From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756073AbbKRWNR (ORCPT ); Wed, 18 Nov 2015 17:13:17 -0500 Received: from ausc60ps301.us.dell.com ([143.166.148.206]:4594 "EHLO ausc60ps301.us.dell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750735AbbKRWNP (ORCPT ); Wed, 18 Nov 2015 17:13:15 -0500 X-Greylist: delayed 572 seconds by postgrey-1.27 at vger.kernel.org; Wed, 18 Nov 2015 17:13:15 EST DomainKey-Signature: s=smtpout; d=dell.com; c=nofws; q=dns; h=X-LoopCount0:X-IronPort-AV:From:To:Cc:Subject:Date: Message-Id:X-Mailer:To; b=hZTCmyKFzsC5Vc3/zAu31f2+6dgWMfMgiFmI45BwzpzdgD5U/MjIYvF3 xl1MXJbB5GNW3kLJg4ebBjwNu0DkmJ/Av2OMv0TjCn6d8a8ZKyqN0/qT0 LcCbuWX8O36L2NXTlofW3qVSnZSjOLee0N712qZOK+rs2cjz32jlaacNr o=; X-LoopCount0: from 10.208.46.141 X-IronPort-AV: E=Sophos;i="5.20,314,1444712400"; d="scan'208";a="759634898" From: Jordan Hargrave To: linux-kernel@vger.kernel.org, jdelvare@suse.com, jharg93@gmail.com Cc: Jordan Hargrave Subject: [PATCH 1/2] Save SMBIOS Type 9 System Slots during DMI Scan Date: Wed, 18 Nov 2015 16:02:14 -0600 Message-Id: <1447884134-31504-1-git-send-email-Jordan_Hargrave@dell.com> X-Mailer: git-send-email 1.7.1 To: Jordan_Hargrave@dell.com Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org PCI address of onboard devices is currently saved but not for slots. Signed-off-by: Jordan Hargrave --- drivers/firmware/dmi_scan.c | 39 +++++++++++++++++++++++++++++++++++++++ include/linux/dmi.h | 1 + 2 files changed, 40 insertions(+) diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c index ac1ce4a..43cb7db 100644 --- a/drivers/firmware/dmi_scan.c +++ b/drivers/firmware/dmi_scan.c @@ -356,6 +356,41 @@ static void __init dmi_save_extended_devices(const struct dmi_header *dm) dmi_save_one_device(*d & 0x7f, dmi_string_nosave(dm, *(d - 1))); } +static void __init dmi_save_dev_slot(int instance, int segment, int bus, int devfn, const char *name) +{ + struct dmi_dev_onboard *slot; + + slot = dmi_alloc(sizeof(*slot) + strlen(name) + 1); + if (!slot) { + printk(KERN_ERR "dmi_save_system_slot: out of memory.\n"); + return; + } + slot->instance = instance; + slot->segment = segment; + slot->bus = bus; + slot->devfn = devfn; + + strcpy((char *)&slot[1], name); + slot->dev.type = DMI_DEV_TYPE_SYSTEM_SLOT; + slot->dev.name = (char *)&slot[1]; + slot->dev.device_data = slot; + + list_add(&slot->dev.list, &dmi_devices); +} + + +static void __init dmi_save_system_slot(const struct dmi_header *dm) +{ + const char *name; + const u8 *d = (u8*)dm; + + if (dm->type == DMI_ENTRY_SYSTEM_SLOT && dm->length >= 0x11) { + name = dmi_string_nosave(dm, *(d + 0x04)); + dmi_save_dev_slot(*(u16 *)(d + 0x09), *(u16 *)(d + 0xD), + *(d + 0xF), *(d + 0x10), name); + } +} + static void __init count_mem_devices(const struct dmi_header *dm, void *v) { if (dm->type != DMI_ENTRY_MEM_DEVICE) @@ -437,6 +472,10 @@ static void __init dmi_decode(const struct dmi_header *dm, void *dummy) break; case 41: /* Onboard Devices Extended Information */ dmi_save_extended_devices(dm); + break; + case 9: /* System Slots */ + dmi_save_system_slot(dm); + break; } } diff --git a/include/linux/dmi.h b/include/linux/dmi.h index 5055ac3..09f42e7 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_SYSTEM_SLOT = -4, }; enum dmi_entry_type { -- 2.5.0