From: Martin Hundebøll <[email protected]>
This is an initial set of patches for the Silciom N5010 programmable
accelerated card adding support for reading out sensors.
Based on v5.13
Changes since v2:
* Removed patch 1/5 from v2 already in fpga/for-next
* Reworded commit message in patch 1/4 as per Hao's suggestion
* Added Yilun's Reviewed-by to patch 3/4 and 4/4
* Added Moritz' Acked-by to patch 3/4
* Added Moritz' Reviewed-by to patch 4/4
* Added Guenter's Reviewed-by to patch 4/4
Changes since v1:
* Commit message in patch 1 is updated with card description
* Added Hao's Acked-by to patch 1
* Patch 2 is replaced with a new patch to carry feature revision info
in struct dfl_device
* Patch 3 is updated to use feature revision from struct dfl_device
* Patch 4 from v0 is split into separate patches for hwmon and mfd
Martin Hundebøll (4):
fpga: dfl: expose feature revision from struct dfl_device
spi: spi-altera-dfl: support n5010 feature revision
mfd: intel-m10-bmc: add n5010 variant
hwmon: intel-m10-bmc-hwmon: add n5010 sensors
drivers/fpga/dfl.c | 27 ++++---
drivers/fpga/dfl.h | 1 +
drivers/hwmon/intel-m10-bmc-hwmon.c | 116 ++++++++++++++++++++++++++++
drivers/mfd/intel-m10-bmc.c | 12 ++-
drivers/spi/spi-altera-dfl.c | 15 +++-
include/linux/dfl.h | 1 +
6 files changed, 159 insertions(+), 13 deletions(-)
--
2.31.0
From: Martin Hundebøll <[email protected]>
DFL device drivers have a common need for checking feature revision
information from the DFL header, as well as other common DFL information
like the already exposed feature id and type.
This patch exposes the feature revision information directly via the DFL
device data structure.
Since the DFL core code has already read the DFL header, this this patch
saves additional mmio reads from DFL device drivers too.
Signed-off-by: Martin Hundebøll <[email protected]>
---
Changes since v2:
* Reworded commit message as per Hao's suggestion
Changes since v1:
* This patch replaces the previous patch 2 and exposes the feature
revision through struct dfl_device instead of a helper reading from
io-mem
drivers/fpga/dfl.c | 27 +++++++++++++++++----------
drivers/fpga/dfl.h | 1 +
include/linux/dfl.h | 1 +
3 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/drivers/fpga/dfl.c b/drivers/fpga/dfl.c
index 511b20ff35a3..9381c579d1cd 100644
--- a/drivers/fpga/dfl.c
+++ b/drivers/fpga/dfl.c
@@ -381,6 +381,7 @@ dfl_dev_add(struct dfl_feature_platform_data *pdata,
ddev->type = feature_dev_id_type(pdev);
ddev->feature_id = feature->id;
+ ddev->revision = feature->revision;
ddev->cdev = pdata->dfl_cdev;
/* add mmio resource */
@@ -717,6 +718,7 @@ struct build_feature_devs_info {
*/
struct dfl_feature_info {
u16 fid;
+ u8 rev;
struct resource mmio_res;
void __iomem *ioaddr;
struct list_head node;
@@ -796,6 +798,7 @@ static int build_info_commit_dev(struct build_feature_devs_info *binfo)
/* save resource information for each feature */
feature->dev = fdev;
feature->id = finfo->fid;
+ feature->revision = finfo->rev;
/*
* the FIU header feature has some fundamental functions (sriov
@@ -910,19 +913,17 @@ static void build_info_free(struct build_feature_devs_info *binfo)
devm_kfree(binfo->dev, binfo);
}
-static inline u32 feature_size(void __iomem *start)
+static inline u32 feature_size(u64 value)
{
- u64 v = readq(start + DFH);
- u32 ofst = FIELD_GET(DFH_NEXT_HDR_OFST, v);
+ u32 ofst = FIELD_GET(DFH_NEXT_HDR_OFST, value);
/* workaround for private features with invalid size, use 4K instead */
return ofst ? ofst : 4096;
}
-static u16 feature_id(void __iomem *start)
+static u16 feature_id(u64 value)
{
- u64 v = readq(start + DFH);
- u16 id = FIELD_GET(DFH_ID, v);
- u8 type = FIELD_GET(DFH_TYPE, v);
+ u16 id = FIELD_GET(DFH_ID, value);
+ u8 type = FIELD_GET(DFH_TYPE, value);
if (type == DFH_TYPE_FIU)
return FEATURE_ID_FIU_HEADER;
@@ -1021,10 +1022,15 @@ create_feature_instance(struct build_feature_devs_info *binfo,
unsigned int irq_base, nr_irqs;
struct dfl_feature_info *finfo;
int ret;
+ u8 rev;
+ u64 v;
+
+ v = readq(binfo->ioaddr + ofst);
+ rev = FIELD_GET(DFH_REVISION, v);
/* read feature size and id if inputs are invalid */
- size = size ? size : feature_size(binfo->ioaddr + ofst);
- fid = fid ? fid : feature_id(binfo->ioaddr + ofst);
+ size = size ? size : feature_size(v);
+ fid = fid ? fid : feature_id(v);
if (binfo->len - ofst < size)
return -EINVAL;
@@ -1038,6 +1044,7 @@ create_feature_instance(struct build_feature_devs_info *binfo,
return -ENOMEM;
finfo->fid = fid;
+ finfo->rev = rev;
finfo->mmio_res.start = binfo->start + ofst;
finfo->mmio_res.end = finfo->mmio_res.start + size - 1;
finfo->mmio_res.flags = IORESOURCE_MEM;
@@ -1166,7 +1173,7 @@ static int parse_feature_private(struct build_feature_devs_info *binfo,
{
if (!is_feature_dev_detected(binfo)) {
dev_err(binfo->dev, "the private feature 0x%x does not belong to any AFU.\n",
- feature_id(binfo->ioaddr + ofst));
+ feature_id(readq(binfo->ioaddr + ofst)));
return -EINVAL;
}
diff --git a/drivers/fpga/dfl.h b/drivers/fpga/dfl.h
index 2b82c96ba56c..422157cfd742 100644
--- a/drivers/fpga/dfl.h
+++ b/drivers/fpga/dfl.h
@@ -243,6 +243,7 @@ struct dfl_feature_irq_ctx {
struct dfl_feature {
struct platform_device *dev;
u16 id;
+ u8 revision;
int resource_index;
void __iomem *ioaddr;
struct dfl_feature_irq_ctx *irq_ctx;
diff --git a/include/linux/dfl.h b/include/linux/dfl.h
index 6cc10982351a..431636a0dc78 100644
--- a/include/linux/dfl.h
+++ b/include/linux/dfl.h
@@ -38,6 +38,7 @@ struct dfl_device {
int id;
u16 type;
u16 feature_id;
+ u8 revision;
struct resource mmio_res;
int *irqs;
unsigned int num_irqs;
--
2.31.0
From: Martin Hundebøll <[email protected]>
The m10-bmc is used on the Silicom N5010 PAC too, so add it to list of
m10bmc types.
Signed-off-by: Martin Hundebøll <[email protected]>
Acked-by: Moritz Fischer <[email protected]>
Reviewed-by: Xu Yilun <[email protected]>
---
Changes since v2:
* Added Yilun's Reviewed-by
* Added Moritz' Acked-by
Changes since v1:
* Patch split out to separate mfd changes
drivers/mfd/intel-m10-bmc.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/drivers/mfd/intel-m10-bmc.c b/drivers/mfd/intel-m10-bmc.c
index 1a9bfb7f48cd..8db3bcf5fccc 100644
--- a/drivers/mfd/intel-m10-bmc.c
+++ b/drivers/mfd/intel-m10-bmc.c
@@ -15,7 +15,8 @@
enum m10bmc_type {
M10_N3000,
- M10_D5005
+ M10_D5005,
+ M10_N5010,
};
static struct mfd_cell m10bmc_d5005_subdevs[] = {
@@ -28,6 +29,10 @@ static struct mfd_cell m10bmc_pacn3000_subdevs[] = {
{ .name = "n3000bmc-secure" },
};
+static struct mfd_cell m10bmc_n5010_subdevs[] = {
+ { .name = "n5010bmc-hwmon" },
+};
+
static const struct regmap_range m10bmc_regmap_range[] = {
regmap_reg_range(M10BMC_LEGACY_BUILD_VER, M10BMC_LEGACY_BUILD_VER),
regmap_reg_range(M10BMC_SYS_BASE, M10BMC_SYS_END),
@@ -192,6 +197,10 @@ static int intel_m10_bmc_spi_probe(struct spi_device *spi)
cells = m10bmc_d5005_subdevs;
n_cell = ARRAY_SIZE(m10bmc_d5005_subdevs);
break;
+ case M10_N5010:
+ cells = m10bmc_n5010_subdevs;
+ n_cell = ARRAY_SIZE(m10bmc_n5010_subdevs);
+ break;
default:
return -ENODEV;
}
@@ -207,6 +216,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 },
+ { "m10-n5010", M10_N5010 },
{ }
};
MODULE_DEVICE_TABLE(spi, m10bmc_spi_id);
--
2.31.0
From: Martin Hundebøll <[email protected]>
Add the list of sensors supported by the Silicom n5010 PAC, and enable
the drivers as a subtype of the intel-m10-bmc multi-function driver.
Signed-off-by: Martin Hundebøll <[email protected]>
Reviewed-by: Guenter Roeck <[email protected]>
Reviewed-by: Moritz Fischer <[email protected]>
Reviewed-by: Xu Yilun <[email protected]>
---
Changes since v2:
* Added Yilun's Reviewed-by
* Added Moritz' Reviewed-by
* Added Guenter's Reviewed-by
Changes since v1:
* Patch split out to separate hwmon changes
drivers/hwmon/intel-m10-bmc-hwmon.c | 116 ++++++++++++++++++++++++++++
1 file changed, 116 insertions(+)
diff --git a/drivers/hwmon/intel-m10-bmc-hwmon.c b/drivers/hwmon/intel-m10-bmc-hwmon.c
index bd7ed2ed3a1e..7a08e4c44a4b 100644
--- a/drivers/hwmon/intel-m10-bmc-hwmon.c
+++ b/drivers/hwmon/intel-m10-bmc-hwmon.c
@@ -228,6 +228,118 @@ static const struct m10bmc_hwmon_board_data d5005bmc_hwmon_bdata = {
.hinfo = d5005bmc_hinfo,
};
+static const struct m10bmc_sdata n5010bmc_temp_tbl[] = {
+ { 0x100, 0x0, 0x104, 0x0, 0x0, 1000, "Board Local Temperature" },
+ { 0x108, 0x0, 0x10c, 0x0, 0x0, 1000, "FPGA 1 Temperature" },
+ { 0x110, 0x0, 0x114, 0x0, 0x0, 1000, "FPGA 2 Temperature" },
+ { 0x118, 0x0, 0x0, 0x0, 0x0, 1000, "Card Top Temperature" },
+ { 0x11c, 0x0, 0x0, 0x0, 0x0, 1000, "Card Bottom Temperature" },
+ { 0x128, 0x0, 0x0, 0x0, 0x0, 1000, "FPGA 1.2V Temperature" },
+ { 0x134, 0x0, 0x0, 0x0, 0x0, 1000, "FPGA 5V Temperature" },
+ { 0x140, 0x0, 0x0, 0x0, 0x0, 1000, "FPGA 0.9V Temperature" },
+ { 0x14c, 0x0, 0x0, 0x0, 0x0, 1000, "FPGA 0.85V Temperature" },
+ { 0x158, 0x0, 0x0, 0x0, 0x0, 1000, "AUX 12V Temperature" },
+ { 0x164, 0x0, 0x0, 0x0, 0x0, 1000, "Backplane 12V Temperature" },
+ { 0x1a8, 0x0, 0x0, 0x0, 0x0, 1000, "QSFP28-1 Temperature" },
+ { 0x1ac, 0x0, 0x0, 0x0, 0x0, 1000, "QSFP28-2 Temperature" },
+ { 0x1b0, 0x0, 0x0, 0x0, 0x0, 1000, "QSFP28-3 Temperature" },
+ { 0x1b4, 0x0, 0x0, 0x0, 0x0, 1000, "QSFP28-4 Temperature" },
+ { 0x1b8, 0x0, 0x0, 0x0, 0x0, 1000, "CVL1 Internal Temperature" },
+ { 0x1bc, 0x0, 0x0, 0x0, 0x0, 1000, "CVL2 Internal Temperature" },
+};
+
+static const struct m10bmc_sdata n5010bmc_in_tbl[] = {
+ { 0x120, 0x0, 0x0, 0x0, 0x0, 1, "FPGA 1.2V Voltage" },
+ { 0x12c, 0x0, 0x0, 0x0, 0x0, 1, "FPGA 5V Voltage" },
+ { 0x138, 0x0, 0x0, 0x0, 0x0, 1, "FPGA 0.9V Voltage" },
+ { 0x144, 0x0, 0x0, 0x0, 0x0, 1, "FPGA 0.85V Voltage" },
+ { 0x150, 0x0, 0x0, 0x0, 0x0, 1, "AUX 12V Voltage" },
+ { 0x15c, 0x0, 0x0, 0x0, 0x0, 1, "Backplane 12V Voltage" },
+ { 0x16c, 0x0, 0x0, 0x0, 0x0, 1, "DDR4 1.2V Voltage" },
+ { 0x17c, 0x0, 0x0, 0x0, 0x0, 1, "FPGA 1.8V Voltage" },
+ { 0x184, 0x0, 0x0, 0x0, 0x0, 1, "QDR 1.3V Voltage" },
+ { 0x18c, 0x0, 0x0, 0x0, 0x0, 1, "CVL1 0.8V Voltage" },
+ { 0x194, 0x0, 0x0, 0x0, 0x0, 1, "CVL1 1.05V Voltage" },
+ { 0x19c, 0x0, 0x0, 0x0, 0x0, 1, "CVL2 1.05V Voltage" },
+ { 0x1a4, 0x0, 0x0, 0x0, 0x0, 1, "CVL2 0.8V Voltage" },
+};
+
+static const struct m10bmc_sdata n5010bmc_curr_tbl[] = {
+ { 0x124, 0x0, 0x0, 0x0, 0x0, 1, "FPGA 1.2V Current" },
+ { 0x130, 0x0, 0x0, 0x0, 0x0, 1, "FPGA 5V Current" },
+ { 0x13c, 0x0, 0x0, 0x0, 0x0, 1, "FPGA 0.9V Current" },
+ { 0x148, 0x0, 0x0, 0x0, 0x0, 1, "FPGA 0.85V Current" },
+ { 0x154, 0x0, 0x0, 0x0, 0x0, 1, "AUX 12V Current" },
+ { 0x160, 0x0, 0x0, 0x0, 0x0, 1, "Backplane 12V Current" },
+ { 0x168, 0x0, 0x0, 0x0, 0x0, 1, "DDR4 1.2V Current" },
+ { 0x178, 0x0, 0x0, 0x0, 0x0, 1, "FPGA 1.8V Current" },
+ { 0x180, 0x0, 0x0, 0x0, 0x0, 1, "QDR 1.3V Current" },
+ { 0x188, 0x0, 0x0, 0x0, 0x0, 1, "CVL1 0.8V Current" },
+ { 0x190, 0x0, 0x0, 0x0, 0x0, 1, "CVL1 1.05V Current" },
+ { 0x198, 0x0, 0x0, 0x0, 0x0, 1, "CVL2 1.05V Current" },
+ { 0x1a0, 0x0, 0x0, 0x0, 0x0, 1, "CVL2 0.8V Current" },
+};
+
+static const struct hwmon_channel_info *n5010bmc_hinfo[] = {
+ HWMON_CHANNEL_INFO(temp,
+ HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_LABEL,
+ HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_LABEL,
+ HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_LABEL,
+ HWMON_T_INPUT | HWMON_T_LABEL,
+ HWMON_T_INPUT | HWMON_T_LABEL,
+ HWMON_T_INPUT | HWMON_T_LABEL,
+ HWMON_T_INPUT | HWMON_T_LABEL,
+ HWMON_T_INPUT | HWMON_T_LABEL,
+ HWMON_T_INPUT | HWMON_T_LABEL,
+ HWMON_T_INPUT | HWMON_T_LABEL,
+ HWMON_T_INPUT | HWMON_T_LABEL,
+ HWMON_T_INPUT | HWMON_T_LABEL,
+ HWMON_T_INPUT | HWMON_T_LABEL,
+ HWMON_T_INPUT | HWMON_T_LABEL,
+ HWMON_T_INPUT | HWMON_T_LABEL,
+ HWMON_T_INPUT | HWMON_T_LABEL,
+ HWMON_T_INPUT | 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_LABEL,
+ HWMON_I_INPUT | HWMON_I_LABEL,
+ HWMON_I_INPUT | HWMON_I_LABEL,
+ HWMON_I_INPUT | HWMON_I_LABEL,
+ HWMON_I_INPUT | HWMON_I_LABEL,
+ HWMON_I_INPUT | HWMON_I_LABEL,
+ HWMON_I_INPUT | HWMON_I_LABEL,
+ HWMON_I_INPUT | HWMON_I_LABEL,
+ HWMON_I_INPUT | HWMON_I_LABEL,
+ HWMON_I_INPUT | 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_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_LABEL),
+ NULL
+};
+
+static const struct m10bmc_hwmon_board_data n5010bmc_hwmon_bdata = {
+ .tables = {
+ [hwmon_temp] = n5010bmc_temp_tbl,
+ [hwmon_in] = n5010bmc_in_tbl,
+ [hwmon_curr] = n5010bmc_curr_tbl,
+ },
+
+ .hinfo = n5010bmc_hinfo,
+};
+
static umode_t
m10bmc_hwmon_is_visible(const void *data, enum hwmon_sensor_types type,
u32 attr, int channel)
@@ -438,6 +550,10 @@ static const struct platform_device_id intel_m10bmc_hwmon_ids[] = {
.name = "d5005bmc-hwmon",
.driver_data = (unsigned long)&d5005bmc_hwmon_bdata,
},
+ {
+ .name = "n5010bmc-hwmon",
+ .driver_data = (unsigned long)&n5010bmc_hwmon_bdata,
+ },
{ }
};
--
2.31.0
> Subject: [PATCH v3 1/4] fpga: dfl: expose feature revision from struct dfl_device
>
> From: Martin Hundebøll <[email protected]>
>
> DFL device drivers have a common need for checking feature revision
> information from the DFL header, as well as other common DFL information
> like the already exposed feature id and type.
>
> This patch exposes the feature revision information directly via the DFL
> device data structure.
>
> Since the DFL core code has already read the DFL header, this this patch
> saves additional mmio reads from DFL device drivers too.
>
> Signed-off-by: Martin Hundebøll <[email protected]>
Acked-by: Wu Hao <[email protected]>
Thanks!
Hao
> ---
>
> Changes since v2:
> * Reworded commit message as per Hao's suggestion
>
> Changes since v1:
> * This patch replaces the previous patch 2 and exposes the feature
> revision through struct dfl_device instead of a helper reading from
> io-mem
>
> drivers/fpga/dfl.c | 27 +++++++++++++++++----------
> drivers/fpga/dfl.h | 1 +
> include/linux/dfl.h | 1 +
> 3 files changed, 19 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/fpga/dfl.c b/drivers/fpga/dfl.c
> index 511b20ff35a3..9381c579d1cd 100644
> --- a/drivers/fpga/dfl.c
> +++ b/drivers/fpga/dfl.c
> @@ -381,6 +381,7 @@ dfl_dev_add(struct dfl_feature_platform_data *pdata,
>
> ddev->type = feature_dev_id_type(pdev);
> ddev->feature_id = feature->id;
> + ddev->revision = feature->revision;
> ddev->cdev = pdata->dfl_cdev;
>
> /* add mmio resource */
> @@ -717,6 +718,7 @@ struct build_feature_devs_info {
> */
> struct dfl_feature_info {
> u16 fid;
> + u8 rev;
> struct resource mmio_res;
> void __iomem *ioaddr;
> struct list_head node;
> @@ -796,6 +798,7 @@ static int build_info_commit_dev(struct
> build_feature_devs_info *binfo)
> /* save resource information for each feature */
> feature->dev = fdev;
> feature->id = finfo->fid;
> + feature->revision = finfo->rev;
>
> /*
> * the FIU header feature has some fundamental functions
> (sriov
> @@ -910,19 +913,17 @@ static void build_info_free(struct
> build_feature_devs_info *binfo)
> devm_kfree(binfo->dev, binfo);
> }
>
> -static inline u32 feature_size(void __iomem *start)
> +static inline u32 feature_size(u64 value)
> {
> - u64 v = readq(start + DFH);
> - u32 ofst = FIELD_GET(DFH_NEXT_HDR_OFST, v);
> + u32 ofst = FIELD_GET(DFH_NEXT_HDR_OFST, value);
> /* workaround for private features with invalid size, use 4K instead */
> return ofst ? ofst : 4096;
> }
>
> -static u16 feature_id(void __iomem *start)
> +static u16 feature_id(u64 value)
> {
> - u64 v = readq(start + DFH);
> - u16 id = FIELD_GET(DFH_ID, v);
> - u8 type = FIELD_GET(DFH_TYPE, v);
> + u16 id = FIELD_GET(DFH_ID, value);
> + u8 type = FIELD_GET(DFH_TYPE, value);
>
> if (type == DFH_TYPE_FIU)
> return FEATURE_ID_FIU_HEADER;
> @@ -1021,10 +1022,15 @@ create_feature_instance(struct
> build_feature_devs_info *binfo,
> unsigned int irq_base, nr_irqs;
> struct dfl_feature_info *finfo;
> int ret;
> + u8 rev;
> + u64 v;
> +
> + v = readq(binfo->ioaddr + ofst);
> + rev = FIELD_GET(DFH_REVISION, v);
>
> /* read feature size and id if inputs are invalid */
> - size = size ? size : feature_size(binfo->ioaddr + ofst);
> - fid = fid ? fid : feature_id(binfo->ioaddr + ofst);
> + size = size ? size : feature_size(v);
> + fid = fid ? fid : feature_id(v);
>
> if (binfo->len - ofst < size)
> return -EINVAL;
> @@ -1038,6 +1044,7 @@ create_feature_instance(struct
> build_feature_devs_info *binfo,
> return -ENOMEM;
>
> finfo->fid = fid;
> + finfo->rev = rev;
> finfo->mmio_res.start = binfo->start + ofst;
> finfo->mmio_res.end = finfo->mmio_res.start + size - 1;
> finfo->mmio_res.flags = IORESOURCE_MEM;
> @@ -1166,7 +1173,7 @@ static int parse_feature_private(struct
> build_feature_devs_info *binfo,
> {
> if (!is_feature_dev_detected(binfo)) {
> dev_err(binfo->dev, "the private feature 0x%x does not belong
> to any AFU.\n",
> - feature_id(binfo->ioaddr + ofst));
> + feature_id(readq(binfo->ioaddr + ofst)));
> return -EINVAL;
> }
>
> diff --git a/drivers/fpga/dfl.h b/drivers/fpga/dfl.h
> index 2b82c96ba56c..422157cfd742 100644
> --- a/drivers/fpga/dfl.h
> +++ b/drivers/fpga/dfl.h
> @@ -243,6 +243,7 @@ struct dfl_feature_irq_ctx {
> struct dfl_feature {
> struct platform_device *dev;
> u16 id;
> + u8 revision;
> int resource_index;
> void __iomem *ioaddr;
> struct dfl_feature_irq_ctx *irq_ctx;
> diff --git a/include/linux/dfl.h b/include/linux/dfl.h
> index 6cc10982351a..431636a0dc78 100644
> --- a/include/linux/dfl.h
> +++ b/include/linux/dfl.h
> @@ -38,6 +38,7 @@ struct dfl_device {
> int id;
> u16 type;
> u16 feature_id;
> + u8 revision;
> struct resource mmio_res;
> int *irqs;
> unsigned int num_irqs;
> --
> 2.31.0
On Tue, 29 Jun 2021, Martin Hundebøll wrote:
> From: Martin Hundebøll <[email protected]>
>
> DFL device drivers have a common need for checking feature revision
> information from the DFL header, as well as other common DFL information
> like the already exposed feature id and type.
>
> This patch exposes the feature revision information directly via the DFL
> device data structure.
>
> Since the DFL core code has already read the DFL header, this this patch
> saves additional mmio reads from DFL device drivers too.
>
> Signed-off-by: Martin Hundebøll <[email protected]>
Acked-by: Matthew Gerlach <[email protected]>
> ---
>
> Changes since v2:
> * Reworded commit message as per Hao's suggestion
>
> Changes since v1:
> * This patch replaces the previous patch 2 and exposes the feature
> revision through struct dfl_device instead of a helper reading from
> io-mem
>
> drivers/fpga/dfl.c | 27 +++++++++++++++++----------
> drivers/fpga/dfl.h | 1 +
> include/linux/dfl.h | 1 +
> 3 files changed, 19 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/fpga/dfl.c b/drivers/fpga/dfl.c
> index 511b20ff35a3..9381c579d1cd 100644
> --- a/drivers/fpga/dfl.c
> +++ b/drivers/fpga/dfl.c
> @@ -381,6 +381,7 @@ dfl_dev_add(struct dfl_feature_platform_data *pdata,
>
> ddev->type = feature_dev_id_type(pdev);
> ddev->feature_id = feature->id;
> + ddev->revision = feature->revision;
> ddev->cdev = pdata->dfl_cdev;
>
> /* add mmio resource */
> @@ -717,6 +718,7 @@ struct build_feature_devs_info {
> */
> struct dfl_feature_info {
> u16 fid;
> + u8 rev;
> struct resource mmio_res;
> void __iomem *ioaddr;
> struct list_head node;
> @@ -796,6 +798,7 @@ static int build_info_commit_dev(struct build_feature_devs_info *binfo)
> /* save resource information for each feature */
> feature->dev = fdev;
> feature->id = finfo->fid;
> + feature->revision = finfo->rev;
>
> /*
> * the FIU header feature has some fundamental functions (sriov
> @@ -910,19 +913,17 @@ static void build_info_free(struct build_feature_devs_info *binfo)
> devm_kfree(binfo->dev, binfo);
> }
>
> -static inline u32 feature_size(void __iomem *start)
> +static inline u32 feature_size(u64 value)
> {
> - u64 v = readq(start + DFH);
> - u32 ofst = FIELD_GET(DFH_NEXT_HDR_OFST, v);
> + u32 ofst = FIELD_GET(DFH_NEXT_HDR_OFST, value);
> /* workaround for private features with invalid size, use 4K instead */
> return ofst ? ofst : 4096;
> }
>
> -static u16 feature_id(void __iomem *start)
> +static u16 feature_id(u64 value)
> {
> - u64 v = readq(start + DFH);
> - u16 id = FIELD_GET(DFH_ID, v);
> - u8 type = FIELD_GET(DFH_TYPE, v);
> + u16 id = FIELD_GET(DFH_ID, value);
> + u8 type = FIELD_GET(DFH_TYPE, value);
>
> if (type == DFH_TYPE_FIU)
> return FEATURE_ID_FIU_HEADER;
> @@ -1021,10 +1022,15 @@ create_feature_instance(struct build_feature_devs_info *binfo,
> unsigned int irq_base, nr_irqs;
> struct dfl_feature_info *finfo;
> int ret;
> + u8 rev;
> + u64 v;
> +
> + v = readq(binfo->ioaddr + ofst);
> + rev = FIELD_GET(DFH_REVISION, v);
>
> /* read feature size and id if inputs are invalid */
> - size = size ? size : feature_size(binfo->ioaddr + ofst);
> - fid = fid ? fid : feature_id(binfo->ioaddr + ofst);
> + size = size ? size : feature_size(v);
> + fid = fid ? fid : feature_id(v);
>
> if (binfo->len - ofst < size)
> return -EINVAL;
> @@ -1038,6 +1044,7 @@ create_feature_instance(struct build_feature_devs_info *binfo,
> return -ENOMEM;
>
> finfo->fid = fid;
> + finfo->rev = rev;
> finfo->mmio_res.start = binfo->start + ofst;
> finfo->mmio_res.end = finfo->mmio_res.start + size - 1;
> finfo->mmio_res.flags = IORESOURCE_MEM;
> @@ -1166,7 +1173,7 @@ static int parse_feature_private(struct build_feature_devs_info *binfo,
> {
> if (!is_feature_dev_detected(binfo)) {
> dev_err(binfo->dev, "the private feature 0x%x does not belong to any AFU.\n",
> - feature_id(binfo->ioaddr + ofst));
> + feature_id(readq(binfo->ioaddr + ofst)));
> return -EINVAL;
> }
>
> diff --git a/drivers/fpga/dfl.h b/drivers/fpga/dfl.h
> index 2b82c96ba56c..422157cfd742 100644
> --- a/drivers/fpga/dfl.h
> +++ b/drivers/fpga/dfl.h
> @@ -243,6 +243,7 @@ struct dfl_feature_irq_ctx {
> struct dfl_feature {
> struct platform_device *dev;
> u16 id;
> + u8 revision;
> int resource_index;
> void __iomem *ioaddr;
> struct dfl_feature_irq_ctx *irq_ctx;
> diff --git a/include/linux/dfl.h b/include/linux/dfl.h
> index 6cc10982351a..431636a0dc78 100644
> --- a/include/linux/dfl.h
> +++ b/include/linux/dfl.h
> @@ -38,6 +38,7 @@ struct dfl_device {
> int id;
> u16 type;
> u16 feature_id;
> + u8 revision;
> struct resource mmio_res;
> int *irqs;
> unsigned int num_irqs;
> --
> 2.31.0
>
>
On Tue, 29 Jun 2021, Martin Hundebøll wrote:
> From: Martin Hundebøll <[email protected]>
>
> Add the list of sensors supported by the Silicom n5010 PAC, and enable
> the drivers as a subtype of the intel-m10-bmc multi-function driver.
>
> Signed-off-by: Martin Hundebøll <[email protected]>
> Reviewed-by: Guenter Roeck <[email protected]>
> Reviewed-by: Moritz Fischer <[email protected]>
> Reviewed-by: Xu Yilun <[email protected]>
Acked-by: Matthew Gerlach <[email protected]>
> ---
>
> Changes since v2:
> * Added Yilun's Reviewed-by
> * Added Moritz' Reviewed-by
> * Added Guenter's Reviewed-by
>
> Changes since v1:
> * Patch split out to separate hwmon changes
>
> drivers/hwmon/intel-m10-bmc-hwmon.c | 116 ++++++++++++++++++++++++++++
> 1 file changed, 116 insertions(+)
>
> diff --git a/drivers/hwmon/intel-m10-bmc-hwmon.c b/drivers/hwmon/intel-m10-bmc-hwmon.c
> index bd7ed2ed3a1e..7a08e4c44a4b 100644
> --- a/drivers/hwmon/intel-m10-bmc-hwmon.c
> +++ b/drivers/hwmon/intel-m10-bmc-hwmon.c
> @@ -228,6 +228,118 @@ static const struct m10bmc_hwmon_board_data d5005bmc_hwmon_bdata = {
> .hinfo = d5005bmc_hinfo,
> };
>
> +static const struct m10bmc_sdata n5010bmc_temp_tbl[] = {
> + { 0x100, 0x0, 0x104, 0x0, 0x0, 1000, "Board Local Temperature" },
> + { 0x108, 0x0, 0x10c, 0x0, 0x0, 1000, "FPGA 1 Temperature" },
> + { 0x110, 0x0, 0x114, 0x0, 0x0, 1000, "FPGA 2 Temperature" },
> + { 0x118, 0x0, 0x0, 0x0, 0x0, 1000, "Card Top Temperature" },
> + { 0x11c, 0x0, 0x0, 0x0, 0x0, 1000, "Card Bottom Temperature" },
> + { 0x128, 0x0, 0x0, 0x0, 0x0, 1000, "FPGA 1.2V Temperature" },
> + { 0x134, 0x0, 0x0, 0x0, 0x0, 1000, "FPGA 5V Temperature" },
> + { 0x140, 0x0, 0x0, 0x0, 0x0, 1000, "FPGA 0.9V Temperature" },
> + { 0x14c, 0x0, 0x0, 0x0, 0x0, 1000, "FPGA 0.85V Temperature" },
> + { 0x158, 0x0, 0x0, 0x0, 0x0, 1000, "AUX 12V Temperature" },
> + { 0x164, 0x0, 0x0, 0x0, 0x0, 1000, "Backplane 12V Temperature" },
> + { 0x1a8, 0x0, 0x0, 0x0, 0x0, 1000, "QSFP28-1 Temperature" },
> + { 0x1ac, 0x0, 0x0, 0x0, 0x0, 1000, "QSFP28-2 Temperature" },
> + { 0x1b0, 0x0, 0x0, 0x0, 0x0, 1000, "QSFP28-3 Temperature" },
> + { 0x1b4, 0x0, 0x0, 0x0, 0x0, 1000, "QSFP28-4 Temperature" },
> + { 0x1b8, 0x0, 0x0, 0x0, 0x0, 1000, "CVL1 Internal Temperature" },
> + { 0x1bc, 0x0, 0x0, 0x0, 0x0, 1000, "CVL2 Internal Temperature" },
> +};
> +
> +static const struct m10bmc_sdata n5010bmc_in_tbl[] = {
> + { 0x120, 0x0, 0x0, 0x0, 0x0, 1, "FPGA 1.2V Voltage" },
> + { 0x12c, 0x0, 0x0, 0x0, 0x0, 1, "FPGA 5V Voltage" },
> + { 0x138, 0x0, 0x0, 0x0, 0x0, 1, "FPGA 0.9V Voltage" },
> + { 0x144, 0x0, 0x0, 0x0, 0x0, 1, "FPGA 0.85V Voltage" },
> + { 0x150, 0x0, 0x0, 0x0, 0x0, 1, "AUX 12V Voltage" },
> + { 0x15c, 0x0, 0x0, 0x0, 0x0, 1, "Backplane 12V Voltage" },
> + { 0x16c, 0x0, 0x0, 0x0, 0x0, 1, "DDR4 1.2V Voltage" },
> + { 0x17c, 0x0, 0x0, 0x0, 0x0, 1, "FPGA 1.8V Voltage" },
> + { 0x184, 0x0, 0x0, 0x0, 0x0, 1, "QDR 1.3V Voltage" },
> + { 0x18c, 0x0, 0x0, 0x0, 0x0, 1, "CVL1 0.8V Voltage" },
> + { 0x194, 0x0, 0x0, 0x0, 0x0, 1, "CVL1 1.05V Voltage" },
> + { 0x19c, 0x0, 0x0, 0x0, 0x0, 1, "CVL2 1.05V Voltage" },
> + { 0x1a4, 0x0, 0x0, 0x0, 0x0, 1, "CVL2 0.8V Voltage" },
> +};
> +
> +static const struct m10bmc_sdata n5010bmc_curr_tbl[] = {
> + { 0x124, 0x0, 0x0, 0x0, 0x0, 1, "FPGA 1.2V Current" },
> + { 0x130, 0x0, 0x0, 0x0, 0x0, 1, "FPGA 5V Current" },
> + { 0x13c, 0x0, 0x0, 0x0, 0x0, 1, "FPGA 0.9V Current" },
> + { 0x148, 0x0, 0x0, 0x0, 0x0, 1, "FPGA 0.85V Current" },
> + { 0x154, 0x0, 0x0, 0x0, 0x0, 1, "AUX 12V Current" },
> + { 0x160, 0x0, 0x0, 0x0, 0x0, 1, "Backplane 12V Current" },
> + { 0x168, 0x0, 0x0, 0x0, 0x0, 1, "DDR4 1.2V Current" },
> + { 0x178, 0x0, 0x0, 0x0, 0x0, 1, "FPGA 1.8V Current" },
> + { 0x180, 0x0, 0x0, 0x0, 0x0, 1, "QDR 1.3V Current" },
> + { 0x188, 0x0, 0x0, 0x0, 0x0, 1, "CVL1 0.8V Current" },
> + { 0x190, 0x0, 0x0, 0x0, 0x0, 1, "CVL1 1.05V Current" },
> + { 0x198, 0x0, 0x0, 0x0, 0x0, 1, "CVL2 1.05V Current" },
> + { 0x1a0, 0x0, 0x0, 0x0, 0x0, 1, "CVL2 0.8V Current" },
> +};
> +
> +static const struct hwmon_channel_info *n5010bmc_hinfo[] = {
> + HWMON_CHANNEL_INFO(temp,
> + HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_LABEL,
> + HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_LABEL,
> + HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_LABEL,
> + HWMON_T_INPUT | HWMON_T_LABEL,
> + HWMON_T_INPUT | HWMON_T_LABEL,
> + HWMON_T_INPUT | HWMON_T_LABEL,
> + HWMON_T_INPUT | HWMON_T_LABEL,
> + HWMON_T_INPUT | HWMON_T_LABEL,
> + HWMON_T_INPUT | HWMON_T_LABEL,
> + HWMON_T_INPUT | HWMON_T_LABEL,
> + HWMON_T_INPUT | HWMON_T_LABEL,
> + HWMON_T_INPUT | HWMON_T_LABEL,
> + HWMON_T_INPUT | HWMON_T_LABEL,
> + HWMON_T_INPUT | HWMON_T_LABEL,
> + HWMON_T_INPUT | HWMON_T_LABEL,
> + HWMON_T_INPUT | HWMON_T_LABEL,
> + HWMON_T_INPUT | 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_LABEL,
> + HWMON_I_INPUT | HWMON_I_LABEL,
> + HWMON_I_INPUT | HWMON_I_LABEL,
> + HWMON_I_INPUT | HWMON_I_LABEL,
> + HWMON_I_INPUT | HWMON_I_LABEL,
> + HWMON_I_INPUT | HWMON_I_LABEL,
> + HWMON_I_INPUT | HWMON_I_LABEL,
> + HWMON_I_INPUT | HWMON_I_LABEL,
> + HWMON_I_INPUT | HWMON_I_LABEL,
> + HWMON_I_INPUT | 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_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_LABEL),
> + NULL
> +};
> +
> +static const struct m10bmc_hwmon_board_data n5010bmc_hwmon_bdata = {
> + .tables = {
> + [hwmon_temp] = n5010bmc_temp_tbl,
> + [hwmon_in] = n5010bmc_in_tbl,
> + [hwmon_curr] = n5010bmc_curr_tbl,
> + },
> +
> + .hinfo = n5010bmc_hinfo,
> +};
> +
> static umode_t
> m10bmc_hwmon_is_visible(const void *data, enum hwmon_sensor_types type,
> u32 attr, int channel)
> @@ -438,6 +550,10 @@ static const struct platform_device_id intel_m10bmc_hwmon_ids[] = {
> .name = "d5005bmc-hwmon",
> .driver_data = (unsigned long)&d5005bmc_hwmon_bdata,
> },
> + {
> + .name = "n5010bmc-hwmon",
> + .driver_data = (unsigned long)&n5010bmc_hwmon_bdata,
> + },
> { }
> };
>
> --
> 2.31.0
>
>
On Tue, 29 Jun 2021, Martin Hundebøll wrote:
> From: Martin Hundebøll <[email protected]>
>
> The m10-bmc is used on the Silicom N5010 PAC too, so add it to list of
> m10bmc types.
>
> Signed-off-by: Martin Hundebøll <[email protected]>
> Acked-by: Moritz Fischer <[email protected]>
> Reviewed-by: Xu Yilun <[email protected]>
Reviewed-by: Matthew Gerlach <[email protected]>
> ---
>
> Changes since v2:
> * Added Yilun's Reviewed-by
> * Added Moritz' Acked-by
>
> Changes since v1:
> * Patch split out to separate mfd changes
>
> drivers/mfd/intel-m10-bmc.c | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/mfd/intel-m10-bmc.c b/drivers/mfd/intel-m10-bmc.c
> index 1a9bfb7f48cd..8db3bcf5fccc 100644
> --- a/drivers/mfd/intel-m10-bmc.c
> +++ b/drivers/mfd/intel-m10-bmc.c
> @@ -15,7 +15,8 @@
>
> enum m10bmc_type {
> M10_N3000,
> - M10_D5005
> + M10_D5005,
> + M10_N5010,
> };
>
> static struct mfd_cell m10bmc_d5005_subdevs[] = {
> @@ -28,6 +29,10 @@ static struct mfd_cell m10bmc_pacn3000_subdevs[] = {
> { .name = "n3000bmc-secure" },
> };
>
> +static struct mfd_cell m10bmc_n5010_subdevs[] = {
> + { .name = "n5010bmc-hwmon" },
> +};
> +
> static const struct regmap_range m10bmc_regmap_range[] = {
> regmap_reg_range(M10BMC_LEGACY_BUILD_VER, M10BMC_LEGACY_BUILD_VER),
> regmap_reg_range(M10BMC_SYS_BASE, M10BMC_SYS_END),
> @@ -192,6 +197,10 @@ static int intel_m10_bmc_spi_probe(struct spi_device *spi)
> cells = m10bmc_d5005_subdevs;
> n_cell = ARRAY_SIZE(m10bmc_d5005_subdevs);
> break;
> + case M10_N5010:
> + cells = m10bmc_n5010_subdevs;
> + n_cell = ARRAY_SIZE(m10bmc_n5010_subdevs);
> + break;
> default:
> return -ENODEV;
> }
> @@ -207,6 +216,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 },
> + { "m10-n5010", M10_N5010 },
> { }
> };
> MODULE_DEVICE_TABLE(spi, m10bmc_spi_id);
> --
> 2.31.0
>
>
On Tue, 29 Jun 2021, Martin Hundebøll wrote:
> From: Martin Hundebøll <[email protected]>
>
> The m10-bmc is used on the Silicom N5010 PAC too, so add it to list of
> m10bmc types.
Please refrain from padding out the commit message in future.
> Signed-off-by: Martin Hundebøll <[email protected]>
> Acked-by: Moritz Fischer <[email protected]>
> Reviewed-by: Xu Yilun <[email protected]>
> ---
>
> Changes since v2:
> * Added Yilun's Reviewed-by
> * Added Moritz' Acked-by
>
> Changes since v1:
> * Patch split out to separate mfd changes
>
> drivers/mfd/intel-m10-bmc.c | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
Applied, thanks.
--
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog