[coreboot-gerrit] Patch set updated for coreboot: arm64: remove spin table support
Furquan Shaikh (furquan@google.com)
gerrit at coreboot.org
Thu Oct 15 21:46:15 CEST 2015
Furquan Shaikh (furquan at google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11908
-gerrit
commit 85430e55a10d745be3be102285cf48de25dd359c
Author: Aaron Durbin <adurbin at chromium.org>
Date: Thu Oct 15 12:22:27 2015 -0500
arm64: remove spin table support
As ARM Trusted Firmware is the only first class citizen for
booting arm64 multi-processor in coreboot remove spintable
support. If SoCs want to bring up MP then ATF needs to be
ported and integrated.
Change-Id: I1f38b8d8b0952eee50cc64440bfd010b1dd0bff4
Signed-off-by: Aaron Durbin <adurbin at chromium.org>
---
src/arch/arm64/Kconfig | 5 --
src/arch/arm64/Makefile.inc | 1 -
src/arch/arm64/boot.c | 5 --
src/arch/arm64/include/arch/spintable.h | 49 --------------
src/arch/arm64/spintable.c | 100 ----------------------------
src/arch/arm64/spintable_asm.S | 38 -----------
src/commonlib/include/commonlib/cbmem_id.h | 2 -
src/mainboard/google/foster/devicetree.cb | 2 -
src/mainboard/google/rush/Kconfig | 1 -
src/mainboard/google/rush/devicetree.cb | 2 -
src/mainboard/google/rush_ryu/Kconfig | 1 -
src/mainboard/google/rush_ryu/devicetree.cb | 2 -
src/mainboard/google/smaug/devicetree.cb | 2 -
src/soc/nvidia/tegra132/chip.h | 3 -
src/soc/nvidia/tegra132/soc.c | 5 --
src/soc/nvidia/tegra210/chip.h | 3 -
src/soc/nvidia/tegra210/soc.c | 5 --
17 files changed, 226 deletions(-)
diff --git a/src/arch/arm64/Kconfig b/src/arch/arm64/Kconfig
index 2f019a3..2c87132 100644
--- a/src/arch/arm64/Kconfig
+++ b/src/arch/arm64/Kconfig
@@ -28,11 +28,6 @@ config ARM64_BOOTBLOCK_CUSTOM
bool
default n
-config ARM64_USE_SPINTABLE
- bool
- default n
- depends on ARCH_RAMSTAGE_ARM64
-
config ARM64_USE_ARM_TRUSTED_FIRMWARE
bool
default n
diff --git a/src/arch/arm64/Makefile.inc b/src/arch/arm64/Makefile.inc
index 90be6cd..4f487da 100644
--- a/src/arch/arm64/Makefile.inc
+++ b/src/arch/arm64/Makefile.inc
@@ -146,7 +146,6 @@ ramstage-y += memcpy.S
ramstage-y += memmove.S
ramstage-y += stage_entry.S
ramstage-y += cpu-stubs.c
-ramstage-$(CONFIG_ARM64_USE_SPINTABLE) += spintable.c spintable_asm.S
ramstage-$(CONFIG_ARM64_USE_ARM_TRUSTED_FIRMWARE) += arm_tf.c
ramstage-y += transition.c transition_asm.S
diff --git a/src/arch/arm64/boot.c b/src/arch/arm64/boot.c
index db51847..1cb01db 100644
--- a/src/arch/arm64/boot.c
+++ b/src/arch/arm64/boot.c
@@ -20,7 +20,6 @@
#include <arch/cache.h>
#include <arch/lib_helpers.h>
#include <arch/stages.h>
-#include <arch/spintable.h>
#include <arch/transition.h>
#include <arm_tf.h>
#include <cbmem.h>
@@ -43,10 +42,6 @@ static void run_payload(struct prog *prog)
else {
uint8_t current_el = get_current_el();
- /* Start the other CPUs spinning. */
- if (IS_ENABLED(CONFIG_ARM64_USE_SPINTABLE))
- spintable_start();
-
cache_sync_instructions();
printk(BIOS_SPEW, "entry = %p\n", doit);
diff --git a/src/arch/arm64/include/arch/spintable.h b/src/arch/arm64/include/arch/spintable.h
deleted file mode 100644
index b19d551..0000000
--- a/src/arch/arm64/include/arch/spintable.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright 2014 Google, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
- */
-
-#ifndef __ARCH_SPINTABLE_H__
-#define __ARCH_SPINTABLE_H__
-
-struct spintable_attributes {
- void (*entry)(void *);
- void *addr;
-};
-
-#if IS_ENABLED(CONFIG_ARM64_USE_SPINTABLE)
-
-/* Initialize spintable with provided monitor address. */
-void spintable_init(void *monitor_address);
-
-/* Return NULL on failure, otherwise the spintable info. */
-const struct spintable_attributes *spintable_get_attributes(void);
-
-#else /* IS_ENABLED(CONFIG_ARM64_USE_SPINTABLE) */
-
-static inline void spintable_init(void *monitor_address) {}
-static inline const struct spintable_attributes *spintable_get_attributes(void)
-{
- return NULL;
-}
-
-#endif /* IS_ENABLED(CONFIG_ARM64_USE_SPINTABLE) */
-
-/* Start spinning on the non-boot CPUs. */
-void spintable_start(void);
-
-#endif /* __ARCH_SPINTABLE_H__ */
diff --git a/src/arch/arm64/spintable.c b/src/arch/arm64/spintable.c
deleted file mode 100644
index 46a78d7..0000000
--- a/src/arch/arm64/spintable.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright 2014 Google Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
- */
-
-#include <arch/cache.h>
-#include <arch/spintable.h>
-#include <arch/transition.h>
-#include <console/console.h>
-#include <cpu/cpu.h>
-#include <cbmem.h>
-#include <string.h>
-
-static struct spintable_attributes spin_attrs;
-
-void spintable_init(void *monitor_address)
-{
- extern void __wait_for_spin_table_request(void);
- const size_t code_size = 4096;
-
- if (monitor_address == NULL) {
- printk(BIOS_ERR, "spintable: NULL address to monitor.\n");
- return;
- }
-
- spin_attrs.entry = cbmem_add(CBMEM_ID_SPINTABLE, code_size);
-
- if (spin_attrs.entry == NULL)
- return;
-
- spin_attrs.addr = monitor_address;
-
- printk(BIOS_INFO, "spintable @ %p will monitor %p\n",
- spin_attrs.entry, spin_attrs.addr);
-
- /* Ensure the memory location is zero'd out. */
- *(uint64_t *)monitor_address = 0;
-
- memcpy(spin_attrs.entry, __wait_for_spin_table_request, code_size);
-
- dcache_clean_invalidate_by_mva(monitor_address, sizeof(uint64_t));
- dcache_clean_invalidate_by_mva(spin_attrs.entry, code_size);
-}
-
-static void spintable_enter(void *unused)
-{
- struct exc_state state;
- const struct spintable_attributes *attrs;
- int current_el;
-
- attrs = spintable_get_attributes();
-
- current_el = get_current_el();
-
- if (current_el != EL3)
- attrs->entry(attrs->addr);
-
- memset(&state, 0, sizeof(state));
- state.elx.spsr = get_eret_el(EL2, SPSR_USE_L);
-
- transition_with_entry(attrs->entry, attrs->addr, &state);
-}
-
-const struct spintable_attributes *spintable_get_attributes(void)
-{
- if (spin_attrs.entry == NULL) {
- printk(BIOS_ERR, "spintable: monitor code not present.\n");
- return NULL;
- }
-
- return &spin_attrs;
-}
-
-void spintable_start(void)
-{
- struct cpu_action action = {
- .run = spintable_enter,
- };
-
- if (spintable_get_attributes() == NULL)
- return;
-
- printk(BIOS_INFO, "All non-boot CPUs to enter spintable.\n");
-
- arch_run_on_all_cpus_but_self_async(&action);
-}
diff --git a/src/arch/arm64/spintable_asm.S b/src/arch/arm64/spintable_asm.S
deleted file mode 100644
index e78b0af..0000000
--- a/src/arch/arm64/spintable_asm.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright 2014 Google Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
- */
-
-#include <arch/asm.h>
-
-ENTRY(__wait_for_spin_table_request)
- /* Entry here is in EL2 with the magic address in x0. */
- mov x28, x0
-1:
- ldr x27, [x28]
- cmp x27, xzr
- b.ne 2f
- wfe
- b 1b
-2:
- /* Entry into the kernel. */
- mov x0, xzr
- mov x1, xzr
- mov x2, xzr
- mov x3, xzr
- br x27
-ENDPROC(__wait_for_spin_table_request)
diff --git a/src/commonlib/include/commonlib/cbmem_id.h b/src/commonlib/include/commonlib/cbmem_id.h
index 4a5b660..b94611c 100644
--- a/src/commonlib/include/commonlib/cbmem_id.h
+++ b/src/commonlib/include/commonlib/cbmem_id.h
@@ -59,7 +59,6 @@
#define CBMEM_ID_ROOT 0xff4007ff
#define CBMEM_ID_SMBIOS 0x534d4254
#define CBMEM_ID_SMM_SAVE_SPACE 0x07e9acee
-#define CBMEM_ID_SPINTABLE 0x59175917
#define CBMEM_ID_STAGEx_META 0x57a9e000
#define CBMEM_ID_STAGEx_CACHE 0x57a9e100
#define CBMEM_ID_TCPA_LOG 0x54435041
@@ -105,7 +104,6 @@
{ CBMEM_ID_ROOT, "CBMEM ROOT " }, \
{ CBMEM_ID_SMBIOS, "SMBIOS " }, \
{ CBMEM_ID_SMM_SAVE_SPACE, "SMM BACKUP " }, \
- { CBMEM_ID_SPINTABLE, "SPIN TABLE " }, \
{ CBMEM_ID_TCPA_LOG, "TCPA LOG " }, \
{ CBMEM_ID_TIMESTAMP, "TIME STAMP " }, \
{ CBMEM_ID_VBOOT_HANDOFF, "VBOOT " }, \
diff --git a/src/mainboard/google/foster/devicetree.cb b/src/mainboard/google/foster/devicetree.cb
index 947a269..f4d37ee 100644
--- a/src/mainboard/google/foster/devicetree.cb
+++ b/src/mainboard/google/foster/devicetree.cb
@@ -18,8 +18,6 @@
##
chip soc/nvidia/tegra210
- register "spintable_addr" = "0x80000008"
-
device cpu_cluster 0 on
device cpu 0 on end
device cpu 1 on end
diff --git a/src/mainboard/google/rush/Kconfig b/src/mainboard/google/rush/Kconfig
index d8b38d1..471b1f7 100644
--- a/src/mainboard/google/rush/Kconfig
+++ b/src/mainboard/google/rush/Kconfig
@@ -31,7 +31,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select MAINBOARD_DO_SOR_INIT
select MAINBOARD_HAS_CHROMEOS
select BOARD_ROMSIZE_KB_4096
- select ARM64_USE_SPINTABLE
config CHROMEOS
select CHROMEOS_VBNV_EC
diff --git a/src/mainboard/google/rush/devicetree.cb b/src/mainboard/google/rush/devicetree.cb
index 659de00..cea4cd6 100644
--- a/src/mainboard/google/rush/devicetree.cb
+++ b/src/mainboard/google/rush/devicetree.cb
@@ -18,8 +18,6 @@
##
chip soc/nvidia/tegra132
- register "spintable_addr" = "0x80000008"
-
device cpu_cluster 0 on
device cpu 0 on end
device cpu 1 on end
diff --git a/src/mainboard/google/rush_ryu/Kconfig b/src/mainboard/google/rush_ryu/Kconfig
index 5965abe..f00e283 100644
--- a/src/mainboard/google/rush_ryu/Kconfig
+++ b/src/mainboard/google/rush_ryu/Kconfig
@@ -32,7 +32,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select MAINBOARD_DO_DSI_INIT
select MAINBOARD_HAS_CHROMEOS
select BOARD_ROMSIZE_KB_8192
- select ARM64_USE_SPINTABLE
config CHROMEOS
select CHROMEOS_VBNV_EC
diff --git a/src/mainboard/google/rush_ryu/devicetree.cb b/src/mainboard/google/rush_ryu/devicetree.cb
index c7f504b..c04eeef 100644
--- a/src/mainboard/google/rush_ryu/devicetree.cb
+++ b/src/mainboard/google/rush_ryu/devicetree.cb
@@ -18,8 +18,6 @@
##
chip soc/nvidia/tegra132
- register "spintable_addr" = "0x80000008"
-
device cpu_cluster 0 on
device cpu 0 on end
device cpu 1 on end
diff --git a/src/mainboard/google/smaug/devicetree.cb b/src/mainboard/google/smaug/devicetree.cb
index 65f02b2..f40121d 100644
--- a/src/mainboard/google/smaug/devicetree.cb
+++ b/src/mainboard/google/smaug/devicetree.cb
@@ -18,8 +18,6 @@
##
chip soc/nvidia/tegra210
- register "spintable_addr" = "0x80000008"
-
device cpu_cluster 0 on
device cpu 0 on end
end
diff --git a/src/soc/nvidia/tegra132/chip.h b/src/soc/nvidia/tegra132/chip.h
index 675e794..6247ecd 100644
--- a/src/soc/nvidia/tegra132/chip.h
+++ b/src/soc/nvidia/tegra132/chip.h
@@ -24,9 +24,6 @@
#include <soc/nvidia/tegra/dc.h>
struct soc_nvidia_tegra132_config {
- /* Address to monitor if spintable employed. */
- uintptr_t spintable_addr;
-
/*
* panel resolution
* The two parameters below provides dc about panel spec.
diff --git a/src/soc/nvidia/tegra132/soc.c b/src/soc/nvidia/tegra132/soc.c
index a65f36d..e59e3b0 100644
--- a/src/soc/nvidia/tegra132/soc.c
+++ b/src/soc/nvidia/tegra132/soc.c
@@ -20,7 +20,6 @@
#include <arch/io.h>
#include <arch/cache.h>
-#include <arch/spintable.h>
#include <cpu/cpu.h>
#include <bootmode.h>
#include <bootstate.h>
@@ -90,12 +89,8 @@ static void lock_down_vpr(void)
static void soc_init(device_t dev)
{
- struct soc_nvidia_tegra132_config *cfg;
-
clock_init_arm_generic_timer();
- cfg = dev->chip_info;
- spintable_init((void *)cfg->spintable_addr);
arch_initialize_cpus(dev, &cntrl_ops);
/* Lock down VPR */
diff --git a/src/soc/nvidia/tegra210/chip.h b/src/soc/nvidia/tegra210/chip.h
index efce901..24feebf 100644
--- a/src/soc/nvidia/tegra210/chip.h
+++ b/src/soc/nvidia/tegra210/chip.h
@@ -24,9 +24,6 @@
#include <soc/nvidia/tegra/dc.h>
struct soc_nvidia_tegra210_config {
- /* Address to monitor if spintable employed. */
- uintptr_t spintable_addr;
-
/*
* panel resolution
* The two parameters below provides dc about panel spec.
diff --git a/src/soc/nvidia/tegra210/soc.c b/src/soc/nvidia/tegra210/soc.c
index 981b09c..04db31c 100644
--- a/src/soc/nvidia/tegra210/soc.c
+++ b/src/soc/nvidia/tegra210/soc.c
@@ -20,7 +20,6 @@
#include <arch/io.h>
#include <arch/cache.h>
-#include <arch/spintable.h>
#include <cpu/cpu.h>
#include <bootmode.h>
#include <bootstate.h>
@@ -84,12 +83,8 @@ static struct cpu_control_ops cntrl_ops = {
static void soc_init(device_t dev)
{
- struct soc_nvidia_tegra210_config *cfg;
-
clock_init_arm_generic_timer();
- cfg = dev->chip_info;
- spintable_init((void *)cfg->spintable_addr);
arch_initialize_cpus(dev, &cntrl_ops);
if (!IS_ENABLED(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT))
More information about the coreboot-gerrit
mailing list