Linaro-acpi February 2014

linaro-acpi@lists.linaro.org

13 participants
22 discussions

[PATCH 0/4 v2] Add tool to enable APEI tables test, other minor changes.

by Tomasz Nowicki

Patch set implement as follows: 1. Minor changes around existing tools - reorganize building process, - move common code to separate direction, - no functionality changes. 2. Add BFAPEI (Blob For APEI) tool which can create blobs for APEI testing. - see commit log for more details Changes for v2: - compilation regardless of whether APEI is used or not, - correct file name in comment headers, - move ACPI structures, defines, etc. to acpi.h headers, - suppress compiler warnings. Tomasz Nowicki (4): map, cab: Reorganize building process and tree hierarchy. bfapei: Add tool that can create blobs for APEI table testing. bfapei: Move generic ACPI structures to separated file, remove duplicated defines. Suppress compiler warnings, file comment headers cleanup. Makefile | 28 +- platforms/Makefile | 9 +- tools/bfapei/Makefile | 11 + tools/bfapei/bfapei.c | 271 +++++++++++++++++++ tools/bfapei/bfapei.h | 49 ++++ tools/cab/Makefile | 12 +- tools/cab/cab.c | 535 +------------------------------------- tools/cab/cab.h | 149 ----------- tools/common/Makefile | 4 + tools/common/build_aml.c | 455 ++++++++++++++++++++++++++++++++ tools/common/check_aml.c | 512 ++++++++++++++++++++++++++++++++++++ tools/common/include/acpi.h | 204 +++++++++++++++ tools/common/include/build_aml.h | 74 ++++++ tools/common/include/check_aml.h | 92 +++++++ tools/mab/Makefile | 13 +- tools/mab/mab.c | 437 +------------------------------ tools/mab/mab.h | 77 ------ 17 files changed, 1734 insertions(+), 1198 deletions(-) create mode 100644 tools/bfapei/Makefile create mode 100644 tools/bfapei/bfapei.c create mode 100644 tools/bfapei/bfapei.h create mode 100644 tools/common/Makefile create mode 100644 tools/common/build_aml.c create mode 100644 tools/common/check_aml.c create mode 100644 tools/common/include/acpi.h create mode 100644 tools/common/include/build_aml.h create mode 100644 tools/common/include/check_aml.h -- 1.7.9.5

7 years

[RFC PATCH 0/3] ACPI: Add vexpress-sysreg

by naresh.bhat＠linaro.org

From: Naresh Bhat <naresh.bhat(a)linaro.org> Add vexpress sysreg probe support, platform ID and remove dts binding. Logs on the v8 model are as below root@genericarmv8:/sys# find . -name LINA0009* ./bus/acpi/devices/LINA0009:00 ./bus/platform/devices/LINA0009:00 ./bus/platform/drivers/vexpress-sysreg/LINA0009:00 ./devices/platform/LINA0009:00 ./devices/LNXSYSTM:00/device:00/ACPI0004:01/ACPI0004:02/LINA0009:00 root@genericarmv8:/sys# Naresh Bhat (3): v2m_sysreg: Add ACPI probing for SYSREG ACPI: Add vexpress sysreg platform ID arm64: dts: remove the vexpress-sysreg binding arch/arm64/boot/dts/foundation-v8-acpi.dts | 6 +++--- drivers/acpi/acpi_platform.c | 3 ++- drivers/mfd/vexpress-sysreg.c | 9 +++++++++ 3 files changed, 14 insertions(+), 4 deletions(-) -- 1.7.9.5

9 years, 10 months

[RFC PATCH 0/5] Introducing the Grand Unified Firmware Interface

by al.stone＠linaro.org

From: Al Stone <al.stone(a)linaro.org> These patches are purely experimental; they just barely compile and they do not run just yet. The reason for posting them is really just to stir some discussion and see if this is a truly crazy idea or if it has some potential for easing the ACPI transition. These patches introduce GUFI: the Grand Unified Firmware Interface. Okay, yes, it is a silly name. I didn't spend a lot of time on it. What I'm most interested in is the idea and whether it is worth pursuing further, and whether or not there are better ways to do this if it does make sense. The idea is very simple: introduce a shim layer that looks like a merge of some sort between ACPI and FDT functionality in the kernel. In that shim layer, make it possible for a driver to make a single call to a function, and with that call, retrieve configuration information stored in either ACPI tables or a DT. Further, allow the kernel to specify which has priority -- i.e., search through ACPI tables, and then through FDT if data is not found, or vice versa -- or which is exclusive, either ACPI or FDT only. Why would I do this? As a kernel developer, this allows me to make changes in the direction of either FDT or ACPI as quickly or as slowly as I want to. Most of my config can be in FDT and I can then piecemeal convert to ACPI as I figure out ASL and/or any driver changes that may be needed. Secondly, if I do this well, the changes to convert from FDT to ACPI *should* be very small; from ACPI to FDT may be much more difficult but over time that can likely be improved as well. Third, in the really, really long term, maybe someone comes up with yet another hardware configuration description format that is so cool it provides sharks with laser beams on their heads and *everyone* wants to convert to it. With this layer in place, perhaps we can smooth even that transition by abstracting out the config info that's needed and the API to retrieve it. So, what do you think? Al Stone (5): ACPI: GUFI: add kernel config options for GUFI ACPI: GUFI: add build commands for drivers/gufi ACPI: GUFI: add in early prototype code for some GUFI functions ACPI: GUFI: add in simple test driver placeholders ACPI: GUFI: start modifying the vexpress-sysreg driver to use the GUFI arch/arm64/Kconfig | 6 - drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/acpi/acpi_platform.c | 1 + drivers/gufi/Kconfig | 54 ++++++++ drivers/gufi/Makefile | 11 ++ drivers/gufi/gufi.c | 309 ++++++++++++++++++++++++++++++++++++++++++ drivers/gufi/gufi_acpi_test.c | 84 ++++++++++++ drivers/gufi/gufi_of_test.c | 83 ++++++++++++ drivers/mfd/vexpress-sysreg.c | 14 +- include/linux/gufi.h | 83 ++++++++++++ 11 files changed, 636 insertions(+), 12 deletions(-) create mode 100644 drivers/gufi/Kconfig create mode 100644 drivers/gufi/Makefile create mode 100644 drivers/gufi/gufi.c create mode 100644 drivers/gufi/gufi_acpi_test.c create mode 100644 drivers/gufi/gufi_of_test.c create mode 100644 include/linux/gufi.h -- 1.8.3.1

10 years

[linaro-acpi PATCH v2 0/4] acpi-asl: DBG2 table template support

by naresh.bhat＠linaro.org

From: Naresh Bhat <naresh.bhat(a)linaro.org> The DBG2 table support in iASL compiler will be available in the next release of acpica https://github.com/acpica/acpica/commit/278cbb119f090d3aad0480381126c1ae8e5… the following set of patches support the DBG2 table template in acpi-asl tool. Naresh Bhat (4): ACPI / ASL: Add DBG2 table template DBG2: Update platforms manifest DBG2: Update xsdt entries across platforms DBG2: Support DBG2 table compilation platforms/exynos5250-arndale.acpi/dbg2.asl | 106 ++++++++++++++++++++ .../exynos5250-arndale.manifest | 1 + platforms/exynos5250-arndale.acpi/xsdt.asl | 1 + platforms/foundation-v8.acpi/dbg2.asl | 106 ++++++++++++++++++++ .../foundation-v8.acpi/foundation-v8.manifest | 1 + platforms/foundation-v8.acpi/xsdt.asl | 1 + platforms/rtsm_ve-aemv8a.acpi/dbg2.asl | 106 ++++++++++++++++++++ .../rtsm_ve-aemv8a.acpi/rtsm_ve-aemv8a.manifest | 1 + platforms/rtsm_ve-aemv8a.acpi/xsdt.asl | 1 + tools/common/build_aml.c | 1 + tools/common/check_aml.c | 1 + tools/common/include/check_aml.h | 1 + 12 files changed, 327 insertions(+) create mode 100644 platforms/exynos5250-arndale.acpi/dbg2.asl create mode 100644 platforms/foundation-v8.acpi/dbg2.asl create mode 100644 platforms/rtsm_ve-aemv8a.acpi/dbg2.asl -- 1.7.9.5

10 years, 1 month

[RESEND][PATCH v5 2/5] ACPI / processor_core: Rework _PDC related stuff to make it more arch-independent

by Hanjun Guo

_PDC related stuff in processor_core.c is little bit X86/IA64 dependent, macros of ACPI_PDC_* are _PDC bit definitions for Intel processors, if we use these macros in processor_core.c, we can not compile it when ACPI is enabled on ARM/ARM64. This patch reworks the code to make it more arch-independent, moving Intel related _PDC bits into architecture directory, no functional change. Cc: Tony Luck <tony.luck(a)intel.com> Cc: Fenghua Yu <fenghua.yu(a)intel.com> Cc: Thomas Gleixner <tglx(a)linutronix.de> Cc: "H. Peter Anvin" <hpa(a)zytor.com> Cc: x86(a)kernel.org Cc: linux-ia64(a)vger.kernel.org Signed-off-by: Hanjun Guo <hanjun.guo(a)linaro.org> Signed-off-by: Graeme Gregory <graeme.gregory(a)linaro.org> --- Hi Tony, Fenghua, Thomas, Peter, this patch was reviewed in ACPI mailling list, and updated for serveral versions, Rafael needs your opinion on this patch, could you please review and ack it? Thanks Hanjun --- arch/ia64/include/asm/acpi.h | 5 +---- arch/ia64/kernel/acpi.c | 14 ++++++++++++++ arch/x86/include/asm/acpi.h | 19 +------------------ arch/x86/kernel/acpi/cstate.c | 29 +++++++++++++++++++++++++++++ drivers/acpi/processor_core.c | 19 +------------------ 5 files changed, 46 insertions(+), 40 deletions(-) diff --git a/arch/ia64/include/asm/acpi.h b/arch/ia64/include/asm/acpi.h index d651102..d2b8b9d 100644 --- a/arch/ia64/include/asm/acpi.h +++ b/arch/ia64/include/asm/acpi.h @@ -152,10 +152,7 @@ extern int __initdata nid_to_pxm_map[MAX_NUMNODES]; #endif static inline bool arch_has_acpi_pdc(void) { return true; } -static inline void arch_acpi_set_pdc_bits(u32 *buf) -{ - buf[2] |= ACPI_PDC_EST_CAPABILITY_SMP; -} +extern void arch_acpi_set_pdc_bits(u32 *buf); #define acpi_unlazy_tlb(x) diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c index 07d209c..af9d9e4 100644 --- a/arch/ia64/kernel/acpi.c +++ b/arch/ia64/kernel/acpi.c @@ -1014,3 +1014,17 @@ EXPORT_SYMBOL(acpi_unregister_ioapic); * TBD when when IA64 starts to support suspend... */ int acpi_suspend_lowlevel(void) { return 0; } + +void arch_acpi_set_pdc_bits(u32 *buf) +{ + /* Enable coordination with firmware's _TSD info */ + buf[2] |= ACPI_PDC_SMP_T_SWCOORD | ACPI_PDC_EST_CAPABILITY_SMP; + if (boot_option_idle_override == IDLE_NOMWAIT) { + /* + * If mwait is disabled for CPU C-states, the C2C3_FFH access + * mode will be disabled in the parameter of _PDC object. + * Of course C1_FFH access mode will also be disabled. + */ + buf[2] &= ~(ACPI_PDC_C_C2C3_FFH | ACPI_PDC_C_C1_FFH); + } +} diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h index c8c1e70..e9f71bc 100644 --- a/arch/x86/include/asm/acpi.h +++ b/arch/x86/include/asm/acpi.h @@ -147,24 +147,7 @@ static inline bool arch_has_acpi_pdc(void) c->x86_vendor == X86_VENDOR_CENTAUR); } -static inline void arch_acpi_set_pdc_bits(u32 *buf) -{ - struct cpuinfo_x86 *c = &cpu_data(0); - - buf[2] |= ACPI_PDC_C_CAPABILITY_SMP; - - if (cpu_has(c, X86_FEATURE_EST)) - buf[2] |= ACPI_PDC_EST_CAPABILITY_SWSMP; - - if (cpu_has(c, X86_FEATURE_ACPI)) - buf[2] |= ACPI_PDC_T_FFH; - - /* - * If mwait/monitor is unsupported, C2/C3_FFH will be disabled - */ - if (!cpu_has(c, X86_FEATURE_MWAIT)) - buf[2] &= ~(ACPI_PDC_C_C2C3_FFH); -} +extern void arch_acpi_set_pdc_bits(u32 *buf); #else /* !CONFIG_ACPI */ diff --git a/arch/x86/kernel/acpi/cstate.c b/arch/x86/kernel/acpi/cstate.c index e69182f..a36638f 100644 --- a/arch/x86/kernel/acpi/cstate.c +++ b/arch/x86/kernel/acpi/cstate.c @@ -16,6 +16,35 @@ #include <asm/mwait.h> #include <asm/special_insns.h> +void arch_acpi_set_pdc_bits(u32 *buf) +{ + struct cpuinfo_x86 *c = &cpu_data(0); + + /* Enable coordination with firmware's _TSD info */ + buf[2] |= ACPI_PDC_SMP_T_SWCOORD | ACPI_PDC_C_CAPABILITY_SMP; + + if (cpu_has(c, X86_FEATURE_EST)) + buf[2] |= ACPI_PDC_EST_CAPABILITY_SWSMP; + + if (cpu_has(c, X86_FEATURE_ACPI)) + buf[2] |= ACPI_PDC_T_FFH; + + /* + * If mwait/monitor is unsupported, C2/C3_FFH will be disabled + */ + if (!cpu_has(c, X86_FEATURE_MWAIT)) + buf[2] &= ~(ACPI_PDC_C_C2C3_FFH); + + if (boot_option_idle_override == IDLE_NOMWAIT) { + /* + * If mwait is disabled for CPU C-states, the C2C3_FFH access + * mode will be disabled in the parameter of _PDC object. + * Of course C1_FFH access mode will also be disabled. + */ + buf[2] &= ~(ACPI_PDC_C_C2C3_FFH | ACPI_PDC_C_C1_FFH); + } +} + /* * Initialize bm_flags based on the CPU cache properties * On SMP it depends on cache configuration diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index 4d91b32..4dcf776 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c @@ -255,9 +255,6 @@ static void acpi_set_pdc_bits(u32 *buf) buf[0] = ACPI_PDC_REVISION_ID; buf[1] = 1; - /* Enable coordination with firmware's _TSD info */ - buf[2] = ACPI_PDC_SMP_T_SWCOORD; - /* Twiddle arch-specific bits needed for _PDC */ arch_acpi_set_pdc_bits(buf); } @@ -282,7 +279,7 @@ static struct acpi_object_list *acpi_processor_alloc_pdc(void) return NULL; } - buf = kmalloc(12, GFP_KERNEL); + buf = kzalloc(12, GFP_KERNEL); if (!buf) { printk(KERN_ERR "Memory allocation error\n"); kfree(obj); @@ -310,20 +307,6 @@ acpi_processor_eval_pdc(acpi_handle handle, struct acpi_object_list *pdc_in) { acpi_status status = AE_OK; - if (boot_option_idle_override == IDLE_NOMWAIT) { - /* - * If mwait is disabled for CPU C-states, the C2C3_FFH access - * mode will be disabled in the parameter of _PDC object. - * Of course C1_FFH access mode will also be disabled. - */ - union acpi_object *obj; - u32 *buffer = NULL; - - obj = pdc_in->pointer; - buffer = (u32 *)(obj->buffer.pointer); - buffer[2] &= ~(ACPI_PDC_C_C2C3_FFH | ACPI_PDC_C_C1_FFH); - - } status = acpi_evaluate_object(handle, "_PDC", pdc_in, NULL); if (ACPI_FAILURE(status)) -- 1.7.9.5

10 years, 1 month

ACPI Kernel and Foundation Model

by Graeme Gregory

Hi, I checked this out in preperation for Connect as we know from experience that getting a network connection is pot luck normally. The ACPI kernel we generate will boot with the Foundation model. Download the Linaro 14.01 release from here :- http://releases.linaro.org/14.01/openembedded/aarch64 The you can start the Foundation model with the following commandline Foundation_v8pkg/models/Linux64_GCC-4.1/Foundation_v8 --cores=4 --visualization --no-secure-memory --data=bl1.bin@0x0 --data=uefi_fvp-base.bin@0x8000000 --block-device=<YOUR ROOT FILESYSTEM IMAGE> --gicv3 --network=nat You will get a few errors as AMBA bus does not actually exist on Foundation model. But these are harmless. Further details are in the release notes from Linaro. Graeme

10 years, 1 month

[PATCH v5 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. Changs for v5: Realign the additional lines to the open parenthesis pr_info(xxxx); xxxx; 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 | 124 ++++++++++++++++++----------------------- include/linux/acpi.h | 4 ++ 8 files changed, 158 insertions(+), 137 deletions(-) -- 1.7.9.5

10 years, 1 month

Linaro ACPI Branches

by Graeme Gregory

Hi List, It seems I forgot to send a summary of the new branch layout on :- https://git.linaro.org/arm/acpi/acpi.git 1) acpi-mainline-core is a copy of the latest patch series sent by Hanjun to the linux-acpi list. 2) acpi-core is work on top of this patch series that has not yet been sent to upstream. 3) acpi-drivers is work on top of acpi-core and contains the drivers to boot the FVP Base model. It is likely these shall never be presented for upstream. Graeme

10 years, 1 month

[PATCH] acpi: DSM lookup value moved to acpi keyvalue file

by naresh.bhat＠linaro.org

From: Naresh Bhat <naresh.bhat(a)linaro.org> Remove duplicate code acpi_dsm_lookup_value is moved to acpi_keyvalue.c file. Signed-off-by: Naresh Bhat <naresh.bhat(a)linaro.org> --- drivers/amba/acpi.c | 100 ++------------------------------------------------- 1 file changed, 2 insertions(+), 98 deletions(-) diff --git a/drivers/amba/acpi.c b/drivers/amba/acpi.c index 9a97cd8..abf4cd4 100644 --- a/drivers/amba/acpi.c +++ b/drivers/amba/acpi.c @@ -25,102 +25,6 @@ struct acpi_amba_bus_info { char *clk_name; }; -/* UUID: a706b112-bf0b-48d2-9fa3-95591a3c4c06 (randomly generated) */ -static const char acpi_amba_dsm_uuid[] = { - 0xa7, 0x06, 0xb1, 0x12, 0xbf, 0x0b, 0x48, 0xd2, - 0x9f, 0xa3, 0x95, 0x59, 0x1a, 0x3c, 0x4c, 0x06 -}; - -/* acpi_amba_dsm_lookup() - * - * Helper to parse through ACPI _DSM object for a device. Each entry - * has three fields. - */ -int acpi_amba_dsm_lookup(acpi_handle handle, - const char *tag, int index, - struct acpi_amba_dsm_entry *entry) -{ - acpi_status status; - struct acpi_object_list input; - struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL }; - union acpi_object params[4]; - union acpi_object *obj; - int len, match_count, i; - - /* invalidate output in case there's no entry to supply */ - entry->key = NULL; - entry->value = NULL; - - if (!acpi_has_method(handle, "_DSM")) - return -ENOENT; - - input.count = 4; - params[0].type = ACPI_TYPE_BUFFER; /* UUID */ - params[0].buffer.length = sizeof(acpi_amba_dsm_uuid); - params[0].buffer.pointer = (char *)acpi_amba_dsm_uuid; - params[1].type = ACPI_TYPE_INTEGER; /* Revision */ - params[1].integer.value = 1; - params[2].type = ACPI_TYPE_INTEGER; /* Function # */ - params[2].integer.value = 1; - params[3].type = ACPI_TYPE_PACKAGE; /* Arguments */ - params[3].package.count = 0; - params[3].package.elements = NULL; - input.pointer = params; - - status = acpi_evaluate_object_typed(handle, "_DSM", - &input, &output, ACPI_TYPE_PACKAGE); - if (ACPI_FAILURE(status)) { - pr_err("failed to get _DSM package for this device\n"); - return -ENOENT; - } - - obj = (union acpi_object *)output.pointer; - - /* parse 2 objects per entry */ - match_count = 0; - for (i = 0; (i + 2) <= obj->package.count; i += 2) { - /* key must be a string */ - len = obj->package.elements[i].string.length; - if (len <= 0) - continue; - - /* check to see if this is the entry to return */ - if (strncmp(tag, obj->package.elements[i].string.pointer, - len) != 0 || - match_count < index) { - match_count++; - continue; - } - - /* copy the key */ - entry->key = kmalloc(len + 1, GFP_KERNEL); - strncpy(entry->key, - obj->package.elements[i].string.pointer, - len); - entry->key[len] = '\0'; - - /* value is a string with space-delimited fields if necessary */ - len = obj->package.elements[i + 1].string.length; - if (len > 0) { - entry->value = kmalloc(len + 1, GFP_KERNEL); - strncpy(entry->value, - obj->package.elements[i+1].string.pointer, - len); - entry->value[len] = '\0'; - } - - break; - } - - kfree(output.pointer); - - if (entry->key == NULL) - return -ENOENT; - - return 0; -} -EXPORT_SYMBOL_GPL(acpi_amba_dsm_lookup); - static int acpi_amba_add_resource(struct acpi_resource *ares, void *data) { struct amba_device *dev = data; @@ -157,7 +61,7 @@ static int acpi_amba_add_resource(struct acpi_resource *ares, void *data) static struct clk *acpi_amba_get_clk(acpi_handle handle, int index, char **clk_name) { - struct acpi_amba_dsm_entry entry; + struct acpi_dsm_entry entry; acpi_handle clk_handle; struct acpi_device *adev, *clk_adev; char *clk_path; @@ -172,7 +76,7 @@ static struct clk *acpi_amba_get_clk(acpi_handle handle, int index, /* key=value format for clocks is: * "clock-name"="apb_pclk \\_SB.CLK0" */ - if (acpi_amba_dsm_lookup(handle, "clock-name", index, &entry) != 0) + if (acpi_dsm_lookup_value(handle, "clock-name", index, &entry) != 0) return NULL; /* look under the clock device for the clock that matches the entry */ -- 1.7.9.5

10 years, 1 month

[PATCH v3 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 | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c index 361b40c..9c62340 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,19 +440,9 @@ 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)); - } kfree(entry); return 0; -- 1.7.9.5

10 years, 1 month

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Linaro-acpi February 2014