diff options
| author | David S. Miller <davem@davemloft.net> | 2005-07-04 15:58:19 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-07-04 15:58:19 -0700 |
| commit | 864ae180074931f3a28c84ea85aa8cfeca18bc4f (patch) | |
| tree | 3250d1f04a6f90629e358e65fcc27b70e35a8016 /arch | |
| parent | 9fba62a59cf1407cd5495f6c61d22d169ca1553f (diff) | |
| download | blackbird-op-linux-864ae180074931f3a28c84ea85aa8cfeca18bc4f.tar.gz blackbird-op-linux-864ae180074931f3a28c84ea85aa8cfeca18bc4f.zip | |
[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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sparc64/kernel/pci_psycho.c | 3 | ||||
| -rw-r--r-- | arch/sparc64/kernel/pci_schizo.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/arch/sparc64/kernel/pci_psycho.c b/arch/sparc64/kernel/pci_psycho.c index 534320ef0db2..91ab466d6c66 100644 --- 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 f4f68e150d74..6a182bb66281 100644 --- 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); |
