Skip to contentSkip to conversation

riscv: dts: starfive: add pcie1 on the star64

PATCH In review Conor Dooley 2 participants 3 messages Jun 26, 2024 – Jul 1, 2024

Subsystems (3)
lore
Share & tools
lore

Conor Dooley

author maintainer
#0 lore raw

PATCH 1/1 riscv: dts: starfive: add pcie1 on the star64

From: Conor Dooley <[email protected]>

It was reported to me that the star64 actually /does/ have an exposed PCIe port, despite the commit message there. In my original conversation with Minda, they said that pcie1 was available there and pcie0 was not, but the v2 patch didn't actually add pcie1 on the star64.

---
I think I'll just squash this in and fixup the commit message, since the patch is still at the top of my branch.

CC Minda Chen <[email protected]>
CC Conor Dooley <[email protected]>
CC Rob Herring <[email protected]>,
CC Emil Renner Berthing <[email protected]
CC Krzysztof Kozlowski <[email protected]
---
 arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dts | 4 ++++
 1 file changed, 4 insertions(+)
arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dts +4 -0
index 2d41f18e0359..b720cdd15ed6 100644
@@ -39,6 +39,10 @@ phy1: ethernet-phy@1 {
 	};
 };
 
+&pcie1 {
+	status = "okay";
+};
+
 &phy0 {
 	rx-internal-delay-ps = <1900>;
 	tx-internal-delay-ps = <1500>;
Signature · 1 line
2.43.0
#1 lore raw
Quoted 44 lines

From: Conor Dooley <[email protected]>

It was reported to me that the star64 actually /does/ have an exposed PCIe port, despite the commit message there. In my original conversation with Minda, they said that pcie1 was available there and pcie0 was not, but the v2 patch didn't actually add pcie1 on the star64.

---
I think I'll just squash this in and fixup the commit message, since the patch is still at the top of my branch.

CC Minda Chen <[email protected]>
CC Conor Dooley <[email protected]>
CC Rob Herring <[email protected]>,
CC Emil Renner Berthing <[email protected]
CC Krzysztof Kozlowski <[email protected]
---
 arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dts | 4 ++++
 1 file changed, 4 insertions(+)
arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dts +4 -1
index 2d41f18e0359..b720cdd15ed6 100644
@@ -39,6 +39,10 @@ phy1: ethernet-phy@1 {
 	};
 };
 
+&pcie1 {
+	status = "okay";
+};
+
 &phy0 {
 	rx-internal-delay-ps = <1900>;
 	tx-internal-delay-ps = <1500>;
--
Quoted 1 line

2.43.0

Hi Conor

The jh7110-pine64-star64.dts is in linux-next tree. I have not noticed it before. Should I squash this to my patch? Can my dts patch be accepted in kernel 6.11? Thanks (The same with Starfive PCIe patch set in linux-next, which will be merge in 6.11, right?)

author maintainer
#2 lore raw
Quoted 48 lines · Minda Chen
Quoted 44 lines

From: Conor Dooley <[email protected]>

It was reported to me that the star64 actually /does/ have an exposed PCIe port, despite the commit message there. In my original conversation with Minda, they said that pcie1 was available there and pcie0 was not, but the v2 patch didn't actually add pcie1 on the star64.

---
I think I'll just squash this in and fixup the commit message, since the patch is still at the top of my branch.

CC Minda Chen <[email protected]>
CC Conor Dooley <[email protected]>
CC Rob Herring <[email protected]>,
CC Emil Renner Berthing <[email protected]
CC Krzysztof Kozlowski <[email protected]
---
 arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dts | 4 ++++
 1 file changed, 4 insertions(+)
arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dts +4 -1
index 2d41f18e0359..b720cdd15ed6 100644
@@ -39,6 +39,10 @@ phy1: ethernet-phy@1 {
 	};
 };
 
+&pcie1 {
+	status = "okay";
+};
+
 &phy0 {
 	rx-internal-delay-ps = <1900>;
 	tx-internal-delay-ps = <1500>;
--
Quoted 1 line

2.43.0

Hi Conor

Quoted 3 lines

The jh7110-pine64-star64.dts is in linux-next tree. I have not noticed it before. Should I squash this to my patch? Can my dts patch be accepted in kernel 6.11? Thanks (The same with Starfive PCIe patch set in linux-next, which will be merge in 6.11, right?)

I already applied your patch, I'll squash this into your patch and queue the result for 6.11.

Thanks,
Conor.