From patchwork Fri Apr 1 15:49:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 64871 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp811311lbc; Fri, 1 Apr 2016 08:51:24 -0700 (PDT) X-Received: by 10.60.40.9 with SMTP id t9mr4928358oek.28.1459525877550; Fri, 01 Apr 2016 08:51:17 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id nq8si7819049obb.92.2016.04.01.08.51.17; Fri, 01 Apr 2016 08:51:17 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932545AbcDAPvJ (ORCPT + 29 others); Fri, 1 Apr 2016 11:51:09 -0400 Received: from mail-pa0-f48.google.com ([209.85.220.48]:34614 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759106AbcDAPvD (ORCPT ); Fri, 1 Apr 2016 11:51:03 -0400 Received: by mail-pa0-f48.google.com with SMTP id fe3so93908048pab.1 for ; Fri, 01 Apr 2016 08:51:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6qCEef/5GvchlerrC4hLaQZc6bibx2h2cFmf6+HesjQ=; b=gtpNEG6tAFJ+5lEb6A4mAy+TsEBFuY3EBYwxBEgv87x+TqzuH2baTCsep0N1BMgBVQ AhwQGZsSuANWfSFzaR2emg5teJezLXzCmWjNQemiae0jUePtbs5jL9kxDob/AXfdpn7G RHDpcYnOPCKKxyKs30WivoenYEusjd2uwfBEU= 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=6qCEef/5GvchlerrC4hLaQZc6bibx2h2cFmf6+HesjQ=; b=i1qiYGlKTZ9Fx07GzRWgRg/vbVY/OQ6BIGsqMvy1TxK6vsPeBeqmaCCC0EJsCuJcA0 1irEhYvxUh1QsB/fAVSiVacNlxrfeNRlmRSEAH9C442YUVSdC38Ymm1HGtgDm8LA4HoO avtJuFAezzkziaddSKc5UEJvn2QJbJbSVGP8buAhSwdVK8W2fta7WnMy7kn3eeKj6Xsi tUCw5nQkKEJEJxylOBb5omrGztNLynae7aYXb5n+L25TE/Spk91lMeH++jArchhHKDIA siljEi9DXPHj6INn0blTlKHmZR26kNZszPDLrQbYr+fJkwdDbZr83kNyZFv55pAJ7FDG jq9w== X-Gm-Message-State: AD7BkJKmo+mMZCyxUOw/SvjDZArfGmMkz2/nl80JCigSgmKayis3Iik6jgounafECc8Zq64B X-Received: by 10.66.102.8 with SMTP id fk8mr32162825pab.12.1459525862043; Fri, 01 Apr 2016 08:51:02 -0700 (PDT) Received: from localhost.localdomain ([167.160.116.218]) by smtp.gmail.com with ESMTPSA id yj1sm22536791pac.16.2016.04.01.08.50.54 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 01 Apr 2016 08:51:00 -0700 (PDT) From: Shannon Zhao To: linux-arm-kernel@lists.infradead.org, stefano.stabellini@citrix.com Cc: david.vrabel@citrix.com, devicetree@vger.kernel.org, linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, catalin.marinas@arm.com, will.deacon@arm.com, julien.grall@arm.com, peter.huangpeng@huawei.com, xen-devel@lists.xen.org, zhaoshenglong@huawei.com, shannon.zhao@linaro.org Subject: [PATCH v10 10/17] arm/xen: Get event-channel irq through HVM_PARAM when booting with ACPI Date: Fri, 1 Apr 2016 23:49:08 +0800 Message-Id: <1459525755-36968-11-git-send-email-shannon.zhao@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1459525755-36968-1-git-send-email-shannon.zhao@linaro.org> References: <1459525755-36968-1-git-send-email-shannon.zhao@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The kernel will get the event-channel IRQ through HVM_PARAM_CALLBACK_IRQ. Signed-off-by: Shannon Zhao Reviewed-by: Stefano Stabellini --- arch/arm/xen/enlighten.c | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) -- 2.1.4 diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c index d94f726..06bd61a 100644 --- a/arch/arm/xen/enlighten.c +++ b/arch/arm/xen/enlighten.c @@ -30,6 +30,7 @@ #include #include #include +#include #include @@ -278,6 +279,35 @@ void __init xen_early_init(void) add_preferred_console("hvc", 0, NULL); } +static void __init xen_acpi_guest_init(void) +{ +#ifdef CONFIG_ACPI + struct xen_hvm_param a; + int interrupt, trigger, polarity; + + a.domid = DOMID_SELF; + a.index = HVM_PARAM_CALLBACK_IRQ; + + if (HYPERVISOR_hvm_op(HVMOP_get_param, &a) + || (a.value >> 56) != HVM_PARAM_CALLBACK_TYPE_PPI) { + xen_events_irq = 0; + return; + } + + interrupt = a.value & 0xff; + trigger = ((a.value >> 8) & 0x1) ? ACPI_EDGE_SENSITIVE + : ACPI_LEVEL_SENSITIVE; + polarity = ((a.value >> 8) & 0x2) ? ACPI_ACTIVE_LOW + : ACPI_ACTIVE_HIGH; + xen_events_irq = acpi_register_gsi(NULL, interrupt, trigger, polarity); +#endif +} + +static void __init xen_dt_guest_init(void) +{ + xen_events_irq = irq_of_parse_and_map(xen_node, 0); +} + static int __init xen_guest_init(void) { struct xen_add_to_physmap xatp; @@ -286,7 +316,11 @@ static int __init xen_guest_init(void) if (!xen_domain()) return 0; - xen_events_irq = irq_of_parse_and_map(xen_node, 0); + if (!acpi_disabled) + xen_acpi_guest_init(); + else + xen_dt_guest_init(); + if (!xen_events_irq) { pr_err("Xen event channel interrupt not found\n"); return -ENODEV;