- Linaro-acpi - lists.linaro.org

[PATCH v2 1/1] ACPI, PCI, ISA: Call ISA-specific code only for architectures which support ISA.

by Tomasz Nowicki

This commit moves ISA-specific code to separate function and makes that function depend on CONFIG_{E}ISA so that we do not have to maintain acpi_isa_irq_to_gsi() function for architectures which do not support ISA. Signed-off-by: Tomasz Nowicki <tomasz.nowicki(a)linaro.org> --- drivers/acpi/pci_irq.c | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c index 361b40c..0a553a0 100644 --- a/drivers/acpi/pci_irq.c +++ b/drivers/acpi/pci_irq.c @@ -370,6 +370,30 @@ static struct acpi_prt_entry *acpi_pci_irq_lookup(struct pci_dev *dev, int pin) return NULL; } +#if IS_ENABLED(CONFIG_ISA) || IS_ENABLED(CONFIG_EISA) +static int acpi_isa_register_gsi(struct pci_dev *dev) +{ + u32 dev_gsi; + + /* Interrupt Line values above 0xF are forbidden */ + if (dev->irq > 0 && (dev->irq <= 0xF) && + (acpi_isa_irq_to_gsi(dev->irq, &dev_gsi) == 0)) { + dev_warn(&dev->dev, "PCI INT %c: no GSI - using ISA IRQ %d\n", + pin_name(dev->pin), dev->irq); + acpi_register_gsi(&dev->dev, dev_gsi, + ACPI_LEVEL_SENSITIVE, + ACPI_ACTIVE_LOW); + return 0; + } + return -EINVAL; +} +#else +static inline int acpi_isa_register_gsi(struct pci_dev *dev) +{ + return -ENODEV; +} +#endif + int acpi_pci_irq_enable(struct pci_dev *dev) { struct acpi_prt_entry *entry; @@ -416,16 +440,7 @@ int acpi_pci_irq_enable(struct pci_dev *dev) * driver reported one, then use it. Exit in any case. */ if (gsi < 0) { - u32 dev_gsi; - /* Interrupt Line values above 0xF are forbidden */ - if (dev->irq > 0 && (dev->irq <= 0xF) && - (acpi_isa_irq_to_gsi(dev->irq, &dev_gsi) == 0)) { - dev_warn(&dev->dev, "PCI INT %c: no GSI - using ISA IRQ %d\n", - pin_name(pin), dev->irq); - acpi_register_gsi(&dev->dev, dev_gsi, - ACPI_LEVEL_SENSITIVE, - ACPI_ACTIVE_LOW); - } else { + if (acpi_isa_register_gsi(dev)) { dev_warn(&dev->dev, "PCI INT %c: no GSI\n", pin_name(pin)); } -- 1.7.9.5

11 years, 5 months

2
3
0 0

[Update][PATCH v5 5/5] ACPI: Replace printk with pr_* in tables.c

by Hanjun Guo

This patch just do some clean up to replace printk with pr_*, and introduces pr_fmt() to remove all PREFIXs in this file, no functional change. Signed-off-by: Hanjun Guo <hanjun.guo(a)linaro.org> --- Hi Rafael, I introduced pr_fmt() as Sudeep suggested, and remove all PREFIXs in this file, hope this patch is ok to you. Thanks Hanjun --- drivers/acpi/tables.c | 128 +++++++++++++++++++++---------------------------- 1 file changed, 55 insertions(+), 73 deletions(-) diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c index 5837f85..2178229 100644 --- a/drivers/acpi/tables.c +++ b/drivers/acpi/tables.c @@ -23,6 +23,8 @@ * */ +#define pr_fmt(fmt) "ACPI: " fmt + #include <linux/init.h> #include <linux/kernel.h> #include <linux/smp.h> @@ -33,8 +35,6 @@ #include <linux/acpi.h> #include <linux/bootmem.h> -#define PREFIX "ACPI: " - #define ACPI_MAX_TABLES 128 static char *mps_inti_flags_polarity[] = { "dfl", "high", "res", "low" }; @@ -55,10 +55,9 @@ void acpi_table_print_madt_entry(struct acpi_subtable_header *header) { struct acpi_madt_local_apic *p = (struct acpi_madt_local_apic *)header; - printk(KERN_INFO PREFIX - "LAPIC (acpi_id[0x%02x] lapic_id[0x%02x] %s)\n", - p->processor_id, p->id, - (p->lapic_flags & ACPI_MADT_ENABLED) ? "enabled" : "disabled"); + pr_info("LAPIC (acpi_id[0x%02x] lapic_id[0x%02x] %s)\n", + p->processor_id, p->id, + (p->lapic_flags & ACPI_MADT_ENABLED) ? "enabled" : "disabled"); } break; @@ -66,11 +65,9 @@ void acpi_table_print_madt_entry(struct acpi_subtable_header *header) { struct acpi_madt_local_x2apic *p = (struct acpi_madt_local_x2apic *)header; - printk(KERN_INFO PREFIX - "X2APIC (apic_id[0x%02x] uid[0x%02x] %s)\n", - p->local_apic_id, p->uid, - (p->lapic_flags & ACPI_MADT_ENABLED) ? - "enabled" : "disabled"); + pr_info("X2APIC (apic_id[0x%02x] uid[0x%02x] %s)\n", + p->local_apic_id, p->uid, + (p->lapic_flags & ACPI_MADT_ENABLED) ? "enabled" : "disabled"); } break; @@ -78,9 +75,8 @@ void acpi_table_print_madt_entry(struct acpi_subtable_header *header) { struct acpi_madt_io_apic *p = (struct acpi_madt_io_apic *)header; - printk(KERN_INFO PREFIX - "IOAPIC (id[0x%02x] address[0x%08x] gsi_base[%d])\n", - p->id, p->address, p->global_irq_base); + pr_info("IOAPIC (id[0x%02x] address[0x%08x] gsi_base[%d])\n", + p->id, p->address, p->global_irq_base); } break; @@ -88,18 +84,15 @@ void acpi_table_print_madt_entry(struct acpi_subtable_header *header) { struct acpi_madt_interrupt_override *p = (struct acpi_madt_interrupt_override *)header; - printk(KERN_INFO PREFIX - "INT_SRC_OVR (bus %d bus_irq %d global_irq %d %s %s)\n", - p->bus, p->source_irq, p->global_irq, - mps_inti_flags_polarity[p->inti_flags & ACPI_MADT_POLARITY_MASK], - mps_inti_flags_trigger[(p->inti_flags & ACPI_MADT_TRIGGER_MASK) >> 2]); + pr_info("INT_SRC_OVR (bus %d bus_irq %d global_irq %d %s %s)\n", + p->bus, p->source_irq, p->global_irq, + mps_inti_flags_polarity[p->inti_flags & ACPI_MADT_POLARITY_MASK], + mps_inti_flags_trigger[(p->inti_flags & ACPI_MADT_TRIGGER_MASK) >> 2]); if (p->inti_flags & ~(ACPI_MADT_POLARITY_MASK | ACPI_MADT_TRIGGER_MASK)) - printk(KERN_INFO PREFIX - "INT_SRC_OVR unexpected reserved flags: 0x%x\n", - p->inti_flags & + pr_info("INT_SRC_OVR unexpected reserved flags: 0x%x\n", + p->inti_flags & ~(ACPI_MADT_POLARITY_MASK | ACPI_MADT_TRIGGER_MASK)); - } break; @@ -107,11 +100,10 @@ void acpi_table_print_madt_entry(struct acpi_subtable_header *header) { struct acpi_madt_nmi_source *p = (struct acpi_madt_nmi_source *)header; - printk(KERN_INFO PREFIX - "NMI_SRC (%s %s global_irq %d)\n", - mps_inti_flags_polarity[p->inti_flags & ACPI_MADT_POLARITY_MASK], - mps_inti_flags_trigger[(p->inti_flags & ACPI_MADT_TRIGGER_MASK) >> 2], - p->global_irq); + pr_info("NMI_SRC (%s %s global_irq %d)\n", + mps_inti_flags_polarity[p->inti_flags & ACPI_MADT_POLARITY_MASK], + mps_inti_flags_trigger[(p->inti_flags & ACPI_MADT_TRIGGER_MASK) >> 2], + p->global_irq); } break; @@ -119,12 +111,11 @@ void acpi_table_print_madt_entry(struct acpi_subtable_header *header) { struct acpi_madt_local_apic_nmi *p = (struct acpi_madt_local_apic_nmi *)header; - printk(KERN_INFO PREFIX - "LAPIC_NMI (acpi_id[0x%02x] %s %s lint[0x%x])\n", - p->processor_id, - mps_inti_flags_polarity[p->inti_flags & ACPI_MADT_POLARITY_MASK ], - mps_inti_flags_trigger[(p->inti_flags & ACPI_MADT_TRIGGER_MASK) >> 2], - p->lint); + pr_info("LAPIC_NMI (acpi_id[0x%02x] %s %s lint[0x%x])\n", + p->processor_id, + mps_inti_flags_polarity[p->inti_flags & ACPI_MADT_POLARITY_MASK ], + mps_inti_flags_trigger[(p->inti_flags & ACPI_MADT_TRIGGER_MASK) >> 2], + p->lint); } break; @@ -137,12 +128,11 @@ void acpi_table_print_madt_entry(struct acpi_subtable_header *header) polarity = p->inti_flags & ACPI_MADT_POLARITY_MASK; trigger = (p->inti_flags & ACPI_MADT_TRIGGER_MASK) >> 2; - printk(KERN_INFO PREFIX - "X2APIC_NMI (uid[0x%02x] %s %s lint[0x%x])\n", - p->uid, - mps_inti_flags_polarity[polarity], - mps_inti_flags_trigger[trigger], - p->lint); + pr_info("X2APIC_NMI (uid[0x%02x] %s %s lint[0x%x])\n", + p->uid, + mps_inti_flags_polarity[polarity], + mps_inti_flags_trigger[trigger], + p->lint); } break; @@ -150,9 +140,8 @@ void acpi_table_print_madt_entry(struct acpi_subtable_header *header) { struct acpi_madt_local_apic_override *p = (struct acpi_madt_local_apic_override *)header; - printk(KERN_INFO PREFIX - "LAPIC_ADDR_OVR (address[%p])\n", - (void *)(unsigned long)p->address); + pr_info("LAPIC_ADDR_OVR (address[%p])\n", + (void *)(unsigned long)p->address); } break; @@ -160,10 +149,9 @@ void acpi_table_print_madt_entry(struct acpi_subtable_header *header) { struct acpi_madt_io_sapic *p = (struct acpi_madt_io_sapic *)header; - printk(KERN_INFO PREFIX - "IOSAPIC (id[0x%x] address[%p] gsi_base[%d])\n", - p->id, (void *)(unsigned long)p->address, - p->global_irq_base); + pr_info("IOSAPIC (id[0x%x] address[%p] gsi_base[%d])\n", + p->id, (void *)(unsigned long)p->address, + p->global_irq_base); } break; @@ -171,10 +159,9 @@ void acpi_table_print_madt_entry(struct acpi_subtable_header *header) { struct acpi_madt_local_sapic *p = (struct acpi_madt_local_sapic *)header; - printk(KERN_INFO PREFIX - "LSAPIC (acpi_id[0x%02x] lsapic_id[0x%02x] lsapic_eid[0x%02x] %s)\n", - p->processor_id, p->id, p->eid, - (p->lapic_flags & ACPI_MADT_ENABLED) ? "enabled" : "disabled"); + pr_info("LSAPIC (acpi_id[0x%02x] lsapic_id[0x%02x] lsapic_eid[0x%02x] %s)\n", + p->processor_id, p->id, p->eid, + (p->lapic_flags & ACPI_MADT_ENABLED) ? "enabled" : "disabled"); } break; @@ -182,19 +169,17 @@ void acpi_table_print_madt_entry(struct acpi_subtable_header *header) { struct acpi_madt_interrupt_source *p = (struct acpi_madt_interrupt_source *)header; - printk(KERN_INFO PREFIX - "PLAT_INT_SRC (%s %s type[0x%x] id[0x%04x] eid[0x%x] iosapic_vector[0x%x] global_irq[0x%x]\n", - mps_inti_flags_polarity[p->inti_flags & ACPI_MADT_POLARITY_MASK], - mps_inti_flags_trigger[(p->inti_flags & ACPI_MADT_TRIGGER_MASK) >> 2], - p->type, p->id, p->eid, p->io_sapic_vector, - p->global_irq); + pr_info("PLAT_INT_SRC (%s %s type[0x%x] id[0x%04x] eid[0x%x] iosapic_vector[0x%x] global_irq[0x%x]\n", + mps_inti_flags_polarity[p->inti_flags & ACPI_MADT_POLARITY_MASK], + mps_inti_flags_trigger[(p->inti_flags & ACPI_MADT_TRIGGER_MASK) >> 2], + p->type, p->id, p->eid, p->io_sapic_vector, + p->global_irq); } break; default: - printk(KERN_WARNING PREFIX - "Found unsupported MADT entry (type = 0x%x)\n", - header->type); + pr_warn("Found unsupported MADT entry (type = 0x%x)\n", + header->type); break; } } @@ -225,7 +210,7 @@ acpi_table_parse_entries(char *id, acpi_get_table_with_size(id, 0, &table_header, &tbl_size); if (!table_header) { - printk(KERN_WARNING PREFIX "%4.4s not present\n", id); + pr_warn("%4.4s not present\n", id); return -ENODEV; } @@ -248,7 +233,7 @@ acpi_table_parse_entries(char *id, * infinite loop. */ if (entry->length == 0) { - pr_err(PREFIX "[%4.4s:0x%02x] Invalid zero length\n", id, entry_id); + pr_err("[%4.4s:0x%02x] Invalid zero length\n", id, entry_id); goto err; } @@ -256,8 +241,8 @@ acpi_table_parse_entries(char *id, ((unsigned long)entry + entry->length); } if (max_entries && count > max_entries) { - printk(KERN_WARNING PREFIX "[%4.4s:0x%02x] ignored %i entries of " - "%i found\n", id, entry_id, count - max_entries, count); + pr_warn("[%4.4s:0x%02x] ignored %i entries of %i found\n", + id, entry_id, count - max_entries, count); } early_acpi_os_unmap_memory((char *)table_header, tbl_size); @@ -322,13 +307,11 @@ static void __init check_multiple_madt(void) acpi_get_table_with_size(ACPI_SIG_MADT, 2, &table, &tbl_size); if (table) { - printk(KERN_WARNING PREFIX - "BIOS bug: multiple APIC/MADT found," - " using %d\n", acpi_apic_instance); - printk(KERN_WARNING PREFIX - "If \"acpi_apic_instance=%d\" works better, " - "notify linux-acpi(a)vger.kernel.org\n", - acpi_apic_instance ? 0 : 2); + pr_warn("BIOS bug: multiple APIC/MADT found, using %d\n", + acpi_apic_instance); + pr_warn("If \"acpi_apic_instance=%d\" works better, " + "notify linux-acpi(a)vger.kernel.org\n", + acpi_apic_instance ? 0 : 2); early_acpi_os_unmap_memory(table, tbl_size); } else @@ -365,8 +348,7 @@ static int __init acpi_parse_apic_instance(char *str) acpi_apic_instance = simple_strtoul(str, NULL, 0); - printk(KERN_NOTICE PREFIX "Shall use APIC/MADT table %d\n", - acpi_apic_instance); + pr_notice("Shall use APIC/MADT table %d\n", acpi_apic_instance); return 0; } -- 1.7.9.5

11 years, 5 months

1
0
0 0

[PATCH v4 0/5] Prepare for running ACPI on !x86 and !ia64

by Hanjun Guo

Some of the ACPI code is arch-dependent and make the code can't be compiled on !x86 or !ia64, the first two patches just do some rework on the idle_boot_override and _PDC related stuff to make the ACPI code more arch-independent. The third patch just introduce map_gic_id() for ACPI processor core followed the ACPI 5.0 spec. Last two patches are just some cleanups. I have compiled the kernel successfully after appling this patch set on x86 and ia64. Changes for v4: a) remove preprocessor directives in function bodies; b) add another two patches for cleanups. Changes for v3: Fix the issues pointed out by Lan Tianyu and add the Reviewed-by for first patch. Changes for v2: a) add #if defined(CONFIG_X86) || defined(CONFIG_IA64) for idle_boot_override related code; b) Rebased on 3.14-rc1. Changes since the RFC version: a) Remove the RFC tag; b) Move idle_boot_override out of the arch directory suggested by Alan; c) Make these 3 patches as a separate patch set since there are not not related to the ARM/ARM64 platform. Hanjun Guo (5): ACPI / idle: Make idle_boot_override depend on x86 and ia64 ACPI / processor_core: Rework _PDC related stuff to make it more arch-independent ACPI / processor: Introduce map_gic_id() to get apic id from MADT or _MAT method ACPI: Move BAD_MADT_ENTRY() to linux/acpi.h ACPI: Replace printk with pr_* in tables.c arch/ia64/include/asm/acpi.h | 5 +-- arch/ia64/kernel/acpi.c | 18 ++++++-- arch/x86/include/asm/acpi.h | 19 +-------- arch/x86/kernel/acpi/boot.c | 4 -- arch/x86/kernel/acpi/cstate.c | 29 +++++++++++++ drivers/acpi/processor_core.c | 92 ++++++++++++++++++++++++----------------- drivers/acpi/tables.c | 51 +++++++++-------------- include/linux/acpi.h | 4 ++ 8 files changed, 124 insertions(+), 98 deletions(-) -- 1.7.9.5

11 years, 5 months

4
12
0 0

[PATCH 0/3] some tidying for acpi-asl

by Graeme Gregory

Hi Guys, Just a couple of .gitignore tidyups to prevent objects/targets appearing in the repo. Also add two missing tables to mab. Graeme

11 years, 6 months

2
4
0 0

[PATCH v2 0/3] Prepare for running ACPI on !x86 and !ia64

by Hanjun Guo

Some of the ACPI code is arch-dependent and make the code can't be compiled on !x86 or !ia64, the first two patches just do some rework on the idle_boot_override and _PDC related stuff to make the ACPI code more arch-independent. The third patch just introduce map_gic_id() for ACPI processor core followed by the ACPI 5.0 spec. I have compiled the kernel successfully after appling this patch set on x86 and ia64. Changes for v2: a) add #if defined(CONFIG_X86) || defined(CONFIG_IA64) for idle_boot_override related code; b) Rebased on 3.14-rc1. Changes since the RFC version: a) Remove the RFC tag; b) Move idle_boot_override out of the arch directory suggested by Alan; c) Make these 3 patches as a separate patch set since there are not not related to the ARM/ARM64 platform. Hanjun Guo (3): ACPI / idle: Make idle_boot_override depend on x86 and ia64 ACPI / processor_core: Rework _PDC related stuff to make it more arch-independent ACPI: Introduce map_gic_id() to get apic id from MADT or _MAT method arch/ia64/include/asm/acpi.h | 5 +-- arch/ia64/kernel/acpi.c | 17 +++++++++ arch/x86/include/asm/acpi.h | 19 +-------- arch/x86/kernel/acpi/cstate.c | 31 +++++++++++++++ drivers/acpi/processor_core.c | 85 ++++++++++++++++++++++++----------------- 5 files changed, 99 insertions(+), 58 deletions(-) -- 1.7.9.5

11 years, 6 months

3
8
0 0

leg-kernel tag leg-20140217.0 released

by Graeme Gregory

The leg-kernel release has been made and tagged as leg-20140217.0 This is based on mainline kernel v3.14-rc3 Repository : http://git.linaro.org/arm/acpi/leg-kernel.git Direct Link: https://git.linaro.org/arm/acpi/leg-kernel.git/commit/f7f2b0bff8dacdb0e5768… Notes :- 1) starting from this release, a FDT is not used to describe the platform. The kernel uses ACPI tables only. This release contains prototype code to boot the CPUs from information held in the MADT. It is hard coded to PSCI control method for the FVP base model.

11 years, 6 months

1
0
0 0

leg-kernel tag leg-20140211.0 released

by Graeme Gregory

The leg-kernel release has been made and tagged as leg-20140211.0 This is based on mainline kernel v3.14-rc2 Repository : http://git.linaro.org/arm/acpi/leg-kernel.git Direct Link: http://git.linaro.org/arm/acpi/leg-kernel.git/commit/a48313884f9124e9703f8c… Notes :- 1) starting from this release, a FDT is not used to describe the platform. The kernel uses ACPI tables only. Given that current ACPI 5.0 tables have limitations in the MADT fields with regards to CPU topology for ARM platforms, currently this means that booting with ACPI will boot with only one processor running. This will remain until ACPI booting from PSCI prototype is completed. As hinted last month with the introduction of a dummy patch[1], the team is focusing on this and plans to present a prototype solution at LCA-14. Booting in FDT mode is unaffected. [1] http://www.spinics.net/lists/linux-acpi/msg48537.html

11 years, 6 months

1
0
0 0

[PATCH v3 0/3] Prepare for running ACPI on !x86 and !ia64

by Hanjun Guo

Some of the ACPI code is arch-dependent and make the code can't be compiled on !x86 or !ia64, the first two patches just do some rework on the idle_boot_override and _PDC related stuff to make the ACPI code more arch-independent. The third patch just introduce map_gic_id() for ACPI processor core followed the ACPI 5.0 spec. I have compiled the kernel successfully after appling this patch set on x86 and ia64. Changes for v3: Fix the issues pointed out by Lan Tianyu and and the Reviewed-by for first patch. Changes for v2: a) add #if defined(CONFIG_X86) || defined(CONFIG_IA64) for idle_boot_override related code; b) Rebased on 3.14-rc1. Changes since the RFC version: a) Remove the RFC tag; b) Move idle_boot_override out of the arch directory suggested by Alan; c) Make these 3 patches as a separate patch set since there are not not related to the ARM/ARM64 platform. Hanjun Guo (3): ACPI / idle: Make idle_boot_override depend on x86 and ia64 ACPI / processor_core: Rework _PDC related stuff to make it more arch-independent ACPI: Introduce map_gic_id() to get apic id from MADT or _MAT method arch/ia64/include/asm/acpi.h | 5 +-- arch/ia64/kernel/acpi.c | 17 +++++++++ arch/x86/include/asm/acpi.h | 19 +-------- arch/x86/kernel/acpi/cstate.c | 31 +++++++++++++++ drivers/acpi/processor_core.c | 85 ++++++++++++++++++++++++----------------- 5 files changed, 99 insertions(+), 58 deletions(-) -- 1.7.9.5

11 years, 6 months

1
3
0 0

[Update][PATCH 1/2] ACPI / processor: Replace hard-coded "ACPI0007" with ACPI_PROCESSOR_DEVICE_HID

by Hanjun Guo

Replace "ACPI0007" with ACPI_PROCESSOR_DEVICE_HID to improve code readability. Signed-off-by: Hanjun Guo <hanjun.guo(a)linaro.org> --- drivers/acpi/processor_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index a4eea9a..f31d0fb 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c @@ -390,5 +390,5 @@ void __init acpi_early_processor_set_pdc(void) acpi_walk_namespace(ACPI_TYPE_PROCESSOR, ACPI_ROOT_OBJECT, ACPI_UINT32_MAX, early_init_pdc, NULL, NULL, NULL); - acpi_get_devices("ACPI0007", early_init_pdc, NULL, NULL); + acpi_get_devices(ACPI_PROCESSOR_DEVICE_HID, early_init_pdc, NULL, NULL); } -- 1.7.9.5

11 years, 6 months

1
0
0 0

[PATCH 1/2] ACPI / processor: Replace hard-coded "ACPI0007" with ACPI_PROCESSOR_DEVICE_HID

by Hanjun Guo

Replace "ACPI0007" with ACPI_PROCESSOR_DEVICE_HID to improve code readability. Signed-off-by: Hanjun Guo <hanjun.guo(a)linaro.org> --- drivers/acpi/processor_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index a4eea9a..849cfd6 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c @@ -390,5 +390,6 @@ void __init acpi_early_processor_set_pdc(void) acpi_walk_namespace(ACPI_TYPE_PROCESSOR, ACPI_ROOT_OBJECT, ACPI_UINT32_MAX, early_init_pdc, NULL, NULL, NULL); - acpi_get_devices("ACPI0007", early_init_pdc, NULL, NULL); + acpi_get_devices(ACPI_PROCESSOR_DEVICE_HID, + early_init_pdc, NULL, NULL); } -- 1.7.9.5

11 years, 6 months

2
3
0 0

leg-kernel tag leg-20140206.0 released

by Graeme Gregory

The leg-kernel release has been made and tagged as leg-20140206.0 This is based on mainline kernel v3.14-rc1 Repository : http://git.linaro.org/arm/acpi/leg-kernel.git Direct Link: http://git.linaro.org/arm/acpi/leg-kernel.git/commit/2089f78f14cf361b8cb9d7… Notes :- 1) starting from this release, a FDT is not used to describe the platform. The kernel uses ACPI tables only. Given that current ACPI 5.0 tables have limitations in the MADT fields with regards to CPU topology for ARM platforms, currently this means that booting with ACPI will boot with only one processor running. This will remain until ACPI booting from PSCI prototype is completed. As hinted last month with the introduction of a dummy patch[1], the team is focusing on this and plans to present a prototype solution at LCA-14. Booting in FDT mode is unaffected. [1] http://www.spinics.net/lists/linux-acpi/msg48537.html

11 years, 6 months

1
0
0 0

[PATCH] arm64: if we chose to boot from acpi then disable FDT

by Graeme Gregory

If the early boot methods of acpi are happy that we have valid ACPI tables and acpi=off has not been passed. Then do not unflatted devicetree effectively disabling further hardware probing from DT. Signed-off-by: Graeme Gregory <graeme.gregory(a)linaro.org> --- arch/arm64/kernel/setup.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 09f34ca..eac789d 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -242,7 +242,8 @@ void __init setup_arch(char **cmdline_p) paging_init(); request_standard_resources(); - unflatten_device_tree(); + if (acpi_disabled) + unflatten_device_tree(); psci_init(); -- 1.8.5.3

11 years, 6 months

3
5
0 0

Re: [Linaro-acpi] draft of blog post - UEFI and ACPI

by Grant Likely

My blog post on ACPI and UEFI has now gone public. Here's the link: http://www.secretlab.ca/archives/27 Jennifer, you can go ahead and publish on the Linaro blog also. g.

11 years, 6 months

1
0
0 0

[PATCH 00/20] Make ACPI core running on ARM64

by Hanjun Guo

This patch set trys to make ACPI core running on ARM64. 1. Why ACPI is needed ? ACPI provides standard interfaces for power managment, themal control, device enumeration and configuration and etc. So ACPI can make OS and hardware decoupling and make people upgrade software or hardware more easily. ACPI is more than that. It can provide standard error report interface called ACPI Platform Error Interface (APEI) for RAS features, and provide standard interface for dynamic system device reconfigurations such as CPU/memory/computer node hot-add and hot-remove, this is especially useful for servers. 2. Does ACPI run propably on ARM64 ? ACPI spec 5.0 introduces hardware reduced mode, GICC/GICD, GTDT for arch timer and etc for Socs. This makes it possible to run ACPI on ARM/ARM64. Some company already did that (UEFI+ACPI) on ARM platforms. ACPI spec for ARM/ARM64 is still need to be improved and people are working on that, but for now, we can run ACPI propably except for some new features such as PSCI and GICv3. 3. What we did in this patch set patch 1-8(Hanjun Guo) will make ACPI core running on ARM64 and make the compilation is ok on ARM64. patch 9-12 will enumeration cpus presented by MADT table. since PSCI is not available for ACPI 5.0, we use spin-table method for SMP initialization. patch 13-16 will initialize GIC in the system. ACPI only support one GIC and only report information about GICC and GICD, so there will some limitations for GICv3 and GICH for GICv2 for virtualization. patch 17-19 and patch from Amit will finish the arch timer initialization. We get informatiom from GTDT (Generic Timer Description Table) to initialize arch timer and introduce a macro CLOCKSOURCE_ACPI_DECLARE to do the same job as CLOCKSOURCE_OF_DECLARE to make it scalable for other timers. All the ACPI tables are available with BSD license at: git://git.linaro.org/arm/acpi/acpi-asl.git Changs since last RFC version: 1) Introduce some PCI functions when PCI is enabled 2) Select ACPI_REDUCED_HARDWARE_ONLY if ACPI is enabled 3) Remove ACPI based CPU hotplug code 4) Use spin-table method for SMP initialization 5) Add macro CLOCKSOURCE_ACPI_DECLARE for ACPI timer init 6) Address lots of comments and suggestions in last RFC version 7) Remove RFC tag and make all the patches seperated as two parts, one is "ACPI: Some patches to prepare for running ACPI on !x86 and !ia64", and another is this one. 8) Rebased on 3.13-rc8. Amit Daniel Kachhap (1): clocksource / acpi: Add macro CLOCKSOURCE_ACPI_DECLARE Hanjun Guo (19): ARM64 / ACPI: Make PCI optional for ACPI on ARM64 ARM64 : Add dummy asm/cpu.h ARM64 / ACPI: Introduce the skeleton of _PDC related for ARM64 ARM64 / ACPI: Introduce arm_core.c and its related head file ARM64 / ACPI: Introduce lowlevel suspend function ARM64 / ACPI: Introduce some PCI functions when PCI is enabled ARM64 / ACPI: Enable ARM64 in Kconfig ARM64 / ACPI: Select ACPI_REDUCED_HARDWARE_ONLY if ACPI is enabled on ARM64 ARM64 / ACPI: Implement core functions for parsing MADT table ARM64 / ACPI: Enumerate possible/present CPU set and map logical cpu id to APIC id ARM64 / ACPI: Get the enable method for SMP initialization ARM64 / ACPI: Use Parked Address in GIC structure for spin table SMP initialisation ARM64 / ACPI: Define ACPI_IRQ_MODEL_GIC needed for arm Irqchip / gic: Set as default domain so we can access from ACPI ACPI / ARM64: Update acpi_register_gsi to register with the core IRQ subsystem ACPI / GIC: Initialize GIC using the information in MADT clocksource / arch_timer: Use ACPI GTDT table to initialize arch timer clocksource / ACPI: Introduce clocksource_acpi_init() using CLOCKSOURCE_ACPI_DECLARE ARM64 / clocksource: Use clocksource_acpi_init() arch/arm64/Kconfig | 3 + arch/arm64/Makefile | 1 + arch/arm64/include/asm/acpi.h | 112 +++++++ arch/arm64/include/asm/cpu.h | 25 ++ arch/arm64/include/asm/cpu_ops.h | 1 + arch/arm64/include/asm/pci.h | 20 ++ arch/arm64/include/asm/processor.h | 2 + arch/arm64/include/asm/smp.h | 2 +- arch/arm64/kernel/cpu_ops.c | 2 +- arch/arm64/kernel/irq.c | 6 + arch/arm64/kernel/process.c | 3 + arch/arm64/kernel/setup.c | 6 + arch/arm64/kernel/smp.c | 42 ++- arch/arm64/kernel/smp_spin_table.c | 12 +- arch/arm64/kernel/time.c | 6 + arch/arm64/pci/Makefile | 1 + arch/arm64/pci/pci.c | 33 ++ drivers/acpi/Kconfig | 11 +- drivers/acpi/Makefile | 4 +- drivers/acpi/bus.c | 3 + drivers/acpi/internal.h | 7 + drivers/acpi/osl.c | 3 +- drivers/acpi/plat/Makefile | 1 + drivers/acpi/plat/arm-core.c | 599 ++++++++++++++++++++++++++++++++++ drivers/acpi/tables.c | 21 ++ drivers/clocksource/Makefile | 1 + drivers/clocksource/arm_arch_timer.c | 101 +++++- drivers/clocksource/clksrc-acpi.c | 36 ++ drivers/irqchip/irq-gic.c | 7 + include/asm-generic/vmlinux.lds.h | 10 + include/linux/acpi.h | 7 + include/linux/clocksource.h | 15 + include/linux/pci.h | 33 +- 33 files changed, 1099 insertions(+), 37 deletions(-) create mode 100644 arch/arm64/include/asm/acpi.h create mode 100644 arch/arm64/include/asm/cpu.h create mode 100644 arch/arm64/include/asm/pci.h create mode 100644 arch/arm64/pci/Makefile create mode 100644 arch/arm64/pci/pci.c create mode 100644 drivers/acpi/plat/Makefile create mode 100644 drivers/acpi/plat/arm-core.c create mode 100644 drivers/clocksource/clksrc-acpi.c -- 1.7.9.5

11 years, 6 months

11
86
0 0

[PATCH 1/2] ACPI / ACPICA: refactor acpi_evaluate_object() to reduce nesting if

by Hanjun Guo

acpi_evaluate_object() has nesting if judgement to make code a little bit complicated, refactor it to make things simple. Signed-off-by: Hanjun Guo <hanjun.guo(a)linaro.org> --- drivers/acpi/acpica/nsxfeval.c | 104 +++++++++++++++++++--------------------- 1 file changed, 50 insertions(+), 54 deletions(-) diff --git a/drivers/acpi/acpica/nsxfeval.c b/drivers/acpi/acpica/nsxfeval.c index 1f0c28b..a1b0b88 100644 --- a/drivers/acpi/acpica/nsxfeval.c +++ b/drivers/acpi/acpica/nsxfeval.c @@ -370,68 +370,64 @@ acpi_evaluate_object(acpi_handle handle, * If we are expecting a return value, and all went well above, * copy the return value to an external object. */ - if (return_buffer) { - if (!info->return_object) { - return_buffer->length = 0; - } else { - if (ACPI_GET_DESCRIPTOR_TYPE(info->return_object) == - ACPI_DESC_TYPE_NAMED) { - /* - * If we received a NS Node as a return object, this means that - * the object we are evaluating has nothing interesting to - * return (such as a mutex, etc.) We return an error because - * these types are essentially unsupported by this interface. - * We don't check up front because this makes it easier to add - * support for various types at a later date if necessary. - */ - status = AE_TYPE; - info->return_object = NULL; /* No need to delete a NS Node */ - return_buffer->length = 0; - } + if (!return_buffer) + goto out; - if (ACPI_SUCCESS(status)) { + if (!info->return_object) { + return_buffer->length = 0; + goto out; + } - /* Dereference Index and ref_of references */ + if (ACPI_GET_DESCRIPTOR_TYPE(info->return_object) == + ACPI_DESC_TYPE_NAMED) { + /* + * If we received a NS Node as a return object, this means that + * the object we are evaluating has nothing interesting to + * return (such as a mutex, etc.) We return an error because + * these types are essentially unsupported by this interface. + * We don't check up front because this makes it easier to add + * support for various types at a later date if necessary. + */ + status = AE_TYPE; + info->return_object = NULL; /* No need to delete a NS Node */ + return_buffer->length = 0; + } - acpi_ns_resolve_references(info); + if (ACPI_FAILURE(status)) + goto out; - /* Get the size of the returned object */ + /* Dereference Index and ref_of references */ - status = - acpi_ut_get_object_size(info->return_object, - &buffer_space_needed); - if (ACPI_SUCCESS(status)) { - - /* Validate/Allocate/Clear caller buffer */ - - status = - acpi_ut_initialize_buffer - (return_buffer, - buffer_space_needed); - if (ACPI_FAILURE(status)) { - /* - * Caller's buffer is too small or a new one can't - * be allocated - */ - ACPI_DEBUG_PRINT((ACPI_DB_INFO, - "Needed buffer size %X, %s\n", - (u32) - buffer_space_needed, - acpi_format_exception - (status))); - } else { - /* We have enough space for the object, build it */ - - status = - acpi_ut_copy_iobject_to_eobject - (info->return_object, - return_buffer); - } - } - } + acpi_ns_resolve_references(info); + + /* Get the size of the returned object */ + + status = acpi_ut_get_object_size(info->return_object, + &buffer_space_needed); + if (ACPI_SUCCESS(status)) { + + /* Validate/Allocate/Clear caller buffer */ + + status = acpi_ut_initialize_buffer(return_buffer, + buffer_space_needed); + if (ACPI_FAILURE(status)) { + /* + * Caller's buffer is too small or a new one can't + * be allocated + */ + ACPI_DEBUG_PRINT((ACPI_DB_INFO, + "Needed buffer size %X, %s\n", + (u32)buffer_space_needed, + acpi_format_exception(status))); + } else { + /* We have enough space for the object, build it */ + + status = acpi_ut_copy_iobject_to_eobject( + info->return_object, return_buffer); } } +out: if (info->return_object) { /* * Delete the internal return object. NOTE: Interpreter must be -- 1.7.9.5

11 years, 6 months

2
2
0 0

[PATCH] Platform / wmi: Fix potential memory leak in parse_wdg()

by Hanjun Guo

we forgot to call wmi_free_devices() and free out.pointer when alloc mamory failed. Signed-off-by: Hanjun Guo <hanjun.guo(a)linaro.org> --- drivers/platform/x86/wmi.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c index 43d1329..e1338b5 100644 --- a/drivers/platform/x86/wmi.c +++ b/drivers/platform/x86/wmi.c @@ -797,8 +797,11 @@ static int parse_wdg(acpi_handle handle) wmi_dump_wdg(&gblock[i]); wblock = kzalloc(sizeof(struct wmi_block), GFP_KERNEL); - if (!wblock) - return -ENOMEM; + if (!wblock) { + wmi_free_devices(); + retval = -ENOMEM; + goto out_free_pointer; + } wblock->handle = handle; wblock->gblock = gblock[i]; -- 1.7.9.5

11 years, 6 months

1
0
0 0

Updating UEFI to latest ACPI tables

by Graeme Gregory

Hi Guys, This patch updates the hardcoded tables in UEFI to the latest version produced by the ACPI team. This is the version that allows the FVP model to boot completely from ACPI. Can this please go into 2014.01 release? Graeme

11 years, 6 months

3
5
0 0

[PATCH] watchdog: Add sp805_wdt depends on ARM64

by naresh.bhat＠linaro.org

From: Naresh Bhat <naresh.bhat(a)linaro.org> Add sp805_wdt depends on ARM64. Signed-off-by: Naresh Bhat <naresh.bhat(a)linaro.org> --- drivers/watchdog/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 5be6e91..2385124 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -109,7 +109,7 @@ config WM8350_WATCHDOG config ARM_SP805_WATCHDOG tristate "ARM SP805 Watchdog" - depends on ARM && ARM_AMBA + depends on (ARM || ARM64) && ARM_AMBA select WATCHDOG_CORE help ARM Primecell SP805 Watchdog timer. This will reboot your system when -- 1.7.9.5

11 years, 6 months

3
2
0 0

[PATCH] rtsm_ve-aemv8a: Fix Local GIC Hardware ID of MADT table.

by Tomasz Nowicki

GIC ID is unique for GIC instance (not for CPU) and reflect number of GIC instances system has. Signed-off-by: Tomasz Nowicki <tomasz.nowicki(a)linaro.org> --- platforms/rtsm_ve-aemv8a.acpi/apic.asl | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/platforms/rtsm_ve-aemv8a.acpi/apic.asl b/platforms/rtsm_ve-aemv8a.acpi/apic.asl index 81351c3..41e869f 100644 --- a/platforms/rtsm_ve-aemv8a.acpi/apic.asl +++ b/platforms/rtsm_ve-aemv8a.acpi/apic.asl @@ -36,7 +36,7 @@ [0004] Signature : "APIC" [0004] Table Length : 000000F6 -[0001] Revision : 03 +[0001] Revision : 04 [0001] Checksum : B0 [0006] Oem ID : "LINARO" [0008] Oem Table ID : "RTSMVEV8" @@ -51,8 +51,8 @@ [0001] Subtable Type : 0B [Generic Interrupt Controller] [0001] Length : 28 [0002] Reserved : 0000 -[0004] Local GIC Hardware ID : 00000000 /* Should be equal to FDT provided or CPU hardware ID */ -[0004] Processor UID : 00000000 +[0004] Local GIC Hardware ID : 00000000 +[0004] Processor UID : 00000000 /* Should be equal to FDT provided or CPU hardware ID */ [0004] Flags (decoded below) : 00000001 Processor Enabled : 1 [0004] Parking Protocol Version : 00000000 @@ -63,7 +63,7 @@ [0001] Subtable Type : 0B [Generic Interrupt Controller] [0001] Length : 28 [0002] Reserved : 0000 -[0004] Local GIC Hardware ID : 00000001 +[0004] Local GIC Hardware ID : 00000000 [0004] Processor UID : 00000001 [0004] Flags (decoded below) : 00000001 Processor Enabled : 1 @@ -75,7 +75,7 @@ [0001] Subtable Type : 0B [Generic Interrupt Controller] [0001] Length : 28 [0002] Reserved : 0000 -[0004] Local GIC Hardware ID : 00000002 +[0004] Local GIC Hardware ID : 00000000 [0004] Processor UID : 00000002 [0004] Flags (decoded below) : 00000001 Processor Enabled : 1 @@ -87,7 +87,7 @@ [0001] Subtable Type : 0B [Generic Interrupt Controller] [0001] Length : 28 [0002] Reserved : 0000 -[0004] Local GIC Hardware ID : 00000003 +[0004] Local GIC Hardware ID : 00000000 [0004] Processor UID : 00000003 [0004] Flags (decoded below) : 00000001 Processor Enabled : 1 @@ -99,7 +99,7 @@ [0001] Subtable Type : 0B [Generic Interrupt Controller] [0001] Length : 28 [0002] Reserved : 0000 -[0004] Local GIC Hardware ID : 00000004 +[0004] Local GIC Hardware ID : 00000000 [0004] Processor UID : 00000004 [0004] Flags (decoded below) : 00000000 Processor Enabled : 0 @@ -111,7 +111,7 @@ [0001] Subtable Type : 0B [Generic Interrupt Controller] [0001] Length : 28 [0002] Reserved : 0000 -[0004] Local GIC Hardware ID : 00000005 +[0004] Local GIC Hardware ID : 00000000 [0004] Processor UID : 00000005 [0004] Flags (decoded below) : 00000000 Processor Enabled : 0 @@ -123,7 +123,7 @@ [0001] Subtable Type : 0B [Generic Interrupt Controller] [0001] Length : 28 [0002] Reserved : 0000 -[0004] Local GIC Hardware ID : 00000006 +[0004] Local GIC Hardware ID : 00000000 [0004] Processor UID : 00000006 [0004] Flags (decoded below) : 00000000 Processor Enabled : 0 @@ -135,7 +135,7 @@ [0001] Subtable Type : 0B [Generic Interrupt Controller] [0001] Length : 28 [0002] Reserved : 0000 -[0004] Local GIC Hardware ID : 00000007 +[0004] Local GIC Hardware ID : 00000000 [0004] Processor UID : 00000007 [0004] Flags (decoded below) : 00000000 Processor Enabled : 0 -- 1.7.9.5

11 years, 6 months

3
8
0 0

[PATCH 0/3] ACPI: Some patches to prepare for running ACPI on !x86 and !ia64

by Hanjun Guo

Some of the ACPI code is arch-dependent and make the code can't be compiled on !x86 and !ia64, the first two patches just do some rework on the idle_boot_override and _PDC related stuff to make the ACPI code more arch-independent. The third patch just introduce map_gic_id() for ACPI processor core followed by the ACPI 5.0 spec. These three patches are just ACPI related so I send them out as a separate patch set. I have compiled the kernel successful after appling this patch set on x86, ia64 and powerpc(with cross compile tool). Changes since last RFC version: a) Remove the RFC tag; b) Move idle_boot_override out of the arch directory suggested by Alan; c) Make these 3 patches as a separate patch set since there are not not related to the ARM/ARM64 platform. Hanjun Guo (3): ACPI / idle: Move idle_boot_override out of the arch directory ACPI / processor_core: Rework _PDC related stuff to make it more arch-independent ACPI: Introduce map_gic_id() to get apic id from MADT or _MAT method arch/ia64/include/asm/acpi.h | 5 +--- arch/ia64/include/asm/processor.h | 3 --- arch/ia64/kernel/acpi.c | 17 +++++++++++++ arch/powerpc/include/asm/processor.h | 1 - arch/x86/include/asm/acpi.h | 19 +-------------- arch/x86/include/asm/processor.h | 3 --- arch/x86/kernel/acpi/cstate.c | 31 ++++++++++++++++++++++++ arch/x86/kernel/process.c | 1 + drivers/acpi/processor_core.c | 47 +++++++++++++++++++++--------------- include/linux/cpu.h | 8 ++++++ 10 files changed, 87 insertions(+), 48 deletions(-) -- 1.8.2.2

11 years, 6 months

3
10
0 0

[RFC part2 PATCH 0/9] Using ACPI MADT table to initialise SMP and GIC

by Hanjun Guo

This patch set is based on part1 "Make ACPI core running on ARM64" patch set. After we can get the ACPI tables from UEFI, we can use these tables to initialise the system now. GIC (means GIC cpu interface) structure and GIC distributor structure in MADT table contains the information of GIC cpu interface base address and GIC distributor base address, which can be used to initialise GIC. Further more, parked address in GIC structure can be used as cpu release address for spin table SMP initialisation. This patch set use these information to init SMP and GIC. Please refer to chapter 5.2.12.14/15 of ACPI 5.0 spec for GIC and GIC distributor structure information. Amit Daniel Kachhap (1): irqdomain: Add a new API irq_create_acpi_mapping() Hanjun Guo (8): ARM64 / ACPI: Implement core functions for parsing MADT table ARM64 / ACPI: Prefill cpu possible/present maps and map logical cpu id to APIC id ARM64 / ACPI: Introduce map_gic_id() to get apic id from MADT or _MAT method ARM64 / ACPI: Use Parked Address in GIC structure for spin table SMP initialisation ACPI: Define ACPI_IRQ_MODEL_GIC needed for arm Irqchip / gic: Set as default domain so we can access from ACPI ACPI / ARM64: Update acpi_register_gsi to register with the core IRQ subsystem ACPI / GIC: Initialize GIC using the information in MADT arch/arm64/include/asm/acpi.h | 16 +- arch/arm64/kernel/irq.c | 5 + arch/arm64/kernel/setup.c | 2 + arch/arm64/kernel/smp.c | 2 + arch/arm64/kernel/smp_spin_table.c | 16 +- drivers/acpi/bus.c | 3 + drivers/acpi/plat/arm-core.c | 397 +++++++++++++++++++++++++++++++++++- drivers/acpi/processor_core.c | 26 +++ drivers/acpi/tables.c | 21 ++ drivers/irqchip/irq-gic.c | 7 + include/linux/acpi.h | 9 + kernel/irq/irqdomain.c | 27 +++ 12 files changed, 521 insertions(+), 10 deletions(-) -- 1.7.9.5

11 years, 7 months

3
16
0 0

[PATCH v3] ACPI: introduce CONFIG_ACPI_REDUCED_HARDWARE_ONLY to enable this ACPI mode

by al.stone＠linaro.org

From: Al Stone <al.stone(a)linaro.org> ACPI hardware reduced mode exists to allow newer platforms to use a simpler form of ACPI that does not require supporting legacy versions of the specification and their associated hardware. This mode was introduced in the ACPI 5.0 specification. To enable the hardware reduced mode of ACPI, we need to set the flag ACPI_REDUCED_HARDWARE to TRUE in the ACPICA source. In order to do that, we introduce a kernel configuration item to enable or disable ACPI_REDUCED_HARDWARE. We can then change the kernel configuration instead of having to modify the kernel source. Introducing this configuration item is based on suggestions from Lv Zheng saying that this does not belong in ACPICA, but rather to the Linux kernel itself. Hence, we introduce this configuration item so that we can make ACPI_REDUCED_HARDWARE configurable. For the details of the discussion, please refer to: http://www.spinics.net/lists/linux-acpi/msg46369.html Changes for v3: -- Minimize the changelog. Changes for v2: -- Changed test for EXPERT to avoid reported Kconfig warning Signed-off-by: Hanjun Guo <hanjun.guo(a)linaro.org> Signed-off-by: Al Stone <al.stone(a)linaro.org> --- drivers/acpi/Kconfig | 13 +++++++++++++ include/acpi/platform/aclinux.h | 6 ++++++ 2 files changed, 19 insertions(+) diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 4770de5..9fd6a7a 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -343,6 +343,19 @@ config ACPI_BGRT data from the firmware boot splash. It will appear under /sys/firmware/acpi/bgrt/ . +config ACPI_REDUCED_HARDWARE_ONLY + bool "Hardware-reduced ACPI support only" if EXPERT + def_bool n + depends on ACPI + help + This config item changes the way the ACPI code is built. When this + option is selected, the kernel will use a specialized version of + ACPICA that ONLY supports the ACPI "reduced hardware" mode. The + resulting kernel will be smaller but it will also be restricted to + running in ACPI reduced hardware mode ONLY. + + If you are unsure what to do, do not enable this option. + source "drivers/acpi/apei/Kconfig" config ACPI_EXTLOG diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h index 28f4f4d..7d71f08 100644 --- a/include/acpi/platform/aclinux.h +++ b/include/acpi/platform/aclinux.h @@ -52,6 +52,12 @@ #ifdef __KERNEL__ +/* Compile for reduced hardware mode only with this kernel config */ + +#ifdef CONFIG_ACPI_REDUCED_HARDWARE_ONLY +#define ACPI_REDUCED_HARDWARE 1 +#endif + #include <linux/string.h> #include <linux/kernel.h> #include <linux/ctype.h> -- 1.8.4.2

11 years, 7 months

1
0
0 0

[PATCH] ACPI: introduce CONFIG_ACPI_REDUCED_HARDWARE_ONLY to enforce this ACPI mode

by al.stone＠linaro.org

From: Al Stone <al.stone(a)linaro.org> Hardware reduced mode, despite the name, exists primarily to allow newer platforms to use a much simpler form of ACPI that does not require supporting the legacy of previous versions of the specification. This mode was first introduced in the ACPI 5.0 specification, but because it is so much simpler and reduces the size of the object code needed to support ACPI, it is likely to be used more often in the near future. To enable the hardware reduced mode of ACPI on some platforms (such as ARM), we need to modify the kernel code and set ACPI_REDUCED_HARDWARE to TRUE in the ACPICA source. For ARM/ARM64, hardware reduced ACPI should be the only mode used; legacy mode would require modifications to SoCs in order to provide several x86-specific hardware features (e.g., an NMI and SMI support). We set ACPI_REDUCED_HARDWARE to TRUE in the ACPICA source by introducing a kernel config item to enable/disable ACPI_REDUCED_HARDWARE. We can then change the kernel config instead of having to modify the kernel source directly to enable the reduced hardware mode of ACPI. Lv Zheng suggested that this configuration item does not belong in ACPICA, the upstream source for much of the ACPI internals, but rather to the Linux kernel itself. Hence, we introduce this flag so that we can make ACPI_REDUCED_HARDWARE configurable. For the details of the discussion, please refer to: http://www.spinics.net/lists/linux-acpi/msg46369.html Even though support for X86 in hardware reduced mode is possible, it is NOT enabled. Extensive effort has gone into the Linux kernel so that there is a single kernel image than can run on all x86 hardware; the kernel changes run-time behavior to adapt to the hardware being used. This is not currently possible with the existing ACPICA infrastructure but only presents a problem on achitectures supporting both hardware-reduced and legacy modes of ACPI -- i.e., on x86 only. The problem with the current ACPICA code base is that if one builds legacy ACPI (a proper superset of hardware-reduced), the kernel can run in hardware- reduced with the proper ACPI tables, but there is still ACPICA code that could be executed even though it is not allowed by the specification. If one builds a hardware-reduced only ACPI, the kernel cannot run with ACPI tables that are for legacy mode. To ensure compliance with ACPI, one must therefore build two separate kernels. Once this problem has been properly fixed, we can then enable x86 hardware-reduced mode and use a single kernel. This patch used to be part of a set to implement stricter conformance with hardware reduced ACPI. The code changes from that set are being re-thought in order to handle some non-compliant hardware, but this patch did not depend on those changes. In the meantime, this patch is needed in order to enable ACPI core functionality for ARMv8 servers and hence is being submitted separately in order to aid that effort. Signed-off-by: Hanjun Guo <hanjun.guo(a)linaro.org> Signed-off-by: Al Stone <al.stone(a)linaro.org> --- drivers/acpi/Kconfig | 13 +++++++++++++ include/acpi/platform/aclinux.h | 6 ++++++ 2 files changed, 19 insertions(+) diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 4770de5..961ea9e 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -343,6 +343,19 @@ config ACPI_BGRT data from the firmware boot splash. It will appear under /sys/firmware/acpi/bgrt/ . +config ACPI_REDUCED_HARDWARE_ONLY + bool "Hardware-reduced ACPI support only" + def_bool n + depends on ACPI && EXPERT + help + This config item changes the way the ACPI code is built. When this + option is selected, the kernel will use a specialized version of + ACPICA that ONLY supports the ACPI "reduced hardware" mode. The + resulting kernel will be smaller but it will also be restricted to + running in ACPI reduced hardware mode ONLY. + + If you are unsure what to do, do not enable this option. + source "drivers/acpi/apei/Kconfig" config ACPI_EXTLOG diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h index 28f4f4d..7d71f08 100644 --- a/include/acpi/platform/aclinux.h +++ b/include/acpi/platform/aclinux.h @@ -52,6 +52,12 @@ #ifdef __KERNEL__ +/* Compile for reduced hardware mode only with this kernel config */ + +#ifdef CONFIG_ACPI_REDUCED_HARDWARE_ONLY +#define ACPI_REDUCED_HARDWARE 1 +#endif + #include <linux/string.h> #include <linux/kernel.h> #include <linux/ctype.h> -- 1.8.4.2

11 years, 7 months

3
5
0 0

[PATCH] ACPI / processor: Return specific error value when mapping lapic id

by Hanjun Guo

we usually return 0 for success in int returned function, and negative value when failed, but in processor_core.c, some function return 1 for success and 0 for failure which leads confusion sometimes, replace with specific error values to fix that. Signed-off-by: Hanjun Guo <hanjun.guo(a)linaro.org> --- drivers/acpi/processor_core.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index b3171f3..24c87ef 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c @@ -45,13 +45,13 @@ static int map_lapic_id(struct acpi_subtable_header *entry, (struct acpi_madt_local_apic *)entry; if (!(lapic->lapic_flags & ACPI_MADT_ENABLED)) - return 0; + return -ENODEV; if (lapic->processor_id != acpi_id) - return 0; + return -EINVAL; *apic_id = lapic->id; - return 1; + return 0; } static int map_x2apic_id(struct acpi_subtable_header *entry, @@ -61,14 +61,14 @@ static int map_x2apic_id(struct acpi_subtable_header *entry, (struct acpi_madt_local_x2apic *)entry; if (!(apic->lapic_flags & ACPI_MADT_ENABLED)) - return 0; + return -ENODEV; if (device_declaration && (apic->uid == acpi_id)) { *apic_id = apic->local_apic_id; - return 1; + return 0; } - return 0; + return -EINVAL; } static int map_lsapic_id(struct acpi_subtable_header *entry, @@ -78,16 +78,16 @@ static int map_lsapic_id(struct acpi_subtable_header *entry, (struct acpi_madt_local_sapic *)entry; if (!(lsapic->lapic_flags & ACPI_MADT_ENABLED)) - return 0; + return -ENODEV; if (device_declaration) { if ((entry->length < 16) || (lsapic->uid != acpi_id)) - return 0; + return -EINVAL; } else if (lsapic->processor_id != acpi_id) - return 0; + return -EINVAL; *apic_id = (lsapic->id << 8) | lsapic->eid; - return 1; + return 0; } static int map_madt_entry(int type, u32 acpi_id) @@ -117,13 +117,13 @@ static int map_madt_entry(int type, u32 acpi_id) struct acpi_subtable_header *header = (struct acpi_subtable_header *)entry; if (header->type == ACPI_MADT_TYPE_LOCAL_APIC) { - if (map_lapic_id(header, acpi_id, &apic_id)) + if (!map_lapic_id(header, acpi_id, &apic_id)) break; } else if (header->type == ACPI_MADT_TYPE_LOCAL_X2APIC) { - if (map_x2apic_id(header, type, acpi_id, &apic_id)) + if (!map_x2apic_id(header, type, acpi_id, &apic_id)) break; } else if (header->type == ACPI_MADT_TYPE_LOCAL_SAPIC) { - if (map_lsapic_id(header, type, acpi_id, &apic_id)) + if (!map_lsapic_id(header, type, acpi_id, &apic_id)) break; } entry += header->length; -- 1.7.9.5

11 years, 7 months

1
0
0 0

[PATCH v2] ACPI: introduce CONFIG_ACPI_REDUCED_HARDWARE_ONLY to enforce this ACPI mode

by al.stone＠linaro.org

From: Al Stone <al.stone(a)linaro.org> Hardware reduced mode, despite the name, exists primarily to allow newer platforms to use a much simpler form of ACPI that does not require supporting the legacy of previous versions of the specification. This mode was first introduced in the ACPI 5.0 specification, but because it is so much simpler and reduces the size of the object code needed to support ACPI, it is likely to be used more often in the near future. To enable the hardware reduced mode of ACPI on some platforms (such as ARM), we need to modify the kernel code and set ACPI_REDUCED_HARDWARE to TRUE in the ACPICA source. For ARM/ARM64, hardware reduced ACPI should be the only mode used; legacy mode would require modifications to SoCs in order to provide several x86-specific hardware features (e.g., an NMI and SMI support). We set ACPI_REDUCED_HARDWARE to TRUE in the ACPICA source by introducing a kernel config item to enable/disable ACPI_REDUCED_HARDWARE. We can then change the kernel config instead of having to modify the kernel source directly to enable the reduced hardware mode of ACPI. Lv Zheng suggested that this configuration item does not belong in ACPICA, the upstream source for much of the ACPI internals, but rather to the Linux kernel itself. Hence, we introduce this flag so that we can make ACPI_REDUCED_HARDWARE configurable. For the details of the discussion, please refer to: http://www.spinics.net/lists/linux-acpi/msg46369.html Even though support for X86 in hardware reduced mode is possible, it is NOT enabled. Extensive effort has gone into the Linux kernel so that there is a single kernel image than can run on all x86 hardware; the kernel changes run-time behavior to adapt to the hardware being used. This is not currently possible with the existing ACPICA infrastructure but only presents a problem on achitectures supporting both hardware-reduced and legacy modes of ACPI -- i.e., on x86 only. The problem with the current ACPICA code base is that if one builds legacy ACPI (a proper superset of hardware-reduced), the kernel can run in hardware- reduced with the proper ACPI tables, but there is still ACPICA code that could be executed even though it is not allowed by the specification. If one builds a hardware-reduced only ACPI, the kernel cannot run with ACPI tables that are for legacy mode. To ensure compliance with ACPI, one must therefore build two separate kernels. Once this problem has been properly fixed, we can then enable x86 hardware-reduced mode and use a single kernel. Changes for v2: -- Changed test for EXPERT to avoid reported Kconfig warning Signed-off-by: Hanjun Guo <hanjun.guo(a)linaro.org> Signed-off-by: Al Stone <al.stone(a)linaro.org> --- drivers/acpi/Kconfig | 13 +++++++++++++ include/acpi/platform/aclinux.h | 6 ++++++ 2 files changed, 19 insertions(+) diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 4770de5..9fd6a7a 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -343,6 +343,19 @@ config ACPI_BGRT data from the firmware boot splash. It will appear under /sys/firmware/acpi/bgrt/ . +config ACPI_REDUCED_HARDWARE_ONLY + bool "Hardware-reduced ACPI support only" if EXPERT + def_bool n + depends on ACPI + help + This config item changes the way the ACPI code is built. When this + option is selected, the kernel will use a specialized version of + ACPICA that ONLY supports the ACPI "reduced hardware" mode. The + resulting kernel will be smaller but it will also be restricted to + running in ACPI reduced hardware mode ONLY. + + If you are unsure what to do, do not enable this option. + source "drivers/acpi/apei/Kconfig" config ACPI_EXTLOG diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h index 28f4f4d..7d71f08 100644 --- a/include/acpi/platform/aclinux.h +++ b/include/acpi/platform/aclinux.h @@ -52,6 +52,12 @@ #ifdef __KERNEL__ +/* Compile for reduced hardware mode only with this kernel config */ + +#ifdef CONFIG_ACPI_REDUCED_HARDWARE_ONLY +#define ACPI_REDUCED_HARDWARE 1 +#endif + #include <linux/string.h> #include <linux/kernel.h> #include <linux/ctype.h> -- 1.8.4.2

11 years, 7 months

2
1
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Linaro-acpi