Commit 9726bfcd authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Tony Luck
Browse files

misc/sgi-xp: remove SGI SN2 support 



Note this also marks xp broken on ia64 now, as the UV support, which
was disable in generic kernels before actually never compiled due to
undefined uv_gpa_to_soc_phys_ram and uv_gpa_in_mmr_space symbols since
at least commit c2c9f115 ("x86: uv: update XPC to handle updated
BIOS interface").

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lkml.kernel.org/r/20190813072514.23299-11-hch@lst.de


Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 0fef2532

arch/ia64/uv/kernel/setup.c

+0 −4
Original line number Diff line number Diff line
@@ -19,12 +19,8 @@ EXPORT_PER_CPU_SYMBOL_GPL(__uv_hub_info); 


#ifdef CONFIG_IA64_SGI_UV

int sn_prom_type;

long sn_partition_id;

EXPORT_SYMBOL(sn_partition_id);

long sn_coherency_id;

EXPORT_SYMBOL_GPL(sn_coherency_id);

long sn_region_size;

EXPORT_SYMBOL(sn_region_size);

#endif



struct redir_addr {

drivers/misc/Kconfig

+2 −3
Original line number Diff line number Diff line
@@ -200,9 +200,8 @@ config ENCLOSURE_SERVICES 
config SGI_XP

	tristate "Support communication between SGI SSIs"

	depends on NET

	depends on (IA64_GENERIC || IA64_SGI_SN2 || IA64_SGI_UV || X86_UV) && SMP

	select IA64_UNCACHED_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2

	select GENERIC_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2

	depends on (IA64_GENERIC || IA64_SGI_UV || X86_UV) && SMP

	depends on X86_64 || BROKEN

	select SGI_GRU if X86_64 && SMP

	---help---

	  An SGI machine can be divided into multiple Single System

drivers/misc/sgi-xp/Makefile

+3 −10
Original line number Diff line number Diff line
@@ -4,17 +4,10 @@ 
#



obj-$(CONFIG_SGI_XP)		+= xp.o

xp-y				:= xp_main.o

xp-$(CONFIG_IA64_SGI_SN2)	+= xp_sn2.o xp_nofault.o

xp-$(CONFIG_IA64_GENERIC)	+= xp_sn2.o xp_nofault.o

xp-$(CONFIG_IA64_SGI_UV)	+= xp_uv.o

xp-$(CONFIG_X86_64)		+= xp_uv.o

xp-y				:= xp_main.o xp_uv.o



obj-$(CONFIG_SGI_XP)		+= xpc.o

xpc-y				:= xpc_main.o xpc_channel.o xpc_partition.o

xpc-$(CONFIG_IA64_SGI_SN2)	+= xpc_sn2.o

xpc-$(CONFIG_IA64_GENERIC)	+= xpc_sn2.o

xpc-$(CONFIG_IA64_SGI_UV) 	+= xpc_uv.o

xpc-$(CONFIG_X86_64)		+= xpc_uv.o

xpc-y				:= xpc_main.o xpc_channel.o xpc_partition.o \

				   xpc_uv.o



obj-$(CONFIG_SGI_XP)		+= xpnet.o

drivers/misc/sgi-xp/xp.h

+0 −19
Original line number Diff line number Diff line
@@ -24,23 +24,6 @@ 
#define is_uv()		0

#endif



#if defined CONFIG_IA64

#include <asm/sn/arch.h>	/* defines is_shub1() and is_shub2() */

#define is_shub()	ia64_platform_is("sn2")

#endif



#ifndef is_shub1

#define is_shub1()	0

#endif



#ifndef is_shub2

#define is_shub2()	0

#endif



#ifndef is_shub

#define is_shub()	0

#endif



#ifdef USE_DBUG_ON

#define DBUG_ON(condition)	BUG_ON(condition)

#else
@@ -360,9 +343,7 @@ extern int xp_nofault_PIOR(void *); 
extern int xp_error_PIOR(void);



extern struct device *xp;

extern enum xp_retval xp_init_sn2(void);

extern enum xp_retval xp_init_uv(void);

extern void xp_exit_sn2(void);

extern void xp_exit_uv(void);



#endif /* _DRIVERS_MISC_SGIXP_XP_H */

drivers/misc/sgi-xp/xp_main.c

+2 −6
Original line number Diff line number Diff line
@@ -233,9 +233,7 @@ xp_init(void) 
	for (ch_number = 0; ch_number < XPC_MAX_NCHANNELS; ch_number++)

		mutex_init(&xpc_registrations[ch_number].mutex);



	if (is_shub())

		ret = xp_init_sn2();

	else if (is_uv())

	if (is_uv())

		ret = xp_init_uv();

	else

		ret = 0;
@@ -251,9 +249,7 @@ module_init(xp_init); 
void __exit

xp_exit(void)

{

	if (is_shub())

		xp_exit_sn2();

	else if (is_uv())

	if (is_uv())

		xp_exit_uv();

}