diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-powerpc/iommu.h | 1 | ||||
-rw-r--r-- | include/asm-powerpc/prom.h | 1 | ||||
-rw-r--r-- | include/asm-ppc64/abs_addr.h | 7 | ||||
-rw-r--r-- | include/asm-ppc64/iSeries/iSeries_pci.h | 70 | ||||
-rw-r--r-- | include/asm-ppc64/pci-bridge.h | 1 | ||||
-rw-r--r-- | include/asm-ppc64/prom.h | 1 |
6 files changed, 11 insertions, 70 deletions
diff --git a/include/asm-powerpc/iommu.h b/include/asm-powerpc/iommu.h index f80ec8daf122..9d91bdd667ae 100644 --- a/include/asm-powerpc/iommu.h +++ b/include/asm-powerpc/iommu.h | |||
@@ -21,6 +21,7 @@ | |||
21 | #ifndef _ASM_IOMMU_H | 21 | #ifndef _ASM_IOMMU_H |
22 | #define _ASM_IOMMU_H | 22 | #define _ASM_IOMMU_H |
23 | 23 | ||
24 | #include <linux/config.h> | ||
24 | #include <asm/types.h> | 25 | #include <asm/types.h> |
25 | #include <linux/spinlock.h> | 26 | #include <linux/spinlock.h> |
26 | #include <linux/device.h> | 27 | #include <linux/device.h> |
diff --git a/include/asm-powerpc/prom.h b/include/asm-powerpc/prom.h index efc40980cb48..8a21791c7cae 100644 --- a/include/asm-powerpc/prom.h +++ b/include/asm-powerpc/prom.h | |||
@@ -15,6 +15,7 @@ | |||
15 | * as published by the Free Software Foundation; either version | 15 | * as published by the Free Software Foundation; either version |
16 | * 2 of the License, or (at your option) any later version. | 16 | * 2 of the License, or (at your option) any later version. |
17 | */ | 17 | */ |
18 | #include <linux/config.h> | ||
18 | #include <linux/types.h> | 19 | #include <linux/types.h> |
19 | #include <linux/proc_fs.h> | 20 | #include <linux/proc_fs.h> |
20 | #include <asm/atomic.h> | 21 | #include <asm/atomic.h> |
diff --git a/include/asm-ppc64/abs_addr.h b/include/asm-ppc64/abs_addr.h index 84c24d4cdb71..dc3fc3fefef2 100644 --- a/include/asm-ppc64/abs_addr.h +++ b/include/asm-ppc64/abs_addr.h | |||
@@ -63,4 +63,11 @@ static inline unsigned long phys_to_abs(unsigned long pa) | |||
63 | #define virt_to_abs(va) phys_to_abs(__pa(va)) | 63 | #define virt_to_abs(va) phys_to_abs(__pa(va)) |
64 | #define abs_to_virt(aa) __va(aa) | 64 | #define abs_to_virt(aa) __va(aa) |
65 | 65 | ||
66 | /* | ||
67 | * Converts Virtual Address to Real Address for | ||
68 | * Legacy iSeries Hypervisor calls | ||
69 | */ | ||
70 | #define iseries_hv_addr(virtaddr) \ | ||
71 | (0x8000000000000000 | virt_to_abs(virtaddr)) | ||
72 | |||
66 | #endif /* _ABS_ADDR_H */ | 73 | #endif /* _ABS_ADDR_H */ |
diff --git a/include/asm-ppc64/iSeries/iSeries_pci.h b/include/asm-ppc64/iSeries/iSeries_pci.h deleted file mode 100644 index a4d88b49fd9f..000000000000 --- a/include/asm-ppc64/iSeries/iSeries_pci.h +++ /dev/null | |||
@@ -1,70 +0,0 @@ | |||
1 | #ifndef _ISERIES_64_PCI_H | ||
2 | #define _ISERIES_64_PCI_H | ||
3 | |||
4 | /* | ||
5 | * File iSeries_pci.h created by Allan Trautman on Tue Feb 20, 2001. | ||
6 | * | ||
7 | * Define some useful macros for the iSeries pci routines. | ||
8 | * Copyright (C) 2001 Allan H Trautman, IBM Corporation | ||
9 | * | ||
10 | * This program is free software; you can redistribute it and/or modify | ||
11 | * it under the terms of the GNU General Public License as published by | ||
12 | * the Free Software Foundation; either version 2 of the License, or | ||
13 | * (at your option) any later version. | ||
14 | * | ||
15 | * This program is distributed in the hope that it will be useful, | ||
16 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
17 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
18 | * GNU General Public License for more details. | ||
19 | * | ||
20 | * You should have received a copy of the GNU General Public License | ||
21 | * along with this program; if not, write to the: | ||
22 | * Free Software Foundation, Inc., | ||
23 | * 59 Temple Place, Suite 330, | ||
24 | * Boston, MA 02111-1307 USA | ||
25 | * | ||
26 | * Change Activity: | ||
27 | * Created Feb 20, 2001 | ||
28 | * Added device reset, March 22, 2001 | ||
29 | * Ported to ppc64, May 25, 2001 | ||
30 | * End Change Activity | ||
31 | */ | ||
32 | |||
33 | #include <asm/abs_addr.h> | ||
34 | #include <asm/prom.h> | ||
35 | #include <asm/pci-bridge.h> | ||
36 | |||
37 | struct pci_dev; /* For Forward Reference */ | ||
38 | |||
39 | /* | ||
40 | * Gets iSeries Bus, SubBus, DevFn using device_node structure | ||
41 | */ | ||
42 | |||
43 | #define ISERIES_BUS(DevPtr) PCI_DN(DevPtr)->DsaAddr.Dsa.busNumber | ||
44 | #define ISERIES_SUBBUS(DevPtr) PCI_DN(DevPtr)->DsaAddr.Dsa.subBusNumber | ||
45 | #define ISERIES_DEVNODE(PciDev) ((struct device_node *)PciDev->sysdata) | ||
46 | |||
47 | #define EADsMaxAgents 7 | ||
48 | |||
49 | /* | ||
50 | * Decodes Linux DevFn to iSeries DevFn, bridge device, or function. | ||
51 | * For Linux, see PCI_SLOT and PCI_FUNC in include/linux/pci.h | ||
52 | */ | ||
53 | |||
54 | #define ISERIES_PCI_AGENTID(idsel, func) \ | ||
55 | (((idsel & 0x0F) << 4) | (func & 0x07)) | ||
56 | #define ISERIES_ENCODE_DEVICE(agentid) \ | ||
57 | ((0x10) | ((agentid & 0x20) >> 2) | (agentid & 0x07)) | ||
58 | |||
59 | #define ISERIES_GET_DEVICE_FROM_SUBBUS(subbus) ((subbus >> 5) & 0x7) | ||
60 | #define ISERIES_GET_FUNCTION_FROM_SUBBUS(subbus) ((subbus >> 2) & 0x7) | ||
61 | |||
62 | /* | ||
63 | * Converts Virtual Address to Real Address for Hypervisor calls | ||
64 | */ | ||
65 | #define ISERIES_HV_ADDR(virtaddr) \ | ||
66 | (0x8000000000000000 | virt_to_abs(virtaddr)) | ||
67 | |||
68 | extern void iSeries_Device_Information(struct pci_dev*, int); | ||
69 | |||
70 | #endif /* _ISERIES_64_PCI_H */ | ||
diff --git a/include/asm-ppc64/pci-bridge.h b/include/asm-ppc64/pci-bridge.h index 56863df18232..01bffca61f89 100644 --- a/include/asm-ppc64/pci-bridge.h +++ b/include/asm-ppc64/pci-bridge.h | |||
@@ -2,6 +2,7 @@ | |||
2 | #ifndef _ASM_PCI_BRIDGE_H | 2 | #ifndef _ASM_PCI_BRIDGE_H |
3 | #define _ASM_PCI_BRIDGE_H | 3 | #define _ASM_PCI_BRIDGE_H |
4 | 4 | ||
5 | #include <linux/config.h> | ||
5 | #include <linux/pci.h> | 6 | #include <linux/pci.h> |
6 | #include <linux/list.h> | 7 | #include <linux/list.h> |
7 | 8 | ||
diff --git a/include/asm-ppc64/prom.h b/include/asm-ppc64/prom.h index cf0284e081ea..e8d0d2ab4c0f 100644 --- a/include/asm-ppc64/prom.h +++ b/include/asm-ppc64/prom.h | |||
@@ -14,6 +14,7 @@ | |||
14 | * as published by the Free Software Foundation; either version | 14 | * as published by the Free Software Foundation; either version |
15 | * 2 of the License, or (at your option) any later version. | 15 | * 2 of the License, or (at your option) any later version. |
16 | */ | 16 | */ |
17 | #include <linux/config.h> | ||
17 | #include <linux/proc_fs.h> | 18 | #include <linux/proc_fs.h> |
18 | #include <asm/atomic.h> | 19 | #include <asm/atomic.h> |
19 | 20 | ||