Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5b6c151 authored by Jordan Hargrave's avatar Jordan Hargrave Committed by Jean Delvare
Browse files

firmware: dmi_scan: Save SMBIOS Type 9 System Slots 



Save SMBIOS Type 9 System Slots during DMI scan. PCI address of
onboard devices was already saved but not for slots.

Signed-off-by: default avatarJordan Hargrave <jordan_hargrave@dell.com>
Signed-off-by: default avatarJean Delvare <jdelvare@suse.de>
parent bfab8b48

drivers/firmware/dmi_scan.c

+36 −15
Original line number Diff line number Diff line
@@ -321,26 +321,31 @@ 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 (type == DMI_DEV_TYPE_DEV_SLOT &&

	    segment == 0xFFFF && 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)
@@ -353,10 +358,23 @@ static void __init dmi_save_extended_devices(const struct dmi_header *dm) 
		return;



	name = dmi_string_nosave(dm, d[0x4]);

	dmi_save_dev_onboard(d[0x6], *(u16 *)(d + 0x7), d[0x9], d[0xA], name);

	dmi_save_dev_pciaddr(d[0x6], *(u16 *)(d + 0x7), d[0x9], d[0xA], name,

			     DMI_DEV_TYPE_DEV_ONBOARD);

	dmi_save_one_device(d[0x5] & 0x7f, name);

}



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)
@@ -427,6 +445,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;

include/linux/dmi.h

+1 −0
Original line number Diff line number Diff line
@@ -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 {