[SPARC64]: Fix IRQ retry interval timer value on sparc64 PCI controllers.

Use '5' instead of 'infinity'.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/arch/sparc64/kernel/pci_psycho.c b/arch/sparc64/kernel/pci_psycho.c
index 534320ef0db2a43992ac6341df4c444d9ccc2182..91ab466d6c66ba7ae9d4aab057b93fd7f1b04bf1 100644 (file)
--- a/arch/sparc64/kernel/pci_psycho.c
+++ b/arch/sparc64/kernel/pci_psycho.c
@@ -1303,8 +1303,7 @@ static void psycho_controller_hwinit(struct pci_controller_info *p)
 {
        u64 tmp;
 
-       /* PROM sets the IRQ retry value too low, increase it. */
-       psycho_write(p->pbm_A.controller_regs + PSYCHO_IRQ_RETRY, 0xff);
+       psycho_write(p->pbm_A.controller_regs + PSYCHO_IRQ_RETRY, 5);
 
        /* Enable arbiter for all PCI slots. */
        tmp = psycho_read(p->pbm_A.controller_regs + PSYCHO_PCIA_CTRL);

diff --git a/arch/sparc64/kernel/pci_schizo.c b/arch/sparc64/kernel/pci_schizo.c
index f4f68e150d747c6953b8f53f9f595d3a0c4e0951..6a182bb66281f24c0caf721207c5f9370323fd4e 100644 (file)
--- a/arch/sparc64/kernel/pci_schizo.c
+++ b/arch/sparc64/kernel/pci_schizo.c
@@ -1936,9 +1936,7 @@ static void __init schizo_pbm_hw_init(struct pci_pbm_info *pbm)
 {
        u64 tmp;
 
-       /* Set IRQ retry to infinity. */
-       schizo_write(pbm->pbm_regs + SCHIZO_PCI_IRQ_RETRY,
-                    SCHIZO_IRQ_RETRY_INF);
+       schizo_write(pbm->pbm_regs + SCHIZO_PCI_IRQ_RETRY, 5);
 
        tmp = schizo_read(pbm->pbm_regs + SCHIZO_PCI_CTRL);