From nobody Mon Nov 10 21:19:56 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1590018368; cv=none; d=zohomail.com; s=zohoarc; b=kcAKlEpJUuuZcgrIWSTcKSrzChLuL3DENk9OSnkjIzdLihFnn3vJH9ncOZgPQ8dIDZbd4/DzkyFGtWga4kpshHsnkKa3dQZAs3furd0z6+tbJB3zceq2VEBiBRtDqqFv3F38OKoMAVv3cmlA6cusnzJy+RmiZ0vCylLMWLpM0gI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590018368; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=aMjy0zcS79+Nh7xBOe/QigV4XwrVVCvfyhkIxvwPQMk=; b=hbnQoeBNSOxAC4lGJtY2C621lqSQXTPRJQp4/dEcdldX+jNwcRdO9P2yjz0lUXcmF5F19A8wsD5krFTTrPRp8OUSkJ/a+7DBE7obRkup4FJF/V+4VH6Br6Ona9JEhBX+ktyeGPEZY7sZUEAd9zDXOwjd6ZIkI8+hZKBZuAUABPw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1590018368248489.3655638854334; Wed, 20 May 2020 16:46:08 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbYPB-00087u-32; Wed, 20 May 2020 23:45:45 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbYP9-00086q-IS for xen-devel@lists.xenproject.org; Wed, 20 May 2020 23:45:43 +0000 Received: from mail.kernel.org (unknown [198.145.29.99]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id fa47af7a-9af3-11ea-aaaa-12813bfff9fa; Wed, 20 May 2020 23:45:25 +0000 (UTC) Received: from sstabellini-ThinkPad-T480s.hsd1.ca.comcast.net (c-67-164-102-47.hsd1.ca.comcast.net [67.164.102.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 03272208C3; Wed, 20 May 2020 23:45:24 +0000 (UTC) X-Inumbo-ID: fa47af7a-9af3-11ea-aaaa-12813bfff9fa DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590018325; bh=8Uhi52nEHwr6p4oqjgGMPqzF2apk7Bwz25uN3GRP/Fc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b6e4YPjm7TkI1oOgr3Xo8IZYxje2EhZjUfcZ0kyxxDR0eWcOFPNzbEZDKqFtqYTP6 DGJnyCco3P66kvXMuzlfjJ1at3ARO6GSJ/ORWX3M1W6ehKfPZs8ie/RZbRghJ5Ik+Z 2zbX0cvTPa4xUg5gXkRmvnBpQPnqfYdnsqAzFQBo= From: Stefano Stabellini To: jgross@suse.com, boris.ostrovsky@oracle.com, konrad.wilk@oracle.com Subject: [PATCH 08/10] swiotlb-xen: introduce phys_to_dma/dma_to_phys translations Date: Wed, 20 May 2020 16:45:18 -0700 Message-Id: <20200520234520.22563-8-sstabellini@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: xen-devel@lists.xenproject.org, sstabellini@kernel.org, linux-kernel@vger.kernel.org, Stefano Stabellini Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Stefano Stabellini Call dma_to_phys in is_xen_swiotlb_buffer. Call phys_to_dma in xen_phys_to_bus. Call dma_to_phys in xen_bus_to_phys. Everything is taken care of by these changes except for xen_swiotlb_alloc_coherent and xen_swiotlb_free_coherent, which need a few explicit phys_to_dma/dma_to_phys calls. Signed-off-by: Stefano Stabellini --- drivers/xen/swiotlb-xen.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c index c50448fd9b75..d011c4c7aa72 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -64,14 +64,16 @@ static inline dma_addr_t xen_phys_to_bus(struct device = *dev, phys_addr_t paddr) =20 dma |=3D paddr & ~XEN_PAGE_MASK; =20 - return dma; + return phys_to_dma(dev, dma); } =20 -static inline phys_addr_t xen_bus_to_phys(struct device *dev, dma_addr_t b= addr) +static inline phys_addr_t xen_bus_to_phys(struct device *dev, + dma_addr_t dma_addr) { + phys_addr_t baddr =3D dma_to_phys(dev, dma_addr); unsigned long xen_pfn =3D bfn_to_pfn(XEN_PFN_DOWN(baddr)); - dma_addr_t dma =3D (dma_addr_t)xen_pfn << XEN_PAGE_SHIFT; - phys_addr_t paddr =3D dma; + phys_addr_t paddr =3D (xen_pfn << XEN_PAGE_SHIFT) | + (baddr & ~XEN_PAGE_MASK); =20 paddr |=3D baddr & ~XEN_PAGE_MASK; =20 @@ -99,7 +101,7 @@ static inline int range_straddles_page_boundary(phys_add= r_t p, size_t size) =20 static int is_xen_swiotlb_buffer(struct device *dev, dma_addr_t dma_addr) { - unsigned long bfn =3D XEN_PFN_DOWN(dma_addr); + unsigned long bfn =3D XEN_PFN_DOWN(dma_to_phys(dev, dma_addr)); unsigned long xen_pfn =3D bfn_to_local_pfn(bfn); phys_addr_t paddr =3D XEN_PFN_PHYS(xen_pfn); =20 @@ -304,11 +306,11 @@ xen_swiotlb_alloc_coherent(struct device *hwdev, size= _t size, if (hwdev && hwdev->coherent_dma_mask) dma_mask =3D hwdev->coherent_dma_mask; =20 - /* At this point dma_handle is the physical address, next we are + /* At this point dma_handle is the dma address, next we are * going to set it to the machine address. * Do not use virt_to_phys(ret) because on ARM it doesn't correspond * to *dma_handle. */ - phys =3D *dma_handle; + phys =3D dma_to_phys(hwdev, *dma_handle); dev_addr =3D xen_phys_to_bus(hwdev, phys); if (((dev_addr + size - 1 <=3D dma_mask)) && !range_straddles_page_boundary(phys, size)) @@ -319,6 +321,7 @@ xen_swiotlb_alloc_coherent(struct device *hwdev, size_t= size, xen_free_coherent_pages(hwdev, size, ret, (dma_addr_t)phys, attrs); return NULL; } + *dma_handle =3D phys_to_dma(hwdev, *dma_handle); SetPageXenRemapped(virt_to_page(ret)); } memset(ret, 0, size); @@ -351,7 +354,8 @@ xen_swiotlb_free_coherent(struct device *hwdev, size_t = size, void *vaddr, TestClearPageXenRemapped(pg)) xen_destroy_contiguous_region(phys, order); =20 - xen_free_coherent_pages(hwdev, size, vaddr, (dma_addr_t)phys, attrs); + xen_free_coherent_pages(hwdev, size, vaddr, phys_to_dma(hwdev, phys), + attrs); } =20 /* --=20 2.17.1