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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 1A1DAC19F53 for ; Tue, 30 Apr 2024 02:18:45 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s1d3j-0004tY-6J; Mon, 29 Apr 2024 22:17:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s1d3i-0004t8-2K for qemu-devel@nongnu.org; Mon, 29 Apr 2024 22:17:30 -0400 Received: from mail-lf1-x135.google.com ([2a00:1450:4864:20::135]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s1d3f-00011q-3W for qemu-devel@nongnu.org; Mon, 29 Apr 2024 22:17:29 -0400 Received: by mail-lf1-x135.google.com with SMTP id 2adb3069b0e04-51967f75763so5989826e87.2 for ; Mon, 29 Apr 2024 19:17:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1714443444; x=1715048244; darn=nongnu.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=jdtaz1Zw8j6bmeVbGdZjZY+9Yid6oCzVCVr8TjRz9Ys=; b=bWMKyDcOq7JuJ4rOcYk6CPZly5Flu6nOgTlkDfL8+QFR0OqhFH9czQzrb6YHRcPqZR tbwK6Op0kVemXqaplzjCvholUBz/tsCnb07johDkR5DHZqV1FSlYk4e8haxEAdIIT4Oe GglKW8ADfG8ypdEt8Nw6J2IZTmwh1eJoP0stzTuIZT3/6UzaZJwrH6aqUK/37M415lDW fx7+lqSCjILEGBlK+RW3Za3755qtSNi29GkBSTi5jc7WO3huKXVRLG8Gj/gfO2WUCps4 jmM3zrHTwHSPHOOZOAl6gsEcrmcNxA5pD0lPNv3tq6SM0BhAmg03SVb7feDFS/y8ZZdP oQaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714443444; x=1715048244; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jdtaz1Zw8j6bmeVbGdZjZY+9Yid6oCzVCVr8TjRz9Ys=; b=D/mAyJ2XEKTGXNDrSjIkXJJ1Q/fXx7tV3UN1/kcJkht379KOS92ik2ltQt1injzqA9 +zqcXdtyFL+rB5m+CFU9WSsf6493mUfJ8BpHsCnBxWIHJ+om7QnFyp+4kyWGLIM1S+sq 1b3PWW69n0go44ykE/euoO1O5ydIlARxKceiV+dAsba54vrLe7EqE3noFZsSqADZRk8d Hbk4q/IXoebkz48WdIJRcFdF3nc0cicoXdJVlL7YCClxjiQvbhnYMNQhtKbybtxcQqEB 8Fmi7o4jubPgtF8NpMG4Dxe4GoneGWi6xYp3WbmY6NYDQLAgEz+FHpx74VrX4cVdQ3VY rGXw== X-Gm-Message-State: AOJu0YwbFO9+t/CkV7uAFuhBqOtA2lwRoTBIOzm4TEMapLU31TnJgzYi bDlf5Etf7xV1W2MwllKrhv0+oFLVN3xRl4Jd1HLssWF0XNM5P2mxOF5oRB542SJVwU17JomXapm M3j3xU4MUXfC1pRcx+c/tge9AeVxA1GHsVaJf9Gjv/i5nhf5dBiuGtcSa8kOF8m4OAjC1D9rJxE ublzlPbDp8pb286DYyse2O0DYpykeYb3/6LgEUQ7/lUA== X-Google-Smtp-Source: AGHT+IE9M7zCkdSwOoySjoCKl93p9qPfPFdp1XxFmUbjjKqN21DDGlczwm/3Mf6GIolf6YsQmCYpvA== X-Received: by 2002:a05:6512:2014:b0:51a:d5d3:ee52 with SMTP id a20-20020a056512201400b0051ad5d3ee52mr7471736lfb.17.1714443444040; Mon, 29 Apr 2024 19:17:24 -0700 (PDT) Received: from mail-lj1-f180.google.com (mail-lj1-f180.google.com. [209.85.208.180]) by smtp.gmail.com with ESMTPSA id j6-20020a056512398600b0051b1e76f8a1sm3018593lfu.26.2024.04.29.19.17.23 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 29 Apr 2024 19:17:23 -0700 (PDT) Received: by mail-lj1-f180.google.com with SMTP id 38308e7fff4ca-2df848f9325so38349191fa.1; Mon, 29 Apr 2024 19:17:23 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCUXJOc1ha9KFyH5sR02rZt76+LJNPO/iZLnbSBFrquJmK3ZDOcBDM47Nke24V8YFY4m5hGqzhfdxddNnzZemKjmBIbtLG4= X-Received: by 2002:a05:651c:11d1:b0:2e0:dc93:52ef with SMTP id z17-20020a05651c11d100b002e0dc9352efmr821923ljo.26.1714443443460; Mon, 29 Apr 2024 19:17:23 -0700 (PDT) MIME-Version: 1.0 References: <20240307160319.675044-1-dbarboza@ventanamicro.com> <20240307160319.675044-7-dbarboza@ventanamicro.com> In-Reply-To: <20240307160319.675044-7-dbarboza@ventanamicro.com> From: Frank Chang Date: Tue, 30 Apr 2024 10:17:11 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v2 06/15] hw/riscv/virt.c: support for RISC-V IOMMU PCIDevice hotplug To: Daniel Henrique Barboza Cc: qemu-devel@nongnu.org, qemu-riscv@nongnu.org, alistair.francis@wdc.com, bmeng@tinylab.org, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, palmer@rivosinc.com, ajones@ventanamicro.com, tjeznach@rivosinc.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=2a00:1450:4864:20::135; envelope-from=frank.chang@sifive.com; helo=mail-lf1-x135.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Reviewed-by: Frank Chang Daniel Henrique Barboza =E6=96=BC 2024=E5=B9=B4= 3=E6=9C=888=E6=97=A5 =E9=80=B1=E4=BA=94 =E4=B8=8A=E5=8D=8812:06=E5=AF=AB=E9= =81=93=EF=BC=9A > > From: Tomasz Jeznach > > Generate device tree entry for riscv-iommu PCI device, along with > mapping all PCI device identifiers to the single IOMMU device instance. > > Signed-off-by: Tomasz Jeznach > Signed-off-by: Daniel Henrique Barboza > --- > hw/riscv/virt.c | 33 ++++++++++++++++++++++++++++++++- > 1 file changed, 32 insertions(+), 1 deletion(-) > > diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c > index a094af97c3..67a8267747 100644 > --- a/hw/riscv/virt.c > +++ b/hw/riscv/virt.c > @@ -32,6 +32,7 @@ > #include "hw/core/sysbus-fdt.h" > #include "target/riscv/pmu.h" > #include "hw/riscv/riscv_hart.h" > +#include "hw/riscv/iommu.h" > #include "hw/riscv/virt.h" > #include "hw/riscv/boot.h" > #include "hw/riscv/numa.h" > @@ -1004,6 +1005,30 @@ static void create_fdt_virtio_iommu(RISCVVirtState= *s, uint16_t bdf) > bdf + 1, iommu_phandle, bdf + 1, 0xffff - bdf= ); > } > > +static void create_fdt_iommu(RISCVVirtState *s, uint16_t bdf) > +{ > + const char comp[] =3D "riscv,pci-iommu"; > + void *fdt =3D MACHINE(s)->fdt; > + uint32_t iommu_phandle; > + g_autofree char *iommu_node =3D NULL; > + g_autofree char *pci_node =3D NULL; > + > + pci_node =3D g_strdup_printf("/soc/pci@%lx", > + (long) virt_memmap[VIRT_PCIE_ECAM].base); > + iommu_node =3D g_strdup_printf("%s/iommu@%x", pci_node, bdf); > + iommu_phandle =3D qemu_fdt_alloc_phandle(fdt); > + qemu_fdt_add_subnode(fdt, iommu_node); > + > + qemu_fdt_setprop(fdt, iommu_node, "compatible", comp, sizeof(comp)); > + qemu_fdt_setprop_cell(fdt, iommu_node, "#iommu-cells", 1); > + qemu_fdt_setprop_cell(fdt, iommu_node, "phandle", iommu_phandle); > + qemu_fdt_setprop_cells(fdt, iommu_node, "reg", > + bdf << 8, 0, 0, 0, 0); > + qemu_fdt_setprop_cells(fdt, pci_node, "iommu-map", > + 0, iommu_phandle, 0, bdf, > + bdf + 1, iommu_phandle, bdf + 1, 0xffff - bdf= ); > +} > + > static void finalize_fdt(RISCVVirtState *s) > { > uint32_t phandle =3D 1, irq_mmio_phandle =3D 1, msi_pcie_phandle =3D= 1; > @@ -1712,9 +1737,11 @@ static HotplugHandler *virt_machine_get_hotplug_ha= ndler(MachineState *machine, > MachineClass *mc =3D MACHINE_GET_CLASS(machine); > > if (device_is_dynamic_sysbus(mc, dev) || > - object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_IOMMU_PCI)) { > + object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_IOMMU_PCI) || > + object_dynamic_cast(OBJECT(dev), TYPE_RISCV_IOMMU_PCI)) { > return HOTPLUG_HANDLER(machine); > } > + > return NULL; > } > > @@ -1735,6 +1762,10 @@ static void virt_machine_device_plug_cb(HotplugHan= dler *hotplug_dev, > if (object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_IOMMU_PCI)) { > create_fdt_virtio_iommu(s, pci_get_bdf(PCI_DEVICE(dev))); > } > + > + if (object_dynamic_cast(OBJECT(dev), TYPE_RISCV_IOMMU_PCI)) { > + create_fdt_iommu(s, pci_get_bdf(PCI_DEVICE(dev))); > + } > } > > static void virt_machine_class_init(ObjectClass *oc, void *data) > -- > 2.43.2 > >