From nobody Mon Nov 10 21:19:57 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=1590018358; cv=none; d=zohomail.com; s=zohoarc; b=Wmaf+hyrB7TEQNafQxdFDf/Cqsn+JCLlI7i0d2/cHk4daYdJQ5Rs7fbhcpz6d1myo1tIGHHJOHrNTEZJebdaNyKiS139TwZIhkgU1c+0ducYG4hY6AbeqE4kxM9WMPYk9+nt8NQRqgBaD38dvpctuBlR+LK82ySsAhUkdAEXjU8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590018358; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=OzyI6G+q2TJou2G6O+Hx90kcuctojB3jybWcCVJjEjk=; b=I7CVDnKo6KflzDagNEHoN7fUmS8ucE8QUE+m5+hu3prRnFSbpMKbbPhxf1Ic0ncexECpdweJqVlaS+H1dzln3/ncmh8W0TknPIGNqpQxGV+tfUG5e6pDpU+C4XFXB2Roqe43bzLWrvIjNBzg+EvyzYc5yfGUJrdEbMfGGhzmhHA= 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 1590018358528148.23881957756396; Wed, 20 May 2020 16:45:58 -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 1jbYP0-00080n-UB; Wed, 20 May 2020 23:45:34 +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 1jbYOz-00080C-IB for xen-devel@lists.xenproject.org; Wed, 20 May 2020 23:45:33 +0000 Received: from mail.kernel.org (unknown [198.145.29.99]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id f9473532-9af3-11ea-aaaa-12813bfff9fa; Wed, 20 May 2020 23:45:24 +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 58CB720899; Wed, 20 May 2020 23:45:23 +0000 (UTC) X-Inumbo-ID: f9473532-9af3-11ea-aaaa-12813bfff9fa DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590018323; bh=KOZVKoHc4nwdfLj2dJHT6a8axx8miTwmLiOrwBfDB1k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Zrzyv7dwGOoZVOjzN/lI6uRiajVHs9Vwy9l2vAnumI9ByScLvTFwCz0GbKgQGL6mH nHTux0QWT9tRMSYP25Dz44CDAsqapcfHK1zzX6Jz+gOjOGZU9NJy7LnunoCzzI+fz8 hdxrCpqYM0hQY5MHAQFgGUEtfwix69+Jsu+d9KVs= From: Stefano Stabellini To: jgross@suse.com, boris.ostrovsky@oracle.com, konrad.wilk@oracle.com Subject: [PATCH 04/10] swiotlb-xen: add struct device* parameter to xen_bus_to_phys Date: Wed, 20 May 2020 16:45:14 -0700 Message-Id: <20200520234520.22563-4-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 The parameter is unused in this patch. No functional changes. Signed-off-by: Stefano Stabellini --- drivers/xen/swiotlb-xen.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c index 958ee5517e0b..9b4306a56feb 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -67,7 +67,7 @@ static inline dma_addr_t xen_phys_to_bus(struct device *d= ev, phys_addr_t paddr) return dma; } =20 -static inline phys_addr_t xen_bus_to_phys(dma_addr_t baddr) +static inline phys_addr_t xen_bus_to_phys(struct device *dev, dma_addr_t b= 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; @@ -339,7 +339,7 @@ xen_swiotlb_free_coherent(struct device *hwdev, size_t = size, void *vaddr, =20 /* do not use virt_to_phys because on ARM it doesn't return you the * physical address */ - phys =3D xen_bus_to_phys(dev_addr); + phys =3D xen_bus_to_phys(hwdev, dev_addr); =20 /* Convert the size to actually allocated. */ size =3D 1UL << (order + XEN_PAGE_SHIFT); @@ -420,7 +420,7 @@ static dma_addr_t xen_swiotlb_map_page(struct device *d= ev, struct page *page, static void xen_swiotlb_unmap_page(struct device *hwdev, dma_addr_t dev_ad= dr, size_t size, enum dma_data_direction dir, unsigned long attrs) { - phys_addr_t paddr =3D xen_bus_to_phys(dev_addr); + phys_addr_t paddr =3D xen_bus_to_phys(hwdev, dev_addr); =20 BUG_ON(dir =3D=3D DMA_NONE); =20 @@ -436,7 +436,7 @@ static void xen_swiotlb_sync_single_for_cpu(struct device *dev, dma_addr_t dma_addr, size_t size, enum dma_data_direction dir) { - phys_addr_t paddr =3D xen_bus_to_phys(dma_addr); + phys_addr_t paddr =3D xen_bus_to_phys(dev, dma_addr); =20 if (!dev_is_dma_coherent(dev)) xen_dma_sync_for_cpu(dma_addr, paddr, size, dir); @@ -449,7 +449,7 @@ static void xen_swiotlb_sync_single_for_device(struct device *dev, dma_addr_t dma_addr, size_t size, enum dma_data_direction dir) { - phys_addr_t paddr =3D xen_bus_to_phys(dma_addr); + phys_addr_t paddr =3D xen_bus_to_phys(dev, dma_addr); =20 if (is_xen_swiotlb_buffer(dma_addr)) swiotlb_tbl_sync_single(dev, paddr, size, dir, SYNC_FOR_DEVICE); --=20 2.17.1