diff options
| author | Thomas Bogendoerfer <tbogendoerfer@suse.de> | 2020-01-09 13:33:40 +0100 |
|---|---|---|
| committer | Paul Burton <paulburton@kernel.org> | 2020-01-09 15:29:50 -0800 |
| commit | b78e9d63a3b6307b6b786e6ba189d3978b60ceb5 (patch) | |
| tree | 25330465375907f3014724f914b3a54f9f94e142 /arch/mips/include/asm/sn | |
| parent | d6972bb477544bea3fa0124ae88fd9a9d131a213 (diff) | |
| download | blackbird-op-linux-b78e9d63a3b6307b6b786e6ba189d3978b60ceb5.tar.gz blackbird-op-linux-b78e9d63a3b6307b6b786e6ba189d3978b60ceb5.zip | |
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: Thomas Bogendoerfer <tbogendoerfer@suse.de>
Signed-off-by: Paul 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
Diffstat (limited to 'arch/mips/include/asm/sn')
| -rw-r--r-- | arch/mips/include/asm/sn/arch.h | 4 | ||||
| -rw-r--r-- | arch/mips/include/asm/sn/hub.h | 17 | ||||
| -rw-r--r-- | arch/mips/include/asm/sn/types.h | 4 |
3 files changed, 8 insertions, 17 deletions
diff --git a/arch/mips/include/asm/sn/arch.h b/arch/mips/include/asm/sn/arch.h index f8b34d34d872..afe9fcf36198 100644 --- a/arch/mips/include/asm/sn/arch.h +++ b/arch/mips/include/asm/sn/arch.h @@ -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 */ diff --git a/arch/mips/include/asm/sn/hub.h b/arch/mips/include/asm/sn/hub.h deleted file mode 100644 index 45878fbefbae..000000000000 --- a/arch/mips/include/asm/sn/hub.h +++ /dev/null @@ -1,17 +0,0 @@ -/* 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 */ diff --git a/arch/mips/include/asm/sn/types.h b/arch/mips/include/asm/sn/types.h index 203c927e84d1..451ba1ee41ad 100644 --- a/arch/mips/include/asm/sn/types.h +++ b/arch/mips/include/asm/sn/types.h @@ -11,6 +11,8 @@ #include <linux/types.h> +#ifndef __ASSEMBLY__ + typedef unsigned long cpuid_t; typedef signed short nasid_t; /* node id in numa-as-id space */ typedef signed char partid_t; /* partition ID type */ @@ -18,4 +20,6 @@ typedef signed short moduleid_t; /* user-visible module number type */ typedef dev_t vertex_hdl_t; /* hardware graph vertex handle */ +#endif + #endif /* _ASM_SN_TYPES_H */ |
