platform/x86: Add Silicom Platform Driver
Subsystems (2)
PATCH v10 1/1 platform/x86: Add Silicom Platform Driver
platform/x86: Add Silicom Platform Driver
Add Silicom platform (silicom-platform) Linux driver for Swisscom Business Box (Swisscom BB) as well as Cordoba family products.
This platform driver provides support for various functions via the Linux LED framework, GPIO framework, Hardware Monitoring (HWMON) and device attributes.
---
Changes from v1 to v2:
===========================
Suggested by Hans de Goede <[email protected]>
.Use git send-email to submit patch.
.patch contents should be in message body.
.Kconfig bit for the driver should be in drivers/platform/x86/Kconfig.
changes from patch v2 to v3
===========================
changes suggested by Guenter Roeck <[email protected]> .Removed unnecessary include file linux/thermal.h. .Removed EXPORT_SYMBOL for mutex lock/unlock function.
Changes suggested by Ilpo Järvinen <[email protected]> .Remove extra new line in code on multiple position.
.Use table instead of space in code.
.Uss Linux defined bit operation MACRO define.
.Removed local variable in rpm_get().
.Corrected typo in comments.
.Corrected incorrect indentation.
.Removed unnecessary comments in silicom_mc_leds_register(). .Rewrite efuse_status_show() to used defined variable and removed uncessary local variables.
.Rewrite uc_version_show() to used defined variable and removed uncessary local variables.
.Removed unused MACRO define: #define CHANNEL_TO_BIT(chan) ((chan) & 0x07). .Rewrite powercycle_uc() to used defined variable and removed uncessary local variables.
.use GENMASK() and use FIELD_GET() instead of bit shift.
.Added define for constant 0x28 used in efuse_status_show(). .Added define for constant 0x0 used in uc_version_show(). .Added define for constant 0x0 used in powercycle_uc(). .Rearrange functions to avoid uncessary pre-define.
.Rewrite rpm_get() to used defined variable and removed uncessary local variables.
.Rewrite temp_get() to used defined variable and removed uncessary local variables.
.Use FIELD_GET instead of bit shift in temp_get().
.Used #define for constant variable 0/1.
Changes suggested by Christophe JAILLET <[email protected]>:
.use "if (!led->subled_info)" instead of
"if (IS_ERR_OR_NULL(led->subled_info))
"in silicom_mc_leds_register
changes from patch v3 to v4
===========================
changes suggested by Guenter Roeck <[email protected]>
Changes suggested by Ilpo Järvinen <[email protected]>:
.Rewrite silicom_mec_led/gpip_set/get() functions to use two newly created silicom_mec_port_get()/silicom_mec_port_set() which have common code. .Remove duplicate code in silicom_mec_port_get()
.Rewrite uc_version_show() to use Linux bit operation MACRO, and add logic to check un-supported register value.
.Added "#define MEC_EFUSE_LSB_ADDR 0x28" and "#define MEC_POWER_CYCLE_ADDR 0x24"
.Added "#define MEC_VERSION_MAJOR GENMASK(15, 14)" and "#define MEC_VERSION_MINOR GENMASK(13, 8)".
Changes suggested by Christophe JAILLET <[email protected]>:
.Used a local variable to store "sizeof(struct mc_subled)" in function silicom_mc_leds_register().
change from patch v4 to v5
===========================================
changes suggested by Guenter Roeck <[email protected]>:
.Corrected return value in temp_get() to return 1/10000th degree. .Removed local variable struct silicom_fan_control_data *ctl in silicom_fan_control_read_fan(),
removed storing rpm value to ctl variable.
.Removed local variable struct silicom_fan_control_data *ctl in silicom_fan_control_read_temp(),
.removed storing rpm value to ctl variable.
.Changed return string in silicom_fan_control_read_labels() to specific string for Silicom platform driver.
.Removed silicom_fan_control_data structure.
.Removed static variable mec_io_base and mec_io_len, and added "#define MEC_IO_BASE 0x0800 and #define MEC_IO_LEN 0x8". .Removed ".write = NULL" in silicom_fan_control_hwmon_ops structure defination.
.Removed unnecessary function silicom_fan_control_write(). .Removed unnecessary check for silicom_led_info in function silicom_platform_probe.
.Removed unnecessary local variable "silicom_fan_control_data *ctl" in silicom_platform_probe().
.Clean out driver initialization error handling in silicom_platform_init();
.Add patch version and changelog for patch submission.
Changes suggested by Ilpo Järvinen <[email protected]>:
.Rename "#define MEC_DATA(offset) to "#define MEC_DATA_OFFSET(offset). .Use constant defined in include/linux/units.h instead of a literal. .return directly instead of go to err condition when platform_device_register_simple() failed.
.Remove unnecessary check for silicom_led_info and silicom_gpiochip. .Use a local variable to how multiple use of array size. .Align the arguments to the same column in silicom_mec_led_mc_brightness_set.
.Add patch version and changelog that shows version to version changes for patch submission.
Changes suggested by Christophe JAILLET <[email protected]>:
.Use "sizeof(*led)" instead of "sizeof(struct led_classdev_mc)" .Use "if (!led)" instead of "if (IS_ERR_OR_NULL(led))" .Removed unnecessary error message:
"dev_err(dev, "Failed to alloc led_classdev_mc[%d]:
%ld\n", i, PTR_ERR(led)).
change from patch vv5 to v6
===========================================
changes suggested by Guenter Roeck <[email protected]>:
.Removed checkpath warnings.
.Resoved dependencies between CONFIG_HWMON and CONFIG_SILICOM_PLATFORM.
change from patch v6 to v7
===========================================
changes suggested by Hans de Goede <[email protected]>:
.Usa a proper subsystem prefix for this patch subject:
Subject: platform/x86: Add Silicom Platform Driver.
change from patch v7 to v8
===========================================
changes suggested by Hans de Goede <[email protected]>:
.Chnage commit message of this driver.
.Adjust location of change log and signed-off-by.
.Change "config SILICOM_PLATFORM" and help contents location, and put it to source "drivers/platform/x86/siemens/Kconfig". .Set editor tab to 8 and align the start of extra function parameters to directly after (. This should be applied for all function.
.Do not manually create a sysfs dir and register sysfs attribute, instead define a platform_driver structure.
.Move MODULE_DEVICE_TABLE(dmi, silicom_dmi_ids) directly after table declaration.
.Using pr_info() instead of dev_info() in function silicom_platform_info_init().
.Made dmi_check_system() check the first thing to do in silicom_platform_init().
.Instead of separate platform_device creation + driver registration, switched to using platform_create_bundle().
.Removed mutex_destroy(&mec_io_mutex).
Changes suggested by Ilpo Järvinen <[email protected]>:
.Too many GENMASK() within to code itself, need put them to #define. Removed all GENMASK() in c functions.
change from patch v8 to v9
===========================================
Changes suggested by Ilpo Järvinen <[email protected]>:
.Just do the same (like MEC_VERSION_MAJOR) with all places in the where you previously had GENMASK() in the code (currently MEC_GET_BITS() is there, obviously, but it should go away and be replaced with FIELD_GET(GOODPREFIX_GOODNAME, ...))).
.This is sysfs so it's odd to print pr_err() like that here. If the driver does not support those versions at all, the probe should fail. If driver is fine but just doesn't know how to interpret such a version, you should return -Esomething here. Driver returns -EINVAL here.
.Replace CENTI with 100
.Align FIELD_GET()s to the same column for line 661.
.Change variables efuse_status, mec_uc_version, power_cycle to unsigned int from int.
changes suggested by Hans de Goede <[email protected]>:
.Please add a Documentation/ABI/testing/sysfs-platform-silicom file to document driver specific the sysfs attributes of this driver. .Like with the Kconfig part, group this together with the other industrial PC drivers we have at the end of the Makefile after Siemens Simatic Industrial PCs.
change from patch v9 to v10 (current patch)
===========================================
Changes suggested by Ilpo Järvinen <[email protected]>:
.Added missing newline in kernel document file.
.Changed the order #define to make sure they are in increasing order. .Removed printing in init function silicom_platform_info_init(); .Changed #define name MEC_PREFIX_HIGH_BYTES to MEC_TEMPERATURE. .Removed dev_err(dev, "Failed to register[%d]: %d\n", i, err) in function silicom_mc_leds_register() before ruturn err. .Changed %du to %u in function power_cycle_store(...). .Chnaged sprintf() to sysfs_emit().
.Changed start point for multi-line comments.
.Added empty line to seperate #define.
.Remove parenthesis around MEC_IO_BASE.
.Changed #define EC_ADDR_MSB (MEC_IO_BASE + 0x3), use
a constant value instead of MEC_DATA_OFFSET_MASK.
.Changed define name MEC_PREFIX_NAME to MEC_PORT_LOC. .Changed define MEC_PREFIX_HIGH_BYTES to MEC_TEMP_LOC. .Removed "PREFIX" from define name, changed MEC_PREFIX_SEC_BYTE to MEC_VERSION_LOC.
.../ABI/testing/sysfs-platform-silicom | 266 +++++ drivers/platform/x86/Kconfig | 14 + drivers/platform/x86/Makefile | 3 + drivers/platform/x86/silicom-platform.c | 1006 +++++++++++++++++ 4 files changed, 1289 insertions(+) create mode 100644 Documentation/ABI/testing/sysfs-platform-silicom create mode 100644 drivers/platform/x86/silicom-platform.c
Documentation/ABI/testing/sysfs-platform-silicom new file +266 -0
@@ -0,0 +1,266 @@ +What: /sys/devices/platform/silicom-platform/uc_version +Date: October 2023 +KernelVersion: 6.6 +Contact: Henry Shi <[email protected]> +Description: + This file allows to read microcontroller firmware + version of current platform. + +What: /sys/devices/platform/silicom-platform/power_cycle +Date: October 2023 +KernelVersion: 6.6 +Contact: Henry Shi <[email protected]> + This file allow user to power cycle the platform. + default value is 0; when set to 1, it powers down + the platform, wait 5 seconds, then power on the + device. + +What: /sys/devices/platform/silicom-platform/efuse_status +Date: October 2023 +KernelVersion: 6.6 +Contact: Henry Shi <[email protected]> +Description: + This file is read only. It returns the current + OTP status: + + 0 - not programmed. + 1 - programmed. + +What: /sys/devices/platform/silicom-platform/hwmon/hwmon1/ + temp1_input +Date: October 2023 +KernelVersion: 6.6 +Contact: Henry Shi <[email protected]> +Description: + This file is read only. It returns the temperature + of device. + +What: /sys/devices/platform/silicom-platform/hwmon/hwmon1/ + temp1_label +Date: October 2023 +KernelVersion: 6.6 +Contact: Henry Shi <[email protected]> +Description: + This file is read only. It returns "Silicom_platform: + Thermostat Sensor". + +What: /sys/devices/platform/silicom-platform/hwmon/hwmon1/ + fan1_input +Date: October 2023 +KernelVersion: 6.6 +Contact: Henry Shi <[email protected]> +Description: + This file is read only. It returns current fan + speed (RPM). + +What: /sys/devices/platform/silicom-platform/hwmon/hwmon1/ + fan1_label +Date: October 2023 +KernelVersion: 6.6 +Contact: Henry Shi <[email protected]> +Description: + This file is read only. It returns "Silicom_platform: + Fan Speed". + +What: /sys/class/leds/multicolor:sys/brightness +Date: October 2023 +KernelVersion: 6.6 +Contact: Henry Shi <[email protected]> +Description: + This is a read/write file. It is used to read/set current + status of system LED brightness: + + 0 - to turn off the LED + 1 - to turn on the LED + +What: /sys/class/leds/multicolor:sys/multi_index +Date: October 2023 +KernelVersion: 6.6 +Contact: Henry Shi <[email protected]> +Description: + This is a read only file. It returns: + + white amber red + +What: /sys/class/leds/multicolor:sys/multi_intensity +Date: October 2023 +KernelVersion: 6.6 +Contact: Henry Shi <[email protected]> +Description: + This is a read/write file. It is used to read/set current + multi-color intensity of system LED: First value for + color white; Second value for color amber and third value + for color red: + + 0 - The color is turned off. + 1 - the color is turned on. + +What: /sys/class/leds/multicolor:wan/brightness +Date: October 2023 +KernelVersion: 6.6 +Contact: Henry Shi <[email protected]> +Description: + This is a read/write file. It is used to read/set current + status of WAN LED brightness: + + 0 - to turn off the LED + 1 - to turn on the LED + +What: /sys/class/leds/multicolor:wan/multi_index +Date: October 2023 +KernelVersion: 6.6 +Contact: Henry Shi <[email protected]> +Description: + This is a read only file. It returns: + + white yellow red + +What: /sys/class/leds/multicolor:wan/multi_intensity +Date: October 2023 +KernelVersion: 6.6 +Contact: Henry Shi <[email protected]> +Description: + This is a read/write file. It is used to read/set current + multi-color intensity of WAN LED: First value for + color white; Second value for color yellow and third value + for color red: + + 0 - The color is turned off. + 1 - the color is turned on. + +What: /sys/class/leds/multicolor:stat%d/brightness +Date: October 2023 +KernelVersion: 6.6 +Contact: Henry Shi <[email protected]> +Description: + This is a read/write file. It is used to read/set current + status of device status LED (number %d) brightness: + + 0 - to turn off the LED + 1 - to turn on the LED + +What: /sys/class/leds/multicolor:stat%d/multi_index +Date: October 2023 +KernelVersion: 6.6 +Contact: Henry Shi <[email protected]> +Description: + This is a read only file. It returns: + + red green blue yellow + +What: /sys/class/leds/multicolor:stat%d/multi_intensity +Date: October 2023 +KernelVersion: 6.6 +Contact: Henry Shi <[email protected]> +Description: + This is a read/write file. It is used to read/set current + multi-color intensity of device status LED (number %d): + First value for color red; Second value for color green; + Third value for color blue and fourth value for color + yellow. + + 0 - The color is turned off. + 1 - the color is turned on. + +What: /sys/class/leds/multicolor:fp_left/brightness +Date: October 2023 +KernelVersion: 6.6 +Contact: Henry Shi <[email protected]> +Description: + This is a read/write file. It is used to read/set current + status of left LED brightness: + + 0 - to turn off the LED + 1 - to turn on the LED + +What: /sys/class/leds/multicolor:fp_left/multi_index +Date: October 2023 +KernelVersion: 6.6 +Contact: Henry Shi <[email protected]> +Description: + This is a read only file. It returns: + + red green blue amber + +What: /sys/class/leds/multicolor:fp_left/multi_intensity +Date: October 2023 +KernelVersion: 6.6 +Contact: Henry Shi <[email protected]> +Description: + This is a read/write file. It is used to read/set current + multi-color intensity of left LED: First value for + color red; Second value for color green; Third value for + color blue and fourth value for color amber. + for color red: + + 0 - The color is turned off. + 1 - the color is turned on. + +What: /sys/class/leds/multicolor:fp_center/brightness +Date: October 2023 +KernelVersion: 6.6 +Contact: Henry Shi <[email protected]> +Description: + This is a read/write file. It is used to read/set current + status of left LED brightness: + + 0 - to turn off the LED + 1 - to turn on the LED + +What: /sys/class/leds/multicolor:fp_center/multi_index +Date: October 2023 +KernelVersion: 6.6 +Contact: Henry Shi <[email protected]> +Description: + This is a read only file. It returns: + + red green blue amber + +What: /sys/class/leds/multicolor:fp_center/multi_intensity +Date: October 2023 +KernelVersion: 6.6 +Contact: Henry Shi <[email protected]> +Description: + This is a read/write file. It is used to read/set current + multi-color intensity of left LED: First value for + color red; Second value for color green; Third value for + color blue and fourth value for color amber. + for color red: + + 0 - The color is turned off. + 1 - the color is turned on. + +What: /sys/class/leds/multicolor:fp_right/brightness +Date: October 2023 +KernelVersion: 6.6 +Contact: Henry Shi <[email protected]> +Description: + This is a read/write file. It is used to read/set current + status of left LED brightness: + + 0 - to turn off the LED + 1 - to turn on the LED + +What: /sys/class/leds/multicolor:fp_right/multi_index +Date: October 2023 +KernelVersion: 6.6 +Contact: Henry Shi <[email protected]> +Description: + This is a read only file. It returns: + + red green blue amber + +What: /sys/class/leds/multicolor:fp_right/multi_intensity +Date: October 2023 +KernelVersion: 6.6 +Contact: Henry Shi <[email protected]> +Description: + This is a read/write file. It is used to read/set current + multi-color intensity of left LED: First value for + color red; Second value for color green; Third value for + color blue and fourth value for color amber. + for color red: + + 0 - The color is turned off. + 1 - the color is turned on. +
drivers/platform/x86/Kconfig +14 -0
@@ -1076,6 +1076,20 @@ config INTEL_SCU_IPC_UTIL source "drivers/platform/x86/siemens/Kconfig" +config SILICOM_PLATFORM + tristate "Silicom Edge Networking device support" + depends on HWMON + select LEDS_CLASS_MULTICOLOR + help + This option enables support for the LEDs/GPIO/etc downstream of the + embedded controller on Silicom "Cordoba" hardware and derivatives. + + This platform driver provides support for various functions via + the Linux LED framework, GPIO framework, Hardware Monitoring (HWMON) + and device attributes. + + If you have a Silicom network appliance, say Y or M here. + config WINMATE_FM07_KEYS tristate "Winmate FM07/FM07P front-panel keys driver" depends on INPUT
drivers/platform/x86/Makefile +3 -0
@@ -133,6 +133,9 @@ obj-$(CONFIG_X86_INTEL_LPSS) += pmc_atom.o # Siemens Simatic Industrial PCs obj-$(CONFIG_SIEMENS_SIMATIC_IPC) += siemens/ +# Silicom +obj-$(CONFIG_SILICOM_PLATFORM) += silicom-platform.o + # Winmate obj-$(CONFIG_WINMATE_FM07_KEYS) += winmate-fm07-keys.o
drivers/platform/x86/silicom-platform.c new file +1006 -0
1,006 lines not on this page · raw message
Signature · 1 line
2.21.3
Ilpo Järvinen
maintainerQuoted 240 lines · Henry Shi
platform/x86: Add Silicom Platform Driver
Add Silicom platform (silicom-platform) Linux driver for Swisscom Business Box (Swisscom BB) as well as Cordoba family products.
This platform driver provides support for various functions via the Linux LED framework, GPIO framework, Hardware Monitoring (HWMON) and device attributes.
Signed-off-by Henry Shi <[email protected]>---
Changes from v1 to v2:
===========================Suggested by Hans de Goede <[email protected]>
.Use git send-email to submit patch.
.patch contents should be in message body.
.Kconfig bit for the driver should be indrivers/platform/x86/Kconfig.changes from patch v2 to v3
===========================changes suggested by Guenter Roeck <[email protected]> .Removed unnecessary include file
linux/thermal.h. .RemovedEXPORT_SYMBOLfor mutex lock/unlock function.Changes suggested by Ilpo Järvinen <[email protected]> .Remove extra new line in code on multiple position.
.Use table instead of space in code.
.Uss Linux defined bit operation MACRO define.
.Removed local variable inrpm_get().
.Corrected typo in comments.
.Corrected incorrect indentation.
.Removed unnecessary comments insilicom_mc_leds_register(). .Rewriteefuse_status_show()to used defined variable and removed uncessary local variables.
.Rewriteuc_version_show()to used defined variable and removed uncessary local variables.
.Removed unused MACRO define: #defineCHANNEL_TO_BIT(chan)((chan) &0x07). .Rewritepowercycle_uc()to used defined variable and removed uncessary local variables.
.useGENMASK()and useFIELD_GET()instead of bit shift.
.Added define for constant0x28used inefuse_status_show(). .Added define for constant0x0used inuc_version_show(). .Added define for constant0x0used inpowercycle_uc(). .Rearrange functions to avoid uncessary pre-define.
.Rewriterpm_get()to used defined variable and removed uncessary local variables.
.Rewritetemp_get()to used defined variable and removed uncessary local variables.
.UseFIELD_GETinstead of bit shift intemp_get().
.Used #define for constant variable 0/1.Changes suggested by Christophe JAILLET <[email protected]>:
.use "if (!led->subled_info)" instead of
"if (IS_ERR_OR_NULL(led->subled_info))
"insilicom_mc_leds_registerchanges from patch v3 to v4
===========================changes suggested by Guenter Roeck <[email protected]>
Changes suggested by Ilpo Järvinen <[email protected]>:
.Rewrite silicom_mec_led/gpip_set/get() functions to use two newly created silicom_mec_port_get()/silicom_mec_port_set() which have common code. .Remove duplicate code insilicom_mec_port_get()
.Rewriteuc_version_show()to use Linux bit operation MACRO, and add logic to check un-supported register value.
.Added "#defineMEC_EFUSE_LSB_ADDR0x28" and "#defineMEC_POWER_CYCLE_ADDR0x24"
.Added "#defineMEC_VERSION_MAJORGENMASK(15, 14)" and "#defineMEC_VERSION_MINORGENMASK(13, 8)".Changes suggested by Christophe JAILLET <[email protected]>:
.Used a local variable to store "sizeof(struct mc_subled)" in functionsilicom_mc_leds_register().change from patch v4 to v5
===========================================changes suggested by Guenter Roeck <[email protected]>:
.Corrected return value intemp_get()to return 1/10000th degree. .Removed local variable structsilicom_fan_control_data*ctl insilicom_fan_control_read_fan(),
removed storing rpm value to ctl variable.
.Removed local variable structsilicom_fan_control_data*ctl insilicom_fan_control_read_temp(),
.removed storing rpm value to ctl variable.
.Changed return string insilicom_fan_control_read_labels()to specific string for Silicom platform driver.
.Removedsilicom_fan_control_datastructure.
.Removed static variablemec_io_baseandmec_io_len, and added "#defineMEC_IO_BASE0x0800and #defineMEC_IO_LEN0x8". .Removed ".write = NULL" insilicom_fan_control_hwmon_opsstructure defination.
.Removed unnecessary functionsilicom_fan_control_write(). .Removed unnecessary check forsilicom_led_infoin functionsilicom_platform_probe.
.Removed unnecessary local variable "silicom_fan_control_data*ctl" insilicom_platform_probe().
.Clean out driver initialization error handling insilicom_platform_init();
.Add patch version and changelog for patch submission.Changes suggested by Ilpo Järvinen <[email protected]>:
.Rename "#defineMEC_DATA(offset)to "#defineMEC_DATA_OFFSET(offset). .Use constant defined ininclude/linux/units.hinstead of a literal. .return directly instead of go to err condition whenplatform_device_register_simple()failed.
.Remove unnecessary check forsilicom_led_infoandsilicom_gpiochip. .Use a local variable to how multiple use of array size. .Align the arguments to the same column insilicom_mec_led_mc_brightness_set.
.Add patch version and changelog that shows version to version changes for patch submission.Changes suggested by Christophe JAILLET <[email protected]>:
.Use "sizeof(*led)" instead of "sizeof(struct led_classdev_mc)" .Use "if (!led)" instead of "if (IS_ERR_OR_NULL(led))" .Removed unnecessary error message:
"dev_err(dev, "Failed to alloc led_classdev_mc[%d]:
%ld\n", i,PTR_ERR(led)).change from patch vv5 to v6
===========================================changes suggested by Guenter Roeck <[email protected]>:
.Removed checkpath warnings.
.Resoved dependencies betweenCONFIG_HWMONandCONFIG_SILICOM_PLATFORM.change from patch v6 to v7
===========================================changes suggested by Hans de Goede <[email protected]>:
.Usa a proper subsystem prefix for this patch subject:
Subject: platform/x86: Add Silicom Platform Driver.change from patch v7 to v8
===========================================changes suggested by Hans de Goede <[email protected]>:
.Chnage commit message of this driver.
.Adjust location of change log and signed-off-by.
.Change "configSILICOM_PLATFORM" and help contents location, and put it to source "drivers/platform/x86/siemens/Kconfig". .Set editor tab to 8 and align the start of extra function parameters to directly after (. This should be applied for all function.
.Do not manually create a sysfs dir and register sysfs attribute, instead define aplatform_driverstructure.
.MoveMODULE_DEVICE_TABLE(dmi, silicom_dmi_ids)directly after table declaration.
.Usingpr_info()instead ofdev_info()in functionsilicom_platform_info_init().
.Madedmi_check_system()check the first thing to do insilicom_platform_init().
.Instead of separateplatform_devicecreation + driver registration, switched to usingplatform_create_bundle().
.Removedmutex_destroy(&mec_io_mutex).Changes suggested by Ilpo Järvinen <[email protected]>:
.Too manyGENMASK()within to code itself, need put them to #define. Removed allGENMASK()in c functions.change from patch v8 to v9
===========================================Changes suggested by Ilpo Järvinen <[email protected]>:
.Just do the same (likeMEC_VERSION_MAJOR) with all places in the where you previously hadGENMASK()in the code (currentlyMEC_GET_BITS()is there, obviously, but it should go away and be replaced withFIELD_GET(GOODPREFIX_GOODNAME, ...))).
.This is sysfs so it's odd to printpr_err()like that here. If the driver does not support those versions at all, the probe should fail. If driver is fine but just doesn't know how to interpret such a version, you should return -Esomething here. Driver returns-EINVALhere.
.Replace CENTI with 100
.Align FIELD_GET()s to the same column for line 661.
.Change variablesefuse_status,mec_uc_version,power_cycleto unsigned int from int.changes suggested by Hans de Goede <[email protected]>:
.Please add aDocumentation/ABI/testing/sysfs-platform-silicomfile to document driver specific the sysfs attributes of this driver. .Like with theKconfigpart, group this together with the other industrial PC drivers we have at the end of theMakefileafter Siemens Simatic Industrial PCs.change from patch v9 to v10 (current patch)
===========================================Changes suggested by Ilpo Järvinen <[email protected]>:
.Added missing newline in kernel document file.
.Changed the order #define to make sure they are in increasing order. .Removed printing in init functionsilicom_platform_info_init(); .Changed #define nameMEC_PREFIX_HIGH_BYTEStoMEC_TEMPERATURE. .Removeddev_err(dev, "Failed to register[%d]: %d\n", i, err)in functionsilicom_mc_leds_register()before ruturn err. .Changed %du to %u in functionpower_cycle_store(...). .Chnagedsprintf()tosysfs_emit().
.Changed start point for multi-line comments.
.Added empty line to seperate #define.
.Remove parenthesis aroundMEC_IO_BASE.
.Changed #defineEC_ADDR_MSB(MEC_IO_BASE+0x3), use
a constant value instead ofMEC_DATA_OFFSET_MASK.
.Changed define nameMEC_PREFIX_NAMEtoMEC_PORT_LOC. .Changed defineMEC_PREFIX_HIGH_BYTEStoMEC_TEMP_LOC. .Removed "PREFIX" from define name, changedMEC_PREFIX_SEC_BYTEtoMEC_VERSION_LOC..../ABI/testing/sysfs-platform-silicom | 266 +++++ drivers/platform/x86/Kconfig | 14 + drivers/platform/x86/Makefile | 3 + drivers/platform/x86/silicom-platform.c | 1006 +++++++++++++++++ 4 files changed, 1289 insertions(+) create mode 100644 Documentation/ABI/testing/sysfs-platform-silicom create mode 100644 drivers/platform/x86/silicom-platform.cdrivers/platform/x86/silicom-platform.c new file +12
-0@@ -0,0 +1,1006 @@ +// 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>
drivers/platform/x86/silicom-platform.c line 22
Quoted 10 lines
drivers/platform/x86/silicom-platform.c new file +10
-0+#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> +#include <linux/units.h>
The includes should be in alphabethical order.
drivers/platform/x86/silicom-platform.c line 28
Quoted 5 lines
drivers/platform/x86/silicom-platform.c new file +5
-0+#define MEC_POWER_CYCLE_ADDR 0x24 +#define MEC_EFUSE_LSB_ADDR 0x28 +#define MEC_PORT_OFFSET_MASK 0xfc +#define MEC_PORT_CHANNEL_MASK 0x7 +#define MEC_DATA_OFFSET_MASK 0x03
These 3 should use GENMASK() too.
Quoted 26 lines
drivers/platform/x86/silicom-platform.c new file +25
-0+#define MEC_GPIO_IN_POS 0x08 +#define MEC_IO_BASE 0x0800 +#define MEC_IO_LEN 0x8 +#define MEC_ADDR ((MEC_IO_BASE) + 0x02) +#define MEC_DATA_OFFSET (offset) ((MEC_IO_BASE) + 0x04 + (offset)) +#define EC_ADDR_LSB MEC_ADDR +#define EC_ADDR_MSB (MEC_IO_BASE + 0x3) +#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 MEC_VERSION_MAJOR GENMASK(15, 14) +#define MEC_VERSION_MINOR GENMASK(13, 8) +#define MEC_PORT_LOC GENMASK(31, 3) +#define MEC_TEMP_LOC GENMASK(31, 16) +#define MEC_VERSION_LOC GENMASK(15, 8) +#define IO_REG_BANK 0x0 +#define DEFAULT_CHAN_LO 0 +#define DEFAULT_CHAN_HI 0 +#define DEFAULT_CHAN_LO_T 0xc + +static DEFINE_MUTEX (mec_io_mutex); +static unsigned int efuse_status; +static unsigned int mec_uc_version; +static unsigned int power_cycle;
drivers/platform/x86/silicom-platform.c
Quoted 10 lines
drivers/platform/x86/silicom-platform.c new file +10
-0+static int silicom_mec_port_get (unsigned int offset) +{ +u8 reg; + +mutex_lock (&mec_io_mutex); +/* Get the dword offset from the channel */ +outb (FIELD_GET (MEC_PORT_LOC , offset) &MEC_PORT_OFFSET_MASK ,MEC_ADDR ); + +/* Get the current register */ + reg =inb (MEC_DATA_OFFSET (FIELD_GET (MEC_PORT_LOC , offset) &MEC_DATA_OFFSET_MASK ));
This now become much more readable and easier to follow what's going on, thanks. I'm still in favor of adding more local variables from the construct that are now on inb/outb() lines as it would make the code less heavy to read.
I now notice that extracting MEC_PORT_LOC as an intermediate step doesn't seem necessary at all. Arguably, it avoids left shift in the case with MEC_PORT_OFFSET_MASK but I still think even that would be cleaner if do just this:
FIELD_GET(MEC_PORT_OFFSET_MASK, offset) << 2
(or * sizeof(u32)). Or you could rename the define to MEC_PORT_DWORD_OFFSET which will self-documents the need for << 2. Note you need to adjust the defines a little to get the fields directly from offset instead of from MEC_PORT_LOC.
Also, now that I finally can follow the logic behind these defines, order their defintions logically since you have centain hierarcies and some of them are "siblings". MEC_PORT_OFFSET_MASK and MEC_DATA_OFFSET_MASK are parts of MEC_PORT_LOC. MEC_PORT_LOC and MEC_PORT_CHANNEL_MASK are parts of what you call "offset".
So put them in order like this:
#define MEC_PORT_CHANNEL_MASK GENMASK(2, 0)
#define MEC_PORT_LOC GENMASK(31, 3)
#define MEC_DATA_OFFSET_MASK GENMASK(1, 0)
#define MEC_PORT_OFFSET_MASK GENMASK(7, 2)
I seem to have forgotten to mention that the defines should be (mostly) aligned to start from the same column. "Mostly" because if you have different groups of defines, they don't need to share the indentation level (usually you want to add an empty line in between such logical blocks).
That is, there's no need to go overboard with it, just put the logically similar ones together, in oder and align their values to the same column.
Quoted 18 lines
drivers/platform/x86/silicom-platform.c new file +18
-0+mutex_unlock (&mec_io_mutex); + +return (reg >> (offset &MEC_PORT_CHANNEL_MASK )) &0x01 ; +} + +static enum led_brightness silicom_mec_led_get (int channel) +{ +/* Outputs are active low */ +return silicom_mec_port_get (channel) ?LED_OFF :LED_ON ; +} + +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 (FIELD_GET (MEC_PORT_LOC , channel) &MEC_PORT_OFFSET_MASK ,MEC_ADDR );
drivers/platform/x86/silicom-platform.c line 186
Quoted 10 lines
drivers/platform/x86/silicom-platform.c new file +10
-0+ +/* Get the current port settings */ + reg =inb (MEC_DATA_OFFSET (FIELD_GET (MEC_PORT_LOC , channel) &MEC_DATA_OFFSET_MASK )); +/* Outputs are active low, so clear the bit for on, or set it for off */ +if (on) + reg &= ~(1 << (channel &MEC_PORT_CHANNEL_MASK )); +else + reg |=1 << (channel &MEC_PORT_CHANNEL_MASK ); +/* Write back the updated register */ +outb (reg,MEC_DATA_OFFSET (FIELD_GET (MEC_PORT_LOC , channel) &MEC_DATA_OFFSET_MASK ));
Just make the calculation once and store into a local variable. It will make the code easier to read too.
drivers/platform/x86/silicom-platform.c line 699
Quoted 13 lines
drivers/platform/x86/silicom-platform.c new file +11
-0+mutex_unlock (&mec_io_mutex); +} +static ssize_t power_cycle_store (struct device *dev, +struct device_attribute *attr, +const char *buf,size_t count) +{ +int rc; + + rc =kstrtou32 (buf,0 , &power_cycle); +if (rc) { +dev_err (dev,"Failed to read power_cycle\n" );
I said about this already in the prev version... Please don't print anything when userspace gives an invalid value, just return -EINVAL.
drivers/platform/x86/silicom-platform.c line 707
Quoted 8 lines
drivers/platform/x86/silicom-platform.c new file +8
-0+return -EINVAL ; + } +if (power_cycle >0 ) +powercycle_uc (); + +return count; +} +static DEVICE_ATTR_RW (power_cycle);
--
i.
kernel test robot
build botkernel test robot noticed the following build warnings:
Hi Henry,
kernel test robot noticed the following build warnings:
[auto build test WARNING on tip/master]
[also build test WARNING on linus/master tip/auto-latest v6.6 next-20231103] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Henry-Shi/platform-x86-Add-Silicom-Platform-Driver/20231028-043932 base: tip/master patch link: https://lore.kernel.org/r/20231027203836.25936-1-henryshi2018%40gmail.com patch subject: [PATCH v10] platform/x86: Add Silicom Platform Driver reproduce: (https://download.01.org/0day-ci/archive/20231104/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All warnings (new ones prefixed by >>):
>> Warning: file ./Documentation/ABI/testing/sysfs-platform-silicom#18: >> Warning: /sys/devices/platform/silicom-platform/hwmon/hwmon1/ is defined 4 times: ./Documentation/ABI/testing/sysfs-platform-silicom:28 ./Documentation/ABI/testing/sysfs-platform-silicom:37 ./Documentation/ABI/testing/sysfs-platform-silicom:46 ./Documentation/ABI/testing/sysfs-platform-silicom:55
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki