From patchwork Thu Jul 14 16:34:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 72035 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp169629qga; Thu, 14 Jul 2016 09:34:54 -0700 (PDT) X-Received: by 10.98.21.131 with SMTP id 125mr13929170pfv.92.1468514094163; Thu, 14 Jul 2016 09:34:54 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k7si3687110paa.279.2016.07.14.09.34.53; Thu, 14 Jul 2016 09:34:54 -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 S1751712AbcGNQes (ORCPT + 30 others); Thu, 14 Jul 2016 12:34:48 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:34611 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751763AbcGNQeL (ORCPT ); Thu, 14 Jul 2016 12:34:11 -0400 Received: by mail-pf0-f196.google.com with SMTP id g202so5036616pfb.1 for ; Thu, 14 Jul 2016 09:34:11 -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=xFFSvGSCjZvUfPcgI1OGOXk9cLComCSKwVims/GzRcM=; b=dqINiupPeFYwZ6w/4H9yLBKhue2jPDXdTtqEVNYWsPzB4urn9ZEFz00Qr6J5F2ojHm u+iEl21xvQ2Jl5zTZ2A0QYv0BLNkLgg3ZwOHf8L5OyZFj0KNJdlJAJlKp6WCt3i4O9JC Uq7vlQkNuQLcNy3NV0Gql6Zpnk7TNjnVHfJuxf7bjeeU3Ak/+Yib70SW0i41wxBhE8xE YNC/w69jsTBEI0v4Aty3Vqr9tIw+V0zPq2lop2+Y8jFh1cjdkp56wY7nlRcwjGiWzmzU A95g+XEnF2YmwGdSCkIXAmvbN/dZh26R2d1qFbFT6K0T/XnuJn9pxK6R+IbZnK0nRGAO Om+Q== 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=xFFSvGSCjZvUfPcgI1OGOXk9cLComCSKwVims/GzRcM=; b=bGcLTKiDlWFNNjUF2aYFXppU1cF0zAvmpQplnmHKsrJFxtzacJT81bfkcOqLKg5yXg pifG0CJgfhEWGC+ewz9UDH5o1oUMDKYP7zYXD5Ys0Mqeca30a58Hl0qTvtZ96ji4aAht oNweLQeacO04qqIX5aItJXzR4a6HnnYuZFdSbzDk/ma3i6sdF9mXfHBww7gchpKjFmyR Uj8xlwNKf4rxWIJGGnNHjL6qcRHcDyl8e6kP531EWWY9oy6BbLXjPVbLl1m9usSqfcck RjfTbMwTHh2k3sKTRlZvFB1OSg08+I6O2hyvkCp5qJB8nDpvaPRpaW0yc2GdcgwqunFb cquA== X-Gm-Message-State: ALyK8tIaizYyBlPOBXeeZ7W6CMd4uBZxwJy9QZ0KhrT4mB23ucqwBEbjw4MrgvBzKnj7xA== X-Received: by 10.98.63.1 with SMTP id m1mr4136006pfa.14.1468514050622; Thu, 14 Jul 2016 09:34:10 -0700 (PDT) Received: from serve.minyard.net (serve.minyard.net. [2001:470:b8f6:1b::1]) by smtp.gmail.com with ESMTPSA id q67sm5849665pfb.31.2016.07.14.09.34.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Jul 2016 09:34:09 -0700 (PDT) Received: from t430.minyard.net (unknown [IPv6:2001:470:b8f6:1b:91d:ffc3:b8d2:3732]) by serve.minyard.net (Postfix) with ESMTPA id 301D4154F; Thu, 14 Jul 2016 11:34:07 -0500 (CDT) Received: by t430.minyard.net (Postfix, from userid 1000) id 3EC9530000F; Thu, 14 Jul 2016 11:34:05 -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 3/4] dmi: Add IPMI DMI scanning to the DMI code Date: Thu, 14 Jul 2016 11:34:02 -0500 Message-Id: <1468514043-21081-4-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 It makes more sense to be there, and it's cleaner with the upcoming conversion of IPMI DMI to a platform device. Signed-off-by: Corey Minyard Cc: Jean Delvare Cc: Andy Lutomirski Tested-by: Andy Lutomirski --- drivers/firmware/dmi_scan.c | 108 ++++++++++++++++++++++++++++++++++++++++++-- include/linux/dmi.h | 26 +++++++++++ 2 files changed, 129 insertions(+), 5 deletions(-) -- 2.7.4 diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c index 5519b4f..16e5174 100644 --- a/drivers/firmware/dmi_scan.c +++ b/drivers/firmware/dmi_scan.c @@ -303,9 +303,105 @@ static void __init dmi_save_oem_strings_devices(const struct dmi_header *dm) } } +#define DMI_IPMI_MIN_LENGTH 0x10 +#define DMI_IPMI_VER2_LENGTH 0x12 +#define DMI_IPMI_TYPE 4 +#define DMI_IPMI_SLAVEADDR 6 +#define DMI_IPMI_ADDR 8 +#define DMI_IPMI_ACCESS 0x10 +#define DMI_IPMI_IRQ 0x11 +#define DMI_IPMI_IO_MASK 0xfffe + +static void __init dmi_decode_ipmi(struct dmi_dev_ipmi *dev, + const struct dmi_header *dm) +{ + const u8 *data = (const u8 *) dm; + unsigned long base_addr; + u8 len = dm->length; + bool slave_addr_set; + + if (len < DMI_IPMI_MIN_LENGTH) + return; + + dev->type = data[DMI_IPMI_TYPE]; + + memcpy(&base_addr, data + DMI_IPMI_ADDR, sizeof(unsigned long)); + if (len >= DMI_IPMI_VER2_LENGTH) { + if (dev->type == IPMI_DMI_TYPE_SSIF) { + if ((data[DMI_IPMI_ADDR] >> 1) == 0) { + /* + * Some broken systems put the I2C address in + * the slave address field. We try to + * accommodate them here. + */ + dev->base_addr = data[DMI_IPMI_SLAVEADDR] >> 1; + dev->slave_addr = 0; + slave_addr_set = true; + } else { + dev->base_addr = data[DMI_IPMI_ADDR] >> 1; + } + } else { + if (base_addr & 1) { + /* I/O */ + base_addr &= DMI_IPMI_IO_MASK; + dev->is_io_space = 1; + } else { + /* Memory */ + dev->is_io_space = 0; + } + + /* + * If bit 4 of byte 0x10 is set, then the lsb + * for the address is odd. + */ + base_addr |= (data[DMI_IPMI_ACCESS] >> 4) & 1; + + dev->base_addr = base_addr; + dev->irq = data[DMI_IPMI_IRQ]; + + /* + * The top two bits of byte 0x10 hold the + * register spacing. + */ + switch ((data[DMI_IPMI_ACCESS] >> 6) & 3) { + case 0: /* Byte boundaries */ + dev->offset = 1; + break; + case 1: /* 32-bit boundaries */ + dev->offset = 4; + break; + case 2: /* 16-byte boundaries */ + dev->offset = 16; + break; + default: + /* Leave 0 for undefined. */ + return; + } + } + } else { + /* Old DMI spec. */ + /* + * Note that technically, the lower bit of the base + * address should be 1 if the address is I/O and 0 if + * the address is in memory. So many systems get that + * wrong (and all that I have seen are I/O) so we just + * ignore that bit and assume I/O. Systems that use + * memory should use the newer spec, anyway. + */ + dev->base_addr = base_addr & DMI_IPMI_IO_MASK; + dev->is_io_space = 1; + dev->offset = 1; + } + + if (!slave_addr_set) + dev->slave_addr = data[DMI_IPMI_SLAVEADDR]; + + dev->good_data = 1; +} + static void __init dmi_save_ipmi_device(const struct dmi_header *dm) { - struct dmi_device *dev; + struct dmi_dev_ipmi *dev; void *data; data = dmi_alloc(dm->length); @@ -318,11 +414,13 @@ static void __init dmi_save_ipmi_device(const struct dmi_header *dm) if (!dev) return; - dev->type = DMI_DEV_TYPE_IPMI; - dev->name = "IPMI controller"; - dev->device_data = data; + dev->dev.type = DMI_DEV_TYPE_IPMI; + dev->dev.name = "IPMI controller"; + dev->dev.device_data = data; - dmi_devices_list_add(dev); + dmi_decode_ipmi(dev, dm); + + dmi_devices_list_add(&dev->dev); } static void __init dmi_save_dev_pciaddr(int instance, int segment, int bus, diff --git a/include/linux/dmi.h b/include/linux/dmi.h index c8dd5b8..96dc644 100644 --- a/include/linux/dmi.h +++ b/include/linux/dmi.h @@ -97,6 +97,24 @@ struct dmi_dev_onboard { int devfn; }; +/* Device data for an IPMI entry. */ +struct dmi_dev_ipmi { + struct dmi_device dev; + u8 good_data; + u8 type; + u8 is_io_space; + u8 irq; + u8 offset; + u8 slave_addr; + unsigned long base_addr; +}; + +/* dmi_ipmi_data type field */ +#define IPMI_DMI_TYPE_KCS 0x01 +#define IPMI_DMI_TYPE_SMIC 0x02 +#define IPMI_DMI_TYPE_BT 0x03 +#define IPMI_DMI_TYPE_SSIF 0x04 + extern struct kobject *dmi_kobj; extern int dmi_check_system(const struct dmi_system_id *list); const struct dmi_system_id *dmi_first_match(const struct dmi_system_id *list); @@ -127,6 +145,14 @@ static inline struct dmi_device *to_dmi_device(struct fwnode_handle *fwnode) return NULL; } +static inline struct dmi_dev_ipmi *to_dmi_dev_ipmi(struct dmi_device *dev) +{ + if (!dev || dev->type != DMI_DEV_TYPE_IPMI) + return NULL; + + return container_of(dev, struct dmi_dev_ipmi, dev); +} + #else static inline int dmi_check_system(const struct dmi_system_id *list) { return 0; }