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 9EA6A3A4F34; Tue, 31 Mar 2026 16:56:11 +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=1774976171; cv=none; b=JyEDhIR5HBkYmVu+Xp8paKdYRf/5sdzdY6zqCvKOVJf/QPSnU4uxTLRIpxUEMijrdCV/FPJurcD8CIYsZVhQubY9AwGs3ojrM+MnqGFHsbHACFrwnMYAWpa0X7MvAbNxtGf5fCK5QId3IDkuLW/og9ip+jBuXf/ZFJRBGxCzEMY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774976171; c=relaxed/simple; bh=UAGVPoUG9gOiDwN6zY61ysm+zxncnGQ9ZWhBxJPQnBE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D3T2iRrIjs6XRgpev0NLVZ+Pk9VZSEi56PUFEBz7VKlsvNapPNJRxke4Eq6CaGT9/epKUN9Y6g04F0VpI1UHkR3oRK8jHQ01t3XpMZm4KgITCQ9KNCMK6euVxcov1MQRztC+h2Lmg+eStNIhtknkuhSBIA/1hi/Zze1mDXW7mb8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=KlwfALmL; 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="KlwfALmL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D6DE7C19423; Tue, 31 Mar 2026 16:56:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1774976171; bh=UAGVPoUG9gOiDwN6zY61ysm+zxncnGQ9ZWhBxJPQnBE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KlwfALmL4XJWKM8/R/HdLul4GfH6qXSuWiNkLGKtVUpo+sat3XSN/TnsLdhUgati8 DHZgYlXOS4Btx1Zxb2vH0jmz9QPVve/WdGvmoox+OANv+kO7N0BHLhmNDv+iI8X3yr hcKR5JNlsRSkyufu0hobM2AxC1PLERdsKcTUZCoA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Marek Vasut , Vinod Koul , Sasha Levin Subject: [PATCH 6.12 234/244] dmaengine: xilinx: xilinx_dma: Fix unmasked residue subtraction Date: Tue, 31 Mar 2026 18:23:04 +0200 Message-ID: <20260331161750.403895181@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260331161741.651718120@linuxfoundation.org> References: <20260331161741.651718120@linuxfoundation.org> User-Agent: quilt/0.69 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.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Marek Vasut [ Upstream commit c7d812e33f3e8ca0fa9eeabf71d1c7bc3acedc09 ] The segment .control and .status fields both contain top bits which are not part of the buffer size, the buffer size is located only in the bottom max_buffer_len bits. To avoid interference from those top bits, mask out the size using max_buffer_len first, and only then subtract the values. Fixes: a575d0b4e663 ("dmaengine: xilinx_dma: Introduce xilinx_dma_get_residue") Signed-off-by: Marek Vasut Link: https://patch.msgid.link/20260316222530.163815-1-marex@nabladev.com Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/xilinx/xilinx_dma.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/dma/xilinx/xilinx_dma.c b/drivers/dma/xilinx/xilinx_dma.c index fff51a00fb9fb..b1c540fbcd716 100644 --- a/drivers/dma/xilinx/xilinx_dma.c +++ b/drivers/dma/xilinx/xilinx_dma.c @@ -996,16 +996,16 @@ static u32 xilinx_dma_get_residue(struct xilinx_dma_chan *chan, struct xilinx_cdma_tx_segment, node); cdma_hw = &cdma_seg->hw; - residue += (cdma_hw->control - cdma_hw->status) & - chan->xdev->max_buffer_len; + residue += (cdma_hw->control & chan->xdev->max_buffer_len) - + (cdma_hw->status & chan->xdev->max_buffer_len); } else if (chan->xdev->dma_config->dmatype == XDMA_TYPE_AXIDMA) { axidma_seg = list_entry(entry, struct xilinx_axidma_tx_segment, node); axidma_hw = &axidma_seg->hw; - residue += (axidma_hw->control - axidma_hw->status) & - chan->xdev->max_buffer_len; + residue += (axidma_hw->control & chan->xdev->max_buffer_len) - + (axidma_hw->status & chan->xdev->max_buffer_len); } else { aximcdma_seg = list_entry(entry, @@ -1013,8 +1013,8 @@ static u32 xilinx_dma_get_residue(struct xilinx_dma_chan *chan, node); aximcdma_hw = &aximcdma_seg->hw; residue += - (aximcdma_hw->control - aximcdma_hw->status) & - chan->xdev->max_buffer_len; + (aximcdma_hw->control & chan->xdev->max_buffer_len) - + (aximcdma_hw->status & chan->xdev->max_buffer_len); } } -- 2.53.0