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: 3277821 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 832D79F380 for ; Tue, 3 Dec 2013 16:44:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6C6212037A for ; Tue, 3 Dec 2013 16:44:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C219F2015E for ; Tue, 3 Dec 2013 16:44:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753596Ab3LCQki (ORCPT ); Tue, 3 Dec 2013 11:40:38 -0500 Received: from mail-pd0-f179.google.com ([209.85.192.179]:34054 "EHLO mail-pd0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754637Ab3LCQkg (ORCPT ); Tue, 3 Dec 2013 11:40:36 -0500 Received: by mail-pd0-f179.google.com with SMTP id r10so20294624pdi.24 for ; Tue, 03 Dec 2013 08:40:35 -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=dFLQ03k+zyZhlXcm38XQxK1n3CW8kr8gWmTGJ2f32CU=; b=T+oTwORoRW9rOHnN1vmkTKmJ2JcVtpFh6bXnAr8nO+Qfx8gZiKhBkZ7dmr0Z8A+IGz vtSSvtYGnC20vFlJp3PPXxFMYJFdlWfU23B0XCj2XSn+JU0bTt4Yexn5wdnq0wvUX9DP cLcPp0ylpk8sGzg8gnLVlbS2rgaaNckA1Si2WwWd+CunIugHYu0ZRw+jzjhdM6YrfBBm yZDO4ZAgZQN6k/1J+Xl1Jz29F2MXzX/nGS/ZYzhDpySrQ6WwDOrfkcagEgGPJdeCFy64 bzKWjoZ2G6CB1zYVDyL4NsBaEBAURO0LQEZUR2xrenfOXMcXBie3XUD31VCAYwyxxBx/ j+OQ== X-Gm-Message-State: ALoCoQkUrGErNDtzL9O9FpYoiZT0LTJz4SfhtGkKA62DCcd1wx/u3oMWOVkJ78bkOBwqRUC+Br6P 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> 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.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 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 };