From: Muli Ben-Yehuda Move the aic94xx split completion timeout handling there. Signed-off-by: Muli Ben-Yehuda Cc: Andi Kleen Signed-off-by: Andrew Morton --- arch/x86_64/kernel/pci-calgary.c | 25 +++++++++++++++++-------- 1 files changed, 17 insertions(+), 8 deletions(-) diff -puN arch/x86_64/kernel/pci-calgary.c~x86-64-calgary-introduce-handle_quirks-for-various-chipset-quirks arch/x86_64/kernel/pci-calgary.c --- a/arch/x86_64/kernel/pci-calgary.c~x86-64-calgary-introduce-handle_quirks-for-various-chipset-quirks +++ a/arch/x86_64/kernel/pci-calgary.c @@ -807,6 +807,20 @@ static void __init calgary_set_split_com readq(target); /* flush */ } +static void __init calgary_handle_quirks(struct pci_dev* dev) +{ + unsigned char busnum = dev->bus->number; + struct iommu_table *tbl = dev->sysdata; + + /* + * Give split completion a longer timeout on bus 1 for aic94xx + * http://bugzilla.kernel.org/show_bug.cgi?id=7180 + */ + if (busnum == 1) + calgary_set_split_completion_timeout(tbl->bbar, busnum, + CCR_2SEC_TIMEOUT); +} + static void __init calgary_enable_translation(struct pci_dev *dev) { u32 val32; @@ -831,14 +845,6 @@ static void __init calgary_enable_transl writel(cpu_to_be32(val32), target); readl(target); /* flush */ - /* - * Give split completion a longer timeout on bus 1 for aic94xx - * http://bugzilla.kernel.org/show_bug.cgi?id=7180 - */ - if (busnum == 1) - calgary_set_split_completion_timeout(bbar, busnum, - CCR_2SEC_TIMEOUT); - init_timer(&tbl->watchdog_timer); tbl->watchdog_timer.function = &calgary_watchdog; tbl->watchdog_timer.data = (unsigned long)dev; @@ -890,6 +896,9 @@ static int __init calgary_init_one(struc pci_dev_get(dev); dev->bus->self = dev; + + calgary_handle_quirks(dev); + calgary_enable_translation(dev); return 0; _