Add Silicom Platform Driver
Subsystems (2)
PATCH 1/1 Add Silicom Platform Driver
The Silicom platform (silicom-platform) Linux driver for Swisscom Business Box (Swisscom BB) as well as Cordoba family products is a software solution designed to facilitate the efficient management and control of devices through the integration of various Linux frameworks. This platform driver provides seamless support for device management via the Linux LED framework, GPIO framework, Hardware Monitoring (HWMON), and device attributes. The Silicom platform driver's compatibility with these Linux frameworks allows applications to access and control Cordoba family devices using existing software that is compatible with these frameworks. This compatibility simplifies the development process, reduces dependencies on proprietary solutions, and promotes interoperability with other Linux-based systems and software.
--- drivers/platform/x86/Kconfig | 11 + drivers/platform/x86/Makefile | 1 + drivers/platform/x86/silicom-platform.c | 1053 +++++++++++++++++++++++ 3 files changed, 1065 insertions(+) create mode 100644 drivers/platform/x86/silicom-platform.c
drivers/platform/x86/Kconfig +11 -0
@@ -188,6 +188,17 @@ config ACER_WMI If you have an ACPI-WMI compatible Acer/ Wistron laptop, say Y or M here. +config SILICOM_PLATFORM + tristate "Silicom Edge Networking device support" + depends on DMI + select LEDS_CLASS_MULTICOLOR + select GPIOLIB + help + This option enables support for the LEDs/GPIO/etc downstream of the + embedded controller on Silicom "Cordoba" hardware and derivatives. + + If you have a Silicom network appliance, say Y or M here. + source "drivers/platform/x86/amd/Kconfig" config ADV_SWBUTTON
drivers/platform/x86/Makefile +1 -0
@@ -113,6 +113,7 @@ obj-$(CONFIG_SERIAL_MULTI_INSTANTIATE) += serial-multi-instantiate.o obj-$(CONFIG_MLX_PLATFORM) += mlx-platform.o obj-$(CONFIG_TOUCHSCREEN_DMI) += touchscreen_dmi.o obj-$(CONFIG_WIRELESS_HOTKEY) += wireless-hotkey.o +obj-$(CONFIG_SILICOM_PLATFORM) += silicom-platform.o obj-$(CONFIG_X86_ANDROID_TABLETS) += x86-android-tablets/ # Intel uncore drivers
drivers/platform/x86/silicom-platform.c new file +1053 -0
1,053 lines not on this page · raw message
Signature · 1 line
2.21.3
Ilpo Järvinen
maintainerQuoted 14 lines · Henry Shi
The Silicom platform (silicom-platform) Linux driver for Swisscom Business Box (Swisscom BB) as well as Cordoba family products is a software solution designed to facilitate the efficient management and control of devices through the integration of various Linux frameworks. This platform driver provides seamless support for device management via the Linux LED framework, GPIO framework, Hardware Monitoring (HWMON), and device attributes. The Silicom platform driver's compatibility with these Linux frameworks allows applications to access and control Cordoba family devices using existing software that is compatible with these frameworks. This compatibility simplifies the development process, reduces dependencies on proprietary solutions, and promotes interoperability with other Linux-based systems and software.
Quoted 2 lines
Signed-off-by Henry Shi <[email protected]>---
You should use version the submission (vXX should appear already in the subject) and provide the version history in a list (listing version to version changes).
Quoted 205 lines
drivers/platform/x86/Kconfig | 11 + drivers/platform/x86/Makefile | 1 + drivers/platform/x86/silicom-platform.c | 1053 +++++++++++++++++++++++ 3 files changed, 1065 insertions(+) create mode 100644 drivers/platform/x86/silicom-platform.cdrivers/platform/x86/Kconfig +11
-0@@ -188,6 +188,17 @@ config ACER_WMI If you have an ACPI-WMI compatible Acer/ Wistron laptop, say Y or M here. +config SILICOM_PLATFORM + tristate "Silicom Edge Networking device support" + depends on DMI + select LEDS_CLASS_MULTICOLOR + select GPIOLIB + help + This option enables support for the LEDs/GPIO/etc downstream of the + embedded controller on Silicom "Cordoba" hardware and derivatives. + + If you have a Silicom network appliance, say Y or M here. + source "drivers/platform/x86/amd/Kconfig" config ADV_SWBUTTONdrivers/platform/x86/Makefile +1
-0@@ -113,6 +113,7 @@ obj-$(CONFIG_SERIAL_MULTI_INSTANTIATE) += serial-multi-instantiate.o obj-$(CONFIG_MLX_PLATFORM) += mlx-platform.o obj-$(CONFIG_TOUCHSCREEN_DMI) += touchscreen_dmi.o obj-$(CONFIG_WIRELESS_HOTKEY) += wireless-hotkey.o +obj-$(CONFIG_SILICOM_PLATFORM) += silicom-platform.o obj-$(CONFIG_X86_ANDROID_TABLETS) += x86-android-tablets/ # Intel uncore driversdrivers/platform/x86/silicom-platform.c new file +159
-0@@ -0,0 +1,1053 @@ +// SPDX-License-Identifier: GPL-2.0+ +// +// silicom-platform.c - Silicom MEC170x platform driver +// +// Copyright (C) 2023 Henry Shi <[email protected]> + +#include <linux/dmi.h> +#include <linux/gpio/driver.h> +#include <linux/init.h> +#include <linux/ioport.h> +#include <linux/io.h> +#include <linux/kernel.h> +#include <linux/led-class-multicolor.h> +#include <linux/module.h> +#include <linux/hwmon.h> +#include <linux/mutex.h> +#include <linux/platform_device.h> +#include <linux/string.h> +#include <linux/kobject.h> +#include <linux/sysfs.h> +#include <linux/bits.h> +#include <linux/bitfield.h> + +#define MEC_ADDR ((mec_io_base) + 0x02) +#define MEC_DATA (offset) ((mec_io_base) + 0x04 + (offset)) +#define EC_ADDR_LSB MEC_ADDR +#define EC_ADDR_MSB ((mec_io_base) + 0x03) +#define SILICOM_MEC_MAGIC 0x5a +#define OFFSET_BIT_TO_CHANNEL (off, bit) ((((off) + 0x014) << 3) | (bit)) +#define CHANNEL_TO_OFFSET (chan) (((chan) >> 3) - 0x14) +#define IO_REG_BANK 0 +#define DEFAULT_CHAN_LO 0 +#define DEFAULT_CHAN_HI 0 + +static DEFINE_MUTEX (mec_io_mutex); +static int mec_io_base, mec_io_len; +static struct device *my_dev; +static int efuse_status; +static int mec_uc_version; +static int power_cycle; + +struct silicom_fan_control_data { +struct device *hdev; +int temp; +int fan_speed; +}; + +static const struct hwmon_channel_info *silicom_fan_control_info[] = { +HWMON_CHANNEL_INFO (fan,HWMON_F_INPUT |HWMON_F_LABEL ), +HWMON_CHANNEL_INFO (temp,HWMON_T_INPUT |HWMON_T_LABEL ), +NULL +}; + +struct silicom_platform_info { +int io_base; +int io_len; +struct led_classdev_mc *led_info; +struct gpio_chip *gpiochip; +u8 *gpio_channels; +u16 ngpio; +}; + +static const char *const plat_0222_gpio_names[] = { +"AUTOM0_SFP_TX_FAULT" , +"SLOT2_LED_OUT" , +"SIM_M2_SLOT2_B_DET" , +"SIM_M2_SLOT2_A_DET" , +"SLOT1_LED_OUT" , +"SIM_M2_SLOT1_B_DET" , +"SIM_M2_SLOT1_A_DET" , +"SLOT0_LED_OUT" , +"WAN_SFP0_RX_LOS" , +"WAN_SFP0_PRSNT_N" , +"WAN_SFP0_TX_FAULT" , +"AUTOM1_SFP_RX_LOS" , +"AUTOM1_SFP_PRSNT_N" , +"AUTOM1_SFP_TX_FAULT" , +"AUTOM0_SFP_RX_LOS" , +"AUTOM0_SFP_PRSNT_N" , +"WAN_SFP1_RX_LOS" , +"WAN_SFP1_PRSNT_N" , +"WAN_SFP1_TX_FAULT" , +"SIM_M2_SLOT1_MUX_SEL" , +"W_DISABLE_M2_SLOT1_N" , +"W_DISABLE_MPCIE_SLOT0_N" , +"W_DISABLE_M2_SLOT0_N" , +"BT_COMMAND_MODE" , +"WAN_SFP1_TX_DISABLE" , +"WAN_SFP0_TX_DISABLE" , +"AUTOM1_SFP_TX_DISABLE" , +"AUTOM0_SFP_TX_DISABLE" , +"SIM_M2_SLOT2_MUX_SEL" , +"W_DISABLE_M2_SLOT2_N" , +"RST_CTL_M2_SLOT_1_N" , +"RST_CTL_M2_SLOT_2_N" , +"PM_USB_PWR_EN_BOT" , +"PM_USB_PWR_EN_TOP" , +}; + +static u8 plat_0222_gpio_channels[] = { +OFFSET_BIT_TO_CHANNEL (0x00 ,0 ), +OFFSET_BIT_TO_CHANNEL (0x00 ,1 ), +OFFSET_BIT_TO_CHANNEL (0x00 ,2 ), +OFFSET_BIT_TO_CHANNEL (0x00 ,3 ), +OFFSET_BIT_TO_CHANNEL (0x00 ,4 ), +OFFSET_BIT_TO_CHANNEL (0x00 ,5 ), +OFFSET_BIT_TO_CHANNEL (0x00 ,6 ), +OFFSET_BIT_TO_CHANNEL (0x00 ,7 ), +OFFSET_BIT_TO_CHANNEL (0x01 ,0 ), +OFFSET_BIT_TO_CHANNEL (0x01 ,1 ), +OFFSET_BIT_TO_CHANNEL (0x01 ,2 ), +OFFSET_BIT_TO_CHANNEL (0x01 ,3 ), +OFFSET_BIT_TO_CHANNEL (0x01 ,4 ), +OFFSET_BIT_TO_CHANNEL (0x01 ,5 ), +OFFSET_BIT_TO_CHANNEL (0x01 ,6 ), +OFFSET_BIT_TO_CHANNEL (0x01 ,7 ), +OFFSET_BIT_TO_CHANNEL (0x02 ,0 ), +OFFSET_BIT_TO_CHANNEL (0x02 ,1 ), +OFFSET_BIT_TO_CHANNEL (0x02 ,2 ), +OFFSET_BIT_TO_CHANNEL (0x09 ,0 ), +OFFSET_BIT_TO_CHANNEL (0x09 ,1 ), +OFFSET_BIT_TO_CHANNEL (0x09 ,2 ), +OFFSET_BIT_TO_CHANNEL (0x09 ,3 ), +OFFSET_BIT_TO_CHANNEL (0x0a ,0 ), +OFFSET_BIT_TO_CHANNEL (0x0a ,1 ), +OFFSET_BIT_TO_CHANNEL (0x0a ,2 ), +OFFSET_BIT_TO_CHANNEL (0x0a ,3 ), +OFFSET_BIT_TO_CHANNEL (0x0a ,4 ), +OFFSET_BIT_TO_CHANNEL (0x0a ,5 ), +OFFSET_BIT_TO_CHANNEL (0x0a ,6 ), +OFFSET_BIT_TO_CHANNEL (0x0b ,0 ), +OFFSET_BIT_TO_CHANNEL (0x0b ,1 ), +OFFSET_BIT_TO_CHANNEL (0x0b ,2 ), +OFFSET_BIT_TO_CHANNEL (0x0b ,3 ), +}; + +static struct platform_device *silicom_platform_dev; +static struct led_classdev_mc *silicom_led_info__initdata ; +static struct gpio_chip *silicom_gpiochip__initdata ; +static u8 *silicom_gpio_channels__initdata ; + +static int silicom_mec_port_get (unsigned int offset) +{ +u8 reg; + +mutex_lock (&mec_io_mutex); +/* Get the dword offset from the channel */ +outb ((offset >>3 ) &0xfc ,MEC_ADDR ); + +/* Get the current register */ + reg =inb (MEC_DATA ((offset >>3 ) &0x03 )); +mutex_unlock (&mec_io_mutex); + +return (reg >> (offset &0x7 )) &0x01 ; +} + +static enum led_brightness silicom_mec_led_get (int channel) +{ +u8 reg;
drivers/platform/x86/silicom-platform.c line 169
Quoted 10 lines
drivers/platform/x86/silicom-platform.c new file +10
-0+ +mutex_lock (&mec_io_mutex); +/* Get the dword offset of the register for this LED from the channel */ +outb ((channel >>3 ) &0xfc ,MEC_ADDR ); +/* Get the current LED settings */ + reg =inb (MEC_DATA ((channel >>3 ) &0x03 )); +mutex_unlock (&mec_io_mutex); + +/* Outputs are active low */ +return silicom_mec_port_get (channel) ?LED_OFF :LED_ON ;
Why is code now done twice, first in this function and then it calls silicom_mec_port_get() which does the same thing?? Perhaps you forgot to remove it from this function while you added the call.
Quoted 38 lines
drivers/platform/x86/silicom-platform.c new file +38
-0+} + +static void silicom_mec_port_set (int channel,int on) +{ +u8 reg; + +mutex_lock (&mec_io_mutex); +/* Get the dword offset from the channel */ +outb ((channel >>3 ) &0xfc ,MEC_ADDR ); +/* Get the current port settings */ + reg =inb (MEC_DATA ((channel >>3 ) &0x03 )); +/* Outputs are active low, so clear the bit for on, or set it for off */ +if (on) + reg &= ~(1 << (channel &0x7 )); +else + reg |=1 << (channel &0x7 ); +/* Write back the updated register */ +outb (reg,MEC_DATA ((channel >>3 ) &0x03 )); +mutex_unlock (&mec_io_mutex); +} + +static enum led_brightness silicom_mec_led_mc_brightness_get (struct led_classdev *led_cdev) +{ +struct led_classdev_mc *mc_cdev =lcdev_to_mccdev (led_cdev); +enum led_brightness brightness =LED_OFF ; +int i; + +for (i =0 ; i < mc_cdev->num_colors; i++) { + mc_cdev->subled_info[i].brightness = +silicom_mec_led_get (mc_cdev->subled_info[i].channel); +/* Mark the overall brightness as LED_ON if any of the subleds are on */ +if (mc_cdev->subled_info[i].brightness !=LED_OFF ) + brightness =LED_ON ; + } + +return brightness; +} +
drivers/platform/x86/silicom-platform.c line 217
Quoted 10 lines
drivers/platform/x86/silicom-platform.c new file +10
-0+static void silicom_mec_led_mc_brightness_set (struct led_classdev *led_cdev, +enum led_brightness brightness) +{ +struct led_classdev_mc *mc_cdev =lcdev_to_mccdev (led_cdev); +int i; + +led_mc_calc_color_components (mc_cdev, brightness); +for (i =0 ; i < mc_cdev->num_colors; i++) { +silicom_mec_port_set (mc_cdev->subled_info[i].channel, + mc_cdev->subled_info[i].brightness);
Align the arguments to the same column please.
Quoted 60 lines
drivers/platform/x86/silicom-platform.c new file +59
-0+ } +} + +static int silicom_gpio_get_direction (struct gpio_chip *gc,unsigned int offset) +{ +u8 *channels =gpiochip_get_data (gc); + +/* Input registers have offsets between [0x00, 0x07] */ +if (CHANNEL_TO_OFFSET (channels[offset]) <0x08 ) +return GPIO_LINE_DIRECTION_IN ; + +return GPIO_LINE_DIRECTION_OUT ; +} + +static int silicom_gpio_direction_input (struct gpio_chip *gc,unsigned int offset) +{ +int direction =silicom_gpio_get_direction (gc, offset); + +return direction ==GPIO_LINE_DIRECTION_IN ?0 : -EINVAL ; +} + +static void silicom_gpio_set (struct gpio_chip *gc,unsigned int offset,int value) +{ +u8 *channels =gpiochip_get_data (gc); +int direction =silicom_gpio_get_direction (gc, offset); +int channel = channels[offset]; + +if (direction ==GPIO_LINE_DIRECTION_IN ) +return ; + +if (value) +silicom_mec_port_set (channel,0 ); +else if (value ==0 ) +silicom_mec_port_set (channel,1 ); +else +pr_err ("Wrong argument value: %d\n" , value); +} + +static int silicom_gpio_direction_output (struct gpio_chip *gc,unsigned int offset,int value) +{ +int direction =silicom_gpio_get_direction (gc, offset); + +if (direction ==GPIO_LINE_DIRECTION_IN ) +return -EINVAL ; + +silicom_gpio_set (gc, offset, value); + +return 0 ; +} + +static int silicom_gpio_get (struct gpio_chip *gc,unsigned int offset) +{ +u8 *channels =gpiochip_get_data (gc); +int channel = channels[offset]; + +return silicom_mec_port_get (channel); +} + +
drivers/platform/x86/silicom-platform.c
Quoted 10 lines
drivers/platform/x86/silicom-platform.c new file +9
-0+static ssize_t efuse_status_show (struct device *dev,struct device_attribute *attr, +char *buf) +{ +u32 reg; + +mutex_lock (&mec_io_mutex); +/* Select memory region */ +outb (IO_REG_BANK ,EC_ADDR_MSB ); +outb (0x28 ,EC_ADDR_LSB );
That 0x28 is some HW offset right? It should be named to what is found at that address with a define. Fiven the function name, perhaps something
along the lines of #define MEC_EFUSE_STATUS 0x28
Quoted 10 lines
drivers/platform/x86/silicom-platform.c new file +10
-0+ +/* Get current data from the address */ + reg =inl (MEC_DATA (DEFAULT_CHAN_LO )); +mutex_unlock (&mec_io_mutex); + + efuse_status = reg &0x1 ; + +return sprintf (buf,"%d\n" , efuse_status); +} +
drivers/platform/x86/silicom-platform.c line 650
Quoted 10 lines
drivers/platform/x86/silicom-platform.c new file +10
-0+static ssize_t uc_version_show (struct device *dev, +struct device_attribute *attr, +char *buf) +{ +u32 reg; +int uc_version; + +mutex_lock (&mec_io_mutex); +outb (IO_REG_BANK ,EC_ADDR_MSB ); +outb (0x0 ,EC_ADDR_LSB );
Named define for 0x0.
drivers/platform/x86/silicom-platform.c line 654
Quoted 4 lines
drivers/platform/x86/silicom-platform.c new file +4
-0+ + reg =inl (MEC_DATA (DEFAULT_CHAN_LO )); +mutex_unlock (&mec_io_mutex); + uc_version =FIELD_GET (GENMASK (15 ,8 ), reg);
In general, it's more useful to have #define with name for GENMASK() like this, but see below...
drivers/platform/x86/silicom-platform.c line 661
Quoted 7 lines
drivers/platform/x86/silicom-platform.c new file +7
-0+if (uc_version >=64 && uc_version <128 ) { + uc_version &= ~(1 <<6 ); + uc_version =100 + uc_version; + }else if (uc_version >=128 && uc_version <192 ) { + uc_version &= ~(1 <<7 ); + uc_version =200 + uc_version; + }
I see you probably missed what I tried to say earlier. Does this version field have two distinct fields? How about this:
#define MEC_VERSION_MAJOR GENMASK(15, 14)
#define MEC_VERSION_MINOR GENMASK(13, 8)
uc_version = FIELD_GET(MEC_VERSION_MAJOR, reg) * 100 + FIELD_GET(MEC_VERSION_MINOR, reg);
...you might want to add something for >= 192 values (or accept they'll be in 300..3xx range if that's okay, I don't know the internals of this fields so I cannot tell which is preferred here).
I think the results are identical to what the above code does but doesn't require any if()s (sans >= 192 that might need additional check).
Quoted 7 lines
drivers/platform/x86/silicom-platform.c new file +7
-0+ mec_uc_version = uc_version; +return sprintf (buf,"%d\n" , mec_uc_version); +} + +static ssize_t power_cycle_show (struct device *dev, +struct device_attribute *attr, +char *buf)
drivers/platform/x86/silicom-platform.c line 678
Quoted 10 lines
drivers/platform/x86/silicom-platform.c new file +10
-0+{ +return sprintf (buf,"%d\n" , power_cycle); +} + +static void powercycle_uc (void ) +{ +mutex_lock (&mec_io_mutex); +/* Select memory region */ +outb (IO_REG_BANK ,EC_ADDR_MSB ); +outb (0x24 ,EC_ADDR_LSB );
Named define for 0x24.
Signature · 1 line
i.
Ilpo,
See my comments below.
Thanks.
Henry
-----Original Message-----
From: Ilpo Järvinen <[email protected]>
Sent: Thursday, August 17, 2023 4:07 AM
To: Henry Shi <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; LKML <[email protected]>; [email protected]; [email protected]; [email protected]; Huibin Shi <[email protected]>; Wen Wang <[email protected]>
Subject: Re: [PATCH] Add Silicom Platform Driver
Caution: This is an external email. Please take care when clicking links or opening attachments.
Quoted 14 lines · Henry Shi
The Silicom platform (silicom-platform) Linux driver for Swisscom Business Box (Swisscom BB) as well as Cordoba family products is a software solution designed to facilitate the efficient management and control of devices through the integration of various Linux frameworks. This platform driver provides seamless support for device management via the Linux LED framework, GPIO framework, Hardware Monitoring (HWMON), and device attributes. The Silicom platform driver's compatibility with these Linux frameworks allows applications to access and control Cordoba family devices using existing software that is compatible with these frameworks. This compatibility simplifies the development process, reduces dependencies on proprietary solutions, and promotes interoperability with other Linux-based systems and software.
Quoted 2 lines
Signed-off-by Henry Shi <[email protected]>---
You should use version the submission (vXX should appear already in the subject) and provide the version history in a list (listing version to version changes).
Henry: OK.
Quoted 196 lines
drivers/platform/x86/Kconfig | 11 + drivers/platform/x86/Makefile | 1 + drivers/platform/x86/silicom-platform.c | 1053 +++++++++++++++++++++++ 3 files changed, 1065 insertions(+) create mode 100644 drivers/platform/x86/silicom-platform.c(quoted diff) +0
-0b/drivers/platform/x86/Kconfig index
22052031c719..7680c0dbcd8d100644drivers/platform/x86/Kconfig +11
-0@@ -188,6 +188,17 @@ config ACER_WMI If you have an ACPI-WMI compatible Acer/ Wistron laptop, say Y or M here. +config SILICOM_PLATFORM + tristate "Silicom Edge Networking device support" + depends on DMI + select LEDS_CLASS_MULTICOLOR + select GPIOLIB + help + This option enables support for the LEDs/GPIO/etc downstream of the + embedded controller on Silicom "Cordoba" hardware and derivatives. + + If you have a Silicom network appliance, say Y or M here. + source "drivers/platform/x86/amd/Kconfig" config ADV_SWBUTTON(quoted diff) +0
-0b/drivers/platform/x86/Makefile index
2cafe51ec4d8..9355ebbc56ca100644drivers/platform/x86/Makefile +1
-0@@ -113,6 +113,7 @@ obj-$(CONFIG_SERIAL_MULTI_INSTANTIATE) += serial-multi-instantiate.o obj-$(CONFIG_MLX_PLATFORM) += mlx-platform.o obj-$(CONFIG_TOUCHSCREEN_DMI) += touchscreen_dmi.o obj-$(CONFIG_WIRELESS_HOTKEY) += wireless-hotkey.o +obj-$(CONFIG_SILICOM_PLATFORM) += silicom-platform.o obj-$(CONFIG_X86_ANDROID_TABLETS) += x86-android-tablets/ # Intel uncore driversdrivers/platform/x86/silicom-platform.c new file +147
-0@@ -0,0 +1,1053 @@ +// SPDX-License-Identifier: GPL-2.0+ +// +// silicom-platform.c - Silicom MEC170x platform driver // // +Copyright (C) 2023 Henry Shi <[email protected]> + +#include <linux/dmi.h> +#include <linux/gpio/driver.h> +#include <linux/init.h> +#include <linux/ioport.h> +#include <linux/io.h> +#include <linux/kernel.h> +#include <linux/led-class-multicolor.h> #include <linux/module.h> +#include <linux/hwmon.h> #include <linux/mutex.h> #include +<linux/platform_device.h> #include <linux/string.h> #include +<linux/kobject.h> #include <linux/sysfs.h> #include <linux/bits.h> +#include <linux/bitfield.h> + +#define MEC_ADDR ((mec_io_base) + 0x02) #define MEC_DATA(offset) +((mec_io_base) + 0x04 + (offset)) #define EC_ADDR_LSB MEC_ADDR +#define EC_ADDR_MSB ((mec_io_base) + 0x03) #define SILICOM_MEC_MAGIC +0x5a #define OFFSET_BIT_TO_CHANNEL(off, bit) ((((off) + 0x014) << 3) +| (bit)) #define CHANNEL_TO_OFFSET(chan) (((chan) >> 3) - 0x14) +#define IO_REG_BANK 0 #define DEFAULT_CHAN_LO 0 #define +DEFAULT_CHAN_HI 0 + +static DEFINE_MUTEX (mec_io_mutex ); +static int mec_io_base, mec_io_len; +static struct device *my_dev; +static int efuse_status; +static int mec_uc_version; +static int power_cycle; + +struct silicom_fan_control_data { +struct device *hdev; +int temp; +int fan_speed; +}; + +static const struct hwmon_channel_info *silicom_fan_control_info[] = { +HWMON_CHANNEL_INFO (fan,HWMON_F_INPUT |HWMON_F_LABEL ), +HWMON_CHANNEL_INFO (temp,HWMON_T_INPUT |HWMON_T_LABEL ), +NULL +}; + +struct silicom_platform_info { +int io_base; +int io_len; +struct led_classdev_mc *led_info; +struct gpio_chip *gpiochip; +u8 *gpio_channels; +u16 ngpio; +}; + +static const char *const plat_0222_gpio_names[] = { +"AUTOM0_SFP_TX_FAULT" , +"SLOT2_LED_OUT" , +"SIM_M2_SLOT2_B_DET" , +"SIM_M2_SLOT2_A_DET" , +"SLOT1_LED_OUT" , +"SIM_M2_SLOT1_B_DET" , +"SIM_M2_SLOT1_A_DET" , +"SLOT0_LED_OUT" , +"WAN_SFP0_RX_LOS" , +"WAN_SFP0_PRSNT_N" , +"WAN_SFP0_TX_FAULT" , +"AUTOM1_SFP_RX_LOS" , +"AUTOM1_SFP_PRSNT_N" , +"AUTOM1_SFP_TX_FAULT" , +"AUTOM0_SFP_RX_LOS" , +"AUTOM0_SFP_PRSNT_N" , +"WAN_SFP1_RX_LOS" , +"WAN_SFP1_PRSNT_N" , +"WAN_SFP1_TX_FAULT" , +"SIM_M2_SLOT1_MUX_SEL" , +"W_DISABLE_M2_SLOT1_N" , +"W_DISABLE_MPCIE_SLOT0_N" , +"W_DISABLE_M2_SLOT0_N" , +"BT_COMMAND_MODE" , +"WAN_SFP1_TX_DISABLE" , +"WAN_SFP0_TX_DISABLE" , +"AUTOM1_SFP_TX_DISABLE" , +"AUTOM0_SFP_TX_DISABLE" , +"SIM_M2_SLOT2_MUX_SEL" , +"W_DISABLE_M2_SLOT2_N" , +"RST_CTL_M2_SLOT_1_N" , +"RST_CTL_M2_SLOT_2_N" , +"PM_USB_PWR_EN_BOT" , +"PM_USB_PWR_EN_TOP" , +}; + +static u8 plat_0222_gpio_channels[] = { +OFFSET_BIT_TO_CHANNEL (0x00 ,0 ), +OFFSET_BIT_TO_CHANNEL (0x00 ,1 ), +OFFSET_BIT_TO_CHANNEL (0x00 ,2 ), +OFFSET_BIT_TO_CHANNEL (0x00 ,3 ), +OFFSET_BIT_TO_CHANNEL (0x00 ,4 ), +OFFSET_BIT_TO_CHANNEL (0x00 ,5 ), +OFFSET_BIT_TO_CHANNEL (0x00 ,6 ), +OFFSET_BIT_TO_CHANNEL (0x00 ,7 ), +OFFSET_BIT_TO_CHANNEL (0x01 ,0 ), +OFFSET_BIT_TO_CHANNEL (0x01 ,1 ), +OFFSET_BIT_TO_CHANNEL (0x01 ,2 ), +OFFSET_BIT_TO_CHANNEL (0x01 ,3 ), +OFFSET_BIT_TO_CHANNEL (0x01 ,4 ), +OFFSET_BIT_TO_CHANNEL (0x01 ,5 ), +OFFSET_BIT_TO_CHANNEL (0x01 ,6 ), +OFFSET_BIT_TO_CHANNEL (0x01 ,7 ), +OFFSET_BIT_TO_CHANNEL (0x02 ,0 ), +OFFSET_BIT_TO_CHANNEL (0x02 ,1 ), +OFFSET_BIT_TO_CHANNEL (0x02 ,2 ), +OFFSET_BIT_TO_CHANNEL (0x09 ,0 ), +OFFSET_BIT_TO_CHANNEL (0x09 ,1 ), +OFFSET_BIT_TO_CHANNEL (0x09 ,2 ), +OFFSET_BIT_TO_CHANNEL (0x09 ,3 ), +OFFSET_BIT_TO_CHANNEL (0x0a ,0 ), +OFFSET_BIT_TO_CHANNEL (0x0a ,1 ), +OFFSET_BIT_TO_CHANNEL (0x0a ,2 ), +OFFSET_BIT_TO_CHANNEL (0x0a ,3 ), +OFFSET_BIT_TO_CHANNEL (0x0a ,4 ), +OFFSET_BIT_TO_CHANNEL (0x0a ,5 ), +OFFSET_BIT_TO_CHANNEL (0x0a ,6 ), +OFFSET_BIT_TO_CHANNEL (0x0b ,0 ), +OFFSET_BIT_TO_CHANNEL (0x0b ,1 ), +OFFSET_BIT_TO_CHANNEL (0x0b ,2 ), +OFFSET_BIT_TO_CHANNEL (0x0b ,3 ), +}; + +static struct platform_device *silicom_platform_dev;static struct +led_classdev_mc *silicom_led_info__initdata ;static struct gpio_chip +*silicom_gpiochip__initdata ;static u8 *silicom_gpio_channels +__initdata ; + +static int silicom_mec_port_get (unsigned int offset) { +u8 reg; + +mutex_lock (&mec_io_mutex); +/* Get the dword offset from the channel */ +outb ((offset >>3 ) &0xfc ,MEC_ADDR ); + +/* Get the current register */ + reg =inb (MEC_DATA ((offset >>3 ) &0x03 )); +mutex_unlock (&mec_io_mutex); + +return (reg >> (offset &0x7 )) &0x01 ; } + +static enum led_brightness silicom_mec_led_get (int channel) { +u8 reg;
drivers/platform/x86/silicom-platform.c line 157
Quoted 10 lines
drivers/platform/x86/silicom-platform.c new file +10
-0+ +mutex_lock (&mec_io_mutex); +/* Get the dword offset of the register for this LED from the channel */ +outb ((channel >>3 ) &0xfc ,MEC_ADDR ); +/* Get the current LED settings */ + reg =inb (MEC_DATA ((channel >>3 ) &0x03 )); +mutex_unlock (&mec_io_mutex); + +/* Outputs are active low */ +return silicom_mec_port_get (channel) ?LED_OFF :LED_ON ;
Why is code now done twice, first in this function and then it callssilicom_mec_port_get() which does the same thing?? Perhaps you forgot to remove it from this function while you added the call.
Henry: Yes, those lines should be removed.
Quoted 38 lines
drivers/platform/x86/silicom-platform.c new file +38
-0+} + +static void silicom_mec_port_set (int channel,int on) { +u8 reg; + +mutex_lock (&mec_io_mutex); +/* Get the dword offset from the channel */ +outb ((channel >>3 ) &0xfc ,MEC_ADDR ); +/* Get the current port settings */ + reg =inb (MEC_DATA ((channel >>3 ) &0x03 )); +/* Outputs are active low, so clear the bit for on, or set it for off */ +if (on) + reg &= ~(1 << (channel &0x7 )); +else + reg |=1 << (channel &0x7 ); +/* Write back the updated register */ +outb (reg,MEC_DATA ((channel >>3 ) &0x03 )); +mutex_unlock (&mec_io_mutex); +} + +static enum led_brightness silicom_mec_led_mc_brightness_get (struct +led_classdev *led_cdev) { +struct led_classdev_mc *mc_cdev =lcdev_to_mccdev (led_cdev); +enum led_brightness brightness =LED_OFF ; +int i; + +for (i =0 ; i < mc_cdev->num_colors; i++) { + mc_cdev->subled_info[i].brightness = +silicom_mec_led_get (mc_cdev->subled_info[i].channel); +/* Mark the overall brightness as LED_ON if any of the subleds are on */ +if (mc_cdev->subled_info[i].brightness !=LED_OFF ) + brightness =LED_ON ; + } + +return brightness; +} + +static void silicom_mec_led_mc_brightness_set(struct led_classdev *led_cdev,
drivers/platform/x86/silicom-platform.c
Quoted 10 lines
drivers/platform/x86/silicom-platform.c new file +10
-0+ +enum led_brightness brightness) { +struct led_classdev_mc *mc_cdev =lcdev_to_mccdev (led_cdev); +int i; + +led_mc_calc_color_components (mc_cdev, brightness); +for (i =0 ; i < mc_cdev->num_colors; i++) { +silicom_mec_port_set (mc_cdev->subled_info[i].channel, + + mc_cdev->subled_info[i].brightness);
Align the arguments to the same column please.
Henry: OK
Quoted 57 lines
drivers/platform/x86/silicom-platform.c new file +56
-0+ } +} + +static int silicom_gpio_get_direction (struct gpio_chip *gc,unsigned +int offset) { +u8 *channels =gpiochip_get_data (gc); + +/* Input registers have offsets between [0x00, 0x07] */ +if (CHANNEL_TO_OFFSET (channels[offset]) <0x08 ) +return GPIO_LINE_DIRECTION_IN ; + +return GPIO_LINE_DIRECTION_OUT ; +} + +static int silicom_gpio_direction_input (struct gpio_chip *gc, +unsigned int offset) { +int direction =silicom_gpio_get_direction (gc, offset); + +return direction ==GPIO_LINE_DIRECTION_IN ?0 : -EINVAL ; } + +static void silicom_gpio_set (struct gpio_chip *gc,unsigned int +offset,int value) { +u8 *channels =gpiochip_get_data (gc); +int direction =silicom_gpio_get_direction (gc, offset); +int channel = channels[offset]; + +if (direction ==GPIO_LINE_DIRECTION_IN ) +return ; + +if (value) +silicom_mec_port_set (channel,0 ); +else if (value ==0 ) +silicom_mec_port_set (channel,1 ); +else +pr_err ("Wrong argument value: %d\n" , value); } + +static int silicom_gpio_direction_output (struct gpio_chip *gc, +unsigned int offset,int value) { +int direction =silicom_gpio_get_direction (gc, offset); + +if (direction ==GPIO_LINE_DIRECTION_IN ) +return -EINVAL ; + +silicom_gpio_set (gc, offset, value); + +return 0 ; +} + +static int silicom_gpio_get (struct gpio_chip *gc,unsigned int +offset) { +u8 *channels =gpiochip_get_data (gc); +int channel = channels[offset]; + +return silicom_mec_port_get (channel); } + +
drivers/platform/x86/silicom-platform.c
Quoted 10 lines
drivers/platform/x86/silicom-platform.c new file +9
-0+static ssize_t efuse_status_show (struct device *dev,struct device_attribute *attr, +char +*buf) { +u32 reg; + +mutex_lock (&mec_io_mutex); +/* Select memory region */ +outb (IO_REG_BANK ,EC_ADDR_MSB ); +outb (0x28 ,EC_ADDR_LSB );
That 0x28 is some HW offset right? It should be named to what is found at that address with a define. Fiven the function name, perhaps something
along the lines of #define MEC_EFUSE_STATUS 0x28
Henry: OK
Quoted 8 lines
drivers/platform/x86/silicom-platform.c new file +8
-0+ +/* Get current data from the address */ + reg =inl (MEC_DATA (DEFAULT_CHAN_LO )); +mutex_unlock (&mec_io_mutex); + + efuse_status = reg &0x1 ; + +return sprintf (buf,"%d\n" , efuse_status); }
drivers/platform/x86/silicom-platform.c line 650
Quoted 10 lines
drivers/platform/x86/silicom-platform.c new file +10
-0+ +static ssize_t uc_version_show (struct device *dev, +struct device_attribute *attr, +char *buf) { +u32 reg; +int uc_version; + +mutex_lock (&mec_io_mutex); +outb (IO_REG_BANK ,EC_ADDR_MSB ); +outb (0x0 ,EC_ADDR_LSB );
Named define for 0x0.
Henry: OK.
drivers/platform/x86/silicom-platform.c line 654
Quoted 4 lines
drivers/platform/x86/silicom-platform.c new file +4
-0+ + reg =inl (MEC_DATA (DEFAULT_CHAN_LO )); +mutex_unlock (&mec_io_mutex); + uc_version =FIELD_GET (GENMASK (15 ,8 ), reg);
In general, it's more useful to have #define with name for GENMASK() like this, but see below...
drivers/platform/x86/silicom-platform.c line 661
Quoted 7 lines
drivers/platform/x86/silicom-platform.c new file +7
-0+if (uc_version >=64 && uc_version <128 ) { + uc_version &= ~(1 <<6 ); + uc_version =100 + uc_version; + }else if (uc_version >=128 && uc_version <192 ) { + uc_version &= ~(1 <<7 ); + uc_version =200 + uc_version; + }
I see you probably missed what I tried to say earlier. Does this version field have two distinct fields? How about this:
#define MEC_VERSION_MAJOR GENMASK(15, 14)
#define MEC_VERSION_MINOR GENMASK(13, 8)
uc_version = FIELD_GET(MEC_VERSION_MAJOR, reg) * 100 +
FIELD_GET(MEC_VERSION_MINOR, reg);
...you might want to add something for >= 192 values (or accept they'll be in 300..3xx range if that's okay, I don't know the internals of this fields so I cannot tell which is preferred here).
I think the results are identical to what the above code does but doesn't require any if()s (sans >= 192 that might need additional check).
Henry: Good suggestion.
Quoted 4 lines
drivers/platform/x86/silicom-platform.c new file +4
-0+ mec_uc_version = uc_version; +return sprintf (buf,"%d\n" , mec_uc_version); } + +static ssize_t power_cycle_show(struct device *dev,
drivers/platform/x86/silicom-platform.c line 678
Quoted 10 lines
drivers/platform/x86/silicom-platform.c new file +10
-0+struct device_attribute *attr, + char *buf) { + return sprintf(buf, "%d\n", power_cycle); } + +static void powercycle_uc (void ) +{ +mutex_lock (&mec_io_mutex); +/* Select memory region */ +outb (IO_REG_BANK ,EC_ADDR_MSB ); +outb (0x24 ,EC_ADDR_LSB );
Named define for 0x24.
Henry: OK
--
i.