Commit 91d599a9 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by David Mosberger

[PATCH] ia64: sba_iommu trivial cleanup

This is mostly trivial whitespace and printk text tweaks.  I did add the
segment number to a printk that previously just had the bus.
parent d8ed430e
......@@ -1437,7 +1437,7 @@ ioc_iova_init(struct ioc *ioc)
iov_order = get_order(ioc->iov_size >> (IOVP_SHIFT - PAGE_SHIFT));
ioc->pdir_size = (ioc->iov_size / IOVP_SIZE) * sizeof(u64);
DBG_INIT("%s() hpa %p IOV %dMB (%d bits) PDIR size 0x%0x\n",
DBG_INIT("%s() hpa %p IOV %dMB (%d bits) PDIR size 0x%x\n",
__FUNCTION__, ioc->ioc_hpa, ioc->iov_size >> 20,
iov_order + PAGE_SHIFT, ioc->pdir_size);
......@@ -1684,7 +1684,7 @@ ioc_init(u64 hpa, void *handle)
ioc_sac_init(ioc);
printk(KERN_INFO PFX
"Found %s IOC %d.%d HPA 0x%lx IOVA space %dMb at 0x%lx\n",
"%s %d.%d HPA 0x%lx IOVA space %dMb at 0x%lx\n",
ioc->name, (ioc->rev >> 4) & 0xF, ioc->rev & 0xF,
hpa, ioc->iov_size >> 20, ioc->ibase);
......@@ -1813,7 +1813,7 @@ sba_proc_init(void)
if (ioc_list) {
struct proc_dir_entry * proc_mckinley_root;
proc_mckinley_root = proc_mkdir("bus/mckinley",0);
proc_mckinley_root = proc_mkdir("bus/mckinley", 0);
create_proc_info_entry(ioc_list->name, 0, proc_mckinley_root, sba_proc_info);
create_proc_info_entry("bitmap", 0, proc_mckinley_root, sba_resource_map);
}
......@@ -1853,7 +1853,7 @@ sba_connect_bus(struct pci_bus *bus)
handle = parent;
} while (ACPI_SUCCESS(status));
printk("No IOC for PCI Bus %d in ACPI\n", bus->number);
printk(KERN_WARNING "No IOC for PCI Bus %02x:%02x in ACPI\n", PCI_SEGMENT(bus), bus->number);
}
static int __init
......@@ -1864,10 +1864,6 @@ acpi_sba_ioc_add(struct acpi_device *device)
u64 hpa, length;
struct acpi_device_info dev_info;
/*
* Only SBA appears in ACPI namespace. It encloses the PCI
* root bridges, and its CSR space includes the IOC function.
*/
status = hp_acpi_csr_space(device->handle, &hpa, &length);
if (ACPI_FAILURE(status))
return 1;
......@@ -1876,6 +1872,10 @@ acpi_sba_ioc_add(struct acpi_device *device)
if (ACPI_FAILURE(status))
return 1;
/*
* For HWP0001, only SBA appears in ACPI namespace. It encloses the PCI
* root bridges, and its CSR space includes the IOC function.
*/
if (strncmp("HWP0001", dev_info.hardware_id, 7) == 0)
hpa += ZX1_IOC_OFFSET;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment