Commit 3938e9ef authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] sn: More code clean up = mostly pcibr_slot.c

From: Pat Gefre <pfg@sgi.com>

More code clean up = mostly pcibr_slot.c
parent cb141c23
This diff is collapsed.
...@@ -689,7 +689,6 @@ extern int config_find_nic_hub(nasid_t, nic_t, lboard_t **, klhub_t**); ...@@ -689,7 +689,6 @@ 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 int config_find_xbow(nasid_t, lboard_t **, klxbow_t**);
extern int update_klcfg_cpuinfo(nasid_t, int); extern int update_klcfg_cpuinfo(nasid_t, int);
extern void board_to_path(lboard_t *brd, char *path); 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 void nic_name_convert(char *old_name, char *new_name);
extern int module_brds(nasid_t nasid, lboard_t **module_brds, int n); extern int module_brds(nasid_t nasid, lboard_t **module_brds, int n);
extern lboard_t *brd_from_key(uint64_t key); extern lboard_t *brd_from_key(uint64_t key);
......
...@@ -24,7 +24,8 @@ extern __psunsigned_t get_master_bridge_base(void); ...@@ -24,7 +24,8 @@ extern __psunsigned_t get_master_bridge_base(void);
extern int check_nasid_equiv(nasid_t, nasid_t); extern int check_nasid_equiv(nasid_t, nasid_t);
extern char get_console_pcislot(void); extern char get_console_pcislot(void);
extern int is_master_baseio_nasid_widget(nasid_t test_nasid, xwidgetnum_t test_wid); extern int is_master_baseio_nasid_widget(nasid_t test_nasid,
xwidgetnum_t test_wid);
/* memsupport.c */ /* memsupport.c */
extern void poison_state_alter_range(__psunsigned_t start, int len, int poison); extern void poison_state_alter_range(__psunsigned_t start, int len, int poison);
...@@ -42,7 +43,7 @@ extern int is_POISONED_dir_state(paddr_t); ...@@ -42,7 +43,7 @@ extern int is_POISONED_dir_state(paddr_t);
extern int is_UNOWNED_dir_state(paddr_t); extern int is_UNOWNED_dir_state(paddr_t);
#ifdef LATER #ifdef LATER
extern void get_dir_ent(paddr_t paddr, int *state, extern void get_dir_ent(paddr_t paddr, int *state,
uint64_t *vec_ptr, hubreg_t *elo); uint64_t * vec_ptr, hubreg_t * elo);
#endif #endif
/* intr.c */ /* intr.c */
...@@ -56,10 +57,11 @@ extern void setrtvector(intr_func_t); ...@@ -56,10 +57,11 @@ extern void setrtvector(intr_func_t);
extern void install_cpuintr(cpuid_t cpu); extern void install_cpuintr(cpuid_t cpu);
extern void install_dbgintr(cpuid_t cpu); extern void install_dbgintr(cpuid_t cpu);
extern void install_tlbintr(cpuid_t cpu); extern void install_tlbintr(cpuid_t cpu);
extern void hub_migrintr_init(cnodeid_t /*cnode*/); extern void hub_migrintr_init(cnodeid_t /*cnode */ );
extern int cause_intr_connect(int level, intr_func_t handler, uint intr_spl_mask); extern int cause_intr_connect(int level, intr_func_t handler,
unsigned int intr_spl_mask);
extern int cause_intr_disconnect(int level); extern int cause_intr_disconnect(int level);
extern void intr_dumpvec(cnodeid_t cnode, void (*pf)(char *, ...)); extern void intr_dumpvec(cnodeid_t cnode, void (*pf) (char *, ...));
/* error_dump.c */ /* error_dump.c */
extern char *hub_rrb_err_type[]; extern char *hub_rrb_err_type[];
...@@ -89,7 +91,7 @@ extern void setup_replication_mask(int maxnodes); ...@@ -89,7 +91,7 @@ extern void setup_replication_mask(int maxnodes);
/* init.c */ /* init.c */
extern cnodeid_t get_compact_nodeid(void); /* get compact node id */ extern cnodeid_t get_compact_nodeid(void); /* get compact node id */
extern void init_platform_nodepda(nodepda_t *npda, cnodeid_t node); extern void init_platform_nodepda(nodepda_t * npda, cnodeid_t node);
extern int is_fine_dirmode(void); extern int is_fine_dirmode(void);
extern void update_node_information(cnodeid_t); extern void update_node_information(cnodeid_t);
...@@ -100,7 +102,7 @@ extern void hub_set_piomode(nasid_t nasid, int conveyor); ...@@ -100,7 +102,7 @@ extern void hub_set_piomode(nasid_t nasid, int conveyor);
/* shuberror.c */ /* shuberror.c */
extern void hub_error_init(cnodeid_t); extern void hub_error_init(cnodeid_t);
extern void dump_error_spool(cpuid_t cpu, void (*pf)(char *, ...)); extern void dump_error_spool(cpuid_t cpu, void (*pf) (char *, ...));
extern void hubni_error_handler(char *, int); extern void hubni_error_handler(char *, int);
extern int check_ni_errors(void); extern int check_ni_errors(void);
...@@ -115,10 +117,10 @@ extern __psunsigned_t debugger_stopped; ...@@ -115,10 +117,10 @@ extern __psunsigned_t debugger_stopped;
* xtalk_piomap_s by generic xtalk routines. * xtalk_piomap_s by generic xtalk routines.
*/ */
struct hub_piomap_s { struct hub_piomap_s {
struct xtalk_piomap_s hpio_xtalk_info;/* standard crosstalk pio info */ struct xtalk_piomap_s hpio_xtalk_info; /* standard crosstalk pio info */
vertex_hdl_t hpio_hub; /* which shub's mapping registers are set up */ vertex_hdl_t hpio_hub; /* which shub's mapping registers are set up */
short hpio_holdcnt; /* count of current users of bigwin mapping */ short hpio_holdcnt; /* count of current users of bigwin mapping */
char hpio_bigwin_num;/* if big window map, which one */ char hpio_bigwin_num; /* if big window map, which one */
int hpio_flags; /* defined below */ int hpio_flags; /* defined below */
}; };
/* hub_piomap flags */ /* hub_piomap flags */
...@@ -136,7 +138,7 @@ struct hub_piomap_s { ...@@ -136,7 +138,7 @@ struct hub_piomap_s {
* xtalk_dmamap_s by generic xtalk routines. * xtalk_dmamap_s by generic xtalk routines.
*/ */
struct hub_dmamap_s { struct hub_dmamap_s {
struct xtalk_dmamap_s hdma_xtalk_info;/* standard crosstalk dma info */ struct xtalk_dmamap_s hdma_xtalk_info; /* standard crosstalk dma info */
vertex_hdl_t hdma_hub; /* which shub we go through */ vertex_hdl_t hdma_hub; /* which shub we go through */
int hdma_flags; /* defined below */ int hdma_flags; /* defined below */
}; };
...@@ -167,7 +169,7 @@ typedef struct hubinfo_s { ...@@ -167,7 +169,7 @@ typedef struct hubinfo_s {
/* structures for PIO management */ /* structures for PIO management */
xwidgetnum_t h_widgetid; /* my widget # (as viewed from xbow) */ xwidgetnum_t h_widgetid; /* my widget # (as viewed from xbow) */
struct hub_piomap_s h_small_window_piomap[HUB_WIDGET_ID_MAX+1]; struct hub_piomap_s h_small_window_piomap[HUB_WIDGET_ID_MAX + 1];
wait_queue_head_t h_bwwait; /* wait for big window to free */ wait_queue_head_t h_bwwait; /* wait for big window to free */
spinlock_t h_bwlock; /* guard big window piomap's */ spinlock_t h_bwlock; /* guard big window piomap's */
spinlock_t h_crblock; /* gaurd CRB error handling */ spinlock_t h_crblock; /* gaurd CRB error handling */
...@@ -230,12 +232,12 @@ extern void sysctlr_keepalive(void); ...@@ -230,12 +232,12 @@ extern void sysctlr_keepalive(void);
*/ */
#define paddr_dimm(_pa) ((_pa & MD_BANK_MASK) >> MD_BANK_SHFT) #define paddr_dimm(_pa) ((_pa & MD_BANK_MASK) >> MD_BANK_SHFT)
#define paddr_cnode(_pa) (NASID_TO_COMPACT_NODEID(NASID_GET(_pa))) #define paddr_cnode(_pa) (NASID_TO_COMPACT_NODEID(NASID_GET(_pa)))
extern void membank_pathname_get(paddr_t,char *); extern void membank_pathname_get(paddr_t, char *);
/* To redirect the output into the error buffer */ /* To redirect the output into the error buffer */
#define errbuf_print(_s) printf("#%s",_s) #define errbuf_print(_s) printf("#%s",_s)
extern void crbx(nasid_t nasid, void (*pf)(char *, ...)); extern void crbx(nasid_t nasid, void (*pf) (char *, ...));
void bootstrap(void); void bootstrap(void);
/* sndrv.c */ /* sndrv.c */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment