From patchwork Wed Apr 27 13:04:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 66789 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp2176435qge; Wed, 27 Apr 2016 06:05:00 -0700 (PDT) X-Received: by 10.66.122.100 with SMTP id lr4mr11207170pab.99.1461762297809; Wed, 27 Apr 2016 06:04:57 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n9si4144055pfb.111.2016.04.27.06.04.57; Wed, 27 Apr 2016 06:04:57 -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 S1752893AbcD0NEu (ORCPT + 29 others); Wed, 27 Apr 2016 09:04:50 -0400 Received: from mail-pa0-f68.google.com ([209.85.220.68]:34847 "EHLO mail-pa0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751241AbcD0NEe (ORCPT ); Wed, 27 Apr 2016 09:04:34 -0400 Received: by mail-pa0-f68.google.com with SMTP id zy2so5500192pac.2 for ; Wed, 27 Apr 2016 06:04:34 -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=B6/nomfW0XFxbN/g5bgnendoSMYPX4ua9FykYQ2QUCGGDwpRagJdwAIGX3XaUhDKng S0eUj/Rc43Bl2SbA+nNPkbpebWkUXssCPGGnePDjjQx4/8vivDvXkpFUthNM2jUz84+D wgcwfY8/Q25sWnfaiatwUm6aQZpdLP6pNrMu6TtTkYmasVwuZ91q+QSzpYsY5XxyLqmb /TrvajYwT6ZE7gWi4uB1OwNvz/3B8h8zam/RR4ZLp+RCRLVty8NqDIQn7Gq1uoIQe/Gf z43jIKx6Akii+S6Tcwd5S0stuSicXvU3Iuqs/6EESw6hUdw24LP+9zcUwIRveSHAk417 4Ptg== 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=LYTS+mR4i+sFCMkmmNlwwNlAkTgC6I4R8eDm0Er497idppEgK5K4S8w7mwzKpl1Oh3 u0Z6OfrnbzWcC6px+5fwHuionaBK5wbgZCnsUBR9AD3Dq9SzC67tNu+h+YNBV0O83obi mBwmip2FA0yWcxjJRma/T5yphFj+qk3mHUgd6TkZ47Kg6U2epzgRdjvl/q3OsLHDTJOU I/qjdMBQMPSxnNcI5oKIbP9fOfe7YI7znDtvwnpk4ro1kgcD5p8KfZOwTu8lKNWy3xxe kllyenmil/3Jwc7MQhgiIN5Wsytz/dX/hDGVBsyzO/S8qOZNCgnwAPrDr5yTfpYb5Mxb +s+A== X-Gm-Message-State: AOPr4FUVoKEbLuaowKL3vAWLdsgiSjod9QBvCwZDrdR2sOzEkvD+GLzm+kAYL0UwdS525g== X-Received: by 10.66.139.70 with SMTP id qw6mr11505129pab.67.1461762273703; Wed, 27 Apr 2016 06:04:33 -0700 (PDT) Received: from serve.minyard.net ([173.71.13.195]) by smtp.gmail.com with ESMTPSA id uw2sm6776890pac.10.2016.04.27.06.04.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Apr 2016 06:04:31 -0700 (PDT) Received: from t430.minyard.net (unknown [IPv6:2001:470:b8f6:1b:3c36:6e8c:c70a:c6bd]) by serve.minyard.net (Postfix) with ESMTPA id D22961656; Wed, 27 Apr 2016 08:04:29 -0500 (CDT) Received: by t430.minyard.net (Postfix, from userid 1000) id F299B30052F; Wed, 27 Apr 2016 08:04:27 -0500 (CDT) From: minyard@acm.org To: openipmi-developer@lists.sourceforge.net, linux-kernel@vger.kernel.org, Jean Delvare Cc: Corey Minyard , Andy Lutomirski Subject: [PATCH v3 2/5] dmi: Add a DMI firmware node and handling Date: Wed, 27 Apr 2016 08:04:17 -0500 Message-Id: <1461762260-32454-3-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1461762260-32454-1-git-send-email-minyard@acm.org> References: <1461762260-32454-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 {