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: 23330 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f72.google.com (mail-oa0-f72.google.com [209.85.219.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 873A120540 for ; Fri, 17 Jan 2014 12:49:00 +0000 (UTC) Received: by mail-oa0-f72.google.com with SMTP id o6sf14779635oag.11 for ; Fri, 17 Jan 2014 04:48:59 -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=4rkpXz4jkjxRGXvvVVRsqw+AZKz/dw2fQ96DzLr55PQ=; b=lw1d1oGoRMSDNHIAN7xa5ggk4uIxd9rSUTM6FrOguyhD5f0NXxssedJU6c1y5kpMJj JphtoUohjtg67+P2KyHcDYrGHrOPMP4ZLQX1WeCRWQiEERu9G0PJKxLL91JJk/J0KmyX ZBwbvkzWOAtVlk9Yn1/OCwYHnOWhdOtpFQzSwFZKtw3UwfFJkJOmKkT6KCgaJkFogJXY RnGh5Soa2s/4tHm+jjDulU5qMpLTjDlFixWACC0fckhLgTagejoBVabfEioHwU0HSwKQ ypTFrxow3AVtVHHJ0Cc5LocQ+hf2+B1V6W/x3tdCebAk5mxDo0ammWaRZr6kERhiGQAW IqWg== X-Gm-Message-State: ALoCoQknfa2nBf7rfpEkDFPUZnBEiQqdES4aedVwtIEYA56MGZWZGN9AjbrFgUpf59HGVMdm3lRj X-Received: by 10.50.79.201 with SMTP id l9mr896136igx.4.1389962939673; Fri, 17 Jan 2014 04:48:59 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.0.106 with SMTP id 10ls1144730qed.55.gmail; Fri, 17 Jan 2014 04:48:59 -0800 (PST) X-Received: by 10.58.12.38 with SMTP id v6mr93700veb.57.1389962939520; Fri, 17 Jan 2014 04:48:59 -0800 (PST) Received: from mail-ve0-f175.google.com (mail-ve0-f175.google.com [209.85.128.175]) by mx.google.com with ESMTPS id sg4si4869221vdc.1.2014.01.17.04.48.59 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 17 Jan 2014 04:48:59 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.175; Received: by mail-ve0-f175.google.com with SMTP id jx11so1549278veb.20 for ; Fri, 17 Jan 2014 04:48:59 -0800 (PST) X-Received: by 10.52.109.105 with SMTP id hr9mr70759vdb.71.1389962939428; Fri, 17 Jan 2014 04:48:59 -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.59.13.131 with SMTP id ey3csp17122ved; Fri, 17 Jan 2014 04:48:58 -0800 (PST) X-Received: by 10.68.191.130 with SMTP id gy2mr1774587pbc.129.1389962938442; Fri, 17 Jan 2014 04:48:58 -0800 (PST) Received: from mail-pa0-f49.google.com (mail-pa0-f49.google.com [209.85.220.49]) by mx.google.com with ESMTPS id nu5si10022587pbc.358.2014.01.17.04.48.58 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 17 Jan 2014 04:48:58 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.49 is neither permitted nor denied by best guess record for domain of hanjun.guo@linaro.org) client-ip=209.85.220.49; Received: by mail-pa0-f49.google.com with SMTP id hz1so4047672pad.8 for ; Fri, 17 Jan 2014 04:48:58 -0800 (PST) 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> 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.128.175 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 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 };