Skip to contentSkip to conversation

rockchip: Pinebook Pro: enable rng to provide an entropy source

PATCH New Peter Robinson 3 participants 7 messages Jun 8, 2020 – Jun 27, 2020 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 rockchip: Pinebook Pro: enable rng to provide an entropy source

Enable the rng so UEFI can provide entropy for KASLR

---
 arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi | 4 ++++
 arch/arm/dts/rk3399-rockpro64-u-boot.dtsi    | 4 ++++
 configs/pinebook-pro-rk3399_defconfig        | 2 ++
 3 files changed, 10 insertions(+)
arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi +4 -0
index 1a2e24d3ef..296321d697 100644
@@ -24,6 +24,10 @@
 	u-boot,dm-pre-reloc;
 };
 
+&rng {
+	status = "okay";
+};
+
 &sdhci {
 	max-frequency = <25000000>;
 	u-boot,dm-pre-reloc;
arch/arm/dts/rk3399-rockpro64-u-boot.dtsi +4 -0
index bac09df4a3..cb8991aa25 100644
@@ -19,6 +19,10 @@
 	};
 };
 
+&rng {
+	status = "okay";
+};
+
 &spi1 {
 	spi_flash: flash at 0 {
 		u-boot,dm-pre-reloc;
configs/pinebook-pro-rk3399_defconfig +2 -0
index 0c129b9aeb..21eecf477c 100644
@@ -54,6 +54,8 @@ CONFIG_DM_PMIC_FAN53555=y
 CONFIG_PMIC_RK8XX=y
 CONFIG_REGULATOR_PWM=y
 CONFIG_REGULATOR_RK8XX=y
+CONFIG_DM_RNG=y
+CONFIG_RNG_ROCKCHIP=y
 CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM_RK3399_LPDDR4=y
 CONFIG_DM_RESET=y
Signature · 1 line
2.26.2
#1 lore raw

PATCH 2/3 rockchip: Pinebook Pro: Fix USB and the USB attached keyboard

The built in keyboard on the Pinebook Pro is attached via USB so fix this up to ensure USB works as expected.

---
 configs/pinebook-pro-rk3399_defconfig | 5 +++++
 include/configs/pinebook-pro-rk3399.h | 3 +++
 2 files changed, 8 insertions(+)
configs/pinebook-pro-rk3399_defconfig +5 -0
index 21eecf477c..733463556a 100644
@@ -61,6 +61,8 @@ CONFIG_RAM_RK3399_LPDDR4=y
 CONFIG_DM_RESET=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="usb start"
 CONFIG_ROCKCHIP_SPI=y
 CONFIG_SYSRESET=y
 CONFIG_USB=y
@@ -68,8 +70,11 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_GENERIC=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_GENERIC=y
 CONFIG_USB_DWC3=y
 CONFIG_ROCKCHIP_USB2_PHY=y
+CONFIG_DM_KEYBOARD=y
 CONFIG_USB_KEYBOARD=y
 CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_ASIX=y
include/configs/pinebook-pro-rk3399.h +3 -0
index 4bc8802d11..d910830582 100644
@@ -25,4 +25,7 @@
 
 #define SDRAM_BANK_SIZE			(2UL << 30)
 
+#define CONFIG_USB_OHCI_NEW
+#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS     2
+
 #endif
Signature · 1 line
2.26.2
#2 lore raw

PATCH 2/3 rockchip: Pinebook Pro: Fix USB and the USB attached keyboard

Quoted 4 lines · Peter Robinson

The built in keyboard on the Pinebook Pro is attached via USB so fix this up to ensure USB works as expected.

Thanks,
- Kever

Quoted 42 lines
---
  configs/pinebook-pro-rk3399_defconfig | 5 +++++
  include/configs/pinebook-pro-rk3399.h | 3 +++
  2 files changed, 8 insertions(+)
configs/pinebook-pro-rk3399_defconfig +5 -0
index 21eecf477c..733463556a 100644
@@ -61,6 +61,8 @@ CONFIG_RAM_RK3399_LPDDR4=y
  CONFIG_DM_RESET=y
  CONFIG_BAUDRATE=1500000
  CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="usb start"
  CONFIG_ROCKCHIP_SPI=y
  CONFIG_SYSRESET=y
  CONFIG_USB=y
@@ -68,8 +70,11 @@ CONFIG_USB_XHCI_HCD=y
  CONFIG_USB_XHCI_DWC3=y
  CONFIG_USB_EHCI_HCD=y
  CONFIG_USB_EHCI_GENERIC=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_GENERIC=y
  CONFIG_USB_DWC3=y
  CONFIG_ROCKCHIP_USB2_PHY=y
+CONFIG_DM_KEYBOARD=y
  CONFIG_USB_KEYBOARD=y
  CONFIG_USB_HOST_ETHER=y
  CONFIG_USB_ETHER_ASIX=y
include/configs/pinebook-pro-rk3399.h +3 -0
index 4bc8802d11..d910830582 100644
@@ -25,4 +25,7 @@
 
  #define SDRAM_BANK_SIZE			(2UL << 30)
 
+#define CONFIG_USB_OHCI_NEW
+#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS     2
+
  #endif
#3 lore raw

PATCH 3/3 rockchip: Pinebook Pro: Fix SPI flash and store env on it

In reply to Peter Robinson

Some minor fixes for SPI flash on the Pinebook Pro and also default to saving environment to the SPI flash as it's guaranteed to be on board.

---
 arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi | 6 +++++-
 configs/pinebook-pro-rk3399_defconfig        | 3 +++
 include/configs/pinebook-pro-rk3399.h        | 9 ---------
 3 files changed, 8 insertions(+), 10 deletions(-)
arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi +5 -1
index 296321d697..ded7db0aef 100644
@@ -12,7 +12,11 @@
 	};
 
 	chosen {
-		u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
+		u-boot,spl-boot-order = "same-as-spl", &sdhci, &spiflash, &sdmmc;
+	};
+
+	config {
+		u-boot,spl-payload-offset = <0x60000>; /* @ 384KB */
 	};
 };
 
configs/pinebook-pro-rk3399_defconfig +3 -0
index 733463556a..18b2d74253 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00200000
+CONFIG_ENV_SIZE=0x8000
 CONFIG_ROCKCHIP_RK3399=y
 CONFIG_TARGET_PINEBOOK_PRO_RK3399=y
 CONFIG_NR_DRAM_BANKS=1
@@ -17,6 +18,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
 CONFIG_SPL_MTD_SUPPORT=y
+CONFIG_SPL_SPI_LOAD=y
 CONFIG_TPL=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_GPIO=y
@@ -32,6 +34,7 @@ CONFIG_CMD_REGULATOR=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="rk3399-pinebook-pro"
 CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ROCKCHIP_GPIO=y
 CONFIG_SYS_I2C_ROCKCHIP=y
include/configs/pinebook-pro-rk3399.h +0 -9
index d910830582..d478b19917 100644
@@ -14,15 +14,6 @@
 
 #include <configs/rk3399_common.h>
 
-#if defined(CONFIG_ENV_IS_IN_MMC)
-#define CONFIG_SYS_MMC_ENV_DEV 0
-#elif defined(CONFIG_ENV_IS_IN_SPI_FLASH)
-#define CONFIG_ENV_SECT_SIZE		(8 * 1024)
-#endif
-
-#undef CONFIG_SYS_SPI_U_BOOT_OFFS
-#define CONFIG_SYS_SPI_U_BOOT_OFFS	1024 * 512
-
 #define SDRAM_BANK_SIZE			(2UL << 30)
 
 #define CONFIG_USB_OHCI_NEW
Signature · 1 line
2.26.2
#4 lore raw

PATCH 3/3 rockchip: Pinebook Pro: Fix SPI flash and store env on it

Quoted 5 lines · Peter Robinson

Some minor fixes for SPI flash on the Pinebook Pro and also default to saving environment to the SPI flash as it's guaranteed to be on board.

Thanks,
- Kever

Quoted 71 lines
---
  arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi | 6 +++++-
  configs/pinebook-pro-rk3399_defconfig        | 3 +++
  include/configs/pinebook-pro-rk3399.h        | 9 ---------
  3 files changed, 8 insertions(+), 10 deletions(-)
arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi +5 -1
index 296321d697..ded7db0aef 100644
@@ -12,7 +12,11 @@
  	};
 
  	chosen {
-		u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
+		u-boot,spl-boot-order = "same-as-spl", &sdhci, &spiflash, &sdmmc;
+	};
+
+	config {
+		u-boot,spl-payload-offset = <0x60000>; /* @ 384KB */
  	};
  };
 
configs/pinebook-pro-rk3399_defconfig +3 -0
index 733463556a..18b2d74253 100644
@@ -1,6 +1,7 @@
  CONFIG_ARM=y
  CONFIG_ARCH_ROCKCHIP=y
  CONFIG_SYS_TEXT_BASE=0x00200000
+CONFIG_ENV_SIZE=0x8000
  CONFIG_ROCKCHIP_RK3399=y
  CONFIG_TARGET_PINEBOOK_PRO_RK3399=y
  CONFIG_NR_DRAM_BANKS=1
@@ -17,6 +18,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
  CONFIG_SPL_STACK_R=y
  CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
  CONFIG_SPL_MTD_SUPPORT=y
+CONFIG_SPL_SPI_LOAD=y
  CONFIG_TPL=y
  CONFIG_CMD_BOOTZ=y
  CONFIG_CMD_GPIO=y
@@ -32,6 +34,7 @@ CONFIG_CMD_REGULATOR=y
  CONFIG_SPL_OF_CONTROL=y
  CONFIG_DEFAULT_DEVICE_TREE="rk3399-pinebook-pro"
  CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
  CONFIG_ROCKCHIP_GPIO=y
  CONFIG_SYS_I2C_ROCKCHIP=y
include/configs/pinebook-pro-rk3399.h +0 -9
index d910830582..d478b19917 100644
@@ -14,15 +14,6 @@
 
  #include <configs/rk3399_common.h>
 
-#if defined(CONFIG_ENV_IS_IN_MMC)
-#define CONFIG_SYS_MMC_ENV_DEV 0
-#elif defined(CONFIG_ENV_IS_IN_SPI_FLASH)
-#define CONFIG_ENV_SECT_SIZE		(8 * 1024)
-#endif
-
-#undef CONFIG_SYS_SPI_U_BOOT_OFFS
-#define CONFIG_SYS_SPI_U_BOOT_OFFS	1024 * 512
-
  #define SDRAM_BANK_SIZE			(2UL << 30)
 
  #define CONFIG_USB_OHCI_NEW
#5 lore raw

PATCH 1/3 rockchip: Pinebook Pro: enable rng to provide an entropy source

In reply to Peter Robinson

W dniu 09.06.2020 o?00:50, Peter Robinson pisze:

Quoted 45 lines

Enable the rng so UEFI can provide entropy for KASLR

---
 arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi | 4 ++++
 arch/arm/dts/rk3399-rockpro64-u-boot.dtsi    | 4 ++++
 configs/pinebook-pro-rk3399_defconfig        | 2 ++
 3 files changed, 10 insertions(+)
arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi +4 -0
index 1a2e24d3ef..296321d697 100644
@@ -24,6 +24,10 @@
 	u-boot,dm-pre-reloc;
 };
 
+&rng {
+	status = "okay";
+};
+
 &sdhci {
 	max-frequency = <25000000>;
 	u-boot,dm-pre-reloc;
arch/arm/dts/rk3399-rockpro64-u-boot.dtsi +4 -0
index bac09df4a3..cb8991aa25 100644
@@ -19,6 +19,10 @@
 	};
 };
 
+&rng {
+	status = "okay";
+};
+
 &spi1 {
 	spi_flash: flash at 0 {
 		u-boot,dm-pre-reloc;
configs/pinebook-pro-rk3399_defconfig +0 -0
index 0c129b9aeb..21eecf477c 100644

configs/pinebook-pro-rk3399_defconfig CONFIG_DM_PMIC_FAN53555=y · line 61

Quoted 8 lines
configs/pinebook-pro-rk3399_defconfig +2 -0
@@ -54,6 +54,8 @@ CONFIG_DM_PMIC_FAN53555=y
 CONFIG_PMIC_RK8XX=y
 CONFIG_REGULATOR_PWM=y
 CONFIG_REGULATOR_RK8XX=y
+CONFIG_DM_RNG=y
+CONFIG_RNG_ROCKCHIP=y
 CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM_RK3399_LPDDR4=y
 CONFIG_DM_RESET=y

You enabled RNG for RockPro64 in DTS but not in config.

rockpro64-rk3399_defconfig +2 -0
index a56126b042..1953316b0c 100644
@@ -54,6 +54,8 @@ CONFIG_REGULATOR_RK8XX=y
 CONFIG_PWM_ROCKCHIP=y
 CONFIG_DM_RESET=y
 CONFIG_RAM_RK3399_LPDDR4=y
+CONFIG_DM_RNG=y
+CONFIG_RNG_ROCKCHIP=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_ROCKCHIP_SPI=y
#6 lore raw

PATCH 1/3 rockchip: Pinebook Pro: enable rng to provide an entropy source

In reply to Peter Robinson
Quoted 3 lines · Peter Robinson

Enable the rng so UEFI can provide entropy for KASLR

Thanks,
- Kever

Quoted 49 lines
---
  arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi | 4 ++++
  arch/arm/dts/rk3399-rockpro64-u-boot.dtsi    | 4 ++++
  configs/pinebook-pro-rk3399_defconfig        | 2 ++
  3 files changed, 10 insertions(+)
arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi +4 -0
index 1a2e24d3ef..296321d697 100644
@@ -24,6 +24,10 @@
  	u-boot,dm-pre-reloc;
  };
 
+&rng {
+	status = "okay";
+};
+
  &sdhci {
  	max-frequency = <25000000>;
  	u-boot,dm-pre-reloc;
arch/arm/dts/rk3399-rockpro64-u-boot.dtsi +4 -0
index bac09df4a3..cb8991aa25 100644
@@ -19,6 +19,10 @@
  	};
  };
 
+&rng {
+	status = "okay";
+};
+
  &spi1 {
  	spi_flash: flash at 0 {
  		u-boot,dm-pre-reloc;
configs/pinebook-pro-rk3399_defconfig +2 -0
index 0c129b9aeb..21eecf477c 100644
@@ -54,6 +54,8 @@ CONFIG_DM_PMIC_FAN53555=y
  CONFIG_PMIC_RK8XX=y
  CONFIG_REGULATOR_PWM=y
  CONFIG_REGULATOR_RK8XX=y
+CONFIG_DM_RNG=y
+CONFIG_RNG_ROCKCHIP=y
  CONFIG_PWM_ROCKCHIP=y
  CONFIG_RAM_RK3399_LPDDR4=y
  CONFIG_DM_RESET=y