Create DMI sysfs code and add IPMI platform device
Subsystems (5)
v5 cover Create DMI sysfs code and add IPMI platform device
This series adds a DMI fwnode, creates an IPMI platform device from the SMBIOS table, and converts the IPMI driver over to use the new platform device.
This is essentially the same thing I posted a while ago, I just updated the v4 version to the latest kernel. I'd really like to get this in to the kernel.
I can handle the IPMI side of things, of course, and with permission I can bring this in through the IPMI tree.
Thanks,
-corey
PATCH v5 1/5 dmi: remove const from return of dmi_find_device
From: Corey Minyard <[email protected]>
A fwnode_handle is being added to dmi_device, and that will need to be updated. So remove the const.
--- drivers/firmware/dmi_scan.c | 11 +++++------ include/linux/dmi.h | 10 +++++----- 2 files changed, 10 insertions(+), 11 deletions(-)
drivers/firmware/dmi_scan.c +5 -6
@@ -896,14 +896,13 @@ EXPORT_SYMBOL(dmi_name_in_vendors);* A new search is initiated by passing %NULL as the @from argument. * If @from is not %NULL, searches continue from next device. */ -const struct dmi_device *dmi_find_device (int type,const char *name, -const struct dmi_device *from) +struct dmi_device *dmi_find_device (int type,const char *name, +const struct dmi_device *from) { -const struct list_head *head = from ? &from->list : &dmi_devices; -struct list_head *d; +struct list_head *d = from ? from->list.next : dmi_devices.next; -for (d = head->next; d != &dmi_devices; d = d->next) { -const struct dmi_device *dev = +for (; d != &dmi_devices; d = d->next) { +struct dmi_device *dev = list_entry(d, struct dmi_device, list); if (((type == DMI_DEV_TYPE_ANY) || (dev->type == type)) &&
include/linux/dmi.h +5 -5
@@ -98,9 +98,9 @@ struct dmi_dev_onboard {extern struct kobject *dmi_kobj;extern int dmi_check_system (const struct dmi_system_id *list);const struct dmi_system_id *dmi_first_match (const struct dmi_system_id *list); -extern const char *dmi_get_system_info (int field); -extern const struct dmi_device *dmi_find_device (int type,const char *name, -const struct dmi_device *from); +extern const char *dmi_get_system_info (int field); +extern struct dmi_device *dmi_find_device (int type,const char *name, +const struct dmi_device *from);extern void dmi_scan_machine (void );extern void dmi_memdev_walk (void );extern void dmi_set_dump_stack_arch_desc (void );
@@ -116,8 +116,8 @@ extern void dmi_memdev_name(u16 handle, const char **bank, const char **device);#else static inline int dmi_check_system (const struct dmi_system_id *list) {return 0 ; } -static inline const char *dmi_get_system_info (int field) {return NULL ; } -static inline const struct dmi_device *dmi_find_device (int type,const char *name, +static inline const char *dmi_get_system_info (int field) {return NULL ; } +static inline struct dmi_device *dmi_find_device (int type,const char *name,const struct dmi_device *from) {return NULL ; }static inline void dmi_scan_machine (void ) {return ; }static inline void dmi_memdev_walk (void ) { }
Signature · 1 line
2.7.4
PATCH v5 2/5 dmi: Add a DMI firmware node and handling
In reply to [email protected]From: Corey Minyard <[email protected]>
This is so that an IPMI platform device can be created from a DMI firmware entry.
--- drivers/firmware/dmi_scan.c | 16 ++++++++++------ include/linux/dmi.h | 14 ++++++++++++++ include/linux/fwnode.h | 3 ++- 3 files changed, 26 insertions(+), 7 deletions(-)
drivers/firmware/dmi_scan.c +10 -6
@@ -242,6 +242,12 @@ static void __init dmi_save_type(const struct dmi_header *dm, int slot, dmi_ident[slot] = s; } +static void __init dmi_devices_list_add (struct dmi_device *dev) +{ + dev->fwnode.type =FWNODE_DMI ; +list_add (&dev->list, &dmi_devices); +} +static void __init dmi_save_one_device (int type,const char *name) {struct dmi_device *dev;
@@ -257,8 +263,7 @@ static void __init dmi_save_one_device(int type, const char *name) dev->type = type;strcpy ((char *)(dev +1 ), name); dev->name = (char *)(dev +1 ); - dev->device_data =NULL ; -list_add (&dev->list, &dmi_devices); +dmi_devices_list_add (dev); }static void __init dmi_save_devices (const struct dmi_header *dm)
@@ -293,9 +298,8 @@ static void __init dmi_save_oem_strings_devices(const struct dmi_header *dm) dev->type =DMI_DEV_TYPE_OEM_STRING ; dev->name = devname; - dev->device_data =NULL ; -list_add (&dev->list, &dmi_devices); +dmi_devices_list_add (dev); } }
@@ -318,7 +322,7 @@ static void __init dmi_save_ipmi_device(const struct dmi_header *dm) dev->name ="IPMI controller" ; dev->device_data = data; -list_add_tail (&dev->list, &dmi_devices); +dmi_devices_list_add (dev); } static void __init dmi_save_dev_pciaddr(int instance, int segment, int bus,
@@ -345,7 +349,7 @@ static void __init dmi_save_dev_pciaddr(int instance, int segment, int bus, dev->dev.name = (char *)&dev[1 ]; dev->dev.device_data = dev; -list_add (&dev->dev.list, &dmi_devices); +dmi_devices_list_add (&dev->dev); }static void __init dmi_save_extended_devices (const struct dmi_header *dm)
include/linux/dmi.h +14 -0
@@ -4,6 +4,7 @@#include <linux/list.h> #include <linux/kobject.h> #include <linux/mod_devicetable.h> +#include <linux/fwnode.h> /* enum dmi_field is in mod_devicetable.h */
@@ -80,6 +81,7 @@ struct dmi_header {struct dmi_device {struct list_head list; +struct fwnode_handle fwnode;int type;const char *name;void *device_data;/* Type specific data */
@@ -113,6 +115,18 @@ extern int dmi_walk(void (*decode)(const struct dmi_header *, void *),extern bool dmi_match (enum dmi_field f,const char *str);extern void dmi_memdev_name (u16 handle,const char **bank,const char **device); +static inline bool is_dmi_fwnode (struct fwnode_handle *fwnode) +{ +return fwnode && fwnode->type ==FWNODE_DMI ; +} + +static inline struct dmi_device *to_dmi_device (struct fwnode_handle *fwnode) +{ +if (is_dmi_fwnode (fwnode)) + return container_of(fwnode, struct dmi_device, fwnode); +return NULL ; +} +#else static inline int dmi_check_system (const struct dmi_system_id *list) {return 0 ; }
include/linux/fwnode.h +2 -1
@@ -19,7 +19,8 @@ enum fwnode_type {FWNODE_ACPI_DATA ,FWNODE_ACPI_STATIC ,FWNODE_PDATA , -FWNODE_IRQCHIP +FWNODE_IRQCHIP , +FWNODE_DMI }; struct fwnode_handle {
Signature · 1 line
2.7.4
PATCH v5 3/5 dmi: Add IPMI DMI scanning to the DMI code
In reply to [email protected]From: Corey Minyard <[email protected]>
It makes more sense to be there, and it's cleaner with the upcoming conversion of IPMI DMI to a platform device.
--- drivers/firmware/dmi_scan.c | 108 ++++++++++++++++++++++++++++++++++++++++++-- include/linux/dmi.h | 26 +++++++++++ 2 files changed, 129 insertions(+), 5 deletions(-)
drivers/firmware/dmi_scan.c +103 -5
@@ -303,9 +303,105 @@ static void __init dmi_save_oem_strings_devices(const struct dmi_header *dm) } } +#define DMI_IPMI_MIN_LENGTH 0x10 +#define DMI_IPMI_VER2_LENGTH 0x12 +#define DMI_IPMI_TYPE 4 +#define DMI_IPMI_SLAVEADDR 6 +#define DMI_IPMI_ADDR 8 +#define DMI_IPMI_ACCESS 0x10 +#define DMI_IPMI_IRQ 0x11 +#define DMI_IPMI_IO_MASK 0xfffe + +static void __init dmi_decode_ipmi (struct dmi_dev_ipmi *dev, +const struct dmi_header *dm) +{ +const u8 *data = (const u8 *) dm; +unsigned long base_addr; +u8 len = dm->length; +bool slave_addr_set; + +if (len <DMI_IPMI_MIN_LENGTH ) +return ; + + dev->type = data[DMI_IPMI_TYPE ]; + +memcpy (&base_addr, data +DMI_IPMI_ADDR ,sizeof (unsigned long )); +if (len >=DMI_IPMI_VER2_LENGTH ) { +if (dev->type ==IPMI_DMI_TYPE_SSIF ) { +if ((data[DMI_IPMI_ADDR ] >>1 ) ==0 ) { +/* +* Some broken systems put the I2C address in +* the slave address field. We try to +* accommodate them here. +*/ + dev->base_addr = data[DMI_IPMI_SLAVEADDR ] >>1 ; + dev->slave_addr =0 ; + slave_addr_set = true; + }else { + dev->base_addr = data[DMI_IPMI_ADDR ] >>1 ; + } + }else { +if (base_addr &1 ) { +/* I/O */ + base_addr &=DMI_IPMI_IO_MASK ; + dev->is_io_space =1 ; + }else { +/* Memory */ + dev->is_io_space =0 ; + } + +/* +* If bit 4 of byte 0x10 is set, then the lsb +* for the address is odd. +*/ + base_addr |= (data[DMI_IPMI_ACCESS ] >>4 ) &1 ; + + dev->base_addr = base_addr; + dev->irq = data[DMI_IPMI_IRQ ]; + +/* +* The top two bits of byte 0x10 hold the +* register spacing. +*/ +switch ((data[DMI_IPMI_ACCESS ] >>6 ) &3 ) { +case 0 :/* Byte boundaries */ + dev->offset =1 ; +break ; +case 1 :/* 32-bit boundaries */ + dev->offset =4 ; +break ; +case 2 :/* 16-byte boundaries */ + dev->offset =16 ; +break ; +default : +/* Leave 0 for undefined. */ +return ; + } + } + }else { +/* Old DMI spec. */ +/* +* Note that technically, the lower bit of the base +* address should be 1 if the address is I/O and 0 if +* the address is in memory. So many systems get that +* wrong (and all that I have seen are I/O) so we just +* ignore that bit and assume I/O. Systems that use +* memory should use the newer spec, anyway. +*/ + dev->base_addr = base_addr &DMI_IPMI_IO_MASK ; + dev->is_io_space =1 ; + dev->offset =1 ; + } + +if (!slave_addr_set) + dev->slave_addr = data[DMI_IPMI_SLAVEADDR ]; + + dev->good_data =1 ; +} +static void __init dmi_save_ipmi_device (const struct dmi_header *dm) { -struct dmi_device *dev; +struct dmi_dev_ipmi *dev;void *data; data =dmi_alloc (dm->length);
@@ -318,11 +414,13 @@ static void __init dmi_save_ipmi_device(const struct dmi_header *dm)if (!dev)return ; - dev->type =DMI_DEV_TYPE_IPMI ; - dev->name ="IPMI controller" ; - dev->device_data = data; + dev->dev.type =DMI_DEV_TYPE_IPMI ; + dev->dev.name ="IPMI controller" ; + dev->dev.device_data = data; -dmi_devices_list_add (dev); +dmi_decode_ipmi (dev, dm); + +dmi_devices_list_add (&dev->dev); } static void __init dmi_save_dev_pciaddr(int instance, int segment, int bus,
include/linux/dmi.h +26 -0
@@ -97,6 +97,24 @@ struct dmi_dev_onboard {int devfn; }; +/* Device data for an IPMI entry. */ +struct dmi_dev_ipmi { +struct dmi_device dev; +u8 good_data; +u8 type; +u8 is_io_space; +u8 irq; +u8 offset; +u8 slave_addr; +unsigned long base_addr; +}; + +/* dmi_ipmi_data type field */ +#define IPMI_DMI_TYPE_KCS 0x01 +#define IPMI_DMI_TYPE_SMIC 0x02 +#define IPMI_DMI_TYPE_BT 0x03 +#define IPMI_DMI_TYPE_SSIF 0x04 +extern struct kobject *dmi_kobj;extern int dmi_check_system (const struct dmi_system_id *list);const struct dmi_system_id *dmi_first_match (const struct dmi_system_id *list);
@@ -127,6 +145,14 @@ static inline struct dmi_device *to_dmi_device(struct fwnode_handle *fwnode)return NULL ; } +static inline struct dmi_dev_ipmi *to_dmi_dev_ipmi (struct dmi_device *dev) +{ +if (!dev || dev->type !=DMI_DEV_TYPE_IPMI ) +return NULL ; + + return container_of(dev, struct dmi_dev_ipmi, dev); +} +#else static inline int dmi_check_system (const struct dmi_system_id *list) {return 0 ; }
Signature · 1 line
2.7.4
PATCH v5 4/5 dmi: Add IPMI DMI devices as platform devices
In reply to [email protected]From: Corey Minyard <[email protected]>
Have DMI create a platform device for every IPMI device it finds.
--- drivers/firmware/dmi_scan.c | 55 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 53 insertions(+), 2 deletions(-)
drivers/firmware/dmi_scan.c +53 -2
@@ -7,6 +7,7 @@#include <linux/efi.h> #include <linux/bootmem.h> #include <linux/random.h> +#include <linux/platform_device.h> #include <asm/dmi.h> #include <asm/unaligned.h>
@@ -783,6 +784,52 @@ static ssize_t raw_table_read(struct file *file, struct kobject *kobj,return count; } +static void __init dmi_add_platform_ipmi (struct dmi_device *dev,int *nr) +{ +struct platform_device *pdev; +struct dmi_dev_ipmi *ipmi_dev =to_dmi_dev_ipmi (dev); +int rv; + +if (!ipmi_dev->good_data) { +pr_err ("dmi: Invalid IPMI data, not creating platform device" ); +return ; + } + +if (ipmi_dev->type ==IPMI_DMI_TYPE_SSIF ) + pdev =platform_device_alloc ("dmi-ipmi-ssif" , *nr); +else + pdev =platform_device_alloc ("dmi-ipmi-si" , *nr); +if (!pdev) { +pr_err ("dmi: Error allocation IPMI platform device" ); +return ; + } +if (ipmi_dev->type ==IPMI_DMI_TYPE_SSIF ) + pdev->driver_override ="ipmi_ssif" ; +else + pdev->driver_override ="ipmi_si" ; + + pdev->dev.fwnode = &dev->fwnode; + rv =platform_device_add (pdev); +if (rv) { +dev_err (&pdev->dev,"dmi: Unable to add device: %d\n" , rv); +platform_device_del (pdev); +return ; + } + + (*nr)++; +} + +static void __init dmi_add_platform_devices (void ) +{ +struct dmi_device *dev; +int nr_ipmi =0 ; + +list_for_each_entry (dev, &dmi_devices, list) { +if (dev->type ==DMI_DEV_TYPE_IPMI ) +dmi_add_platform_ipmi (dev, &nr_ipmi); + } +} + static BIN_ATTR(smbios_entry_point, S_IRUSR, raw_table_read, NULL, 0); static BIN_ATTR(DMI, S_IRUSR, raw_table_read, NULL, 0);
@@ -823,9 +870,13 @@ static int __init dmi_init(void) bin_attr_DMI.size = dmi_len; bin_attr_DMI.private = dmi_table; ret =sysfs_create_bin_file (tables_kobj, &bin_attr_DMI); -if (!ret) -return 0 ; +if (ret) + goto out_remove_bin_file; + +dmi_add_platform_devices (); +return 0 ; + out_remove_bin_file:sysfs_remove_bin_file (tables_kobj, &bin_attr_smbios_entry_point); err_unmap:
Signature · 1 line
2.7.4
PATCH v5 5/5 ipmi: Convert DMI handling over to a platform device
In reply to [email protected]From: Corey Minyard <[email protected]>
Now that the DMI code creates a platform device for IPMI devices in the firmware, use that instead of handling all the DMI work in the IPMI driver itself.
--- drivers/char/ipmi/ipmi_si_intf.c | 137 ++++++++------------------------------- drivers/char/ipmi/ipmi_ssif.c | 119 ++++++++++++++++++++++------------ 2 files changed, 106 insertions(+), 150 deletions(-)
drivers/char/ipmi/ipmi_si_intf.c +27 -110
@@ -2274,121 +2274,45 @@ static void spmi_find_bmc(void)#endif #ifdef CONFIG_DMI -struct dmi_ipmi_data { -u8 type; -u8 addr_space; -unsigned long base_addr; -u8 irq; -u8 offset; -u8 slave_addr; -}; - -static int decode_dmi (const struct dmi_header *dm, -struct dmi_ipmi_data *dmi) -{ -const u8 *data = (const u8 *)dm; -unsigned long base_addr; -u8 reg_spacing; -u8 len = dm->length; - - dmi->type = data[4 ]; - -memcpy (&base_addr, data+8 ,sizeof (unsigned long )); -if (len >=0x11 ) { -if (base_addr &1 ) { -/* I/O */ - base_addr &=0xFFFE ; - dmi->addr_space =IPMI_IO_ADDR_SPACE ; - }else -/* Memory */ - dmi->addr_space =IPMI_MEM_ADDR_SPACE ; - -/* If bit 4 of byte 0x10 is set, then the lsb for the address -is odd. */ - dmi->base_addr = base_addr | ((data[0x10 ] &0x10 ) >>4 ); - - dmi->irq = data[0x11 ]; - -/* The top two bits of byte 0x10 hold the register spacing. */ - reg_spacing = (data[0x10 ] &0xC0 ) >>6 ; -switch (reg_spacing) { -case 0x00 :/* Byte boundaries */ - dmi->offset =1 ; -break ; -case 0x01 :/* 32-bit boundaries */ - dmi->offset =4 ; -break ; -case 0x02 :/* 16-byte boundaries */ - dmi->offset =16 ; -break ; -default : -/* Some other interface, just ignore it. */ -return -EIO ; - } - }else { -/* Old DMI spec. */ -/* -* Note that technically, the lower bit of the base -* address should be 1 if the address is I/O and 0 if -* the address is in memory. So many systems get that -* wrong (and all that I have seen are I/O) so we just -* ignore that bit and assume I/O. Systems that use -* memory should use the newer spec, anyway. -*/ - dmi->base_addr = base_addr &0xfffe ; - dmi->addr_space =IPMI_IO_ADDR_SPACE ; - dmi->offset =1 ; - } - - dmi->slave_addr = data[6 ]; - -return 0 ; -} - -static void try_init_dmi (struct dmi_ipmi_data *ipmi_data) +static int dmi_ipmi_probe (struct platform_device *pdev) { +struct dmi_device *dmi_dev =to_dmi_device (pdev->dev.fwnode); +struct dmi_dev_ipmi *ipmi_data =to_dmi_dev_ipmi (dmi_dev);struct smi_info *info; +if (!si_trydmi || !ipmi_data) +return -ENODEV ; + info =smi_info_alloc ();if (!info) {pr_err (PFX "Could not allocate SI data\n" ); -return ; +return -ENOMEM ; } info->addr_source =SI_SMBIOS ;pr_info (PFX "probing via SMBIOS\n" );switch (ipmi_data->type) { -case 0x01 :/* KCS */ +case IPMI_DMI_TYPE_KCS : info->si_type =SI_KCS ;break ; -case 0x02 :/* SMIC */ +case IPMI_DMI_TYPE_SMIC : info->si_type =SI_SMIC ;break ; -case 0x03 :/* BT */ +case IPMI_DMI_TYPE_BT : info->si_type =SI_BT ;break ;default :kfree (info); -return ; +return -EINVAL ; } -switch (ipmi_data->addr_space) { -case IPMI_MEM_ADDR_SPACE : - info->io_setup = mem_setup; - info->io.addr_type =IPMI_MEM_ADDR_SPACE ; -break ; - -case IPMI_IO_ADDR_SPACE : +if (ipmi_data->is_io_space) { info->io_setup = port_setup; info->io.addr_type =IPMI_IO_ADDR_SPACE ; -break ; - -default : -kfree (info); -pr_warn (PFX "Unknown SMBIOS I/O Address type: %d\n" , - ipmi_data->addr_space); -return ; + }else { + info->io_setup = mem_setup; + info->io.addr_type =IPMI_MEM_ADDR_SPACE ; } info->io.addr_data = ipmi_data->base_addr;
@@ -2404,6 +2328,8 @@ static void try_init_dmi(struct dmi_ipmi_data *ipmi_data)if (info->irq) info->irq_setup = std_irq_setup; + info->dev = &pdev->dev; + pr_info("ipmi_si: SMBIOS: %s %#lx regsize %d spacing %d irq %d\n", (info->io.addr_type == IPMI_IO_ADDR_SPACE) ? "io" : "mem", info->io.addr_data, info->io.regsize, info->io.regspacing,
@@ -2411,21 +2337,13 @@ static void try_init_dmi(struct dmi_ipmi_data *ipmi_data)if (add_smi (info))kfree (info); -} -static void dmi_find_bmc (void ) + return 0; +} +#else +static int dmi_ipmi_probe (struct platform_device *pdev) { -const struct dmi_device *dev =NULL ; -struct dmi_ipmi_data data; -int rv; - -while ((dev =dmi_find_device (DMI_DEV_TYPE_IPMI ,NULL , dev))) { -memset (&data,0 ,sizeof (data)); - rv =decode_dmi ((const struct dmi_header *) dev->device_data, - &data); -if (!rv) -try_init_dmi (&data); - } +return -ENODEV ; }#endif /* CONFIG_DMI */
@@ -2813,7 +2731,10 @@ static int ipmi_probe(struct platform_device *dev)if (of_ipmi_probe (dev) ==0 )return 0 ; -return acpi_ipmi_probe (dev); +if (acpi_ipmi_probe (dev) ==0 ) +return 0 ; + +return dmi_ipmi_probe (dev); }static int ipmi_remove (struct platform_device *dev)
@@ -3786,11 +3707,6 @@ static int init_ipmi_si(void) }#endif -#ifdef CONFIG_DMI -if (si_trydmi) -dmi_find_bmc (); -#endif -#ifdef CONFIG_ACPI if (si_tryacpi)spmi_find_bmc ();
@@ -3938,6 +3854,7 @@ static void cleanup_ipmi_si(void) }module_exit (cleanup_ipmi_si); +MODULE_ALIAS ("platform:dmi-ipmi-si" );MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Corey Minyard <[email protected]>" ); MODULE_DESCRIPTION("Interface to the IPMI driver for the KCS, SMIC, and BT"
drivers/char/ipmi/ipmi_ssif.c +79 -40
209 lines not on this page · raw message
Signature · 1 line
2.7.4