From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757352AbcASIVr (ORCPT ); Tue, 19 Jan 2016 03:21:47 -0500 Received: from szxga03-in.huawei.com ([119.145.14.66]:64887 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751786AbcASIVo (ORCPT ); Tue, 19 Jan 2016 03:21:44 -0500 Message-ID: <569DF203.8030104@huawei.com> Date: Tue, 19 Jan 2016 16:21:23 +0800 From: Shannon Zhao User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 MIME-Version: 1.0 To: Stefano Stabellini CC: , , , , , , , , , , , , , Subject: Re: [Xen-devel] [PATCH v2 09/16] arm/xen: Get event-channel irq through HVM_PARAM when booting with ACPI References: <1452840929-19612-1-git-send-email-zhaoshenglong@huawei.com> <1452840929-19612-10-git-send-email-zhaoshenglong@huawei.com> In-Reply-To: Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.177.16.142] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020204.569DF214.007A,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: dcf7370cd725c40fbaae5c10b4655a56 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2016/1/18 22:38, Stefano Stabellini wrote: > On Fri, 15 Jan 2016, Shannon Zhao wrote: >> From: Shannon Zhao >> >> When booting with ACPI, it could get the event-channel irq through >> HVM_PARAM_CALLBACK_IRQ. >> >> Signed-off-by: Shannon Zhao >> --- >> arch/arm/xen/enlighten.c | 30 +++++++++++++++++++++++++++++- >> 1 file changed, 29 insertions(+), 1 deletion(-) >> >> diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c >> index 6d90a62..4e78c49 100644 >> --- a/arch/arm/xen/enlighten.c >> +++ b/arch/arm/xen/enlighten.c >> @@ -29,6 +29,7 @@ >> #include >> #include >> #include >> +#include >> >> #include >> >> @@ -270,7 +271,34 @@ 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) { >> +#ifdef CONFIG_ACPI > > I think it would be best to move the acpi specific and DT specific > initializations out of xen_guest_init. Then at the beginning of > xen_guest_init, call only the one that applies. The acpi init function > could be ifdef'ed CONFIG_ACPI. Making sure that acpi_disabled is 1 when > !CONFIG_ACPI, we could even avoid all ifdef's from xen_guest_init. > Sure, will fix. Thanks. > The rest is good, thanks. > > >> + struct xen_hvm_param a; >> + int interrupt, trigger, polarity; >> + >> + a.domid = DOMID_SELF; >> + a.index = HVM_PARAM_CALLBACK_IRQ; >> + xen_events_irq = 0; >> + if (!HYPERVISOR_hvm_op(HVMOP_get_param, &a)) { >> + if ((a.value >> 56) == 3) { >> + 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 >> + } else { >> + xen_events_irq = irq_of_parse_and_map(xen_node, 0); >> + } >> + >> if (!xen_events_irq) { >> pr_err("Xen event channel interrupt not found\n"); >> return -ENODEV; > > . > -- Shannon