Skip to content

GitLab

Commit f681c676 authored by Carlo Caione's avatar Carlo Caione
Browse files

amlogic: Fix prefixes in the helpers file 



The code is the common directory is now generic, no need to have the SoC
prefix hardcoded in the function names.
Signed-off-by: default avatarCarlo Caione <ccaione@baylibre.com>
Change-Id: Ied3a5e506b9abd4c2d6f893bafef50019bff24f1
parent fab69512
Show whitespace changes
Inline Side-by-side
plat/amlogic/common/aarch64/aml_helpers.S
View file @ f681c676
/* /*
* Copyright (c) 2018, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
.globl plat_is_my_cpu_primary .globl plat_is_my_cpu_primary
.globl plat_my_core_pos .globl plat_my_core_pos
.globl plat_reset_handler .globl plat_reset_handler
.globl plat_gxbb_calc_core_pos .globl plat_calc_core_pos
/* ----------------------------------------------------- /* -----------------------------------------------------
* unsigned int plat_my_core_pos(void); * unsigned int plat_my_core_pos(void);
...@@ -24,17 +24,17 @@ ...@@ -24,17 +24,17 @@
*/ */
func plat_my_core_pos func plat_my_core_pos
mrs x0, mpidr_el1 mrs x0, mpidr_el1
b plat_gxbb_calc_core_pos b plat_calc_core_pos
endfunc plat_my_core_pos endfunc plat_my_core_pos
/* ----------------------------------------------------- /* -----------------------------------------------------
* unsigned int plat_gxbb_calc_core_pos(u_register_t mpidr); * unsigned int plat_calc_core_pos(u_register_t mpidr);
* ----------------------------------------------------- * -----------------------------------------------------
*/ */
func plat_gxbb_calc_core_pos func plat_calc_core_pos
and x0, x0, #MPIDR_CPU_MASK and x0, x0, #MPIDR_CPU_MASK
ret ret
endfunc plat_gxbb_calc_core_pos endfunc plat_calc_core_pos
/* ----------------------------------------------------- /* -----------------------------------------------------
* unsigned int plat_is_my_cpu_primary(void); * unsigned int plat_is_my_cpu_primary(void);
...@@ -43,7 +43,7 @@ endfunc plat_gxbb_calc_core_pos ...@@ -43,7 +43,7 @@ endfunc plat_gxbb_calc_core_pos
func plat_is_my_cpu_primary func plat_is_my_cpu_primary
mrs x0, mpidr_el1 mrs x0, mpidr_el1
and x0, x0, #(MPIDR_CLUSTER_MASK | MPIDR_CPU_MASK) and x0, x0, #(MPIDR_CLUSTER_MASK | MPIDR_CPU_MASK)
cmp x0, #GXBB_PRIMARY_CPU cmp x0, #AML_PRIMARY_CPU
cset w0, eq cset w0, eq
ret ret
endfunc plat_is_my_cpu_primary endfunc plat_is_my_cpu_primary
...@@ -61,9 +61,9 @@ endfunc platform_mem_init ...@@ -61,9 +61,9 @@ endfunc platform_mem_init
* --------------------------------------------- * ---------------------------------------------
*/ */
func plat_crash_console_init func plat_crash_console_init
mov_imm x0, GXBB_UART0_AO_BASE mov_imm x0, AML_UART0_AO_BASE
mov_imm x1, GXBB_UART0_AO_CLK_IN_HZ mov_imm x1, AML_UART0_AO_CLK_IN_HZ
mov_imm x2, GXBB_UART_BAUDRATE mov_imm x2, AML_UART_BAUDRATE
b console_meson_init b console_meson_init
endfunc plat_crash_console_init endfunc plat_crash_console_init
...@@ -73,7 +73,7 @@ endfunc plat_crash_console_init ...@@ -73,7 +73,7 @@ endfunc plat_crash_console_init
* --------------------------------------------- * ---------------------------------------------
*/ */
func plat_crash_console_putc func plat_crash_console_putc
mov_imm x1, GXBB_UART0_AO_BASE mov_imm x1, AML_UART0_AO_BASE
b console_meson_core_putc b console_meson_core_putc
endfunc plat_crash_console_putc endfunc plat_crash_console_putc
...@@ -84,7 +84,7 @@ endfunc plat_crash_console_putc ...@@ -84,7 +84,7 @@ endfunc plat_crash_console_putc
* --------------------------------------------- * ---------------------------------------------
*/ */
func plat_crash_console_flush func plat_crash_console_flush
mov_imm x0, GXBB_UART0_AO_BASE mov_imm x0, AML_UART0_AO_BASE
b console_meson_core_flush b console_meson_core_flush
endfunc plat_crash_console_flush endfunc plat_crash_console_flush
......
plat/amlogic/common/aml_topology.c
View file @ f681c676
...@@ -49,5 +49,5 @@ int plat_core_pos_by_mpidr(u_register_t mpidr) ...@@ -49,5 +49,5 @@ int plat_core_pos_by_mpidr(u_register_t mpidr)
if (cpu_id >= PLATFORM_MAX_CPUS_PER_CLUSTER) if (cpu_id >= PLATFORM_MAX_CPUS_PER_CLUSTER)
return -1; return -1;
return plat_gxbb_calc_core_pos(mpidr); return plat_calc_core_pos(mpidr);
} }
plat/amlogic/common/include/aml_private.h
View file @ f681c676
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include <stdint.h> #include <stdint.h>
/* Utility functions */ /* Utility functions */
unsigned int plat_gxbb_calc_core_pos(u_register_t mpidr); unsigned int plat_calc_core_pos(u_register_t mpidr);
void gxbb_console_init(void); void gxbb_console_init(void);
void gxbb_setup_page_tables(void); void gxbb_setup_page_tables(void);
......
plat/amlogic/gxbb/gxbb_common.c
View file @ f681c676
...@@ -109,9 +109,9 @@ static console_meson_t gxbb_console; ...@@ -109,9 +109,9 @@ static console_meson_t gxbb_console;
void gxbb_console_init(void) void gxbb_console_init(void)
{ {
int rc = console_meson_register(GXBB_UART0_AO_BASE, int rc = console_meson_register(AML_UART0_AO_BASE,
GXBB_UART0_AO_CLK_IN_HZ, AML_UART0_AO_CLK_IN_HZ,
GXBB_UART_BAUDRATE, AML_UART_BAUDRATE,
&gxbb_console); &gxbb_console);
if (rc == 0) { if (rc == 0) {
/* /*
......
plat/amlogic/gxbb/gxbb_def.h
View file @ f681c676
/* /*
* Copyright (c) 2018, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
...@@ -75,9 +75,9 @@ ...@@ -75,9 +75,9 @@
/******************************************************************************* /*******************************************************************************
* UART definitions * UART definitions
******************************************************************************/ ******************************************************************************/
#define GXBB_UART0_AO_BASE UL(0xC81004C0) #define AML_UART0_AO_BASE UL(0xC81004C0)
#define GXBB_UART0_AO_CLK_IN_HZ GXBB_OSC24M_CLK_IN_HZ #define AML_UART0_AO_CLK_IN_HZ GXBB_OSC24M_CLK_IN_HZ
#define GXBB_UART_BAUDRATE U(115200) #define AML_UART_BAUDRATE U(115200)
/******************************************************************************* /*******************************************************************************
* Memory-mapped I/O Registers * Memory-mapped I/O Registers
......
plat/amlogic/gxbb/gxbb_pm.c
View file @ f681c676
...@@ -31,7 +31,7 @@ static volatile uint32_t gxbb_cpu0_go; ...@@ -31,7 +31,7 @@ static volatile uint32_t gxbb_cpu0_go;
static void gxbb_program_mailbox(u_register_t mpidr, uint64_t value) static void gxbb_program_mailbox(u_register_t mpidr, uint64_t value)
{ {
unsigned int core = plat_gxbb_calc_core_pos(mpidr); unsigned int core = plat_calc_core_pos(mpidr);
uintptr_t cpu_mailbox_addr = GXBB_PSCI_MAILBOX_BASE + (core << 4); uintptr_t cpu_mailbox_addr = GXBB_PSCI_MAILBOX_BASE + (core << 4);
mmio_write_64(cpu_mailbox_addr, value); mmio_write_64(cpu_mailbox_addr, value);
...@@ -86,10 +86,10 @@ static void __dead2 gxbb_system_off(void) ...@@ -86,10 +86,10 @@ static void __dead2 gxbb_system_off(void)
static int32_t gxbb_pwr_domain_on(u_register_t mpidr) static int32_t gxbb_pwr_domain_on(u_register_t mpidr)
{ {
unsigned int core = plat_gxbb_calc_core_pos(mpidr); unsigned int core = plat_calc_core_pos(mpidr);
/* CPU0 can't be turned OFF, emulate it with a WFE loop */ /* CPU0 can't be turned OFF, emulate it with a WFE loop */
if (core == GXBB_PRIMARY_CPU) { if (core == AML_PRIMARY_CPU) {
VERBOSE("BL31: Releasing CPU0 from wait loop...\n"); VERBOSE("BL31: Releasing CPU0 from wait loop...\n");
gxbb_cpu0_go = 1; gxbb_cpu0_go = 1;
...@@ -113,12 +113,12 @@ static int32_t gxbb_pwr_domain_on(u_register_t mpidr) ...@@ -113,12 +113,12 @@ static int32_t gxbb_pwr_domain_on(u_register_t mpidr)
static void gxbb_pwr_domain_on_finish(const psci_power_state_t *target_state) static void gxbb_pwr_domain_on_finish(const psci_power_state_t *target_state)
{ {
unsigned int core = plat_gxbb_calc_core_pos(read_mpidr_el1()); unsigned int core = plat_calc_core_pos(read_mpidr_el1());
assert(target_state->pwr_domain_state[MPIDR_AFFLVL0] == assert(target_state->pwr_domain_state[MPIDR_AFFLVL0] ==
PLAT_LOCAL_STATE_OFF); PLAT_LOCAL_STATE_OFF);
if (core == GXBB_PRIMARY_CPU) { if (core == AML_PRIMARY_CPU) {
gxbb_cpu0_go = 0; gxbb_cpu0_go = 0;
flush_dcache_range((uintptr_t)&gxbb_cpu0_go, sizeof(gxbb_cpu0_go)); flush_dcache_range((uintptr_t)&gxbb_cpu0_go, sizeof(gxbb_cpu0_go));
dsb(); dsb();
...@@ -132,7 +132,7 @@ static void gxbb_pwr_domain_on_finish(const psci_power_state_t *target_state) ...@@ -132,7 +132,7 @@ static void gxbb_pwr_domain_on_finish(const psci_power_state_t *target_state)
static void gxbb_pwr_domain_off(const psci_power_state_t *target_state) static void gxbb_pwr_domain_off(const psci_power_state_t *target_state)
{ {
u_register_t mpidr = read_mpidr_el1(); u_register_t mpidr = read_mpidr_el1();
unsigned int core = plat_gxbb_calc_core_pos(mpidr); unsigned int core = plat_calc_core_pos(mpidr);
uintptr_t addr = GXBB_PSCI_MAILBOX_BASE + 8 + (core << 4); uintptr_t addr = GXBB_PSCI_MAILBOX_BASE + 8 + (core << 4);
mmio_write_32(addr, 0xFFFFFFFF); mmio_write_32(addr, 0xFFFFFFFF);
...@@ -141,7 +141,7 @@ static void gxbb_pwr_domain_off(const psci_power_state_t *target_state) ...@@ -141,7 +141,7 @@ static void gxbb_pwr_domain_off(const psci_power_state_t *target_state)
gicv2_cpuif_disable(); gicv2_cpuif_disable();
/* CPU0 can't be turned OFF, emulate it with a WFE loop */ /* CPU0 can't be turned OFF, emulate it with a WFE loop */
if (core == GXBB_PRIMARY_CPU) if (core == AML_PRIMARY_CPU)
return; return;
scpi_set_css_power_state(mpidr, scpi_set_css_power_state(mpidr,
...@@ -151,10 +151,10 @@ static void gxbb_pwr_domain_off(const psci_power_state_t *target_state) ...@@ -151,10 +151,10 @@ static void gxbb_pwr_domain_off(const psci_power_state_t *target_state)
static void __dead2 gxbb_pwr_domain_pwr_down_wfi(const psci_power_state_t static void __dead2 gxbb_pwr_domain_pwr_down_wfi(const psci_power_state_t
*target_state) *target_state)
{ {
unsigned int core = plat_gxbb_calc_core_pos(read_mpidr_el1()); unsigned int core = plat_calc_core_pos(read_mpidr_el1());
/* CPU0 can't be turned OFF, emulate it with a WFE loop */ /* CPU0 can't be turned OFF, emulate it with a WFE loop */
if (core == GXBB_PRIMARY_CPU) { if (core == AML_PRIMARY_CPU) {
VERBOSE("BL31: CPU0 entering wait loop...\n"); VERBOSE("BL31: CPU0 entering wait loop...\n");
while (gxbb_cpu0_go == 0) while (gxbb_cpu0_go == 0)
......
plat/amlogic/gxbb/include/platform_def.h
View file @ f681c676
/* /*
* Copyright (c) 2018, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#define PLATFORM_CLUSTER0_CORE_COUNT PLATFORM_MAX_CPUS_PER_CLUSTER #define PLATFORM_CLUSTER0_CORE_COUNT PLATFORM_MAX_CPUS_PER_CLUSTER
#define PLATFORM_CORE_COUNT PLATFORM_CLUSTER0_CORE_COUNT #define PLATFORM_CORE_COUNT PLATFORM_CLUSTER0_CORE_COUNT
#define GXBB_PRIMARY_CPU U(0) #define AML_PRIMARY_CPU U(0)
#define PLAT_MAX_PWR_LVL MPIDR_AFFLVL1 #define PLAT_MAX_PWR_LVL MPIDR_AFFLVL1
#define PLAT_NUM_PWR_DOMAINS (PLATFORM_CLUSTER_COUNT + \ #define PLAT_NUM_PWR_DOMAINS (PLATFORM_CLUSTER_COUNT + \
......
plat/amlogic/gxl/gxl_common.c
View file @ f681c676
/* /*
* Copyright (c) 2018, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
...@@ -107,9 +107,9 @@ static console_meson_t gxbb_console; ...@@ -107,9 +107,9 @@ static console_meson_t gxbb_console;
void gxbb_console_init(void) void gxbb_console_init(void)
{ {
int rc = console_meson_register(GXBB_UART0_AO_BASE, int rc = console_meson_register(AML_UART0_AO_BASE,
GXBB_UART0_AO_CLK_IN_HZ, AML_UART0_AO_CLK_IN_HZ,
GXBB_UART_BAUDRATE, AML_UART_BAUDRATE,
&gxbb_console); &gxbb_console);
if (rc == 0) { if (rc == 0) {
/* /*
......
plat/amlogic/gxl/gxl_def.h
View file @ f681c676
...@@ -79,9 +79,9 @@ ...@@ -79,9 +79,9 @@
/******************************************************************************* /*******************************************************************************
* UART definitions * UART definitions
******************************************************************************/ ******************************************************************************/
#define GXBB_UART0_AO_BASE UL(0xC81004C0) #define AML_UART0_AO_BASE UL(0xC81004C0)
#define GXBB_UART0_AO_CLK_IN_HZ GXBB_OSC24M_CLK_IN_HZ #define AML_UART0_AO_CLK_IN_HZ GXBB_OSC24M_CLK_IN_HZ
#define GXBB_UART_BAUDRATE U(115200) #define AML_UART_BAUDRATE U(115200)
/******************************************************************************* /*******************************************************************************
* Memory-mapped I/O Registers * Memory-mapped I/O Registers
......
plat/amlogic/gxl/gxl_pm.c
View file @ f681c676
...@@ -29,7 +29,7 @@ static volatile uint32_t gxbb_cpu0_go; ...@@ -29,7 +29,7 @@ static volatile uint32_t gxbb_cpu0_go;
static void gxl_pm_set_reset_addr(u_register_t mpidr, uint64_t value) static void gxl_pm_set_reset_addr(u_register_t mpidr, uint64_t value)
{ {
unsigned int core = plat_gxbb_calc_core_pos(mpidr); unsigned int core = plat_calc_core_pos(mpidr);
uintptr_t cpu_mailbox_addr = GXBB_PSCI_MAILBOX_BASE + (core << 4); uintptr_t cpu_mailbox_addr = GXBB_PSCI_MAILBOX_BASE + (core << 4);
mmio_write_64(cpu_mailbox_addr, value); mmio_write_64(cpu_mailbox_addr, value);
...@@ -37,7 +37,7 @@ static void gxl_pm_set_reset_addr(u_register_t mpidr, uint64_t value) ...@@ -37,7 +37,7 @@ static void gxl_pm_set_reset_addr(u_register_t mpidr, uint64_t value)
static void gxl_pm_reset(u_register_t mpidr) static void gxl_pm_reset(u_register_t mpidr)
{ {
unsigned int core = plat_gxbb_calc_core_pos(mpidr); unsigned int core = plat_calc_core_pos(mpidr);
uintptr_t cpu_mailbox_addr = GXBB_PSCI_MAILBOX_BASE + (core << 4) + 8; uintptr_t cpu_mailbox_addr = GXBB_PSCI_MAILBOX_BASE + (core << 4) + 8;
mmio_write_32(cpu_mailbox_addr, 0); mmio_write_32(cpu_mailbox_addr, 0);
...@@ -99,10 +99,10 @@ static void __dead2 gxbb_system_off(void) ...@@ -99,10 +99,10 @@ static void __dead2 gxbb_system_off(void)
static int32_t gxbb_pwr_domain_on(u_register_t mpidr) static int32_t gxbb_pwr_domain_on(u_register_t mpidr)
{ {
unsigned int core = plat_gxbb_calc_core_pos(mpidr); unsigned int core = plat_calc_core_pos(mpidr);
/* CPU0 can't be turned OFF, emulate it with a WFE loop */ /* CPU0 can't be turned OFF, emulate it with a WFE loop */
if (core == GXBB_PRIMARY_CPU) { if (core == AML_PRIMARY_CPU) {
VERBOSE("BL31: Releasing CPU0 from wait loop...\n"); VERBOSE("BL31: Releasing CPU0 from wait loop...\n");
gxbb_cpu0_go = 1; gxbb_cpu0_go = 1;
...@@ -127,12 +127,12 @@ static int32_t gxbb_pwr_domain_on(u_register_t mpidr) ...@@ -127,12 +127,12 @@ static int32_t gxbb_pwr_domain_on(u_register_t mpidr)
static void gxbb_pwr_domain_on_finish(const psci_power_state_t *target_state) static void gxbb_pwr_domain_on_finish(const psci_power_state_t *target_state)
{ {
unsigned int core = plat_gxbb_calc_core_pos(read_mpidr_el1()); unsigned int core = plat_calc_core_pos(read_mpidr_el1());
assert(target_state->pwr_domain_state[MPIDR_AFFLVL0] == assert(target_state->pwr_domain_state[MPIDR_AFFLVL0] ==
PLAT_LOCAL_STATE_OFF); PLAT_LOCAL_STATE_OFF);
if (core == GXBB_PRIMARY_CPU) { if (core == AML_PRIMARY_CPU) {
gxbb_cpu0_go = 0; gxbb_cpu0_go = 0;
flush_dcache_range((uintptr_t)&gxbb_cpu0_go, flush_dcache_range((uintptr_t)&gxbb_cpu0_go,
sizeof(gxbb_cpu0_go)); sizeof(gxbb_cpu0_go));
...@@ -147,12 +147,12 @@ static void gxbb_pwr_domain_on_finish(const psci_power_state_t *target_state) ...@@ -147,12 +147,12 @@ static void gxbb_pwr_domain_on_finish(const psci_power_state_t *target_state)
static void gxbb_pwr_domain_off(const psci_power_state_t *target_state) static void gxbb_pwr_domain_off(const psci_power_state_t *target_state)
{ {
u_register_t mpidr = read_mpidr_el1(); u_register_t mpidr = read_mpidr_el1();
unsigned int core = plat_gxbb_calc_core_pos(mpidr); unsigned int core = plat_calc_core_pos(mpidr);
gicv2_cpuif_disable(); gicv2_cpuif_disable();
/* CPU0 can't be turned OFF, emulate it with a WFE loop */ /* CPU0 can't be turned OFF, emulate it with a WFE loop */
if (core == GXBB_PRIMARY_CPU) if (core == AML_PRIMARY_CPU)
return; return;
scpi_set_css_power_state(mpidr, scpi_set_css_power_state(mpidr,
...@@ -163,10 +163,10 @@ static void __dead2 gxbb_pwr_domain_pwr_down_wfi(const psci_power_state_t ...@@ -163,10 +163,10 @@ static void __dead2 gxbb_pwr_domain_pwr_down_wfi(const psci_power_state_t
*target_state) *target_state)
{ {
u_register_t mpidr = read_mpidr_el1(); u_register_t mpidr = read_mpidr_el1();
unsigned int core = plat_gxbb_calc_core_pos(mpidr); unsigned int core = plat_calc_core_pos(mpidr);
/* CPU0 can't be turned OFF, emulate it with a WFE loop */ /* CPU0 can't be turned OFF, emulate it with a WFE loop */
if (core == GXBB_PRIMARY_CPU) { if (core == AML_PRIMARY_CPU) {
VERBOSE("BL31: CPU0 entering wait loop...\n"); VERBOSE("BL31: CPU0 entering wait loop...\n");
while (gxbb_cpu0_go == 0) while (gxbb_cpu0_go == 0)
......
plat/amlogic/gxl/include/platform_def.h
View file @ f681c676
/* /*
* Copyright (c) 2018, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#define PLATFORM_CLUSTER0_CORE_COUNT PLATFORM_MAX_CPUS_PER_CLUSTER #define PLATFORM_CLUSTER0_CORE_COUNT PLATFORM_MAX_CPUS_PER_CLUSTER
#define PLATFORM_CORE_COUNT PLATFORM_CLUSTER0_CORE_COUNT #define PLATFORM_CORE_COUNT PLATFORM_CLUSTER0_CORE_COUNT
#define GXBB_PRIMARY_CPU U(0) #define AML_PRIMARY_CPU U(0)
#define PLAT_MAX_PWR_LVL MPIDR_AFFLVL1 #define PLAT_MAX_PWR_LVL MPIDR_AFFLVL1
#define PLAT_NUM_PWR_DOMAINS (PLATFORM_CLUSTER_COUNT + \ #define PLAT_NUM_PWR_DOMAINS (PLATFORM_CLUSTER_COUNT + \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment