Skip to contentSkip to conversation

Add StarFive VF2 USB host support.

PATCH RESEND In review Minda Chen 3 participants 10 messages Aug 7, 2023 – Aug 9, 2023

Subsystems (2)
lore
Share & tools
lore

Minda Chen

author
#0 lore raw

cover Add StarFive VF2 USB host support.

StarFive VF2 VLI usb-host controller connect to pcie0 RC. Enable pcie0 first the enable USB function.

patch1 is Get the correct ECAM offset in multiple PCIe RC. patch2 is enable pcie0 dts node.
patch3 is enable SYS_CACHELINE_SIZE
patch4 is Add VF2 USB related configuration.

Minda Chen (4):
pci: plda: Get correct ECAM offset in multiple PCIe RC case
riscv: dts: starfive: Enable pcie0 dts node
riscv: starfive: Add SYS_CACHE_SHIFT_6 to enable SYS_CACHELINE_SIZE
configs: riscv: starfive: Add VF2 PCIe USB3 XHCI support

 arch/riscv/cpu/jh7110/Kconfig                    | 1 +
 arch/riscv/dts/jh7110-starfive-visionfive-2.dtsi | 2 +-
 configs/starfive_visionfive2_defconfig           | 5 +++++
 drivers/pci/pcie_plda_common.c                   | 5 +++--
 4 files changed, 10 insertions(+), 3 deletions(-)

base-commit: 38dedebc547f795efc3daad17f7c013c515e1285

Signature · 1 line
2.17.1
author
#1 lore raw

PATCH RESEND 1/4 pci: plda: Get correct ECAM offset in multiple PCIe RC case

Get the correct ECAM offset and record the secondary bus number in Multiple RC case.

---
 drivers/pci/pcie_plda_common.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/pci/pcie_plda_common.c +3 -2
index 005b92616a..cd74bb4711 100644
@@ -36,8 +36,8 @@ static int plda_pcie_conf_address(const struct udevice *udev, pci_dev_t bdf,
 				  uint offset, void **paddr)
 {
 	struct pcie_plda *priv = dev_get_priv(udev);
-	int where = PCIE_ECAM_OFFSET(PCI_BUS(bdf), PCI_DEV(bdf),
-				     PCI_FUNC(bdf), offset);
+	int where = PCIE_ECAM_OFFSET(PCI_BUS(bdf) - dev_seq(udev),
+				     PCI_DEV(bdf), PCI_FUNC(bdf), offset);
 
 	if (!plda_pcie_addr_valid(priv, bdf))
 		return -ENODEV;
@@ -71,6 +71,7 @@ int plda_pcie_config_write(struct udevice *udev, pci_dev_t bdf,
 	    (offset == PCI_PRIMARY_BUS && size != PCI_SIZE_8))) {
 		priv->sec_busno =
 			((offset == PCI_PRIMARY_BUS) ? (value >> 8) : value) & 0xff;
+		priv->sec_busno += dev_seq(udev);
 		debug("Secondary bus number was changed to %d\n",
 		      priv->sec_busno);
 	}
Signature · 1 line
2.17.1
Reviewed-by on v1 1/4
#2 lore raw

Re: [RESEND,v1 1/4] pci: plda: Get correct ECAM offset in multiple PCIe RC case

Quoted 7 lines · Minda Chen

Get the correct ECAM offset and record the secondary bus number in Multiple RC case.

---
 drivers/pci/pcie_plda_common.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
author
#3 lore raw

PATCH RESEND 2/4 riscv: dts: starfive: Enable pcie0 dts node

In reply to Minda Chen

In StarFive VF2 board. pcie0 connect to VTI usb controller. Enable it to support usb host.

---
 arch/riscv/dts/jh7110-starfive-visionfive-2.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/riscv/dts/jh7110-starfive-visionfive-2.dtsi +1 -1
index bf7fdb4dd6..e40f57a150 100644
@@ -311,7 +311,7 @@
 
 &pcie0 {
 	reset-gpios = <&sysgpio 26 GPIO_ACTIVE_LOW>;
-	status = "disabled";
+	status = "okay";
 };
 
 &pcie1 {
Signature · 1 line
2.17.1
Reviewed-by on v1 2/4
#4 lore raw

Re: [RESEND,v1 2/4] riscv: dts: starfive: Enable pcie0 dts node

Quoted 7 lines · Minda Chen

In StarFive VF2 board. pcie0 connect to VTI usb controller. Enable it to support usb host.

---
 arch/riscv/dts/jh7110-starfive-visionfive-2.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
author
#5 lore raw

PATCH RESEND 3/4 riscv: starfive: Add SYS_CACHE_SHIFT_6 to enable SYS_CACHELINE_SIZE

In reply to Minda Chen

Some device driver need SYS_CACHELINE_SIZE macro. Add StarFive SYS_CACHE_SHIFT_6 to enable it.

---
 arch/riscv/cpu/jh7110/Kconfig | 1 +
 1 file changed, 1 insertion(+)
arch/riscv/cpu/jh7110/Kconfig +1 -0
index 4d9581165b..c1d3e6ada2 100644
@@ -13,6 +13,7 @@ config STARFIVE_JH7110
 	select SUPPORT_SPL
 	select SPL_RAM if SPL
 	select SPL_STARFIVE_DDR
+	select SYS_CACHE_SHIFT_6
 	select PINCTRL_STARFIVE_JH7110
 	imply MMC
 	imply MMC_BROKEN_CD
Signature · 1 line
2.17.1
Reviewed-by on v1 3/4
#6 lore raw

Re: [RESEND, v1 3/4] riscv: starfive: Add SYS_CACHE_SHIFT_6 to enable SYS_CACHELINE_SIZE

Quoted 9 lines · Minda Chen

Some device driver need SYS_CACHELINE_SIZE macro. Add StarFive SYS_CACHE_SHIFT_6 to enable it.

---
 arch/riscv/cpu/jh7110/Kconfig | 1 +
 1 file changed, 1 insertion(+)
author
#8 lore raw

PATCH RESEND 4/4 configs: riscv: starfive: Add VF2 PCIe USB3 XHCI support

In reply to Minda Chen

Add XHCI_PCI to enable usb3-host functions.
Also add usb command and keyboard config.

---
 configs/starfive_visionfive2_defconfig | 5 +++++
 1 file changed, 5 insertions(+)
configs/starfive_visionfive2_defconfig +5 -0
index 5d8a8e28cb..a70ada394f 100644
@@ -65,6 +65,7 @@ CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=5
 CONFIG_CMD_MEMINFO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_PCI=y
+CONFIG_CMD_USB=y
 CONFIG_CMD_TFTPPUT=y
 CONFIG_OF_BOARD=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
@@ -111,3 +112,7 @@ CONFIG_PINCTRL_STARFIVE=y
 CONFIG_SYS_NS16550=y
 CONFIG_CADENCE_QSPI=y
 CONFIG_TIMER_EARLY=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_PCI=y
+CONFIG_USB_KEYBOARD=y
Signature · 1 line
2.17.1
Reviewed-by on v1 4/4
#9 lore raw

Re: [RESEND, v1 4/4] configs: riscv: starfive: Add VF2 PCIe USB3 XHCI support

Quoted 7 lines · Minda Chen

Add XHCI_PCI to enable usb3-host functions.
Also add usb command and keyboard config.

---
 configs/starfive_visionfive2_defconfig | 5 +++++
 1 file changed, 5 insertions(+)