commit fdf6d7e7cf448b9482062d73a48895afaf38a458
Author: Jordan Hargrave <[email protected]>
Date: Fri Nov 27 20:39:59 2015 -0600
Fix spacing
Check invalid slot entry according to spec
commit 8a7fe87241b93c72cfd6ef818a680a2c7fc2f1c7
Author: Jordan Hargrave <[email protected]>
Date: Thu Nov 26 15:57:24 2015 -0600
Save SMBIOS Type 9 System Slots during DMI Scan
PCI address of onboard devices is currently saved but not for slots.
Cleaned up some code, verify clean patch
PCI address of onboard devices is currently saved but not for slots.
Cleaned up some code, verify clean patch
Signed-off-by: Jordan Hargrave <[email protected]>
---
drivers/firmware/dmi_scan.c | 53 +++++++++++++++++++++++++++++++--------------
include/linux/dmi.h | 1 +
2 files changed, 38 insertions(+), 16 deletions(-)
diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
index ac1ce4a..c6b2828 100644
--- a/drivers/firmware/dmi_scan.c
+++ b/drivers/firmware/dmi_scan.c
@@ -321,26 +321,30 @@ static void __init dmi_save_ipmi_device(const struct dmi_header *dm)
list_add_tail(&dev->list, &dmi_devices);
}
-static void __init dmi_save_dev_onboard(int instance, int segment, int bus,
- int devfn, const char *name)
+static void __init dmi_save_dev_pciaddr(int instance, int segment, int bus,
+ int devfn, const char *name, int type)
{
- struct dmi_dev_onboard *onboard_dev;
+ struct dmi_dev_onboard *dev;
- onboard_dev = dmi_alloc(sizeof(*onboard_dev) + strlen(name) + 1);
- if (!onboard_dev)
+ /* Ignore invalid values */
+ if ((bus == 0 && devfn == 0) || (bus == 0xFF && devfn == 0xFF))
return;
- onboard_dev->instance = instance;
- onboard_dev->segment = segment;
- onboard_dev->bus = bus;
- onboard_dev->devfn = devfn;
+ dev = dmi_alloc(sizeof(*dev) + strlen(name) + 1);
+ if (!dev)
+ return;
- strcpy((char *)&onboard_dev[1], name);
- onboard_dev->dev.type = DMI_DEV_TYPE_DEV_ONBOARD;
- onboard_dev->dev.name = (char *)&onboard_dev[1];
- onboard_dev->dev.device_data = onboard_dev;
+ dev->instance = instance;
+ dev->segment = segment;
+ dev->bus = bus;
+ dev->devfn = devfn;
- list_add(&onboard_dev->dev.list, &dmi_devices);
+ strcpy((char *)&dev[1], name);
+ dev->dev.type = type;
+ dev->dev.name = (char *)&dev[1];
+ dev->dev.device_data = dev;
+
+ list_add(&dev->dev.list, &dmi_devices);
}
static void __init dmi_save_extended_devices(const struct dmi_header *dm)
@@ -351,11 +355,25 @@ static void __init dmi_save_extended_devices(const struct dmi_header *dm)
if ((*d & 0x80) == 0)
return;
- dmi_save_dev_onboard(*(d+1), *(u16 *)(d+2), *(d+4), *(d+5),
- dmi_string_nosave(dm, *(d-1)));
+ dmi_save_dev_pciaddr(*(d+1), *(u16 *)(d+2), *(d+4), *(d+5),
+ dmi_string_nosave(dm, *(d-1)),
+ DMI_DEV_TYPE_DEV_ONBOARD);
dmi_save_one_device(*d & 0x7f, dmi_string_nosave(dm, *(d - 1)));
}
+static void __init dmi_save_system_slot(const struct dmi_header *dm)
+{
+ const u8 *d = (u8 *)dm;
+
+ /* Need SMBIOS 2.6+ structure */
+ if (dm->length < 0x11)
+ return;
+ dmi_save_dev_pciaddr(*(u16 *)(d + 0x9), *(u16 *)(d + 0xD),
+ *(d + 0xF), *(d + 0x10),
+ dmi_string_nosave(dm, *(d + 0x4)),
+ DMI_DEV_TYPE_DEV_SLOT);
+}
+
static void __init count_mem_devices(const struct dmi_header *dm, void *v)
{
if (dm->type != DMI_ENTRY_MEM_DEVICE)
@@ -426,6 +444,9 @@ static void __init dmi_decode(const struct dmi_header *dm, void *dummy)
dmi_save_ident(dm, DMI_CHASSIS_SERIAL, 7);
dmi_save_ident(dm, DMI_CHASSIS_ASSET_TAG, 8);
break;
+ case 9: /* System Slots */
+ dmi_save_system_slot(dm);
+ break;
case 10: /* Onboard Devices Information */
dmi_save_devices(dm);
break;
diff --git a/include/linux/dmi.h b/include/linux/dmi.h
index 5055ac3..5e9c74c 100644
--- a/include/linux/dmi.h
+++ b/include/linux/dmi.h
@@ -22,6 +22,7 @@ enum dmi_device_type {
DMI_DEV_TYPE_IPMI = -1,
DMI_DEV_TYPE_OEM_STRING = -2,
DMI_DEV_TYPE_DEV_ONBOARD = -3,
+ DMI_DEV_TYPE_DEV_SLOT = -4,
};
enum dmi_entry_type {
--
1.9.1
---
drivers/firmware/dmi_scan.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
index c6b2828..6abba82 100644
--- a/drivers/firmware/dmi_scan.c
+++ b/drivers/firmware/dmi_scan.c
@@ -327,7 +327,8 @@ static void __init dmi_save_dev_pciaddr(int instance, int segment, int bus,
struct dmi_dev_onboard *dev;
/* Ignore invalid values */
- if ((bus == 0 && devfn == 0) || (bus == 0xFF && devfn == 0xFF))
+ if (type == DMI_DEV_TYPE_DEV_SLOT &&
+ segment == 0xFFFF && bus == 0xFF && devfn == 0xFF)
return;
dev = dmi_alloc(sizeof(*dev) + strlen(name) + 1);
@@ -445,8 +446,8 @@ static void __init dmi_decode(const struct dmi_header *dm, void *dummy)
dmi_save_ident(dm, DMI_CHASSIS_ASSET_TAG, 8);
break;
case 9: /* System Slots */
- dmi_save_system_slot(dm);
- break;
+ dmi_save_system_slot(dm);
+ break;
case 10: /* Onboard Devices Information */
dmi_save_devices(dm);
break;
--
1.9.1
Hi Jordan,
On Fri, 27 Nov 2015 20:45:55 -0600, Jordan Hargrave wrote:
> commit fdf6d7e7cf448b9482062d73a48895afaf38a458
> Author: Jordan Hargrave <[email protected]>
> Date: Fri Nov 27 20:39:59 2015 -0600
>
> Fix spacing
> Check invalid slot entry according to spec
>
> commit 8a7fe87241b93c72cfd6ef818a680a2c7fc2f1c7
> Author: Jordan Hargrave <[email protected]>
> Date: Thu Nov 26 15:57:24 2015 -0600
>
> Save SMBIOS Type 9 System Slots during DMI Scan
>
> PCI address of onboard devices is currently saved but not for slots.
>
> Cleaned up some code, verify clean patch
>
> PCI address of onboard devices is currently saved but not for slots.
>
> Cleaned up some code, verify clean patch
>
> Signed-off-by: Jordan Hargrave <[email protected]>
> ---
> drivers/firmware/dmi_scan.c | 53 +++++++++++++++++++++++++++++++--------------
> include/linux/dmi.h | 1 +
> 2 files changed, 38 insertions(+), 16 deletions(-)
> (...)
Format is awful but result is correct. Next time please rebase cleanly
your patch. For this time I'll do it, I must adjust it due to my own
patches anyway. So consider it applied.
Thanks,
--
Jean Delvare
SUSE L3 Support