From: Christoph Hellwig <hch@lst.de>
To: iommu@lists.linux-foundation.org
Cc: linux-alpha@vger.kernel.org, linux-snps-arc@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
adi-buildroot-devel@lists.sourceforge.net,
linux-c6x-dev@linux-c6x.org, linux-cris-kernel@axis.com,
linux-hexagon@vger.kernel.org, linux-ia64@vger.kernel.org,
linux-m68k@lists.linux-m68k.org, linux-metag@vger.kernel.org,
Michal Simek <monstr@monstr.eu>,
linux-mips@linux-mips.org, linux-parisc@vger.kernel.org,
linuxppc-dev@lists.ozlabs.org, patches@groups.riscv.org,
linux-s390@vger.kernel.org, linux-sh@vger.kernel.org,
sparclinux@vger.kernel.org, Guan Xuetao <gxt@mprc.pku.edu.cn>,
x86@kernel.org, linux-arch@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 36/67] x86: remove dma_alloc_coherent_mask
Date: Fri, 29 Dec 2017 09:18:40 +0100 [thread overview]
Message-ID: <20171229081911.2802-37-hch@lst.de> (raw)
In-Reply-To: <20171229081911.2802-1-hch@lst.de>
These days all devices (including the ISA fallback device) have a coherent
DMA mask set, so remove the workaround.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
arch/x86/include/asm/dma-mapping.h | 18 ++----------------
arch/x86/kernel/pci-dma.c | 10 ++++------
arch/x86/mm/mem_encrypt.c | 4 +---
drivers/xen/swiotlb-xen.c | 16 +---------------
4 files changed, 8 insertions(+), 40 deletions(-)
diff --git a/arch/x86/include/asm/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h
index 6277c83c0eb1..545bf3721bc0 100644
--- a/arch/x86/include/asm/dma-mapping.h
+++ b/arch/x86/include/asm/dma-mapping.h
@@ -44,26 +44,12 @@ extern void dma_generic_free_coherent(struct device *dev, size_t size,
void *vaddr, dma_addr_t dma_addr,
unsigned long attrs);
-static inline unsigned long dma_alloc_coherent_mask(struct device *dev,
- gfp_t gfp)
-{
- unsigned long dma_mask = 0;
-
- dma_mask = dev->coherent_dma_mask;
- if (!dma_mask)
- dma_mask = (gfp & GFP_DMA) ? DMA_BIT_MASK(24) : DMA_BIT_MASK(32);
-
- return dma_mask;
-}
-
static inline gfp_t dma_alloc_coherent_gfp_flags(struct device *dev, gfp_t gfp)
{
- unsigned long dma_mask = dma_alloc_coherent_mask(dev, gfp);
-
- if (dma_mask <= DMA_BIT_MASK(24))
+ if (dev->coherent_dma_mask <= DMA_BIT_MASK(24))
gfp |= GFP_DMA;
#ifdef CONFIG_X86_64
- if (dma_mask <= DMA_BIT_MASK(32) && !(gfp & GFP_DMA))
+ if (dev->coherent_dma_mask <= DMA_BIT_MASK(32) && !(gfp & GFP_DMA))
gfp |= GFP_DMA32;
#endif
return gfp;
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index df7ab02f959f..b59820872ec7 100644
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -80,13 +80,10 @@ void *dma_generic_alloc_coherent(struct device *dev, size_t size,
dma_addr_t *dma_addr, gfp_t flag,
unsigned long attrs)
{
- unsigned long dma_mask;
struct page *page;
unsigned int count = PAGE_ALIGN(size) >> PAGE_SHIFT;
dma_addr_t addr;
- dma_mask = dma_alloc_coherent_mask(dev, flag);
-
again:
page = NULL;
/* CMA can be used only in the context which permits sleeping */
@@ -95,7 +92,7 @@ void *dma_generic_alloc_coherent(struct device *dev, size_t size,
flag);
if (page) {
addr = phys_to_dma(dev, page_to_phys(page));
- if (addr + size > dma_mask) {
+ if (addr + size > dev->coherent_dma_mask) {
dma_release_from_contiguous(dev, page, count);
page = NULL;
}
@@ -108,10 +105,11 @@ void *dma_generic_alloc_coherent(struct device *dev, size_t size,
return NULL;
addr = phys_to_dma(dev, page_to_phys(page));
- if (addr + size > dma_mask) {
+ if (addr + size > dev->coherent_dma_mask) {
__free_pages(page, get_order(size));
- if (dma_mask < DMA_BIT_MASK(32) && !(flag & GFP_DMA)) {
+ if (dev->coherent_dma_mask < DMA_BIT_MASK(32) &&
+ !(flag & GFP_DMA)) {
flag = (flag & ~GFP_DMA32) | GFP_DMA;
goto again;
}
diff --git a/arch/x86/mm/mem_encrypt.c b/arch/x86/mm/mem_encrypt.c
index 764b916ef7da..479586b8ca9b 100644
--- a/arch/x86/mm/mem_encrypt.c
+++ b/arch/x86/mm/mem_encrypt.c
@@ -203,12 +203,10 @@ void __init sme_early_init(void)
static void *sev_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle,
gfp_t gfp, unsigned long attrs)
{
- unsigned long dma_mask;
unsigned int order;
struct page *page;
void *vaddr = NULL;
- dma_mask = dma_alloc_coherent_mask(dev, gfp);
order = get_order(size);
/*
@@ -226,7 +224,7 @@ static void *sev_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle,
* mask with it already cleared.
*/
addr = __sme_clr(phys_to_dma(dev, page_to_phys(page)));
- if ((addr + size) > dma_mask) {
+ if ((addr + size) > dev->coherent_dma_mask) {
__free_pages(page, get_order(size));
} else {
vaddr = page_address(page);
diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
index 5bb72d3f8337..e1c60899fdbc 100644
--- a/drivers/xen/swiotlb-xen.c
+++ b/drivers/xen/swiotlb-xen.c
@@ -53,20 +53,6 @@
* API.
*/
-#ifndef CONFIG_X86
-static unsigned long dma_alloc_coherent_mask(struct device *dev,
- gfp_t gfp)
-{
- unsigned long dma_mask = 0;
-
- dma_mask = dev->coherent_dma_mask;
- if (!dma_mask)
- dma_mask = (gfp & GFP_DMA) ? DMA_BIT_MASK(24) : DMA_BIT_MASK(32);
-
- return dma_mask;
-}
-#endif
-
#define XEN_SWIOTLB_ERROR_CODE (~(dma_addr_t)0x0)
static char *xen_io_tlb_start, *xen_io_tlb_end;
@@ -328,7 +314,7 @@ xen_swiotlb_alloc_coherent(struct device *hwdev, size_t size,
return ret;
if (hwdev && hwdev->coherent_dma_mask)
- dma_mask = dma_alloc_coherent_mask(hwdev, flags);
+ dma_mask = hwdev->coherent_dma_mask;
/* At this point dma_handle is the physical address, next we are
* going to set it to the machine address.
--
2.14.2
next prev parent reply other threads:[~2017-12-29 8:22 UTC|newest]
Thread overview: 97+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-29 8:18 consolidate direct dma mapping and swiotlb support Christoph Hellwig
2017-12-29 8:18 ` [PATCH 01/67] x86: remove X86_PPRO_FENCE Christoph Hellwig
2017-12-29 8:18 ` [PATCH 02/67] alpha: mark jensen as broken Christoph Hellwig
2018-01-02 10:36 ` Geert Uytterhoeven
2018-01-04 8:53 ` Christoph Hellwig
2017-12-29 8:18 ` [PATCH 03/67] dma-mapping: take dma_pfn_offset into account in dma_max_pfn Christoph Hellwig
2017-12-29 8:18 ` [PATCH 04/67] arm64: don't override dma_max_pfn Christoph Hellwig
2017-12-29 8:18 ` [PATCH 05/67] dma-mapping: replace PCI_DMA_BUS_IS_PHYS with a flag in struct dma_map_ops Christoph Hellwig
2018-01-02 10:39 ` Geert Uytterhoeven
2018-01-09 15:55 ` Jesper Nilsson
2017-12-29 8:18 ` [PATCH 06/67] hexagon: remove unused flush_write_buffers definition Christoph Hellwig
2018-01-09 3:13 ` Richard Kuo
2017-12-29 8:18 ` [PATCH 07/67] m32r: " Christoph Hellwig
2017-12-29 8:18 ` [PATCH 08/67] powerpc: " Christoph Hellwig
2017-12-29 8:18 ` [PATCH 09/67] arc: remove CONFIG_ARC_PLAT_NEEDS_PHYS_TO_DMA Christoph Hellwig
2018-01-05 19:45 ` Vineet Gupta
2017-12-29 8:18 ` [PATCH 10/67] m32r: remove the unused dma_capable helper Christoph Hellwig
2017-12-29 8:18 ` [PATCH 11/67] riscv: " Christoph Hellwig
2017-12-29 8:18 ` [PATCH 12/67] s390: " Christoph Hellwig
2017-12-29 8:18 ` [PATCH 13/67] dma-mapping: move swiotlb arch helpers to a new header Christoph Hellwig
2017-12-29 8:18 ` [PATCH 14/67] dma-mapping: move dma_mark_clean to dma-direct.h Christoph Hellwig
2017-12-29 8:18 ` [PATCH 15/67] hexagon: use the generic dma_capable helper Christoph Hellwig
2017-12-29 8:18 ` [PATCH 16/67] powerpc: rename dma_direct_ to dma_nommu_ Christoph Hellwig
2018-01-02 9:45 ` Michael Ellerman
2018-01-02 10:22 ` Geert Uytterhoeven
2018-01-03 6:24 ` Michael Ellerman
2018-01-03 7:49 ` Geert Uytterhoeven
2018-01-03 8:19 ` Julian Calaby
2018-01-04 8:48 ` Christoph Hellwig
2018-01-04 8:49 ` Christoph Hellwig
2018-01-09 15:38 ` Christoph Hellwig
2017-12-29 8:18 ` [PATCH 17/67] microblaze: rename dma_direct to dma_microblaze Christoph Hellwig
2017-12-29 10:11 ` Julian Calaby
2018-01-04 8:45 ` Christoph Hellwig
2017-12-29 8:18 ` [PATCH 18/67] microblaze: remove dma_nommu_dma_supported Christoph Hellwig
2017-12-29 8:18 ` [PATCH 19/67] microblaze: remove the dead !NOT_COHERENT_CACHE dma code Christoph Hellwig
2017-12-29 8:18 ` [PATCH 20/67] s390: move s390_pci_dma_ops to asm/pci_dma.h Christoph Hellwig
2017-12-29 8:18 ` [PATCH 21/67] dma-mapping: warn when there is no coherent_dma_mask Christoph Hellwig
2017-12-29 8:18 ` [PATCH 22/67] dma-mapping: clear harmful GFP_* flags in common code Christoph Hellwig
2018-01-02 10:38 ` Geert Uytterhoeven
2018-01-09 15:54 ` Jesper Nilsson
2017-12-29 8:18 ` [PATCH 23/67] dma-mapping: add an arch_dma_supported hook Christoph Hellwig
2017-12-29 8:18 ` [PATCH 24/67] dma-mapping: provide a generic asm/dma-mapping.h Christoph Hellwig
2017-12-29 8:18 ` [PATCH 25/67] dma-direct: rename dma_noop to dma_direct Christoph Hellwig
2018-01-02 16:25 ` Vladimir Murzin
2017-12-29 8:18 ` [PATCH 26/67] dma-direct: use phys_to_dma Christoph Hellwig
2018-01-02 16:26 ` Vladimir Murzin
2017-12-29 8:18 ` [PATCH 27/67] dma-direct: add dma address sanity checks Christoph Hellwig
2017-12-29 14:12 ` Geert Uytterhoeven
2018-01-04 8:52 ` Christoph Hellwig
2017-12-29 8:18 ` [PATCH 28/67] dma-direct: add support for CMA allocation Christoph Hellwig
2017-12-29 8:18 ` [PATCH 29/67] dma-direct: use node local allocations for coherent memory Christoph Hellwig
2018-01-02 10:29 ` Geert Uytterhoeven
2017-12-29 8:18 ` [PATCH 30/67] dma-direct: retry allocations using GFP_DMA for small masks Christoph Hellwig
2018-01-02 16:43 ` Vladimir Murzin
2018-01-04 9:02 ` Christoph Hellwig
2017-12-29 8:18 ` [PATCH 31/67] dma-direct: make dma_direct_{alloc, free} available to other implementations Christoph Hellwig
2018-01-02 16:44 ` Vladimir Murzin
2017-12-29 8:18 ` [PATCH 32/67] dma-direct: add support for allocation from ZONE_DMA and ZONE_DMA32 Christoph Hellwig
2017-12-29 8:18 ` [PATCH 33/67] dma-direct: reject too small dma masks Christoph Hellwig
2017-12-29 8:18 ` [PATCH 34/67] cris: use dma-direct Christoph Hellwig
2018-01-09 15:53 ` Jesper Nilsson
2017-12-29 8:18 ` [PATCH 35/67] h8300: " Christoph Hellwig
2017-12-29 8:18 ` Christoph Hellwig [this message]
2017-12-29 8:18 ` [PATCH 37/67] x86: " Christoph Hellwig
2017-12-29 8:18 ` [PATCH 38/67] x86/amd_gart: clean up gart_alloc_coherent Christoph Hellwig
2017-12-29 8:18 ` [PATCH 39/67] iommu/amd_iommu: use dma_direct_* helpers for the direct mapping case Christoph Hellwig
2017-12-29 8:18 ` [PATCH 40/67] iommu/intel-iommu: " Christoph Hellwig
2017-12-29 8:18 ` [PATCH 41/67] x86: remove dma_alloc_coherent_gfp_flags Christoph Hellwig
2017-12-29 8:18 ` [PATCH 42/67] arm64: rename swiotlb_dma_ops Christoph Hellwig
2017-12-29 8:18 ` [PATCH 43/67] ia64: " Christoph Hellwig
2017-12-29 8:18 ` [PATCH 44/67] powerpc: " Christoph Hellwig
2017-12-29 8:18 ` [PATCH 45/67] swiotlb: rename swiotlb_free to swiotlb_exit Christoph Hellwig
2017-12-29 8:18 ` [PATCH 46/67] swiotlb: lift x86 swiotlb_dma_ops to common code Christoph Hellwig
2017-12-29 8:18 ` [PATCH 47/67] swiotlb: wire up ->dma_supported in swiotlb_dma_ops Christoph Hellwig
2017-12-29 8:18 ` [PATCH 48/67] swiotlb: rely on dev->coherent_dma_mask Christoph Hellwig
2017-12-29 8:18 ` [PATCH 49/67] swiotlb: refactor coherent buffer freeing Christoph Hellwig
2017-12-29 8:18 ` [PATCH 50/67] swiotlb: refactor coherent buffer allocation Christoph Hellwig
2017-12-29 8:18 ` [PATCH 51/67] set_memory.h: provide set_memory_{en,de}crypted stubs Christoph Hellwig
2017-12-29 8:18 ` [PATCH 52/67] dma-direct: handle the memory encryption bit in common code Christoph Hellwig
2017-12-29 8:18 ` [PATCH 53/67] swiotlb: remove swiotlb_set_mem_attributes Christoph Hellwig
2017-12-29 8:18 ` [PATCH 54/67] x86: remove sta2x11_dma_ops Christoph Hellwig
2017-12-29 8:18 ` [PATCH 55/67] ia64: replace ZONE_DMA with ZONE_DMA32 Christoph Hellwig
2017-12-29 8:19 ` [PATCH 56/67] ia64: use generic swiotlb_ops Christoph Hellwig
2017-12-29 8:19 ` [PATCH 57/67] ia64: clean up swiotlb support Christoph Hellwig
2017-12-29 8:19 ` [PATCH 58/67] ia64: remove an ifdef around the content of pci-dma.c Christoph Hellwig
2017-12-29 8:19 ` [PATCH 59/67] unicore32: use generic swiotlb_ops Christoph Hellwig
2017-12-29 8:19 ` [PATCH 60/67] tile: replace ZONE_DMA with ZONE_DMA32 Christoph Hellwig
2017-12-29 8:19 ` [PATCH 61/67] tile: use generic swiotlb_ops Christoph Hellwig
2017-12-29 8:19 ` [PATCH 62/67] mips/netlogic: remove swiotlb support Christoph Hellwig
2017-12-29 8:19 ` [PATCH 63/67] mips: use swiotlb_{alloc,free} Christoph Hellwig
2017-12-29 8:19 ` [PATCH 64/67] arm64: replace ZONE_DMA with ZONE_DMA32 Christoph Hellwig
2017-12-29 8:19 ` [PATCH 65/67] arm64: use swiotlb_alloc and swiotlb_free Christoph Hellwig
2017-12-29 8:19 ` [PATCH 66/67] swiotlb: remove swiotlb_{alloc,free}_coherent Christoph Hellwig
2017-12-29 8:19 ` [PATCH 67/67] swiotlb: remove various exports Christoph Hellwig
2017-12-29 10:52 ` consolidate direct dma mapping and swiotlb support Vladimir Murzin
2017-12-30 10:56 ` Christoph Hellwig
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=20171229081911.2802-37-hch@lst.de \
--to=hch@lst.de \
--cc=adi-buildroot-devel@lists.sourceforge.net \
--cc=gxt@mprc.pku.edu.cn \
--cc=iommu@lists.linux-foundation.org \
--cc=linux-alpha@vger.kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-c6x-dev@linux-c6x.org \
--cc=linux-cris-kernel@axis.com \
--cc=linux-hexagon@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=linux-metag@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linux-parisc@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=linux-snps-arc@lists.infradead.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=monstr@monstr.eu \
--cc=patches@groups.riscv.org \
--cc=sparclinux@vger.kernel.org \
--cc=x86@kernel.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).