platform/x86: mlx-platform: Extend to support new systems and additional user interfaces
Subsystems (2)
Vadim Pasternak
maintainercover platform/x86: mlx-platform: Extend to support new systems and additional user interfaces
The patch set adds:
- Support for new systems:
- COMe NVSwitch management module for Vulcan chassis containing Nvidia's Hopper dGPU (GH100), NVswitch (LS10) based HGX baseboard.
- XH3000 system, which is a water-cooling Ethernet switch blade equipped with 32x200G Ethernet ports.
- Support for systems equipped with two ASICc.
- Logic for selective activation of some drivers.
- Documentation fixes and introduction of new attributes.
- Locking protection for IO operations over register space.
The patch set contains:
Patch #1 - extends logic for selective activation of some drivers,
depending on system type.
Patch #2 - contains cosmetic changes.
Patch #3 - adds support for systems with two ASICs. Patches #4-#5 - introduce new systems.
Patch #6 - adds new feature for system minor revision changes. Patch #7 - adds locking for IO operations.
Patches #8-#9 - documentation changes.
Vadim Pasternak (9):
platform/x86: mlx-platform: Make activation of some drivers
conditional
platform/x86: mlx-platform: Add cosmetic changes for alignment platform/x86: mlx-platform: Add support for systems equipped with two
ASICs
platform/x86: mlx-platform: Introduce support for COMe NVSwitch
management module for Vulcan chassis
platform/x86: mlx-platform: Add support for new system XH3000 platform/x86: mlx-platform: Add COME board revision register platform/mellanox: mlxreg-io: Add locking for io operations Documentation/ABI: mlxreg-io: Fix contact info Documentation/ABI: Add new attributes for mlxreg-io sysfs interfaces
.../ABI/stable/sysfs-driver-mlxreg-io | 81 ++- drivers/platform/mellanox/mlxreg-io.c | 23 + drivers/platform/x86/mlx-platform.c | 491 ++++++++++++++++-- 3 files changed, 526 insertions(+), 69 deletions(-)
Signature · 1 line
2.20.1
Vadim Pasternak
maintainerPATCH 1/9 platform/x86: mlx-platform: Make activation of some drivers conditional
Current assumption in driver that any system is capable of LED, hotplug or watchdog support. It could be not true for some new coming systems.
Add validation for LED, hotplug, watchdog configuration and skip activation of relevant drivers if not configured.
--- drivers/platform/x86/mlx-platform.c | 62 ++++++++++++++++------------- 1 file changed, 35 insertions(+), 27 deletions(-)
drivers/platform/x86/mlx-platform.c +35 -27
@@ -4853,16 +4853,18 @@ static int __init mlxplat_init(void) }/* Add hotplug driver */ - mlxplat_hotplug->regmap = priv->regmap; - priv->pdev_hotplug =platform_device_register_resndata ( - &mlxplat_dev->dev,"mlxreg-hotplug" , -PLATFORM_DEVID_NONE , - mlxplat_mlxcpld_resources, -ARRAY_SIZE (mlxplat_mlxcpld_resources), - mlxplat_hotplug,sizeof (*mlxplat_hotplug)); -if (IS_ERR (priv->pdev_hotplug)) { - err =PTR_ERR (priv->pdev_hotplug); - goto fail_platform_mux_register; +if (mlxplat_hotplug) { + mlxplat_hotplug->regmap = priv->regmap; + priv->pdev_hotplug = +platform_device_register_resndata (&mlxplat_dev->dev, +"mlxreg-hotplug" ,PLATFORM_DEVID_NONE , + mlxplat_mlxcpld_resources, +ARRAY_SIZE (mlxplat_mlxcpld_resources), + mlxplat_hotplug,sizeof (*mlxplat_hotplug)); +if (IS_ERR (priv->pdev_hotplug)) { + err =PTR_ERR (priv->pdev_hotplug); + goto fail_platform_mux_register; + } }/* Set default registers. */
@@ -4875,24 +4877,26 @@ static int __init mlxplat_init(void) }/* Add LED driver. */ - mlxplat_led->regmap = priv->regmap; - priv->pdev_led =platform_device_register_resndata ( - &mlxplat_dev->dev,"leds-mlxreg" , -PLATFORM_DEVID_NONE ,NULL ,0 , - mlxplat_led,sizeof (*mlxplat_led)); -if (IS_ERR (priv->pdev_led)) { - err =PTR_ERR (priv->pdev_led); - goto fail_platform_hotplug_register; +if (mlxplat_led) { + mlxplat_led->regmap = priv->regmap; + priv->pdev_led = +platform_device_register_resndata (&mlxplat_dev->dev,"leds-mlxreg" , +PLATFORM_DEVID_NONE ,NULL ,0 , mlxplat_led, +sizeof (*mlxplat_led)); +if (IS_ERR (priv->pdev_led)) { + err =PTR_ERR (priv->pdev_led); + goto fail_platform_hotplug_register; + } }/* Add registers io access driver. */ if (mlxplat_regs_io) { mlxplat_regs_io->regmap = priv->regmap; - priv->pdev_io_regs =platform_device_register_resndata ( - &mlxplat_dev->dev,"mlxreg-io" , -PLATFORM_DEVID_NONE ,NULL ,0 , - mlxplat_regs_io, -sizeof (*mlxplat_regs_io)); + priv->pdev_io_regs =platform_device_register_resndata (&mlxplat_dev->dev, +"mlxreg-io" , +PLATFORM_DEVID_NONE ,NULL , +0 , mlxplat_regs_io, +sizeof (*mlxplat_regs_io));if (IS_ERR (priv->pdev_io_regs)) { err =PTR_ERR (priv->pdev_io_regs); goto fail_platform_led_register;
@@ -4949,9 +4953,11 @@ static int __init mlxplat_init(void)if (mlxplat_regs_io)platform_device_unregister (priv->pdev_io_regs); fail_platform_led_register: -platform_device_unregister (priv->pdev_led); +if (mlxplat_led) +platform_device_unregister (priv->pdev_led); fail_platform_hotplug_register: -platform_device_unregister (priv->pdev_hotplug); +if (mlxplat_hotplug) +platform_device_unregister (priv->pdev_hotplug); fail_platform_mux_register:while (--i >=0 )platform_device_unregister (priv->pdev_mux[i]);
@@ -4974,8 +4980,10 @@ static void __exit mlxplat_exit(void)platform_device_unregister (priv->pdev_fan);if (priv->pdev_io_regs)platform_device_unregister (priv->pdev_io_regs); -platform_device_unregister (priv->pdev_led); -platform_device_unregister (priv->pdev_hotplug); +if (priv->pdev_led) +platform_device_unregister (priv->pdev_led); +if (priv->pdev_hotplug) +platform_device_unregister (priv->pdev_hotplug);for (i = mlxplat_mux_num -1 ; i >=0 ; i--)platform_device_unregister (priv->pdev_mux[i]);
Signature · 1 line
2.20.1
Vadim Pasternak
maintainerPATCH 2/9 platform/x86: mlx-platform: Add cosmetic changes for alignment
In reply to Vadim PasternakAlign the first argument with open parenthesis for platform_device_register_resndata() calls.
--- drivers/platform/x86/mlx-platform.c | 36 +++++++++++++---------------- 1 file changed, 16 insertions(+), 20 deletions(-)
drivers/platform/x86/mlx-platform.c +16 -20
@@ -4830,22 +4830,20 @@ static int __init mlxplat_init(void) nr = (nr == mlxplat_max_adap_num) ?-1 : nr;if (mlxplat_i2c) mlxplat_i2c->regmap = priv->regmap; - priv->pdev_i2c =platform_device_register_resndata ( - &mlxplat_dev->dev,"i2c_mlxcpld" , - nr, mlxplat_mlxcpld_resources, -ARRAY_SIZE (mlxplat_mlxcpld_resources), - mlxplat_i2c,sizeof (*mlxplat_i2c)); + priv->pdev_i2c =platform_device_register_resndata (&mlxplat_dev->dev,"i2c_mlxcpld" , + nr, mlxplat_mlxcpld_resources, +ARRAY_SIZE (mlxplat_mlxcpld_resources), + mlxplat_i2c,sizeof (*mlxplat_i2c));if (IS_ERR (priv->pdev_i2c)) { err =PTR_ERR (priv->pdev_i2c); goto fail_alloc; }for (i =0 ; i < mlxplat_mux_num; i++) { - priv->pdev_mux[i] =platform_device_register_resndata ( - &priv->pdev_i2c->dev, -"i2c-mux-reg" , i,NULL , -0 , &mlxplat_mux_data[i], -sizeof (mlxplat_mux_data[i])); + priv->pdev_mux[i] =platform_device_register_resndata (&priv->pdev_i2c->dev, +"i2c-mux-reg" , i,NULL ,0 , + &mlxplat_mux_data[i], +sizeof (mlxplat_mux_data[i]));if (IS_ERR (priv->pdev_mux[i])) { err =PTR_ERR (priv->pdev_mux[i]); goto fail_platform_mux_register;
@@ -4906,11 +4904,10 @@ static int __init mlxplat_init(void)/* Add FAN driver. */ if (mlxplat_fan) { mlxplat_fan->regmap = priv->regmap; - priv->pdev_fan =platform_device_register_resndata ( - &mlxplat_dev->dev,"mlxreg-fan" , -PLATFORM_DEVID_NONE ,NULL ,0 , - mlxplat_fan, -sizeof (*mlxplat_fan)); + priv->pdev_fan =platform_device_register_resndata (&mlxplat_dev->dev,"mlxreg-fan" , +PLATFORM_DEVID_NONE ,NULL ,0 , + mlxplat_fan, +sizeof (*mlxplat_fan));if (IS_ERR (priv->pdev_fan)) { err =PTR_ERR (priv->pdev_fan); goto fail_platform_io_regs_register;
@@ -4924,11 +4921,10 @@ static int __init mlxplat_init(void)for (j =0 ; j <MLXPLAT_CPLD_WD_MAX_DEVS ; j++) {if (mlxplat_wd_data[j]) { mlxplat_wd_data[j]->regmap = priv->regmap; - priv->pdev_wd[j] =platform_device_register_resndata ( - &mlxplat_dev->dev,"mlx-wdt" , - j,NULL ,0 , - mlxplat_wd_data[j], -sizeof (*mlxplat_wd_data[j])); + priv->pdev_wd[j] = +platform_device_register_resndata (&mlxplat_dev->dev,"mlx-wdt" , j, +NULL ,0 , mlxplat_wd_data[j], +sizeof (*mlxplat_wd_data[j]));if (IS_ERR (priv->pdev_wd[j])) { err =PTR_ERR (priv->pdev_wd[j]); goto fail_platform_wd_register;
Signature · 1 line
2.20.1
Vadim Pasternak
maintainerPATCH 3/9 platform/x86: mlx-platform: Add support for systems equipped with two ASICs
In reply to Vadim PasternakMotivation is to support new systems equipped with two ASICs.
Extend driver with:
- The second ASIC health event.
- Per ASIC reset control, triggering reset of ASIC internal resources and restarting ASIC initialization flow.
--- drivers/platform/x86/mlx-platform.c | 52 ++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-)
drivers/platform/x86/mlx-platform.c +51 -1
@@ -34,6 +34,7 @@#define MLXPLAT_CPLD_LPC_REG_CPLD3_PN1_OFFSET 0x09#define MLXPLAT_CPLD_LPC_REG_CPLD4_PN_OFFSET 0x0a#define MLXPLAT_CPLD_LPC_REG_CPLD4_PN1_OFFSET 0x0b +#define MLXPLAT_CPLD_LPC_REG_RESET_GP2_OFFSET 0x19#define MLXPLAT_CPLD_LPC_REG_RESET_GP4_OFFSET 0x1c#define MLXPLAT_CPLD_LPC_REG_RESET_CAUSE_OFFSET 0x1d#define MLXPLAT_CPLD_LPC_REG_RST_CAUSE1_OFFSET 0x1e
@@ -69,6 +70,9 @@#define MLXPLAT_CPLD_LPC_REG_ASIC_HEALTH_OFFSET 0x50#define MLXPLAT_CPLD_LPC_REG_ASIC_EVENT_OFFSET 0x51#define MLXPLAT_CPLD_LPC_REG_ASIC_MASK_OFFSET 0x52 +#define MLXPLAT_CPLD_LPC_REG_ASIC2_HEALTH_OFFSET 0x53 +#define MLXPLAT_CPLD_LPC_REG_ASIC2_EVENT_OFFSET 0x54 +#define MLXPLAT_CPLD_LPC_REG_ASIC2_MASK_OFFSET 0x55#define MLXPLAT_CPLD_LPC_REG_AGGRLC_OFFSET 0x56#define MLXPLAT_CPLD_LPC_REG_AGGRLC_MASK_OFFSET 0x57#define MLXPLAT_CPLD_LPC_REG_PSU_OFFSET 0x58
@@ -193,6 +197,7 @@ MLXPLAT_CPLD_AGGR_MASK_LC_ACT | \ MLXPLAT_CPLD_AGGR_MASK_LC_SDWN)#define MLXPLAT_CPLD_LOW_AGGR_MASK_LOW 0xc1 +#define MLXPLAT_CPLD_LOW_AGGR_MASK_ASIC2 BIT(2)#define MLXPLAT_CPLD_LOW_AGGR_MASK_I2C BIT(6)#define MLXPLAT_CPLD_PSU_MASK GENMASK(1, 0)#define MLXPLAT_CPLD_PWR_MASK GENMASK(1, 0)
@@ -588,6 +593,15 @@ static struct mlxreg_core_data mlxplat_mlxcpld_default_asic_items_data[] = { }, }; +static struct mlxreg_core_data mlxplat_mlxcpld_default_asic2_items_data[] = { + { + .label ="asic2" , + .reg =MLXPLAT_CPLD_LPC_REG_ASIC2_HEALTH_OFFSET , + .mask =MLXPLAT_CPLD_ASIC_MASK , + .hpdev.nr =MLXPLAT_CPLD_NR_NONE , + }, +}; +static struct mlxreg_core_item mlxplat_mlxcpld_default_items[] = { { .data = mlxplat_mlxcpld_default_psu_items_data,
@@ -1151,6 +1165,15 @@ static struct mlxreg_core_item mlxplat_mlxcpld_ext_items[] = { .inversed = 0, .health = true, }, + { + .data = mlxplat_mlxcpld_default_asic2_items_data, + .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, + .reg = MLXPLAT_CPLD_LPC_REG_ASIC2_HEALTH_OFFSET, + .mask = MLXPLAT_CPLD_ASIC_MASK, + .count = ARRAY_SIZE(mlxplat_mlxcpld_default_asic2_items_data), + .inversed = 0, + .health = true, + } }; static
@@ -1160,7 +1183,7 @@ struct mlxreg_core_hotplug_platform_data mlxplat_mlxcpld_ext_data = { .cell = MLXPLAT_CPLD_LPC_REG_AGGR_OFFSET, .mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF | MLXPLAT_CPLD_AGGR_MASK_COMEX, .cell_low = MLXPLAT_CPLD_LPC_REG_AGGRLO_OFFSET, - .mask_low = MLXPLAT_CPLD_LOW_AGGR_MASK_LOW, + .mask_low = MLXPLAT_CPLD_LOW_AGGR_MASK_LOW | MLXPLAT_CPLD_LOW_AGGR_MASK_ASIC2, };static struct mlxreg_core_data mlxplat_mlxcpld_modular_pwr_items_data[] = {
@@ -2856,6 +2879,18 @@ static struct mlxreg_core_data mlxplat_mlxcpld_default_ng_regs_io_data[] = { .bit = GENMASK(7, 0), .mode = 0444, }, + { + .label = "asic_reset", + .reg = MLXPLAT_CPLD_LPC_REG_RESET_GP2_OFFSET, + .mask = GENMASK(7, 0) & ~BIT(3), + .mode = 0200, + }, + { + .label = "asic2_reset", + .reg = MLXPLAT_CPLD_LPC_REG_RESET_GP2_OFFSET, + .mask = GENMASK(7, 0) & ~BIT(2), + .mode = 0200, + }, { .label = "reset_long_pb", .reg = MLXPLAT_CPLD_LPC_REG_RESET_CAUSE_OFFSET,
@@ -2995,6 +3030,13 @@ static struct mlxreg_core_data mlxplat_mlxcpld_default_ng_regs_io_data[] = { .bit = 1, .mode = 0444, }, + { + .label = "asic2_health", + .reg = MLXPLAT_CPLD_LPC_REG_ASIC2_HEALTH_OFFSET, + .mask = MLXPLAT_CPLD_ASIC_MASK, + .bit = 1, + .mode = 0444, + }, { .label = "fan_dir", .reg = MLXPLAT_CPLD_LPC_REG_FAN_DIRECTION,
@@ -3934,6 +3976,8 @@ static bool mlxplat_mlxcpld_writeable_reg(struct device *dev, unsigned int reg)case MLXPLAT_CPLD_LPC_REG_AGGRCX_MASK_OFFSET :case MLXPLAT_CPLD_LPC_REG_ASIC_EVENT_OFFSET :case MLXPLAT_CPLD_LPC_REG_ASIC_MASK_OFFSET : +case MLXPLAT_CPLD_LPC_REG_ASIC2_EVENT_OFFSET : +case MLXPLAT_CPLD_LPC_REG_ASIC2_MASK_OFFSET :case MLXPLAT_CPLD_LPC_REG_PSU_EVENT_OFFSET :case MLXPLAT_CPLD_LPC_REG_PSU_MASK_OFFSET :case MLXPLAT_CPLD_LPC_REG_PWR_EVENT_OFFSET :
@@ -4026,6 +4070,9 @@ static bool mlxplat_mlxcpld_readable_reg(struct device *dev, unsigned int reg)case MLXPLAT_CPLD_LPC_REG_ASIC_HEALTH_OFFSET :case MLXPLAT_CPLD_LPC_REG_ASIC_EVENT_OFFSET :case MLXPLAT_CPLD_LPC_REG_ASIC_MASK_OFFSET : +case MLXPLAT_CPLD_LPC_REG_ASIC2_HEALTH_OFFSET : +case MLXPLAT_CPLD_LPC_REG_ASIC2_EVENT_OFFSET : +case MLXPLAT_CPLD_LPC_REG_ASIC2_MASK_OFFSET :case MLXPLAT_CPLD_LPC_REG_PSU_OFFSET :case MLXPLAT_CPLD_LPC_REG_PSU_EVENT_OFFSET :case MLXPLAT_CPLD_LPC_REG_PSU_MASK_OFFSET :
@@ -4153,6 +4200,9 @@ static bool mlxplat_mlxcpld_volatile_reg(struct device *dev, unsigned int reg)case MLXPLAT_CPLD_LPC_REG_ASIC_HEALTH_OFFSET :case MLXPLAT_CPLD_LPC_REG_ASIC_EVENT_OFFSET :case MLXPLAT_CPLD_LPC_REG_ASIC_MASK_OFFSET : +case MLXPLAT_CPLD_LPC_REG_ASIC2_HEALTH_OFFSET : +case MLXPLAT_CPLD_LPC_REG_ASIC2_EVENT_OFFSET : +case MLXPLAT_CPLD_LPC_REG_ASIC2_MASK_OFFSET :case MLXPLAT_CPLD_LPC_REG_PSU_OFFSET :case MLXPLAT_CPLD_LPC_REG_PSU_EVENT_OFFSET :case MLXPLAT_CPLD_LPC_REG_PSU_MASK_OFFSET :
Signature · 1 line
2.20.1
Vadim Pasternak
maintainerPATCH 4/9 platform/x86: mlx-platform: Introduce support for COMe NVSwitch management module for Vulcan chassis
In reply to Vadim PasternakThe Vulcan is chassis containing Nvidia's Hopper dGPU (GH100), NVswitch (LS10) based HGX baseboard and COMe NVSwitch management module. The system is built for artificial intelligence and accelerated analytics applications. Vulcan is offered as an HGX product to cloud service providers and OEMs, who intend to build fully interconnected GPU systems for large scale deployments.
Driver is extended to support new COMe NVSwitch management module.
--- drivers/platform/x86/mlx-platform.c | 269 ++++++++++++++++++++++++++++ 1 file changed, 269 insertions(+)
drivers/platform/x86/mlx-platform.c +269 -0
@@ -67,6 +67,9 @@#define MLXPLAT_CPLD_LPC_REG_AGGRCO_MASK_OFFSET 0x43#define MLXPLAT_CPLD_LPC_REG_AGGRCX_OFFSET 0x44#define MLXPLAT_CPLD_LPC_REG_AGGRCX_MASK_OFFSET 0x45 +#define MLXPLAT_CPLD_LPC_REG_GWP_OFFSET 0x4a +#define MLXPLAT_CPLD_LPC_REG_GWP_EVENT_OFFSET 0x4b +#define MLXPLAT_CPLD_LPC_REG_GWP_MASK_OFFSET 0x4c#define MLXPLAT_CPLD_LPC_REG_ASIC_HEALTH_OFFSET 0x50#define MLXPLAT_CPLD_LPC_REG_ASIC_EVENT_OFFSET 0x51#define MLXPLAT_CPLD_LPC_REG_ASIC_MASK_OFFSET 0x52
@@ -209,6 +212,7 @@#define MLXPLAT_CPLD_LED_LO_NIBBLE_MASK GENMASK(7, 4)#define MLXPLAT_CPLD_LED_HI_NIBBLE_MASK GENMASK(3, 0)#define MLXPLAT_CPLD_VOLTREG_UPD_MASK GENMASK(5, 4) +#define MLXPLAT_CPLD_GWP_MASK GENMASK(0, 0)#define MLXPLAT_CPLD_I2C_CAP_BIT 0x04#define MLXPLAT_CPLD_I2C_CAP_MASK GENMASK(5, MLXPLAT_CPLD_I2C_CAP_BIT)
@@ -2027,6 +2031,38 @@ struct mlxreg_core_hotplug_platform_data mlxplat_mlxcpld_modular_data = { .mask_low = MLXPLAT_CPLD_LOW_AGGR_MASK_LOW, }; +/* Platform hotplug for NVLink blade systems family data */ +static struct mlxreg_core_data mlxplat_mlxcpld_global_wp_items_data[] = { + { + .label ="global_wp_grant" , + .reg =MLXPLAT_CPLD_LPC_REG_GWP_OFFSET , + .mask =MLXPLAT_CPLD_GWP_MASK , + .hpdev.nr =MLXPLAT_CPLD_NR_NONE , + }, +}; + +static struct mlxreg_core_item mlxplat_mlxcpld_nvlink_blade_items[] = { + { + .data = mlxplat_mlxcpld_global_wp_items_data, + .aggr_mask =MLXPLAT_CPLD_AGGR_MASK_NG_DEF , + .reg =MLXPLAT_CPLD_LPC_REG_GWP_OFFSET , + .mask =MLXPLAT_CPLD_GWP_MASK , + .count =ARRAY_SIZE (mlxplat_mlxcpld_global_wp_items_data), + .inversed =0 , + .health = false, + }, +}; + +static +struct mlxreg_core_hotplug_platform_data mlxplat_mlxcpld_nvlink_blade_data = { + .items = mlxplat_mlxcpld_nvlink_blade_items, + .counter =ARRAY_SIZE (mlxplat_mlxcpld_nvlink_blade_items), + .cell =MLXPLAT_CPLD_LPC_REG_AGGR_OFFSET , + .mask =MLXPLAT_CPLD_AGGR_MASK_COMEX , + .cell_low =MLXPLAT_CPLD_LPC_REG_AGGRLO_OFFSET , + .mask_low =MLXPLAT_CPLD_LOW_AGGR_MASK_LOW , +}; +/* Platform led default data */ static struct mlxreg_core_data mlxplat_mlxcpld_default_led_data[] = { {
@@ -3589,6 +3625,203 @@ static struct mlxreg_core_platform_data mlxplat_modular_regs_io_data = { .counter = ARRAY_SIZE(mlxplat_mlxcpld_modular_regs_io_data), }; +/* Platform register access for NVLink blade systems family data */ +static struct mlxreg_core_data mlxplat_mlxcpld_nvlink_blade_regs_io_data[] = { + { + .label ="cpld1_version" , + .reg =MLXPLAT_CPLD_LPC_REG_CPLD1_VER_OFFSET , + .bit =GENMASK (7 ,0 ), + .mode =0444 , + }, + { + .label ="cpld1_pn" , + .reg =MLXPLAT_CPLD_LPC_REG_CPLD1_PN_OFFSET , + .bit =GENMASK (15 ,0 ), + .mode =0444 , + .regnum =2 , + }, + { + .label ="cpld1_version_min" , + .reg =MLXPLAT_CPLD_LPC_REG_CPLD1_MVER_OFFSET , + .bit =GENMASK (7 ,0 ), + .mode =0444 , + }, + { + .label ="reset_aux_pwr_or_ref" , + .reg =MLXPLAT_CPLD_LPC_REG_RESET_CAUSE_OFFSET , + .mask =GENMASK (7 ,0 ) & ~BIT (2 ), + .mode =0444 , + }, + { + .label ="reset_from_comex" , + .reg =MLXPLAT_CPLD_LPC_REG_RESET_CAUSE_OFFSET , + .mask =GENMASK (7 ,0 ) & ~BIT (4 ), + .mode =0444 , + }, + { + .label ="reset_comex_pwr_fail" , + .reg =MLXPLAT_CPLD_LPC_REG_RST_CAUSE1_OFFSET , + .mask =GENMASK (7 ,0 ) & ~BIT (3 ), + .mode =0444 , + }, + { + .label ="reset_platform" , + .reg =MLXPLAT_CPLD_LPC_REG_RST_CAUSE1_OFFSET , + .mask =GENMASK (7 ,0 ) & ~BIT (4 ), + .mode =0444 , + }, + { + .label ="reset_soc" , + .reg =MLXPLAT_CPLD_LPC_REG_RST_CAUSE1_OFFSET , + .mask =GENMASK (7 ,0 ) & ~BIT (5 ), + .mode =0444 , + }, + { + .label ="reset_comex_wd" , + .reg =MLXPLAT_CPLD_LPC_REG_RST_CAUSE1_OFFSET , + .mask =GENMASK (7 ,0 ) & ~BIT (6 ), + .mode =0444 , + }, + { + .label ="reset_voltmon_upgrade_fail" , + .reg =MLXPLAT_CPLD_LPC_REG_RST_CAUSE2_OFFSET , + .mask =GENMASK (7 ,0 ) & ~BIT (0 ), + .mode =0444 , + }, + { + .label ="reset_system" , + .reg =MLXPLAT_CPLD_LPC_REG_RST_CAUSE2_OFFSET , + .mask =GENMASK (7 ,0 ) & ~BIT (1 ), + .mode =0444 , + }, + { + .label ="reset_sw_pwr_off" , + .reg =MLXPLAT_CPLD_LPC_REG_RST_CAUSE2_OFFSET , + .mask =GENMASK (7 ,0 ) & ~BIT (2 ), + .mode =0444 , + }, + { + .label ="reset_comex_thermal" , + .reg =MLXPLAT_CPLD_LPC_REG_RST_CAUSE2_OFFSET , + .mask =GENMASK (7 ,0 ) & ~BIT (3 ), + .mode =0444 , + }, + { + .label ="reset_reload_bios" , + .reg =MLXPLAT_CPLD_LPC_REG_RST_CAUSE2_OFFSET , + .mask =GENMASK (7 ,0 ) & ~BIT (5 ), + .mode =0444 , + }, + { + .label ="reset_ac_pwr_fail" , + .reg =MLXPLAT_CPLD_LPC_REG_RST_CAUSE2_OFFSET , + .mask =GENMASK (7 ,0 ) & ~BIT (6 ), + .mode =0444 , + }, + { + .label ="pwr_cycle" , + .reg =MLXPLAT_CPLD_LPC_REG_GP1_OFFSET , + .mask =GENMASK (7 ,0 ) & ~BIT (2 ), + .mode =0200 , + }, + { + .label ="pwr_down" , + .reg =MLXPLAT_CPLD_LPC_REG_GP1_OFFSET , + .mask =GENMASK (7 ,0 ) & ~BIT (3 ), + .mode =0200 , + }, + { + .label ="global_wp_request" , + .reg =MLXPLAT_CPLD_LPC_REG_GP2_OFFSET , + .mask =GENMASK (7 ,0 ) & ~BIT (0 ), + .mode =0644 , + }, + { + .label ="jtag_enable" , + .reg =MLXPLAT_CPLD_LPC_REG_GP2_OFFSET , + .mask =GENMASK (7 ,0 ) & ~BIT (4 ), + .mode =0644 , + }, + { + .label ="comm_chnl_ready" , + .reg =MLXPLAT_CPLD_LPC_REG_GP2_OFFSET , + .mask =GENMASK (7 ,0 ) & ~BIT (6 ), + .mode =0200 , + }, + { + .label ="bios_safe_mode" , + .reg =MLXPLAT_CPLD_LPC_REG_GPCOM0_OFFSET , + .mask =GENMASK (7 ,0 ) & ~BIT (4 ), + .mode =0444 , + }, + { + .label ="bios_active_image" , + .reg =MLXPLAT_CPLD_LPC_REG_GPCOM0_OFFSET , + .mask =GENMASK (7 ,0 ) & ~BIT (5 ), + .mode =0444 , + }, + { + .label ="bios_auth_fail" , + .reg =MLXPLAT_CPLD_LPC_REG_GPCOM0_OFFSET , + .mask =GENMASK (7 ,0 ) & ~BIT (6 ), + .mode =0444 , + }, + { + .label ="bios_upgrade_fail" , + .reg =MLXPLAT_CPLD_LPC_REG_GPCOM0_OFFSET , + .mask =GENMASK (7 ,0 ) & ~BIT (7 ), + .mode =0444 , + }, + { + .label ="voltreg_update_status" , + .reg =MLXPLAT_CPLD_LPC_REG_GP0_RO_OFFSET , + .mask =MLXPLAT_CPLD_VOLTREG_UPD_MASK , + .bit =5 , + .mode =0444 , + }, + { + .label ="vpd_wp" , + .reg =MLXPLAT_CPLD_LPC_REG_GP0_OFFSET , + .mask =GENMASK (7 ,0 ) & ~BIT (3 ), + .mode =0644 , + }, + { + .label ="pcie_asic_reset_dis" , + .reg =MLXPLAT_CPLD_LPC_REG_GP0_OFFSET , + .mask =GENMASK (7 ,0 ) & ~BIT (4 ), + .mode =0644 , + }, + { + .label ="global_wp_response" , + .reg =MLXPLAT_CPLD_LPC_REG_GWP_OFFSET , + .mask =GENMASK (7 ,0 ) & ~BIT (0 ), + .mode =0444 , + }, + { + .label ="config1" , + .reg =MLXPLAT_CPLD_LPC_REG_CONFIG1_OFFSET , + .bit =GENMASK (7 ,0 ), + .mode =0444 , + }, + { + .label ="config2" , + .reg =MLXPLAT_CPLD_LPC_REG_CONFIG2_OFFSET , + .bit =GENMASK (7 ,0 ), + .mode =0444 , + }, + { + .label ="ufm_version" , + .reg =MLXPLAT_CPLD_LPC_REG_UFM_VERSION_OFFSET , + .bit =GENMASK (7 ,0 ), + .mode =0444 , + }, +}; + +static struct mlxreg_core_platform_data mlxplat_nvlink_blade_regs_io_data = { + .data = mlxplat_mlxcpld_nvlink_blade_regs_io_data, + .counter =ARRAY_SIZE (mlxplat_mlxcpld_nvlink_blade_regs_io_data), +}; +/* Platform FAN default */ static struct mlxreg_core_data mlxplat_mlxcpld_default_fan_data[] = { {
@@ -3974,6 +4207,8 @@ static bool mlxplat_mlxcpld_writeable_reg(struct device *dev, unsigned int reg)case MLXPLAT_CPLD_LPC_REG_AGGRLO_MASK_OFFSET :case MLXPLAT_CPLD_LPC_REG_AGGRCO_MASK_OFFSET :case MLXPLAT_CPLD_LPC_REG_AGGRCX_MASK_OFFSET : +case MLXPLAT_CPLD_LPC_REG_GWP_EVENT_OFFSET : +case MLXPLAT_CPLD_LPC_REG_GWP_MASK_OFFSET :case MLXPLAT_CPLD_LPC_REG_ASIC_EVENT_OFFSET :case MLXPLAT_CPLD_LPC_REG_ASIC_MASK_OFFSET :case MLXPLAT_CPLD_LPC_REG_ASIC2_EVENT_OFFSET :
@@ -4067,6 +4302,9 @@ static bool mlxplat_mlxcpld_readable_reg(struct device *dev, unsigned int reg)case MLXPLAT_CPLD_LPC_REG_AGGRCO_MASK_OFFSET :case MLXPLAT_CPLD_LPC_REG_AGGRCX_OFFSET :case MLXPLAT_CPLD_LPC_REG_AGGRCX_MASK_OFFSET : +case MLXPLAT_CPLD_LPC_REG_GWP_OFFSET : +case MLXPLAT_CPLD_LPC_REG_GWP_EVENT_OFFSET : +case MLXPLAT_CPLD_LPC_REG_GWP_MASK_OFFSET :case MLXPLAT_CPLD_LPC_REG_ASIC_HEALTH_OFFSET :case MLXPLAT_CPLD_LPC_REG_ASIC_EVENT_OFFSET :case MLXPLAT_CPLD_LPC_REG_ASIC_MASK_OFFSET :
@@ -4197,6 +4435,9 @@ static bool mlxplat_mlxcpld_volatile_reg(struct device *dev, unsigned int reg)case MLXPLAT_CPLD_LPC_REG_AGGRCO_MASK_OFFSET :case MLXPLAT_CPLD_LPC_REG_AGGRCX_OFFSET :case MLXPLAT_CPLD_LPC_REG_AGGRCX_MASK_OFFSET : +case MLXPLAT_CPLD_LPC_REG_GWP_OFFSET : +case MLXPLAT_CPLD_LPC_REG_GWP_EVENT_OFFSET : +case MLXPLAT_CPLD_LPC_REG_GWP_MASK_OFFSET :case MLXPLAT_CPLD_LPC_REG_ASIC_HEALTH_OFFSET :case MLXPLAT_CPLD_LPC_REG_ASIC_EVENT_OFFSET :case MLXPLAT_CPLD_LPC_REG_ASIC_MASK_OFFSET :
@@ -4629,6 +4870,28 @@ static int __init mlxplat_dmi_modular_matched(const struct dmi_system_id *dmi)return 1 ; } +static int __init mlxplat_dmi_nvlink_blade_matched (const struct dmi_system_id *dmi) +{ +int i; + + mlxplat_max_adap_num =MLXPLAT_CPLD_MAX_PHYS_ADAPTER_NUM ; + mlxplat_mux_num =ARRAY_SIZE (mlxplat_default_mux_data); + mlxplat_mux_data = mlxplat_default_mux_data; + mlxplat_hotplug = &mlxplat_mlxcpld_nvlink_blade_data; + mlxplat_hotplug->deferred_nr = + mlxplat_msn21xx_channels[MLXPLAT_CPLD_GRP_CHNL_NUM -1 ]; +for (i =0 ; i < mlxplat_mux_num; i++) { + mlxplat_mux_data[i].values = mlxplat_msn21xx_channels; + mlxplat_mux_data[i].n_values = +ARRAY_SIZE (mlxplat_msn21xx_channels); + } + mlxplat_regs_io = &mlxplat_nvlink_blade_regs_io_data; + mlxplat_i2c = &mlxplat_mlxcpld_i2c_ng_data; + mlxplat_regmap_config = &mlxplat_mlxcpld_regmap_config_ng400; + +return 1 ; +} +static const struct dmi_system_id mlxplat_dmi_table[]__initconst = { { .callback = mlxplat_dmi_default_wc_matched,
@@ -4691,6 +4954,12 @@ static const struct dmi_system_id mlxplat_dmi_table[] __initconst = { DMI_MATCH(DMI_BOARD_NAME, "VMOD0011"), }, }, + { + .callback = mlxplat_dmi_nvlink_blade_matched, + .matches = { + DMI_MATCH(DMI_BOARD_NAME, "VMOD0015"), + }, + }, { .callback = mlxplat_dmi_msn274x_matched, .matches = {
Signature · 1 line
2.20.1
Vadim Pasternak
maintainerPATCH 5/9 platform/x86: mlx-platform: Add support for new system XH3000
In reply to Vadim PasternakAdd support for new system type XH3000, which is a water cooling Ethernet switch blade equipped with 32x200G Ethernet ports.
The system is recognized by "DMI_BOARD_NAME" and "DMI_PRODUCT_SKU" matches, when these fields are set to "VMOD0005" and "HI139" respectively.
--- drivers/platform/x86/mlx-platform.c | 51 +++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+)
drivers/platform/x86/mlx-platform.c +51 -0
@@ -2161,6 +2161,25 @@ static struct mlxreg_core_platform_data mlxplat_default_led_wc_data = { .counter = ARRAY_SIZE(mlxplat_mlxcpld_default_led_wc_data), }; +/* Platform led default data for water cooling Ethernet switch blade */ +static struct mlxreg_core_data mlxplat_mlxcpld_default_led_eth_wc_blade_data[] = { + { + .label ="status:green" , + .reg =MLXPLAT_CPLD_LPC_REG_LED1_OFFSET , + .mask =MLXPLAT_CPLD_LED_LO_NIBBLE_MASK , + }, + { + .label ="status:red" , + .reg =MLXPLAT_CPLD_LPC_REG_LED1_OFFSET , + .mask =MLXPLAT_CPLD_LED_LO_NIBBLE_MASK + }, +}; + +static struct mlxreg_core_platform_data mlxplat_default_led_eth_wc_blade_data = { + .data = mlxplat_mlxcpld_default_led_eth_wc_blade_data, + .counter =ARRAY_SIZE (mlxplat_mlxcpld_default_led_eth_wc_blade_data), +}; +/* Platform led MSN21xx system family data */ static struct mlxreg_core_data mlxplat_mlxcpld_msn21xx_led_data[] = { {
@@ -4708,6 +4727,31 @@ static int __init mlxplat_dmi_default_wc_matched(const struct dmi_system_id *dmireturn 1 ; } +static int __init mlxplat_dmi_default_eth_wc_blade_matched (const struct dmi_system_id *dmi) +{ +int i; + + mlxplat_max_adap_num =MLXPLAT_CPLD_MAX_PHYS_ADAPTER_NUM ; + mlxplat_mux_num =ARRAY_SIZE (mlxplat_default_mux_data); + mlxplat_mux_data = mlxplat_default_mux_data; +for (i =0 ; i < mlxplat_mux_num; i++) { + mlxplat_mux_data[i].values = mlxplat_msn21xx_channels; + mlxplat_mux_data[i].n_values = +ARRAY_SIZE (mlxplat_msn21xx_channels); + } + mlxplat_hotplug = &mlxplat_mlxcpld_default_wc_data; + mlxplat_hotplug->deferred_nr = + mlxplat_msn21xx_channels[MLXPLAT_CPLD_GRP_CHNL_NUM -1 ]; + mlxplat_led = &mlxplat_default_led_eth_wc_blade_data; + mlxplat_regs_io = &mlxplat_default_ng_regs_io_data; +for (i =0 ; i <ARRAY_SIZE (mlxplat_mlxcpld_wd_set_type2); i++) + mlxplat_wd_data[i] = &mlxplat_mlxcpld_wd_set_type2[i]; + mlxplat_i2c = &mlxplat_mlxcpld_i2c_ng_data; + mlxplat_regmap_config = &mlxplat_mlxcpld_regmap_config_ng; + +return 1 ; +} +static int __init mlxplat_dmi_msn21xx_matched (const struct dmi_system_id *dmi) {int i;
@@ -4924,6 +4968,13 @@ static const struct dmi_system_id mlxplat_dmi_table[] __initconst = { DMI_MATCH(DMI_BOARD_NAME, "VMOD0004"), }, }, + { + .callback = mlxplat_dmi_default_eth_wc_blade_matched, + .matches = { +DMI_MATCH (DMI_BOARD_NAME ,"VMOD0005" ), + DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "HI139"), + }, + }, { .callback = mlxplat_dmi_qmb7xx_matched, .matches = {
Signature · 1 line
2.20.1
Vadim Pasternak
maintainerPATCH 6/9 platform/x86: mlx-platform: Add COME board revision register
In reply to Vadim PasternakExtend COME CPLD with board configuration register for getting board revision. The value of this register is pushed by hardware through GPIO pins.
The purpose of it is to expose some minor BOM changes.
--- drivers/platform/x86/mlx-platform.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
drivers/platform/x86/mlx-platform.c +21 -0
@@ -150,6 +150,7 @@#define MLXPLAT_CPLD_LPC_REG_SLOT_QTY_OFFSET 0xfa#define MLXPLAT_CPLD_LPC_REG_CONFIG1_OFFSET 0xfb#define MLXPLAT_CPLD_LPC_REG_CONFIG2_OFFSET 0xfc +#define MLXPLAT_CPLD_LPC_REG_CONFIG3_OFFSET 0xfd#define MLXPLAT_CPLD_LPC_IO_RANGE 0x100#define MLXPLAT_CPLD_LPC_I2C_CH1_OFF 0xdb#define MLXPLAT_CPLD_LPC_I2C_CH2_OFF 0xda
@@ -3153,6 +3154,12 @@ static struct mlxreg_core_data mlxplat_mlxcpld_default_ng_regs_io_data[] = { .bit = GENMASK(7, 0), .mode = 0444, }, + { + .label = "config3", + .reg = MLXPLAT_CPLD_LPC_REG_CONFIG3_OFFSET, + .bit = GENMASK(7, 0), + .mode = 0444, + }, { .label = "ufm_version", .reg = MLXPLAT_CPLD_LPC_REG_UFM_VERSION_OFFSET,
@@ -3631,6 +3638,12 @@ static struct mlxreg_core_data mlxplat_mlxcpld_modular_regs_io_data[] = { .bit = GENMASK(7, 0), .mode = 0444, }, + { + .label = "config3", + .reg = MLXPLAT_CPLD_LPC_REG_CONFIG3_OFFSET, + .bit = GENMASK(7, 0), + .mode = 0444, + }, { .label = "ufm_version", .reg = MLXPLAT_CPLD_LPC_REG_UFM_VERSION_OFFSET,
@@ -3828,6 +3841,12 @@ static struct mlxreg_core_data mlxplat_mlxcpld_nvlink_blade_regs_io_data[] = { .bit = GENMASK(7, 0), .mode = 0444, }, + { + .label = "config3", + .reg = MLXPLAT_CPLD_LPC_REG_CONFIG3_OFFSET, + .bit = GENMASK(7, 0), + .mode = 0444, + }, { .label = "ufm_version", .reg = MLXPLAT_CPLD_LPC_REG_UFM_VERSION_OFFSET,
@@ -4404,6 +4423,7 @@ static bool mlxplat_mlxcpld_readable_reg(struct device *dev, unsigned int reg)case MLXPLAT_CPLD_LPC_REG_SLOT_QTY_OFFSET :case MLXPLAT_CPLD_LPC_REG_CONFIG1_OFFSET :case MLXPLAT_CPLD_LPC_REG_CONFIG2_OFFSET : +case MLXPLAT_CPLD_LPC_REG_CONFIG3_OFFSET :case MLXPLAT_CPLD_LPC_REG_UFM_VERSION_OFFSET :return true; }
@@ -4531,6 +4551,7 @@ static bool mlxplat_mlxcpld_volatile_reg(struct device *dev, unsigned int reg)case MLXPLAT_CPLD_LPC_REG_SLOT_QTY_OFFSET :case MLXPLAT_CPLD_LPC_REG_CONFIG1_OFFSET :case MLXPLAT_CPLD_LPC_REG_CONFIG2_OFFSET : +case MLXPLAT_CPLD_LPC_REG_CONFIG3_OFFSET :case MLXPLAT_CPLD_LPC_REG_UFM_VERSION_OFFSET :return true; }
Signature · 1 line
2.20.1
Vadim Pasternak
maintainerPATCH 7/9 platform/mellanox: mlxreg-io: Add locking for io operations
In reply to Vadim PasternakAdd lock to protect user read/write access to the registers.
--- drivers/platform/mellanox/mlxreg-io.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)
drivers/platform/mellanox/mlxreg-io.c +23 -0
@@ -31,6 +31,7 @@* @group: sysfs attribute group; * @groups: list of sysfs attribute group for hwmon registration; * @regsize: size of a register value; +* @io_lock: user access locking; */ struct mlxreg_io_priv_data {struct platform_device *pdev;
@@ -41,6 +42,7 @@ struct mlxreg_io_priv_data {struct attribute_group group;const struct attribute_group *groups[2 ];int regsize; +struct mutex io_lock;/* Protects user access. */ }; static int
@@ -116,14 +118,19 @@ mlxreg_io_attr_show(struct device *dev, struct device_attribute *attr,u32 regval =0 ;int ret; +mutex_lock (&priv->io_lock); + ret =mlxreg_io_get_reg (priv->pdata->regmap, data,0 , true, priv->regsize, ®val);if (ret) goto access_error; +mutex_unlock (&priv->io_lock); +return sprintf (buf,"%u\n" , regval); access_error: +mutex_unlock (&priv->io_lock);return ret; }
@@ -145,6 +152,8 @@ mlxreg_io_attr_store(struct device *dev, struct device_attribute *attr,if (ret)return ret; +mutex_lock (&priv->io_lock); + ret =mlxreg_io_get_reg (priv->pdata->regmap, data, input_val, false, priv->regsize, ®val);if (ret)
@@ -154,9 +163,12 @@ mlxreg_io_attr_store(struct device *dev, struct device_attribute *attr,if (ret) goto access_error; +mutex_unlock (&priv->io_lock); +return len; access_error: +mutex_unlock (&priv->io_lock);dev_err (&priv->pdev->dev,"Bus access error\n" );return ret; }
@@ -246,16 +258,27 @@ static int mlxreg_io_probe(struct platform_device *pdev)return PTR_ERR (priv->hwmon); } +mutex_init (&priv->io_lock);dev_set_drvdata (&pdev->dev, priv);return 0 ; } +static int mlxreg_io_remove (struct platform_device *pdev) +{ +struct mlxreg_io_priv_data *priv =dev_get_drvdata (&pdev->dev); + +mutex_destroy (&priv->io_lock); + +return 0 ; +} +static struct platform_driver mlxreg_io_driver = { .driver = { .name ="mlxreg-io" , }, .probe = mlxreg_io_probe, + .remove = mlxreg_io_remove, };module_platform_driver (mlxreg_io_driver);
Signature · 1 line
2.20.1
Vadim Pasternak
maintainerPATCH 8/9 Documentation/ABI: mlxreg-io: Fix contact info
In reply to Vadim PasternakFix e-mail in contact fields.
--- .../ABI/stable/sysfs-driver-mlxreg-io | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-)
Documentation/ABI/stable/sysfs-driver-mlxreg-io +21 -21
@@ -1,7 +1,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/asic_health Date: June 2018 KernelVersion: 4.19 -Contact: Vadim Pasternak <vadimpmellanox.com> +Contact: Vadim Pasternak <[email protected]> Description: This file shows ASIC health status. The possible values are: 0 - health failed, 2 - health OK, 3 - ASIC in booting state.
@@ -11,7 +11,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld1_version What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld2_version Date: June 2018 KernelVersion: 4.19 -Contact: Vadim Pasternak <vadimpmellanox.com> +Contact: Vadim Pasternak <[email protected]> Description: These files show with which CPLD versions have been burned on carrier and switch boards.
@@ -20,7 +20,7 @@ Description: These files show with which CPLD versions have been burned What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/fan_dir Date: December 2018 KernelVersion: 5.0 -Contact: Vadim Pasternak <vadimpmellanox.com> +Contact: Vadim Pasternak <[email protected]> Description: This file shows the system fans direction: forward direction - relevant bit is set 0; reversed direction - relevant bit is set 1.
@@ -30,7 +30,7 @@ Description: This file shows the system fans direction: What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld3_version Date: November 2018 KernelVersion: 5.0 -Contact: Vadim Pasternak <vadimpmellanox.com> +Contact: Vadim Pasternak <[email protected]> Description: These files show with which CPLD versions have been burned on LED or Gearbox board.
@@ -39,7 +39,7 @@ Description: These files show with which CPLD versions have been burned What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/jtag_enable Date: November 2018 KernelVersion: 5.0 -Contact: Vadim Pasternak <vadimpmellanox.com> +Contact: Vadim Pasternak <[email protected]> Description: These files enable and disable the access to the JTAG domain. By default access to the JTAG domain is disabled.
@@ -48,7 +48,7 @@ Description: These files enable and disable the access to the JTAG domain. What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/select_iio Date: June 2018 KernelVersion: 4.19 -Contact: Vadim Pasternak <vadimpmellanox.com> +Contact: Vadim Pasternak <[email protected]> Description: This file allows iio devices selection. Attribute select_iio can be written with 0 or with 1. It
@@ -62,7 +62,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/psu1_on /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/pwr_down Date: June 2018 KernelVersion: 4.19 -Contact: Vadim Pasternak <vadimpmellanox.com> +Contact: Vadim Pasternak <[email protected]> Description: These files allow asserting system power cycling, switching power supply units on and off and system's main power domain shutdown.
@@ -89,7 +89,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_short_pb What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_sw_reset Date: June 2018 KernelVersion: 4.19 -Contact: Vadim Pasternak <vadimpmellanox.com> +Contact: Vadim Pasternak <[email protected]> Description: These files show the system reset cause, as following: power auxiliary outage or power refresh, ASIC thermal shutdown, halt, hotswap, watchdog, firmware reset, long press power button,
@@ -106,7 +106,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_system What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_voltmon_upgrade_fail Date: November 2018 KernelVersion: 5.0 -Contact: Vadim Pasternak <vadimpmellanox.com> +Contact: Vadim Pasternak <[email protected]> Description: These files show the system reset cause, as following: ComEx power fail, reset from ComEx, system platform reset, reset due to voltage monitor devices upgrade failure,
@@ -119,7 +119,7 @@ Description: These files show the system reset cause, as following: ComEx What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld4_version Date: November 2018 KernelVersion: 5.0 -Contact: Vadim Pasternak <vadimpmellanox.com> +Contact: Vadim Pasternak <[email protected]> Description: These files show with which CPLD versions have been burned on LED board.
@@ -133,7 +133,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_sff_wd What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_swb_wd Date: June 2019 KernelVersion: 5.3 -Contact: Vadim Pasternak <vadimpmellanox.com> +Contact: Vadim Pasternak <[email protected]> Description: These files show the system reset cause, as following: COMEX thermal shutdown; wathchdog power off or reset was derived by one of the next components: COMEX, switch board or by Small Form
@@ -148,7 +148,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/config1 What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/config2 Date: January 2020 KernelVersion: 5.6 -Contact: Vadim Pasternak <vadimpmellanox.com> +Contact: Vadim Pasternak <[email protected]> Description: These files show system static topology identification like system's static I2C topology, number and type of FPGA devices within the system and so on.
@@ -161,7 +161,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_soc What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_sw_pwr_off Date: January 2020 KernelVersion: 5.6 -Contact: Vadim Pasternak <vadimpmellanox.com> +Contact: Vadim Pasternak <[email protected]> Description: These files show the system reset causes, as following: reset due to AC power failure, reset invoked from software by assertion reset signal through CPLD. reset caused by signal
@@ -173,7 +173,7 @@ Description: These files show the system reset causes, as following: reset What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/pcie_asic_reset_dis Date: January 2020 KernelVersion: 5.6 -Contact: Vadim Pasternak <vadimpmellanox.com> +Contact: Vadim Pasternak <[email protected]> Description: This file allows to retain ASIC up during PCIe root complex reset, when attribute is set 1.
@@ -182,7 +182,7 @@ Description: This file allows to retain ASIC up during PCIe root complex What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/vpd_wp Date: January 2020 KernelVersion: 5.6 -Contact: Vadim Pasternak <vadimpmellanox.com> +Contact: Vadim Pasternak <[email protected]> Description: This file allows to overwrite system VPD hardware write protection when attribute is set 1.
@@ -191,7 +191,7 @@ Description: This file allows to overwrite system VPD hardware write What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/voltreg_update_status Date: January 2020 KernelVersion: 5.6 -Contact: Vadim Pasternak <vadimpmellanox.com> +Contact: Vadim Pasternak <[email protected]> Description: This file exposes the configuration update status of burnable voltage regulator devices. The status values are as following: 0 - OK; 1 - CRC failure; 2 = I2C failure; 3 - in progress.
@@ -201,7 +201,7 @@ Description: This file exposes the configuration update status of burnable What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/ufm_version Date: January 2020 KernelVersion: 5.6 -Contact: Vadim Pasternak <vadimpmellanox.com> +Contact: Vadim Pasternak <[email protected]> Description: This file exposes the firmware version of burnable voltage regulator devices.
@@ -217,7 +217,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld3_version_min What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld4_version_min Date: July 2020 KernelVersion: 5.9 -Contact: Vadim Pasternak <vadimpmellanox.com> +Contact: Vadim Pasternak <[email protected]> Description: These files show with which CPLD part numbers and minor versions have been burned CPLD devices equipped on a system.
@@ -471,7 +471,7 @@ Description: These files provide the maximum powered required for line card What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/phy_reset Date: May 2022 KernelVersion: 5.19 -Contact: Vadim Pasternak <vadimpmellanox.com> +Contact: Vadim Pasternak <[email protected]> Description: This file allows to reset PHY 88E1548 when attribute is set 0 due to some abnormal PHY behavior. Expected behavior:
@@ -483,7 +483,7 @@ Description: This file allows to reset PHY 88E1548 when attribute is set 0 What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/mac_reset Date: May 2022 KernelVersion: 5.19 -Contact: Vadim Pasternak <vadimpmellanox.com> +Contact: Vadim Pasternak <[email protected]> Description: This file allows to reset ASIC MT52132 when attribute is set 0 due to some abnormal ASIC behavior. Expected behavior:
@@ -495,7 +495,7 @@ Description: This file allows to reset ASIC MT52132 when attribute is set 0 What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/qsfp_pwr_good Date: May 2022 KernelVersion: 5.19 -Contact: Vadim Pasternak <vadimpmellanox.com> +Contact: Vadim Pasternak <[email protected]> Description: This file shows QSFP ports power status. The value is set to 0 when one of any QSFP ports is plugged. The value is set to 1 when there are no any QSFP ports are plugged.
Signature · 1 line
2.20.1
Vadim Pasternak
maintainerPATCH 9/9 Documentation/ABI: Add new attributes for mlxreg-io sysfs interfaces
In reply to Vadim PasternakAdd documentation for the new attributes:
- "asic2_health" - health of 2-nd ASIC for system equipped with two ASICs.
- "asic_reset" and "asic2_reset" - ASICs reset control.
- "comm_chnl_ready" - communication channel indication to remote end (BMC).
- "config3" - indication of system minor BOM changes.
--- .../ABI/stable/sysfs-driver-mlxreg-io | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+)
Documentation/ABI/stable/sysfs-driver-mlxreg-io +39 -0
@@ -503,3 +503,42 @@ Description: This file shows QSFP ports power status. The value is set to 0 0 - Power good, 1 - Not power good. The files are read only. + +What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/asic2_health +Date: July 2022 +KernelVersion: 5.20 +Contact: Vadim Pasternak <[email protected]> +Description: This file shows 2-nd ASIC health status. The possible values are: + 0 - health failed, 2 - health OK, 3 - ASIC in booting state. + + The file is read only. + +What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/asic_reset +What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/asic2_reset +Date: July 2022 +KernelVersion: 5.20 +Contact: Vadim Pasternak <[email protected]> +Description: These files allow to each of AISCs by writing 1. + + The files are write only. + + +What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/comm_chnl_ready +Date: July 2022 +KernelVersion: 5.20 +Contact: Vadim Pasternak <[email protected]> +Description: This file is used to indicate remote end (for example BMC) that system + host CPU is ready for sending telemetry data to remote end. + For indication the file should be written 1. + + The file is write only. + +What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/config3 +Date: January 2020 +KernelVersion: 5.6 +Contact: Vadim Pasternak <[email protected]> +Description: The file indicates COME module hardware configuration. + The value is pushed by hardware through GPIO pins. + The purpose is to expose some minor BOM changes for the same system SKU. + + The file is read only.
Signature · 1 line
2.20.1
Hi,
Quoted 12 lines · Vadim Pasternak
The patch set adds:
- Support for new systems:
- COMe NVSwitch management module for Vulcan chassis containing Nvidia's Hopper dGPU (GH100), NVswitch (LS10) based HGX baseboard.
- XH3000 system, which is a water-cooling Ethernet switch blade equipped with 32x200G Ethernet ports.
- Support for systems equipped with two ASICc.
- Logic for selective activation of some drivers.
- Documentation fixes and introduction of new attributes.
- Locking protection for IO operations over register space.
Quoted 9 lines
The patch set contains:
Patch #1 - extends logic for selective activation of some drivers,
depending on system type.
Patch #2 - contains cosmetic changes.
Patch #3 - adds support for systems with two ASICs. Patches #4-#5 - introduce new systems.
Patch #6 - adds new feature for system minor revision changes. Patch #7 - adds locking for IO operations.
Patches #8-#9 - documentation changes.
Thank you for your patch-series, I've applied the series to my review-hans branch:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans
Note I've fixed up a type in patch 9/9: s/AISCs/ASICs/
Once I've run some tests on this branch the patches there will be added to the platform-drivers-x86/for-next branch and eventually will be included in the pdx86 pull-request to Linus for the next merge-window.
Regards,
Hans
Quoted 20 lines
Vadim Pasternak (9):
platform/x86: mlx-platform: Make activation of some drivers
conditional
platform/x86: mlx-platform: Add cosmetic changes for alignment platform/x86: mlx-platform: Add support for systems equipped with two
ASICs
platform/x86: mlx-platform: Introduce support for COMe NVSwitch
management module for Vulcan chassis
platform/x86: mlx-platform: Add support for new system XH3000 platform/x86: mlx-platform: Add COME board revision register platform/mellanox: mlxreg-io: Add locking for io operationsDocumentation/ABI: mlxreg-io: Fix contact infoDocumentation/ABI: Add new attributes for mlxreg-io sysfs interfaces.../ABI/stable/sysfs-driver-mlxreg-io | 81 ++- drivers/platform/mellanox/mlxreg-io.c | 23 + drivers/platform/x86/mlx-platform.c | 491 ++++++++++++++++-- 3 files changed, 526 insertions(+), 69 deletions(-)