From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6B342C433FE for ; Tue, 8 Dec 2020 19:51:49 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AFAF223C31 for ; Tue, 8 Dec 2020 19:51:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AFAF223C31 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:37458 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kmj1X-0003oz-OS for qemu-devel@archiver.kernel.org; Tue, 08 Dec 2020 14:51:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48882) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kmikd-00054V-Qi for qemu-devel@nongnu.org; Tue, 08 Dec 2020 14:34:19 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:51232) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kmikb-0004on-Dp for qemu-devel@nongnu.org; Tue, 08 Dec 2020 14:34:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607456056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=eNcV8yenr5e4/gQuOd0WGDeItExL2HtrnjnsPaPv3a0=; b=U6gz+N/Dy/kMqnHA81ApjiXMlmgsjFt7Ccj3D4YyaIj+/fWK/SgfQsMug7AK0575mOgCaJ ote8i0lB1nBQ483DGJ9Ci9Y+x37zpkcdcsJ5e/agDjVfTGVPezcCM06tz4ALux9yhYxGCb 8me3yopKYCxhlVCcs6moS9DNS+ELblY= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-252-8ARr4979N8OTH84QYT9iMA-1; Tue, 08 Dec 2020 14:34:14 -0500 X-MC-Unique: 8ARr4979N8OTH84QYT9iMA-1 Received: by mail-wr1-f69.google.com with SMTP id o17so37031wra.8 for ; Tue, 08 Dec 2020 11:34:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=eNcV8yenr5e4/gQuOd0WGDeItExL2HtrnjnsPaPv3a0=; b=j72WqMtVxVxq73cPZFH4yXC+Z01LbYn0RWqbucEg5HNnbGpN8wN/PhUwH6tAlo/lrk 7Ovj59SqRBFCHdo/7H1Kh2sbUKv/YbjyO3Z6gq7b4E5bPs0tJPDPldPhkl0vNpodIgeq tWQdpummxxU7pwCs1MnYp38ixC+bBefxKPvZ+6brz23HLCc3qzPcLfdDoDgvlaGohV9p WLfw0ACeNGidkAvKciUT2/cy9q6kqw82B3hqZJq8ENKaR8dqhHnSEm8fJkFaFrvMlr93 hysf+KT/GVnV/3lWwUVA6IBJgTMUPXRiz4w8C1TK9hFYfS6+khq7TQ+FCYYZLekgV6nv 5b+w== X-Gm-Message-State: AOAM5327bkGsMqxS/uzhR2gp3A4BstGEOLGXPrISHs7YsJp7m7q7XTwJ NyQTqocflw6gQDtVrd+0U2uv8rOOMI51nUl+CrfFyKeI6losS2bCvqRVRvBB59/PhxPN8OyQPrG bNckVIFmIcTHQ1VGXC3utU3db8UC3ZrMdtSNw/Eh4KuQxfdOGYighDKVOtjU5 X-Received: by 2002:adf:e60e:: with SMTP id p14mr26033945wrm.188.1607456053217; Tue, 08 Dec 2020 11:34:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJx+0rG6UqIkSpktUmKieOn0AdQtCmnFuGPJKGy/Yljh5ZYi+5cpxEd3A5IdvuIbSchqjvvLww== X-Received: by 2002:adf:e60e:: with SMTP id p14mr26033926wrm.188.1607456053005; Tue, 08 Dec 2020 11:34:13 -0800 (PST) Received: from redhat.com (bzq-79-176-44-197.red.bezeqint.net. [79.176.44.197]) by smtp.gmail.com with ESMTPSA id o83sm4910349wme.21.2020.12.08.11.34.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Dec 2020 11:34:12 -0800 (PST) Date: Tue, 8 Dec 2020 14:34:10 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 10/66] hw/arm/virt: Write extra pci roots into fw_cfg Message-ID: <20201208193307.646726-11-mst@redhat.com> References: <20201208193307.646726-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20201208193307.646726-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mst@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Received-SPF: pass client-ip=63.128.21.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Jiahui Cen , qemu-arm@nongnu.org, Yubo Miao Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Jiahui Cen Add bus property to virt machine for primary PCI root bus and use it to add extra pci roots behind it. Signed-off-by: Jiahui Cen Signed-off-by: Yubo Miao Message-Id: <20201119014841.7298-4-cenjiahui@huawei.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/hw/arm/virt.h | 1 + hw/arm/virt.c | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index aad6d69841..abf54fab49 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -163,6 +163,7 @@ struct VirtMachineState { DeviceState *gic; DeviceState *acpi_dev; Notifier powerdown_notifier; + PCIBus *bus; }; #define VIRT_ECAM_ID(high) (high ? VIRT_HIGH_PCIE_ECAM : VIRT_PCIE_ECAM) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 27dbeb549e..847257aa5c 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1289,7 +1289,8 @@ static void create_pcie(VirtMachineState *vms) } pci = PCI_HOST_BRIDGE(dev); - if (pci->bus) { + vms->bus = pci->bus; + if (vms->bus) { for (i = 0; i < nb_nics; i++) { NICInfo *nd = &nd_table[i]; @@ -1346,7 +1347,7 @@ static void create_pcie(VirtMachineState *vms) switch (vms->iommu) { case VIRT_IOMMU_SMMUV3: - create_smmu(vms, pci->bus); + create_smmu(vms, vms->bus); qemu_fdt_setprop_cells(vms->fdt, nodename, "iommu-map", 0x0, vms->iommu_phandle, 0x0, 0x10000); break; @@ -1481,6 +1482,8 @@ void virt_machine_done(Notifier *notifier, void *data) exit(1); } + fw_cfg_add_extra_pci_roots(vms->bus, vms->fw_cfg); + virt_acpi_setup(vms); virt_build_smbios(vms); } -- MST