* [PATCH v3 1/5] dt-bindings: aspeed-lpc: Remove LPC partitioning
2020-12-21 5:56 [PATCH v3 0/5] Remove LPC register partitioning Chia-Wei, Wang
@ 2020-12-21 5:56 ` Chia-Wei, Wang
2020-12-21 5:56 ` [PATCH v3 2/5] ARM: dts: Remove LPC BMC and Host partitions Chia-Wei, Wang
` (4 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Chia-Wei, Wang @ 2020-12-21 5:56 UTC (permalink / raw)
To: lee.jones, robh+dt, joel, andrew, linus.walleij, minyard,
devicetree, linux-arm-kernel, linux-aspeed, linux-kernel,
openbmc
Cc: BMC-SW, cyrilbur, haiyue.wang, rlippert
The LPC controller has no concept of the BMC and the Host partitions.
This patch fixes the documentation by removing the description on LPC
partitions. The register offsets illustrated in the DTS node examples
are also fixed to adapt to the LPC DTS change.
Signed-off-by: Chia-Wei, Wang <chiawei_wang@aspeedtech.com>
---
.../devicetree/bindings/mfd/aspeed-lpc.txt | 99 ++++---------------
1 file changed, 21 insertions(+), 78 deletions(-)
diff --git a/Documentation/devicetree/bindings/mfd/aspeed-lpc.txt b/Documentation/devicetree/bindings/mfd/aspeed-lpc.txt
index d0a38ba8b9ce..90eb0ecc95d1 100644
--- a/Documentation/devicetree/bindings/mfd/aspeed-lpc.txt
+++ b/Documentation/devicetree/bindings/mfd/aspeed-lpc.txt
@@ -9,13 +9,7 @@ primary use case of the Aspeed LPC controller is as a slave on the bus
conditions it can also take the role of bus master.
The LPC controller is represented as a multi-function device to account for the
-mix of functionality it provides. The principle split is between the register
-layout at the start of the I/O space which is, to quote the Aspeed datasheet,
-"basically compatible with the [LPC registers from the] popular BMC controller
-H8S/2168[1]", and everything else, where everything else is an eclectic
-collection of functions with a esoteric register layout. "Everything else",
-here labeled the "host" portion of the controller, includes, but is not limited
-to:
+mix of functionality, which includes, but is not limited to:
* An IPMI Block Transfer[2] Controller
@@ -44,80 +38,29 @@ Required properties
===================
- compatible: One of:
- "aspeed,ast2400-lpc", "simple-mfd"
- "aspeed,ast2500-lpc", "simple-mfd"
- "aspeed,ast2600-lpc", "simple-mfd"
+ "aspeed,ast2400-lpc-v2", "simple-mfd", "syscon"
+ "aspeed,ast2500-lpc-v2", "simple-mfd", "syscon"
+ "aspeed,ast2600-lpc-v2", "simple-mfd", "syscon"
- reg: contains the physical address and length values of the Aspeed
LPC memory region.
- #address-cells: <1>
- #size-cells: <1>
-- ranges: Maps 0 to the physical address and length of the LPC memory
- region
-
-Required LPC Child nodes
-========================
-
-BMC Node
---------
-
-- compatible: One of:
- "aspeed,ast2400-lpc-bmc"
- "aspeed,ast2500-lpc-bmc"
- "aspeed,ast2600-lpc-bmc"
-
-- reg: contains the physical address and length values of the
- H8S/2168-compatible LPC controller memory region
-
-Host Node
----------
-
-- compatible: One of:
- "aspeed,ast2400-lpc-host", "simple-mfd", "syscon"
- "aspeed,ast2500-lpc-host", "simple-mfd", "syscon"
- "aspeed,ast2600-lpc-host", "simple-mfd", "syscon"
-
-- reg: contains the address and length values of the host-related
- register space for the Aspeed LPC controller
-
-- #address-cells: <1>
-- #size-cells: <1>
-- ranges: Maps 0 to the address and length of the host-related LPC memory
+- ranges: Maps 0 to the physical address and length of the LPC memory
region
Example:
lpc: lpc@1e789000 {
- compatible = "aspeed,ast2500-lpc", "simple-mfd";
+ compatible = "aspeed,ast2500-lpc-v2", "simple-mfd", "syscon";
reg = <0x1e789000 0x1000>;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x0 0x1e789000 0x1000>;
-
- lpc_bmc: lpc-bmc@0 {
- compatible = "aspeed,ast2500-lpc-bmc";
- reg = <0x0 0x80>;
- };
-
- lpc_host: lpc-host@80 {
- compatible = "aspeed,ast2500-lpc-host", "simple-mfd", "syscon";
- reg = <0x80 0x1e0>;
- reg-io-width = <4>;
-
- #address-cells = <1>;
- #size-cells = <1>;
- ranges = <0x0 0x80 0x1e0>;
- };
};
-BMC Node Children
-==================
-
-
-Host Node Children
-==================
LPC Host Interface Controller
-------------------
@@ -149,14 +92,12 @@ Optional properties:
Example:
-lpc-host@80 {
- lpc_ctrl: lpc-ctrl@0 {
- compatible = "aspeed,ast2500-lpc-ctrl";
- reg = <0x0 0x80>;
- clocks = <&syscon ASPEED_CLK_GATE_LCLK>;
- memory-region = <&flash_memory>;
- flash = <&spi>;
- };
+lpc_ctrl: lpc-ctrl@80 {
+ compatible = "aspeed,ast2500-lpc-ctrl";
+ reg = <0x80 0x80>;
+ clocks = <&syscon ASPEED_CLK_GATE_LCLK>;
+ memory-region = <&flash_memory>;
+ flash = <&spi>;
};
LPC Host Controller
@@ -179,9 +120,9 @@ Required properties:
Example:
-lhc: lhc@20 {
+lhc: lhc@a0 {
compatible = "aspeed,ast2500-lhc";
- reg = <0x20 0x24 0x48 0x8>;
+ reg = <0xa0 0x24 0xc8 0x8>;
};
LPC reset control
@@ -192,16 +133,18 @@ state of the LPC bus. Some systems may chose to modify this configuration.
Required properties:
- - compatible: "aspeed,ast2600-lpc-reset" or
- "aspeed,ast2500-lpc-reset"
- "aspeed,ast2400-lpc-reset"
+ - compatible: One of:
+ "aspeed,ast2600-lpc-reset";
+ "aspeed,ast2500-lpc-reset";
+ "aspeed,ast2400-lpc-reset";
+
- reg: offset and length of the IP in the LHC memory region
- #reset-controller indicates the number of reset cells expected
Example:
-lpc_reset: reset-controller@18 {
+lpc_reset: reset-controller@98 {
compatible = "aspeed,ast2500-lpc-reset";
- reg = <0x18 0x4>;
+ reg = <0x98 0x4>;
#reset-cells = <1>;
};
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH v3 2/5] ARM: dts: Remove LPC BMC and Host partitions
2020-12-21 5:56 [PATCH v3 0/5] Remove LPC register partitioning Chia-Wei, Wang
2020-12-21 5:56 ` [PATCH v3 1/5] dt-bindings: aspeed-lpc: Remove LPC partitioning Chia-Wei, Wang
@ 2020-12-21 5:56 ` Chia-Wei, Wang
2020-12-21 5:56 ` [PATCH v3 3/5] ipmi: kcs: aspeed: Adapt to new LPC DTS layout Chia-Wei, Wang
` (3 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Chia-Wei, Wang @ 2020-12-21 5:56 UTC (permalink / raw)
To: lee.jones, robh+dt, joel, andrew, linus.walleij, minyard,
devicetree, linux-arm-kernel, linux-aspeed, linux-kernel,
openbmc
Cc: BMC-SW, cyrilbur, haiyue.wang, rlippert
The LPC controller has no concept of the BMC and the Host partitions.
A concrete instance is that the HICRB[5:4] are for the I/O port address
configurtaion of KCS channel 1/2. However, the KCS driver cannot access
HICRB for channel 1/2 initialization via syscon regmap interface due to
the parition boundary. (i.e. offset 80h)
In addition, for the HW design backward compatibility, a newly added HW
control bit could be located at any reserved one over the LPC addressing
space. Thereby, this patch removes the lpc-bmc and lpc-host child node
and thus the LPC partitioning.
Note that this change requires the synchronization between device tree
change and the driver change. To prevent the misuse of old devicetrees
with new drivers, or vice versa, the v2 compatible strings are adopted
for the LPC device as listed:
"aspeed,ast2400-lpc-v2"
"aspeed,ast2500-lpc-v2"
"aspeed,ast2600-lpc-v2"
Signed-off-by: Chia-Wei, Wang <chiawei_wang@aspeedtech.com>
---
arch/arm/boot/dts/aspeed-g4.dtsi | 74 +++++++----------
arch/arm/boot/dts/aspeed-g5.dtsi | 135 ++++++++++++++-----------------
arch/arm/boot/dts/aspeed-g6.dtsi | 135 ++++++++++++++-----------------
3 files changed, 148 insertions(+), 196 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi
index b3dafbc8caca..ee22bc036440 100644
--- a/arch/arm/boot/dts/aspeed-g4.dtsi
+++ b/arch/arm/boot/dts/aspeed-g4.dtsi
@@ -343,58 +343,44 @@
};
lpc: lpc@1e789000 {
- compatible = "aspeed,ast2400-lpc", "simple-mfd";
+ compatible = "aspeed,ast2400-lpc-v2", "simple-mfd", "syscon";
reg = <0x1e789000 0x1000>;
+ reg-io-width = <4>;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x0 0x1e789000 0x1000>;
- lpc_bmc: lpc-bmc@0 {
- compatible = "aspeed,ast2400-lpc-bmc";
- reg = <0x0 0x80>;
+ lpc_ctrl: lpc-ctrl@80 {
+ compatible = "aspeed,ast2400-lpc-ctrl";
+ reg = <0x80 0x10>;
+ clocks = <&syscon ASPEED_CLK_GATE_LCLK>;
+ status = "disabled";
};
- lpc_host: lpc-host@80 {
- compatible = "aspeed,ast2400-lpc-host", "simple-mfd", "syscon";
- reg = <0x80 0x1e0>;
- reg-io-width = <4>;
-
- #address-cells = <1>;
- #size-cells = <1>;
- ranges = <0x0 0x80 0x1e0>;
-
- lpc_ctrl: lpc-ctrl@0 {
- compatible = "aspeed,ast2400-lpc-ctrl";
- reg = <0x0 0x10>;
- clocks = <&syscon ASPEED_CLK_GATE_LCLK>;
- status = "disabled";
- };
-
- lpc_snoop: lpc-snoop@10 {
- compatible = "aspeed,ast2400-lpc-snoop";
- reg = <0x10 0x8>;
- interrupts = <8>;
- status = "disabled";
- };
-
- lhc: lhc@20 {
- compatible = "aspeed,ast2400-lhc";
- reg = <0x20 0x24 0x48 0x8>;
- };
-
- lpc_reset: reset-controller@18 {
- compatible = "aspeed,ast2400-lpc-reset";
- reg = <0x18 0x4>;
- #reset-cells = <1>;
- };
-
- ibt: ibt@c0 {
- compatible = "aspeed,ast2400-ibt-bmc";
- reg = <0xc0 0x18>;
- interrupts = <8>;
- status = "disabled";
- };
+ lpc_snoop: lpc-snoop@90 {
+ compatible = "aspeed,ast2400-lpc-snoop";
+ reg = <0x90 0x8>;
+ interrupts = <8>;
+ status = "disabled";
+ };
+
+ lhc: lhc@a0 {
+ compatible = "aspeed,ast2400-lhc";
+ reg = <0xa0 0x24 0xc8 0x8>;
+ };
+
+ lpc_reset: reset-controller@98 {
+ compatible = "aspeed,ast2400-lpc-reset";
+ reg = <0x98 0x4>;
+ #reset-cells = <1>;
+ };
+
+ ibt: ibt@140 {
+ compatible = "aspeed,ast2400-ibt-bmc";
+ reg = <0x140 0x18>;
+ interrupts = <8>;
+ status = "disabled";
};
};
diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
index 5bc0de0f3365..10ca2100f69b 100644
--- a/arch/arm/boot/dts/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed-g5.dtsi
@@ -434,90 +434,73 @@
};
lpc: lpc@1e789000 {
- compatible = "aspeed,ast2500-lpc", "simple-mfd";
+ compatible = "aspeed,ast2500-lpc-v2", "simple-mfd", "syscon";
reg = <0x1e789000 0x1000>;
+ reg-io-width = <4>;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x0 0x1e789000 0x1000>;
- lpc_bmc: lpc-bmc@0 {
- compatible = "aspeed,ast2500-lpc-bmc", "simple-mfd", "syscon";
- reg = <0x0 0x80>;
- reg-io-width = <4>;
-
- #address-cells = <1>;
- #size-cells = <1>;
- ranges = <0x0 0x0 0x80>;
-
- kcs1: kcs@24 {
- compatible = "aspeed,ast2500-kcs-bmc-v2";
- reg = <0x24 0x1>, <0x30 0x1>, <0x3c 0x1>;
- interrupts = <8>;
- status = "disabled";
- };
- kcs2: kcs@28 {
- compatible = "aspeed,ast2500-kcs-bmc-v2";
- reg = <0x28 0x1>, <0x34 0x1>, <0x40 0x1>;
- interrupts = <8>;
- status = "disabled";
- };
- kcs3: kcs@2c {
- compatible = "aspeed,ast2500-kcs-bmc-v2";
- reg = <0x2c 0x1>, <0x38 0x1>, <0x44 0x1>;
- interrupts = <8>;
- status = "disabled";
- };
+ kcs1: kcs@24 {
+ compatible = "aspeed,ast2500-kcs-bmc-v2";
+ reg = <0x24 0x1>, <0x30 0x1>, <0x3c 0x1>;
+ interrupts = <8>;
+ status = "disabled";
+ };
+
+ kcs2: kcs@28 {
+ compatible = "aspeed,ast2500-kcs-bmc-v2";
+ reg = <0x28 0x1>, <0x34 0x1>, <0x40 0x1>;
+ interrupts = <8>;
+ status = "disabled";
+ };
+
+ kcs3: kcs@2c {
+ compatible = "aspeed,ast2500-kcs-bmc-v2";
+ reg = <0x2c 0x1>, <0x38 0x1>, <0x44 0x1>;
+ interrupts = <8>;
+ status = "disabled";
+ };
+
+ kcs4: kcs@114 {
+ compatible = "aspeed,ast2500-kcs-bmc-v2";
+ reg = <0x114 0x1>, <0x118 0x1>, <0x11c 0x1>;
+ interrupts = <8>;
+ status = "disabled";
};
- lpc_host: lpc-host@80 {
- compatible = "aspeed,ast2500-lpc-host", "simple-mfd", "syscon";
- reg = <0x80 0x1e0>;
- reg-io-width = <4>;
-
- #address-cells = <1>;
- #size-cells = <1>;
- ranges = <0x0 0x80 0x1e0>;
-
- kcs4: kcs@94 {
- compatible = "aspeed,ast2500-kcs-bmc-v2";
- reg = <0x94 0x1>, <0x98 0x1>, <0x9c 0x1>;
- interrupts = <8>;
- status = "disabled";
- };
-
- lpc_ctrl: lpc-ctrl@0 {
- compatible = "aspeed,ast2500-lpc-ctrl";
- reg = <0x0 0x10>;
- clocks = <&syscon ASPEED_CLK_GATE_LCLK>;
- status = "disabled";
- };
-
- lpc_snoop: lpc-snoop@10 {
- compatible = "aspeed,ast2500-lpc-snoop";
- reg = <0x10 0x8>;
- interrupts = <8>;
- status = "disabled";
- };
-
- lpc_reset: reset-controller@18 {
- compatible = "aspeed,ast2500-lpc-reset";
- reg = <0x18 0x4>;
- #reset-cells = <1>;
- };
-
- lhc: lhc@20 {
- compatible = "aspeed,ast2500-lhc";
- reg = <0x20 0x24 0x48 0x8>;
- };
-
-
- ibt: ibt@c0 {
- compatible = "aspeed,ast2500-ibt-bmc";
- reg = <0xc0 0x18>;
- interrupts = <8>;
- status = "disabled";
- };
+ lpc_ctrl: lpc-ctrl@80 {
+ compatible = "aspeed,ast2500-lpc-ctrl";
+ reg = <0x80 0x10>;
+ clocks = <&syscon ASPEED_CLK_GATE_LCLK>;
+ status = "disabled";
+ };
+
+ lpc_snoop: lpc-snoop@90 {
+ compatible = "aspeed,ast2500-lpc-snoop";
+ reg = <0x90 0x8>;
+ interrupts = <8>;
+ status = "disabled";
+ };
+
+ lpc_reset: reset-controller@98 {
+ compatible = "aspeed,ast2500-lpc-reset";
+ reg = <0x98 0x4>;
+ #reset-cells = <1>;
+ };
+
+ lhc: lhc@a0 {
+ compatible = "aspeed,ast2500-lhc";
+ reg = <0xa0 0x24 0xc8 0x8>;
+ };
+
+
+ ibt: ibt@140 {
+ compatible = "aspeed,ast2500-ibt-bmc";
+ reg = <0x140 0x18>;
+ interrupts = <8>;
+ status = "disabled";
};
};
diff --git a/arch/arm/boot/dts/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed-g6.dtsi
index 810b0676ab03..d91f48c3db62 100644
--- a/arch/arm/boot/dts/aspeed-g6.dtsi
+++ b/arch/arm/boot/dts/aspeed-g6.dtsi
@@ -460,90 +460,73 @@
};
lpc: lpc@1e789000 {
- compatible = "aspeed,ast2600-lpc", "simple-mfd";
+ compatible = "aspeed,ast2600-lpc-v2", "simple-mfd", "syscon";
reg = <0x1e789000 0x1000>;
+ reg-io-width = <4>;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x0 0x1e789000 0x1000>;
- lpc_bmc: lpc-bmc@0 {
- compatible = "aspeed,ast2600-lpc-bmc", "simple-mfd", "syscon";
- reg = <0x0 0x80>;
- reg-io-width = <4>;
-
- #address-cells = <1>;
- #size-cells = <1>;
- ranges = <0x0 0x0 0x80>;
-
- kcs1: kcs@24 {
- compatible = "aspeed,ast2500-kcs-bmc-v2";
- reg = <0x24 0x1>, <0x30 0x1>, <0x3c 0x1>;
- interrupts = <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>;
- kcs_chan = <1>;
- status = "disabled";
- };
- kcs2: kcs@28 {
- compatible = "aspeed,ast2500-kcs-bmc-v2";
- reg = <0x28 0x1>, <0x34 0x1>, <0x40 0x1>;
- interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>;
- status = "disabled";
- };
- kcs3: kcs@2c {
- compatible = "aspeed,ast2500-kcs-bmc-v2";
- reg = <0x2c 0x1>, <0x38 0x1>, <0x44 0x1>;
- interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
- status = "disabled";
- };
+ kcs1: kcs@24 {
+ compatible = "aspeed,ast2500-kcs-bmc-v2";
+ reg = <0x24 0x1>, <0x30 0x1>, <0x3c 0x1>;
+ interrupts = <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>;
+ kcs_chan = <1>;
+ status = "disabled";
+ };
+
+ kcs2: kcs@28 {
+ compatible = "aspeed,ast2500-kcs-bmc-v2";
+ reg = <0x28 0x1>, <0x34 0x1>, <0x40 0x1>;
+ interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+ };
+
+ kcs3: kcs@2c {
+ compatible = "aspeed,ast2500-kcs-bmc-v2";
+ reg = <0x2c 0x1>, <0x38 0x1>, <0x44 0x1>;
+ interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+ };
+
+ kcs4: kcs@114 {
+ compatible = "aspeed,ast2500-kcs-bmc-v2";
+ reg = <0x114 0x1>, <0x118 0x1>, <0x11c 0x1>;
+ interrupts = <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+ };
+
+ lpc_ctrl: lpc-ctrl@80 {
+ compatible = "aspeed,ast2600-lpc-ctrl";
+ reg = <0x80 0x80>;
+ clocks = <&syscon ASPEED_CLK_GATE_LCLK>;
+ status = "disabled";
+ };
+
+ lpc_snoop: lpc-snoop@80 {
+ compatible = "aspeed,ast2600-lpc-snoop";
+ reg = <0x80 0x80>;
+ interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
};
- lpc_host: lpc-host@80 {
- compatible = "aspeed,ast2600-lpc-host", "simple-mfd", "syscon";
- reg = <0x80 0x1e0>;
- reg-io-width = <4>;
-
- #address-cells = <1>;
- #size-cells = <1>;
- ranges = <0x0 0x80 0x1e0>;
-
- kcs4: kcs@94 {
- compatible = "aspeed,ast2500-kcs-bmc-v2";
- reg = <0x94 0x1>, <0x98 0x1>, <0x9c 0x1>;
- interrupts = <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>;
- status = "disabled";
- };
-
- lpc_ctrl: lpc-ctrl@0 {
- compatible = "aspeed,ast2600-lpc-ctrl";
- reg = <0x0 0x80>;
- clocks = <&syscon ASPEED_CLK_GATE_LCLK>;
- status = "disabled";
- };
-
- lpc_snoop: lpc-snoop@0 {
- compatible = "aspeed,ast2600-lpc-snoop";
- reg = <0x0 0x80>;
- interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>;
- status = "disabled";
- };
-
- lhc: lhc@20 {
- compatible = "aspeed,ast2600-lhc";
- reg = <0x20 0x24 0x48 0x8>;
- };
-
- lpc_reset: reset-controller@18 {
- compatible = "aspeed,ast2600-lpc-reset";
- reg = <0x18 0x4>;
- #reset-cells = <1>;
- };
-
- ibt: ibt@c0 {
- compatible = "aspeed,ast2600-ibt-bmc";
- reg = <0xc0 0x18>;
- interrupts = <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
- status = "disabled";
- };
+ lhc: lhc@a0 {
+ compatible = "aspeed,ast2600-lhc";
+ reg = <0xa0 0x24 0xc8 0x8>;
+ };
+
+ lpc_reset: reset-controller@98 {
+ compatible = "aspeed,ast2600-lpc-reset";
+ reg = <0x98 0x4>;
+ #reset-cells = <1>;
+ };
+
+ ibt: ibt@140 {
+ compatible = "aspeed,ast2600-ibt-bmc";
+ reg = <0x140 0x18>;
+ interrupts = <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
};
};
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH v3 3/5] ipmi: kcs: aspeed: Adapt to new LPC DTS layout
2020-12-21 5:56 [PATCH v3 0/5] Remove LPC register partitioning Chia-Wei, Wang
2020-12-21 5:56 ` [PATCH v3 1/5] dt-bindings: aspeed-lpc: Remove LPC partitioning Chia-Wei, Wang
2020-12-21 5:56 ` [PATCH v3 2/5] ARM: dts: Remove LPC BMC and Host partitions Chia-Wei, Wang
@ 2020-12-21 5:56 ` Chia-Wei, Wang
2020-12-21 7:53 ` Haiyue Wang
2020-12-21 5:56 ` [PATCH v3 4/5] pinctrl: aspeed-g5: Adapt to new LPC device tree layout Chia-Wei, Wang
` (2 subsequent siblings)
5 siblings, 1 reply; 10+ messages in thread
From: Chia-Wei, Wang @ 2020-12-21 5:56 UTC (permalink / raw)
To: lee.jones, robh+dt, joel, andrew, linus.walleij, minyard,
devicetree, linux-arm-kernel, linux-aspeed, linux-kernel,
openbmc
Cc: BMC-SW, cyrilbur, haiyue.wang, rlippert
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>
---
drivers/char/ipmi/kcs_bmc_aspeed.c | 35 ++++++++++++++++++------------
1 file changed, 21 insertions(+), 14 deletions(-)
diff --git a/drivers/char/ipmi/kcs_bmc_aspeed.c b/drivers/char/ipmi/kcs_bmc_aspeed.c
index a140203c079b..6283bfef4ea7 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;
@@ -345,15 +342,25 @@ static int aspeed_kcs_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct kcs_bmc *kcs_bmc;
- struct device_node *np;
+ struct device_node *kcs_np;
+ struct device_node *lpc_np;
int rc;
- np = pdev->dev.of_node;
- if (of_device_is_compatible(np, "aspeed,ast2400-kcs-bmc") ||
- of_device_is_compatible(np, "aspeed,ast2500-kcs-bmc"))
+ kcs_np = dev->of_node;
+ lpc_np = kcs_np->parent;
+
+ if (!of_device_is_compatible(lpc_np, "aspeed,ast2400-lpc-v2") &&
+ !of_device_is_compatible(lpc_np, "aspeed,ast2500-lpc-v2") &&
+ !of_device_is_compatible(lpc_np, "aspeed,ast2600-lpc-v2")) {
+ dev_err(dev, "unsupported LPC device binding\n");
+ return -ENODEV;
+ }
+
+ if (of_device_is_compatible(kcs_np, "aspeed,ast2400-kcs-bmc") ||
+ of_device_is_compatible(kcs_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"))
+ else if (of_device_is_compatible(kcs_np, "aspeed,ast2400-kcs-bmc-v2") ||
+ of_device_is_compatible(kcs_np, "aspeed,ast2500-kcs-bmc-v2"))
kcs_bmc = aspeed_kcs_probe_of_v2(pdev);
else
return -EINVAL;
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH v3 3/5] ipmi: kcs: aspeed: Adapt to new LPC DTS layout
2020-12-21 5:56 ` [PATCH v3 3/5] ipmi: kcs: aspeed: Adapt to new LPC DTS layout Chia-Wei, Wang
@ 2020-12-21 7:53 ` Haiyue Wang
2020-12-21 7:59 ` Haiyue Wang
0 siblings, 1 reply; 10+ messages in thread
From: Haiyue Wang @ 2020-12-21 7:53 UTC (permalink / raw)
To: Chia-Wei, Wang, lee.jones, robh+dt, joel, andrew, linus.walleij,
minyard, devicetree, linux-arm-kernel, linux-aspeed,
linux-kernel, openbmc
Cc: BMC-SW, cyrilbur, rlippert
On 12/21/2020 13:56, Chia-Wei, Wang wrote:
> 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>
> ---
> drivers/char/ipmi/kcs_bmc_aspeed.c | 35 ++++++++++++++++++------------
> 1 file changed, 21 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/char/ipmi/kcs_bmc_aspeed.c b/drivers/char/ipmi/kcs_bmc_aspeed.c
> index a140203c079b..6283bfef4ea7 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;
> @@ -345,15 +342,25 @@ static int aspeed_kcs_probe(struct platform_device *pdev)
> {
> struct device *dev = &pdev->dev;
> struct kcs_bmc *kcs_bmc;
> - struct device_node *np;
> + struct device_node *kcs_np;
> + struct device_node *lpc_np;
> int rc;
>
I think you can just use 'np' to do LPC compatible checking:
np = pdev->dev.of_node->parent;
if (!of_device_is_compatible(lpc_np, "aspeed,ast2400-lpc-v2") &&
!of_device_is_compatible(lpc_np, "aspeed,ast2500-lpc-v2") &&
!of_device_is_compatible(lpc_np, "aspeed,ast2600-lpc-v2")) {
dev_err(dev, "unsupported LPC device binding\n");
return -ENODEV;
}
before:
np = pdev->dev.of_node;
if (of_device_is_compatible(np, "aspeed,ast2400-kcs-bmc") ||
of_device_is_compatible(np, "aspeed,ast2500-kcs-bmc"))
Then the patch is clear. ;-)
> - np = pdev->dev.of_node;
> - if (of_device_is_compatible(np, "aspeed,ast2400-kcs-bmc") ||
> - of_device_is_compatible(np, "aspeed,ast2500-kcs-bmc"))
> + kcs_np = dev->of_node;
> + lpc_np = kcs_np->parent;
> +
> + if (!of_device_is_compatible(lpc_np, "aspeed,ast2400-lpc-v2") &&
> + !of_device_is_compatible(lpc_np, "aspeed,ast2500-lpc-v2") &&
> + !of_device_is_compatible(lpc_np, "aspeed,ast2600-lpc-v2")) {
> + dev_err(dev, "unsupported LPC device binding\n");
> + return -ENODEV;
> + }
> +
> + if (of_device_is_compatible(kcs_np, "aspeed,ast2400-kcs-bmc") ||
> + of_device_is_compatible(kcs_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"))
> + else if (of_device_is_compatible(kcs_np, "aspeed,ast2400-kcs-bmc-v2") ||
> + of_device_is_compatible(kcs_np, "aspeed,ast2500-kcs-bmc-v2"))
> kcs_bmc = aspeed_kcs_probe_of_v2(pdev);
> else
> return -EINVAL;
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH v3 3/5] ipmi: kcs: aspeed: Adapt to new LPC DTS layout
2020-12-21 7:53 ` Haiyue Wang
@ 2020-12-21 7:59 ` Haiyue Wang
2020-12-22 2:13 ` ChiaWei Wang
0 siblings, 1 reply; 10+ messages in thread
From: Haiyue Wang @ 2020-12-21 7:59 UTC (permalink / raw)
To: Chia-Wei, Wang, lee.jones, robh+dt, joel, andrew, linus.walleij,
minyard, devicetree, linux-arm-kernel, linux-aspeed,
linux-kernel, openbmc
Cc: BMC-SW, cyrilbur, rlippert
On 12/21/2020 15:53, Haiyue Wang wrote:
> On 12/21/2020 13:56, Chia-Wei, Wang wrote:
>> 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>
>> ---
>> drivers/char/ipmi/kcs_bmc_aspeed.c | 35 ++++++++++++++++++------------
>> 1 file changed, 21 insertions(+), 14 deletions(-)
>>
>> diff --git a/drivers/char/ipmi/kcs_bmc_aspeed.c
>> b/drivers/char/ipmi/kcs_bmc_aspeed.c
>> index a140203c079b..6283bfef4ea7 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;
>> @@ -345,15 +342,25 @@ static int aspeed_kcs_probe(struct
>> platform_device *pdev)
>> {
>> struct device *dev = &pdev->dev;
>> struct kcs_bmc *kcs_bmc;
>> - struct device_node *np;
>> + struct device_node *kcs_np;
>> + struct device_node *lpc_np;
>> int rc;
>
> I think you can just use 'np' to do LPC compatible checking:
>
> np = pdev->dev.of_node->parent;
>
> if (!of_device_is_compatible(lpc_np, "aspeed,ast2400-lpc-v2") &&
> !of_device_is_compatible(lpc_np, "aspeed,ast2500-lpc-v2") &&
> !of_device_is_compatible(lpc_np, "aspeed,ast2600-lpc-v2")) {
> dev_err(dev, "unsupported LPC device binding\n");
> return -ENODEV;
> }
>
Typo:
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;
}
>
> before:
>
> np = pdev->dev.of_node;
> if (of_device_is_compatible(np, "aspeed,ast2400-kcs-bmc") ||
> of_device_is_compatible(np, "aspeed,ast2500-kcs-bmc"))
>
> Then the patch is clear. ;-)
>
>> - np = pdev->dev.of_node;
>> - if (of_device_is_compatible(np, "aspeed,ast2400-kcs-bmc") ||
>> - of_device_is_compatible(np, "aspeed,ast2500-kcs-bmc"))
>> + kcs_np = dev->of_node;
>> + lpc_np = kcs_np->parent;
>> +
>> + if (!of_device_is_compatible(lpc_np, "aspeed,ast2400-lpc-v2") &&
>> + !of_device_is_compatible(lpc_np, "aspeed,ast2500-lpc-v2") &&
>> + !of_device_is_compatible(lpc_np, "aspeed,ast2600-lpc-v2")) {
>> + dev_err(dev, "unsupported LPC device binding\n");
>> + return -ENODEV;
>> + }
>> +
>> + if (of_device_is_compatible(kcs_np, "aspeed,ast2400-kcs-bmc") ||
>> + of_device_is_compatible(kcs_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"))
>> + else if (of_device_is_compatible(kcs_np,
>> "aspeed,ast2400-kcs-bmc-v2") ||
>> + of_device_is_compatible(kcs_np,
>> "aspeed,ast2500-kcs-bmc-v2"))
>> kcs_bmc = aspeed_kcs_probe_of_v2(pdev);
>> else
>> return -EINVAL;
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 10+ messages in thread* RE: [PATCH v3 3/5] ipmi: kcs: aspeed: Adapt to new LPC DTS layout
2020-12-21 7:59 ` Haiyue Wang
@ 2020-12-22 2:13 ` ChiaWei Wang
0 siblings, 0 replies; 10+ messages in thread
From: ChiaWei Wang @ 2020-12-22 2:13 UTC (permalink / raw)
To: Haiyue Wang, lee.jones, robh+dt, joel, andrew, linus.walleij,
minyard, devicetree, linux-arm-kernel, linux-aspeed,
linux-kernel, openbmc
Cc: BMC-SW, cyrilbur, rlippert
Hi Haiyue,
> -----Original Message-----
> From: Haiyue Wang <haiyue.wang@linux.intel.com>
> Sent: Monday, December 21, 2020 3:59 PM
> Subject: Re: [PATCH v3 3/5] ipmi: kcs: aspeed: Adapt to new LPC DTS layout
>
>
> On 12/21/2020 15:53, Haiyue Wang wrote:
> > On 12/21/2020 13:56, Chia-Wei, Wang wrote:
> >> 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>
> >> ---
> >> drivers/char/ipmi/kcs_bmc_aspeed.c | 35
> >> ++++++++++++++++++------------
> >> 1 file changed, 21 insertions(+), 14 deletions(-)
> >>
> >> diff --git a/drivers/char/ipmi/kcs_bmc_aspeed.c
> >> b/drivers/char/ipmi/kcs_bmc_aspeed.c
> >> index a140203c079b..6283bfef4ea7 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;
> >> @@ -345,15 +342,25 @@ static int aspeed_kcs_probe(struct
> >> platform_device *pdev)
> >> {
> >> struct device *dev = &pdev->dev;
> >> struct kcs_bmc *kcs_bmc;
> >> - struct device_node *np;
> >> + struct device_node *kcs_np;
> >> + struct device_node *lpc_np;
> >> int rc;
> >
> > I think you can just use 'np' to do LPC compatible checking:
> >
> > np = pdev->dev.of_node->parent;
> >
> > if (!of_device_is_compatible(lpc_np, "aspeed,ast2400-lpc-v2") &&
> > !of_device_is_compatible(lpc_np, "aspeed,ast2500-lpc-v2") &&
> > !of_device_is_compatible(lpc_np, "aspeed,ast2600-lpc-v2")) {
> > dev_err(dev, "unsupported LPC device binding\n");
> > return -ENODEV;
> > }
> >
> Typo:
>
> 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;
> }
Thanks for the suggestion. Will revise the code after collecting reviewers' feedback.
>
>
> >
> > before:
> >
> > np = pdev->dev.of_node;
> > if (of_device_is_compatible(np, "aspeed,ast2400-kcs-bmc") ||
> > of_device_is_compatible(np, "aspeed,ast2500-kcs-bmc"))
> >
> > Then the patch is clear. ;-)
> >
> >> - np = pdev->dev.of_node;
> >> - if (of_device_is_compatible(np, "aspeed,ast2400-kcs-bmc") ||
> >> - of_device_is_compatible(np,
> "aspeed,ast2500-kcs-bmc"))
> >> + kcs_np = dev->of_node;
> >> + lpc_np = kcs_np->parent;
> >> +
> >> + if (!of_device_is_compatible(lpc_np, "aspeed,ast2400-lpc-v2") &&
> >> + !of_device_is_compatible(lpc_np, "aspeed,ast2500-lpc-v2")
> &&
> >> + !of_device_is_compatible(lpc_np, "aspeed,ast2600-lpc-v2")) {
> >> + dev_err(dev, "unsupported LPC device binding\n");
> >> + return -ENODEV;
> >> + }
> >> +
> >> + if (of_device_is_compatible(kcs_np, "aspeed,ast2400-kcs-bmc") ||
> >> + of_device_is_compatible(kcs_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"))
> >> + else if (of_device_is_compatible(kcs_np,
> >> "aspeed,ast2400-kcs-bmc-v2") ||
> >> + of_device_is_compatible(kcs_np,
> >> "aspeed,ast2500-kcs-bmc-v2"))
> >> kcs_bmc = aspeed_kcs_probe_of_v2(pdev);
> >> else
> >> return -EINVAL;
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v3 4/5] pinctrl: aspeed-g5: Adapt to new LPC device tree layout
2020-12-21 5:56 [PATCH v3 0/5] Remove LPC register partitioning Chia-Wei, Wang
` (2 preceding siblings ...)
2020-12-21 5:56 ` [PATCH v3 3/5] ipmi: kcs: aspeed: Adapt to new LPC DTS layout Chia-Wei, Wang
@ 2020-12-21 5:56 ` Chia-Wei, Wang
2020-12-21 5:56 ` [PATCH v3 5/5] soc: aspeed: " Chia-Wei, Wang
2021-01-04 15:30 ` [PATCH v3 0/5] Remove LPC register partitioning Jonathan Cameron
5 siblings, 0 replies; 10+ messages in thread
From: Chia-Wei, Wang @ 2020-12-21 5:56 UTC (permalink / raw)
To: lee.jones, robh+dt, joel, andrew, linus.walleij, minyard,
devicetree, linux-arm-kernel, linux-aspeed, linux-kernel,
openbmc
Cc: BMC-SW, cyrilbur, haiyue.wang, rlippert
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>
---
drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c b/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c
index 0cab4c2576e2..6e0e5b64e677 100644
--- a/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c
+++ b/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c
@@ -60,7 +60,7 @@
#define COND2 { ASPEED_IP_SCU, SCU94, GENMASK(1, 0), 0, 0 }
/* LHCR0 is offset from the end of the H8S/2168-compatible registers */
-#define LHCR0 0x20
+#define LHCR0 0xa0
#define GFX064 0x64
#define B14 0
@@ -2648,14 +2648,21 @@ static struct regmap *aspeed_g5_acquire_regmap(struct aspeed_pinmux_data *ctx,
}
if (ip == ASPEED_IP_LPC) {
- struct device_node *node;
+ struct device_node *lhc_np;
+ struct device_node *lpc_np;
struct regmap *map;
- node = of_parse_phandle(ctx->dev->of_node,
+ lhc_np = of_parse_phandle(ctx->dev->of_node,
"aspeed,external-nodes", 1);
- if (node) {
- map = syscon_node_to_regmap(node->parent);
- of_node_put(node);
+ if (lhc_np) {
+ lpc_np = lhc_np->parent;
+ if (!of_device_is_compatible(lpc_np, "aspeed,ast2400-lpc-v2") &&
+ !of_device_is_compatible(lpc_np, "aspeed,ast2500-lpc-v2") &&
+ !of_device_is_compatible(lpc_np, "aspeed,ast2600-lpc-v2"))
+ return ERR_PTR(-ENODEV);
+
+ map = syscon_node_to_regmap(lpc_np);
+ of_node_put(lhc_np);
if (IS_ERR(map))
return map;
} else
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH v3 5/5] soc: aspeed: Adapt to new LPC device tree layout
2020-12-21 5:56 [PATCH v3 0/5] Remove LPC register partitioning Chia-Wei, Wang
` (3 preceding siblings ...)
2020-12-21 5:56 ` [PATCH v3 4/5] pinctrl: aspeed-g5: Adapt to new LPC device tree layout Chia-Wei, Wang
@ 2020-12-21 5:56 ` Chia-Wei, Wang
2021-01-04 15:30 ` [PATCH v3 0/5] Remove LPC register partitioning Jonathan Cameron
5 siblings, 0 replies; 10+ messages in thread
From: Chia-Wei, Wang @ 2020-12-21 5:56 UTC (permalink / raw)
To: lee.jones, robh+dt, joel, andrew, linus.walleij, minyard,
devicetree, linux-arm-kernel, linux-aspeed, linux-kernel,
openbmc
Cc: BMC-SW, cyrilbur, haiyue.wang, rlippert
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>
---
drivers/soc/aspeed/aspeed-lpc-ctrl.c | 20 ++++++++++++++------
drivers/soc/aspeed/aspeed-lpc-snoop.c | 23 +++++++++++++++--------
2 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/drivers/soc/aspeed/aspeed-lpc-ctrl.c b/drivers/soc/aspeed/aspeed-lpc-ctrl.c
index 439bcd6b8c4a..b04074949240 100644
--- a/drivers/soc/aspeed/aspeed-lpc-ctrl.c
+++ b/drivers/soc/aspeed/aspeed-lpc-ctrl.c
@@ -18,15 +18,15 @@
#define DEVICE_NAME "aspeed-lpc-ctrl"
-#define HICR5 0x0
+#define HICR5 0x80
#define HICR5_ENL2H BIT(8)
#define HICR5_ENFWH BIT(10)
-#define HICR6 0x4
+#define HICR6 0x84
#define SW_FWH2AHB BIT(17)
-#define HICR7 0x8
-#define HICR8 0xc
+#define HICR7 0x88
+#define HICR8 0x8c
struct aspeed_lpc_ctrl {
struct miscdevice miscdev;
@@ -215,6 +215,7 @@ static int aspeed_lpc_ctrl_probe(struct platform_device *pdev)
struct device_node *node;
struct resource resm;
struct device *dev;
+ struct device_node *lpc_np;
int rc;
dev = &pdev->dev;
@@ -270,8 +271,15 @@ static int aspeed_lpc_ctrl_probe(struct platform_device *pdev)
}
}
- lpc_ctrl->regmap = syscon_node_to_regmap(
- pdev->dev.parent->of_node);
+ lpc_np = pdev->dev.parent->of_node;
+ if (!of_device_is_compatible(lpc_np, "aspeed,ast2400-lpc-v2") &&
+ !of_device_is_compatible(lpc_np, "aspeed,ast2500-lpc-v2") &&
+ !of_device_is_compatible(lpc_np, "aspeed,ast2600-lpc-v2")) {
+ dev_err(dev, "unsupported LPC device binding\n");
+ return -ENODEV;
+ }
+
+ lpc_ctrl->regmap = syscon_node_to_regmap(lpc_np);
if (IS_ERR(lpc_ctrl->regmap)) {
dev_err(dev, "Couldn't get regmap\n");
return -ENODEV;
diff --git a/drivers/soc/aspeed/aspeed-lpc-snoop.c b/drivers/soc/aspeed/aspeed-lpc-snoop.c
index 682ba0eb4eba..63c3d9b8ba61 100644
--- a/drivers/soc/aspeed/aspeed-lpc-snoop.c
+++ b/drivers/soc/aspeed/aspeed-lpc-snoop.c
@@ -28,26 +28,25 @@
#define NUM_SNOOP_CHANNELS 2
#define SNOOP_FIFO_SIZE 2048
-#define HICR5 0x0
+#define HICR5 0x80
#define HICR5_EN_SNP0W BIT(0)
#define HICR5_ENINT_SNP0W BIT(1)
#define HICR5_EN_SNP1W BIT(2)
#define HICR5_ENINT_SNP1W BIT(3)
-
-#define HICR6 0x4
+#define HICR6 0x84
#define HICR6_STR_SNP0W BIT(0)
#define HICR6_STR_SNP1W BIT(1)
-#define SNPWADR 0x10
+#define SNPWADR 0x90
#define SNPWADR_CH0_MASK GENMASK(15, 0)
#define SNPWADR_CH0_SHIFT 0
#define SNPWADR_CH1_MASK GENMASK(31, 16)
#define SNPWADR_CH1_SHIFT 16
-#define SNPWDR 0x14
+#define SNPWDR 0x94
#define SNPWDR_CH0_MASK GENMASK(7, 0)
#define SNPWDR_CH0_SHIFT 0
#define SNPWDR_CH1_MASK GENMASK(15, 8)
#define SNPWDR_CH1_SHIFT 8
-#define HICRB 0x80
+#define HICRB 0x100
#define HICRB_ENSNP0D BIT(14)
#define HICRB_ENSNP1D BIT(15)
@@ -258,6 +257,7 @@ static int aspeed_lpc_snoop_probe(struct platform_device *pdev)
{
struct aspeed_lpc_snoop *lpc_snoop;
struct device *dev;
+ struct device_node *lpc_np;
u32 port;
int rc;
@@ -267,8 +267,15 @@ static int aspeed_lpc_snoop_probe(struct platform_device *pdev)
if (!lpc_snoop)
return -ENOMEM;
- lpc_snoop->regmap = syscon_node_to_regmap(
- pdev->dev.parent->of_node);
+ lpc_np = pdev->dev.parent->of_node;
+ if (!of_device_is_compatible(lpc_np, "aspeed,ast2400-lpc-v2") &&
+ !of_device_is_compatible(lpc_np, "aspeed,ast2500-lpc-v2") &&
+ !of_device_is_compatible(lpc_np, "aspeed,ast2600-lpc-v2")) {
+ dev_err(dev, "unsupported LPC device binding\n");
+ return -ENODEV;
+ }
+
+ lpc_snoop->regmap = syscon_node_to_regmap(lpc_np);
if (IS_ERR(lpc_snoop->regmap)) {
dev_err(dev, "Couldn't get regmap\n");
return -ENODEV;
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH v3 0/5] Remove LPC register partitioning
2020-12-21 5:56 [PATCH v3 0/5] Remove LPC register partitioning Chia-Wei, Wang
` (4 preceding siblings ...)
2020-12-21 5:56 ` [PATCH v3 5/5] soc: aspeed: " Chia-Wei, Wang
@ 2021-01-04 15:30 ` Jonathan Cameron
5 siblings, 0 replies; 10+ messages in thread
From: Jonathan Cameron @ 2021-01-04 15:30 UTC (permalink / raw)
To: Chia-Wei, Wang
Cc: devicetree, haiyue.wang, linux-aspeed, minyard, BMC-SW, andrew,
linus.walleij, linux-kernel, cyrilbur, rlippert, robh+dt, joel,
lee.jones, openbmc, linux-arm-kernel
On Mon, 21 Dec 2020 13:56:18 +0800
"Chia-Wei, Wang" <chiawei_wang@aspeedtech.com> wrote:
> The LPC controller has no concept of the BMC and the Host partitions.
> The incorrect partitioning can impose unnecessary range restrictions
> on register access through the syscon regmap interface.
>
> For instance, HICRB contains the I/O port address configuration
> of KCS channel 1/2. However, the KCS#1/#2 drivers cannot access
> HICRB as it is located at the other LPC partition.
>
> In addition, to be backward compatible, the newly added HW control
> bits could be located at any reserved bits over the LPC addressing
> space.
>
> Thereby, this patch series aims to remove the LPC partitioning for
> better driver development and maintenance. This requires the change
> to both the device tree and the driver implementation. To ensure
> both sides are synchronously updated, a v2 binding check is added.
>
> Changes since v2:
> - Add v2 binding check to ensure the synchronization between the
> device tree change and the driver register offset fix.
>
> Changes since v1:
> - Add the fix to the aspeed-lpc binding documentation.
>
> Chia-Wei, Wang (5):
> dt-bindings: aspeed-lpc: Remove LPC partitioning
> ARM: dts: Remove LPC BMC and Host partitions
> ipmi: kcs: aspeed: Adapt to new LPC DTS layout
> pinctrl: aspeed-g5: Adapt to new LPC device tree layout
> soc: aspeed: Adapt to new LPC device tree layout
>
> .../devicetree/bindings/mfd/aspeed-lpc.txt | 99 +++----------
> arch/arm/boot/dts/aspeed-g4.dtsi | 74 ++++------
> arch/arm/boot/dts/aspeed-g5.dtsi | 135 ++++++++----------
> arch/arm/boot/dts/aspeed-g6.dtsi | 135 ++++++++----------
> drivers/char/ipmi/kcs_bmc_aspeed.c | 35 +++--
> drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c | 19 ++-
> drivers/soc/aspeed/aspeed-lpc-ctrl.c | 20 ++-
> drivers/soc/aspeed/aspeed-lpc-snoop.c | 23 +--
> 8 files changed, 232 insertions(+), 308 deletions(-)
>
Hi,
New year, new campaign to make people's lives slightly easier :)
I would appreciate it if everyone made sure their cover letters have an
appropriate "scope" defined. This is going to broad mailing
lists so it would be good to give it a title of something like
"aspeed: Remove LPC register partitioning"
possibly even
"arm: aspeed: Remove LPC register partitioning"
both to make it stand out to people who do want to read it and to
allow others to rapidly conclude they can skip the thread.
Thanks,
Jonathan
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 10+ messages in thread