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@linaro.org X-Patchwork-Id: 3285391 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9775D9F37A for ; Wed, 4 Dec 2013 21:24:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 93CF3204FB for ; Wed, 4 Dec 2013 21:24:48 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 74BE6201D5 for ; Wed, 4 Dec 2013 21:24:47 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VoJup-00080H-PH; Wed, 04 Dec 2013 21:23:28 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VoJua-0001UA-Ne; Wed, 04 Dec 2013 21:23:12 +0000 Received: from mail-ie0-f170.google.com ([209.85.223.170]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VoJu7-0001Pk-BR for linux-arm-kernel@lists.infradead.org; Wed, 04 Dec 2013 21:22:47 +0000 Received: by mail-ie0-f170.google.com with SMTP id qd12so28028821ieb.1 for ; Wed, 04 Dec 2013 13:22: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:from:to:cc:subject:date:message-id:in-reply-to :references; bh=OT4Z/JknY5gQiz43JhTJX88RKnhBaINpAZcwYznnBa4=; b=F1e+KWZ/UMFvIROj5B/UawrtHffcRB2A+8Qwuf8rk0EhQ9ZhAJ/+Gvx/67lv3bOZp9 dgIjObVKnf37vKYSNmUUQFJdWcZB+6rjHLSsYrteADhTj7K9RPeJcgoyB/fOzaZgqtd+ KE7bVLTg0K403oM84wugwukkjdYkgjb8I6onf7+bEKypnV/kGMcc/+okDxaqbzyHu9YX 2pN/gCOEVeVi2upcWCzr3WI4sQLaCfDJuEPWBex7RnnqGC7PxIT4tHvwPxMjsstdHAxo HaC8S9wC5KAmQXGXLlTNpfDID9SCh24cawGtt+DMWNrf5OeO0Ned/BNccrt0lVsXi9G8 KsPA== X-Gm-Message-State: ALoCoQk/fy+UHrIwkdmZPT01DVIgdzMbwXiGkZwTf+Kiddt8Eo3pv7dYVlquyTi1uTB15B4p1SQe 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 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131204_162243_500303_F9E8F813 X-CRM114-Status: GOOD ( 14.27 ) X-Spam-Score: -0.1 (/) Cc: patches@linaro.org, Al Stone , linaro-kernel@lists.linaro.org, linaro-acpi@lists.linaro.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, SUSPICIOUS_RECIPS, UNPARSEABLE_RELAY autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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; }