| Message ID | 20221116165714.2349545-1-eajames@linux.ibm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [linux,dev-6.0] arm: dts: aspeed: ibm-power9-dual: Update OCC nodes | expand |
On Wed, 16 Nov 2022 at 16:57, Eddie James <eajames@linux.ibm.com> wrote: > > Set the ibm,no-poll-on-init property for the OCCs. Is this required to make them probe? Previously they worked (it would attempt to read form the host and fail, but the driver would probe). Do we need to fix the driver, or do we need to fix all of the device trees (vesnin, palmetto, tacoma)? > > Signed-off-by: Eddie James <eajames@linux.ibm.com> > --- > arch/arm/boot/dts/ibm-power9-dual.dtsi | 23 ++++++++++++----------- > 1 file changed, 12 insertions(+), 11 deletions(-) > > diff --git a/arch/arm/boot/dts/ibm-power9-dual.dtsi b/arch/arm/boot/dts/ibm-power9-dual.dtsi > index a0fa65b44b0f..916041e6e00c 100644 > --- a/arch/arm/boot/dts/ibm-power9-dual.dtsi > +++ b/arch/arm/boot/dts/ibm-power9-dual.dtsi > @@ -86,8 +86,13 @@ sbefifo@2400 { > #address-cells = <1>; > #size-cells = <0>; > > - fsi_occ0: occ@1 { > + fsi_occ0: occ { > compatible = "ibm,p9-occ"; > + > + occ-hwmon { > + compatible = "ibm,p9-occ-hwmon"; > + ibm,no-poll-on-init; > + }; > }; > }; > > @@ -187,8 +192,13 @@ sbefifo@2400 { > #address-cells = <1>; > #size-cells = <0>; > > - fsi_occ1: occ@2 { > + fsi_occ1: occ { > compatible = "ibm,p9-occ"; > + > + occ-hwmon { > + compatible = "ibm,p9-occ-hwmon"; > + ibm,no-poll-on-init; > + }; > }; > }; > > @@ -203,15 +213,6 @@ fsi_hub1: hub@3400 { > }; > }; > > -/* Legacy OCC numbering (to get rid of when userspace is fixed) */ > -&fsi_occ0 { > - reg = <1>; > -}; > - > -&fsi_occ1 { > - reg = <2>; > -}; > - > / { > aliases { > i2c100 = &cfam0_i2c0; > -- > 2.31.1 >
On 11/16/22 21:13, Joel Stanley wrote: > On Wed, 16 Nov 2022 at 16:57, Eddie James <eajames@linux.ibm.com> wrote: >> Set the ibm,no-poll-on-init property for the OCCs. > Is this required to make them probe? > > Previously they worked (it would attempt to read form the host and > fail, but the driver would probe). Do we need to fix the driver, or do > we need to fix all of the device trees (vesnin, palmetto, tacoma)? No, they will probe if the host is on. The probe will fail if the host is off - as before. The problem is the occ-control application no longer binds the device to the driver. So, on any system, if the BMC boots with the host off, the device will not be probed. Then the application fails because it's expecting the device to be there. Thanks, Eddie > >> Signed-off-by: Eddie James <eajames@linux.ibm.com> >> --- >> arch/arm/boot/dts/ibm-power9-dual.dtsi | 23 ++++++++++++----------- >> 1 file changed, 12 insertions(+), 11 deletions(-) >> >> diff --git a/arch/arm/boot/dts/ibm-power9-dual.dtsi b/arch/arm/boot/dts/ibm-power9-dual.dtsi >> index a0fa65b44b0f..916041e6e00c 100644 >> --- a/arch/arm/boot/dts/ibm-power9-dual.dtsi >> +++ b/arch/arm/boot/dts/ibm-power9-dual.dtsi >> @@ -86,8 +86,13 @@ sbefifo@2400 { >> #address-cells = <1>; >> #size-cells = <0>; >> >> - fsi_occ0: occ@1 { >> + fsi_occ0: occ { >> compatible = "ibm,p9-occ"; >> + >> + occ-hwmon { >> + compatible = "ibm,p9-occ-hwmon"; >> + ibm,no-poll-on-init; >> + }; >> }; >> }; >> >> @@ -187,8 +192,13 @@ sbefifo@2400 { >> #address-cells = <1>; >> #size-cells = <0>; >> >> - fsi_occ1: occ@2 { >> + fsi_occ1: occ { >> compatible = "ibm,p9-occ"; >> + >> + occ-hwmon { >> + compatible = "ibm,p9-occ-hwmon"; >> + ibm,no-poll-on-init; >> + }; >> }; >> }; >> >> @@ -203,15 +213,6 @@ fsi_hub1: hub@3400 { >> }; >> }; >> >> -/* Legacy OCC numbering (to get rid of when userspace is fixed) */ >> -&fsi_occ0 { >> - reg = <1>; >> -}; >> - >> -&fsi_occ1 { >> - reg = <2>; >> -}; >> - >> / { >> aliases { >> i2c100 = &cfam0_i2c0; >> -- >> 2.31.1 >>
diff --git a/arch/arm/boot/dts/ibm-power9-dual.dtsi b/arch/arm/boot/dts/ibm-power9-dual.dtsi index a0fa65b44b0f..916041e6e00c 100644 --- a/arch/arm/boot/dts/ibm-power9-dual.dtsi +++ b/arch/arm/boot/dts/ibm-power9-dual.dtsi @@ -86,8 +86,13 @@ sbefifo@2400 { #address-cells = <1>; #size-cells = <0>; - fsi_occ0: occ@1 { + fsi_occ0: occ { compatible = "ibm,p9-occ"; + + occ-hwmon { + compatible = "ibm,p9-occ-hwmon"; + ibm,no-poll-on-init; + }; }; }; @@ -187,8 +192,13 @@ sbefifo@2400 { #address-cells = <1>; #size-cells = <0>; - fsi_occ1: occ@2 { + fsi_occ1: occ { compatible = "ibm,p9-occ"; + + occ-hwmon { + compatible = "ibm,p9-occ-hwmon"; + ibm,no-poll-on-init; + }; }; }; @@ -203,15 +213,6 @@ fsi_hub1: hub@3400 { }; }; -/* Legacy OCC numbering (to get rid of when userspace is fixed) */ -&fsi_occ0 { - reg = <1>; -}; - -&fsi_occ1 { - reg = <2>; -}; - / { aliases { i2c100 = &cfam0_i2c0;
Set the ibm,no-poll-on-init property for the OCCs. Signed-off-by: Eddie James <eajames@linux.ibm.com> --- arch/arm/boot/dts/ibm-power9-dual.dtsi | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-)