From patchwork Fri Jul 26 09:01:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viktor Mitin X-Patchwork-Id: 11060591 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 00B79746 for ; Fri, 26 Jul 2019 09:03:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DE2E828A6A for ; Fri, 26 Jul 2019 09:03:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D212128A64; Fri, 26 Jul 2019 09:03:54 +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 683CE28A5E for ; Fri, 26 Jul 2019 09:03:54 +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 1hqw70-0007PK-Mh; Fri, 26 Jul 2019 09:02:02 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hqw6y-0007PF-J7 for xen-devel@lists.xenproject.org; Fri, 26 Jul 2019 09:02:00 +0000 X-Inumbo-ID: 05d01ce4-af84-11e9-8980-bc764e045a96 Received: from mail-lj1-x241.google.com (unknown [2a00:1450:4864:20::241]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 05d01ce4-af84-11e9-8980-bc764e045a96; Fri, 26 Jul 2019 09:01:58 +0000 (UTC) Received: by mail-lj1-x241.google.com with SMTP id t28so50736132lje.9 for ; Fri, 26 Jul 2019 02:01:58 -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; bh=hM8CMM0qhovHLQUGpQOWL439U8qSRDprqV2X5oX5KZE=; b=lFjYev9/TrtNecyK91tM+wbSA9RMWZuDl2g/Ildn+oxmFs/UtEZSWViUoNo2UiKGyZ H7ZJx+867nDi8zY8v6G/TcUB0aoDEw4nrmyVYCYtc5WRUoIW1qvQnzt6nDA5QXqrl1nv l/ECfwQQJM9/W9V7jrubEJ4rIOrUUnCbBiMkEggfEywjqxk2t/si4tGXW2O3VUr3Q6GZ 1YPORw7uX60Qt8HtIXfMFBL9kKGlnPRLgooiWWsBEx6G5L1FnHj/d5Jsvy70d4XMH7qG QPww/GWHMcImBncF79FfzJtptX7SRh0K1V4HAzmlwJzZzmuezvowp+6b++eOCWwqn+3Q a/8w== 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; bh=hM8CMM0qhovHLQUGpQOWL439U8qSRDprqV2X5oX5KZE=; b=EMXnbpna+wFxwEIP6A1lo4fWWAS8tEt4RmbcfAi2srTxW+4UlQbI+Q1Yf+bOQGG83v TrlxURF/OYyAZqjUPipBuZZjWJhI0PM/HiSEeujHBawi5GMEaTCPGtiOfend3rJJM+36 CsMZxoHfjz1mF5opG/2eoaqT6VnjkSwmVv7UoEZqyKo6GN4udrBAE7VCZqd2xG5rIcx1 4L2tt4wG9hqKA1dGbm9NMj2aDGQRlfmdJvWuABfdJWNFvMIZSZU5FmpuFP1OFigmkr+p 6giImdioLMdVGFBPWcKSj3DFuH5c4qrb5HeFyrjXGOIHUS0oYvjT8VCxpeeaL5kEZMCN 1dWA== X-Gm-Message-State: APjAAAXo4Fc0v3qp56zd0ZbNSbui8ekTHgspqD2Wy6RA3krlN+lR04e8 z1Ox9kT7xd4FXkqBJUpw9yQPs1Lc X-Google-Smtp-Source: APXvYqykWEnH0jHnUYq6/c9lxc1z2by2jkTs9H6A/Nb1hmhJuAgJ/Pa47FqAbmd1lRZ99AZaXtuy2w== X-Received: by 2002:a2e:2b9d:: with SMTP id r29mr48785251ljr.181.1564131717126; Fri, 26 Jul 2019 02:01:57 -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 v4sm9860626lji.103.2019.07.26.02.01.55 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 26 Jul 2019 02:01:56 -0700 (PDT) From: Viktor Mitin To: xen-devel@lists.xenproject.org Date: Fri, 26 Jul 2019 12:01:24 +0300 Message-Id: <20190726090124.26444-1-viktor.mitin.19@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [Xen-devel] [PATCH] xen/arm: extend fdt_property_interrupts 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 xen/arm: extend fdt_property_interrupts to deal with other domain than the hwdom Tested with aarch64 qemu dom0 and dom0less boot. Suggested-by: Julien Grall Signed-off-by: Viktor Mitin --- See discussion in mail: [PATCH] xen/arm: merge make_timer_node and make_timer_domU_node xen/arch/arm/domain_build.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 4c8404155a..5f68603392 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -621,17 +621,19 @@ 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, - unsigned num_irq) +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 +735,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 +962,10 @@ 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 )