From patchwork Tue Sep 14 14:19:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Philippe Brucker X-Patchwork-Id: 510940 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp1624933jao; Tue, 14 Sep 2021 07:57:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwarUeXhoKOEUGaNHxmzCY0El5rJHzGz+B+VqXCKtFEUqLxKI1GJXa/75wHfi3GGGEuRHWN X-Received: by 2002:a25:d946:: with SMTP id q67mr21536757ybg.107.1631631468053; Tue, 14 Sep 2021 07:57:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631631468; cv=none; d=google.com; s=arc-20160816; b=JCGTUDr3gdqzwb10hYCOZmMDwR8SKt9fuIC+JClajstJ/S0Fs6XYMh4MsyeMGhMgtA 9XPbR3zC2blEk8AjuX2tC2dzL5aZRqIvTEPW/2mwFQ3swNVVNT7NJ4Rkf1ZP5+tLGIYo UIToLycOb/oNCLfcTagXrSxAnfaCiaDNYcZOJmbvDefWSC0iU+Wl5IS2fIVV/kNWAdQa nv0MO+ghjPRefcg4sx0yI220cEm3htVksKGYUg6tHdpapZgT/ch5AYkbwIEoK3K37qzl NZdRnY7iENpW1CkHYQjPtNI4wvyEIJ2i84KHaBXxNrvITL/+QHl4VNX0mu+OLr0iED3W ++dA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=A36UF6SLZ6rtAL1T4W2mA2INEfGxveQOg5GlQyADzqg=; b=QIXSO3CgJMQoSo3SpP57jqpuV6zglnlFexJguN+5vCUjcs1EJm8tkzl67Dej/5Yf6a 24AxRza6h2OmSIl+VXZd3wHzxe2VjjwjIogjp2MkldZkudauUszIAs8J093F2lV8s04A uex2JOizikgzUnv6nK9Ioro1RFkCJQUHI0K/ti+pZQ9+jHqr4BnEew1D0igyCZY3uHfg HFJafoE53zWbD2CM3msO0GT8Bn8foFoKH5rRRj84OIiXc+zTqWbkKjkcI+FsYYwaqHb/ fwRJmwnuljkuwhhOTsRpxOvb3I7OH8gQmOI7garpmRPTEgxwmTViH39xjZcgcyzXV7+Y yPMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ds+QZrm0; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r137si13860024ybc.246.2021.09.14.07.57.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 14 Sep 2021 07:57:48 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ds+QZrm0; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:49102 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQ9sZ-0006xs-Dx for patch@linaro.org; Tue, 14 Sep 2021 10:57:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35920) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQ9MS-0006Bw-5D for qemu-devel@nongnu.org; Tue, 14 Sep 2021 10:24:36 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:45727) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQ9MJ-0005Nr-65 for qemu-devel@nongnu.org; Tue, 14 Sep 2021 10:24:35 -0400 Received: by mail-wm1-x329.google.com with SMTP id j17-20020a05600c1c1100b002e754875260so2694216wms.4 for ; Tue, 14 Sep 2021 07:24:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=A36UF6SLZ6rtAL1T4W2mA2INEfGxveQOg5GlQyADzqg=; b=ds+QZrm0k8l6jUBnwq7IHqicrPeYluCt5ucvx08hT+feUN7pwPu6PbkcvYq79e8zSZ cUXaa730IdoRFKFVuy8bX6nWXeCDnnW5DLZ0OQar9bxGvU4sS4lZnGsivQb8PuKxB4nk GktCDrEg7OxnSRzyTae7SzZZjSFhoflGchISB7NnIVxReu+uxjn7wxedYK7HgWiO+Vii iVbY6MOkru0vYWdmUATcKNdpk4nlMKicxxtRfnkNtJAvnhS0uOW8vMsiKh+Fhb0DuuuW 00lQu1haYeImtZtVU2Z+E/SeRdqDXkine0VdZSXPMI4UAZb7Uhia/obAnLPxCv52Q200 hDCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=A36UF6SLZ6rtAL1T4W2mA2INEfGxveQOg5GlQyADzqg=; b=FwBsA+o24EfvEU08BQDBI5FhqMrouk0TIL6urHedtgZsW8ju8hccSzQVhQpMw3UnFF uORz2NT53kYbDYypeUwf+eueYVoRiRuwNHEOt+gvEKpZkSRgFbQAe3juzth6TAwYiL7u Ii4melEkRs6VrQchSM7qrJBWHKZnFLezj8MdljmMY5trXen5XVuTZ6sMvqwe9jKj9XmV b0xXaw8ivXYo/+ny1Y7hqSYaptkEX+QVNZ/ibAPZmrx+0l+X9PMyG31SyWVhjCKx+wq9 3J4bOsIZ8N8nlQ7WgqFeu8HLjs3TZOfl16OXGMDEv+Mc4JrsbfF8hgY/uFZkXu+LDmaz YnkA== X-Gm-Message-State: AOAM530Z2vFxoXRxAfFrQJWtzIsMjXse707w6mPU6jWg8eiR3bsM6w2y f0js90j8pK6OXLfcHyiNhLPvxA== X-Received: by 2002:a7b:c3cc:: with SMTP id t12mr2530132wmj.68.1631629465295; Tue, 14 Sep 2021 07:24:25 -0700 (PDT) Received: from localhost.localdomain (cpc92880-cmbg19-2-0-cust679.5-4.cable.virginm.net. [82.27.106.168]) by smtp.gmail.com with ESMTPSA id k6sm184252wmo.37.2021.09.14.07.24.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Sep 2021 07:24:24 -0700 (PDT) From: Jean-Philippe Brucker To: eric.auger@redhat.com Subject: [PATCH v3 04/10] hw/arm/virt: Reject instantiation of multiple IOMMUs Date: Tue, 14 Sep 2021 15:19:59 +0100 Message-Id: <20210914142004.2433568-5-jean-philippe@linaro.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210914142004.2433568-1-jean-philippe@linaro.org> References: <20210914142004.2433568-1-jean-philippe@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=jean-philippe@linaro.org; helo=mail-wm1-x329.google.com X-Spam_score_int: -1 X-Spam_score: -0.2 X-Spam_bar: / X-Spam_report: (-0.2 / 5.0 requ) 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, ehabkost@redhat.com, mst@redhat.com, richard.henderson@linaro.org, qemu-devel@nongnu.org, shannon.zhaosl@gmail.com, Jean-Philippe Brucker , qemu-arm@nongnu.org, pbonzini@redhat.com, ani@anisinha.ca, imammedo@redhat.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We do not support instantiating multiple IOMMUs. Before adding a virtio-iommu, check that no other IOMMU is present. This will detect both "iommu=smmuv3" machine parameter and another virtio-iommu instance. Fixes: 70e89132c9 ("hw/arm/virt: Add the virtio-iommu device tree mappings") Reviewed-by: Eric Auger Signed-off-by: Jean-Philippe Brucker --- hw/arm/virt.c | 5 +++++ 1 file changed, 5 insertions(+) -- 2.33.0 Tested-by: Eric Auger diff --git a/hw/arm/virt.c b/hw/arm/virt.c index f238766aa1..26069f943a 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2471,6 +2471,11 @@ static void virt_machine_device_plug_cb(HotplugHandler *hotplug_dev, if (object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_IOMMU_PCI)) { PCIDevice *pdev = PCI_DEVICE(dev); + if (vms->iommu != VIRT_IOMMU_NONE) { + error_setg(errp, "virt machine does not support multiple IOMMUs"); + return; + } + vms->iommu = VIRT_IOMMU_VIRTIO; vms->virtio_iommu_bdf = pci_get_bdf(pdev); create_virtio_iommu_dt_bindings(vms);