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=-15.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable 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 52C13C48BE6 for ; Wed, 16 Jun 2021 15:54:25 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 1060860FF1 for ; Wed, 16 Jun 2021 15:54:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1060860FF1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:Reply-To:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date :Message-ID:From:References:Cc:To:Subject:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=scPavKOGWzexa1O+WKgKN+CHEn87i70zZsCxqEPrq7Y=; b=1ca4mLHHNfGQ0p q3educ6mW5EFq0njvdrXB9NkA4x32/1yUt+9we9nSlflbagfeyByYQy75hCjpoTylIpI1A0NlZhF+ KHhFa+24bHM/nv4dAxHnjKvBwnRTSox7FZK0lXEU2LfRVg6uPqVyY3xwGz/1IigJwIs00/FiN6l0z esKlV9lp+/gc70fE06ssxZsl3KdYamMGKlvEX+qbnkp0f8v+Z2979EzkVYKbv1IU/3nT1LMH3X1ZW I6dl3nXHIWptpWam1wQcHtaN+EqFtuRmdkHq1Hv45Sk3ai6wGMGEkFeniz3ESQvfKdRxqnzqShvGu Iutyh6gKkm8lXPqu7mdw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltXqc-006z0s-8i; Wed, 16 Jun 2021 15:52:58 +0000 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltXqX-006yzH-88 for linux-arm-kernel@lists.infradead.org; Wed, 16 Jun 2021 15:52:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623858772; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6r7FqEyIqGHuXZGRXFsW95199nXnF1UaOlSdhA4lIyc=; b=XEdcELW3gvmfyAjBuIiMN5UKBSLyK0uwD/YHX4k9GotUbXgB+ibCOPIyUA8CsyjUHEPq0B 9QRZ82CcdT8P9CyaeT9nJ+NfNy+ABLJ8vuqLIqC+Ym2QxhsZZRZEvzuOPZsEf7obHE7gIf MUHrIcxnljmX5Ziu7iGyfg8ho1ja9F8= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-603-lEHMQg54PemhifkMNAh8AA-1; Wed, 16 Jun 2021 11:52:50 -0400 X-MC-Unique: lEHMQg54PemhifkMNAh8AA-1 Received: by mail-wm1-f69.google.com with SMTP id m6-20020a7bce060000b02901d2a0c361bfso506693wmc.4 for ; Wed, 16 Jun 2021 08:52:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:reply-to:subject:to:cc:references:from :message-id:date:user-agent:mime-version:in-reply-to :content-transfer-encoding:content-language; bh=6r7FqEyIqGHuXZGRXFsW95199nXnF1UaOlSdhA4lIyc=; b=YgIBbxgzTJOnwKQcj1WsKNpsgpIpm54ZoG3UYM4lAXnOam0IDo6LkdxhXFImm5xzlp FrSZjUSpVypVxPCwxlnnwST2yB39pKlPJ4xAHEBzNIoTS3y1j6hPmm+DNqhhBfGSfFW4 4mmn1IJdGJvRpBPgdjoDeRs96ndEDhPbHl+hF9F9lkGLyDorxhOTATo8OVvdXFTlpmWt PIk1oWpIl/UmK3ZyZJ+tKYun2ox4xpAaMR9FvXFLMqqqkLvnlJsrM+AM1XxHAxYYXFOF 7gcAz9ZYe2njwhGoL3UwBYtlM4k8/moxu2YSJ67a0EKWq/fS/YQv4RHfFwp0esCkAa10 GPCw== X-Gm-Message-State: AOAM530iSXUiARzSppUelb1aHBs9hkWaWMPaPuv74PsZYAZ9iR8fkS0R ThAUkGAf6mCDQYiecZjm+b8KMynrQ+AVTo/4IKui0E0HYcJmT7IZeh0c9g9FqrO5bRmYmGgbkPa O9SGLZNc6fwT7vBw2+YQtjaTPVTiLFLd6nCw= X-Received: by 2002:a5d:64c2:: with SMTP id f2mr55249wri.291.1623858769531; Wed, 16 Jun 2021 08:52:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJysyzQ5DAqgvGtPQdPC6k1RsxHctJlotRiVdhus3R8J8Yk+bdyOpT1kx5y2o1TBPyLSdtUNPA== X-Received: by 2002:a5d:64c2:: with SMTP id f2mr55237wri.291.1623858769411; Wed, 16 Jun 2021 08:52:49 -0700 (PDT) Received: from [192.168.43.95] ([37.172.247.238]) by smtp.gmail.com with ESMTPSA id c13sm2703348wrb.5.2021.06.16.08.52.47 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 16 Jun 2021 08:52:48 -0700 (PDT) Subject: Re: [PATCH v4 6/6] iommu/virtio: Enable x86 support To: Jean-Philippe Brucker , rjw@rjwysocki.net, lenb@kernel.org, joro@8bytes.org, mst@redhat.com Cc: will@kernel.org, catalin.marinas@arm.com, baolu.lu@linux.intel.com, dwmw2@infradead.org, linux-acpi@vger.kernel.org, iommu@lists.linux-foundation.org, virtualization@lists.linux-foundation.org, linux-arm-kernel@lists.infradead.org, sebastien.boeuf@intel.com, robin.murphy@arm.com, kevin.tian@intel.com, lorenzo.pieralisi@arm.com, guohanjun@huawei.com, sudeep.holla@arm.com References: <20210610075130.67517-1-jean-philippe@linaro.org> <20210610075130.67517-7-jean-philippe@linaro.org> From: Eric Auger Message-ID: <9149c79e-6f88-5df5-80e7-4da4cb13d6e1@redhat.com> Date: Wed, 16 Jun 2021 17:52:46 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: <20210610075130.67517-7-jean-philippe@linaro.org> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eric.auger@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210616_085253_425994_96E30B0A X-CRM114-Status: GOOD ( 22.06 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: eric.auger@redhat.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi jean, On 6/10/21 9:51 AM, Jean-Philippe Brucker wrote: > With the VIOT support in place, x86 platforms can now use the > virtio-iommu. > > Because the other x86 IOMMU drivers aren't yet ready to use the > acpi_dma_setup() path, x86 doesn't implement arch_setup_dma_ops() at the > moment. Similarly to Vt-d and AMD IOMMU, call iommu_setup_dma_ops() from > probe_finalize(). > > Acked-by: Joerg Roedel > Acked-by: Michael S. Tsirkin > Signed-off-by: Jean-Philippe Brucker Reviewed-by: Eric Auger Eric > --- > drivers/iommu/Kconfig | 3 ++- > drivers/iommu/dma-iommu.c | 1 + > drivers/iommu/virtio-iommu.c | 8 ++++++++ > 3 files changed, 11 insertions(+), 1 deletion(-) > > diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig > index aff8a4830dd1..07b7c25cbed8 100644 > --- a/drivers/iommu/Kconfig > +++ b/drivers/iommu/Kconfig > @@ -400,8 +400,9 @@ config HYPERV_IOMMU > config VIRTIO_IOMMU > tristate "Virtio IOMMU driver" > depends on VIRTIO > - depends on ARM64 > + depends on (ARM64 || X86) > select IOMMU_API > + select IOMMU_DMA > select INTERVAL_TREE > select ACPI_VIOT if ACPI > help > diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c > index 175f8eaeb5b3..46ed43c400cf 100644 > --- a/drivers/iommu/dma-iommu.c > +++ b/drivers/iommu/dma-iommu.c > @@ -1332,6 +1332,7 @@ void iommu_setup_dma_ops(struct device *dev, u64 dma_base, u64 dma_limit) > pr_warn("Failed to set up IOMMU for device %s; retaining platform DMA ops\n", > dev_name(dev)); > } > +EXPORT_SYMBOL_GPL(iommu_setup_dma_ops); > > static struct iommu_dma_msi_page *iommu_dma_get_msi_page(struct device *dev, > phys_addr_t msi_addr, struct iommu_domain *domain) > diff --git a/drivers/iommu/virtio-iommu.c b/drivers/iommu/virtio-iommu.c > index 218fe8560e8d..77aee1207ced 100644 > --- a/drivers/iommu/virtio-iommu.c > +++ b/drivers/iommu/virtio-iommu.c > @@ -1026,6 +1026,13 @@ static struct iommu_device *viommu_probe_device(struct device *dev) > return ERR_PTR(ret); > } > > +static void viommu_probe_finalize(struct device *dev) > +{ > +#ifndef CONFIG_ARCH_HAS_SETUP_DMA_OPS > + iommu_setup_dma_ops(dev, 0, U64_MAX); > +#endif > +} > + > static void viommu_release_device(struct device *dev) > { > struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev); > @@ -1062,6 +1069,7 @@ static struct iommu_ops viommu_ops = { > .iova_to_phys = viommu_iova_to_phys, > .iotlb_sync = viommu_iotlb_sync, > .probe_device = viommu_probe_device, > + .probe_finalize = viommu_probe_finalize, > .release_device = viommu_release_device, > .device_group = viommu_device_group, > .get_resv_regions = viommu_get_resv_regions, _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel