[03/19] ipmi: kcs: aspeed: Adapt to new LPC DTS layout

Message ID	20210219142523.3464540-4-andrew@aj.id.au
State	New
Headers	show Return-Path: <openbmc-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org> From: Andrew Jeffery <andrew@aj.id.au> To: openipmi-developer@lists.sourceforge.net, openbmc@lists.ozlabs.org, minyard@acm.org Subject: [PATCH 03/19] ipmi: kcs: aspeed: Adapt to new LPC DTS layout Date: Sat, 20 Feb 2021 00:55:07 +1030 Message-Id: <20210219142523.3464540-4-andrew@aj.id.au> In-Reply-To: <20210219142523.3464540-1-andrew@aj.id.au> References: <20210219142523.3464540-1-andrew@aj.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Cc: devicetree@vger.kernel.org, Haiyue Wang <haiyue.wang@linux.intel.com>, tmaimon77@gmail.com, linux-aspeed@lists.ozlabs.org, linux-gpio@vger.kernel.org, avifishman70@gmail.com, venture@google.com, "Chia-Wei, Wang" <chiawei_wang@aspeedtech.com>, linux-kernel@vger.kernel.org, tali.perry1@gmail.com, robh+dt@kernel.org, Corey Minyard <cminyard@mvista.com>, lee.jones@linaro.org, linus.walleij@linaro.org, linux-arm-kernel@lists.infradead.org, benjaminfair@google.com Errors-To: openbmc-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "openbmc" <openbmc-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org>
Series	ipmi: Allow raw access to KCS devices \| expand [00/19] ipmi: Allow raw access to KCS devices [01/19] dt-bindings: aspeed-lpc: Remove LPC partitioning [02/19] ARM: dts: Remove LPC BMC and Host partitions [03/19] ipmi: kcs: aspeed: Adapt to new LPC DTS layout [04/19] pinctrl: aspeed-g5: Adapt to new LPC device tree layout [05/19] soc: aspeed: Adapt to new LPC device tree layout [06/19] ipmi: kcs_bmc_aspeed: Use of match data to extract KCS properties [07/19] ipmi: kcs_bmc: Make status update atomic [08/19] ipmi: kcs_bmc: Rename {read, write}_{status, data}() functions [09/19] ipmi: kcs_bmc: Split out kcs_bmc_cdev_ipmi [10/19] ipmi: kcs_bmc: Turn the driver data-structures inside-out [11/19] ipmi: kcs_bmc: Split headers into device and client [12/19] ipmi: kcs_bmc: Strip private client data from struct kcs_bmc [13/19] ipmi: kcs_bmc: Decouple the IPMI chardev from the core [14/19] ipmi: kcs_bmc: Allow clients to control KCS IRQ state [15/19] ipmi: kcs_bmc: Add a "raw" character device interface [16/19] dt-bindings: ipmi: Convert ASPEED KCS binding to schema [17/19] dt-bindings: ipmi: Add optional SerIRQ property to ASPEED KCS devices [18/19] ipmi: kcs_bmc_aspeed: Implement KCS SerIRQ configuration [19/19] ipmi: kcs_bmc_aspeed: Fix IBFIE typo from datasheet

Message ID

20210219142523.3464540-4-andrew@aj.id.au

State

New

Headers

From: Andrew Jeffery <andrew@aj.id.au>
To: openipmi-developer@lists.sourceforge.net, openbmc@lists.ozlabs.org,
 minyard@acm.org
Subject: [PATCH 03/19] ipmi: kcs: aspeed: Adapt to new LPC DTS layout
Date: Sat, 20 Feb 2021 00:55:07 +1030
Message-Id: <20210219142523.3464540-4-andrew@aj.id.au>
In-Reply-To: <20210219142523.3464540-1-andrew@aj.id.au>
References: <20210219142523.3464540-1-andrew@aj.id.au>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: list
Cc: devicetree@vger.kernel.org, Haiyue Wang <haiyue.wang@linux.intel.com>,
 tmaimon77@gmail.com, linux-aspeed@lists.ozlabs.org,
 linux-gpio@vger.kernel.org,
 avifishman70@gmail.com, venture@google.com, "Chia-Wei,
 Wang" <chiawei_wang@aspeedtech.com>, linux-kernel@vger.kernel.org,
 tali.perry1@gmail.com, robh+dt@kernel.org,
 Corey Minyard <cminyard@mvista.com>,
 lee.jones@linaro.org, linus.walleij@linaro.org,
 linux-arm-kernel@lists.infradead.org, benjaminfair@google.com
Errors-To: openbmc-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org
Sender: "openbmc"
 <openbmc-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org>

Series

ipmi: Allow raw access to KCS devices | expand

Commit Message

Andrew Jeffery Feb. 19, 2021, 2:25 p.m. UTC

From: "Chia-Wei, Wang" <chiawei_wang@aspeedtech.com>

Add check against LPC device v2 compatible string to
ensure that the fixed device tree layout is adopted.
The LPC register offsets are also fixed accordingly.

Signed-off-by: Chia-Wei Wang <chiawei_wang@aspeedtech.com>
Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
Acked-by: Haiyue Wang <haiyue.wang@linux.intel.com>
Acked-by: Corey Minyard <cminyard@mvista.com>
---
 drivers/char/ipmi/kcs_bmc_aspeed.c | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/drivers/char/ipmi/kcs_bmc_aspeed.c b/drivers/char/ipmi/kcs_bmc_aspeed.c
index a140203c079b..eefe362f65f0 100644
--- a/drivers/char/ipmi/kcs_bmc_aspeed.c
+++ b/drivers/char/ipmi/kcs_bmc_aspeed.c
@@ -27,7 +27,6 @@ 
 
 #define KCS_CHANNEL_MAX     4
 
-/* mapped to lpc-bmc@0 IO space */
 #define LPC_HICR0            0x000
 #define     LPC_HICR0_LPC3E          BIT(7)
 #define     LPC_HICR0_LPC2E          BIT(6)
@@ -52,15 +51,13 @@ 
 #define LPC_STR1             0x03C
 #define LPC_STR2             0x040
 #define LPC_STR3             0x044
-
-/* mapped to lpc-host@80 IO space */
-#define LPC_HICRB            0x080
+#define LPC_HICRB            0x100
 #define     LPC_HICRB_IBFIF4         BIT(1)
 #define     LPC_HICRB_LPC4E          BIT(0)
-#define LPC_LADR4            0x090
-#define LPC_IDR4             0x094
-#define LPC_ODR4             0x098
-#define LPC_STR4             0x09C
+#define LPC_LADR4            0x110
+#define LPC_IDR4             0x114
+#define LPC_ODR4             0x118
+#define LPC_STR4             0x11C
 
 struct aspeed_kcs_bmc {
 	struct regmap *map;
@@ -348,12 +345,20 @@  static int aspeed_kcs_probe(struct platform_device *pdev)
 	struct device_node *np;
 	int rc;
 
-	np = pdev->dev.of_node;
+	np = dev->of_node->parent;
+	if (!of_device_is_compatible(np, "aspeed,ast2400-lpc-v2") &&
+	    !of_device_is_compatible(np, "aspeed,ast2500-lpc-v2") &&
+	    !of_device_is_compatible(np, "aspeed,ast2600-lpc-v2")) {
+		dev_err(dev, "unsupported LPC device binding\n");
+		return -ENODEV;
+	}
+
+	np = dev->of_node;
 	if (of_device_is_compatible(np, "aspeed,ast2400-kcs-bmc") ||
-			of_device_is_compatible(np, "aspeed,ast2500-kcs-bmc"))
+	    of_device_is_compatible(np, "aspeed,ast2500-kcs-bmc"))
 		kcs_bmc = aspeed_kcs_probe_of_v1(pdev);
 	else if (of_device_is_compatible(np, "aspeed,ast2400-kcs-bmc-v2") ||
-			of_device_is_compatible(np, "aspeed,ast2500-kcs-bmc-v2"))
+		 of_device_is_compatible(np, "aspeed,ast2500-kcs-bmc-v2"))
 		kcs_bmc = aspeed_kcs_probe_of_v2(pdev);
 	else
 		return -EINVAL;

[03/19] ipmi: kcs: aspeed: Adapt to new LPC DTS layout

Commit Message

Patch