Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757070AbbKRWPo (ORCPT ); Wed, 18 Nov 2015 17:15:44 -0500 Received: from AUSXIPPS310.us.dell.com ([143.166.148.211]:59395 "EHLO ausxipps310.us.dell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751127AbbKRWPn convert rfc822-to-8bit (ORCPT ); Wed, 18 Nov 2015 17:15:43 -0500 DomainKey-Signature: s=smtpout; d=dell.com; c=nofws; q=dns; h=X-LoopCount0:X-IronPort-AV:From:To:Date:Subject: Thread-Topic:Thread-Index:Message-ID:References: In-Reply-To:Accept-Language:Content-Language: X-MS-Has-Attach:X-MS-TNEF-Correlator:acceptlanguage: Content-Type:Content-Transfer-Encoding:MIME-Version; b=ng53T4aiQh5uLK7s/ItT7DBOXW55UcZQE+04sfGIUKo0M6O3nNOJ5Css W6Ph0gwjybcSlkGGdHGKP1r/LGDzdXuLPCWCV2Y12GkTN1dUaQxc8UpTm f731kCtpUY5QeIO3ZOuNYSvJcy6g5bfYQ/uZwov1TJYWYrzGhJwoKzl1Z M=; X-LoopCount0: from 10.170.28.41 X-IronPort-AV: E=Sophos;i="5.20,315,1444712400"; d="scan'208";a="253276932" From: To: Date: Wed, 18 Nov 2015 16:14:58 -0600 Subject: [PATCH 1/2] Save SMBIOS Type 9 System Slots during DMI Scan Thread-Topic: [PATCH 1/2] Save SMBIOS Type 9 System Slots during DMI Scan Thread-Index: AdEiTP1gHK2v1s+vS6aYkOhkew1P8wAAZKrH Message-ID: <5B3AAEAF6B46EA4D955DF7AD46C2C485172218D3FE@AUSX7MCPS303.AMER.DELL.COM> References: <1447884134-31504-1-git-send-email-Jordan_Hargrave@dell.com> In-Reply-To: <1447884134-31504-1-git-send-email-Jordan_Hargrave@dell.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2834 Lines: 85 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/