lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

iop_adma: cleanup iop_chan_xor_slot_count

Browse Source 
- use a table for iop13xx, trade text for data
- shrink the iop3xx to a cache line

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
Dan Williams
2008-07-17 17:59:56 -07:00
parent 5eb907aaaf
commit 2a46fa13d7
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/asm-arm/arch-iop13xx/adma.h
View File

@@ -198,17 +198,13 @@ iop_chan_memset_slot_count(size_t len, int *slots_per_op)
static inline int static inline int
iop_chan_xor_slot_count(size_t len, int src_cnt, int *slots_per_op) iop_chan_xor_slot_count(size_t len, int src_cnt, int *slots_per_op)
{ {
int num_slots; static const char slot_count_table[] = { 1, 2, 2, 2,
/* slots_to_find = 1 for basic descriptor + 1 per 4 sources above 1 2, 3, 3, 3,
* (1 source => 8 bytes) (1 slot => 32 bytes) 3, 4, 4, 4,
*/ 4, 5, 5, 5,
num_slots = 1 + (((src_cnt - 1) << 3) >> 5); };
if (((src_cnt - 1) << 3) & 0x1f) *slots_per_op = slot_count_table[src_cnt - 1];
num_slots++; return *slots_per_op;
*slots_per_op = num_slots;
return num_slots;
} }
#define ADMA_MAX_BYTE_COUNT (16 * 1024 * 1024) #define ADMA_MAX_BYTE_COUNT (16 * 1024 * 1024)

4
include/asm-arm/hardware/iop3xx-adma.h
View File

@@ -260,7 +260,7 @@ static inline int iop_chan_memset_slot_count(size_t len, int *slots_per_op)
static inline int iop3xx_aau_xor_slot_count(size_t len, int src_cnt, static inline int iop3xx_aau_xor_slot_count(size_t len, int src_cnt,
int *slots_per_op) int *slots_per_op)
{ {
static const int slot_count_table[] = { 0, static const char slot_count_table[] = {
1, 1, 1, 1, /* 01 - 04 */ 1, 1, 1, 1, /* 01 - 04 */
2, 2, 2, 2, /* 05 - 08 */ 2, 2, 2, 2, /* 05 - 08 */
4, 4, 4, 4, /* 09 - 12 */ 4, 4, 4, 4, /* 09 - 12 */
@@ -270,7 +270,7 @@ static inline int iop3xx_aau_xor_slot_count(size_t len, int src_cnt,
8, 8, 8, 8, /* 25 - 28 */ 8, 8, 8, 8, /* 25 - 28 */
8, 8, 8, 8, /* 29 - 32 */ 8, 8, 8, 8, /* 29 - 32 */
}; };
*slots_per_op = slot_count_table[src_cnt]; *slots_per_op = slot_count_table[src_cnt - 1];
return *slots_per_op; return *slots_per_op;
} }