GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/cavium/cn81xx: Use read64p() 

Change-Id: Ia79816ccc230d17dd1ce2bde7a185b4d502ad107
Signed-off-by: Elyes Haouas <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/70284
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
This commit is contained in:
Elyes Haouas 2022-12-03 12:14:40 +01:00 committed by Felix Held
parent f68bd1273b
commit 285bf097ab
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/soc/cavium/cn81xx/clock.c
View File

@ -46,7 +46,7 @@ u64 thunderx_get_io_clock(void)
{ {
union cavm_rst_boot rst_boot; union cavm_rst_boot rst_boot;
rst_boot.u = read64((void *)RST_PF_BAR0); rst_boot.u = read64p(RST_PF_BAR0);
return ((u64)rst_boot.s.pnr_mul) * PLL_REF_CLK; return ((u64)rst_boot.s.pnr_mul) * PLL_REF_CLK;
} }
@ -58,7 +58,7 @@ u64 thunderx_get_core_clock(void)
{ {
union cavm_rst_boot rst_boot; union cavm_rst_boot rst_boot;
rst_boot.u = read64((void *)RST_PF_BAR0); rst_boot.u = read64p(RST_PF_BAR0);
return ((u64)rst_boot.s.c_mul) * PLL_REF_CLK; return ((u64)rst_boot.s.c_mul) * PLL_REF_CLK;
} }

6
src/soc/cavium/cn81xx/cpu.c
View File

@ -11,7 +11,7 @@
uint64_t cpu_get_available_core_mask(void) uint64_t cpu_get_available_core_mask(void)
{ {
return read64((void *)RST_PP_AVAILABLE); return read64p(RST_PP_AVAILABLE);
} }
size_t cpu_get_num_available_cores(void) size_t cpu_get_num_available_cores(void)
@ -75,7 +75,7 @@ size_t start_cpu(size_t cpu, void (*entry_64)(size_t core_id))
write64((void *)MIO_BOOT_AP_JUMP, (uintptr_t)secondary_init); write64((void *)MIO_BOOT_AP_JUMP, (uintptr_t)secondary_init);
/* Get coremask of cores in reset */ /* Get coremask of cores in reset */
const uint64_t reset = read64((void *)RST_PP_RESET); const uint64_t reset = read64p(RST_PP_RESET);
printk(BIOS_INFO, "CPU: Cores currently in reset: 0x%llx\n", reset); printk(BIOS_INFO, "CPU: Cores currently in reset: 0x%llx\n", reset);
/* Setup entry for secondary core */ /* Setup entry for secondary core */
@ -93,7 +93,7 @@ size_t start_cpu(size_t cpu, void (*entry_64)(size_t core_id))
stopwatch_init_usecs_expire(&sw, 1000000); stopwatch_init_usecs_expire(&sw, 1000000);
do { do {
pending = read64((void *)RST_PP_PENDING); pending = read64p(RST_PP_PENDING);
} while (!stopwatch_expired(&sw) && (pending & coremask)); } while (!stopwatch_expired(&sw) && (pending & coremask));
if (stopwatch_expired(&sw)) { if (stopwatch_expired(&sw)) {