aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/firewire/ohci.c
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2010-06-10 02:34:13 -0400
committerClemens Ladisch <clemens@ladisch.de>2010-06-10 02:34:13 -0400
commit27a2329f8235d6ce637463f5d83e98d760ef006e (patch)
treedcc3b1a62d92d407f38744a93914742e9eed1816 /drivers/firewire/ohci.c
parenta48777e03ad53777ed119a5f86dd22a6c5a378ad (diff)
firewire: add CSR BUSY_TIMEOUT support
Implement the BUSY_TIMEOUT register, which is required for nodes that support retries. Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Diffstat (limited to 'drivers/firewire/ohci.c')
-rw-r--r--drivers/firewire/ohci.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
index 3d4badb7c79b..9c588fd01250 100644
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
@@ -1731,7 +1731,8 @@ static int ohci_enable(struct fw_card *card,
1731 reg_write(ohci, OHCI1394_ATRetries, 1731 reg_write(ohci, OHCI1394_ATRetries,
1732 OHCI1394_MAX_AT_REQ_RETRIES | 1732 OHCI1394_MAX_AT_REQ_RETRIES |
1733 (OHCI1394_MAX_AT_RESP_RETRIES << 4) | 1733 (OHCI1394_MAX_AT_RESP_RETRIES << 4) |
1734 (OHCI1394_MAX_PHYS_RESP_RETRIES << 8)); 1734 (OHCI1394_MAX_PHYS_RESP_RETRIES << 8) |
1735 (200 << 16));
1735 1736
1736 seconds = lower_32_bits(get_seconds()); 1737 seconds = lower_32_bits(get_seconds());
1737 reg_write(ohci, OHCI1394_IsochronousCycleTimer, seconds << 25); 1738 reg_write(ohci, OHCI1394_IsochronousCycleTimer, seconds << 25);
@@ -2023,6 +2024,10 @@ static u32 ohci_read_csr_reg(struct fw_card *card, int csr_offset)
2023 spin_unlock_irqrestore(&ohci->lock, flags); 2024 spin_unlock_irqrestore(&ohci->lock, flags);
2024 return value; 2025 return value;
2025 2026
2027 case CSR_BUSY_TIMEOUT:
2028 value = reg_read(ohci, OHCI1394_ATRetries);
2029 return (value >> 4) & 0x0ffff00f;
2030
2026 default: 2031 default:
2027 WARN_ON(1); 2032 WARN_ON(1);
2028 return 0; 2033 return 0;
@@ -2053,6 +2058,13 @@ static void ohci_write_csr_reg(struct fw_card *card, int csr_offset, u32 value)
2053 spin_unlock_irqrestore(&ohci->lock, flags); 2058 spin_unlock_irqrestore(&ohci->lock, flags);
2054 break; 2059 break;
2055 2060
2061 case CSR_BUSY_TIMEOUT:
2062 value = (value & 0xf) | ((value & 0xf) << 4) |
2063 ((value & 0xf) << 8) | ((value & 0x0ffff000) << 4);
2064 reg_write(ohci, OHCI1394_ATRetries, value);
2065 flush_writes(ohci);
2066 break;
2067
2056 default: 2068 default:
2057 WARN_ON(1); 2069 WARN_ON(1);
2058 break; 2070 break;