From patchwork Thu Jul 14 16:34:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 72034 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp169459qga; Thu, 14 Jul 2016 09:34:31 -0700 (PDT) X-Received: by 10.98.134.77 with SMTP id x74mr13908803pfd.21.1468514070665; Thu, 14 Jul 2016 09:34:30 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 4si3748670pav.105.2016.07.14.09.34.30; Thu, 14 Jul 2016 09:34:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752057AbcGNQeT (ORCPT + 30 others); Thu, 14 Jul 2016 12:34:19 -0400 Received: from mail-pa0-f68.google.com ([209.85.220.68]:36062 "EHLO mail-pa0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751662AbcGNQeK (ORCPT ); Thu, 14 Jul 2016 12:34:10 -0400 Received: by mail-pa0-f68.google.com with SMTP id ez1so1402766pab.3 for ; Thu, 14 Jul 2016 09:34:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=vR7bg8RcFkWYYvtlynSW+MfR3W/ahaDdGhv65BcrDGQ=; b=GkTUnEuqTRSQUva380Vh0gZB+8kPcyvAiVfEc5o3zGEz6nCAyFWl2EMFTDYs3m6lZE /oJh9iareeYAJaEseZq7xGKi6det+e8Wsq95iXfpLbs+P7ND0Ieww0kn2n1vJ/FJm8yP XKefXWoil0FunBf+7Kd4dV60P/BBvmTQ6b4ppGwSUTP0N1Zql7Xz8I0fBjCmP5M0Wi65 PJlGxsdGMl7wuM18zEowJjqXfGN++BOCc3w8Yg7209QOmn2F8yN5uHBIBQDTJTQbJOjc 241ic7RX5Nmxbbn32fHkgOL4kZ3OzgJA8DMQiCT03k0HLcCysn2lsjKrlELHmBjs3lPD DcWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=vR7bg8RcFkWYYvtlynSW+MfR3W/ahaDdGhv65BcrDGQ=; b=VTImixhh1rkrdQOwPlGfYLsE1ibuw98+tFB5LvwdevJVaLJwKoKshf7L1kGLFACDEE 0ITkhpuELURfpQCsq399itzTynDHEJSx+OEHNNWE1r6lXm8SE3hOzaIPqDu3rX4k7+gn rrjHJ9j4d8QUuer9yU11IBZR+dzWW0IG+5sXpaWFl2CvkYP2OnYFqvuaDVcA53kQOHIU c/StBlji/N0gzOMMxu1aT8SlT3KhKNIDe21jTW5WOuxVErcOykIhIP2BX+Gw8nyE3CeG N85hIVCBWq88EWH3vKLtQYbdH3E/L89CjmU3J9vKdLdGVl2YfPoCbK+KsChx+uqhntOI z+zw== X-Gm-Message-State: ALyK8tL8cDDpIrKgRcLTqxvydLCBl7k85whVMJzdfgp9mmTSoqEBaJXUi1AWGTaAdfRRTQ== X-Received: by 10.66.101.1 with SMTP id fc1mr23997469pab.84.1468514049934; Thu, 14 Jul 2016 09:34:09 -0700 (PDT) Received: from serve.minyard.net ([173.64.235.97]) by smtp.gmail.com with ESMTPSA id t4sm5952443paf.39.2016.07.14.09.34.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Jul 2016 09:34:08 -0700 (PDT) Received: from t430.minyard.net (t430m.minyard.net [192.168.27.3]) by serve.minyard.net (Postfix) with ESMTPA id D6A5C127B; Thu, 14 Jul 2016 11:34:06 -0500 (CDT) Received: by t430.minyard.net (Postfix, from userid 1000) id 5B57930267F; Thu, 14 Jul 2016 11:34:04 -0500 (CDT) From: minyard@acm.org To: linux-kernel@vger.kernel.org, Jean Delvare , openipmi-developer@lists.sourceforge.net Cc: Corey Minyard , Andy Lutomirski Subject: [PATCH v4 2/4] dmi: Add a DMI firmware node and handling Date: Thu, 14 Jul 2016 11:34:01 -0500 Message-Id: <1468514043-21081-3-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1468514043-21081-1-git-send-email-minyard@acm.org> References: <1468514043-21081-1-git-send-email-minyard@acm.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Corey Minyard This is so that an IPMI platform device can be created from a DMI firmware entry. Signed-off-by: Corey Minyard Cc: Jean Delvare Cc: Andy Lutomirski Tested-by: Andy Lutomirski --- drivers/firmware/dmi_scan.c | 16 ++++++++++------ include/linux/dmi.h | 14 ++++++++++++++ include/linux/fwnode.h | 1 + 3 files changed, 25 insertions(+), 6 deletions(-) -- 2.7.4 diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c index da471b2..5519b4f 100644 --- a/drivers/firmware/dmi_scan.c +++ b/drivers/firmware/dmi_scan.c @@ -242,6 +242,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; @@ -257,8 +263,7 @@ static void __init dmi_save_one_device(int type, const char *name) 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) @@ -293,9 +298,8 @@ static void __init dmi_save_oem_strings_devices(const struct dmi_header *dm) 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); } } @@ -318,7 +322,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, @@ -345,7 +349,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) diff --git a/include/linux/dmi.h b/include/linux/dmi.h index a930a4d..c8dd5b8 100644 --- a/include/linux/dmi.h +++ b/include/linux/dmi.h @@ -4,6 +4,7 @@ #include #include #include +#include /* 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; } diff --git a/include/linux/fwnode.h b/include/linux/fwnode.h index 8516717..8690de2 100644 --- a/include/linux/fwnode.h +++ b/include/linux/fwnode.h @@ -19,6 +19,7 @@ enum fwnode_type { FWNODE_ACPI_DATA, FWNODE_PDATA, FWNODE_IRQCHIP, + FWNODE_DMI, }; struct fwnode_handle {