FSI Tweaks
Subsystems (3)
Joel Stanley
maintainerv2 cover FSI Tweaks
v2 fixes the alignment of the memory region we've chosen.
These patches attempt to get the FSI master working on Tacoma.
The host FSI device tree needs rethinking, which we can do when upstreaming the changes.
Joel Stanley (3):
ARM: dts: aspeed: tacoma: Add host FSI description
ARM: dts: aspeed: tacoma: Use 64MB for firmware memory
fsi: aspeed: Disable IPOLL
arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts | 249 +++++++++++++++++++- drivers/fsi/fsi-master-aspeed.c | 2 +- 2 files changed, 249 insertions(+), 2 deletions(-)
Signature · 1 line
2.23.0
Joel Stanley
maintainerPATCH v2 1/3 ARM: dts: aspeed: tacoma: Add host FSI description
This adds the description of the Power9 CPUs that are attached to the BMC.
--- arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts | 247 ++++++++++++++++++++ 1 file changed, 247 insertions(+)
arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts +247 -0
@@ -138,6 +138,253 @@ &fsim0 { status = "okay"; + #address-cells = <2>; + #size-cells = <0>; + + cfam@0,0 { + reg = <0 0>; + #address-cells = <1>; + #size-cells = <1>; + chip-id = <0>; + + scom@1000 { + compatible = "ibm,fsi2pib"; + reg = <0x1000 0x400>; + }; + + i2c@1800 { + compatible = "ibm,fsi-i2c-master"; + reg = <0x1800 0x400>; + #address-cells = <1>; + #size-cells = <0>; + + cfam0_i2c0: i2c-bus@0 { + reg = <0>; + }; + + cfam0_i2c1: i2c-bus@1 { + reg = <1>; + }; + + cfam0_i2c2: i2c-bus@2 { + reg = <2>; + }; + + cfam0_i2c3: i2c-bus@3 { + reg = <3>; + }; + + cfam0_i2c4: i2c-bus@4 { + reg = <4>; + }; + + cfam0_i2c5: i2c-bus@5 { + reg = <5>; + }; + + cfam0_i2c6: i2c-bus@6 { + reg = <6>; + }; + + cfam0_i2c7: i2c-bus@7 { + reg = <7>; + }; + + cfam0_i2c8: i2c-bus@8 { + reg = <8>; + }; + + cfam0_i2c9: i2c-bus@9 { + reg = <9>; + }; + + cfam0_i2c10: i2c-bus@a { + reg = <10>; + }; + + cfam0_i2c11: i2c-bus@b { + reg = <11>; + }; + + cfam0_i2c12: i2c-bus@c { + reg = <12>; + }; + + cfam0_i2c13: i2c-bus@d { + reg = <13>; + }; + + cfam0_i2c14: i2c-bus@e { + reg = <14>; + }; + }; + + sbefifo@2400 { + compatible = "ibm,p9-sbefifo"; + reg = <0x2400 0x400>; + #address-cells = <1>; + #size-cells = <0>; + + fsi_occ0: occ { + compatible = "ibm,p9-occ"; + }; + }; + + fsi_hub0: hub@3400 { + compatible = "fsi-master-hub"; + reg = <0x3400 0x400>; + #address-cells = <2>; + #size-cells = <0>; + + no-scan-on-init; + }; + }; +}; + +&fsi_hub0 { + cfam@1,0 { + reg = <1 0>; + #address-cells = <1>; + #size-cells = <1>; + chip-id = <1>; + + scom@1000 { + compatible = "ibm,fsi2pib"; + reg = <0x1000 0x400>; + }; + + i2c@1800 { + compatible = "ibm,fsi-i2c-master"; + reg = <0x1800 0x400>; + #address-cells = <1>; + #size-cells = <0>; + + cfam1_i2c0: i2c-bus@0 { + reg = <0>; + }; + + cfam1_i2c1: i2c-bus@1 { + reg = <1>; + }; + + cfam1_i2c2: i2c-bus@2 { + reg = <2>; + }; + + cfam1_i2c3: i2c-bus@3 { + reg = <3>; + }; + + cfam1_i2c4: i2c-bus@4 { + reg = <4>; + }; + + cfam1_i2c5: i2c-bus@5 { + reg = <5>; + }; + + cfam1_i2c6: i2c-bus@6 { + reg = <6>; + }; + + cfam1_i2c7: i2c-bus@7 { + reg = <7>; + }; + + cfam1_i2c8: i2c-bus@8 { + reg = <8>; + }; + + cfam1_i2c9: i2c-bus@9 { + reg = <9>; + }; + + cfam1_i2c10: i2c-bus@a { + reg = <10>; + }; + + cfam1_i2c11: i2c-bus@b { + reg = <11>; + }; + + cfam1_i2c12: i2c-bus@c { + reg = <12>; + }; + + cfam1_i2c13: i2c-bus@d { + reg = <13>; + }; + + cfam1_i2c14: i2c-bus@e { + reg = <14>; + }; + }; + + sbefifo@2400 { + compatible = "ibm,p9-sbefifo"; + reg = <0x2400 0x400>; + #address-cells = <1>; + #size-cells = <0>; + + fsi_occ1: occ { + compatible = "ibm,p9-occ"; + }; + }; + + fsi_hub1: hub@3400 { + compatible = "fsi-master-hub"; + reg = <0x3400 0x400>; + #address-cells = <2>; + #size-cells = <0>; + + no-scan-on-init; + }; + }; +}; + +/* Legacy OCC numbering (to get rid of when userspace is fixed) */ +&fsi_occ0 { + reg = <1>; +}; + +&fsi_occ1 { + reg = <2>; +}; + +/ { + aliases { + i2c100 = &cfam0_i2c0; + i2c101 = &cfam0_i2c1; + i2c102 = &cfam0_i2c2; + i2c103 = &cfam0_i2c3; + i2c104 = &cfam0_i2c4; + i2c105 = &cfam0_i2c5; + i2c106 = &cfam0_i2c6; + i2c107 = &cfam0_i2c7; + i2c108 = &cfam0_i2c8; + i2c109 = &cfam0_i2c9; + i2c110 = &cfam0_i2c10; + i2c111 = &cfam0_i2c11; + i2c112 = &cfam0_i2c12; + i2c113 = &cfam0_i2c13; + i2c114 = &cfam0_i2c14; + i2c200 = &cfam1_i2c0; + i2c201 = &cfam1_i2c1; + i2c202 = &cfam1_i2c2; + i2c203 = &cfam1_i2c3; + i2c204 = &cfam1_i2c4; + i2c205 = &cfam1_i2c5; + i2c206 = &cfam1_i2c6; + i2c207 = &cfam1_i2c7; + i2c208 = &cfam1_i2c8; + i2c209 = &cfam1_i2c9; + i2c210 = &cfam1_i2c10; + i2c211 = &cfam1_i2c11; + i2c212 = &cfam1_i2c12; + i2c213 = &cfam1_i2c13; + i2c214 = &cfam1_i2c14; + }; + }; &i2c0 {
Signature · 1 line
2.23.0
Joel Stanley
maintainerPATCH v2 2/3 ARM: dts: aspeed: tacoma: Use 64MB for firmware memory
In reply to Joel StanleyMbox's file mode needs a window the same size as the image being loaded.
---
v2:
fix alignment
--- arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts +1 -1
@@ -27,7 +27,7 @@ flash_memory: region@ba000000 { no-map; - reg = <0xba000000 0x2000000>; /* 32M */ + reg = <0xb8000000 0x4000000>; /* 64M */ }; };
Signature · 1 line
2.23.0
Re: [PATCH linux dev-5.3 v2 2/3] ARM: dts: aspeed: tacoma: Use 64MB for firmware memory
Quoted 3 lines · Joel Stanley
Mbox's file mode needs a window the same size as the image being loaded.
Signed-off-by Joel Stanley <[email protected]>
Joel Stanley
maintainerPATCH v2 3/3 fsi: aspeed: Disable IPOLL
In reply to Joel StanleyHaving IPOLL enabled when turning on the host causes FSI to stop working.
In the future we will need to add a mechansim for the BMC to enable IPOLL once it is ready.
--- drivers/fsi/fsi-master-aspeed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/fsi/fsi-master-aspeed.c +1 -1
@@ -421,7 +421,7 @@ static int aspeed_master_init(struct fsi_master_aspeed *aspeed) reg =cpu_to_be32 (FSI_MECTRL_EOAE |FSI_MECTRL_P8_AUTO_TERM );opb_write (aspeed->base, ctrl_base +FSI_MECTRL , reg,4 ); - reg =cpu_to_be32 (FSI_MMODE_EIP |FSI_MMODE_ECRC |FSI_MMODE_EPC + reg =cpu_to_be32 (FSI_MMODE_ECRC |FSI_MMODE_EPC |fsi_mmode_crs0 (0x7f ) |fsi_mmode_crs1 (0x7f ) |FSI_MMODE_P8_TO_LSB );opb_write (aspeed->base, ctrl_base +FSI_MMODE , reg,4 );
Signature · 1 line
2.23.0
Re: [PATCH linux dev-5.3 v2 3/3] fsi: aspeed: Disable IPOLL
Quoted 7 lines · Joel Stanley
Having IPOLL enabled when turning on the host causes FSI to stop working.
In the future we will need to add a mechansim for the BMC to enable IPOLL once it is ready.
Signed-off-by Joel Stanley <[email protected]>
Re: [PATCH linux dev-5.3 v2 3/3] fsi: aspeed: Disable IPOLL
In reply to Joel StanleyHi Joel,
Quoted 5 lines
Having IPOLL enabled when turning on the host causes FSI to stop working.
In the future we will need to add a mechansim for the BMC to enable IPOLL once it is ready.
... in parallel though, we'll see what the underlying issue is.
Cheers,
Jeremy