Skip to content

Commit

Permalink
Revert "igc: Export LEDs"
Browse files Browse the repository at this point in the history 
This reverts commit cf83318.

There are better Linux interfaces to export the different LED modes
and blinking reasons.

Revert this patch for now and come up with better solution later.

Suggested-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Kurt Kanzenbach <kurt@linutronix.de>
Link: https://lore.kernel.org/r/20210719101640.16047-1-kurt@linutronix.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Kurt Kanzenbach authored and Jakub Kicinski committed Jul 20, 2021
1 parent e93abb8 commit edd2e9d
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 155 deletions.
1 change: 0 additions & 1 deletion drivers/net/ethernet/intel/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,6 @@ config IGC
tristate "Intel(R) Ethernet Controller I225-LM/I225-V support"
default n
depends on PCI
depends on LEDS_CLASS
help
This driver supports Intel(R) Ethernet Controller I225-LM/I225-V
family of adapters.
Expand Down
10 changes: 0 additions & 10 deletions drivers/net/ethernet/intel/igc/igc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
#include <linux/ptp_clock_kernel.h>
#include <linux/timecounter.h>
#include <linux/net_tstamp.h>
#include <linux/leds.h>

#include "igc_hw.h"

Expand Down Expand Up @@ -240,17 +239,8 @@ struct igc_adapter {
struct timespec64 start;
struct timespec64 period;
} perout[IGC_N_PEROUT];

/* LEDs */
struct mutex led_mutex;
struct led_classdev led0;
struct led_classdev led1;
struct led_classdev led2;
};

#define led_to_igc(ldev, led) \
container_of(ldev, struct igc_adapter, led)

void igc_up(struct igc_adapter *adapter);
void igc_down(struct igc_adapter *adapter);
int igc_open(struct net_device *netdev);
Expand Down
10 changes: 0 additions & 10 deletions drivers/net/ethernet/intel/igc/igc_defines.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,16 +144,6 @@
#define IGC_CTRL_SDP0_DIR 0x00400000 /* SDP0 Data direction */
#define IGC_CTRL_SDP1_DIR 0x00800000 /* SDP1 Data direction */

/* LED Control */
#define IGC_LEDCTL_LED0_MODE_SHIFT 0
#define IGC_LEDCTL_LED0_MODE_MASK GENMASK(3, 0)
#define IGC_LEDCTL_LED1_MODE_SHIFT 8
#define IGC_LEDCTL_LED1_MODE_MASK GENMASK(11, 8)
#define IGC_LEDCTL_LED2_MODE_SHIFT 16
#define IGC_LEDCTL_LED2_MODE_MASK GENMASK(19, 16)

#define IGC_CONNSW_AUTOSENSE_EN 0x1

/* As per the EAS the maximum supported size is 9.5KB (9728 bytes) */
#define MAX_JUMBO_FRAME_SIZE 0x2600

Expand Down
132 changes: 0 additions & 132 deletions drivers/net/ethernet/intel/igc/igc_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6130,134 +6130,6 @@ int igc_set_spd_dplx(struct igc_adapter *adapter, u32 spd, u8 dplx)
return -EINVAL;
}

static void igc_select_led(struct igc_adapter *adapter, int led,
u32 *mask, u32 *shift)
{
switch (led) {
case 0:
*mask = IGC_LEDCTL_LED0_MODE_MASK;
*shift = IGC_LEDCTL_LED0_MODE_SHIFT;
break;
case 1:
*mask = IGC_LEDCTL_LED1_MODE_MASK;
*shift = IGC_LEDCTL_LED1_MODE_SHIFT;
break;
case 2:
*mask = IGC_LEDCTL_LED2_MODE_MASK;
*shift = IGC_LEDCTL_LED2_MODE_SHIFT;
break;
default:
*mask = *shift = 0;
dev_err(&adapter->pdev->dev, "Unknown led %d selected!", led);
}
}

static void igc_led_set(struct igc_adapter *adapter, int led, u16 brightness)
{
struct igc_hw *hw = &adapter->hw;
u32 shift, mask, ledctl;

igc_select_led(adapter, led, &mask, &shift);

mutex_lock(&adapter->led_mutex);
ledctl = rd32(IGC_LEDCTL);
ledctl &= ~mask;
ledctl |= brightness << shift;
wr32(IGC_LEDCTL, ledctl);
mutex_unlock(&adapter->led_mutex);
}

static enum led_brightness igc_led_get(struct igc_adapter *adapter, int led)
{
struct igc_hw *hw = &adapter->hw;
u32 shift, mask, ledctl;

igc_select_led(adapter, led, &mask, &shift);

mutex_lock(&adapter->led_mutex);
ledctl = rd32(IGC_LEDCTL);
mutex_unlock(&adapter->led_mutex);

return (ledctl & mask) >> shift;
}

static void igc_led0_set(struct led_classdev *ldev, enum led_brightness b)
{
struct igc_adapter *adapter = led_to_igc(ldev, led0);

igc_led_set(adapter, 0, b);
}

static enum led_brightness igc_led0_get(struct led_classdev *ldev)
{
struct igc_adapter *adapter = led_to_igc(ldev, led0);

return igc_led_get(adapter, 0);
}

static void igc_led1_set(struct led_classdev *ldev, enum led_brightness b)
{
struct igc_adapter *adapter = led_to_igc(ldev, led1);

igc_led_set(adapter, 1, b);
}

static enum led_brightness igc_led1_get(struct led_classdev *ldev)
{
struct igc_adapter *adapter = led_to_igc(ldev, led1);

return igc_led_get(adapter, 1);
}

static void igc_led2_set(struct led_classdev *ldev, enum led_brightness b)
{
struct igc_adapter *adapter = led_to_igc(ldev, led2);

igc_led_set(adapter, 2, b);
}

static enum led_brightness igc_led2_get(struct led_classdev *ldev)
{
struct igc_adapter *adapter = led_to_igc(ldev, led2);

return igc_led_get(adapter, 2);
}

static int igc_led_setup(struct igc_adapter *adapter)
{
/* Setup */
mutex_init(&adapter->led_mutex);

adapter->led0.name = "igc_led0";
adapter->led0.max_brightness = 15;
adapter->led0.brightness_set = igc_led0_set;
adapter->led0.brightness_get = igc_led0_get;

adapter->led1.name = "igc_led1";
adapter->led1.max_brightness = 15;
adapter->led1.brightness_set = igc_led1_set;
adapter->led1.brightness_get = igc_led1_get;

adapter->led2.name = "igc_led2";
adapter->led2.max_brightness = 15;
adapter->led2.brightness_set = igc_led2_set;
adapter->led2.brightness_get = igc_led2_get;

/* Register leds */
led_classdev_register(&adapter->pdev->dev, &adapter->led0);
led_classdev_register(&adapter->pdev->dev, &adapter->led1);
led_classdev_register(&adapter->pdev->dev, &adapter->led2);

return 0;
}

static void igc_led_destroy(struct igc_adapter *adapter)
{
led_classdev_unregister(&adapter->led0);
led_classdev_unregister(&adapter->led1);
led_classdev_unregister(&adapter->led2);
}

/**
* igc_probe - Device Initialization Routine
* @pdev: PCI device information struct
Expand Down Expand Up @@ -6485,8 +6357,6 @@ static int igc_probe(struct pci_dev *pdev,

pm_runtime_put_noidle(&pdev->dev);

igc_led_setup(adapter);

return 0;

err_register:
Expand Down Expand Up @@ -6528,8 +6398,6 @@ static void igc_remove(struct pci_dev *pdev)

igc_ptp_stop(adapter);

igc_led_destroy(adapter);

set_bit(__IGC_DOWN, &adapter->state);

del_timer_sync(&adapter->watchdog_timer);
Expand Down
2 changes: 0 additions & 2 deletions drivers/net/ethernet/intel/igc/igc_regs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
#define IGC_EECD 0x00010 /* EEPROM/Flash Control - RW */
#define IGC_CTRL_EXT 0x00018 /* Extended Device Control - RW */
#define IGC_MDIC 0x00020 /* MDI Control - RW */
#define IGC_LEDCTL 0x00E00 /* LED Control - RW */
#define IGC_MDICNFG 0x00E04 /* MDC/MDIO Configuration - RW */
#define IGC_CONNSW 0x00034 /* Copper/Fiber switch control - RW */
#define IGC_VET 0x00038 /* VLAN Ether Type - RW */
#define IGC_I225_PHPM 0x00E14 /* I225 PHY Power Management */
Expand Down

0 comments on commit edd2e9d

Please sign in to comment.