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=-14.5 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,SPF_HELO_NONE,SPF_PASS 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 1468CC433ED for ; Fri, 14 May 2021 12:36:15 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 905B1613D6 for ; Fri, 14 May 2021 12:36:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 905B1613D6 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=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Iewzu3lkC97xuQuDF3LI8xnnzTdC6Q7/nrxodJkheMg=; b=ikYe85KZemhYmAFIX8dhHy2CT YhUqpFU1VBp6jGJq0pmVYca4XjqXEyDhSqW4cOHdteshxSwsgx/edDuyaQi5hVKqVTLCkfNbYR5cL QMeVUHPX1Y9xAS6DdPrOP4DgVeVkdY/pCCYarQASPV7O/oKhLgKuR7Xp4JfiqEZh0NPMd7JFMHAtn Tti33nZhDfrUxm9XuxlSEE4fHp9Je1L00WwhaDE2wK733mMEdj30+rcwB12DyqwEs6vkGl8JC/zMk 8ezScALKvElN03seZGQSHkEMG46j9ZNQA594JFJeuYg7tLgrUivYkCCddMzM+B1hY9GI48fBOHDBL 7gzwvQj3g==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lhX1S-0082rz-Ma; Fri, 14 May 2021 12:34:30 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lhX1O-0082rI-RV for linux-arm-kernel@desiato.infradead.org; Fri, 14 May 2021 12:34:27 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Type:In-Reply-To:MIME-Version :References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=yBw7gIpngSLTMJRgkqlTDn2EW5sfHupDmKkTQSBDQu8=; b=2CILEooYNWhkszREnu8/erHuU1 IHgylmjCbYeoYhuAv2A8h1zi0onpGFlY3CQP67+kkQVagS5cMURH6uM02FuQPN6+rZpTF7EJ57QqF 2CTx1pRmoQ41Iu9dmuqmWNZt1C4i7aa0QSktyIMNrknDOwLrlpp/leaHfkBRCV/Rjot9ZJ6dq6xZc Hw5V44ZWAQVXjgsAE3vzUF7jbI84ILkjkPnigE9npd8kiHAxB2n0EsPaTcQ2URjT9vbWSYqD7QbwA VY8YvIbDGgnJHYnfi1z/w9cW9Pta9n0jAPmhN9x56FxtDyuLTACsy2gNIysB8Ammw7kLIXm3LDhF8 JUF45J7A==; Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lhX1M-00ByYr-7b for linux-arm-kernel@lists.infradead.org; Fri, 14 May 2021 12:34:25 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620995662; 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=yBw7gIpngSLTMJRgkqlTDn2EW5sfHupDmKkTQSBDQu8=; b=MHCYOJELwyyQYR8uLpNmdjOAmo2hX0Xl+ldVvIrWRE4eJCOnnsAsrTjrn65uMAd2JEvpPW wYpLUjXblOJlEcjtGfpnQvei8UJTuws0g4qEDSexZcS7JkQABGlTmQXHNeY8yoA9LYIg5z d7DNYgPctPscp5YoidXgk3OE5uVNldg= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-291-w4cAB-5-PhKsVV4_K8lT6A-1; Fri, 14 May 2021 08:34:19 -0400 X-MC-Unique: w4cAB-5-PhKsVV4_K8lT6A-1 Received: by mail-wr1-f71.google.com with SMTP id v18-20020adfc4120000b02901114771e2feso196537wrf.3 for ; Fri, 14 May 2021 05:34:18 -0700 (PDT) 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=yBw7gIpngSLTMJRgkqlTDn2EW5sfHupDmKkTQSBDQu8=; b=nUjMrXJawFXMerKDK105uYD2h6jBVVtabz1Sk1Vex+Gt/kZLSey3SRi57O2GckmUOL QWT+38sMavyWqstXAQ2z/21qX4NA/niOQ1jqRxSJL1sRvmZb1C8FdkHhRW2fnM8QFXwa 64hRtn3x3vnsrLEOE4kutTr9jBY/YraAgZAlEmyAxc9WLBYPlYxFdPlYXcYIpzEOpbFg Kq+LfugUD62FOZaMPdfVFOwF/zDrrsrDJ6Z0QmOVmKhQRZY7VlxDwOoLtScpUlbEWLzd Qmu07Gz118iLOlF/w/lKA4wuPcYD1UGI66vWaCPI+SvXghHuUk2NHL5Tc6pdfmAr2WUo Ktww== X-Gm-Message-State: AOAM530FGtvHPBhUWE0l8IHynFq51FwQ6f1YYHOWKuIBXBndA5dK6o8k Em3elkZq5XQw3GKL/iulHQDNo5T/bULTQ3FFZ6gIApkNyDFeGgoCB2y/kyHI/uk6M9IhibsQbo2 PD9qtbvy9kniTPnMAYAwqxnr7MfmF3tvN+g8= X-Received: by 2002:a1c:f30a:: with SMTP id q10mr27822632wmq.138.1620995657884; Fri, 14 May 2021 05:34:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzFPlnSw9Rc/MJc1oJZloOpaijmqBpFKdogoBEFMFg1dOVUteKbEaiQtObG1YSFXWGviULp6Q== X-Received: by 2002:a1c:f30a:: with SMTP id q10mr27822619wmq.138.1620995657750; Fri, 14 May 2021 05:34:17 -0700 (PDT) Received: from redhat.com ([2a10:800c:1fa6:0:3809:fe0c:bb87:250e]) by smtp.gmail.com with ESMTPSA id j13sm7360302wrd.81.2021.05.14.05.34.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 May 2021 05:34:17 -0700 (PDT) Date: Fri, 14 May 2021 08:34:13 -0400 From: "Michael S. Tsirkin" To: Jean-Philippe Brucker Cc: rjw@rjwysocki.net, lenb@kernel.org, joro@8bytes.org, 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, eric.auger@redhat.com, sebastien.boeuf@intel.com, robin.murphy@arm.com, kevin.tian@intel.com, lorenzo.pieralisi@arm.com, guohanjun@huawei.com, sudeep.holla@arm.com Subject: Re: [PATCH v2 6/6] iommu/virtio: Enable x86 support Message-ID: <20210514083402-mutt-send-email-mst@kernel.org> References: <20210423113836.3974972-1-jean-philippe@linaro.org> <20210423113836.3974972-7-jean-philippe@linaro.org> MIME-Version: 1.0 In-Reply-To: <20210423113836.3974972-7-jean-philippe@linaro.org> 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-Disposition: inline X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210514_053424_375634_78404446 X-CRM114-Status: GOOD ( 21.81 ) 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: , 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 On Fri, Apr 23, 2021 at 01:38:37PM +0200, 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 > Signed-off-by: Jean-Philippe Brucker Acked-by: Michael S. Tsirkin > --- > 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 29a397c2d12f..8be546a338e7 100644 > --- a/drivers/iommu/virtio-iommu.c > +++ b/drivers/iommu/virtio-iommu.c > @@ -1027,6 +1027,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); > @@ -1063,6 +1070,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, > -- > 2.31.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel