direct-io.hg

changeset 1691:ce83dd94e73c

bitkeeper revision 1.1041.1.14 (40eaf438sciOdZWe5QAqcjLLtbzF2Q)

Minor PCI tweaks to move ever so slightly toward 2.6 and make ia64
(based on 2.6) easier.
author djm@kirby.fc.hp.com
date Tue Jul 06 18:49:28 2004 +0000 (2004-07-06)
parents d7fd2dca5e0a
children 62169ad13597
files xen/drivers/pci/pci.c xen/include/asm-x86/pci.h xen/include/xen/pci.h
line diff
     1.1 --- a/xen/drivers/pci/pci.c	Tue Jul 06 17:27:27 2004 +0000
     1.2 +++ b/xen/drivers/pci/pci.c	Tue Jul 06 18:49:28 2004 +0000
     1.3 @@ -890,7 +890,7 @@ pci_set_mwi(struct pci_dev *dev)
     1.4  	u16 cmd;
     1.5  
     1.6  #ifdef HAVE_ARCH_PCI_MWI
     1.7 -	rc = pcibios_set_mwi(dev);
     1.8 +	rc = pcibios_prep_mwi(dev);
     1.9  #else
    1.10  	rc = pci_generic_prep_mwi(dev);
    1.11  #endif
    1.12 @@ -1384,7 +1384,7 @@ struct pci_dev * __devinit pci_scan_slot
    1.13  		temp->hdr_type = hdr_type & 0x7f;
    1.14  
    1.15  		dev = pci_scan_device(temp);
    1.16 -		if (!pcibios_scan_all_fns() && func == 0) {
    1.17 +		if (!pcibios_scan_all_fns(0,0) && func == 0) {
    1.18  			if (!dev)
    1.19  				break;
    1.20  		} else {
     2.1 --- a/xen/include/asm-x86/pci.h	Tue Jul 06 17:27:27 2004 +0000
     2.2 +++ b/xen/include/asm-x86/pci.h	Tue Jul 06 18:49:28 2004 +0000
     2.3 @@ -12,7 +12,7 @@ extern unsigned int pcibios_assign_all_b
     2.4  #else
     2.5  #define pcibios_assign_all_busses()	0
     2.6  #endif
     2.7 -#define pcibios_scan_all_fns()		0
     2.8 +#define pcibios_scan_all_fns(a,b)	0
     2.9  
    2.10  extern unsigned long pci_mem_start;
    2.11  #define PCIBIOS_MIN_IO		0x1000
     3.1 --- a/xen/include/xen/pci.h	Tue Jul 06 17:27:27 2004 +0000
     3.2 +++ b/xen/include/xen/pci.h	Tue Jul 06 18:49:28 2004 +0000
     3.3 @@ -393,6 +393,10 @@ struct pci_dev {
     3.4  					   this is D0-D3, D0 being fully functional,
     3.5  					   and D3 being off. */
     3.6  
     3.7 +#ifdef LINUX_2_6
     3.8 +	struct device dev;		/* Generic device interface */
     3.9 +#endif
    3.10 +
    3.11  	/* device is compatible with these IDs */
    3.12  	unsigned short vendor_compatible[DEVICE_COUNT_COMPATIBLE];
    3.13  	unsigned short device_compatible[DEVICE_COUNT_COMPATIBLE];