From: Stefano Stabellini <sstabellini@kernel.org>
To: jgross@suse.com, boris.ostrovsky@oracle.com, konrad.wilk@oracle.com
Cc: xen-devel@lists.xenproject.org, sstabellini@kernel.org,
linux-kernel@vger.kernel.org,
Stefano Stabellini <stefano.stabellini@xilinx.com>
Subject: [PATCH 02/10] swiotlb-xen: remove start_dma_addr
Date: Wed, 20 May 2020 16:45:12 -0700 [thread overview]
Message-ID: <20200520234520.22563-2-sstabellini@kernel.org> (raw)
In-Reply-To: <alpine.DEB.2.21.2005201628330.27502@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.
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
---
drivers/xen/swiotlb-xen.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
index a42129cba36e..b5e0492b07b9 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,7 +386,7 @@ 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,
+ 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, xen-devel@lists.xenproject.org,
linux-kernel@vger.kernel.org,
Stefano Stabellini <stefano.stabellini@xilinx.com>
Subject: [PATCH 02/10] swiotlb-xen: remove start_dma_addr
Date: Wed, 20 May 2020 16:45:12 -0700 [thread overview]
Message-ID: <20200520234520.22563-2-sstabellini@kernel.org> (raw)
In-Reply-To: <alpine.DEB.2.21.2005201628330.27502@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.
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
---
drivers/xen/swiotlb-xen.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
index a42129cba36e..b5e0492b07b9 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,7 +386,7 @@ 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,
+ 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-05-20 23:45 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-20 23:45 [PATCH 00/10] fix swiotlb-xen for RPi4 Stefano Stabellini
2020-05-20 23:45 ` Stefano Stabellini
2020-05-20 23:45 ` [PATCH 01/10] swiotlb-xen: use vmalloc_to_page on vmalloc virt addresses Stefano Stabellini
2020-05-20 23:45 ` Stefano Stabellini
2020-05-21 8:01 ` Julien Grall
2020-05-21 8:01 ` Julien Grall
2020-05-22 3:54 ` Stefano Stabellini
2020-05-22 3:54 ` Stefano Stabellini
2020-05-22 18:11 ` Julien Grall
2020-05-22 18:11 ` Julien Grall
2020-05-22 20:36 ` Stefano Stabellini
2020-05-22 20:36 ` Stefano Stabellini
2020-05-20 23:45 ` Stefano Stabellini [this message]
2020-05-20 23:45 ` [PATCH 02/10] swiotlb-xen: remove start_dma_addr Stefano Stabellini
2020-05-21 8:05 ` Julien Grall
2020-05-21 8:05 ` Julien Grall
2020-05-22 3:55 ` Stefano Stabellini
2020-05-22 3:55 ` Stefano Stabellini
2020-05-22 18:16 ` Julien Grall
2020-05-22 18:16 ` Julien Grall
2020-05-22 20:47 ` Stefano Stabellini
2020-05-22 20:47 ` Stefano Stabellini
2020-05-20 23:45 ` [PATCH 03/10] swiotlb-xen: add struct device* parameter to xen_phys_to_bus Stefano Stabellini
2020-05-20 23:45 ` Stefano Stabellini
2020-05-20 23:45 ` [PATCH 04/10] swiotlb-xen: add struct device* parameter to xen_bus_to_phys Stefano Stabellini
2020-05-20 23:45 ` Stefano Stabellini
2020-05-20 23:45 ` [PATCH 05/10] swiotlb-xen: add struct device* parameter to xen_dma_sync_for_cpu Stefano Stabellini
2020-05-20 23:45 ` Stefano Stabellini
2020-05-20 23:45 ` [PATCH 06/10] swiotlb-xen: add struct device* parameter to xen_dma_sync_for_device Stefano Stabellini
2020-05-20 23:45 ` Stefano Stabellini
2020-05-20 23:45 ` [PATCH 07/10] swiotlb-xen: add struct device* parameter to is_xen_swiotlb_buffer Stefano Stabellini
2020-05-20 23:45 ` Stefano Stabellini
2020-05-20 23:45 ` [PATCH 08/10] swiotlb-xen: introduce phys_to_dma/dma_to_phys translations Stefano Stabellini
2020-05-20 23:45 ` Stefano Stabellini
2020-05-21 8:07 ` Julien Grall
2020-05-21 8:07 ` Julien Grall
2020-05-21 22:59 ` Boris Ostrovsky
2020-05-21 22:59 ` Boris Ostrovsky
2020-05-22 17:34 ` Stefano Stabellini
2020-05-22 17:34 ` Stefano Stabellini
2020-05-22 18:29 ` Boris Ostrovsky
2020-05-22 18:29 ` Boris Ostrovsky
2020-05-20 23:45 ` [PATCH 09/10] xen/arm: introduce phys/dma translations in xen_dma_sync_for_* Stefano Stabellini
2020-05-20 23:45 ` Stefano Stabellini
2020-05-21 8:18 ` Julien Grall
2020-05-21 8:18 ` Julien Grall
2020-05-21 20:08 ` Stefano Stabellini
2020-05-21 20:08 ` Stefano Stabellini
2020-05-21 20:17 ` Julien Grall
2020-05-21 20:17 ` Julien Grall
2020-05-20 23:45 ` [PATCH 10/10] xen/arm: call dma_to_phys on the dma_addr_t parameter of dma_cache_maint Stefano Stabellini
2020-05-20 23:45 ` Stefano Stabellini
2020-05-21 8:25 ` Julien Grall
2020-05-21 8:25 ` Julien Grall
2020-05-20 23:51 ` [PATCH 00/10] fix swiotlb-xen for RPi4 Roman Shaposhnik
2020-05-20 23:51 ` Roman Shaposhnik
2020-05-20 23:56 ` Stefano Stabellini
2020-05-20 23:56 ` Stefano Stabellini
2020-06-02 21:51 ` Stefano Stabellini
2020-06-02 21:51 ` Stefano Stabellini
2020-06-03 0:15 ` Boris Ostrovsky
2020-06-03 0:15 ` 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=20200520234520.22563-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=stefano.stabellini@xilinx.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: link
Be 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.