mfd: intel-m10-bmc: add sysfs files for mac_address
Subsystems (2)
v3 cover mfd: intel-m10-bmc: add sysfs files for mac_address
Add two sysfs nodes to the Intel MAX10 BMC driver: mac_address and mac_count. The mac_address provides the first of a series of sequential MAC addresses assigned to the FPGA card. The mac_count indicates how many MAC addresses are assigned to the card.
Changelog v2 -> v3:
- Updated Date and KernelVersion in ABI documentation
Changelog v1 -> v2:
- Updated the documentation for the mac_address and mac_count sysfs nodes to clearify their usage.
- Changed sysfs _show() functions to use sysfs_emit() instead of sprintf.
Russ Weight (1):
mfd: intel-m10-bmc: expose mac address and count
.../ABI/testing/sysfs-driver-intel-m10-bmc | 21 +++++++++ drivers/mfd/intel-m10-bmc.c | 43 +++++++++++++++++++ include/linux/mfd/intel-m10-bmc.h | 9 ++++ 3 files changed, 73 insertions(+)
Signature · 1 line
2.25.1
PATCH v3 1/1 mfd: intel-m10-bmc: expose mac address and count
Create two sysfs entries for exposing the MAC address and count from the MAX10 BMC register space. The MAC address is the first in a sequential block of MAC addresses reserved for the FPGA card. The MAC count is the number of MAC addresses in the reserved block.
---
v3:
- Updated Date and KernelVersion in ABI documentation
v2:
- Updated the documentation for the mac_address and mac_count sysfs nodes to clarify their usage.
- Changed sysfs _show() functions to use sysfs_emit() instead of sprintf.
--- .../ABI/testing/sysfs-driver-intel-m10-bmc | 21 +++++++++ drivers/mfd/intel-m10-bmc.c | 43 +++++++++++++++++++ include/linux/mfd/intel-m10-bmc.h | 9 ++++ 3 files changed, 73 insertions(+)
Documentation/ABI/testing/sysfs-driver-intel-m10-bmc +21 -0
@@ -13,3 +13,24 @@ Contact: Xu Yilun <[email protected]> Description: Read only. Returns the firmware version of Intel MAX10 BMC chip. Format: "0x%x". + +What: /sys/bus/spi/devices/.../mac_address +Date: January 2021 +KernelVersion: 5.12 +Contact: Russ Weight <[email protected]> +Description: Read only. Returns the first MAC address in a block + of sequential MAC addresses assigned to the board + that is managed by the Intel MAX10 BMC. It is stored in + FLASH storage and is mirrored in the MAX10 BMC register + space. + Format: "%02x:%02x:%02x:%02x:%02x:%02x". + +What: /sys/bus/spi/devices/.../mac_count +Date: January 2021 +KernelVersion: 5.12 +Contact: Russ Weight <[email protected]> +Description: Read only. Returns the number of sequential MAC + addresses assigned to the board managed by the Intel + MAX10 BMC. This value is stored in FLASH and is mirrored + in the MAX10 BMC register space. + Format: "%u".
drivers/mfd/intel-m10-bmc.c +43 -0
52 lines not on this page · raw message
include/linux/mfd/intel-m10-bmc.h +9 -0
@@ -15,6 +15,15 @@/* Register offset of system registers */ #define NIOS2_FW_VERSION 0x0 +#define M10BMC_MACADDR1 0x10 +#define M10BMC_MAC_BYTE4 GENMASK(7, 0) +#define M10BMC_MAC_BYTE3 GENMASK(15, 8) +#define M10BMC_MAC_BYTE2 GENMASK(23, 16) +#define M10BMC_MAC_BYTE1 GENMASK(31, 24) +#define M10BMC_MACADDR2 0x14 +#define M10BMC_MAC_BYTE6 GENMASK(7, 0) +#define M10BMC_MAC_BYTE5 GENMASK(15, 8) +#define M10BMC_MAC_COUNT GENMASK(23, 16)#define M10BMC_TEST_REG 0x3c#define M10BMC_BUILD_VER 0x68#define M10BMC_VER_MAJOR_MSK GENMASK(23, 16)
Signature · 1 line
2.25.1
Re: [PATCH v3 1/1] mfd: intel-m10-bmc: expose mac address and count
Quoted 56 lines · Russ Weight
Create two sysfs entries for exposing the MAC address and count from the MAX10 BMC register space. The MAC address is the first in a sequential block of MAC addresses reserved for the FPGA card. The MAC count is the number of MAC addresses in the reserved block.
Signed-off-by Russ Weight <[email protected]>Signed-off-by Xu Yilun <[email protected]>---
v3:
- Updated Date and KernelVersion in ABI documentation
v2:
- Updated the documentation for themac_addressandmac_countsysfs nodes to clarify their usage.
- Changed sysfs_show()functions to usesysfs_emit()instead of sprintf.--- .../ABI/testing/sysfs-driver-intel-m10-bmc | 21 +++++++++ drivers/mfd/intel-m10-bmc.c | 43 +++++++++++++++++++ include/linux/mfd/intel-m10-bmc.h | 9 ++++ 3 files changed, 73 insertions(+)Documentation/ABI/testing/sysfs-driver-intel-m10-bmc +21
-0@@ -13,3 +13,24 @@ Contact: Xu Yilun <[email protected]> Description: Read only. Returns the firmware version of Intel MAX10 BMC chip. Format: "0x%x". + +What: /sys/bus/spi/devices/.../mac_address +Date: January 2021 +KernelVersion: 5.12 +Contact: Russ Weight <[email protected]> +Description: Read only. Returns the first MAC address in a block + of sequential MAC addresses assigned to the board + that is managed by the Intel MAX10 BMC. It is stored in + FLASH storage and is mirrored in the MAX10 BMC register + space. + Format: "%02x:%02x:%02x:%02x:%02x:%02x". + +What: /sys/bus/spi/devices/.../mac_count +Date: January 2021 +KernelVersion: 5.12 +Contact: Russ Weight <[email protected]> +Description: Read only. Returns the number of sequential MAC + addresses assigned to the board managed by the Intel + MAX10 BMC. This value is stored in FLASH and is mirrored + in the MAX10 BMC register space. + Format: "%u".drivers/mfd/intel-m10-bmc.c +0
-0
drivers/mfd/intel-m10-bmc.c static ssize_t bmcfw_version_show(struct device *dev, · line 67
Quoted 8 lines
drivers/mfd/intel-m10-bmc.c +5
-0@@ -60,9 +60,52 @@ static ssize_t bmcfw_version_show(struct device *dev, }static DEVICE_ATTR_RO (bmcfw_version); +static ssize_t mac_address_show (struct device *dev, +struct device_attribute *attr,char *buf) +{ +struct intel_m10bmc *max10 =dev_get_drvdata (dev); +unsigned int macaddr1, macaddr2;
This naming convention is confusing.
It took me a minute to work it out.
Does 'high' and 'low' make sense?
Quoted 64 lines
drivers/mfd/intel-m10-bmc.c +38
-0+int ret; + + ret =m10bmc_sys_read (max10,M10BMC_MACADDR1 , &macaddr1); +if (ret) +return ret; + + ret =m10bmc_sys_read (max10,M10BMC_MACADDR2 , &macaddr2); +if (ret) +return ret; + +return sysfs_emit (buf,"%02x:%02x:%02x:%02x:%02x:%02x\n" , + (u8 )FIELD_GET (M10BMC_MAC_BYTE1 , macaddr1), + (u8 )FIELD_GET (M10BMC_MAC_BYTE2 , macaddr1), + (u8 )FIELD_GET (M10BMC_MAC_BYTE3 , macaddr1), + (u8 )FIELD_GET (M10BMC_MAC_BYTE4 , macaddr1), + (u8 )FIELD_GET (M10BMC_MAC_BYTE5 , macaddr2), + (u8 )FIELD_GET (M10BMC_MAC_BYTE6 , macaddr2)); +} +static DEVICE_ATTR_RO (mac_address); + +static ssize_t mac_count_show (struct device *dev, +struct device_attribute *attr,char *buf) +{ +struct intel_m10bmc *max10 =dev_get_drvdata (dev); +unsigned int macaddr2; +int ret; + + ret =m10bmc_sys_read (max10,M10BMC_MACADDR2 , &macaddr2); +if (ret) +return ret; + +return sysfs_emit (buf,"%u\n" , + (u8 )FIELD_GET (M10BMC_MAC_COUNT , macaddr2)); +} +static DEVICE_ATTR_RO (mac_count); +static struct attribute *m10bmc_attrs[] = { &dev_attr_bmc_version.attr, &dev_attr_bmcfw_version.attr, + &dev_attr_mac_address.attr, + &dev_attr_mac_count.attr,NULL , };ATTRIBUTE_GROUPS (m10bmc);include/linux/mfd/intel-m10-bmc.h +9
-0@@ -15,6 +15,15 @@/* Register offset of system registers */ #define NIOS2_FW_VERSION 0x0 +#define M10BMC_MACADDR1 0x10 +#define M10BMC_MAC_BYTE4 GENMASK(7, 0) +#define M10BMC_MAC_BYTE3 GENMASK(15, 8) +#define M10BMC_MAC_BYTE2 GENMASK(23, 16) +#define M10BMC_MAC_BYTE1 GENMASK(31, 24) +#define M10BMC_MACADDR2 0x14 +#define M10BMC_MAC_BYTE6 GENMASK(7, 0) +#define M10BMC_MAC_BYTE5 GENMASK(15, 8) +#define M10BMC_MAC_COUNT GENMASK(23, 16)#define M10BMC_TEST_REG 0x3c#define M10BMC_BUILD_VER 0x68#define M10BMC_VER_MAJOR_MSK GENMASK(23, 16)
Signature · 4 lines
Lee Jones [李琼斯] Senior Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog
Re: [PATCH v3 1/1] mfd: intel-m10-bmc: expose mac address and count
Quoted 68 lines · Lee Jones
Quoted 56 lines · Russ Weight
Create two sysfs entries for exposing the MAC address and count from the MAX10 BMC register space. The MAC address is the first in a sequential block of MAC addresses reserved for the FPGA card. The MAC count is the number of MAC addresses in the reserved block.
Signed-off-by Russ Weight <[email protected]>Signed-off-by Xu Yilun <[email protected]>---
v3:
- Updated Date and KernelVersion in ABI documentation
v2:
- Updated the documentation for themac_addressandmac_countsysfs nodes to clarify their usage.
- Changed sysfs_show()functions to usesysfs_emit()instead of sprintf.--- .../ABI/testing/sysfs-driver-intel-m10-bmc | 21 +++++++++ drivers/mfd/intel-m10-bmc.c | 43 +++++++++++++++++++ include/linux/mfd/intel-m10-bmc.h | 9 ++++ 3 files changed, 73 insertions(+)Documentation/ABI/testing/sysfs-driver-intel-m10-bmc +21
-0@@ -13,3 +13,24 @@ Contact: Xu Yilun <[email protected]> Description: Read only. Returns the firmware version of Intel MAX10 BMC chip. Format: "0x%x". + +What: /sys/bus/spi/devices/.../mac_address +Date: January 2021 +KernelVersion: 5.12 +Contact: Russ Weight <[email protected]> +Description: Read only. Returns the first MAC address in a block + of sequential MAC addresses assigned to the board + that is managed by the Intel MAX10 BMC. It is stored in + FLASH storage and is mirrored in the MAX10 BMC register + space. + Format: "%02x:%02x:%02x:%02x:%02x:%02x". + +What: /sys/bus/spi/devices/.../mac_count +Date: January 2021 +KernelVersion: 5.12 +Contact: Russ Weight <[email protected]> +Description: Read only. Returns the number of sequential MAC + addresses assigned to the board managed by the Intel + MAX10 BMC. This value is stored in FLASH and is mirrored + in the MAX10 BMC register space. + Format: "%u".drivers/mfd/intel-m10-bmc.c +0
-0drivers/mfd/intel-m10-bmc.c static ssize_t bmcfw_version_show(struct device *dev, · line 67
Quoted 8 lines
drivers/mfd/intel-m10-bmc.c +5
-0@@ -60,9 +60,52 @@ static ssize_t bmcfw_version_show(struct device *dev, }static DEVICE_ATTR_RO (bmcfw_version); +static ssize_t mac_address_show (struct device *dev, +struct device_attribute *attr,char *buf) +{ +struct intel_m10bmc *max10 =dev_get_drvdata (dev); +unsigned int macaddr1, macaddr2;This naming convention is confusing.
Quoted 3 lines
It took me a minute to work it out.
Does 'high' and 'low' make sense!
Yes - that is more descriptive. I'll make the change and resubmit.
Thanks!
- Russ
Quoted 65 lines
Quoted 65 lines
drivers/mfd/intel-m10-bmc.c +38
-0+int ret; + + ret =m10bmc_sys_read (max10,M10BMC_MACADDR1 , &macaddr1); +if (ret) +return ret; + + ret =m10bmc_sys_read (max10,M10BMC_MACADDR2 , &macaddr2); +if (ret) +return ret; + +return sysfs_emit (buf,"%02x:%02x:%02x:%02x:%02x:%02x\n" , + (u8 )FIELD_GET (M10BMC_MAC_BYTE1 , macaddr1), + (u8 )FIELD_GET (M10BMC_MAC_BYTE2 , macaddr1), + (u8 )FIELD_GET (M10BMC_MAC_BYTE3 , macaddr1), + (u8 )FIELD_GET (M10BMC_MAC_BYTE4 , macaddr1), + (u8 )FIELD_GET (M10BMC_MAC_BYTE5 , macaddr2), + (u8 )FIELD_GET (M10BMC_MAC_BYTE6 , macaddr2)); +} +static DEVICE_ATTR_RO (mac_address); + +static ssize_t mac_count_show (struct device *dev, +struct device_attribute *attr,char *buf) +{ +struct intel_m10bmc *max10 =dev_get_drvdata (dev); +unsigned int macaddr2; +int ret; + + ret =m10bmc_sys_read (max10,M10BMC_MACADDR2 , &macaddr2); +if (ret) +return ret; + +return sysfs_emit (buf,"%u\n" , + (u8 )FIELD_GET (M10BMC_MAC_COUNT , macaddr2)); +} +static DEVICE_ATTR_RO (mac_count); +static struct attribute *m10bmc_attrs[] = { &dev_attr_bmc_version.attr, &dev_attr_bmcfw_version.attr, + &dev_attr_mac_address.attr, + &dev_attr_mac_count.attr,NULL , };ATTRIBUTE_GROUPS (m10bmc);include/linux/mfd/intel-m10-bmc.h +9
-0@@ -15,6 +15,15 @@/* Register offset of system registers */ #define NIOS2_FW_VERSION 0x0 +#define M10BMC_MACADDR1 0x10 +#define M10BMC_MAC_BYTE4 GENMASK(7, 0) +#define M10BMC_MAC_BYTE3 GENMASK(15, 8) +#define M10BMC_MAC_BYTE2 GENMASK(23, 16) +#define M10BMC_MAC_BYTE1 GENMASK(31, 24) +#define M10BMC_MACADDR2 0x14 +#define M10BMC_MAC_BYTE6 GENMASK(7, 0) +#define M10BMC_MAC_BYTE5 GENMASK(15, 8) +#define M10BMC_MAC_COUNT GENMASK(23, 16)#define M10BMC_TEST_REG 0x3c#define M10BMC_BUILD_VER 0x68#define M10BMC_VER_MAJOR_MSK GENMASK(23, 16)