Skip to contentSkip to conversation

arm/dts: Add I2C master and ports to FSI cfam

PATCH Superseded Eddie James 2 participants 6 messages Jun 29, 2017 – Jul 6, 2017

Subsystems (4)

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

v2 cover arm/dts: Add I2C master and ports to FSI cfam

From: "Edward A. James" <[email protected]>

Fix the devicetree parsing in the driver, and add the FSI-attached I2C devices to the devicetree.

changes since v1:
* Change port entries to i2c-bus.
* Label the i2c-buses and disable them in the POWER9 include file, include them in the specific machine files.
* Add driver changes.

Edward A. James (2):
arm/dts: Add I2C master and ports to FSI cfam drivers/i2c: Fix devicetree parsing in FSI-attached I2C master algo

 arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts     | 120 +++++++++++++++++
 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 120 +++++++++++++++++
 arch/arm/boot/dts/ibm-power9-cfam.dtsi           | 164 +++++++++++++++++++++++
 drivers/i2c/busses/i2c-fsi.c                     |  11 +-
 4 files changed, 410 insertions(+), 5 deletions(-)
Signature · 1 line
1.8.3.1
#1 lore raw

PATCH v2 1/2 arm/dts: Add I2C master and ports to FSI cfam

From: "Edward A. James" <[email protected]>

FSI I2C master algorithm probes port devices based on dts.

---
 arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts     | 120 +++++++++++++++++
 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 120 +++++++++++++++++
 arch/arm/boot/dts/ibm-power9-cfam.dtsi           | 164 +++++++++++++++++++++++
 3 files changed, 404 insertions(+)
arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +120 -0
index d53dc59..4a1a390 100644
@@ -72,6 +72,126 @@
 
 #include "ibm-power9-cfam.dtsi"
 
+&cfam0_i2c0 {
+	status = "okay";
+};
+
+&cfam0_i2c1 {
+	status = "okay";
+};
+
+&cfam0_i2c2 {
+	status = "okay";
+};
+
+&cfam0_i2c3 {
+	status = "okay";
+};
+
+&cfam0_i2c4 {
+	status = "okay";
+};
+
+&cfam0_i2c5 {
+	status = "okay";
+};
+
+&cfam0_i2c6 {
+	status = "okay";
+};
+
+&cfam0_i2c7 {
+	status = "okay";
+};
+
+&cfam0_i2c8 {
+	status = "okay";
+};
+
+&cfam0_i2c9 {
+	status = "okay";
+};
+
+&cfam0_i2c10 {
+	status = "okay";
+};
+
+&cfam0_i2c11 {
+	status = "okay";
+};
+
+&cfam0_i2c12 {
+	status = "okay";
+};
+
+&cfam0_i2c13 {
+	status = "okay";
+};
+
+&cfam0_i2c14 {
+	status = "okay";
+};
+
+&cfam1_i2c0 {
+	status = "okay";
+};
+
+&cfam1_i2c1 {
+	status = "okay";
+};
+
+&cfam1_i2c2 {
+	status = "okay";
+};
+
+&cfam1_i2c3 {
+	status = "okay";
+};
+
+&cfam1_i2c4 {
+	status = "okay";
+};
+
+&cfam1_i2c5 {
+	status = "okay";
+};
+
+&cfam1_i2c6 {
+	status = "okay";
+};
+
+&cfam1_i2c7 {
+	status = "okay";
+};
+
+&cfam1_i2c8 {
+	status = "okay";
+};
+
+&cfam1_i2c9 {
+	status = "okay";
+};
+
+&cfam1_i2c10 {
+	status = "okay";
+};
+
+&cfam1_i2c11 {
+	status = "okay";
+};
+
+&cfam1_i2c12 {
+	status = "okay";
+};
+
+&cfam1_i2c13 {
+	status = "okay";
+};
+
+&cfam1_i2c14 {
+	status = "okay";
+};
+
 &fmc {
 	status = "okay";
 	flash@0 {
arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts +120 -0

126 lines not on this page · raw message

arch/arm/boot/dts/ibm-power9-cfam.dtsi +164 -0

176 lines not on this page · raw message

Signature · 1 line
1.8.3.1
maintainer
#2 lore raw
Quoted 16 lines · Eddie James

From: "Edward A. James" <[email protected]>

FSI I2C master algorithm probes port devices based on dts.

---
 arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts     | 120 +++++++++++++++++
 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 120 +++++++++++++++++
 arch/arm/boot/dts/ibm-power9-cfam.dtsi           | 164 +++++++++++++++++++++++
 3 files changed, 404 insertions(+)
arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +0 -0
index d53dc59..4a1a390 100644

arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts line 77

Quoted 6 lines
arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +3 -0
@@ -72,6 +72,126 @@
 
 #include "ibm-power9-cfam.dtsi"
 
+&cfam0_i2c0 {
+       status = "okay";
+};

The point of separating out the description and enabling of these i2c nodes was so we could selectively enable the ones that are in use by OpenBMC kernel drivers and userspace applications.

With this change we enable 30 i2c character devices, and consume the associated kernel memory.

Did you make any progress with discovering the devices that are required?

I can see from a bug report that the SBE EEPROM is one use case:

errorMessage : ServerI2CInstruction::iic_open invalid device open
attempt /dev/i2c-100

Could we enable just that one on each processor to unblock people using it for this use case while you investigate other uses?

Cheers,

Joel

Quoted 436 lines
arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +117 -0
+
+&cfam0_i2c1 {
+       status = "okay";
+};
+
+&cfam0_i2c2 {
+       status = "okay";
+};
+
+&cfam0_i2c3 {
+       status = "okay";
+};
+
+&cfam0_i2c4 {
+       status = "okay";
+};
+
+&cfam0_i2c5 {
+       status = "okay";
+};
+
+&cfam0_i2c6 {
+       status = "okay";
+};
+
+&cfam0_i2c7 {
+       status = "okay";
+};
+
+&cfam0_i2c8 {
+       status = "okay";
+};
+
+&cfam0_i2c9 {
+       status = "okay";
+};
+
+&cfam0_i2c10 {
+       status = "okay";
+};
+
+&cfam0_i2c11 {
+       status = "okay";
+};
+
+&cfam0_i2c12 {
+       status = "okay";
+};
+
+&cfam0_i2c13 {
+       status = "okay";
+};
+
+&cfam0_i2c14 {
+       status = "okay";
+};
+
+&cfam1_i2c0 {
+       status = "okay";
+};
+
+&cfam1_i2c1 {
+       status = "okay";
+};
+
+&cfam1_i2c2 {
+       status = "okay";
+};
+
+&cfam1_i2c3 {
+       status = "okay";
+};
+
+&cfam1_i2c4 {
+       status = "okay";
+};
+
+&cfam1_i2c5 {
+       status = "okay";
+};
+
+&cfam1_i2c6 {
+       status = "okay";
+};
+
+&cfam1_i2c7 {
+       status = "okay";
+};
+
+&cfam1_i2c8 {
+       status = "okay";
+};
+
+&cfam1_i2c9 {
+       status = "okay";
+};
+
+&cfam1_i2c10 {
+       status = "okay";
+};
+
+&cfam1_i2c11 {
+       status = "okay";
+};
+
+&cfam1_i2c12 {
+       status = "okay";
+};
+
+&cfam1_i2c13 {
+       status = "okay";
+};
+
+&cfam1_i2c14 {
+       status = "okay";
+};
+
 &fmc {
        status = "okay";
        flash@0 {
arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts +120 -0
index 31315d0..4cc99e2 100644
@@ -84,6 +84,126 @@
 
 #include "ibm-power9-cfam.dtsi"
 
+&cfam0_i2c0 {
+       status = "okay";
+};
+
+&cfam0_i2c1 {
+       status = "okay";
+};
+
+&cfam0_i2c2 {
+       status = "okay";
+};
+
+&cfam0_i2c3 {
+       status = "okay";
+};
+
+&cfam0_i2c4 {
+       status = "okay";
+};
+
+&cfam0_i2c5 {
+       status = "okay";
+};
+
+&cfam0_i2c6 {
+       status = "okay";
+};
+
+&cfam0_i2c7 {
+       status = "okay";
+};
+
+&cfam0_i2c8 {
+       status = "okay";
+};
+
+&cfam0_i2c9 {
+       status = "okay";
+};
+
+&cfam0_i2c10 {
+       status = "okay";
+};
+
+&cfam0_i2c11 {
+       status = "okay";
+};
+
+&cfam0_i2c12 {
+       status = "okay";
+};
+
+&cfam0_i2c13 {
+       status = "okay";
+};
+
+&cfam0_i2c14 {
+       status = "okay";
+};
+
+&cfam1_i2c0 {
+       status = "okay";
+};
+
+&cfam1_i2c1 {
+       status = "okay";
+};
+
+&cfam1_i2c2 {
+       status = "okay";
+};
+
+&cfam1_i2c3 {
+       status = "okay";
+};
+
+&cfam1_i2c4 {
+       status = "okay";
+};
+
+&cfam1_i2c5 {
+       status = "okay";
+};
+
+&cfam1_i2c6 {
+       status = "okay";
+};
+
+&cfam1_i2c7 {
+       status = "okay";
+};
+
+&cfam1_i2c8 {
+       status = "okay";
+};
+
+&cfam1_i2c9 {
+       status = "okay";
+};
+
+&cfam1_i2c10 {
+       status = "okay";
+};
+
+&cfam1_i2c11 {
+       status = "okay";
+};
+
+&cfam1_i2c12 {
+       status = "okay";
+};
+
+&cfam1_i2c13 {
+       status = "okay";
+};
+
+&cfam1_i2c14 {
+       status = "okay";
+};
+
 &fmc {
        status = "okay";
        flash@0 {
arch/arm/boot/dts/ibm-power9-cfam.dtsi +164 -1
index f29c6e3..ede778d 100644
@@ -4,6 +4,88 @@
                #address-cells = <1>;
                #size-cells = <1>;
 
+               i2c@1800 {
+                       compatible = "ibm,fsi-i2c-master";
+                       reg = <0x1800 0x400>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       cfam0_i2c0: i2c-bus@0 {
+                               status = "disabled";
+                               reg = <0>;
+                       };
+
+                       cfam0_i2c1: i2c-bus@1 {
+                               status = "disabled";
+                               reg = <1>;
+                       };
+
+                       cfam0_i2c2: i2c-bus@2 {
+                               status = "disabled";
+                               reg = <2>;
+                       };
+
+                       cfam0_i2c3: i2c-bus@3 {
+                               status = "disabled";
+                               reg = <3>;
+                       };
+
+                       cfam0_i2c4: i2c-bus@4 {
+                               status = "disabled";
+                               reg = <4>;
+                       };
+
+                       cfam0_i2c5: i2c-bus@5 {
+                               status = "disabled";
+                               reg = <5>;
+                       };
+
+                       cfam0_i2c6: i2c-bus@6 {
+                               status = "disabled";
+                               reg = <6>;
+                       };
+
+                       cfam0_i2c7: i2c-bus@7 {
+                               status = "disabled";
+                               reg = <7>;
+                       };
+
+                       cfam0_i2c8: i2c-bus@8 {
+                               status = "disabled";
+                               reg = <8>;
+                       };
+
+                       cfam0_i2c9: i2c-bus@9 {
+                               status = "disabled";
+                               reg = <9>;
+                       };
+
+                       cfam0_i2c10: i2c-bus@10 {
+                               status = "disabled";
+                               reg = <10>;
+                       };
+
+                       cfam0_i2c11: i2c-bus@11 {
+                               status = "disabled";
+                               reg = <11>;
+                       };
+
+                       cfam0_i2c12: i2c-bus@12 {
+                               status = "disabled";
+                               reg = <12>;
+                       };
+
+                       cfam0_i2c13: i2c-bus@13 {
+                               status = "disabled";
+                               reg = <13>;
+                       };
+
+                       cfam0_i2c14: i2c-bus@14 {
+                               status = "disabled";
+                               reg = <14>;
+                       };
+               };
+
                sbefifo@2400 {
                        compatible = "ibm,p9-sbefifo";
                        reg = <0x2400 0x400>;
@@ -31,6 +113,88 @@
                                #address-cells = <1>;
                                #size-cells = <1>;
 
+                               i2c@1800 {
+                                       compatible = "ibm,fsi-i2c-master";
+                                       reg = <0x1800 0x400>;
+                                       #address-cells = <1>;
+                                       #size-cells = <0>;
+
+                                       cfam1_i2c0: i2c-bus@0 {
+                                               status = "disabled";
+                                               reg = <0>;
+                                       };
+
+                                       cfam1_i2c1: i2c-bus@1 {
+                                               status = "disabled";
+                                               reg = <1>;
+                                       };
+
+                                       cfam1_i2c2: i2c-bus@2 {
+                                               status = "disabled";
+                                               reg = <2>;
+                                       };
+
+                                       cfam1_i2c3: i2c-bus@3 {
+                                               status = "disabled";
+                                               reg = <3>;
+                                       };
+
+                                       cfam1_i2c4: i2c-bus@4 {
+                                               status = "disabled";
+                                               reg = <4>;
+                                       };
+
+                                       cfam1_i2c5: i2c-bus@5 {
+                                               status = "disabled";
+                                               reg = <5>;
+                                       };
+
+                                       cfam1_i2c6: i2c-bus@6 {
+                                               status = "disabled";
+                                               reg = <6>;
+                                       };
+
+                                       cfam1_i2c7: i2c-bus@7 {
+                                               status = "disabled";
+                                               reg = <7>;
+                                       };
+
+                                       cfam1_i2c8: i2c-bus@8 {
+                                               status = "disabled";
+                                               reg = <8>;
+                                       };
+
+                                       cfam1_i2c9: i2c-bus@9 {
+                                               status = "disabled";
+                                               reg = <9>;
+                                       };
+
+                                       cfam1_i2c10: i2c-bus@10 {
+                                               status = "disabled";
+                                               reg = <10>;
+                                       };
+
+                                       cfam1_i2c11: i2c-bus@11 {
+                                               status = "disabled";
+                                               reg = <11>;
+                                       };
+
+                                       cfam1_i2c12: i2c-bus@12 {
+                                               status = "disabled";
+                                               reg = <12>;
+                                       };
+
+                                       cfam1_i2c13: i2c-bus@13 {
+                                               status = "disabled";
+                                               reg = <13>;
+                                       };
+
+                                       cfam1_i2c14: i2c-bus@14 {
+                                               status = "disabled";
+                                               reg = <14>;
+                                       };
+                               };
+
                                sbefifo@2400 {
                                        compatible = "ibm,p9-sbefifo";
                                        reg = <0x2400 0x400>;
--

1.8.3.1

#3 lore raw
Quoted 32 lines · Joel Stanley
Quoted 16 lines · Eddie James

From: "Edward A. James" <[email protected]>

FSI I2C master algorithm probes port devices based on dts.

---
  arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts     | 120 +++++++++++++++++
  arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 120 +++++++++++++++++
  arch/arm/boot/dts/ibm-power9-cfam.dtsi           | 164 +++++++++++++++++++++++
  3 files changed, 404 insertions(+)
arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +0 -0
index d53dc59..4a1a390 100644

arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts line 77

Quoted 6 lines
arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +3 -0
@@ -72,6 +72,126 @@
 
  #include "ibm-power9-cfam.dtsi"
 
+&cfam0_i2c0 {
+       status = "okay";
+};

The point of separating out the description and enabling of these i2c nodes was so we could selectively enable the ones that are in use by OpenBMC kernel drivers and userspace applications.

With this change we enable 30 i2c character devices, and consume the associated kernel memory.

Did you make any progress with discovering the devices that are required?

Quoted 7 lines

I can see from a bug report that the SBE EEPROM is one use case:

errorMessage : ServerI2CInstruction::iic_open invalid device open
attempt /dev/i2c-100

Could we enable just that one on each processor to unblock people using it for this use case while you investigate other uses?

I heard back from Cronus team, they said they want all the ports (/dev/i2c-100 - 114 and 200 - 214). Manufacturing guys deferred to Cronus team, so I think that's the best source for which ports we need for now.

Thanks,
Eddie

Quoted 440 lines

Cheers,

Joel

Quoted 436 lines
arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +117 -0
+
+&cfam0_i2c1 {
+       status = "okay";
+};
+
+&cfam0_i2c2 {
+       status = "okay";
+};
+
+&cfam0_i2c3 {
+       status = "okay";
+};
+
+&cfam0_i2c4 {
+       status = "okay";
+};
+
+&cfam0_i2c5 {
+       status = "okay";
+};
+
+&cfam0_i2c6 {
+       status = "okay";
+};
+
+&cfam0_i2c7 {
+       status = "okay";
+};
+
+&cfam0_i2c8 {
+       status = "okay";
+};
+
+&cfam0_i2c9 {
+       status = "okay";
+};
+
+&cfam0_i2c10 {
+       status = "okay";
+};
+
+&cfam0_i2c11 {
+       status = "okay";
+};
+
+&cfam0_i2c12 {
+       status = "okay";
+};
+
+&cfam0_i2c13 {
+       status = "okay";
+};
+
+&cfam0_i2c14 {
+       status = "okay";
+};
+
+&cfam1_i2c0 {
+       status = "okay";
+};
+
+&cfam1_i2c1 {
+       status = "okay";
+};
+
+&cfam1_i2c2 {
+       status = "okay";
+};
+
+&cfam1_i2c3 {
+       status = "okay";
+};
+
+&cfam1_i2c4 {
+       status = "okay";
+};
+
+&cfam1_i2c5 {
+       status = "okay";
+};
+
+&cfam1_i2c6 {
+       status = "okay";
+};
+
+&cfam1_i2c7 {
+       status = "okay";
+};
+
+&cfam1_i2c8 {
+       status = "okay";
+};
+
+&cfam1_i2c9 {
+       status = "okay";
+};
+
+&cfam1_i2c10 {
+       status = "okay";
+};
+
+&cfam1_i2c11 {
+       status = "okay";
+};
+
+&cfam1_i2c12 {
+       status = "okay";
+};
+
+&cfam1_i2c13 {
+       status = "okay";
+};
+
+&cfam1_i2c14 {
+       status = "okay";
+};
+
  &fmc {
         status = "okay";
         flash@0 {
arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts +120 -0
index 31315d0..4cc99e2 100644
@@ -84,6 +84,126 @@
 
  #include "ibm-power9-cfam.dtsi"
 
+&cfam0_i2c0 {
+       status = "okay";
+};
+
+&cfam0_i2c1 {
+       status = "okay";
+};
+
+&cfam0_i2c2 {
+       status = "okay";
+};
+
+&cfam0_i2c3 {
+       status = "okay";
+};
+
+&cfam0_i2c4 {
+       status = "okay";
+};
+
+&cfam0_i2c5 {
+       status = "okay";
+};
+
+&cfam0_i2c6 {
+       status = "okay";
+};
+
+&cfam0_i2c7 {
+       status = "okay";
+};
+
+&cfam0_i2c8 {
+       status = "okay";
+};
+
+&cfam0_i2c9 {
+       status = "okay";
+};
+
+&cfam0_i2c10 {
+       status = "okay";
+};
+
+&cfam0_i2c11 {
+       status = "okay";
+};
+
+&cfam0_i2c12 {
+       status = "okay";
+};
+
+&cfam0_i2c13 {
+       status = "okay";
+};
+
+&cfam0_i2c14 {
+       status = "okay";
+};
+
+&cfam1_i2c0 {
+       status = "okay";
+};
+
+&cfam1_i2c1 {
+       status = "okay";
+};
+
+&cfam1_i2c2 {
+       status = "okay";
+};
+
+&cfam1_i2c3 {
+       status = "okay";
+};
+
+&cfam1_i2c4 {
+       status = "okay";
+};
+
+&cfam1_i2c5 {
+       status = "okay";
+};
+
+&cfam1_i2c6 {
+       status = "okay";
+};
+
+&cfam1_i2c7 {
+       status = "okay";
+};
+
+&cfam1_i2c8 {
+       status = "okay";
+};
+
+&cfam1_i2c9 {
+       status = "okay";
+};
+
+&cfam1_i2c10 {
+       status = "okay";
+};
+
+&cfam1_i2c11 {
+       status = "okay";
+};
+
+&cfam1_i2c12 {
+       status = "okay";
+};
+
+&cfam1_i2c13 {
+       status = "okay";
+};
+
+&cfam1_i2c14 {
+       status = "okay";
+};
+
  &fmc {
         status = "okay";
         flash@0 {
arch/arm/boot/dts/ibm-power9-cfam.dtsi +164 -1
index f29c6e3..ede778d 100644
@@ -4,6 +4,88 @@
                 #address-cells = <1>;
                 #size-cells = <1>;
 
+               i2c@1800 {
+                       compatible = "ibm,fsi-i2c-master";
+                       reg = <0x1800 0x400>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       cfam0_i2c0: i2c-bus@0 {
+                               status = "disabled";
+                               reg = <0>;
+                       };
+
+                       cfam0_i2c1: i2c-bus@1 {
+                               status = "disabled";
+                               reg = <1>;
+                       };
+
+                       cfam0_i2c2: i2c-bus@2 {
+                               status = "disabled";
+                               reg = <2>;
+                       };
+
+                       cfam0_i2c3: i2c-bus@3 {
+                               status = "disabled";
+                               reg = <3>;
+                       };
+
+                       cfam0_i2c4: i2c-bus@4 {
+                               status = "disabled";
+                               reg = <4>;
+                       };
+
+                       cfam0_i2c5: i2c-bus@5 {
+                               status = "disabled";
+                               reg = <5>;
+                       };
+
+                       cfam0_i2c6: i2c-bus@6 {
+                               status = "disabled";
+                               reg = <6>;
+                       };
+
+                       cfam0_i2c7: i2c-bus@7 {
+                               status = "disabled";
+                               reg = <7>;
+                       };
+
+                       cfam0_i2c8: i2c-bus@8 {
+                               status = "disabled";
+                               reg = <8>;
+                       };
+
+                       cfam0_i2c9: i2c-bus@9 {
+                               status = "disabled";
+                               reg = <9>;
+                       };
+
+                       cfam0_i2c10: i2c-bus@10 {
+                               status = "disabled";
+                               reg = <10>;
+                       };
+
+                       cfam0_i2c11: i2c-bus@11 {
+                               status = "disabled";
+                               reg = <11>;
+                       };
+
+                       cfam0_i2c12: i2c-bus@12 {
+                               status = "disabled";
+                               reg = <12>;
+                       };
+
+                       cfam0_i2c13: i2c-bus@13 {
+                               status = "disabled";
+                               reg = <13>;
+                       };
+
+                       cfam0_i2c14: i2c-bus@14 {
+                               status = "disabled";
+                               reg = <14>;
+                       };
+               };
+
                 sbefifo@2400 {
                         compatible = "ibm,p9-sbefifo";
                         reg = <0x2400 0x400>;
@@ -31,6 +113,88 @@
                                 #address-cells = <1>;
                                 #size-cells = <1>;
 
+                               i2c@1800 {
+                                       compatible = "ibm,fsi-i2c-master";
+                                       reg = <0x1800 0x400>;
+                                       #address-cells = <1>;
+                                       #size-cells = <0>;
+
+                                       cfam1_i2c0: i2c-bus@0 {
+                                               status = "disabled";
+                                               reg = <0>;
+                                       };
+
+                                       cfam1_i2c1: i2c-bus@1 {
+                                               status = "disabled";
+                                               reg = <1>;
+                                       };
+
+                                       cfam1_i2c2: i2c-bus@2 {
+                                               status = "disabled";
+                                               reg = <2>;
+                                       };
+
+                                       cfam1_i2c3: i2c-bus@3 {
+                                               status = "disabled";
+                                               reg = <3>;
+                                       };
+
+                                       cfam1_i2c4: i2c-bus@4 {
+                                               status = "disabled";
+                                               reg = <4>;
+                                       };
+
+                                       cfam1_i2c5: i2c-bus@5 {
+                                               status = "disabled";
+                                               reg = <5>;
+                                       };
+
+                                       cfam1_i2c6: i2c-bus@6 {
+                                               status = "disabled";
+                                               reg = <6>;
+                                       };
+
+                                       cfam1_i2c7: i2c-bus@7 {
+                                               status = "disabled";
+                                               reg = <7>;
+                                       };
+
+                                       cfam1_i2c8: i2c-bus@8 {
+                                               status = "disabled";
+                                               reg = <8>;
+                                       };
+
+                                       cfam1_i2c9: i2c-bus@9 {
+                                               status = "disabled";
+                                               reg = <9>;
+                                       };
+
+                                       cfam1_i2c10: i2c-bus@10 {
+                                               status = "disabled";
+                                               reg = <10>;
+                                       };
+
+                                       cfam1_i2c11: i2c-bus@11 {
+                                               status = "disabled";
+                                               reg = <11>;
+                                       };
+
+                                       cfam1_i2c12: i2c-bus@12 {
+                                               status = "disabled";
+                                               reg = <12>;
+                                       };
+
+                                       cfam1_i2c13: i2c-bus@13 {
+                                               status = "disabled";
+                                               reg = <13>;
+                                       };
+
+                                       cfam1_i2c14: i2c-bus@14 {
+                                               status = "disabled";
+                                               reg = <14>;
+                                       };
+                               };
+
                                 sbefifo@2400 {
                                         compatible = "ibm,p9-sbefifo";
                                         reg = <0x2400 0x400>;
--

1.8.3.1

maintainer
#4 lore raw
Quoted 48 lines · Eddie James
Quoted 45 lines · Joel Stanley
Quoted 21 lines · Eddie James

From: "Edward A. James" <[email protected]>

FSI I2C master algorithm probes port devices based on dts.

---
  arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts     | 120
+++++++++++++++++
  arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 120
+++++++++++++++++
  arch/arm/boot/dts/ibm-power9-cfam.dtsi           | 164
+++++++++++++++++++++++
  3 files changed, 404 insertions(+)
arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +0 -0
index d53dc59..4a1a390 100644

arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts line 77

Quoted 6 lines
arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +3 -0
@@ -72,6 +72,126 @@
 
  #include "ibm-power9-cfam.dtsi"
 
+&cfam0_i2c0 {
+       status = "okay";
+};

The point of separating out the description and enabling of these i2c nodes was so we could selectively enable the ones that are in use by OpenBMC kernel drivers and userspace applications.

With this change we enable 30 i2c character devices, and consume the associated kernel memory.

Did you make any progress with discovering the devices that are required?

I can see from a bug report that the SBE EEPROM is one use case:

errorMessage : ServerI2CInstruction::iic_open invalid device open
attempt /dev/i2c-100

Quoted 7 lines
Quoted 2 lines

Could we enable just that one on each processor to unblock people using it for this use case while you investigate other uses?

I heard back from Cronus team, they said they want all the ports (/dev/i2c-100 - 114 and 200 - 214). Manufacturing guys deferred to Cronus team, so I think that's the best source for which ports we need for now.

According to the spec, we have the following:

- 4x i2c seeprom
- 8x i2c avagos
- 1x dpss
- 2x dimms

That accounts for all 15 devices on the CFAM i2cm.

Can you ask the Cronus team which port these devices are on, so we can annotate the device tree? Put me on cc :)

From there we could look to using the kernel driver for e.g. the seeprom.

Cheers,

Joel

Quoted 450 lines

Thanks,
Eddie

Quoted 444 lines

Cheers,

Joel

Quoted 440 lines
arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +117 -0
+
+&cfam0_i2c1 {
+       status = "okay";
+};
+
+&cfam0_i2c2 {
+       status = "okay";
+};
+
+&cfam0_i2c3 {
+       status = "okay";
+};
+
+&cfam0_i2c4 {
+       status = "okay";
+};
+
+&cfam0_i2c5 {
+       status = "okay";
+};
+
+&cfam0_i2c6 {
+       status = "okay";
+};
+
+&cfam0_i2c7 {
+       status = "okay";
+};
+
+&cfam0_i2c8 {
+       status = "okay";
+};
+
+&cfam0_i2c9 {
+       status = "okay";
+};
+
+&cfam0_i2c10 {
+       status = "okay";
+};
+
+&cfam0_i2c11 {
+       status = "okay";
+};
+
+&cfam0_i2c12 {
+       status = "okay";
+};
+
+&cfam0_i2c13 {
+       status = "okay";
+};
+
+&cfam0_i2c14 {
+       status = "okay";
+};
+
+&cfam1_i2c0 {
+       status = "okay";
+};
+
+&cfam1_i2c1 {
+       status = "okay";
+};
+
+&cfam1_i2c2 {
+       status = "okay";
+};
+
+&cfam1_i2c3 {
+       status = "okay";
+};
+
+&cfam1_i2c4 {
+       status = "okay";
+};
+
+&cfam1_i2c5 {
+       status = "okay";
+};
+
+&cfam1_i2c6 {
+       status = "okay";
+};
+
+&cfam1_i2c7 {
+       status = "okay";
+};
+
+&cfam1_i2c8 {
+       status = "okay";
+};
+
+&cfam1_i2c9 {
+       status = "okay";
+};
+
+&cfam1_i2c10 {
+       status = "okay";
+};
+
+&cfam1_i2c11 {
+       status = "okay";
+};
+
+&cfam1_i2c12 {
+       status = "okay";
+};
+
+&cfam1_i2c13 {
+       status = "okay";
+};
+
+&cfam1_i2c14 {
+       status = "okay";
+};
+
  &fmc {
         status = "okay";
         flash@0 {
arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts +120 -0
index 31315d0..4cc99e2 100644
@@ -84,6 +84,126 @@
 
  #include "ibm-power9-cfam.dtsi"
 
+&cfam0_i2c0 {
+       status = "okay";
+};
+
+&cfam0_i2c1 {
+       status = "okay";
+};
+
+&cfam0_i2c2 {
+       status = "okay";
+};
+
+&cfam0_i2c3 {
+       status = "okay";
+};
+
+&cfam0_i2c4 {
+       status = "okay";
+};
+
+&cfam0_i2c5 {
+       status = "okay";
+};
+
+&cfam0_i2c6 {
+       status = "okay";
+};
+
+&cfam0_i2c7 {
+       status = "okay";
+};
+
+&cfam0_i2c8 {
+       status = "okay";
+};
+
+&cfam0_i2c9 {
+       status = "okay";
+};
+
+&cfam0_i2c10 {
+       status = "okay";
+};
+
+&cfam0_i2c11 {
+       status = "okay";
+};
+
+&cfam0_i2c12 {
+       status = "okay";
+};
+
+&cfam0_i2c13 {
+       status = "okay";
+};
+
+&cfam0_i2c14 {
+       status = "okay";
+};
+
+&cfam1_i2c0 {
+       status = "okay";
+};
+
+&cfam1_i2c1 {
+       status = "okay";
+};
+
+&cfam1_i2c2 {
+       status = "okay";
+};
+
+&cfam1_i2c3 {
+       status = "okay";
+};
+
+&cfam1_i2c4 {
+       status = "okay";
+};
+
+&cfam1_i2c5 {
+       status = "okay";
+};
+
+&cfam1_i2c6 {
+       status = "okay";
+};
+
+&cfam1_i2c7 {
+       status = "okay";
+};
+
+&cfam1_i2c8 {
+       status = "okay";
+};
+
+&cfam1_i2c9 {
+       status = "okay";
+};
+
+&cfam1_i2c10 {
+       status = "okay";
+};
+
+&cfam1_i2c11 {
+       status = "okay";
+};
+
+&cfam1_i2c12 {
+       status = "okay";
+};
+
+&cfam1_i2c13 {
+       status = "okay";
+};
+
+&cfam1_i2c14 {
+       status = "okay";
+};
+
  &fmc {
         status = "okay";
         flash@0 {
arch/arm/boot/dts/ibm-power9-cfam.dtsi +164 -0
index f29c6e3..ede778d 100644
@@ -4,6 +4,88 @@
                 #address-cells = <1>;
                 #size-cells = <1>;
 
+               i2c@1800 {
+                       compatible = "ibm,fsi-i2c-master";
+                       reg = <0x1800 0x400>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       cfam0_i2c0: i2c-bus@0 {
+                               status = "disabled";
+                               reg = <0>;
+                       };
+
+                       cfam0_i2c1: i2c-bus@1 {
+                               status = "disabled";
+                               reg = <1>;
+                       };
+
+                       cfam0_i2c2: i2c-bus@2 {
+                               status = "disabled";
+                               reg = <2>;
+                       };
+
+                       cfam0_i2c3: i2c-bus@3 {
+                               status = "disabled";
+                               reg = <3>;
+                       };
+
+                       cfam0_i2c4: i2c-bus@4 {
+                               status = "disabled";
+                               reg = <4>;
+                       };
+
+                       cfam0_i2c5: i2c-bus@5 {
+                               status = "disabled";
+                               reg = <5>;
+                       };
+
+                       cfam0_i2c6: i2c-bus@6 {
+                               status = "disabled";
+                               reg = <6>;
+                       };
+
+                       cfam0_i2c7: i2c-bus@7 {
+                               status = "disabled";
+                               reg = <7>;
+                       };
+
+                       cfam0_i2c8: i2c-bus@8 {
+                               status = "disabled";
+                               reg = <8>;
+                       };
+
+                       cfam0_i2c9: i2c-bus@9 {
+                               status = "disabled";
+                               reg = <9>;
+                       };
+
+                       cfam0_i2c10: i2c-bus@10 {
+                               status = "disabled";
+                               reg = <10>;
+                       };
+
+                       cfam0_i2c11: i2c-bus@11 {
+                               status = "disabled";
+                               reg = <11>;
+                       };
+
+                       cfam0_i2c12: i2c-bus@12 {
+                               status = "disabled";
+                               reg = <12>;
+                       };
+
+                       cfam0_i2c13: i2c-bus@13 {
+                               status = "disabled";
+                               reg = <13>;
+                       };
+
+                       cfam0_i2c14: i2c-bus@14 {
+                               status = "disabled";
+                               reg = <14>;
+                       };
+               };
+
                 sbefifo@2400 {
                         compatible = "ibm,p9-sbefifo";
                         reg = <0x2400 0x400>;
@@ -31,6 +113,88 @@
                                 #address-cells = <1>;
                                 #size-cells = <1>;
 
+                               i2c@1800 {
+                                       compatible =
 "ibm,fsi-i2c-master";
+                                       reg = <0x1800 0x400>;
+                                       #address-cells = <1>;
+                                       #size-cells = <0>;
+
+                                       cfam1_i2c0: i2c-bus@0 {
+                                               status = "disabled";
+                                               reg = <0>;
+                                       };
+
+                                       cfam1_i2c1: i2c-bus@1 {
+                                               status = "disabled";
+                                               reg = <1>;
+                                       };
+
+                                       cfam1_i2c2: i2c-bus@2 {
+                                               status = "disabled";
+                                               reg = <2>;
+                                       };
+
+                                       cfam1_i2c3: i2c-bus@3 {
+                                               status = "disabled";
+                                               reg = <3>;
+                                       };
+
+                                       cfam1_i2c4: i2c-bus@4 {
+                                               status = "disabled";
+                                               reg = <4>;
+                                       };
+
+                                       cfam1_i2c5: i2c-bus@5 {
+                                               status = "disabled";
+                                               reg = <5>;
+                                       };
+
+                                       cfam1_i2c6: i2c-bus@6 {
+                                               status = "disabled";
+                                               reg = <6>;
+                                       };
+
+                                       cfam1_i2c7: i2c-bus@7 {
+                                               status = "disabled";
+                                               reg = <7>;
+                                       };
+
+                                       cfam1_i2c8: i2c-bus@8 {
+                                               status = "disabled";
+                                               reg = <8>;
+                                       };
+
+                                       cfam1_i2c9: i2c-bus@9 {
+                                               status = "disabled";
+                                               reg = <9>;
+                                       };
+
+                                       cfam1_i2c10: i2c-bus@10 {
+                                               status = "disabled";
+                                               reg = <10>;
+                                       };
+
+                                       cfam1_i2c11: i2c-bus@11 {
+                                               status = "disabled";
+                                               reg = <11>;
+                                       };
+
+                                       cfam1_i2c12: i2c-bus@12 {
+                                               status = "disabled";
+                                               reg = <12>;
+                                       };
+
+                                       cfam1_i2c13: i2c-bus@13 {
+                                               status = "disabled";
+                                               reg = <13>;
+                                       };
+
+                                       cfam1_i2c14: i2c-bus@14 {
+                                               status = "disabled";
+                                               reg = <14>;
+                                       };
+                               };
+
                                 sbefifo@2400 {
                                         compatible = "ibm,p9-sbefifo";
                                         reg = <0x2400 0x400>;

--
1.8.3.1

#5 lore raw

PATCH v2 2/2 drivers/i2c: Fix devicetree parsing in FSI-attached I2C master algo

In reply to Eddie James

From: "Edward A. James" <[email protected]>

Add compatible check for the master device node. Change "port" to "reg" for the port number property. Check that the port node is available.

---
 drivers/i2c/busses/i2c-fsi.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/i2c/busses/i2c-fsi.c +6 -5
index b4eb102..d5135b4 100644
@@ -568,10 +568,11 @@ static int fsi_i2c_probe(struct device *dev)
 	ida_init(&i2c->ida);
 	INIT_LIST_HEAD(&i2c->ports);
 
-	if (dev->of_node) {
+	if (dev->of_node &&
+	    of_device_is_compatible(dev->of_node, "ibm,fsi-i2c-master")) {
 		/* add adapter for each i2c port of the master */
-		for_each_child_of_node(dev->of_node, np) {
-			rc = of_property_read_u32(np, "port", &port_no);
+		for_each_available_child_of_node(dev->of_node, np) {
+			rc = of_property_read_u32(np, "reg", &port_no);
 			if (rc || port_no > 0xFFFF)
 				continue;
 
@@ -600,7 +601,7 @@ static int fsi_i2c_probe(struct device *dev)
 
 			snprintf(port->adapter.name,
 				 sizeof(port->adapter.name),
-				 "fsi_i2c-%u", port_no);
+				 "fsi%d_i2c%u", i2c->idx, port_no);
 
 			rc = i2c_add_numbered_adapter(&port->adapter);
 			if (rc < 0)
@@ -643,7 +644,7 @@ static int fsi_i2c_remove(struct device *dev)
 static struct fsi_driver fsi_i2c_driver = {
 	.id_table = fsi_i2c_ids,
 	.drv = {
-		.name = "i2c_master_fsi",
+		.name = "fsi_i2c_master",
 		.bus = &fsi_bus_type,
 		.probe = fsi_i2c_probe,
 		.remove = fsi_i2c_remove,
Signature · 1 line
1.8.3.1