Linaro-acpi July 2013

linaro-acpi@lists.linaro.org

12 participants
30 discussions

[PATCH 0/5] Foundation model network by ACPI

by Graeme Gregory

Hi Guys, In the spirit of starting things for our LCU target here is the network device on Foundation model converted to probe from ACPI. Things that have come out of this conversion: 1) we need an ACPI equivalent of simple-bus from FDT 2) we need to decide on how to handle irq domains and especially the domain for the GIC. Thanks Graeme

10 years, 9 months

[RFC][PATCH] Add ARM64 cpu topology definition

by Hanjun Guo

We can define the cpu topology of ARM64 platform from the affinity of processors which is defined in the MPIDR register. After we get the cpu topology, we can use it for sched_mc and sched_smt. Signed-off-by: Hanjun Guo <hanjun.guo(a)linaro.org> --- arch/arm64/Kconfig | 25 ++++++++ arch/arm64/include/asm/cputype.h | 13 ++++ arch/arm64/include/asm/topology.h | 35 +++++++++++ arch/arm64/kernel/Makefile | 5 +- arch/arm64/kernel/smp.c | 6 ++ arch/arm64/kernel/topology.c | 120 +++++++++++++++++++++++++++++++++++++ 6 files changed, 200 insertions(+), 4 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index c967b11..67c1c53 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -144,6 +144,31 @@ config SMP If you don't know what to do here, say N. +config ARM64_CPU_TOPOLOGY + bool "Support cpu topology definition" + depends on SMP && ARM64 + default y + help + Support ARM64 cpu topology definition. The MPIDR register defines + affinity between processors which is then used to describe the cpu + topology of an ARM64 System. + +config SCHED_MC + bool "Multi-core scheduler support" + depends on ARM64_CPU_TOPOLOGY + help + Multi-core scheduler support improves the CPU scheduler's decision + making when dealing with multi-core CPU chips at a cost of slightly + increased overhead in some places. If unsure say N here. + +config SCHED_SMT + bool "SMT scheduler support" + depends on ARM64_CPU_TOPOLOGY + help + Improves the CPU scheduler's decision making when dealing with + MultiThreading at a cost of slightly increased overhead in some + places. If unsure say N here. + config NR_CPUS int "Maximum number of CPUs (2-32)" range 2 32 diff --git a/arch/arm64/include/asm/cputype.h b/arch/arm64/include/asm/cputype.h index cf27494..75ac91c 100644 --- a/arch/arm64/include/asm/cputype.h +++ b/arch/arm64/include/asm/cputype.h @@ -30,6 +30,19 @@ #define MPIDR_HWID_BITMASK 0xff00ffffff +#define MPIDR_SMP_BITMASK (0x3 << 30) +#define MPIDR_SMP_VALUE (0x2 << 30) + +#define MPIDR_MT_BITMASK (0x1 << 24) + +#define MPIDR_LEVEL_BITS 8 +#define MPIDR_LEVEL_MASK ((1 << MPIDR_LEVEL_BITS) - 1) + +#define MPIDR_AFFINITY_LEVEL_0(mpidr) ((mpidr) & MPIDR_LEVEL_MASK) +#define MPIDR_AFFINITY_LEVEL_1(mpidr) ((mpidr >> 8) & MPIDR_LEVEL_MASK) +#define MPIDR_AFFINITY_LEVEL_2(mpidr) ((mpidr >> 16) & MPIDR_LEVEL_MASK) +#define MPIDR_AFFINITY_LEVEL_3(mpidr) ((mpidr >> 32) & MPIDR_LEVEL_MASK) + #define read_cpuid(reg) ({ \ u64 __val; \ asm("mrs %0, " reg : "=r" (__val)); \ diff --git a/arch/arm64/include/asm/topology.h b/arch/arm64/include/asm/topology.h index 22c9421..6436e73 100644 --- a/arch/arm64/include/asm/topology.h +++ b/arch/arm64/include/asm/topology.h @@ -1,8 +1,43 @@ #ifndef _ASM_ARM64_TOPOLOGY_H #define _ASM_ARM64_TOPOLOGY_H +#ifdef CONFIG_ARM64_CPU_TOPOLOGY + +#include <linux/cpumask.h> + +struct cputopo_arm64 { + int thread_id; + int core_id; + int socket_id; + cpumask_t thread_sibling; + cpumask_t core_sibling; +}; + +DECLARE_PER_CPU(struct cputopo_arm64, cpu_topology); + +#define cpu_topo(cpu) per_cpu(cpu_topology, cpu) + +#define topology_physical_package_id(cpu) (cpu_topo(cpu).socket_id) +#define topology_core_id(cpu) (cpu_topo(cpu).core_id) +#define topology_core_cpumask(cpu) (&cpu_topo(cpu).core_sibling) +#define topology_thread_cpumask(cpu) (&cpu_topo(cpu).thread_sibling) + +#define mc_capable() (cpu_topology[0].socket_id != -1) +#define smt_capable() (cpu_topology[0].thread_id != -1) + +void init_cpu_topology(void); +void store_cpu_topology(unsigned int cpuid); +const struct cpumask *cpu_coregroup_mask(int cpu); void arch_fix_phys_package_id(int num, u32 slot); +#else + +static inline void arch_fix_phys_package_id(int num, u32 slot) {} +static inline void init_cpu_topology(void) { } +static inline void store_cpu_topology(unsigned int cpuid) { } + +#endif + #include <asm-generic/topology.h> #endif /* _ASM_ARM64_TOPOLOGY_H */ diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index c5e29d5..a47c359 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -18,6 +18,7 @@ arm64-obj-$(CONFIG_SMP) += smp.o smp_spin_table.o smp_psci.o arm64-obj-$(CONFIG_HW_PERF_EVENTS) += perf_event.o arm64-obj-$(CONFIG_HAVE_HW_BREAKPOINT)+= hw_breakpoint.o arm64-obj-$(CONFIG_EARLY_PRINTK) += early_printk.o +arm64-obj-$(CONFIG_ARM64_CPU_TOPOLOGY) += topology.o obj-y += $(arm64-obj-y) vdso/ obj-m += $(arm64-obj-m) @@ -27,7 +28,3 @@ extra-y := $(head-y) vmlinux.lds # vDSO - this must be built first to generate the symbol offsets $(call objectify,$(arm64-obj-y)): $(obj)/vdso/vdso-offsets.h $(obj)/vdso/vdso-offsets.h: $(obj)/vdso - -# Hack for now -obj-y += topology.o - diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c index 5ec1723..36d09fe 100644 --- a/arch/arm64/kernel/smp.c +++ b/arch/arm64/kernel/smp.c @@ -39,6 +39,7 @@ #include <asm/atomic.h> #include <asm/cacheflush.h> #include <asm/cputype.h> +#include <asm/topology.h> #include <asm/mmu_context.h> #include <asm/pgtable.h> #include <asm/pgalloc.h> @@ -206,6 +207,8 @@ asmlinkage void __cpuinit secondary_start_kernel(void) local_irq_enable(); local_fiq_enable(); + store_cpu_topology(cpu); + /* * OK, now it's safe to let the boot CPU continue. Wait for * the CPU migration code to notice that the CPU is online @@ -407,6 +410,9 @@ void __init smp_prepare_cpus(unsigned int max_cpus) int cpu, err; unsigned int ncores = num_possible_cpus(); + init_cpu_topology(); + store_cpu_topology(smp_processor_id()); + /* * are we trying to boot more cores than exist? */ diff --git a/arch/arm64/kernel/topology.c b/arch/arm64/kernel/topology.c index 5c8e69c..20fd521 100644 --- a/arch/arm64/kernel/topology.c +++ b/arch/arm64/kernel/topology.c @@ -1,3 +1,16 @@ +/* + * arch/arm64/kernel/topology.c + * + * Copyright (C) 2013 Linaro Limited. + * Written by: Hanjun Guo + * + * based on arch/arm/kernel/topology.c + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file "COPYING" in the main directory of this archive + * for more details. + */ + #include <linux/cpu.h> #include <linux/cpumask.h> #include <linux/export.h> @@ -13,6 +26,113 @@ #include <asm/topology.h> #include <asm/cpu.h> +DEFINE_PER_CPU(struct cputopo_arm64, cpu_topology); + +const struct cpumask *cpu_coregroup_mask(int cpu) +{ + return &cpu_topo(cpu).core_sibling; +} + +void update_siblings_masks(unsigned int cpuid) +{ + struct cputopo_arm64 *topo, *cpuid_topo = &cpu_topo(cpuid); + int cpu; + + /* update core and thread sibling masks */ + for_each_possible_cpu(cpu) { + topo = &cpu_topo(cpu); + + if (cpuid_topo->socket_id != topo->socket_id) + continue; + + cpumask_set_cpu(cpuid, &topo->core_sibling); + if (cpu != cpuid) + cpumask_set_cpu(cpu, &cpuid_topo->core_sibling); + + if (cpuid_topo->core_id != topo->core_id) + continue; + + cpumask_set_cpu(cpuid, &topo->thread_sibling); + if (cpu != cpuid) + cpumask_set_cpu(cpu, &cpuid_topo->thread_sibling); + } + smp_wmb(); +} + +/* + * store_cpu_topology is called at boot when only one cpu is running + * and with the mutex cpu_hotplug.lock locked, when several cpus have booted, + * which prevents simultaneous write access to cpu_topology array + */ +void store_cpu_topology(unsigned int cpuid) +{ + struct cputopo_arm64 *cpuid_topo = &cpu_topo(cpuid); + unsigned int mpidr; + + /* If the cpu topology has been already set, just return */ + if (cpuid_topo->core_id != -1) + return; + + mpidr = read_cpuid_mpidr(); + + /* create cpu topology mapping */ + if ((mpidr & MPIDR_SMP_BITMASK) == MPIDR_SMP_VALUE) { + /* + * This is a multiprocessor system + * multiprocessor format & multiprocessor mode field are set + */ + + if (mpidr & MPIDR_MT_BITMASK) { + /* core performance interdependency */ + cpuid_topo->thread_id = MPIDR_AFFINITY_LEVEL_0(mpidr); + cpuid_topo->core_id = MPIDR_AFFINITY_LEVEL_1(mpidr); + cpuid_topo->socket_id = MPIDR_AFFINITY_LEVEL_2(mpidr); + } else { + /* largely independent cores */ + cpuid_topo->thread_id = -1; + cpuid_topo->core_id = MPIDR_AFFINITY_LEVEL_0(mpidr); + cpuid_topo->socket_id = MPIDR_AFFINITY_LEVEL_1(mpidr); + } + } else { + /* + * This is an uniprocessor system + * we are in multiprocessor format but uniprocessor system + * or in the old uniprocessor format + */ + cpuid_topo->thread_id = -1; + cpuid_topo->core_id = 0; + cpuid_topo->socket_id = -1; + } + + update_siblings_masks(cpuid); + + printk(KERN_INFO "CPU%u: thread %d, cpu %d, socket %d, mpidr %x\n", + cpuid, cpu_topo(cpuid).thread_id, + cpu_topo(cpuid).core_id, + cpu_topo(cpuid).socket_id, mpidr); +} + +/* + * init_cpu_topology is called at boot when only one cpu is running + * which prevent simultaneous write access to cpu_topology array + */ +void __init init_cpu_topology(void) +{ + unsigned int cpu; + + /* init core mask */ + for_each_possible_cpu(cpu) { + struct cputopo_arm64 *topo = &cpu_topo(cpu); + + topo->thread_id = -1; + topo->core_id = -1; + topo->socket_id = -1; + cpumask_clear(&topo->core_sibling); + cpumask_clear(&topo->thread_sibling); + } + smp_wmb(); +} + void arch_fix_phys_package_id(int num, u32 slot) { } -- 1.7.9.5

10 years, 9 months

[PATCHv2 0/2] Initialise ACPI from EFI

by Graeme Gregory

These patches implement getting ACPI tables from EFI and remove some unneeded debugging which will crash kernel in this case. Changes since v1 Handled the case where CONFIG_EFI=n in patch 1/2

10 years, 9 months

[PATCH 0/1] Workaround for ACPI table mapping across page size boundary

by Tomasz Nowicki

If MAB tool would form ACPI blob in the way where some of the tbales cross page size boundary current kernel can not map it correctly (table size < 4k case is allowed). We round up table to page size reaching PAGE_SIZE alignment. Kernel should handle with such case thus changes within acpi_map() function are needed. -- 1.7.9.5

10 years, 9 months

[PATCH] of: fdt: remove debugging from ACPI initialisation

by Graeme Gregory

From: Graeme Gregory <graeme.gregory(a)linaro.org> Remove the debugging code from acpi initialisation as it is no longer needed and causes issues becuase it is called before paging_init() which depending on memory layout crashes. Signed-off-by: Graeme Gregory <graeme.gregory(a)linaro.org> --- drivers/of/fdt.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 0535169..3b8b38e 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -728,20 +728,6 @@ int __init early_init_dt_scan_acpi(unsigned long node, const char *uname, if (p != NULL && l > 0) pinfo->size = be32_to_cpu(*p); - printk("acpi: start info is 0x%016llX, %lu bytes\n", - pinfo->phys_address, pinfo->size); - - memblock_reserve(pinfo->phys_address, pinfo->size); - - sig = phys_to_virt(pinfo->phys_address); - - printk("acpi: sig is \"%c%c%c%c\"\n", - sig[0], sig[1], sig[2], sig[3]); - printk("acpi: info is %02x %02x %02x %02x\n", - sig[4], sig[5], sig[6], sig[7]); - printk("acpi: first table is \"%c%c%c%c\"\n", - sig[8], sig[9], sig[10], sig[11]); - return 1; } #endif -- 1.7.10.4

10 years, 9 months

ACPI Blob Handling (offset correction)

by Graeme Gregory

Hi Guys, I think I made a mistake when I originally did the u-boot ACPI blob loading. I would like to correct that mistake before we progress further. I do not think I should have passed the ACPI.... (length) piece to the kernel I don't think we actually need in as nothing apart from our debug code ever checks it. The length is also redundant as its stored in the FDT if we ever need it (which we don't currently). When I did the grub/efi work the bootloader is passing a pointer to RSDT into the kernel. I would like to fix the u-boot path to do the same (and simplify some code). This will obviously mean people need to refresh their u-boot. What do you guys think? Thanks Graeme

10 years, 9 months

processor_idle issues

by Graeme Gregory

Hi Guys, Ok, a serious impediment to us upstreaming code is the state of CPU idle, currently we have large chunks of code #defined out for our build. We need to come up with a plan to solve this! Graeme

10 years, 9 months

[PATCHv3] grub armacpi implementation

by Graeme Gregory

Hi, this is v3 of the patch after review from Leif. Leif it would be good if you could carry this in your branch to save us having to maintain another grub tree. Changes since v2: Updates to pointer types to prevent compile warnings (-Werror issues) from Leif Changes since v1: Address Leifs comments:- return type for grub_cmd_armcpi does not return with bogus error leaving file open, not jumps to out: properly bogus whitespace change removed. Thanks Graeme

10 years, 9 months

[PATCHv2] grub armacpi implementation

by Graeme Gregory

Hi, this is v2 of the patch after review from Leif. Leif it would be good if you could carry this in your branch to save us having to maintain another grub tree. Changes since v1: Address Leifs comments:- return type for grub_cmd_armcpi does not return with bogus error leaving file open, not jumps to out: properly bogus whitespace change removed. Thanks Graeme

10 years, 9 months

[PATCH] arm: efi fill the acpi20 pointer if it is given

by Graeme Gregory

From: Graeme Gregory <graeme.gregory(a)linaro.org> Make sure to update the efi.acpi20 pointer if the ACPI20 GUID is found in the system configuration tables list. Signed-off-by: Graeme Gregory <graeme.gregory(a)linaro.org> --- arch/arm/kernel/efi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/kernel/efi.c b/arch/arm/kernel/efi.c index 86bb75e..482ff48 100644 --- a/arch/arm/kernel/efi.c +++ b/arch/arm/kernel/efi.c @@ -160,6 +160,8 @@ static int __init uefi_config_init(void) str, (u32)table); if (!efi_guidcmp(guid, ACPI_TABLE_GUID)) efi.acpi = table; + if (!efi_guidcmp(guid, ACPI_20_TABLE_GUID)) + efi.acpi20 = table; if (!efi_guidcmp(guid, SMBIOS_TABLE_GUID)) efi.smbios = table; } -- 1.7.10.4

10 years, 9 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Linaro-acpi July 2013