diff options
author | Matthew Slattery <mslattery@solarflare.com> | 2009-11-28 00:35:24 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-29 02:58:52 -0500 |
commit | 0589ece031e31a238e60057ef2abfa1ff18d46d0 (patch) | |
tree | 562d879ecd15b820ff189b570f7081bab0aa287c /drivers/net/sfc | |
parent | fb45f2c154be470ad950bcf16f3662ec0ca48695 (diff) |
sfc: Remove EFX_WORKAROUND_9141 macro
The "bug9141 workaround" of setting TX_FLUSH_MIN_LEN_EN should really
be considered as a normal bit of configuration rather than a
workaround.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc')
-rw-r--r-- | drivers/net/sfc/falcon.c | 2 | ||||
-rw-r--r-- | drivers/net/sfc/workarounds.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c index 9c4f8985aa71..b186fd2c9b6f 100644 --- a/drivers/net/sfc/falcon.c +++ b/drivers/net/sfc/falcon.c | |||
@@ -3128,7 +3128,7 @@ int falcon_init_nic(struct efx_nic *efx) | |||
3128 | /* Prefetch threshold 2 => fetch when descriptor cache half empty */ | 3128 | /* Prefetch threshold 2 => fetch when descriptor cache half empty */ |
3129 | EFX_SET_OWORD_FIELD(temp, FRF_AZ_TX_PREF_THRESHOLD, 2); | 3129 | EFX_SET_OWORD_FIELD(temp, FRF_AZ_TX_PREF_THRESHOLD, 2); |
3130 | /* Squash TX of packets of 16 bytes or less */ | 3130 | /* Squash TX of packets of 16 bytes or less */ |
3131 | if (falcon_rev(efx) >= FALCON_REV_B0 && EFX_WORKAROUND_9141(efx)) | 3131 | if (falcon_rev(efx) >= FALCON_REV_B0) |
3132 | EFX_SET_OWORD_FIELD(temp, FRF_BZ_TX_FLUSH_MIN_LEN_EN, 1); | 3132 | EFX_SET_OWORD_FIELD(temp, FRF_BZ_TX_FLUSH_MIN_LEN_EN, 1); |
3133 | efx_writeo(efx, &temp, FR_AZ_TX_RESERVED); | 3133 | efx_writeo(efx, &temp, FR_AZ_TX_RESERVED); |
3134 | 3134 | ||
diff --git a/drivers/net/sfc/workarounds.h b/drivers/net/sfc/workarounds.h index 84e579e40b88..bad09320b5f8 100644 --- a/drivers/net/sfc/workarounds.h +++ b/drivers/net/sfc/workarounds.h | |||
@@ -28,8 +28,6 @@ | |||
28 | #define EFX_WORKAROUND_7575 EFX_WORKAROUND_ALWAYS | 28 | #define EFX_WORKAROUND_7575 EFX_WORKAROUND_ALWAYS |
29 | /* Bit-bashed I2C reads cause performance drop */ | 29 | /* Bit-bashed I2C reads cause performance drop */ |
30 | #define EFX_WORKAROUND_7884 EFX_WORKAROUND_10G | 30 | #define EFX_WORKAROUND_7884 EFX_WORKAROUND_10G |
31 | /* TX pkt parser problem with <= 16 byte TXes */ | ||
32 | #define EFX_WORKAROUND_9141 EFX_WORKAROUND_ALWAYS | ||
33 | /* TX_EV_PKT_ERR can be caused by a dangling TX descriptor | 31 | /* TX_EV_PKT_ERR can be caused by a dangling TX descriptor |
34 | * or a PCIe error (bug 11028) */ | 32 | * or a PCIe error (bug 11028) */ |
35 | #define EFX_WORKAROUND_10727 EFX_WORKAROUND_ALWAYS | 33 | #define EFX_WORKAROUND_10727 EFX_WORKAROUND_ALWAYS |