Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
b383f47e
Commit
b383f47e
authored
Jun 07, 2006
by
Ralf Baechle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[MIPS] IP27: Nuke last leftovers of CONFIG_SGI_IO.
Signed-off-by:
Ralf Baechle
<
ralf@linux-mips.org
>
parent
5e46c3ae
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
83 deletions
+2
-83
include/asm-mips/sn/addrs.h
include/asm-mips/sn/addrs.h
+0
-5
include/asm-mips/sn/klconfig.h
include/asm-mips/sn/klconfig.h
+2
-48
include/asm-mips/sn/kldir.h
include/asm-mips/sn/kldir.h
+0
-30
No files found.
include/asm-mips/sn/addrs.h
View file @
b383f47e
...
@@ -27,13 +27,8 @@
...
@@ -27,13 +27,8 @@
#ifndef __ASSEMBLY__
#ifndef __ASSEMBLY__
#if defined(CONFIG_SGI_IO)
/* FIXME */
#define PS_UINT_CAST (__psunsigned_t)
#define UINT64_CAST (__uint64_t)
#else
/* CONFIG_SGI_IO */
#define PS_UINT_CAST (unsigned long)
#define PS_UINT_CAST (unsigned long)
#define UINT64_CAST (unsigned long)
#define UINT64_CAST (unsigned long)
#endif
/* CONFIG_SGI_IO */
#define HUBREG_CAST (volatile hubreg_t *)
#define HUBREG_CAST (volatile hubreg_t *)
...
...
include/asm-mips/sn/klconfig.h
View file @
b383f47e
...
@@ -54,12 +54,12 @@
...
@@ -54,12 +54,12 @@
#include <asm/sn/agent.h>
#include <asm/sn/agent.h>
#include <asm/arc/types.h>
#include <asm/arc/types.h>
#include <asm/arc/hinv.h>
#include <asm/arc/hinv.h>
#if defined(CONFIG_SGI_I
O) || defined(CONFIG_SGI_I
P35)
#if defined(CONFIG_SGI_IP35)
// The hack file has to be before vector and after sn0_fru....
// The hack file has to be before vector and after sn0_fru....
#include <asm/hack.h>
#include <asm/hack.h>
#include <asm/sn/vector.h>
#include <asm/sn/vector.h>
#include <asm/xtalk/xtalk.h>
#include <asm/xtalk/xtalk.h>
#endif
/* CONFIG_SGI_I
O || CONFIG_SGI_I
P35 */
#endif
/* CONFIG_SGI_IP35 */
#endif
/* CONFIG_SGI_IP27 || CONFIG_SGI_IP35 */
#endif
/* CONFIG_SGI_IP27 || CONFIG_SGI_IP35 */
#define KLCFGINFO_MAGIC 0xbeedbabe
#define KLCFGINFO_MAGIC 0xbeedbabe
...
@@ -134,15 +134,9 @@ typedef s32 klconf_off_t;
...
@@ -134,15 +134,9 @@ typedef s32 klconf_off_t;
typedef
struct
console_s
{
typedef
struct
console_s
{
#if defined(CONFIG_SGI_IO)
/* FIXME */
__psunsigned_t
uart_base
;
__psunsigned_t
config_base
;
__psunsigned_t
memory_base
;
#else
unsigned
long
uart_base
;
unsigned
long
uart_base
;
unsigned
long
config_base
;
unsigned
long
config_base
;
unsigned
long
memory_base
;
unsigned
long
memory_base
;
#endif
short
baud
;
short
baud
;
short
flag
;
short
flag
;
int
type
;
int
type
;
...
@@ -197,23 +191,13 @@ typedef struct kl_config_hdr {
...
@@ -197,23 +191,13 @@ typedef struct kl_config_hdr {
/* --- New Macros for the changed kl_config_hdr_t structure --- */
/* --- New Macros for the changed kl_config_hdr_t structure --- */
#if defined(CONFIG_SGI_IO)
#define PTR_CH_MALLOC_HDR(_k) ((klc_malloc_hdr_t *)\
((__psunsigned_t)_k + (_k->ch_malloc_hdr_off)))
#else
#define PTR_CH_MALLOC_HDR(_k) ((klc_malloc_hdr_t *)\
#define PTR_CH_MALLOC_HDR(_k) ((klc_malloc_hdr_t *)\
(unsigned long)_k + (_k->ch_malloc_hdr_off)))
(unsigned long)_k + (_k->ch_malloc_hdr_off)))
#endif
#define KL_CONFIG_CH_MALLOC_HDR(_n) PTR_CH_MALLOC_HDR(KL_CONFIG_HDR(_n))
#define KL_CONFIG_CH_MALLOC_HDR(_n) PTR_CH_MALLOC_HDR(KL_CONFIG_HDR(_n))
#if defined(CONFIG_SGI_IO)
#define PTR_CH_CONS_INFO(_k) ((console_t *)\
((__psunsigned_t)_k + (_k->ch_cons_off)))
#else
#define PTR_CH_CONS_INFO(_k) ((console_t *)\
#define PTR_CH_CONS_INFO(_k) ((console_t *)\
((unsigned long)_k + (_k->ch_cons_off)))
((unsigned long)_k + (_k->ch_cons_off)))
#endif
#define KL_CONFIG_CH_CONS_INFO(_n) PTR_CH_CONS_INFO(KL_CONFIG_HDR(_n))
#define KL_CONFIG_CH_CONS_INFO(_n) PTR_CH_CONS_INFO(KL_CONFIG_HDR(_n))
...
@@ -945,36 +929,6 @@ extern klcpu_t *nasid_slice_to_cpuinfo(nasid_t, int);
...
@@ -945,36 +929,6 @@ extern klcpu_t *nasid_slice_to_cpuinfo(nasid_t, int);
extern
lboard_t
*
find_lboard_class
(
lboard_t
*
start
,
unsigned
char
brd_class
);
extern
lboard_t
*
find_lboard_class
(
lboard_t
*
start
,
unsigned
char
brd_class
);
#if defined(CONFIG_SGI_IO)
extern
xwidgetnum_t
nodevertex_widgetnum_get
(
vertex_hdl_t
node_vtx
);
extern
vertex_hdl_t
nodevertex_xbow_peer_get
(
vertex_hdl_t
node_vtx
);
extern
lboard_t
*
find_gfxpipe
(
int
pipenum
);
extern
void
setup_gfxpipe_link
(
vertex_hdl_t
vhdl
,
int
pipenum
);
extern
lboard_t
*
find_lboard_module_class
(
lboard_t
*
start
,
moduleid_t
mod
,
unsigned
char
brd_class
);
extern
lboard_t
*
find_nic_lboard
(
lboard_t
*
,
nic_t
);
extern
lboard_t
*
find_nic_type_lboard
(
nasid_t
,
unsigned
char
,
nic_t
);
extern
lboard_t
*
find_lboard_modslot
(
lboard_t
*
start
,
moduleid_t
mod
,
slotid_t
slot
);
extern
lboard_t
*
find_lboard_module
(
lboard_t
*
start
,
moduleid_t
mod
);
extern
lboard_t
*
get_board_name
(
nasid_t
nasid
,
moduleid_t
mod
,
slotid_t
slot
,
char
*
name
);
extern
int
config_find_nic_router
(
nasid_t
,
nic_t
,
lboard_t
**
,
klrou_t
**
);
extern
int
config_find_nic_hub
(
nasid_t
,
nic_t
,
lboard_t
**
,
klhub_t
**
);
extern
int
config_find_xbow
(
nasid_t
,
lboard_t
**
,
klxbow_t
**
);
extern
klcpu_t
*
get_cpuinfo
(
cpuid_t
cpu
);
extern
int
update_klcfg_cpuinfo
(
nasid_t
,
int
);
extern
void
board_to_path
(
lboard_t
*
brd
,
char
*
path
);
extern
moduleid_t
get_module_id
(
nasid_t
nasid
);
extern
void
nic_name_convert
(
char
*
old_name
,
char
*
new_name
);
extern
int
module_brds
(
nasid_t
nasid
,
lboard_t
**
module_brds
,
int
n
);
extern
lboard_t
*
brd_from_key
(
ulong_t
key
);
extern
void
device_component_canonical_name_get
(
lboard_t
*
,
klinfo_t
*
,
char
*
);
extern
int
board_serial_number_get
(
lboard_t
*
,
char
*
);
extern
int
is_master_baseio
(
nasid_t
,
moduleid_t
,
slotid_t
);
extern
nasid_t
get_actual_nasid
(
lboard_t
*
brd
)
;
extern
net_vec_t
klcfg_discover_route
(
lboard_t
*
,
lboard_t
*
,
int
);
#else
/* CONFIG_SGI_IO */
extern
klcpu_t
*
sn_get_cpuinfo
(
cpuid_t
cpu
);
extern
klcpu_t
*
sn_get_cpuinfo
(
cpuid_t
cpu
);
#endif
/* CONFIG_SGI_IO */
#endif
/* _ASM_SN_KLCONFIG_H */
#endif
/* _ASM_SN_KLCONFIG_H */
include/asm-mips/sn/kldir.h
View file @
b383f47e
...
@@ -13,10 +13,6 @@
...
@@ -13,10 +13,6 @@
#include <linux/config.h>
#include <linux/config.h>
#if defined(CONFIG_SGI_IO)
#include <asm/hack.h>
#endif
/*
/*
* The kldir memory area resides at a fixed place in each node's memory and
* The kldir memory area resides at a fixed place in each node's memory and
* provides pointers to most other IP27 memory areas. This allows us to
* provides pointers to most other IP27 memory areas. This allows us to
...
@@ -136,8 +132,6 @@
...
@@ -136,8 +132,6 @@
#define KLDIR_OFF_STRIDE 0x28
#define KLDIR_OFF_STRIDE 0x28
#endif
/* __ASSEMBLY__ */
#endif
/* __ASSEMBLY__ */
#if !defined(CONFIG_SGI_IO)
/*
/*
* This is defined here because IP27_SYMMON_STK_SIZE must be at least what
* This is defined here because IP27_SYMMON_STK_SIZE must be at least what
* we define here. Since it's set up in the prom. We can't redefine it later
* we define here. Since it's set up in the prom. We can't redefine it later
...
@@ -207,17 +201,11 @@
...
@@ -207,17 +201,11 @@
#define KLDIR_ENT_SIZE 0x40
#define KLDIR_ENT_SIZE 0x40
#define KLDIR_MAX_ENTRIES (0x400 / 0x40)
#define KLDIR_MAX_ENTRIES (0x400 / 0x40)
#endif
/* !CONFIG_SGI_IO */
#ifndef __ASSEMBLY__
#ifndef __ASSEMBLY__
typedef
struct
kldir_ent_s
{
typedef
struct
kldir_ent_s
{
u64
magic
;
/* Indicates validity of entry */
u64
magic
;
/* Indicates validity of entry */
off_t
offset
;
/* Offset from start of node space */
off_t
offset
;
/* Offset from start of node space */
#if defined(CONFIG_SGI_IO)
/* FIXME */
__psunsigned_t
pointer
;
/* Pointer to area in some cases */
#else
unsigned
long
pointer
;
/* Pointer to area in some cases */
unsigned
long
pointer
;
/* Pointer to area in some cases */
#endif
size_t
size
;
/* Size in bytes */
size_t
size
;
/* Size in bytes */
u64
count
;
/* Repeat count if array, 1 if not */
u64
count
;
/* Repeat count if array, 1 if not */
size_t
stride
;
/* Stride if array, 0 if not */
size_t
stride
;
/* Stride if array, 0 if not */
...
@@ -227,22 +215,4 @@ typedef struct kldir_ent_s {
...
@@ -227,22 +215,4 @@ typedef struct kldir_ent_s {
}
kldir_ent_t
;
}
kldir_ent_t
;
#endif
/* !__ASSEMBLY__ */
#endif
/* !__ASSEMBLY__ */
#if defined(CONFIG_SGI_IO)
#define KLDIR_ENT_SIZE 0x40
#define KLDIR_MAX_ENTRIES (0x400 / 0x40)
/*
* The actual offsets of each memory area are machine-dependent
*/
#ifdef CONFIG_SGI_IP27
// Not yet #include <asm/sn/sn0/kldir.h>
#elif defined(CONFIG_SGI_IP35)
#include <asm/sn/sn1/kldir.h>
#else
#error "kldir.h is currently defined for IP27 and IP35 platforms only"
#endif
#endif
/* CONFIG_SGI_IO */
#endif
/* _ASM_SN_KLDIR_H */
#endif
/* _ASM_SN_KLDIR_H */
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment