Change pci_raw_ops to pci_raw_read/write
We want to allow different implementations of pci_raw_ops for standard and extended config space on x86. Rather than clutter generic code with knowledge of this, we make pci_raw_ops private to x86 and use it to implement the new raw interface -- raw_pci_read() and raw_pci_write(). Signed-off-by: Matthew Wilcox <willy@linux.intel.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:

committed by
Linus Torvalds

szülő
a0ca990960
commit
b6ce068a12
@@ -752,13 +752,13 @@ tioce_kern_init(struct tioce_common *tioce_common)
|
||||
* Determine the secondary bus number of the port2 logical PPB.
|
||||
* This is used to decide whether a given pci device resides on
|
||||
* port1 or port2. Note: We don't have enough plumbing set up
|
||||
* here to use pci_read_config_xxx() so use the raw_pci_ops vector.
|
||||
* here to use pci_read_config_xxx() so use raw_pci_read().
|
||||
*/
|
||||
|
||||
seg = tioce_common->ce_pcibus.bs_persist_segment;
|
||||
bus = tioce_common->ce_pcibus.bs_persist_busnum;
|
||||
|
||||
raw_pci_ops->read(seg, bus, PCI_DEVFN(2, 0), PCI_SECONDARY_BUS, 1,&tmp);
|
||||
raw_pci_read(seg, bus, PCI_DEVFN(2, 0), PCI_SECONDARY_BUS, 1,&tmp);
|
||||
tioce_kern->ce_port1_secondary = (u8) tmp;
|
||||
|
||||
/*
|
||||
@@ -799,11 +799,11 @@ tioce_kern_init(struct tioce_common *tioce_common)
|
||||
|
||||
/* mem base/limit */
|
||||
|
||||
raw_pci_ops->read(seg, bus, PCI_DEVFN(dev, 0),
|
||||
raw_pci_read(seg, bus, PCI_DEVFN(dev, 0),
|
||||
PCI_MEMORY_BASE, 2, &tmp);
|
||||
base = (u64)tmp << 16;
|
||||
|
||||
raw_pci_ops->read(seg, bus, PCI_DEVFN(dev, 0),
|
||||
raw_pci_read(seg, bus, PCI_DEVFN(dev, 0),
|
||||
PCI_MEMORY_LIMIT, 2, &tmp);
|
||||
limit = (u64)tmp << 16;
|
||||
limit |= 0xfffffUL;
|
||||
@@ -817,21 +817,21 @@ tioce_kern_init(struct tioce_common *tioce_common)
|
||||
* attributes.
|
||||
*/
|
||||
|
||||
raw_pci_ops->read(seg, bus, PCI_DEVFN(dev, 0),
|
||||
raw_pci_read(seg, bus, PCI_DEVFN(dev, 0),
|
||||
PCI_PREF_MEMORY_BASE, 2, &tmp);
|
||||
base = ((u64)tmp & PCI_PREF_RANGE_MASK) << 16;
|
||||
|
||||
raw_pci_ops->read(seg, bus, PCI_DEVFN(dev, 0),
|
||||
raw_pci_read(seg, bus, PCI_DEVFN(dev, 0),
|
||||
PCI_PREF_BASE_UPPER32, 4, &tmp);
|
||||
base |= (u64)tmp << 32;
|
||||
|
||||
raw_pci_ops->read(seg, bus, PCI_DEVFN(dev, 0),
|
||||
raw_pci_read(seg, bus, PCI_DEVFN(dev, 0),
|
||||
PCI_PREF_MEMORY_LIMIT, 2, &tmp);
|
||||
|
||||
limit = ((u64)tmp & PCI_PREF_RANGE_MASK) << 16;
|
||||
limit |= 0xfffffUL;
|
||||
|
||||
raw_pci_ops->read(seg, bus, PCI_DEVFN(dev, 0),
|
||||
raw_pci_read(seg, bus, PCI_DEVFN(dev, 0),
|
||||
PCI_PREF_LIMIT_UPPER32, 4, &tmp);
|
||||
limit |= (u64)tmp << 32;
|
||||
|
||||
|
Reference in New Issue
Block a user