summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2004-02-03 18:52:37 -0800
committerLinus Torvalds <torvalds@home.osdl.org>2004-02-03 18:52:37 -0800
commit19cb813747423d6f4c4308fd513e762dc5d77b1f (patch)
tree1cab862a73fe9df77c97b8287e8e86f079b84646 /include
parent4e15eda4ac7901a76bae4297b4126c09f2d679bb (diff)
[PATCH] Altix update: small cleanups
From: Pat Gefre <pfg@sgi.com> arch/ia64/sn/io/io.c@1.12 misc code cleanup no parens on returns remove __psunsigned_t arch/ia64/sn/io/sn2/ml_iograph.c@1.18 no parens on returns arch/ia64/sn/io/sn2/pcibr/pcibr_dvr.c@1.25 no parens on returns use -errno arch/ia64/sn/io/sn2/pcibr/pcibr_hints.c@1.8 no parens on returns arch/ia64/sn/io/sn2/pcibr/pcibr_intr.c@1.15 no parens on returns unsigned to unsigned int arch/ia64/sn/io/sn2/pcibr/pcibr_rrb.c@1.13 no parens on returns use -errno arch/ia64/sn/io/sn2/pcibr/pcibr_slot.c@1.18 no parens on returns use -errno arch/ia64/sn/io/sn2/pciio.c@1.14 oom handling removed ASSERT and funcs not needed arch/ia64/sn/io/sn2/pic.c@1.13 use -errno arch/ia64/sn/io/sn2/shuberror.c@1.12 add delay.h arch/ia64/sn/io/sn2/xbow.c@1.10 include file clean up arch/ia64/sn/io/sn2/xtalk.c@1.9 misc code cleanup no parens on returns arch/ia64/sn/io/xswitch.c@1.11 misc code cleanup arch/ia64/sn/kernel/bte.c@1.5 include file clean up arch/ia64/sn/kernel/mca.c@1.8 include file clean up arch/ia64/sn/kernel/probe.c@1.5 include file clean up arch/ia64/sn/kernel/sn2/prominfo_proc.c@1.3 include file clean up arch/ia64/sn/kernel/sn2/sn2_smp.c@1.9 include file clean up arch/ia64/sn/kernel/sn2/sn_proc_fs.c@1.4 include file clean up drivers/char/sn_serial.c@1.3 include file clean up include/asm-ia64/sn/addrs.h@1.8 include file clean up remove __psunsigned_t include/asm-ia64/sn/alenlist.h@1.8 unsigned to unsigned int include/asm-ia64/sn/arch.h@1.7 include file clean up include/asm-ia64/sn/bte.h@1.6 include file clean up include/asm-ia64/sn/clksupport.h@1.8 include file clean up include/asm-ia64/sn/driver.h@1.5 remove __psunsigned_t include/asm-ia64/sn/hcl.h@1.13 include file clean up include/asm-ia64/sn/hcl_util.h@1.7 include file clean up include/asm-ia64/sn/hwgfs.h@1.5 include file clean up include/asm-ia64/sn/iograph.h@1.9 include file clean up include/asm-ia64/sn/klconfig.h@1.14 remove __psunsigned_t include/asm-ia64/sn/kldir.h@1.5 remove __psunsigned_t include file clean up include/asm-ia64/sn/module.h@1.12 include file clean up include/asm-ia64/sn/nodepda.h@1.14 include file clean up include/asm-ia64/sn/pci/bridge.h@1.13 uchar_t to unsigned char include/asm-ia64/sn/pci/pcibr_private.h@1.20 move PVnnnnnn's include/asm-ia64/sn/pci/pciio.h@1.14 unsigned to unsigned int include/asm-ia64/sn/pci/pciio_private.h@1.10 unsigned to unsigned int include/asm-ia64/sn/pda.h@1.9 include file clean up include/asm-ia64/sn/pio.h@1.7 include file clean up ulong to unsigned long include/asm-ia64/sn/sgi.h@1.11 include file clean up move PVnnnnnn's to here include/asm-ia64/sn/sn2/arch.h@1.6 include file clean up include/asm-ia64/sn/sn2/sn_private.h@1.12 include file clean up remove __psunsigned_t include/asm-ia64/sn/sn_cpuid.h@1.8 include file clean up include/asm-ia64/sn/sn_private.h@1.6 include file clean up include/asm-ia64/sn/types.h@1.6 include file clean up remove __psunsigned_t include/asm-ia64/sn/vector.h@1.6 include file clean up include/asm-ia64/sn/xtalk/xbow.h@1.9 include file clean up misc code cleanup include/asm-ia64/sn/xtalk/xtalk.h@1.12 unsigned to unsigned int include/asm-ia64/sn/xtalk/xwidget.h@1.8 unsigned to unsigned int
Diffstat (limited to 'include')
-rw-r--r--include/asm-ia64/sn/addrs.h4
-rw-r--r--include/asm-ia64/sn/alenlist.h18
-rw-r--r--include/asm-ia64/sn/arch.h7
-rw-r--r--include/asm-ia64/sn/bte.h3
-rw-r--r--include/asm-ia64/sn/clksupport.h2
-rw-r--r--include/asm-ia64/sn/driver.h2
-rw-r--r--include/asm-ia64/sn/hcl.h2
-rw-r--r--include/asm-ia64/sn/hcl_util.h2
-rw-r--r--include/asm-ia64/sn/hwgfs.h3
-rw-r--r--include/asm-ia64/sn/iograph.h1
-rw-r--r--include/asm-ia64/sn/klconfig.h8
-rw-r--r--include/asm-ia64/sn/kldir.h4
-rw-r--r--include/asm-ia64/sn/module.h2
-rw-r--r--include/asm-ia64/sn/nodepda.h4
-rw-r--r--include/asm-ia64/sn/pci/bridge.h16
-rw-r--r--include/asm-ia64/sn/pci/pcibr_private.h15
-rw-r--r--include/asm-ia64/sn/pci/pciio.h20
-rw-r--r--include/asm-ia64/sn/pci/pciio_private.h6
-rw-r--r--include/asm-ia64/sn/pda.h3
-rw-r--r--include/asm-ia64/sn/pio.h6
-rw-r--r--include/asm-ia64/sn/sgi.h17
-rw-r--r--include/asm-ia64/sn/sn2/arch.h3
-rw-r--r--include/asm-ia64/sn/sn2/sn_private.h12
-rw-r--r--include/asm-ia64/sn/sn_cpuid.h6
-rw-r--r--include/asm-ia64/sn/sn_private.h5
-rw-r--r--include/asm-ia64/sn/types.h8
-rw-r--r--include/asm-ia64/sn/vector.h2
-rw-r--r--include/asm-ia64/sn/xtalk/xbow.h19
-rw-r--r--include/asm-ia64/sn/xtalk/xtalk.h16
-rw-r--r--include/asm-ia64/sn/xtalk/xwidget.h26
30 files changed, 97 insertions, 145 deletions
diff --git a/include/asm-ia64/sn/addrs.h b/include/asm-ia64/sn/addrs.h
index 4790718f31df..550365c7f4ef 100644
--- a/include/asm-ia64/sn/addrs.h
+++ b/include/asm-ia64/sn/addrs.h
@@ -9,8 +9,6 @@
#ifndef _ASM_IA64_SN_ADDRS_H
#define _ASM_IA64_SN_ADDRS_H
-#include <linux/config.h>
-
#include <asm/sn/sn2/addrs.h>
#ifndef __ASSEMBLY__
@@ -154,7 +152,7 @@
* the base of the register space.
*/
#define HUB_REG_PTR(_base, _off) \
- (HUBREG_CAST ((__psunsigned_t)(_base) + (__psunsigned_t)(_off)))
+ (HUBREG_CAST ((unsigned long)(_base) + (__psunsigned_t)(_off)))
#define HUB_REG_PTR_L(_base, _off) \
HUB_L(HUB_REG_PTR((_base), (_off)))
diff --git a/include/asm-ia64/sn/alenlist.h b/include/asm-ia64/sn/alenlist.h
index ec01bdd359f2..4ab6c0731982 100644
--- a/include/asm-ia64/sn/alenlist.h
+++ b/include/asm-ia64/sn/alenlist.h
@@ -62,7 +62,7 @@ typedef struct external_alenlist *external_alenlist_t;
/* Create an Address/Length List, and clear it of all entries. */
-extern alenlist_t alenlist_create(unsigned flags);
+extern alenlist_t alenlist_create(unsigned int flags);
/* Grow/shrink an Address/Length List and FIX its size. */
extern int alenlist_grow(alenlist_t, size_t npairs);
@@ -103,7 +103,7 @@ alenlist_done(alenlist_t alenlist);
extern int alenlist_append(alenlist_t alenlist, /* append to this list */
alenaddr_t address, /* address to append */
size_t length, /* length to append */
- unsigned flags);
+ unsigned int flags);
/*
* Replace a Pair in the middle of a List, and return old values.
@@ -114,7 +114,7 @@ alenlist_replace( alenlist_t alenlist, /* in: replace in this list */
alenlist_cursor_t cursorp, /* inout: which item to replace */
alenaddr_t *addrp, /* inout: address */
size_t *lengthp, /* inout: length */
- unsigned flags);
+ unsigned int flags);
/* Get the next Pair from a List */
@@ -123,7 +123,7 @@ extern int alenlist_get(alenlist_t alenlist, /* in: get from this list */
size_t maxlength, /* in: at most length */
alenaddr_t *addr, /* out: address */
size_t *length, /* out: length */
- unsigned flags);
+ unsigned int flags);
/* Return the number of Pairs stored in this List */
@@ -135,11 +135,11 @@ extern void alenlist_concat( alenlist_t from, /* copy from this list */
/* Create a copy of an Address/Length List */
extern alenlist_t alenlist_clone(alenlist_t old, /* clone this list */
- unsigned flags);
+ unsigned int flags);
/* Allocate and initialize an Address/Length List Cursor */
-extern alenlist_cursor_t alenlist_cursor_create(alenlist_t alenlist, unsigned flags);
+extern alenlist_cursor_t alenlist_cursor_create(alenlist_t alenlist, unsigned int flags);
/* Free an Address/Length List Cursor */
extern void alenlist_cursor_destroy(alenlist_cursor_t cursorp);
@@ -170,19 +170,19 @@ extern size_t alenlist_cursor_offset(alenlist_t alenlist, alenlist_cursor_t curs
extern alenlist_t kvaddr_to_alenlist( alenlist_t alenlist,
caddr_t kvaddr,
size_t length,
- unsigned flags);
+ unsigned int flags);
/* Convert from a User Virtual Address to a Physical Address/Length List */
extern alenlist_t uvaddr_to_alenlist( alenlist_t alenlist,
uvaddr_t vaddr,
size_t length,
- unsigned flags);
+ unsigned int flags);
/* Convert from a buf struct to a Physical Address/Length List */
struct buf;
extern alenlist_t buf_to_alenlist( alenlist_t alenlist,
struct buf *buf,
- unsigned flags);
+ unsigned int flags);
/*
diff --git a/include/asm-ia64/sn/arch.h b/include/asm-ia64/sn/arch.h
index ac487ad83b67..53691562b9f4 100644
--- a/include/asm-ia64/sn/arch.h
+++ b/include/asm-ia64/sn/arch.h
@@ -11,12 +11,9 @@
#ifndef _ASM_IA64_SN_ARCH_H
#define _ASM_IA64_SN_ARCH_H
-#include <linux/config.h>
-#include <linux/threads.h>
-#include <linux/mmzone.h>
+#include <asm/types.h>
#include <asm/sn/types.h>
-
-#include <asm/sn/sn2/arch.h>
+#include <asm/sn/sn_cpuid.h>
typedef u64 shubreg_t;
typedef u64 hubreg_t;
diff --git a/include/asm-ia64/sn/bte.h b/include/asm-ia64/sn/bte.h
index 2e96438b8d2b..538385a21fb7 100644
--- a/include/asm-ia64/sn/bte.h
+++ b/include/asm-ia64/sn/bte.h
@@ -13,8 +13,7 @@
#include <linux/timer.h>
#include <linux/spinlock.h>
#include <linux/cache.h>
-#include <asm/sn/io.h>
-#include <asm/delay.h>
+#include <asm/sn/types.h>
/* #define BTE_DEBUG */
diff --git a/include/asm-ia64/sn/clksupport.h b/include/asm-ia64/sn/clksupport.h
index ff5c1a00c115..037112e0360a 100644
--- a/include/asm-ia64/sn/clksupport.h
+++ b/include/asm-ia64/sn/clksupport.h
@@ -23,9 +23,7 @@
#ifndef _ASM_IA64_SN_CLKSUPPORT_H
#define _ASM_IA64_SN_CLKSUPPORT_H
-#include <linux/config.h>
#include <asm/sn/arch.h>
-#include <asm/sn/addrs.h>
typedef long clkreg_t;
diff --git a/include/asm-ia64/sn/driver.h b/include/asm-ia64/sn/driver.h
index c0ddca44061e..41b4ffb63c10 100644
--- a/include/asm-ia64/sn/driver.h
+++ b/include/asm-ia64/sn/driver.h
@@ -31,7 +31,7 @@ struct eframe_s;
struct piomap;
struct dmamap;
-typedef __psunsigned_t iobush_t;
+typedef unsigned long iobush_t;
/* interrupt function */
typedef void *intr_arg_t;
diff --git a/include/asm-ia64/sn/hcl.h b/include/asm-ia64/sn/hcl.h
index abf3fee7cdf3..b10d9ea6760e 100644
--- a/include/asm-ia64/sn/hcl.h
+++ b/include/asm-ia64/sn/hcl.h
@@ -8,6 +8,7 @@
#ifndef _ASM_IA64_SN_HCL_H
#define _ASM_IA64_SN_HCL_H
+#include <linux/fs.h>
#include <asm/sn/sgi.h>
extern vertex_hdl_t hwgraph_root;
@@ -58,7 +59,6 @@ typedef long arb_info_desc_t;
#define hwgraph_connectpt_set labelcl_info_connectpt_set
#define hwgraph_generate_path hwgfs_generate_path
#define hwgraph_path_to_vertex(a) hwgfs_find_handle(NULL, a, 0, 0, 0, 1)
-#define hwgraph_edge_remove(a,b,c)
#define hwgraph_vertex_unref(a)
/*
diff --git a/include/asm-ia64/sn/hcl_util.h b/include/asm-ia64/sn/hcl_util.h
index f32ecc728bef..faa5aaec6fe0 100644
--- a/include/asm-ia64/sn/hcl_util.h
+++ b/include/asm-ia64/sn/hcl_util.h
@@ -9,6 +9,8 @@
#ifndef _ASM_IA64_SN_HCL_UTIL_H
#define _ASM_IA64_SN_HCL_UTIL_H
+#include <asm/sn/sgi.h>
+
extern char * dev_to_name(vertex_hdl_t, char *, unsigned int);
extern int device_master_set(vertex_hdl_t, vertex_hdl_t);
extern vertex_hdl_t device_master_get(vertex_hdl_t);
diff --git a/include/asm-ia64/sn/hwgfs.h b/include/asm-ia64/sn/hwgfs.h
index 39191b144805..bbdd433234c5 100644
--- a/include/asm-ia64/sn/hwgfs.h
+++ b/include/asm-ia64/sn/hwgfs.h
@@ -8,6 +8,9 @@
*
* Copyright (C) 1992 - 1997, 2000-2003 Silicon Graphics, Inc. All rights reserved.
*/
+
+#include <asm/types.h>
+
typedef struct dentry *hwgfs_handle_t;
extern hwgfs_handle_t hwgfs_register(hwgfs_handle_t dir, const char *name,
diff --git a/include/asm-ia64/sn/iograph.h b/include/asm-ia64/sn/iograph.h
index 65d191c23cf7..b6c04f7ba87a 100644
--- a/include/asm-ia64/sn/iograph.h
+++ b/include/asm-ia64/sn/iograph.h
@@ -144,6 +144,7 @@
void init_all_devices(void);
#endif /* __KERNEL__ */
+#include <asm/sn/sgi.h>
#include <asm/sn/xtalk/xbow.h> /* For get MAX_PORT_NUM */
int io_brick_map_widget(int, int);
diff --git a/include/asm-ia64/sn/klconfig.h b/include/asm-ia64/sn/klconfig.h
index 6f485a4da42c..1ab6eb8c2091 100644
--- a/include/asm-ia64/sn/klconfig.h
+++ b/include/asm-ia64/sn/klconfig.h
@@ -92,9 +92,9 @@ typedef s32 klconf_off_t;
typedef struct console_s {
- __psunsigned_t uart_base;
- __psunsigned_t config_base;
- __psunsigned_t memory_base;
+ unsigned long uart_base;
+ unsigned long config_base;
+ unsigned long memory_base;
short baud;
short flag;
int type;
@@ -134,7 +134,7 @@ typedef struct kl_config_hdr {
/* --- New Macros for the changed kl_config_hdr_t structure --- */
#define PTR_CH_CONS_INFO(_k) ((console_t *)\
- ((__psunsigned_t)_k + (_k->ch_cons_off)))
+ ((unsigned long)_k + (_k->ch_cons_off)))
#define KL_CONFIG_CH_CONS_INFO(_n) PTR_CH_CONS_INFO(KL_CONFIG_HDR(_n))
diff --git a/include/asm-ia64/sn/kldir.h b/include/asm-ia64/sn/kldir.h
index c49174494ce3..685f110b9ec7 100644
--- a/include/asm-ia64/sn/kldir.h
+++ b/include/asm-ia64/sn/kldir.h
@@ -11,7 +11,7 @@
#ifndef _ASM_IA64_SN_KLDIR_H
#define _ASM_IA64_SN_KLDIR_H
-#include <asm/sn/sgi.h>
+#include <linux/types.h>
/*
* The kldir memory area resides at a fixed place in each node's memory and
@@ -136,7 +136,7 @@
typedef struct kldir_ent_s {
u64 magic; /* Indicates validity of entry */
off_t offset; /* Offset from start of node space */
- __psunsigned_t pointer; /* Pointer to area in some cases */
+ unsigned long pointer; /* Pointer to area in some cases */
size_t size; /* Size in bytes */
u64 count; /* Repeat count if array, 1 if not */
size_t stride; /* Stride if array, 0 if not */
diff --git a/include/asm-ia64/sn/module.h b/include/asm-ia64/sn/module.h
index 0b38f156260c..bbc966a53daf 100644
--- a/include/asm-ia64/sn/module.h
+++ b/include/asm-ia64/sn/module.h
@@ -13,7 +13,7 @@ extern "C" {
#endif
-#include <linux/config.h>
+#include <asm/semaphore.h>
#include <asm/sn/klconfig.h>
#include <asm/sn/ksys/elsc.h>
diff --git a/include/asm-ia64/sn/nodepda.h b/include/asm-ia64/sn/nodepda.h
index 4df396cd46ed..c992940c6398 100644
--- a/include/asm-ia64/sn/nodepda.h
+++ b/include/asm-ia64/sn/nodepda.h
@@ -9,14 +9,14 @@
#define _ASM_IA64_SN_NODEPDA_H
-#include <linux/config.h>
-#include <asm/sn/sgi.h>
+#include <asm/semaphore.h>
#include <asm/irq.h>
#include <asm/sn/intr.h>
#include <asm/sn/router.h>
#include <asm/sn/pda.h>
#include <asm/sn/module.h>
#include <asm/sn/bte.h>
+#include <asm/sn/sn2/arch.h>
/*
* NUMA Node-Specific Data structures are defined in this file.
diff --git a/include/asm-ia64/sn/pci/bridge.h b/include/asm-ia64/sn/pci/bridge.h
index d98f425eb682..6b6d346ce1c9 100644
--- a/include/asm-ia64/sn/pci/bridge.h
+++ b/include/asm-ia64/sn/pci/bridge.h
@@ -533,12 +533,12 @@ typedef volatile struct bridge_s {
/* 0x020000-0x027FFF -- PCI Device Configuration Spaces */
union { /* make all access sizes available. */
- uchar_t c[0x1000 / 1]; /* 0x02{0000,,,7FFF} */
+ unsigned char c[0x1000 / 1]; /* 0x02{0000,,,7FFF} */
uint16_t s[0x1000 / 2]; /* 0x02{0000,,,7FFF} */
uint32_t l[0x1000 / 4]; /* 0x02{0000,,,7FFF} */
uint64_t d[0x1000 / 8]; /* 0x02{0000,,,7FFF} */
union {
- uchar_t c[0x100 / 1];
+ unsigned char c[0x100 / 1];
uint16_t s[0x100 / 2];
uint32_t l[0x100 / 4];
uint64_t d[0x100 / 8];
@@ -547,12 +547,12 @@ typedef volatile struct bridge_s {
/* 0x028000-0x028FFF -- PCI Type 1 Configuration Space */
union { /* make all access sizes available. */
- uchar_t c[0x1000 / 1];
+ unsigned char c[0x1000 / 1];
uint16_t s[0x1000 / 2];
uint32_t l[0x1000 / 4];
uint64_t d[0x1000 / 8];
union {
- uchar_t c[0x100 / 1];
+ unsigned char c[0x100 / 1];
uint16_t s[0x100 / 2];
uint32_t l[0x100 / 4];
uint64_t d[0x100 / 8];
@@ -563,13 +563,13 @@ typedef volatile struct bridge_s {
/* 0x030000-0x030007 -- PCI Interrupt Acknowledge Cycle */
union {
- uchar_t c[8 / 1];
+ unsigned char c[8 / 1];
uint16_t s[8 / 2];
uint32_t l[8 / 4];
uint64_t d[8 / 8];
} b_pci_iack; /* 0x030000-0x030007 */
- uchar_t _pad_030007[0x04fff8]; /* 0x030008-0x07FFFF */
+ unsigned char _pad_030007[0x04fff8]; /* 0x030008-0x07FFFF */
/* 0x080000-0x0FFFFF -- External Address Translation Entry RAM */
bridge_ate_t b_ext_ate_ram[0x10000];
@@ -579,7 +579,7 @@ typedef volatile struct bridge_s {
/* 0x200000-0xBFFFFF -- PCI/GIO Device Spaces */
union { /* make all access sizes available. */
- uchar_t c[0x100000 / 1];
+ unsigned char c[0x100000 / 1];
uint16_t s[0x100000 / 2];
uint32_t l[0x100000 / 4];
uint64_t d[0x100000 / 8];
@@ -593,7 +593,7 @@ typedef volatile struct bridge_s {
/* 0xC00000-0xFFFFFF -- External Flash Proms 1,0 */
union { /* make all access sizes available. */
- uchar_t c[0x400000 / 1]; /* read-only */
+ unsigned char c[0x400000 / 1]; /* read-only */
uint16_t s[0x400000 / 2]; /* read-write */
uint32_t l[0x400000 / 4]; /* read-only */
uint64_t d[0x400000 / 8]; /* read-only */
diff --git a/include/asm-ia64/sn/pci/pcibr_private.h b/include/asm-ia64/sn/pci/pcibr_private.h
index fd67e38b88e7..9fef71740fbf 100644
--- a/include/asm-ia64/sn/pci/pcibr_private.h
+++ b/include/asm-ia64/sn/pci/pcibr_private.h
@@ -395,21 +395,6 @@ struct pcibr_intr_wrap_s {
*/
#define PCIBR_WAR_ENABLED(pv, pcibr_soft) \
((1 << XWIDGET_PART_REV_NUM_REV(pcibr_soft->bs_rev_num)) & pv)
-/*
- * Defines for individual WARs. Each is a bitmask of applicable
- * part revision numbers. (1 << 1) == rev A, (1 << 2) == rev B,
- * (3 << 1) == (rev A or rev B), etc
- */
-#define PV854697 (~0) /* PIC: write 64bit regs as 64bits. permanent */
-#define PV854827 (~0) /* PIC: fake widget 0xf presence bit. permanent */
-#define PV855271 (1 << 1) /* PIC: use virt chan iff 64-bit device. */
-#define PV878674 (~0) /* PIC: Dont allow 64bit PIOs. permanent */
-#define PV855272 (1 << 1) /* PIC: runaway interrupt WAR */
-#define PV856155 (1 << 1) /* PIC: arbitration WAR */
-#define PV856864 (1 << 1) /* PIC: lower timeout to free TNUMs quicker */
-#define PV856866 (1 << 1) /* PIC: avoid rrb's 0/1/8/9. */
-#define PV862253 (1 << 1) /* PIC: don't enable write req RAM parity checking */
-#define PV867308 (3 << 1) /* PIC: make LLP error interrupts FATAL for PIC */
/* defines for pcibr_soft_s->bs_bridge_mode */
#define PCIBR_BRIDGEMODE_PCI_33 0x0
diff --git a/include/asm-ia64/sn/pci/pciio.h b/include/asm-ia64/sn/pci/pciio.h
index 7b6740a6a272..f2168a8908ee 100644
--- a/include/asm-ia64/sn/pci/pciio.h
+++ b/include/asm-ia64/sn/pci/pciio.h
@@ -321,7 +321,7 @@ pciio_piomap_alloc_f (vertex_hdl_t dev, /* set up mapping for this device */
iopaddr_t pcipio_addr, /* starting address */
size_t byte_count,
size_t byte_count_max, /* maximum size of a mapping */
- unsigned flags); /* defined in sys/pio.h */
+ unsigned int flags); /* defined in sys/pio.h */
typedef void
pciio_piomap_free_f (pciio_piomap_t pciio_piomap);
@@ -340,7 +340,7 @@ pciio_piotrans_addr_f (vertex_hdl_t dev, /* translate for this device */
pciio_space_t space, /* which address space */
iopaddr_t pciio_addr, /* starting address */
size_t byte_count, /* map this many bytes */
- unsigned flags);
+ unsigned int flags);
typedef caddr_t
pciio_pio_addr_f (vertex_hdl_t dev, /* translate for this device */
@@ -349,7 +349,7 @@ pciio_pio_addr_f (vertex_hdl_t dev, /* translate for this device */
iopaddr_t pciio_addr, /* starting address */
size_t byte_count, /* map this many bytes */
pciio_piomap_t *mapp, /* in case a piomap was needed */
- unsigned flags);
+ unsigned int flags);
typedef iopaddr_t
pciio_piospace_alloc_f (vertex_hdl_t dev, /* PIO space for this device */
@@ -370,7 +370,7 @@ typedef pciio_dmamap_t
pciio_dmamap_alloc_f (vertex_hdl_t dev, /* set up mappings for this device */
device_desc_t dev_desc, /* device descriptor */
size_t byte_count_max, /* max size of a mapping */
- unsigned flags); /* defined in dma.h */
+ unsigned int flags); /* defined in dma.h */
typedef void
pciio_dmamap_free_f (pciio_dmamap_t dmamap);
@@ -388,7 +388,7 @@ pciio_dmatrans_addr_f (vertex_hdl_t dev, /* translate for this device */
device_desc_t dev_desc, /* device descriptor */
paddr_t paddr, /* system physical address */
size_t byte_count, /* length */
- unsigned flags); /* defined in dma.h */
+ unsigned int flags); /* defined in dma.h */
typedef void
pciio_dmamap_drain_f (pciio_dmamap_t map);
@@ -440,13 +440,13 @@ pciio_endian_set_f (vertex_hdl_t dev, /* specify endianness for this device
typedef uint64_t
pciio_config_get_f (vertex_hdl_t conn, /* pci connection point */
- unsigned reg, /* register byte offset */
- unsigned size); /* width in bytes (1..4) */
+ unsigned int reg, /* register byte offset */
+ unsigned int size); /* width in bytes (1..4) */
typedef void
pciio_config_set_f (vertex_hdl_t conn, /* pci connection point */
- unsigned reg, /* register byte offset */
- unsigned size, /* width in bytes (1..4) */
+ unsigned int reg, /* register byte offset */
+ unsigned int size, /* width in bytes (1..4) */
uint64_t value); /* value to store */
typedef pciio_slot_t
@@ -578,7 +578,7 @@ extern int
pciio_driver_register (pciio_vendor_id_t vendor_id, /* card's vendor number */
pciio_device_id_t device_id, /* card's device number */
char *driver_prefix, /* driver prefix */
- unsigned flags);
+ unsigned int flags);
extern void
pciio_error_register (vertex_hdl_t pconn, /* which slot */
diff --git a/include/asm-ia64/sn/pci/pciio_private.h b/include/asm-ia64/sn/pci/pciio_private.h
index 05287f28cbe6..862015890dc6 100644
--- a/include/asm-ia64/sn/pci/pciio_private.h
+++ b/include/asm-ia64/sn/pci/pciio_private.h
@@ -20,7 +20,7 @@
* All PCI providers set up PIO using this information.
*/
struct pciio_piomap_s {
- unsigned pp_flags; /* PCIIO_PIOMAP flags */
+ unsigned int pp_flags; /* PCIIO_PIOMAP flags */
vertex_hdl_t pp_dev; /* associated pci card */
pciio_slot_t pp_slot; /* which slot the card is in */
pciio_space_t pp_space; /* which address space */
@@ -33,7 +33,7 @@ struct pciio_piomap_s {
* All PCI providers set up DMA using this information.
*/
struct pciio_dmamap_s {
- unsigned pd_flags; /* PCIIO_DMAMAP flags */
+ unsigned int pd_flags; /* PCIIO_DMAMAP flags */
vertex_hdl_t pd_dev; /* associated pci card */
pciio_slot_t pd_slot; /* which slot the card is in */
};
@@ -43,7 +43,7 @@ struct pciio_dmamap_s {
*/
struct pciio_intr_s {
- unsigned pi_flags; /* PCIIO_INTR flags */
+ unsigned int pi_flags; /* PCIIO_INTR flags */
vertex_hdl_t pi_dev; /* associated pci card */
device_desc_t pi_dev_desc; /* override device descriptor */
pciio_intr_line_t pi_lines; /* which interrupt line(s) */
diff --git a/include/asm-ia64/sn/pda.h b/include/asm-ia64/sn/pda.h
index 51ce9a9f879e..20e9b5775435 100644
--- a/include/asm-ia64/sn/pda.h
+++ b/include/asm-ia64/sn/pda.h
@@ -8,12 +8,9 @@
#ifndef _ASM_IA64_SN_PDA_H
#define _ASM_IA64_SN_PDA_H
-#include <linux/config.h>
#include <linux/cache.h>
#include <asm/percpu.h>
#include <asm/system.h>
-#include <asm/processor.h>
-#include <asm/page.h>
#include <asm/sn/bte.h>
diff --git a/include/asm-ia64/sn/pio.h b/include/asm-ia64/sn/pio.h
index 4c0b9f0486a0..da74b96905f4 100644
--- a/include/asm-ia64/sn/pio.h
+++ b/include/asm-ia64/sn/pio.h
@@ -8,9 +8,7 @@
#ifndef _ASM_IA64_SN_PIO_H
#define _ASM_IA64_SN_PIO_H
-#include <linux/types.h>
-#include <asm/sn/sgi.h>
-#include <asm/sn/driver.h>
+#include <asm/sn/types.h>
/*
* pioaddr_t - The kernel virtual address that a PIO can be done upon.
@@ -18,7 +16,7 @@
* to long mostly, just cast for other sizes.
*/
-typedef volatile ulong* pioaddr_t;
+typedef volatile unsigned long* pioaddr_t;
/*
* iopaddr_t - the physical io space relative address (e.g. VME A16S 0x0800).
diff --git a/include/asm-ia64/sn/sgi.h b/include/asm-ia64/sn/sgi.h
index 57b3b4ecf826..4f050825eead 100644
--- a/include/asm-ia64/sn/sgi.h
+++ b/include/asm-ia64/sn/sgi.h
@@ -14,8 +14,6 @@
#include <asm/sn/types.h>
#include <asm/uaccess.h> /* for copy_??_user */
-#include <linux/mm.h>
-#include <linux/fs.h>
#include <asm/sn/hwgfs.h>
typedef hwgfs_handle_t vertex_hdl_t;
@@ -44,6 +42,21 @@ typedef enum graph_error_e {
#define CPU_NONE (-1)
#define GRAPH_VERTEX_NONE ((vertex_hdl_t)-1)
+/*
+ * Defines for individual WARs. Each is a bitmask of applicable
+ * part revision numbers. (1 << 1) == rev A, (1 << 2) == rev B,
+ * (3 << 1) == (rev A or rev B), etc
+ */
+#define PV854697 (~0) /* PIC: write 64bit regs as 64bits. permanent */
+#define PV854827 (~0UL) /* PIC: fake widget 0xf presence bit. permanent */
+#define PV855271 (1 << 1) /* PIC: use virt chan iff 64-bit device. */
+#define PV878674 (~0) /* PIC: Dont allow 64bit PIOs. permanent */
+#define PV855272 (1 << 1) /* PIC: runaway interrupt WAR */
+#define PV856155 (1 << 1) /* PIC: arbitration WAR */
+#define PV856864 (1 << 1) /* PIC: lower timeout to free TNUMs quicker */
+#define PV856866 (1 << 1) /* PIC: avoid rrb's 0/1/8/9. */
+#define PV862253 (1 << 1) /* PIC: don't enable write req RAM parity checking */
+#define PV867308 (3 << 1) /* PIC: make LLP error interrupts FATAL for PIC */
/*
* No code is complete without an Assertion macro
diff --git a/include/asm-ia64/sn/sn2/arch.h b/include/asm-ia64/sn/sn2/arch.h
index db7f09301d98..f944f24cc6da 100644
--- a/include/asm-ia64/sn/sn2/arch.h
+++ b/include/asm-ia64/sn/sn2/arch.h
@@ -8,9 +8,6 @@
#ifndef _ASM_IA64_SN_SN2_ARCH_H
#define _ASM_IA64_SN_SN2_ARCH_H
-#include <asm/types.h>
-
-
#define CPUS_PER_NODE 4 /* CPUs on a single hub */
#define CPUS_PER_SUBNODE 4 /* CPUs on a single hub PI */
diff --git a/include/asm-ia64/sn/sn2/sn_private.h b/include/asm-ia64/sn/sn2/sn_private.h
index e9c2940d4c58..bea5eee0a116 100644
--- a/include/asm-ia64/sn/sn2/sn_private.h
+++ b/include/asm-ia64/sn/sn2/sn_private.h
@@ -8,6 +8,7 @@
#ifndef _ASM_IA64_SN_SN2_SN_PRIVATE_H
#define _ASM_IA64_SN_SN2_SN_PRIVATE_H
+#include <linux/wait.h>
#include <asm/sn/nodepda.h>
#include <asm/sn/io.h>
#include <asm/sn/xtalk/xwidget.h>
@@ -20,7 +21,7 @@ extern void he_arcs_set_vectors(void);
extern void mem_init(void);
extern void cpu_unenable(cpuid_t);
extern nasid_t get_lowest_nasid(void);
-extern __psunsigned_t get_master_bridge_base(void);
+extern unsigned long get_master_bridge_base(void);
extern int check_nasid_equiv(nasid_t, nasid_t);
extern char get_console_pcislot(void);
@@ -28,7 +29,7 @@ extern int is_master_baseio_nasid_widget(nasid_t test_nasid,
xwidgetnum_t test_wid);
/* memsupport.c */
-extern void poison_state_alter_range(__psunsigned_t start, int len, int poison);
+extern void poison_state_alter_range(unsigned long start, int len, int poison);
extern int memory_present(paddr_t);
extern int memory_read_accessible(paddr_t);
extern int memory_write_accessible(paddr_t);
@@ -86,7 +87,7 @@ void install_klidbg_functions(void);
/* klnuma.c */
extern void replicate_kernel_text(int numnodes);
-extern __psunsigned_t get_freemem_start(cnodeid_t cnode);
+extern unsigned long get_freemem_start(cnodeid_t cnode);
extern void setup_replication_mask(int maxnodes);
/* init.c */
@@ -109,7 +110,7 @@ extern int check_ni_errors(void);
/* Used for debugger to signal upper software a breakpoint has taken place */
extern void *debugger_update;
-extern __psunsigned_t debugger_stopped;
+extern unsigned long debugger_stopped;
/*
* piomap, created by shub_pio_alloc.
@@ -234,9 +235,6 @@ extern void sysctlr_keepalive(void);
#define paddr_cnode(_pa) (NASID_TO_COMPACT_NODEID(NASID_GET(_pa)))
extern void membank_pathname_get(paddr_t, char *);
-/* To redirect the output into the error buffer */
-#define errbuf_print(_s) printf("#%s",_s)
-
extern void crbx(nasid_t nasid, void (*pf) (char *, ...));
void bootstrap(void);
diff --git a/include/asm-ia64/sn/sn_cpuid.h b/include/asm-ia64/sn/sn_cpuid.h
index a2831ceb16a8..0c7cce652368 100644
--- a/include/asm-ia64/sn/sn_cpuid.h
+++ b/include/asm-ia64/sn/sn_cpuid.h
@@ -13,12 +13,8 @@
#include <linux/config.h>
#include <linux/smp.h>
-#include <linux/sched.h>
-#include <linux/mmzone.h>
-#include <asm/sn/types.h>
-#include <asm/current.h>
-#include <asm/nodedata.h>
#include <asm/sn/pda.h>
+#include <asm/intrinsics.h>
/*
diff --git a/include/asm-ia64/sn/sn_private.h b/include/asm-ia64/sn/sn_private.h
index ee0a7addf65b..897b8310dbf6 100644
--- a/include/asm-ia64/sn/sn_private.h
+++ b/include/asm-ia64/sn/sn_private.h
@@ -8,11 +8,6 @@
#ifndef _ASM_IA64_SN_SN_PRIVATE_H
#define _ASM_IA64_SN_SN_PRIVATE_H
-#include <linux/config.h>
-#include <asm/sn/nodepda.h>
-#include <asm/sn/xtalk/xwidget.h>
-#include <asm/sn/xtalk/xtalk_private.h>
-
#include <asm/sn/sn2/sn_private.h>
#endif /* _ASM_IA64_SN_SN_PRIVATE_H */
diff --git a/include/asm-ia64/sn/types.h b/include/asm-ia64/sn/types.h
index 0275ce759abf..5f821c07808f 100644
--- a/include/asm-ia64/sn/types.h
+++ b/include/asm-ia64/sn/types.h
@@ -9,21 +9,15 @@
#ifndef _ASM_IA64_SN_TYPES_H
#define _ASM_IA64_SN_TYPES_H
-#include <linux/config.h>
-#include <linux/types.h>
-
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 */
typedef unsigned int moduleid_t; /* user-visible module number type */
typedef unsigned int cmoduleid_t; /* kernel compact module id type */
-typedef signed char slabid_t;
+typedef signed char slabid_t;
typedef unsigned char clusterid_t; /* Clusterid of the cell */
-typedef uint64_t __psunsigned_t;
-
typedef unsigned long iopaddr_t;
-typedef unsigned char uchar_t;
typedef unsigned long paddr_t;
typedef unsigned long pfn_t;
typedef short cnodeid_t;
diff --git a/include/asm-ia64/sn/vector.h b/include/asm-ia64/sn/vector.h
index e87801a74e8b..6b39c7ace4b5 100644
--- a/include/asm-ia64/sn/vector.h
+++ b/include/asm-ia64/sn/vector.h
@@ -8,8 +8,6 @@
#ifndef _ASM_IA64_SN_VECTOR_H
#define _ASM_IA64_SN_VECTOR_H
-#include <linux/config.h>
-
#define NET_VEC_NULL ((net_vec_t) 0)
#define NET_VEC_BAD ((net_vec_t) -1)
diff --git a/include/asm-ia64/sn/xtalk/xbow.h b/include/asm-ia64/sn/xtalk/xbow.h
index 596e17caaf29..b1019a81bcc9 100644
--- a/include/asm-ia64/sn/xtalk/xbow.h
+++ b/include/asm-ia64/sn/xtalk/xbow.h
@@ -12,7 +12,7 @@
* xbow.h - header file for crossbow chip and xbow section of xbridge
*/
-#include <linux/config.h>
+#include <asm/types.h>
#include <asm/sn/xtalk/xtalk.h>
#include <asm/sn/xtalk/xwidget.h>
#include <asm/sn/xtalk/xswitch.h>
@@ -55,12 +55,6 @@
#ifndef __ASSEMBLY__
typedef uint32_t xbowreg_t;
-#define XBOWCONST (xbowreg_t)
-
-/* Generic xbow register, given base and offset */
-#define XBOW_REG_PTR(base, offset) ((volatile xbowreg_t*) \
- ((__psunsigned_t)(base) + (__psunsigned_t)(offset)))
-
/* Register set for each xbow link */
typedef volatile struct xb_linkregs_s {
/*
@@ -224,14 +218,6 @@ typedef struct xbow_cfg_s {
/* of the widget0 address space (before 0xf4) */
#define XBOW_WID_UNDEF 0xe4
-/* pointer to link arbitration register, given xbow base, dst and src widget id */
-#define XBOW_PRIO_ARBREG_PTR(base, dst_wid, src_wid) \
- XBOW_REG_PTR(XBOW_PRIO_LINKREGS_PTR(base, dst_wid), XBOW_ARB_OFF(src_wid))
-
-/* pointer to link registers base, given xbow base and destination widget id */
-#define XBOW_PRIO_LINKREGS_PTR(base, dst_wid) (xb_linkregs_t*) \
- XBOW_REG_PTR(base, XB_LINK_REG_BASE(dst_wid))
-
/* xbow link register set base, legal value for x is 0x8..0xf */
#define XB_LINK_BASE 0x100
#define XB_LINK_OFFSET 0x40
@@ -356,9 +342,6 @@ typedef struct xbow_cfg_s {
XWIDGET_MFG_NUM(wid) == XXBOW_WIDGET_MFGR_NUM)
#define XBOW_WAR_ENABLED(pv, widid) ((1 << XWIDGET_REV_NUM(widid)) & pv)
-#define PV854827 (~0) /* PIC: fake widget 0xf presence bit. permanent */
-#define PV863579 (1 << 1) /* PIC: PIO to PIC register */
-
#ifndef __ASSEMBLY__
/*
diff --git a/include/asm-ia64/sn/xtalk/xtalk.h b/include/asm-ia64/sn/xtalk/xtalk.h
index aaf1f7a51d7a..dc6e8b2f3728 100644
--- a/include/asm-ia64/sn/xtalk/xtalk.h
+++ b/include/asm-ia64/sn/xtalk/xtalk.h
@@ -94,7 +94,7 @@ xtalk_piomap_alloc_f (vertex_hdl_t dev, /* set up mapping for this device */
iopaddr_t xtalk_addr, /* map for this xtalk_addr range */
size_t byte_count,
size_t byte_count_max, /* maximum size of a mapping */
- unsigned flags); /* defined in sys/pio.h */
+ unsigned int flags); /* defined in sys/pio.h */
typedef void
xtalk_piomap_free_f (xtalk_piomap_t xtalk_piomap);
@@ -111,7 +111,7 @@ xtalk_piotrans_addr_f (vertex_hdl_t dev, /* translate for this device */
device_desc_t dev_desc, /* device descriptor */
iopaddr_t xtalk_addr, /* Crosstalk address */
size_t byte_count, /* map this many bytes */
- unsigned flags); /* (currently unused) */
+ unsigned int flags); /* (currently unused) */
extern caddr_t
xtalk_pio_addr (vertex_hdl_t dev, /* translate for this device */
@@ -119,7 +119,7 @@ xtalk_pio_addr (vertex_hdl_t dev, /* translate for this device */
iopaddr_t xtalk_addr, /* Crosstalk address */
size_t byte_count, /* map this many bytes */
xtalk_piomap_t *xtalk_piomapp, /* RETURNS mapping resources */
- unsigned flags); /* (currently unused) */
+ unsigned int flags); /* (currently unused) */
/* DMA MANAGEMENT */
@@ -129,7 +129,7 @@ typedef xtalk_dmamap_t
xtalk_dmamap_alloc_f (vertex_hdl_t dev, /* set up mappings for this device */
device_desc_t dev_desc, /* device descriptor */
size_t byte_count_max, /* max size of a mapping */
- unsigned flags); /* defined in dma.h */
+ unsigned int flags); /* defined in dma.h */
typedef void
xtalk_dmamap_free_f (xtalk_dmamap_t dmamap);
@@ -142,7 +142,7 @@ xtalk_dmamap_addr_f (xtalk_dmamap_t dmamap, /* use these mapping resources
typedef alenlist_t
xtalk_dmamap_list_f (xtalk_dmamap_t dmamap, /* use these mapping resources */
alenlist_t alenlist, /* map this address/length list */
- unsigned flags);
+ unsigned int flags);
typedef void
xtalk_dmamap_done_f (xtalk_dmamap_t dmamap);
@@ -152,13 +152,13 @@ xtalk_dmatrans_addr_f (vertex_hdl_t dev, /* translate for this device */
device_desc_t dev_desc, /* device descriptor */
paddr_t paddr, /* system physical address */
size_t byte_count, /* length */
- unsigned flags);
+ unsigned int flags);
typedef alenlist_t
xtalk_dmatrans_list_f (vertex_hdl_t dev, /* translate for this device */
device_desc_t dev_desc, /* device descriptor */
alenlist_t palenlist, /* system address/length list */
- unsigned flags);
+ unsigned int flags);
typedef void
xtalk_dmamap_drain_f (xtalk_dmamap_t map); /* drain this map's channel */
@@ -243,7 +243,7 @@ xtalk_early_piotrans_addr_f (xwidget_part_num_t part_num,
int which,
iopaddr_t xtalk_addr,
size_t byte_count,
- unsigned flags);
+ unsigned int flags);
/*
* Adapters that provide a crosstalk interface adhere to this software interface.
diff --git a/include/asm-ia64/sn/xtalk/xwidget.h b/include/asm-ia64/sn/xtalk/xwidget.h
index 28e453fc52af..15a298a584ec 100644
--- a/include/asm-ia64/sn/xtalk/xwidget.h
+++ b/include/asm-ia64/sn/xtalk/xwidget.h
@@ -139,17 +139,17 @@ typedef volatile struct widget_cfg {
} widget_cfg_t;
typedef struct {
- unsigned other:8;
- unsigned bo:1;
- unsigned error:1;
- unsigned vbpm:1;
- unsigned gbr:1;
- unsigned ds:2;
- unsigned ct:1;
- unsigned tnum:5;
- unsigned pactyp:4;
- unsigned sidn:4;
- unsigned didn:4;
+ unsigned int other:8;
+ unsigned int bo:1;
+ unsigned int error:1;
+ unsigned int vbpm:1;
+ unsigned int gbr:1;
+ unsigned int ds:2;
+ unsigned int ct:1;
+ unsigned int tnum:5;
+ unsigned int pactyp:4;
+ unsigned int sidn:4;
+ unsigned int didn:4;
} w_err_cmd_word_f;
typedef union {
@@ -188,7 +188,7 @@ typedef struct xwidget_hwid_s {
extern int xwidget_driver_register(xwidget_part_num_t part_num,
xwidget_mfg_num_t mfg_num,
char *driver_prefix,
- unsigned flags);
+ unsigned int flags);
extern void xwidget_driver_unregister(char *driver_prefix);
@@ -230,7 +230,7 @@ extern xwidgetnum_t hub_widget_id(nasid_t);
* However, since nobody looks inside ...
*/
typedef struct v_widget_s {
- unsigned v_widget_s_is_really_empty;
+ unsigned int v_widget_s_is_really_empty;
#define v_widget_s_is_really_empty and using this would be a syntax error.
} v_widget_t;
#endif /* _KERNEL */
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-31 07:49:44 +0000