dma40: use flags to reduce parameter count (7f933bed) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/dma/ste_dma40_ll.c

+47 −37

Original line number	Original line	Diff line number	Diff line
	@@ -127,10 +127,11 @@ static int d40_phy_fill_lli(struct d40_phy_lli *lli,
	u32 data_size,		u32 data_size,
	dma_addr_t next_lli,		dma_addr_t next_lli,
	u32 reg_cfg,		u32 reg_cfg,
	bool term_int,		struct stedma40_half_channel_info *info,
	bool is_device,		unsigned int flags)
	struct stedma40_half_channel_info *info)
	{		{
			bool addr_inc = flags & LLI_ADDR_INC;
			bool term_int = flags & LLI_TERM_INT;
	unsigned int data_width = info->data_width;		unsigned int data_width = info->data_width;
	int psize = info->psize;		int psize = info->psize;
	int num_elems;		int num_elems;
	@@ -155,7 +156,7 @@ static int d40_phy_fill_lli(struct d40_phy_lli *lli,
	* Distance to next element sized entry.		* Distance to next element sized entry.
	* Usually the size of the element unless you want gaps.		* Usually the size of the element unless you want gaps.
	*/		*/
	if (!is_device)		if (addr_inc)
	lli->reg_elt \|= (0x1 << data_width) <<		lli->reg_elt \|= (0x1 << data_width) <<
	D40_SREG_ELEM_PHY_EIDX_POS;		D40_SREG_ELEM_PHY_EIDX_POS;

	@@ -201,40 +202,45 @@ static int d40_seg_size(int size, int data_width1, int data_width2)

	static struct d40_phy_lli *		static struct d40_phy_lli *
	d40_phy_buf_to_lli(struct d40_phy_lli *lli, dma_addr_t addr, u32 size,		d40_phy_buf_to_lli(struct d40_phy_lli *lli, dma_addr_t addr, u32 size,
	dma_addr_t lli_phys, u32 reg_cfg, bool term_int,		dma_addr_t lli_phys, u32 reg_cfg,
	bool is_device, struct stedma40_half_channel_info *info,		struct stedma40_half_channel_info *info,
	struct stedma40_half_channel_info *otherinfo)		struct stedma40_half_channel_info *otherinfo,
			unsigned long flags)
	{		{
			bool addr_inc = flags & LLI_ADDR_INC;
			bool term_int = flags & LLI_TERM_INT;
	int err;		int err;
	dma_addr_t next = lli_phys;		dma_addr_t next = lli_phys;
	int size_rest = size;		int size_rest = size;
	int size_seg = 0;		int size_seg = 0;

			/*
			* This piece may be split up based on d40_seg_size(); we only want the
			* term int on the last part.
			*/
			if (term_int)
			flags &= ~LLI_TERM_INT;

	do {		do {
	size_seg = d40_seg_size(size_rest, info->data_width,		size_seg = d40_seg_size(size_rest, info->data_width,
	otherinfo->data_width);		otherinfo->data_width);
	size_rest -= size_seg;		size_rest -= size_seg;

	if (term_int && size_rest == 0)		if (term_int && size_rest == 0) {
	next = 0;		next = 0;
	else		flags \|= LLI_TERM_INT;
			} else
	next = ALIGN(next + sizeof(struct d40_phy_lli),		next = ALIGN(next + sizeof(struct d40_phy_lli),
	D40_LLI_ALIGN);		D40_LLI_ALIGN);

	err = d40_phy_fill_lli(lli,		err = d40_phy_fill_lli(lli, addr, size_seg, next,
	addr,		reg_cfg, info, flags);
	size_seg,
	next,
	reg_cfg,
	!next,
	is_device,
	info);

	if (err)		if (err)
	goto err;		goto err;

	lli++;		lli++;
	if (!is_device)		if (addr_inc)
	addr += size_seg;		addr += size_seg;
	} while (size_rest);		} while (size_rest);

	@@ -256,31 +262,29 @@ int d40_phy_sg_to_lli(struct scatterlist *sg,
	int total_size = 0;		int total_size = 0;
	int i;		int i;
	struct scatterlist *current_sg = sg;		struct scatterlist *current_sg = sg;
	dma_addr_t dst;
	struct d40_phy_lli *lli = lli_sg;		struct d40_phy_lli *lli = lli_sg;
	dma_addr_t l_phys = lli_phys;		dma_addr_t l_phys = lli_phys;
			unsigned long flags = 0;

			if (!target)
			flags \|= LLI_ADDR_INC;

	for_each_sg(sg, current_sg, sg_len, i) {		for_each_sg(sg, current_sg, sg_len, i) {
			dma_addr_t sg_addr = sg_dma_address(current_sg);
			unsigned int len = sg_dma_len(current_sg);
			dma_addr_t dst = target ?: sg_addr;

	total_size += sg_dma_len(current_sg);		total_size += sg_dma_len(current_sg);

	if (target)		if (i == sg_len - 1)
	dst = target;		flags \|= LLI_TERM_INT;
	else
	dst = sg_dma_address(current_sg);

	l_phys = ALIGN(lli_phys + (lli - lli_sg) *		l_phys = ALIGN(lli_phys + (lli - lli_sg) *
	sizeof(struct d40_phy_lli), D40_LLI_ALIGN);		sizeof(struct d40_phy_lli), D40_LLI_ALIGN);

	lli = d40_phy_buf_to_lli(lli,		lli = d40_phy_buf_to_lli(lli, dst, len, l_phys,
	dst,		reg_cfg, info, otherinfo, flags);
	sg_dma_len(current_sg),
	l_phys,
	reg_cfg,
	sg_len - 1 == i,
	target == dst,
	info,
	otherinfo);
	if (lli == NULL)		if (lli == NULL)
	return -EINVAL;		return -EINVAL;
	}		}
	@@ -343,8 +347,10 @@ static void d40_log_fill_lli(struct d40_log_lli *lli,
	dma_addr_t data, u32 data_size,		dma_addr_t data, u32 data_size,
	u32 reg_cfg,		u32 reg_cfg,
	u32 data_width,		u32 data_width,
	bool addr_inc)		unsigned int flags)
	{		{
			bool addr_inc = flags & LLI_ADDR_INC;

	lli->lcsp13 = reg_cfg;		lli->lcsp13 = reg_cfg;

	/* The number of elements to transfer */		/* The number of elements to transfer */
	@@ -369,8 +375,9 @@ static struct d40_log_lli d40_log_buf_to_lli(struct d40_log_lli lli_sg,
	u32 lcsp13, /* src or dst*/		u32 lcsp13, /* src or dst*/
	u32 data_width1,		u32 data_width1,
	u32 data_width2,		u32 data_width2,
	bool addr_inc)		unsigned int flags)
	{		{
			bool addr_inc = flags & LLI_ADDR_INC;
	struct d40_log_lli *lli = lli_sg;		struct d40_log_lli *lli = lli_sg;
	int size_rest = size;		int size_rest = size;
	int size_seg = 0;		int size_seg = 0;
	@@ -383,7 +390,7 @@ static struct d40_log_lli d40_log_buf_to_lli(struct d40_log_lli lli_sg,
	addr,		addr,
	size_seg,		size_seg,
	lcsp13, data_width1,		lcsp13, data_width1,
	addr_inc);		flags);
	if (addr_inc)		if (addr_inc)
	addr += size_seg;		addr += size_seg;
	lli++;		lli++;
	@@ -403,7 +410,10 @@ int d40_log_sg_to_lli(struct scatterlist *sg,
	struct scatterlist *current_sg = sg;		struct scatterlist *current_sg = sg;
	int i;		int i;
	struct d40_log_lli *lli = lli_sg;		struct d40_log_lli *lli = lli_sg;
	bool autoinc = !dev_addr;		unsigned long flags = 0;

			if (!dev_addr)
			flags \|= LLI_ADDR_INC;

	for_each_sg(sg, current_sg, sg_len, i) {		for_each_sg(sg, current_sg, sg_len, i) {
	dma_addr_t sg_addr = sg_dma_address(current_sg);		dma_addr_t sg_addr = sg_dma_address(current_sg);
	@@ -416,7 +426,7 @@ int d40_log_sg_to_lli(struct scatterlist *sg,
	lcsp13,		lcsp13,
	data_width1,		data_width1,
	data_width2,		data_width2,
	autoinc);		flags);
	}		}

	return total_size;		return total_size;

drivers/dma/ste_dma40_ll.h

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -293,6 +293,11 @@ struct d40_def_lcsp {

	/* Physical channels */		/* Physical channels */

			enum d40_lli_flags {
			LLI_ADDR_INC = 1 << 0,
			LLI_TERM_INT = 1 << 1,
			};

	void d40_phy_cfg(struct stedma40_chan_cfg *cfg,		void d40_phy_cfg(struct stedma40_chan_cfg *cfg,
	u32 *src_cfg,		u32 *src_cfg,
	u32 *dst_cfg,		u32 *dst_cfg,