Re: [PATCH 1/2] rockchip: rk356x: Implement checkboard() to print SoC variant

Hi Simon,

On 2024-10-19 04:00, Simon Glass wrote:

Hi Jonas,

On Fri, 18 Oct 2024 at 10:34, Jonas Karlman jonas@kwiboo.se wrote:

...

Implement checkboard() to print current SoC model, e.g. one of:

SoC: RK3566 v1 SoC: RK3566 v2 SoC: RK3566T v2 SoC: RK3568 v2 SoC: RK3568B2 v2 SoC: RK3568J v2

when U-Boot proper is started.

Information about what SoC model, variant and version is read from OTP.

Signed-off-by: Jonas Karlman jonas@kwiboo.se

arch/arm/dts/rk356x-u-boot.dtsi | 4 ++ arch/arm/mach-rockchip/rk3568/rk3568.c | 65 ++++++++++++++++++++++++++ configs/generic-rk3568_defconfig | 2 +- 3 files changed, 70 insertions(+), 1 deletion(-)

Instead of this, can you use add a CPU driver? Then it should happen automatically - see print_cpuinfo().

Unfortunately the CPU driver seem to be more related to the /cpus nodes, e.g. the arm cores included in these SoCs and not really related to the overall SoC used by the board.

This instead depend on the DISPLAY_BOARDINFO and its checkboard() as the type of SoC seem more related to the board soc target.

Regards, Jonas

...

diff --git a/arch/arm/dts/rk356x-u-boot.dtsi b/arch/arm/dts/rk356x-u-boot.dtsi index 0a0943b462a9..24a976cf7e21 100644 --- a/arch/arm/dts/rk356x-u-boot.dtsi +++ b/arch/arm/dts/rk356x-u-boot.dtsi @@ -87,6 +87,10 @@ bootph-all; };

+&otp {

•   bootph-some-ram;
  

+};

&pcfg_pull_none { bootph-all; }; diff --git a/arch/arm/mach-rockchip/rk3568/rk3568.c b/arch/arm/mach-rockchip/rk3568/rk3568.c index 768a37393290..fc4c140ab970 100644 --- a/arch/arm/mach-rockchip/rk3568/rk3568.c +++ b/arch/arm/mach-rockchip/rk3568/rk3568.c @@ -4,6 +4,7 @@ */

#include <dm.h> +#include <misc.h> #include <asm/armv8/mmu.h> #include <asm/arch-rockchip/bootrom.h> #include <asm/arch-rockchip/grf_rk3568.h> @@ -133,3 +134,67 @@ int arch_cpu_init(void) #endif return 0; }

+#define RK3568_OTP_CPU_CODE_OFFSET 0x02 +#define RK3568_OTP_SPECIFICATION_OFFSET 0x07 +#define RK3568_OTP_CPU_VERSION_OFFSET 0x08 +#define RK3568_OTP_PERFORMANCE_OFFSET 0x22

+int checkboard(void) +{

•   u8 cpu_code[2], specification, package, cpu_version, performance;
  

•   struct udevice *dev;
  

•   char suffix[3];
  

•   int ret;
  

•   ret = uclass_get_device_by_driver(UCLASS_MISC,
  

•                                     DM_DRIVER_GET(rockchip_otp), &dev);
  

•   if (ret) {
  

•           debug("%s: could not find otp device, ret=%d\n", __func__, ret);
  

•           return 0;
  

•   }
  

•   /* cpu-code: SoC model, 0x35 0x66 or 0x35 0x68 */
  

•   ret = misc_read(dev, RK3568_OTP_CPU_CODE_OFFSET, cpu_code, 2);
  

•   if (ret < 0) {
  

•           debug("%s: could not read cpu-code, ret=%d\n", __func__, ret);
  

•           return 0;
  

•   }
  

•   /* specification: SoC variant, 0x2 for RK3568B2 and 0xA for RK3568J */
  

•   ret = misc_read(dev, RK3568_OTP_SPECIFICATION_OFFSET, &specification, 1);
  

•   if (ret < 0) {
  

•           debug("%s: could not read specification, ret=%d\n", __func__, ret);
  

•           return 0;
  

•   }
  

•   /* package: likely SoC variant revision, 0x2 for RK3568B2 */
  

•   package = specification >> 5;
  

•   specification &= 0x1f;
  

•   /* cpu-version: chip version, e.g. second letter of lot number */
  

•   ret = misc_read(dev, RK3568_OTP_CPU_VERSION_OFFSET, &cpu_version, 1);
  

•   if (ret < 0) {
  

•           debug("%s: could not read cpu-version, ret=%d\n", __func__, ret);
  

•           return 0;
  

•   }
  

•   cpu_version >>= 3;
  

•   cpu_version &= 0x7;
  

•   /* performance: used to identify RK3566T SoC variant */
  

•   ret = misc_read(dev, RK3568_OTP_PERFORMANCE_OFFSET, &performance, 1);
  

•   if (ret < 0) {
  

•           debug("%s: could not read performance, ret=%d\n", __func__, ret);
  

•           return 0;
  

•   }
  

•   if (performance & 0x0f)
  

•           specification = 0x14; /* T-variant */
  

•   suffix[0] = specification > 1 ? '@' + specification : 0;
  

•   suffix[1] = package > 1 ? '0' + package : 0;
  

•   suffix[2] = 0;
  

•   printf("SoC:   RK%02x%02x%s v%u\n",
  

•          cpu_code[0], cpu_code[1], suffix, cpu_version);
  

•   return 0;
  

+} diff --git a/configs/generic-rk3568_defconfig b/configs/generic-rk3568_defconfig index 1d06f3411fe0..f79f0e84400b 100644 --- a/configs/generic-rk3568_defconfig +++ b/configs/generic-rk3568_defconfig @@ -22,7 +22,6 @@ CONFIG_SPL_LOAD_FIT=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3568-generic.dtb" # CONFIG_DISPLAY_CPUINFO is not set -CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000 # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set @@ -31,6 +30,7 @@ CONFIG_SYS_SPI_U_BOOT_OFFS=0x60000 CONFIG_SPL_ATF=y CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=y +CONFIG_CMD_MISC=y CONFIG_CMD_MMC=y CONFIG_CMD_ROCKUSB=y CONFIG_CMD_USB_MASS_STORAGE=y -- 2.46.2

Regards, Simon