From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.161.45 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794808882; b=mZaww9lB2hOfEGG0I/JoXCUxt1Gy9WDlcBNXDs6T0NO1tNHfvAKNRV3UqnOISJkpC2j+ vfiEWlq2ZSLb3Fm7bvVzkjOe67AKZQ7LiwBXYlqhPN/Xas+R4Yxw7IF8FuKt/3qsG8Nty K5oX9W54riZFpsspcuVAGU4ayzVHuI03oPqXe+I6o4S+5Xy6DCWJ/CyVu6eClFo5QwoKB JU+XrEb9IYLMnlXr2t8YF+1wiE/t/jPjtGbVV4NVrsGYDQ005/ANUsOv4eHiMnuPJ55FX ++DTJgdGEZGe8roB2fxZArM7kVtk09+1eCTtcgjsPtFD6y1vQiOKWp2zV3aJtPbGUpw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794808882; 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=AOVjVYWiGu1+2CTZWPQd/l37VMMlzCbF4uz2qUZJc8U=; b=Xv1F5QettKiAvBiT6z+TWBxBvV0YnWKmQBNI4/WY0y9OxD+bIklCoRs+n3xbghuUxAQ2 hR29HBhumC5gTCLHNpqGNG9YAvrrqiLWbNIHWiZDMSbdcQLJx81j+S+z8RWUlDRx7EyXK P4nvw0XgAKkQvt7FedBi2hx6R8O+LM0gc2ia6fRr6wYDVXrDaKBHrjj5C6SgHW26XWNSA MCQP/3lIsraznwbr+YLVuCT8oUQ+cBV7YaQCaSx+Xuj9f/cu0zS3Hw6XQtuIszQuBYqHk w7r1ObfvbH0hnhGSmCSS9xjAL4lqki8xw1cQL6hsmkBVR/YpNPYR5TS/dfzUMTJXsJA== 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="P/En0gAp"; arc=none smtp.remote-ip=209.85.161.45 Received: from mail-oo1-f45.google.com (mail-oo1-f45.google.com [209.85.161.45]) (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 BCEE1606A332 for ; Mon, 16 Nov 2026 06:01:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org BCEE1606A332 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=P/En0gAp Received: by mail-oo1-f45.google.com with SMTP id 006d021491bc7-6b1afdf5196so1041459eaf.2 for ; Sun, 15 Nov 2026 22:01:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794808880; x=1795413680; 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=AOVjVYWiGu1+2CTZWPQd/l37VMMlzCbF4uz2qUZJc8U=; b=P/En0gApUmL5JhFwKBSaELY/MyPtlTG9oUUc0wNQR7tScXvNx5NPcpZYtaPjCOuY0V EDAz5K6zAy2NyvfeADsaEc5U5TRNrQKw5LykSnWVojGoqySha/TLWQ9yUcgS7LPZelzh TgIbcvM1useOztFvhRS1oqywlg13+TWdsFy7hAfeheFrync0py+c1+JGBnPVmDgxyVsD w/HQU5KEtHMNBziDhQihNh239boXBdQU6tyXnETicm1aPtN3DDrMNtPOaj/C2zy+QVt5 QgJeiC2GK1XEbVc70GGDVYZAN6xFmjP76YEqi6eRNEPlocHD6UhOMKgKU6iunGsYg2Q3 bRQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794808880; x=1795413680; 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=AOVjVYWiGu1+2CTZWPQd/l37VMMlzCbF4uz2qUZJc8U=; b=e5mb1yh0q9Bfay1UgX6cKRTCmMJJikzMr9Y7uXCVXqDwa4sK/iSYLClkvvx8grJdBH H9JTDuLUQtel+CSyJ6QvMbVkdnhed8vrl5q2+og3dgHqqY8MMc9oTlTES9b9WAf5DOqy ZTL4bIzHwJsGpFnDhPbgF1i4w7+X664U5HaAhI9RaebwhrxYBwRN5ZwEBy6OtFEnfOGW OyiSFs59BKHAqQhFMlTfytAxD8RxSo6Ie2CW6AtVNdliskRLgiJdmaSJJtF/gzGCCEA5 1SMv+2ALixv6bFSF/F/4XVJ0wG4DB5JqzCi8852rGJxZjnDqaEH62OJ1mc9xB4QNtSLW uQ/Q== X-Forwarded-Encrypted: i=1; AL+hErH6mz+X9xnIc+rkBxK5wSfdw52G4tKueqzHcHaySZX8pHeL2YXbk/r4wr7xZOO+6qRGxQzPYpUdGVaESrI=@vger.kernel.org X-Gm-Message-State: APuU4Z/5aSDb70CZH7jjYsddBlRtUPe3EjuGAeQKWl7O4Gd+cTnXuz3p fl78yXV58K65TXaMLc5hluBNh7Z+tEpY31OabvbP6Y3npqFGrIShvkp+ X-Gm-Gg: AYBFou2YVi5nZBaxXjW8WQI9DUcap6kpHek89UHefT/AL9aozJ5y42EAWIuwnciYRHt h9sGGIGO6ziLJMBubftu8e1T11FwShj4Nz558M/Y2vVU7EcL/pfaXj4T3Y34dquPY0lZbPq/9NA CFMsHNkeWHxMtmX1QZyAejI08LoqLycn7q7Akn3N7UtSPIy4bI8OSdd/ttx/nzax5kHCBVWvx61 lSxOsyzvCqNiZsuOHbcdQgEjxLcSt5yKaFvDgcmZHteS8SRehsimc1aAQ1vFdz86rife6uxxJoM ZNGUHUFdzpUZ7tsUEVayuGp5fhHKIGfJyHJUyBpPVumP8VtFMsf6VHLbBuGBn15VxgtOIp2VO3S qXZdUMQMWlIJY0WHdPa19JGVAoF4dTqcJdoxnYndk5Q/+k1jo7TWK6iJ5CrYdXowIYkDiJESFxI m2wUv6fKU6BCRQ73GtmCthvVmGz8uZxv7eOPjxKCrINM2pUnTr/H7ch99Xt7vp+6I27XRPQCtqy ArUOUdfrs42+wEVQZfKJTivNUKf3gCGgPX8I2070RBn9BZCf+gUNDgyXh2sIvcJaw2cnzjKCing vmWhPlaSvYSMshBRb278q9ba6nDL9ylZ/rAEgc5oi8JJz4E2tc0KFWF1MLZxTKWv4eK/XkmXif+ R19zjuDmEkY4eNi+YRoDOb2V8fP3u3W3GZasPFkU3Fd7vw4qsuaiKxv+EFkEJRtxb2mmzvg3WFo kJLoZXYqlMnSb72vVOHNg5jcyUwgAQuKeJdwYNopPDpaj4KlijtnY= X-Received: by 2002:a05:6820:c5ca:10b0:6dc:8f59:6ba7 with SMTP id 006d021491bc7-71ab522206fmr3884129eaf.73.1794808880626; Sun, 15 Nov 2026 22:01:20 -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-862881a965esm9375160a34.25.2026.11.15.22.01.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Nov 2026 22:01:20 -0800 (PST) From: James Hilliard Date: Sun, 15 Nov 2026 23:00:43 -0700 Subject: [PATCH v6 2/7] dmaengine: dw-axi-dmac: poll the correct enable bit during termination 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: <20261115-submit-dw-axi-dma-stop-pause-v1-v6-2-bcb23d1e7029@gmail.com> References: <20261115-submit-dw-axi-dma-stop-pause-v1-v6-0-bcb23d1e7029@gmail.com> In-Reply-To: <20261115-submit-dw-axi-dma-stop-pause-v1-v6-0-bcb23d1e7029@gmail.com> To: Eugeniy Paltsev , Vinod Koul , Frank Li , Sergey Khimich , Andy Shevchenko , Sia Jee Heng Cc: Mitch Barnett , dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, James Hilliard , stable@vger.kernel.org X-Mailer: b4 0.17-dev For channels 16 through 31, the channel enable bits occupy bits 32 through 47 of the extended DMAC_CHEN register. dma_chan_terminate_all() only reads the low word and tests BIT(chan->id), so it can conclude that an upper-bank channel has stopped while its actual enable bit remains set. Descriptors can then be freed while hardware still owns them. Poll axi_chan_is_hw_enable(), which already handles both register banks and the smaller channel layouts, instead of constructing another mask. Fixes: 495e18b16e3d ("dmaengine: dw-axi-dmac: Add support DMAX_NUM_CHANNELS > 16") Cc: stable@vger.kernel.org Signed-off-by: James Hilliard --- drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c index 6dae63024721..405ab9a78955 100644 --- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c +++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include "dw-axi-dmac.h" @@ -1179,17 +1180,17 @@ static irqreturn_t dw_axi_dma_interrupt(int irq, void *dev_id) static int dma_chan_terminate_all(struct dma_chan *dchan) { struct axi_dma_chan *chan = dchan_to_axi_dma_chan(dchan); - u32 chan_active = BIT(chan->id) << DMAC_CHAN_EN_SHIFT; unsigned long flags; - u32 val; + bool enabled; int ret; LIST_HEAD(head); axi_chan_disable(chan); - ret = readl_poll_timeout_atomic(chan->chip->regs + DMAC_CHEN, val, - !(val & chan_active), 1000, 50000); - if (ret == -ETIMEDOUT) + ret = readx_poll_timeout_atomic(axi_chan_is_hw_enable, chan, + enabled, !enabled, + 1 * USEC_PER_MSEC, 50 * USEC_PER_MSEC); + if (ret) dev_warn(dmaengine_chan_dev(dchan), "%s failed to stop\n", axi_chan_name(chan)); -- 2.53.0