Skip to contentSkip to conversation

rockchip: Enable PCIe/M.2 and NVMe on Firefly RK3399

PATCH Superseded Mark Kettenis 4 participants 7 messages May 25, 2020 – Jun 7, 2020

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 rockchip: Enable PCIe/M.2 and NVMe on Firefly RK3399

Enable CONFIG_PCI and CONFIG_NVME and related configs for the Firefly RK3399 board.

---
Changes in v2:
- Extend commit message

 configs/firefly-rk3399_defconfig | 4 ++++
 1 file changed, 4 insertions(+)
configs/firefly-rk3399_defconfig +4 -0
index 831a37d607..2f2a3edb72 100644
@@ -19,6 +19,7 @@ CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
+CONFIG_CMD_PCI=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_TIME=y
 CONFIG_SPL_OF_CONTROL=y
@@ -38,10 +39,13 @@ CONFIG_SF_DEFAULT_SPEED=20000000
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_GMAC_ROCKCHIP=y
+CONFIG_NVME=y
+CONFIG_PCI=y
 CONFIG_PMIC_RK8XX=y
 CONFIG_REGULATOR_PWM=y
 CONFIG_REGULATOR_RK8XX=y
 CONFIG_PWM_ROCKCHIP=y
+CONFIG_DM_RESET=y
 CONFIG_BAUDRATE=115200
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYSRESET=y
Signature · 1 line
2.26.2
#1 lore raw

PATCH v2 2/2 rockchip: Enable PCIe and NVMe on ROCKPro64

Enable CONFIG_PCI and CONFIG_NVME and related configs for the ROCKPro64 board.

---
Changes in v2:
- Extend commit message

 configs/rockpro64-rk3399_defconfig | 4 ++++
 1 file changed, 4 insertions(+)
configs/rockpro64-rk3399_defconfig +4 -0
index 95037a191d..b472167283 100644
@@ -19,6 +19,7 @@ CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
+CONFIG_CMD_PCI=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_TIME=y
 CONFIG_SPL_OF_CONTROL=y
@@ -38,10 +39,13 @@ CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_GMAC_ROCKCHIP=y
+CONFIG_NVME=y
+CONFIG_PCI=y
 CONFIG_PMIC_RK8XX=y
 CONFIG_REGULATOR_PWM=y
 CONFIG_REGULATOR_RK8XX=y
 CONFIG_PWM_ROCKCHIP=y
+CONFIG_DM_RESET=y
 CONFIG_RAM_RK3399_LPDDR4=y
 CONFIG_BAUDRATE=115200
 CONFIG_DEBUG_UART_SHIFT=2
Signature · 1 line
2.26.2
#2 lore raw

PATCH v2 2/2 rockchip: Enable PCIe and NVMe on ROCKPro64

Quoted 4 lines · Mark Kettenis

Enable CONFIG_PCI and CONFIG_NVME and related configs for the ROCKPro64 board.

Tested by: Kurt Miller <[email protected]>

Model: Pine64 RockPro64 v2.1

=> pci
Scanning PCI devices on bus 0 BusDevFun??VendorId???DeviceId???Device Class???????Sub-Class
_____________________________________________________________
00.00.00???0x1d87?????0x0100?????Bridge device???????????0x04 => pci 1
Scanning PCI devices on bus 1 BusDevFun??VendorId???DeviceId???Device Class???????Sub-Class
_____________________________________________________________
01.00.00???0x1b4b?????0x9128?????Mass storage controller 0x06

Quoted 33 lines

---
Changes in v2:
- Extend commit message

?configs/rockpro64-rk3399_defconfig | 4 ++++
?1 file changed, 4 insertions(+)

configs/rockpro64-rk3399_defconfig +0 -0
index 95037a191d..b472167283 100644
@@ -19,6 +19,7 @@ CONFIG_CMD_BOOTZ=y

?CONFIG_CMD_GPT=y
?CONFIG_CMD_MMC=y
?CONFIG_CMD_USB=y
+CONFIG_CMD_PCI=y
?# CONFIG_CMD_SETEXPR is not set
?CONFIG_CMD_TIME=y
?CONFIG_SPL_OF_CONTROL=y

configs/rockpro64-rk3399_defconfig +0 -0
@@ -38,10 +39,13 @@ CONFIG_SPI_FLASH_GIGADEVICE=y

?CONFIG_DM_ETH=y
?CONFIG_ETH_DESIGNWARE=y
?CONFIG_GMAC_ROCKCHIP=y

configs/rockpro64-rk3399_defconfig +2 -0
+CONFIG_NVME=y
+CONFIG_PCI=y

?CONFIG_PMIC_RK8XX=y
?CONFIG_REGULATOR_PWM=y
?CONFIG_REGULATOR_RK8XX=y
?CONFIG_PWM_ROCKCHIP=y
+CONFIG_DM_RESET=y
?CONFIG_RAM_RK3399_LPDDR4=y
?CONFIG_BAUDRATE=115200
?CONFIG_DEBUG_UART_SHIFT=2

#5 lore raw

PATCH v2 1/2 rockchip: Enable PCIe/M.2 and NVMe on Firefly RK3399

In reply to Mark Kettenis

Hi Mark,

This is not able to apply directly, this is the first time I met this error:

$ git-pw patch apply 1297197
Applying: rockchip: Enable PCIe/M.2 and NVMe on Firefly RK3399
error: sha1 information is lacking or useless 
(configs/firefly-rk3399_defconfig).
error: could not build fake ancestor
Patch failed at 0001 rockchip: Enable PCIe/M.2 and NVMe on Firefly RK3399

If I use apply this patch manually, these two patch also have conflict due to "CONFIG_BAUDRATE".

Thanks,

- Kever

Quoted 38 lines · Mark Kettenis

Enable CONFIG_PCI and CONFIG_NVME and related configs for the Firefly RK3399 board.

---
Changes in v2:
- Extend commit message

  configs/firefly-rk3399_defconfig | 4 ++++
  1 file changed, 4 insertions(+)
configs/firefly-rk3399_defconfig +4 -0
index 831a37d607..2f2a3edb72 100644
@@ -19,6 +19,7 @@ CONFIG_CMD_BOOTZ=y
  CONFIG_CMD_GPT=y
  CONFIG_CMD_MMC=y
  CONFIG_CMD_USB=y
+CONFIG_CMD_PCI=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_TIME=y
  CONFIG_SPL_OF_CONTROL=y
@@ -38,10 +39,13 @@ CONFIG_SF_DEFAULT_SPEED=20000000
  CONFIG_DM_ETH=y
  CONFIG_ETH_DESIGNWARE=y
  CONFIG_GMAC_ROCKCHIP=y
+CONFIG_NVME=y
+CONFIG_PCI=y
  CONFIG_PMIC_RK8XX=y
  CONFIG_REGULATOR_PWM=y
  CONFIG_REGULATOR_RK8XX=y
  CONFIG_PWM_ROCKCHIP=y
+CONFIG_DM_RESET=y
  CONFIG_BAUDRATE=115200
  CONFIG_DEBUG_UART_SHIFT=2
  CONFIG_SYSRESET=y
#6 lore raw

PATCH v2 1/2 rockchip: Enable PCIe/M.2 and NVMe on Firefly RK3399

Quoted 15 lines

From: Kever Yang <[email protected]>
Date: Mon, 1 Jun 2020 09:15:17 +0800

Hi Mark,

This is not able to apply directly, this is the first time I met this error:

$ git-pw patch apply 1297197
Applying: rockchip: Enable PCIe/M.2 and NVMe on Firefly RK3399
error: sha1 information is lacking or useless 
(configs/firefly-rk3399_defconfig).
error: could not build fake ancestor
Patch failed at 0001 rockchip: Enable PCIe/M.2 and NVMe on Firefly RK3399
Quoted 2 lines

If I use apply this patch manually, these two patch also have conflict due to "CONFIG_BAUDRATE".

Sorry, I generated these patches from a branch that has CONFIG_BAUDRATE set to a more manageable 115200. Will send a clean v3 in a moment.

Quoted 43 lines · Mark Kettenis
Quoted 38 lines

Enable CONFIG_PCI and CONFIG_NVME and related configs for the Firefly RK3399 board.

---
Changes in v2:
- Extend commit message

  configs/firefly-rk3399_defconfig | 4 ++++
  1 file changed, 4 insertions(+)
configs/firefly-rk3399_defconfig +4 -0
index 831a37d607..2f2a3edb72 100644
@@ -19,6 +19,7 @@ CONFIG_CMD_BOOTZ=y
  CONFIG_CMD_GPT=y
  CONFIG_CMD_MMC=y
  CONFIG_CMD_USB=y
+CONFIG_CMD_PCI=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_TIME=y
  CONFIG_SPL_OF_CONTROL=y
@@ -38,10 +39,13 @@ CONFIG_SF_DEFAULT_SPEED=20000000
  CONFIG_DM_ETH=y
  CONFIG_ETH_DESIGNWARE=y
  CONFIG_GMAC_ROCKCHIP=y
+CONFIG_NVME=y
+CONFIG_PCI=y
  CONFIG_PMIC_RK8XX=y
  CONFIG_REGULATOR_PWM=y
  CONFIG_REGULATOR_RK8XX=y
  CONFIG_PWM_ROCKCHIP=y
+CONFIG_DM_RESET=y
  CONFIG_BAUDRATE=115200
  CONFIG_DEBUG_UART_SHIFT=2
  CONFIG_SYSRESET=y