From patchwork Fri Jan 17 12:25:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 3504161 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 308579F2E9 for ; Fri, 17 Jan 2014 12:49:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4B9212012F for ; Fri, 17 Jan 2014 12:49:31 +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 6EAB320120 for ; Fri, 17 Jan 2014 12:49:30 +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 1W48rV-00026K-Ca; Fri, 17 Jan 2014 12:49:25 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W48rT-0007ru-1i; Fri, 17 Jan 2014 12:49:23 +0000 Received: from mail-pa0-f44.google.com ([209.85.220.44]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W48rP-0007r2-Q9 for linux-arm-kernel@lists.infradead.org; Fri, 17 Jan 2014 12:49:20 +0000 Received: by mail-pa0-f44.google.com with SMTP id kq14so4074666pab.17 for ; Fri, 17 Jan 2014 04:48:58 -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=4rkpXz4jkjxRGXvvVVRsqw+AZKz/dw2fQ96DzLr55PQ=; b=dXpE7X4p1J3SnX8OjvnuL/fmJ0weRmli3sLTrOwoFTohvJum46FvFUdDQ1z3v46hcf qtSY14UcrP04lvgUI/OMkhjnIio+qMybM+/L9a7ckwbsGYd8qZz5K7i300Rd/UWKBam7 smC1I3/V95C0ytkAA/0XDf3h45Ti1Sa8zcHeuo/CJrNpLNHye7KNV0HAe/2SCCFNeixQ VBwGFy6vrS04lRCtrtlFdvqC7Vh0ZfyWV3xUIw+fUIr3XEatdFFMEXQMloLnalyN69FJ v+IG6eXpFOUCc0M1xlUWlnfNOrzwLW5dM6g6APmk+Az7nWPOldZxu0Fe8wBvMMKFZj6k R6yw== X-Gm-Message-State: ALoCoQnJDsvEvSImkwG0lO+uZF7JusWH1uIfeOG7nvf0Fe95uVMAx59ZQ+zM6Zm2vsKOYoql9IPm X-Received: by 10.68.203.197 with SMTP id ks5mr2023371pbc.14.1389962937931; Fri, 17 Jan 2014 04:48:57 -0800 (PST) Received: from localhost ([218.17.215.175]) by mx.google.com with ESMTPSA id xs1sm30385424pac.7.2014.01.17.04.47.20 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 17 Jan 2014 04:48:57 -0800 (PST) From: Hanjun Guo To: "Rafael J. Wysocki" , Catalin Marinas , Will Deacon , Russell King - ARM Linux Subject: [PATCH 13/20] ARM64 / ACPI: Define ACPI_IRQ_MODEL_GIC needed for arm Date: Fri, 17 Jan 2014 20:25:07 +0800 Message-Id: <1389961514-13562-14-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1389961514-13562-1-git-send-email-hanjun.guo@linaro.org> References: <1389961514-13562-1-git-send-email-hanjun.guo@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140117_074919_936684_E14366E2 X-CRM114-Status: GOOD ( 13.25 ) X-Spam-Score: -1.8 (-) Cc: Mark Rutland , Matthew Garrett , linaro-kernel@lists.linaro.org, Al Stone , Arnd Bergmann , Rob Herring , Linus Walleij , Olof Johansson , linux-kernel@vger.kernel.org, linaro-acpi@lists.linaro.org, linux-acpi@vger.kernel.org, Hanjun Guo , patches@linaro.org, Grant Likely , Bjorn Helgaas , linux-arm-kernel@lists.infradead.org, Charles.Garcia-Tobin@arm.com 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=-3.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_WEB,RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham 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 Needed because arm uses GIC which is defined in ACPI 5.0 spec. Signed-off-by: Al Stone Signed-off-by: Hanjun Guo --- drivers/acpi/bus.c | 3 +++ drivers/acpi/plat/arm-core.c | 6 +++++- include/linux/acpi.h | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 0710004..246b40c 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -487,6 +487,9 @@ static int __init acpi_bus_init_irq(void) case ACPI_IRQ_MODEL_IOSAPIC: message = "IOSAPIC"; break; + case ACPI_IRQ_MODEL_GIC: + message = "GIC"; + break; case ACPI_IRQ_MODEL_PLATFORM: message = "platform specific model"; break; diff --git a/drivers/acpi/plat/arm-core.c b/drivers/acpi/plat/arm-core.c index 7f1d709..2ff00b0 100644 --- a/drivers/acpi/plat/arm-core.c +++ b/drivers/acpi/plat/arm-core.c @@ -76,7 +76,11 @@ void arch_fix_phys_package_id(int num, u32 slot) } EXPORT_SYMBOL_GPL(arch_fix_phys_package_id); -enum acpi_irq_model_id acpi_irq_model = ACPI_IRQ_MODEL_PLATFORM; +/* + * Since we're on ARM, the default interrupt routing model + * clearly has to be GIC. + */ +enum acpi_irq_model_id acpi_irq_model = ACPI_IRQ_MODEL_GIC; static unsigned int gsi_to_irq(unsigned int gsi) { diff --git a/include/linux/acpi.h b/include/linux/acpi.h index d9099b1..da55da2 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -63,6 +63,7 @@ enum acpi_irq_model_id { ACPI_IRQ_MODEL_IOAPIC, ACPI_IRQ_MODEL_IOSAPIC, ACPI_IRQ_MODEL_PLATFORM, + ACPI_IRQ_MODEL_GIC, ACPI_IRQ_MODEL_COUNT };