| Message ID | TY3P286MB2611C9AD6E5BB3756A959E89981FA@TY3P286MB2611.JPNP286.PROD.OUTLOOK.COM |
|---|---|
| State | Accepted |
| Commit | dccf4a843a5f0fb2befd31c47b70aecfd0a49ecb |
| Delegated to: | Andes |
| Headers | show |
| Series | Enable PCIE and USB by default on Visionfive 2 | expand |
On Tue, 2023-08-22 at 22:33, Shengyu Qu wrote: > Although PCIE driver already exists, board defconfig isn't configured to > enable PCIE enum on boot, thus USB storage device and NVME drive are not > supported by default. So modify defconfig to enable PCIE auto enum, then > start USB subsystem and scan nvme drive on boot. > > Signed-off-by: Shengyu Qu <wiagn233@outlook.com> Tested-by: Milan P. Stanić <mps@arvanta.net> > --- > configs/starfive_visionfive2_defconfig | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/configs/starfive_visionfive2_defconfig b/configs/starfive_visionfive2_defconfig > index e9b63e5b84..3002c96f0e 100644 > --- a/configs/starfive_visionfive2_defconfig > +++ b/configs/starfive_visionfive2_defconfig > @@ -30,6 +30,7 @@ CONFIG_SPL_SPI=y > CONFIG_SYS_LOAD_ADDR=0x82000000 > CONFIG_SYS_PCI_64BIT=y > CONFIG_PCI=y > +CONFIG_PCI_INIT_R=y > CONFIG_TARGET_STARFIVE_VISIONFIVE2=y > CONFIG_SPL_OPENSBI_LOAD_ADDR=0x40000000 > CONFIG_ARCH_RV64I=y > @@ -43,7 +44,7 @@ CONFIG_SD_BOOT=y > CONFIG_USE_BOOTARGS=y > CONFIG_BOOTARGS="console=ttyS0,115200 debug rootwait earlycon=sbi" > CONFIG_USE_PREBOOT=y > -CONFIG_PREBOOT="setenv fdt_addr ${fdtcontroladdr};fdt addr ${fdtcontroladdr};" > +CONFIG_PREBOOT="nvme scan; usb start; setenv fdt_addr ${fdtcontroladdr}; fdt addr ${fdtcontroladdr};" > CONFIG_DEFAULT_FDT_FILE="starfive/jh7110-starfive-visionfive-2.dtb" > CONFIG_DISPLAY_CPUINFO=y > CONFIG_DISPLAY_BOARDINFO=y > @@ -124,4 +125,9 @@ CONFIG_TIMER_EARLY=y > CONFIG_USB=y > CONFIG_USB_XHCI_HCD=y > CONFIG_USB_XHCI_PCI=y > +CONFIG_USB_EHCI_HCD=y > +CONFIG_USB_EHCI_PCI=y > +CONFIG_USB_OHCI_HCD=y > +CONFIG_USB_OHCI_PCI=y > +CONFIG_USB_STORAGE=y > CONFIG_USB_KEYBOARD=y > -- > 2.42.0 >
On Tue, Aug 22, 2023 at 9:34 AM Shengyu Qu <wiagn233@outlook.com> wrote: > Although PCIE driver already exists, board defconfig isn't configured to > enable PCIE enum on boot, thus USB storage device and NVME drive are not > supported by default. So modify defconfig to enable PCIE auto enum, then > start USB subsystem and scan nvme drive on boot. > > Signed-off-by: Shengyu Qu <wiagn233@outlook.com> > Tested-by: Dennis Gilmore <dennis@ausil.us> > --- > configs/starfive_visionfive2_defconfig | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/configs/starfive_visionfive2_defconfig > b/configs/starfive_visionfive2_defconfig > index e9b63e5b84..3002c96f0e 100644 > --- a/configs/starfive_visionfive2_defconfig > +++ b/configs/starfive_visionfive2_defconfig > @@ -30,6 +30,7 @@ CONFIG_SPL_SPI=y > CONFIG_SYS_LOAD_ADDR=0x82000000 > CONFIG_SYS_PCI_64BIT=y > CONFIG_PCI=y > +CONFIG_PCI_INIT_R=y > CONFIG_TARGET_STARFIVE_VISIONFIVE2=y > CONFIG_SPL_OPENSBI_LOAD_ADDR=0x40000000 > CONFIG_ARCH_RV64I=y > @@ -43,7 +44,7 @@ CONFIG_SD_BOOT=y > CONFIG_USE_BOOTARGS=y > CONFIG_BOOTARGS="console=ttyS0,115200 debug rootwait earlycon=sbi" > CONFIG_USE_PREBOOT=y > -CONFIG_PREBOOT="setenv fdt_addr ${fdtcontroladdr};fdt addr > ${fdtcontroladdr};" > +CONFIG_PREBOOT="nvme scan; usb start; setenv fdt_addr ${fdtcontroladdr}; > fdt addr ${fdtcontroladdr};" > CONFIG_DEFAULT_FDT_FILE="starfive/jh7110-starfive-visionfive-2.dtb" > CONFIG_DISPLAY_CPUINFO=y > CONFIG_DISPLAY_BOARDINFO=y > @@ -124,4 +125,9 @@ CONFIG_TIMER_EARLY=y > CONFIG_USB=y > CONFIG_USB_XHCI_HCD=y > CONFIG_USB_XHCI_PCI=y > +CONFIG_USB_EHCI_HCD=y > +CONFIG_USB_EHCI_PCI=y > +CONFIG_USB_OHCI_HCD=y > +CONFIG_USB_OHCI_PCI=y > +CONFIG_USB_STORAGE=y > CONFIG_USB_KEYBOARD=y > -- > 2.42.0 > >
diff --git a/configs/starfive_visionfive2_defconfig b/configs/starfive_visionfive2_defconfig index e9b63e5b84..3002c96f0e 100644 --- a/configs/starfive_visionfive2_defconfig +++ b/configs/starfive_visionfive2_defconfig @@ -30,6 +30,7 @@ CONFIG_SPL_SPI=y CONFIG_SYS_LOAD_ADDR=0x82000000 CONFIG_SYS_PCI_64BIT=y CONFIG_PCI=y +CONFIG_PCI_INIT_R=y CONFIG_TARGET_STARFIVE_VISIONFIVE2=y CONFIG_SPL_OPENSBI_LOAD_ADDR=0x40000000 CONFIG_ARCH_RV64I=y @@ -43,7 +44,7 @@ CONFIG_SD_BOOT=y CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 debug rootwait earlycon=sbi" CONFIG_USE_PREBOOT=y -CONFIG_PREBOOT="setenv fdt_addr ${fdtcontroladdr};fdt addr ${fdtcontroladdr};" +CONFIG_PREBOOT="nvme scan; usb start; setenv fdt_addr ${fdtcontroladdr}; fdt addr ${fdtcontroladdr};" CONFIG_DEFAULT_FDT_FILE="starfive/jh7110-starfive-visionfive-2.dtb" CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y @@ -124,4 +125,9 @@ CONFIG_TIMER_EARLY=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_PCI=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_PCI=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_PCI=y +CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y
Although PCIE driver already exists, board defconfig isn't configured to enable PCIE enum on boot, thus USB storage device and NVME drive are not supported by default. So modify defconfig to enable PCIE auto enum, then start USB subsystem and scan nvme drive on boot. Signed-off-by: Shengyu Qu <wiagn233@outlook.com> --- configs/starfive_visionfive2_defconfig | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)