From patchwork Tue Dec 3 16:39:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 21986 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f200.google.com (mail-ob0-f200.google.com [209.85.214.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E8051202AE for ; Tue, 3 Dec 2013 16:40:37 +0000 (UTC) Received: by mail-ob0-f200.google.com with SMTP id wm4sf46718933obc.7 for ; Tue, 03 Dec 2013 08:40:37 -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=dFLQ03k+zyZhlXcm38XQxK1n3CW8kr8gWmTGJ2f32CU=; b=EDyI4IAaxjVc5BKLbJeRdxckGR4FIv5iK/g3yi6iUfuiUf41S16uXj46IM9D4L0HaE Bu9zhyAGOS6t7cWTwf/w1zqfkAMlMadCHGontAhTejCtVyfzi5IqyrKLfOUEhecGi7F+ IDW6whjqTd7WsCM7lv+iwWZy0U41EOrXVQqjMBJ59/Gzk4ulmTeOcIHCYjkd0+utchGy HbWtwxIS2LHWSKcburFzMv+Fw309OSVe6GlyOQPKYk7yrKhgqLMslDtFrB5u4LlA9mFu ufFGDl8aEOCDeB242Hg3wXKSDEals2oO7lawdKsH7pw217UL+gwKLFB+WQes/i8WBI+y ZHYA== X-Gm-Message-State: ALoCoQkDh07u+q5bBPQFDwst+hUNnaU9oW1WYwzyqp7HntCswxkgbjdhYH24xsviZQFZqjKKTn0q X-Received: by 10.50.109.193 with SMTP id hu1mr1352125igb.6.1386088837353; Tue, 03 Dec 2013 08:40:37 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.17.163 with SMTP id p3ls2755407qed.41.gmail; Tue, 03 Dec 2013 08:40:37 -0800 (PST) X-Received: by 10.58.11.169 with SMTP id r9mr109769veb.52.1386088837216; Tue, 03 Dec 2013 08:40:37 -0800 (PST) Received: from mail-vc0-f171.google.com (mail-vc0-f171.google.com [209.85.220.171]) by mx.google.com with ESMTPS id gw7si31565414veb.114.2013.12.03.08.40.37 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 03 Dec 2013 08:40:37 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.171 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.171; Received: by mail-vc0-f171.google.com with SMTP id ik5so10244139vcb.30 for ; Tue, 03 Dec 2013 08:40:37 -0800 (PST) X-Received: by 10.220.123.6 with SMTP id n6mr2037913vcr.28.1386088837012; Tue, 03 Dec 2013 08:40:37 -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 u4csp222616vcz; Tue, 3 Dec 2013 08:40:36 -0800 (PST) X-Received: by 10.68.197.73 with SMTP id is9mr39440052pbc.75.1386088836144; Tue, 03 Dec 2013 08:40:36 -0800 (PST) Received: from mail-pb0-f50.google.com (mail-pb0-f50.google.com [209.85.160.50]) by mx.google.com with ESMTPS id qx4si8698374pbc.105.2013.12.03.08.40.35 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 03 Dec 2013 08:40:36 -0800 (PST) Received-SPF: neutral (google.com: 209.85.160.50 is neither permitted nor denied by best guess record for domain of hanjun.guo@linaro.org) client-ip=209.85.160.50; Received: by mail-pb0-f50.google.com with SMTP id rr13so21218836pbb.23 for ; Tue, 03 Dec 2013 08:40:35 -0800 (PST) X-Received: by 10.68.219.72 with SMTP id pm8mr11816609pbc.164.1386088835762; Tue, 03 Dec 2013 08:40:35 -0800 (PST) Received: from localhost ([61.148.199.138]) by mx.google.com with ESMTPSA id vh3sm97924225pbc.8.2013.12.03.08.40.27 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 03 Dec 2013 08:40:35 -0800 (PST) From: Hanjun Guo To: "Rafael J. Wysocki" , Catalin Marinas , Will Deacon , Russell King - ARM Linux , Daniel Lezcano 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 , Jon Masters , patches@linaro.org, linux-kernel@vger.kernel.org, linaro-kernel@lists.linaro.org, linaro-acpi@lists.linaro.org, Hanjun Guo , Al Stone Subject: [RFC part2 PATCH 5/9] ACPI: Define ACPI_IRQ_MODEL_GIC needed for arm Date: Wed, 4 Dec 2013 00:39:09 +0800 Message-Id: <1386088753-2850-6-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1386088753-2850-1-git-send-email-hanjun.guo@linaro.org> References: <1386088753-2850-1-git-send-email-hanjun.guo@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: hanjun.guo@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.171 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: , 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 a79273a..b1fed60 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -410,6 +410,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 c4c8c68..9cc0208 100644 --- a/drivers/acpi/plat/arm-core.c +++ b/drivers/acpi/plat/arm-core.c @@ -82,7 +82,11 @@ EXPORT_SYMBOL_GPL(arch_fix_phys_package_id); * Boot-time Configuration */ -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 115c610..1e6a0ac 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -69,6 +69,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 };