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: 3504141 Return-Path: X-Original-To: patchwork-linux-acpi@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 E40409F2E9 for ; Fri, 17 Jan 2014 12:49:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0E4F32015E for ; Fri, 17 Jan 2014 12:49:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 485A220120 for ; Fri, 17 Jan 2014 12:49:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752444AbaAQMs7 (ORCPT ); Fri, 17 Jan 2014 07:48:59 -0500 Received: from mail-pa0-f41.google.com ([209.85.220.41]:46497 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752263AbaAQMs6 (ORCPT ); Fri, 17 Jan 2014 07:48:58 -0500 Received: by mail-pa0-f41.google.com with SMTP id fa1so1756695pad.28 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=Tc1ZgGCbEpu1Yk0jAhlKzjPcaJ8MFrEsVxMMvGTEW1fHcUGDf9/+TS9/Pv66rdLdTT c2wReDuBeaHZ3acQtbFjBZ23lSprPD3FpuTGAX8SpoShVrC2ID+gSnCyBGdSNLmnZdZq pHSotDa7iiFY29W/G/wIM959FIpz9hqxBe3b1+0W27BZNh6ZyYNA6gPc5z7UYhVZh/tR IF1ta8H7YHEmhsf8RwWz+n5qVuTnevg0sqS9RDi2iBRyDkmxpuzlkjvvUCYMy43btebI J8Yzfd6FSDO8r5amKD5qTmuGoGoq3RAH17NjXETQQEsrLEvOM0Nn+cA4jxmY5awu/TSe UGWg== X-Gm-Message-State: ALoCoQmx2e91CSShGHjh5Cw4Gz3v2slMkI6nrcO31+HvTOWUpxCC50kYcRyWwrvXp+LHotMcsWsW 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 Cc: linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Grant Likely , Matthew Garrett , Olof Johansson , Linus Walleij , Bjorn Helgaas , Rob Herring , Mark Rutland , Arnd Bergmann , patches@linaro.org, linux-kernel@vger.kernel.org, linaro-kernel@lists.linaro.org, linaro-acpi@lists.linaro.org, Charles.Garcia-Tobin@arm.com, Hanjun Guo , Al Stone 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> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 };