move arch/x86/pci/pci.h to arch/x86/include/asm/pci_x86.h
PATCH 1/1 move arch/x86/pci/pci.h to arch/x86/include/asm/pci_x86.h
Impact: cleanup, arch/x86/pci/pci.h -> arch/x86/include/asm/pci_x86.h
Tested on: X86_32_UP, X86_32_SMP and X86_64_SMP
--- arch/x86/include/asm/pci_x86.h | 165 ++++++++++++++++++++++++++++++++++++ arch/x86/kernel/mmconf-fam10h_64.c | 3 +- arch/x86/kernel/reboot.c | 3 +- arch/x86/pci/acpi.c | 2 +- arch/x86/pci/amd_bus.c | 2 +- arch/x86/pci/common.c | 3 +- arch/x86/pci/direct.c | 2 +- arch/x86/pci/early.c | 2 +- arch/x86/pci/fixup.c | 3 +- arch/x86/pci/i386.c | 2 +- arch/x86/pci/init.c | 2 +- arch/x86/pci/irq.c | 3 +- arch/x86/pci/legacy.c | 2 +- arch/x86/pci/mmconfig-shared.c | 3 +- arch/x86/pci/mmconfig_32.c | 2 +- arch/x86/pci/mmconfig_64.c | 3 +- arch/x86/pci/numaq_32.c | 2 +- arch/x86/pci/olpc.c | 2 +- arch/x86/pci/pcbios.c | 5 +- arch/x86/pci/pci.h | 162 ----------------------------------- arch/x86/pci/visws.c | 3 +- 21 files changed, 185 insertions(+), 191 deletions(-) create mode 100644 arch/x86/include/asm/pci_x86.h delete mode 100644 arch/x86/pci/pci.h
arch/x86/include/asm/pci_x86.h new file +165 -0
@@ -0,0 +1,165 @@ +/* +* Low-Level PCI Access for i386 machines. +* +* (c) 1999 Martin Mares <[email protected]> +*/ + +#undef DEBUG + +#ifdef DEBUG +#define DBG(x...) printk(x) +#else +#define DBG(x...) +#endif + +#define PCI_PROBE_BIOS 0x0001 +#define PCI_PROBE_CONF1 0x0002 +#define PCI_PROBE_CONF2 0x0004 +#define PCI_PROBE_MMCONF 0x0008 +#define PCI_PROBE_MASK 0x000f +#define PCI_PROBE_NOEARLY 0x0010 + +#define PCI_NO_CHECKS 0x0400 +#define PCI_USE_PIRQ_MASK 0x0800 +#define PCI_ASSIGN_ROMS 0x1000 +#define PCI_BIOS_IRQ_SCAN 0x2000 +#define PCI_ASSIGN_ALL_BUSSES 0x4000 +#define PCI_CAN_SKIP_ISA_ALIGN 0x8000 +#define PCI_USE__CRS 0x10000 +#define PCI_CHECK_ENABLE_AMD_MMCONF 0x20000 +#define PCI_HAS_IO_ECS 0x40000 +#define PCI_NOASSIGN_ROMS 0x80000 + +extern unsigned int pci_probe; +extern unsigned long pirq_table_addr; + +enum pci_bf_sort_state { + pci_bf_sort_default, + pci_force_nobf, + pci_force_bf, + pci_dmi_bf, +}; + +/* pci-i386.c */ + +extern unsigned int pcibios_max_latency; + +void pcibios_resource_survey (void ); + +/* pci-pc.c */ + +extern int pcibios_last_bus; +extern struct pci_bus *pci_root_bus; +extern struct pci_ops pci_root_ops; + +/* pci-irq.c */ + +struct irq_info { +u8 bus, devfn;/* Bus, device and function */ +struct { +u8 link;/* IRQ line ID, chipset dependent, +0 = not routed */ +u16 bitmap;/* Available IRQs */ + } __attribute__((packed)) irq[4 ]; +u8 slot;/* Slot number, 0=onboard */ +u8 rfu; +} __attribute__((packed)); + +struct irq_routing_table { +u32 signature;/* PIRQ_SIGNATURE should be here */ +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 */ +u32 miniport_data;/* Crap */ +u8 rfu[11 ]; +u8 checksum;/* Modulo 256 checksum must give 0 */ +struct irq_info slots[0 ]; +} __attribute__((packed)); + +extern unsigned int pcibios_irq_mask; + +extern int pcibios_scanned; +extern spinlock_t pci_config_lock; + +extern int (*pcibios_enable_irq)(struct pci_dev *dev); +extern void (*pcibios_disable_irq)(struct pci_dev *dev); + +struct pci_raw_ops { +int (*read)(unsigned int domain,unsigned int bus,unsigned int devfn, +int reg,int len,u32 *val); +int (*write)(unsigned int domain,unsigned int bus,unsigned int devfn, +int reg,int len,u32 val); +}; + +extern struct pci_raw_ops *raw_pci_ops; +extern struct pci_raw_ops *raw_pci_ext_ops; + +extern struct pci_raw_ops pci_direct_conf1; +extern bool port_cf9_safe; + +/* arch_initcall level */ +extern int pci_direct_probe (void ); +extern void pci_direct_init (int type); +extern void pci_pcbios_init (void ); +extern int pci_olpc_init (void ); +extern void __init dmi_check_pciprobe (void ); +extern void __init dmi_check_skip_isa_align (void ); + +/* some common used subsys_initcalls */ +extern int __init pci_acpi_init (void ); +extern int __init pcibios_irq_init (void ); +extern int __init pci_visws_init (void ); +extern int __init pci_numaq_init (void ); +extern int __init pcibios_init (void ); + +/* pci-mmconfig.c */ + +extern int __init pci_mmcfg_arch_init (void ); +extern void __init pci_mmcfg_arch_free (void ); + +/* +* AMD Fam10h CPUs are buggy, and cannot access MMIO config space +* on their northbrige except through the * %eax register. As such, you MUST +* NOT use normal IOMEM accesses, you need to only use the magic mmio-config +* accessor functions. +* In fact just use pci_config_*, nothing else please. +*/ +static inline unsigned char mmio_config_readb (void __iomem *pos) +{ +u8 val; + asmvolatile ("movb (%1),%%al" :"=a" (val) :"r" (pos)); +return val; +} + +static inline unsigned short mmio_config_readw (void __iomem *pos) +{ +u16 val; + asmvolatile ("movw (%1),%%ax" :"=a" (val) :"r" (pos)); +return val; +} + +static inline unsigned int mmio_config_readl (void __iomem *pos) +{ +u32 val; + asmvolatile ("movl (%1),%%eax" :"=a" (val) :"r" (pos)); +return val; +} + +static inline void mmio_config_writeb (void __iomem *pos,u8 val) +{ + asmvolatile ("movb %%al,(%1)" : :"a" (val),"r" (pos) :"memory" ); +} + +static inline void mmio_config_writew (void __iomem *pos,u16 val) +{ + asmvolatile ("movw %%ax,(%1)" : :"a" (val),"r" (pos) :"memory" ); +} + +static inline void mmio_config_writel (void __iomem *pos,u32 val) +{ + asmvolatile ("movl %%eax,(%1)" : :"a" (val),"r" (pos) :"memory" ); +}
arch/x86/kernel/mmconf-fam10h_64.c +1 -2
@@ -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
@@ -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
@@ -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
@@ -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>
arch/x86/pci/common.c +1 -2
@@ -14,8 +14,7 @@#include <asm/segment.h> #include <asm/io.h> #include <asm/smp.h> - -#include "pci.h" +#include <asm/pci_x86.h> unsigned int pci_probe =PCI_PROBE_BIOS |PCI_PROBE_CONF1 |PCI_PROBE_CONF2 |PCI_PROBE_MMCONF ;
arch/x86/pci/direct.c +1 -1
@@ -5,7 +5,7 @@#include <linux/pci.h> #include <linux/init.h> #include <linux/dmi.h> -#include "pci.h" +#include <asm/pci_x86.h> /* * Functions for accessing PCI base (first 256 bytes) and extended
arch/x86/pci/early.c +1 -1
@@ -2,7 +2,7 @@#include <linux/pci.h> #include <asm/pci-direct.h> #include <asm/io.h> -#include "pci.h" +#include <asm/pci_x86.h> /* Direct PCI access. This is used for PCI accesses in early boot before the PCI subsystem works. */
arch/x86/pci/fixup.c +1 -2
@@ -6,8 +6,7 @@#include <linux/dmi.h> #include <linux/pci.h> #include <linux/init.h> -#include "pci.h" - +#include <asm/pci_x86.h> static void __devinit pci_fixup_i450nx (struct pci_dev *d) {
arch/x86/pci/i386.c +1 -1
@@ -34,8 +34,8 @@#include <asm/pat.h> #include <asm/e820.h> +#include <asm/pci_x86.h> -#include "pci.h" static int skip_isa_ioresource_align (struct pci_dev *dev) {
arch/x86/pci/init.c +1 -1
@@ -1,6 +1,6 @@#include <linux/pci.h> #include <linux/init.h> -#include "pci.h" +#include <asm/pci_x86.h> /* arch_initcall has too random ordering, so call the initializers in the right sequence from here. */
arch/x86/pci/irq.c +1 -2
@@ -16,8 +16,7 @@#include <asm/io_apic.h> #include <linux/irq.h> #include <linux/acpi.h> - -#include "pci.h" +#include <asm/pci_x86.h> #define PIRQ_SIGNATURE (('$' << 0) + ('P' << 8) + ('I' << 16) + ('R' << 24))#define PIRQ_VERSION 0x0100
arch/x86/pci/legacy.c +1 -1
@@ -3,7 +3,7 @@*/ #include <linux/init.h> #include <linux/pci.h> -#include "pci.h" +#include <asm/pci_x86.h> /* * Discover remaining PCI buses in case there are peer host bridges.
arch/x86/pci/mmconfig-shared.c +1 -2
@@ -15,8 +15,7 @@#include <linux/acpi.h> #include <linux/bitmap.h> #include <asm/e820.h> - -#include "pci.h" +#include <asm/pci_x86.h> /* aperture is up to 256MB but BIOS may reserve less */ #define MMCONFIG_APER_MIN (2 * 1024*1024)
arch/x86/pci/mmconfig_32.c +1 -1
@@ -13,7 +13,7 @@#include <linux/init.h> #include <linux/acpi.h> #include <asm/e820.h> -#include "pci.h" +#include <asm/pci_x86.h> /* Assume systems with more busses have correct MCFG */ #define mmcfg_virt_addr ((void __iomem *) fix_to_virt(FIX_PCIE_MCFG))
arch/x86/pci/mmconfig_64.c +1 -2
@@ -10,8 +10,7 @@#include <linux/acpi.h> #include <linux/bitmap.h> #include <asm/e820.h> - -#include "pci.h" +#include <asm/pci_x86.h> /* Static virtual mapping of the MMCONFIG aperture */ struct mmcfg_virt {
arch/x86/pci/numaq_32.c +1 -1
@@ -7,7 +7,7 @@#include <linux/nodemask.h> #include <mach_apic.h> #include <asm/mpspec.h> -#include "pci.h" +#include <asm/pci_x86.h> #define XQUAD_PORTIO_BASE 0xfe400000#define XQUAD_PORTIO_QUAD 0x40000/* 256k per quad. */
arch/x86/pci/olpc.c +1 -1
@@ -29,7 +29,7 @@#include <linux/init.h> #include <asm/olpc.h> #include <asm/geode.h> -#include "pci.h" +#include <asm/pci_x86.h> /* * In the tables below, the first two line (8 longwords) are the
arch/x86/pci/pcbios.c +2 -3
@@ -6,9 +6,8 @@#include <linux/init.h> #include <linux/module.h> #include <linux/uaccess.h> -#include "pci.h" -#include "pci-functions.h" - +#include <asm/pci_x86.h> +#include <asm/mach-default/pci-functions.h> /* BIOS32 signature: "_32_" */ #define BIOS32_SIGNATURE (('_' << 0) + ('3' << 8) + ('2' << 16) + ('_' << 24))
arch/x86/pci/pci.h deleted +0 -162
162 lines not on this page · raw message
arch/x86/pci/visws.c +1 -2
@@ -9,11 +9,10 @@#include <linux/init.h> #include <asm/setup.h> +#include <asm/pci_x86.h> #include <asm/visws/cobalt.h> #include <asm/visws/lithium.h> -#include "pci.h" -static int pci_visws_enable_irq (struct pci_dev *dev) {return 0 ; }static void pci_visws_disable_irq (struct pci_dev *dev) { }
Signature · 1 line
1.5.5.1
Quoted 1 line · Jaswinder Singh Rajput
Impact: cleanup,
arch/x86/pci/pci.h->arch/x86/include/asm/pci_x86.h
And this is done for what?
Quoted 4 lines · Alexey Dobriyan
Quoted 1 line · Jaswinder Singh Rajput
Impact: cleanup,
arch/x86/pci/pci.h->arch/x86/include/asm/pci_x86.hAnd this is done for what?
Don't you think arch/x86/pci/pci.h looks ugly it should be in arch/x86/incluse/asm directory ?
It was suggested by Ingo :
http://marc.info/?l=linux-kernel&m=123037395221921&w=2
I think Ingo will have more valid reasons to satisfy your curiousity ;-)
Thank you,
JSR
Quoted 8 lines · Jaswinder Singh Rajput
Quoted 4 lines · Alexey Dobriyan
Quoted 1 line · Jaswinder Singh Rajput
Impact: cleanup,
arch/x86/pci/pci.h->arch/x86/include/asm/pci_x86.hAnd this is done for what?
Don't you think arch/x86/pci/pci.h looks ugly it should be in
arch/x86/incluse/asmdirectory ?
It was
#include "../pci/pci.h"
which can look ugly, not full path.
Anyway, you want to put you question into changelog?
Quoted 4 lines
It was suggested by Ingo :
http://marc.info/?l=linux-kernel&m=123037395221921&w=2I think Ingo will have more valid reasons to satisfy your curiousity ;-)
So you don't actually have an opinion? Why are you sending patch then?
> could you send another patch that moves arch/x86/pci/pci.h to > arch/x86/include/asm/pci_x86.h ^^^ ^^^
Or should it be arch/x86/include/asm/pci.h ?
Quoted 8 lines · Alexey Dobriyan
So you don't actually have an opinion? Why are you sending patch then?
> could you send another patch that moves arch/x86/pci/pci.h to > arch/x86/include/asm/pci_x86.h ^^^ ^^^Or should it be
arch/x86/include/asm/pci.h?
<asm/pci.h> already exists, though. This file contains definitions private to the x86 implementation, whereas <asm/pci.h> contains arch implementations of panarchitectural interfaces.
The reason for moving it was to avoid ugly ../ paths.
-hpa
Quoted 6 lines · Jaswinder Singh Rajput
Quoted 4 lines · Alexey Dobriyan
Quoted 1 line · Jaswinder Singh Rajput
Impact: cleanup,
arch/x86/pci/pci.h->arch/x86/include/asm/pci_x86.hAnd this is done for what?
Quoted 7 lines
Don't you think arch/x86/pci/pci.h looks ugly it should be in
arch/x86/incluse/asmdirectory ?It was suggested by Ingo :
http://marc.info/?l=linux-kernel&m=123037395221921&w=2I think Ingo will have more valid reasons to satisfy your curiousity ;-)
yes - the reason why i asked for that is that asm/pci.h already exists, and it is included in generic code (via linux/include/pci.h) and provides public PCI interfaces.
pci_x86.h (a'ka arch/x86/pci/pci.h) includes lowlevel x86-only internals, included from a handful PCI arch/x86/ platform .c files.
Ingo
Ingo Molnar
AppliedQuoted 22 lines · Jaswinder Singh Rajput
Impact: cleanup,
arch/x86/pci/pci.h->arch/x86/include/asm/pci_x86.hTested on:
X86_32_UP,X86_32_SMPandX86_64_SMPSigned-off-by Jaswinder Singh Rajput <[email protected]>--- arch/x86/include/asm/pci_x86.h | 165 ++++++++++++++++++++++++++++++++++++ arch/x86/kernel/mmconf-fam10h_64.c | 3 +- arch/x86/kernel/reboot.c | 3 +- arch/x86/pci/acpi.c | 2 +- arch/x86/pci/amd_bus.c | 2 +- arch/x86/pci/common.c | 3 +- arch/x86/pci/direct.c | 2 +- arch/x86/pci/early.c | 2 +- arch/x86/pci/fixup.c | 3 +- arch/x86/pci/i386.c | 2 +- arch/x86/pci/init.c | 2 +- arch/x86/pci/irq.c | 3 +- arch/x86/pci/legacy.c | 2 +- arch/x86/pci/mmconfig-shared.c | 3 +- arch/x86/pci/mmconfig_32.c | 2 +- arch/x86/pci/mmconfig_64.c | 3 +-
Quoted 8 lines
arch/x86/pci/numaq_32.c | 2 +- arch/x86/pci/olpc.c | 2 +- arch/x86/pci/pcbios.c | 5 +- arch/x86/pci/pci.h | 162 ----------------------------------- arch/x86/pci/visws.c | 3 +- 21 files changed, 185 insertions(+), 191 deletions(-) create mode 100644 arch/x86/include/asm/pci_x86.h delete mode 100644 arch/x86/pci/pci.h
applied to tip/x86/cleanups (with an expanded changelog), thanks!
Ingo
Quoted 34 lines · Ingo Molnar
Quoted 22 lines · Jaswinder Singh Rajput
Impact: cleanup,
arch/x86/pci/pci.h->arch/x86/include/asm/pci_x86.hTested on:
X86_32_UP,X86_32_SMPandX86_64_SMPSigned-off-by Jaswinder Singh Rajput <[email protected]>--- arch/x86/include/asm/pci_x86.h | 165 ++++++++++++++++++++++++++++++++++++ arch/x86/kernel/mmconf-fam10h_64.c | 3 +- arch/x86/kernel/reboot.c | 3 +- arch/x86/pci/acpi.c | 2 +- arch/x86/pci/amd_bus.c | 2 +- arch/x86/pci/common.c | 3 +- arch/x86/pci/direct.c | 2 +- arch/x86/pci/early.c | 2 +- arch/x86/pci/fixup.c | 3 +- arch/x86/pci/i386.c | 2 +- arch/x86/pci/init.c | 2 +- arch/x86/pci/irq.c | 3 +- arch/x86/pci/legacy.c | 2 +- arch/x86/pci/mmconfig-shared.c | 3 +- arch/x86/pci/mmconfig_32.c | 2 +- arch/x86/pci/mmconfig_64.c | 3 +-Quoted 8 lines
arch/x86/pci/numaq_32.c | 2 +- arch/x86/pci/olpc.c | 2 +- arch/x86/pci/pcbios.c | 5 +- arch/x86/pci/pci.h | 162 ----------------------------------- arch/x86/pci/visws.c | 3 +- 21 files changed, 185 insertions(+), 191 deletions(-) create mode 100644 arch/x86/include/asm/pci_x86.h delete mode 100644 arch/x86/pci/pci.h
Quoted 1 line
applied to tip/x86/cleanups (with an expanded changelog), thanks!
btw., you missed to update a couple of places - pci/pci.h was used outside of arch/x86 as well. Updated patch below.
Ingo
---------------->
Quoted 1 line
From
54a090abe7cb85c724305124f57d2570b7e9adf1Mon Sep 17 00:00:00 2001
From: Jaswinder Singh Rajput <[email protected]>
Date: Sat, 27 Dec 2008 18:32:28 +0530
Subject: [PATCH] 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
--- arch/x86/include/asm/pci_x86.h | 165 ++++++++++++++++++++++++++++++++++++ arch/x86/kernel/mmconf-fam10h_64.c | 3 +- arch/x86/kernel/reboot.c | 3 +- arch/x86/pci/acpi.c | 2 +- arch/x86/pci/amd_bus.c | 2 +- arch/x86/pci/common.c | 3 +- arch/x86/pci/direct.c | 2 +- arch/x86/pci/early.c | 2 +- arch/x86/pci/fixup.c | 3 +- arch/x86/pci/i386.c | 2 +- arch/x86/pci/init.c | 2 +- arch/x86/pci/irq.c | 3 +- arch/x86/pci/legacy.c | 2 +- arch/x86/pci/mmconfig-shared.c | 3 +- arch/x86/pci/mmconfig_32.c | 2 +- arch/x86/pci/mmconfig_64.c | 3 +- arch/x86/pci/numaq_32.c | 2 +- arch/x86/pci/olpc.c | 2 +- arch/x86/pci/pcbios.c | 5 +- arch/x86/pci/pci.h | 162 ----------------------------------- arch/x86/pci/visws.c | 3 +- drivers/pci/hotplug/cpqphp_core.c | 2 +- drivers/pci/hotplug/cpqphp_pci.c | 2 +- drivers/pci/hotplug/ibmphp_core.c | 2 +- 24 files changed, 188 insertions(+), 194 deletions(-)
arch/x86/include/asm/pci_x86.h new file +165 -0
@@ -0,0 +1,165 @@ +/* +* Low-Level PCI Access for i386 machines. +* +* (c) 1999 Martin Mares <[email protected]> +*/ + +#undef DEBUG + +#ifdef DEBUG +#define DBG(x...) printk(x) +#else +#define DBG(x...) +#endif + +#define PCI_PROBE_BIOS 0x0001 +#define PCI_PROBE_CONF1 0x0002 +#define PCI_PROBE_CONF2 0x0004 +#define PCI_PROBE_MMCONF 0x0008 +#define PCI_PROBE_MASK 0x000f +#define PCI_PROBE_NOEARLY 0x0010 + +#define PCI_NO_CHECKS 0x0400 +#define PCI_USE_PIRQ_MASK 0x0800 +#define PCI_ASSIGN_ROMS 0x1000 +#define PCI_BIOS_IRQ_SCAN 0x2000 +#define PCI_ASSIGN_ALL_BUSSES 0x4000 +#define PCI_CAN_SKIP_ISA_ALIGN 0x8000 +#define PCI_USE__CRS 0x10000 +#define PCI_CHECK_ENABLE_AMD_MMCONF 0x20000 +#define PCI_HAS_IO_ECS 0x40000 +#define PCI_NOASSIGN_ROMS 0x80000 + +extern unsigned int pci_probe; +extern unsigned long pirq_table_addr; + +enum pci_bf_sort_state { + pci_bf_sort_default, + pci_force_nobf, + pci_force_bf, + pci_dmi_bf, +}; + +/* pci-i386.c */ + +extern unsigned int pcibios_max_latency; + +void pcibios_resource_survey (void ); + +/* pci-pc.c */ + +extern int pcibios_last_bus; +extern struct pci_bus *pci_root_bus; +extern struct pci_ops pci_root_ops; + +/* pci-irq.c */ + +struct irq_info { +u8 bus, devfn;/* Bus, device and function */ +struct { +u8 link;/* IRQ line ID, chipset dependent, +0 = not routed */ +u16 bitmap;/* Available IRQs */ + } __attribute__((packed)) irq[4 ]; +u8 slot;/* Slot number, 0=onboard */ +u8 rfu; +} __attribute__((packed)); + +struct irq_routing_table { +u32 signature;/* PIRQ_SIGNATURE should be here */ +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 */ +u32 miniport_data;/* Crap */ +u8 rfu[11 ]; +u8 checksum;/* Modulo 256 checksum must give 0 */ +struct irq_info slots[0 ]; +} __attribute__((packed)); + +extern unsigned int pcibios_irq_mask; + +extern int pcibios_scanned; +extern spinlock_t pci_config_lock; + +extern int (*pcibios_enable_irq)(struct pci_dev *dev); +extern void (*pcibios_disable_irq)(struct pci_dev *dev); + +struct pci_raw_ops { +int (*read)(unsigned int domain,unsigned int bus,unsigned int devfn, +int reg,int len,u32 *val); +int (*write)(unsigned int domain,unsigned int bus,unsigned int devfn, +int reg,int len,u32 val); +}; + +extern struct pci_raw_ops *raw_pci_ops; +extern struct pci_raw_ops *raw_pci_ext_ops; + +extern struct pci_raw_ops pci_direct_conf1; +extern bool port_cf9_safe; + +/* arch_initcall level */ +extern int pci_direct_probe (void ); +extern void pci_direct_init (int type); +extern void pci_pcbios_init (void ); +extern int pci_olpc_init (void ); +extern void __init dmi_check_pciprobe (void ); +extern void __init dmi_check_skip_isa_align (void ); + +/* some common used subsys_initcalls */ +extern int __init pci_acpi_init (void ); +extern int __init pcibios_irq_init (void ); +extern int __init pci_visws_init (void ); +extern int __init pci_numaq_init (void ); +extern int __init pcibios_init (void ); + +/* pci-mmconfig.c */ + +extern int __init pci_mmcfg_arch_init (void ); +extern void __init pci_mmcfg_arch_free (void ); + +/* +* AMD Fam10h CPUs are buggy, and cannot access MMIO config space +* on their northbrige except through the * %eax register. As such, you MUST +* NOT use normal IOMEM accesses, you need to only use the magic mmio-config +* accessor functions. +* In fact just use pci_config_*, nothing else please. +*/ +static inline unsigned char mmio_config_readb (void __iomem *pos) +{ +u8 val; + asmvolatile ("movb (%1),%%al" :"=a" (val) :"r" (pos)); +return val; +} + +static inline unsigned short mmio_config_readw (void __iomem *pos) +{ +u16 val; + asmvolatile ("movw (%1),%%ax" :"=a" (val) :"r" (pos)); +return val; +} + +static inline unsigned int mmio_config_readl (void __iomem *pos) +{ +u32 val; + asmvolatile ("movl (%1),%%eax" :"=a" (val) :"r" (pos)); +return val; +} + +static inline void mmio_config_writeb (void __iomem *pos,u8 val) +{ + asmvolatile ("movb %%al,(%1)" : :"a" (val),"r" (pos) :"memory" ); +} + +static inline void mmio_config_writew (void __iomem *pos,u16 val) +{ + asmvolatile ("movw %%ax,(%1)" : :"a" (val),"r" (pos) :"memory" ); +} + +static inline void mmio_config_writel (void __iomem *pos,u32 val) +{ + asmvolatile ("movl %%eax,(%1)" : :"a" (val),"r" (pos) :"memory" ); +}
arch/x86/kernel/mmconf-fam10h_64.c +1 -2
@@ -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
@@ -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
@@ -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
@@ -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>
arch/x86/pci/common.c +1 -2
@@ -14,8 +14,7 @@#include <asm/segment.h> #include <asm/io.h> #include <asm/smp.h> - -#include "pci.h" +#include <asm/pci_x86.h> unsigned int pci_probe =PCI_PROBE_BIOS |PCI_PROBE_CONF1 |PCI_PROBE_CONF2 |PCI_PROBE_MMCONF ;
arch/x86/pci/direct.c +1 -1
@@ -5,7 +5,7 @@#include <linux/pci.h> #include <linux/init.h> #include <linux/dmi.h> -#include "pci.h" +#include <asm/pci_x86.h> /* * Functions for accessing PCI base (first 256 bytes) and extended
arch/x86/pci/early.c +1 -1
@@ -2,7 +2,7 @@#include <linux/pci.h> #include <asm/pci-direct.h> #include <asm/io.h> -#include "pci.h" +#include <asm/pci_x86.h> /* Direct PCI access. This is used for PCI accesses in early boot before the PCI subsystem works. */
arch/x86/pci/fixup.c +1 -2
@@ -6,8 +6,7 @@#include <linux/dmi.h> #include <linux/pci.h> #include <linux/init.h> -#include "pci.h" - +#include <asm/pci_x86.h> static void __devinit pci_fixup_i450nx (struct pci_dev *d) {
arch/x86/pci/i386.c +1 -1
@@ -34,8 +34,8 @@#include <asm/pat.h> #include <asm/e820.h> +#include <asm/pci_x86.h> -#include "pci.h" static int skip_isa_ioresource_align (struct pci_dev *dev) {
arch/x86/pci/init.c +1 -1
@@ -1,6 +1,6 @@#include <linux/pci.h> #include <linux/init.h> -#include "pci.h" +#include <asm/pci_x86.h> /* arch_initcall has too random ordering, so call the initializers in the right sequence from here. */
arch/x86/pci/irq.c +1 -2
@@ -16,8 +16,7 @@#include <asm/io_apic.h> #include <linux/irq.h> #include <linux/acpi.h> - -#include "pci.h" +#include <asm/pci_x86.h> #define PIRQ_SIGNATURE (('$' << 0) + ('P' << 8) + ('I' << 16) + ('R' << 24))#define PIRQ_VERSION 0x0100
arch/x86/pci/legacy.c +1 -1
@@ -3,7 +3,7 @@*/ #include <linux/init.h> #include <linux/pci.h> -#include "pci.h" +#include <asm/pci_x86.h> /* * Discover remaining PCI buses in case there are peer host bridges.
arch/x86/pci/mmconfig-shared.c +1 -2
@@ -15,8 +15,7 @@#include <linux/acpi.h> #include <linux/bitmap.h> #include <asm/e820.h> - -#include "pci.h" +#include <asm/pci_x86.h> /* aperture is up to 256MB but BIOS may reserve less */ #define MMCONFIG_APER_MIN (2 * 1024*1024)
arch/x86/pci/mmconfig_32.c +1 -1
@@ -13,7 +13,7 @@#include <linux/init.h> #include <linux/acpi.h> #include <asm/e820.h> -#include "pci.h" +#include <asm/pci_x86.h> /* Assume systems with more busses have correct MCFG */ #define mmcfg_virt_addr ((void __iomem *) fix_to_virt(FIX_PCIE_MCFG))
arch/x86/pci/mmconfig_64.c +1 -2
@@ -10,8 +10,7 @@#include <linux/acpi.h> #include <linux/bitmap.h> #include <asm/e820.h> - -#include "pci.h" +#include <asm/pci_x86.h> /* Static virtual mapping of the MMCONFIG aperture */ struct mmcfg_virt {
arch/x86/pci/numaq_32.c +1 -1
@@ -7,7 +7,7 @@#include <linux/nodemask.h> #include <mach_apic.h> #include <asm/mpspec.h> -#include "pci.h" +#include <asm/pci_x86.h> #define XQUAD_PORTIO_BASE 0xfe400000#define XQUAD_PORTIO_QUAD 0x40000/* 256k per quad. */
arch/x86/pci/olpc.c +1 -1
@@ -29,7 +29,7 @@#include <linux/init.h> #include <asm/olpc.h> #include <asm/geode.h> -#include "pci.h" +#include <asm/pci_x86.h> /* * In the tables below, the first two line (8 longwords) are the
arch/x86/pci/pcbios.c +2 -3
@@ -6,9 +6,8 @@#include <linux/init.h> #include <linux/module.h> #include <linux/uaccess.h> -#include "pci.h" -#include "pci-functions.h" - +#include <asm/pci_x86.h> +#include <asm/mach-default/pci-functions.h> /* BIOS32 signature: "_32_" */ #define BIOS32_SIGNATURE (('_' << 0) + ('3' << 8) + ('2' << 16) + ('_' << 24))
arch/x86/pci/pci.h deleted +0 -162
162 lines not on this page · raw message
arch/x86/pci/visws.c +1 -2
@@ -9,11 +9,10 @@#include <linux/init.h> #include <asm/setup.h> +#include <asm/pci_x86.h> #include <asm/visws/cobalt.h> #include <asm/visws/lithium.h> -#include "pci.h" -static int pci_visws_enable_irq (struct pci_dev *dev) {return 0 ; }static void pci_visws_disable_irq (struct pci_dev *dev) { }
drivers/pci/hotplug/cpqphp_core.c +1 -1
@@ -45,7 +45,7 @@#include "cpqphp.h" #include "cpqphp_nvram.h" -#include "../../../arch/x86/pci/pci.h" /* horrible hack showing how processor dependent we are... */ +#include <asm/pci_x86.h> /* Global variables */
drivers/pci/hotplug/cpqphp_pci.c +1 -1
@@ -37,7 +37,7 @@#include "../pci.h" #include "cpqphp.h" #include "cpqphp_nvram.h" -#include "../../../arch/x86/pci/pci.h" /* horrible hack showing how processor dependent we are... */ +#include <asm/pci_x86.h> u8 cpqhp_nic_irq;
drivers/pci/hotplug/ibmphp_core.c +1 -1
@@ -35,7 +35,7 @@#include <linux/delay.h> #include <linux/wait.h> #include "../pci.h" -#include "../../../arch/x86/pci/pci.h" /* for struct irq_routing_table */ +#include <asm/pci_x86.h> /* for struct irq_routing_table */ #include "ibmphp.h" #define attn_on (sl) ibmphp_hpc_writeslot (sl, HPC_SLOT_ATTNON)
Hello Ingo,
Quoted 5 lines · Ingo Molnar
* Ingo Molnar <[email protected]> wrote:
btw., you missed to update a couple of places -
pci/pci.hwas used outside ofarch/x86as well. Updated patch below.
Ahh, I will be more careful next time.
Thanks for your kindness :-)
JSR
Quoted 41 lines
btw., you missed to update a couple of places -
pci/pci.hwas used outside ofarch/x86as well. Updated patch below.Ingo
---------------->
Quoted 1 line
From
54a090abe7cb85c724305124f57d2570b7e9adf1Mon Sep 17 00:00:00 2001From: Jaswinder Singh Rajput <[email protected]>
Date: Sat, 27 Dec 2008 18:32:28 +0530
Subject: [PATCH] x86, pci: movearch/x86/pci/pci.htoarch/x86/include/asm/pci_x86.hImpact: cleanup
Now that
arch/x86/pci/pci.his 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 existingarch/x86/include/asm/pci.hfile, which provides public details about x86 PCI)Tested on:
X86_32_UP,X86_32_SMPandX86_64_SMPSigned-off-by Jaswinder Singh Rajput <[email protected]>Signed-off-by Ingo Molnar <[email protected]>--- arch/x86/include/asm/pci_x86.h | 165 ++++++++++++++++++++++++++++++++++++ arch/x86/kernel/mmconf-fam10h_64.c | 3 +- arch/x86/kernel/reboot.c | 3 +- arch/x86/pci/acpi.c | 2 +- arch/x86/pci/amd_bus.c | 2 +- arch/x86/pci/common.c | 3 +- arch/x86/pci/direct.c | 2 +- arch/x86/pci/early.c | 2 +- arch/x86/pci/fixup.c | 3 +- arch/x86/pci/i386.c | 2 +- arch/x86/pci/init.c | 2 +- arch/x86/pci/irq.c | 3 +- arch/x86/pci/legacy.c | 2 +- arch/x86/pci/mmconfig-shared.c | 3 +- arch/x86/pci/mmconfig_32.c | 2 +- arch/x86/pci/mmconfig_64.c | 3 +- arch/x86/pci/numaq_32.c | 2 +-
Quoted 8 lines
arch/x86/pci/olpc.c | 2 +- arch/x86/pci/pcbios.c | 5 +- arch/x86/pci/pci.h | 162 ----------------------------------- arch/x86/pci/visws.c | 3 +- drivers/pci/hotplug/cpqphp_core.c | 2 +- drivers/pci/hotplug/cpqphp_pci.c | 2 +- drivers/pci/hotplug/ibmphp_core.c | 2 +- 24 files changed, 188 insertions(+), 194 deletions(-)
You should teach your script to use:
git format-patch -M -B -C
With -M -B -C you get a much better picture of what happens when you rename files like in this patch (and copy them).
Sam
Quoted 50 lines · Sam Ravnborg
Quoted 41 lines
btw., you missed to update a couple of places -
pci/pci.hwas used outside ofarch/x86as well. Updated patch below.Ingo
---------------->
Quoted 1 line
From
54a090abe7cb85c724305124f57d2570b7e9adf1Mon Sep 17 00:00:00 2001From: Jaswinder Singh Rajput <[email protected]>
Date: Sat, 27 Dec 2008 18:32:28 +0530
Subject: [PATCH] x86, pci: movearch/x86/pci/pci.htoarch/x86/include/asm/pci_x86.hImpact: cleanup
Now that
arch/x86/pci/pci.his 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 existingarch/x86/include/asm/pci.hfile, which provides public details about x86 PCI)Tested on:
X86_32_UP,X86_32_SMPandX86_64_SMPSigned-off-by Jaswinder Singh Rajput <[email protected]>Signed-off-by Ingo Molnar <[email protected]>--- arch/x86/include/asm/pci_x86.h | 165 ++++++++++++++++++++++++++++++++++++ arch/x86/kernel/mmconf-fam10h_64.c | 3 +- arch/x86/kernel/reboot.c | 3 +- arch/x86/pci/acpi.c | 2 +- arch/x86/pci/amd_bus.c | 2 +- arch/x86/pci/common.c | 3 +- arch/x86/pci/direct.c | 2 +- arch/x86/pci/early.c | 2 +- arch/x86/pci/fixup.c | 3 +- arch/x86/pci/i386.c | 2 +- arch/x86/pci/init.c | 2 +- arch/x86/pci/irq.c | 3 +- arch/x86/pci/legacy.c | 2 +- arch/x86/pci/mmconfig-shared.c | 3 +- arch/x86/pci/mmconfig_32.c | 2 +- arch/x86/pci/mmconfig_64.c | 3 +- arch/x86/pci/numaq_32.c | 2 +-Quoted 8 lines
arch/x86/pci/olpc.c | 2 +- arch/x86/pci/pcbios.c | 5 +- arch/x86/pci/pci.h | 162 ----------------------------------- arch/x86/pci/visws.c | 3 +- drivers/pci/hotplug/cpqphp_core.c | 2 +- drivers/pci/hotplug/cpqphp_pci.c | 2 +- drivers/pci/hotplug/ibmphp_core.c | 2 +- 24 files changed, 188 insertions(+), 194 deletions(-)
Quoted 5 lines
You should teach your script to use:
git format-patch -M -B -CWith -M -B -C you get a much better picture of what happens when you rename files like in this patch (and copy them).
you mean:
git format-patch --stdout -1 -M -B -C <sha1>
(otherwise people trying this out will be faced with git creating all commits way back to the beginnings of time, as patches in their current directory ;-)
Ingo
Quoted 56 lines · Ingo Molnar
Quoted 53 lines · Sam Ravnborg
Quoted 41 lines
btw., you missed to update a couple of places -
pci/pci.hwas used outside ofarch/x86as well. Updated patch below.Ingo
---------------->
Quoted 1 line
From
54a090abe7cb85c724305124f57d2570b7e9adf1Mon Sep 17 00:00:00 2001From: Jaswinder Singh Rajput <[email protected]>
Date: Sat, 27 Dec 2008 18:32:28 +0530
Subject: [PATCH] x86, pci: movearch/x86/pci/pci.htoarch/x86/include/asm/pci_x86.hImpact: cleanup
Now that
arch/x86/pci/pci.his 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 existingarch/x86/include/asm/pci.hfile, which provides public details about x86 PCI)Tested on:
X86_32_UP,X86_32_SMPandX86_64_SMPSigned-off-by Jaswinder Singh Rajput <[email protected]>Signed-off-by Ingo Molnar <[email protected]>--- arch/x86/include/asm/pci_x86.h | 165 ++++++++++++++++++++++++++++++++++++ arch/x86/kernel/mmconf-fam10h_64.c | 3 +- arch/x86/kernel/reboot.c | 3 +- arch/x86/pci/acpi.c | 2 +- arch/x86/pci/amd_bus.c | 2 +- arch/x86/pci/common.c | 3 +- arch/x86/pci/direct.c | 2 +- arch/x86/pci/early.c | 2 +- arch/x86/pci/fixup.c | 3 +- arch/x86/pci/i386.c | 2 +- arch/x86/pci/init.c | 2 +- arch/x86/pci/irq.c | 3 +- arch/x86/pci/legacy.c | 2 +- arch/x86/pci/mmconfig-shared.c | 3 +- arch/x86/pci/mmconfig_32.c | 2 +- arch/x86/pci/mmconfig_64.c | 3 +- arch/x86/pci/numaq_32.c | 2 +-Quoted 8 lines
arch/x86/pci/olpc.c | 2 +- arch/x86/pci/pcbios.c | 5 +- arch/x86/pci/pci.h | 162 ----------------------------------- arch/x86/pci/visws.c | 3 +- drivers/pci/hotplug/cpqphp_core.c | 2 +- drivers/pci/hotplug/cpqphp_pci.c | 2 +- drivers/pci/hotplug/ibmphp_core.c | 2 +- 24 files changed, 188 insertions(+), 194 deletions(-)You should teach your script to use:
git format-patch -M -B -C
Quoted 6 lines
Quoted 2 lines
With -M -B -C you get a much better picture of what happens when you rename files like in this patch (and copy them).
you mean:
git format-patch --stdout -1 -M -B -C <sha1>
also, this does not result in a patch that will be applied properly by the usual patch-tools that people use when they pick up patches from email. So i'll just keep my old script ;-)
Ingo
Quoted 7 lines
Quoted 3 lines
you mean:
git format-patch --stdout -1 -M -B -C <sha1>also, this does not result in a patch that will be applied properly by the usual patch-tools that people use when they pick up patches from email. So i'll just keep my old script ;-)
I sometimes forget about the stoneage....
Sam
Quoted 9 lines · Sam Ravnborg
Quoted 7 lines
Quoted 3 lines
you mean:
git format-patch --stdout -1 -M -B -C <sha1>also, this does not result in a patch that will be applied properly by the usual patch-tools that people use when they pick up patches from email. So i'll just keep my old script ;-)
I sometimes forget about the stoneage....
well applying a (throw-away) patch from email for a specific problem is often much handier than to go hunting for git trees and trying to merge them or cherry-pick from them. Even for the Git addicted ;-)
Ingo