Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a46fa13 authored by Dan Williams's avatar Dan Williams
Browse files

iop_adma: cleanup iop_chan_xor_slot_count 



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

Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 5eb907aa

include/asm-arm/arch-iop13xx/adma.h

+7 −11
Original line number Diff line number Diff line
@@ -198,17 +198,13 @@ iop_chan_memset_slot_count(size_t len, int *slots_per_op) 
static inline int

iop_chan_xor_slot_count(size_t len, int src_cnt, int *slots_per_op)

{

	int num_slots;

	/* slots_to_find = 1 for basic descriptor + 1 per 4 sources above 1

	 * (1 source => 8 bytes) (1 slot => 32 bytes)

	 */

	num_slots = 1 + (((src_cnt - 1) << 3) >> 5);

	if (((src_cnt - 1) << 3) & 0x1f)

		num_slots++;



	*slots_per_op = num_slots;



	return num_slots;

	static const char slot_count_table[] = { 1, 2, 2, 2,

						 2, 3, 3, 3,

						 3, 4, 4, 4,

						 4, 5, 5, 5,

						};

	*slots_per_op = slot_count_table[src_cnt - 1];

	return *slots_per_op;

}



#define ADMA_MAX_BYTE_COUNT	(16 * 1024 * 1024)

include/asm-arm/hardware/iop3xx-adma.h

+2 −2
Original line number Diff line number Diff line
@@ -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,

					int *slots_per_op)

{

	static const int slot_count_table[] = { 0,

	static const char slot_count_table[] = {

						1, 1, 1, 1, /* 01 - 04 */

						2, 2, 2, 2, /* 05 - 08 */

						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, /* 29 - 32 */

					      };

	*slots_per_op = slot_count_table[src_cnt];

	*slots_per_op = slot_count_table[src_cnt - 1];

	return *slots_per_op;

}