From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8717117DFFC; Sun, 1 Sep 2024 16:33:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725208435; cv=none; b=aisZ2x+leOIx1zqkbuUXX9uTL/1vA/mHAi9F9E7qEaZkbdlvKbrYRHFpcFzo7rOvYa8nroTneQO35IiYuzgQ0KTIwIvL5LrzGwIthPi1EX1S7U8bLGOR2mzUMcMzUh6+dOowNdK4Zu9w5yEexZDfsZ+b6HskVxdWNMZgwSdAZmw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725208435; c=relaxed/simple; bh=TuJHHpvnHgQkLq5TUhwHByAw78s9VbQZV/HquN7sWa8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eZE0OigFd3fkaVCYuNS54WaVMwbqxvNkXCMnsmeBjWXF/80jZJWvBNEdEDs02OYjEhOhCHtcRts2ripXyOj1W5K2QSuEjEfLvJsRBHnGwDmEXlBYAwA9pqbbVGSUnzpPu4mnwMamAygzrxnz7x70Dw9NKHOCjiPP5aC83aSLg4U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=pyxZsfs/; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="pyxZsfs/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BDD54C4CEC3; Sun, 1 Sep 2024 16:33:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1725208435; bh=TuJHHpvnHgQkLq5TUhwHByAw78s9VbQZV/HquN7sWa8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pyxZsfs/vNNlPAK00riK8zA74kci6ghHuepabXIGiOd3blbvu20HxLX1NO1HYN6zc O7CL3LfYCWtER5+aHxEgfa8OvD/7U9OeD/boZW6vgm154c2i7hRQFqgtcTNca4z/6e Eb5u1+2+CoBX/JWMEk3LWZmiAf+tPTbBb+/Ntcns= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mrinmay Sarkar , Manivannan Sadhasivam , Vinod Koul Subject: [PATCH 6.10 081/149] dmaengine: dw-edma: Fix unmasking STOP and ABORT interrupts for HDMA Date: Sun, 1 Sep 2024 18:16:32 +0200 Message-ID: <20240901160820.514803182@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240901160817.461957599@linuxfoundation.org> References: <20240901160817.461957599@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mrinmay Sarkar commit 383baf5c8f062091af34c63f28d37642a8f188ae upstream. The current logic is enabling both STOP_INT_MASK and ABORT_INT_MASK bit. This is apparently masking those particular interrupts rather than unmasking the same. If the interrupts are masked, they would never get triggered. So fix the issue by unmasking the STOP and ABORT interrupts properly. Fixes: e74c39573d35 ("dmaengine: dw-edma: Add support for native HDMA") cc: stable@vger.kernel.org Signed-off-by: Mrinmay Sarkar Reviewed-by: Manivannan Sadhasivam Link: https://lore.kernel.org/r/1724674261-3144-2-git-send-email-quic_msarkar@quicinc.com Signed-off-by: Vinod Koul Signed-off-by: Greg Kroah-Hartman --- drivers/dma/dw-edma/dw-hdma-v0-core.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) --- a/drivers/dma/dw-edma/dw-hdma-v0-core.c +++ b/drivers/dma/dw-edma/dw-hdma-v0-core.c @@ -247,10 +247,11 @@ static void dw_hdma_v0_core_start(struct if (first) { /* Enable engine */ SET_CH_32(dw, chan->dir, chan->id, ch_en, BIT(0)); - /* Interrupt enable&unmask - done, abort */ - tmp = GET_CH_32(dw, chan->dir, chan->id, int_setup) | - HDMA_V0_STOP_INT_MASK | HDMA_V0_ABORT_INT_MASK | - HDMA_V0_LOCAL_STOP_INT_EN | HDMA_V0_LOCAL_ABORT_INT_EN; + /* Interrupt unmask - stop, abort */ + tmp = GET_CH_32(dw, chan->dir, chan->id, int_setup); + tmp &= ~(HDMA_V0_STOP_INT_MASK | HDMA_V0_ABORT_INT_MASK); + /* Interrupt enable - stop, abort */ + tmp |= HDMA_V0_LOCAL_STOP_INT_EN | HDMA_V0_LOCAL_ABORT_INT_EN; if (!(dw->chip->flags & DW_EDMA_CHIP_LOCAL)) tmp |= HDMA_V0_REMOTE_STOP_INT_EN | HDMA_V0_REMOTE_ABORT_INT_EN; SET_CH_32(dw, chan->dir, chan->id, int_setup, tmp);