Linaro-acpi

linaro-acpi@lists.linaro.org

820 discussions

[RFC][PATCH 0/3] Prototype cpu topology and cpu-hotplug (part1: parse MADT)

by Hanjun Guo

Here is the first part of cpu topology and cpu-hotplug code for RFC. In this part of code, MADT is being parsed and the cpu possible map and cpu present map are prefilled. CPU possible map is equal to the GIC entries in MADT no matter enabled or disabled, and cpu present map limits to the enabled cpu in MADT. Without this patch set, CPU possible map is equal to the cpus found in FDT, and cpu possible map is the same as cpu present map with no hotplugble cpus. Boot information with this patch (with --cores=4): ACPI: GIC (acpi_id[0x0000] gic_id[0x0000] enabled) // MADT was parsed ACPI: GIC (acpi_id[0x0001] gic_id[0x0001] enabled) ACPI: GIC (acpi_id[0x0002] gic_id[0x0002] disabled) ACPI: GIC (acpi_id[0x0003] gic_id[0x0003] disabled) ACPI: GIC (acpi_id[0x0004] gic_id[0x0004] disabled) ACPI: GIC (acpi_id[0x0005] gic_id[0x0005] disabled) ACPI: GIC (acpi_id[0x0006] gic_id[0x0006] disabled) ACPI: GIC (acpi_id[0x0007] gic_id[0x0007] disabled) 2 CPUs available, 8 CPUs total //find 2 enabled cpus which // is the same as MADT described ACPI: GIC Distributor (id[0x0000] address[0x2c001000] gsi_base[0]) // IOAPIC(GIC distributor is also parsed) Using ACPI (MADT) for SMP configuration information SMP: limits to 4 CPUs // the foundation model supports only 4 four cpus SMP: Allowing 4 CPUs, 2 hotplug CPUs // so limits to 4 cpus, and 2 disabled in MADT can be hotpluged PERCPU: Embedded 10 pages/cpu @ffffffc03ffa7000 s11520 r8192 d21248 u40960 [....] CPU1: Booted secondary processor Brought up 2 CPUs SMP: Total of 2 processors activated (400.00 BogoMIPS). Because only 2 cpus is enabled in MADT, so the system will up 2 cpus in despite of --cores=4. Next step will prototype cpu topology code for ACPI driver. This is the RFC version only, will updated and rebased on the new acpi branch. Hanjun Guo (3): ARM / ACPI: MADT for armv8 foundation model ARM / ACPI: Core functions for MADT parse ARM / ACPI: Prefill cpu possible and present map when boot with MADT arch/arm64/boot/asl/foundation-v8.acpi/apic.asl | 175 ++++++++------- arch/arm64/include/asm/acpi.h | 3 + arch/arm64/kernel/setup.c | 6 + arch/arm64/kernel/smp.c | 2 + drivers/acpi/plat/arm/boot.c | 261 ++++++++++++++++++++++- drivers/acpi/tables.c | 21 ++ 6 files changed, 374 insertions(+), 94 deletions(-) -- 1.7.9.5

10 years, 10 months

ACPI/ACPI-combined switch 10AM BST 27th June

by Graeme Gregory

Hi Guys, Discussed this with Al and I think everyone is finished with 3.9 work now! I am going to switch the acpi branch to be the contents of the acpi-combined branch at 10AM tomorrow my local time! The two branches will initially be :- acpi - our work branch now based off 3.10-rcX kernel (and will track mainline releases/rc releases) acpi-ltfixes - is the acpi branch + some needed fixes from Samsung landing team for Arndale prototyping. We can of course create more short term branches for demos, prototyping as needed. Thanks Graeme

10 years, 10 months

[PATCH] ARM64: ACPI: Initialize acpi_state variable

by naresh.bhat＠linaro.org

From: Naresh Bhat <naresh.bhat(a)linaro.org> CC drivers/acpi/fan.o drivers/acpi/fan.c: In function ‘fan_get_cur_state’: drivers/acpi/fan.c:96:9: warning: ‘acpi_state’ may be used uninitialized in this function [-Wuninitialized] --- drivers/acpi/fan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c index f815da8..f61f7fd 100644 --- a/drivers/acpi/fan.c +++ b/drivers/acpi/fan.c @@ -84,7 +84,7 @@ static int fan_get_cur_state(struct thermal_cooling_device *cdev, unsigned long { struct acpi_device *device = cdev->devdata; int result; - int acpi_state; + int acpi_state = 0; if (!device) return -EINVAL; -- 1.7.9.5

10 years, 10 months

[PATCH] ARM64: ACPI:Fix compilation warning prodessor_idle

by naresh.bhat＠linaro.org

From: Naresh Bhat <naresh.bhat(a)linaro.org> CC drivers/acpi/processor_idle.o drivers/acpi/processor_idle.c: In function ‘acpi_idle_play_dead’: drivers/acpi/processor_idle.c:758:28: warning: unused variable ‘cx’ [-Wunused-variable] --- drivers/acpi/processor_idle.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 0b6132a..0993526 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c @@ -755,8 +755,9 @@ static int acpi_idle_enter_c1(struct cpuidle_device *dev, */ static int acpi_idle_play_dead(struct cpuidle_device *dev, int index) { +#ifdef CONFIG_X86 struct acpi_processor_cx *cx = per_cpu(acpi_cstate[index], dev->cpu); - +#endif ACPI_FLUSH_CPU_CACHE(); while (1) { -- 1.7.9.5

10 years, 10 months

[PATCH 0/3] clean up some early boot messages

by al.stone＠linaro.org

From: Al Stone <ahs3(a)redhat.com> There are a few places where the printk()s no longer serve a useful purpose -- those printk()s are removed by the first patch. The second and third patches remove printk() in favor of proper use of pr_err() and pr_debug(), respectively. Al Stone (3): ARM: ACPI: remove some unneeded printk messages used for initial debugging ARM: ACPI: use pr_err() as one should and not printk() ACPI: ARM: use pr_debug() as one should and not printk() drivers/acpi/osl.c | 31 +++++++++++++++---------------- drivers/acpi/plat/arm/boot.c | 9 --------- 2 files changed, 15 insertions(+), 25 deletions(-) -- 1.8.1.4

10 years, 10 months

acpi-combined & network/LPAE fixes for Arndale

by Graeme Gregory

Hi guys, I have extracted the necessary fixes from Samsung Landing Team tree for Arndale network (actually usb hack) and LPAE. I have uploaded these on top of our acpi-combined branch as acpi-combined-ltfixes. This should make it easier for people testing armv7. I have attached my config file for this. Thanks Graeme

10 years, 10 months

[PATCH] ARM64: ACPI: Skeleton topology.c hack to make arm64 compile

by Graeme Gregory

From: Graeme Gregory <graeme.gregory(a)linaro.org> This is just a null do nothing topology.c in order to make acpi_processor driver compile on arm64. It will need to be replaced by fully functional driver at later date. Signed-off-by: Graeme Gregory <graeme.gregory(a)linaro.org> --- arch/arm64/include/asm/cpu.h | 1 + arch/arm64/include/asm/topology.h | 8 ++++++++ arch/arm64/kernel/Makefile | 3 +++ arch/arm64/kernel/topology.c | 20 ++++++++++++++++++++ 4 files changed, 32 insertions(+) create mode 100644 arch/arm64/include/asm/topology.h create mode 100644 arch/arm64/kernel/topology.c diff --git a/arch/arm64/include/asm/cpu.h b/arch/arm64/include/asm/cpu.h index 5341811..dbeb98d 100644 --- a/arch/arm64/include/asm/cpu.h +++ b/arch/arm64/include/asm/cpu.h @@ -10,6 +10,7 @@ #include <linux/percpu.h> #include <linux/cpu.h> +#include <linux/topology.h> struct cpuinfo_arm { struct cpu cpu; diff --git a/arch/arm64/include/asm/topology.h b/arch/arm64/include/asm/topology.h new file mode 100644 index 0000000..22c9421 --- /dev/null +++ b/arch/arm64/include/asm/topology.h @@ -0,0 +1,8 @@ +#ifndef _ASM_ARM64_TOPOLOGY_H +#define _ASM_ARM64_TOPOLOGY_H + +void arch_fix_phys_package_id(int num, u32 slot); + +#include <asm-generic/topology.h> + +#endif /* _ASM_ARM64_TOPOLOGY_H */ diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index f8bebc1..c5e29d5 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -28,3 +28,6 @@ extra-y := $(head-y) vmlinux.lds $(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/topology.c b/arch/arm64/kernel/topology.c new file mode 100644 index 0000000..cb548f1 --- /dev/null +++ b/arch/arm64/kernel/topology.c @@ -0,0 +1,20 @@ +#include <linux/cpu.h> +#include <linux/cpumask.h> +#include <linux/export.h> +#include <linux/init.h> +#include <linux/percpu.h> +#include <linux/node.h> +#include <linux/nodemask.h> +#include <linux/of.h> +#include <linux/sched.h> +#include <linux/slab.h> + +#include <asm/cputype.h> +#include <asm/topology.h> +#include <asm/cpu.h> + +void arch_fix_phys_package_id(int num, u32 slot) +{ +} +EXPORT_SYMBOL_GPL(arch_fix_phys_package_id); + -- 1.7.10.4

10 years, 10 months

ACPI Table Size Issue

by Graeme Gregory

Hi, I have managed to boot our ACPI enabled kernel on the beaglebone device which has working earlyprintk. You will see from the log below there is a very familiar looking RCU stall, same place as I was seeing with Hanjun's patches. I did not check the size of his blob but I suspect its the same issue and actually not to do with cpu topology at all. Anyway below is the log of the ACPI kernel booting on the beaglebone. Thanks Graeme U-Boot 2013.04-00003-g8fc034b-dirty (Jun 22 2013 - 00:52:05) I2C: ready DRAM: 256 MiB WARNING: Caches not enabled NAND: No NAND device found!!! 0 MiB MMC: OMAP SD/MMC: 0, OMAP SD/MMC: 1 *** Warning - readenv() failed, using default environment musb-hdrc: ConfigData=0xde (UTMI-8, dyn FIFOs, HB-ISO Rx, HB-ISO Tx, SoftConn) musb-hdrc: MHDRC RTL version 2.0 musb-hdrc: setup fifo_mode 4 musb-hdrc: 28/31 max ep, 16384/16384 memory USB Peripheral mode controller at 47401000 using PIO, IRQ 0 musb-hdrc: ConfigData=0xde (UTMI-8, dyn FIFOs, HB-ISO Rx, HB-ISO Tx, SoftConn) musb-hdrc: MHDRC RTL version 2.0 musb-hdrc: setup fifo_mode 4 musb-hdrc: 28/31 max ep, 16384/16384 memory USB Host mode controller at 47401800 using PIO, IRQ 0 Net: <ethaddr> not set. Validating first E-fuse MAC cpsw, usb_ether Hit any key to stop autoboot: 0 link up on port 0, speed 100, full duplex BOOTP broadcast 1 DHCP client bound to address 192.168.222.138 Using cpsw device TFTP from server 192.168.222.11; our IP address is 192.168.222.138 Filename 'zImage-bone'. Load address: 0x80200000 Loading: ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ######################################## 625 KiB/s done Bytes transferred = 4197392 (400c10 hex) link up on port 0, speed 100, full duplex Using cpsw device TFTP from server 192.168.222.11; our IP address is 192.168.222.138 Filename 'am335x-bone.dtb'. Load address: 0x80f80000 Loading: ## 489.3 KiB/s done Bytes transferred = 8518 (2146 hex) link up on port 0, speed 100, full duplex Using cpsw device TFTP from server 192.168.222.11; our IP address is 192.168.222.138 Filename 'bone.acpi'. Load address: 0x80f84000 Loading: # 416 KiB/s done Bytes transferred = 4266 (10aa hex) ## Flattened Device Tree blob at 80f80000 Booting using the fdt blob at 0x80f80000 * acpi: cmdline image address = 0x80f84000 * acpi: Length of blob 4258 * acpi: loading to 8f236000, end 8f2370aa Loading Device Tree to 8f230000, end 8f235145 ... OK using: ACPI Starting kernel ... [ 0.000000] Booting Linux on physical CPU 0x0 [ 0.000000] Linux version 3.10.0-rc6-00024-g0eba3878-dirty (graeme@xora-build) (gcc version 4.7.3 20130328 (prerelease) (crosstool-NG linaro-1.13.1-4.7-2013.04-20130415 - Linaro GCC 2013.04) ) #125 SMP Sat Jun 22 00:39:57 BST 2013 [ 0.000000] CPU: ARMv7 Processor [413fc082] revision 2 (ARMv7), cr=10c53c7d [ 0.000000] CPU: PIPT / VIPT nonaliasing data cache, VIPT aliasing instruction cache [ 0.000000] Machine: Generic AM33XX (Flattened Device Tree), model: TI AM335x BeagleBone [ 0.000000] bootconsole [earlycon0] enabled [ 0.000000] cma: CMA: reserved 16 MiB at 8e000000 [ 0.000000] Memory policy: ECC disabled, Data cache writeback [ 0.000000] acpi: vaddress c0fb5000 [ 0.000000] acpi: Phys 80fb5000 Virt c0fb5000 [ 0.000000] acpi: GOT HERE1 [ 0.000000] acpi: GOT HERE2 [ 0.000000] (I) entering acpi_tb_parse_root_table [ 0.000000] ACPI: RSDP 80fb5000 00024 (v02 LINARO) [ 0.000000] ACPI: XSDT 80fb5024 000C4 (v01 LINARO ARNDALE 00000014 INTL 20130517) [ 0.000000] ACPI: FACP 80fb50e8 0010C (v05 LINARO ARNDALE 00000000 INTL 20130517) [ 0.000000] ACPI: DSDT 80fb51f4 00228 (v01 LINARO ARNDALE 00000002 INTL 20130517) [ 0.000000] ACPI: MSCT 80fb545c 00090 (v01 LINARO ARNDALE 00000001 INTL 20130517) [ 0.000000] ACPI: MCHI 80fb54ec 00045 (v01 LINARO ARNDALE 02000715 INTL 20130517) [ 0.000000] ACPI: FPDT 80fb5531 00064 (v01 LINARO ARNDALE 00000001 INTL 20130517) [ 0.000000] ACPI: ERST 80fb5595 00230 (v01 LINARO ARNDALE 00000001 INTL 20130517) [ 0.000000] ACPI: EINJ 80fb57c5 00130 (v01 LINARO ARNDALE 00000001 INTL 20130517) [ 0.000000] ACPI: CPEP 80fb58f5 00034 (v01 LINARO ARNDALE 00000000 INTL 20130517) [ 0.000000] ACPI: UEFI 80fb5929 00036 (v01 LINARO ARNDALE 00000001 INTL 20130517) [ 0.000000] ACPI: SRAT 80fb595f 00080 (v03 LINARO ARNDALE 00000001 INTL 20130517) [ 0.000000] ACPI: SPMI 80fb59df 00041 (v04 LINARO ARNDALE 00000000 INTL 20130517) [ 0.000000] ACPI: SLIT 80fb5a20 001BC (v01 LINARO ARNDALE 00000001 INTL 20130517) [ 0.000000] ACPI: OEM0 80fb5bdc 00024 (v01 LINARO ARNDALE 0000000A INTL 20130517) [ 0.000000] ACPI: MPST 80fb5c00 000B6 (v01 LINARO ARNDALE 00000001 INTL 20130517) [ 0.000000] ACPI: MCFG 80fb5cb6 0003C (v01 LINARO ARNDALE 00000001 INTL 20130517) [ 0.000000] ACPI: APIC 80fb5cf2 000F6 (v01 LINARO ARNDALE 00000001 INTL 20130517) [ 0.000000] ACPI: HEST 80fb5de8 001D4 (v01 LINARO ARNDALE 00000001 INTL 20130517) [ 0.000000] ACPI: GTDT 80fb5fbc 00050 (v01 LINARO ARNDALE 00000001 INTL 20130517) [ 0.000000] ACPI: ECDT 80fb600c 00042 (v01 LINARO ARNDALE 00000001 INTL 20130517) [ 0.000000] ACPI: BERT 80fb604e 00030 (v01 LINARO ARNDALE 00000001 INTL 20130517) [ 0.000000] ACPI: SSDT 80fb607e 00024 (v02 LINARO ARNDALE 00000001 INTL 20130517) [ 0.000000] (I) acpi_table_init call completed [ 0.000000] (I) exit acpi_boot_table_init [ 0.000000] enter early_acpi_boot_init [ 0.000000] CPU: All CPU(s) started in SVC mode. [ 0.000000] AM335X ES1.0 (neon ) [ 0.000000] enter acpi_boot_init [ 0.000000] PERCPU: Embedded 9 pages/cpu @c0fbd000 s14592 r8192 d14080 u36864 [ 0.000000] Built 1 zonelists in Zone order, mobility grouping on. Total pages: 64768 [ 0.000000] Kernel command line: console=ttyO0,115200n8 root=/dev/mmcblk0p2 rootwait earlyprintk [ 0.000000] PID hash table entries: 1024 (order: 0, 4096 bytes) [ 0.000000] Dentry cache hash table entries: 32768 (order: 5, 131072 bytes) [ 0.000000] Inode-cache hash table entries: 16384 (order: 4, 65536 bytes) [ 0.000000] Memory: 255MB = 255MB total [ 0.000000] Memory: 228316k/228316k available, 33828k reserved, 0K highmem [ 0.000000] Virtual kernel memory layout: [ 0.000000] vector : 0xffff0000 - 0xffff1000 ( 4 kB) [ 0.000000] fixmap : 0xfff00000 - 0xfffe0000 ( 896 kB) [ 0.000000] vmalloc : 0xd0800000 - 0xff000000 ( 744 MB) [ 0.000000] lowmem : 0xc0000000 - 0xd0000000 ( 256 MB) [ 0.000000] pkmap : 0xbfe00000 - 0xc0000000 ( 2 MB) [ 0.000000] modules : 0xbf000000 - 0xbfe00000 ( 14 MB) [ 0.000000] .text : 0xc0008000 - 0xc074a858 (7435 kB) [ 0.000000] .init : 0xc074b000 - 0xc07b2900 ( 415 kB) [ 0.000000] .data : 0xc07b4000 - 0xc084cc88 ( 612 kB) [ 0.000000] .bss : 0xc084cc88 - 0xc0db18e8 (5524 kB) [ 0.000000] Hierarchical RCU implementation. [ 0.000000] RCU restricting CPUs from NR_CPUS=2 to nr_cpu_ids=1. [ 0.000000] NR_IRQS:16 nr_irqs:16 16 [ 0.000000] IRQ: Found an INTC at 0xfa200000 (revision 5.0) with 128 interrupts [ 0.000000] Total of 128 interrupts on 1 active controller [ 0.000000] OMAP clockevent source: timer2 at 24000000 Hz [ 0.000000] sched_clock: 32 bits at 24MHz, resolution 41ns, wraps every 178956ms [ 0.000000] OMAP clocksource: timer1 at 24000000 Hz [ 0.000000] Console: colour dummy device 80x30 [ 0.000000] Lock dependency validator: Copyright (c) 2006 Red Hat, Inc., Ingo Molnar [ 0.000000] ... MAX_LOCKDEP_SUBCLASSES: 8 [ 0.000000] ... MAX_LOCK_DEPTH: 48 [ 0.000000] ... MAX_LOCKDEP_KEYS: 8191 [ 0.000000] ... CLASSHASH_SIZE: 4096 [ 0.000000] ... MAX_LOCKDEP_ENTRIES: 16384 [ 0.000000] ... MAX_LOCKDEP_CHAINS: 32768 [ 0.000000] ... CHAINHASH_SIZE: 16384 [ 0.000000] memory used by lock dependency info: 3695 kB [ 0.000000] per task-struct memory footprint: 1152 bytes [ 0.062509] Calibrating delay loop... 363.72 BogoMIPS (lpj=1818624) [ 0.119238] pid_max: default: 32768 minimum: 301 [ 0.124655] Security Framework initialized [ 0.129183] Mount-cache hash table entries: 512 [ 0.146500] CPU: Testing write buffer coherency: ok [ 0.151830] ACPI: Core revision 20130328 [ 0.158096] ACPI: All ACPI Tables successfully acquired [ 0.165239] CPU0: thread -1, cpu 0, socket -1, mpidr 0 [ 0.170770] Setting up static identity map for 0xc0524750 - 0xc05247c0 [ 0.181338] Brought up 1 CPUs [ 0.184500] SMP: Total of 1 processors activated (363.72 BogoMIPS). [ 0.191125] CPU: All CPU(s) started in SVC mode. [ 0.199973] devtmpfs: initialized [ 0.283148] pinctrl core: initialized pinctrl subsystem [ 0.294438] regulator-dummy: no parameters [ 0.303478] NET: Registered protocol family 16 [ 0.318367] DMA: preallocated 256 KiB pool for atomic coherent allocations [ 0.355305] OMAP GPIO hardware version 0.1 [ 0.387884] No ATAGs? [ 0.390062] hw-breakpoint: debug architecture 0x4 unsupported. [ 0.486304] bio: create slab <bio-0> at 0 [ 0.494907] ACPI: Added _OSI(Module Device) [ 0.499533] ACPI: Added _OSI(Processor Device) [ 0.504209] ACPI: Added _OSI(3.0 _SCP Extensions) [ 0.509237] ACPI: Added _OSI(Processor Aggregator Device) [ 0.515927] ACPI: EC: EC description table is found, configuring boot EC [ 0.525136] ACPI: Interpreter enabled [ 0.529128] ACPI Exception: AE_NOT_FOUND, While evaluating Sleep State [\_S1_] (20130328/hwxface-568) [ 0.538831] ACPI Exception: AE_NOT_FOUND, While evaluating Sleep State [\_S2_] (20130328/hwxface-568) [ 0.548527] ACPI Exception: AE_NOT_FOUND, While evaluating Sleep State [\_S3_] (20130328/hwxface-568) [ 0.558323] ACPI Exception: AE_NOT_FOUND, While evaluating Sleep State [\_S5_] (20130328/hwxface-568) [ 0.568153] ACPI: (supports S0) [ 0.571482] ACPI: Using GIC for interrupt routing [ 21.596404] INFO: rcu_sched detected stalls on CPUs/tasks: {} (detected by 0, t=2102 jiffies, g=4294967023, c=4294967022, q=67) [ 21.608358] INFO: Stall ended before state dump start

10 years, 10 months

[PATCH] ARM: ACPI: remove 64bit divide replace with do_div

by Graeme Gregory

From: Graeme Gregory <graeme.gregory(a)linaro.org> I some situations custom 64bit by 32bit divide was giving the wrong values so replace it with the internal kernel do_div function instead. Signed-off-by: Graeme Gregory <graeme.gregory(a)linaro.org> --- arch/arm/include/asm/acpi.h | 18 ++--- drivers/acpi/plat/arm/Makefile | 1 - drivers/acpi/plat/arm/acpi_div_64_by_32.S | 105 ----------------------------- 3 files changed, 7 insertions(+), 117 deletions(-) delete mode 100644 drivers/acpi/plat/arm/acpi_div_64_by_32.S diff --git a/arch/arm/include/asm/acpi.h b/arch/arm/include/asm/acpi.h index aafc276..e752c5c 100644 --- a/arch/arm/include/asm/acpi.h +++ b/arch/arm/include/asm/acpi.h @@ -31,6 +31,8 @@ #include <linux/init.h> +#include <asm/div64.h> + #define COMPILER_DEPENDENT_INT64 long long #define COMPILER_DEPENDENT_UINT64 unsigned long long @@ -54,17 +56,11 @@ #define ACPI_ENABLE_IRQS() local_irq_enable() #define ACPI_FLUSH_CPU_CACHE() flush_cache_all() -#define ACPI_DIV_64_BY_32(n_hi, n_lo, d32, q32, r32) \ - asm ("mov r0, %2\n" \ - "mov r1, %3\n" \ - "mov r2, %4\n" \ - "bl __arm_acpi_div_64_by_32\n" \ - "mov %0, r0\n" \ - "mov %1, r1\n" \ - : "=r"(q32), "=r"(r32) /* output operands */ \ - : "r"(n_hi), "r"(n_lo), "r"(d32) /* input operands */ \ - : "r0", "r1", "r2" /* clobbered registers */ \ - ) +#define ACPI_DIV_64_BY_32(n_hi, n_lo, d32, q32, r32) { \ + u64 value = (u64)n_hi << 32 | n_lo; \ + r32 = do_div(value, d32); \ + q32 = value; \ + } #define ACPI_SHIFT_RIGHT_64(n_hi, n_lo) \ asm ("mov r0, %2\n" \ diff --git a/drivers/acpi/plat/arm/Makefile b/drivers/acpi/plat/arm/Makefile index aa9dd19..a1f056d 100644 --- a/drivers/acpi/plat/arm/Makefile +++ b/drivers/acpi/plat/arm/Makefile @@ -1,4 +1,3 @@ obj-y += boot.o obj-y += sleep.o -obj-$(CONFIG_ARM) += acpi_div_64_by_32.o diff --git a/drivers/acpi/plat/arm/acpi_div_64_by_32.S b/drivers/acpi/plat/arm/acpi_div_64_by_32.S deleted file mode 100644 index 573bce4..0000000 --- a/drivers/acpi/plat/arm/acpi_div_64_by_32.S +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Copyright (c) 2013, Al Stone <ahs3(a)redhat.com> - * - * __acpi_arm_div64_by_32: perform integer division of a 64-bit value - * a 32-bit value - * - * The algorithm is borrowed from the GMP library, but has been redone - * here in order to put this implementation under a GPLv2 license. - * - * 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; either version 2 of the License, or - * (at your option) any later version. - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifdef __ARM_ARCH_7A__ - -#include <linux/linkage.h> - -/* - * This needs to be called in the following manner: - * n_lo => r0 # these are the low 32 bits of the dividend - * n_hi => r1 # the high 32 bits of the dividend - * d32 => r2 # the 32-bit divisor - * - * The result is: - * q32 <= r0 # the 32-bit quotient - * r32 <= r1 # the 32-bit remainder - * - * This should be consistent with the normal ARMv7 calling conventions. - * - */ - -ENTRY(__arm_acpi_div_64_by_32) - mov r12, #32 // loop counter - cmp r2, #0x80000000 // check divisor MSB and clear carry - bcs bigdiv - -loop: adcs r1, r1, r1 // handle each bit - adc r0, r0, r0 - cmp r0, r2 - subcs r0, r0, r2 - sub r12, r12, #1 - teq r12, #0 - bne loop - - mov r3, r0 // stash the remainder for a tic - adc r0, r1, r1 // quotient: add in last carry - mov r1, r3 // remainder (now in right register) - mov pc, lr - -bigdiv: stmfd sp!, { r8, lr } // clear some scratch space - - and r8, r1, #1 // save LSB of dividend - mov lr, r0, lsl #31 - orrs r1, lr, r1, lsr #1 // r1 = lower part >> 1 bit - mov r0, r0, lsr #1 // r0 = higher part >> 1 bit - - and lr, r2, #1 // save LSB of divisor - movs r2, r2, lsr #1 // r2 = floor(divisor / 2) - adc r2, r2, #0 // r2 = ceil(divisor / 2) - -loop2: adcs r1, r1, r1 // handle each bit - adc r0, r0, r0 - cmp r0, r2 - subcs r0, r0, r2 - sub r12, r12, #1 - teq r12, #0 - bne loop2 - - adc r1, r1, r1 // shift and add last carry - add r0, r8, r0, lsl #1 // shift in remaining dividend LSB - tst lr, lr - beq evendiv - - rsb r2, lr, r2, lsl #1 // restore divisor value - adds r0, r0, r1 // adjust for omitted divisor LSB - addcs r1, r1, #1 // adjust quotient if a carry results - subcs r0, r0, r2 // adjust remainder, if carry - cmp r0, r2 - subcs r0, r0, #1 // adjust remainder - addcs r1, r1, #1 // adjust quotient - -evendiv: - mov r3, r0 // stash the remainder for a tic - mov r0, r1 // quotient - mov r1, r3 // remainder - - ldmfd sp!, { r8, pc } // restore the registers used - -ENDPROC(__arm_acpi_div_64_by_32) - -#else /* ! __ARM_ARCH_7A__ */ -#error __arm_acpi_div_64_by_32 not defined for this architecture -#endif - -- 1.7.10.4

10 years, 10 months

RAS and ACPI

by Tomasz Nowicki

Hi Robert, I am doing APEI implementation of ACPI specification. That is, ACPI kernel side of RAS work. I am manage to test some of APEI functionality now. I would like to ask about status of LEG-389 since I want to avoid of doing work that may be actually already done. Regards, Tomasz Nowicki

10 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Linaro-acpi