tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
x86, pci: move arch/x86/pci/pci.h to arch/x86/include/asm/pci_x86.h
Impact: cleanup
Now that arch/x86/pci/pci.h is used in a number of other places as well,
move the lowlevel x86 pci definitions into the architecture include files.
(not to be confused with the existing arch/x86/include/asm/pci.h file,
which provides public details about x86 PCI)
Tested on: X86_32_UP, X86_32_SMP and X86_64_SMP
Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
authored by
Jaswinder Singh Rajput
and committed by
Ingo Molnar
82487711
c854c919
+33
-39
+1
-2
arch/x86/kernel/mmconf-fam10h_64.c
+1
-2
arch/x86/kernel/mmconf-fam10h_64.c
+1
-2
arch/x86/kernel/reboot.c
+1
-2
arch/x86/kernel/reboot.c
···
12
12
#include <asm/proto.h>
13
13
#include <asm/reboot_fixups.h>
14
14
#include <asm/reboot.h>
15
+
#include <asm/pci_x86.h>
15
16
16
17
#ifdef CONFIG_X86_32
17
18
# include <linux/dmi.h>
···
23
22
#endif
24
23
25
24
#include <mach_ipi.h>
26
-
#include "../pci/pci.h"
27
-
28
25
29
26
/*
30
27
* Power off function, if any
+1
-1
arch/x86/pci/acpi.c
+1
-1
arch/x86/pci/acpi.c
+1
-1
arch/x86/pci/amd_bus.c
+1
-1
arch/x86/pci/amd_bus.c
+1
-2
arch/x86/pci/common.c
+1
-2
arch/x86/pci/common.c
+1
-1
arch/x86/pci/direct.c
+1
-1
arch/x86/pci/direct.c
+1
-1
arch/x86/pci/early.c
+1
-1
arch/x86/pci/early.c
+1
-2
arch/x86/pci/fixup.c
+1
-2
arch/x86/pci/fixup.c
+1
-1
arch/x86/pci/i386.c
+1
-1
arch/x86/pci/i386.c
+1
-1
arch/x86/pci/init.c
+1
-1
arch/x86/pci/init.c
+1
-2
arch/x86/pci/irq.c
+1
-2
arch/x86/pci/irq.c
+1
-1
arch/x86/pci/legacy.c
+1
-1
arch/x86/pci/legacy.c
+1
-1
arch/x86/pci/mmconfig_32.c
+1
-1
arch/x86/pci/mmconfig_32.c
+1
-2
arch/x86/pci/mmconfig_64.c
+1
-2
arch/x86/pci/mmconfig_64.c
+1
-1
arch/x86/pci/numaq_32.c
+1
-1
arch/x86/pci/numaq_32.c
+1
-1
arch/x86/pci/olpc.c
+1
-1
arch/x86/pci/olpc.c
+2
-3
arch/x86/pci/pcbios.c
+2
-3
arch/x86/pci/pcbios.c
···
6
6
#include <linux/init.h>
7
7
#include <linux/module.h>
8
8
#include <linux/uaccess.h>
9
-
#include "pci.h"
10
-
#include "pci-functions.h"
11
-
9
+
#include <asm/pci_x86.h>
10
+
#include <asm/mach-default/pci-functions.h>
12
11
13
12
/* BIOS32 signature: "_32_" */
14
13
#define BIOS32_SIGNATURE (('_' << 0) + ('3' << 8) + ('2' << 16) + ('_' << 24))
+10
-7
arch/x86/pci/pci.h
arch/x86/include/asm/pci_x86.h
+10
-7
arch/x86/pci/pci.h
arch/x86/include/asm/pci_x86.h
···
57
57
struct irq_info {
58
58
u8 bus, devfn; /* Bus, device and function */
59
59
struct {
60
-
u8 link; /* IRQ line ID, chipset dependent, 0=not routed */
60
+
u8 link; /* IRQ line ID, chipset dependent,
61
+
0 = not routed */
61
62
u16 bitmap; /* Available IRQs */
62
63
} __attribute__((packed)) irq[4];
63
64
u8 slot; /* Slot number, 0=onboard */
···
70
69
u16 version; /* PIRQ_VERSION */
71
70
u16 size; /* Table size in bytes */
72
71
u8 rtr_bus, rtr_devfn; /* Where the interrupt router lies */
73
-
u16 exclusive_irqs; /* IRQs devoted exclusively to PCI usage */
74
-
u16 rtr_vendor, rtr_device; /* Vendor and device ID of interrupt router */
72
+
u16 exclusive_irqs; /* IRQs devoted exclusively to
73
+
PCI usage */
74
+
u16 rtr_vendor, rtr_device; /* Vendor and device ID of
75
+
interrupt router */
75
76
u32 miniport_data; /* Crap */
76
77
u8 rfu[11];
77
-
u8 checksum; /* Modulo 256 checksum must give zero */
78
+
u8 checksum; /* Modulo 256 checksum must give 0 */
78
79
struct irq_info slots[0];
79
80
} __attribute__((packed));
80
81
···
151
148
152
149
static inline void mmio_config_writeb(void __iomem *pos, u8 val)
153
150
{
154
-
asm volatile("movb %%al,(%1)" :: "a" (val), "r" (pos) : "memory");
151
+
asm volatile("movb %%al,(%1)" : : "a" (val), "r" (pos) : "memory");
155
152
}
156
153
157
154
static inline void mmio_config_writew(void __iomem *pos, u16 val)
158
155
{
159
-
asm volatile("movw %%ax,(%1)" :: "a" (val), "r" (pos) : "memory");
156
+
asm volatile("movw %%ax,(%1)" : : "a" (val), "r" (pos) : "memory");
160
157
}
161
158
162
159
static inline void mmio_config_writel(void __iomem *pos, u32 val)
163
160
{
164
-
asm volatile("movl %%eax,(%1)" :: "a" (val), "r" (pos) : "memory");
161
+
asm volatile("movl %%eax,(%1)" : : "a" (val), "r" (pos) : "memory");
165
162
}
+1
-2
arch/x86/pci/visws.c
+1
-2
arch/x86/pci/visws.c
···
9
9
#include <linux/init.h>
10
10
11
11
#include <asm/setup.h>
12
+
#include <asm/pci_x86.h>
12
13
#include <asm/visws/cobalt.h>
13
14
#include <asm/visws/lithium.h>
14
-
15
-
#include "pci.h"
16
15
17
16
static int pci_visws_enable_irq(struct pci_dev *dev) { return 0; }
18
17
static void pci_visws_disable_irq(struct pci_dev *dev) { }
+1
-1
drivers/pci/hotplug/cpqphp_core.c
+1
-1
drivers/pci/hotplug/cpqphp_core.c
+1
-1
drivers/pci/hotplug/cpqphp_pci.c
+1
-1
drivers/pci/hotplug/cpqphp_pci.c
+1
-1
drivers/pci/hotplug/ibmphp_core.c
+1
-1
drivers/pci/hotplug/ibmphp_core.c
···
35
35
#include <linux/delay.h>
36
36
#include <linux/wait.h>
37
37
#include "../pci.h"
38
-
#include "../../../arch/x86/pci/pci.h" /* for struct irq_routing_table */
38
+
#include <asm/pci_x86.h> /* for struct irq_routing_table */
39
39
#include "ibmphp.h"
40
40
41
41
#define attn_on(sl) ibmphp_hpc_writeslot (sl, HPC_SLOT_ATTNON)