pci-mmconfig for 2.6.3-rc1
PATCH 1/1 pci-mmconfig for 2.6.3-rc1
Another round of the MMCONFIG patch. Changes since last time ...
- Updated to 2.6.3-rc1.
- Don't complain about missing MCFG table (Len Brown's suggestion).
- Don't try to reserve the memory region as the BIOS must mark it reserved anyway so we don't try to allocate over the top of it. (Thanks to Sundar)
- Adds pci_find_ext_capability() so we can look for the Extended Capabilities documented in the specs.
Compile-tested only.
arch/i386/Kconfig +16 -6
@@ -1030,12 +1030,16 @@ config PCI_GOBIOS PCI-based systems don't have any BIOS at all. Linux can also try to detect the PCI hardware directly without using the BIOS. - With this option, you can specify how Linux should detect the PCI - devices. If you choose "BIOS", the BIOS will be used, if you choose - "Direct", the BIOS won't be used, and if you choose "Any", the - kernel will try the direct access method and falls back to the BIOS - if that doesn't work. If unsure, go with the default, which is - "Any". + With this option, you can specify how Linux should detect the + PCI devices. If you choose "BIOS", the BIOS will be used, + if you choose "Direct", the BIOS won't be used, and if you + choose "MMConfig", then PCI Express MMCONFIG will be used. + If you choose "Any", the kernel will try MMCONFIG, then the + direct access method and falls back to the BIOS if that doesn't + work. If unsure, go with the default, which is "Any". + +config PCI_GOMMCONFIG + bool "MMConfig" config PCI_GODIRECT bool "Direct"
@@ -1055,6 +1059,12 @@ config PCI_DIRECT depends on PCI && ((PCI_GODIRECT || PCI_GOANY) || X86_VISWS) default y +config PCI_MMCONFIG + bool + depends on PCI && (PCI_GOMMCONFIG || PCI_GOANY) + select ACPI_BOOT + default y + config PCI_USE_VECTOR bool "Vector-based interrupt indexing" depends on X86_LOCAL_APIC && X86_IO_APIC
arch/i386/kernel/acpi/boot.c +34 -0
@@ -95,6 +95,31 @@ char *__acpi_map_table(unsigned long phy } +#ifdef CONFIG_PCI_MMCONFIG +static int __init acpi_parse_mcfg (unsigned long phys_addr,unsigned long size) +{ +struct acpi_table_mcfg *mcfg; + +if (!phys_addr || !size) +return -EINVAL ; + + mcfg = (struct acpi_table_mcfg *)__acpi_map_table (phys_addr, size); +if (!mcfg) { + printk(KERN_WARNING PREFIX "Unable to map MCFG\n"); +return -ENODEV ; + } + +if (mcfg->base_reserved) { + printk(KERN_ERR PREFIX "MMCONFIG not in low 4GB of memory\n"); +return -ENODEV ; + } + + pci_mmcfg_base_addr = mcfg->base_address; + +return 0 ; +} +#endif /* CONFIG_PCI_MMCONFIG */ +#ifdef CONFIG_X86_LOCAL_APIC static u64 acpi_lapic_addr__initdata =APIC_DEFAULT_PHYS_BASE ;
@@ -563,6 +588,15 @@ acpi_boot_init (void)#endif /* CONFIG_X86_IO_APIC && CONFIG_ACPI_INTERPRETER */ +#ifdef CONFIG_PCI_MMCONFIG + result =acpi_table_parse (ACPI_MCFG , acpi_parse_mcfg); +if (result <0 ) { + printk(KERN_ERR PREFIX "Error %d parsing MCFG\n", result); + }else if (result >1 ) { + printk(KERN_WARNING PREFIX "Multiple MCFG tables exist\n"); + } +#endif /* CONFIG_PCI_MMCONFIG */ +#ifdef CONFIG_X86_LOCAL_APIC if (acpi_lapic && acpi_ioapic) { smp_found_config =1 ;
arch/i386/pci/Makefile +1 -0
@@ -1,6 +1,7 @@ obj-y := i386.o obj-$(CONFIG_PCI_BIOS) += pcbios.o +obj-$(CONFIG_PCI_MMCONFIG) += mmconfig.o obj-$(CONFIG_PCI_DIRECT) += direct.o pci-y := fixup.o
arch/i386/pci/common.c +8 -1
@@ -20,7 +20,8 @@extern void pcibios_sort (void );#endif -unsigned int pci_probe =PCI_PROBE_BIOS |PCI_PROBE_CONF1 |PCI_PROBE_CONF2 ; +unsigned int pci_probe =PCI_PROBE_BIOS |PCI_PROBE_CONF1 |PCI_PROBE_CONF2 | +PCI_PROBE_MMCONF ;int pcibios_last_bus =-1 ;struct pci_bus *pci_root_bus =NULL ;
@@ -198,6 +199,12 @@ char * __devinit pcibios_setup(char *streturn NULL ; }#endif +#ifdef CONFIG_PCI_MMCONFIG + else if (!strcmp(str, "nommconf")) { + pci_probe &= ~PCI_PROBE_MMCONF ; +return NULL ; + } +#endif else if (!strcmp(str, "noacpi")) {acpi_noirq_set ();return NULL ;
arch/i386/pci/mmconfig.c +109 -0
109 lines not on this page · raw message
arch/i386/pci/pci.h +3 -0
@@ -15,6 +15,9 @@#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_NO_SORT 0x0100#define PCI_BIOS_SORT 0x0200#define PCI_NO_CHECKS 0x0400
arch/ia64/pci/pci.c +17 -6
@@ -55,8 +55,11 @@ struct pci_fixup pcibios_fixups[1];#define PCI_SAL_ADDRESS (seg, bus, devfn, reg) \ ((u64)(seg << 24) | (u64)(bus << 16) | \ - (u64)(devfn << 8) | (u64)(reg)) + (u64)(devfn << 8) | (u64)(reg)), 0 +#define PCI_SAL_EXT_ADDRESS (seg, bus, devfn, reg) \ + ((u64)(seg << 28) | (u64)(bus << 20) | \ + (u64)(devfn << 12) | (u64)(reg)), 1static int pci_sal_read (int seg,int bus,int devfn,int reg,int len,u32 *value)
@@ -64,10 +67,14 @@ pci_sal_read (int seg, int bus, int devfint result =0 ;u64 data =0 ; -if (!value || (seg >255 ) || (bus >255 ) || (devfn >255 ) || (reg >255 )) +if (!value || (seg >65535 ) || (bus >255 ) || (devfn >255 ) || (reg >4095 ))return -EINVAL ; - result =ia64_sal_pci_config_read (PCI_SAL_ADDRESS (seg, bus, devfn, reg), len, &data); +if ((seg <256 ) && (reg <256 )) { + result =ia64_sal_pci_config_read (PCI_SAL_ADDRESS (seg, bus, devfn, reg), len, &data); + }else { + result =ia64_sal_pci_config_read (PCI_SAL_EXT_ADDRESS (seg, bus, devfn, reg), len, &data); + } *value = (u32 ) data;
@@ -77,13 +84,17 @@ pci_sal_read (int seg, int bus, int devfstatic int pci_sal_write (int seg,int bus,int devfn,int reg,int len,u32 value) { -if ((seg >255 ) || (bus >255 ) || (devfn >255 ) || (reg >255 )) +if ((seg >65535 ) || (bus >255 ) || (devfn >255 ) || (reg >4095 ))return -EINVAL ; -return ia64_sal_pci_config_write (PCI_SAL_ADDRESS (seg, bus, devfn, reg), len, value); +if ((seg <256 ) && (reg <256 )) { +return ia64_sal_pci_config_write (PCI_SAL_ADDRESS (seg, bus, devfn, reg), len, value); + }else { +return ia64_sal_pci_config_write (PCI_SAL_EXT_ADDRESS (seg, bus, devfn, reg), len, value); + } } -struct pci_raw_ops pci_sal_ops = { +static struct pci_raw_ops pci_sal_ops = { .read = pci_sal_read, .write = pci_sal_write };
drivers/acpi/tables.c +1 -0
@@ -58,6 +58,7 @@ static char *acpi_table_signatures[ACPI_ [ACPI_SSDT] = "SSDT", [ACPI_SPMI] = "SPMI", [ACPI_HPET] = "HPET", + [ACPI_MCFG] = "MCFG", };static char *mps_inti_flags_polarity[] = {"dfl" ,"high" ,"res" ,"low" };
drivers/pci/pci-sysfs.c +19 -5
@@ -71,7 +71,7 @@ pci_read_config(struct kobject *kobj, ch/* Several chips lock up trying to read undefined config space */ if (capable (CAP_SYS_ADMIN )) { - size =256 ; + size = dev->cfg_size; }else if (dev->hdr_type ==PCI_HEADER_TYPE_CARDBUS ) { size =128 ; }
@@ -123,10 +123,10 @@ pci_write_config(struct kobject *kobj, cunsigned int size = count;loff_t init_off = off; -if (off >256 ) +if (off > dev->cfg_size)return 0 ; -if (off + count >256 ) { - size =256 - off; +if (off + count > dev->cfg_size) { + size = dev->cfg_size - off; count = size; }
@@ -167,6 +167,16 @@ static struct bin_attribute pci_config_a .write = pci_write_config, }; +static struct bin_attribute pcie_config_attr = { + .attr = { + .name ="config" , + .mode =S_IRUGO |S_IWUSR , + }, + .size =4096 , + .read = pci_read_config, + .write = pci_write_config, +}; +void pci_create_sysfs_dev_files (struct pci_dev *pdev) {struct device *dev = &pdev->dev;
@@ -179,5 +189,9 @@ void pci_create_sysfs_dev_files (structdevice_create_file (dev, &dev_attr_class);device_create_file (dev, &dev_attr_irq);device_create_file (dev, &dev_attr_resource); -sysfs_create_bin_file (&dev->kobj, &pci_config_attr); +if (pdev->cfg_size <4096 ) { +sysfs_create_bin_file (&dev->kobj, &pci_config_attr); + }else { +sysfs_create_bin_file (&dev->kobj, &pcie_config_attr); + } }
drivers/pci/pci.c +44 -0
56 lines not on this page · raw message
drivers/pci/probe.c +17 -0
@@ -18,6 +18,8 @@#define CARDBUS_LATENCY_TIMER 176/* secondary latency timer */ #define CARDBUS_RESERVE_BUSNR 3 +#define PCI_CFG_SPACE_SIZE 256 +#define PCI_CFG_SPACE_EXP_SIZE 4096/* Ugh. Need to stop exporting this to modules. */ LIST_HEAD (pci_root_buses);
@@ -528,6 +530,20 @@ static void pci_release_dev(struct devickfree (pci_dev); } +/** +* pci_cfg_space_size - get the configuration space size of the PCI device +*/ +static int pci_cfg_space_size (struct pci_dev *dev) +{ +#ifdef CONFIG_PCI_MMCONFIG +/* Find whether the device is PCI Express */ +int is_pci_express_dev =pci_find_capability (dev,PCI_CAP_ID_EXP ); +if (is_pci_express_dev) +return PCI_CFG_SPACE_EXP_SIZE ; +#endif +return PCI_CFG_SPACE_SIZE ; +} +/* * Read the config data for a PCI device, sanity-check it * and fill in the dev structure...
@@ -564,6 +580,7 @@ pci_scan_device(struct pci_bus *bus, int dev->multifunction = !!(hdr_type &0x80 ); dev->vendor = l &0xffff ; dev->device = (l >>16 ) &0xffff ; + dev->cfg_size =pci_cfg_space_size (dev);/* Assume 32-bit PCI; let 64-bit PCI cards (which are far rarer) set this higher, assuming the system even supports it. */
drivers/pci/proc.c +13 -13
@@ -16,16 +16,15 @@#include <asm/uaccess.h> #include <asm/byteorder.h> -#define PCI_CFG_SPACE_SIZE 256 -static int proc_initialized;/* = 0 */ static loff_t proc_bus_pci_lseek (struct file *file,loff_t off,int whence) {loff_t new =-1 ; +struct inode *inode = file->f_dentry->d_inode; -down (&file->f_dentry->d_inode->i_sem); +down (&inode->i_sem);switch (whence) {case 0 : new = off;
@@ -34,14 +33,14 @@ proc_bus_pci_lseek(struct file *file, lo new = file->f_pos + off;break ;case 2 : - new =PCI_CFG_SPACE_SIZE + off; + new = inode->i_size + off;break ; } -if (new <0 || new >PCI_CFG_SPACE_SIZE ) +if (new <0 || new > inode->i_size) new = -EINVAL ;else file->f_pos = new; -up (&file->f_dentry->d_inode->i_sem); +up (&inode->i_sem);return new; }
@@ -61,7 +60,7 @@ proc_bus_pci_read(struct file *file, cha*/ if (capable (CAP_SYS_ADMIN )) - size =PCI_CFG_SPACE_SIZE ; + size = dev->cfg_size;else if (dev->hdr_type ==PCI_HEADER_TYPE_CARDBUS ) size =128 ;else
@@ -134,14 +133,15 @@ proc_bus_pci_write(struct file *file, coconst struct proc_dir_entry *dp =PDE (ino);struct pci_dev *dev = dp->data;int pos = *ppos; +int size = dev->cfg_size;int cnt; -if (pos >=PCI_CFG_SPACE_SIZE ) +if (pos >= size)return 0 ; -if (nbytes >=PCI_CFG_SPACE_SIZE ) - nbytes =PCI_CFG_SPACE_SIZE ; -if (pos + nbytes >PCI_CFG_SPACE_SIZE ) - nbytes =PCI_CFG_SPACE_SIZE - pos; +if (nbytes >= size) + nbytes = size; +if (pos + nbytes > size) + nbytes = size - pos; cnt = nbytes;if (!access_ok (VERIFY_READ , buf, cnt))
@@ -403,7 +403,7 @@ int pci_proc_attach_device(struct pci_dereturn -ENOMEM ; e->proc_fops = &proc_bus_pci_operations; e->data = dev; - e->size =PCI_CFG_SPACE_SIZE ; + e->size = dev->cfg_size;return 0 ; }
include/asm-i386/fixmap.h +3 -0
@@ -71,6 +71,9 @@ enum fixed_addresses { FIX_ACPI_BEGIN, FIX_ACPI_END = FIX_ACPI_BEGIN + FIX_ACPI_PAGES - 1,#endif +#ifdef CONFIG_PCI_MMCONFIG + FIX_PCIE_MCFG, +#endif __end_of_permanent_fixed_addresses,/* temporary boot-time mappings, used before ioremap() is functional */ #define NR_FIX_BTMAPS 16
include/asm-ia64/sal.h +4 -4
@@ -741,10 +741,10 @@ ia64_sal_mc_set_params (u64 param_type,/* Read from PCI configuration space */ static inline s64 -ia64_sal_pci_config_read (u64 pci_config_addr,u64 size,u64 *value) +ia64_sal_pci_config_read (u64 pci_config_addr,int type,u64 size,u64 *value) {struct ia64_sal_retval isrv; -SAL_CALL (isrv,SAL_PCI_CONFIG_READ , pci_config_addr, size,0 ,0 ,0 ,0 ,0 ); +SAL_CALL (isrv,SAL_PCI_CONFIG_READ , pci_config_addr, size, type,0 ,0 ,0 ,0 );if (value) *value = isrv.v0;return isrv.status;
@@ -752,11 +752,11 @@ ia64_sal_pci_config_read (u64 pci_config/* Write to PCI configuration space */ static inline s64 -ia64_sal_pci_config_write (u64 pci_config_addr,u64 size,u64 value) +ia64_sal_pci_config_write (u64 pci_config_addr,int type,u64 size,u64 value) {struct ia64_sal_retval isrv;SAL_CALL (isrv,SAL_PCI_CONFIG_WRITE , pci_config_addr, size, value, -0 ,0 ,0 ,0 ); + type,0 ,0 ,0 );return isrv.status; }
include/linux/acpi.h +12 -0
@@ -317,6 +317,15 @@ struct acpi_table_ecdt {char ec_id[0 ]; } __attribute__ ((packed)); +/* PCI MMCONFIG */ + +struct acpi_table_mcfg { +struct acpi_table_header header; +u8 reserved[8 ]; +u32 base_address; +u32 base_reserved; +} __attribute__ ((packed)); +/* Table Handlers */ enum acpi_table_id {
@@ -338,6 +347,7 @@ enum acpi_table_id {ACPI_SSDT ,ACPI_SPMI ,ACPI_HPET , +ACPI_MCFG , ACPI_TABLE_COUNT };
@@ -369,6 +379,8 @@ void acpi_numa_arch_fixup(void);extern int acpi_mp_config; +extern u32 pci_mmcfg_base_addr; +#else /*!CONFIG_ACPI_BOOT*/ #define acpi_mp_config 0
include/linux/pci.h +44 -0
68 lines not on this page · raw message
Signature · 6 lines
"Next the statesmen will invent cheap lies, putting the blame upon the nation that is attacked, and every man will be glad of those conscience-soothing falsities, and will diligently study them, and refuse to examine any refutations of them; and thus he will by and by convince himself that the war is just, and will thank God for the better sleep he enjoys after this process of grotesque self-deception." -- Mark Twain
Quoted 1 line · Matthew Wilcox
Another round of the MMCONFIG patch. Changes since last time ...
If the system has no MADT, then acpi_boot_init() will never call acpi_parse_mcfg() -- looks like that call needs to be moved up. (And yes, it seems that HPET has the same problem).
I see i386 and ia64 updates -- are they the only platforms that will support pci-express?
thanks,
-Len
Quoted 9 lines · Len Brown
Quoted 1 line · Matthew Wilcox
Another round of the MMCONFIG patch. Changes since last time ...
If the system has no MADT, then
acpi_boot_init()will never callacpi_parse_mcfg()-- looks like that call needs to be moved up. (And yes, it seems that HPET has the same problem).I see i386 and ia64 updates -- are they the only platforms that will support pci-express?
I know of some other platforms that will need pci-express support for them, but that will probably happen some time next year due to hardware availability...
I think we can only test i386 and ia64 at this time, unless someone else knows differently?
thanks,
greg k-h
Quoted 3 lines · Len Brown
If the system has no MADT, then
acpi_boot_init()will never callacpi_parse_mcfg()-- looks like that call needs to be moved up. (And yes, it seems that HPET has the same problem).
Heh. I didn't look at the preceeding code; just fixed the MCFG code to not have the same problems as it ;-)
That whole section of acpi boot is pretty scruffy. How about moving all the apic stuff into a separate function (see patch at the end of the message)?
Quoted 2 lines
I see i386 and ia64 updates -- are they the only platforms that will support pci-express?
They're the only platforms I have information about how to access PCI extended config space. Other platforms can catch up (or if people want to send me patches, I'll integrate them with this patch).
arch/i386/Kconfig +16 -6
@@ -1030,12 +1030,16 @@ config PCI_GOBIOS PCI-based systems don't have any BIOS at all. Linux can also try to detect the PCI hardware directly without using the BIOS. - With this option, you can specify how Linux should detect the PCI - devices. If you choose "BIOS", the BIOS will be used, if you choose - "Direct", the BIOS won't be used, and if you choose "Any", the - kernel will try the direct access method and falls back to the BIOS - if that doesn't work. If unsure, go with the default, which is - "Any". + With this option, you can specify how Linux should detect the + PCI devices. If you choose "BIOS", the BIOS will be used, + if you choose "Direct", the BIOS won't be used, and if you + choose "MMConfig", then PCI Express MMCONFIG will be used. + If you choose "Any", the kernel will try MMCONFIG, then the + direct access method and falls back to the BIOS if that doesn't + work. If unsure, go with the default, which is "Any". + +config PCI_GOMMCONFIG + bool "MMConfig" config PCI_GODIRECT bool "Direct"
@@ -1055,6 +1059,12 @@ config PCI_DIRECT depends on PCI && ((PCI_GODIRECT || PCI_GOANY) || X86_VISWS) default y +config PCI_MMCONFIG + bool + depends on PCI && (PCI_GOMMCONFIG || PCI_GOANY) + select ACPI_BOOT + default y + config PCI_USE_VECTOR bool "Vector-based interrupt indexing" depends on X86_LOCAL_APIC && X86_IO_APIC
arch/i386/kernel/acpi/boot.c +106 -63
215 lines not on this page · raw message
arch/i386/pci/Makefile +1 -0
@@ -1,6 +1,7 @@ obj-y := i386.o obj-$(CONFIG_PCI_BIOS) += pcbios.o +obj-$(CONFIG_PCI_MMCONFIG) += mmconfig.o obj-$(CONFIG_PCI_DIRECT) += direct.o pci-y := fixup.o
arch/i386/pci/common.c +8 -1
@@ -20,7 +20,8 @@extern void pcibios_sort (void );#endif -unsigned int pci_probe =PCI_PROBE_BIOS |PCI_PROBE_CONF1 |PCI_PROBE_CONF2 ; +unsigned int pci_probe =PCI_PROBE_BIOS |PCI_PROBE_CONF1 |PCI_PROBE_CONF2 | +PCI_PROBE_MMCONF ;int pcibios_last_bus =-1 ;struct pci_bus *pci_root_bus =NULL ;
@@ -198,6 +199,12 @@ char * __devinit pcibios_setup(char *streturn NULL ; }#endif +#ifdef CONFIG_PCI_MMCONFIG + else if (!strcmp(str, "nommconf")) { + pci_probe &= ~PCI_PROBE_MMCONF ; +return NULL ; + } +#endif else if (!strcmp(str, "noacpi")) {acpi_noirq_set ();return NULL ;
arch/i386/pci/mmconfig.c +109 -0
109 lines not on this page · raw message
arch/i386/pci/pci.h +3 -0
@@ -15,6 +15,9 @@#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_NO_SORT 0x0100#define PCI_BIOS_SORT 0x0200#define PCI_NO_CHECKS 0x0400
arch/ia64/pci/pci.c +17 -6
@@ -55,8 +55,11 @@ struct pci_fixup pcibios_fixups[1];#define PCI_SAL_ADDRESS (seg, bus, devfn, reg) \ ((u64)(seg << 24) | (u64)(bus << 16) | \ - (u64)(devfn << 8) | (u64)(reg)) + (u64)(devfn << 8) | (u64)(reg)), 0 +#define PCI_SAL_EXT_ADDRESS (seg, bus, devfn, reg) \ + ((u64)(seg << 28) | (u64)(bus << 20) | \ + (u64)(devfn << 12) | (u64)(reg)), 1static int pci_sal_read (int seg,int bus,int devfn,int reg,int len,u32 *value)
@@ -64,10 +67,14 @@ pci_sal_read (int seg, int bus, int devfint result =0 ;u64 data =0 ; -if (!value || (seg >255 ) || (bus >255 ) || (devfn >255 ) || (reg >255 )) +if (!value || (seg >65535 ) || (bus >255 ) || (devfn >255 ) || (reg >4095 ))return -EINVAL ; - result =ia64_sal_pci_config_read (PCI_SAL_ADDRESS (seg, bus, devfn, reg), len, &data); +if ((seg <256 ) && (reg <256 )) { + result =ia64_sal_pci_config_read (PCI_SAL_ADDRESS (seg, bus, devfn, reg), len, &data); + }else { + result =ia64_sal_pci_config_read (PCI_SAL_EXT_ADDRESS (seg, bus, devfn, reg), len, &data); + } *value = (u32 ) data;
@@ -77,13 +84,17 @@ pci_sal_read (int seg, int bus, int devfstatic int pci_sal_write (int seg,int bus,int devfn,int reg,int len,u32 value) { -if ((seg >255 ) || (bus >255 ) || (devfn >255 ) || (reg >255 )) +if ((seg >65535 ) || (bus >255 ) || (devfn >255 ) || (reg >4095 ))return -EINVAL ; -return ia64_sal_pci_config_write (PCI_SAL_ADDRESS (seg, bus, devfn, reg), len, value); +if ((seg <256 ) && (reg <256 )) { +return ia64_sal_pci_config_write (PCI_SAL_ADDRESS (seg, bus, devfn, reg), len, value); + }else { +return ia64_sal_pci_config_write (PCI_SAL_EXT_ADDRESS (seg, bus, devfn, reg), len, value); + } } -struct pci_raw_ops pci_sal_ops = { +static struct pci_raw_ops pci_sal_ops = { .read = pci_sal_read, .write = pci_sal_write };
drivers/acpi/tables.c +1 -0
@@ -58,6 +58,7 @@ static char *acpi_table_signatures[ACPI_ [ACPI_SSDT] = "SSDT", [ACPI_SPMI] = "SPMI", [ACPI_HPET] = "HPET", + [ACPI_MCFG] = "MCFG", };static char *mps_inti_flags_polarity[] = {"dfl" ,"high" ,"res" ,"low" };
drivers/pci/pci-sysfs.c +19 -5
@@ -71,7 +71,7 @@ pci_read_config(struct kobject *kobj, ch/* Several chips lock up trying to read undefined config space */ if (capable (CAP_SYS_ADMIN )) { - size =256 ; + size = dev->cfg_size; }else if (dev->hdr_type ==PCI_HEADER_TYPE_CARDBUS ) { size =128 ; }
@@ -123,10 +123,10 @@ pci_write_config(struct kobject *kobj, cunsigned int size = count;loff_t init_off = off; -if (off >256 ) +if (off > dev->cfg_size)return 0 ; -if (off + count >256 ) { - size =256 - off; +if (off + count > dev->cfg_size) { + size = dev->cfg_size - off; count = size; }
@@ -167,6 +167,16 @@ static struct bin_attribute pci_config_a .write = pci_write_config, }; +static struct bin_attribute pcie_config_attr = { + .attr = { + .name ="config" , + .mode =S_IRUGO |S_IWUSR , + }, + .size =4096 , + .read = pci_read_config, + .write = pci_write_config, +}; +void pci_create_sysfs_dev_files (struct pci_dev *pdev) {struct device *dev = &pdev->dev;
@@ -179,5 +189,9 @@ void pci_create_sysfs_dev_files (structdevice_create_file (dev, &dev_attr_class);device_create_file (dev, &dev_attr_irq);device_create_file (dev, &dev_attr_resource); -sysfs_create_bin_file (&dev->kobj, &pci_config_attr); +if (pdev->cfg_size <4096 ) { +sysfs_create_bin_file (&dev->kobj, &pci_config_attr); + }else { +sysfs_create_bin_file (&dev->kobj, &pcie_config_attr); + } }
drivers/pci/pci.c +44 -0
56 lines not on this page · raw message
drivers/pci/probe.c +17 -0
@@ -18,6 +18,8 @@#define CARDBUS_LATENCY_TIMER 176/* secondary latency timer */ #define CARDBUS_RESERVE_BUSNR 3 +#define PCI_CFG_SPACE_SIZE 256 +#define PCI_CFG_SPACE_EXP_SIZE 4096/* Ugh. Need to stop exporting this to modules. */ LIST_HEAD (pci_root_buses);
@@ -528,6 +530,20 @@ static void pci_release_dev(struct devickfree (pci_dev); } +/** +* pci_cfg_space_size - get the configuration space size of the PCI device +*/ +static int pci_cfg_space_size (struct pci_dev *dev) +{ +#ifdef CONFIG_PCI_MMCONFIG +/* Find whether the device is PCI Express */ +int is_pci_express_dev =pci_find_capability (dev,PCI_CAP_ID_EXP ); +if (is_pci_express_dev) +return PCI_CFG_SPACE_EXP_SIZE ; +#endif +return PCI_CFG_SPACE_SIZE ; +} +/* * Read the config data for a PCI device, sanity-check it * and fill in the dev structure...
@@ -564,6 +580,7 @@ pci_scan_device(struct pci_bus *bus, int dev->multifunction = !!(hdr_type &0x80 ); dev->vendor = l &0xffff ; dev->device = (l >>16 ) &0xffff ; + dev->cfg_size =pci_cfg_space_size (dev);/* Assume 32-bit PCI; let 64-bit PCI cards (which are far rarer) set this higher, assuming the system even supports it. */
drivers/pci/proc.c +13 -13
@@ -16,16 +16,15 @@#include <asm/uaccess.h> #include <asm/byteorder.h> -#define PCI_CFG_SPACE_SIZE 256 -static int proc_initialized;/* = 0 */ static loff_t proc_bus_pci_lseek (struct file *file,loff_t off,int whence) {loff_t new =-1 ; +struct inode *inode = file->f_dentry->d_inode; -down (&file->f_dentry->d_inode->i_sem); +down (&inode->i_sem);switch (whence) {case 0 : new = off;
@@ -34,14 +33,14 @@ proc_bus_pci_lseek(struct file *file, lo new = file->f_pos + off;break ;case 2 : - new =PCI_CFG_SPACE_SIZE + off; + new = inode->i_size + off;break ; } -if (new <0 || new >PCI_CFG_SPACE_SIZE ) +if (new <0 || new > inode->i_size) new = -EINVAL ;else file->f_pos = new; -up (&file->f_dentry->d_inode->i_sem); +up (&inode->i_sem);return new; }
@@ -61,7 +60,7 @@ proc_bus_pci_read(struct file *file, cha*/ if (capable (CAP_SYS_ADMIN )) - size =PCI_CFG_SPACE_SIZE ; + size = dev->cfg_size;else if (dev->hdr_type ==PCI_HEADER_TYPE_CARDBUS ) size =128 ;else
@@ -134,14 +133,15 @@ proc_bus_pci_write(struct file *file, coconst struct proc_dir_entry *dp =PDE (ino);struct pci_dev *dev = dp->data;int pos = *ppos; +int size = dev->cfg_size;int cnt; -if (pos >=PCI_CFG_SPACE_SIZE ) +if (pos >= size)return 0 ; -if (nbytes >=PCI_CFG_SPACE_SIZE ) - nbytes =PCI_CFG_SPACE_SIZE ; -if (pos + nbytes >PCI_CFG_SPACE_SIZE ) - nbytes =PCI_CFG_SPACE_SIZE - pos; +if (nbytes >= size) + nbytes = size; +if (pos + nbytes > size) + nbytes = size - pos; cnt = nbytes;if (!access_ok (VERIFY_READ , buf, cnt))
@@ -403,7 +403,7 @@ int pci_proc_attach_device(struct pci_dereturn -ENOMEM ; e->proc_fops = &proc_bus_pci_operations; e->data = dev; - e->size =PCI_CFG_SPACE_SIZE ; + e->size = dev->cfg_size;return 0 ; }
include/asm-i386/fixmap.h +3 -0
@@ -71,6 +71,9 @@ enum fixed_addresses { FIX_ACPI_BEGIN, FIX_ACPI_END = FIX_ACPI_BEGIN + FIX_ACPI_PAGES - 1,#endif +#ifdef CONFIG_PCI_MMCONFIG + FIX_PCIE_MCFG, +#endif __end_of_permanent_fixed_addresses,/* temporary boot-time mappings, used before ioremap() is functional */ #define NR_FIX_BTMAPS 16
include/asm-ia64/sal.h +4 -4
@@ -741,10 +741,10 @@ ia64_sal_mc_set_params (u64 param_type,/* Read from PCI configuration space */ static inline s64 -ia64_sal_pci_config_read (u64 pci_config_addr,u64 size,u64 *value) +ia64_sal_pci_config_read (u64 pci_config_addr,int type,u64 size,u64 *value) {struct ia64_sal_retval isrv; -SAL_CALL (isrv,SAL_PCI_CONFIG_READ , pci_config_addr, size,0 ,0 ,0 ,0 ,0 ); +SAL_CALL (isrv,SAL_PCI_CONFIG_READ , pci_config_addr, size, type,0 ,0 ,0 ,0 );if (value) *value = isrv.v0;return isrv.status;
@@ -752,11 +752,11 @@ ia64_sal_pci_config_read (u64 pci_config/* Write to PCI configuration space */ static inline s64 -ia64_sal_pci_config_write (u64 pci_config_addr,u64 size,u64 value) +ia64_sal_pci_config_write (u64 pci_config_addr,int type,u64 size,u64 value) {struct ia64_sal_retval isrv;SAL_CALL (isrv,SAL_PCI_CONFIG_WRITE , pci_config_addr, size, value, -0 ,0 ,0 ,0 ); + type,0 ,0 ,0 );return isrv.status; }
include/linux/acpi.h +12 -0
@@ -317,6 +317,15 @@ struct acpi_table_ecdt {char ec_id[0 ]; } __attribute__ ((packed)); +/* PCI MMCONFIG */ + +struct acpi_table_mcfg { +struct acpi_table_header header; +u8 reserved[8 ]; +u32 base_address; +u32 base_reserved; +} __attribute__ ((packed)); +/* Table Handlers */ enum acpi_table_id {
@@ -338,6 +347,7 @@ enum acpi_table_id {ACPI_SSDT ,ACPI_SPMI ,ACPI_HPET , +ACPI_MCFG , ACPI_TABLE_COUNT };
@@ -369,6 +379,8 @@ void acpi_numa_arch_fixup(void);extern int acpi_mp_config; +extern u32 pci_mmcfg_base_addr; +#else /*!CONFIG_ACPI_BOOT*/ #define acpi_mp_config 0
include/linux/pci.h +44 -0
68 lines not on this page · raw message
Signature · 6 lines
"Next the statesmen will invent cheap lies, putting the blame upon the nation that is attacked, and every man will be glad of those conscience-soothing falsities, and will diligently study them, and refuse to examine any refutations of them; and thus he will by and by convince himself that the war is just, and will thank God for the better sleep he enjoys after this process of grotesque self-deception." -- Mark Twain