* [PATCH 0/3] ipmi: kcs-bmc: Rework bindings to clean up DT warnings @ 2019-12-03 12:38 Andrew Jeffery 2019-12-03 12:38 ` [PATCH 1/3] dt-bindings: ipmi: aspeed: Introduce a v2 binding for KCS Andrew Jeffery ` (2 more replies) 0 siblings, 3 replies; 10+ messages in thread From: Andrew Jeffery @ 2019-12-03 12:38 UTC (permalink / raw) To: openipmi-developer Cc: mark.rutland, devicetree, minyard, arnd, gregkh, linux-kernel, linux-aspeed, robh+dt, joel, linux-arm-kernel Hello, This is a short series reworking the devicetree binding and driver for the ASPEED BMC KCS devices. With the number of supported ASPEED BMC devicetrees the changes enable removal of more than 100 lines of warning output from dtc. These changes are extracted from an RFC series posted previously, which can be found here: https://lore.kernel.org/lkml/20190726053959.2003-1-andrew@aj.id.au/ Haiyue has already reviewed the driver patches in that thread so the re-posting carries his tags. Since the original series the patches have been rebased on top of char-misc/master with no further changes. However, please take a look to make sure the patches are still sane. Cheers, Andrew Andrew Jeffery (3): dt-bindings: ipmi: aspeed: Introduce a v2 binding for KCS ipmi: kcs: Finish configuring ASPEED KCS device before enable ipmi: kcs: aspeed: Implement v2 bindings Documentation/devicetree/bindings/ipmi/aspeed-kcs-bmc.txt | 20 +- drivers/char/ipmi/kcs_bmc_aspeed.c | 151 +++++-- 2 files changed, 139 insertions(+), 32 deletions(-) base-commit: 937d6eefc716a9071f0e3bada19200de1bb9d048 -- git-series 0.9.1 _______________________________________________ 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 1/3] dt-bindings: ipmi: aspeed: Introduce a v2 binding for KCS 2019-12-03 12:38 [PATCH 0/3] ipmi: kcs-bmc: Rework bindings to clean up DT warnings Andrew Jeffery @ 2019-12-03 12:38 ` Andrew Jeffery 2019-12-03 14:31 ` Rob Herring 2019-12-03 12:38 ` [PATCH 2/3] ipmi: kcs: Finish configuring ASPEED KCS device before enable Andrew Jeffery 2019-12-03 12:38 ` [PATCH 3/3] ipmi: kcs: aspeed: Implement v2 bindings Andrew Jeffery 2 siblings, 1 reply; 10+ messages in thread From: Andrew Jeffery @ 2019-12-03 12:38 UTC (permalink / raw) To: openipmi-developer Cc: mark.rutland, devicetree, minyard, arnd, gregkh, linux-kernel, linux-aspeed, robh+dt, joel, linux-arm-kernel The v2 binding utilises reg and renames some of the v1 properties. Signed-off-by: Andrew Jeffery <andrew@aj.id.au> --- Documentation/devicetree/bindings/ipmi/aspeed-kcs-bmc.txt | 20 +++++--- 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/Documentation/devicetree/bindings/ipmi/aspeed-kcs-bmc.txt b/Documentation/devicetree/bindings/ipmi/aspeed-kcs-bmc.txt index d98a9bf45d6c..76b180ebbde4 100644 --- a/Documentation/devicetree/bindings/ipmi/aspeed-kcs-bmc.txt +++ b/Documentation/devicetree/bindings/ipmi/aspeed-kcs-bmc.txt @@ -1,9 +1,10 @@ -* Aspeed KCS (Keyboard Controller Style) IPMI interface +# Aspeed KCS (Keyboard Controller Style) IPMI interface The Aspeed SOCs (AST2400 and AST2500) are commonly used as BMCs (Baseboard Management Controllers) and the KCS interface can be used to perform in-band IPMI communication with their host. +## v1 Required properties: - compatible : should be one of "aspeed,ast2400-kcs-bmc" @@ -12,14 +13,21 @@ Required properties: - kcs_chan : The LPC channel number in the controller - kcs_addr : The host CPU IO map address +## v2 +Required properties: +- compatible : should be one of + "aspeed,ast2400-kcs-bmc-v2" + "aspeed,ast2500-kcs-bmc-v2" +- reg : The address and size of the IDR, ODR and STR registers +- interrupts : interrupt generated by the controller +- slave-reg : The host CPU IO map address Example: - kcs3: kcs3@0 { - compatible = "aspeed,ast2500-kcs-bmc"; - reg = <0x0 0x80>; + kcs3: kcs@24 { + compatible = "aspeed,ast2500-kcs-bmc-v2"; + reg = <0x24 0x1>, <0x30 0x1>, <0x3c 0x1>; interrupts = <8>; - kcs_chan = <3>; - kcs_addr = <0xCA2>; + slave-reg = <0xca2>; status = "okay"; }; -- git-series 0.9.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 1/3] dt-bindings: ipmi: aspeed: Introduce a v2 binding for KCS 2019-12-03 12:38 ` [PATCH 1/3] dt-bindings: ipmi: aspeed: Introduce a v2 binding for KCS Andrew Jeffery @ 2019-12-03 14:31 ` Rob Herring 2019-12-05 5:13 ` Andrew Jeffery 0 siblings, 1 reply; 10+ messages in thread From: Rob Herring @ 2019-12-03 14:31 UTC (permalink / raw) To: Andrew Jeffery Cc: Mark Rutland, devicetree, Corey Minyard, Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, linux-aspeed, Joel Stanley, openipmi-developer, moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE On Tue, Dec 3, 2019 at 6:36 AM Andrew Jeffery <andrew@aj.id.au> wrote: > > The v2 binding utilises reg and renames some of the v1 properties. > > Signed-off-by: Andrew Jeffery <andrew@aj.id.au> > --- > Documentation/devicetree/bindings/ipmi/aspeed-kcs-bmc.txt | 20 +++++--- > 1 file changed, 14 insertions(+), 6 deletions(-) > > diff --git a/Documentation/devicetree/bindings/ipmi/aspeed-kcs-bmc.txt b/Documentation/devicetree/bindings/ipmi/aspeed-kcs-bmc.txt > index d98a9bf45d6c..76b180ebbde4 100644 > --- a/Documentation/devicetree/bindings/ipmi/aspeed-kcs-bmc.txt > +++ b/Documentation/devicetree/bindings/ipmi/aspeed-kcs-bmc.txt > @@ -1,9 +1,10 @@ > -* Aspeed KCS (Keyboard Controller Style) IPMI interface > +# Aspeed KCS (Keyboard Controller Style) IPMI interface > > The Aspeed SOCs (AST2400 and AST2500) are commonly used as BMCs > (Baseboard Management Controllers) and the KCS interface can be > used to perform in-band IPMI communication with their host. > > +## v1 > Required properties: > - compatible : should be one of > "aspeed,ast2400-kcs-bmc" > @@ -12,14 +13,21 @@ Required properties: > - kcs_chan : The LPC channel number in the controller > - kcs_addr : The host CPU IO map address > > +## v2 > +Required properties: > +- compatible : should be one of > + "aspeed,ast2400-kcs-bmc-v2" > + "aspeed,ast2500-kcs-bmc-v2" > +- reg : The address and size of the IDR, ODR and STR registers > +- interrupts : interrupt generated by the controller > +- slave-reg : The host CPU IO map address aspeed,slave-reg > > Example: > > - kcs3: kcs3@0 { > - compatible = "aspeed,ast2500-kcs-bmc"; > - reg = <0x0 0x80>; > + kcs3: kcs@24 { > + compatible = "aspeed,ast2500-kcs-bmc-v2"; > + reg = <0x24 0x1>, <0x30 0x1>, <0x3c 0x1>; What are the other registers in this address space? I'm not so sure this is an improvement if you end up with a bunch of nodes with single registers. > interrupts = <8>; > - kcs_chan = <3>; > - kcs_addr = <0xCA2>; > + slave-reg = <0xca2>; > status = "okay"; > }; > -- > git-series 0.9.1 _______________________________________________ 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 1/3] dt-bindings: ipmi: aspeed: Introduce a v2 binding for KCS 2019-12-03 14:31 ` Rob Herring @ 2019-12-05 5:13 ` Andrew Jeffery 2019-12-05 17:50 ` Rob Herring 0 siblings, 1 reply; 10+ messages in thread From: Andrew Jeffery @ 2019-12-05 5:13 UTC (permalink / raw) To: Rob Herring Cc: Mark Rutland, devicetree, Corey Minyard, Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, linux-aspeed, Joel Stanley, openipmi-developer, moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE On Wed, 4 Dec 2019, at 01:01, Rob Herring wrote: > On Tue, Dec 3, 2019 at 6:36 AM Andrew Jeffery <andrew@aj.id.au> wrote: > > > > The v2 binding utilises reg and renames some of the v1 properties. > > > > Signed-off-by: Andrew Jeffery <andrew@aj.id.au> > > --- > > Documentation/devicetree/bindings/ipmi/aspeed-kcs-bmc.txt | 20 +++++--- > > 1 file changed, 14 insertions(+), 6 deletions(-) > > > > diff --git a/Documentation/devicetree/bindings/ipmi/aspeed-kcs-bmc.txt b/Documentation/devicetree/bindings/ipmi/aspeed-kcs-bmc.txt > > index d98a9bf45d6c..76b180ebbde4 100644 > > --- a/Documentation/devicetree/bindings/ipmi/aspeed-kcs-bmc.txt > > +++ b/Documentation/devicetree/bindings/ipmi/aspeed-kcs-bmc.txt > > @@ -1,9 +1,10 @@ > > -* Aspeed KCS (Keyboard Controller Style) IPMI interface > > +# Aspeed KCS (Keyboard Controller Style) IPMI interface > > > > The Aspeed SOCs (AST2400 and AST2500) are commonly used as BMCs > > (Baseboard Management Controllers) and the KCS interface can be > > used to perform in-band IPMI communication with their host. > > > > +## v1 > > Required properties: > > - compatible : should be one of > > "aspeed,ast2400-kcs-bmc" > > @@ -12,14 +13,21 @@ Required properties: > > - kcs_chan : The LPC channel number in the controller > > - kcs_addr : The host CPU IO map address > > > > +## v2 > > +Required properties: > > +- compatible : should be one of > > + "aspeed,ast2400-kcs-bmc-v2" > > + "aspeed,ast2500-kcs-bmc-v2" > > +- reg : The address and size of the IDR, ODR and STR registers > > +- interrupts : interrupt generated by the controller > > +- slave-reg : The host CPU IO map address > > aspeed,slave-reg I don't agree, as it's not an aspeed-specific behaviour. This property controls where the device appears in the host's LPC IO address space, which is a common problem for any LPC IO device exposed by the BMC to the host. > > > > > Example: > > > > - kcs3: kcs3@0 { > > - compatible = "aspeed,ast2500-kcs-bmc"; > > - reg = <0x0 0x80>; > > + kcs3: kcs@24 { > > + compatible = "aspeed,ast2500-kcs-bmc-v2"; > > + reg = <0x24 0x1>, <0x30 0x1>, <0x3c 0x1>; > > What are the other registers in this address space? I'm not so sure > this is an improvement if you end up with a bunch of nodes with single > registers. Put into practice the bindings give the following patch: on the AST2500: diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi index e8feb8b66a2f..5d51f469cbf0 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi @@ -399,22 +399,22 @@ #size-cells = <1>; ranges = <0x0 0x0 0x80>; - kcs1: kcs1@0 { - compatible = "aspeed,ast2500-kcs-bmc"; + kcs1: kcs@24 { + compatible = "aspeed,ast2500-kcs-bmc-v2"; + reg = <0x24 0x1>, <0x30 0x1>, <0x3c 0x1>; interrupts = <8>; - kcs_chan = <1>; status = "disabled"; }; - kcs2: kcs2@0 { - compatible = "aspeed,ast2500-kcs-bmc"; + kcs2: kcs@28 { + compatible = "aspeed,ast2500-kcs-bmc-v2"; + reg = <0x28 0x1>, <0x34 0x1>, <0x40 0x1>; interrupts = <8>; - kcs_chan = <2>; status = "disabled"; }; - kcs3: kcs3@0 { - compatible = "aspeed,ast2500-kcs-bmc"; + kcs3: kcs@2c { + compatible = "aspeed,ast2500-kcs-bmc-v2"; + reg = <0x2c 0x1>, <0x38 0x1>, <0x44 0x1>; interrupts = <8>; - kcs_chan = <3>; status = "disabled"; }; }; @@ -428,10 +428,10 @@ #size-cells = <1>; ranges = <0x0 0x80 0x1e0>; - kcs4: kcs4@0 { - compatible = "aspeed,ast2500-kcs-bmc"; + kcs4: kcs@94 { + compatible = "aspeed,ast2500-kcs-bmc-v2"; + reg = <0x94 0x1>, <0x98 0x1>, <0x9c 0x1>; interrupts = <8>; - kcs_chan = <4>; status = "disabled"; }; The aim is to fix these warnings which appear for every aspeed-based devicetree: arch/arm/boot/dts/aspeed-g5.dtsi:376.19-381.8: Warning (unit_address_vs_reg): /ahb/apb/lpc@1e789000/lpc-bmc@0/kcs1@0: node has a unit name, but no reg property arch/arm/boot/dts/aspeed-g5.dtsi:382.19-387.8: Warning (unit_address_vs_reg): /ahb/apb/lpc@1e789000/lpc-bmc@0/kcs2@0: node has a unit name, but no reg property arch/arm/boot/dts/aspeed-g5.dtsi:388.19-393.8: Warning (unit_address_vs_reg): /ahb/apb/lpc@1e789000/lpc-bmc@0/kcs3@0: node has a unit name, but no reg property arch/arm/boot/dts/aspeed-g5.dtsi:405.19-410.8: Warning (unit_address_vs_reg): /ahb/apb/lpc@1e789000/lpc-host@80/kcs4@0: node has a unit name, but no reg property arch/arm/boot/dts/aspeed-g5.dtsi:376.19-381.8: Warning (unique_unit_address): /ahb/apb/lpc@1e789000/lpc-bmc@0/kcs1@0: duplicate unit-address (also used in node /ahb/apb/lpc@1e789000/lpc-bmc@0/kcs2@0) arch/arm/boot/dts/aspeed-g5.dtsi:376.19-381.8: Warning (unique_unit_address): /ahb/apb/lpc@1e789000/lpc-bmc@0/kcs1@0: duplicate unit-address (also used in node /ahb/apb/lpc@1e789000/lpc-bmc@0/kcs3@0) arch/arm/boot/dts/aspeed-g5.dtsi:382.19-387.8: Warning (unique_unit_address): /ahb/apb/lpc@1e789000/lpc-bmc@0/kcs2@0: duplicate unit-address (also used in node /ahb/apb/lpc@1e789000/lpc-bmc@0/kcs3@0) arch/arm/boot/dts/aspeed-g5.dtsi:405.19-410.8: Warning (unique_unit_address): /ahb/apb/lpc@1e789000/lpc-host@80/kcs4@0: duplicate unit-address (also used in node /ahb/apb/lpc@1e789000/lpc-host@80/lpc-ctrl@0) Andrew _______________________________________________ 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 1/3] dt-bindings: ipmi: aspeed: Introduce a v2 binding for KCS 2019-12-05 5:13 ` Andrew Jeffery @ 2019-12-05 17:50 ` Rob Herring 2019-12-05 23:19 ` Andrew Jeffery 0 siblings, 1 reply; 10+ messages in thread From: Rob Herring @ 2019-12-05 17:50 UTC (permalink / raw) To: Andrew Jeffery Cc: Mark Rutland, devicetree, Corey Minyard, Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, linux-aspeed, Joel Stanley, openipmi-developer, moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE On Wed, Dec 4, 2019 at 11:12 PM Andrew Jeffery <andrew@aj.id.au> wrote: > > > > On Wed, 4 Dec 2019, at 01:01, Rob Herring wrote: > > On Tue, Dec 3, 2019 at 6:36 AM Andrew Jeffery <andrew@aj.id.au> wrote: > > > > > > The v2 binding utilises reg and renames some of the v1 properties. > > > > > > Signed-off-by: Andrew Jeffery <andrew@aj.id.au> > > > --- > > > Documentation/devicetree/bindings/ipmi/aspeed-kcs-bmc.txt | 20 +++++--- > > > 1 file changed, 14 insertions(+), 6 deletions(-) > > > > > > diff --git a/Documentation/devicetree/bindings/ipmi/aspeed-kcs-bmc.txt b/Documentation/devicetree/bindings/ipmi/aspeed-kcs-bmc.txt > > > index d98a9bf45d6c..76b180ebbde4 100644 > > > --- a/Documentation/devicetree/bindings/ipmi/aspeed-kcs-bmc.txt > > > +++ b/Documentation/devicetree/bindings/ipmi/aspeed-kcs-bmc.txt > > > @@ -1,9 +1,10 @@ > > > -* Aspeed KCS (Keyboard Controller Style) IPMI interface > > > +# Aspeed KCS (Keyboard Controller Style) IPMI interface > > > > > > The Aspeed SOCs (AST2400 and AST2500) are commonly used as BMCs > > > (Baseboard Management Controllers) and the KCS interface can be > > > used to perform in-band IPMI communication with their host. > > > > > > +## v1 > > > Required properties: > > > - compatible : should be one of > > > "aspeed,ast2400-kcs-bmc" > > > @@ -12,14 +13,21 @@ Required properties: > > > - kcs_chan : The LPC channel number in the controller > > > - kcs_addr : The host CPU IO map address > > > > > > +## v2 > > > +Required properties: > > > +- compatible : should be one of > > > + "aspeed,ast2400-kcs-bmc-v2" > > > + "aspeed,ast2500-kcs-bmc-v2" > > > +- reg : The address and size of the IDR, ODR and STR registers > > > +- interrupts : interrupt generated by the controller > > > +- slave-reg : The host CPU IO map address > > > > aspeed,slave-reg > > I don't agree, as it's not an aspeed-specific behaviour. This property > controls where the device appears in the host's LPC IO address space, > which is a common problem for any LPC IO device exposed by the BMC > to the host. Then document it as such. Common properties go into common binding documents. > > > Example: > > > > > > - kcs3: kcs3@0 { > > > - compatible = "aspeed,ast2500-kcs-bmc"; > > > - reg = <0x0 0x80>; > > > + kcs3: kcs@24 { > > > + compatible = "aspeed,ast2500-kcs-bmc-v2"; > > > + reg = <0x24 0x1>, <0x30 0x1>, <0x3c 0x1>; > > > > What are the other registers in this address space? I'm not so sure > > this is an improvement if you end up with a bunch of nodes with single > > registers. > > Put into practice the bindings give the following patch: on the AST2500: Okay, that's an unfortunate interleaving, but seems fine. > > diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi > index e8feb8b66a2f..5d51f469cbf0 100644 > --- a/arch/arm/boot/dts/aspeed-g5.dtsi > +++ b/arch/arm/boot/dts/aspeed-g5.dtsi > @@ -399,22 +399,22 @@ > #size-cells = <1>; > ranges = <0x0 0x0 0x80>; > > - kcs1: kcs1@0 { > - compatible = "aspeed,ast2500-kcs-bmc"; > + kcs1: kcs@24 { > + compatible = "aspeed,ast2500-kcs-bmc-v2"; > + reg = <0x24 0x1>, <0x30 0x1>, <0x3c 0x1>; > interrupts = <8>; > - kcs_chan = <1>; > status = "disabled"; > }; > - kcs2: kcs2@0 { > - compatible = "aspeed,ast2500-kcs-bmc"; > + kcs2: kcs@28 { > + compatible = "aspeed,ast2500-kcs-bmc-v2"; > + reg = <0x28 0x1>, <0x34 0x1>, <0x40 0x1>; > interrupts = <8>; > - kcs_chan = <2>; > status = "disabled"; > }; > - kcs3: kcs3@0 { > - compatible = "aspeed,ast2500-kcs-bmc"; > + kcs3: kcs@2c { > + compatible = "aspeed,ast2500-kcs-bmc-v2"; > + reg = <0x2c 0x1>, <0x38 0x1>, <0x44 0x1>; > interrupts = <8>; > - kcs_chan = <3>; > status = "disabled"; > }; > }; > @@ -428,10 +428,10 @@ > #size-cells = <1>; > ranges = <0x0 0x80 0x1e0>; > > - kcs4: kcs4@0 { > - compatible = "aspeed,ast2500-kcs-bmc"; > + kcs4: kcs@94 { > + compatible = "aspeed,ast2500-kcs-bmc-v2"; > + reg = <0x94 0x1>, <0x98 0x1>, <0x9c 0x1>; > interrupts = <8>; > - kcs_chan = <4>; > status = "disabled"; > }; > > The aim is to fix these warnings which appear for every aspeed-based devicetree: > > arch/arm/boot/dts/aspeed-g5.dtsi:376.19-381.8: Warning (unit_address_vs_reg): /ahb/apb/lpc@1e789000/lpc-bmc@0/kcs1@0: node has a unit name, but no reg property > arch/arm/boot/dts/aspeed-g5.dtsi:382.19-387.8: Warning (unit_address_vs_reg): /ahb/apb/lpc@1e789000/lpc-bmc@0/kcs2@0: node has a unit name, but no reg property > arch/arm/boot/dts/aspeed-g5.dtsi:388.19-393.8: Warning (unit_address_vs_reg): /ahb/apb/lpc@1e789000/lpc-bmc@0/kcs3@0: node has a unit name, but no reg property > arch/arm/boot/dts/aspeed-g5.dtsi:405.19-410.8: Warning (unit_address_vs_reg): /ahb/apb/lpc@1e789000/lpc-host@80/kcs4@0: node has a unit name, but no reg property > arch/arm/boot/dts/aspeed-g5.dtsi:376.19-381.8: Warning (unique_unit_address): /ahb/apb/lpc@1e789000/lpc-bmc@0/kcs1@0: duplicate unit-address (also used in node /ahb/apb/lpc@1e789000/lpc-bmc@0/kcs2@0) > arch/arm/boot/dts/aspeed-g5.dtsi:376.19-381.8: Warning (unique_unit_address): /ahb/apb/lpc@1e789000/lpc-bmc@0/kcs1@0: duplicate unit-address (also used in node /ahb/apb/lpc@1e789000/lpc-bmc@0/kcs3@0) > arch/arm/boot/dts/aspeed-g5.dtsi:382.19-387.8: Warning (unique_unit_address): /ahb/apb/lpc@1e789000/lpc-bmc@0/kcs2@0: duplicate unit-address (also used in node /ahb/apb/lpc@1e789000/lpc-bmc@0/kcs3@0) > arch/arm/boot/dts/aspeed-g5.dtsi:405.19-410.8: Warning (unique_unit_address): /ahb/apb/lpc@1e789000/lpc-host@80/kcs4@0: duplicate unit-address (also used in node /ahb/apb/lpc@1e789000/lpc-host@80/lpc-ctrl@0) > > Andrew _______________________________________________ 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 1/3] dt-bindings: ipmi: aspeed: Introduce a v2 binding for KCS 2019-12-05 17:50 ` Rob Herring @ 2019-12-05 23:19 ` Andrew Jeffery 0 siblings, 0 replies; 10+ messages in thread From: Andrew Jeffery @ 2019-12-05 23:19 UTC (permalink / raw) To: Rob Herring Cc: Mark Rutland, devicetree, Corey Minyard, Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, linux-aspeed, Joel Stanley, openipmi-developer, moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE On Fri, 6 Dec 2019, at 04:20, Rob Herring wrote: > On Wed, Dec 4, 2019 at 11:12 PM Andrew Jeffery <andrew@aj.id.au> wrote: > > > > > > > > On Wed, 4 Dec 2019, at 01:01, Rob Herring wrote: > > > On Tue, Dec 3, 2019 at 6:36 AM Andrew Jeffery <andrew@aj.id.au> wrote: > > > > > > > > The v2 binding utilises reg and renames some of the v1 properties. > > > > > > > > Signed-off-by: Andrew Jeffery <andrew@aj.id.au> > > > > --- > > > > Documentation/devicetree/bindings/ipmi/aspeed-kcs-bmc.txt | 20 +++++--- > > > > 1 file changed, 14 insertions(+), 6 deletions(-) > > > > > > > > diff --git a/Documentation/devicetree/bindings/ipmi/aspeed-kcs-bmc.txt b/Documentation/devicetree/bindings/ipmi/aspeed-kcs-bmc.txt > > > > index d98a9bf45d6c..76b180ebbde4 100644 > > > > --- a/Documentation/devicetree/bindings/ipmi/aspeed-kcs-bmc.txt > > > > +++ b/Documentation/devicetree/bindings/ipmi/aspeed-kcs-bmc.txt > > > > @@ -1,9 +1,10 @@ > > > > -* Aspeed KCS (Keyboard Controller Style) IPMI interface > > > > +# Aspeed KCS (Keyboard Controller Style) IPMI interface > > > > > > > > The Aspeed SOCs (AST2400 and AST2500) are commonly used as BMCs > > > > (Baseboard Management Controllers) and the KCS interface can be > > > > used to perform in-band IPMI communication with their host. > > > > > > > > +## v1 > > > > Required properties: > > > > - compatible : should be one of > > > > "aspeed,ast2400-kcs-bmc" > > > > @@ -12,14 +13,21 @@ Required properties: > > > > - kcs_chan : The LPC channel number in the controller > > > > - kcs_addr : The host CPU IO map address > > > > > > > > +## v2 > > > > +Required properties: > > > > +- compatible : should be one of > > > > + "aspeed,ast2400-kcs-bmc-v2" > > > > + "aspeed,ast2500-kcs-bmc-v2" > > > > +- reg : The address and size of the IDR, ODR and STR registers > > > > +- interrupts : interrupt generated by the controller > > > > +- slave-reg : The host CPU IO map address > > > > > > aspeed,slave-reg > > > > I don't agree, as it's not an aspeed-specific behaviour. This property > > controls where the device appears in the host's LPC IO address space, > > which is a common problem for any LPC IO device exposed by the BMC > > to the host. > > Then document it as such. Common properties go into common binding documents. Fair call. > > > > > Example: > > > > > > > > - kcs3: kcs3@0 { > > > > - compatible = "aspeed,ast2500-kcs-bmc"; > > > > - reg = <0x0 0x80>; > > > > + kcs3: kcs@24 { > > > > + compatible = "aspeed,ast2500-kcs-bmc-v2"; > > > > + reg = <0x24 0x1>, <0x30 0x1>, <0x3c 0x1>; > > > > > > What are the other registers in this address space? I'm not so sure > > > this is an improvement if you end up with a bunch of nodes with single > > > registers. > > > > Put into practice the bindings give the following patch: on the AST2500: > > Okay, that's an unfortunate interleaving, but seems fine. "Unfortunate" is a good description for the entire register layout of the LPC slave controller. I'll send a v2. Thanks, Andrew _______________________________________________ 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 2/3] ipmi: kcs: Finish configuring ASPEED KCS device before enable 2019-12-03 12:38 [PATCH 0/3] ipmi: kcs-bmc: Rework bindings to clean up DT warnings Andrew Jeffery 2019-12-03 12:38 ` [PATCH 1/3] dt-bindings: ipmi: aspeed: Introduce a v2 binding for KCS Andrew Jeffery @ 2019-12-03 12:38 ` Andrew Jeffery 2019-12-03 13:40 ` Corey Minyard 2019-12-03 12:38 ` [PATCH 3/3] ipmi: kcs: aspeed: Implement v2 bindings Andrew Jeffery 2 siblings, 1 reply; 10+ messages in thread From: Andrew Jeffery @ 2019-12-03 12:38 UTC (permalink / raw) To: openipmi-developer Cc: mark.rutland, devicetree, Haiyue Wang, minyard, arnd, gregkh, linux-kernel, linux-aspeed, robh+dt, joel, linux-arm-kernel The currently interrupts are configured after the channel was enabled. Signed-off-by: Andrew Jeffery <andrew@aj.id.au> Reviewed-by: Joel Stanley <joel@jms.id.au> Reviewed-by: Haiyue Wang <haiyue.wang@linux.intel.com> --- drivers/char/ipmi/kcs_bmc_aspeed.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/char/ipmi/kcs_bmc_aspeed.c b/drivers/char/ipmi/kcs_bmc_aspeed.c index 3c955946e647..e3dd09022589 100644 --- a/drivers/char/ipmi/kcs_bmc_aspeed.c +++ b/drivers/char/ipmi/kcs_bmc_aspeed.c @@ -268,13 +268,14 @@ static int aspeed_kcs_probe(struct platform_device *pdev) kcs_bmc->io_inputb = aspeed_kcs_inb; kcs_bmc->io_outputb = aspeed_kcs_outb; + rc = aspeed_kcs_config_irq(kcs_bmc, pdev); + if (rc) + return rc; + dev_set_drvdata(dev, kcs_bmc); aspeed_kcs_set_address(kcs_bmc, addr); aspeed_kcs_enable_channel(kcs_bmc, true); - rc = aspeed_kcs_config_irq(kcs_bmc, pdev); - if (rc) - return rc; rc = misc_register(&kcs_bmc->miscdev); if (rc) { -- git-series 0.9.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 2/3] ipmi: kcs: Finish configuring ASPEED KCS device before enable 2019-12-03 12:38 ` [PATCH 2/3] ipmi: kcs: Finish configuring ASPEED KCS device before enable Andrew Jeffery @ 2019-12-03 13:40 ` Corey Minyard 2019-12-05 5:15 ` Andrew Jeffery 0 siblings, 1 reply; 10+ messages in thread From: Corey Minyard @ 2019-12-03 13:40 UTC (permalink / raw) To: Andrew Jeffery Cc: mark.rutland, devicetree, Haiyue Wang, linux-aspeed, arnd, gregkh, linux-kernel, robh+dt, joel, openipmi-developer, linux-arm-kernel On Tue, Dec 03, 2019 at 11:08:24PM +1030, Andrew Jeffery wrote: > The currently interrupts are configured after the channel was enabled. How about: The interrupts were configured after the channel was enabled, configure them before so they will work. -corey > > Signed-off-by: Andrew Jeffery <andrew@aj.id.au> > Reviewed-by: Joel Stanley <joel@jms.id.au> > Reviewed-by: Haiyue Wang <haiyue.wang@linux.intel.com> > --- > drivers/char/ipmi/kcs_bmc_aspeed.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/drivers/char/ipmi/kcs_bmc_aspeed.c b/drivers/char/ipmi/kcs_bmc_aspeed.c > index 3c955946e647..e3dd09022589 100644 > --- a/drivers/char/ipmi/kcs_bmc_aspeed.c > +++ b/drivers/char/ipmi/kcs_bmc_aspeed.c > @@ -268,13 +268,14 @@ static int aspeed_kcs_probe(struct platform_device *pdev) > kcs_bmc->io_inputb = aspeed_kcs_inb; > kcs_bmc->io_outputb = aspeed_kcs_outb; > > + rc = aspeed_kcs_config_irq(kcs_bmc, pdev); > + if (rc) > + return rc; > + > dev_set_drvdata(dev, kcs_bmc); > > aspeed_kcs_set_address(kcs_bmc, addr); > aspeed_kcs_enable_channel(kcs_bmc, true); > - rc = aspeed_kcs_config_irq(kcs_bmc, pdev); > - if (rc) > - return rc; > > rc = misc_register(&kcs_bmc->miscdev); > if (rc) { > -- > git-series 0.9.1 _______________________________________________ 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 2/3] ipmi: kcs: Finish configuring ASPEED KCS device before enable 2019-12-03 13:40 ` Corey Minyard @ 2019-12-05 5:15 ` Andrew Jeffery 0 siblings, 0 replies; 10+ messages in thread From: Andrew Jeffery @ 2019-12-05 5:15 UTC (permalink / raw) To: Corey Minyard Cc: mark.rutland, devicetree, Haiyue Wang, linux-aspeed, Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Rob Herring, Joel Stanley, openipmi-developer, linux-arm-kernel On Wed, 4 Dec 2019, at 00:10, Corey Minyard wrote: > On Tue, Dec 03, 2019 at 11:08:24PM +1030, Andrew Jeffery wrote: > > The currently interrupts are configured after the channel was enabled. > > How about: > > The interrupts were configured after the channel was enabled, configure > them before so they will work. Hah, yes, that commit message did get a bit mangled. I'll update it. Thanks, Andrew _______________________________________________ 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 3/3] ipmi: kcs: aspeed: Implement v2 bindings 2019-12-03 12:38 [PATCH 0/3] ipmi: kcs-bmc: Rework bindings to clean up DT warnings Andrew Jeffery 2019-12-03 12:38 ` [PATCH 1/3] dt-bindings: ipmi: aspeed: Introduce a v2 binding for KCS Andrew Jeffery 2019-12-03 12:38 ` [PATCH 2/3] ipmi: kcs: Finish configuring ASPEED KCS device before enable Andrew Jeffery @ 2019-12-03 12:38 ` Andrew Jeffery 2 siblings, 0 replies; 10+ messages in thread From: Andrew Jeffery @ 2019-12-03 12:38 UTC (permalink / raw) To: openipmi-developer Cc: mark.rutland, devicetree, Haiyue Wang, minyard, arnd, gregkh, linux-kernel, linux-aspeed, robh+dt, joel, linux-arm-kernel The v2 bindings allow us to extract the resources from the devicetree. The table in the driver is retained to derive the channel index, which removes the need for kcs_chan property from the v1 bindings. The v2 bindings allow us to reduce the number of warnings generated by the existing devicetree nodes. Signed-off-by: Andrew Jeffery <andrew@aj.id.au> Reviewed-by: Joel Stanley <joel@jms.id.au> Reviewed-by: Haiyue Wang <haiyue.wang@linux.intel.com> --- drivers/char/ipmi/kcs_bmc_aspeed.c | 144 +++++++++++++++++++++++++----- 1 file changed, 121 insertions(+), 23 deletions(-) diff --git a/drivers/char/ipmi/kcs_bmc_aspeed.c b/drivers/char/ipmi/kcs_bmc_aspeed.c index e3dd09022589..509e0d3c6eb1 100644 --- a/drivers/char/ipmi/kcs_bmc_aspeed.c +++ b/drivers/char/ipmi/kcs_bmc_aspeed.c @@ -12,6 +12,7 @@ #include <linux/mfd/syscon.h> #include <linux/module.h> #include <linux/of.h> +#include <linux/of_address.h> #include <linux/platform_device.h> #include <linux/poll.h> #include <linux/regmap.h> @@ -233,38 +234,133 @@ static const struct kcs_ioreg ast_kcs_bmc_ioregs[KCS_CHANNEL_MAX] = { { .idr = LPC_IDR4, .odr = LPC_ODR4, .str = LPC_STR4 }, }; -static int aspeed_kcs_probe(struct platform_device *pdev) +static struct kcs_bmc *aspeed_kcs_probe_of_v1(struct platform_device *pdev) { - struct device *dev = &pdev->dev; struct aspeed_kcs_bmc *priv; - struct kcs_bmc *kcs_bmc; - u32 chan, addr; + struct device_node *np; + struct kcs_bmc *kcs; + u32 channel; + u32 slave; int rc; - rc = of_property_read_u32(dev->of_node, "kcs_chan", &chan); - if ((rc != 0) || (chan == 0 || chan > KCS_CHANNEL_MAX)) { - dev_err(dev, "no valid 'kcs_chan' configured\n"); - return -ENODEV; + np = pdev->dev.of_node; + + rc = of_property_read_u32(np, "kcs_chan", &channel); + if ((rc != 0) || (channel == 0 || channel > KCS_CHANNEL_MAX)) { + dev_err(&pdev->dev, "no valid 'kcs_chan' configured\n"); + return ERR_PTR(-EINVAL); } - rc = of_property_read_u32(dev->of_node, "kcs_addr", &addr); + kcs = kcs_bmc_alloc(&pdev->dev, sizeof(struct aspeed_kcs_bmc), channel); + if (!kcs) + return ERR_PTR(-ENOMEM); + + priv = kcs_bmc_priv(kcs); + priv->map = syscon_node_to_regmap(pdev->dev.parent->of_node); + if (IS_ERR(priv->map)) { + dev_err(&pdev->dev, "Couldn't get regmap\n"); + return ERR_PTR(-ENODEV); + } + + rc = of_property_read_u32(np, "kcs_addr", &slave); if (rc) { - dev_err(dev, "no valid 'kcs_addr' configured\n"); - return -ENODEV; + dev_err(&pdev->dev, "no valid 'kcs_addr' configured\n"); + return ERR_PTR(-EINVAL); } - kcs_bmc = kcs_bmc_alloc(dev, sizeof(*priv), chan); - if (!kcs_bmc) - return -ENOMEM; + kcs->ioreg = ast_kcs_bmc_ioregs[channel - 1]; + aspeed_kcs_set_address(kcs, slave); + + return 0; +} + +static int aspeed_kcs_calculate_channel(const struct kcs_ioreg *regs) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(ast_kcs_bmc_ioregs); i++) { + if (!memcmp(&ast_kcs_bmc_ioregs[i], regs, sizeof(*regs))) + return i + 1; + } + + return -EINVAL; +} + +static struct kcs_bmc *aspeed_kcs_probe_of_v2(struct platform_device *pdev) +{ + struct aspeed_kcs_bmc *priv; + struct device_node *np; + struct kcs_ioreg ioreg; + struct kcs_bmc *kcs; + const __be32 *reg; + int channel; + u32 slave; + int rc; - priv = kcs_bmc_priv(kcs_bmc); - priv->map = syscon_node_to_regmap(dev->parent->of_node); + np = pdev->dev.of_node; + + /* Don't translate addresses, we want offsets for the regmaps */ + reg = of_get_address(np, 0, NULL, NULL); + if (!reg) + return ERR_PTR(-EINVAL); + ioreg.idr = be32_to_cpup(reg); + + reg = of_get_address(np, 1, NULL, NULL); + if (!reg) + return ERR_PTR(-EINVAL); + ioreg.odr = be32_to_cpup(reg); + + reg = of_get_address(np, 2, NULL, NULL); + if (!reg) + return ERR_PTR(-EINVAL); + ioreg.str = be32_to_cpup(reg); + + channel = aspeed_kcs_calculate_channel(&ioreg); + if (channel < 0) + return ERR_PTR(channel); + + kcs = kcs_bmc_alloc(&pdev->dev, sizeof(struct aspeed_kcs_bmc), channel); + if (!kcs) + return ERR_PTR(-ENOMEM); + + kcs->ioreg = ioreg; + + priv = kcs_bmc_priv(kcs); + priv->map = syscon_node_to_regmap(pdev->dev.parent->of_node); if (IS_ERR(priv->map)) { - dev_err(dev, "Couldn't get regmap\n"); - return -ENODEV; + dev_err(&pdev->dev, "Couldn't get regmap\n"); + return ERR_PTR(-ENODEV); } - kcs_bmc->ioreg = ast_kcs_bmc_ioregs[chan - 1]; + rc = of_property_read_u32(np, "slave-reg", &slave); + if (rc) + return ERR_PTR(rc); + + aspeed_kcs_set_address(kcs, slave); + + return kcs; +} + +static int aspeed_kcs_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct kcs_bmc *kcs_bmc; + struct device_node *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_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")) + kcs_bmc = aspeed_kcs_probe_of_v2(pdev); + else + return -EINVAL; + + if (IS_ERR(kcs_bmc)) + return PTR_ERR(kcs_bmc); + kcs_bmc->io_inputb = aspeed_kcs_inb; kcs_bmc->io_outputb = aspeed_kcs_outb; @@ -274,7 +370,6 @@ static int aspeed_kcs_probe(struct platform_device *pdev) dev_set_drvdata(dev, kcs_bmc); - aspeed_kcs_set_address(kcs_bmc, addr); aspeed_kcs_enable_channel(kcs_bmc, true); rc = misc_register(&kcs_bmc->miscdev); @@ -283,9 +378,10 @@ static int aspeed_kcs_probe(struct platform_device *pdev) return rc; } - pr_info("channel=%u addr=0x%x idr=0x%x odr=0x%x str=0x%x\n", - chan, addr, - kcs_bmc->ioreg.idr, kcs_bmc->ioreg.odr, kcs_bmc->ioreg.str); + dev_dbg(&pdev->dev, + "Probed KCS device %d (IDR=0x%x, ODR=0x%x, STR=0x%x)\n", + kcs_bmc->channel, kcs_bmc->ioreg.idr, kcs_bmc->ioreg.odr, + kcs_bmc->ioreg.str); return 0; } @@ -302,6 +398,8 @@ static int aspeed_kcs_remove(struct platform_device *pdev) static const struct of_device_id ast_kcs_bmc_match[] = { { .compatible = "aspeed,ast2400-kcs-bmc" }, { .compatible = "aspeed,ast2500-kcs-bmc" }, + { .compatible = "aspeed,ast2400-kcs-bmc-v2" }, + { .compatible = "aspeed,ast2500-kcs-bmc-v2" }, { } }; MODULE_DEVICE_TABLE(of, ast_kcs_bmc_match); -- git-series 0.9.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
end of thread, other threads:[~2019-12-05 23:17 UTC | newest] Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-12-03 12:38 [PATCH 0/3] ipmi: kcs-bmc: Rework bindings to clean up DT warnings Andrew Jeffery 2019-12-03 12:38 ` [PATCH 1/3] dt-bindings: ipmi: aspeed: Introduce a v2 binding for KCS Andrew Jeffery 2019-12-03 14:31 ` Rob Herring 2019-12-05 5:13 ` Andrew Jeffery 2019-12-05 17:50 ` Rob Herring 2019-12-05 23:19 ` Andrew Jeffery 2019-12-03 12:38 ` [PATCH 2/3] ipmi: kcs: Finish configuring ASPEED KCS device before enable Andrew Jeffery 2019-12-03 13:40 ` Corey Minyard 2019-12-05 5:15 ` Andrew Jeffery 2019-12-03 12:38 ` [PATCH 3/3] ipmi: kcs: aspeed: Implement v2 bindings Andrew Jeffery
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).