Commit 6142be7e authored by Thomas Weißschuh's avatar Thomas Weißschuh Committed by Thomas Gleixner
Browse files

powerpc: Split systemcfg struct definitions out from vdso 



The systemcfg data has nothing to do anymore with the vdso.
Split it into a dedicated header file.

Signed-off-by: default avatarThomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20241010-vdso-generic-base-v1-27-b64f0842d512@linutronix.de
parent 1184674d

arch/powerpc/include/asm/systemcfg.h

0 → 100644
+52 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-or-later */

#ifndef _SYSTEMCFG_H

#define _SYSTEMCFG_H



/*

 * Copyright (C) 2002 Peter Bergner <bergner@vnet.ibm.com>, IBM

 * Copyright (C) 2005 Benjamin Herrenschmidy <benh@kernel.crashing.org>,

 * 		      IBM Corp.

 */



#ifdef CONFIG_PPC64



/*

 * If the major version changes we are incompatible.

 * Minor version changes are a hint.

 */

#define SYSTEMCFG_MAJOR 1

#define SYSTEMCFG_MINOR 1



#include <linux/types.h>



struct systemcfg {

	__u8  eye_catcher[16];		/* Eyecatcher: SYSTEMCFG:PPC64	0x00 */

	struct {			/* Systemcfg version numbers	     */

		__u32 major;		/* Major number			0x10 */

		__u32 minor;		/* Minor number			0x14 */

	} version;



	/* Note about the platform flags: it now only contains the lpar

	 * bit. The actual platform number is dead and buried

	 */

	__u32 platform;			/* Platform flags		0x18 */

	__u32 processor;		/* Processor type		0x1C */

	__u64 processorCount;		/* # of physical processors	0x20 */

	__u64 physicalMemorySize;	/* Size of real memory(B)	0x28 */

	__u64 tb_orig_stamp;		/* (NU) Timebase at boot	0x30 */

	__u64 tb_ticks_per_sec;		/* Timebase tics / sec		0x38 */

	__u64 tb_to_xs;			/* (NU) Inverse of TB to 2^20	0x40 */

	__u64 stamp_xsec;		/* (NU)				0x48 */

	__u64 tb_update_count;		/* (NU) Timebase atomicity ctr	0x50 */

	__u32 tz_minuteswest;		/* (NU) Min. west of Greenwich	0x58 */

	__u32 tz_dsttime;		/* (NU) Type of dst correction	0x5C */

	__u32 dcache_size;		/* L1 d-cache size		0x60 */

	__u32 dcache_line_size;		/* L1 d-cache line size		0x64 */

	__u32 icache_size;		/* L1 i-cache size		0x68 */

	__u32 icache_line_size;		/* L1 i-cache line size		0x6C */

};



extern struct systemcfg *systemcfg;



#endif /* CONFIG_PPC64 */

#endif /* _SYSTEMCFG_H */

arch/powerpc/include/asm/vdso_datapage.h

+0 −37
Original line number Diff line number Diff line
@@ -9,14 +9,6 @@ 
 * 		      IBM Corp.

 */





/*

 * If the major version changes we are incompatible.

 * Minor version changes are a hint.

 */

#define SYSTEMCFG_MAJOR 1

#define SYSTEMCFG_MINOR 1



#ifndef __ASSEMBLY__



#include <linux/unistd.h>
@@ -27,35 +19,6 @@ 


#ifdef CONFIG_PPC64



struct systemcfg {

	__u8  eye_catcher[16];		/* Eyecatcher: SYSTEMCFG:PPC64	0x00 */

	struct {			/* Systemcfg version numbers	     */

		__u32 major;		/* Major number			0x10 */

		__u32 minor;		/* Minor number			0x14 */

	} version;



	/* Note about the platform flags: it now only contains the lpar

	 * bit. The actual platform number is dead and buried

	 */

	__u32 platform;			/* Platform flags		0x18 */

	__u32 processor;		/* Processor type		0x1C */

	__u64 processorCount;		/* # of physical processors	0x20 */

	__u64 physicalMemorySize;	/* Size of real memory(B)	0x28 */

	__u64 tb_orig_stamp;		/* (NU) Timebase at boot	0x30 */

	__u64 tb_ticks_per_sec;		/* Timebase tics / sec		0x38 */

	__u64 tb_to_xs;			/* (NU) Inverse of TB to 2^20	0x40 */

	__u64 stamp_xsec;		/* (NU)				0x48 */

	__u64 tb_update_count;		/* (NU) Timebase atomicity ctr	0x50 */

	__u32 tz_minuteswest;		/* (NU) Min. west of Greenwich	0x58 */

	__u32 tz_dsttime;		/* (NU) Type of dst correction	0x5C */

	__u32 dcache_size;		/* L1 d-cache size		0x60 */

	__u32 dcache_line_size;		/* L1 d-cache line size		0x64 */

	__u32 icache_size;		/* L1 i-cache size		0x68 */

	__u32 icache_line_size;		/* L1 i-cache line size		0x6C */

};



extern struct systemcfg *systemcfg;



struct vdso_arch_data {

	__u64 tb_ticks_per_sec;			/* Timebase tics / sec */

	__u32 dcache_block_size;		/* L1 d-cache block size     */

arch/powerpc/kernel/proc_powerpc.c

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <asm/machdep.h>

#include <asm/vdso_datapage.h>

#include <asm/rtas.h>

#include <asm/systemcfg.h>

#include <linux/uaccess.h>



#ifdef CONFIG_PPC64_PROC_SYSTEMCFG

arch/powerpc/kernel/setup-common.c

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ 
#include <asm/cpu_has_feature.h>

#include <asm/kasan.h>

#include <asm/mce.h>

#include <asm/systemcfg.h>



#include "setup.h"

arch/powerpc/kernel/smp.c

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ 
#include <asm/ftrace.h>

#include <asm/kup.h>

#include <asm/fadump.h>

#include <asm/systemcfg.h>



#include <trace/events/ipi.h>