diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2009-11-25 11:08:30 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-26 18:58:57 -0500 |
commit | 46e1ac0f42c7ff20a7e47c172e4835273b0e6899 (patch) | |
tree | ea782833df53dc7bc7c039335693750b8b58233d /drivers | |
parent | 27c0b1a850cdea6298f573d835782f3337be913c (diff) |
sfc: Fix descriptor cache sizes
These were accidentally undersized by a factor of 2, which limited
performance.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/sfc/falcon.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c index 41a321b0e8c6..7b19686218a5 100644 --- a/drivers/net/sfc/falcon.c +++ b/drivers/net/sfc/falcon.c | |||
@@ -49,11 +49,11 @@ static int disable_dma_stats; | |||
49 | * goes idle. | 49 | * goes idle. |
50 | */ | 50 | */ |
51 | #define TX_DC_ENTRIES 16 | 51 | #define TX_DC_ENTRIES 16 |
52 | #define TX_DC_ENTRIES_ORDER 0 | 52 | #define TX_DC_ENTRIES_ORDER 1 |
53 | #define TX_DC_BASE 0x130000 | 53 | #define TX_DC_BASE 0x130000 |
54 | 54 | ||
55 | #define RX_DC_ENTRIES 64 | 55 | #define RX_DC_ENTRIES 64 |
56 | #define RX_DC_ENTRIES_ORDER 2 | 56 | #define RX_DC_ENTRIES_ORDER 3 |
57 | #define RX_DC_BASE 0x100000 | 57 | #define RX_DC_BASE 0x100000 |
58 | 58 | ||
59 | static const unsigned int | 59 | static const unsigned int |
@@ -2974,14 +2974,14 @@ int falcon_init_nic(struct efx_nic *efx) | |||
2974 | efx_writeo(efx, &temp, FR_AZ_SRM_RX_DC_CFG); | 2974 | efx_writeo(efx, &temp, FR_AZ_SRM_RX_DC_CFG); |
2975 | 2975 | ||
2976 | /* Set TX descriptor cache size. */ | 2976 | /* Set TX descriptor cache size. */ |
2977 | BUILD_BUG_ON(TX_DC_ENTRIES != (16 << TX_DC_ENTRIES_ORDER)); | 2977 | BUILD_BUG_ON(TX_DC_ENTRIES != (8 << TX_DC_ENTRIES_ORDER)); |
2978 | EFX_POPULATE_OWORD_1(temp, FRF_AZ_TX_DC_SIZE, TX_DC_ENTRIES_ORDER); | 2978 | EFX_POPULATE_OWORD_1(temp, FRF_AZ_TX_DC_SIZE, TX_DC_ENTRIES_ORDER); |
2979 | efx_writeo(efx, &temp, FR_AZ_TX_DC_CFG); | 2979 | efx_writeo(efx, &temp, FR_AZ_TX_DC_CFG); |
2980 | 2980 | ||
2981 | /* Set RX descriptor cache size. Set low watermark to size-8, as | 2981 | /* Set RX descriptor cache size. Set low watermark to size-8, as |
2982 | * this allows most efficient prefetching. | 2982 | * this allows most efficient prefetching. |
2983 | */ | 2983 | */ |
2984 | BUILD_BUG_ON(RX_DC_ENTRIES != (16 << RX_DC_ENTRIES_ORDER)); | 2984 | BUILD_BUG_ON(RX_DC_ENTRIES != (8 << RX_DC_ENTRIES_ORDER)); |
2985 | EFX_POPULATE_OWORD_1(temp, FRF_AZ_RX_DC_SIZE, RX_DC_ENTRIES_ORDER); | 2985 | EFX_POPULATE_OWORD_1(temp, FRF_AZ_RX_DC_SIZE, RX_DC_ENTRIES_ORDER); |
2986 | efx_writeo(efx, &temp, FR_AZ_RX_DC_CFG); | 2986 | efx_writeo(efx, &temp, FR_AZ_RX_DC_CFG); |
2987 | EFX_POPULATE_OWORD_1(temp, FRF_AZ_RX_DC_PF_LWM, RX_DC_ENTRIES - 8); | 2987 | EFX_POPULATE_OWORD_1(temp, FRF_AZ_RX_DC_PF_LWM, RX_DC_ENTRIES - 8); |