hwmon: (intel-m10-bmc-hwmon) add sensor support of Intel D5005 card

Like the Intel N3000 card, the Intel D5005 has a MAX10 based
BMC.  This commit adds support for the D5005 sensors that are
monitored by the MAX10 BMC.

Signed-off-by: Matthew Gerlach <matthew.gerlach@linux.intel.com>
Signed-off-by: Russ Weight <russell.h.weight@linux.intel.com>
Acked-by: Lee Jones <lee.jones@linaro.org>
Reviewed-by: Tom Rix <trix@redhat.com>
Link: https://lore.kernel.org/r/20210413225835.459662-3-matthew.gerlach@linux.intel.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>

diff --git a/drivers/hwmon/intel-m10-bmc-hwmon.c b/drivers/hwmon/intel-m10-bmc-hwmon.c
index 17d5e6b91c8a62d9ed6604a7be3d42063a711bd9..bd7ed2ed3a1e63e6912f5febddd146476e670382 100644 (file)
--- a/drivers/hwmon/intel-m10-bmc-hwmon.c
+++ b/drivers/hwmon/intel-m10-bmc-hwmon.c
@@ -99,6 +99,50 @@ static const struct hwmon_channel_info *n3000bmc_hinfo[] = {
        NULL
 };
 
+static const struct m10bmc_sdata d5005bmc_temp_tbl[] = {
+       { 0x100, 0x104, 0x108, 0x10c, 0x0, 500, "Board Inlet Air Temperature" },
+       { 0x110, 0x114, 0x118, 0x0, 0x0, 500, "FPGA Core Temperature" },
+       { 0x11c, 0x120, 0x124, 0x128, 0x0, 500, "Board Exhaust Air Temperature" },
+       { 0x12c, 0x130, 0x134, 0x0, 0x0, 500, "FPGA Transceiver Temperature" },
+       { 0x138, 0x13c, 0x140, 0x144, 0x0, 500, "RDIMM0 Temperature" },
+       { 0x148, 0x14c, 0x150, 0x154, 0x0, 500, "RDIMM1 Temperature" },
+       { 0x158, 0x15c, 0x160, 0x164, 0x0, 500, "RDIMM2 Temperature" },
+       { 0x168, 0x16c, 0x170, 0x174, 0x0, 500, "RDIMM3 Temperature" },
+       { 0x178, 0x17c, 0x180, 0x0, 0x0, 500, "QSFP0 Temperature" },
+       { 0x188, 0x18c, 0x190, 0x0, 0x0, 500, "QSFP1 Temperature" },
+       { 0x1a0, 0x1a4, 0x1a8, 0x0, 0x0, 500, "3.3v Temperature" },
+       { 0x1bc, 0x1c0, 0x1c4, 0x0, 0x0, 500, "VCCERAM Temperature" },
+       { 0x1d8, 0x1dc, 0x1e0, 0x0, 0x0, 500, "VCCR Temperature" },
+       { 0x1f4, 0x1f8, 0x1fc, 0x0, 0x0, 500, "VCCT Temperature" },
+       { 0x210, 0x214, 0x218, 0x0, 0x0, 500, "1.8v Temperature" },
+       { 0x22c, 0x230, 0x234, 0x0, 0x0, 500, "12v Backplane Temperature" },
+       { 0x248, 0x24c, 0x250, 0x0, 0x0, 500, "12v AUX Temperature" },
+};
+
+static const struct m10bmc_sdata d5005bmc_in_tbl[] = {
+       { 0x184, 0x0, 0x0, 0x0, 0x0, 1, "QSFP0 Supply Voltage" },
+       { 0x194, 0x0, 0x0, 0x0, 0x0, 1, "QSFP1 Supply Voltage" },
+       { 0x198, 0x0, 0x0, 0x0, 0x0, 1, "FPGA Core Voltage" },
+       { 0x1ac, 0x1b0, 0x1b4, 0x0, 0x0, 1, "3.3v Voltage" },
+       { 0x1c8, 0x1cc, 0x1d0, 0x0, 0x0, 1, "VCCERAM Voltage" },
+       { 0x1e4, 0x1e8, 0x1ec, 0x0, 0x0, 1, "VCCR Voltage" },
+       { 0x200, 0x204, 0x208, 0x0, 0x0, 1, "VCCT Voltage" },
+       { 0x21c, 0x220, 0x224, 0x0, 0x0, 1, "1.8v Voltage" },
+       { 0x238, 0x0, 0x0, 0x0, 0x23c, 1, "12v Backplane Voltage" },
+       { 0x254, 0x0, 0x0, 0x0, 0x258, 1, "12v AUX Voltage" },
+};
+
+static const struct m10bmc_sdata d5005bmc_curr_tbl[] = {
+       { 0x19c, 0x0, 0x0, 0x0, 0x0, 1, "FPGA Core Current" },
+       { 0x1b8, 0x0, 0x0, 0x0, 0x0, 1, "3.3v Current" },
+       { 0x1d4, 0x0, 0x0, 0x0, 0x0, 1, "VCCERAM Current" },
+       { 0x1f0, 0x0, 0x0, 0x0, 0x0, 1, "VCCR Current" },
+       { 0x20c, 0x0, 0x0, 0x0, 0x0, 1, "VCCT Current" },
+       { 0x228, 0x0, 0x0, 0x0, 0x0, 1, "1.8v Current" },
+       { 0x240, 0x244, 0x0, 0x0, 0x0, 1, "12v Backplane Current" },
+       { 0x25c, 0x260, 0x0, 0x0, 0x0, 1, "12v AUX Current" },
+};
+
 static const struct m10bmc_hwmon_board_data n3000bmc_hwmon_bdata = {
        .tables = {
                [hwmon_temp] = n3000bmc_temp_tbl,
@@ -110,6 +154,80 @@ static const struct m10bmc_hwmon_board_data n3000bmc_hwmon_bdata = {
        .hinfo = n3000bmc_hinfo,
 };
 
+static const struct hwmon_channel_info *d5005bmc_hinfo[] = {
+       HWMON_CHANNEL_INFO(temp,
+                          HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_MAX_HYST |
+                          HWMON_T_CRIT | HWMON_T_CRIT_HYST | HWMON_T_LABEL,
+                          HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_CRIT |
+                          HWMON_T_LABEL,
+                          HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_MAX_HYST |
+                          HWMON_T_CRIT | HWMON_T_CRIT_HYST | HWMON_T_LABEL,
+                          HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_CRIT |
+                          HWMON_T_LABEL,
+                          HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_MAX_HYST |
+                          HWMON_T_CRIT | HWMON_T_CRIT_HYST | HWMON_T_LABEL,
+                          HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_MAX_HYST |
+                          HWMON_T_CRIT | HWMON_T_CRIT_HYST | HWMON_T_LABEL,
+                          HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_MAX_HYST |
+                          HWMON_T_CRIT | HWMON_T_CRIT_HYST | HWMON_T_LABEL,
+                          HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_MAX_HYST |
+                          HWMON_T_CRIT | HWMON_T_CRIT_HYST | HWMON_T_LABEL,
+                          HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_CRIT |
+                          HWMON_T_LABEL,
+                          HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_CRIT |
+                          HWMON_T_LABEL,
+                          HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_CRIT |
+                          HWMON_T_LABEL,
+                          HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_CRIT |
+                          HWMON_T_LABEL,
+                          HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_CRIT |
+                          HWMON_T_LABEL,
+                          HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_CRIT |
+                          HWMON_T_LABEL,
+                          HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_CRIT |
+                          HWMON_T_LABEL,
+                          HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_CRIT |
+                          HWMON_T_LABEL,
+                          HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_CRIT |
+                          HWMON_T_LABEL),
+       HWMON_CHANNEL_INFO(in,
+                          HWMON_I_INPUT | HWMON_I_LABEL,
+                          HWMON_I_INPUT | HWMON_I_LABEL,
+                          HWMON_I_INPUT | HWMON_I_LABEL,
+                          HWMON_I_INPUT | HWMON_I_MAX | HWMON_I_CRIT |
+                          HWMON_I_LABEL,
+                          HWMON_I_INPUT | HWMON_I_MAX | HWMON_I_CRIT |
+                          HWMON_I_LABEL,
+                          HWMON_I_INPUT | HWMON_I_MAX | HWMON_I_CRIT |
+                          HWMON_I_LABEL,
+                          HWMON_I_INPUT | HWMON_I_MAX | HWMON_I_CRIT |
+                          HWMON_I_LABEL,
+                          HWMON_I_INPUT | HWMON_I_MAX | HWMON_I_CRIT |
+                          HWMON_I_LABEL,
+                          HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_LABEL,
+                          HWMON_I_INPUT | HWMON_I_MIN | HWMON_I_LABEL),
+       HWMON_CHANNEL_INFO(curr,
+                          HWMON_C_INPUT | HWMON_C_LABEL,
+                          HWMON_C_INPUT | HWMON_C_LABEL,
+                          HWMON_C_INPUT | HWMON_C_LABEL,
+                          HWMON_C_INPUT | HWMON_C_LABEL,
+                          HWMON_C_INPUT | HWMON_C_LABEL,
+                          HWMON_C_INPUT | HWMON_C_LABEL,
+                          HWMON_C_INPUT | HWMON_C_MAX | HWMON_C_LABEL,
+                          HWMON_C_INPUT | HWMON_C_MAX | HWMON_C_LABEL),
+       NULL
+};
+
+static const struct m10bmc_hwmon_board_data d5005bmc_hwmon_bdata = {
+       .tables = {
+               [hwmon_temp] = d5005bmc_temp_tbl,
+               [hwmon_in] = d5005bmc_in_tbl,
+               [hwmon_curr] = d5005bmc_curr_tbl,
+       },
+
+       .hinfo = d5005bmc_hinfo,
+};
+
 static umode_t
 m10bmc_hwmon_is_visible(const void *data, enum hwmon_sensor_types type,
                        u32 attr, int channel)
@@ -316,6 +434,10 @@ static const struct platform_device_id intel_m10bmc_hwmon_ids[] = {
                .name = "n3000bmc-hwmon",
                .driver_data = (unsigned long)&n3000bmc_hwmon_bdata,
        },
+       {
+               .name = "d5005bmc-hwmon",
+               .driver_data = (unsigned long)&d5005bmc_hwmon_bdata,
+       },
        { }
 };
 

diff --git a/drivers/mfd/intel-m10-bmc.c b/drivers/mfd/intel-m10-bmc.c
index 06c977519479ac3b1bb941f873e81c30d9cb4445..cb538983246cbf13095099f02c6d5690c62a096f 100644 (file)
--- a/drivers/mfd/intel-m10-bmc.c
+++ b/drivers/mfd/intel-m10-bmc.c
@@ -15,6 +15,11 @@
 
 enum m10bmc_type {
        M10_N3000,
+       M10_D5005
+};
+
+static struct mfd_cell m10bmc_d5005_subdevs[] = {
+       { .name = "d5005bmc-hwmon" },
 };
 
 static struct mfd_cell m10bmc_pacn3000_subdevs[] = {
@@ -173,6 +178,10 @@ static int intel_m10_bmc_spi_probe(struct spi_device *spi)
                cells = m10bmc_pacn3000_subdevs;
                n_cell = ARRAY_SIZE(m10bmc_pacn3000_subdevs);
                break;
+       case M10_D5005:
+               cells = m10bmc_d5005_subdevs;
+               n_cell = ARRAY_SIZE(m10bmc_d5005_subdevs);
+               break;
        default:
                return -ENODEV;
        }
@@ -187,6 +196,7 @@ static int intel_m10_bmc_spi_probe(struct spi_device *spi)
 
 static const struct spi_device_id m10bmc_spi_id[] = {
        { "m10-n3000", M10_N3000 },
+       { "m10-d5005", M10_D5005 },
        { }
 };
 MODULE_DEVICE_TABLE(spi, m10bmc_spi_id);