From mboxrd@z Thu Jan 1 00:00:00 1970 From: Joel Fernandes Subject: Re: [PATCH v2] ARM: EDMA: Fix clearing of unused list for DT DMA resources Date: Fri, 6 Sep 2013 14:51:14 -0500 Message-ID: <522A3232.2090103@ti.com> References: <1377287613-16491-1-git-send-email-joelf@ti.com> <522A2943.4060502@newflow.co.uk> <522A29CF.2090001@newflow.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <522A29CF.2090001-2FZW7xY0fHgqdlJmJB21zg@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: Errors-To: davinci-linux-open-source-bounces-VycZQUHpC/PFrsHnngEfi1aTQe2KTcn/@public.gmane.org To: Mark Jackson Cc: Linux DaVinci Kernel List , Russell King , Tony Lindgren , Linux MMC List , Linux Kernel Mailing List , Vinod Koul , Pantel Antoniou , Dan Williams , Linux OMAP List , Linux ARM Kernel List List-Id: linux-omap@vger.kernel.org On 09/06/2013 02:15 PM, Mark Jackson wrote: > On 06/09/13 20:13, Mark Jackson wrote: >> On 23/08/13 20:53, Joel Fernandes wrote: >>> HWMOD removal for MMC and Crypto is breaking edma_start as the events are >>> being manually triggered due to unused channel list not being clear. Atleast >>> breakage has been seen on these peripherals, but it is expected Audio (McASP) >>> maybe breaking too. >>> >>> This patch fixes the issue, by reading the "dmas" property from the DT node if >>> it exists and clearing the bits in the unused channel list so that these channels >>> are not manually triggered. >>> >>> v2 changes: >>> Reduced indendation by returning from if block. >>> >>> Reviewed-by: Sekhar Nori >>> Reported-by: Balaji T K >>> Cc: Pantel Antoniou >>> Signed-off-by: Joel Fernandes >>> --- >>> Note: >>> Patch should go in for -rc cycle as it fixes existing crypto drivers. >>> >>> arch/arm/common/edma.c | 22 +++++++++++++++++++--- >>> 1 file changed, 19 insertions(+), 3 deletions(-) >>> >>> diff --git a/arch/arm/common/edma.c b/arch/arm/common/edma.c >>> index 39ad030..3867e7e 100644 >>> --- a/arch/arm/common/edma.c >>> +++ b/arch/arm/common/edma.c >>> @@ -560,14 +560,30 @@ static int reserve_contiguous_slots(int ctlr, unsigned int id, >>> static int prepare_unused_channel_list(struct device *dev, void *data) >>> { >>> struct platform_device *pdev = to_platform_device(dev); >>> - int i, ctlr; >>> + int i = 0, ctlr; >>> + u32 dma_chan; >>> + const __be32 *dma_chan_p; >>> + struct property *prop; >>> + >>> + if (dev->of_node) { >>> + of_property_for_each_u32(dev->of_node, "dmas", prop, >>> + dma_chan_p, dma_chan) { >>> + if (i++ & 1) { >>> + ctlr = EDMA_CTLR(dma_chan); >>> + clear_bit(EDMA_CHAN_SLOT(dma_chan), >>> + edma_cc[ctlr]->edma_unused); >>> + } >>> + } >>> + return; >> >> This should return something here, otherwise we get:- >> >> arch/arm/common/edma.c: In function 'prepare_unused_channel_list': >> arch/arm/common/edma.c:577:3: warning: 'return' with no value, in function returning non-void [-Wreturn-type] > > Other than that I can confirm it fixes the issue for me ... Thanks for pointing that out. Will fix it in the next revision. Regards, -Joel