Commit 60ba9265 authored by Huacai Chen's avatar Huacai Chen Committed by Hongchen Zhang
Browse files

LoongArch: Cleanup headers to avoid circular dependency 

mainline inclusion
from mainline-v6.0-rc3
commit 092e9ebe
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I5OHOB


CVE: NA

--------------------------------

When enable GENERIC_IOREMAP, there will be circular dependency to cause
build errors. The root cause is that pgtable.h shouldn't include io.h
but pgtable.h need some macros defined in io.h. So cleanup those macros
and remove the unnecessary inclusions, as other architectures do.

Signed-off-by: default avatarHuacai Chen <chenhuacai@loongson.cn>
parent 48b73970

arch/loongarch/include/asm/addrspace.h

+16 −0
Original line number Diff line number Diff line
@@ -109,4 +109,20 @@ extern unsigned long vm_map_base; 
 */

#define PHYSADDR(a)		((_ACAST64_(a)) & TO_PHYS_MASK)



/*

 * On LoongArch, I/O ports mappring is following:

 *

 *              |         ....          |

 *              |-----------------------|

 *              | pci io ports(16K~32M) |

 *              |-----------------------|

 *              | isa io ports(0  ~16K) |

 * PCI_IOBASE ->|-----------------------|

 *              |         ....          |

 */

#define PCI_IOBASE	((void __iomem *)(vm_map_base + (2 * PAGE_SIZE)))

#define PCI_IOSIZE	SZ_32M

#define ISA_IOSIZE	SZ_16K

#define IO_SPACE_LIMIT	(PCI_IOSIZE - 1)



#endif /* _ASM_ADDRSPACE_H */

arch/loongarch/include/asm/io.h

+0 −19
Original line number Diff line number Diff line
@@ -7,34 +7,15 @@ 


#define ARCH_HAS_IOREMAP_WC



#include <linux/compiler.h>

#include <linux/kernel.h>

#include <linux/types.h>



#include <asm/addrspace.h>

#include <asm/bug.h>

#include <asm/byteorder.h>

#include <asm/cpu.h>

#include <asm/page.h>

#include <asm/pgtable-bits.h>

#include <asm/string.h>



/*

 * On LoongArch, I/O ports mappring is following:

 *

 *              |         ....          |

 *              |-----------------------|

 *              | pci io ports(64K~32M) |

 *              |-----------------------|

 *              | isa io ports(0  ~16K) |

 * PCI_IOBASE ->|-----------------------|

 *              |         ....          |

 */

#define PCI_IOBASE	((void __iomem *)(vm_map_base + (2 * PAGE_SIZE)))

#define PCI_IOSIZE	SZ_32M

#define ISA_IOSIZE	SZ_16K

#define IO_SPACE_LIMIT	(PCI_IOSIZE - 1)



/*

 * Change "struct page" to physical address.

 */

arch/loongarch/include/asm/page.h

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static inline int pfn_valid(unsigned long pfn) 


#endif



#define virt_to_pfn(kaddr)	PFN_DOWN(virt_to_phys((void *)(kaddr)))

#define virt_to_pfn(kaddr)	PFN_DOWN(PHYSADDR(kaddr))

#define virt_to_page(kaddr)	pfn_to_page(virt_to_pfn(kaddr))



extern int __virt_addr_valid(volatile void *kaddr);

arch/loongarch/include/asm/pgtable.h

+3 −4
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ 
#include <linux/mm_types.h>

#include <linux/mmzone.h>

#include <asm/fixmap.h>

#include <asm/io.h>



struct mm_struct;

struct vm_area_struct;
@@ -147,7 +146,7 @@ static inline void set_p4d(p4d_t *p4d, p4d_t p4dval) 
	*p4d = p4dval;

}



#define p4d_phys(p4d)		virt_to_phys((void *)p4d_val(p4d))

#define p4d_phys(p4d)		PHYSADDR(p4d_val(p4d))

#define p4d_page(p4d)		(pfn_to_page(p4d_phys(p4d) >> PAGE_SHIFT))



#endif
@@ -190,7 +189,7 @@ static inline pmd_t *pud_pgtable(pud_t pud) 


#define set_pud(pudptr, pudval) do { *(pudptr) = (pudval); } while (0)



#define pud_phys(pud)		virt_to_phys((void *)pud_val(pud))

#define pud_phys(pud)		PHYSADDR(pud_val(pud))

#define pud_page(pud)		(pfn_to_page(pud_phys(pud) >> PAGE_SHIFT))



#endif
@@ -223,7 +222,7 @@ static inline void pmd_clear(pmd_t *pmdp) 


#define set_pmd(pmdptr, pmdval) do { *(pmdptr) = (pmdval); } while (0)



#define pmd_phys(pmd)		virt_to_phys((void *)pmd_val(pmd))

#define pmd_phys(pmd)		PHYSADDR(pmd_val(pmd))



#ifndef CONFIG_TRANSPARENT_HUGEPAGE

#define pmd_page(pmd)		(pfn_to_page(pmd_phys(pmd) >> PAGE_SHIFT))

arch/loongarch/mm/mmap.c

+2 −9
Original line number Diff line number Diff line
@@ -2,16 +2,9 @@ 
/*

 * Copyright (C) 2020-2022 Loongson Technology Corporation Limited

 */

#include <linux/compiler.h>

#include <linux/elf-randomize.h>

#include <linux/errno.h>

#include <linux/export.h>

#include <linux/mm.h>

#include <linux/mman.h>

#include <linux/export.h>

#include <linux/personality.h>

#include <linux/random.h>

#include <linux/sched/signal.h>

#include <linux/sched/mm.h>



unsigned long shm_align_mask = PAGE_SIZE - 1;	/* Sane caches */

EXPORT_SYMBOL(shm_align_mask);
@@ -120,6 +113,6 @@ int __virt_addr_valid(volatile void *kaddr) 
	if ((vaddr < PAGE_OFFSET) || (vaddr >= vm_map_base))

		return 0;



	return pfn_valid(PFN_DOWN(virt_to_phys(kaddr)));

	return pfn_valid(PFN_DOWN(PHYSADDR(kaddr)));

}

EXPORT_SYMBOL_GPL(__virt_addr_valid);