From nobody Mon Nov 10 19:48:41 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=1591222986; cv=none; d=zohomail.com; s=zohoarc; b=KTzWIQ+pa4kh5ZO03oLPgrxQkEubn679vOrWiC/urn897ouYjSnwx8gDCvd+y5Nh2yq0h9yjxNX9WImTysfwmDTczbskQXH4904F+YsrZWwWAdkKqeK7GiEohWBjqsdbFjXYOQX6RSZg46zVM1eeW8ga6YfweXJr5OD8zVfMj/E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591222986; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=LL5IAnhyDU5Gat4DsgNWOZKKJSNYR0qj/ikAUZeOeTI=; b=SuofAqGvRevQrV83Q5RXwshzTiMk0q1PaSg3iaNrsSCwDW/vj5hAig62zpKLx8o5Yn3YXVHl1qRm59ECvlOErdDo5p5+j/XvoyOE7ScYGd8ZglOM6d7XvkCbhAhrnBb3NnQV2NF6jXULNmY73ZR//lrT2ctBbboV6UfZ3Mqs7SE= 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 1591222986035359.51053831938157; Wed, 3 Jun 2020 15:23:06 -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 1jgbme-0004b7-76; Wed, 03 Jun 2020 22:22:52 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jgbmd-0004ad-7B for xen-devel@lists.xenproject.org; Wed, 03 Jun 2020 22:22:51 +0000 Received: from mail.kernel.org (unknown [198.145.29.99]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id c2a0bb66-a5e8-11ea-81bc-bc764e2007e4; Wed, 03 Jun 2020 22:22:50 +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 DD192207ED; Wed, 3 Jun 2020 22:22:49 +0000 (UTC) X-Inumbo-ID: c2a0bb66-a5e8-11ea-81bc-bc764e2007e4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591222970; bh=8roukE2cTqX3x3U/iL+TWs1iGe9wtzQx9xz7olDA5jo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qfq6j7xRVNuYFJciHIBfv0Hg3QKcp+rEpTkPApdVaF/0j83toOfu9Qb2RDayzq07g eWKPjP2zWTV/ifm1xQvO+4YmzvyVJYmqgiUwWnpxQitIuHoRSHJxXT/YY2jtK9kkWD 9g33HwxMV7DGdAnc5ryX5OYBot/+trzQbyHC4d8E= From: Stefano Stabellini To: jgross@suse.com, boris.ostrovsky@oracle.com, konrad.wilk@oracle.com Subject: [PATCH v2 03/11] swiotlb-xen: add struct device* parameter to xen_phys_to_bus Date: Wed, 3 Jun 2020 15:22:39 -0700 Message-Id: <20200603222247.11681-3-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: sstabellini@kernel.org, roman@zededa.com, linux-kernel@vger.kernel.org, tamas@tklengyel.com, xen-devel@lists.xenproject.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 The parameter is unused in this patch. No functional changes. Signed-off-by: Stefano Stabellini Tested-by: Corey Minyard Tested-by: Roman Shaposhnik --- drivers/xen/swiotlb-xen.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c index ed09f8ac34c5..1c44dbc69b70 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -57,7 +57,7 @@ static unsigned long xen_io_tlb_nslabs; * can be 32bit when dma_addr_t is 64bit leading to a loss in * information if the shift is done before casting to 64bit. */ -static inline dma_addr_t xen_phys_to_bus(phys_addr_t paddr) +static inline dma_addr_t xen_phys_to_bus(struct device *dev, phys_addr_t p= addr) { unsigned long bfn =3D pfn_to_bfn(XEN_PFN_DOWN(paddr)); dma_addr_t dma =3D (dma_addr_t)bfn << XEN_PAGE_SHIFT; @@ -78,9 +78,9 @@ static inline phys_addr_t xen_bus_to_phys(dma_addr_t badd= r) return paddr; } =20 -static inline dma_addr_t xen_virt_to_bus(void *address) +static inline dma_addr_t xen_virt_to_bus(struct device *dev, void *address) { - return xen_phys_to_bus(virt_to_phys(address)); + return xen_phys_to_bus(dev, virt_to_phys(address)); } =20 static inline int range_straddles_page_boundary(phys_addr_t p, size_t size) @@ -309,7 +309,7 @@ xen_swiotlb_alloc_coherent(struct device *hwdev, size_t= size, * Do not use virt_to_phys(ret) because on ARM it doesn't correspond * to *dma_handle. */ phys =3D *dma_handle; - dev_addr =3D xen_phys_to_bus(phys); + dev_addr =3D xen_phys_to_bus(hwdev, phys); if (((dev_addr + size - 1 <=3D dma_mask)) && !range_straddles_page_boundary(phys, size)) *dma_handle =3D dev_addr; @@ -367,7 +367,7 @@ static dma_addr_t xen_swiotlb_map_page(struct device *d= ev, struct page *page, unsigned long attrs) { phys_addr_t map, phys =3D page_to_phys(page) + offset; - dma_addr_t dev_addr =3D xen_phys_to_bus(phys); + dma_addr_t dev_addr =3D xen_phys_to_bus(dev, phys); =20 BUG_ON(dir =3D=3D DMA_NONE); /* @@ -392,7 +392,7 @@ static dma_addr_t xen_swiotlb_map_page(struct device *d= ev, struct page *page, return DMA_MAPPING_ERROR; =20 phys =3D map; - dev_addr =3D xen_phys_to_bus(map); + dev_addr =3D xen_phys_to_bus(dev, map); =20 /* * Ensure that the address returned is DMA'ble @@ -536,7 +536,7 @@ xen_swiotlb_sync_sg_for_device(struct device *dev, stru= ct scatterlist *sgl, static int xen_swiotlb_dma_supported(struct device *hwdev, u64 mask) { - return xen_virt_to_bus(xen_io_tlb_end - 1) <=3D mask; + return xen_virt_to_bus(hwdev, xen_io_tlb_end - 1) <=3D mask; } =20 const struct dma_map_ops xen_swiotlb_dma_ops =3D { --=20 2.17.1