dmi: Rework to get IPMI autoloading from DMI tables
Subsystems (5)
cover dmi: Rework to get IPMI autoloading from DMI tables
The IPMI driver would not auto-load from DMI tables. So these patches creates a platform device from an IPMI DMI table entry, and then modify the IPMI driver to handle all this.
I followed how ACPI works mostly, with a fwnode and such. But greatly simplified, of course :).
I'm no sure if patch 4 is done in the right place. Maybe it would be better in the IPMI driver directory? But it's pretty clean where it is.
Also, I wasn't quite sure about the name of the device. If the device was named ipmi_si or ipmi_ssif, the driver override would not be required, but then you really couldn't tell it came from DMI.
You could also create a firmware_node like ACPI does, but that might be overkill.
-corey
PATCH 1/4 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.5.0
PATCH 2/4 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 | 34 ++++++++++++++++++++++++---------- include/linux/dmi.h | 24 ++++++++++++++++++++++++ include/linux/fwnode.h | 1 + 3 files changed, 49 insertions(+), 10 deletions(-)
drivers/firmware/dmi_scan.c +24 -10
@@ -41,6 +41,16 @@ static struct dmi_memdev_info { } *dmi_memdev;static int dmi_memdev_nr; +static void *dmi_zalloc (unsigned len) +{ +void *ret =dmi_alloc (len); + +if (ret) +memset (ret,0 , len); + +return ret; +} +static const char *__init dmi_string_nosave (const struct dmi_header *dm,u8 s) {const u8 *bp = ((u8 *) dm) + dm->length;
@@ -242,6 +252,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;
@@ -250,15 +266,14 @@ static void __init dmi_save_one_device(int type, const char *name)if (dmi_find_device (type, name,NULL ))return ; - dev =dmi_alloc (sizeof (*dev) +strlen (name) +1 ); + dev =dmi_zalloc (sizeof (*dev) +strlen (name) +1 );if (!dev)return ; 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)
@@ -287,15 +302,14 @@ static void __init dmi_save_oem_strings_devices(const struct dmi_header *dm)if (devname == dmi_empty_string)continue ; - dev =dmi_alloc (sizeof (*dev)); + dev =dmi_zalloc (sizeof (*dev));if (!dev)break ; 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); } }
@@ -310,7 +324,7 @@ static void __init dmi_save_ipmi_device(const struct dmi_header *dm)memcpy (data, dm, dm->length); - dev =dmi_alloc (sizeof (*dev)); + dev =dmi_zalloc (sizeof (*dev));if (!dev)return ;
@@ -318,7 +332,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,
@@ -331,7 +345,7 @@ static void __init dmi_save_dev_pciaddr(int instance, int segment, int bus, segment == 0xFFFF && bus == 0xFF && devfn == 0xFF)return ; - dev =dmi_alloc (sizeof (*dev) +strlen (name) +1 ); + dev =dmi_zalloc (sizeof (*dev) +strlen (name) +1 );if (!dev)return ;
@@ -345,7 +359,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 +24 -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 ; }
@@ -144,6 +158,16 @@ static inline void dmi_memdev_name(u16 handle, const char **bank,static inline const struct dmi_system_id *dmi_first_match (const struct dmi_system_id *list) {return NULL ; } +static inline bool is_dmi_fwnode (struct fwnode_handle *fwnode) +{ + return false +} + +static inline struct dmi_fwnode *to_dmi_device (struct fwnode_handle *fwnode) +{ +return NULL ; +} +#endif #endif /* __DMI_H__ */
include/linux/fwnode.h +1 -0
@@ -19,6 +19,7 @@ enum fwnode_type {FWNODE_ACPI_DATA ,FWNODE_PDATA ,FWNODE_IRQCHIP , + FWNODE_DMI, }; struct fwnode_handle {
Signature · 1 line
2.5.0
kbuild test robot
build botRe: [PATCH 2/4] dmi: Add a DMI firmware node and handling
reproduce:
Hi Corey,
[auto build test ERROR on char-misc/char-misc-testing]
[also build test ERROR on v4.5-rc1 next-20160129]
[if your patch is applied to the wrong git tree, please drop us a note to help improving the system]
url: https://github.com/0day-ci/linux/commits/minyard-acm-org/dmi-Rework-to-get-IPMI-autoloading-from-DMI-tables/20160130-074830 config: i386-tinyconfig (attached as .config) reproduce: # save the attached .config to linux build tree make ARCH=i386
All errors (new ones prefixed by >>):
In file included from arch/x86/kernel/setup.c:46:0:
include/linux/dmi.h: In function 'is_dmi_fwnode':
>> include/linux/dmi.h:164:1: error: expected ';' before '}' token
}
^vim +164 include/linux/dmi.h
158 static inline const struct dmi_system_id *
159 dmi_first_match(const struct dmi_system_id *list) { return NULL; }
160
161 static inline bool is_dmi_fwnode(struct fwnode_handle *fwnode)
162 {
163 return false
> 164 }
165
166 static inline struct dmi_fwnode *to_dmi_device(struct fwnode_handle *fwnode)
167 {
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
Re: [PATCH 2/4] dmi: Add a DMI firmware node and handling
Dang, I've been doing too much Python. I've fixed this, but I guess I'll wait for more comments.
-corey
Quoted 36 lines · kbuild test robot
Hi Corey,
[auto build test ERROR on char-misc/char-misc-testing]
[also build test ERROR on v4.5-rc1 next-20160129]
[if your patch is applied to the wrong git tree, please drop us a note to help improving the system]url: https://github.com/0day-ci/linux/commits/minyard-acm-org/dmi-Rework-to-get-IPMI-autoloading-from-DMI-tables/20160130-074830 config: i386-tinyconfig (attached as .config) reproduce: # save the attached .config to linux build tree make ARCH=i386All errors (new ones prefixed by >>):
In file included from
arch/x86/kernel/setup.c:46:0:
include/linux/dmi.h: In function 'is_dmi_fwnode':Quoted 1 line
Quoted 1 line
include/linux/dmi.h:164:1: error: expected ';' before '}' token} ^vim +164
include/linux/dmi.h158 static inline const struct dmi_system_id * 159 dmi_first_match(const struct dmi_system_id *list) { return NULL; } 160 161 static inline bool is_dmi_fwnode(struct fwnode_handle *fwnode) 162 { 163 return falseQuoted 1 line
164 }
165 166 static inline struct dmi_fwnode *to_dmi_device(struct fwnode_handle *fwnode) 167 {---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
kbuild test robot
build botRe: [PATCH 2/4] dmi: Add a DMI firmware node and handling
In reply to [email protected]reproduce:
Hi Corey,
[auto build test WARNING on char-misc/char-misc-testing]
[also build test WARNING on v4.5-rc1 next-20160129]
[if your patch is applied to the wrong git tree, please drop us a note to help improving the system]
url: https://github.com/0day-ci/linux/commits/minyard-acm-org/dmi-Rework-to-get-IPMI-autoloading-from-DMI-tables/20160130-074830 config: i386-randconfig-s0-201604 (attached as .config) reproduce: # save the attached .config to linux build tree make ARCH=i386
All warnings (new ones prefixed by >>):
>> WARNING: vmlinux.o(.text.unlikely+0xe634): Section mismatch in reference from the function dmi_zalloc() to the function .init.text:extend_brk()
The function dmi_zalloc() references
the function __init extend_brk().
This is often because dmi_zalloc lacks a __init annotation or the annotation of extend_brk is wrong.
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
Re: [PATCH 2/4] dmi: Add a DMI firmware node and handling
In reply to [email protected]Quoted 4 lines · On Fri, Jan 29, 2016 at 2:43 PM, <[email protected]> wrote:
From: Corey Minyard <[email protected]>
This is so that an IPMI platform device can be created from a DMI firmware entry.
This doesn't apply for me. What's it based on?
--Andy
Re: [PATCH 2/4] dmi: Add a DMI firmware node and handling
Quoted 8 lines · Andy Lutomirski
Quoted 4 lines · On Fri, Jan 29, 2016 at 2:43 PM, <[email protected]> wrote:
From: Corey Minyard <[email protected]>
This is so that an IPMI platform device can be created from a DMI firmware entry.
This doesn't apply for me. What's it based on?
--Andy
It was off of Linus' master a couple of days ago. I just rebased to the latest and it applied cleanly.
I can resend, if you like.
Thanks,
-corey
Re: [PATCH 2/4] dmi: Add a DMI firmware node and handling
In reply to [email protected]Hi Corey,
I won't comment on the IPMI side of this as this isn't my area. However I have a comment on the DMI part:
Quoted 40 lines · Le Friday 29 January 2016 à 16:43 -0600, [email protected] a écrit :
From: Corey Minyard <[email protected]>
This is so that an IPMI platform device can be created from a DMI firmware entry.
Signed-off-by Corey Minyard <[email protected]>Cc Jean Delvare <[email protected]>Cc Andy Lutomirski <[email protected]>--- drivers/firmware/dmi_scan.c | 34 ++++++++++++++++++++++++---------- include/linux/dmi.h | 24 ++++++++++++++++++++++++ include/linux/fwnode.h | 1 + 3 files changed, 49 insertions(+), 10 deletions(-)drivers/firmware/dmi_scan.c +10
-0@@ -41,6 +41,16 @@ static struct dmi_memdev_info { } *dmi_memdev;static int dmi_memdev_nr; +static void *dmi_zalloc (unsigned len) +{ +void *ret =dmi_alloc (len); + +if (ret) +memset (ret,0 , len); + +return ret; +} +static const char *__init dmi_string_nosave (const struct dmi_header *dm,u8 s) {const u8 *bp = ((u8 *) dm) + dm->length;@@ -242,6 +252,12 @@ static void __init dmi_save_type(const struct dmi_header *dm, int slot,@@ -250,15 +266,14 @@ static void __init dmi_save_one_device(int type, const char *name)if (dmi_find_device (type, name,NULL ))return ;
drivers/firmware/dmi_scan.c static void __init dmi_save_one_device(int type, const char *name) · line 260
Quoted 10 lines
drivers/firmware/dmi_scan.c +1
-2- dev =dmi_alloc (sizeof (*dev) +strlen (name) +1 ); + dev =dmi_zalloc (sizeof (*dev) +strlen (name) +1 );if (!dev)return ; dev->type = type;strcpy ((char *)(dev +1 ), name); dev->name = (char *)(dev +1 ); - dev->device_data =NULL ;
This change seems rather unrelated, and I'm not sure what purpose it serves. On ia64 and arm64 it is clearly redundant as dmi_alloc calls kzalloc directly. On x86_64, extend_brk is called instead (don't ask me why, I have no clue) but looking at the code I see that it does memset(ret, 0, size) as well so memory is also zeroed there. Which makes dmi_alloc the same as dmi_zalloc on all 3 architectures.
So please revert this change. This will make your patch easier to review, too.
Signature · 2 lines
Jean Delvare SUSE L3 Support
Re: [PATCH 2/4] dmi: Add a DMI firmware node and handling
Quoted 63 lines · Jean Delvare
Hi Corey,
I won't comment on the IPMI side of this as this isn't my area. However I have a comment on the DMI part:
Quoted 40 lines · Le Friday 29 January 2016 à 16:43 -0600, [email protected] a écrit :
From: Corey Minyard <[email protected]>
This is so that an IPMI platform device can be created from a DMI firmware entry.
Signed-off-by Corey Minyard <[email protected]>Cc Jean Delvare <[email protected]>Cc Andy Lutomirski <[email protected]>--- drivers/firmware/dmi_scan.c | 34 ++++++++++++++++++++++++---------- include/linux/dmi.h | 24 ++++++++++++++++++++++++ include/linux/fwnode.h | 1 + 3 files changed, 49 insertions(+), 10 deletions(-)drivers/firmware/dmi_scan.c +10
-0@@ -41,6 +41,16 @@ static struct dmi_memdev_info { } *dmi_memdev;static int dmi_memdev_nr; +static void *dmi_zalloc (unsigned len) +{ +void *ret =dmi_alloc (len); + +if (ret) +memset (ret,0 , len); + +return ret; +} +static const char *__init dmi_string_nosave (const struct dmi_header *dm,u8 s) {const u8 *bp = ((u8 *) dm) + dm->length;@@ -242,6 +252,12 @@ static void __init dmi_save_type(const struct dmi_header *dm, int slot,@@ -250,15 +266,14 @@ static void __init dmi_save_one_device(int type, const char *name)if (dmi_find_device (type, name,NULL ))return ;drivers/firmware/dmi_scan.c static void __init dmi_save_one_device(int type, const char *name) · line 260
Quoted 10 lines
drivers/firmware/dmi_scan.c +1
-2- dev =dmi_alloc (sizeof (*dev) +strlen (name) +1 ); + dev =dmi_zalloc (sizeof (*dev) +strlen (name) +1 );if (!dev)return ; dev->type = type;strcpy ((char *)(dev +1 ), name); dev->name = (char *)(dev +1 ); - dev->device_data =NULL ;This change seems rather unrelated, and I'm not sure what purpose it serves. On ia64 and arm64 it is clearly redundant as
dmi_alloccalls kzalloc directly. Onx86_64,extend_brkis called instead (don't ask me why, I have no clue) but looking at the code I see that it doesmemset(ret, 0, size)as well so memory is also zeroed there. Which makesdmi_allocthe same asdmi_zallocon all 3 architectures.
Quoted 3 lines
So please revert this change. This will make your patch easier to review, too.
Ok. I had assumed extend_break wasn't zeroing since there were all the NULL assignments, I should have looked.
I was thinking about this, and the fwnode could just be added to the IPMI device. I'm not sure if you would prefer that over adding it to dmi_device. The fwnode is in acpi_device, and I was modelling these changes after that, but maybe that's not required here.
Thanks,
-corey
Re: [PATCH 2/4] dmi: Add a DMI firmware node and handling
Quoted 68 lines · Corey Minyard
Quoted 63 lines · Jean Delvare
Hi Corey,
I won't comment on the IPMI side of this as this isn't my area. However I have a comment on the DMI part:
Quoted 38 lines · Le Friday 29 January 2016 à 16:43 -0600, [email protected] a écrit :
From: Corey Minyard <[email protected]>
This is so that an IPMI platform device can be created from a DMI firmware entry.
Signed-off-by Corey Minyard <[email protected]>Cc Jean Delvare <[email protected]>Cc Andy Lutomirski <[email protected]>--- drivers/firmware/dmi_scan.c | 34 ++++++++++++++++++++++++---------- include/linux/dmi.h | 24 ++++++++++++++++++++++++ include/linux/fwnode.h | 1 + 3 files changed, 49 insertions(+), 10 deletions(-)drivers/firmware/dmi_scan.c +9
-0@@ -41,6 +41,16 @@ static struct dmi_memdev_info { } *dmi_memdev;static int dmi_memdev_nr; +static void *dmi_zalloc(unsigned len) +{ +void *ret =dmi_alloc (len); + +if (ret) +memset (ret,0 , len); + +return ret; +} +static const char *__init dmi_string_nosave (const struct dmi_header *dm,u8 s) {const u8 *bp = ((u8 *) dm) + dm->length;@@ -242,6 +252,12 @@ static void __init dmi_save_type(const struct dmi_header *dm, int slot,drivers/firmware/dmi_scan.c static void __init dmi_save_one_device(int type, const char *name) · line 258
Quoted 10 lines
drivers/firmware/dmi_scan.c +1
-1@@ -250,15 +266,14 @@ static void __init dmi_save_one_device(int type, const char *name)if (dmi_find_device (type, name,NULL ))return ; - dev =dmi_alloc (sizeof (*dev) +strlen (name) +1 ); + dev =dmi_zalloc (sizeof (*dev) +strlen (name) +1 );if (!dev)return ; dev->type = type;strcpy ((char *)(dev +1 ), name); dev->name = (char *)(dev +1 ); - dev->device_data =NULL ;This change seems rather unrelated, and I'm not sure what purpose it serves. On ia64 and arm64 it is clearly redundant as
dmi_alloccalls kzalloc directly. Onx86_64,extend_brkis called instead (don't ask me why, I have no clue) but looking at the code I see that it doesmemset(ret, 0, size)as well so memory is also zeroed there. Which makesdmi_allocthe same asdmi_zallocon all 3 architectures.Quoted 3 lines
So please revert this change. This will make your patch easier to review, too.
Quoted 6 lines
Ok. I had assumed
extend_breakwasn't zeroing since there were all the NULL assignments, I should have looked.I was thinking about this, and the fwnode could just be added to the IPMI device. I'm not sure if you would prefer that over adding it to
dmi_device. The fwnode is inacpi_device, and I was modelling these changes after that, but maybe that's not required here.
I think dmi_device is right, especially if your patches result in a firmware_node sysfs link being created. That way the link will point to the right place.
--Andy
Re: [PATCH 2/4] dmi: Add a DMI firmware node and handling
Quoted 68 lines · Andy Lutomirski
Quoted 67 lines · Corey Minyard
Quoted 60 lines · Jean Delvare
Hi Corey,
I won't comment on the IPMI side of this as this isn't my area. However I have a comment on the DMI part:
Quoted 37 lines · Le Friday 29 January 2016 à 16:43 -0600, [email protected] a écrit :
From: Corey Minyard <[email protected]>
This is so that an IPMI platform device can be created from a DMI firmware entry.
Signed-off-by Corey Minyard <[email protected]>Cc Jean Delvare <[email protected]>Cc Andy Lutomirski <[email protected]>--- drivers/firmware/dmi_scan.c | 34 ++++++++++++++++++++++++---------- include/linux/dmi.h | 24 ++++++++++++++++++++++++ include/linux/fwnode.h | 1 + 3 files changed, 49 insertions(+), 10 deletions(-)drivers/firmware/dmi_scan.c +9
-0@@ -41,6 +41,16 @@ static struct dmi_memdev_info { } *dmi_memdev;static int dmi_memdev_nr; +static void *dmi_zalloc(unsigned len) +{ +void *ret =dmi_alloc (len); + +if (ret) +memset (ret,0 , len); + +return ret; +} +static const char *__init dmi_string_nosave (const struct dmi_header *dm,u8 s) {const u8 *bp = ((u8 *) dm) + dm->length;@@ -242,6 +252,12 @@ static void __init dmi_save_type(const struct dmi_header *dm, int slot,drivers/firmware/dmi_scan.c static void __init dmi_save_one_device(int type, const char *name) · line 258
Quoted 10 lines
drivers/firmware/dmi_scan.c +1
-1@@ -250,15 +266,14 @@ static void __init dmi_save_one_device(int type, const char *name)if (dmi_find_device (type, name,NULL ))return ; - dev =dmi_alloc (sizeof (*dev) +strlen (name) +1 ); + dev =dmi_zalloc (sizeof (*dev) +strlen (name) +1 );if (!dev)return ; dev->type = type;strcpy ((char *)(dev +1 ), name); dev->name = (char *)(dev +1 ); - dev->device_data =NULL ;This change seems rather unrelated, and I'm not sure what purpose it serves. On ia64 and arm64 it is clearly redundant as
dmi_alloccalls kzalloc directly. Onx86_64,extend_brkis called instead (don't ask me why, I have no clue) but looking at the code I see that it doesmemset(ret, 0, size)as well so memory is also zeroed there. Which makesdmi_allocthe same asdmi_zallocon all 3 architectures.Quoted 3 lines
So please revert this change. This will make your patch easier to review, too.
Ok. I had assumed
extend_breakwasn't zeroing since there were all the NULL assignments, I should have looked.
Quoted 6 lines
Quoted 3 lines
I was thinking about this, and the fwnode could just be added to the IPMI device. I'm not sure if you would prefer that over adding it to
dmi_device. The fwnode is inacpi_device, and I was modelling these changes after that, but maybe that's not required here.I think
dmi_deviceis right, especially if your patches result in afirmware_nodesysfs link being created. That way the link will point to the right place.
Yeah, that's the conclusion I had come to, I think. It doesn't currently add the firmware_node to sysfs, but that's easily added and probably a next logical step.
I'll have a new set of patches out today after I compile test at each step.
Thanks,
-corey
PATCH 3/4 dmi: Move 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/char/ipmi/ipmi_si_intf.c | 119 +++++++-------------------------------- drivers/char/ipmi/ipmi_ssif.c | 40 +++++-------- drivers/firmware/dmi_scan.c | 108 +++++++++++++++++++++++++++++++++-- include/linux/dmi.h | 26 +++++++++ 4 files changed, 162 insertions(+), 131 deletions(-)
drivers/char/ipmi/ipmi_si_intf.c +20 -99
@@ -2272,98 +2272,36 @@ 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) +static void try_init_dmi (struct dmi_device *dmi_dev) { -const u8 *data = (const u8 *)dm; -unsigned long base_addr; -u8 reg_spacing; -u8 len = dm->length; +struct dmi_dev_ipmi *ipmi_data =to_dmi_dev_ipmi (dmi_dev); +struct smi_info *info; - dmi->type = data[4 ]; +if (!ipmi_data) +return ; -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 ; +if (!ipmi_data->good_data) { +pr_err (PFX "DMI data for this device was invalid.\n" ); +return ; } - dmi->slave_addr = data[6 ]; - -return 0 ; -} - -static void try_init_dmi (struct dmi_ipmi_data *ipmi_data) -{ -struct smi_info *info; - info =smi_info_alloc ();if (!info) { - printk(KERN_ERR PFX "Could not allocate SI data\n"); +pr_err (PFX "Could not allocate SI data\n" );return ; } info->addr_source =SI_SMBIOS ; - printk(KERN_INFO PFX "probing via SMBIOS\n"); +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 :
@@ -2371,22 +2309,12 @@ static void try_init_dmi(struct dmi_ipmi_data *ipmi_data)return ; } -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); - printk(KERN_WARNING 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;
@@ -2413,17 +2341,10 @@ static void try_init_dmi(struct dmi_ipmi_data *ipmi_data)static void dmi_find_bmc (void ) { -const struct dmi_device *dev =NULL ; -struct dmi_ipmi_data data; -int rv; +struct dmi_device *dev =NULL ; -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); - } +while ((dev =dmi_find_device (DMI_DEV_TYPE_IPMI ,NULL , dev))) +try_init_dmi (dev); }#endif /* CONFIG_DMI */
drivers/char/ipmi/ipmi_ssif.c +13 -27
@@ -1906,42 +1906,28 @@ static void spmi_find_bmc(void) { }#endif #ifdef CONFIG_DMI -static int decode_dmi (const struct dmi_device *dmi_dev) +static int decode_dmi (struct dmi_device *dmi_dev) { -struct dmi_header *dm = dmi_dev->device_data; -u8 *data = (u8 *) dm; -u8 len = dm->length; -unsigned short myaddr; -int slave_addr; - -if (num_addrs >=MAX_SSIF_BMCS ) -return -1 ; +struct dmi_dev_ipmi *ipmi_data =to_dmi_dev_ipmi (dmi_dev); -if (len <9 ) -return -1 ; - -if (data[0x04 ] !=4 )/* Not SSIF */ -return -1 ; +if (!ipmi_data) +return -ENODEV ; -if ((data[8 ] >>1 ) ==0 ) { -/* -* Some broken systems put the I2C address in -* the slave address field. We try to -* accommodate them here. -*/ - myaddr = data[6 ] >>1 ; - slave_addr =0 ; - }else { - myaddr = data[8 ] >>1 ; - slave_addr = data[6 ]; +if (!ipmi_data->good_data) { +pr_err (PFX "DMI data for this device was invalid.\n" ); +return -EINVAL ; } -return new_ssif_client (myaddr,NULL ,0 ,0 ,SI_SMBIOS ); +if (ipmi_data->type !=IPMI_DMI_TYPE_SSIF ) +return -ENODEV ; + +return new_ssif_client (ipmi_data->base_addr,NULL ,0 , + ipmi_data->slave_addr,SI_SMBIOS ); }static void dmi_iterator (void ) { -const struct dmi_device *dev =NULL ; +struct dmi_device *dev =NULL ;while ((dev =dmi_find_device (DMI_DEV_TYPE_IPMI ,NULL , dev)))decode_dmi (dev);
drivers/firmware/dmi_scan.c +103 -5
123 lines not on this page · raw message
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.5.0
PATCH 4/4 dmi/ipmi: 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.
This requires some modification of the IPMI driver to find the IPMI devices as platform devices.
--- drivers/char/ipmi/ipmi_si_intf.c | 42 +++++++++---------- drivers/char/ipmi/ipmi_ssif.c | 87 ++++++++++++++++++++++++++++++++-------- drivers/firmware/dmi_scan.c | 55 ++++++++++++++++++++++++- 3 files changed, 142 insertions(+), 42 deletions(-)
drivers/char/ipmi/ipmi_si_intf.c +19 -23
@@ -2272,23 +2272,19 @@ static void spmi_find_bmc(void)#endif #ifdef CONFIG_DMI -static void try_init_dmi (struct dmi_device *dmi_dev) +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 (!ipmi_data) -return ; - -if (!ipmi_data->good_data) { -pr_err (PFX "DMI data for this device was invalid.\n" ); -return ; - } +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 ;
@@ -2306,7 +2302,7 @@ static void try_init_dmi(struct dmi_device *dmi_dev)break ;default :kfree (info); -return ; +return -EINVAL ; }if (ipmi_data->is_io_space) {
@@ -2330,6 +2326,8 @@ static void try_init_dmi(struct dmi_device *dmi_dev)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,
@@ -2337,14 +2335,13 @@ static void try_init_dmi(struct dmi_device *dmi_dev)if (add_smi (info))kfree (info); -} -static void dmi_find_bmc (void ) + return 0; +} +#else +static int dmi_ipmi_probe (struct platform_device *pdev) { -struct dmi_device *dev =NULL ; - -while ((dev =dmi_find_device (DMI_DEV_TYPE_IPMI ,NULL , dev))) -try_init_dmi (dev); +return -ENODEV ; }#endif /* CONFIG_DMI */
@@ -2729,7 +2726,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)
@@ -3446,7 +3446,7 @@ static int add_smi(struct smi_info *new_smi) si_to_str[new_smi->si_type]);mutex_lock (&smi_infos_lock);if (!is_new_interface (new_smi)) { -printk (KERN_CONT " duplicate interface\n" ); +printk (KERN_CONT ": duplicate interface\n" ); rv = -EBUSY ; goto out_err; }
@@ -3737,11 +3737,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 ();
@@ -3902,6 +3897,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 +70 -17
181 lines not on this page · raw message
drivers/firmware/dmi_scan.c +53 -2
74 lines not on this page · raw message
Signature · 1 line
2.5.0