Commit 16c200e0 authored by Will Deacon's avatar Will Deacon
Browse files

Merge branch 'for-next/pfn-valid' into for-next/core 

* for-next/pfn-valid:
  arm64/mm: drop HAVE_ARCH_PFN_VALID
  dma-mapping: remove bogus test for pfn_valid from dma_map_resource
parents bd334dd7 3de360c3

arch/arm64/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -154,7 +154,6 @@ config ARM64 
	select HAVE_ARCH_KGDB

	select HAVE_ARCH_MMAP_RND_BITS

	select HAVE_ARCH_MMAP_RND_COMPAT_BITS if COMPAT

	select HAVE_ARCH_PFN_VALID

	select HAVE_ARCH_PREL32_RELOCATIONS

	select HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET

	select HAVE_ARCH_SECCOMP_FILTER

arch/arm64/include/asm/page.h

+0 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ void tag_clear_highpage(struct page *to); 


typedef struct page *pgtable_t;



int pfn_valid(unsigned long pfn);

int pfn_is_map_memory(unsigned long pfn);



#include <asm/memory.h>

arch/arm64/mm/init.c

+0 −37
Original line number Diff line number Diff line
@@ -160,43 +160,6 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max) 
	free_area_init(max_zone_pfns);

}



int pfn_valid(unsigned long pfn)

{

	phys_addr_t addr = PFN_PHYS(pfn);

	struct mem_section *ms;



	/*

	 * Ensure the upper PAGE_SHIFT bits are clear in the

	 * pfn. Else it might lead to false positives when

	 * some of the upper bits are set, but the lower bits

	 * match a valid pfn.

	 */

	if (PHYS_PFN(addr) != pfn)

		return 0;



	if (pfn_to_section_nr(pfn) >= NR_MEM_SECTIONS)

		return 0;



	ms = __pfn_to_section(pfn);

	if (!valid_section(ms))

		return 0;



	/*

	 * ZONE_DEVICE memory does not have the memblock entries.

	 * memblock_is_map_memory() check for ZONE_DEVICE based

	 * addresses will always fail. Even the normal hotplugged

	 * memory will never have MEMBLOCK_NOMAP flag set in their

	 * memblock entries. Skip memblock search for all non early

	 * memory sections covering all of hotplug memory including

	 * both normal and ZONE_DEVICE based.

	 */

	if (!early_section(ms))

		return pfn_section_valid(ms, pfn);



	return memblock_is_memory(addr);

}

EXPORT_SYMBOL(pfn_valid);



int pfn_is_map_memory(unsigned long pfn)

{

	phys_addr_t addr = PFN_PHYS(pfn);

kernel/dma/mapping.c

+0 −4
Original line number Diff line number Diff line
@@ -296,10 +296,6 @@ dma_addr_t dma_map_resource(struct device *dev, phys_addr_t phys_addr, 
	if (WARN_ON_ONCE(!dev->dma_mask))

		return DMA_MAPPING_ERROR;



	/* Don't allow RAM to be mapped */

	if (WARN_ON_ONCE(pfn_valid(PHYS_PFN(phys_addr))))

		return DMA_MAPPING_ERROR;



	if (dma_map_direct(dev, ops))

		addr = dma_direct_map_resource(dev, phys_addr, size, dir, attrs);

	else if (ops->map_resource)