From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.161.49 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794826391; b=H/SAElbg4WQCvSRaVFLo0MCvAwdg0+ca2ZV/lDN40JoDmQHyceC3PJ6dPHr+wsxIVdlV 1n74tE9X66sQ604jpflVsRjGExn3FDM2G31baMxij6/IWZiRRl2frujPlp/jVKTIlxA7k 50fEB5a6EIiO2/86plnQaE/oK6Vo4bnOhjbxiOcgiKVf4XhHX1BGeEX4Gv1VtkFK8k+1r +2xtv9UTSxf4aHzzgkFnGHO3qhiOga0viIwjj5+A2xPrJRuqibEjc5N7Xx0ujMKa8UXRI HBqiqDFQuZidwdNNRJmU5PEhfkZnY4AgGl9CpGfbfsoMKgPyOTmA2kY/f764eLBXH2g== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794826391; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:Date:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding: Message-Id:References:In-Reply-To:To:Cc:X-Mailer; bh=K0i/xrW+wVH3BjomlRH87KMdUy4LFZjH49JteTT0ats=; b=E5mjWAUE0b+KweDxbUg188AepO5A6VBlf3hQq/hcoQMI5ZdFNDG4jLD2eEddVgqx8i0F w4tRGJ0K7aidQCpV04p8noiqp5pEBtOMpU0Hsmg29+bwqwexOowx9ruTVleCUavl52VRj OnkZWPGd4sQwuxUJ7b6l7qttbUf6lJTKrPgOCqQhPIYQdJwc9W12gNA2kHnLF8DRe8ygl RAI1GpN+wsTQ6TLuS5yWKHJYt++IHc9QiuS+32HY/DYfdFNPGPhx4eSQJBdVgZB3MTzqL DnVF9IXgSla8DTRnm8ek8IfKvVWl4/9KXEwUWYWLZKVnLUog+A1gjngSkVBg0nJ1TPQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=GmUsAtvS; arc=none smtp.remote-ip=209.85.161.49 Received: from mail-oo1-f49.google.com (mail-oo1-f49.google.com [209.85.161.49]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 59E91606A8BB for ; Mon, 16 Nov 2026 10:53:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 59E91606A8BB Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=GmUsAtvS Received: by mail-oo1-f49.google.com with SMTP id 006d021491bc7-71af0656bedso424411eaf.0 for ; Mon, 16 Nov 2026 02:53:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794826390; x=1795431190; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=K0i/xrW+wVH3BjomlRH87KMdUy4LFZjH49JteTT0ats=; b=GmUsAtvSbwsdlAwC1mIYv0+NOcOmgCNdTQjqnO6xCvFfxWZvrT5ezUBenWrx+nUZ2S pQuvuU0uFb1KX4Y7THWkOT/O5GYufIiEykMHO+Ax5+Dh/rLaKD8XNa+5E+39NuZp9IQR yhPXodfJO+ukZQ6+wzD6iXDQt3/jj55apKGc88eV1j6tjf7gh+aspBXll+lbZ2lbJ+4F Pdp+NRat5FEHb85QMI/CSiOAEtoHrc6shQ68klDhOWQ5x2zHp/vi/0iZMtXSbec+iCb6 RDS2XAr+oc6Crw3yiaxWfOT3S/bG1uB0f98bhoJPkLUgJUwBwapVoPPBy7m8hUPIOz+P FrEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794826390; x=1795431190; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=K0i/xrW+wVH3BjomlRH87KMdUy4LFZjH49JteTT0ats=; b=iNqlPIEFKXYf4EXvpVhJRCKnVkCVufj83Uh/C2bCZyHWHNekAj8dQsfSKgH9SCVQjg o+6fYmx2od+YEcy9RyLfku518ke+uWDXf7puR0YMSY0Q5WQhXwAk6DQz2RnivBylOH/o He6VZT3g9gTRU/F4RU9U5TrB1EC91pv2nNG/cd7V+qh5mSd161/eOa6nMOmRRJ134kM2 a/JHdScIH6lhHM1NWQ/scQAcwObpVS4Q7VvQbIetVjcFSHwo4qSfm3uAFXV415VCh7eB x3f6QqOVHfI25WCQNltzu7WDtVBVfTb+Wphi4PihgvhWVgMgEQW4fIs7OiE5TcFyWuu5 pJ0g== X-Forwarded-Encrypted: i=1; AL+hErH3SeD9j2etNaRCRG4bjaLHOJgyD9qCKaNlFj9gCkeSOVEevxA7yESgy5YcbFLo8Kv+hWAQLLa291LuO0k=@vger.kernel.org X-Gm-Message-State: APuU4Z/p9oUMVsMlz9KBZzpLxVQMTTljTm+i7fTVGwvAWOCFsLX0oC+r dK18kD+kot539V0acpQSq1FmGh4p5HtS3RuOPFAZeObqZ62tmN5ykYvs X-Gm-Gg: AYBFou1TxoGvewmYP/q0X9bcEJG9eMiAb2iNqp5c03+uMkGa5kMgWrnWzTpX1NThuvP I7XdazYR+Dgm75x6pQoSHxl1y/tkj9lidhg1skQe+ZfTi0n0jiEede5xTM5Nxu0lRu9tcD4FUCn pRXx1VK3JXC6tYOFB7WqWChSV7j/vX6C+rmw9JTDvksO9HxMTJ5M8XqSCc412C+8Y1IqS7K93eQ DE2LzE000+qZyuTLUwpQsLAZkX5uFGT1PFyeMxXELei5wulndfYGSBOM+ZhYjEYjbOYyo59sn+X Wryf7e5smLiZfgVW59jmm1sxy2gqeFbRjmauW1Kg4gaDmEtAO44XS6t+zX9rjtLjkJlkOTK9L4e STCnkvuuSsEagd1TlDgVRVSPXkf80hcYyy9Hj35DFFEzKXy1HM0DzKNd6jooXOq1hGNCX61rz2a sO1tCPg3ixNs/3VfRBl4EW0DAX/l1bCPzwtYc1r1+hZH5TsqXoDWr03aMnzimEpY1tmxBTGYB7J yf3M50JZDRKbQeNZ48Pzn1C9qLzZ5euVaHQP0q/p3iwjtR8S99ToK1Bb+XPQU5K9j2ldlfTotfc 9Ru1vSWzvDoGtUgfMsmVaeqYb8huBE7uLLugfDk/N6JWS884+viKDIuagyM77vixv2HolZJZjYz RrO6yy8MewXCFYh1oMe/xWB82C6W3HHgLbHsVR9zriqaO/DpWgSRuzQZriIHGivgNwIJsbKLxek JQgmQV5mqwbABz6LqtiWja2NHgfr9rnMobV8b8TShNFGrCEjeqIfKABMJeQN/W5MLiZaDJ+cwZ X-Received: by 2002:a05:6820:1f03:b0:71a:e74b:f97e with SMTP id 006d021491bc7-71ae74bfad9mr2617887eaf.23.1794826390315; Mon, 16 Nov 2026 02:53:10 -0800 (PST) Received: from [127.0.1.1] (174-29-1-49.hlrn.qwest.net. [174.29.1.49]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-862b08b8b5bsm5555546a34.5.2026.11.16.02.53.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2026 02:53:09 -0800 (PST) From: James Hilliard Date: Mon, 16 Nov 2026 03:52:33 -0700 Subject: [PATCH v8 5/6] dmaengine: dw: calculate residue in the status getter X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261116-submit-dw-dma-synchronize-v1-v8-5-4a82d64fcd1a@gmail.com> References: <20261116-submit-dw-dma-synchronize-v1-v8-0-4a82d64fcd1a@gmail.com> In-Reply-To: <20261116-submit-dw-dma-synchronize-v1-v8-0-4a82d64fcd1a@gmail.com> To: Viresh Kumar , Andy Shevchenko , Vinod Koul , Frank Li , Dan Williams Cc: Serge Semin , Greg Kroah-Hartman , Jiri Slaby , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , dmaengine@vger.kernel.org, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, Sashiko , Lars-Peter Clausen , James Hilliard , stable@vger.kernel.org X-Mailer: b4 0.17-dev From: Serge Semin Calculate hardware-LLP residue while looking up the requested cookie under the channel lock. The descriptor scanner updates cached residue only when no transfer-complete event is pending. If a status query completes the current transaction and starts the next one, that new transaction's cached residue has not been initialized and a query for its cookie reports zero. Have dwc_get_hard_llp_desc_residue() return a local residue value from a fresh LLP snapshot. Keep the persistent residue field for software-LLP block accounting, subtracting the current block's progress when reporting status. The descriptor scanner continues to advance software-LLP blocks and complete cookies from RAW.XFER, including for polled transfers. Fixes: 4702d5244ca9 ("dw_dmac: return proper residue value") Cc: stable@vger.kernel.org Signed-off-by: Serge Semin [james: retain polled completion and software-LLP progress] Signed-off-by: James Hilliard --- drivers/dma/dw/core.c | 49 ++++++++++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 27 deletions(-) diff --git a/drivers/dma/dw/core.c b/drivers/dma/dw/core.c index 504b6ddeccd4..565d01c9a29a 100644 --- a/drivers/dma/dw/core.c +++ b/drivers/dma/dw/core.c @@ -214,41 +214,41 @@ static inline u32 dwc_get_sent(struct dw_dma_chan *dwc) return dw->block2bytes(dwc, ctlhi, ctllo >> 4 & 7); } -static void dwc_get_hard_llp_desc_residue(struct dw_dma_chan *dwc, - struct dw_desc *desc, dma_addr_t llp) +static u32 dwc_get_hard_llp_desc_residue(struct dw_dma_chan *dwc, struct dw_desc *desc) { + u32 residue = desc->total_len; struct dw_desc *child; + dma_addr_t llp; + + llp = channel_readl(dwc, LLP); - desc->residue = desc->total_len; + /* The first descriptor may still be waiting to be fetched. */ if (desc->vd.tx.phys == DWC_LLP_LOC(llp)) - return; + return residue; - if (lli_read(desc, llp) == llp) { - desc->residue -= dwc_get_sent(dwc); - return; - } + if (lli_read(desc, llp) == llp) + return residue - dwc_get_sent(dwc); - desc->residue -= desc->len; + residue -= desc->len; list_for_each_entry(child, &desc->tx_list, vd.node) { - if (lli_read(child, llp) == llp) { - desc->residue -= dwc_get_sent(dwc); - return; - } - desc->residue -= child->len; + if (lli_read(child, llp) == llp) + return residue - dwc_get_sent(dwc); + + residue -= child->len; } + + return residue; } static void dwc_scan_descriptors(struct dw_dma *dw, struct dw_dma_chan *dwc) { struct dw_desc *desc; struct dw_desc *child; - dma_addr_t llp; lockdep_assert_held(&dwc->vc.lock); - llp = channel_readl(dwc, LLP); if (!(dma_readl(dw, RAW.XFER) & dwc->mask)) - goto residue; + return; dma_writel(dw, CLEAR.XFER, dwc->mask); if (!dwc->desc) @@ -287,14 +287,6 @@ static void dwc_scan_descriptors(struct dw_dma *dw, struct dw_dma_chan *dwc) dwc->desc = NULL; vchan_cookie_complete(&desc->vd); dwc_dostart_first_queued(dwc); - return; - -residue: - desc = dwc->desc; - if (!desc || test_bit(DW_DMA_IS_SOFT_LLP, &dwc->flags)) - return; - - dwc_get_hard_llp_desc_residue(dwc, desc, llp); } static inline void dwc_dump_lli(struct dw_dma_chan *dwc, struct dw_desc *desc) @@ -892,9 +884,12 @@ static u32 dwc_get_residue_and_status(struct dw_dma_chan *dwc, dma_cookie_t cook desc = dwc_find_desc(dwc, cookie); if (desc) { if (desc == dwc->desc) { - residue = desc->residue; - if (test_bit(DW_DMA_IS_SOFT_LLP, &dwc->flags) && residue) + if (test_bit(DW_DMA_IS_SOFT_LLP, &dwc->flags)) { + residue = desc->residue; residue -= dwc_get_sent(dwc); + } else { + residue = dwc_get_hard_llp_desc_residue(dwc, desc); + } if (test_bit(DW_DMA_IS_PAUSED, &dwc->flags)) *status = DMA_PAUSED; } else { -- 2.53.0