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

Commit 4aed79b2 authored by Marcin Mielczarczyk's avatar Marcin Mielczarczyk Committed by Dan Williams
Browse files

DMAENGINE: DMA40 fix for allocation of logical channel 0 



Fix for allocation failure of logical channel when event line
happens to be number 0.

Signed-off-by: default avatarMarcin Mielczarczyk <marcin.mielczarczyk@tieto.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@stericsson.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent a5ebca47

drivers/dma/ste_dma40.c

+8 −7
Original line number Diff line number Diff line
@@ -1039,11 +1039,11 @@ static int d40_validate_conf(struct d40_chan *d40c, 
}



static bool d40_alloc_mask_set(struct d40_phy_res *phy, bool is_src,

			       int log_event_line)

			       int log_event_line, bool is_log)

{

	unsigned long flags;

	spin_lock_irqsave(&phy->lock, flags);

	if (!log_event_line) {

	if (!is_log) {

		/* Physical interrupts are masked per physical full channel */

		if (phy->allocated_src == D40_ALLOC_FREE &&

		    phy->allocated_dst == D40_ALLOC_FREE) {
@@ -1161,15 +1161,16 @@ static int d40_allocate_channel(struct d40_chan *d40c) 
			/* Find physical half channel */

			for (i = 0; i < d40c->base->num_phy_chans; i++) {



				if (d40_alloc_mask_set(&phys[i], is_src, 0))

				if (d40_alloc_mask_set(&phys[i], is_src,

						       0, is_log))

					goto found_phy;

			}

		} else

			for (j = 0; j < d40c->base->num_phy_chans; j += 8) {

				int phy_num = j  + event_group * 2;

				for (i = phy_num; i < phy_num + 2; i++) {

					if (d40_alloc_mask_set(&phys[i],

							       is_src, 0))

					if (d40_alloc_mask_set(&phys[i], is_src,

							       0, is_log))

						goto found_phy;

				}

			}
@@ -1193,13 +1194,13 @@ static int d40_allocate_channel(struct d40_chan *d40c) 
		if (is_src) {

			for (i = phy_num; i < phy_num + 2; i++) {

				if (d40_alloc_mask_set(&phys[i], is_src,

						       event_line))

						       event_line, is_log))

					goto found_log;

			}

		} else {

			for (i = phy_num + 1; i >= phy_num; i--) {

				if (d40_alloc_mask_set(&phys[i], is_src,

						       event_line))

						       event_line, is_log))

					goto found_log;

			}

		}