Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82487711 authored by Jaswinder Singh Rajput's avatar Jaswinder Singh Rajput Committed by Ingo Molnar
Browse files

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: default avatarJaswinder Singh Rajput <jaswinderrajput@gmail.com>
Acked-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent c854c919

arch/x86/pci/pci.h→arch/x86/include/asm/pci_x86.h

+10 −7
Original line number Diff line number Diff line
@@ -57,7 +57,8 @@ extern struct pci_ops pci_root_ops; 
struct irq_info {

	u8 bus, devfn;			/* Bus, device and function */

	struct {

		u8 link;		/* IRQ line ID, chipset dependent, 0=not routed */

		u8 link;		/* IRQ line ID, chipset dependent,

					   0 = not routed */

		u16 bitmap;		/* Available IRQs */

	} __attribute__((packed)) irq[4];

	u8 slot;			/* Slot number, 0=onboard */
@@ -69,11 +70,13 @@ struct irq_routing_table { 
	u16 version;			/* PIRQ_VERSION */

	u16 size;			/* Table size in bytes */

	u8 rtr_bus, rtr_devfn;		/* Where the interrupt router lies */

	u16 exclusive_irqs;		/* IRQs devoted exclusively to PCI usage */

	u16 rtr_vendor, rtr_device;	/* Vendor and device ID of interrupt router */

	u16 exclusive_irqs;		/* IRQs devoted exclusively to

					   PCI usage */

	u16 rtr_vendor, rtr_device;	/* Vendor and device ID of

					   interrupt router */

	u32 miniport_data;		/* Crap */

	u8 rfu[11];

	u8 checksum;			/* Modulo 256 checksum must give zero */

	u8 checksum;			/* Modulo 256 checksum must give 0 */

	struct irq_info slots[0];

} __attribute__((packed));

arch/x86/kernel/mmconf-fam10h_64.c

+1 −2
Original line number Diff line number Diff line
@@ -13,8 +13,7 @@ 
#include <asm/msr.h>

#include <asm/acpi.h>

#include <asm/mmconfig.h>



#include "../pci/pci.h"

#include <asm/pci_x86.h>



struct pci_hostbridge_probe {

	u32 bus;

arch/x86/kernel/reboot.c

+1 −2
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <asm/proto.h>

#include <asm/reboot_fixups.h>

#include <asm/reboot.h>

#include <asm/pci_x86.h>



#ifdef CONFIG_X86_32

# include <linux/dmi.h>
@@ -22,8 +23,6 @@ 
#endif



#include <mach_ipi.h>

#include "../pci/pci.h"





/*

 * Power off function, if any

arch/x86/pci/acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#include <linux/irq.h>

#include <linux/dmi.h>

#include <asm/numa.h>

#include "pci.h"

#include <asm/pci_x86.h>



struct pci_root_info {

	char *name;

arch/x86/pci/amd_bus.c

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#include <linux/pci.h>

#include <linux/topology.h>

#include <linux/cpu.h>

#include "pci.h"

#include <asm/pci_x86.h>



#ifdef CONFIG_X86_64

#include <asm/pci-direct.h>