From: Christoph Hellwig <hch@lst.de>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Michael Ellerman <mpe@ellerman.id.au>
Cc: linuxppc-dev@lists.ozlabs.org, iommu@lists.linux-foundation.org,
linux-mm@kvack.org, linux-arch@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 25/34] powerpc/dma: remove max_direct_dma_addr
Date: Wed, 14 Nov 2018 09:23:05 +0100 [thread overview]
Message-ID: <20181114082314.8965-26-hch@lst.de> (raw)
In-Reply-To: <20181114082314.8965-1-hch@lst.de>
The max_direct_dma_addr duplicates the bus_dma_mask field in struct
device. Use the generic field instead.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
arch/powerpc/include/asm/device.h | 3 ---
arch/powerpc/include/asm/dma-direct.h | 4 +---
arch/powerpc/kernel/dma-swiotlb.c | 20 --------------------
arch/powerpc/kernel/dma.c | 5 ++---
arch/powerpc/sysdev/fsl_pci.c | 3 +--
5 files changed, 4 insertions(+), 31 deletions(-)
diff --git a/arch/powerpc/include/asm/device.h b/arch/powerpc/include/asm/device.h
index 3814e1c2d4bc..a130be13ee83 100644
--- a/arch/powerpc/include/asm/device.h
+++ b/arch/powerpc/include/asm/device.h
@@ -38,9 +38,6 @@ struct dev_archdata {
#ifdef CONFIG_IOMMU_API
void *iommu_domain;
#endif
-#ifdef CONFIG_SWIOTLB
- dma_addr_t max_direct_dma_addr;
-#endif
#ifdef CONFIG_PPC64
struct pci_dn *pci_data;
#endif
diff --git a/arch/powerpc/include/asm/dma-direct.h b/arch/powerpc/include/asm/dma-direct.h
index 7702875aabb7..e00ab5d0612d 100644
--- a/arch/powerpc/include/asm/dma-direct.h
+++ b/arch/powerpc/include/asm/dma-direct.h
@@ -5,9 +5,7 @@
static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)
{
#ifdef CONFIG_SWIOTLB
- struct dev_archdata *sd = &dev->archdata;
-
- if (sd->max_direct_dma_addr && addr + size > sd->max_direct_dma_addr)
+ if (dev->bus_dma_mask && addr + size > dev->bus_dma_mask)
return false;
#endif
diff --git a/arch/powerpc/kernel/dma-swiotlb.c b/arch/powerpc/kernel/dma-swiotlb.c
index 38a2c9f5ab54..62caa16b91a9 100644
--- a/arch/powerpc/kernel/dma-swiotlb.c
+++ b/arch/powerpc/kernel/dma-swiotlb.c
@@ -24,21 +24,6 @@
unsigned int ppc_swiotlb_enable;
-static u64 swiotlb_powerpc_get_required(struct device *dev)
-{
- u64 end, mask, max_direct_dma_addr = dev->archdata.max_direct_dma_addr;
-
- end = memblock_end_of_DRAM();
- if (max_direct_dma_addr && end > max_direct_dma_addr)
- end = max_direct_dma_addr;
- end += get_dma_offset(dev);
-
- mask = 1ULL << (fls64(end) - 1);
- mask += mask - 1;
-
- return mask;
-}
-
/*
* At the moment, all platforms that use this code only require
* swiotlb to be used if we're operating on HIGHMEM. Since
@@ -60,22 +45,17 @@ const struct dma_map_ops powerpc_swiotlb_dma_ops = {
.sync_sg_for_cpu = swiotlb_sync_sg_for_cpu,
.sync_sg_for_device = swiotlb_sync_sg_for_device,
.mapping_error = dma_direct_mapping_error,
- .get_required_mask = swiotlb_powerpc_get_required,
};
static int ppc_swiotlb_bus_notify(struct notifier_block *nb,
unsigned long action, void *data)
{
struct device *dev = data;
- struct dev_archdata *sd;
/* We are only intereted in device addition */
if (action != BUS_NOTIFY_ADD_DEVICE)
return 0;
- sd = &dev->archdata;
- sd->max_direct_dma_addr = 0;
-
/* May need to bounce if the device can't address all of DRAM */
if ((dma_get_mask(dev) + 1) < memblock_end_of_DRAM())
set_dma_ops(dev, &powerpc_swiotlb_dma_ops);
diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c
index f9f51fc505a1..59f38ca3975c 100644
--- a/arch/powerpc/kernel/dma.c
+++ b/arch/powerpc/kernel/dma.c
@@ -30,11 +30,10 @@
static u64 __maybe_unused get_pfn_limit(struct device *dev)
{
u64 pfn = (dev->coherent_dma_mask >> PAGE_SHIFT) + 1;
- struct dev_archdata __maybe_unused *sd = &dev->archdata;
#ifdef CONFIG_SWIOTLB
- if (sd->max_direct_dma_addr && dev->dma_ops == &powerpc_swiotlb_dma_ops)
- pfn = min_t(u64, pfn, sd->max_direct_dma_addr >> PAGE_SHIFT);
+ if (dev->bus_dma_mask && dev->dma_ops == &powerpc_swiotlb_dma_ops)
+ pfn = min_t(u64, pfn, dev->bus_dma_mask >> PAGE_SHIFT);
#endif
return pfn;
diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
index 561f97d698cc..f136567a5ed5 100644
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -117,9 +117,8 @@ static u64 pci64_dma_offset;
static void pci_dma_dev_setup_swiotlb(struct pci_dev *pdev)
{
struct pci_controller *hose = pci_bus_to_host(pdev->bus);
- struct dev_archdata *sd = &pdev->dev.archdata;
- sd->max_direct_dma_addr =
+ pdev->dev.bus_dma_mask =
hose->dma_window_base_cur + hose->dma_window_size;
}
--
2.19.1
next prev parent reply other threads:[~2018-11-14 8:24 UTC|newest]
Thread overview: 178+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-14 8:22 use generic DMA mapping code in powerpc V4 Christoph Hellwig
2018-11-14 8:22 ` [PATCH 01/34] powerpc: use mm zones more sensibly Christoph Hellwig
2018-12-06 14:09 ` Christoph Hellwig
2018-12-07 12:18 ` Michael Ellerman
2018-12-07 14:09 ` Christoph Hellwig
2018-12-07 15:04 ` Christian Zigotzky
2018-11-14 8:22 ` [PATCH 02/34] powerpc: allow NOT_COHERENT_CACHE for amigaone Christoph Hellwig
2018-12-06 14:09 ` Christoph Hellwig
2018-11-14 8:22 ` [PATCH 03/34] powerpc/dma: remove the unused ARCH_HAS_DMA_MMAP_COHERENT define Christoph Hellwig
2018-12-06 14:09 ` Christoph Hellwig
2018-11-14 8:22 ` [PATCH 04/34] powerpc/dma: remove the unused ISA_DMA_THRESHOLD export Christoph Hellwig
2018-12-06 14:10 ` Christoph Hellwig
2018-11-14 8:22 ` [PATCH 05/34] powerpc/dma: remove the unused dma_iommu_ops export Christoph Hellwig
2018-12-06 14:10 ` Christoph Hellwig
2018-11-14 8:22 ` [PATCH 06/34] powerpc/dma: split the two __dma_alloc_coherent implementations Christoph Hellwig
2018-12-06 14:10 ` Christoph Hellwig
2018-11-14 8:22 ` [PATCH 07/34] powerpc/dma: remove the no-op dma_nommu_unmap_{page,sg} routines Christoph Hellwig
2018-12-06 14:10 ` [PATCH 07/34] powerpc/dma: remove the no-op dma_nommu_unmap_{page, sg} routines Christoph Hellwig
2018-11-14 8:22 ` [PATCH 08/34] powerpc/dma: untangle vio_dma_mapping_ops from dma_iommu_ops Christoph Hellwig
2018-12-06 14:10 ` Christoph Hellwig
2018-11-14 8:22 ` [PATCH 09/34] powerpc/dma: handle iommu bypass in dma_iommu_ops Christoph Hellwig
2018-11-14 8:22 ` [PATCH 10/34] powerpc/pseries: unwind dma_get_required_mask_pSeriesLP a bit Christoph Hellwig
2018-11-14 8:22 ` [PATCH 11/34] powerpc/pseries: use the generic iommu bypass code Christoph Hellwig
2018-11-14 8:22 ` [PATCH 12/34] powerpc/cell: move dma direct window setup out of dma_configure Christoph Hellwig
2018-12-09 10:23 ` Michael Ellerman
2018-12-12 14:36 ` Christoph Hellwig
2018-12-14 13:29 ` Michael Ellerman
2018-12-14 16:42 ` Christoph Hellwig
2018-11-14 8:22 ` [PATCH 13/34] powerpc/cell: use the generic iommu bypass code Christoph Hellwig
2018-11-14 8:22 ` [PATCH 14/34] powerpc/dart: remove dead cleanup code in iommu_init_early_dart Christoph Hellwig
2018-12-06 14:11 ` Christoph Hellwig
2018-11-14 8:22 ` [PATCH 15/34] powerpc/dart: use the generic iommu bypass code Christoph Hellwig
2018-11-14 8:22 ` [PATCH 16/34] powerpc/powernv: remove pnv_pci_ioda_pe_single_vendor Christoph Hellwig
2018-11-14 8:22 ` [PATCH 17/34] powerpc/powernv: remove pnv_npu_dma_set_mask Christoph Hellwig
2018-11-14 8:22 ` [PATCH 18/34] powerpc/powernv: use the generic iommu bypass code Christoph Hellwig
2018-11-14 8:22 ` [PATCH 19/34] cxl: drop the dma_set_mask callback from vphb Christoph Hellwig
2018-12-06 14:10 ` Christoph Hellwig
2018-11-14 8:23 ` [PATCH 20/34] powerpc/dma: stop overriding dma_get_required_mask Christoph Hellwig
2018-11-14 8:23 ` [PATCH 21/34] powerpc/pci: remove the dma_set_mask pci_controller ops methods Christoph Hellwig
2018-11-14 8:23 ` [PATCH 22/34] powerpc/dma: remove the iommu fallback for coherent allocations Christoph Hellwig
2018-11-14 8:23 ` [PATCH 23/34] powerpc/dma: remove get_pci_dma_ops Christoph Hellwig
2018-11-14 8:23 ` [PATCH 24/34] powerpc/dma: move pci_dma_dev_setup_swiotlb to fsl_pci.c Christoph Hellwig
2018-11-14 8:23 ` Christoph Hellwig [this message]
2018-11-14 8:23 ` [PATCH 26/34] powerpc/dma: fix an off-by-one in dma_capable Christoph Hellwig
2018-11-14 8:23 ` [PATCH 27/34] powerpc/fsl_pci: simplify fsl_pci_dma_set_mask Christoph Hellwig
2018-11-14 8:23 ` [PATCH 28/34] dma-mapping, powerpc: simplify the arch dma_set_mask override Christoph Hellwig
2018-11-14 8:23 ` [PATCH 29/34] powerpc/dma: use phys_to_dma instead of get_dma_offset Christoph Hellwig
2018-11-14 8:23 ` [PATCH 30/34] powerpc/dma: remove dma_nommu_mmap_coherent Christoph Hellwig
2018-11-14 8:23 ` [PATCH 31/34] powerpc/dma: use generic direct and swiotlb ops Christoph Hellwig
2018-11-14 8:23 ` [PATCH 32/34] powerpc/dma: remove get_dma_offset Christoph Hellwig
2018-11-14 8:23 ` [PATCH 33/34] powerpc/dma: remove set_dma_offset Christoph Hellwig
2018-11-14 8:23 ` [PATCH 34/34] powerpc/dma: trim the fat from <asm/dma-mapping.h> Christoph Hellwig
2018-11-27 7:42 ` use generic DMA mapping code in powerpc V4 Christoph Hellwig
2018-11-27 22:05 ` Benjamin Herrenschmidt
2018-11-28 11:05 ` Michael Ellerman
2018-11-28 15:55 ` Christian Zigotzky
2018-11-28 20:02 ` Christian Zigotzky
2018-11-28 20:35 ` Michal Suchánek
2018-11-29 17:03 ` Christoph Hellwig
2019-12-19 13:54 ` Christian Zigotzky
2018-11-29 12:05 ` Christian Zigotzky
2018-11-29 15:30 ` Christian Zigotzky
2018-11-29 17:03 ` Christoph Hellwig
2018-11-29 23:07 ` Christian Zigotzky
2018-11-30 10:53 ` Christoph Hellwig
2018-11-30 12:23 ` Christian Zigotzky
2018-11-30 13:10 ` Christoph Hellwig
2018-11-30 15:29 ` Christian Zigotzky
2018-12-04 7:31 ` Christian Zigotzky
2018-12-04 9:53 ` Christian Zigotzky
2018-12-04 14:24 ` Christoph Hellwig
2018-12-05 9:44 ` Christian Zigotzky
2018-12-05 14:05 ` Christoph Hellwig
2018-12-06 10:55 ` Christian Zigotzky
2018-12-06 17:10 ` Christian Zigotzky
2018-12-06 19:36 ` Christoph Hellwig
2018-12-07 7:48 ` Christian Zigotzky
2018-12-07 13:45 ` Christian Zigotzky
2018-12-07 18:33 ` Christian Zigotzky
2018-12-08 10:29 ` Christian Zigotzky
2018-12-08 13:47 ` Christian Zigotzky
2018-12-09 14:20 ` Christian Zigotzky
2018-12-09 18:26 ` Christian Zigotzky
2018-12-10 15:54 ` Christian Zigotzky
2018-12-11 14:28 ` Christian Zigotzky
2018-12-11 18:17 ` Christian Zigotzky
2018-12-12 0:47 ` Benjamin Herrenschmidt
2018-12-12 7:03 ` Christian Zigotzky
2018-12-12 14:15 ` Christoph Hellwig
2018-12-12 14:39 ` Christian Zigotzky
2018-12-13 8:41 ` Christian Zigotzky
2018-12-13 9:10 ` Christoph Hellwig
2018-12-13 9:47 ` Christian Zigotzky
2018-12-13 11:19 ` Christian Zigotzky
2018-12-13 11:25 ` Christoph Hellwig
2018-12-13 13:34 ` Christian Zigotzky
2018-12-13 17:48 ` Christian Zigotzky
2018-12-13 21:53 ` Christian Zigotzky
2018-12-14 12:00 ` Christian Zigotzky
2018-12-14 16:45 ` Christoph Hellwig
2019-01-03 7:36 ` Christoph Hellwig
2019-01-03 19:26 ` Christian Zigotzky
2019-01-05 16:03 ` Christian Zigotzky
2019-01-09 9:31 ` Christian Zigotzky
2019-01-11 2:10 ` Christian Zigotzky
2019-01-12 18:14 ` Christian Zigotzky
2019-01-15 8:07 ` Christian Zigotzky
2019-01-15 8:49 ` Christian Zigotzky
2019-01-15 10:55 ` Christian Zigotzky
2019-01-15 13:35 ` Christoph Hellwig
2019-01-15 13:56 ` Christian Zigotzky
2019-01-15 15:17 ` Christoph Hellwig
2019-01-17 9:21 ` Christian Zigotzky
2019-01-17 9:31 ` Christoph Hellwig
2019-01-17 9:44 ` Christian Zigotzky
2019-01-18 8:35 ` Christoph Hellwig
2019-01-18 11:10 ` Christian Zigotzky
2019-01-18 11:28 ` Christoph Hellwig
2019-01-18 12:07 ` Christian Zigotzky
2019-01-18 12:18 ` Christoph Hellwig
2019-01-18 12:46 ` Christian Zigotzky
2019-01-18 12:55 ` Christoph Hellwig
2019-01-18 15:06 ` Christian Zigotzky
2019-01-19 11:40 ` Christian Zigotzky
2019-01-19 11:52 ` Christian Zigotzky
2019-01-19 13:02 ` Christoph Hellwig
2019-01-19 14:04 ` Christoph Hellwig
2019-01-21 14:38 ` Christian Zigotzky
2019-01-23 14:34 ` Christian Zigotzky
2019-01-25 13:37 ` Christian Zigotzky
2019-01-27 13:13 ` Christian Zigotzky
2019-01-28 7:04 ` Christoph Hellwig
2019-01-28 16:22 ` Christoph Hellwig
2019-01-28 16:52 ` Christian Zigotzky
2019-01-29 15:03 ` Christian Zigotzky
2019-01-29 16:14 ` Christoph Hellwig
2019-01-29 16:34 ` Christoph Hellwig
2019-01-30 4:40 ` Christian Zigotzky
2019-01-31 12:48 ` Christian Zigotzky
2019-02-01 8:04 ` Christoph Hellwig
2019-02-01 16:54 ` Christian Zigotzky
2019-02-03 16:49 ` Christian Zigotzky
2019-02-04 7:56 ` Christoph Hellwig
2019-02-04 12:13 ` Christian Zigotzky
2019-02-04 12:38 ` Christoph Hellwig
2019-02-06 13:45 ` Christian Zigotzky
2019-02-06 15:15 ` Christoph Hellwig
2019-02-06 15:16 ` Christoph Hellwig
2019-02-07 4:34 ` Christian Zigotzky
2019-02-08 9:01 ` Christian Zigotzky
2019-02-08 9:18 ` Christoph Hellwig
2019-02-08 10:59 ` Christian Zigotzky
2019-02-10 12:00 ` Christian Zigotzky
[not found] ` <0042290A-2939-4EBA-A638-D404FA2055ED@xenosoft.de>
2019-02-11 7:21 ` Christian Zigotzky
2019-02-11 7:38 ` Christoph Hellwig
2019-02-12 12:42 ` Christian Zigotzky
2019-02-12 15:25 ` Christoph Hellwig
2019-02-12 19:31 ` Christian Zigotzky
2019-02-12 19:50 ` Christian Zigotzky
2019-02-12 19:52 ` Christoph Hellwig
2019-11-05 7:56 ` Bug 205201 - overflow of DMA mask and bus mask Christian Zigotzky
2019-11-05 16:28 ` Christoph Hellwig
2019-11-06 14:09 ` Robin Murphy
2019-11-21 17:26 ` Christoph Hellwig
2019-11-07 9:53 ` Christian Zigotzky
2019-11-10 7:27 ` Christian Zigotzky
2019-11-11 8:12 ` Christian Zigotzky
2019-11-11 8:16 ` Christian Zigotzky
2019-11-11 12:22 ` Christian Zigotzky
2019-11-12 14:41 ` Christoph Hellwig
2019-11-12 22:58 ` Christian Zigotzky
2019-11-13 10:14 ` Christian Zigotzky
2019-11-13 11:02 ` Christoph Hellwig
2018-11-29 17:02 ` use generic DMA mapping code in powerpc V4 Christoph Hellwig
2018-11-30 3:17 ` Benjamin Herrenschmidt
2018-12-08 17:03 ` Christoph Hellwig
2018-12-16 16:51 ` Christoph Hellwig
2018-12-17 1:14 ` Michael Ellerman
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=20181114082314.8965-26-hch@lst.de \
--to=hch@lst.de \
--cc=benh@kernel.crashing.org \
--cc=iommu@lists.linux-foundation.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=paulus@samba.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).