| Message ID | 20250113084337.24763-8-vadimp@nvidia.com (mailing list archive) |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
| Series | platform/mellanox: Add support for new systems, amendments, relocate mlx-platform module | expand |
On Mon, 13 Jan 2025, Vadim Pasternak wrote: > Provide platform support for Nvidia Smart Switch SN4280. > > The Smart Switch equipped with: > - Nvidia COME module based on AMD EPYC™ Embedded 3451 CPU. > - Nvidia Spectrum-3 ASIC. > - Four DPUs, each equipped with Nvidia BF3 ARM based processor and > with Lattice LFD2NX-40 FPGA device. > - 28xQSFP-DD external ports. > - Two power supplies. > - Four cooling drawers. > > Introduce configuration structures for the new systems to allow proper > activation of the required platform drivers. > > Reviewed-by: Ciju Rajan K <crajank@nvidia.com> > Signed-off-by: Vadim Pasternak <vadimp@nvidia.com> > --- > drivers/platform/mellanox/mlx-platform.c | 1965 +++++++++++++++++++--- > 1 file changed, 1711 insertions(+), 254 deletions(-) > > diff --git a/drivers/platform/mellanox/mlx-platform.c b/drivers/platform/mellanox/mlx-platform.c > index bd3bb06ff8f2..9d237852d3e0 100644 > --- a/drivers/platform/mellanox/mlx-platform.c > +++ b/drivers/platform/mellanox/mlx-platform.c > @@ -38,6 +38,7 @@ > #define MLXPLAT_CPLD_LPC_REG_CPLD4_PN1_OFFSET 0x0b > #define MLXPLAT_CPLD_LPC_REG_RESET_GP1_OFFSET 0x17 > #define MLXPLAT_CPLD_LPC_REG_RESET_GP2_OFFSET 0x19 > +#define MLXPLAT_CPLD_LPC_REG_RESET_GP3_OFFSET 0x1b > #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 > @@ -49,9 +50,11 @@ > #define MLXPLAT_CPLD_LPC_REG_LED5_OFFSET 0x24 > #define MLXPLAT_CPLD_LPC_REG_LED6_OFFSET 0x25 > #define MLXPLAT_CPLD_LPC_REG_LED7_OFFSET 0x26 > +#define MLXPLAT_CPLD_LPC_REG_LED8_OFFSET 0x27 > #define MLXPLAT_CPLD_LPC_REG_FAN_DIRECTION 0x2a > #define MLXPLAT_CPLD_LPC_REG_GP0_RO_OFFSET 0x2b > #define MLXPLAT_CPLD_LPC_REG_GPCOM0_OFFSET 0x2d > +#define MLXPLAT_CPLD_LPC_REG_GP1_RO_OFFSET 0x2c > #define MLXPLAT_CPLD_LPC_REG_GP0_OFFSET 0x2e > #define MLXPLAT_CPLD_LPC_REG_GP_RST_OFFSET 0x2f > #define MLXPLAT_CPLD_LPC_REG_GP1_OFFSET 0x30 > @@ -71,12 +74,14 @@ > #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_GP3_OFFSET 0x46 > #define MLXPLAT_CPLD_LPC_REG_BRD_OFFSET 0x47 > #define MLXPLAT_CPLD_LPC_REG_BRD_EVENT_OFFSET 0x48 > #define MLXPLAT_CPLD_LPC_REG_BRD_MASK_OFFSET 0x49 > #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_GPI_MASK_OFFSET 0x4e > #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 > @@ -88,15 +93,20 @@ > #define MLXPLAT_CPLD_LPC_REG_PSU_OFFSET 0x58 > #define MLXPLAT_CPLD_LPC_REG_PSU_EVENT_OFFSET 0x59 > #define MLXPLAT_CPLD_LPC_REG_PSU_MASK_OFFSET 0x5a > +#define MLXPLAT_CPLD_LPC_REG_PSU_AC_OFFSET 0x5e > #define MLXPLAT_CPLD_LPC_REG_PWR_OFFSET 0x64 > #define MLXPLAT_CPLD_LPC_REG_PWR_EVENT_OFFSET 0x65 > #define MLXPLAT_CPLD_LPC_REG_PWR_MASK_OFFSET 0x66 > +#define MLXPLAT_CPLD_LPC_REG_PSU_ALERT_OFFSET 0x6a > #define MLXPLAT_CPLD_LPC_REG_LC_IN_OFFSET 0x70 > #define MLXPLAT_CPLD_LPC_REG_LC_IN_EVENT_OFFSET 0x71 > #define MLXPLAT_CPLD_LPC_REG_LC_IN_MASK_OFFSET 0x72 > #define MLXPLAT_CPLD_LPC_REG_FAN_OFFSET 0x88 > #define MLXPLAT_CPLD_LPC_REG_FAN_EVENT_OFFSET 0x89 > #define MLXPLAT_CPLD_LPC_REG_FAN_MASK_OFFSET 0x8a > +#define MLXPLAT_CPLD_LPC_REG_FAN2_OFFSET 0x8b > +#define MLXPLAT_CPLD_LPC_REG_FAN2_EVENT_OFFSET 0x8c > +#define MLXPLAT_CPLD_LPC_REG_FAN2_MASK_OFFSET 0x8d > #define MLXPLAT_CPLD_LPC_REG_CPLD5_VER_OFFSET 0x8e > #define MLXPLAT_CPLD_LPC_REG_CPLD5_PN_OFFSET 0x8f > #define MLXPLAT_CPLD_LPC_REG_CPLD5_PN1_OFFSET 0x90 > @@ -128,10 +138,15 @@ > #define MLXPLAT_CPLD_LPC_REG_LC_SD_EVENT_OFFSET 0xaa > #define MLXPLAT_CPLD_LPC_REG_LC_SD_MASK_OFFSET 0xab > #define MLXPLAT_CPLD_LPC_REG_LC_PWR_ON 0xb2 > +#define MLXPLAT_CPLD_LPC_REG_TACHO19_OFFSET 0xb4 > +#define MLXPLAT_CPLD_LPC_REG_TACHO20_OFFSET 0xb5 > #define MLXPLAT_CPLD_LPC_REG_DBG1_OFFSET 0xb6 > #define MLXPLAT_CPLD_LPC_REG_DBG2_OFFSET 0xb7 > #define MLXPLAT_CPLD_LPC_REG_DBG3_OFFSET 0xb8 > #define MLXPLAT_CPLD_LPC_REG_DBG4_OFFSET 0xb9 > +#define MLXPLAT_CPLD_LPC_REG_TACHO17_OFFSET 0xba > +#define MLXPLAT_CPLD_LPC_REG_TACHO18_OFFSET 0xbb > +#define MLXPLAT_CPLD_LPC_REG_ASIC_CAP_OFFSET 0xc1 > #define MLXPLAT_CPLD_LPC_REG_GP4_RO_OFFSET 0xc2 > #define MLXPLAT_CPLD_LPC_REG_SPI_CHNL_SELECT 0xc3 > #define MLXPLAT_CPLD_LPC_REG_CPLD5_MVER_OFFSET 0xc4 > @@ -182,6 +197,9 @@ > #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_REG_TACHO15_OFFSET 0xfe > +#define MLXPLAT_CPLD_LPC_REG_TACHO16_OFFSET 0xff > + > #define MLXPLAT_CPLD_LPC_IO_RANGE 0x100 > > #define MLXPLAT_CPLD_LPC_PIO_OFFSET 0x10000UL > @@ -210,9 +228,15 @@ > #define MLXPLAT_CPLD_AGGR_MASK_NG_DEF 0x04 > #define MLXPLAT_CPLD_AGGR_MASK_COMEX BIT(0) > #define MLXPLAT_CPLD_AGGR_MASK_LC BIT(3) > +#define MLXPLAT_CPLD_AGGR_MASK_DPU_BRD BIT(4) > +#define MLXPLAT_CPLD_AGGR_MASK_DPU_CORE BIT(5) > #define MLXPLAT_CPLD_AGGR_MASK_MODULAR (MLXPLAT_CPLD_AGGR_MASK_NG_DEF | \ > MLXPLAT_CPLD_AGGR_MASK_COMEX | \ > MLXPLAT_CPLD_AGGR_MASK_LC) > +#define MLXPLAT_CPLD_AGGR_MASK_SMART_SW (MLXPLAT_CPLD_AGGR_MASK_COMEX | \ > + MLXPLAT_CPLD_AGGR_MASK_NG_DEF | \ > + MLXPLAT_CPLD_AGGR_MASK_DPU_BRD | \ > + MLXPLAT_CPLD_AGGR_MASK_DPU_CORE) > #define MLXPLAT_CPLD_AGGR_MASK_LC_PRSNT BIT(0) > #define MLXPLAT_CPLD_AGGR_MASK_LC_RDY BIT(1) > #define MLXPLAT_CPLD_AGGR_MASK_LC_PG BIT(2) > @@ -235,15 +259,24 @@ > #define MLXPLAT_CPLD_PWR_MASK GENMASK(1, 0) > #define MLXPLAT_CPLD_PSU_EXT_MASK GENMASK(3, 0) > #define MLXPLAT_CPLD_PWR_EXT_MASK GENMASK(3, 0) > +#define MLXPLAT_CPLD_PSU_XDR_MASK GENMASK(7, 0) > +#define MLXPLAT_CPLD_PWR_XDR_MASK GENMASK(7, 0) > #define MLXPLAT_CPLD_FAN_MASK GENMASK(3, 0) > #define MLXPLAT_CPLD_ASIC_MASK GENMASK(1, 0) > +#define MLXPLAT_CPLD_ASIC_XDR_MASK GENMASK(3, 0) > #define MLXPLAT_CPLD_FAN_NG_MASK GENMASK(6, 0) > +#define MLXPLAT_CPLD_FAN_XDR_MASK GENMASK(7, 0) > #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_EROT_MASK GENMASK(1, 0) > #define MLXPLAT_CPLD_FU_CAP_MASK GENMASK(1, 0) > +#define MLXPLAT_CPLD_PSU_CAP_MASK GENMASK(7, 0) > +#define MLXPLAT_CPLD_FAN_CAP_MASK GENMASK(7, 0) > +#define MLXPLAT_CPLD_ASIC_CAP_MASK GENMASK(7, 0) > +#define MLXPLAT_CPLD_BIOS_STATUS_MASK GENMASK(3, 1) > +#define MLXPLAT_CPLD_DPU_MASK GENMASK(3, 0) > #define MLXPLAT_CPLD_PWR_BUTTON_MASK BIT(0) > #define MLXPLAT_CPLD_LATCH_RST_MASK BIT(6) > #define MLXPLAT_CPLD_THERMAL1_PDB_MASK BIT(3) > @@ -267,6 +300,9 @@ > /* Masks for aggregation for modular systems */ > #define MLXPLAT_CPLD_LPC_LC_MASK GENMASK(7, 0) > > +/* Masks for aggregation for smart switch systems */ > +#define MLXPLAT_CPLD_LPC_SM_SW_MASK GENMASK(7, 0) > + > #define MLXPLAT_CPLD_HALT_MASK BIT(3) > #define MLXPLAT_CPLD_RESET_MASK GENMASK(7, 1) > > @@ -297,15 +333,18 @@ > #define MLXPLAT_CPLD_NR_NONE -1 > #define MLXPLAT_CPLD_PSU_DEFAULT_NR 10 > #define MLXPLAT_CPLD_PSU_MSNXXXX_NR 4 > +#define MLXPLAT_CPLD_PSU_XDR_NR 3 > #define MLXPLAT_CPLD_FAN1_DEFAULT_NR 11 > #define MLXPLAT_CPLD_FAN2_DEFAULT_NR 12 > #define MLXPLAT_CPLD_FAN3_DEFAULT_NR 13 > #define MLXPLAT_CPLD_FAN4_DEFAULT_NR 14 > #define MLXPLAT_CPLD_NR_ASIC 3 > #define MLXPLAT_CPLD_NR_LC_BASE 34 > +#define MLXPLAT_CPLD_NR_DPU_BASE 18 > > #define MLXPLAT_CPLD_NR_LC_SET(nr) (MLXPLAT_CPLD_NR_LC_BASE + (nr)) > #define MLXPLAT_CPLD_LC_ADDR 0x32 > +#define MLXPLAT_CPLD_DPU_ADDR 0x68 > > /* Masks and default values for watchdogs */ > #define MLXPLAT_CPLD_WD1_CLEAR_MASK GENMASK(7, 1) > @@ -320,6 +359,7 @@ > #define MLXPLAT_CPLD_WD_DFLT_TIMEOUT 30 > #define MLXPLAT_CPLD_WD3_DFLT_TIMEOUT 600 > #define MLXPLAT_CPLD_WD_MAX_DEVS 2 > +#define MLXPLAT_CPLD_DPU_MAX_DEVS 4 > > #define MLXPLAT_CPLD_LPC_SYSIRQ 17 > > @@ -346,6 +386,7 @@ > * @pdev_io_regs - register access platform devices > * @pdev_fan - FAN platform devices > * @pdev_wd - array of watchdog platform devices > + * pdev_dpu - array of Data Processor Unit platform devices > * @regmap: device register map > * @hotplug_resources: system hotplug resources > * @hotplug_resources_size: size of system hotplug resources > @@ -360,6 +401,7 @@ struct mlxplat_priv { > struct platform_device *pdev_io_regs; > struct platform_device *pdev_fan; > struct platform_device *pdev_wd[MLXPLAT_CPLD_WD_MAX_DEVS]; > + struct platform_device *pdev_dpu[MLXPLAT_CPLD_DPU_MAX_DEVS]; > void *regmap; > struct resource *hotplug_resources; > unsigned int hotplug_resources_size; > @@ -626,6 +668,21 @@ static struct i2c_board_info mlxplat_mlxcpld_pwr_ng800[] = { > }, > }; > > +static struct i2c_board_info mlxplat_mlxcpld_xdr_pwr[] = { > + { > + I2C_BOARD_INFO("dps460", 0x5d), > + }, > + { > + I2C_BOARD_INFO("dps460", 0x5c), > + }, > + { > + I2C_BOARD_INFO("dps460", 0x5e), > + }, > + { > + I2C_BOARD_INFO("dps460", 0x5f), > + }, > +}; > + > static struct i2c_board_info mlxplat_mlxcpld_fan[] = { > { > I2C_BOARD_INFO("24c32", 0x50), > @@ -2370,205 +2427,665 @@ struct mlxreg_core_hotplug_platform_data mlxplat_mlxcpld_rack_switch_data = { > .mask_low = MLXPLAT_CPLD_LOW_AGGR_MASK_LOW, > }; > > -/* Callback performs graceful shutdown after notification about power button event */ > -static int > -mlxplat_mlxcpld_l1_switch_pwr_events_handler(void *handle, enum mlxreg_hotplug_kind kind, > - u8 action) > -{ > - if (action) { > - dev_info(&mlxplat_dev->dev, "System shutdown due to short press of power button"); > - kernel_power_off(); > - } > - > - return 0; > -} > - > -static struct mlxreg_core_hotplug_notifier mlxplat_mlxcpld_l1_switch_pwr_events_notifier = { > - .user_handler = mlxplat_mlxcpld_l1_switch_pwr_events_handler, > -}; > - > -/* Platform hotplug for l1 switch systems family data */ > -static struct mlxreg_core_data mlxplat_mlxcpld_l1_switch_pwr_events_items_data[] = { > +/* Platform hotplug XDR and smart switch system family data */ > +static struct mlxreg_core_data mlxplat_mlxcpld_xdr_psu_items_data[] = { > { > - .label = "power_button", > - .reg = MLXPLAT_CPLD_LPC_REG_PWRB_OFFSET, > - .mask = MLXPLAT_CPLD_PWR_BUTTON_MASK, > + .label = "psu1", > + .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET, > + .mask = BIT(0), > + .slot = 1, > + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, > + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, > .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > - .hpdev.action = MLXREG_HOTPLUG_DEVICE_NO_ACTION, > - .hpdev.notifier = &mlxplat_mlxcpld_l1_switch_pwr_events_notifier, > }, > -}; > - > -/* Callback activates latch reset flow after notification about intrusion event */ > -static int > -mlxplat_mlxcpld_l1_switch_intrusion_events_handler(void *handle, enum mlxreg_hotplug_kind kind, > - u8 action) > -{ > - struct mlxplat_priv *priv = platform_get_drvdata(mlxplat_dev); > - u32 regval; > - int err; > - > - err = regmap_read(priv->regmap, MLXPLAT_CPLD_LPC_REG_GP1_OFFSET, ®val); > - if (err) > - goto fail_regmap_read; > - > - if (action) { > - dev_info(&mlxplat_dev->dev, "Detected intrusion - system latch is opened"); > - err = regmap_write(priv->regmap, MLXPLAT_CPLD_LPC_REG_GP1_OFFSET, > - regval | MLXPLAT_CPLD_LATCH_RST_MASK); > - } else { > - dev_info(&mlxplat_dev->dev, "System latch is properly closed"); > - err = regmap_write(priv->regmap, MLXPLAT_CPLD_LPC_REG_GP1_OFFSET, > - regval & ~MLXPLAT_CPLD_LATCH_RST_MASK); > - } > - > - if (err) > - goto fail_regmap_write; > - > - return 0; > - > -fail_regmap_read: > -fail_regmap_write: > - dev_err(&mlxplat_dev->dev, "Register access failed"); > - return err; > -} > - > -static struct mlxreg_core_hotplug_notifier mlxplat_mlxcpld_l1_switch_intrusion_events_notifier = { > - .user_handler = mlxplat_mlxcpld_l1_switch_intrusion_events_handler, > -}; > - > -static struct mlxreg_core_data mlxplat_mlxcpld_l1_switch_health_events_items_data[] = { > { > - .label = "thermal1_pdb", > - .reg = MLXPLAT_CPLD_LPC_REG_BRD_OFFSET, > - .mask = MLXPLAT_CPLD_THERMAL1_PDB_MASK, > + .label = "psu2", > + .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET, > + .mask = BIT(1), > + .slot = 2, > + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, > + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, > .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > }, > { > - .label = "thermal2_pdb", > - .reg = MLXPLAT_CPLD_LPC_REG_BRD_OFFSET, > - .mask = MLXPLAT_CPLD_THERMAL2_PDB_MASK, > + .label = "psu3", > + .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET, > + .mask = BIT(2), > + .slot = 3, > + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, > + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, > .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > }, Why's the diff such a mess in this patch? Are you perhaps doing two things in this patch, that is, reorganizing the existing code/structs and adding new stuff? If that's the case, please try to do the reorganization in another patch before this one so the diff spaghetti is hopefully avoided. -- i. > { > - .label = "intrusion", > - .reg = MLXPLAT_CPLD_LPC_REG_BRD_OFFSET, > - .mask = MLXPLAT_CPLD_INTRUSION_MASK, > + .label = "psu4", > + .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET, > + .mask = BIT(3), > + .slot = 4, > + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, > + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, > .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > - .hpdev.action = MLXREG_HOTPLUG_DEVICE_NO_ACTION, > - .hpdev.notifier = &mlxplat_mlxcpld_l1_switch_intrusion_events_notifier, > }, > { > - .label = "pwm_pg", > - .reg = MLXPLAT_CPLD_LPC_REG_BRD_OFFSET, > - .mask = MLXPLAT_CPLD_PWM_PG_MASK, > + .label = "psu5", > + .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET, > + .mask = BIT(4), > + .slot = 5, > + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, > + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, > .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > }, > -}; > - > -static struct mlxreg_core_item mlxplat_mlxcpld_l1_switch_events_items[] = { > - { > - .data = mlxplat_mlxcpld_default_ng_fan_items_data, > - .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, > - .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > - .mask = MLXPLAT_CPLD_FAN_NG_MASK, > - .count = ARRAY_SIZE(mlxplat_mlxcpld_default_ng_fan_items_data), > - .inversed = 1, > - .health = false, > - }, > - { > - .data = mlxplat_mlxcpld_erot_ap_items_data, > - .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, > - .reg = MLXPLAT_CPLD_LPC_REG_EROT_OFFSET, > - .mask = MLXPLAT_CPLD_EROT_MASK, > - .count = ARRAY_SIZE(mlxplat_mlxcpld_erot_ap_items_data), > - .inversed = 1, > - .health = false, > - }, > { > - .data = mlxplat_mlxcpld_erot_error_items_data, > - .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, > - .reg = MLXPLAT_CPLD_LPC_REG_EROTE_OFFSET, > - .mask = MLXPLAT_CPLD_EROT_MASK, > - .count = ARRAY_SIZE(mlxplat_mlxcpld_erot_error_items_data), > - .inversed = 1, > - .health = false, > + .label = "psu6", > + .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET, > + .mask = BIT(5), > + .slot = 6, > + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, > + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > }, > { > - .data = mlxplat_mlxcpld_l1_switch_pwr_events_items_data, > - .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, > - .reg = MLXPLAT_CPLD_LPC_REG_PWRB_OFFSET, > - .mask = MLXPLAT_CPLD_PWR_BUTTON_MASK, > - .count = ARRAY_SIZE(mlxplat_mlxcpld_l1_switch_pwr_events_items_data), > - .inversed = 1, > - .health = false, > + .label = "psu7", > + .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET, > + .mask = BIT(6), > + .slot = 7, > + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, > + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > }, > { > - .data = mlxplat_mlxcpld_l1_switch_health_events_items_data, > - .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, > - .reg = MLXPLAT_CPLD_LPC_REG_BRD_OFFSET, > - .mask = MLXPLAT_CPLD_L1_CHA_HEALTH_MASK, > - .count = ARRAY_SIZE(mlxplat_mlxcpld_l1_switch_health_events_items_data), > - .inversed = 1, > - .health = false, > - .ind = 8, > + .label = "psu8", > + .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET, > + .mask = BIT(7), > + .slot = 8, > + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, > + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > }, > }; > > -static > -struct mlxreg_core_hotplug_platform_data mlxplat_mlxcpld_l1_switch_data = { > - .items = mlxplat_mlxcpld_l1_switch_events_items, > - .counter = ARRAY_SIZE(mlxplat_mlxcpld_l1_switch_events_items), > - .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 | MLXPLAT_CPLD_LOW_AGGR_MASK_PWR_BUT, > -}; > - > -/* Platform led default data */ > -static struct mlxreg_core_data mlxplat_mlxcpld_default_led_data[] = { > +static struct mlxreg_core_data mlxplat_mlxcpld_xdr_pwr_items_data[] = { > { > - .label = "status:green", > - .reg = MLXPLAT_CPLD_LPC_REG_LED1_OFFSET, > - .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > + .label = "pwr1", > + .reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET, > + .mask = BIT(0), > + .slot = 1, > + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, > + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, > + .hpdev.brdinfo = &mlxplat_mlxcpld_pwr[0], > + .hpdev.nr = MLXPLAT_CPLD_PSU_MSNXXXX_NR, > }, > { > - .label = "status:red", > - .reg = MLXPLAT_CPLD_LPC_REG_LED1_OFFSET, > - .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK > + .label = "pwr2", > + .reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET, > + .mask = BIT(1), > + .slot = 2, > + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, > + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, > + .hpdev.brdinfo = &mlxplat_mlxcpld_pwr[1], > + .hpdev.nr = MLXPLAT_CPLD_PSU_MSNXXXX_NR, > }, > { > - .label = "psu:green", > - .reg = MLXPLAT_CPLD_LPC_REG_LED1_OFFSET, > - .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > + .label = "pwr3", > + .reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET, > + .mask = BIT(2), > + .slot = 3, > + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, > + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, > + .hpdev.brdinfo = &mlxplat_mlxcpld_ext_pwr[0], > + .hpdev.nr = MLXPLAT_CPLD_PSU_MSNXXXX_NR, > }, > { > - .label = "psu:red", > - .reg = MLXPLAT_CPLD_LPC_REG_LED1_OFFSET, > - .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > + .label = "pwr4", > + .reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET, > + .mask = BIT(3), > + .slot = 4, > + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, > + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, > + .hpdev.brdinfo = &mlxplat_mlxcpld_ext_pwr[1], > + .hpdev.nr = MLXPLAT_CPLD_PSU_MSNXXXX_NR, > }, > { > - .label = "fan1:green", > - .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET, > - .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > + .label = "pwr5", > + .reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET, > + .mask = BIT(4), > + .slot = 5, > + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, > + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, > + .hpdev.brdinfo = &mlxplat_mlxcpld_xdr_pwr[0], > + .hpdev.nr = MLXPLAT_CPLD_PSU_XDR_NR, > }, > { > - .label = "fan1:red", > - .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET, > - .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > + .label = "pwr6", > + .reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET, > + .mask = BIT(5), > + .slot = 6, > + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, > + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, > + .hpdev.brdinfo = &mlxplat_mlxcpld_xdr_pwr[1], > + .hpdev.nr = MLXPLAT_CPLD_PSU_XDR_NR, > }, > { > - .label = "fan2:green", > - .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET, > - .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > + .label = "pwr7", > + .reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET, > + .mask = BIT(6), > + .slot = 7, > + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, > + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, > + .hpdev.brdinfo = &mlxplat_mlxcpld_xdr_pwr[2], > + .hpdev.nr = MLXPLAT_CPLD_PSU_XDR_NR, > }, > { > - .label = "fan2:red", > - .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET, > - .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > + .label = "pwr8", > + .reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET, > + .mask = BIT(7), > + .slot = 8, > + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, > + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, > + .hpdev.brdinfo = &mlxplat_mlxcpld_xdr_pwr[3], > + .hpdev.nr = MLXPLAT_CPLD_PSU_XDR_NR, > }, > +}; > + > +static struct mlxreg_core_data mlxplat_mlxcpld_xdr_fan_items_data[] = { > { > - .label = "fan3:green", > + .label = "fan1", > + .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > + .mask = BIT(0), > + .slot = 1, > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > + .capability_mask = MLXPLAT_CPLD_FAN_XDR_MASK, > + .bit = BIT(0), > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > + }, > + { > + .label = "fan2", > + .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > + .mask = BIT(1), > + .slot = 2, > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > + .capability_mask = MLXPLAT_CPLD_FAN_XDR_MASK, > + .bit = BIT(1), > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > + }, > + { > + .label = "fan3", > + .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > + .mask = BIT(2), > + .slot = 3, > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > + .capability_mask = MLXPLAT_CPLD_FAN_XDR_MASK, > + .bit = BIT(2), > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > + }, > + { > + .label = "fan4", > + .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > + .mask = BIT(3), > + .slot = 4, > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > + .capability_mask = MLXPLAT_CPLD_FAN_XDR_MASK, > + .bit = BIT(3), > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > + }, > + { > + .label = "fan5", > + .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > + .mask = BIT(4), > + .slot = 5, > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > + .capability_mask = MLXPLAT_CPLD_FAN_XDR_MASK, > + .bit = BIT(4), > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > + }, > + { > + .label = "fan6", > + .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > + .mask = BIT(5), > + .slot = 6, > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > + .capability_mask = MLXPLAT_CPLD_FAN_XDR_MASK, > + .bit = BIT(5), > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > + }, > + { > + .label = "fan7", > + .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > + .mask = BIT(6), > + .slot = 7, > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > + .capability_mask = MLXPLAT_CPLD_FAN_XDR_MASK, > + .bit = BIT(6), > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > + }, > + { > + .label = "fan8", > + .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > + .mask = BIT(7), > + .slot = 8, > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > + .capability_mask = MLXPLAT_CPLD_FAN_XDR_MASK, > + .bit = BIT(7), > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > + }, > +}; > + > +static struct mlxreg_core_data mlxplat_mlxcpld_xdr_asic1_items_data[] = { > + { > + .label = "asic1", > + .reg = MLXPLAT_CPLD_LPC_REG_ASIC_HEALTH_OFFSET, > + .mask = MLXPLAT_CPLD_ASIC_MASK, > + .slot = 1, > + .capability = MLXPLAT_CPLD_LPC_REG_ASIC_CAP_OFFSET, > + .capability_mask = MLXPLAT_CPLD_ASIC_CAP_MASK, > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > + } > +}; > + > +/* Platform hotplug for smart switch systems families data */ > +static struct mlxreg_core_data mlxplat_mlxcpld_smart_switch_dpu_ready_data[] = { > + { > + .label = "dpu1_ready", > + .reg = MLXPLAT_CPLD_LPC_REG_LC_RD_OFFSET, > + .mask = BIT(0), > + .slot = 1, > + .capability = MLXPLAT_CPLD_LPC_REG_SLOT_QTY_OFFSET, > + .capability_mask = MLXPLAT_CPLD_DPU_MASK, > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > + }, > + { > + .label = "dpu2_ready", > + .reg = MLXPLAT_CPLD_LPC_REG_LC_RD_OFFSET, > + .mask = BIT(1), > + .slot = 2, > + .capability = MLXPLAT_CPLD_LPC_REG_SLOT_QTY_OFFSET, > + .capability_mask = MLXPLAT_CPLD_DPU_MASK, > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > + }, > + { > + .label = "dpu3_ready", > + .reg = MLXPLAT_CPLD_LPC_REG_LC_RD_OFFSET, > + .mask = BIT(2), > + .slot = 3, > + .capability = MLXPLAT_CPLD_LPC_REG_SLOT_QTY_OFFSET, > + .capability_mask = MLXPLAT_CPLD_DPU_MASK, > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > + }, > + { > + .label = "dpu4_ready", > + .reg = MLXPLAT_CPLD_LPC_REG_LC_RD_OFFSET, > + .mask = BIT(3), > + .slot = 4, > + .capability = MLXPLAT_CPLD_LPC_REG_SLOT_QTY_OFFSET, > + .capability_mask = MLXPLAT_CPLD_DPU_MASK, > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > + }, > +}; > + > +static struct mlxreg_core_data mlxplat_mlxcpld_smart_switch_dpu_shtdn_ready_data[] = { > + { > + .label = "dpu1_shtdn_ready", > + .reg = MLXPLAT_CPLD_LPC_REG_LC_SN_OFFSET, > + .mask = BIT(0), > + .slot = 1, > + .capability = MLXPLAT_CPLD_LPC_REG_SLOT_QTY_OFFSET, > + .capability_mask = MLXPLAT_CPLD_DPU_MASK, > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > + }, > + { > + .label = "dpu2_shtdn_ready", > + .reg = MLXPLAT_CPLD_LPC_REG_LC_SN_OFFSET, > + .mask = BIT(1), > + .slot = 2, > + .capability = MLXPLAT_CPLD_LPC_REG_SLOT_QTY_OFFSET, > + .capability_mask = MLXPLAT_CPLD_DPU_MASK, > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > + }, > + { > + .label = "dpu3_shtdn_ready", > + .reg = MLXPLAT_CPLD_LPC_REG_LC_SN_OFFSET, > + .mask = BIT(2), > + .slot = 3, > + .capability = MLXPLAT_CPLD_LPC_REG_SLOT_QTY_OFFSET, > + .capability_mask = MLXPLAT_CPLD_DPU_MASK, > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > + }, > + { > + .label = "dpu4_shtdn_ready", > + .reg = MLXPLAT_CPLD_LPC_REG_LC_SN_OFFSET, > + .mask = BIT(3), > + .slot = 4, > + .capability = MLXPLAT_CPLD_LPC_REG_SLOT_QTY_OFFSET, > + .capability_mask = MLXPLAT_CPLD_DPU_MASK, > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > + }, > +}; > + > +static struct mlxreg_core_item mlxplat_mlxcpld_smart_switch_items[] = { > + { > + .data = mlxplat_mlxcpld_xdr_psu_items_data, > + .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, > + .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET, > + .mask = MLXPLAT_CPLD_PSU_XDR_MASK, > + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, > + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, > + .count = ARRAY_SIZE(mlxplat_mlxcpld_xdr_psu_items_data), > + .inversed = 1, > + .health = false, > + }, > + { > + .data = mlxplat_mlxcpld_xdr_pwr_items_data, > + .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, > + .reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET, > + .mask = MLXPLAT_CPLD_PWR_XDR_MASK, > + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, > + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, > + .count = ARRAY_SIZE(mlxplat_mlxcpld_xdr_pwr_items_data), > + .inversed = 0, > + .health = false, > + }, > + { > + .data = mlxplat_mlxcpld_xdr_fan_items_data, > + .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, > + .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > + .mask = MLXPLAT_CPLD_FAN_XDR_MASK, > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > + .capability_mask = MLXPLAT_CPLD_FAN_CAP_MASK, > + .count = ARRAY_SIZE(mlxplat_mlxcpld_xdr_fan_items_data), > + .inversed = 1, > + .health = false, > + }, > + { > + .data = mlxplat_mlxcpld_xdr_asic1_items_data, > + .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, > + .reg = MLXPLAT_CPLD_LPC_REG_ASIC_HEALTH_OFFSET, > + .mask = MLXPLAT_CPLD_ASIC_XDR_MASK, > + .capability = MLXPLAT_CPLD_LPC_REG_ASIC_CAP_OFFSET, > + .capability_mask = MLXPLAT_CPLD_ASIC_CAP_MASK, > + .count = ARRAY_SIZE(mlxplat_mlxcpld_xdr_asic1_items_data), > + .inversed = 0, > + .health = true, > + }, > + { > + .data = mlxplat_mlxcpld_smart_switch_dpu_ready_data, > + .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_DPU_CORE, > + .reg = MLXPLAT_CPLD_LPC_REG_LC_RD_OFFSET, > + .mask = MLXPLAT_CPLD_DPU_MASK, > + .capability = MLXPLAT_CPLD_LPC_REG_SLOT_QTY_OFFSET, > + .capability_mask = MLXPLAT_CPLD_DPU_MASK, > + .count = ARRAY_SIZE(mlxplat_mlxcpld_smart_switch_dpu_ready_data), > + .inversed = 1, > + .health = false, > + }, > + { > + .data = mlxplat_mlxcpld_smart_switch_dpu_shtdn_ready_data, > + .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_DPU_CORE, > + .reg = MLXPLAT_CPLD_LPC_REG_LC_SN_OFFSET, > + .mask = MLXPLAT_CPLD_DPU_MASK, > + .capability = MLXPLAT_CPLD_LPC_REG_SLOT_QTY_OFFSET, > + .capability_mask = MLXPLAT_CPLD_DPU_MASK, > + .count = ARRAY_SIZE(mlxplat_mlxcpld_smart_switch_dpu_shtdn_ready_data), > + .inversed = 1, > + .health = false, > + }, > +}; > + > +static > +struct mlxreg_core_hotplug_platform_data mlxplat_mlxcpld_smart_switch_data = { > + .items = mlxplat_mlxcpld_smart_switch_items, > + .counter = ARRAY_SIZE(mlxplat_mlxcpld_smart_switch_items), > + .cell = MLXPLAT_CPLD_LPC_REG_AGGR_OFFSET, > + .mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF | MLXPLAT_CPLD_AGGR_MASK_COMEX | > + MLXPLAT_CPLD_AGGR_MASK_DPU_BRD | MLXPLAT_CPLD_AGGR_MASK_DPU_CORE, > + .cell_low = MLXPLAT_CPLD_LPC_REG_AGGRLO_OFFSET, > + .mask_low = MLXPLAT_CPLD_LOW_AGGR_MASK_LOW, > +}; > + > +/* Smart switch data processor units data */ > +static struct i2c_board_info mlxplat_mlxcpld_smart_switch_dpu_devs[] = { > + { > + I2C_BOARD_INFO("mlxreg-dpu", MLXPLAT_CPLD_DPU_ADDR), > + .irq = MLXPLAT_CPLD_LPC_SYSIRQ, > + }, > + { > + I2C_BOARD_INFO("mlxreg-dpu", MLXPLAT_CPLD_DPU_ADDR), > + .irq = MLXPLAT_CPLD_LPC_SYSIRQ, > + }, > + { > + I2C_BOARD_INFO("mlxreg-dpu", MLXPLAT_CPLD_DPU_ADDR), > + .irq = MLXPLAT_CPLD_LPC_SYSIRQ, > + }, > + { > + I2C_BOARD_INFO("mlxreg-dpu", MLXPLAT_CPLD_DPU_ADDR), > + .irq = MLXPLAT_CPLD_LPC_SYSIRQ, > + }, > +}; > + > +static struct mlxreg_core_data mlxplat_mlxcpld_smart_switch_dpu_data[] = { > + { > + .label = "dpu1", > + .hpdev.brdinfo = &mlxplat_mlxcpld_smart_switch_dpu_devs[0], > + .hpdev.nr = MLXPLAT_CPLD_NR_DPU_BASE, > + .slot = 1, > + }, > + { > + .label = "dpu2", > + .hpdev.brdinfo = &mlxplat_mlxcpld_smart_switch_dpu_devs[1], > + .hpdev.nr = MLXPLAT_CPLD_NR_DPU_BASE + 1, > + .slot = 2, > + }, > + { > + .label = "dpu3", > + .hpdev.brdinfo = &mlxplat_mlxcpld_smart_switch_dpu_devs[2], > + .hpdev.nr = MLXPLAT_CPLD_NR_DPU_BASE + 2, > + .slot = 3, > + }, > + { > + .label = "dpu4", > + .hpdev.brdinfo = &mlxplat_mlxcpld_smart_switch_dpu_devs[2], > + .hpdev.nr = MLXPLAT_CPLD_NR_DPU_BASE + 3, > + .slot = 4, > + }, > +}; > + > +/* Callback performs graceful shutdown after notification about power button event */ > +static int > +mlxplat_mlxcpld_l1_switch_pwr_events_handler(void *handle, enum mlxreg_hotplug_kind kind, > + u8 action) > +{ > + if (action) { > + dev_info(&mlxplat_dev->dev, "System shutdown due to short press of power button"); > + kernel_power_off(); > + } > + > + return 0; > +} > + > +static struct mlxreg_core_hotplug_notifier mlxplat_mlxcpld_l1_switch_pwr_events_notifier = { > + .user_handler = mlxplat_mlxcpld_l1_switch_pwr_events_handler, > +}; > + > +/* Platform hotplug for l1 switch systems family data */ > +static struct mlxreg_core_data mlxplat_mlxcpld_l1_switch_pwr_events_items_data[] = { > + { > + .label = "power_button", > + .reg = MLXPLAT_CPLD_LPC_REG_PWRB_OFFSET, > + .mask = MLXPLAT_CPLD_PWR_BUTTON_MASK, > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > + .hpdev.action = MLXREG_HOTPLUG_DEVICE_NO_ACTION, > + .hpdev.notifier = &mlxplat_mlxcpld_l1_switch_pwr_events_notifier, > + }, > +}; > + > +/* Callback activates latch reset flow after notification about intrusion event */ > +static int > +mlxplat_mlxcpld_l1_switch_intrusion_events_handler(void *handle, enum mlxreg_hotplug_kind kind, > + u8 action) > +{ > + struct mlxplat_priv *priv = platform_get_drvdata(mlxplat_dev); > + u32 regval; > + int err; > + > + err = regmap_read(priv->regmap, MLXPLAT_CPLD_LPC_REG_GP1_OFFSET, ®val); > + if (err) > + goto fail_regmap_read; > + > + if (action) { > + dev_info(&mlxplat_dev->dev, "Detected intrusion - system latch is opened"); > + err = regmap_write(priv->regmap, MLXPLAT_CPLD_LPC_REG_GP1_OFFSET, > + regval | MLXPLAT_CPLD_LATCH_RST_MASK); > + } else { > + dev_info(&mlxplat_dev->dev, "System latch is properly closed"); > + err = regmap_write(priv->regmap, MLXPLAT_CPLD_LPC_REG_GP1_OFFSET, > + regval & ~MLXPLAT_CPLD_LATCH_RST_MASK); > + } > + > + if (err) > + goto fail_regmap_write; > + > + return 0; > + > +fail_regmap_read: > +fail_regmap_write: > + dev_err(&mlxplat_dev->dev, "Register access failed"); > + return err; > +} > + > +static struct mlxreg_core_hotplug_notifier mlxplat_mlxcpld_l1_switch_intrusion_events_notifier = { > + .user_handler = mlxplat_mlxcpld_l1_switch_intrusion_events_handler, > +}; > + > +static struct mlxreg_core_data mlxplat_mlxcpld_l1_switch_health_events_items_data[] = { > + { > + .label = "thermal1_pdb", > + .reg = MLXPLAT_CPLD_LPC_REG_BRD_OFFSET, > + .mask = MLXPLAT_CPLD_THERMAL1_PDB_MASK, > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > + }, > + { > + .label = "thermal2_pdb", > + .reg = MLXPLAT_CPLD_LPC_REG_BRD_OFFSET, > + .mask = MLXPLAT_CPLD_THERMAL2_PDB_MASK, > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > + }, > + { > + .label = "intrusion", > + .reg = MLXPLAT_CPLD_LPC_REG_BRD_OFFSET, > + .mask = MLXPLAT_CPLD_INTRUSION_MASK, > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > + .hpdev.action = MLXREG_HOTPLUG_DEVICE_NO_ACTION, > + .hpdev.notifier = &mlxplat_mlxcpld_l1_switch_intrusion_events_notifier, > + }, > + { > + .label = "pwm_pg", > + .reg = MLXPLAT_CPLD_LPC_REG_BRD_OFFSET, > + .mask = MLXPLAT_CPLD_PWM_PG_MASK, > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > + }, > +}; > + > +static struct mlxreg_core_item mlxplat_mlxcpld_l1_switch_events_items[] = { > + { > + .data = mlxplat_mlxcpld_default_ng_fan_items_data, > + .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, > + .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > + .mask = MLXPLAT_CPLD_FAN_NG_MASK, > + .count = ARRAY_SIZE(mlxplat_mlxcpld_default_ng_fan_items_data), > + .inversed = 1, > + .health = false, > + }, > + { > + .data = mlxplat_mlxcpld_erot_ap_items_data, > + .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, > + .reg = MLXPLAT_CPLD_LPC_REG_EROT_OFFSET, > + .mask = MLXPLAT_CPLD_EROT_MASK, > + .count = ARRAY_SIZE(mlxplat_mlxcpld_erot_ap_items_data), > + .inversed = 1, > + .health = false, > + }, > + { > + .data = mlxplat_mlxcpld_erot_error_items_data, > + .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, > + .reg = MLXPLAT_CPLD_LPC_REG_EROTE_OFFSET, > + .mask = MLXPLAT_CPLD_EROT_MASK, > + .count = ARRAY_SIZE(mlxplat_mlxcpld_erot_error_items_data), > + .inversed = 1, > + .health = false, > + }, > + { > + .data = mlxplat_mlxcpld_l1_switch_pwr_events_items_data, > + .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, > + .reg = MLXPLAT_CPLD_LPC_REG_PWRB_OFFSET, > + .mask = MLXPLAT_CPLD_PWR_BUTTON_MASK, > + .count = ARRAY_SIZE(mlxplat_mlxcpld_l1_switch_pwr_events_items_data), > + .inversed = 1, > + .health = false, > + }, > + { > + .data = mlxplat_mlxcpld_l1_switch_health_events_items_data, > + .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, > + .reg = MLXPLAT_CPLD_LPC_REG_BRD_OFFSET, > + .mask = MLXPLAT_CPLD_L1_CHA_HEALTH_MASK, > + .count = ARRAY_SIZE(mlxplat_mlxcpld_l1_switch_health_events_items_data), > + .inversed = 1, > + .health = false, > + .ind = 8, > + }, > +}; > + > +static > +struct mlxreg_core_hotplug_platform_data mlxplat_mlxcpld_l1_switch_data = { > + .items = mlxplat_mlxcpld_l1_switch_events_items, > + .counter = ARRAY_SIZE(mlxplat_mlxcpld_l1_switch_events_items), > + .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 | MLXPLAT_CPLD_LOW_AGGR_MASK_PWR_BUT, > +}; > + > +/* Platform led default data */ > +static struct mlxreg_core_data mlxplat_mlxcpld_default_led_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 > + }, > + { > + .label = "psu:green", > + .reg = MLXPLAT_CPLD_LPC_REG_LED1_OFFSET, > + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > + }, > + { > + .label = "psu:red", > + .reg = MLXPLAT_CPLD_LPC_REG_LED1_OFFSET, > + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > + }, > + { > + .label = "fan1:green", > + .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET, > + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > + }, > + { > + .label = "fan1:red", > + .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET, > + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > + }, > + { > + .label = "fan2:green", > + .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET, > + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > + }, > + { > + .label = "fan2:red", > + .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET, > + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > + }, > + { > + .label = "fan3:green", > .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET, > .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > }, > @@ -3088,67 +3605,241 @@ static struct mlxreg_core_data mlxplat_mlxcpld_l1_switch_led_data[] = { > .bit = BIT(1), > }, > { > - .label = "fan2:orange", > - .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET, > + .label = "fan2:orange", > + .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET, > + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > + .bit = BIT(1), > + }, > + { > + .label = "fan3:green", > + .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET, > + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > + .bit = BIT(2), > + }, > + { > + .label = "fan3:orange", > + .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET, > + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > + .bit = BIT(2), > + }, > + { > + .label = "fan4:green", > + .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET, > + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > + .bit = BIT(3), > + }, > + { > + .label = "fan4:orange", > + .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET, > + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > + .bit = BIT(3), > + }, > + { > + .label = "fan5:green", > + .reg = MLXPLAT_CPLD_LPC_REG_LED4_OFFSET, > + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > + .bit = BIT(4), > + }, > + { > + .label = "fan5:orange", > + .reg = MLXPLAT_CPLD_LPC_REG_LED4_OFFSET, > + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > + .bit = BIT(4), > + }, > + { > + .label = "fan6:green", > + .reg = MLXPLAT_CPLD_LPC_REG_LED4_OFFSET, > + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > + .bit = BIT(5), > + }, > + { > + .label = "fan6:orange", > + .reg = MLXPLAT_CPLD_LPC_REG_LED4_OFFSET, > + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > + .bit = BIT(5), > + }, > + { > + .label = "uid:blue", > + .reg = MLXPLAT_CPLD_LPC_REG_LED5_OFFSET, > + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > + }, > +}; > + > +static struct mlxreg_core_platform_data mlxplat_l1_switch_led_data = { > + .data = mlxplat_mlxcpld_l1_switch_led_data, > + .counter = ARRAY_SIZE(mlxplat_mlxcpld_l1_switch_led_data), > +}; > + > +/* Platform led data for XDR and smart switch systems */ > +static struct mlxreg_core_data mlxplat_mlxcpld_xdr_led_data[] = { > + { > + .label = "status:green", > + .reg = MLXPLAT_CPLD_LPC_REG_LED1_OFFSET, > + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > + }, > + { > + .label = "status:orange", > + .reg = MLXPLAT_CPLD_LPC_REG_LED1_OFFSET, > + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK > + }, > + { > + .label = "psu:green", > + .reg = MLXPLAT_CPLD_LPC_REG_LED1_OFFSET, > + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > + }, > + { > + .label = "psu:orange", > + .reg = MLXPLAT_CPLD_LPC_REG_LED1_OFFSET, > + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > + }, > + { > + .label = "fan1:green", > + .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET, > + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > + .slot = 1, > + }, > + { > + .label = "fan1:orange", > + .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET, > + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > + .slot = 1, > + }, > + { > + .label = "fan2:green", > + .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET, > + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > + .slot = 2, > + }, > + { > + .label = "fan2:orange", > + .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET, > + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > + .slot = 2, > + }, > + { > + .label = "fan3:green", > + .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET, > + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > + .slot = 3, > + }, > + { > + .label = "fan3:orange", > + .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET, > + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > + .slot = 3, > + }, > + { > + .label = "fan4:green", > + .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET, > + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > + .slot = 4, > + }, > + { > + .label = "fan4:orange", > + .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET, > + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > + .slot = 4, > + }, > + { > + .label = "fan5:green", > + .reg = MLXPLAT_CPLD_LPC_REG_LED4_OFFSET, > + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > + .slot = 5, > + }, > + { > + .label = "fan5:orange", > + .reg = MLXPLAT_CPLD_LPC_REG_LED4_OFFSET, > + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > + .slot = 5, > + }, > + { > + .label = "fan6:green", > + .reg = MLXPLAT_CPLD_LPC_REG_LED4_OFFSET, > + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > + .slot = 6, > + }, > + { > + .label = "fan6:orange", > + .reg = MLXPLAT_CPLD_LPC_REG_LED4_OFFSET, > + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > + .slot = 6, > + }, > + { > + .label = "fan7:green", > + .reg = MLXPLAT_CPLD_LPC_REG_LED6_OFFSET, > + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > + .slot = 7, > + }, > + { > + .label = "fan7:orange", > + .reg = MLXPLAT_CPLD_LPC_REG_LED6_OFFSET, > .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > - .bit = BIT(1), > + .slot = 7, > }, > { > - .label = "fan3:green", > - .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET, > + .label = "fan8:green", > + .reg = MLXPLAT_CPLD_LPC_REG_LED7_OFFSET, > .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > - .bit = BIT(2), > + .slot = 8, > }, > { > - .label = "fan3:orange", > - .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET, > + .label = "fan8:orange", > + .reg = MLXPLAT_CPLD_LPC_REG_LED7_OFFSET, > .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > - .bit = BIT(2), > + .slot = 8, > }, > { > - .label = "fan4:green", > - .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET, > + .label = "fan9:green", > + .reg = MLXPLAT_CPLD_LPC_REG_LED7_OFFSET, > .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > - .bit = BIT(3), > + .slot = 9, > }, > { > - .label = "fan4:orange", > - .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET, > + .label = "fan9:orange", > + .reg = MLXPLAT_CPLD_LPC_REG_LED7_OFFSET, > .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > - .bit = BIT(3), > + .slot = 9, > }, > { > - .label = "fan5:green", > - .reg = MLXPLAT_CPLD_LPC_REG_LED4_OFFSET, > + .label = "fan10:green", > + .reg = MLXPLAT_CPLD_LPC_REG_LED8_OFFSET, > .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > - .bit = BIT(4), > + .slot = 10, > }, > { > - .label = "fan5:orange", > - .reg = MLXPLAT_CPLD_LPC_REG_LED4_OFFSET, > + .label = "fan10:orange", > + .reg = MLXPLAT_CPLD_LPC_REG_LED8_OFFSET, > .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > - .bit = BIT(4), > - }, > - { > - .label = "fan6:green", > - .reg = MLXPLAT_CPLD_LPC_REG_LED4_OFFSET, > - .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > - .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > - .bit = BIT(5), > - }, > - { > - .label = "fan6:orange", > - .reg = MLXPLAT_CPLD_LPC_REG_LED4_OFFSET, > - .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > - .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > - .bit = BIT(5), > + .slot = 10, > }, > { > .label = "uid:blue", > @@ -3157,9 +3848,9 @@ static struct mlxreg_core_data mlxplat_mlxcpld_l1_switch_led_data[] = { > }, > }; > > -static struct mlxreg_core_platform_data mlxplat_l1_switch_led_data = { > - .data = mlxplat_mlxcpld_l1_switch_led_data, > - .counter = ARRAY_SIZE(mlxplat_mlxcpld_l1_switch_led_data), > +static struct mlxreg_core_platform_data mlxplat_xdr_led_data = { > + .data = mlxplat_mlxcpld_xdr_led_data, > + .counter = ARRAY_SIZE(mlxplat_mlxcpld_xdr_led_data), > }; > > /* Platform register access default */ > @@ -4396,19 +5087,240 @@ static struct mlxreg_core_data mlxplat_mlxcpld_modular_regs_io_data[] = { > }, > }; > > -static struct mlxreg_core_platform_data mlxplat_modular_regs_io_data = { > - .data = mlxplat_mlxcpld_modular_regs_io_data, > - .counter = ARRAY_SIZE(mlxplat_mlxcpld_modular_regs_io_data), > +static struct mlxreg_core_platform_data mlxplat_modular_regs_io_data = { > + .data = mlxplat_mlxcpld_modular_regs_io_data, > + .counter = ARRAY_SIZE(mlxplat_mlxcpld_modular_regs_io_data), > +}; > + > +/* Platform register access for chassis blade systems family data */ > +static struct mlxreg_core_data mlxplat_mlxcpld_chassis_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 = "reset_long_pwr_pb", > + .reg = MLXPLAT_CPLD_LPC_REG_RST_CAUSE2_OFFSET, > + .mask = GENMASK(7, 0) & ~BIT(7), > + .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 = "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, > + .bit = GENMASK(7, 0), > + .mode = 0444, > + }, > +}; > + > +static struct mlxreg_core_platform_data mlxplat_chassis_blade_regs_io_data = { > + .data = mlxplat_mlxcpld_chassis_blade_regs_io_data, > + .counter = ARRAY_SIZE(mlxplat_mlxcpld_chassis_blade_regs_io_data), > }; > > -/* Platform register access for chassis blade systems family data */ > -static struct mlxreg_core_data mlxplat_mlxcpld_chassis_blade_regs_io_data[] = { > +/* Platform register access for smart switch systems families data */ > +static struct mlxreg_core_data mlxplat_mlxcpld_smart_switch_regs_io_data[] = { > { > .label = "cpld1_version", > .reg = MLXPLAT_CPLD_LPC_REG_CPLD1_VER_OFFSET, > .bit = GENMASK(7, 0), > .mode = 0444, > }, > + { > + .label = "cpld2_version", > + .reg = MLXPLAT_CPLD_LPC_REG_CPLD2_VER_OFFSET, > + .bit = GENMASK(7, 0), > + .mode = 0444, > + }, > + { > + .label = "cpld3_version", > + .reg = MLXPLAT_CPLD_LPC_REG_CPLD3_VER_OFFSET, > + .bit = GENMASK(7, 0), > + .mode = 0444, > + }, > { > .label = "cpld1_pn", > .reg = MLXPLAT_CPLD_LPC_REG_CPLD1_PN_OFFSET, > @@ -4416,12 +5328,116 @@ static struct mlxreg_core_data mlxplat_mlxcpld_chassis_blade_regs_io_data[] = { > .mode = 0444, > .regnum = 2, > }, > + { > + .label = "cpld2_pn", > + .reg = MLXPLAT_CPLD_LPC_REG_CPLD2_PN_OFFSET, > + .bit = GENMASK(15, 0), > + .mode = 0444, > + .regnum = 2, > + }, > + { > + .label = "cpld3_pn", > + .reg = MLXPLAT_CPLD_LPC_REG_CPLD3_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 = "cpld2_version_min", > + .reg = MLXPLAT_CPLD_LPC_REG_CPLD2_MVER_OFFSET, > + .bit = GENMASK(7, 0), > + .mode = 0444, > + }, > + { > + .label = "cpld3_version_min", > + .reg = MLXPLAT_CPLD_LPC_REG_CPLD3_MVER_OFFSET, > + .bit = GENMASK(7, 0), > + .mode = 0444, > + }, > + { > + .label = "kexec_activated", > + .reg = MLXPLAT_CPLD_LPC_REG_RESET_GP1_OFFSET, > + .mask = GENMASK(7, 0) & ~BIT(1), > + .mode = 0644, > + }, > + { > + .label = "asic_reset", > + .reg = MLXPLAT_CPLD_LPC_REG_RESET_GP2_OFFSET, > + .mask = GENMASK(7, 0) & ~BIT(3), > + .mode = 0644, > + }, > + { > + .label = "eth_switch_reset", > + .reg = MLXPLAT_CPLD_LPC_REG_RESET_GP2_OFFSET, > + .mask = GENMASK(7, 0) & ~BIT(4), > + .mode = 0644, > + }, > + { > + .label = "dpu1_rst", > + .reg = MLXPLAT_CPLD_LPC_REG_RESET_GP3_OFFSET, > + .mask = GENMASK(7, 0) & ~BIT(0), > + .mode = 0200, > + }, > + { > + .label = "dpu2_rst", > + .reg = MLXPLAT_CPLD_LPC_REG_RESET_GP3_OFFSET, > + .mask = GENMASK(7, 0) & ~BIT(1), > + .mode = 0200, > + }, > + { > + .label = "dpu3_rst", > + .reg = MLXPLAT_CPLD_LPC_REG_RESET_GP3_OFFSET, > + .mask = GENMASK(7, 0) & ~BIT(2), > + .mode = 0200, > + }, > + { > + .label = "dpu4_rst", > + .reg = MLXPLAT_CPLD_LPC_REG_RESET_GP3_OFFSET, > + .mask = GENMASK(7, 0) & ~BIT(3), > + .mode = 0200, > + }, > + { > + .label = "dpu1_pwr", > + .reg = MLXPLAT_CPLD_LPC_REG_RESET_GP4_OFFSET, > + .mask = GENMASK(7, 0) & ~BIT(0), > + .mode = 0200, > + }, > + { > + .label = "dpu2_pwr", > + .reg = MLXPLAT_CPLD_LPC_REG_RESET_GP4_OFFSET, > + .mask = GENMASK(7, 0) & ~BIT(1), > + .mode = 0200, > + }, > + { > + .label = "dpu3_pwr", > + .reg = MLXPLAT_CPLD_LPC_REG_RESET_GP4_OFFSET, > + .mask = GENMASK(7, 0) & ~BIT(2), > + .mode = 0200, > + }, > + { > + .label = "dpu4_pwr", > + .reg = MLXPLAT_CPLD_LPC_REG_RESET_GP4_OFFSET, > + .mask = GENMASK(7, 0) & ~BIT(3), > + .mode = 0200, > + }, > + { > + .label = "reset_long_pb", > + .reg = MLXPLAT_CPLD_LPC_REG_RESET_CAUSE_OFFSET, > + .mask = GENMASK(7, 0) & ~BIT(0), > + .mode = 0444, > + }, > + { > + .label = "reset_short_pb", > + .reg = MLXPLAT_CPLD_LPC_REG_RESET_CAUSE_OFFSET, > + .mask = GENMASK(7, 0) & ~BIT(1), > + .mode = 0444, > + }, > { > .label = "reset_aux_pwr_or_ref", > .reg = MLXPLAT_CPLD_LPC_REG_RESET_CAUSE_OFFSET, > @@ -4429,9 +5445,33 @@ static struct mlxreg_core_data mlxplat_mlxcpld_chassis_blade_regs_io_data[] = { > .mode = 0444, > }, > { > - .label = "reset_from_comex", > + .label = "reset_swb_dc_dc_pwr_fail", > .reg = MLXPLAT_CPLD_LPC_REG_RESET_CAUSE_OFFSET, > - .mask = GENMASK(7, 0) & ~BIT(4), > + .mask = GENMASK(7, 0) & ~BIT(3), > + .mode = 0444, > + }, > + { > + .label = "reset_swb_wd", > + .reg = MLXPLAT_CPLD_LPC_REG_RESET_CAUSE_OFFSET, > + .mask = GENMASK(7, 0) & ~BIT(6), > + .mode = 0444, > + }, > + { > + .label = "reset_asic_thermal", > + .reg = MLXPLAT_CPLD_LPC_REG_RESET_CAUSE_OFFSET, > + .mask = GENMASK(7, 0) & ~BIT(7), > + .mode = 0444, > + }, > + { > + .label = "reset_sw_reset", > + .reg = MLXPLAT_CPLD_LPC_REG_RST_CAUSE1_OFFSET, > + .mask = GENMASK(7, 0) & ~BIT(0), > + .mode = 0444, > + }, > + { > + .label = "reset_aux_pwr_or_reload", > + .reg = MLXPLAT_CPLD_LPC_REG_RST_CAUSE1_OFFSET, > + .mask = GENMASK(7, 0) & ~BIT(2), > .mode = 0444, > }, > { > @@ -4453,13 +5493,13 @@ static struct mlxreg_core_data mlxplat_mlxcpld_chassis_blade_regs_io_data[] = { > .mode = 0444, > }, > { > - .label = "reset_comex_wd", > + .label = "reset_pwr", > .reg = MLXPLAT_CPLD_LPC_REG_RST_CAUSE1_OFFSET, > - .mask = GENMASK(7, 0) & ~BIT(6), > + .mask = GENMASK(7, 0) & ~BIT(7), > .mode = 0444, > }, > { > - .label = "reset_voltmon_upgrade_fail", > + .label = "reset_pwr_converter_fail", > .reg = MLXPLAT_CPLD_LPC_REG_RST_CAUSE2_OFFSET, > .mask = GENMASK(7, 0) & ~BIT(0), > .mode = 0444, > @@ -4483,23 +5523,103 @@ static struct mlxreg_core_data mlxplat_mlxcpld_chassis_blade_regs_io_data[] = { > .mode = 0444, > }, > { > - .label = "reset_reload_bios", > + .label = "reset_ac_pwr_fail", > .reg = MLXPLAT_CPLD_LPC_REG_RST_CAUSE2_OFFSET, > - .mask = GENMASK(7, 0) & ~BIT(5), > + .mask = GENMASK(7, 0) & ~BIT(6), > .mode = 0444, > }, > { > - .label = "reset_ac_pwr_fail", > - .reg = MLXPLAT_CPLD_LPC_REG_RST_CAUSE2_OFFSET, > - .mask = GENMASK(7, 0) & ~BIT(6), > + .label = "voltreg_update_status", > + .reg = MLXPLAT_CPLD_LPC_REG_GP0_RO_OFFSET, > + .mask = MLXPLAT_CPLD_VOLTREG_UPD_MASK, > + .bit = 5, > .mode = 0444, > }, > { > - .label = "reset_long_pwr_pb", > - .reg = MLXPLAT_CPLD_LPC_REG_RST_CAUSE2_OFFSET, > - .mask = GENMASK(7, 0) & ~BIT(7), > + .label = "port80", > + .reg = MLXPLAT_CPLD_LPC_REG_GP1_RO_OFFSET, > + .bit = GENMASK(7, 0), > + .mode = 0444, > + }, > + { > + .label = "bios_status", > + .reg = MLXPLAT_CPLD_LPC_REG_GPCOM0_OFFSET, > + .mask = MLXPLAT_CPLD_BIOS_STATUS_MASK, > + .bit = 2, > + .mode = 0444, > + }, > + { > + .label = "bios_start_retry", > + .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 = "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 = "shutdown_unlock", > + .reg = MLXPLAT_CPLD_LPC_REG_GP0_OFFSET, > + .mask = GENMASK(7, 0) & ~BIT(5), > + .mode = 0644, > + }, > + { > + .label = "fan_dir", > + .reg = MLXPLAT_CPLD_LPC_REG_FAN_DIRECTION, > + .bit = GENMASK(7, 0), > .mode = 0444, > }, > + { > + .label = "dpu1_rst_en", > + .reg = MLXPLAT_CPLD_LPC_REG_GP_RST_OFFSET, > + .mask = GENMASK(7, 0) & ~BIT(0), > + .mode = 0200, > + }, > + { > + .label = "dpu2_rst_en", > + .reg = MLXPLAT_CPLD_LPC_REG_GP_RST_OFFSET, > + .mask = GENMASK(7, 0) & ~BIT(1), > + .mode = 0200, > + }, > + { > + .label = "dpu3_rst_en", > + .reg = MLXPLAT_CPLD_LPC_REG_GP_RST_OFFSET, > + .mask = GENMASK(7, 0) & ~BIT(2), > + .mode = 0200, > + }, > + { > + .label = "dpu4_rst_en", > + .reg = MLXPLAT_CPLD_LPC_REG_GP_RST_OFFSET, > + .mask = GENMASK(7, 0) & ~BIT(3), > + .mode = 0200, > + }, > + { > + .label = "psu1_on", > + .reg = MLXPLAT_CPLD_LPC_REG_GP1_OFFSET, > + .mask = GENMASK(7, 0) & ~BIT(0), > + .mode = 0200, > + }, > + { > + .label = "psu2_on", > + .reg = MLXPLAT_CPLD_LPC_REG_GP1_OFFSET, > + .mask = GENMASK(7, 0) & ~BIT(1), > + .mode = 0200, > + }, > { > .label = "pwr_cycle", > .reg = MLXPLAT_CPLD_LPC_REG_GP1_OFFSET, > @@ -4513,72 +5633,117 @@ static struct mlxreg_core_data mlxplat_mlxcpld_chassis_blade_regs_io_data[] = { > .mode = 0200, > }, > { > - .label = "global_wp_request", > - .reg = MLXPLAT_CPLD_LPC_REG_GP2_OFFSET, > - .mask = GENMASK(7, 0) & ~BIT(0), > + .label = "jtag_cap", > + .reg = MLXPLAT_CPLD_LPC_REG_FU_CAP_OFFSET, > + .mask = MLXPLAT_CPLD_FU_CAP_MASK, > + .bit = 1, > + .mode = 0444, > + }, > + { > + .label = "jtag_enable", > + .reg = MLXPLAT_CPLD_LPC_REG_FIELD_UPGRADE, > + .mask = GENMASK(1, 0), > + .bit = 1, > + .mode = 0644, > + }, > + { > + .label = "non_active_bios_select", > + .reg = MLXPLAT_CPLD_LPC_SAFE_BIOS_OFFSET, > + .mask = GENMASK(7, 0) & ~BIT(4), > + .mode = 0644, > + }, > + { > + .label = "bios_upgrade_fail", > + .reg = MLXPLAT_CPLD_LPC_SAFE_BIOS_OFFSET, > + .mask = GENMASK(7, 0) & ~BIT(5), > + .mode = 0444, > + }, > + { > + .label = "bios_image_invert", > + .reg = MLXPLAT_CPLD_LPC_SAFE_BIOS_OFFSET, > + .mask = GENMASK(7, 0) & ~BIT(6), > .mode = 0644, > }, > { > - .label = "jtag_enable", > - .reg = MLXPLAT_CPLD_LPC_REG_GP2_OFFSET, > - .mask = GENMASK(7, 0) & ~BIT(4), > + .label = "me_reboot", > + .reg = MLXPLAT_CPLD_LPC_SAFE_BIOS_OFFSET, > + .mask = GENMASK(7, 0) & ~BIT(7), > .mode = 0644, > }, > { > - .label = "comm_chnl_ready", > - .reg = MLXPLAT_CPLD_LPC_REG_GP2_OFFSET, > - .mask = GENMASK(7, 0) & ~BIT(6), > + .label = "dpu1_pwr_force", > + .reg = MLXPLAT_CPLD_LPC_REG_GP3_OFFSET, > + .mask = GENMASK(7, 0) & ~BIT(0), > .mode = 0200, > }, > { > - .label = "bios_safe_mode", > - .reg = MLXPLAT_CPLD_LPC_REG_GPCOM0_OFFSET, > - .mask = GENMASK(7, 0) & ~BIT(4), > - .mode = 0444, > + .label = "dpu2_pwr_force", > + .reg = MLXPLAT_CPLD_LPC_REG_GP3_OFFSET, > + .mask = GENMASK(7, 0) & ~BIT(1), > + .mode = 0200, > }, > { > - .label = "bios_active_image", > - .reg = MLXPLAT_CPLD_LPC_REG_GPCOM0_OFFSET, > - .mask = GENMASK(7, 0) & ~BIT(5), > - .mode = 0444, > + .label = "dpu3_pwr_force", > + .reg = MLXPLAT_CPLD_LPC_REG_GP3_OFFSET, > + .mask = GENMASK(7, 0) & ~BIT(2), > + .mode = 0200, > }, > { > - .label = "bios_auth_fail", > - .reg = MLXPLAT_CPLD_LPC_REG_GPCOM0_OFFSET, > - .mask = GENMASK(7, 0) & ~BIT(6), > - .mode = 0444, > + .label = "dpu4_pwr_force", > + .reg = MLXPLAT_CPLD_LPC_REG_GP3_OFFSET, > + .mask = GENMASK(7, 0) & ~BIT(3), > + .mode = 0200, > }, > { > - .label = "bios_upgrade_fail", > - .reg = MLXPLAT_CPLD_LPC_REG_GPCOM0_OFFSET, > - .mask = GENMASK(7, 0) & ~BIT(7), > + .label = "ufm_done", > + .reg = MLXPLAT_CPLD_LPC_REG_GPI_MASK_OFFSET, > + .bit = GENMASK(7, 0), > .mode = 0444, > }, > { > - .label = "voltreg_update_status", > - .reg = MLXPLAT_CPLD_LPC_REG_GP0_RO_OFFSET, > - .mask = MLXPLAT_CPLD_VOLTREG_UPD_MASK, > - .bit = 5, > + .label = "asic_health", > + .reg = MLXPLAT_CPLD_LPC_REG_ASIC_HEALTH_OFFSET, > + .mask = MLXPLAT_CPLD_ASIC_MASK, > + .bit = 1, > .mode = 0444, > }, > { > - .label = "vpd_wp", > - .reg = MLXPLAT_CPLD_LPC_REG_GP0_OFFSET, > - .mask = GENMASK(7, 0) & ~BIT(3), > + .label = "psu1_ac_ok", > + .reg = MLXPLAT_CPLD_LPC_REG_PSU_AC_OFFSET, > + .mask = GENMASK(7, 0) & ~BIT(0), > .mode = 0644, > }, > { > - .label = "pcie_asic_reset_dis", > - .reg = MLXPLAT_CPLD_LPC_REG_GP0_OFFSET, > - .mask = GENMASK(7, 0) & ~BIT(4), > + .label = "psu2_ac_ok", > + .reg = MLXPLAT_CPLD_LPC_REG_PSU_AC_OFFSET, > + .mask = GENMASK(7, 0) & ~BIT(1), > .mode = 0644, > }, > { > - .label = "global_wp_response", > - .reg = MLXPLAT_CPLD_LPC_REG_GWP_OFFSET, > + .label = "psu1_no_alert", > + .reg = MLXPLAT_CPLD_LPC_REG_PSU_ALERT_OFFSET, > .mask = GENMASK(7, 0) & ~BIT(0), > + .mode = 0644, > + }, > + { > + .label = "psu2_no_alert", > + .reg = MLXPLAT_CPLD_LPC_REG_PSU_ALERT_OFFSET, > + .mask = GENMASK(7, 0) & ~BIT(1), > + .mode = 0644, > + }, > + { > + .label = "asic_pg_fail", > + .reg = MLXPLAT_CPLD_LPC_REG_GP4_RO_OFFSET, > + .mask = GENMASK(7, 0) & ~BIT(7), > .mode = 0444, > }, > + { > + .label = "spi_chnl_select", > + .reg = MLXPLAT_CPLD_LPC_REG_SPI_CHNL_SELECT, > + .mask = GENMASK(7, 0), > + .bit = 1, > + .mode = 0644, > + }, > { > .label = "config1", > .reg = MLXPLAT_CPLD_LPC_REG_CONFIG1_OFFSET, > @@ -4605,9 +5770,9 @@ static struct mlxreg_core_data mlxplat_mlxcpld_chassis_blade_regs_io_data[] = { > }, > }; > > -static struct mlxreg_core_platform_data mlxplat_chassis_blade_regs_io_data = { > - .data = mlxplat_mlxcpld_chassis_blade_regs_io_data, > - .counter = ARRAY_SIZE(mlxplat_mlxcpld_chassis_blade_regs_io_data), > +static struct mlxreg_core_platform_data mlxplat_smart_switch_regs_io_data = { > + .data = mlxplat_mlxcpld_smart_switch_regs_io_data, > + .counter = ARRAY_SIZE(mlxplat_mlxcpld_smart_switch_regs_io_data), > }; > > /* Platform FAN default */ > @@ -4751,6 +5916,185 @@ static struct mlxreg_core_platform_data mlxplat_default_fan_data = { > .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > }; > > +/* XDR and smart switch platform fan data */ > +static struct mlxreg_core_data mlxplat_mlxcpld_xdr_fan_data[] = { > + { > + .label = "pwm1", > + .reg = MLXPLAT_CPLD_LPC_REG_PWM1_OFFSET, > + }, > + { > + .label = "tacho1", > + .reg = MLXPLAT_CPLD_LPC_REG_TACHO1_OFFSET, > + .mask = GENMASK(7, 0), > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, > + .slot = 1, > + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > + }, > + { > + .label = "tacho2", > + .reg = MLXPLAT_CPLD_LPC_REG_TACHO2_OFFSET, > + .mask = GENMASK(7, 0), > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, > + .slot = 2, > + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > + }, > + { > + .label = "tacho3", > + .reg = MLXPLAT_CPLD_LPC_REG_TACHO3_OFFSET, > + .mask = GENMASK(7, 0), > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, > + .slot = 3, > + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > + }, > + { > + .label = "tacho4", > + .reg = MLXPLAT_CPLD_LPC_REG_TACHO4_OFFSET, > + .mask = GENMASK(7, 0), > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, > + .slot = 4, > + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > + }, > + { > + .label = "tacho5", > + .reg = MLXPLAT_CPLD_LPC_REG_TACHO5_OFFSET, > + .mask = GENMASK(7, 0), > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, > + .slot = 5, > + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > + }, > + { > + .label = "tacho6", > + .reg = MLXPLAT_CPLD_LPC_REG_TACHO6_OFFSET, > + .mask = GENMASK(7, 0), > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, > + .slot = 6, > + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > + }, > + { > + .label = "tacho7", > + .reg = MLXPLAT_CPLD_LPC_REG_TACHO7_OFFSET, > + .mask = GENMASK(7, 0), > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, > + .slot = 7, > + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > + }, > + { > + .label = "tacho8", > + .reg = MLXPLAT_CPLD_LPC_REG_TACHO8_OFFSET, > + .mask = GENMASK(7, 0), > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, > + .slot = 8, > + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > + }, > + { > + .label = "tacho9", > + .reg = MLXPLAT_CPLD_LPC_REG_TACHO9_OFFSET, > + .mask = GENMASK(7, 0), > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, > + .slot = 9, > + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > + }, > + { > + .label = "tacho10", > + .reg = MLXPLAT_CPLD_LPC_REG_TACHO10_OFFSET, > + .mask = GENMASK(7, 0), > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, > + .slot = 10, > + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > + }, > + { > + .label = "tacho11", > + .reg = MLXPLAT_CPLD_LPC_REG_TACHO11_OFFSET, > + .mask = GENMASK(7, 0), > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, > + .slot = 11, > + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > + }, > + { > + .label = "tacho12", > + .reg = MLXPLAT_CPLD_LPC_REG_TACHO12_OFFSET, > + .mask = GENMASK(7, 0), > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, > + .slot = 12, > + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > + }, > + { > + .label = "tacho13", > + .reg = MLXPLAT_CPLD_LPC_REG_TACHO13_OFFSET, > + .mask = GENMASK(7, 0), > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, > + .slot = 13, > + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > + }, > + { > + .label = "tacho14", > + .reg = MLXPLAT_CPLD_LPC_REG_TACHO14_OFFSET, > + .mask = GENMASK(7, 0), > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, > + .slot = 14, > + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > + }, > + { > + .label = "tacho15", > + .reg = MLXPLAT_CPLD_LPC_REG_TACHO15_OFFSET, > + .mask = GENMASK(7, 0), > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, > + .slot = 15, > + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > + }, > + { > + .label = "tacho16", > + .reg = MLXPLAT_CPLD_LPC_REG_TACHO16_OFFSET, > + .mask = GENMASK(7, 0), > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, > + .slot = 16, > + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > + }, > + { > + .label = "tacho17", > + .reg = MLXPLAT_CPLD_LPC_REG_TACHO17_OFFSET, > + .mask = GENMASK(7, 0), > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, > + .slot = 17, > + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN2_OFFSET, > + }, > + { > + .label = "tacho18", > + .reg = MLXPLAT_CPLD_LPC_REG_TACHO18_OFFSET, > + .mask = GENMASK(7, 0), > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, > + .slot = 18, > + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN2_OFFSET, > + }, > + { > + .label = "tacho19", > + .reg = MLXPLAT_CPLD_LPC_REG_TACHO19_OFFSET, > + .mask = GENMASK(7, 0), > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, > + .slot = 19, > + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN2_OFFSET, > + }, > + { > + .label = "tacho20", > + .reg = MLXPLAT_CPLD_LPC_REG_TACHO20_OFFSET, > + .mask = GENMASK(7, 0), > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, > + .slot = 20, > + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN2_OFFSET, > + }, > + { > + .label = "conf", > + .capability = MLXPLAT_CPLD_LPC_REG_TACHO_SPEED_OFFSET, > + }, > +}; > + > +static struct mlxreg_core_platform_data mlxplat_xdr_fan_data = { > + .data = mlxplat_mlxcpld_xdr_fan_data, > + .counter = ARRAY_SIZE(mlxplat_mlxcpld_xdr_fan_data), > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > + .version = 1, > +}; > + > /* Watchdog type1: hardware implementation version1 > * (MSN2700, MSN2410, MSN2740, MSN2100 and MSN2140 systems). > */ > @@ -4975,6 +6319,8 @@ static bool mlxplat_mlxcpld_writeable_reg(struct device *dev, unsigned int reg) > { > switch (reg) { > case MLXPLAT_CPLD_LPC_REG_RESET_GP1_OFFSET: > + case MLXPLAT_CPLD_LPC_REG_RESET_GP2_OFFSET: > + case MLXPLAT_CPLD_LPC_REG_RESET_GP3_OFFSET: > case MLXPLAT_CPLD_LPC_REG_RESET_GP4_OFFSET: > case MLXPLAT_CPLD_LPC_REG_LED1_OFFSET: > case MLXPLAT_CPLD_LPC_REG_LED2_OFFSET: > @@ -4983,12 +6329,14 @@ static bool mlxplat_mlxcpld_writeable_reg(struct device *dev, unsigned int reg) > case MLXPLAT_CPLD_LPC_REG_LED5_OFFSET: > case MLXPLAT_CPLD_LPC_REG_LED6_OFFSET: > case MLXPLAT_CPLD_LPC_REG_LED7_OFFSET: > + case MLXPLAT_CPLD_LPC_REG_LED8_OFFSET: > case MLXPLAT_CPLD_LPC_REG_GP0_OFFSET: > case MLXPLAT_CPLD_LPC_REG_GP_RST_OFFSET: > case MLXPLAT_CPLD_LPC_REG_GP1_OFFSET: > case MLXPLAT_CPLD_LPC_REG_WP1_OFFSET: > case MLXPLAT_CPLD_LPC_REG_GP2_OFFSET: > case MLXPLAT_CPLD_LPC_REG_WP2_OFFSET: > + case MLXPLAT_CPLD_LPC_REG_GP3_OFFSET: > case MLXPLAT_CPLD_LPC_REG_FIELD_UPGRADE: > case MLXPLAT_CPLD_LPC_SAFE_BIOS_OFFSET: > case MLXPLAT_CPLD_LPC_SAFE_BIOS_WP_OFFSET: > @@ -5012,10 +6360,14 @@ static bool mlxplat_mlxcpld_writeable_reg(struct device *dev, unsigned int reg) > 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_PSU_AC_OFFSET: > case MLXPLAT_CPLD_LPC_REG_PWR_EVENT_OFFSET: > case MLXPLAT_CPLD_LPC_REG_PWR_MASK_OFFSET: > + case MLXPLAT_CPLD_LPC_REG_PSU_ALERT_OFFSET: > case MLXPLAT_CPLD_LPC_REG_FAN_EVENT_OFFSET: > case MLXPLAT_CPLD_LPC_REG_FAN_MASK_OFFSET: > + case MLXPLAT_CPLD_LPC_REG_FAN2_EVENT_OFFSET: > + case MLXPLAT_CPLD_LPC_REG_FAN2_MASK_OFFSET: > case MLXPLAT_CPLD_LPC_REG_EROT_EVENT_OFFSET: > case MLXPLAT_CPLD_LPC_REG_EROT_MASK_OFFSET: > case MLXPLAT_CPLD_LPC_REG_EROTE_EVENT_OFFSET: > @@ -5083,6 +6435,8 @@ static bool mlxplat_mlxcpld_readable_reg(struct device *dev, unsigned int reg) > case MLXPLAT_CPLD_LPC_REG_CPLD5_PN_OFFSET: > case MLXPLAT_CPLD_LPC_REG_CPLD5_PN1_OFFSET: > case MLXPLAT_CPLD_LPC_REG_RESET_GP1_OFFSET: > + case MLXPLAT_CPLD_LPC_REG_RESET_GP2_OFFSET: > + case MLXPLAT_CPLD_LPC_REG_RESET_GP3_OFFSET: > case MLXPLAT_CPLD_LPC_REG_RESET_GP4_OFFSET: > case MLXPLAT_CPLD_LPC_REG_RESET_CAUSE_OFFSET: > case MLXPLAT_CPLD_LPC_REG_RST_CAUSE1_OFFSET: > @@ -5094,15 +6448,18 @@ static bool mlxplat_mlxcpld_readable_reg(struct device *dev, unsigned int reg) > case MLXPLAT_CPLD_LPC_REG_LED5_OFFSET: > case MLXPLAT_CPLD_LPC_REG_LED6_OFFSET: > case MLXPLAT_CPLD_LPC_REG_LED7_OFFSET: > + case MLXPLAT_CPLD_LPC_REG_LED8_OFFSET: > case MLXPLAT_CPLD_LPC_REG_FAN_DIRECTION: > case MLXPLAT_CPLD_LPC_REG_GP0_RO_OFFSET: > case MLXPLAT_CPLD_LPC_REG_GPCOM0_OFFSET: > + case MLXPLAT_CPLD_LPC_REG_GP1_RO_OFFSET: > case MLXPLAT_CPLD_LPC_REG_GP0_OFFSET: > case MLXPLAT_CPLD_LPC_REG_GP_RST_OFFSET: > case MLXPLAT_CPLD_LPC_REG_GP1_OFFSET: > case MLXPLAT_CPLD_LPC_REG_WP1_OFFSET: > case MLXPLAT_CPLD_LPC_REG_GP2_OFFSET: > case MLXPLAT_CPLD_LPC_REG_WP2_OFFSET: > + case MLXPLAT_CPLD_LPC_REG_GP3_OFFSET: > case MLXPLAT_CPLD_LPC_REG_FIELD_UPGRADE: > case MLXPLAT_CPLD_LPC_SAFE_BIOS_OFFSET: > case MLXPLAT_CPLD_LPC_SAFE_BIOS_WP_OFFSET: > @@ -5122,6 +6479,7 @@ static bool mlxplat_mlxcpld_readable_reg(struct device *dev, unsigned int reg) > 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_GPI_MASK_OFFSET: > case MLXPLAT_CPLD_LPC_REG_BRD_OFFSET: > case MLXPLAT_CPLD_LPC_REG_BRD_EVENT_OFFSET: > case MLXPLAT_CPLD_LPC_REG_BRD_MASK_OFFSET: > @@ -5134,12 +6492,17 @@ static bool mlxplat_mlxcpld_readable_reg(struct device *dev, unsigned int reg) > case MLXPLAT_CPLD_LPC_REG_PSU_OFFSET: > case MLXPLAT_CPLD_LPC_REG_PSU_EVENT_OFFSET: > case MLXPLAT_CPLD_LPC_REG_PSU_MASK_OFFSET: > + case MLXPLAT_CPLD_LPC_REG_PSU_AC_OFFSET: > case MLXPLAT_CPLD_LPC_REG_PWR_OFFSET: > case MLXPLAT_CPLD_LPC_REG_PWR_EVENT_OFFSET: > case MLXPLAT_CPLD_LPC_REG_PWR_MASK_OFFSET: > + case MLXPLAT_CPLD_LPC_REG_PSU_ALERT_OFFSET: > case MLXPLAT_CPLD_LPC_REG_FAN_OFFSET: > case MLXPLAT_CPLD_LPC_REG_FAN_EVENT_OFFSET: > case MLXPLAT_CPLD_LPC_REG_FAN_MASK_OFFSET: > + case MLXPLAT_CPLD_LPC_REG_FAN2_OFFSET: > + case MLXPLAT_CPLD_LPC_REG_FAN2_EVENT_OFFSET: > + case MLXPLAT_CPLD_LPC_REG_FAN2_MASK_OFFSET: > case MLXPLAT_CPLD_LPC_REG_EROT_OFFSET: > case MLXPLAT_CPLD_LPC_REG_EROT_EVENT_OFFSET: > case MLXPLAT_CPLD_LPC_REG_EROT_MASK_OFFSET: > @@ -5213,6 +6576,13 @@ static bool mlxplat_mlxcpld_readable_reg(struct device *dev, unsigned int reg) > case MLXPLAT_CPLD_LPC_REG_TACHO12_OFFSET: > case MLXPLAT_CPLD_LPC_REG_TACHO13_OFFSET: > case MLXPLAT_CPLD_LPC_REG_TACHO14_OFFSET: > + case MLXPLAT_CPLD_LPC_REG_TACHO15_OFFSET: > + case MLXPLAT_CPLD_LPC_REG_TACHO16_OFFSET: > + case MLXPLAT_CPLD_LPC_REG_TACHO17_OFFSET: > + case MLXPLAT_CPLD_LPC_REG_TACHO18_OFFSET: > + case MLXPLAT_CPLD_LPC_REG_TACHO19_OFFSET: > + case MLXPLAT_CPLD_LPC_REG_TACHO20_OFFSET: > + case MLXPLAT_CPLD_LPC_REG_ASIC_CAP_OFFSET: > case MLXPLAT_CPLD_LPC_REG_PWM_CONTROL_OFFSET: > case MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET: > case MLXPLAT_CPLD_LPC_REG_FAN_CAP2_OFFSET: > @@ -5248,6 +6618,8 @@ static bool mlxplat_mlxcpld_volatile_reg(struct device *dev, unsigned int reg) > case MLXPLAT_CPLD_LPC_REG_CPLD5_PN_OFFSET: > case MLXPLAT_CPLD_LPC_REG_CPLD5_PN1_OFFSET: > case MLXPLAT_CPLD_LPC_REG_RESET_GP1_OFFSET: > + case MLXPLAT_CPLD_LPC_REG_RESET_GP2_OFFSET: > + case MLXPLAT_CPLD_LPC_REG_RESET_GP3_OFFSET: > case MLXPLAT_CPLD_LPC_REG_RESET_GP4_OFFSET: > case MLXPLAT_CPLD_LPC_REG_RESET_CAUSE_OFFSET: > case MLXPLAT_CPLD_LPC_REG_RST_CAUSE1_OFFSET: > @@ -5259,13 +6631,16 @@ static bool mlxplat_mlxcpld_volatile_reg(struct device *dev, unsigned int reg) > case MLXPLAT_CPLD_LPC_REG_LED5_OFFSET: > case MLXPLAT_CPLD_LPC_REG_LED6_OFFSET: > case MLXPLAT_CPLD_LPC_REG_LED7_OFFSET: > + case MLXPLAT_CPLD_LPC_REG_LED8_OFFSET: > case MLXPLAT_CPLD_LPC_REG_FAN_DIRECTION: > case MLXPLAT_CPLD_LPC_REG_GP0_RO_OFFSET: > case MLXPLAT_CPLD_LPC_REG_GPCOM0_OFFSET: > + case MLXPLAT_CPLD_LPC_REG_GP1_RO_OFFSET: > case MLXPLAT_CPLD_LPC_REG_GP0_OFFSET: > case MLXPLAT_CPLD_LPC_REG_GP_RST_OFFSET: > case MLXPLAT_CPLD_LPC_REG_GP1_OFFSET: > case MLXPLAT_CPLD_LPC_REG_GP2_OFFSET: > + case MLXPLAT_CPLD_LPC_REG_GP3_OFFSET: > case MLXPLAT_CPLD_LPC_REG_FIELD_UPGRADE: > case MLXPLAT_CPLD_LPC_SAFE_BIOS_OFFSET: > case MLXPLAT_CPLD_LPC_SAFE_BIOS_WP_OFFSET: > @@ -5285,6 +6660,7 @@ static bool mlxplat_mlxcpld_volatile_reg(struct device *dev, unsigned int reg) > 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_GPI_MASK_OFFSET: > case MLXPLAT_CPLD_LPC_REG_BRD_OFFSET: > case MLXPLAT_CPLD_LPC_REG_BRD_EVENT_OFFSET: > case MLXPLAT_CPLD_LPC_REG_BRD_MASK_OFFSET: > @@ -5297,9 +6673,11 @@ static bool mlxplat_mlxcpld_volatile_reg(struct device *dev, unsigned int reg) > case MLXPLAT_CPLD_LPC_REG_PSU_OFFSET: > case MLXPLAT_CPLD_LPC_REG_PSU_EVENT_OFFSET: > case MLXPLAT_CPLD_LPC_REG_PSU_MASK_OFFSET: > + case MLXPLAT_CPLD_LPC_REG_PSU_AC_OFFSET: > case MLXPLAT_CPLD_LPC_REG_PWR_OFFSET: > case MLXPLAT_CPLD_LPC_REG_PWR_EVENT_OFFSET: > case MLXPLAT_CPLD_LPC_REG_PWR_MASK_OFFSET: > + case MLXPLAT_CPLD_LPC_REG_PSU_ALERT_OFFSET: > case MLXPLAT_CPLD_LPC_REG_FAN_OFFSET: > case MLXPLAT_CPLD_LPC_REG_FAN_EVENT_OFFSET: > case MLXPLAT_CPLD_LPC_REG_FAN_MASK_OFFSET: > @@ -5370,6 +6748,13 @@ static bool mlxplat_mlxcpld_volatile_reg(struct device *dev, unsigned int reg) > case MLXPLAT_CPLD_LPC_REG_TACHO12_OFFSET: > case MLXPLAT_CPLD_LPC_REG_TACHO13_OFFSET: > case MLXPLAT_CPLD_LPC_REG_TACHO14_OFFSET: > + case MLXPLAT_CPLD_LPC_REG_TACHO15_OFFSET: > + case MLXPLAT_CPLD_LPC_REG_TACHO16_OFFSET: > + case MLXPLAT_CPLD_LPC_REG_TACHO17_OFFSET: > + case MLXPLAT_CPLD_LPC_REG_TACHO18_OFFSET: > + case MLXPLAT_CPLD_LPC_REG_TACHO19_OFFSET: > + case MLXPLAT_CPLD_LPC_REG_TACHO20_OFFSET: > + case MLXPLAT_CPLD_LPC_REG_ASIC_CAP_OFFSET: > case MLXPLAT_CPLD_LPC_REG_PWM_CONTROL_OFFSET: > case MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET: > case MLXPLAT_CPLD_LPC_REG_FAN_CAP2_OFFSET: > @@ -5431,6 +6816,15 @@ static const struct reg_default mlxplat_mlxcpld_regmap_eth_modular[] = { > MLXPLAT_CPLD_AGGR_MASK_LC_LOW }, > }; > > +static const struct reg_default mlxplat_mlxcpld_regmap_smart_switch[] = { > + { MLXPLAT_CPLD_LPC_REG_PWM_CONTROL_OFFSET, 0x00 }, > + { MLXPLAT_CPLD_LPC_REG_WD1_ACT_OFFSET, 0x00 }, > + { MLXPLAT_CPLD_LPC_REG_WD2_ACT_OFFSET, 0x00 }, > + { MLXPLAT_CPLD_LPC_REG_WD3_ACT_OFFSET, 0x00 }, > + { MLXPLAT_CPLD_LPC_REG_AGGRCX_MASK_OFFSET, > + MLXPLAT_CPLD_LPC_SM_SW_MASK }, > +}; > + > struct mlxplat_mlxcpld_regmap_context { > void __iomem *base; > }; > @@ -5539,6 +6933,20 @@ static const struct regmap_config mlxplat_mlxcpld_regmap_config_eth_modular = { > .reg_write = mlxplat_mlxcpld_reg_write, > }; > > +static const struct regmap_config mlxplat_mlxcpld_regmap_config_smart_switch = { > + .reg_bits = 8, > + .val_bits = 8, > + .max_register = 255, > + .cache_type = REGCACHE_FLAT, > + .writeable_reg = mlxplat_mlxcpld_writeable_reg, > + .readable_reg = mlxplat_mlxcpld_readable_reg, > + .volatile_reg = mlxplat_mlxcpld_volatile_reg, > + .reg_defaults = mlxplat_mlxcpld_regmap_smart_switch, > + .num_reg_defaults = ARRAY_SIZE(mlxplat_mlxcpld_regmap_smart_switch), > + .reg_read = mlxplat_mlxcpld_reg_read, > + .reg_write = mlxplat_mlxcpld_reg_write, > +}; > + > static struct resource mlxplat_mlxcpld_resources[] = { > [0] = DEFINE_RES_IRQ_NAMED(MLXPLAT_CPLD_LPC_SYSIRQ, "mlxreg-hotplug"), > }; > @@ -5550,6 +6958,7 @@ static struct mlxreg_core_platform_data *mlxplat_regs_io; > static struct mlxreg_core_platform_data *mlxplat_fan; > static struct mlxreg_core_platform_data > *mlxplat_wd_data[MLXPLAT_CPLD_WD_MAX_DEVS]; > +static struct mlxreg_core_data *mlxplat_dpu_data[MLXPLAT_CPLD_DPU_MAX_DEVS]; > static const struct regmap_config *mlxplat_regmap_config; > static struct pci_dev *lpc_bridge; > static struct pci_dev *i2c_bridge; > @@ -5921,6 +7330,29 @@ static int __init mlxplat_dmi_l1_switch_matched(const struct dmi_system_id *dmi) > return mlxplat_register_platform_device(); > } > > +static int __init mlxplat_dmi_smart_switch_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_ng800_mux_data); > + mlxplat_mux_data = mlxplat_ng800_mux_data; > + mlxplat_hotplug = &mlxplat_mlxcpld_smart_switch_data; > + mlxplat_hotplug->deferred_nr = > + mlxplat_msn21xx_channels[MLXPLAT_CPLD_GRP_CHNL_NUM - 1]; > + mlxplat_led = &mlxplat_xdr_led_data; > + mlxplat_regs_io = &mlxplat_smart_switch_regs_io_data; > + mlxplat_fan = &mlxplat_xdr_fan_data; > + for (i = 0; i < ARRAY_SIZE(mlxplat_mlxcpld_wd_set_type2); i++) > + mlxplat_wd_data[i] = &mlxplat_mlxcpld_wd_set_type2[i]; > + for (i = 0; i < ARRAY_SIZE(mlxplat_mlxcpld_smart_switch_dpu_data); i++) > + mlxplat_dpu_data[i] = &mlxplat_mlxcpld_smart_switch_dpu_data[i]; > + mlxplat_i2c = &mlxplat_mlxcpld_i2c_ng_data; > + mlxplat_regmap_config = &mlxplat_mlxcpld_regmap_config_smart_switch; > + > + return mlxplat_register_platform_device(); > +} > + > static const struct dmi_system_id mlxplat_dmi_table[] __initconst = { > { > .callback = mlxplat_dmi_default_wc_matched, > @@ -6015,6 +7447,12 @@ static const struct dmi_system_id mlxplat_dmi_table[] __initconst = { > DMI_MATCH(DMI_BOARD_NAME, "VMOD0017"), > }, > }, > + { > + .callback = mlxplat_dmi_smart_switch_matched, > + .matches = { > + DMI_MATCH(DMI_BOARD_NAME, "VMOD0019"), > + }, > + }, > { > .callback = mlxplat_dmi_msn274x_matched, > .matches = { > @@ -6390,8 +7828,25 @@ static int mlxplat_platdevs_init(struct mlxplat_priv *priv) > } > } > > + /* Add DPU drivers. */ > + for (i = 0; i < MLXPLAT_CPLD_DPU_MAX_DEVS; i++) { > + if (mlxplat_dpu_data[i]) { > + priv->pdev_dpu[i] = > + platform_device_register_resndata(&mlxplat_dev->dev, "mlxreg-dpu", > + i, NULL, 0, mlxplat_dpu_data[i], > + sizeof(*mlxplat_dpu_data[i])); > + if (IS_ERR(priv->pdev_dpu[i])) { > + err = PTR_ERR(priv->pdev_dpu[i]); > + goto fail_platform_dpu_register; > + } > + } > + } > + > return 0; > > +fail_platform_dpu_register: > + while (--i >= 0) > + platform_device_unregister(priv->pdev_dpu[i]); > fail_platform_wd_register: > while (--i >= 0) > platform_device_unregister(priv->pdev_wd[i]); > @@ -6412,6 +7867,8 @@ static void mlxplat_platdevs_exit(struct mlxplat_priv *priv) > { > int i; > > + for (i = MLXPLAT_CPLD_DPU_MAX_DEVS - 1; i >= 0 ; i--) > + platform_device_unregister(priv->pdev_dpu[i]); > for (i = MLXPLAT_CPLD_WD_MAX_DEVS - 1; i >= 0 ; i--) > platform_device_unregister(priv->pdev_wd[i]); > if (priv->pdev_fan) >
> -----Original Message----- > From: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> > Sent: Monday, 13 January 2025 19:12 > To: Vadim Pasternak <vadimp@nvidia.com> > Cc: Hans de Goede <hdegoede@redhat.com>; Michael Shych > <michaelsh@nvidia.com>; Ciju Rajan K <crajank@nvidia.com>; Felix Radensky > <fradensky@nvidia.com>; Oleksandr Shamray <oleksandrs@nvidia.com>; > platform-driver-x86@vger.kernel.org > Subject: Re: [PATCH platform-next v2 07/10] platform: mellanox: Introduce > support of Nvidia smart switch > > On Mon, 13 Jan 2025, Vadim Pasternak wrote: > > > Provide platform support for Nvidia Smart Switch SN4280. > > > > The Smart Switch equipped with: > > - Nvidia COME module based on AMD EPYC™ Embedded 3451 CPU. > > - Nvidia Spectrum-3 ASIC. > > - Four DPUs, each equipped with Nvidia BF3 ARM based processor and > > with Lattice LFD2NX-40 FPGA device. > > - 28xQSFP-DD external ports. > > - Two power supplies. > > - Four cooling drawers. > > > > Introduce configuration structures for the new systems to allow proper > > activation of the required platform drivers. > > > > Reviewed-by: Ciju Rajan K <crajank@nvidia.com> > > Signed-off-by: Vadim Pasternak <vadimp@nvidia.com> > > --- > > drivers/platform/mellanox/mlx-platform.c | 1965 +++++++++++++++++++- > -- > > 1 file changed, 1711 insertions(+), 254 deletions(-) > > > > diff --git a/drivers/platform/mellanox/mlx-platform.c > b/drivers/platform/mellanox/mlx-platform.c > > index bd3bb06ff8f2..9d237852d3e0 100644 > > --- a/drivers/platform/mellanox/mlx-platform.c > > +++ b/drivers/platform/mellanox/mlx-platform.c > > @@ -38,6 +38,7 @@ > > #define MLXPLAT_CPLD_LPC_REG_CPLD4_PN1_OFFSET 0x0b > > #define MLXPLAT_CPLD_LPC_REG_RESET_GP1_OFFSET 0x17 > > #define MLXPLAT_CPLD_LPC_REG_RESET_GP2_OFFSET 0x19 > > +#define MLXPLAT_CPLD_LPC_REG_RESET_GP3_OFFSET 0x1b > > #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 > > @@ -49,9 +50,11 @@ > > #define MLXPLAT_CPLD_LPC_REG_LED5_OFFSET 0x24 > > #define MLXPLAT_CPLD_LPC_REG_LED6_OFFSET 0x25 > > #define MLXPLAT_CPLD_LPC_REG_LED7_OFFSET 0x26 > > +#define MLXPLAT_CPLD_LPC_REG_LED8_OFFSET 0x27 > > #define MLXPLAT_CPLD_LPC_REG_FAN_DIRECTION 0x2a > > #define MLXPLAT_CPLD_LPC_REG_GP0_RO_OFFSET 0x2b > > #define MLXPLAT_CPLD_LPC_REG_GPCOM0_OFFSET 0x2d > > +#define MLXPLAT_CPLD_LPC_REG_GP1_RO_OFFSET 0x2c > > #define MLXPLAT_CPLD_LPC_REG_GP0_OFFSET 0x2e > > #define MLXPLAT_CPLD_LPC_REG_GP_RST_OFFSET 0x2f > > #define MLXPLAT_CPLD_LPC_REG_GP1_OFFSET 0x30 > > @@ -71,12 +74,14 @@ > > #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_GP3_OFFSET 0x46 > > #define MLXPLAT_CPLD_LPC_REG_BRD_OFFSET 0x47 > > #define MLXPLAT_CPLD_LPC_REG_BRD_EVENT_OFFSET 0x48 > > #define MLXPLAT_CPLD_LPC_REG_BRD_MASK_OFFSET 0x49 > > #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_GPI_MASK_OFFSET 0x4e > > #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 > > @@ -88,15 +93,20 @@ > > #define MLXPLAT_CPLD_LPC_REG_PSU_OFFSET 0x58 > > #define MLXPLAT_CPLD_LPC_REG_PSU_EVENT_OFFSET 0x59 > > #define MLXPLAT_CPLD_LPC_REG_PSU_MASK_OFFSET 0x5a > > +#define MLXPLAT_CPLD_LPC_REG_PSU_AC_OFFSET 0x5e > > #define MLXPLAT_CPLD_LPC_REG_PWR_OFFSET 0x64 > > #define MLXPLAT_CPLD_LPC_REG_PWR_EVENT_OFFSET 0x65 > > #define MLXPLAT_CPLD_LPC_REG_PWR_MASK_OFFSET 0x66 > > +#define MLXPLAT_CPLD_LPC_REG_PSU_ALERT_OFFSET 0x6a > > #define MLXPLAT_CPLD_LPC_REG_LC_IN_OFFSET 0x70 > > #define MLXPLAT_CPLD_LPC_REG_LC_IN_EVENT_OFFSET 0x71 > > #define MLXPLAT_CPLD_LPC_REG_LC_IN_MASK_OFFSET 0x72 > > #define MLXPLAT_CPLD_LPC_REG_FAN_OFFSET 0x88 > > #define MLXPLAT_CPLD_LPC_REG_FAN_EVENT_OFFSET 0x89 > > #define MLXPLAT_CPLD_LPC_REG_FAN_MASK_OFFSET 0x8a > > +#define MLXPLAT_CPLD_LPC_REG_FAN2_OFFSET 0x8b > > +#define MLXPLAT_CPLD_LPC_REG_FAN2_EVENT_OFFSET 0x8c > > +#define MLXPLAT_CPLD_LPC_REG_FAN2_MASK_OFFSET 0x8d > > #define MLXPLAT_CPLD_LPC_REG_CPLD5_VER_OFFSET 0x8e > > #define MLXPLAT_CPLD_LPC_REG_CPLD5_PN_OFFSET 0x8f > > #define MLXPLAT_CPLD_LPC_REG_CPLD5_PN1_OFFSET 0x90 > > @@ -128,10 +138,15 @@ > > #define MLXPLAT_CPLD_LPC_REG_LC_SD_EVENT_OFFSET 0xaa > > #define MLXPLAT_CPLD_LPC_REG_LC_SD_MASK_OFFSET 0xab > > #define MLXPLAT_CPLD_LPC_REG_LC_PWR_ON 0xb2 > > +#define MLXPLAT_CPLD_LPC_REG_TACHO19_OFFSET 0xb4 > > +#define MLXPLAT_CPLD_LPC_REG_TACHO20_OFFSET 0xb5 > > #define MLXPLAT_CPLD_LPC_REG_DBG1_OFFSET 0xb6 > > #define MLXPLAT_CPLD_LPC_REG_DBG2_OFFSET 0xb7 > > #define MLXPLAT_CPLD_LPC_REG_DBG3_OFFSET 0xb8 > > #define MLXPLAT_CPLD_LPC_REG_DBG4_OFFSET 0xb9 > > +#define MLXPLAT_CPLD_LPC_REG_TACHO17_OFFSET 0xba > > +#define MLXPLAT_CPLD_LPC_REG_TACHO18_OFFSET 0xbb > > +#define MLXPLAT_CPLD_LPC_REG_ASIC_CAP_OFFSET 0xc1 > > #define MLXPLAT_CPLD_LPC_REG_GP4_RO_OFFSET 0xc2 > > #define MLXPLAT_CPLD_LPC_REG_SPI_CHNL_SELECT 0xc3 > > #define MLXPLAT_CPLD_LPC_REG_CPLD5_MVER_OFFSET 0xc4 > > @@ -182,6 +197,9 @@ > > #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_REG_TACHO15_OFFSET 0xfe > > +#define MLXPLAT_CPLD_LPC_REG_TACHO16_OFFSET 0xff > > + > > #define MLXPLAT_CPLD_LPC_IO_RANGE 0x100 > > > > #define MLXPLAT_CPLD_LPC_PIO_OFFSET 0x10000UL > > @@ -210,9 +228,15 @@ > > #define MLXPLAT_CPLD_AGGR_MASK_NG_DEF 0x04 > > #define MLXPLAT_CPLD_AGGR_MASK_COMEX BIT(0) > > #define MLXPLAT_CPLD_AGGR_MASK_LC BIT(3) > > +#define MLXPLAT_CPLD_AGGR_MASK_DPU_BRD BIT(4) > > +#define MLXPLAT_CPLD_AGGR_MASK_DPU_CORE BIT(5) > > #define MLXPLAT_CPLD_AGGR_MASK_MODULAR > (MLXPLAT_CPLD_AGGR_MASK_NG_DEF | \ > > > MLXPLAT_CPLD_AGGR_MASK_COMEX | \ > > MLXPLAT_CPLD_AGGR_MASK_LC) > > +#define MLXPLAT_CPLD_AGGR_MASK_SMART_SW > (MLXPLAT_CPLD_AGGR_MASK_COMEX | \ > > + > MLXPLAT_CPLD_AGGR_MASK_NG_DEF | \ > > + > MLXPLAT_CPLD_AGGR_MASK_DPU_BRD | \ > > + > MLXPLAT_CPLD_AGGR_MASK_DPU_CORE) > > #define MLXPLAT_CPLD_AGGR_MASK_LC_PRSNT BIT(0) > > #define MLXPLAT_CPLD_AGGR_MASK_LC_RDY BIT(1) > > #define MLXPLAT_CPLD_AGGR_MASK_LC_PG BIT(2) > > @@ -235,15 +259,24 @@ > > #define MLXPLAT_CPLD_PWR_MASK GENMASK(1, 0) > > #define MLXPLAT_CPLD_PSU_EXT_MASK GENMASK(3, 0) > > #define MLXPLAT_CPLD_PWR_EXT_MASK GENMASK(3, 0) > > +#define MLXPLAT_CPLD_PSU_XDR_MASK GENMASK(7, 0) > > +#define MLXPLAT_CPLD_PWR_XDR_MASK GENMASK(7, 0) > > #define MLXPLAT_CPLD_FAN_MASK GENMASK(3, 0) > > #define MLXPLAT_CPLD_ASIC_MASK GENMASK(1, 0) > > +#define MLXPLAT_CPLD_ASIC_XDR_MASK GENMASK(3, 0) > > #define MLXPLAT_CPLD_FAN_NG_MASK GENMASK(6, 0) > > +#define MLXPLAT_CPLD_FAN_XDR_MASK GENMASK(7, 0) > > #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_EROT_MASK GENMASK(1, 0) > > #define MLXPLAT_CPLD_FU_CAP_MASK GENMASK(1, 0) > > +#define MLXPLAT_CPLD_PSU_CAP_MASK GENMASK(7, 0) > > +#define MLXPLAT_CPLD_FAN_CAP_MASK GENMASK(7, 0) > > +#define MLXPLAT_CPLD_ASIC_CAP_MASK GENMASK(7, 0) > > +#define MLXPLAT_CPLD_BIOS_STATUS_MASK GENMASK(3, 1) > > +#define MLXPLAT_CPLD_DPU_MASK GENMASK(3, 0) > > #define MLXPLAT_CPLD_PWR_BUTTON_MASK BIT(0) > > #define MLXPLAT_CPLD_LATCH_RST_MASK BIT(6) > > #define MLXPLAT_CPLD_THERMAL1_PDB_MASK BIT(3) > > @@ -267,6 +300,9 @@ > > /* Masks for aggregation for modular systems */ > > #define MLXPLAT_CPLD_LPC_LC_MASK GENMASK(7, 0) > > > > +/* Masks for aggregation for smart switch systems */ > > +#define MLXPLAT_CPLD_LPC_SM_SW_MASK GENMASK(7, 0) > > + > > #define MLXPLAT_CPLD_HALT_MASK BIT(3) > > #define MLXPLAT_CPLD_RESET_MASK GENMASK(7, 1) > > > > @@ -297,15 +333,18 @@ > > #define MLXPLAT_CPLD_NR_NONE -1 > > #define MLXPLAT_CPLD_PSU_DEFAULT_NR 10 > > #define MLXPLAT_CPLD_PSU_MSNXXXX_NR 4 > > +#define MLXPLAT_CPLD_PSU_XDR_NR 3 > > #define MLXPLAT_CPLD_FAN1_DEFAULT_NR 11 > > #define MLXPLAT_CPLD_FAN2_DEFAULT_NR 12 > > #define MLXPLAT_CPLD_FAN3_DEFAULT_NR 13 > > #define MLXPLAT_CPLD_FAN4_DEFAULT_NR 14 > > #define MLXPLAT_CPLD_NR_ASIC 3 > > #define MLXPLAT_CPLD_NR_LC_BASE 34 > > +#define MLXPLAT_CPLD_NR_DPU_BASE 18 > > > > #define MLXPLAT_CPLD_NR_LC_SET(nr) > (MLXPLAT_CPLD_NR_LC_BASE + (nr)) > > #define MLXPLAT_CPLD_LC_ADDR 0x32 > > +#define MLXPLAT_CPLD_DPU_ADDR 0x68 > > > > /* Masks and default values for watchdogs */ > > #define MLXPLAT_CPLD_WD1_CLEAR_MASK GENMASK(7, 1) > > @@ -320,6 +359,7 @@ > > #define MLXPLAT_CPLD_WD_DFLT_TIMEOUT 30 > > #define MLXPLAT_CPLD_WD3_DFLT_TIMEOUT 600 > > #define MLXPLAT_CPLD_WD_MAX_DEVS 2 > > +#define MLXPLAT_CPLD_DPU_MAX_DEVS 4 > > > > #define MLXPLAT_CPLD_LPC_SYSIRQ 17 > > > > @@ -346,6 +386,7 @@ > > * @pdev_io_regs - register access platform devices > > * @pdev_fan - FAN platform devices > > * @pdev_wd - array of watchdog platform devices > > + * pdev_dpu - array of Data Processor Unit platform devices > > * @regmap: device register map > > * @hotplug_resources: system hotplug resources > > * @hotplug_resources_size: size of system hotplug resources > > @@ -360,6 +401,7 @@ struct mlxplat_priv { > > struct platform_device *pdev_io_regs; > > struct platform_device *pdev_fan; > > struct platform_device *pdev_wd[MLXPLAT_CPLD_WD_MAX_DEVS]; > > + struct platform_device > *pdev_dpu[MLXPLAT_CPLD_DPU_MAX_DEVS]; > > void *regmap; > > struct resource *hotplug_resources; > > unsigned int hotplug_resources_size; > > @@ -626,6 +668,21 @@ static struct i2c_board_info > mlxplat_mlxcpld_pwr_ng800[] = { > > }, > > }; > > > > +static struct i2c_board_info mlxplat_mlxcpld_xdr_pwr[] = { > > + { > > + I2C_BOARD_INFO("dps460", 0x5d), > > + }, > > + { > > + I2C_BOARD_INFO("dps460", 0x5c), > > + }, > > + { > > + I2C_BOARD_INFO("dps460", 0x5e), > > + }, > > + { > > + I2C_BOARD_INFO("dps460", 0x5f), > > + }, > > +}; > > + > > static struct i2c_board_info mlxplat_mlxcpld_fan[] = { > > { > > I2C_BOARD_INFO("24c32", 0x50), > > @@ -2370,205 +2427,665 @@ struct mlxreg_core_hotplug_platform_data > mlxplat_mlxcpld_rack_switch_data = { > > .mask_low = MLXPLAT_CPLD_LOW_AGGR_MASK_LOW, > > }; > > > > -/* Callback performs graceful shutdown after notification about power > button event */ > > -static int > > -mlxplat_mlxcpld_l1_switch_pwr_events_handler(void *handle, enum > mlxreg_hotplug_kind kind, > > - u8 action) > > -{ > > - if (action) { > > - dev_info(&mlxplat_dev->dev, "System shutdown due to short > press of power button"); > > - kernel_power_off(); > > - } > > - > > - return 0; > > -} > > - > > -static struct mlxreg_core_hotplug_notifier > mlxplat_mlxcpld_l1_switch_pwr_events_notifier = { > > - .user_handler = mlxplat_mlxcpld_l1_switch_pwr_events_handler, > > -}; > > - > > -/* Platform hotplug for l1 switch systems family data */ > > -static struct mlxreg_core_data > mlxplat_mlxcpld_l1_switch_pwr_events_items_data[] = { > > +/* Platform hotplug XDR and smart switch system family data */ > > +static struct mlxreg_core_data mlxplat_mlxcpld_xdr_psu_items_data[] = { > > { > > - .label = "power_button", > > - .reg = MLXPLAT_CPLD_LPC_REG_PWRB_OFFSET, > > - .mask = MLXPLAT_CPLD_PWR_BUTTON_MASK, > > + .label = "psu1", > > + .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET, > > + .mask = BIT(0), > > + .slot = 1, > > + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, > > + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, > > .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > > - .hpdev.action = MLXREG_HOTPLUG_DEVICE_NO_ACTION, > > - .hpdev.notifier = > &mlxplat_mlxcpld_l1_switch_pwr_events_notifier, > > }, > > -}; > > - > > -/* Callback activates latch reset flow after notification about intrusion event > */ > > -static int > > -mlxplat_mlxcpld_l1_switch_intrusion_events_handler(void *handle, enum > mlxreg_hotplug_kind kind, > > - u8 action) > > -{ > > - struct mlxplat_priv *priv = platform_get_drvdata(mlxplat_dev); > > - u32 regval; > > - int err; > > - > > - err = regmap_read(priv->regmap, > MLXPLAT_CPLD_LPC_REG_GP1_OFFSET, ®val); > > - if (err) > > - goto fail_regmap_read; > > - > > - if (action) { > > - dev_info(&mlxplat_dev->dev, "Detected intrusion - system > latch is opened"); > > - err = regmap_write(priv->regmap, > MLXPLAT_CPLD_LPC_REG_GP1_OFFSET, > > - regval | > MLXPLAT_CPLD_LATCH_RST_MASK); > > - } else { > > - dev_info(&mlxplat_dev->dev, "System latch is properly > closed"); > > - err = regmap_write(priv->regmap, > MLXPLAT_CPLD_LPC_REG_GP1_OFFSET, > > - regval & > ~MLXPLAT_CPLD_LATCH_RST_MASK); > > - } > > - > > - if (err) > > - goto fail_regmap_write; > > - > > - return 0; > > - > > -fail_regmap_read: > > -fail_regmap_write: > > - dev_err(&mlxplat_dev->dev, "Register access failed"); > > - return err; > > -} > > - > > -static struct mlxreg_core_hotplug_notifier > mlxplat_mlxcpld_l1_switch_intrusion_events_notifier = { > > - .user_handler = mlxplat_mlxcpld_l1_switch_intrusion_events_handler, > > -}; > > - > > -static struct mlxreg_core_data > mlxplat_mlxcpld_l1_switch_health_events_items_data[] = { > > { > > - .label = "thermal1_pdb", > > - .reg = MLXPLAT_CPLD_LPC_REG_BRD_OFFSET, > > - .mask = MLXPLAT_CPLD_THERMAL1_PDB_MASK, > > + .label = "psu2", > > + .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET, > > + .mask = BIT(1), > > + .slot = 2, > > + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, > > + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, > > .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > > }, > > { > > - .label = "thermal2_pdb", > > - .reg = MLXPLAT_CPLD_LPC_REG_BRD_OFFSET, > > - .mask = MLXPLAT_CPLD_THERMAL2_PDB_MASK, > > + .label = "psu3", > > + .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET, > > + .mask = BIT(2), > > + .slot = 3, > > + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, > > + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, > > .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > > }, > > Why's the diff such a mess in this patch? > > Are you perhaps doing two things in this patch, that is, reorganizing the > existing code/structs and adding new stuff? If that's the case, please try > to do the reorganization in another patch before this one so the diff > spaghetti is hopefully avoided. > I really don't understand why patch shows some lines as deleted. In patch only new lines where added, no one deleted. If I am doing just diff - it shows only new lines, but in patch it looks like some lines have been removed. Probably some problem with ' git format-patch'. Have no idea how to handle it. > -- > i. > > > { > > - .label = "intrusion", > > - .reg = MLXPLAT_CPLD_LPC_REG_BRD_OFFSET, > > - .mask = MLXPLAT_CPLD_INTRUSION_MASK, > > + .label = "psu4", > > + .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET, > > + .mask = BIT(3), > > + .slot = 4, > > + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, > > + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, > > .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > > - .hpdev.action = MLXREG_HOTPLUG_DEVICE_NO_ACTION, > > - .hpdev.notifier = > &mlxplat_mlxcpld_l1_switch_intrusion_events_notifier, > > }, > > { > > - .label = "pwm_pg", > > - .reg = MLXPLAT_CPLD_LPC_REG_BRD_OFFSET, > > - .mask = MLXPLAT_CPLD_PWM_PG_MASK, > > + .label = "psu5", > > + .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET, > > + .mask = BIT(4), > > + .slot = 5, > > + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, > > + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, > > .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > > }, > > -}; > > - > > -static struct mlxreg_core_item mlxplat_mlxcpld_l1_switch_events_items[] = > { > > - { > > - .data = mlxplat_mlxcpld_default_ng_fan_items_data, > > - .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, > > - .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > > - .mask = MLXPLAT_CPLD_FAN_NG_MASK, > > - .count = > ARRAY_SIZE(mlxplat_mlxcpld_default_ng_fan_items_data), > > - .inversed = 1, > > - .health = false, > > - }, > > - { > > - .data = mlxplat_mlxcpld_erot_ap_items_data, > > - .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, > > - .reg = MLXPLAT_CPLD_LPC_REG_EROT_OFFSET, > > - .mask = MLXPLAT_CPLD_EROT_MASK, > > - .count = ARRAY_SIZE(mlxplat_mlxcpld_erot_ap_items_data), > > - .inversed = 1, > > - .health = false, > > - }, > > { > > - .data = mlxplat_mlxcpld_erot_error_items_data, > > - .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, > > - .reg = MLXPLAT_CPLD_LPC_REG_EROTE_OFFSET, > > - .mask = MLXPLAT_CPLD_EROT_MASK, > > - .count = > ARRAY_SIZE(mlxplat_mlxcpld_erot_error_items_data), > > - .inversed = 1, > > - .health = false, > > + .label = "psu6", > > + .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET, > > + .mask = BIT(5), > > + .slot = 6, > > + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, > > + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, > > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > > }, > > { > > - .data = mlxplat_mlxcpld_l1_switch_pwr_events_items_data, > > - .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, > > - .reg = MLXPLAT_CPLD_LPC_REG_PWRB_OFFSET, > > - .mask = MLXPLAT_CPLD_PWR_BUTTON_MASK, > > - .count = > ARRAY_SIZE(mlxplat_mlxcpld_l1_switch_pwr_events_items_data), > > - .inversed = 1, > > - .health = false, > > + .label = "psu7", > > + .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET, > > + .mask = BIT(6), > > + .slot = 7, > > + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, > > + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, > > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > > }, > > { > > - .data = > mlxplat_mlxcpld_l1_switch_health_events_items_data, > > - .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, > > - .reg = MLXPLAT_CPLD_LPC_REG_BRD_OFFSET, > > - .mask = MLXPLAT_CPLD_L1_CHA_HEALTH_MASK, > > - .count = > ARRAY_SIZE(mlxplat_mlxcpld_l1_switch_health_events_items_data), > > - .inversed = 1, > > - .health = false, > > - .ind = 8, > > + .label = "psu8", > > + .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET, > > + .mask = BIT(7), > > + .slot = 8, > > + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, > > + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, > > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > > }, > > }; > > > > -static > > -struct mlxreg_core_hotplug_platform_data > mlxplat_mlxcpld_l1_switch_data = { > > - .items = mlxplat_mlxcpld_l1_switch_events_items, > > - .counter = ARRAY_SIZE(mlxplat_mlxcpld_l1_switch_events_items), > > - .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 | > MLXPLAT_CPLD_LOW_AGGR_MASK_PWR_BUT, > > -}; > > - > > -/* Platform led default data */ > > -static struct mlxreg_core_data mlxplat_mlxcpld_default_led_data[] = { > > +static struct mlxreg_core_data mlxplat_mlxcpld_xdr_pwr_items_data[] = { > > { > > - .label = "status:green", > > - .reg = MLXPLAT_CPLD_LPC_REG_LED1_OFFSET, > > - .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > > + .label = "pwr1", > > + .reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET, > > + .mask = BIT(0), > > + .slot = 1, > > + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, > > + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, > > + .hpdev.brdinfo = &mlxplat_mlxcpld_pwr[0], > > + .hpdev.nr = MLXPLAT_CPLD_PSU_MSNXXXX_NR, > > }, > > { > > - .label = "status:red", > > - .reg = MLXPLAT_CPLD_LPC_REG_LED1_OFFSET, > > - .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK > > + .label = "pwr2", > > + .reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET, > > + .mask = BIT(1), > > + .slot = 2, > > + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, > > + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, > > + .hpdev.brdinfo = &mlxplat_mlxcpld_pwr[1], > > + .hpdev.nr = MLXPLAT_CPLD_PSU_MSNXXXX_NR, > > }, > > { > > - .label = "psu:green", > > - .reg = MLXPLAT_CPLD_LPC_REG_LED1_OFFSET, > > - .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > > + .label = "pwr3", > > + .reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET, > > + .mask = BIT(2), > > + .slot = 3, > > + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, > > + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, > > + .hpdev.brdinfo = &mlxplat_mlxcpld_ext_pwr[0], > > + .hpdev.nr = MLXPLAT_CPLD_PSU_MSNXXXX_NR, > > }, > > { > > - .label = "psu:red", > > - .reg = MLXPLAT_CPLD_LPC_REG_LED1_OFFSET, > > - .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > > + .label = "pwr4", > > + .reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET, > > + .mask = BIT(3), > > + .slot = 4, > > + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, > > + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, > > + .hpdev.brdinfo = &mlxplat_mlxcpld_ext_pwr[1], > > + .hpdev.nr = MLXPLAT_CPLD_PSU_MSNXXXX_NR, > > }, > > { > > - .label = "fan1:green", > > - .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET, > > - .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > > + .label = "pwr5", > > + .reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET, > > + .mask = BIT(4), > > + .slot = 5, > > + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, > > + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, > > + .hpdev.brdinfo = &mlxplat_mlxcpld_xdr_pwr[0], > > + .hpdev.nr = MLXPLAT_CPLD_PSU_XDR_NR, > > }, > > { > > - .label = "fan1:red", > > - .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET, > > - .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > > + .label = "pwr6", > > + .reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET, > > + .mask = BIT(5), > > + .slot = 6, > > + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, > > + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, > > + .hpdev.brdinfo = &mlxplat_mlxcpld_xdr_pwr[1], > > + .hpdev.nr = MLXPLAT_CPLD_PSU_XDR_NR, > > }, > > { > > - .label = "fan2:green", > > - .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET, > > - .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > > + .label = "pwr7", > > + .reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET, > > + .mask = BIT(6), > > + .slot = 7, > > + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, > > + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, > > + .hpdev.brdinfo = &mlxplat_mlxcpld_xdr_pwr[2], > > + .hpdev.nr = MLXPLAT_CPLD_PSU_XDR_NR, > > }, > > { > > - .label = "fan2:red", > > - .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET, > > - .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > > + .label = "pwr8", > > + .reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET, > > + .mask = BIT(7), > > + .slot = 8, > > + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, > > + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, > > + .hpdev.brdinfo = &mlxplat_mlxcpld_xdr_pwr[3], > > + .hpdev.nr = MLXPLAT_CPLD_PSU_XDR_NR, > > }, > > +}; > > + > > +static struct mlxreg_core_data mlxplat_mlxcpld_xdr_fan_items_data[] = { > > { > > - .label = "fan3:green", > > + .label = "fan1", > > + .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > > + .mask = BIT(0), > > + .slot = 1, > > + .capability = > MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > > + .capability_mask = MLXPLAT_CPLD_FAN_XDR_MASK, > > + .bit = BIT(0), > > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > > + }, > > + { > > + .label = "fan2", > > + .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > > + .mask = BIT(1), > > + .slot = 2, > > + .capability = > MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > > + .capability_mask = MLXPLAT_CPLD_FAN_XDR_MASK, > > + .bit = BIT(1), > > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > > + }, > > + { > > + .label = "fan3", > > + .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > > + .mask = BIT(2), > > + .slot = 3, > > + .capability = > MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > > + .capability_mask = MLXPLAT_CPLD_FAN_XDR_MASK, > > + .bit = BIT(2), > > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > > + }, > > + { > > + .label = "fan4", > > + .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > > + .mask = BIT(3), > > + .slot = 4, > > + .capability = > MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > > + .capability_mask = MLXPLAT_CPLD_FAN_XDR_MASK, > > + .bit = BIT(3), > > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > > + }, > > + { > > + .label = "fan5", > > + .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > > + .mask = BIT(4), > > + .slot = 5, > > + .capability = > MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > > + .capability_mask = MLXPLAT_CPLD_FAN_XDR_MASK, > > + .bit = BIT(4), > > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > > + }, > > + { > > + .label = "fan6", > > + .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > > + .mask = BIT(5), > > + .slot = 6, > > + .capability = > MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > > + .capability_mask = MLXPLAT_CPLD_FAN_XDR_MASK, > > + .bit = BIT(5), > > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > > + }, > > + { > > + .label = "fan7", > > + .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > > + .mask = BIT(6), > > + .slot = 7, > > + .capability = > MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > > + .capability_mask = MLXPLAT_CPLD_FAN_XDR_MASK, > > + .bit = BIT(6), > > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > > + }, > > + { > > + .label = "fan8", > > + .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > > + .mask = BIT(7), > > + .slot = 8, > > + .capability = > MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > > + .capability_mask = MLXPLAT_CPLD_FAN_XDR_MASK, > > + .bit = BIT(7), > > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > > + }, > > +}; > > + > > +static struct mlxreg_core_data mlxplat_mlxcpld_xdr_asic1_items_data[] = { > > + { > > + .label = "asic1", > > + .reg = MLXPLAT_CPLD_LPC_REG_ASIC_HEALTH_OFFSET, > > + .mask = MLXPLAT_CPLD_ASIC_MASK, > > + .slot = 1, > > + .capability = MLXPLAT_CPLD_LPC_REG_ASIC_CAP_OFFSET, > > + .capability_mask = MLXPLAT_CPLD_ASIC_CAP_MASK, > > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > > + } > > +}; > > + > > +/* Platform hotplug for smart switch systems families data */ > > +static struct mlxreg_core_data > mlxplat_mlxcpld_smart_switch_dpu_ready_data[] = { > > + { > > + .label = "dpu1_ready", > > + .reg = MLXPLAT_CPLD_LPC_REG_LC_RD_OFFSET, > > + .mask = BIT(0), > > + .slot = 1, > > + .capability = MLXPLAT_CPLD_LPC_REG_SLOT_QTY_OFFSET, > > + .capability_mask = MLXPLAT_CPLD_DPU_MASK, > > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > > + }, > > + { > > + .label = "dpu2_ready", > > + .reg = MLXPLAT_CPLD_LPC_REG_LC_RD_OFFSET, > > + .mask = BIT(1), > > + .slot = 2, > > + .capability = MLXPLAT_CPLD_LPC_REG_SLOT_QTY_OFFSET, > > + .capability_mask = MLXPLAT_CPLD_DPU_MASK, > > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > > + }, > > + { > > + .label = "dpu3_ready", > > + .reg = MLXPLAT_CPLD_LPC_REG_LC_RD_OFFSET, > > + .mask = BIT(2), > > + .slot = 3, > > + .capability = MLXPLAT_CPLD_LPC_REG_SLOT_QTY_OFFSET, > > + .capability_mask = MLXPLAT_CPLD_DPU_MASK, > > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > > + }, > > + { > > + .label = "dpu4_ready", > > + .reg = MLXPLAT_CPLD_LPC_REG_LC_RD_OFFSET, > > + .mask = BIT(3), > > + .slot = 4, > > + .capability = MLXPLAT_CPLD_LPC_REG_SLOT_QTY_OFFSET, > > + .capability_mask = MLXPLAT_CPLD_DPU_MASK, > > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > > + }, > > +}; > > + > > +static struct mlxreg_core_data > mlxplat_mlxcpld_smart_switch_dpu_shtdn_ready_data[] = { > > + { > > + .label = "dpu1_shtdn_ready", > > + .reg = MLXPLAT_CPLD_LPC_REG_LC_SN_OFFSET, > > + .mask = BIT(0), > > + .slot = 1, > > + .capability = MLXPLAT_CPLD_LPC_REG_SLOT_QTY_OFFSET, > > + .capability_mask = MLXPLAT_CPLD_DPU_MASK, > > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > > + }, > > + { > > + .label = "dpu2_shtdn_ready", > > + .reg = MLXPLAT_CPLD_LPC_REG_LC_SN_OFFSET, > > + .mask = BIT(1), > > + .slot = 2, > > + .capability = MLXPLAT_CPLD_LPC_REG_SLOT_QTY_OFFSET, > > + .capability_mask = MLXPLAT_CPLD_DPU_MASK, > > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > > + }, > > + { > > + .label = "dpu3_shtdn_ready", > > + .reg = MLXPLAT_CPLD_LPC_REG_LC_SN_OFFSET, > > + .mask = BIT(2), > > + .slot = 3, > > + .capability = MLXPLAT_CPLD_LPC_REG_SLOT_QTY_OFFSET, > > + .capability_mask = MLXPLAT_CPLD_DPU_MASK, > > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > > + }, > > + { > > + .label = "dpu4_shtdn_ready", > > + .reg = MLXPLAT_CPLD_LPC_REG_LC_SN_OFFSET, > > + .mask = BIT(3), > > + .slot = 4, > > + .capability = MLXPLAT_CPLD_LPC_REG_SLOT_QTY_OFFSET, > > + .capability_mask = MLXPLAT_CPLD_DPU_MASK, > > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > > + }, > > +}; > > + > > +static struct mlxreg_core_item mlxplat_mlxcpld_smart_switch_items[] = { > > + { > > + .data = mlxplat_mlxcpld_xdr_psu_items_data, > > + .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, > > + .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET, > > + .mask = MLXPLAT_CPLD_PSU_XDR_MASK, > > + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, > > + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, > > + .count = ARRAY_SIZE(mlxplat_mlxcpld_xdr_psu_items_data), > > + .inversed = 1, > > + .health = false, > > + }, > > + { > > + .data = mlxplat_mlxcpld_xdr_pwr_items_data, > > + .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, > > + .reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET, > > + .mask = MLXPLAT_CPLD_PWR_XDR_MASK, > > + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, > > + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, > > + .count = ARRAY_SIZE(mlxplat_mlxcpld_xdr_pwr_items_data), > > + .inversed = 0, > > + .health = false, > > + }, > > + { > > + .data = mlxplat_mlxcpld_xdr_fan_items_data, > > + .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, > > + .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > > + .mask = MLXPLAT_CPLD_FAN_XDR_MASK, > > + .capability = > MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > > + .capability_mask = MLXPLAT_CPLD_FAN_CAP_MASK, > > + .count = ARRAY_SIZE(mlxplat_mlxcpld_xdr_fan_items_data), > > + .inversed = 1, > > + .health = false, > > + }, > > + { > > + .data = mlxplat_mlxcpld_xdr_asic1_items_data, > > + .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, > > + .reg = MLXPLAT_CPLD_LPC_REG_ASIC_HEALTH_OFFSET, > > + .mask = MLXPLAT_CPLD_ASIC_XDR_MASK, > > + .capability = MLXPLAT_CPLD_LPC_REG_ASIC_CAP_OFFSET, > > + .capability_mask = MLXPLAT_CPLD_ASIC_CAP_MASK, > > + .count = ARRAY_SIZE(mlxplat_mlxcpld_xdr_asic1_items_data), > > + .inversed = 0, > > + .health = true, > > + }, > > + { > > + .data = mlxplat_mlxcpld_smart_switch_dpu_ready_data, > > + .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_DPU_CORE, > > + .reg = MLXPLAT_CPLD_LPC_REG_LC_RD_OFFSET, > > + .mask = MLXPLAT_CPLD_DPU_MASK, > > + .capability = MLXPLAT_CPLD_LPC_REG_SLOT_QTY_OFFSET, > > + .capability_mask = MLXPLAT_CPLD_DPU_MASK, > > + .count = > ARRAY_SIZE(mlxplat_mlxcpld_smart_switch_dpu_ready_data), > > + .inversed = 1, > > + .health = false, > > + }, > > + { > > + .data = > mlxplat_mlxcpld_smart_switch_dpu_shtdn_ready_data, > > + .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_DPU_CORE, > > + .reg = MLXPLAT_CPLD_LPC_REG_LC_SN_OFFSET, > > + .mask = MLXPLAT_CPLD_DPU_MASK, > > + .capability = MLXPLAT_CPLD_LPC_REG_SLOT_QTY_OFFSET, > > + .capability_mask = MLXPLAT_CPLD_DPU_MASK, > > + .count = > ARRAY_SIZE(mlxplat_mlxcpld_smart_switch_dpu_shtdn_ready_data), > > + .inversed = 1, > > + .health = false, > > + }, > > +}; > > + > > +static > > +struct mlxreg_core_hotplug_platform_data > mlxplat_mlxcpld_smart_switch_data = { > > + .items = mlxplat_mlxcpld_smart_switch_items, > > + .counter = ARRAY_SIZE(mlxplat_mlxcpld_smart_switch_items), > > + .cell = MLXPLAT_CPLD_LPC_REG_AGGR_OFFSET, > > + .mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF | > MLXPLAT_CPLD_AGGR_MASK_COMEX | > > + MLXPLAT_CPLD_AGGR_MASK_DPU_BRD | > MLXPLAT_CPLD_AGGR_MASK_DPU_CORE, > > + .cell_low = MLXPLAT_CPLD_LPC_REG_AGGRLO_OFFSET, > > + .mask_low = MLXPLAT_CPLD_LOW_AGGR_MASK_LOW, > > +}; > > + > > +/* Smart switch data processor units data */ > > +static struct i2c_board_info mlxplat_mlxcpld_smart_switch_dpu_devs[] = { > > + { > > + I2C_BOARD_INFO("mlxreg-dpu", > MLXPLAT_CPLD_DPU_ADDR), > > + .irq = MLXPLAT_CPLD_LPC_SYSIRQ, > > + }, > > + { > > + I2C_BOARD_INFO("mlxreg-dpu", > MLXPLAT_CPLD_DPU_ADDR), > > + .irq = MLXPLAT_CPLD_LPC_SYSIRQ, > > + }, > > + { > > + I2C_BOARD_INFO("mlxreg-dpu", > MLXPLAT_CPLD_DPU_ADDR), > > + .irq = MLXPLAT_CPLD_LPC_SYSIRQ, > > + }, > > + { > > + I2C_BOARD_INFO("mlxreg-dpu", > MLXPLAT_CPLD_DPU_ADDR), > > + .irq = MLXPLAT_CPLD_LPC_SYSIRQ, > > + }, > > +}; > > + > > +static struct mlxreg_core_data mlxplat_mlxcpld_smart_switch_dpu_data[] = > { > > + { > > + .label = "dpu1", > > + .hpdev.brdinfo = > &mlxplat_mlxcpld_smart_switch_dpu_devs[0], > > + .hpdev.nr = MLXPLAT_CPLD_NR_DPU_BASE, > > + .slot = 1, > > + }, > > + { > > + .label = "dpu2", > > + .hpdev.brdinfo = > &mlxplat_mlxcpld_smart_switch_dpu_devs[1], > > + .hpdev.nr = MLXPLAT_CPLD_NR_DPU_BASE + 1, > > + .slot = 2, > > + }, > > + { > > + .label = "dpu3", > > + .hpdev.brdinfo = > &mlxplat_mlxcpld_smart_switch_dpu_devs[2], > > + .hpdev.nr = MLXPLAT_CPLD_NR_DPU_BASE + 2, > > + .slot = 3, > > + }, > > + { > > + .label = "dpu4", > > + .hpdev.brdinfo = > &mlxplat_mlxcpld_smart_switch_dpu_devs[2], > > + .hpdev.nr = MLXPLAT_CPLD_NR_DPU_BASE + 3, > > + .slot = 4, > > + }, > > +}; > > + > > +/* Callback performs graceful shutdown after notification about power > button event */ > > +static int > > +mlxplat_mlxcpld_l1_switch_pwr_events_handler(void *handle, enum > mlxreg_hotplug_kind kind, > > + u8 action) > > +{ > > + if (action) { > > + dev_info(&mlxplat_dev->dev, "System shutdown due to short > press of power button"); > > + kernel_power_off(); > > + } > > + > > + return 0; > > +} > > + > > +static struct mlxreg_core_hotplug_notifier > mlxplat_mlxcpld_l1_switch_pwr_events_notifier = { > > + .user_handler = mlxplat_mlxcpld_l1_switch_pwr_events_handler, > > +}; > > + > > +/* Platform hotplug for l1 switch systems family data */ > > +static struct mlxreg_core_data > mlxplat_mlxcpld_l1_switch_pwr_events_items_data[] = { > > + { > > + .label = "power_button", > > + .reg = MLXPLAT_CPLD_LPC_REG_PWRB_OFFSET, > > + .mask = MLXPLAT_CPLD_PWR_BUTTON_MASK, > > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > > + .hpdev.action = MLXREG_HOTPLUG_DEVICE_NO_ACTION, > > + .hpdev.notifier = > &mlxplat_mlxcpld_l1_switch_pwr_events_notifier, > > + }, > > +}; > > + > > +/* Callback activates latch reset flow after notification about intrusion event > */ > > +static int > > +mlxplat_mlxcpld_l1_switch_intrusion_events_handler(void *handle, enum > mlxreg_hotplug_kind kind, > > + u8 action) > > +{ > > + struct mlxplat_priv *priv = platform_get_drvdata(mlxplat_dev); > > + u32 regval; > > + int err; > > + > > + err = regmap_read(priv->regmap, > MLXPLAT_CPLD_LPC_REG_GP1_OFFSET, ®val); > > + if (err) > > + goto fail_regmap_read; > > + > > + if (action) { > > + dev_info(&mlxplat_dev->dev, "Detected intrusion - system > latch is opened"); > > + err = regmap_write(priv->regmap, > MLXPLAT_CPLD_LPC_REG_GP1_OFFSET, > > + regval | > MLXPLAT_CPLD_LATCH_RST_MASK); > > + } else { > > + dev_info(&mlxplat_dev->dev, "System latch is properly > closed"); > > + err = regmap_write(priv->regmap, > MLXPLAT_CPLD_LPC_REG_GP1_OFFSET, > > + regval & > ~MLXPLAT_CPLD_LATCH_RST_MASK); > > + } > > + > > + if (err) > > + goto fail_regmap_write; > > + > > + return 0; > > + > > +fail_regmap_read: > > +fail_regmap_write: > > + dev_err(&mlxplat_dev->dev, "Register access failed"); > > + return err; > > +} > > + > > +static struct mlxreg_core_hotplug_notifier > mlxplat_mlxcpld_l1_switch_intrusion_events_notifier = { > > + .user_handler = mlxplat_mlxcpld_l1_switch_intrusion_events_handler, > > +}; > > + > > +static struct mlxreg_core_data > mlxplat_mlxcpld_l1_switch_health_events_items_data[] = { > > + { > > + .label = "thermal1_pdb", > > + .reg = MLXPLAT_CPLD_LPC_REG_BRD_OFFSET, > > + .mask = MLXPLAT_CPLD_THERMAL1_PDB_MASK, > > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > > + }, > > + { > > + .label = "thermal2_pdb", > > + .reg = MLXPLAT_CPLD_LPC_REG_BRD_OFFSET, > > + .mask = MLXPLAT_CPLD_THERMAL2_PDB_MASK, > > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > > + }, > > + { > > + .label = "intrusion", > > + .reg = MLXPLAT_CPLD_LPC_REG_BRD_OFFSET, > > + .mask = MLXPLAT_CPLD_INTRUSION_MASK, > > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > > + .hpdev.action = MLXREG_HOTPLUG_DEVICE_NO_ACTION, > > + .hpdev.notifier = > &mlxplat_mlxcpld_l1_switch_intrusion_events_notifier, > > + }, > > + { > > + .label = "pwm_pg", > > + .reg = MLXPLAT_CPLD_LPC_REG_BRD_OFFSET, > > + .mask = MLXPLAT_CPLD_PWM_PG_MASK, > > + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > > + }, > > +}; > > + > > +static struct mlxreg_core_item mlxplat_mlxcpld_l1_switch_events_items[] = > { > > + { > > + .data = mlxplat_mlxcpld_default_ng_fan_items_data, > > + .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, > > + .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > > + .mask = MLXPLAT_CPLD_FAN_NG_MASK, > > + .count = > ARRAY_SIZE(mlxplat_mlxcpld_default_ng_fan_items_data), > > + .inversed = 1, > > + .health = false, > > + }, > > + { > > + .data = mlxplat_mlxcpld_erot_ap_items_data, > > + .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, > > + .reg = MLXPLAT_CPLD_LPC_REG_EROT_OFFSET, > > + .mask = MLXPLAT_CPLD_EROT_MASK, > > + .count = ARRAY_SIZE(mlxplat_mlxcpld_erot_ap_items_data), > > + .inversed = 1, > > + .health = false, > > + }, > > + { > > + .data = mlxplat_mlxcpld_erot_error_items_data, > > + .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, > > + .reg = MLXPLAT_CPLD_LPC_REG_EROTE_OFFSET, > > + .mask = MLXPLAT_CPLD_EROT_MASK, > > + .count = > ARRAY_SIZE(mlxplat_mlxcpld_erot_error_items_data), > > + .inversed = 1, > > + .health = false, > > + }, > > + { > > + .data = mlxplat_mlxcpld_l1_switch_pwr_events_items_data, > > + .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, > > + .reg = MLXPLAT_CPLD_LPC_REG_PWRB_OFFSET, > > + .mask = MLXPLAT_CPLD_PWR_BUTTON_MASK, > > + .count = > ARRAY_SIZE(mlxplat_mlxcpld_l1_switch_pwr_events_items_data), > > + .inversed = 1, > > + .health = false, > > + }, > > + { > > + .data = > mlxplat_mlxcpld_l1_switch_health_events_items_data, > > + .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, > > + .reg = MLXPLAT_CPLD_LPC_REG_BRD_OFFSET, > > + .mask = MLXPLAT_CPLD_L1_CHA_HEALTH_MASK, > > + .count = > ARRAY_SIZE(mlxplat_mlxcpld_l1_switch_health_events_items_data), > > + .inversed = 1, > > + .health = false, > > + .ind = 8, > > + }, > > +}; > > + > > +static > > +struct mlxreg_core_hotplug_platform_data > mlxplat_mlxcpld_l1_switch_data = { > > + .items = mlxplat_mlxcpld_l1_switch_events_items, > > + .counter = ARRAY_SIZE(mlxplat_mlxcpld_l1_switch_events_items), > > + .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 | > MLXPLAT_CPLD_LOW_AGGR_MASK_PWR_BUT, > > +}; > > + > > +/* Platform led default data */ > > +static struct mlxreg_core_data mlxplat_mlxcpld_default_led_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 > > + }, > > + { > > + .label = "psu:green", > > + .reg = MLXPLAT_CPLD_LPC_REG_LED1_OFFSET, > > + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > > + }, > > + { > > + .label = "psu:red", > > + .reg = MLXPLAT_CPLD_LPC_REG_LED1_OFFSET, > > + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > > + }, > > + { > > + .label = "fan1:green", > > + .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET, > > + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > > + }, > > + { > > + .label = "fan1:red", > > + .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET, > > + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > > + }, > > + { > > + .label = "fan2:green", > > + .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET, > > + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > > + }, > > + { > > + .label = "fan2:red", > > + .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET, > > + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > > + }, > > + { > > + .label = "fan3:green", > > .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET, > > .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > > }, > > @@ -3088,67 +3605,241 @@ static struct mlxreg_core_data > mlxplat_mlxcpld_l1_switch_led_data[] = { > > .bit = BIT(1), > > }, > > { > > - .label = "fan2:orange", > > - .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET, > > + .label = "fan2:orange", > > + .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET, > > + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > > + .capability = > MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > > + .bit = BIT(1), > > + }, > > + { > > + .label = "fan3:green", > > + .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET, > > + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > > + .capability = > MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > > + .bit = BIT(2), > > + }, > > + { > > + .label = "fan3:orange", > > + .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET, > > + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > > + .capability = > MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > > + .bit = BIT(2), > > + }, > > + { > > + .label = "fan4:green", > > + .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET, > > + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > > + .capability = > MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > > + .bit = BIT(3), > > + }, > > + { > > + .label = "fan4:orange", > > + .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET, > > + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > > + .capability = > MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > > + .bit = BIT(3), > > + }, > > + { > > + .label = "fan5:green", > > + .reg = MLXPLAT_CPLD_LPC_REG_LED4_OFFSET, > > + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > > + .capability = > MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > > + .bit = BIT(4), > > + }, > > + { > > + .label = "fan5:orange", > > + .reg = MLXPLAT_CPLD_LPC_REG_LED4_OFFSET, > > + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > > + .capability = > MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > > + .bit = BIT(4), > > + }, > > + { > > + .label = "fan6:green", > > + .reg = MLXPLAT_CPLD_LPC_REG_LED4_OFFSET, > > + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > > + .capability = > MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > > + .bit = BIT(5), > > + }, > > + { > > + .label = "fan6:orange", > > + .reg = MLXPLAT_CPLD_LPC_REG_LED4_OFFSET, > > + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > > + .capability = > MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > > + .bit = BIT(5), > > + }, > > + { > > + .label = "uid:blue", > > + .reg = MLXPLAT_CPLD_LPC_REG_LED5_OFFSET, > > + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > > + }, > > +}; > > + > > +static struct mlxreg_core_platform_data mlxplat_l1_switch_led_data = { > > + .data = mlxplat_mlxcpld_l1_switch_led_data, > > + .counter = ARRAY_SIZE(mlxplat_mlxcpld_l1_switch_led_data), > > +}; > > + > > +/* Platform led data for XDR and smart switch systems */ > > +static struct mlxreg_core_data mlxplat_mlxcpld_xdr_led_data[] = { > > + { > > + .label = "status:green", > > + .reg = MLXPLAT_CPLD_LPC_REG_LED1_OFFSET, > > + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > > + }, > > + { > > + .label = "status:orange", > > + .reg = MLXPLAT_CPLD_LPC_REG_LED1_OFFSET, > > + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK > > + }, > > + { > > + .label = "psu:green", > > + .reg = MLXPLAT_CPLD_LPC_REG_LED1_OFFSET, > > + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > > + }, > > + { > > + .label = "psu:orange", > > + .reg = MLXPLAT_CPLD_LPC_REG_LED1_OFFSET, > > + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > > + }, > > + { > > + .label = "fan1:green", > > + .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET, > > + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > > + .capability = > MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > > + .slot = 1, > > + }, > > + { > > + .label = "fan1:orange", > > + .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET, > > + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > > + .capability = > MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > > + .slot = 1, > > + }, > > + { > > + .label = "fan2:green", > > + .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET, > > + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > > + .capability = > MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > > + .slot = 2, > > + }, > > + { > > + .label = "fan2:orange", > > + .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET, > > + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > > + .capability = > MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > > + .slot = 2, > > + }, > > + { > > + .label = "fan3:green", > > + .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET, > > + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > > + .capability = > MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > > + .slot = 3, > > + }, > > + { > > + .label = "fan3:orange", > > + .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET, > > + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > > + .capability = > MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > > + .slot = 3, > > + }, > > + { > > + .label = "fan4:green", > > + .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET, > > + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > > + .capability = > MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > > + .slot = 4, > > + }, > > + { > > + .label = "fan4:orange", > > + .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET, > > + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > > + .capability = > MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > > + .slot = 4, > > + }, > > + { > > + .label = "fan5:green", > > + .reg = MLXPLAT_CPLD_LPC_REG_LED4_OFFSET, > > + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > > + .capability = > MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > > + .slot = 5, > > + }, > > + { > > + .label = "fan5:orange", > > + .reg = MLXPLAT_CPLD_LPC_REG_LED4_OFFSET, > > + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > > + .capability = > MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > > + .slot = 5, > > + }, > > + { > > + .label = "fan6:green", > > + .reg = MLXPLAT_CPLD_LPC_REG_LED4_OFFSET, > > + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > > + .capability = > MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > > + .slot = 6, > > + }, > > + { > > + .label = "fan6:orange", > > + .reg = MLXPLAT_CPLD_LPC_REG_LED4_OFFSET, > > + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > > + .capability = > MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > > + .slot = 6, > > + }, > > + { > > + .label = "fan7:green", > > + .reg = MLXPLAT_CPLD_LPC_REG_LED6_OFFSET, > > + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > > + .capability = > MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > > + .slot = 7, > > + }, > > + { > > + .label = "fan7:orange", > > + .reg = MLXPLAT_CPLD_LPC_REG_LED6_OFFSET, > > .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > > .capability = > MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > > - .bit = BIT(1), > > + .slot = 7, > > }, > > { > > - .label = "fan3:green", > > - .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET, > > + .label = "fan8:green", > > + .reg = MLXPLAT_CPLD_LPC_REG_LED7_OFFSET, > > .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > > .capability = > MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > > - .bit = BIT(2), > > + .slot = 8, > > }, > > { > > - .label = "fan3:orange", > > - .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET, > > + .label = "fan8:orange", > > + .reg = MLXPLAT_CPLD_LPC_REG_LED7_OFFSET, > > .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > > .capability = > MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > > - .bit = BIT(2), > > + .slot = 8, > > }, > > { > > - .label = "fan4:green", > > - .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET, > > + .label = "fan9:green", > > + .reg = MLXPLAT_CPLD_LPC_REG_LED7_OFFSET, > > .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > > .capability = > MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > > - .bit = BIT(3), > > + .slot = 9, > > }, > > { > > - .label = "fan4:orange", > > - .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET, > > + .label = "fan9:orange", > > + .reg = MLXPLAT_CPLD_LPC_REG_LED7_OFFSET, > > .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > > .capability = > MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > > - .bit = BIT(3), > > + .slot = 9, > > }, > > { > > - .label = "fan5:green", > > - .reg = MLXPLAT_CPLD_LPC_REG_LED4_OFFSET, > > + .label = "fan10:green", > > + .reg = MLXPLAT_CPLD_LPC_REG_LED8_OFFSET, > > .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > > .capability = > MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > > - .bit = BIT(4), > > + .slot = 10, > > }, > > { > > - .label = "fan5:orange", > > - .reg = MLXPLAT_CPLD_LPC_REG_LED4_OFFSET, > > + .label = "fan10:orange", > > + .reg = MLXPLAT_CPLD_LPC_REG_LED8_OFFSET, > > .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, > > .capability = > MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > > - .bit = BIT(4), > > - }, > > - { > > - .label = "fan6:green", > > - .reg = MLXPLAT_CPLD_LPC_REG_LED4_OFFSET, > > - .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > > - .capability = > MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > > - .bit = BIT(5), > > - }, > > - { > > - .label = "fan6:orange", > > - .reg = MLXPLAT_CPLD_LPC_REG_LED4_OFFSET, > > - .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, > > - .capability = > MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > > - .bit = BIT(5), > > + .slot = 10, > > }, > > { > > .label = "uid:blue", > > @@ -3157,9 +3848,9 @@ static struct mlxreg_core_data > mlxplat_mlxcpld_l1_switch_led_data[] = { > > }, > > }; > > > > -static struct mlxreg_core_platform_data mlxplat_l1_switch_led_data = { > > - .data = mlxplat_mlxcpld_l1_switch_led_data, > > - .counter = ARRAY_SIZE(mlxplat_mlxcpld_l1_switch_led_data), > > +static struct mlxreg_core_platform_data mlxplat_xdr_led_data = { > > + .data = mlxplat_mlxcpld_xdr_led_data, > > + .counter = ARRAY_SIZE(mlxplat_mlxcpld_xdr_led_data), > > }; > > > > /* Platform register access default */ > > @@ -4396,19 +5087,240 @@ static struct mlxreg_core_data > mlxplat_mlxcpld_modular_regs_io_data[] = { > > }, > > }; > > > > -static struct mlxreg_core_platform_data mlxplat_modular_regs_io_data = { > > - .data = mlxplat_mlxcpld_modular_regs_io_data, > > - .counter = > ARRAY_SIZE(mlxplat_mlxcpld_modular_regs_io_data), > > +static struct mlxreg_core_platform_data mlxplat_modular_regs_io_data = { > > + .data = mlxplat_mlxcpld_modular_regs_io_data, > > + .counter = > ARRAY_SIZE(mlxplat_mlxcpld_modular_regs_io_data), > > +}; > > + > > +/* Platform register access for chassis blade systems family data */ > > +static struct mlxreg_core_data > mlxplat_mlxcpld_chassis_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 = "reset_long_pwr_pb", > > + .reg = MLXPLAT_CPLD_LPC_REG_RST_CAUSE2_OFFSET, > > + .mask = GENMASK(7, 0) & ~BIT(7), > > + .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 = "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, > > + .bit = GENMASK(7, 0), > > + .mode = 0444, > > + }, > > +}; > > + > > +static struct mlxreg_core_platform_data > mlxplat_chassis_blade_regs_io_data = { > > + .data = mlxplat_mlxcpld_chassis_blade_regs_io_data, > > + .counter = > ARRAY_SIZE(mlxplat_mlxcpld_chassis_blade_regs_io_data), > > }; > > > > -/* Platform register access for chassis blade systems family data */ > > -static struct mlxreg_core_data > mlxplat_mlxcpld_chassis_blade_regs_io_data[] = { > > +/* Platform register access for smart switch systems families data */ > > +static struct mlxreg_core_data > mlxplat_mlxcpld_smart_switch_regs_io_data[] = { > > { > > .label = "cpld1_version", > > .reg = MLXPLAT_CPLD_LPC_REG_CPLD1_VER_OFFSET, > > .bit = GENMASK(7, 0), > > .mode = 0444, > > }, > > + { > > + .label = "cpld2_version", > > + .reg = MLXPLAT_CPLD_LPC_REG_CPLD2_VER_OFFSET, > > + .bit = GENMASK(7, 0), > > + .mode = 0444, > > + }, > > + { > > + .label = "cpld3_version", > > + .reg = MLXPLAT_CPLD_LPC_REG_CPLD3_VER_OFFSET, > > + .bit = GENMASK(7, 0), > > + .mode = 0444, > > + }, > > { > > .label = "cpld1_pn", > > .reg = MLXPLAT_CPLD_LPC_REG_CPLD1_PN_OFFSET, > > @@ -4416,12 +5328,116 @@ static struct mlxreg_core_data > mlxplat_mlxcpld_chassis_blade_regs_io_data[] = { > > .mode = 0444, > > .regnum = 2, > > }, > > + { > > + .label = "cpld2_pn", > > + .reg = MLXPLAT_CPLD_LPC_REG_CPLD2_PN_OFFSET, > > + .bit = GENMASK(15, 0), > > + .mode = 0444, > > + .regnum = 2, > > + }, > > + { > > + .label = "cpld3_pn", > > + .reg = MLXPLAT_CPLD_LPC_REG_CPLD3_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 = "cpld2_version_min", > > + .reg = MLXPLAT_CPLD_LPC_REG_CPLD2_MVER_OFFSET, > > + .bit = GENMASK(7, 0), > > + .mode = 0444, > > + }, > > + { > > + .label = "cpld3_version_min", > > + .reg = MLXPLAT_CPLD_LPC_REG_CPLD3_MVER_OFFSET, > > + .bit = GENMASK(7, 0), > > + .mode = 0444, > > + }, > > + { > > + .label = "kexec_activated", > > + .reg = MLXPLAT_CPLD_LPC_REG_RESET_GP1_OFFSET, > > + .mask = GENMASK(7, 0) & ~BIT(1), > > + .mode = 0644, > > + }, > > + { > > + .label = "asic_reset", > > + .reg = MLXPLAT_CPLD_LPC_REG_RESET_GP2_OFFSET, > > + .mask = GENMASK(7, 0) & ~BIT(3), > > + .mode = 0644, > > + }, > > + { > > + .label = "eth_switch_reset", > > + .reg = MLXPLAT_CPLD_LPC_REG_RESET_GP2_OFFSET, > > + .mask = GENMASK(7, 0) & ~BIT(4), > > + .mode = 0644, > > + }, > > + { > > + .label = "dpu1_rst", > > + .reg = MLXPLAT_CPLD_LPC_REG_RESET_GP3_OFFSET, > > + .mask = GENMASK(7, 0) & ~BIT(0), > > + .mode = 0200, > > + }, > > + { > > + .label = "dpu2_rst", > > + .reg = MLXPLAT_CPLD_LPC_REG_RESET_GP3_OFFSET, > > + .mask = GENMASK(7, 0) & ~BIT(1), > > + .mode = 0200, > > + }, > > + { > > + .label = "dpu3_rst", > > + .reg = MLXPLAT_CPLD_LPC_REG_RESET_GP3_OFFSET, > > + .mask = GENMASK(7, 0) & ~BIT(2), > > + .mode = 0200, > > + }, > > + { > > + .label = "dpu4_rst", > > + .reg = MLXPLAT_CPLD_LPC_REG_RESET_GP3_OFFSET, > > + .mask = GENMASK(7, 0) & ~BIT(3), > > + .mode = 0200, > > + }, > > + { > > + .label = "dpu1_pwr", > > + .reg = MLXPLAT_CPLD_LPC_REG_RESET_GP4_OFFSET, > > + .mask = GENMASK(7, 0) & ~BIT(0), > > + .mode = 0200, > > + }, > > + { > > + .label = "dpu2_pwr", > > + .reg = MLXPLAT_CPLD_LPC_REG_RESET_GP4_OFFSET, > > + .mask = GENMASK(7, 0) & ~BIT(1), > > + .mode = 0200, > > + }, > > + { > > + .label = "dpu3_pwr", > > + .reg = MLXPLAT_CPLD_LPC_REG_RESET_GP4_OFFSET, > > + .mask = GENMASK(7, 0) & ~BIT(2), > > + .mode = 0200, > > + }, > > + { > > + .label = "dpu4_pwr", > > + .reg = MLXPLAT_CPLD_LPC_REG_RESET_GP4_OFFSET, > > + .mask = GENMASK(7, 0) & ~BIT(3), > > + .mode = 0200, > > + }, > > + { > > + .label = "reset_long_pb", > > + .reg = MLXPLAT_CPLD_LPC_REG_RESET_CAUSE_OFFSET, > > + .mask = GENMASK(7, 0) & ~BIT(0), > > + .mode = 0444, > > + }, > > + { > > + .label = "reset_short_pb", > > + .reg = MLXPLAT_CPLD_LPC_REG_RESET_CAUSE_OFFSET, > > + .mask = GENMASK(7, 0) & ~BIT(1), > > + .mode = 0444, > > + }, > > { > > .label = "reset_aux_pwr_or_ref", > > .reg = MLXPLAT_CPLD_LPC_REG_RESET_CAUSE_OFFSET, > > @@ -4429,9 +5445,33 @@ static struct mlxreg_core_data > mlxplat_mlxcpld_chassis_blade_regs_io_data[] = { > > .mode = 0444, > > }, > > { > > - .label = "reset_from_comex", > > + .label = "reset_swb_dc_dc_pwr_fail", > > .reg = MLXPLAT_CPLD_LPC_REG_RESET_CAUSE_OFFSET, > > - .mask = GENMASK(7, 0) & ~BIT(4), > > + .mask = GENMASK(7, 0) & ~BIT(3), > > + .mode = 0444, > > + }, > > + { > > + .label = "reset_swb_wd", > > + .reg = MLXPLAT_CPLD_LPC_REG_RESET_CAUSE_OFFSET, > > + .mask = GENMASK(7, 0) & ~BIT(6), > > + .mode = 0444, > > + }, > > + { > > + .label = "reset_asic_thermal", > > + .reg = MLXPLAT_CPLD_LPC_REG_RESET_CAUSE_OFFSET, > > + .mask = GENMASK(7, 0) & ~BIT(7), > > + .mode = 0444, > > + }, > > + { > > + .label = "reset_sw_reset", > > + .reg = MLXPLAT_CPLD_LPC_REG_RST_CAUSE1_OFFSET, > > + .mask = GENMASK(7, 0) & ~BIT(0), > > + .mode = 0444, > > + }, > > + { > > + .label = "reset_aux_pwr_or_reload", > > + .reg = MLXPLAT_CPLD_LPC_REG_RST_CAUSE1_OFFSET, > > + .mask = GENMASK(7, 0) & ~BIT(2), > > .mode = 0444, > > }, > > { > > @@ -4453,13 +5493,13 @@ static struct mlxreg_core_data > mlxplat_mlxcpld_chassis_blade_regs_io_data[] = { > > .mode = 0444, > > }, > > { > > - .label = "reset_comex_wd", > > + .label = "reset_pwr", > > .reg = MLXPLAT_CPLD_LPC_REG_RST_CAUSE1_OFFSET, > > - .mask = GENMASK(7, 0) & ~BIT(6), > > + .mask = GENMASK(7, 0) & ~BIT(7), > > .mode = 0444, > > }, > > { > > - .label = "reset_voltmon_upgrade_fail", > > + .label = "reset_pwr_converter_fail", > > .reg = MLXPLAT_CPLD_LPC_REG_RST_CAUSE2_OFFSET, > > .mask = GENMASK(7, 0) & ~BIT(0), > > .mode = 0444, > > @@ -4483,23 +5523,103 @@ static struct mlxreg_core_data > mlxplat_mlxcpld_chassis_blade_regs_io_data[] = { > > .mode = 0444, > > }, > > { > > - .label = "reset_reload_bios", > > + .label = "reset_ac_pwr_fail", > > .reg = MLXPLAT_CPLD_LPC_REG_RST_CAUSE2_OFFSET, > > - .mask = GENMASK(7, 0) & ~BIT(5), > > + .mask = GENMASK(7, 0) & ~BIT(6), > > .mode = 0444, > > }, > > { > > - .label = "reset_ac_pwr_fail", > > - .reg = MLXPLAT_CPLD_LPC_REG_RST_CAUSE2_OFFSET, > > - .mask = GENMASK(7, 0) & ~BIT(6), > > + .label = "voltreg_update_status", > > + .reg = MLXPLAT_CPLD_LPC_REG_GP0_RO_OFFSET, > > + .mask = MLXPLAT_CPLD_VOLTREG_UPD_MASK, > > + .bit = 5, > > .mode = 0444, > > }, > > { > > - .label = "reset_long_pwr_pb", > > - .reg = MLXPLAT_CPLD_LPC_REG_RST_CAUSE2_OFFSET, > > - .mask = GENMASK(7, 0) & ~BIT(7), > > + .label = "port80", > > + .reg = MLXPLAT_CPLD_LPC_REG_GP1_RO_OFFSET, > > + .bit = GENMASK(7, 0), > > + .mode = 0444, > > + }, > > + { > > + .label = "bios_status", > > + .reg = MLXPLAT_CPLD_LPC_REG_GPCOM0_OFFSET, > > + .mask = MLXPLAT_CPLD_BIOS_STATUS_MASK, > > + .bit = 2, > > + .mode = 0444, > > + }, > > + { > > + .label = "bios_start_retry", > > + .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 = "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 = "shutdown_unlock", > > + .reg = MLXPLAT_CPLD_LPC_REG_GP0_OFFSET, > > + .mask = GENMASK(7, 0) & ~BIT(5), > > + .mode = 0644, > > + }, > > + { > > + .label = "fan_dir", > > + .reg = MLXPLAT_CPLD_LPC_REG_FAN_DIRECTION, > > + .bit = GENMASK(7, 0), > > .mode = 0444, > > }, > > + { > > + .label = "dpu1_rst_en", > > + .reg = MLXPLAT_CPLD_LPC_REG_GP_RST_OFFSET, > > + .mask = GENMASK(7, 0) & ~BIT(0), > > + .mode = 0200, > > + }, > > + { > > + .label = "dpu2_rst_en", > > + .reg = MLXPLAT_CPLD_LPC_REG_GP_RST_OFFSET, > > + .mask = GENMASK(7, 0) & ~BIT(1), > > + .mode = 0200, > > + }, > > + { > > + .label = "dpu3_rst_en", > > + .reg = MLXPLAT_CPLD_LPC_REG_GP_RST_OFFSET, > > + .mask = GENMASK(7, 0) & ~BIT(2), > > + .mode = 0200, > > + }, > > + { > > + .label = "dpu4_rst_en", > > + .reg = MLXPLAT_CPLD_LPC_REG_GP_RST_OFFSET, > > + .mask = GENMASK(7, 0) & ~BIT(3), > > + .mode = 0200, > > + }, > > + { > > + .label = "psu1_on", > > + .reg = MLXPLAT_CPLD_LPC_REG_GP1_OFFSET, > > + .mask = GENMASK(7, 0) & ~BIT(0), > > + .mode = 0200, > > + }, > > + { > > + .label = "psu2_on", > > + .reg = MLXPLAT_CPLD_LPC_REG_GP1_OFFSET, > > + .mask = GENMASK(7, 0) & ~BIT(1), > > + .mode = 0200, > > + }, > > { > > .label = "pwr_cycle", > > .reg = MLXPLAT_CPLD_LPC_REG_GP1_OFFSET, > > @@ -4513,72 +5633,117 @@ static struct mlxreg_core_data > mlxplat_mlxcpld_chassis_blade_regs_io_data[] = { > > .mode = 0200, > > }, > > { > > - .label = "global_wp_request", > > - .reg = MLXPLAT_CPLD_LPC_REG_GP2_OFFSET, > > - .mask = GENMASK(7, 0) & ~BIT(0), > > + .label = "jtag_cap", > > + .reg = MLXPLAT_CPLD_LPC_REG_FU_CAP_OFFSET, > > + .mask = MLXPLAT_CPLD_FU_CAP_MASK, > > + .bit = 1, > > + .mode = 0444, > > + }, > > + { > > + .label = "jtag_enable", > > + .reg = MLXPLAT_CPLD_LPC_REG_FIELD_UPGRADE, > > + .mask = GENMASK(1, 0), > > + .bit = 1, > > + .mode = 0644, > > + }, > > + { > > + .label = "non_active_bios_select", > > + .reg = MLXPLAT_CPLD_LPC_SAFE_BIOS_OFFSET, > > + .mask = GENMASK(7, 0) & ~BIT(4), > > + .mode = 0644, > > + }, > > + { > > + .label = "bios_upgrade_fail", > > + .reg = MLXPLAT_CPLD_LPC_SAFE_BIOS_OFFSET, > > + .mask = GENMASK(7, 0) & ~BIT(5), > > + .mode = 0444, > > + }, > > + { > > + .label = "bios_image_invert", > > + .reg = MLXPLAT_CPLD_LPC_SAFE_BIOS_OFFSET, > > + .mask = GENMASK(7, 0) & ~BIT(6), > > .mode = 0644, > > }, > > { > > - .label = "jtag_enable", > > - .reg = MLXPLAT_CPLD_LPC_REG_GP2_OFFSET, > > - .mask = GENMASK(7, 0) & ~BIT(4), > > + .label = "me_reboot", > > + .reg = MLXPLAT_CPLD_LPC_SAFE_BIOS_OFFSET, > > + .mask = GENMASK(7, 0) & ~BIT(7), > > .mode = 0644, > > }, > > { > > - .label = "comm_chnl_ready", > > - .reg = MLXPLAT_CPLD_LPC_REG_GP2_OFFSET, > > - .mask = GENMASK(7, 0) & ~BIT(6), > > + .label = "dpu1_pwr_force", > > + .reg = MLXPLAT_CPLD_LPC_REG_GP3_OFFSET, > > + .mask = GENMASK(7, 0) & ~BIT(0), > > .mode = 0200, > > }, > > { > > - .label = "bios_safe_mode", > > - .reg = MLXPLAT_CPLD_LPC_REG_GPCOM0_OFFSET, > > - .mask = GENMASK(7, 0) & ~BIT(4), > > - .mode = 0444, > > + .label = "dpu2_pwr_force", > > + .reg = MLXPLAT_CPLD_LPC_REG_GP3_OFFSET, > > + .mask = GENMASK(7, 0) & ~BIT(1), > > + .mode = 0200, > > }, > > { > > - .label = "bios_active_image", > > - .reg = MLXPLAT_CPLD_LPC_REG_GPCOM0_OFFSET, > > - .mask = GENMASK(7, 0) & ~BIT(5), > > - .mode = 0444, > > + .label = "dpu3_pwr_force", > > + .reg = MLXPLAT_CPLD_LPC_REG_GP3_OFFSET, > > + .mask = GENMASK(7, 0) & ~BIT(2), > > + .mode = 0200, > > }, > > { > > - .label = "bios_auth_fail", > > - .reg = MLXPLAT_CPLD_LPC_REG_GPCOM0_OFFSET, > > - .mask = GENMASK(7, 0) & ~BIT(6), > > - .mode = 0444, > > + .label = "dpu4_pwr_force", > > + .reg = MLXPLAT_CPLD_LPC_REG_GP3_OFFSET, > > + .mask = GENMASK(7, 0) & ~BIT(3), > > + .mode = 0200, > > }, > > { > > - .label = "bios_upgrade_fail", > > - .reg = MLXPLAT_CPLD_LPC_REG_GPCOM0_OFFSET, > > - .mask = GENMASK(7, 0) & ~BIT(7), > > + .label = "ufm_done", > > + .reg = MLXPLAT_CPLD_LPC_REG_GPI_MASK_OFFSET, > > + .bit = GENMASK(7, 0), > > .mode = 0444, > > }, > > { > > - .label = "voltreg_update_status", > > - .reg = MLXPLAT_CPLD_LPC_REG_GP0_RO_OFFSET, > > - .mask = MLXPLAT_CPLD_VOLTREG_UPD_MASK, > > - .bit = 5, > > + .label = "asic_health", > > + .reg = MLXPLAT_CPLD_LPC_REG_ASIC_HEALTH_OFFSET, > > + .mask = MLXPLAT_CPLD_ASIC_MASK, > > + .bit = 1, > > .mode = 0444, > > }, > > { > > - .label = "vpd_wp", > > - .reg = MLXPLAT_CPLD_LPC_REG_GP0_OFFSET, > > - .mask = GENMASK(7, 0) & ~BIT(3), > > + .label = "psu1_ac_ok", > > + .reg = MLXPLAT_CPLD_LPC_REG_PSU_AC_OFFSET, > > + .mask = GENMASK(7, 0) & ~BIT(0), > > .mode = 0644, > > }, > > { > > - .label = "pcie_asic_reset_dis", > > - .reg = MLXPLAT_CPLD_LPC_REG_GP0_OFFSET, > > - .mask = GENMASK(7, 0) & ~BIT(4), > > + .label = "psu2_ac_ok", > > + .reg = MLXPLAT_CPLD_LPC_REG_PSU_AC_OFFSET, > > + .mask = GENMASK(7, 0) & ~BIT(1), > > .mode = 0644, > > }, > > { > > - .label = "global_wp_response", > > - .reg = MLXPLAT_CPLD_LPC_REG_GWP_OFFSET, > > + .label = "psu1_no_alert", > > + .reg = MLXPLAT_CPLD_LPC_REG_PSU_ALERT_OFFSET, > > .mask = GENMASK(7, 0) & ~BIT(0), > > + .mode = 0644, > > + }, > > + { > > + .label = "psu2_no_alert", > > + .reg = MLXPLAT_CPLD_LPC_REG_PSU_ALERT_OFFSET, > > + .mask = GENMASK(7, 0) & ~BIT(1), > > + .mode = 0644, > > + }, > > + { > > + .label = "asic_pg_fail", > > + .reg = MLXPLAT_CPLD_LPC_REG_GP4_RO_OFFSET, > > + .mask = GENMASK(7, 0) & ~BIT(7), > > .mode = 0444, > > }, > > + { > > + .label = "spi_chnl_select", > > + .reg = MLXPLAT_CPLD_LPC_REG_SPI_CHNL_SELECT, > > + .mask = GENMASK(7, 0), > > + .bit = 1, > > + .mode = 0644, > > + }, > > { > > .label = "config1", > > .reg = MLXPLAT_CPLD_LPC_REG_CONFIG1_OFFSET, > > @@ -4605,9 +5770,9 @@ static struct mlxreg_core_data > mlxplat_mlxcpld_chassis_blade_regs_io_data[] = { > > }, > > }; > > > > -static struct mlxreg_core_platform_data > mlxplat_chassis_blade_regs_io_data = { > > - .data = mlxplat_mlxcpld_chassis_blade_regs_io_data, > > - .counter = > ARRAY_SIZE(mlxplat_mlxcpld_chassis_blade_regs_io_data), > > +static struct mlxreg_core_platform_data > mlxplat_smart_switch_regs_io_data = { > > + .data = mlxplat_mlxcpld_smart_switch_regs_io_data, > > + .counter = > ARRAY_SIZE(mlxplat_mlxcpld_smart_switch_regs_io_data), > > }; > > > > /* Platform FAN default */ > > @@ -4751,6 +5916,185 @@ static struct mlxreg_core_platform_data > mlxplat_default_fan_data = { > > .capability = > MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > > }; > > > > +/* XDR and smart switch platform fan data */ > > +static struct mlxreg_core_data mlxplat_mlxcpld_xdr_fan_data[] = { > > + { > > + .label = "pwm1", > > + .reg = MLXPLAT_CPLD_LPC_REG_PWM1_OFFSET, > > + }, > > + { > > + .label = "tacho1", > > + .reg = MLXPLAT_CPLD_LPC_REG_TACHO1_OFFSET, > > + .mask = GENMASK(7, 0), > > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, > > + .slot = 1, > > + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > > + }, > > + { > > + .label = "tacho2", > > + .reg = MLXPLAT_CPLD_LPC_REG_TACHO2_OFFSET, > > + .mask = GENMASK(7, 0), > > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, > > + .slot = 2, > > + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > > + }, > > + { > > + .label = "tacho3", > > + .reg = MLXPLAT_CPLD_LPC_REG_TACHO3_OFFSET, > > + .mask = GENMASK(7, 0), > > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, > > + .slot = 3, > > + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > > + }, > > + { > > + .label = "tacho4", > > + .reg = MLXPLAT_CPLD_LPC_REG_TACHO4_OFFSET, > > + .mask = GENMASK(7, 0), > > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, > > + .slot = 4, > > + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > > + }, > > + { > > + .label = "tacho5", > > + .reg = MLXPLAT_CPLD_LPC_REG_TACHO5_OFFSET, > > + .mask = GENMASK(7, 0), > > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, > > + .slot = 5, > > + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > > + }, > > + { > > + .label = "tacho6", > > + .reg = MLXPLAT_CPLD_LPC_REG_TACHO6_OFFSET, > > + .mask = GENMASK(7, 0), > > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, > > + .slot = 6, > > + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > > + }, > > + { > > + .label = "tacho7", > > + .reg = MLXPLAT_CPLD_LPC_REG_TACHO7_OFFSET, > > + .mask = GENMASK(7, 0), > > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, > > + .slot = 7, > > + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > > + }, > > + { > > + .label = "tacho8", > > + .reg = MLXPLAT_CPLD_LPC_REG_TACHO8_OFFSET, > > + .mask = GENMASK(7, 0), > > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, > > + .slot = 8, > > + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > > + }, > > + { > > + .label = "tacho9", > > + .reg = MLXPLAT_CPLD_LPC_REG_TACHO9_OFFSET, > > + .mask = GENMASK(7, 0), > > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, > > + .slot = 9, > > + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > > + }, > > + { > > + .label = "tacho10", > > + .reg = MLXPLAT_CPLD_LPC_REG_TACHO10_OFFSET, > > + .mask = GENMASK(7, 0), > > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, > > + .slot = 10, > > + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > > + }, > > + { > > + .label = "tacho11", > > + .reg = MLXPLAT_CPLD_LPC_REG_TACHO11_OFFSET, > > + .mask = GENMASK(7, 0), > > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, > > + .slot = 11, > > + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > > + }, > > + { > > + .label = "tacho12", > > + .reg = MLXPLAT_CPLD_LPC_REG_TACHO12_OFFSET, > > + .mask = GENMASK(7, 0), > > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, > > + .slot = 12, > > + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > > + }, > > + { > > + .label = "tacho13", > > + .reg = MLXPLAT_CPLD_LPC_REG_TACHO13_OFFSET, > > + .mask = GENMASK(7, 0), > > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, > > + .slot = 13, > > + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > > + }, > > + { > > + .label = "tacho14", > > + .reg = MLXPLAT_CPLD_LPC_REG_TACHO14_OFFSET, > > + .mask = GENMASK(7, 0), > > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, > > + .slot = 14, > > + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > > + }, > > + { > > + .label = "tacho15", > > + .reg = MLXPLAT_CPLD_LPC_REG_TACHO15_OFFSET, > > + .mask = GENMASK(7, 0), > > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, > > + .slot = 15, > > + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > > + }, > > + { > > + .label = "tacho16", > > + .reg = MLXPLAT_CPLD_LPC_REG_TACHO16_OFFSET, > > + .mask = GENMASK(7, 0), > > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, > > + .slot = 16, > > + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, > > + }, > > + { > > + .label = "tacho17", > > + .reg = MLXPLAT_CPLD_LPC_REG_TACHO17_OFFSET, > > + .mask = GENMASK(7, 0), > > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, > > + .slot = 17, > > + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN2_OFFSET, > > + }, > > + { > > + .label = "tacho18", > > + .reg = MLXPLAT_CPLD_LPC_REG_TACHO18_OFFSET, > > + .mask = GENMASK(7, 0), > > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, > > + .slot = 18, > > + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN2_OFFSET, > > + }, > > + { > > + .label = "tacho19", > > + .reg = MLXPLAT_CPLD_LPC_REG_TACHO19_OFFSET, > > + .mask = GENMASK(7, 0), > > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, > > + .slot = 19, > > + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN2_OFFSET, > > + }, > > + { > > + .label = "tacho20", > > + .reg = MLXPLAT_CPLD_LPC_REG_TACHO20_OFFSET, > > + .mask = GENMASK(7, 0), > > + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, > > + .slot = 20, > > + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN2_OFFSET, > > + }, > > + { > > + .label = "conf", > > + .capability = > MLXPLAT_CPLD_LPC_REG_TACHO_SPEED_OFFSET, > > + }, > > +}; > > + > > +static struct mlxreg_core_platform_data mlxplat_xdr_fan_data = { > > + .data = mlxplat_mlxcpld_xdr_fan_data, > > + .counter = ARRAY_SIZE(mlxplat_mlxcpld_xdr_fan_data), > > + .capability = > MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, > > + .version = 1, > > +}; > > + > > /* Watchdog type1: hardware implementation version1 > > * (MSN2700, MSN2410, MSN2740, MSN2100 and MSN2140 systems). > > */ > > @@ -4975,6 +6319,8 @@ static bool mlxplat_mlxcpld_writeable_reg(struct > device *dev, unsigned int reg) > > { > > switch (reg) { > > case MLXPLAT_CPLD_LPC_REG_RESET_GP1_OFFSET: > > + case MLXPLAT_CPLD_LPC_REG_RESET_GP2_OFFSET: > > + case MLXPLAT_CPLD_LPC_REG_RESET_GP3_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_RESET_GP4_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_LED1_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_LED2_OFFSET: > > @@ -4983,12 +6329,14 @@ static bool > mlxplat_mlxcpld_writeable_reg(struct device *dev, unsigned int reg) > > case MLXPLAT_CPLD_LPC_REG_LED5_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_LED6_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_LED7_OFFSET: > > + case MLXPLAT_CPLD_LPC_REG_LED8_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_GP0_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_GP_RST_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_GP1_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_WP1_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_GP2_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_WP2_OFFSET: > > + case MLXPLAT_CPLD_LPC_REG_GP3_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_FIELD_UPGRADE: > > case MLXPLAT_CPLD_LPC_SAFE_BIOS_OFFSET: > > case MLXPLAT_CPLD_LPC_SAFE_BIOS_WP_OFFSET: > > @@ -5012,10 +6360,14 @@ static bool > mlxplat_mlxcpld_writeable_reg(struct device *dev, unsigned int reg) > > 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_PSU_AC_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_PWR_EVENT_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_PWR_MASK_OFFSET: > > + case MLXPLAT_CPLD_LPC_REG_PSU_ALERT_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_FAN_EVENT_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_FAN_MASK_OFFSET: > > + case MLXPLAT_CPLD_LPC_REG_FAN2_EVENT_OFFSET: > > + case MLXPLAT_CPLD_LPC_REG_FAN2_MASK_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_EROT_EVENT_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_EROT_MASK_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_EROTE_EVENT_OFFSET: > > @@ -5083,6 +6435,8 @@ static bool mlxplat_mlxcpld_readable_reg(struct > device *dev, unsigned int reg) > > case MLXPLAT_CPLD_LPC_REG_CPLD5_PN_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_CPLD5_PN1_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_RESET_GP1_OFFSET: > > + case MLXPLAT_CPLD_LPC_REG_RESET_GP2_OFFSET: > > + case MLXPLAT_CPLD_LPC_REG_RESET_GP3_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_RESET_GP4_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_RESET_CAUSE_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_RST_CAUSE1_OFFSET: > > @@ -5094,15 +6448,18 @@ static bool > mlxplat_mlxcpld_readable_reg(struct device *dev, unsigned int reg) > > case MLXPLAT_CPLD_LPC_REG_LED5_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_LED6_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_LED7_OFFSET: > > + case MLXPLAT_CPLD_LPC_REG_LED8_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_FAN_DIRECTION: > > case MLXPLAT_CPLD_LPC_REG_GP0_RO_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_GPCOM0_OFFSET: > > + case MLXPLAT_CPLD_LPC_REG_GP1_RO_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_GP0_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_GP_RST_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_GP1_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_WP1_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_GP2_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_WP2_OFFSET: > > + case MLXPLAT_CPLD_LPC_REG_GP3_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_FIELD_UPGRADE: > > case MLXPLAT_CPLD_LPC_SAFE_BIOS_OFFSET: > > case MLXPLAT_CPLD_LPC_SAFE_BIOS_WP_OFFSET: > > @@ -5122,6 +6479,7 @@ static bool mlxplat_mlxcpld_readable_reg(struct > device *dev, unsigned int reg) > > 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_GPI_MASK_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_BRD_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_BRD_EVENT_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_BRD_MASK_OFFSET: > > @@ -5134,12 +6492,17 @@ static bool > mlxplat_mlxcpld_readable_reg(struct device *dev, unsigned int reg) > > case MLXPLAT_CPLD_LPC_REG_PSU_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_PSU_EVENT_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_PSU_MASK_OFFSET: > > + case MLXPLAT_CPLD_LPC_REG_PSU_AC_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_PWR_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_PWR_EVENT_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_PWR_MASK_OFFSET: > > + case MLXPLAT_CPLD_LPC_REG_PSU_ALERT_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_FAN_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_FAN_EVENT_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_FAN_MASK_OFFSET: > > + case MLXPLAT_CPLD_LPC_REG_FAN2_OFFSET: > > + case MLXPLAT_CPLD_LPC_REG_FAN2_EVENT_OFFSET: > > + case MLXPLAT_CPLD_LPC_REG_FAN2_MASK_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_EROT_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_EROT_EVENT_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_EROT_MASK_OFFSET: > > @@ -5213,6 +6576,13 @@ static bool mlxplat_mlxcpld_readable_reg(struct > device *dev, unsigned int reg) > > case MLXPLAT_CPLD_LPC_REG_TACHO12_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_TACHO13_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_TACHO14_OFFSET: > > + case MLXPLAT_CPLD_LPC_REG_TACHO15_OFFSET: > > + case MLXPLAT_CPLD_LPC_REG_TACHO16_OFFSET: > > + case MLXPLAT_CPLD_LPC_REG_TACHO17_OFFSET: > > + case MLXPLAT_CPLD_LPC_REG_TACHO18_OFFSET: > > + case MLXPLAT_CPLD_LPC_REG_TACHO19_OFFSET: > > + case MLXPLAT_CPLD_LPC_REG_TACHO20_OFFSET: > > + case MLXPLAT_CPLD_LPC_REG_ASIC_CAP_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_PWM_CONTROL_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_FAN_CAP2_OFFSET: > > @@ -5248,6 +6618,8 @@ static bool mlxplat_mlxcpld_volatile_reg(struct > device *dev, unsigned int reg) > > case MLXPLAT_CPLD_LPC_REG_CPLD5_PN_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_CPLD5_PN1_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_RESET_GP1_OFFSET: > > + case MLXPLAT_CPLD_LPC_REG_RESET_GP2_OFFSET: > > + case MLXPLAT_CPLD_LPC_REG_RESET_GP3_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_RESET_GP4_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_RESET_CAUSE_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_RST_CAUSE1_OFFSET: > > @@ -5259,13 +6631,16 @@ static bool mlxplat_mlxcpld_volatile_reg(struct > device *dev, unsigned int reg) > > case MLXPLAT_CPLD_LPC_REG_LED5_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_LED6_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_LED7_OFFSET: > > + case MLXPLAT_CPLD_LPC_REG_LED8_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_FAN_DIRECTION: > > case MLXPLAT_CPLD_LPC_REG_GP0_RO_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_GPCOM0_OFFSET: > > + case MLXPLAT_CPLD_LPC_REG_GP1_RO_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_GP0_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_GP_RST_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_GP1_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_GP2_OFFSET: > > + case MLXPLAT_CPLD_LPC_REG_GP3_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_FIELD_UPGRADE: > > case MLXPLAT_CPLD_LPC_SAFE_BIOS_OFFSET: > > case MLXPLAT_CPLD_LPC_SAFE_BIOS_WP_OFFSET: > > @@ -5285,6 +6660,7 @@ static bool mlxplat_mlxcpld_volatile_reg(struct > device *dev, unsigned int reg) > > 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_GPI_MASK_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_BRD_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_BRD_EVENT_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_BRD_MASK_OFFSET: > > @@ -5297,9 +6673,11 @@ static bool mlxplat_mlxcpld_volatile_reg(struct > device *dev, unsigned int reg) > > case MLXPLAT_CPLD_LPC_REG_PSU_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_PSU_EVENT_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_PSU_MASK_OFFSET: > > + case MLXPLAT_CPLD_LPC_REG_PSU_AC_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_PWR_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_PWR_EVENT_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_PWR_MASK_OFFSET: > > + case MLXPLAT_CPLD_LPC_REG_PSU_ALERT_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_FAN_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_FAN_EVENT_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_FAN_MASK_OFFSET: > > @@ -5370,6 +6748,13 @@ static bool mlxplat_mlxcpld_volatile_reg(struct > device *dev, unsigned int reg) > > case MLXPLAT_CPLD_LPC_REG_TACHO12_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_TACHO13_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_TACHO14_OFFSET: > > + case MLXPLAT_CPLD_LPC_REG_TACHO15_OFFSET: > > + case MLXPLAT_CPLD_LPC_REG_TACHO16_OFFSET: > > + case MLXPLAT_CPLD_LPC_REG_TACHO17_OFFSET: > > + case MLXPLAT_CPLD_LPC_REG_TACHO18_OFFSET: > > + case MLXPLAT_CPLD_LPC_REG_TACHO19_OFFSET: > > + case MLXPLAT_CPLD_LPC_REG_TACHO20_OFFSET: > > + case MLXPLAT_CPLD_LPC_REG_ASIC_CAP_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_PWM_CONTROL_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET: > > case MLXPLAT_CPLD_LPC_REG_FAN_CAP2_OFFSET: > > @@ -5431,6 +6816,15 @@ static const struct reg_default > mlxplat_mlxcpld_regmap_eth_modular[] = { > > MLXPLAT_CPLD_AGGR_MASK_LC_LOW }, > > }; > > > > +static const struct reg_default mlxplat_mlxcpld_regmap_smart_switch[] = { > > + { MLXPLAT_CPLD_LPC_REG_PWM_CONTROL_OFFSET, 0x00 }, > > + { MLXPLAT_CPLD_LPC_REG_WD1_ACT_OFFSET, 0x00 }, > > + { MLXPLAT_CPLD_LPC_REG_WD2_ACT_OFFSET, 0x00 }, > > + { MLXPLAT_CPLD_LPC_REG_WD3_ACT_OFFSET, 0x00 }, > > + { MLXPLAT_CPLD_LPC_REG_AGGRCX_MASK_OFFSET, > > + MLXPLAT_CPLD_LPC_SM_SW_MASK }, > > +}; > > + > > struct mlxplat_mlxcpld_regmap_context { > > void __iomem *base; > > }; > > @@ -5539,6 +6933,20 @@ static const struct regmap_config > mlxplat_mlxcpld_regmap_config_eth_modular = { > > .reg_write = mlxplat_mlxcpld_reg_write, > > }; > > > > +static const struct regmap_config > mlxplat_mlxcpld_regmap_config_smart_switch = { > > + .reg_bits = 8, > > + .val_bits = 8, > > + .max_register = 255, > > + .cache_type = REGCACHE_FLAT, > > + .writeable_reg = mlxplat_mlxcpld_writeable_reg, > > + .readable_reg = mlxplat_mlxcpld_readable_reg, > > + .volatile_reg = mlxplat_mlxcpld_volatile_reg, > > + .reg_defaults = mlxplat_mlxcpld_regmap_smart_switch, > > + .num_reg_defaults = > ARRAY_SIZE(mlxplat_mlxcpld_regmap_smart_switch), > > + .reg_read = mlxplat_mlxcpld_reg_read, > > + .reg_write = mlxplat_mlxcpld_reg_write, > > +}; > > + > > static struct resource mlxplat_mlxcpld_resources[] = { > > [0] = DEFINE_RES_IRQ_NAMED(MLXPLAT_CPLD_LPC_SYSIRQ, > "mlxreg-hotplug"), > > }; > > @@ -5550,6 +6958,7 @@ static struct mlxreg_core_platform_data > *mlxplat_regs_io; > > static struct mlxreg_core_platform_data *mlxplat_fan; > > static struct mlxreg_core_platform_data > > *mlxplat_wd_data[MLXPLAT_CPLD_WD_MAX_DEVS]; > > +static struct mlxreg_core_data > *mlxplat_dpu_data[MLXPLAT_CPLD_DPU_MAX_DEVS]; > > static const struct regmap_config *mlxplat_regmap_config; > > static struct pci_dev *lpc_bridge; > > static struct pci_dev *i2c_bridge; > > @@ -5921,6 +7330,29 @@ static int __init > mlxplat_dmi_l1_switch_matched(const struct dmi_system_id *dmi) > > return mlxplat_register_platform_device(); > > } > > > > +static int __init mlxplat_dmi_smart_switch_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_ng800_mux_data); > > + mlxplat_mux_data = mlxplat_ng800_mux_data; > > + mlxplat_hotplug = &mlxplat_mlxcpld_smart_switch_data; > > + mlxplat_hotplug->deferred_nr = > > + > mlxplat_msn21xx_channels[MLXPLAT_CPLD_GRP_CHNL_NUM - 1]; > > + mlxplat_led = &mlxplat_xdr_led_data; > > + mlxplat_regs_io = &mlxplat_smart_switch_regs_io_data; > > + mlxplat_fan = &mlxplat_xdr_fan_data; > > + for (i = 0; i < ARRAY_SIZE(mlxplat_mlxcpld_wd_set_type2); i++) > > + mlxplat_wd_data[i] = &mlxplat_mlxcpld_wd_set_type2[i]; > > + for (i = 0; i < ARRAY_SIZE(mlxplat_mlxcpld_smart_switch_dpu_data); > i++) > > + mlxplat_dpu_data[i] = > &mlxplat_mlxcpld_smart_switch_dpu_data[i]; > > + mlxplat_i2c = &mlxplat_mlxcpld_i2c_ng_data; > > + mlxplat_regmap_config = > &mlxplat_mlxcpld_regmap_config_smart_switch; > > + > > + return mlxplat_register_platform_device(); > > +} > > + > > static const struct dmi_system_id mlxplat_dmi_table[] __initconst = { > > { > > .callback = mlxplat_dmi_default_wc_matched, > > @@ -6015,6 +7447,12 @@ static const struct dmi_system_id > mlxplat_dmi_table[] __initconst = { > > DMI_MATCH(DMI_BOARD_NAME, "VMOD0017"), > > }, > > }, > > + { > > + .callback = mlxplat_dmi_smart_switch_matched, > > + .matches = { > > + DMI_MATCH(DMI_BOARD_NAME, "VMOD0019"), > > + }, > > + }, > > { > > .callback = mlxplat_dmi_msn274x_matched, > > .matches = { > > @@ -6390,8 +7828,25 @@ static int mlxplat_platdevs_init(struct > mlxplat_priv *priv) > > } > > } > > > > + /* Add DPU drivers. */ > > + for (i = 0; i < MLXPLAT_CPLD_DPU_MAX_DEVS; i++) { > > + if (mlxplat_dpu_data[i]) { > > + priv->pdev_dpu[i] = > > + > platform_device_register_resndata(&mlxplat_dev->dev, "mlxreg-dpu", > > + i, NULL, 0, > mlxplat_dpu_data[i], > > + > sizeof(*mlxplat_dpu_data[i])); > > + if (IS_ERR(priv->pdev_dpu[i])) { > > + err = PTR_ERR(priv->pdev_dpu[i]); > > + goto fail_platform_dpu_register; > > + } > > + } > > + } > > + > > return 0; > > > > +fail_platform_dpu_register: > > + while (--i >= 0) > > + platform_device_unregister(priv->pdev_dpu[i]); > > fail_platform_wd_register: > > while (--i >= 0) > > platform_device_unregister(priv->pdev_wd[i]); > > @@ -6412,6 +7867,8 @@ static void mlxplat_platdevs_exit(struct > mlxplat_priv *priv) > > { > > int i; > > > > + for (i = MLXPLAT_CPLD_DPU_MAX_DEVS - 1; i >= 0 ; i--) > > + platform_device_unregister(priv->pdev_dpu[i]); > > for (i = MLXPLAT_CPLD_WD_MAX_DEVS - 1; i >= 0 ; i--) > > platform_device_unregister(priv->pdev_wd[i]); > > if (priv->pdev_fan) > > > > -- > i.
On Mon, 13 Jan 2025, Vadim Pasternak wrote: > > -----Original Message----- > > From: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> > > Sent: Monday, 13 January 2025 19:12 > > To: Vadim Pasternak <vadimp@nvidia.com> > > Cc: Hans de Goede <hdegoede@redhat.com>; Michael Shych > > <michaelsh@nvidia.com>; Ciju Rajan K <crajank@nvidia.com>; Felix Radensky > > <fradensky@nvidia.com>; Oleksandr Shamray <oleksandrs@nvidia.com>; > > platform-driver-x86@vger.kernel.org > > Subject: Re: [PATCH platform-next v2 07/10] platform: mellanox: Introduce > > support of Nvidia smart switch > > > > On Mon, 13 Jan 2025, Vadim Pasternak wrote: > > > > > Provide platform support for Nvidia Smart Switch SN4280. > > > > > > The Smart Switch equipped with: > > > - Nvidia COME module based on AMD EPYC™ Embedded 3451 CPU. > > > - Nvidia Spectrum-3 ASIC. > > > - Four DPUs, each equipped with Nvidia BF3 ARM based processor and > > > with Lattice LFD2NX-40 FPGA device. > > > - 28xQSFP-DD external ports. > > > - Two power supplies. > > > - Four cooling drawers. > > > > > > Introduce configuration structures for the new systems to allow proper > > > activation of the required platform drivers. > > > > > > Reviewed-by: Ciju Rajan K <crajank@nvidia.com> > > > Signed-off-by: Vadim Pasternak <vadimp@nvidia.com> > > > --- > > > drivers/platform/mellanox/mlx-platform.c | 1965 +++++++++++++++++++- > > -- > > > 1 file changed, 1711 insertions(+), 254 deletions(-) > > > > > > diff --git a/drivers/platform/mellanox/mlx-platform.c > > b/drivers/platform/mellanox/mlx-platform.c > > > index bd3bb06ff8f2..9d237852d3e0 100644 > > > --- a/drivers/platform/mellanox/mlx-platform.c > > > +++ b/drivers/platform/mellanox/mlx-platform.c > > > @@ -38,6 +38,7 @@ > > > #define MLXPLAT_CPLD_LPC_REG_CPLD4_PN1_OFFSET 0x0b > > > #define MLXPLAT_CPLD_LPC_REG_RESET_GP1_OFFSET 0x17 > > > #define MLXPLAT_CPLD_LPC_REG_RESET_GP2_OFFSET 0x19 > > > +#define MLXPLAT_CPLD_LPC_REG_RESET_GP3_OFFSET 0x1b > > > #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 > > > @@ -49,9 +50,11 @@ > > > #define MLXPLAT_CPLD_LPC_REG_LED5_OFFSET 0x24 > > > #define MLXPLAT_CPLD_LPC_REG_LED6_OFFSET 0x25 > > > #define MLXPLAT_CPLD_LPC_REG_LED7_OFFSET 0x26 > > > +#define MLXPLAT_CPLD_LPC_REG_LED8_OFFSET 0x27 > > > #define MLXPLAT_CPLD_LPC_REG_FAN_DIRECTION 0x2a > > > #define MLXPLAT_CPLD_LPC_REG_GP0_RO_OFFSET 0x2b > > > #define MLXPLAT_CPLD_LPC_REG_GPCOM0_OFFSET 0x2d > > > +#define MLXPLAT_CPLD_LPC_REG_GP1_RO_OFFSET 0x2c > > > #define MLXPLAT_CPLD_LPC_REG_GP0_OFFSET 0x2e > > > #define MLXPLAT_CPLD_LPC_REG_GP_RST_OFFSET 0x2f > > > #define MLXPLAT_CPLD_LPC_REG_GP1_OFFSET 0x30 > > > @@ -71,12 +74,14 @@ > > > #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_GP3_OFFSET 0x46 > > > #define MLXPLAT_CPLD_LPC_REG_BRD_OFFSET 0x47 > > > #define MLXPLAT_CPLD_LPC_REG_BRD_EVENT_OFFSET 0x48 > > > #define MLXPLAT_CPLD_LPC_REG_BRD_MASK_OFFSET 0x49 > > > #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_GPI_MASK_OFFSET 0x4e > > > #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 > > > @@ -88,15 +93,20 @@ > > > #define MLXPLAT_CPLD_LPC_REG_PSU_OFFSET 0x58 > > > #define MLXPLAT_CPLD_LPC_REG_PSU_EVENT_OFFSET 0x59 > > > #define MLXPLAT_CPLD_LPC_REG_PSU_MASK_OFFSET 0x5a > > > +#define MLXPLAT_CPLD_LPC_REG_PSU_AC_OFFSET 0x5e > > > #define MLXPLAT_CPLD_LPC_REG_PWR_OFFSET 0x64 > > > #define MLXPLAT_CPLD_LPC_REG_PWR_EVENT_OFFSET 0x65 > > > #define MLXPLAT_CPLD_LPC_REG_PWR_MASK_OFFSET 0x66 > > > +#define MLXPLAT_CPLD_LPC_REG_PSU_ALERT_OFFSET 0x6a > > > #define MLXPLAT_CPLD_LPC_REG_LC_IN_OFFSET 0x70 > > > #define MLXPLAT_CPLD_LPC_REG_LC_IN_EVENT_OFFSET 0x71 > > > #define MLXPLAT_CPLD_LPC_REG_LC_IN_MASK_OFFSET 0x72 > > > #define MLXPLAT_CPLD_LPC_REG_FAN_OFFSET 0x88 > > > #define MLXPLAT_CPLD_LPC_REG_FAN_EVENT_OFFSET 0x89 > > > #define MLXPLAT_CPLD_LPC_REG_FAN_MASK_OFFSET 0x8a > > > +#define MLXPLAT_CPLD_LPC_REG_FAN2_OFFSET 0x8b > > > +#define MLXPLAT_CPLD_LPC_REG_FAN2_EVENT_OFFSET 0x8c > > > +#define MLXPLAT_CPLD_LPC_REG_FAN2_MASK_OFFSET 0x8d > > > #define MLXPLAT_CPLD_LPC_REG_CPLD5_VER_OFFSET 0x8e > > > #define MLXPLAT_CPLD_LPC_REG_CPLD5_PN_OFFSET 0x8f > > > #define MLXPLAT_CPLD_LPC_REG_CPLD5_PN1_OFFSET 0x90 > > > @@ -128,10 +138,15 @@ > > > #define MLXPLAT_CPLD_LPC_REG_LC_SD_EVENT_OFFSET 0xaa > > > #define MLXPLAT_CPLD_LPC_REG_LC_SD_MASK_OFFSET 0xab > > > #define MLXPLAT_CPLD_LPC_REG_LC_PWR_ON 0xb2 > > > +#define MLXPLAT_CPLD_LPC_REG_TACHO19_OFFSET 0xb4 > > > +#define MLXPLAT_CPLD_LPC_REG_TACHO20_OFFSET 0xb5 > > > #define MLXPLAT_CPLD_LPC_REG_DBG1_OFFSET 0xb6 > > > #define MLXPLAT_CPLD_LPC_REG_DBG2_OFFSET 0xb7 > > > #define MLXPLAT_CPLD_LPC_REG_DBG3_OFFSET 0xb8 > > > #define MLXPLAT_CPLD_LPC_REG_DBG4_OFFSET 0xb9 > > > +#define MLXPLAT_CPLD_LPC_REG_TACHO17_OFFSET 0xba > > > +#define MLXPLAT_CPLD_LPC_REG_TACHO18_OFFSET 0xbb > > > +#define MLXPLAT_CPLD_LPC_REG_ASIC_CAP_OFFSET 0xc1 > > > #define MLXPLAT_CPLD_LPC_REG_GP4_RO_OFFSET 0xc2 > > > #define MLXPLAT_CPLD_LPC_REG_SPI_CHNL_SELECT 0xc3 > > > #define MLXPLAT_CPLD_LPC_REG_CPLD5_MVER_OFFSET 0xc4 > > > @@ -182,6 +197,9 @@ > > > #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_REG_TACHO15_OFFSET 0xfe > > > +#define MLXPLAT_CPLD_LPC_REG_TACHO16_OFFSET 0xff > > > + > > > #define MLXPLAT_CPLD_LPC_IO_RANGE 0x100 > > > > > > #define MLXPLAT_CPLD_LPC_PIO_OFFSET 0x10000UL > > > @@ -210,9 +228,15 @@ > > > #define MLXPLAT_CPLD_AGGR_MASK_NG_DEF 0x04 > > > #define MLXPLAT_CPLD_AGGR_MASK_COMEX BIT(0) > > > #define MLXPLAT_CPLD_AGGR_MASK_LC BIT(3) > > > +#define MLXPLAT_CPLD_AGGR_MASK_DPU_BRD BIT(4) > > > +#define MLXPLAT_CPLD_AGGR_MASK_DPU_CORE BIT(5) > > > #define MLXPLAT_CPLD_AGGR_MASK_MODULAR > > (MLXPLAT_CPLD_AGGR_MASK_NG_DEF | \ > > > > > MLXPLAT_CPLD_AGGR_MASK_COMEX | \ > > > MLXPLAT_CPLD_AGGR_MASK_LC) > > > +#define MLXPLAT_CPLD_AGGR_MASK_SMART_SW > > (MLXPLAT_CPLD_AGGR_MASK_COMEX | \ > > > + > > MLXPLAT_CPLD_AGGR_MASK_NG_DEF | \ > > > + > > MLXPLAT_CPLD_AGGR_MASK_DPU_BRD | \ > > > + > > MLXPLAT_CPLD_AGGR_MASK_DPU_CORE) > > > #define MLXPLAT_CPLD_AGGR_MASK_LC_PRSNT BIT(0) > > > #define MLXPLAT_CPLD_AGGR_MASK_LC_RDY BIT(1) > > > #define MLXPLAT_CPLD_AGGR_MASK_LC_PG BIT(2) > > > @@ -235,15 +259,24 @@ > > > #define MLXPLAT_CPLD_PWR_MASK GENMASK(1, 0) > > > #define MLXPLAT_CPLD_PSU_EXT_MASK GENMASK(3, 0) > > > #define MLXPLAT_CPLD_PWR_EXT_MASK GENMASK(3, 0) > > > +#define MLXPLAT_CPLD_PSU_XDR_MASK GENMASK(7, 0) > > > +#define MLXPLAT_CPLD_PWR_XDR_MASK GENMASK(7, 0) > > > #define MLXPLAT_CPLD_FAN_MASK GENMASK(3, 0) > > > #define MLXPLAT_CPLD_ASIC_MASK GENMASK(1, 0) > > > +#define MLXPLAT_CPLD_ASIC_XDR_MASK GENMASK(3, 0) > > > #define MLXPLAT_CPLD_FAN_NG_MASK GENMASK(6, 0) > > > +#define MLXPLAT_CPLD_FAN_XDR_MASK GENMASK(7, 0) > > > #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_EROT_MASK GENMASK(1, 0) > > > #define MLXPLAT_CPLD_FU_CAP_MASK GENMASK(1, 0) > > > +#define MLXPLAT_CPLD_PSU_CAP_MASK GENMASK(7, 0) > > > +#define MLXPLAT_CPLD_FAN_CAP_MASK GENMASK(7, 0) > > > +#define MLXPLAT_CPLD_ASIC_CAP_MASK GENMASK(7, 0) > > > +#define MLXPLAT_CPLD_BIOS_STATUS_MASK GENMASK(3, 1) > > > +#define MLXPLAT_CPLD_DPU_MASK GENMASK(3, 0) > > > #define MLXPLAT_CPLD_PWR_BUTTON_MASK BIT(0) > > > #define MLXPLAT_CPLD_LATCH_RST_MASK BIT(6) > > > #define MLXPLAT_CPLD_THERMAL1_PDB_MASK BIT(3) > > > @@ -267,6 +300,9 @@ > > > /* Masks for aggregation for modular systems */ > > > #define MLXPLAT_CPLD_LPC_LC_MASK GENMASK(7, 0) > > > > > > +/* Masks for aggregation for smart switch systems */ > > > +#define MLXPLAT_CPLD_LPC_SM_SW_MASK GENMASK(7, 0) > > > + > > > #define MLXPLAT_CPLD_HALT_MASK BIT(3) > > > #define MLXPLAT_CPLD_RESET_MASK GENMASK(7, 1) > > > > > > @@ -297,15 +333,18 @@ > > > #define MLXPLAT_CPLD_NR_NONE -1 > > > #define MLXPLAT_CPLD_PSU_DEFAULT_NR 10 > > > #define MLXPLAT_CPLD_PSU_MSNXXXX_NR 4 > > > +#define MLXPLAT_CPLD_PSU_XDR_NR 3 > > > #define MLXPLAT_CPLD_FAN1_DEFAULT_NR 11 > > > #define MLXPLAT_CPLD_FAN2_DEFAULT_NR 12 > > > #define MLXPLAT_CPLD_FAN3_DEFAULT_NR 13 > > > #define MLXPLAT_CPLD_FAN4_DEFAULT_NR 14 > > > #define MLXPLAT_CPLD_NR_ASIC 3 > > > #define MLXPLAT_CPLD_NR_LC_BASE 34 > > > +#define MLXPLAT_CPLD_NR_DPU_BASE 18 > > > > > > #define MLXPLAT_CPLD_NR_LC_SET(nr) > > (MLXPLAT_CPLD_NR_LC_BASE + (nr)) > > > #define MLXPLAT_CPLD_LC_ADDR 0x32 > > > +#define MLXPLAT_CPLD_DPU_ADDR 0x68 > > > > > > /* Masks and default values for watchdogs */ > > > #define MLXPLAT_CPLD_WD1_CLEAR_MASK GENMASK(7, 1) > > > @@ -320,6 +359,7 @@ > > > #define MLXPLAT_CPLD_WD_DFLT_TIMEOUT 30 > > > #define MLXPLAT_CPLD_WD3_DFLT_TIMEOUT 600 > > > #define MLXPLAT_CPLD_WD_MAX_DEVS 2 > > > +#define MLXPLAT_CPLD_DPU_MAX_DEVS 4 > > > > > > #define MLXPLAT_CPLD_LPC_SYSIRQ 17 > > > > > > @@ -346,6 +386,7 @@ > > > * @pdev_io_regs - register access platform devices > > > * @pdev_fan - FAN platform devices > > > * @pdev_wd - array of watchdog platform devices > > > + * pdev_dpu - array of Data Processor Unit platform devices > > > * @regmap: device register map > > > * @hotplug_resources: system hotplug resources > > > * @hotplug_resources_size: size of system hotplug resources > > > @@ -360,6 +401,7 @@ struct mlxplat_priv { > > > struct platform_device *pdev_io_regs; > > > struct platform_device *pdev_fan; > > > struct platform_device *pdev_wd[MLXPLAT_CPLD_WD_MAX_DEVS]; > > > + struct platform_device > > *pdev_dpu[MLXPLAT_CPLD_DPU_MAX_DEVS]; > > > void *regmap; > > > struct resource *hotplug_resources; > > > unsigned int hotplug_resources_size; > > > @@ -626,6 +668,21 @@ static struct i2c_board_info > > mlxplat_mlxcpld_pwr_ng800[] = { > > > }, > > > }; > > > > > > +static struct i2c_board_info mlxplat_mlxcpld_xdr_pwr[] = { > > > + { > > > + I2C_BOARD_INFO("dps460", 0x5d), > > > + }, > > > + { > > > + I2C_BOARD_INFO("dps460", 0x5c), > > > + }, > > > + { > > > + I2C_BOARD_INFO("dps460", 0x5e), > > > + }, > > > + { > > > + I2C_BOARD_INFO("dps460", 0x5f), > > > + }, > > > +}; > > > + > > > static struct i2c_board_info mlxplat_mlxcpld_fan[] = { > > > { > > > I2C_BOARD_INFO("24c32", 0x50), > > > @@ -2370,205 +2427,665 @@ struct mlxreg_core_hotplug_platform_data > > mlxplat_mlxcpld_rack_switch_data = { > > > .mask_low = MLXPLAT_CPLD_LOW_AGGR_MASK_LOW, > > > }; > > > > > > -/* Callback performs graceful shutdown after notification about power > > button event */ > > > -static int > > > -mlxplat_mlxcpld_l1_switch_pwr_events_handler(void *handle, enum > > mlxreg_hotplug_kind kind, > > > - u8 action) > > > -{ > > > - if (action) { > > > - dev_info(&mlxplat_dev->dev, "System shutdown due to short > > press of power button"); > > > - kernel_power_off(); > > > - } > > > - > > > - return 0; > > > -} > > > - > > > -static struct mlxreg_core_hotplug_notifier > > mlxplat_mlxcpld_l1_switch_pwr_events_notifier = { > > > - .user_handler = mlxplat_mlxcpld_l1_switch_pwr_events_handler, > > > -}; > > > - > > > -/* Platform hotplug for l1 switch systems family data */ > > > -static struct mlxreg_core_data > > mlxplat_mlxcpld_l1_switch_pwr_events_items_data[] = { > > > +/* Platform hotplug XDR and smart switch system family data */ > > > +static struct mlxreg_core_data mlxplat_mlxcpld_xdr_psu_items_data[] = { > > > { > > > - .label = "power_button", > > > - .reg = MLXPLAT_CPLD_LPC_REG_PWRB_OFFSET, > > > - .mask = MLXPLAT_CPLD_PWR_BUTTON_MASK, > > > + .label = "psu1", > > > + .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET, > > > + .mask = BIT(0), > > > + .slot = 1, > > > + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, > > > + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, > > > .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > > > - .hpdev.action = MLXREG_HOTPLUG_DEVICE_NO_ACTION, > > > - .hpdev.notifier = > > &mlxplat_mlxcpld_l1_switch_pwr_events_notifier, > > > }, > > > -}; > > > - > > > -/* Callback activates latch reset flow after notification about intrusion event > > */ > > > -static int > > > -mlxplat_mlxcpld_l1_switch_intrusion_events_handler(void *handle, enum > > mlxreg_hotplug_kind kind, > > > - u8 action) > > > -{ > > > - struct mlxplat_priv *priv = platform_get_drvdata(mlxplat_dev); > > > - u32 regval; > > > - int err; > > > - > > > - err = regmap_read(priv->regmap, > > MLXPLAT_CPLD_LPC_REG_GP1_OFFSET, ®val); > > > - if (err) > > > - goto fail_regmap_read; > > > - > > > - if (action) { > > > - dev_info(&mlxplat_dev->dev, "Detected intrusion - system > > latch is opened"); > > > - err = regmap_write(priv->regmap, > > MLXPLAT_CPLD_LPC_REG_GP1_OFFSET, > > > - regval | > > MLXPLAT_CPLD_LATCH_RST_MASK); > > > - } else { > > > - dev_info(&mlxplat_dev->dev, "System latch is properly > > closed"); > > > - err = regmap_write(priv->regmap, > > MLXPLAT_CPLD_LPC_REG_GP1_OFFSET, > > > - regval & > > ~MLXPLAT_CPLD_LATCH_RST_MASK); > > > - } > > > - > > > - if (err) > > > - goto fail_regmap_write; > > > - > > > - return 0; > > > - > > > -fail_regmap_read: > > > -fail_regmap_write: > > > - dev_err(&mlxplat_dev->dev, "Register access failed"); > > > - return err; > > > -} > > > - > > > -static struct mlxreg_core_hotplug_notifier > > mlxplat_mlxcpld_l1_switch_intrusion_events_notifier = { > > > - .user_handler = mlxplat_mlxcpld_l1_switch_intrusion_events_handler, > > > -}; > > > - > > > -static struct mlxreg_core_data > > mlxplat_mlxcpld_l1_switch_health_events_items_data[] = { > > > { > > > - .label = "thermal1_pdb", > > > - .reg = MLXPLAT_CPLD_LPC_REG_BRD_OFFSET, > > > - .mask = MLXPLAT_CPLD_THERMAL1_PDB_MASK, > > > + .label = "psu2", > > > + .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET, > > > + .mask = BIT(1), > > > + .slot = 2, > > > + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, > > > + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, > > > .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > > > }, > > > { > > > - .label = "thermal2_pdb", > > > - .reg = MLXPLAT_CPLD_LPC_REG_BRD_OFFSET, > > > - .mask = MLXPLAT_CPLD_THERMAL2_PDB_MASK, > > > + .label = "psu3", > > > + .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET, > > > + .mask = BIT(2), > > > + .slot = 3, > > > + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, > > > + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, > > > .hpdev.nr = MLXPLAT_CPLD_NR_NONE, > > > }, > > > > Why's the diff such a mess in this patch? > > > > Are you perhaps doing two things in this patch, that is, reorganizing the > > existing code/structs and adding new stuff? If that's the case, please try > > to do the reorganization in another patch before this one so the diff > > spaghetti is hopefully avoided. > > > > I really don't understand why patch shows some lines as deleted. > In patch only new lines where added, no one deleted. > If I am doing just diff - it shows only new lines, but in patch it looks like > some lines have been removed. Okay, I'll play with various diff options then. Different diff strategies lock different lines. > Probably some problem with ' git format-patch'. > Have no idea how to handle it. You could try with --minimal, --patience, or --histogram options which pick a different diff strategy, sometimes that might help (I can do that myself too after applying but if I would need to give review feedback a cleaner diff in email would be preferred :-)). But if you cannot get it to avoid it generating the deleted lines, don't sweat it.
diff --git a/drivers/platform/mellanox/mlx-platform.c b/drivers/platform/mellanox/mlx-platform.c index bd3bb06ff8f2..9d237852d3e0 100644 --- a/drivers/platform/mellanox/mlx-platform.c +++ b/drivers/platform/mellanox/mlx-platform.c @@ -38,6 +38,7 @@ #define MLXPLAT_CPLD_LPC_REG_CPLD4_PN1_OFFSET 0x0b #define MLXPLAT_CPLD_LPC_REG_RESET_GP1_OFFSET 0x17 #define MLXPLAT_CPLD_LPC_REG_RESET_GP2_OFFSET 0x19 +#define MLXPLAT_CPLD_LPC_REG_RESET_GP3_OFFSET 0x1b #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 @@ -49,9 +50,11 @@ #define MLXPLAT_CPLD_LPC_REG_LED5_OFFSET 0x24 #define MLXPLAT_CPLD_LPC_REG_LED6_OFFSET 0x25 #define MLXPLAT_CPLD_LPC_REG_LED7_OFFSET 0x26 +#define MLXPLAT_CPLD_LPC_REG_LED8_OFFSET 0x27 #define MLXPLAT_CPLD_LPC_REG_FAN_DIRECTION 0x2a #define MLXPLAT_CPLD_LPC_REG_GP0_RO_OFFSET 0x2b #define MLXPLAT_CPLD_LPC_REG_GPCOM0_OFFSET 0x2d +#define MLXPLAT_CPLD_LPC_REG_GP1_RO_OFFSET 0x2c #define MLXPLAT_CPLD_LPC_REG_GP0_OFFSET 0x2e #define MLXPLAT_CPLD_LPC_REG_GP_RST_OFFSET 0x2f #define MLXPLAT_CPLD_LPC_REG_GP1_OFFSET 0x30 @@ -71,12 +74,14 @@ #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_GP3_OFFSET 0x46 #define MLXPLAT_CPLD_LPC_REG_BRD_OFFSET 0x47 #define MLXPLAT_CPLD_LPC_REG_BRD_EVENT_OFFSET 0x48 #define MLXPLAT_CPLD_LPC_REG_BRD_MASK_OFFSET 0x49 #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_GPI_MASK_OFFSET 0x4e #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 @@ -88,15 +93,20 @@ #define MLXPLAT_CPLD_LPC_REG_PSU_OFFSET 0x58 #define MLXPLAT_CPLD_LPC_REG_PSU_EVENT_OFFSET 0x59 #define MLXPLAT_CPLD_LPC_REG_PSU_MASK_OFFSET 0x5a +#define MLXPLAT_CPLD_LPC_REG_PSU_AC_OFFSET 0x5e #define MLXPLAT_CPLD_LPC_REG_PWR_OFFSET 0x64 #define MLXPLAT_CPLD_LPC_REG_PWR_EVENT_OFFSET 0x65 #define MLXPLAT_CPLD_LPC_REG_PWR_MASK_OFFSET 0x66 +#define MLXPLAT_CPLD_LPC_REG_PSU_ALERT_OFFSET 0x6a #define MLXPLAT_CPLD_LPC_REG_LC_IN_OFFSET 0x70 #define MLXPLAT_CPLD_LPC_REG_LC_IN_EVENT_OFFSET 0x71 #define MLXPLAT_CPLD_LPC_REG_LC_IN_MASK_OFFSET 0x72 #define MLXPLAT_CPLD_LPC_REG_FAN_OFFSET 0x88 #define MLXPLAT_CPLD_LPC_REG_FAN_EVENT_OFFSET 0x89 #define MLXPLAT_CPLD_LPC_REG_FAN_MASK_OFFSET 0x8a +#define MLXPLAT_CPLD_LPC_REG_FAN2_OFFSET 0x8b +#define MLXPLAT_CPLD_LPC_REG_FAN2_EVENT_OFFSET 0x8c +#define MLXPLAT_CPLD_LPC_REG_FAN2_MASK_OFFSET 0x8d #define MLXPLAT_CPLD_LPC_REG_CPLD5_VER_OFFSET 0x8e #define MLXPLAT_CPLD_LPC_REG_CPLD5_PN_OFFSET 0x8f #define MLXPLAT_CPLD_LPC_REG_CPLD5_PN1_OFFSET 0x90 @@ -128,10 +138,15 @@ #define MLXPLAT_CPLD_LPC_REG_LC_SD_EVENT_OFFSET 0xaa #define MLXPLAT_CPLD_LPC_REG_LC_SD_MASK_OFFSET 0xab #define MLXPLAT_CPLD_LPC_REG_LC_PWR_ON 0xb2 +#define MLXPLAT_CPLD_LPC_REG_TACHO19_OFFSET 0xb4 +#define MLXPLAT_CPLD_LPC_REG_TACHO20_OFFSET 0xb5 #define MLXPLAT_CPLD_LPC_REG_DBG1_OFFSET 0xb6 #define MLXPLAT_CPLD_LPC_REG_DBG2_OFFSET 0xb7 #define MLXPLAT_CPLD_LPC_REG_DBG3_OFFSET 0xb8 #define MLXPLAT_CPLD_LPC_REG_DBG4_OFFSET 0xb9 +#define MLXPLAT_CPLD_LPC_REG_TACHO17_OFFSET 0xba +#define MLXPLAT_CPLD_LPC_REG_TACHO18_OFFSET 0xbb +#define MLXPLAT_CPLD_LPC_REG_ASIC_CAP_OFFSET 0xc1 #define MLXPLAT_CPLD_LPC_REG_GP4_RO_OFFSET 0xc2 #define MLXPLAT_CPLD_LPC_REG_SPI_CHNL_SELECT 0xc3 #define MLXPLAT_CPLD_LPC_REG_CPLD5_MVER_OFFSET 0xc4 @@ -182,6 +197,9 @@ #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_REG_TACHO15_OFFSET 0xfe +#define MLXPLAT_CPLD_LPC_REG_TACHO16_OFFSET 0xff + #define MLXPLAT_CPLD_LPC_IO_RANGE 0x100 #define MLXPLAT_CPLD_LPC_PIO_OFFSET 0x10000UL @@ -210,9 +228,15 @@ #define MLXPLAT_CPLD_AGGR_MASK_NG_DEF 0x04 #define MLXPLAT_CPLD_AGGR_MASK_COMEX BIT(0) #define MLXPLAT_CPLD_AGGR_MASK_LC BIT(3) +#define MLXPLAT_CPLD_AGGR_MASK_DPU_BRD BIT(4) +#define MLXPLAT_CPLD_AGGR_MASK_DPU_CORE BIT(5) #define MLXPLAT_CPLD_AGGR_MASK_MODULAR (MLXPLAT_CPLD_AGGR_MASK_NG_DEF | \ MLXPLAT_CPLD_AGGR_MASK_COMEX | \ MLXPLAT_CPLD_AGGR_MASK_LC) +#define MLXPLAT_CPLD_AGGR_MASK_SMART_SW (MLXPLAT_CPLD_AGGR_MASK_COMEX | \ + MLXPLAT_CPLD_AGGR_MASK_NG_DEF | \ + MLXPLAT_CPLD_AGGR_MASK_DPU_BRD | \ + MLXPLAT_CPLD_AGGR_MASK_DPU_CORE) #define MLXPLAT_CPLD_AGGR_MASK_LC_PRSNT BIT(0) #define MLXPLAT_CPLD_AGGR_MASK_LC_RDY BIT(1) #define MLXPLAT_CPLD_AGGR_MASK_LC_PG BIT(2) @@ -235,15 +259,24 @@ #define MLXPLAT_CPLD_PWR_MASK GENMASK(1, 0) #define MLXPLAT_CPLD_PSU_EXT_MASK GENMASK(3, 0) #define MLXPLAT_CPLD_PWR_EXT_MASK GENMASK(3, 0) +#define MLXPLAT_CPLD_PSU_XDR_MASK GENMASK(7, 0) +#define MLXPLAT_CPLD_PWR_XDR_MASK GENMASK(7, 0) #define MLXPLAT_CPLD_FAN_MASK GENMASK(3, 0) #define MLXPLAT_CPLD_ASIC_MASK GENMASK(1, 0) +#define MLXPLAT_CPLD_ASIC_XDR_MASK GENMASK(3, 0) #define MLXPLAT_CPLD_FAN_NG_MASK GENMASK(6, 0) +#define MLXPLAT_CPLD_FAN_XDR_MASK GENMASK(7, 0) #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_EROT_MASK GENMASK(1, 0) #define MLXPLAT_CPLD_FU_CAP_MASK GENMASK(1, 0) +#define MLXPLAT_CPLD_PSU_CAP_MASK GENMASK(7, 0) +#define MLXPLAT_CPLD_FAN_CAP_MASK GENMASK(7, 0) +#define MLXPLAT_CPLD_ASIC_CAP_MASK GENMASK(7, 0) +#define MLXPLAT_CPLD_BIOS_STATUS_MASK GENMASK(3, 1) +#define MLXPLAT_CPLD_DPU_MASK GENMASK(3, 0) #define MLXPLAT_CPLD_PWR_BUTTON_MASK BIT(0) #define MLXPLAT_CPLD_LATCH_RST_MASK BIT(6) #define MLXPLAT_CPLD_THERMAL1_PDB_MASK BIT(3) @@ -267,6 +300,9 @@ /* Masks for aggregation for modular systems */ #define MLXPLAT_CPLD_LPC_LC_MASK GENMASK(7, 0) +/* Masks for aggregation for smart switch systems */ +#define MLXPLAT_CPLD_LPC_SM_SW_MASK GENMASK(7, 0) + #define MLXPLAT_CPLD_HALT_MASK BIT(3) #define MLXPLAT_CPLD_RESET_MASK GENMASK(7, 1) @@ -297,15 +333,18 @@ #define MLXPLAT_CPLD_NR_NONE -1 #define MLXPLAT_CPLD_PSU_DEFAULT_NR 10 #define MLXPLAT_CPLD_PSU_MSNXXXX_NR 4 +#define MLXPLAT_CPLD_PSU_XDR_NR 3 #define MLXPLAT_CPLD_FAN1_DEFAULT_NR 11 #define MLXPLAT_CPLD_FAN2_DEFAULT_NR 12 #define MLXPLAT_CPLD_FAN3_DEFAULT_NR 13 #define MLXPLAT_CPLD_FAN4_DEFAULT_NR 14 #define MLXPLAT_CPLD_NR_ASIC 3 #define MLXPLAT_CPLD_NR_LC_BASE 34 +#define MLXPLAT_CPLD_NR_DPU_BASE 18 #define MLXPLAT_CPLD_NR_LC_SET(nr) (MLXPLAT_CPLD_NR_LC_BASE + (nr)) #define MLXPLAT_CPLD_LC_ADDR 0x32 +#define MLXPLAT_CPLD_DPU_ADDR 0x68 /* Masks and default values for watchdogs */ #define MLXPLAT_CPLD_WD1_CLEAR_MASK GENMASK(7, 1) @@ -320,6 +359,7 @@ #define MLXPLAT_CPLD_WD_DFLT_TIMEOUT 30 #define MLXPLAT_CPLD_WD3_DFLT_TIMEOUT 600 #define MLXPLAT_CPLD_WD_MAX_DEVS 2 +#define MLXPLAT_CPLD_DPU_MAX_DEVS 4 #define MLXPLAT_CPLD_LPC_SYSIRQ 17 @@ -346,6 +386,7 @@ * @pdev_io_regs - register access platform devices * @pdev_fan - FAN platform devices * @pdev_wd - array of watchdog platform devices + * pdev_dpu - array of Data Processor Unit platform devices * @regmap: device register map * @hotplug_resources: system hotplug resources * @hotplug_resources_size: size of system hotplug resources @@ -360,6 +401,7 @@ struct mlxplat_priv { struct platform_device *pdev_io_regs; struct platform_device *pdev_fan; struct platform_device *pdev_wd[MLXPLAT_CPLD_WD_MAX_DEVS]; + struct platform_device *pdev_dpu[MLXPLAT_CPLD_DPU_MAX_DEVS]; void *regmap; struct resource *hotplug_resources; unsigned int hotplug_resources_size; @@ -626,6 +668,21 @@ static struct i2c_board_info mlxplat_mlxcpld_pwr_ng800[] = { }, }; +static struct i2c_board_info mlxplat_mlxcpld_xdr_pwr[] = { + { + I2C_BOARD_INFO("dps460", 0x5d), + }, + { + I2C_BOARD_INFO("dps460", 0x5c), + }, + { + I2C_BOARD_INFO("dps460", 0x5e), + }, + { + I2C_BOARD_INFO("dps460", 0x5f), + }, +}; + static struct i2c_board_info mlxplat_mlxcpld_fan[] = { { I2C_BOARD_INFO("24c32", 0x50), @@ -2370,205 +2427,665 @@ struct mlxreg_core_hotplug_platform_data mlxplat_mlxcpld_rack_switch_data = { .mask_low = MLXPLAT_CPLD_LOW_AGGR_MASK_LOW, }; -/* Callback performs graceful shutdown after notification about power button event */ -static int -mlxplat_mlxcpld_l1_switch_pwr_events_handler(void *handle, enum mlxreg_hotplug_kind kind, - u8 action) -{ - if (action) { - dev_info(&mlxplat_dev->dev, "System shutdown due to short press of power button"); - kernel_power_off(); - } - - return 0; -} - -static struct mlxreg_core_hotplug_notifier mlxplat_mlxcpld_l1_switch_pwr_events_notifier = { - .user_handler = mlxplat_mlxcpld_l1_switch_pwr_events_handler, -}; - -/* Platform hotplug for l1 switch systems family data */ -static struct mlxreg_core_data mlxplat_mlxcpld_l1_switch_pwr_events_items_data[] = { +/* Platform hotplug XDR and smart switch system family data */ +static struct mlxreg_core_data mlxplat_mlxcpld_xdr_psu_items_data[] = { { - .label = "power_button", - .reg = MLXPLAT_CPLD_LPC_REG_PWRB_OFFSET, - .mask = MLXPLAT_CPLD_PWR_BUTTON_MASK, + .label = "psu1", + .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET, + .mask = BIT(0), + .slot = 1, + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, .hpdev.nr = MLXPLAT_CPLD_NR_NONE, - .hpdev.action = MLXREG_HOTPLUG_DEVICE_NO_ACTION, - .hpdev.notifier = &mlxplat_mlxcpld_l1_switch_pwr_events_notifier, }, -}; - -/* Callback activates latch reset flow after notification about intrusion event */ -static int -mlxplat_mlxcpld_l1_switch_intrusion_events_handler(void *handle, enum mlxreg_hotplug_kind kind, - u8 action) -{ - struct mlxplat_priv *priv = platform_get_drvdata(mlxplat_dev); - u32 regval; - int err; - - err = regmap_read(priv->regmap, MLXPLAT_CPLD_LPC_REG_GP1_OFFSET, ®val); - if (err) - goto fail_regmap_read; - - if (action) { - dev_info(&mlxplat_dev->dev, "Detected intrusion - system latch is opened"); - err = regmap_write(priv->regmap, MLXPLAT_CPLD_LPC_REG_GP1_OFFSET, - regval | MLXPLAT_CPLD_LATCH_RST_MASK); - } else { - dev_info(&mlxplat_dev->dev, "System latch is properly closed"); - err = regmap_write(priv->regmap, MLXPLAT_CPLD_LPC_REG_GP1_OFFSET, - regval & ~MLXPLAT_CPLD_LATCH_RST_MASK); - } - - if (err) - goto fail_regmap_write; - - return 0; - -fail_regmap_read: -fail_regmap_write: - dev_err(&mlxplat_dev->dev, "Register access failed"); - return err; -} - -static struct mlxreg_core_hotplug_notifier mlxplat_mlxcpld_l1_switch_intrusion_events_notifier = { - .user_handler = mlxplat_mlxcpld_l1_switch_intrusion_events_handler, -}; - -static struct mlxreg_core_data mlxplat_mlxcpld_l1_switch_health_events_items_data[] = { { - .label = "thermal1_pdb", - .reg = MLXPLAT_CPLD_LPC_REG_BRD_OFFSET, - .mask = MLXPLAT_CPLD_THERMAL1_PDB_MASK, + .label = "psu2", + .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET, + .mask = BIT(1), + .slot = 2, + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, .hpdev.nr = MLXPLAT_CPLD_NR_NONE, }, { - .label = "thermal2_pdb", - .reg = MLXPLAT_CPLD_LPC_REG_BRD_OFFSET, - .mask = MLXPLAT_CPLD_THERMAL2_PDB_MASK, + .label = "psu3", + .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET, + .mask = BIT(2), + .slot = 3, + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, .hpdev.nr = MLXPLAT_CPLD_NR_NONE, }, { - .label = "intrusion", - .reg = MLXPLAT_CPLD_LPC_REG_BRD_OFFSET, - .mask = MLXPLAT_CPLD_INTRUSION_MASK, + .label = "psu4", + .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET, + .mask = BIT(3), + .slot = 4, + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, .hpdev.nr = MLXPLAT_CPLD_NR_NONE, - .hpdev.action = MLXREG_HOTPLUG_DEVICE_NO_ACTION, - .hpdev.notifier = &mlxplat_mlxcpld_l1_switch_intrusion_events_notifier, }, { - .label = "pwm_pg", - .reg = MLXPLAT_CPLD_LPC_REG_BRD_OFFSET, - .mask = MLXPLAT_CPLD_PWM_PG_MASK, + .label = "psu5", + .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET, + .mask = BIT(4), + .slot = 5, + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, .hpdev.nr = MLXPLAT_CPLD_NR_NONE, }, -}; - -static struct mlxreg_core_item mlxplat_mlxcpld_l1_switch_events_items[] = { - { - .data = mlxplat_mlxcpld_default_ng_fan_items_data, - .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, - .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, - .mask = MLXPLAT_CPLD_FAN_NG_MASK, - .count = ARRAY_SIZE(mlxplat_mlxcpld_default_ng_fan_items_data), - .inversed = 1, - .health = false, - }, - { - .data = mlxplat_mlxcpld_erot_ap_items_data, - .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, - .reg = MLXPLAT_CPLD_LPC_REG_EROT_OFFSET, - .mask = MLXPLAT_CPLD_EROT_MASK, - .count = ARRAY_SIZE(mlxplat_mlxcpld_erot_ap_items_data), - .inversed = 1, - .health = false, - }, { - .data = mlxplat_mlxcpld_erot_error_items_data, - .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, - .reg = MLXPLAT_CPLD_LPC_REG_EROTE_OFFSET, - .mask = MLXPLAT_CPLD_EROT_MASK, - .count = ARRAY_SIZE(mlxplat_mlxcpld_erot_error_items_data), - .inversed = 1, - .health = false, + .label = "psu6", + .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET, + .mask = BIT(5), + .slot = 6, + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, }, { - .data = mlxplat_mlxcpld_l1_switch_pwr_events_items_data, - .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, - .reg = MLXPLAT_CPLD_LPC_REG_PWRB_OFFSET, - .mask = MLXPLAT_CPLD_PWR_BUTTON_MASK, - .count = ARRAY_SIZE(mlxplat_mlxcpld_l1_switch_pwr_events_items_data), - .inversed = 1, - .health = false, + .label = "psu7", + .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET, + .mask = BIT(6), + .slot = 7, + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, }, { - .data = mlxplat_mlxcpld_l1_switch_health_events_items_data, - .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, - .reg = MLXPLAT_CPLD_LPC_REG_BRD_OFFSET, - .mask = MLXPLAT_CPLD_L1_CHA_HEALTH_MASK, - .count = ARRAY_SIZE(mlxplat_mlxcpld_l1_switch_health_events_items_data), - .inversed = 1, - .health = false, - .ind = 8, + .label = "psu8", + .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET, + .mask = BIT(7), + .slot = 8, + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, }, }; -static -struct mlxreg_core_hotplug_platform_data mlxplat_mlxcpld_l1_switch_data = { - .items = mlxplat_mlxcpld_l1_switch_events_items, - .counter = ARRAY_SIZE(mlxplat_mlxcpld_l1_switch_events_items), - .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 | MLXPLAT_CPLD_LOW_AGGR_MASK_PWR_BUT, -}; - -/* Platform led default data */ -static struct mlxreg_core_data mlxplat_mlxcpld_default_led_data[] = { +static struct mlxreg_core_data mlxplat_mlxcpld_xdr_pwr_items_data[] = { { - .label = "status:green", - .reg = MLXPLAT_CPLD_LPC_REG_LED1_OFFSET, - .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, + .label = "pwr1", + .reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET, + .mask = BIT(0), + .slot = 1, + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, + .hpdev.brdinfo = &mlxplat_mlxcpld_pwr[0], + .hpdev.nr = MLXPLAT_CPLD_PSU_MSNXXXX_NR, }, { - .label = "status:red", - .reg = MLXPLAT_CPLD_LPC_REG_LED1_OFFSET, - .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK + .label = "pwr2", + .reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET, + .mask = BIT(1), + .slot = 2, + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, + .hpdev.brdinfo = &mlxplat_mlxcpld_pwr[1], + .hpdev.nr = MLXPLAT_CPLD_PSU_MSNXXXX_NR, }, { - .label = "psu:green", - .reg = MLXPLAT_CPLD_LPC_REG_LED1_OFFSET, - .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, + .label = "pwr3", + .reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET, + .mask = BIT(2), + .slot = 3, + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, + .hpdev.brdinfo = &mlxplat_mlxcpld_ext_pwr[0], + .hpdev.nr = MLXPLAT_CPLD_PSU_MSNXXXX_NR, }, { - .label = "psu:red", - .reg = MLXPLAT_CPLD_LPC_REG_LED1_OFFSET, - .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, + .label = "pwr4", + .reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET, + .mask = BIT(3), + .slot = 4, + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, + .hpdev.brdinfo = &mlxplat_mlxcpld_ext_pwr[1], + .hpdev.nr = MLXPLAT_CPLD_PSU_MSNXXXX_NR, }, { - .label = "fan1:green", - .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET, - .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, + .label = "pwr5", + .reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET, + .mask = BIT(4), + .slot = 5, + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, + .hpdev.brdinfo = &mlxplat_mlxcpld_xdr_pwr[0], + .hpdev.nr = MLXPLAT_CPLD_PSU_XDR_NR, }, { - .label = "fan1:red", - .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET, - .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, + .label = "pwr6", + .reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET, + .mask = BIT(5), + .slot = 6, + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, + .hpdev.brdinfo = &mlxplat_mlxcpld_xdr_pwr[1], + .hpdev.nr = MLXPLAT_CPLD_PSU_XDR_NR, }, { - .label = "fan2:green", - .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET, - .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, + .label = "pwr7", + .reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET, + .mask = BIT(6), + .slot = 7, + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, + .hpdev.brdinfo = &mlxplat_mlxcpld_xdr_pwr[2], + .hpdev.nr = MLXPLAT_CPLD_PSU_XDR_NR, }, { - .label = "fan2:red", - .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET, - .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, + .label = "pwr8", + .reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET, + .mask = BIT(7), + .slot = 8, + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, + .hpdev.brdinfo = &mlxplat_mlxcpld_xdr_pwr[3], + .hpdev.nr = MLXPLAT_CPLD_PSU_XDR_NR, }, +}; + +static struct mlxreg_core_data mlxplat_mlxcpld_xdr_fan_items_data[] = { { - .label = "fan3:green", + .label = "fan1", + .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, + .mask = BIT(0), + .slot = 1, + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, + .capability_mask = MLXPLAT_CPLD_FAN_XDR_MASK, + .bit = BIT(0), + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, + }, + { + .label = "fan2", + .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, + .mask = BIT(1), + .slot = 2, + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, + .capability_mask = MLXPLAT_CPLD_FAN_XDR_MASK, + .bit = BIT(1), + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, + }, + { + .label = "fan3", + .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, + .mask = BIT(2), + .slot = 3, + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, + .capability_mask = MLXPLAT_CPLD_FAN_XDR_MASK, + .bit = BIT(2), + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, + }, + { + .label = "fan4", + .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, + .mask = BIT(3), + .slot = 4, + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, + .capability_mask = MLXPLAT_CPLD_FAN_XDR_MASK, + .bit = BIT(3), + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, + }, + { + .label = "fan5", + .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, + .mask = BIT(4), + .slot = 5, + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, + .capability_mask = MLXPLAT_CPLD_FAN_XDR_MASK, + .bit = BIT(4), + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, + }, + { + .label = "fan6", + .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, + .mask = BIT(5), + .slot = 6, + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, + .capability_mask = MLXPLAT_CPLD_FAN_XDR_MASK, + .bit = BIT(5), + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, + }, + { + .label = "fan7", + .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, + .mask = BIT(6), + .slot = 7, + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, + .capability_mask = MLXPLAT_CPLD_FAN_XDR_MASK, + .bit = BIT(6), + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, + }, + { + .label = "fan8", + .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, + .mask = BIT(7), + .slot = 8, + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, + .capability_mask = MLXPLAT_CPLD_FAN_XDR_MASK, + .bit = BIT(7), + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, + }, +}; + +static struct mlxreg_core_data mlxplat_mlxcpld_xdr_asic1_items_data[] = { + { + .label = "asic1", + .reg = MLXPLAT_CPLD_LPC_REG_ASIC_HEALTH_OFFSET, + .mask = MLXPLAT_CPLD_ASIC_MASK, + .slot = 1, + .capability = MLXPLAT_CPLD_LPC_REG_ASIC_CAP_OFFSET, + .capability_mask = MLXPLAT_CPLD_ASIC_CAP_MASK, + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, + } +}; + +/* Platform hotplug for smart switch systems families data */ +static struct mlxreg_core_data mlxplat_mlxcpld_smart_switch_dpu_ready_data[] = { + { + .label = "dpu1_ready", + .reg = MLXPLAT_CPLD_LPC_REG_LC_RD_OFFSET, + .mask = BIT(0), + .slot = 1, + .capability = MLXPLAT_CPLD_LPC_REG_SLOT_QTY_OFFSET, + .capability_mask = MLXPLAT_CPLD_DPU_MASK, + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, + }, + { + .label = "dpu2_ready", + .reg = MLXPLAT_CPLD_LPC_REG_LC_RD_OFFSET, + .mask = BIT(1), + .slot = 2, + .capability = MLXPLAT_CPLD_LPC_REG_SLOT_QTY_OFFSET, + .capability_mask = MLXPLAT_CPLD_DPU_MASK, + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, + }, + { + .label = "dpu3_ready", + .reg = MLXPLAT_CPLD_LPC_REG_LC_RD_OFFSET, + .mask = BIT(2), + .slot = 3, + .capability = MLXPLAT_CPLD_LPC_REG_SLOT_QTY_OFFSET, + .capability_mask = MLXPLAT_CPLD_DPU_MASK, + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, + }, + { + .label = "dpu4_ready", + .reg = MLXPLAT_CPLD_LPC_REG_LC_RD_OFFSET, + .mask = BIT(3), + .slot = 4, + .capability = MLXPLAT_CPLD_LPC_REG_SLOT_QTY_OFFSET, + .capability_mask = MLXPLAT_CPLD_DPU_MASK, + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, + }, +}; + +static struct mlxreg_core_data mlxplat_mlxcpld_smart_switch_dpu_shtdn_ready_data[] = { + { + .label = "dpu1_shtdn_ready", + .reg = MLXPLAT_CPLD_LPC_REG_LC_SN_OFFSET, + .mask = BIT(0), + .slot = 1, + .capability = MLXPLAT_CPLD_LPC_REG_SLOT_QTY_OFFSET, + .capability_mask = MLXPLAT_CPLD_DPU_MASK, + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, + }, + { + .label = "dpu2_shtdn_ready", + .reg = MLXPLAT_CPLD_LPC_REG_LC_SN_OFFSET, + .mask = BIT(1), + .slot = 2, + .capability = MLXPLAT_CPLD_LPC_REG_SLOT_QTY_OFFSET, + .capability_mask = MLXPLAT_CPLD_DPU_MASK, + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, + }, + { + .label = "dpu3_shtdn_ready", + .reg = MLXPLAT_CPLD_LPC_REG_LC_SN_OFFSET, + .mask = BIT(2), + .slot = 3, + .capability = MLXPLAT_CPLD_LPC_REG_SLOT_QTY_OFFSET, + .capability_mask = MLXPLAT_CPLD_DPU_MASK, + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, + }, + { + .label = "dpu4_shtdn_ready", + .reg = MLXPLAT_CPLD_LPC_REG_LC_SN_OFFSET, + .mask = BIT(3), + .slot = 4, + .capability = MLXPLAT_CPLD_LPC_REG_SLOT_QTY_OFFSET, + .capability_mask = MLXPLAT_CPLD_DPU_MASK, + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, + }, +}; + +static struct mlxreg_core_item mlxplat_mlxcpld_smart_switch_items[] = { + { + .data = mlxplat_mlxcpld_xdr_psu_items_data, + .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, + .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET, + .mask = MLXPLAT_CPLD_PSU_XDR_MASK, + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, + .count = ARRAY_SIZE(mlxplat_mlxcpld_xdr_psu_items_data), + .inversed = 1, + .health = false, + }, + { + .data = mlxplat_mlxcpld_xdr_pwr_items_data, + .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, + .reg = MLXPLAT_CPLD_LPC_REG_PWR_OFFSET, + .mask = MLXPLAT_CPLD_PWR_XDR_MASK, + .capability = MLXPLAT_CPLD_LPC_REG_PSU_I2C_CAP_OFFSET, + .capability_mask = MLXPLAT_CPLD_PSU_CAP_MASK, + .count = ARRAY_SIZE(mlxplat_mlxcpld_xdr_pwr_items_data), + .inversed = 0, + .health = false, + }, + { + .data = mlxplat_mlxcpld_xdr_fan_items_data, + .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, + .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, + .mask = MLXPLAT_CPLD_FAN_XDR_MASK, + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, + .capability_mask = MLXPLAT_CPLD_FAN_CAP_MASK, + .count = ARRAY_SIZE(mlxplat_mlxcpld_xdr_fan_items_data), + .inversed = 1, + .health = false, + }, + { + .data = mlxplat_mlxcpld_xdr_asic1_items_data, + .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, + .reg = MLXPLAT_CPLD_LPC_REG_ASIC_HEALTH_OFFSET, + .mask = MLXPLAT_CPLD_ASIC_XDR_MASK, + .capability = MLXPLAT_CPLD_LPC_REG_ASIC_CAP_OFFSET, + .capability_mask = MLXPLAT_CPLD_ASIC_CAP_MASK, + .count = ARRAY_SIZE(mlxplat_mlxcpld_xdr_asic1_items_data), + .inversed = 0, + .health = true, + }, + { + .data = mlxplat_mlxcpld_smart_switch_dpu_ready_data, + .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_DPU_CORE, + .reg = MLXPLAT_CPLD_LPC_REG_LC_RD_OFFSET, + .mask = MLXPLAT_CPLD_DPU_MASK, + .capability = MLXPLAT_CPLD_LPC_REG_SLOT_QTY_OFFSET, + .capability_mask = MLXPLAT_CPLD_DPU_MASK, + .count = ARRAY_SIZE(mlxplat_mlxcpld_smart_switch_dpu_ready_data), + .inversed = 1, + .health = false, + }, + { + .data = mlxplat_mlxcpld_smart_switch_dpu_shtdn_ready_data, + .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_DPU_CORE, + .reg = MLXPLAT_CPLD_LPC_REG_LC_SN_OFFSET, + .mask = MLXPLAT_CPLD_DPU_MASK, + .capability = MLXPLAT_CPLD_LPC_REG_SLOT_QTY_OFFSET, + .capability_mask = MLXPLAT_CPLD_DPU_MASK, + .count = ARRAY_SIZE(mlxplat_mlxcpld_smart_switch_dpu_shtdn_ready_data), + .inversed = 1, + .health = false, + }, +}; + +static +struct mlxreg_core_hotplug_platform_data mlxplat_mlxcpld_smart_switch_data = { + .items = mlxplat_mlxcpld_smart_switch_items, + .counter = ARRAY_SIZE(mlxplat_mlxcpld_smart_switch_items), + .cell = MLXPLAT_CPLD_LPC_REG_AGGR_OFFSET, + .mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF | MLXPLAT_CPLD_AGGR_MASK_COMEX | + MLXPLAT_CPLD_AGGR_MASK_DPU_BRD | MLXPLAT_CPLD_AGGR_MASK_DPU_CORE, + .cell_low = MLXPLAT_CPLD_LPC_REG_AGGRLO_OFFSET, + .mask_low = MLXPLAT_CPLD_LOW_AGGR_MASK_LOW, +}; + +/* Smart switch data processor units data */ +static struct i2c_board_info mlxplat_mlxcpld_smart_switch_dpu_devs[] = { + { + I2C_BOARD_INFO("mlxreg-dpu", MLXPLAT_CPLD_DPU_ADDR), + .irq = MLXPLAT_CPLD_LPC_SYSIRQ, + }, + { + I2C_BOARD_INFO("mlxreg-dpu", MLXPLAT_CPLD_DPU_ADDR), + .irq = MLXPLAT_CPLD_LPC_SYSIRQ, + }, + { + I2C_BOARD_INFO("mlxreg-dpu", MLXPLAT_CPLD_DPU_ADDR), + .irq = MLXPLAT_CPLD_LPC_SYSIRQ, + }, + { + I2C_BOARD_INFO("mlxreg-dpu", MLXPLAT_CPLD_DPU_ADDR), + .irq = MLXPLAT_CPLD_LPC_SYSIRQ, + }, +}; + +static struct mlxreg_core_data mlxplat_mlxcpld_smart_switch_dpu_data[] = { + { + .label = "dpu1", + .hpdev.brdinfo = &mlxplat_mlxcpld_smart_switch_dpu_devs[0], + .hpdev.nr = MLXPLAT_CPLD_NR_DPU_BASE, + .slot = 1, + }, + { + .label = "dpu2", + .hpdev.brdinfo = &mlxplat_mlxcpld_smart_switch_dpu_devs[1], + .hpdev.nr = MLXPLAT_CPLD_NR_DPU_BASE + 1, + .slot = 2, + }, + { + .label = "dpu3", + .hpdev.brdinfo = &mlxplat_mlxcpld_smart_switch_dpu_devs[2], + .hpdev.nr = MLXPLAT_CPLD_NR_DPU_BASE + 2, + .slot = 3, + }, + { + .label = "dpu4", + .hpdev.brdinfo = &mlxplat_mlxcpld_smart_switch_dpu_devs[2], + .hpdev.nr = MLXPLAT_CPLD_NR_DPU_BASE + 3, + .slot = 4, + }, +}; + +/* Callback performs graceful shutdown after notification about power button event */ +static int +mlxplat_mlxcpld_l1_switch_pwr_events_handler(void *handle, enum mlxreg_hotplug_kind kind, + u8 action) +{ + if (action) { + dev_info(&mlxplat_dev->dev, "System shutdown due to short press of power button"); + kernel_power_off(); + } + + return 0; +} + +static struct mlxreg_core_hotplug_notifier mlxplat_mlxcpld_l1_switch_pwr_events_notifier = { + .user_handler = mlxplat_mlxcpld_l1_switch_pwr_events_handler, +}; + +/* Platform hotplug for l1 switch systems family data */ +static struct mlxreg_core_data mlxplat_mlxcpld_l1_switch_pwr_events_items_data[] = { + { + .label = "power_button", + .reg = MLXPLAT_CPLD_LPC_REG_PWRB_OFFSET, + .mask = MLXPLAT_CPLD_PWR_BUTTON_MASK, + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, + .hpdev.action = MLXREG_HOTPLUG_DEVICE_NO_ACTION, + .hpdev.notifier = &mlxplat_mlxcpld_l1_switch_pwr_events_notifier, + }, +}; + +/* Callback activates latch reset flow after notification about intrusion event */ +static int +mlxplat_mlxcpld_l1_switch_intrusion_events_handler(void *handle, enum mlxreg_hotplug_kind kind, + u8 action) +{ + struct mlxplat_priv *priv = platform_get_drvdata(mlxplat_dev); + u32 regval; + int err; + + err = regmap_read(priv->regmap, MLXPLAT_CPLD_LPC_REG_GP1_OFFSET, ®val); + if (err) + goto fail_regmap_read; + + if (action) { + dev_info(&mlxplat_dev->dev, "Detected intrusion - system latch is opened"); + err = regmap_write(priv->regmap, MLXPLAT_CPLD_LPC_REG_GP1_OFFSET, + regval | MLXPLAT_CPLD_LATCH_RST_MASK); + } else { + dev_info(&mlxplat_dev->dev, "System latch is properly closed"); + err = regmap_write(priv->regmap, MLXPLAT_CPLD_LPC_REG_GP1_OFFSET, + regval & ~MLXPLAT_CPLD_LATCH_RST_MASK); + } + + if (err) + goto fail_regmap_write; + + return 0; + +fail_regmap_read: +fail_regmap_write: + dev_err(&mlxplat_dev->dev, "Register access failed"); + return err; +} + +static struct mlxreg_core_hotplug_notifier mlxplat_mlxcpld_l1_switch_intrusion_events_notifier = { + .user_handler = mlxplat_mlxcpld_l1_switch_intrusion_events_handler, +}; + +static struct mlxreg_core_data mlxplat_mlxcpld_l1_switch_health_events_items_data[] = { + { + .label = "thermal1_pdb", + .reg = MLXPLAT_CPLD_LPC_REG_BRD_OFFSET, + .mask = MLXPLAT_CPLD_THERMAL1_PDB_MASK, + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, + }, + { + .label = "thermal2_pdb", + .reg = MLXPLAT_CPLD_LPC_REG_BRD_OFFSET, + .mask = MLXPLAT_CPLD_THERMAL2_PDB_MASK, + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, + }, + { + .label = "intrusion", + .reg = MLXPLAT_CPLD_LPC_REG_BRD_OFFSET, + .mask = MLXPLAT_CPLD_INTRUSION_MASK, + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, + .hpdev.action = MLXREG_HOTPLUG_DEVICE_NO_ACTION, + .hpdev.notifier = &mlxplat_mlxcpld_l1_switch_intrusion_events_notifier, + }, + { + .label = "pwm_pg", + .reg = MLXPLAT_CPLD_LPC_REG_BRD_OFFSET, + .mask = MLXPLAT_CPLD_PWM_PG_MASK, + .hpdev.nr = MLXPLAT_CPLD_NR_NONE, + }, +}; + +static struct mlxreg_core_item mlxplat_mlxcpld_l1_switch_events_items[] = { + { + .data = mlxplat_mlxcpld_default_ng_fan_items_data, + .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, + .reg = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, + .mask = MLXPLAT_CPLD_FAN_NG_MASK, + .count = ARRAY_SIZE(mlxplat_mlxcpld_default_ng_fan_items_data), + .inversed = 1, + .health = false, + }, + { + .data = mlxplat_mlxcpld_erot_ap_items_data, + .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, + .reg = MLXPLAT_CPLD_LPC_REG_EROT_OFFSET, + .mask = MLXPLAT_CPLD_EROT_MASK, + .count = ARRAY_SIZE(mlxplat_mlxcpld_erot_ap_items_data), + .inversed = 1, + .health = false, + }, + { + .data = mlxplat_mlxcpld_erot_error_items_data, + .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, + .reg = MLXPLAT_CPLD_LPC_REG_EROTE_OFFSET, + .mask = MLXPLAT_CPLD_EROT_MASK, + .count = ARRAY_SIZE(mlxplat_mlxcpld_erot_error_items_data), + .inversed = 1, + .health = false, + }, + { + .data = mlxplat_mlxcpld_l1_switch_pwr_events_items_data, + .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, + .reg = MLXPLAT_CPLD_LPC_REG_PWRB_OFFSET, + .mask = MLXPLAT_CPLD_PWR_BUTTON_MASK, + .count = ARRAY_SIZE(mlxplat_mlxcpld_l1_switch_pwr_events_items_data), + .inversed = 1, + .health = false, + }, + { + .data = mlxplat_mlxcpld_l1_switch_health_events_items_data, + .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_NG_DEF, + .reg = MLXPLAT_CPLD_LPC_REG_BRD_OFFSET, + .mask = MLXPLAT_CPLD_L1_CHA_HEALTH_MASK, + .count = ARRAY_SIZE(mlxplat_mlxcpld_l1_switch_health_events_items_data), + .inversed = 1, + .health = false, + .ind = 8, + }, +}; + +static +struct mlxreg_core_hotplug_platform_data mlxplat_mlxcpld_l1_switch_data = { + .items = mlxplat_mlxcpld_l1_switch_events_items, + .counter = ARRAY_SIZE(mlxplat_mlxcpld_l1_switch_events_items), + .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 | MLXPLAT_CPLD_LOW_AGGR_MASK_PWR_BUT, +}; + +/* Platform led default data */ +static struct mlxreg_core_data mlxplat_mlxcpld_default_led_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 + }, + { + .label = "psu:green", + .reg = MLXPLAT_CPLD_LPC_REG_LED1_OFFSET, + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, + }, + { + .label = "psu:red", + .reg = MLXPLAT_CPLD_LPC_REG_LED1_OFFSET, + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, + }, + { + .label = "fan1:green", + .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET, + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, + }, + { + .label = "fan1:red", + .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET, + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, + }, + { + .label = "fan2:green", + .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET, + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, + }, + { + .label = "fan2:red", + .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET, + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, + }, + { + .label = "fan3:green", .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET, .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, }, @@ -3088,67 +3605,241 @@ static struct mlxreg_core_data mlxplat_mlxcpld_l1_switch_led_data[] = { .bit = BIT(1), }, { - .label = "fan2:orange", - .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET, + .label = "fan2:orange", + .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET, + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, + .bit = BIT(1), + }, + { + .label = "fan3:green", + .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET, + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, + .bit = BIT(2), + }, + { + .label = "fan3:orange", + .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET, + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, + .bit = BIT(2), + }, + { + .label = "fan4:green", + .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET, + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, + .bit = BIT(3), + }, + { + .label = "fan4:orange", + .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET, + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, + .bit = BIT(3), + }, + { + .label = "fan5:green", + .reg = MLXPLAT_CPLD_LPC_REG_LED4_OFFSET, + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, + .bit = BIT(4), + }, + { + .label = "fan5:orange", + .reg = MLXPLAT_CPLD_LPC_REG_LED4_OFFSET, + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, + .bit = BIT(4), + }, + { + .label = "fan6:green", + .reg = MLXPLAT_CPLD_LPC_REG_LED4_OFFSET, + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, + .bit = BIT(5), + }, + { + .label = "fan6:orange", + .reg = MLXPLAT_CPLD_LPC_REG_LED4_OFFSET, + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, + .bit = BIT(5), + }, + { + .label = "uid:blue", + .reg = MLXPLAT_CPLD_LPC_REG_LED5_OFFSET, + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, + }, +}; + +static struct mlxreg_core_platform_data mlxplat_l1_switch_led_data = { + .data = mlxplat_mlxcpld_l1_switch_led_data, + .counter = ARRAY_SIZE(mlxplat_mlxcpld_l1_switch_led_data), +}; + +/* Platform led data for XDR and smart switch systems */ +static struct mlxreg_core_data mlxplat_mlxcpld_xdr_led_data[] = { + { + .label = "status:green", + .reg = MLXPLAT_CPLD_LPC_REG_LED1_OFFSET, + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, + }, + { + .label = "status:orange", + .reg = MLXPLAT_CPLD_LPC_REG_LED1_OFFSET, + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK + }, + { + .label = "psu:green", + .reg = MLXPLAT_CPLD_LPC_REG_LED1_OFFSET, + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, + }, + { + .label = "psu:orange", + .reg = MLXPLAT_CPLD_LPC_REG_LED1_OFFSET, + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, + }, + { + .label = "fan1:green", + .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET, + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, + .slot = 1, + }, + { + .label = "fan1:orange", + .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET, + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, + .slot = 1, + }, + { + .label = "fan2:green", + .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET, + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, + .slot = 2, + }, + { + .label = "fan2:orange", + .reg = MLXPLAT_CPLD_LPC_REG_LED2_OFFSET, + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, + .slot = 2, + }, + { + .label = "fan3:green", + .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET, + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, + .slot = 3, + }, + { + .label = "fan3:orange", + .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET, + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, + .slot = 3, + }, + { + .label = "fan4:green", + .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET, + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, + .slot = 4, + }, + { + .label = "fan4:orange", + .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET, + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, + .slot = 4, + }, + { + .label = "fan5:green", + .reg = MLXPLAT_CPLD_LPC_REG_LED4_OFFSET, + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, + .slot = 5, + }, + { + .label = "fan5:orange", + .reg = MLXPLAT_CPLD_LPC_REG_LED4_OFFSET, + .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, + .slot = 5, + }, + { + .label = "fan6:green", + .reg = MLXPLAT_CPLD_LPC_REG_LED4_OFFSET, + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, + .slot = 6, + }, + { + .label = "fan6:orange", + .reg = MLXPLAT_CPLD_LPC_REG_LED4_OFFSET, + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, + .slot = 6, + }, + { + .label = "fan7:green", + .reg = MLXPLAT_CPLD_LPC_REG_LED6_OFFSET, + .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, + .slot = 7, + }, + { + .label = "fan7:orange", + .reg = MLXPLAT_CPLD_LPC_REG_LED6_OFFSET, .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, - .bit = BIT(1), + .slot = 7, }, { - .label = "fan3:green", - .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET, + .label = "fan8:green", + .reg = MLXPLAT_CPLD_LPC_REG_LED7_OFFSET, .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, - .bit = BIT(2), + .slot = 8, }, { - .label = "fan3:orange", - .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET, + .label = "fan8:orange", + .reg = MLXPLAT_CPLD_LPC_REG_LED7_OFFSET, .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, - .bit = BIT(2), + .slot = 8, }, { - .label = "fan4:green", - .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET, + .label = "fan9:green", + .reg = MLXPLAT_CPLD_LPC_REG_LED7_OFFSET, .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, - .bit = BIT(3), + .slot = 9, }, { - .label = "fan4:orange", - .reg = MLXPLAT_CPLD_LPC_REG_LED3_OFFSET, + .label = "fan9:orange", + .reg = MLXPLAT_CPLD_LPC_REG_LED7_OFFSET, .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, - .bit = BIT(3), + .slot = 9, }, { - .label = "fan5:green", - .reg = MLXPLAT_CPLD_LPC_REG_LED4_OFFSET, + .label = "fan10:green", + .reg = MLXPLAT_CPLD_LPC_REG_LED8_OFFSET, .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, - .bit = BIT(4), + .slot = 10, }, { - .label = "fan5:orange", - .reg = MLXPLAT_CPLD_LPC_REG_LED4_OFFSET, + .label = "fan10:orange", + .reg = MLXPLAT_CPLD_LPC_REG_LED8_OFFSET, .mask = MLXPLAT_CPLD_LED_LO_NIBBLE_MASK, .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, - .bit = BIT(4), - }, - { - .label = "fan6:green", - .reg = MLXPLAT_CPLD_LPC_REG_LED4_OFFSET, - .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, - .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, - .bit = BIT(5), - }, - { - .label = "fan6:orange", - .reg = MLXPLAT_CPLD_LPC_REG_LED4_OFFSET, - .mask = MLXPLAT_CPLD_LED_HI_NIBBLE_MASK, - .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, - .bit = BIT(5), + .slot = 10, }, { .label = "uid:blue", @@ -3157,9 +3848,9 @@ static struct mlxreg_core_data mlxplat_mlxcpld_l1_switch_led_data[] = { }, }; -static struct mlxreg_core_platform_data mlxplat_l1_switch_led_data = { - .data = mlxplat_mlxcpld_l1_switch_led_data, - .counter = ARRAY_SIZE(mlxplat_mlxcpld_l1_switch_led_data), +static struct mlxreg_core_platform_data mlxplat_xdr_led_data = { + .data = mlxplat_mlxcpld_xdr_led_data, + .counter = ARRAY_SIZE(mlxplat_mlxcpld_xdr_led_data), }; /* Platform register access default */ @@ -4396,19 +5087,240 @@ static struct mlxreg_core_data mlxplat_mlxcpld_modular_regs_io_data[] = { }, }; -static struct mlxreg_core_platform_data mlxplat_modular_regs_io_data = { - .data = mlxplat_mlxcpld_modular_regs_io_data, - .counter = ARRAY_SIZE(mlxplat_mlxcpld_modular_regs_io_data), +static struct mlxreg_core_platform_data mlxplat_modular_regs_io_data = { + .data = mlxplat_mlxcpld_modular_regs_io_data, + .counter = ARRAY_SIZE(mlxplat_mlxcpld_modular_regs_io_data), +}; + +/* Platform register access for chassis blade systems family data */ +static struct mlxreg_core_data mlxplat_mlxcpld_chassis_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 = "reset_long_pwr_pb", + .reg = MLXPLAT_CPLD_LPC_REG_RST_CAUSE2_OFFSET, + .mask = GENMASK(7, 0) & ~BIT(7), + .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 = "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, + .bit = GENMASK(7, 0), + .mode = 0444, + }, +}; + +static struct mlxreg_core_platform_data mlxplat_chassis_blade_regs_io_data = { + .data = mlxplat_mlxcpld_chassis_blade_regs_io_data, + .counter = ARRAY_SIZE(mlxplat_mlxcpld_chassis_blade_regs_io_data), }; -/* Platform register access for chassis blade systems family data */ -static struct mlxreg_core_data mlxplat_mlxcpld_chassis_blade_regs_io_data[] = { +/* Platform register access for smart switch systems families data */ +static struct mlxreg_core_data mlxplat_mlxcpld_smart_switch_regs_io_data[] = { { .label = "cpld1_version", .reg = MLXPLAT_CPLD_LPC_REG_CPLD1_VER_OFFSET, .bit = GENMASK(7, 0), .mode = 0444, }, + { + .label = "cpld2_version", + .reg = MLXPLAT_CPLD_LPC_REG_CPLD2_VER_OFFSET, + .bit = GENMASK(7, 0), + .mode = 0444, + }, + { + .label = "cpld3_version", + .reg = MLXPLAT_CPLD_LPC_REG_CPLD3_VER_OFFSET, + .bit = GENMASK(7, 0), + .mode = 0444, + }, { .label = "cpld1_pn", .reg = MLXPLAT_CPLD_LPC_REG_CPLD1_PN_OFFSET, @@ -4416,12 +5328,116 @@ static struct mlxreg_core_data mlxplat_mlxcpld_chassis_blade_regs_io_data[] = { .mode = 0444, .regnum = 2, }, + { + .label = "cpld2_pn", + .reg = MLXPLAT_CPLD_LPC_REG_CPLD2_PN_OFFSET, + .bit = GENMASK(15, 0), + .mode = 0444, + .regnum = 2, + }, + { + .label = "cpld3_pn", + .reg = MLXPLAT_CPLD_LPC_REG_CPLD3_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 = "cpld2_version_min", + .reg = MLXPLAT_CPLD_LPC_REG_CPLD2_MVER_OFFSET, + .bit = GENMASK(7, 0), + .mode = 0444, + }, + { + .label = "cpld3_version_min", + .reg = MLXPLAT_CPLD_LPC_REG_CPLD3_MVER_OFFSET, + .bit = GENMASK(7, 0), + .mode = 0444, + }, + { + .label = "kexec_activated", + .reg = MLXPLAT_CPLD_LPC_REG_RESET_GP1_OFFSET, + .mask = GENMASK(7, 0) & ~BIT(1), + .mode = 0644, + }, + { + .label = "asic_reset", + .reg = MLXPLAT_CPLD_LPC_REG_RESET_GP2_OFFSET, + .mask = GENMASK(7, 0) & ~BIT(3), + .mode = 0644, + }, + { + .label = "eth_switch_reset", + .reg = MLXPLAT_CPLD_LPC_REG_RESET_GP2_OFFSET, + .mask = GENMASK(7, 0) & ~BIT(4), + .mode = 0644, + }, + { + .label = "dpu1_rst", + .reg = MLXPLAT_CPLD_LPC_REG_RESET_GP3_OFFSET, + .mask = GENMASK(7, 0) & ~BIT(0), + .mode = 0200, + }, + { + .label = "dpu2_rst", + .reg = MLXPLAT_CPLD_LPC_REG_RESET_GP3_OFFSET, + .mask = GENMASK(7, 0) & ~BIT(1), + .mode = 0200, + }, + { + .label = "dpu3_rst", + .reg = MLXPLAT_CPLD_LPC_REG_RESET_GP3_OFFSET, + .mask = GENMASK(7, 0) & ~BIT(2), + .mode = 0200, + }, + { + .label = "dpu4_rst", + .reg = MLXPLAT_CPLD_LPC_REG_RESET_GP3_OFFSET, + .mask = GENMASK(7, 0) & ~BIT(3), + .mode = 0200, + }, + { + .label = "dpu1_pwr", + .reg = MLXPLAT_CPLD_LPC_REG_RESET_GP4_OFFSET, + .mask = GENMASK(7, 0) & ~BIT(0), + .mode = 0200, + }, + { + .label = "dpu2_pwr", + .reg = MLXPLAT_CPLD_LPC_REG_RESET_GP4_OFFSET, + .mask = GENMASK(7, 0) & ~BIT(1), + .mode = 0200, + }, + { + .label = "dpu3_pwr", + .reg = MLXPLAT_CPLD_LPC_REG_RESET_GP4_OFFSET, + .mask = GENMASK(7, 0) & ~BIT(2), + .mode = 0200, + }, + { + .label = "dpu4_pwr", + .reg = MLXPLAT_CPLD_LPC_REG_RESET_GP4_OFFSET, + .mask = GENMASK(7, 0) & ~BIT(3), + .mode = 0200, + }, + { + .label = "reset_long_pb", + .reg = MLXPLAT_CPLD_LPC_REG_RESET_CAUSE_OFFSET, + .mask = GENMASK(7, 0) & ~BIT(0), + .mode = 0444, + }, + { + .label = "reset_short_pb", + .reg = MLXPLAT_CPLD_LPC_REG_RESET_CAUSE_OFFSET, + .mask = GENMASK(7, 0) & ~BIT(1), + .mode = 0444, + }, { .label = "reset_aux_pwr_or_ref", .reg = MLXPLAT_CPLD_LPC_REG_RESET_CAUSE_OFFSET, @@ -4429,9 +5445,33 @@ static struct mlxreg_core_data mlxplat_mlxcpld_chassis_blade_regs_io_data[] = { .mode = 0444, }, { - .label = "reset_from_comex", + .label = "reset_swb_dc_dc_pwr_fail", .reg = MLXPLAT_CPLD_LPC_REG_RESET_CAUSE_OFFSET, - .mask = GENMASK(7, 0) & ~BIT(4), + .mask = GENMASK(7, 0) & ~BIT(3), + .mode = 0444, + }, + { + .label = "reset_swb_wd", + .reg = MLXPLAT_CPLD_LPC_REG_RESET_CAUSE_OFFSET, + .mask = GENMASK(7, 0) & ~BIT(6), + .mode = 0444, + }, + { + .label = "reset_asic_thermal", + .reg = MLXPLAT_CPLD_LPC_REG_RESET_CAUSE_OFFSET, + .mask = GENMASK(7, 0) & ~BIT(7), + .mode = 0444, + }, + { + .label = "reset_sw_reset", + .reg = MLXPLAT_CPLD_LPC_REG_RST_CAUSE1_OFFSET, + .mask = GENMASK(7, 0) & ~BIT(0), + .mode = 0444, + }, + { + .label = "reset_aux_pwr_or_reload", + .reg = MLXPLAT_CPLD_LPC_REG_RST_CAUSE1_OFFSET, + .mask = GENMASK(7, 0) & ~BIT(2), .mode = 0444, }, { @@ -4453,13 +5493,13 @@ static struct mlxreg_core_data mlxplat_mlxcpld_chassis_blade_regs_io_data[] = { .mode = 0444, }, { - .label = "reset_comex_wd", + .label = "reset_pwr", .reg = MLXPLAT_CPLD_LPC_REG_RST_CAUSE1_OFFSET, - .mask = GENMASK(7, 0) & ~BIT(6), + .mask = GENMASK(7, 0) & ~BIT(7), .mode = 0444, }, { - .label = "reset_voltmon_upgrade_fail", + .label = "reset_pwr_converter_fail", .reg = MLXPLAT_CPLD_LPC_REG_RST_CAUSE2_OFFSET, .mask = GENMASK(7, 0) & ~BIT(0), .mode = 0444, @@ -4483,23 +5523,103 @@ static struct mlxreg_core_data mlxplat_mlxcpld_chassis_blade_regs_io_data[] = { .mode = 0444, }, { - .label = "reset_reload_bios", + .label = "reset_ac_pwr_fail", .reg = MLXPLAT_CPLD_LPC_REG_RST_CAUSE2_OFFSET, - .mask = GENMASK(7, 0) & ~BIT(5), + .mask = GENMASK(7, 0) & ~BIT(6), .mode = 0444, }, { - .label = "reset_ac_pwr_fail", - .reg = MLXPLAT_CPLD_LPC_REG_RST_CAUSE2_OFFSET, - .mask = GENMASK(7, 0) & ~BIT(6), + .label = "voltreg_update_status", + .reg = MLXPLAT_CPLD_LPC_REG_GP0_RO_OFFSET, + .mask = MLXPLAT_CPLD_VOLTREG_UPD_MASK, + .bit = 5, .mode = 0444, }, { - .label = "reset_long_pwr_pb", - .reg = MLXPLAT_CPLD_LPC_REG_RST_CAUSE2_OFFSET, - .mask = GENMASK(7, 0) & ~BIT(7), + .label = "port80", + .reg = MLXPLAT_CPLD_LPC_REG_GP1_RO_OFFSET, + .bit = GENMASK(7, 0), + .mode = 0444, + }, + { + .label = "bios_status", + .reg = MLXPLAT_CPLD_LPC_REG_GPCOM0_OFFSET, + .mask = MLXPLAT_CPLD_BIOS_STATUS_MASK, + .bit = 2, + .mode = 0444, + }, + { + .label = "bios_start_retry", + .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 = "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 = "shutdown_unlock", + .reg = MLXPLAT_CPLD_LPC_REG_GP0_OFFSET, + .mask = GENMASK(7, 0) & ~BIT(5), + .mode = 0644, + }, + { + .label = "fan_dir", + .reg = MLXPLAT_CPLD_LPC_REG_FAN_DIRECTION, + .bit = GENMASK(7, 0), .mode = 0444, }, + { + .label = "dpu1_rst_en", + .reg = MLXPLAT_CPLD_LPC_REG_GP_RST_OFFSET, + .mask = GENMASK(7, 0) & ~BIT(0), + .mode = 0200, + }, + { + .label = "dpu2_rst_en", + .reg = MLXPLAT_CPLD_LPC_REG_GP_RST_OFFSET, + .mask = GENMASK(7, 0) & ~BIT(1), + .mode = 0200, + }, + { + .label = "dpu3_rst_en", + .reg = MLXPLAT_CPLD_LPC_REG_GP_RST_OFFSET, + .mask = GENMASK(7, 0) & ~BIT(2), + .mode = 0200, + }, + { + .label = "dpu4_rst_en", + .reg = MLXPLAT_CPLD_LPC_REG_GP_RST_OFFSET, + .mask = GENMASK(7, 0) & ~BIT(3), + .mode = 0200, + }, + { + .label = "psu1_on", + .reg = MLXPLAT_CPLD_LPC_REG_GP1_OFFSET, + .mask = GENMASK(7, 0) & ~BIT(0), + .mode = 0200, + }, + { + .label = "psu2_on", + .reg = MLXPLAT_CPLD_LPC_REG_GP1_OFFSET, + .mask = GENMASK(7, 0) & ~BIT(1), + .mode = 0200, + }, { .label = "pwr_cycle", .reg = MLXPLAT_CPLD_LPC_REG_GP1_OFFSET, @@ -4513,72 +5633,117 @@ static struct mlxreg_core_data mlxplat_mlxcpld_chassis_blade_regs_io_data[] = { .mode = 0200, }, { - .label = "global_wp_request", - .reg = MLXPLAT_CPLD_LPC_REG_GP2_OFFSET, - .mask = GENMASK(7, 0) & ~BIT(0), + .label = "jtag_cap", + .reg = MLXPLAT_CPLD_LPC_REG_FU_CAP_OFFSET, + .mask = MLXPLAT_CPLD_FU_CAP_MASK, + .bit = 1, + .mode = 0444, + }, + { + .label = "jtag_enable", + .reg = MLXPLAT_CPLD_LPC_REG_FIELD_UPGRADE, + .mask = GENMASK(1, 0), + .bit = 1, + .mode = 0644, + }, + { + .label = "non_active_bios_select", + .reg = MLXPLAT_CPLD_LPC_SAFE_BIOS_OFFSET, + .mask = GENMASK(7, 0) & ~BIT(4), + .mode = 0644, + }, + { + .label = "bios_upgrade_fail", + .reg = MLXPLAT_CPLD_LPC_SAFE_BIOS_OFFSET, + .mask = GENMASK(7, 0) & ~BIT(5), + .mode = 0444, + }, + { + .label = "bios_image_invert", + .reg = MLXPLAT_CPLD_LPC_SAFE_BIOS_OFFSET, + .mask = GENMASK(7, 0) & ~BIT(6), .mode = 0644, }, { - .label = "jtag_enable", - .reg = MLXPLAT_CPLD_LPC_REG_GP2_OFFSET, - .mask = GENMASK(7, 0) & ~BIT(4), + .label = "me_reboot", + .reg = MLXPLAT_CPLD_LPC_SAFE_BIOS_OFFSET, + .mask = GENMASK(7, 0) & ~BIT(7), .mode = 0644, }, { - .label = "comm_chnl_ready", - .reg = MLXPLAT_CPLD_LPC_REG_GP2_OFFSET, - .mask = GENMASK(7, 0) & ~BIT(6), + .label = "dpu1_pwr_force", + .reg = MLXPLAT_CPLD_LPC_REG_GP3_OFFSET, + .mask = GENMASK(7, 0) & ~BIT(0), .mode = 0200, }, { - .label = "bios_safe_mode", - .reg = MLXPLAT_CPLD_LPC_REG_GPCOM0_OFFSET, - .mask = GENMASK(7, 0) & ~BIT(4), - .mode = 0444, + .label = "dpu2_pwr_force", + .reg = MLXPLAT_CPLD_LPC_REG_GP3_OFFSET, + .mask = GENMASK(7, 0) & ~BIT(1), + .mode = 0200, }, { - .label = "bios_active_image", - .reg = MLXPLAT_CPLD_LPC_REG_GPCOM0_OFFSET, - .mask = GENMASK(7, 0) & ~BIT(5), - .mode = 0444, + .label = "dpu3_pwr_force", + .reg = MLXPLAT_CPLD_LPC_REG_GP3_OFFSET, + .mask = GENMASK(7, 0) & ~BIT(2), + .mode = 0200, }, { - .label = "bios_auth_fail", - .reg = MLXPLAT_CPLD_LPC_REG_GPCOM0_OFFSET, - .mask = GENMASK(7, 0) & ~BIT(6), - .mode = 0444, + .label = "dpu4_pwr_force", + .reg = MLXPLAT_CPLD_LPC_REG_GP3_OFFSET, + .mask = GENMASK(7, 0) & ~BIT(3), + .mode = 0200, }, { - .label = "bios_upgrade_fail", - .reg = MLXPLAT_CPLD_LPC_REG_GPCOM0_OFFSET, - .mask = GENMASK(7, 0) & ~BIT(7), + .label = "ufm_done", + .reg = MLXPLAT_CPLD_LPC_REG_GPI_MASK_OFFSET, + .bit = GENMASK(7, 0), .mode = 0444, }, { - .label = "voltreg_update_status", - .reg = MLXPLAT_CPLD_LPC_REG_GP0_RO_OFFSET, - .mask = MLXPLAT_CPLD_VOLTREG_UPD_MASK, - .bit = 5, + .label = "asic_health", + .reg = MLXPLAT_CPLD_LPC_REG_ASIC_HEALTH_OFFSET, + .mask = MLXPLAT_CPLD_ASIC_MASK, + .bit = 1, .mode = 0444, }, { - .label = "vpd_wp", - .reg = MLXPLAT_CPLD_LPC_REG_GP0_OFFSET, - .mask = GENMASK(7, 0) & ~BIT(3), + .label = "psu1_ac_ok", + .reg = MLXPLAT_CPLD_LPC_REG_PSU_AC_OFFSET, + .mask = GENMASK(7, 0) & ~BIT(0), .mode = 0644, }, { - .label = "pcie_asic_reset_dis", - .reg = MLXPLAT_CPLD_LPC_REG_GP0_OFFSET, - .mask = GENMASK(7, 0) & ~BIT(4), + .label = "psu2_ac_ok", + .reg = MLXPLAT_CPLD_LPC_REG_PSU_AC_OFFSET, + .mask = GENMASK(7, 0) & ~BIT(1), .mode = 0644, }, { - .label = "global_wp_response", - .reg = MLXPLAT_CPLD_LPC_REG_GWP_OFFSET, + .label = "psu1_no_alert", + .reg = MLXPLAT_CPLD_LPC_REG_PSU_ALERT_OFFSET, .mask = GENMASK(7, 0) & ~BIT(0), + .mode = 0644, + }, + { + .label = "psu2_no_alert", + .reg = MLXPLAT_CPLD_LPC_REG_PSU_ALERT_OFFSET, + .mask = GENMASK(7, 0) & ~BIT(1), + .mode = 0644, + }, + { + .label = "asic_pg_fail", + .reg = MLXPLAT_CPLD_LPC_REG_GP4_RO_OFFSET, + .mask = GENMASK(7, 0) & ~BIT(7), .mode = 0444, }, + { + .label = "spi_chnl_select", + .reg = MLXPLAT_CPLD_LPC_REG_SPI_CHNL_SELECT, + .mask = GENMASK(7, 0), + .bit = 1, + .mode = 0644, + }, { .label = "config1", .reg = MLXPLAT_CPLD_LPC_REG_CONFIG1_OFFSET, @@ -4605,9 +5770,9 @@ static struct mlxreg_core_data mlxplat_mlxcpld_chassis_blade_regs_io_data[] = { }, }; -static struct mlxreg_core_platform_data mlxplat_chassis_blade_regs_io_data = { - .data = mlxplat_mlxcpld_chassis_blade_regs_io_data, - .counter = ARRAY_SIZE(mlxplat_mlxcpld_chassis_blade_regs_io_data), +static struct mlxreg_core_platform_data mlxplat_smart_switch_regs_io_data = { + .data = mlxplat_mlxcpld_smart_switch_regs_io_data, + .counter = ARRAY_SIZE(mlxplat_mlxcpld_smart_switch_regs_io_data), }; /* Platform FAN default */ @@ -4751,6 +5916,185 @@ static struct mlxreg_core_platform_data mlxplat_default_fan_data = { .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, }; +/* XDR and smart switch platform fan data */ +static struct mlxreg_core_data mlxplat_mlxcpld_xdr_fan_data[] = { + { + .label = "pwm1", + .reg = MLXPLAT_CPLD_LPC_REG_PWM1_OFFSET, + }, + { + .label = "tacho1", + .reg = MLXPLAT_CPLD_LPC_REG_TACHO1_OFFSET, + .mask = GENMASK(7, 0), + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, + .slot = 1, + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, + }, + { + .label = "tacho2", + .reg = MLXPLAT_CPLD_LPC_REG_TACHO2_OFFSET, + .mask = GENMASK(7, 0), + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, + .slot = 2, + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, + }, + { + .label = "tacho3", + .reg = MLXPLAT_CPLD_LPC_REG_TACHO3_OFFSET, + .mask = GENMASK(7, 0), + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, + .slot = 3, + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, + }, + { + .label = "tacho4", + .reg = MLXPLAT_CPLD_LPC_REG_TACHO4_OFFSET, + .mask = GENMASK(7, 0), + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, + .slot = 4, + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, + }, + { + .label = "tacho5", + .reg = MLXPLAT_CPLD_LPC_REG_TACHO5_OFFSET, + .mask = GENMASK(7, 0), + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, + .slot = 5, + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, + }, + { + .label = "tacho6", + .reg = MLXPLAT_CPLD_LPC_REG_TACHO6_OFFSET, + .mask = GENMASK(7, 0), + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, + .slot = 6, + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, + }, + { + .label = "tacho7", + .reg = MLXPLAT_CPLD_LPC_REG_TACHO7_OFFSET, + .mask = GENMASK(7, 0), + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, + .slot = 7, + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, + }, + { + .label = "tacho8", + .reg = MLXPLAT_CPLD_LPC_REG_TACHO8_OFFSET, + .mask = GENMASK(7, 0), + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, + .slot = 8, + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, + }, + { + .label = "tacho9", + .reg = MLXPLAT_CPLD_LPC_REG_TACHO9_OFFSET, + .mask = GENMASK(7, 0), + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, + .slot = 9, + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, + }, + { + .label = "tacho10", + .reg = MLXPLAT_CPLD_LPC_REG_TACHO10_OFFSET, + .mask = GENMASK(7, 0), + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, + .slot = 10, + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, + }, + { + .label = "tacho11", + .reg = MLXPLAT_CPLD_LPC_REG_TACHO11_OFFSET, + .mask = GENMASK(7, 0), + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, + .slot = 11, + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, + }, + { + .label = "tacho12", + .reg = MLXPLAT_CPLD_LPC_REG_TACHO12_OFFSET, + .mask = GENMASK(7, 0), + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, + .slot = 12, + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, + }, + { + .label = "tacho13", + .reg = MLXPLAT_CPLD_LPC_REG_TACHO13_OFFSET, + .mask = GENMASK(7, 0), + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, + .slot = 13, + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, + }, + { + .label = "tacho14", + .reg = MLXPLAT_CPLD_LPC_REG_TACHO14_OFFSET, + .mask = GENMASK(7, 0), + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, + .slot = 14, + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, + }, + { + .label = "tacho15", + .reg = MLXPLAT_CPLD_LPC_REG_TACHO15_OFFSET, + .mask = GENMASK(7, 0), + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, + .slot = 15, + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, + }, + { + .label = "tacho16", + .reg = MLXPLAT_CPLD_LPC_REG_TACHO16_OFFSET, + .mask = GENMASK(7, 0), + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, + .slot = 16, + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN_OFFSET, + }, + { + .label = "tacho17", + .reg = MLXPLAT_CPLD_LPC_REG_TACHO17_OFFSET, + .mask = GENMASK(7, 0), + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, + .slot = 17, + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN2_OFFSET, + }, + { + .label = "tacho18", + .reg = MLXPLAT_CPLD_LPC_REG_TACHO18_OFFSET, + .mask = GENMASK(7, 0), + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, + .slot = 18, + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN2_OFFSET, + }, + { + .label = "tacho19", + .reg = MLXPLAT_CPLD_LPC_REG_TACHO19_OFFSET, + .mask = GENMASK(7, 0), + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, + .slot = 19, + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN2_OFFSET, + }, + { + .label = "tacho20", + .reg = MLXPLAT_CPLD_LPC_REG_TACHO20_OFFSET, + .mask = GENMASK(7, 0), + .capability = MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET, + .slot = 20, + .reg_prsnt = MLXPLAT_CPLD_LPC_REG_FAN2_OFFSET, + }, + { + .label = "conf", + .capability = MLXPLAT_CPLD_LPC_REG_TACHO_SPEED_OFFSET, + }, +}; + +static struct mlxreg_core_platform_data mlxplat_xdr_fan_data = { + .data = mlxplat_mlxcpld_xdr_fan_data, + .counter = ARRAY_SIZE(mlxplat_mlxcpld_xdr_fan_data), + .capability = MLXPLAT_CPLD_LPC_REG_FAN_DRW_CAP_OFFSET, + .version = 1, +}; + /* Watchdog type1: hardware implementation version1 * (MSN2700, MSN2410, MSN2740, MSN2100 and MSN2140 systems). */ @@ -4975,6 +6319,8 @@ static bool mlxplat_mlxcpld_writeable_reg(struct device *dev, unsigned int reg) { switch (reg) { case MLXPLAT_CPLD_LPC_REG_RESET_GP1_OFFSET: + case MLXPLAT_CPLD_LPC_REG_RESET_GP2_OFFSET: + case MLXPLAT_CPLD_LPC_REG_RESET_GP3_OFFSET: case MLXPLAT_CPLD_LPC_REG_RESET_GP4_OFFSET: case MLXPLAT_CPLD_LPC_REG_LED1_OFFSET: case MLXPLAT_CPLD_LPC_REG_LED2_OFFSET: @@ -4983,12 +6329,14 @@ static bool mlxplat_mlxcpld_writeable_reg(struct device *dev, unsigned int reg) case MLXPLAT_CPLD_LPC_REG_LED5_OFFSET: case MLXPLAT_CPLD_LPC_REG_LED6_OFFSET: case MLXPLAT_CPLD_LPC_REG_LED7_OFFSET: + case MLXPLAT_CPLD_LPC_REG_LED8_OFFSET: case MLXPLAT_CPLD_LPC_REG_GP0_OFFSET: case MLXPLAT_CPLD_LPC_REG_GP_RST_OFFSET: case MLXPLAT_CPLD_LPC_REG_GP1_OFFSET: case MLXPLAT_CPLD_LPC_REG_WP1_OFFSET: case MLXPLAT_CPLD_LPC_REG_GP2_OFFSET: case MLXPLAT_CPLD_LPC_REG_WP2_OFFSET: + case MLXPLAT_CPLD_LPC_REG_GP3_OFFSET: case MLXPLAT_CPLD_LPC_REG_FIELD_UPGRADE: case MLXPLAT_CPLD_LPC_SAFE_BIOS_OFFSET: case MLXPLAT_CPLD_LPC_SAFE_BIOS_WP_OFFSET: @@ -5012,10 +6360,14 @@ static bool mlxplat_mlxcpld_writeable_reg(struct device *dev, unsigned int reg) 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_PSU_AC_OFFSET: case MLXPLAT_CPLD_LPC_REG_PWR_EVENT_OFFSET: case MLXPLAT_CPLD_LPC_REG_PWR_MASK_OFFSET: + case MLXPLAT_CPLD_LPC_REG_PSU_ALERT_OFFSET: case MLXPLAT_CPLD_LPC_REG_FAN_EVENT_OFFSET: case MLXPLAT_CPLD_LPC_REG_FAN_MASK_OFFSET: + case MLXPLAT_CPLD_LPC_REG_FAN2_EVENT_OFFSET: + case MLXPLAT_CPLD_LPC_REG_FAN2_MASK_OFFSET: case MLXPLAT_CPLD_LPC_REG_EROT_EVENT_OFFSET: case MLXPLAT_CPLD_LPC_REG_EROT_MASK_OFFSET: case MLXPLAT_CPLD_LPC_REG_EROTE_EVENT_OFFSET: @@ -5083,6 +6435,8 @@ static bool mlxplat_mlxcpld_readable_reg(struct device *dev, unsigned int reg) case MLXPLAT_CPLD_LPC_REG_CPLD5_PN_OFFSET: case MLXPLAT_CPLD_LPC_REG_CPLD5_PN1_OFFSET: case MLXPLAT_CPLD_LPC_REG_RESET_GP1_OFFSET: + case MLXPLAT_CPLD_LPC_REG_RESET_GP2_OFFSET: + case MLXPLAT_CPLD_LPC_REG_RESET_GP3_OFFSET: case MLXPLAT_CPLD_LPC_REG_RESET_GP4_OFFSET: case MLXPLAT_CPLD_LPC_REG_RESET_CAUSE_OFFSET: case MLXPLAT_CPLD_LPC_REG_RST_CAUSE1_OFFSET: @@ -5094,15 +6448,18 @@ static bool mlxplat_mlxcpld_readable_reg(struct device *dev, unsigned int reg) case MLXPLAT_CPLD_LPC_REG_LED5_OFFSET: case MLXPLAT_CPLD_LPC_REG_LED6_OFFSET: case MLXPLAT_CPLD_LPC_REG_LED7_OFFSET: + case MLXPLAT_CPLD_LPC_REG_LED8_OFFSET: case MLXPLAT_CPLD_LPC_REG_FAN_DIRECTION: case MLXPLAT_CPLD_LPC_REG_GP0_RO_OFFSET: case MLXPLAT_CPLD_LPC_REG_GPCOM0_OFFSET: + case MLXPLAT_CPLD_LPC_REG_GP1_RO_OFFSET: case MLXPLAT_CPLD_LPC_REG_GP0_OFFSET: case MLXPLAT_CPLD_LPC_REG_GP_RST_OFFSET: case MLXPLAT_CPLD_LPC_REG_GP1_OFFSET: case MLXPLAT_CPLD_LPC_REG_WP1_OFFSET: case MLXPLAT_CPLD_LPC_REG_GP2_OFFSET: case MLXPLAT_CPLD_LPC_REG_WP2_OFFSET: + case MLXPLAT_CPLD_LPC_REG_GP3_OFFSET: case MLXPLAT_CPLD_LPC_REG_FIELD_UPGRADE: case MLXPLAT_CPLD_LPC_SAFE_BIOS_OFFSET: case MLXPLAT_CPLD_LPC_SAFE_BIOS_WP_OFFSET: @@ -5122,6 +6479,7 @@ static bool mlxplat_mlxcpld_readable_reg(struct device *dev, unsigned int reg) 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_GPI_MASK_OFFSET: case MLXPLAT_CPLD_LPC_REG_BRD_OFFSET: case MLXPLAT_CPLD_LPC_REG_BRD_EVENT_OFFSET: case MLXPLAT_CPLD_LPC_REG_BRD_MASK_OFFSET: @@ -5134,12 +6492,17 @@ static bool mlxplat_mlxcpld_readable_reg(struct device *dev, unsigned int reg) case MLXPLAT_CPLD_LPC_REG_PSU_OFFSET: case MLXPLAT_CPLD_LPC_REG_PSU_EVENT_OFFSET: case MLXPLAT_CPLD_LPC_REG_PSU_MASK_OFFSET: + case MLXPLAT_CPLD_LPC_REG_PSU_AC_OFFSET: case MLXPLAT_CPLD_LPC_REG_PWR_OFFSET: case MLXPLAT_CPLD_LPC_REG_PWR_EVENT_OFFSET: case MLXPLAT_CPLD_LPC_REG_PWR_MASK_OFFSET: + case MLXPLAT_CPLD_LPC_REG_PSU_ALERT_OFFSET: case MLXPLAT_CPLD_LPC_REG_FAN_OFFSET: case MLXPLAT_CPLD_LPC_REG_FAN_EVENT_OFFSET: case MLXPLAT_CPLD_LPC_REG_FAN_MASK_OFFSET: + case MLXPLAT_CPLD_LPC_REG_FAN2_OFFSET: + case MLXPLAT_CPLD_LPC_REG_FAN2_EVENT_OFFSET: + case MLXPLAT_CPLD_LPC_REG_FAN2_MASK_OFFSET: case MLXPLAT_CPLD_LPC_REG_EROT_OFFSET: case MLXPLAT_CPLD_LPC_REG_EROT_EVENT_OFFSET: case MLXPLAT_CPLD_LPC_REG_EROT_MASK_OFFSET: @@ -5213,6 +6576,13 @@ static bool mlxplat_mlxcpld_readable_reg(struct device *dev, unsigned int reg) case MLXPLAT_CPLD_LPC_REG_TACHO12_OFFSET: case MLXPLAT_CPLD_LPC_REG_TACHO13_OFFSET: case MLXPLAT_CPLD_LPC_REG_TACHO14_OFFSET: + case MLXPLAT_CPLD_LPC_REG_TACHO15_OFFSET: + case MLXPLAT_CPLD_LPC_REG_TACHO16_OFFSET: + case MLXPLAT_CPLD_LPC_REG_TACHO17_OFFSET: + case MLXPLAT_CPLD_LPC_REG_TACHO18_OFFSET: + case MLXPLAT_CPLD_LPC_REG_TACHO19_OFFSET: + case MLXPLAT_CPLD_LPC_REG_TACHO20_OFFSET: + case MLXPLAT_CPLD_LPC_REG_ASIC_CAP_OFFSET: case MLXPLAT_CPLD_LPC_REG_PWM_CONTROL_OFFSET: case MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET: case MLXPLAT_CPLD_LPC_REG_FAN_CAP2_OFFSET: @@ -5248,6 +6618,8 @@ static bool mlxplat_mlxcpld_volatile_reg(struct device *dev, unsigned int reg) case MLXPLAT_CPLD_LPC_REG_CPLD5_PN_OFFSET: case MLXPLAT_CPLD_LPC_REG_CPLD5_PN1_OFFSET: case MLXPLAT_CPLD_LPC_REG_RESET_GP1_OFFSET: + case MLXPLAT_CPLD_LPC_REG_RESET_GP2_OFFSET: + case MLXPLAT_CPLD_LPC_REG_RESET_GP3_OFFSET: case MLXPLAT_CPLD_LPC_REG_RESET_GP4_OFFSET: case MLXPLAT_CPLD_LPC_REG_RESET_CAUSE_OFFSET: case MLXPLAT_CPLD_LPC_REG_RST_CAUSE1_OFFSET: @@ -5259,13 +6631,16 @@ static bool mlxplat_mlxcpld_volatile_reg(struct device *dev, unsigned int reg) case MLXPLAT_CPLD_LPC_REG_LED5_OFFSET: case MLXPLAT_CPLD_LPC_REG_LED6_OFFSET: case MLXPLAT_CPLD_LPC_REG_LED7_OFFSET: + case MLXPLAT_CPLD_LPC_REG_LED8_OFFSET: case MLXPLAT_CPLD_LPC_REG_FAN_DIRECTION: case MLXPLAT_CPLD_LPC_REG_GP0_RO_OFFSET: case MLXPLAT_CPLD_LPC_REG_GPCOM0_OFFSET: + case MLXPLAT_CPLD_LPC_REG_GP1_RO_OFFSET: case MLXPLAT_CPLD_LPC_REG_GP0_OFFSET: case MLXPLAT_CPLD_LPC_REG_GP_RST_OFFSET: case MLXPLAT_CPLD_LPC_REG_GP1_OFFSET: case MLXPLAT_CPLD_LPC_REG_GP2_OFFSET: + case MLXPLAT_CPLD_LPC_REG_GP3_OFFSET: case MLXPLAT_CPLD_LPC_REG_FIELD_UPGRADE: case MLXPLAT_CPLD_LPC_SAFE_BIOS_OFFSET: case MLXPLAT_CPLD_LPC_SAFE_BIOS_WP_OFFSET: @@ -5285,6 +6660,7 @@ static bool mlxplat_mlxcpld_volatile_reg(struct device *dev, unsigned int reg) 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_GPI_MASK_OFFSET: case MLXPLAT_CPLD_LPC_REG_BRD_OFFSET: case MLXPLAT_CPLD_LPC_REG_BRD_EVENT_OFFSET: case MLXPLAT_CPLD_LPC_REG_BRD_MASK_OFFSET: @@ -5297,9 +6673,11 @@ static bool mlxplat_mlxcpld_volatile_reg(struct device *dev, unsigned int reg) case MLXPLAT_CPLD_LPC_REG_PSU_OFFSET: case MLXPLAT_CPLD_LPC_REG_PSU_EVENT_OFFSET: case MLXPLAT_CPLD_LPC_REG_PSU_MASK_OFFSET: + case MLXPLAT_CPLD_LPC_REG_PSU_AC_OFFSET: case MLXPLAT_CPLD_LPC_REG_PWR_OFFSET: case MLXPLAT_CPLD_LPC_REG_PWR_EVENT_OFFSET: case MLXPLAT_CPLD_LPC_REG_PWR_MASK_OFFSET: + case MLXPLAT_CPLD_LPC_REG_PSU_ALERT_OFFSET: case MLXPLAT_CPLD_LPC_REG_FAN_OFFSET: case MLXPLAT_CPLD_LPC_REG_FAN_EVENT_OFFSET: case MLXPLAT_CPLD_LPC_REG_FAN_MASK_OFFSET: @@ -5370,6 +6748,13 @@ static bool mlxplat_mlxcpld_volatile_reg(struct device *dev, unsigned int reg) case MLXPLAT_CPLD_LPC_REG_TACHO12_OFFSET: case MLXPLAT_CPLD_LPC_REG_TACHO13_OFFSET: case MLXPLAT_CPLD_LPC_REG_TACHO14_OFFSET: + case MLXPLAT_CPLD_LPC_REG_TACHO15_OFFSET: + case MLXPLAT_CPLD_LPC_REG_TACHO16_OFFSET: + case MLXPLAT_CPLD_LPC_REG_TACHO17_OFFSET: + case MLXPLAT_CPLD_LPC_REG_TACHO18_OFFSET: + case MLXPLAT_CPLD_LPC_REG_TACHO19_OFFSET: + case MLXPLAT_CPLD_LPC_REG_TACHO20_OFFSET: + case MLXPLAT_CPLD_LPC_REG_ASIC_CAP_OFFSET: case MLXPLAT_CPLD_LPC_REG_PWM_CONTROL_OFFSET: case MLXPLAT_CPLD_LPC_REG_FAN_CAP1_OFFSET: case MLXPLAT_CPLD_LPC_REG_FAN_CAP2_OFFSET: @@ -5431,6 +6816,15 @@ static const struct reg_default mlxplat_mlxcpld_regmap_eth_modular[] = { MLXPLAT_CPLD_AGGR_MASK_LC_LOW }, }; +static const struct reg_default mlxplat_mlxcpld_regmap_smart_switch[] = { + { MLXPLAT_CPLD_LPC_REG_PWM_CONTROL_OFFSET, 0x00 }, + { MLXPLAT_CPLD_LPC_REG_WD1_ACT_OFFSET, 0x00 }, + { MLXPLAT_CPLD_LPC_REG_WD2_ACT_OFFSET, 0x00 }, + { MLXPLAT_CPLD_LPC_REG_WD3_ACT_OFFSET, 0x00 }, + { MLXPLAT_CPLD_LPC_REG_AGGRCX_MASK_OFFSET, + MLXPLAT_CPLD_LPC_SM_SW_MASK }, +}; + struct mlxplat_mlxcpld_regmap_context { void __iomem *base; }; @@ -5539,6 +6933,20 @@ static const struct regmap_config mlxplat_mlxcpld_regmap_config_eth_modular = { .reg_write = mlxplat_mlxcpld_reg_write, }; +static const struct regmap_config mlxplat_mlxcpld_regmap_config_smart_switch = { + .reg_bits = 8, + .val_bits = 8, + .max_register = 255, + .cache_type = REGCACHE_FLAT, + .writeable_reg = mlxplat_mlxcpld_writeable_reg, + .readable_reg = mlxplat_mlxcpld_readable_reg, + .volatile_reg = mlxplat_mlxcpld_volatile_reg, + .reg_defaults = mlxplat_mlxcpld_regmap_smart_switch, + .num_reg_defaults = ARRAY_SIZE(mlxplat_mlxcpld_regmap_smart_switch), + .reg_read = mlxplat_mlxcpld_reg_read, + .reg_write = mlxplat_mlxcpld_reg_write, +}; + static struct resource mlxplat_mlxcpld_resources[] = { [0] = DEFINE_RES_IRQ_NAMED(MLXPLAT_CPLD_LPC_SYSIRQ, "mlxreg-hotplug"), }; @@ -5550,6 +6958,7 @@ static struct mlxreg_core_platform_data *mlxplat_regs_io; static struct mlxreg_core_platform_data *mlxplat_fan; static struct mlxreg_core_platform_data *mlxplat_wd_data[MLXPLAT_CPLD_WD_MAX_DEVS]; +static struct mlxreg_core_data *mlxplat_dpu_data[MLXPLAT_CPLD_DPU_MAX_DEVS]; static const struct regmap_config *mlxplat_regmap_config; static struct pci_dev *lpc_bridge; static struct pci_dev *i2c_bridge; @@ -5921,6 +7330,29 @@ static int __init mlxplat_dmi_l1_switch_matched(const struct dmi_system_id *dmi) return mlxplat_register_platform_device(); } +static int __init mlxplat_dmi_smart_switch_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_ng800_mux_data); + mlxplat_mux_data = mlxplat_ng800_mux_data; + mlxplat_hotplug = &mlxplat_mlxcpld_smart_switch_data; + mlxplat_hotplug->deferred_nr = + mlxplat_msn21xx_channels[MLXPLAT_CPLD_GRP_CHNL_NUM - 1]; + mlxplat_led = &mlxplat_xdr_led_data; + mlxplat_regs_io = &mlxplat_smart_switch_regs_io_data; + mlxplat_fan = &mlxplat_xdr_fan_data; + for (i = 0; i < ARRAY_SIZE(mlxplat_mlxcpld_wd_set_type2); i++) + mlxplat_wd_data[i] = &mlxplat_mlxcpld_wd_set_type2[i]; + for (i = 0; i < ARRAY_SIZE(mlxplat_mlxcpld_smart_switch_dpu_data); i++) + mlxplat_dpu_data[i] = &mlxplat_mlxcpld_smart_switch_dpu_data[i]; + mlxplat_i2c = &mlxplat_mlxcpld_i2c_ng_data; + mlxplat_regmap_config = &mlxplat_mlxcpld_regmap_config_smart_switch; + + return mlxplat_register_platform_device(); +} + static const struct dmi_system_id mlxplat_dmi_table[] __initconst = { { .callback = mlxplat_dmi_default_wc_matched, @@ -6015,6 +7447,12 @@ static const struct dmi_system_id mlxplat_dmi_table[] __initconst = { DMI_MATCH(DMI_BOARD_NAME, "VMOD0017"), }, }, + { + .callback = mlxplat_dmi_smart_switch_matched, + .matches = { + DMI_MATCH(DMI_BOARD_NAME, "VMOD0019"), + }, + }, { .callback = mlxplat_dmi_msn274x_matched, .matches = { @@ -6390,8 +7828,25 @@ static int mlxplat_platdevs_init(struct mlxplat_priv *priv) } } + /* Add DPU drivers. */ + for (i = 0; i < MLXPLAT_CPLD_DPU_MAX_DEVS; i++) { + if (mlxplat_dpu_data[i]) { + priv->pdev_dpu[i] = + platform_device_register_resndata(&mlxplat_dev->dev, "mlxreg-dpu", + i, NULL, 0, mlxplat_dpu_data[i], + sizeof(*mlxplat_dpu_data[i])); + if (IS_ERR(priv->pdev_dpu[i])) { + err = PTR_ERR(priv->pdev_dpu[i]); + goto fail_platform_dpu_register; + } + } + } + return 0; +fail_platform_dpu_register: + while (--i >= 0) + platform_device_unregister(priv->pdev_dpu[i]); fail_platform_wd_register: while (--i >= 0) platform_device_unregister(priv->pdev_wd[i]); @@ -6412,6 +7867,8 @@ static void mlxplat_platdevs_exit(struct mlxplat_priv *priv) { int i; + for (i = MLXPLAT_CPLD_DPU_MAX_DEVS - 1; i >= 0 ; i--) + platform_device_unregister(priv->pdev_dpu[i]); for (i = MLXPLAT_CPLD_WD_MAX_DEVS - 1; i >= 0 ; i--) platform_device_unregister(priv->pdev_wd[i]); if (priv->pdev_fan)