From patchwork Thu Aug 1 12:04:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viktor Mitin X-Patchwork-Id: 11070593 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0B5D313AC for ; Thu, 1 Aug 2019 12:07:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EFD5C271FD for ; Thu, 1 Aug 2019 12:07:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E398F28409; Thu, 1 Aug 2019 12:07:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.0 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 79F64271FD for ; Thu, 1 Aug 2019 12:07:03 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ht9pt-0002Ka-Mb; Thu, 01 Aug 2019 12:05:33 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ht9ps-0002KT-N7 for xen-devel@lists.xenproject.org; Thu, 01 Aug 2019 12:05:32 +0000 X-Inumbo-ID: a85e2090-b454-11e9-8980-bc764e045a96 Received: from mail-lf1-x144.google.com (unknown [2a00:1450:4864:20::144]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id a85e2090-b454-11e9-8980-bc764e045a96; Thu, 01 Aug 2019 12:05:31 +0000 (UTC) Received: by mail-lf1-x144.google.com with SMTP id c9so50003261lfh.4 for ; Thu, 01 Aug 2019 05:05:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lsh6Uzyr0dItLdqmqOxb7/3w2WzbhbJL6Ehl7l0MBko=; b=SJCtxtf5kNzEDFLfBRoOEhcyf7foNfHw41J9NeLTbEFGHv0J2OyAzw+eiPPpM0EgLh cU8LwlwpNteYofgi9xj+XKc0+BY08FnHaVqaOEG9B1mwMXfsOzubA12LuhAjm2Pzgk/Q 3Ot972HRyLrjLwhw5nZzBPTKpdAOlCLzjjTGmCCYt2/XSXMAE1CVyWsskQj0j/6y1IrQ 9ne4+5F8fDgC/tyCAT99A+0tadCU+4bbPzoTyAh4rJwHmTlOL3uAPY+6CAbsj+rGgoxv up1OChNBOOj5UTlviF/Wo9du3zNgFof0ZBXB4ZsU+uZ0EkOfOHP16Vg6zfkRA1gnOP4C c08A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=lsh6Uzyr0dItLdqmqOxb7/3w2WzbhbJL6Ehl7l0MBko=; b=Cc84Kiqj2DjozcGr4nrvYv2aPlsdYRiBteYvkdaxf5xPT14cSofp7zEZ/gbipwfdqF UMm9aZFI+wlNetIByTMj6Mr3kS4h9L69qK/XWgkmwDbw/ZHAO+Qc75rA/V4o3noQOSj1 mouI7VV/Qib/Ci/hDSOAtoE2gFJ1QLM0NLehD2bg+OP/iWWifd/ixzcf+647TIECun02 JxZanMoWLecMHl/XScDSHEK2gdjSXFW4vn2dE6rfefChydxDRO7dNpbqCrt6b4XH190K n+ZgRwOawt0ihSlchPj++LYi5bnwXCtOLaLq25N9hfkwei4oxRtQ1TPDL4eduoz9SnPb x9gg== X-Gm-Message-State: APjAAAXnS6TxfS7eC5Q6PUB2gK0Elon0bjbQ69E2f2VFF4aL/eAgAuwZ FrPAX/uwDvkVLWPWCcjWV55e7UjW3sw= X-Google-Smtp-Source: APXvYqz2qz4hA1OV7wGwx2A/wZlH6ZAiE4PbbJp2Q7X0SMugVa9lugR67VQ5bsVWaKAtrWErigBIgQ== X-Received: by 2002:a19:8c57:: with SMTP id i23mr59581232lfj.192.1564661129949; Thu, 01 Aug 2019 05:05:29 -0700 (PDT) Received: from 3489.kyiv.epam.com (ll-22.209.223.85.sovam.net.ua. [85.223.209.22]) by smtp.gmail.com with ESMTPSA id u18sm12147150lfe.65.2019.08.01.05.05.28 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 01 Aug 2019 05:05:29 -0700 (PDT) From: Viktor Mitin To: xen-devel@lists.xenproject.org Date: Thu, 1 Aug 2019 15:04:51 +0300 Message-Id: <20190801120452.6814-2-viktor.mitin.19@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190801120452.6814-1-viktor.mitin.19@gmail.com> References: <20190801120452.6814-1-viktor.mitin.19@gmail.com> Subject: [Xen-devel] [PATCH v5 1/2] xen/arm: extend fdt_property_interrupts to support DomU X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Volodymyr Babchuk , Julien Grall , Stefano Stabellini , Viktor Mitin , Viktor Mitin MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Extend fdt_property_interrupts to deal with other domain than the hwdom. The prototype of fdt_property_interrupts() has been modified to support both hwdom and domU in one function. The new prototype of make_timer_node function is required since make_timer_node calls fdt_property_interrupts which uses kinfo: make_timer_node(const struct kernel_info *kinfo) This is a preparatory for the next patch which consolidates make_timer_node and make_timer_domU_node". Original goal is to consolidate make_timer functions. Suggested-by: Julien Grall Signed-off-by: Viktor Mitin Reviewed-by: Volodymyr Babchuk --- xen/arch/arm/domain_build.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) -- 2.17.1 diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 4c8404155a..bc7d17dd2c 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -621,17 +621,20 @@ static void __init set_interrupt(gic_interrupt_t interrupt, * "interrupts": contains the list of interrupts * "interrupt-parent": link to the GIC */ -static int __init fdt_property_interrupts(void *fdt, gic_interrupt_t *intr, +static int __init fdt_property_interrupts(const struct kernel_info *kinfo, + gic_interrupt_t *intr, unsigned num_irq) { int res; + uint32_t phandle = is_hardware_domain(kinfo->d) ? + dt_interrupt_controller->phandle : GUEST_PHANDLE_GIC; - res = fdt_property(fdt, "interrupts", intr, sizeof (intr[0]) * num_irq); + res = fdt_property(kinfo->fdt, "interrupts", + intr, sizeof (intr[0]) * num_irq); if ( res ) return res; - res = fdt_property_cell(fdt, "interrupt-parent", - dt_interrupt_controller->phandle); + res = fdt_property_cell(kinfo->fdt, "interrupt-parent", phandle); return res; } @@ -733,7 +736,7 @@ static int __init make_hypervisor_node(struct domain *d, * TODO: Handle properly the cpumask; */ set_interrupt(intr, d->arch.evtchn_irq, 0xf, DT_IRQ_TYPE_LEVEL_LOW); - res = fdt_property_interrupts(fdt, &intr, 1); + res = fdt_property_interrupts(kinfo, &intr, 1); if ( res ) return res; @@ -960,8 +963,9 @@ static int __init make_gic_node(const struct domain *d, void *fdt, return res; } -static int __init make_timer_node(const struct domain *d, void *fdt) +static int __init make_timer_node(const struct kernel_info *kinfo) { + void *fdt = kinfo->fdt; static const struct dt_device_match timer_ids[] __initconst = { DT_MATCH_COMPATIBLE("arm,armv7-timer"), @@ -1016,7 +1020,7 @@ static int __init make_timer_node(const struct domain *d, void *fdt) dt_dprintk(" Virt interrupt %u\n", irq); set_interrupt(intrs[2], irq, 0xf, DT_IRQ_TYPE_LEVEL_LOW); - res = fdt_property_interrupts(fdt, intrs, 3); + res = fdt_property_interrupts(kinfo, intrs, 3); if ( res ) return res; @@ -1377,7 +1381,7 @@ static int __init handle_node(struct domain *d, struct kernel_info *kinfo, if ( device_get_class(node) == DEVICE_GIC ) return make_gic_node(d, kinfo->fdt, node); if ( dt_match_node(timer_matches, node) ) - return make_timer_node(d, kinfo->fdt); + return make_timer_node(kinfo); /* Skip nodes used by Xen */ if ( dt_device_used_by(node) == DOMID_XEN )