From: Stefano Stabellini <sstabellini@kernel.org> To: jgross@suse.com, boris.ostrovsky@oracle.com, konrad.wilk@oracle.com Cc: sstabellini@kernel.org, xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org, tamas@tklengyel.com, roman@zededa.com, Stefano Stabellini <stefano.stabellini@xilinx.com> Subject: [PATCH v2 02/11] swiotlb-xen: remove start_dma_addr Date: Wed, 3 Jun 2020 15:22:38 -0700 [thread overview] Message-ID: <20200603222247.11681-2-sstabellini@kernel.org> (raw) In-Reply-To: <alpine.DEB.2.21.2006031506590.6774@sstabellini-ThinkPad-T480s> From: Stefano Stabellini <stefano.stabellini@xilinx.com> It is not strictly needed. Call virt_to_phys on xen_io_tlb_start instead. It will be useful not to have a start_dma_addr around with the next patches. Note that virt_to_phys is not the same as xen_virt_to_bus but actually it is used to compared again __pa(xen_io_tlb_start) as passed to swiotlb_init_with_tbl, so virt_to_phys is actually what we want. Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com> Tested-by: Corey Minyard <cminyard@mvista.com> Tested-by: Roman Shaposhnik <roman@zededa.com> --- Changes in v2: - update commit message --- --- drivers/xen/swiotlb-xen.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c index a42129cba36e..ed09f8ac34c5 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -52,8 +52,6 @@ static unsigned long xen_io_tlb_nslabs; * Quick lookup value of the bus address of the IOTLB. */ -static u64 start_dma_addr; - /* * Both of these functions should avoid XEN_PFN_PHYS because phys_addr_t * can be 32bit when dma_addr_t is 64bit leading to a loss in @@ -241,7 +239,6 @@ int __ref xen_swiotlb_init(int verbose, bool early) m_ret = XEN_SWIOTLB_EFIXUP; goto error; } - start_dma_addr = xen_virt_to_bus(xen_io_tlb_start); if (early) { if (swiotlb_init_with_tbl(xen_io_tlb_start, xen_io_tlb_nslabs, verbose)) @@ -389,8 +386,8 @@ static dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page, */ trace_swiotlb_bounced(dev, dev_addr, size, swiotlb_force); - map = swiotlb_tbl_map_single(dev, start_dma_addr, phys, - size, size, dir, attrs); + map = swiotlb_tbl_map_single(dev, virt_to_phys(xen_io_tlb_start), + phys, size, size, dir, attrs); if (map == (phys_addr_t)DMA_MAPPING_ERROR) return DMA_MAPPING_ERROR; -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Stefano Stabellini <sstabellini@kernel.org> To: jgross@suse.com, boris.ostrovsky@oracle.com, konrad.wilk@oracle.com Cc: sstabellini@kernel.org, roman@zededa.com, linux-kernel@vger.kernel.org, tamas@tklengyel.com, xen-devel@lists.xenproject.org, Stefano Stabellini <stefano.stabellini@xilinx.com> Subject: [PATCH v2 02/11] swiotlb-xen: remove start_dma_addr Date: Wed, 3 Jun 2020 15:22:38 -0700 [thread overview] Message-ID: <20200603222247.11681-2-sstabellini@kernel.org> (raw) In-Reply-To: <alpine.DEB.2.21.2006031506590.6774@sstabellini-ThinkPad-T480s> From: Stefano Stabellini <stefano.stabellini@xilinx.com> It is not strictly needed. Call virt_to_phys on xen_io_tlb_start instead. It will be useful not to have a start_dma_addr around with the next patches. Note that virt_to_phys is not the same as xen_virt_to_bus but actually it is used to compared again __pa(xen_io_tlb_start) as passed to swiotlb_init_with_tbl, so virt_to_phys is actually what we want. Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com> Tested-by: Corey Minyard <cminyard@mvista.com> Tested-by: Roman Shaposhnik <roman@zededa.com> --- Changes in v2: - update commit message --- --- drivers/xen/swiotlb-xen.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c index a42129cba36e..ed09f8ac34c5 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -52,8 +52,6 @@ static unsigned long xen_io_tlb_nslabs; * Quick lookup value of the bus address of the IOTLB. */ -static u64 start_dma_addr; - /* * Both of these functions should avoid XEN_PFN_PHYS because phys_addr_t * can be 32bit when dma_addr_t is 64bit leading to a loss in @@ -241,7 +239,6 @@ int __ref xen_swiotlb_init(int verbose, bool early) m_ret = XEN_SWIOTLB_EFIXUP; goto error; } - start_dma_addr = xen_virt_to_bus(xen_io_tlb_start); if (early) { if (swiotlb_init_with_tbl(xen_io_tlb_start, xen_io_tlb_nslabs, verbose)) @@ -389,8 +386,8 @@ static dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page, */ trace_swiotlb_bounced(dev, dev_addr, size, swiotlb_force); - map = swiotlb_tbl_map_single(dev, start_dma_addr, phys, - size, size, dir, attrs); + map = swiotlb_tbl_map_single(dev, virt_to_phys(xen_io_tlb_start), + phys, size, size, dir, attrs); if (map == (phys_addr_t)DMA_MAPPING_ERROR) return DMA_MAPPING_ERROR; -- 2.17.1
next prev parent reply other threads:[~2020-06-03 22:23 UTC|newest] Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-06-03 22:22 [PATCH v2 00/11] fix swiotlb-xen for RPi4 Stefano Stabellini 2020-06-03 22:22 ` Stefano Stabellini 2020-06-03 22:22 ` [PATCH v2 01/11] swiotlb-xen: use vmalloc_to_page on vmalloc virt addresses Stefano Stabellini 2020-06-03 22:22 ` Stefano Stabellini 2020-06-08 7:04 ` Christoph Hellwig 2020-06-08 7:04 ` Christoph Hellwig 2020-06-08 22:53 ` Stefano Stabellini 2020-06-08 22:53 ` Stefano Stabellini 2020-06-03 22:22 ` Stefano Stabellini [this message] 2020-06-03 22:22 ` [PATCH v2 02/11] swiotlb-xen: remove start_dma_addr Stefano Stabellini 2020-06-03 22:22 ` [PATCH v2 03/11] swiotlb-xen: add struct device* parameter to xen_phys_to_bus Stefano Stabellini 2020-06-03 22:22 ` Stefano Stabellini 2020-06-08 7:05 ` Christoph Hellwig 2020-06-08 7:05 ` Christoph Hellwig 2020-06-08 22:55 ` Stefano Stabellini 2020-06-08 22:55 ` Stefano Stabellini 2020-06-03 22:22 ` [PATCH v2 04/11] swiotlb-xen: add struct device* parameter to xen_bus_to_phys Stefano Stabellini 2020-06-03 22:22 ` Stefano Stabellini 2020-06-08 7:05 ` Christoph Hellwig 2020-06-08 7:05 ` Christoph Hellwig 2020-06-03 22:22 ` [PATCH v2 05/11] swiotlb-xen: add struct device* parameter to xen_dma_sync_for_cpu Stefano Stabellini 2020-06-03 22:22 ` Stefano Stabellini 2020-06-03 22:22 ` [PATCH v2 06/11] swiotlb-xen: add struct device* parameter to xen_dma_sync_for_device Stefano Stabellini 2020-06-03 22:22 ` Stefano Stabellini 2020-06-03 22:22 ` [PATCH v2 07/11] swiotlb-xen: add struct device* parameter to is_xen_swiotlb_buffer Stefano Stabellini 2020-06-03 22:22 ` Stefano Stabellini 2020-06-03 22:22 ` [PATCH v2 08/11] swiotlb-xen: introduce phys_to_dma/dma_to_phys translations Stefano Stabellini 2020-06-03 22:22 ` Stefano Stabellini 2020-06-04 17:46 ` Boris Ostrovsky 2020-06-04 17:46 ` Boris Ostrovsky 2020-06-04 17:47 ` boris.ostrovsky 2020-06-04 17:47 ` boris.ostrovsky 2020-06-08 7:08 ` Christoph Hellwig 2020-06-08 7:08 ` Christoph Hellwig 2020-06-08 23:06 ` Stefano Stabellini 2020-06-08 23:06 ` Stefano Stabellini 2020-06-09 3:46 ` Stefano Stabellini 2020-06-09 3:46 ` Stefano Stabellini 2020-06-09 5:32 ` Christoph Hellwig 2020-06-09 5:32 ` Christoph Hellwig 2020-06-09 21:50 ` Stefano Stabellini 2020-06-09 21:50 ` Stefano Stabellini 2020-06-03 22:22 ` [PATCH v2 09/11] swiotlb-xen: rename xen_phys_to_bus to xen_phys_to_dma and xen_bus_to_phys to xen_dma_to_phys Stefano Stabellini 2020-06-03 22:22 ` Stefano Stabellini 2020-06-08 7:09 ` Christoph Hellwig 2020-06-08 7:09 ` Christoph Hellwig 2020-06-03 22:22 ` [PATCH v2 10/11] xen/arm: introduce phys/dma translations in xen_dma_sync_for_* Stefano Stabellini 2020-06-03 22:22 ` Stefano Stabellini 2020-06-08 7:12 ` Christoph Hellwig 2020-06-08 7:12 ` Christoph Hellwig 2020-06-09 0:38 ` Stefano Stabellini 2020-06-09 0:38 ` Stefano Stabellini 2020-06-09 5:38 ` Christoph Hellwig 2020-06-09 5:38 ` Christoph Hellwig 2020-06-09 5:39 ` Christoph Hellwig 2020-06-09 5:39 ` Christoph Hellwig 2020-06-09 21:50 ` Stefano Stabellini 2020-06-09 21:50 ` Stefano Stabellini 2020-06-03 22:22 ` [PATCH v2 11/11] xen/arm: call dma_to_phys on the dma_addr_t parameter of dma_cache_maint Stefano Stabellini 2020-06-03 22:22 ` Stefano Stabellini 2020-06-04 18:32 ` [PATCH v2 00/11] fix swiotlb-xen for RPi4 Boris Ostrovsky 2020-06-04 18:32 ` Boris Ostrovsky
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200603222247.11681-2-sstabellini@kernel.org \ --to=sstabellini@kernel.org \ --cc=boris.ostrovsky@oracle.com \ --cc=jgross@suse.com \ --cc=konrad.wilk@oracle.com \ --cc=linux-kernel@vger.kernel.org \ --cc=roman@zededa.com \ --cc=stefano.stabellini@xilinx.com \ --cc=tamas@tklengyel.com \ --cc=xen-devel@lists.xenproject.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.