Commit bc5c8ad3 authored by Mike Rapoport (Microsoft)'s avatar Mike Rapoport (Microsoft) Committed by Andrew Morton
Browse files

MIPS: sgi-ip27: make NODE_DATA() the same as on all other architectures 

sgi-ip27 is the only system that defines NODE_DATA() differently than the
rest of NUMA machines.

Add node_data array of struct pglist pointers that will point to
__node_data[node]->pglist and redefine NODE_DATA() to use node_data array.

This will allow pulling declaration of node_data to the generic mm code in
the next commit.

Link: https://lkml.kernel.org/r/20240807064110.1003856-3-rppt@kernel.org


Signed-off-by: default avatarMike Rapoport (Microsoft) <rppt@kernel.org>
Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Tested-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> [arm64 + CXL via QEMU]
Acked-by: default avatarDan Williams <dan.j.williams@intel.com>
Acked-by: default avatarDavid Hildenbrand <david@redhat.com>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Andreas Larsson <andreas@gaisler.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Cc: David S. Miller <davem@davemloft.net>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiaxun Yang <jiaxun.yang@flygoat.com>
Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Rafael J. Wysocki <rafael@kernel.org>
Cc: Rob Herring (Arm) <robh@kernel.org>
Cc: Samuel Holland <samuel.holland@sifive.com>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Zi Yan <ziy@nvidia.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 0e8b6798

arch/mips/include/asm/mach-ip27/mmzone.h

+4 −1
Original line number Diff line number Diff line
@@ -22,7 +22,10 @@ struct node_data { 


extern struct node_data *__node_data[];



#define NODE_DATA(n)		(&__node_data[(n)]->pglist)

#define hub_data(n)		(&__node_data[(n)]->hub)



extern struct pglist_data *node_data[];



#define NODE_DATA(nid)		(node_data[nid])



#endif /* _ASM_MACH_MMZONE_H */

arch/mips/sgi-ip27/ip27-memory.c

+4 −1
Original line number Diff line number Diff line
@@ -34,8 +34,10 @@ 
#define SLOT_PFNSHIFT		(SLOT_SHIFT - PAGE_SHIFT)

#define PFN_NASIDSHFT		(NASID_SHFT - PAGE_SHIFT)



struct node_data *__node_data[MAX_NUMNODES];

struct pglist_data *node_data[MAX_NUMNODES];

EXPORT_SYMBOL(node_data);



struct node_data *__node_data[MAX_NUMNODES];

EXPORT_SYMBOL(__node_data);



static u64 gen_region_mask(void)
@@ -361,6 +363,7 @@ static void __init node_mem_init(nasid_t node) 
	 */

	__node_data[node] = __va(slot_freepfn << PAGE_SHIFT);

	memset(__node_data[node], 0, PAGE_SIZE);

	node_data[node] = &__node_data[node]->pglist;



	NODE_DATA(node)->node_start_pfn = start_pfn;

	NODE_DATA(node)->node_spanned_pages = end_pfn - start_pfn;