Improve identification of ARC cores
cover Improve identification of ARC cores
Print more complex information about ARC core we're running on. This includes smarts for ARC core template detection, CPU clock frequency, human-readable board·description etc.
Alexey Brodkin (5):
ARC: Improve identification of ARC cores
arc: Get rid of board-specific print_cpuinfo()
arc: emsdp: Read real CPU clock value from hardware
arc: emsdp: Refactor register and bit accesses
arc: devboards: Implement checkboard()
arch/arc/include/asm/arcregs.h | 25 +++- arch/arc/lib/cpu.c | 200 ++++++++++++++++++++++--- board/synopsys/axs10x/axs10x.c | 8 + board/synopsys/emsdp/emsdp.c | 70 +++++++-- board/synopsys/hsdk/hsdk.c | 8 +- board/synopsys/iot_devkit/iot_devkit.c | 10 -- 6 files changed, 273 insertions(+), 48 deletions(-)
Signature · 1 line
2.19.1
PATCH 1/5 ARC: Improve identification of ARC cores
1. Try to guess a ARC core template that was used i.e. not just name a core family but something more menaingful like "ARC HS38", "ARC EM11D" etc.
We do it checking availability of the key differentiation features like:
- Caches (we actually only check for L1 I$ fpr simplicity)
- XY-memory
- DSP extensions etc.
2. Identify ARC subsystems
3. Print core clock frequency
--- arch/arc/include/asm/arcregs.h | 25 ++++- arch/arc/lib/cpu.c | 200 +++++++++++++++++++++++++++++---- 2 files changed, 204 insertions(+), 21 deletions(-)
arch/arc/include/asm/arcregs.h +24 -1
@@ -16,6 +16,20 @@* access: "lr"/"sr". */ +/* +* Typically 8 least significant bits of Build Configuration Register (BCR) +* describe version of the HW block in question. Moreover if decoded version +* is 0 this means given HW block is absent - this is especially useful because +* we may safely read BRC regardless HW block existence while an attempt to +* access any other AUX regs associated with this HW block lead to imediate +* "instruction error" exception. +* +* I.e. before using any cofigurable HW block it's required to make sure it +* exists at all, and for that we introduce a special macro below. +*/ +#define ARC_BCR_VERSION_MASK GENMASK(7, 0) +#define ARC_FEATURE_EXISTS (bcr) !!(__builtin_arc_lr(bcr) & ARC_BCR_VERSION_MASK) +#define ARC_AUX_IDENTITY 0x04#define ARC_AUX_STATUS32 0x0a
@@ -73,7 +87,7 @@#define ARC_BCR_CLUSTER 0xcf/* MMU Management regs */ -#define ARC_AUX_MMU_BCR 0x06f +#define ARC_AUX_MMU_BCR 0x6f/* IO coherency related auxiliary registers */ #define ARC_AUX_IO_COH_ENABLE 0x500
@@ -81,6 +95,15 @@#define ARC_AUX_IO_COH_AP0_BASE 0x508#define ARC_AUX_IO_COH_AP0_SIZE 0x509 +/* XY-memory related */ +#define ARC_AUX_XY_BUILD 0x79 + +/* DSP-extensions related auxiliary registers */ +#define ARC_AUX_DSP_BUILD 0x7A + +/* ARC Subsystems related auxiliary registers */ +#define ARC_AUX_SUBSYS_BUILD 0xF0 +#ifndef __ASSEMBLY__/* Accessors for auxiliary registers */ #define read_aux_reg (reg) __builtin_arc_lr(reg)
arch/arc/lib/cpu.c +180 -20
220 lines not on this page · raw message
Signature · 1 line
2.19.1
PATCH 2/5 arc: Get rid of board-specific print_cpuinfo()
In reply to Alexey BrodkinSince we now do advanced CPU identification in generic ARC code there's no need to have per-board hardcoded data.
--- board/synopsys/hsdk/hsdk.c | 8 -------- board/synopsys/iot_devkit/iot_devkit.c | 10 ---------- 2 files changed, 18 deletions(-)
board/synopsys/hsdk/hsdk.c +0 -8
@@ -1053,11 +1053,3 @@ int board_mmc_init(bd_t *bis)return 0 ; } - -#ifdef CONFIG_DISPLAY_CPUINFO -int print_cpuinfo (void ) -{ -printf ("CPU: ARC HS38 v2.1c\n" ); -return 0 ; -} -#endif /* CONFIG_DISPLAY_CPUINFO */
board/synopsys/iot_devkit/iot_devkit.c +0 -10
@@ -189,13 +189,3 @@ int checkboard(void)puts ("Board: Synopsys IoT Development Kit\n" );return 0 ; }; - -#ifdef CONFIG_DISPLAY_CPUINFO -int print_cpuinfo (void ) -{ -char mhz[8 ]; - -printf ("CPU: ARC EM9D at %s MHz\n" ,strmhz (mhz, gd->cpu_clk)); -return 0 ; -} -#endif /* CONFIG_DISPLAY_CPUINFO */
Signature · 1 line
2.19.1
PATCH 3/5 arc: emsdp: Read real CPU clock value from hardware
In reply to Alexey BrodkinWe do real CPU clock measurement with help of built-in counters. Thus we may accommodate different real clock values that appear in different FPA images instead of relying on something hard-coded in the .dtb.
And while at it make make SDIO base address define look similar to others with casting to "(void *)".
--- board/synopsys/emsdp/emsdp.c | 42 +++++++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-)
board/synopsys/emsdp/emsdp.c +39 -3
@@ -7,10 +7,46 @@#include <dwmmc.h> #include <malloc.h> +#include <asm/arcregs.h> +DECLARE_GLOBAL_DATA_PTR ; -#define ARC_PERIPHERAL_BASE 0xF0000000 -#define SDIO_BASE (ARC_PERIPHERAL_BASE + 0x10000) +#define ARC_PERIPHERAL_BASE 0xF0000000 + +#define CGU_ARC_FMEAS_ARC (void *)(ARC_PERIPHERAL_BASE + 0x84) +#define CGU_ARC_FMEAS_ARC_START BIT(31) +#define CGU_ARC_FMEAS_ARC_DONE BIT(30) +#define CGU_ARC_FMEAS_ARC_CNT_MASK GENMASK(14, 0) +#define CGU_ARC_FMEAS_ARC_RCNT_OFFSET 0 +#define CGU_ARC_FMEAS_ARC_FCNT_OFFSET 15 + +#define SDIO_BASE (void *)(ARC_PERIPHERAL_BASE + 0x10000) + +int mach_cpu_init (void ) +{ +int rcnt, fcnt; +u32 data; + +/* Start frequency measurement */ +writel (CGU_ARC_FMEAS_ARC_START ,CGU_ARC_FMEAS_ARC ); + +/* Poll DONE bit */ +do { + data =readl (CGU_ARC_FMEAS_ARC ); + }while (!(data &CGU_ARC_FMEAS_ARC_DONE )); + +/* Amount of reference 100 MHz clocks */ + rcnt = ((data >>CGU_ARC_FMEAS_ARC_RCNT_OFFSET ) & +CGU_ARC_FMEAS_ARC_CNT_MASK ); + +/* Amount of CPU clocks */ + fcnt = ((data >>CGU_ARC_FMEAS_ARC_FCNT_OFFSET ) & +CGU_ARC_FMEAS_ARC_CNT_MASK ); + + gd->cpu_clk = ((100 * fcnt) / rcnt) *1000000 ; + +return 0 ; +}int board_mmc_init (bd_t *bis) {
@@ -24,7 +60,7 @@ int board_mmc_init(bd_t *bis)memset (host,0 ,sizeof (struct dwmci_host )); host->name ="Synopsys Mobile storage" ; - host->ioaddr = (void *)SDIO_BASE ; + host->ioaddr =SDIO_BASE ; host->buswidth =4 ; host->dev_index =0 ; host->bus_hz =50000000 ;
Signature · 1 line
2.19.1
PATCH 4/5 arc: emsdp: Refactor register and bit accesses
In reply to Alexey BrodkinInstead of "base + offset" define all registers right away and access them later via direct defines.
Generate bit masks with "BIT" macro.
--- board/synopsys/emsdp/emsdp.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
board/synopsys/emsdp/emsdp.c +9 -9
@@ -78,31 +78,31 @@ int board_mmc_getcd(struct mmc *mmc) }#define CREG_BASE 0xF0001000 -#define CREG_BOOT_OFFSET 0 -#define CREG_BOOT_WP_OFFSET 8 +#define CREG_BOOT (void *)(CREG_BASE + 0x0FF0) +#define CREG_IP_SW_RESET (void *)(CREG_BASE + 0x0FF0) -#define CGU_BASE 0xF0000000 -#define CGU_IP_SW_RESET 0x0FF0 +/* Bits in CREG_BOOT register */ +#define CREG_BOOT_WP_BIT BIT(8)void reset_cpu (ulong addr) { -writel (1 , (u32 *)(CGU_BASE +CGU_IP_SW_RESET )); +writel (1 ,CREG_IP_SW_RESET );while (1 ) ;/* loop forever till reset */ }static int do_emsdp_rom (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) { -u32 creg_boot =readl ((u32 *)(CREG_BASE +CREG_BOOT_OFFSET )); +u32 creg_boot =readl (CREG_BOOT );if (!strcmp (argv[1 ],"unlock" )) - creg_boot &= ~BIT (CREG_BOOT_WP_OFFSET ); + creg_boot &= ~CREG_BOOT_WP_BIT ;else if (!strcmp (argv[1 ],"lock" )) - creg_boot |=BIT (CREG_BOOT_WP_OFFSET ); + creg_boot |=CREG_BOOT_WP_BIT ;else return CMD_RET_USAGE ; -writel (creg_boot, (u32 *)(CREG_BASE +CREG_BOOT_OFFSET )); +writel (creg_boot,CREG_BOOT );return CMD_RET_SUCCESS ; }
Signature · 1 line
2.19.1
PATCH 5/5 arc: devboards: Implement checkboard()
In reply to Alexey BrodkinThis allows us to print nice board name on boot.
--- board/synopsys/axs10x/axs10x.c | 8 ++++++++ board/synopsys/emsdp/emsdp.c | 10 ++++++++++ board/synopsys/hsdk/hsdk.c | 6 ++++++ 3 files changed, 24 insertions(+)
board/synopsys/axs10x/axs10x.c +8 -0
@@ -109,3 +109,11 @@ void smp_kick_all_cpus(void) writel(cmd, (void __iomem *)AXC003_CREG_CPU_START); }#endif + +int checkboard (void ) +{ +printf ("Board: ARC Software Development Platform AXS%s\n" , +is_isa_arcv2 () ?"103" :"101" ); + +return 0 ; +};
board/synopsys/emsdp/emsdp.c +10 -0
@@ -80,6 +80,7 @@ int board_mmc_getcd(struct mmc *mmc)#define CREG_BASE 0xF0001000#define CREG_BOOT (void *)(CREG_BASE + 0x0FF0)#define CREG_IP_SW_RESET (void *)(CREG_BASE + 0x0FF0) +#define CREG_IP_VERSION (void *)(CREG_BASE + 0x0FF8)/* Bits in CREG_BOOT register */ #define CREG_BOOT_WP_BIT BIT(8)
@@ -133,3 +134,12 @@ U_BOOT_CMD("rom unlock - Unlock non-volatile memory for writing\n" "emsdp rom lock - Lock non-volatile memory to prevent writing\n" ); + +int checkboard (void ) +{ +int version =readl (CREG_IP_VERSION ); + +printf ("Board: ARC EM Software Development Platform v%d.%d\n" , + (version >>16 ) &0xff , version &0xff ); +return 0 ; +};
board/synopsys/hsdk/hsdk.c +6 -0
@@ -1053,3 +1053,9 @@ int board_mmc_init(bd_t *bis)return 0 ; } + +int checkboard (void ) +{ +puts ("Board: Synopsys ARC HS Development Kit\n" ); +return 0 ; +};
Signature · 1 line
2.19.1