From patchwork Wed Dec 4 21:22:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Al Stone X-Patchwork-Id: 22048 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f72.google.com (mail-oa0-f72.google.com [209.85.219.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id AFE8423FCB for ; Wed, 4 Dec 2013 21:24:22 +0000 (UTC) Received: by mail-oa0-f72.google.com with SMTP id o6sf54605833oag.3 for ; Wed, 04 Dec 2013 13:24:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=OT4Z/JknY5gQiz43JhTJX88RKnhBaINpAZcwYznnBa4=; b=fqi70pC+WYhx7/B7dYHlKoB7StVRfjXI3cQO2bmlh5r4QbJaQBpT1Qpun2vzqKbaXX NpiRRf36TokQBFotWYFgsSurcYcxo2gd2h6wCCCR4Spvpndi7Bptx1NHuewizOxePeR5 NmuALUiqd0l42LV5kiHrgLV+R6bUhcHVJ8RXcHw9abNjr5WuJtZSqqMWDI0ZwQ1OnmIG s4ixDowG2PBXoEcjS9A1OE26KFimSfiey6lfiKKnpJiNdQ/pYL6rhHRfK35xAVNXTGTf C68vTRdht5p57KChZB9QyHI+vhHJLiFNoAOMoeFAGFyPiGFhIz8gujzVTuvAgNzSuG/3 ZcKQ== X-Gm-Message-State: ALoCoQkBbwVTSvt0vANMJt0zRjuA8i2dhLCNbOFVcjCPW8t4V78zhjZjX5EbYEvPlgQyNF60z83S X-Received: by 10.182.223.18 with SMTP id qq18mr20448584obc.33.1386192262263; Wed, 04 Dec 2013 13:24:22 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.17.163 with SMTP id p3ls553615qed.41.gmail; Wed, 04 Dec 2013 13:24:22 -0800 (PST) X-Received: by 10.52.160.130 with SMTP id xk2mr8688922vdb.24.1386192262163; Wed, 04 Dec 2013 13:24:22 -0800 (PST) Received: from mail-ve0-f173.google.com (mail-ve0-f173.google.com [209.85.128.173]) by mx.google.com with ESMTPS id a6si33228671vdp.117.2013.12.04.13.24.22 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 04 Dec 2013 13:24:22 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.173; Received: by mail-ve0-f173.google.com with SMTP id oz11so12680003veb.18 for ; Wed, 04 Dec 2013 13:24:22 -0800 (PST) X-Received: by 10.58.188.42 with SMTP id fx10mr33761vec.51.1386192262005; Wed, 04 Dec 2013 13:24:22 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp325178vcz; Wed, 4 Dec 2013 13:24:19 -0800 (PST) X-Received: by 10.43.155.84 with SMTP id lh20mr1232176icc.81.1386192141913; Wed, 04 Dec 2013 13:22:21 -0800 (PST) Received: from mail-ie0-f182.google.com (mail-ie0-f182.google.com [209.85.223.182]) by mx.google.com with ESMTPS id l1si4870494igx.29.2013.12.04.13.22.21 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 04 Dec 2013 13:22:21 -0800 (PST) Received-SPF: neutral (google.com: 209.85.223.182 is neither permitted nor denied by best guess record for domain of al.stone@linaro.org) client-ip=209.85.223.182; Received: by mail-ie0-f182.google.com with SMTP id as1so27626038iec.41 for ; Wed, 04 Dec 2013 13:22:21 -0800 (PST) X-Received: by 10.42.209.208 with SMTP id gh16mr3043382icb.65.1386192140985; Wed, 04 Dec 2013 13:22:20 -0800 (PST) Received: from fidelio.ahs3 (74-93-232-46-Colorado.hfc.comcastbusiness.net. [74.93.232.46]) by mx.google.com with ESMTPSA id f5sm6351925igc.4.2013.12.04.13.22.19 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Dec 2013 13:22:20 -0800 (PST) From: al.stone@linaro.org To: linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: linaro-acpi@lists.linaro.org, patches@linaro.org, linaro-kernel@lists.linaro.org, Al Stone Subject: [PATCH v3 3/5] ACPI: HW reduced mode does not allow use of the FADT sci_interrupt field Date: Wed, 4 Dec 2013 14:22:05 -0700 Message-Id: <1386192127-28564-4-git-send-email-al.stone@linaro.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1386192127-28564-1-git-send-email-al.stone@linaro.org> References: <1386192127-28564-1-git-send-email-al.stone@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: al.stone@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Al Stone In HW reduced mode, the use of the SCI interrupt is not allowed. In all those places that use the FADT sci_interrupt field, remove that usage when in HW reduced mode. In the case of acpi_os_install_interrupt_handler() in osl.c, this allows us to open up the routine to installing interrupt handlers other than acpi_gbl_FADT.sci_interrupt regardless of whether we are in ACPI legacy mode or reduced HW mode; acpi_os_remove_interrupt_handler() changes to maintain symmetry. The function acpi_reserve_resources() is not stubbed but removed to quiet a compiler warning about an unused function when using ACPI reduced hardware mode. Signed-off-by: Al Stone --- drivers/acpi/bus.c | 3 ++- drivers/acpi/osl.c | 16 +++++----------- drivers/acpi/pci_link.c | 2 ++ 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index bba9b72..de3a259 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -541,7 +541,8 @@ void __init acpi_early_init(void) goto error0; } -#ifdef CONFIG_X86 +#ifndef CONFIG_ACPI_REDUCED_HARDWARE + /* NOTE: in HW reduced mode, FADT sci_interrupt has no meaning */ if (!acpi_ioapic) { /* compatible (0) means level (3) */ if (!(acpi_sci_flags & ACPI_MADT_TRIGGER_MASK)) { diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 44c07eb..613e4a1 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -84,6 +84,7 @@ static int (*__acpi_os_prepare_extended_sleep)(u8 sleep_state, u32 val_a, static acpi_osd_handler acpi_irq_handler; static void *acpi_irq_context; +static u32 acpi_irq_number; static struct workqueue_struct *kacpid_wq; static struct workqueue_struct *kacpi_notify_wq; static struct workqueue_struct *kacpi_hotplug_wq; @@ -159,6 +160,7 @@ static u32 acpi_osi_handler(acpi_string interface, u32 supported) return supported; } +#ifndef CONFIG_ACPI_REDUCED_HARDWARE static void __init acpi_request_region (struct acpi_generic_address *gas, unsigned int length, char *desc) { @@ -209,6 +211,7 @@ static int __init acpi_reserve_resources(void) return 0; } device_initcall(acpi_reserve_resources); +#endif void acpi_os_printf(const char *fmt, ...) { @@ -795,13 +798,6 @@ acpi_os_install_interrupt_handler(u32 gsi, acpi_osd_handler handler, acpi_irq_stats_init(); - /* - * ACPI interrupts different from the SCI in our copy of the FADT are - * not supported. - */ - if (gsi != acpi_gbl_FADT.sci_interrupt) - return AE_BAD_PARAMETER; - if (acpi_irq_handler) return AE_ALREADY_ACQUIRED; @@ -818,15 +814,13 @@ acpi_os_install_interrupt_handler(u32 gsi, acpi_osd_handler handler, acpi_irq_handler = NULL; return AE_NOT_ACQUIRED; } + acpi_irq_number = irq; return AE_OK; } acpi_status acpi_os_remove_interrupt_handler(u32 irq, acpi_osd_handler handler) { - if (irq != acpi_gbl_FADT.sci_interrupt) - return AE_BAD_PARAMETER; - free_irq(irq, acpi_irq); acpi_irq_handler = NULL; @@ -1806,7 +1800,7 @@ acpi_status __init acpi_os_initialize1(void) acpi_status acpi_os_terminate(void) { if (acpi_irq_handler) { - acpi_os_remove_interrupt_handler(acpi_gbl_FADT.sci_interrupt, + acpi_os_remove_interrupt_handler(acpi_irq_number, acpi_irq_handler); } diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c index 2652a61..d5c155e 100644 --- a/drivers/acpi/pci_link.c +++ b/drivers/acpi/pci_link.c @@ -505,6 +505,8 @@ int __init acpi_irq_penalty_init(void) } } /* Add a penalty for the SCI */ + if (acpi_gbl_reduced_hardware) + return 0; acpi_irq_penalty[acpi_gbl_FADT.sci_interrupt] += PIRQ_PENALTY_PCI_USING; return 0; }