回复: [PATCH V1] arm: add initial support for the Phytium Pomelo Board
Nicholas zheng
Nicholas_zheng at outlook.com
Thu Aug 12 05:44:22 CEST 2021
Is this structure describing some hardware register layout? Or some
interface with the firmware?
Then please use explicit types: uint8_t, uint16_t, ...
I want to use uint8_t,but checkpatch.pl showed “Prefer kernel type 'u8' over 'uint8_t'”.So I don't know which is better.
Thanks.
________________________________
发件人: Andre Przywara <andre.przywara at arm.com>
发送时间: 2021年7月23日 19:03
收件人: nicholas_zheng at outlook.com <nicholas_zheng at outlook.com>
抄送: trini at konsulko.com <trini at konsulko.com>; bharat.gooty at broadcom.com <bharat.gooty at broadcom.com>; rayagonda.kokatanur at broadcom.com <rayagonda.kokatanur at broadcom.com>; jagan at amarulasolutions.com <jagan at amarulasolutions.com>; festevam at gmail.com <festevam at gmail.com>; patrick.delaunay at foss.st.com <patrick.delaunay at foss.st.com>; tharvey at gateworks.com <tharvey at gateworks.com>; pbrobinson at gmail.com <pbrobinson at gmail.com>; hs at denx.de <hs at denx.de>; lokeshvutla at ti.com <lokeshvutla at ti.com>; d-gerlach at ti.com <d-gerlach at ti.com>; u-boot at lists.denx.de <u-boot at lists.denx.de>; robh+dt at kernel.org <robh+dt at kernel.org>
主题: Re: [PATCH V1] arm: add initial support for the Phytium Pomelo Board
On Mon, 19 Jul 2021 17:46:41 +0800
nicholas_zheng at outlook.com wrote:
Hi,
as Peter already mentioned, this should be [PATCH v2], the next
version [PATCH v3], and so on. And please don't resend the same email
(and they are identical, I diffed them) without any comments as to why.
If you want to ping people, reply to your own email.
Now for the technical part:
> From: weichangzheng <nicholas_zheng at outlook.com>
>
> This adds platform code and the device tree for the Phytium Pomelo Board.
> The initial support comprises the UART and the PCIE.
>
> Signed-off-by: weichangzheng <nicholas_zheng at outlook.com>
> Changes since v1:
> - updated to DT
> ---
> arch/arm/Kconfig | 8 ++
> arch/arm/dts/Makefile | 1 +
> arch/arm/dts/phytium-pomelo.dts | 113 +++++++++++++++++++++
> board/phytium/pomelo/Kconfig | 12 +++
> board/phytium/pomelo/MAINTAINERS | 8 ++
> board/phytium/pomelo/Makefile | 14 +++
> board/phytium/pomelo/cpu.h | 73 ++++++++++++++
> board/phytium/pomelo/ddr.c | 164 +++++++++++++++++++++++++++++++
> board/phytium/pomelo/pcie.c | 61 ++++++++++++
> board/phytium/pomelo/pll.c | 75 ++++++++++++++
> board/phytium/pomelo/pomelo.c | 120 ++++++++++++++++++++++
> board/phytium/pomelo/sec.c | 40 ++++++++
> configs/pomelo_defconfig | 36 +++++++
> include/configs/pomelo.h | 45 +++++++++
> 14 files changed, 770 insertions(+)
> create mode 100644 arch/arm/dts/phytium-pomelo.dts
> create mode 100644 board/phytium/pomelo/Kconfig
> create mode 100644 board/phytium/pomelo/MAINTAINERS
> create mode 100644 board/phytium/pomelo/Makefile
> create mode 100644 board/phytium/pomelo/cpu.h
> create mode 100644 board/phytium/pomelo/ddr.c
> create mode 100644 board/phytium/pomelo/pcie.c
> create mode 100644 board/phytium/pomelo/pll.c
> create mode 100644 board/phytium/pomelo/pomelo.c
> create mode 100644 board/phytium/pomelo/sec.c
> create mode 100644 configs/pomelo_defconfig
> create mode 100644 include/configs/pomelo.h
>
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 0448787b8b..0afbb86640 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -1818,6 +1818,13 @@ config TARGET_DURIAN
> Support for durian platform.
> It has 2GB Sdram, uart and pcie.
>
> +config TARGET_POMELO
> + bool "Support Phytium Pomelo Platform"
> + select ARM64
You should use this stanza here to select more of U-Boot features (see
below).
> + help
> + Support for pomelo platform.
> + It has 2GB Sdram, uart and pcie.
> +
> config TARGET_PRESIDIO_ASIC
> bool "Support Cortina Presidio ASIC Platform"
> select ARM64
> @@ -2038,6 +2045,7 @@ source "board/toradex/colibri_pxa270/Kconfig"
> source "board/variscite/dart_6ul/Kconfig"
> source "board/vscom/baltos/Kconfig"
> source "board/phytium/durian/Kconfig"
> +source "board/phytium/pomelo/Kconfig"
> source "board/xen/xenguest_arm64/Kconfig"
> source "board/keymile/Kconfig"
>
> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index 9fb38682e6..45d0340bd3 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -1107,6 +1107,7 @@ dtb-$(CONFIG_TARGET_MX53PPD) += imx53-ppd.dtb
> dtb-$(CONFIG_TARGET_TOTAL_COMPUTE) += total_compute.dtb
>
> dtb-$(CONFIG_TARGET_DURIAN) += phytium-durian.dtb
> +dtb-$(CONFIG_TARGET_POMELO) += phytium-pomelo.dtb
>
> dtb-$(CONFIG_TARGET_PRESIDIO_ASIC) += ca-presidio-engboard.dtb
>
> diff --git a/arch/arm/dts/phytium-pomelo.dts b/arch/arm/dts/phytium-pomelo.dts
> new file mode 100644
> index 0000000000..3869475902
> --- /dev/null
> +++ b/arch/arm/dts/phytium-pomelo.dts
> @@ -0,0 +1,113 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * dts file for Phytium Pomelo board
> + * Copyright (C) 2021, Phytium Ltd.
> + * lixinde <lixinde at phytium.com.cn>
> + * weichangzheng <weichangzheng at phytium.com.cn>
> + */
> +/dts-v1/;
> +
> +/ {
> + model = "Phytium Pomelo";
> + compatible = "phytium,pomelo";
> + #address-cells = <2>;
> + #size-cells = <2>;
> +
> + aliases {
> + serial0 = &uart0;
> + };
> +
> + cpus {
> + #address-cells = <0x2>;
> + #size-cells = <0x0>;
> +
> + cpu0: cpu at 0 {
> + device_type = "cpu";
> + compatible = "arm,armv8";
> + reg = <0x0 0x0>;
> + enable-method = "psci";
> + numa-node-id = <0>;
> + };
> +
> + cpu1: cpu at 1 {
> + device_type = "cpu";
> + compatible = "arm,armv8";
> + reg = <0x0 0x1>;
> + enable-method = "psci";
> + numa-node-id = <0>;
> + };
> +
> + cpu2: cpu at 4 {
> + device_type = "cpu";
> + compatible = "arm,armv8";
> + reg = <0x0 0x100>;
> + enable-method = "psci";
> + numa-node-id = <0>;
> + };
> +
> + cpu3: cpu at 5 {
> + device_type = "cpu";
> + compatible = "arm,armv8";
> + reg = <0x0 0x101>;
> + enable-method = "psci";
> + numa-node-id = <0>;
> + };
> +
> + cpu4: cpu at 8 {
> + device_type = "cpu";
> + compatible = "arm,armv8";
> + reg = <0x0 0x200>;
> + enable-method = "psci";
> + numa-node-id = <0>;
> + };
> +
> + cpu5: cpu at 9 {
> + device_type = "cpu";
> + compatible = "arm,armv8";
> + reg = <0x0 0x201>;
> + enable-method = "psci";
> + numa-node-id = <0>;
> + };
> +
> + cpu6: cpu at 12 {
> + device_type = "cpu";
> + compatible = "arm,armv8";
> + reg = <0x0 0x300>;
> + enable-method = "psci";
> + numa-node-id = <0>;
> + };
> +
> + cpu7: cpu at 13 {
> + device_type = "cpu";
> + compatible = "arm,armv8";
> + reg = <0x0 0x301>;
> + enable-method = "psci";
> + numa-node-id = <0>;
> + };
> + };
> +
> + pcie-controller at 40000000 {
> + compatible = "pci-host-ecam-generic";
> + device_type = "pci";
> + #address-cells = <3>;
> + #size-cells = <2>;
> + reg = <0x0 0x40000000 0x0 0x10000000>;
> + bus-range = <0x0 0xff>;
> + ranges = <0x01000000 0x00 0x00000000 0x0 0x50000000 0x0 0x00F00000>,
> + <0x02000000 0x00 0x58000000 0x0 0x58000000 0x0 0x28000000>,
> + <0x43000000 0x10 0x00000000 0x10 0x00000000 0x10 0x00000000>;
> + };
> +
> + sysclk_48mhz: clk48mhz {
> + compatible = "fixed-clock";
> + #clock-cells = <0x0>;
> + clock-frequency = <48000000>;
> + clock-output-names = "sysclk_48mhz";
> + };
> +
> + uart0: uart at 28001000 {
> + compatible = "arm,pl011";
> + reg = <0x0 0x28001000 0x0 0x1000>;
> + clocks = <&sysclk_48mhz>;
> + };
> +};
> diff --git a/board/phytium/pomelo/Kconfig b/board/phytium/pomelo/Kconfig
> new file mode 100644
> index 0000000000..281aa8feff
> --- /dev/null
> +++ b/board/phytium/pomelo/Kconfig
> @@ -0,0 +1,12 @@
> +if TARGET_POMELO
> +
> +config SYS_BOARD
> + default "pomelo"
> +
> +config SYS_VENDOR
> + default "phytium"
> +
> +config SYS_CONFIG_NAME
> + default "pomelo"
> +
> +endif
> diff --git a/board/phytium/pomelo/MAINTAINERS b/board/phytium/pomelo/MAINTAINERS
> new file mode 100644
> index 0000000000..950449392b
> --- /dev/null
> +++ b/board/phytium/pomelo/MAINTAINERS
> @@ -0,0 +1,8 @@
> +POMELO BOARD
> +M: lixinde <lixinde at phytium.com.cn>
> +M: weichangzheng <weichangzheng at phytium.com.cn>
> +S: Maintained
> +F: board/phytium/pomelo/*
> +F: include/configs/pomelo.h
> +F: configs/pomelo_defconfig
> +
> diff --git a/board/phytium/pomelo/Makefile b/board/phytium/pomelo/Makefile
> new file mode 100644
> index 0000000000..b9cb3609bd
> --- /dev/null
> +++ b/board/phytium/pomelo/Makefile
> @@ -0,0 +1,14 @@
> +# SPDX-License-Identifier: GPL-2.0+
> +#
> +# Copyright (C) 2021
> +# lixinde <lixinde at phytium.com.cn>
> +# weichangzheng <weichangzheng at phytium.com.cn>
> +#
> +
> +obj-y += pomelo.o
> +obj-y += pll.o
> +obj-y += pcie.o
> +obj-y += ddr.o
> +obj-y += sec.o
> +
> +
> diff --git a/board/phytium/pomelo/cpu.h b/board/phytium/pomelo/cpu.h
> new file mode 100644
> index 0000000000..e15917609b
> --- /dev/null
> +++ b/board/phytium/pomelo/cpu.h
> @@ -0,0 +1,73 @@
> +/* SPDX-License-Identifier: GPL-2.0+ */
> +/*
> + * (C) Copyright 2021
> + * Phytium Technology Ltd <www.phytium.com<http://www.phytium.com>>
> + * lixinde <lixinde at phytium.com.cn>
> + * weichangzheng <weichangzheng at phytium.com.cn>
> + */
> +
> +#ifndef _FT_POMELO_H
> +#define _FT_POMELO_H
> +
> +/* SMCCC ID */
> +#define CPU_SVC_VERSION 0xC2000F00
> +#define CPU_GET_RST_SOURCE 0xC2000F01
> +#define CPU_INIT_PLL 0xC2000F02
> +#define CPU_INIT_PCIE 0xC2000F03
> +#define CPU_INIT_MEM 0xC2000F04
> +#define CPU_INIT_SEC_SVC 0xC2000F05
> +
> +/*CPU RESET*/
> +#define CPU_RESET_POWER_ON 0x1
> +#define CPU_RESET_PLL 0x4
> +#define CPU_RESET_WATCH_DOG 0x8
> +
> +/* PLL */
> +#define PARAMETER_PLL_MAGIC 0x54460010
> +
> +/* PCIE */
> +#define PARAMETER_PCIE_MAGIC 0x54460011
> +#define CONFIG_INDEPENDENT_TREE 0x0
> +#define PCI_PEU0 0x1
> +#define PCI_PEU1 0x1
> +#define PEU1_OFFSET 16
> +#define PEU_C_OFFSET_MODE 16
> +#define PEU_C_OFFSET_SPEED 0
> +#define RC_MODE 0x1
> +#define X8X8 0x1
> +#define GEN3 3
> +
> +/* DDR */
> +#define PARAMETER_MCU_MAGIC 0x54460014
> +#define PARAM_MCU_VERSION 0x1
> +#define PARAM_MCU_SIZE 0x100
> +#define PARAM_CH_ENABLE 0x3
> +#define PARAM_ECC_ENABLE 0x3
> +#define PARAM_FORCE_SPD_DISABLE 0x0
> +#define PARAM_MCU_MISC_ENABLE 0x0
> +
> +#define UDIMM_TYPE 0x2
> +#define DIMM_X8 0x1
> +#define NO_MIRROR 0x0
> +#define NO_ECC_TYPE 0
> +#define DDR4_TYPE 0xC
> +
> +/* SEC */
> +#define PARAMETER_COMMON_MAGIC 0x54460013
> +
> +/* FLUSH L3 CASHE */
> +#define HNF_COUNT 0x8
> +#define HNF_PSTATE_REQ (HNF_BASE + 0x10)
> +#define HNF_PSTATE_STAT (HNF_BASE + 0x18)
> +#define HNF_PSTATE_OFF 0x0
> +#define HNF_PSTATE_SFONLY 0x1
> +#define HNF_PSTATE_HALF 0x2
> +#define HNF_PSTATE_FULL 0x3
> +#define HNF_STRIDE 0x10000
> +#define HNF_BASE (unsigned long)(0x3A200000)
> +void ddr_init(void);
> +void sec_init(void);
> +void check_reset(void);
> +void pcie_init(void);
> +
> +#endif /* _FT_POMELO_H */
> diff --git a/board/phytium/pomelo/ddr.c b/board/phytium/pomelo/ddr.c
> new file mode 100644
> index 0000000000..88756f5fc1
> --- /dev/null
> +++ b/board/phytium/pomelo/ddr.c
> @@ -0,0 +1,164 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Copyright (C) 2021
> + * lixinde <lixinde at phytium.com.cn>
> + * weichangzheng <weichangzheng at phytium.com.cn>
> + */
> +
> +#include <stdio.h>
> +#include <linux/arm-smccc.h>
> +#include "cpu.h"
> +
> +struct ddr_spd {
Is this structure describing some hardware register layout? Or some
interface with the firmware?
Then please use explicit types: uint8_t, uint16_t, ...
> + /******************* read from spd *****************/
> + unsigned char dimm_type; /* 1: RDIMM;2: UDIMM;3: SODIMM;4: LRDIMM */
> + unsigned char data_width; /* 0: x4; 1: x8; 2: x16 */
> + unsigned char mirror_type; /* 0: stardard; 1: mirror */
> + unsigned char ecc_type; /* 0: no-ecc; 1:ecc */
> + unsigned char dram_type; /* 0xB: DDR3; 0xC: DDR4 */
> + unsigned char rank_num;
> + unsigned char row_num;
> + unsigned char col_num;
> +
> + unsigned char bg_num; /*only DDR4*/
> + unsigned char bank_num;
> + unsigned short int module_manufacturer_id;
> + unsigned short int taamin;
> + unsigned short int trcdmin;
> +
> + unsigned short int trpmin;
> + unsigned short int trasmin;
> + unsigned short int trcmin;
> + unsigned short int tfawmin;
> +
> + unsigned short int trrd_smin; /*only DDR4*/
> + unsigned short int trrd_lmin; /*only DDR4*/
> + unsigned short int tccd_lmin; /*only DDR4*/
> + unsigned short int twrmin;
> +
> + unsigned short int twtr_smin; /*only DDR4*/
> + unsigned short int twtr_lmin; /*only DDR4*/
> + unsigned short int twtrmin; /*only DDR3*/
> + unsigned short int trrdmin; /*only DDR3*/
> +
> + /******************* RCD control words *****************/
> + unsigned char f0rc03; /*bit[3:2]:CS bit[1:0]:CA */
> + unsigned char f0rc04; /*bit[3:2]:ODT bit[1:0]:CKE */
> + unsigned char f0rc05; /*bit[3:2]:CLK-A side bit[1:0]:CLK-B side */
> + unsigned char bc00;
> + unsigned char bc01;
> + unsigned char bc02;
> + unsigned char bc03;
> + unsigned char bc04;
> +
> + unsigned char bc05;
> + unsigned char f5bc5x;
> + unsigned char f5bc6x;
> + /******************* LRDIMM special *****************/
> + unsigned char vrefdq_pr0;
> + unsigned char vrefdq_mdram;
> + unsigned char rtt_mdram_1866;
> + unsigned char rtt_mdram_2400;
> + unsigned char rtt_mdram_3200;
> +
> + unsigned char drive_dram;
> + unsigned char odt_dram_1866;
> + unsigned char odt_dram_2400;
> + unsigned char odt_dram_3200;
> + unsigned char park_dram_1866;
> + unsigned char park_dram_2400;
> + unsigned char park_dram_3200;
> + unsigned char rcd_num;
> +} __attribute((aligned(4)));
Don't you need a "packed" here as well?
> +
> +struct mcu_config {
Same comment about explicit types and packed here and for the other
structs below.
> + unsigned int magic;
> + unsigned int version;
> + unsigned int size;
> + unsigned char rev1[4];
> +
> + unsigned char ch_enable;
> + unsigned char misc1_enable;
> + unsigned char misc2_enable;
> + unsigned char force_spd_enable;
> + unsigned char misc3_enable;
> + unsigned char train_debug;
> + unsigned char train_recover;
> + unsigned char rev2[9];
> +
> + struct ddr_spd ddr_spd_info[2];
> +} __attribute((aligned(4)));
> +
> +static void get_mcu_up_info_default(struct mcu_config *pm)
> +{
> + pm->magic = PARAMETER_MCU_MAGIC;
> + pm->version = PARAM_MCU_VERSION;
> + pm->size = PARAM_MCU_SIZE;
> + pm->ch_enable = PARAM_CH_ENABLE;
> + pm->misc1_enable = PARAM_ECC_ENABLE;
> + pm->force_spd_enable = PARAM_FORCE_SPD_DISABLE;
> + pm->misc3_enable = PARAM_MCU_MISC_ENABLE;
> + pm->train_recover = 0x0;
> +}
> +
> +static unsigned char init_dimm_param(unsigned char ch, struct mcu_config *pm)
> +{
> + printf("manual config dimm info...\n");
> + pm->ddr_spd_info[ch].dimm_type = UDIMM_TYPE;
> + pm->ddr_spd_info[ch].data_width = DIMM_X8;
> + pm->ddr_spd_info[ch].mirror_type = NO_MIRROR;
> + pm->ddr_spd_info[ch].ecc_type = NO_ECC_TYPE;
> + pm->ddr_spd_info[ch].dram_type = DDR4_TYPE;
> + pm->ddr_spd_info[ch].rank_num = 1;
> + pm->ddr_spd_info[ch].row_num = 16;
> + pm->ddr_spd_info[ch].col_num = 10;
> + pm->ddr_spd_info[ch].bg_num = 4;
> + pm->ddr_spd_info[ch].bank_num = 4;
> + pm->ddr_spd_info[ch].taamin = 13750;
> + pm->ddr_spd_info[ch].trcdmin = 13750;
> +
> + pm->ddr_spd_info[ch].trpmin = 13750;
> + pm->ddr_spd_info[ch].trasmin = 32000;
> + pm->ddr_spd_info[ch].trcmin = 45750;
> + pm->ddr_spd_info[ch].tfawmin = 21000;
> +
> + pm->ddr_spd_info[ch].trrd_smin = 3000;
> + pm->ddr_spd_info[ch].trrd_lmin = 4900;
> + pm->ddr_spd_info[ch].tccd_lmin = 5000;
> + pm->ddr_spd_info[ch].twrmin = 15000;
> +
> + pm->ddr_spd_info[ch].twtr_smin = 2500;
> + pm->ddr_spd_info[ch].twtr_lmin = 7500;
> +
> + return 0;
> +}
> +
> +void get_default_mcu_info(unsigned char *data)
> +{
> + get_mcu_up_info_default((struct mcu_config *)data);
> +}
> +
> +void fix_mcu_info(unsigned char *data)
> +{
> + unsigned char ch;
> + struct mcu_config *mcu_info = (struct mcu_config *)data;
> +
> + for (ch = 0; ch < 2; ch++)
> + init_dimm_param(ch, mcu_info);
> +}
> +
> +void ddr_init(void)
> +{
> + unsigned char buffer[0x100];
> + struct arm_smccc_res res;
> +
> + get_default_mcu_info(buffer);
> + fix_mcu_info(buffer);
> +
> + arm_smccc_smc(CPU_INIT_MEM, 0, (u64)buffer, 0, 0, 0, 0, 0, &res);
> + if (res.a0 != 0) {
> + printf("error x0: 0x%lx, x1: 0x%lx\n", res.a0, res.a1);
> + while (true)
> + ;
I think we have panic() for this?
> + }
> +}
> diff --git a/board/phytium/pomelo/pcie.c b/board/phytium/pomelo/pcie.c
> new file mode 100644
> index 0000000000..3754d8eb9b
> --- /dev/null
> +++ b/board/phytium/pomelo/pcie.c
> @@ -0,0 +1,61 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Copyright (C) 2021
> + * lixinde <lixinde at phytium.com.cn>
> + * weichangzheng <weichangzheng at phytium.com.cn>
> + */
> +
> +#include <stdio.h>
> +#include <string.h>
> +#include <linux/arm-smccc.h>
> +#include "cpu.h"
> +
> +struct pcu_ctr {
> + unsigned int base_config[3];
> + unsigned int equalization[3];
> + unsigned char rev[80];
> +} __attribute((aligned(4)));
> +
> +struct pcu_config {
> + unsigned int magic;
> + unsigned int version;
> + unsigned int size;
> + unsigned char rev1[4];
> + unsigned int independent_tree;
> + unsigned int base_cfg;
> + unsigned char rev2[16];
> + struct pcu_ctr ctr_cfg[2];
> +} __attribute((aligned(4)));
> +
> +struct pcu_config const peu_base_info = {
> + .magic = PARAMETER_PCIE_MAGIC,
> + .version = 0x2,
> + .size = 0x100,
> + .independent_tree = CONFIG_INDEPENDENT_TREE,
> + .base_cfg = ((PCI_PEU1 | (X8X8 << 1)) << PEU1_OFFSET | (PCI_PEU0 | (X8X8 << 1))),
> + .ctr_cfg[0].base_config[0] = (RC_MODE << PEU_C_OFFSET_MODE) | (GEN3 << PEU_C_OFFSET_SPEED),
> + .ctr_cfg[0].base_config[1] = (RC_MODE << PEU_C_OFFSET_MODE) | (GEN3 << PEU_C_OFFSET_SPEED),
> + .ctr_cfg[0].base_config[2] = (RC_MODE << PEU_C_OFFSET_MODE) | (GEN3 << PEU_C_OFFSET_SPEED),
> + .ctr_cfg[1].base_config[0] = (RC_MODE << PEU_C_OFFSET_MODE) | (GEN3 << PEU_C_OFFSET_SPEED),
> + .ctr_cfg[1].base_config[1] = (RC_MODE << PEU_C_OFFSET_MODE) | (GEN3 << PEU_C_OFFSET_SPEED),
> + .ctr_cfg[1].base_config[2] = (RC_MODE << PEU_C_OFFSET_MODE) | (GEN3 << PEU_C_OFFSET_SPEED),
> + .ctr_cfg[0].equalization[0] = 0x7,
> + .ctr_cfg[0].equalization[1] = 0x7,
> + .ctr_cfg[0].equalization[2] = 0x7,
> + .ctr_cfg[1].equalization[0] = 0x7,
> + .ctr_cfg[1].equalization[1] = 0x7,
> + .ctr_cfg[1].equalization[2] = 0x7,
> +};
> +
> +void pcie_init(void)
> +{
> + unsigned char buffer[0x100];
> + struct arm_smccc_res res;
> +
> + memcpy(buffer, &peu_base_info, sizeof(peu_base_info));
> + arm_smccc_smc(CPU_INIT_PCIE, 0, (u64)buffer, 0, 0, 0, 0, 0, &res);
> + if (res.a0 != 0) {
> + while (true)
> + ;
Please use panic() and say why you are hanging here. Same for the other
hang loops below.
> + }
> +}
> diff --git a/board/phytium/pomelo/pll.c b/board/phytium/pomelo/pll.c
> new file mode 100644
> index 0000000000..1227b7dd80
> --- /dev/null
> +++ b/board/phytium/pomelo/pll.c
> @@ -0,0 +1,75 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Copyright (C) 2021
> + * lixinde <lixinde at phytium.com.cn>
> + * weichangzheng <weichangzheng at phytium.com.cn>
> + */
> +
> +#include <stdio.h>
> +#include <string.h>
> +#include <asm/io.h>
> +#include <linux/arm-smccc.h>
> +#include "cpu.h"
> +
> +struct pll_config {
> + unsigned int magic;
> + unsigned int version;
> + unsigned int size;
> + unsigned char rev1[4];
> + unsigned int core_pll;
> + unsigned int res1;
> + unsigned int lmu_pll;
> + unsigned int res2;
> + unsigned int res3;
> + unsigned int res4;
> + unsigned int res5;
> +} __attribute((aligned(4)));
> +
> +struct pll_config const pll_base_info = {
> + .magic = PARAMETER_PLL_MAGIC,
> + .version = 0x1,
> + .size = 0x30,
> + .core_pll = 2300, /*MHz*/
> + .lmu_pll = 667, /*MHz*/
> +};
> +
> +unsigned int get_reset_source(void)
> +{
> + struct arm_smccc_res res;
> +
> + arm_smccc_smc(CPU_GET_RST_SOURCE, 0, 0, 0, 0, 0, 0, 0, &res);
> + return res.a0;
> +}
> +
> +void pll_init(void)
> +{
> + unsigned char buffer[0x100];
> + struct arm_smccc_res res;
> +
> + memcpy(buffer, &pll_base_info, sizeof(pll_base_info));
> + arm_smccc_smc(CPU_INIT_PLL, 0, (u64)buffer, 0, 0, 0, 0, 0, &res);
> + if (res.a0 != 0) {
> + while (true)
> + ;
> + }
> +}
> +
> +void check_reset(void)
> +{
> + unsigned int rst;
> +
> + rst = get_reset_source();
> +
> + switch (rst) {
> + case CPU_RESET_POWER_ON:
> + pll_init();
> + break;
> + case CPU_RESET_PLL:
> + break;
> + case CPU_RESET_WATCH_DOG:
> + break;
> + default:
> + while (true)
> + ;
> + }
> +}
> diff --git a/board/phytium/pomelo/pomelo.c b/board/phytium/pomelo/pomelo.c
> new file mode 100644
> index 0000000000..693e891d20
> --- /dev/null
> +++ b/board/phytium/pomelo/pomelo.c
> @@ -0,0 +1,120 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Copyright (C) 2021
> + * lixinde <lixinde at phytium.com.cn>
> + * weichangzheng <weichangzheng at phytium.com.cn>
> + */
> +
> +#include <stdio.h>
> +#include <command.h>
> +#include <init.h>
> +#include <asm/armv8/mmu.h>
> +#include <asm/io.h>
> +#include <linux/arm-smccc.h>
> +#include <scsi.h>
> +#include "cpu.h"
> +
> +DECLARE_GLOBAL_DATA_PTR;
> +
> +int dram_init(void)
> +{
> + gd->mem_clk = 0;
> + gd->ram_size = PHYS_SDRAM_1_SIZE;
> +
> + printf("Phytium ddr init\n");
> +
> + ddr_init();
> + sec_init();
> + printf("PBF relocate done\n");
Are those messages really helpful for the normal user? Should they be
using debug() instead?
> +
> + return 0;
> +}
> +
> +int board_init(void)
> +{
> + return 0;
> +}
> +
> +void reset_cpu(void)
> +{
> + struct arm_smccc_res res;
> +
> + printf("run in reset cpu\n");
Same here, debug().
> + arm_smccc_smc(0x84000009, 0, 0, 0, 0, 0, 0, 0, &res);
> + printf("reset cpu error, %lx\n", res.a0);
This should be a panic(), I guess?
> +}
> +
> +int mach_cpu_init(void)
> +{
> + check_reset();
> + return 0;
> +}
> +
> +int board_early_init_f(void)
> +{
> + pcie_init();
> + return 0;
> +}
> +
> +int board_early_init_r(void)
> +{
> + return 0;
> +}
> +
> +static struct mm_region pomelo_mem_map[] = {
> + {
> + .virt = 0x0UL,
> + .phys = 0x0UL,
> + .size = 0x80000000UL,
> + .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
> + PTE_BLOCK_NON_SHARE |
> + PTE_BLOCK_PXN |
> + PTE_BLOCK_UXN
> + },
> + {
> + .virt = (u64)PHYS_SDRAM_1,
> + .phys = (u64)PHYS_SDRAM_1,
> + .size = (u64)PHYS_SDRAM_1_SIZE,
> + .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
> + PTE_BLOCK_NS |
> + PTE_BLOCK_INNER_SHARE
> + },
> + {
> + 0,
> + }
> +};
> +
> +struct mm_region *mem_map = pomelo_mem_map;
> +
> +int __asm_flush_l3_dcache(void)
> +{
> + int i, pstate;
> +
> + for (i = 0; i < HNF_COUNT; i++)
> + writeq(HNF_PSTATE_SFONLY, HNF_PSTATE_REQ + i * HNF_STRIDE);
> + for (i = 0; i < HNF_COUNT; i++) {
> + do {
> + pstate = readq(HNF_PSTATE_STAT + i * HNF_STRIDE);
> + } while ((pstate & 0xf) != (HNF_PSTATE_SFONLY << 2));
> + }
> +
> + for (i = 0; i < HNF_COUNT; i++)
> + writeq(HNF_PSTATE_FULL, HNF_PSTATE_REQ + i * HNF_STRIDE);
> +
> + return 0;
> +}
> +
> +int last_stage_init(void)
> +{
> + int ret;
> +
> + /* pci e */
> + pci_init();
> + /* scsi scan */
> + ret = scsi_scan(true);
> + if (ret) {
> + printf("scsi scan failed\n");
> + return CMD_RET_FAILURE;
> + }
> + return ret;
> +}
> diff --git a/board/phytium/pomelo/sec.c b/board/phytium/pomelo/sec.c
> new file mode 100644
> index 0000000000..8ec0fa797b
> --- /dev/null
> +++ b/board/phytium/pomelo/sec.c
> @@ -0,0 +1,40 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Copyright (C) 2021
> + * lixinde <lixinde at phytium.com.cn>
> + * weichangzheng <weichangzheng at phytium.com.cn>
> + */
> +
> +#include <stdio.h>
> +#include <string.h>
> +#include <linux/arm-smccc.h>
> +#include "cpu.h"
> +
> +struct common_config {
> + unsigned int magic;
> + unsigned int version;
> + unsigned int size;
> + unsigned char rev1[4];
> + unsigned long long core_bit_map;
> +} __attribute((aligned(4)));
> +
> +struct common_config const common_base_info = {
> + .magic = PARAMETER_COMMON_MAGIC,
> + .version = 0x1,
> + .core_bit_map = 0x3333,
> +};
> +
> +void sec_init(void)
> +{
> + unsigned char buffer[0x100];
> + struct arm_smccc_res res;
> +
> + memcpy(buffer, &common_base_info, sizeof(common_base_info));
> + arm_smccc_smc(CPU_INIT_SEC_SVC, 0, (u64)buffer, 0, 0, 0, 0, 0, &res);
> +
> + if (res.a0 != 0) {
> + printf("error ret %lx\n", res.a0);
> + while (true)
> + ;
> + }
> +}
> diff --git a/configs/pomelo_defconfig b/configs/pomelo_defconfig
> new file mode 100644
> index 0000000000..3e6c18196d
> --- /dev/null
> +++ b/configs/pomelo_defconfig
> @@ -0,0 +1,36 @@
> +CONFIG_ARM=y
> +CONFIG_ARM_SMCCC=y
> +CONFIG_TARGET_POMELO=y
> +CONFIG_SYS_TEXT_BASE=0x180000
> +CONFIG_NR_DRAM_BANKS=1
> +CONFIG_ENV_SIZE=0x1000
That looks pretty tight, also the environment is nowhere? Can't you use
CONFIG_ENV_IS_IN_FAT to allow storing it in the ESP?
> +# CONFIG_PSCI_RESET is not set
why not?
> +CONFIG_DEFAULT_DEVICE_TREE="phytium-pomelo"
> +CONFIG_AHCI=y
> +CONFIG_DISTRO_DEFAULTS=y
> +CONFIG_USE_BOOTARGS=y
> +CONFIG_BOOTARGS="console=ttyAMA0,115200 earlycon=pl011,0x28001000 root=/dev/sda2 rw"
> +# CONFIG_DISPLAY_CPUINFO is not set
> +# CONFIG_DISPLAY_BOARDINFO is not set
> +CONFIG_LAST_STAGE_INIT=y
> +CONFIG_SYS_PROMPT="pomelo#"
> +# CONFIG_CMD_LZMADEC is not set
> +# CONFIG_CMD_UNZIP is not set
why are those disabled? You can define KERNEL_COMP_ADDR_R and
KERNEL_COMP_SIZE to get automatic decompression with booti.
> +CONFIG_CMD_PCI=y
> +CONFIG_OF_CONTROL=y
> +CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> +# CONFIG_NET is not set
> +CONFIG_DM=y
> +CONFIG_SCSI_AHCI=y
> +CONFIG_AHCI_PCI=y
> +CONFIG_BLK=y
> +# CONFIG_MMC is not set
> +CONFIG_PCI=y
> +CONFIG_DM_PCI=y
> +CONFIG_DM_PCI_COMPAT=y
> +CONFIG_PCI_PHYTIUM=y
> +CONFIG_PCIE_ECAM_GENERIC=y
> +CONFIG_SCSI=y
> +CONFIG_DM_SCSI=y
> +CONFIG_DM_SERIAL=y
> +CONFIG_PL01X_SERIAL=y
Please move all those *platform* (but not board) specific definitions
into the Kconfig part mentioned above.
> diff --git a/include/configs/pomelo.h b/include/configs/pomelo.h
> new file mode 100644
> index 0000000000..69c4195d86
> --- /dev/null
> +++ b/include/configs/pomelo.h
> @@ -0,0 +1,45 @@
> +/* SPDX-License-Identifier: GPL-2.0+ */
> +/*
> + * Copyright (C) 2021
> + * lixinde <lixinde at phytium.com.cn>
> + * weichangzheng <weichangzheng at phytium.com.cn>
> + */
> +
> +#ifndef __POMELO_CONFIG_H__
> +#define __POMELO_CONFIG_H__
> +
> +/* SDRAM Bank #1 start address */
> +#define PHYS_SDRAM_1 0x80000000
> +#define PHYS_SDRAM_1_SIZE 0x7B000000
> +#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
> +
> +#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x10000000)
> +
> +/* SIZE of malloc pool */
> +#define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024 + CONFIG_ENV_SIZE)
> +#define CONFIG_BOARD_EARLY_INIT_F
> +#define CONFIG_BOARD_EARLY_INIT_R
Those two are in Kconfig. And why do you define INIT_R if the definition
above is empty?
> +
> +#define CONFIG_SYS_INIT_SP_ADDR (0x29800000 + 0x1a000)
> +
> +/* PCI CONFIG */
> +#define CONFIG_SYS_PCI_64BIT 1
> +#define CONFIG_PCI_SCAN_SHOW
This is one is not used anywhere?
> +
> +/* SCSI */
> +#define CONFIG_SYS_SCSI_MAX_SCSI_ID 4
> +#define CONFIG_SYS_SCSI_MAX_LUN 1
> +#define CONFIG_SYS_SCSI_MAX_DEVICE 128
> +#define CONFIG_SCSI_AHCI_PLAT
> +#define CONFIG_SYS_SATA_MAX_DEVICE 4
Those are all deprecated non-DM variables? You should not need them.
> +
> +/*BOOT*/
> +#define CONFIG_SYS_BOOTM_LEN (60 * 1024 * 1024)
> +
> +#define CONFIG_EXTRA_ENV_SETTINGS \
> + "load_kernel=ext4load scsi 0:1 0x90100000 uImage_old\0" \
> + "load_fdt=ext4load scsi 0:1 0x95000000 ft-d2000.dtb\0"\
> + "boot_fdt=bootm 0x90100000 -:- 0x17c000\0" \
> + "distro_bootcmd=run load_kernel; run boot_fdt"
Sorry, but that looks horribly hacky and is surely not honouring the
board's capabilities. Please define the default load addresses properly
(kernel_addr_r, ramdisk_addr_r). The kernel load address should be 2MB
aligned these days. If the DT in this patch is for real, just use
$fdtcontroladdr.
But most importantly: Please define the proper variables for the normal
distro boot, see this for an example (ignore the AFS part):
https://lists.denx.de/pipermail/u-boot/2021-July/454524.html
Cheers,
Andre
> +
> +#endif
More information about the U-Boot
mailing list