Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-17 05:45:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[SCSI] Use pcibios_resource_to_bus()

Browse Source 
We had our own code (pci_get_base_address()) to get the bus address of
a BAR.  We can get this using pcibios_resource_to_bus() instead.

Signed-off-by: Matthew Wilcox <matthew@wil.cx>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
Matthew Wilcox 2006-03-28 11:03:44 -05:00 committed by James Bottomley
parent 1f61d82490
commit b6d105d7ee
1 changed files with 13 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
drivers/scsi/sym53c8xx_2/sym_glue.c
View File

@ -134,45 +134,6 @@ static void sym2_setup_params(void)
} }
} }
/*
* We used to try to deal with 64-bit BARs here, but don't any more.
* There are many parts of this driver which would need to be modified
* to handle a 64-bit base address, including scripts. I'm uncomfortable
* with making those changes when I have no way of testing it, so I'm
* just going to disable it.
*
* Note that some machines (eg HP rx8620 and Superdome) have bus addresses
* below 4GB and physical addresses above 4GB. These will continue to work.
*/
static int __devinit
pci_get_base_address(struct pci_dev *pdev, int index, unsigned long *basep)
{
u32 tmp;
unsigned long base;
#define PCI_BAR_OFFSET(index) (PCI_BASE_ADDRESS_0 + (index<<2))
pci_read_config_dword(pdev, PCI_BAR_OFFSET(index++), &tmp);
base = tmp;
if ((tmp & 0x7) == PCI_BASE_ADDRESS_MEM_TYPE_64) {
pci_read_config_dword(pdev, PCI_BAR_OFFSET(index++), &tmp);
if (tmp > 0) {
dev_err(&pdev->dev,
"BAR %d is 64-bit, disabling\n", index - 1);
base = 0;
}
}
if ((base & PCI_BASE_ADDRESS_SPACE) == PCI_BASE_ADDRESS_SPACE_IO) {
base &= PCI_BASE_ADDRESS_IO_MASK;
} else {
base &= PCI_BASE_ADDRESS_MEM_MASK;
}
*basep = base;
return index;
#undef PCI_BAR_OFFSET
}
static struct scsi_transport_template *sym2_transport_template = NULL; static struct scsi_transport_template *sym2_transport_template = NULL;
/* /*
@ -1866,13 +1827,23 @@ static int __devinit sym_set_workarounds(struct sym_device *device)
static void __devinit static void __devinit
sym_init_device(struct pci_dev *pdev, struct sym_device *device) sym_init_device(struct pci_dev *pdev, struct sym_device *device)
{ {
int i; int i = 2;
struct pci_bus_region bus_addr;
device->host_id = SYM_SETUP_HOST_ID; device->host_id = SYM_SETUP_HOST_ID;
device->pdev = pdev; device->pdev = pdev;
i = pci_get_base_address(pdev, 1, &device->mmio_base); pcibios_resource_to_bus(pdev, &bus_addr, &pdev->resource[1]);
pci_get_base_address(pdev, i, &device->ram_base); device->mmio_base = bus_addr.start;
/*
* If the BAR is 64-bit, resource 2 will be occupied by the
* upper 32 bits
*/
if (!pdev->resource[i].flags)
i++;
pcibios_resource_to_bus(pdev, &bus_addr, &pdev->resource[i]);
device->ram_base = bus_addr.start;
#ifdef CONFIG_SCSI_SYM53C8XX_MMIO #ifdef CONFIG_SCSI_SYM53C8XX_MMIO
if (device->mmio_base) if (device->mmio_base)