Skip to contentSkip to conversation

arm: dts: aspeed: ibm-power9-dual: Update OCC nodes

PATCH In review Eddie James 2 participants 3 messages Nov 16, 2022 – Nov 17, 2022 Device tree bindings

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm: dts: aspeed: ibm-power9-dual: Update OCC nodes

Set the ibm,no-poll-on-init property for the OCCs.

---
 arch/arm/boot/dts/ibm-power9-dual.dtsi | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)
arch/arm/boot/dts/ibm-power9-dual.dtsi +12 -11
index a0fa65b44b0f..916041e6e00c 100644
@@ -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;
Signature · 1 line
2.31.1
#1 lore raw
Quoted 2 lines · Eddie James

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)?

Quoted 59 lines
---
 arch/arm/boot/dts/ibm-power9-dual.dtsi | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)
arch/arm/boot/dts/ibm-power9-dual.dtsi +12 -12
index a0fa65b44b0f..916041e6e00c 100644
@@ -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

#2 lore raw
Quoted 7 lines · Joel Stanley
Quoted 1 line · Eddie James

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

Quoted 59 lines
Quoted 59 lines
---
  arch/arm/boot/dts/ibm-power9-dual.dtsi | 23 ++++++++++++-----------
  1 file changed, 12 insertions(+), 11 deletions(-)
arch/arm/boot/dts/ibm-power9-dual.dtsi +12 -12
index a0fa65b44b0f..916041e6e00c 100644
@@ -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