From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:ac2:5042:0:0:0:0:0 with SMTP id a2csp312268lfm; Fri, 26 Jun 2020 03:40:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwRPKPlQSGSKpIzzSRH1Y2VKf4YSdIpH81RyFYJRdYo5XShsiC8Kudstzf0LZ9lh3x1DJDq X-Received: by 2002:a25:e41:: with SMTP id 62mr4160586ybo.91.1593168003572; Fri, 26 Jun 2020 03:40:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593168003; cv=none; d=google.com; s=arc-20160816; b=kzk4MeVt+tRYgOK1dcIf4y+gBW0tHtmndTy/857h23h1hcIK9HpA5emj6uws9vXoaG 0vhHOGhAdBkQrs3U5CsyKbKF66LvFc0w7I+nLyRP4d6aGhnEKHA8aVwhrzeu27So1zAe jQ6VhZg5hMcUCuF03btbprqcMs4odgkw/tYVz5jJWkH6qrMqzhjxEqAe0zX8/7YkfP77 leLJbx/kMK4lO2OWTapjsdspm/JaTXNN4131oVA/NOK/j/HWOFLCQKxn6ZvjokFkOG4w gj9S3NxEdloB3hJePAJcK2Ro8OH3KYaaYpMoC2WjIvi2NA4bXe/t7blQ5bPVKKJQtQrX 5DVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=Jsx2paOZxQG5p+6GOhDH30oBaa9asfYPofqVx/6jHHs=; b=aiDddcAV3gG+6/IMv4x46qKAp9tTKvp3ZMI3bMJra/Ufhjb6c9Th2V7XEiDvcXGupk k0Cs7AYv9C3t2wbmVcYAA9Z+c9Rq4epZfimU+klTIRiDvUfKJDZ/bRKpr48DS/rYYelI joRAzb14wiv0FC7bOsRN3dG6d6h9a7WWlyXWD7Q/Iu1vQ002cEmYu3zO1wgd4z/4P8aZ +hiazq5j0eGbqmXkhUslz9wFU1Pd/f6RGRQ5gwVEGktGe45uKwllHjP6K0+lbHEB1NFr s77RFiia6IWS7Sv4bpEaRE1RtLUT0l3VKgHJYhc7A8ntZfcmZBsC/WXejgwDwEfW/cWZ maXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=D5iXW3Sp; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6si22809869ybu.119.2020.06.26.03.40.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Jun 2020 03:40:03 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=D5iXW3Sp; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:49166 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jolm6-00057S-V4 for alex.bennee@linaro.org; Fri, 26 Jun 2020 06:40:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41172) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jole2-0002Qz-9D for qemu-arm@nongnu.org; Fri, 26 Jun 2020 06:31:42 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:40396 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jole0-0003LN-87 for qemu-arm@nongnu.org; Fri, 26 Jun 2020 06:31:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593167499; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Jsx2paOZxQG5p+6GOhDH30oBaa9asfYPofqVx/6jHHs=; b=D5iXW3Spk1fbmBKRDqZ5xZhwVqfe6ESAKJjHXmpJJt2T2ZZUJnm5kIPvUC6mIkZlHtY1nW vvwKyn7ZYF2HIC8rzjRRP4WuiWSaszK0Badc1BHyyxDUI8d/X682Up0OPJulnejkBjcALn UgtlZnkF96H4O/IafIYIPfT70uxEwTs= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-220-2qakR_AJPXKBrBvNt8fVSg-1; Fri, 26 Jun 2020 06:31:35 -0400 X-MC-Unique: 2qakR_AJPXKBrBvNt8fVSg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 95577107ACF2; Fri, 26 Jun 2020 10:31:34 +0000 (UTC) Received: from laptop.redhat.com (ovpn-114-197.ams2.redhat.com [10.36.114.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9BCEB61169; Fri, 26 Jun 2020 10:31:23 +0000 (UTC) From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, peter.maydell@linaro.org, mst@redhat.com, armbru@redhat.com, pbonzini@redhat.com, jean-philippe@linaro.org, bbhushan2@marvell.com, peterx@redhat.com Subject: [PATCH v6 4/5] virtio-iommu-pci: Add array of Interval properties Date: Fri, 26 Jun 2020 12:30:56 +0200 Message-Id: <20200626103057.11263-5-eric.auger@redhat.com> In-Reply-To: <20200626103057.11263-1-eric.auger@redhat.com> References: <20200626103057.11263-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=205.139.110.61; envelope-from=eric.auger@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/26 02:19:36 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: X4Z3XpyiyhNv The machine may need to pass reserved regions to the virtio-iommu-pci device (such as the MSI window on x86 or the MSI doorbells on ARM). So let's add an array of Interval properties. Note: if some reserved regions are already set by the machine code - which should be the case in general -, the length of the property array is already set and prevents the end-user from modifying them. For example, attempting to use: -device virtio-iommu-pci,\ len-reserved-regions=1,reserved-regions[0]=0xfee00000:0xfeefffff:1 would result in the following error message: qemu-system-aarch64: -device virtio-iommu-pci,addr=0xa, len-reserved-regions=1,reserved-regions[0]=0xfee00000:0xfeefffff:1: array size property len-reserved-regions may not be set more than once Otherwise, for example, adding two reserved regions is achieved using the following options: -device virtio-iommu-pci,addr=0xa,len-reserved-regions=2,\ reserved-regions[0]=0xfee00000:0xfeefffff:1,\ reserved-regions[1]=0x1000000:100ffff:1 Signed-off-by: Eric Auger --- v5 -> v6: - check the type value - removed Jean's R-b v3 -> v4: - added examples in the commit message as suggested by Markus - added Jean's R-b --- hw/virtio/virtio-iommu-pci.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/hw/virtio/virtio-iommu-pci.c b/hw/virtio/virtio-iommu-pci.c index 632533abaf..9c9bda9490 100644 --- a/hw/virtio/virtio-iommu-pci.c +++ b/hw/virtio/virtio-iommu-pci.c @@ -33,6 +33,9 @@ struct VirtIOIOMMUPCI { static Property virtio_iommu_pci_properties[] = { DEFINE_PROP_UINT32("class", VirtIOPCIProxy, class_code, 0), + DEFINE_PROP_ARRAY("reserved-regions", VirtIOIOMMUPCI, + vdev.nb_reserved_regions, vdev.reserved_regions, + qdev_prop_reserved_region, ReservedRegion), DEFINE_PROP_END_OF_LIST(), }; @@ -40,6 +43,7 @@ static void virtio_iommu_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp) { VirtIOIOMMUPCI *dev = VIRTIO_IOMMU_PCI(vpci_dev); DeviceState *vdev = DEVICE(&dev->vdev); + VirtIOIOMMU *s = VIRTIO_IOMMU(vdev); if (!qdev_get_machine_hotplug_handler(DEVICE(vpci_dev))) { MachineClass *mc = MACHINE_GET_CLASS(qdev_get_machine()); @@ -54,6 +58,15 @@ static void virtio_iommu_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp) "-no-acpi\n"); return; } + for (int i = 0; i < s->nb_reserved_regions; i++) { + if (s->reserved_regions[i].type != VIRTIO_IOMMU_RESV_MEM_T_RESERVED && + s->reserved_regions[i].type != VIRTIO_IOMMU_RESV_MEM_T_MSI) { + error_setg(errp, "reserved region %d has an invalid type", i); + error_append_hint(errp, "Valid values are " + "VIRTIO_IOMMU_RESV_MEM_T_RESERVED and " + "VIRTIO_IOMMU_RESV_MEM_T_SMI\n"); + } + } object_property_set_link(OBJECT(dev), OBJECT(pci_get_bus(&vpci_dev->pci_dev)), "primary-bus", errp); -- 2.20.1