Unverified Commit b78e9d63 authored by Thomas Bogendoerfer's avatar Thomas Bogendoerfer Committed by Paul Burton
Browse files

MIPS: SGI-IP27: use asm/sn/agent.h for including HUB related stuff 



By including agent.h where hub related defines/structs are needed, we
have only one place to select, which agent chip (HUB or BEDROCK) is used.

Signed-off-by: default avatarThomas Bogendoerfer <tbogendoerfer@suse.de>
Signed-off-by: default avatarPaul Burton <paulburton@kernel.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: linux-mips@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
parent d6972bb4

arch/mips/include/asm/mach-ip27/kernel-entry-init.h

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#define __ASM_MACH_IP27_KERNEL_ENTRY_H



#include <asm/sn/addrs.h>

#include <asm/sn/sn0/hubni.h>

#include <asm/sn/agent.h>

#include <asm/sn/klkernvars.h>



/*

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

+2 −1
Original line number Diff line number Diff line
@@ -4,7 +4,8 @@ 


#include <asm/sn/addrs.h>

#include <asm/sn/arch.h>

#include <asm/sn/hub.h>

#include <asm/sn/agent.h>

#include <asm/sn/klkernvars.h>



#define pa_to_nid(addr)		NASID_GET(addr)

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

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
#ifndef _ASM_MACH_TOPOLOGY_H

#define _ASM_MACH_TOPOLOGY_H	1



#include <asm/sn/hub.h>

#include <asm/sn/types.h>

#include <asm/mmzone.h>

arch/mips/include/asm/sn/arch.h

+4 −0
Original line number Diff line number Diff line
@@ -25,6 +25,10 @@ 
#define INVALID_MODULE		(moduleid_t)-1

#define INVALID_PARTID		(partid_t)-1



#ifndef __ASSEMBLY__



extern nasid_t get_nasid(void);



#endif



#endif /* _ASM_SN_ARCH_H */

arch/mips/include/asm/sn/hub.h

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef __ASM_SN_HUB_H

#define __ASM_SN_HUB_H



#include <linux/types.h>

#include <linux/cpumask.h>

#include <asm/sn/types.h>

#include <asm/sn/io.h>

#include <asm/sn/klkernvars.h>

#include <asm/xtalk/xtalk.h>



/* ip27-hubio.c */

extern unsigned long hub_pio_map(nasid_t nasid, xwidgetnum_t widget,

			  unsigned long xtalk_addr, size_t size);

extern void hub_pio_init(nasid_t nasid);



#endif /* __ASM_SN_HUB_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE