Commit c164fbb4 authored by Logan Gunthorpe's avatar Logan Gunthorpe Committed by Linus Torvalds
Browse files

x86/mm: thread pgprot_t through init_memory_mapping() 



In preparation to support a pgprot_t argument for arch_add_memory().

It's required to move the prototype of init_memory_mapping() seeing the
original location came before the definition of pgprot_t.

Signed-off-by: default avatarLogan Gunthorpe <logang@deltatee.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Reviewed-by: default avatarDan Williams <dan.j.williams@intel.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: David Hildenbrand <david@redhat.com>
Cc: Eric Badger <ebadger@gigaio.com>
Cc: Jason Gunthorpe <jgg@ziepe.ca>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Will Deacon <will@kernel.org>
Link: http://lkml.kernel.org/r/20200306170846.9333-4-logang@deltatee.com


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f5637d3b

arch/x86/include/asm/page_types.h

+0 −3
Original line number Diff line number Diff line
@@ -71,9 +71,6 @@ static inline phys_addr_t get_max_mapped(void) 


bool pfn_range_is_mapped(unsigned long start_pfn, unsigned long end_pfn);



extern unsigned long init_memory_mapping(unsigned long start,

					 unsigned long end);



extern void initmem_init(void);



#endif	/* !__ASSEMBLY__ */

arch/x86/include/asm/pgtable.h

+3 −0
Original line number Diff line number Diff line
@@ -1081,6 +1081,9 @@ static inline void __meminit init_trampoline_default(void) 


void __init poking_init(void);



unsigned long init_memory_mapping(unsigned long start,

				  unsigned long end, pgprot_t prot);



# ifdef CONFIG_RANDOMIZE_MEMORY

void __meminit init_trampoline(void);

# else

arch/x86/kernel/amd_gart_64.c

+2 −1
Original line number Diff line number Diff line
@@ -744,7 +744,8 @@ int __init gart_iommu_init(void) 


	start_pfn = PFN_DOWN(aper_base);

	if (!pfn_range_is_mapped(start_pfn, end_pfn))

		init_memory_mapping(start_pfn<<PAGE_SHIFT, end_pfn<<PAGE_SHIFT);

		init_memory_mapping(start_pfn<<PAGE_SHIFT, end_pfn<<PAGE_SHIFT,

				    PAGE_KERNEL);



	pr_info("PCI-DMA: using GART IOMMU.\n");

	iommu_size = check_iommu_size(info.aper_base, aper_size);

arch/x86/mm/init.c

+5 −4
Original line number Diff line number Diff line
@@ -467,7 +467,7 @@ bool pfn_range_is_mapped(unsigned long start_pfn, unsigned long end_pfn) 
 * the physical memory. To access them they are temporarily mapped.

 */

unsigned long __ref init_memory_mapping(unsigned long start,

					       unsigned long end)

					unsigned long end, pgprot_t prot)

{

	struct map_range mr[NR_RANGE_MR];

	unsigned long ret = 0;
@@ -481,7 +481,8 @@ unsigned long __ref init_memory_mapping(unsigned long start, 


	for (i = 0; i < nr_range; i++)

		ret = kernel_physical_mapping_init(mr[i].start, mr[i].end,

						   mr[i].page_size_mask);

						   mr[i].page_size_mask,

						   prot);



	add_pfn_range_mapped(start >> PAGE_SHIFT, ret >> PAGE_SHIFT);
@@ -521,7 +522,7 @@ static unsigned long __init init_range_memory_mapping( 
		 */

		can_use_brk_pgt = max(start, (u64)pgt_buf_end<<PAGE_SHIFT) >=

				    min(end, (u64)pgt_buf_top<<PAGE_SHIFT);

		init_memory_mapping(start, end);

		init_memory_mapping(start, end, PAGE_KERNEL);

		mapped_ram_size += end - start;

		can_use_brk_pgt = true;

	}
@@ -661,7 +662,7 @@ void __init init_mem_mapping(void) 
#endif



	/* the ISA range is always mapped regardless of memory holes */

	init_memory_mapping(0, ISA_END_ADDRESS);

	init_memory_mapping(0, ISA_END_ADDRESS, PAGE_KERNEL);



	/* Init the trampoline, possibly with KASLR memory offset */

	init_trampoline();

arch/x86/mm/init_32.c

+2 −1
Original line number Diff line number Diff line
@@ -257,7 +257,8 @@ static inline int __is_kernel_text(unsigned long addr) 
unsigned long __init

kernel_physical_mapping_init(unsigned long start,

			     unsigned long end,

			     unsigned long page_size_mask)

			     unsigned long page_size_mask,

			     pgprot_t prot)

{

	int use_pse = page_size_mask == (1<<PG_LEVEL_2M);

	unsigned long last_map_addr = end;

CRA Git | Maintained and supported by SUSTech CRA and CCSE