Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 63B29C282CE for ; Wed, 24 Apr 2019 17:30:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 27E3020811 for ; Wed, 24 Apr 2019 17:30:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="hxTeB5Jc" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391079AbfDXRa4 (ORCPT ); Wed, 24 Apr 2019 13:30:56 -0400 Received: from mail-oi1-f193.google.com ([209.85.167.193]:44238 "EHLO mail-oi1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391065AbfDXRay (ORCPT ); Wed, 24 Apr 2019 13:30:54 -0400 Received: by mail-oi1-f193.google.com with SMTP id l7so5368960oil.11 for ; Wed, 24 Apr 2019 10:30:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Ll61GTBmJnM1C1VCuPwVpdL1CB1qjjNkIvNtOcgcCps=; b=hxTeB5JcQAh0eIoSgNgb9xkGNMnC1i9y/3HgVqyNTitPoXxavZxi/bDjz/6ot1ZbB0 ds5VSCTrzaejaVfNmHJLEffo4cQLIVFaXfG3Z+M3jTO+HRmOxoUrYKZmKdpXVRTnj8+S cznZjbcL5sCEiOwYMYXK1uo/OO4ihHX0DwwFWVb8OqyO7N5buSJABlNojGj4rJBCl64n PpTtFIpscpnzkh+wlwrxUnVKJizV7NGHWMfgPQnQWGJz2sbKxpaYDD97DCUJF/OrgCjZ UcnMEQWtqsR9hT6B9pQz7TmLtRXNEaF0SBLMQwllRgL6C3If+nRyB24tlEwoTiG0A2dY L+6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=Ll61GTBmJnM1C1VCuPwVpdL1CB1qjjNkIvNtOcgcCps=; b=IT0DYOpSaoRW2VG8/kpEnY5aKDIdZT88JtcwzFRpvWKTFZRsMF0SH6wNRxYMC8Lr+D Xh5vLN4uscvxzT8mqXu/pyR31ETFW7VbxsOBsSdow4+odaQTmyxHQE9+cm/cMwfQmUGt hmTk9xKy39EZ5V8/Ja6fGveF/FPXMocEfeFMF6nr53v9UY5MpNuEqE+sugbNPVTz2mlt ACY4noeqmVm2o+1xib1sKv5StZCUmOtsJhzTp9rutigP92cJDen1Pdc2aJ4TsyraPEAg x8iSn14Nfgk3xKbD1+zlWAXsfATUemJvdT5OnIFTcJgeRMIYLv3EcVd7b4TKIeg+sYS3 BQqg== X-Gm-Message-State: APjAAAVjsZU3ISJMxxfR6irtFVmbNFriq4dwczrmR9ZRRECAdrGNiKy9 DywxeMc6npR+CUxfN0ysTQ== X-Google-Smtp-Source: APXvYqw54pzmLscL3XKv1eoScFwylnj2/+RIgYVvruP2RZC3esB5uE1mc5GxKDN3do2nmksCBnstrQ== X-Received: by 2002:aca:48c6:: with SMTP id v189mr133515oia.13.1556127053132; Wed, 24 Apr 2019 10:30:53 -0700 (PDT) Received: from serve.minyard.net (serve.minyard.net. [2001:470:b8f6:1b::1]) by smtp.gmail.com with ESMTPSA id q19sm7852314ota.28.2019.04.24.10.30.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 Apr 2019 10:30:50 -0700 (PDT) Received: from t430.minyard.net (unknown [IPv6:2001:470:b8f6:1b:d5e:aa5a:44d8:6907]) by serve.minyard.net (Postfix) with ESMTPA id 338041800D0; Wed, 24 Apr 2019 17:30:48 +0000 (UTC) Received: by t430.minyard.net (Postfix, from userid 1000) id F41E8301246; Wed, 24 Apr 2019 12:30:47 -0500 (CDT) From: minyard@acm.org To: openipmi-developer@lists.sourceforge.net, Kamlakant Patel Cc: Jayachandran Chandrasekharan Nair , Corey Minyard , stable@vger.kernel.org Subject: [PATCH 1/4] ipmi: Add the i2c-addr property for SSIF interfaces Date: Wed, 24 Apr 2019 12:30:41 -0500 Message-Id: <20190424173044.25804-2-minyard@acm.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190424173044.25804-1-minyard@acm.org> References: <20190424173044.25804-1-minyard@acm.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Corey Minyard This is required for SSIF to work. There was no way to know if the interface being added was SI or SSIF from the platform data, but that was required so the i2c-addr is only added for SSIF interfaces. So add a field for that. Also rework the logic a bit so that ipmi-type is not set for SSIF interfaces, as it is not necessary for that. Fixes: 3cd83bac481d ("ipmi: Consolidate the adding of platform devices") Reported-by: Kamlakant Patel Signed-off-by: Corey Minyard Cc: stable@vger.kernel.org # 5.1 --- drivers/char/ipmi/ipmi_dmi.c | 2 ++ drivers/char/ipmi/ipmi_plat_data.c | 27 +++++++++++++++------------ drivers/char/ipmi/ipmi_plat_data.h | 3 +++ drivers/char/ipmi/ipmi_si_hardcode.c | 1 + drivers/char/ipmi/ipmi_si_hotmod.c | 1 + 5 files changed, 22 insertions(+), 12 deletions(-) diff --git a/drivers/char/ipmi/ipmi_dmi.c b/drivers/char/ipmi/ipmi_dmi.c index f2411468f33f..f38e651dd1b5 100644 --- a/drivers/char/ipmi/ipmi_dmi.c +++ b/drivers/char/ipmi/ipmi_dmi.c @@ -47,9 +47,11 @@ static void __init dmi_add_platform_ipmi(unsigned long base_addr, memset(&p, 0, sizeof(p)); name = "dmi-ipmi-si"; + p.iftype = IPMI_PLAT_IF_SI; switch (type) { case IPMI_DMI_TYPE_SSIF: name = "dmi-ipmi-ssif"; + p.iftype = IPMI_PLAT_IF_SSIF; p.type = SI_TYPE_INVALID; break; case IPMI_DMI_TYPE_BT: diff --git a/drivers/char/ipmi/ipmi_plat_data.c b/drivers/char/ipmi/ipmi_plat_data.c index 8f0ca2a848eb..28471ff2a3a3 100644 --- a/drivers/char/ipmi/ipmi_plat_data.c +++ b/drivers/char/ipmi/ipmi_plat_data.c @@ -12,7 +12,7 @@ struct platform_device *ipmi_platform_add(const char *name, unsigned int inst, struct ipmi_plat_data *p) { struct platform_device *pdev; - unsigned int num_r = 1, size, pidx = 0; + unsigned int num_r = 1, size = 0, pidx = 0; struct resource r[4]; struct property_entry pr[6]; u32 flags; @@ -21,19 +21,22 @@ struct platform_device *ipmi_platform_add(const char *name, unsigned int inst, memset(pr, 0, sizeof(pr)); memset(r, 0, sizeof(r)); - if (p->type == SI_BT) - size = 3; - else if (p->type == SI_TYPE_INVALID) - size = 0; - else - size = 2; + if (p->iftype == IPMI_PLAT_IF_SI) { + if (p->type == SI_BT) + size = 3; + else if (p->type != SI_TYPE_INVALID) + size = 2; + + if (p->regsize == 0) + p->regsize = DEFAULT_REGSIZE; + if (p->regspacing == 0) + p->regspacing = p->regsize; - if (p->regsize == 0) - p->regsize = DEFAULT_REGSIZE; - if (p->regspacing == 0) - p->regspacing = p->regsize; + pr[pidx++] = PROPERTY_ENTRY_U8("ipmi-type", p->type); + } else if (p->iftype == IPMI_PLAT_IF_SSIF) { + pr[pidx++] = PROPERTY_ENTRY_U16("i2c-addr", p->addr); + } - pr[pidx++] = PROPERTY_ENTRY_U8("ipmi-type", p->type); if (p->slave_addr) pr[pidx++] = PROPERTY_ENTRY_U8("slave-addr", p->slave_addr); pr[pidx++] = PROPERTY_ENTRY_U8("addr-source", p->addr_source); diff --git a/drivers/char/ipmi/ipmi_plat_data.h b/drivers/char/ipmi/ipmi_plat_data.h index 567cfcec8ada..9ba744ea9571 100644 --- a/drivers/char/ipmi/ipmi_plat_data.h +++ b/drivers/char/ipmi/ipmi_plat_data.h @@ -6,7 +6,10 @@ #include +enum ipmi_plat_interface_type { IPMI_PLAT_IF_SI, IPMI_PLAT_IF_SSIF }; + struct ipmi_plat_data { + enum ipmi_plat_interface_type iftype; unsigned int type; /* si_type for si, SI_INVALID for others */ unsigned int space; /* addr_space for si, intf# for ssif. */ unsigned long addr; diff --git a/drivers/char/ipmi/ipmi_si_hardcode.c b/drivers/char/ipmi/ipmi_si_hardcode.c index 682221eebd66..f6ece7569504 100644 --- a/drivers/char/ipmi/ipmi_si_hardcode.c +++ b/drivers/char/ipmi/ipmi_si_hardcode.c @@ -83,6 +83,7 @@ static void __init ipmi_hardcode_init_one(const char *si_type_str, memset(&p, 0, sizeof(p)); + p.iftype = IPMI_PLAT_IF_SI; if (!si_type_str || !*si_type_str || strcmp(si_type_str, "kcs") == 0) { p.type = SI_KCS; } else if (strcmp(si_type_str, "smic") == 0) { diff --git a/drivers/char/ipmi/ipmi_si_hotmod.c b/drivers/char/ipmi/ipmi_si_hotmod.c index 03140f6cdf6f..42a925f8cf69 100644 --- a/drivers/char/ipmi/ipmi_si_hotmod.c +++ b/drivers/char/ipmi/ipmi_si_hotmod.c @@ -108,6 +108,7 @@ static int parse_hotmod_str(const char *curr, enum hotmod_op *op, int rv; unsigned int ival; + h->iftype = IPMI_PLAT_IF_SI; rv = parse_str(hotmod_ops, &ival, "operation", &curr); if (rv) return rv; -- 2.17.1