From nobody Fri Dec 19 17:14:27 2025 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AEEB4308F1B for ; Thu, 6 Nov 2025 15:45:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762443902; cv=none; b=l8JSGMHcqj9CWvybkfIE9AJuPaiLs4ZSwuEfl3P7gGruFk2uyQjQ5/wX/1UB6VUOAL+KbdhdTLIsHClHFe8tE5gxnfVV8eHULYWophIhlrZrD0YkWUUVLLdDY6a2P8SkDIpj2ban6os3+7Ax7hz+9j2ZQkeroIZHv3dzd+nW69s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762443902; c=relaxed/simple; bh=qbhajpU0G4kJl7tgyhXKSP59dX10IT1q+klpIbWREpg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bkIP7J0c0ZqcZffBGhNvXSdPduQRLAvgqNR2DuZUv76cC7V06cBdSg2WmwMa9dluvDBwimbp25fVbS6AcozZZ/2sERuusm5jtBR1W8EAB3ierJs/tg77+eR5AABRs7Lc771SVei1Esrm5NJ9HBwlWBX9CIrOgejuEFlxEtgFOeE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl; spf=none smtp.mailfrom=bgdev.pl; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b=ABNOmtDl; arc=none smtp.client-ip=209.85.128.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b="ABNOmtDl" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-4775ae77516so13328375e9.1 for ; Thu, 06 Nov 2025 07:45:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1762443899; x=1763048699; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=x66guca1eftJPuWCv2VQqhGjAMisaYzjZ4uDuE1tm+w=; b=ABNOmtDl35JvgV5qJ97DZbDB9OFa2hGqfdga6fZENEGwfbMbWyHqOpOXyqlFmQUs5u FRkQcO/f4SaAStfqzL5LD9KjL7rH3BEC6OpeIsLS1hbEDLP8s4nIrlVoiM2aDCxO072y 8g2cp89lLP3Xb6MdDLQ+jLVFKKvIjtcqKDdGFtt2uuuVZ2e1EmDEpcAZJeFBP0qnj9eO R1hJNlN7ibLfxQUgTcswMb0Jsip32qZZd+TtqQymrBaT3VkwZK/ww0/xImUksQocuC6T lsstcXySQXXvyBoAlNlN5Sr5FctH7JaqaZ8mOX2lxF9o/GEZB1XTbxV84GjofIBmjW0A 4tEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762443899; x=1763048699; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=x66guca1eftJPuWCv2VQqhGjAMisaYzjZ4uDuE1tm+w=; b=UGJleWEc/JCzMrwmUa1ACR89yXK+9kdd4RxEi+tELtuZsPXTbxwkHDYZbJ4aJKtJKl O19GA384BezWd5QyXSDOAS2m77JSU8ifZslaZGt8UbizyJ+uB/2PZXhUgL3BGlAVmK4e COA1ulyxT6Acj5mEkznGb/Bj+Mg0CyxojfjT8ow4Lz6DboGfRGGE9ZGQaDfdm0nFAe7V u+nwteK8hoHPrAfsS2BgSp70JyrUgbwzC9sr8mILjs7JOHfxR21q3PtOX6ySpxM5YFwS S9cZynR7REq/2qwF0X50MOa0zDSKOswjdEEK9zaDkJr2dZH35x7Ud7DMBcL5JPSDqdKT NO0A== X-Forwarded-Encrypted: i=1; AJvYcCUPSMAXvyIdEYGThEP/AvaK6PKgPWSflYUHxJRIIu3kQun5JoB0WnWokrEyUZ19bA3UdPwKAJDWhsJ17CQ=@vger.kernel.org X-Gm-Message-State: AOJu0YyaYj4C0fxfztxSc1PloLZvdBrT+hP1yrawREJlV+Ytda/VIWnJ Wi1n3whP7RJDCCPA1doTW9rDFYSwwP6k84jr7eSkKGDaNHknylL+HNsxycjbAtS0L5mxQCq4PlP A9KjO4BI= X-Gm-Gg: ASbGncuew4MYQ0PQJ+PAge5GBxRZaMIB4AMZM62hYki/gkdsP84ph+MjHMEbFdQlO/z 0vPthukdxwncrM93caBYXKX8vP5iUmqlReBMwF/fLL6nJK6pG3NZxw44m0jrBApRHFV9TEhoBKq hgYGUbiVlXvbuC7bDFnBcjFHJ2z+Egpf40VuN27Qdyemip+90rPBIgZwFCc06cLu4Ia6ooLMkSP WuEWTWu0HGDlRmUIi3s/xTVcNbR4PGfh93FuCCSlpeeW+uIPCkQoL/JassYzU03jvi+Xk5ArQjZ 5Tis4KdMLJnfzR+1W42Cv0dn3Qp6UO4LjG1kx/2nDHCfMlI4BFClTufseB/RaCol4HNf6mDZlGW g5IZoGl6k8I2/ZIwE0ZFwBmyoK+p15Y5IsvN987sWzqXyTLwyciOtgCSGU1ZCAlS4RsydLQ== X-Google-Smtp-Source: AGHT+IEGoGND80uf9mOa5zbUVNeRt3iYWwEu+Kyw+xpveCZRRlkiUNTnCbyfpa/6u3X0EIG0bh4BHQ== X-Received: by 2002:a05:600c:841a:b0:459:e398:ed89 with SMTP id 5b1f17b1804b1-4775cdad627mr57791065e9.1.1762443899025; Thu, 06 Nov 2025 07:44:59 -0800 (PST) Received: from [127.0.1.1] ([2a01:cb1d:dc:7e00:d9de:4038:a78:acab]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47763e66b1fsm20621705e9.1.2025.11.06.07.44.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Nov 2025 07:44:57 -0800 (PST) From: Bartosz Golaszewski Date: Thu, 06 Nov 2025 16:44:50 +0100 Subject: [PATCH 1/3] dmaengine: qcom: bam_dma: order includes alphabetically Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251106-qcom-bam-dma-refactor-v1-1-0e2baaf3d81a@linaro.org> References: <20251106-qcom-bam-dma-refactor-v1-0-0e2baaf3d81a@linaro.org> In-Reply-To: <20251106-qcom-bam-dma-refactor-v1-0-0e2baaf3d81a@linaro.org> To: Vinod Koul Cc: linux-arm-msm@vger.kernel.org, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1604; i=bartosz.golaszewski@linaro.org; h=from:subject:message-id; bh=e7cbrLbtrA2QdYXynWY0z/h9f2KdWIz0hBln6YJk0L0=; b=owEBbQKS/ZANAwAKARGnLqAUcddyAcsmYgBpDMJ3wDD2iDBCwRq63Jsh20+PEuvzfO1VNoM8c UWpJEg308SJAjMEAAEKAB0WIQQWnetsC8PEYBPSx58Rpy6gFHHXcgUCaQzCdwAKCRARpy6gFHHX cmvdD/9stMXXL0j4g69U3lcomFVsfQJQpzTmu+YskFtImN0Dwz9haq2L24+GCKQxrkb46zFkS9m mhc6DLIiWboRf9MmT4+tnh/Q9uuXGRZj9aLED1R5+4NJTWuuKFQHA6ZZmPVwgS5sCnY0omEVawX 0wq93BmeG1ChHA+nvqubkhUE8rKWrcZIo+hWkpHZ8ncWjoEIc7nl4JVTgt5o6MpAxnCPY8NlGmu WbQIfOOF7ZPkibrQhDEfnKv5AMfiTktll1b+CJXxHv+i63R1oRxNmI+1SyT2HqVlIhQiBE7bECR RZEKztqv7bM/Dl4kOfJTW85sUHL+zt3YkTXbsSyA8HWgml0pcAdYmYMGiPp7lhFQwEmvoVy2NRr tUvdVSwNCb3bQR/fmxYaKLyIVPaQrVrjSFCGMiKgtlc6P/OgSDhoBHn7P+4jmBnf4YG7OCtCv0F bIBlVyuGbMjJLpeLToSmftHcytHwbohtX4sZbehnt9EiLjg2wFxlO6KcYBM0C3ooF+6BlaJnqah OwO/DLmp4r+exW8mW1F+P1Rm+dRYKiZznvuybJfy2dCjnG6g1Jxmo4BDu5gg/bjJi1DeBT/1Xnp I6Y8dn3C/c7rPp1XTD+ExTOEVWl4akKA1Fr8YZ5YxTl0M+E9aLN7g+nKuYv6VucZM+29WEkFZCV aAow4lMyOdoRxcw== X-Developer-Key: i=bartosz.golaszewski@linaro.org; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 From: Bartosz Golaszewski For easier maintenance and better readability order all includes alphabetically. Signed-off-by: Bartosz Golaszewski Reviewed-by: Dmitry Baryshkov --- drivers/dma/qcom/bam_dma.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/dma/qcom/bam_dma.c b/drivers/dma/qcom/bam_dma.c index 2cf060174795fe326abaf053a7a7a10022455586..2f1f295d3e1ff910a5051c20dc0= 9cb1e8077df82 100644 --- a/drivers/dma/qcom/bam_dma.c +++ b/drivers/dma/qcom/bam_dma.c @@ -23,24 +23,24 @@ * indication of where the hardware is currently working. */ =20 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include =20 #include "../dmaengine.h" #include "../virt-dma.h" --=20 2.51.0 From nobody Fri Dec 19 17:14:27 2025 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3B03C334378 for ; Thu, 6 Nov 2025 15:45:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762443905; cv=none; b=ZtWLwCBrdBDDmdADxtWpFP2lNXiyDfL0S51+Xu8e4eHgw7/+SJd1QYGKhxi2djQvrOPbdwogbhXLUfPTeMP+nn6M/bG5AsdOldqNjdVYZucu7X74s+NV+ZdrsA+dPd3wNYsi6AiQDezerJzulioE4Xn44Z/DpckbINRzgT67S0Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762443905; c=relaxed/simple; bh=KMXtcGywPA0XXbonnk/C4InSA219MMkomUCla9TEJSE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qbHxF6I1CLnL8HmeqnpCIis4jAtGHIWOmA6iCHwiB1mLeomSYKuMCE0eWC21Fk08oOjwO5awpV2jEt024Kg+dCP4HeyAC00TcJWrT/+Xh/4jxTdGEKZNfQlJrCVsDyayln/kKnkzC3e8m6Ue2BTTHwLIzSdXvR5V2bqQ70H6Evs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl; spf=none smtp.mailfrom=bgdev.pl; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b=bcMBnse3; arc=none smtp.client-ip=209.85.128.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b="bcMBnse3" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-471b80b994bso10757845e9.3 for ; Thu, 06 Nov 2025 07:45:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1762443902; x=1763048702; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=sbd9T49zUds3GM17Wvqrp3KhIc2FjSNyODbZEdWX+EA=; b=bcMBnse3pQwe/Li0FKttYtNtYmwBk8XLSXNxOHwsq/ZUAN9lL74z79a7LWXPBSkUOu de85+hcTTjtezeMHH2ar+Nz6ITsWeoQ+FWkJKLnJPiPGZMBiDipe9NyPwWBkjXJm2UML EcMY+x6Or5uVQvyTq1ePhKPYiLgZwbwI/A8h6lUI7kLr64WB2UFLLUT0hBTgtVi1Irpq aM289SDAWPn/XcudK0gISBhG1Sr0tJB3+oXTyohfuR+dl1sehXW4cBwQCvhkF/phVxvi heBYPmj9WftFNJ8SeYYb6BLtkwyL2VPv3YhzR/zD2oNHjPB8sIHPh8cMIUttrujvg0O3 LyBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762443902; x=1763048702; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sbd9T49zUds3GM17Wvqrp3KhIc2FjSNyODbZEdWX+EA=; b=u1NNBUsxXU6+uGWTMgEdbIcLNrso3hltsV1t0VHVVgA1fjVoxZZE4zTNTvaNv7n3cf 7M67I1SNq6zbzwYLp2f7Oojvw3yFnLa7Qx30Jccb+FF3fMs2TrQrtzQQEBTTu2dEAenI 3l5q5v2KqYrhmR+cdxx0JeKnul9oKePZOGNfv13dxzrY+IqHs0mXTdIttgicInMGLIcp wfLH/OJ+qC6GM3oTjQySUA+PEgwGIrEoXCydu4qWIS9J5LN8a9U/PHC4+zOGFAQq+3TZ u/egM75iRn/WvdRyroG40ZgIWo9EtUusRvWWeKSQX9EPAZ+KUK4z2yuxKKKn/CLDb7Ba f8dA== X-Forwarded-Encrypted: i=1; AJvYcCVxSXWmsJMx7BqJQhnKqyA48yMugOMbynfzSzBwN7RkeNQ/jHwVK8zLeEEfK+2QlX9YlR/BgT6Z41QvG2E=@vger.kernel.org X-Gm-Message-State: AOJu0YzrX8rr77Ew8C1MxhvQ3f3BVFzuDB8LAtNi6V/aOyCMEwE6Wf8f v/6knxWu9nhWK8yLedXgVynfbibFwpoYyVETwZCWnm/7qDr+Fa51ZgKY4YaXQb7Ad7c= X-Gm-Gg: ASbGncu2mmu7ygVyssANDESQUSecvgwCDKmnWrRK/GiyPRD4teKYrsYT+7tpAa0ZYEB QcTfUCQesRwzPq2p5aTikc0jRWjSikTp3RY7AaNKytZtuhPdhrtqqWUrccTtbfs2VMhJ4mdeRGZ Pq0U9FKDglZny0nAMA6Zlt46pf2LA2yMa8SKmtLDztgL1PaLjud9OTBFTwADFkXLqV5Xw5RxE/M sxIevUHIxPzKZxrBtNUH0+q79ah1eKXN/JKZUTtJKdzzJElAkiUgp0zRv/81gzyPqsd4JJ3JmO2 a2ZToe06tHpVwJeFFhP0hHvbaUW+gEec5Xh3zK/M0wysBL+P7bHwYzo7QIvco2SDkKLismcM9xb XEm6xwgavRpc2NB1DtxPIHYBXbXwakWoO0tU0/nipmdXOL/JoXK3q92JIiuejNJFbDHQ/85LRAg V4Sk0EBvl2uso6sWk= X-Google-Smtp-Source: AGHT+IFtov35GCVOXR/cS2r0f57fAWevPV2mc2aIOXdGAl6CDTHBexQAmH0Z6e5W7UJqLLDk8tfqlQ== X-Received: by 2002:a05:600c:348f:b0:46e:2801:84aa with SMTP id 5b1f17b1804b1-4775cd3bec8mr84554855e9.0.1762443901568; Thu, 06 Nov 2025 07:45:01 -0800 (PST) Received: from [127.0.1.1] ([2a01:cb1d:dc:7e00:d9de:4038:a78:acab]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47763e66b1fsm20621705e9.1.2025.11.06.07.44.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Nov 2025 07:44:59 -0800 (PST) From: Bartosz Golaszewski Date: Thu, 06 Nov 2025 16:44:51 +0100 Subject: [PATCH 2/3] dmaengine: qcom: bam_dma: use lock guards Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251106-qcom-bam-dma-refactor-v1-2-0e2baaf3d81a@linaro.org> References: <20251106-qcom-bam-dma-refactor-v1-0-0e2baaf3d81a@linaro.org> In-Reply-To: <20251106-qcom-bam-dma-refactor-v1-0-0e2baaf3d81a@linaro.org> To: Vinod Koul Cc: linux-arm-msm@vger.kernel.org, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=9493; i=bartosz.golaszewski@linaro.org; h=from:subject:message-id; bh=jVKoP2X4Ilas0P+Aru4xMP9CmE2OcT/z1vHvPmMV1IY=; b=owEBbQKS/ZANAwAKARGnLqAUcddyAcsmYgBpDMJ3QxjixXJYDZtvzP0lI/Ab8pWxSPTwbk9l3 boYrMwZy9uJAjMEAAEKAB0WIQQWnetsC8PEYBPSx58Rpy6gFHHXcgUCaQzCdwAKCRARpy6gFHHX ct3tEACy4NodtdxxVrv8D1R3dE+7+U9W8fFhuKuYrSk8woF7W9kGalbFZnntkUxP/KySQa//0qQ 8HoLpQC3W3UlwCw3fCHe3GxocCw8rxfvrA2tmRoo54qTPdcFYsmHQy/oCE9/Pf0lxQcEMgKdPi1 a9rOSZunGa7SGGFDJnEMCGikAl/l59O7QCTHzNa7GABT1xNdMDjSylT8ICBfGmx9bYmifYimmse qRNlPxUvo/ZuIZHG8LBywbXER0lBjXnWFZXKsyFScEqRqEGzNKgP42DcOXIShOC8mF2ZaBlVGEH ywuALvHyVwOew4Ihl975+P1cwcHlUAuhGnf41CvEJPhFlTkf7+k0fubUfykR+4l9LbE5Ct7NtR1 HpTMGMskua9l0tlbH05DG5XNLi9tIkHcBb7Aq0lLOLP4SUB7peNGeclfdEQTh/1lSSiycrXI13p xqgZLmO+8/QyVfxUwe8wRI1hlqSYtP/M2HFfn/wMyMhory1wb+VafKxb932FadIFbmfccfTKqkp Ls3/Zk2QUMZj/rtgLq9nJB2EyJKeFgyWYi1GCz2Ov2TryOa6Yh0V47Kuyqt6JzQR3SP4YmrpDh3 X30MmR924dwNRzzUcFdEjsW26BzJ/NCv+cCsdTkR26hoXgKorCHnQ6mui8rGxeallsHTCmdZZFn n4gdfR42E8nfi+A== X-Developer-Key: i=bartosz.golaszewski@linaro.org; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 From: Bartosz Golaszewski Simplify locking across the driver with lock guards from cleanup.h. Signed-off-by: Bartosz Golaszewski --- drivers/dma/qcom/bam_dma.c | 124 ++++++++++++++++++++---------------------= ---- 1 file changed, 55 insertions(+), 69 deletions(-) diff --git a/drivers/dma/qcom/bam_dma.c b/drivers/dma/qcom/bam_dma.c index 2f1f295d3e1ff910a5051c20dc09cb1e8077df82..bcd8de9a9a12621a36b49c31bff= 96f474468be06 100644 --- a/drivers/dma/qcom/bam_dma.c +++ b/drivers/dma/qcom/bam_dma.c @@ -24,6 +24,7 @@ */ =20 #include +#include #include #include #include @@ -570,7 +571,6 @@ static void bam_free_chan(struct dma_chan *chan) struct bam_chan *bchan =3D to_bam_chan(chan); struct bam_device *bdev =3D bchan->bdev; u32 val; - unsigned long flags; int ret; =20 ret =3D pm_runtime_get_sync(bdev->dev); @@ -584,9 +584,8 @@ static void bam_free_chan(struct dma_chan *chan) goto err; } =20 - spin_lock_irqsave(&bchan->vc.lock, flags); - bam_reset_channel(bchan); - spin_unlock_irqrestore(&bchan->vc.lock, flags); + scoped_guard(spinlock_irqsave, &bchan->vc.lock) + bam_reset_channel(bchan); =20 dma_free_wc(bdev->dev, BAM_DESC_FIFO_SIZE, bchan->fifo_virt, bchan->fifo_phys); @@ -624,12 +623,11 @@ static int bam_slave_config(struct dma_chan *chan, struct dma_slave_config *cfg) { struct bam_chan *bchan =3D to_bam_chan(chan); - unsigned long flag; =20 - spin_lock_irqsave(&bchan->vc.lock, flag); + guard(spinlock_irqsave)(&bchan->vc.lock); + memcpy(&bchan->slave, cfg, sizeof(*cfg)); bchan->reconfigure =3D 1; - spin_unlock_irqrestore(&bchan->vc.lock, flag); =20 return 0; } @@ -726,38 +724,37 @@ static int bam_dma_terminate_all(struct dma_chan *cha= n) { struct bam_chan *bchan =3D to_bam_chan(chan); struct bam_async_desc *async_desc, *tmp; - unsigned long flag; LIST_HEAD(head); =20 /* remove all transactions, including active transaction */ - spin_lock_irqsave(&bchan->vc.lock, flag); - /* - * If we have transactions queued, then some might be committed to the - * hardware in the desc fifo. The only way to reset the desc fifo is - * to do a hardware reset (either by pipe or the entire block). - * bam_chan_init_hw() will trigger a pipe reset, and also reinit the - * pipe. If the pipe is left disabled (default state after pipe reset) - * and is accessed by a connected hardware engine, a fatal error in - * the BAM will occur. There is a small window where this could happen - * with bam_chan_init_hw(), but it is assumed that the caller has - * stopped activity on any attached hardware engine. Make sure to do - * this first so that the BAM hardware doesn't cause memory corruption - * by accessing freed resources. - */ - if (!list_empty(&bchan->desc_list)) { - async_desc =3D list_first_entry(&bchan->desc_list, - struct bam_async_desc, desc_node); - bam_chan_init_hw(bchan, async_desc->dir); - } + scoped_guard(spinlock_irqsave, &bchan->vc.lock) { + /* + * If we have transactions queued, then some might be committed to the + * hardware in the desc fifo. The only way to reset the desc fifo is + * to do a hardware reset (either by pipe or the entire block). + * bam_chan_init_hw() will trigger a pipe reset, and also reinit the + * pipe. If the pipe is left disabled (default state after pipe reset) + * and is accessed by a connected hardware engine, a fatal error in + * the BAM will occur. There is a small window where this could happen + * with bam_chan_init_hw(), but it is assumed that the caller has + * stopped activity on any attached hardware engine. Make sure to do + * this first so that the BAM hardware doesn't cause memory corruption + * by accessing freed resources. + */ + if (!list_empty(&bchan->desc_list)) { + async_desc =3D list_first_entry(&bchan->desc_list, + struct bam_async_desc, desc_node); + bam_chan_init_hw(bchan, async_desc->dir); + } =20 - list_for_each_entry_safe(async_desc, tmp, - &bchan->desc_list, desc_node) { - list_add(&async_desc->vd.node, &bchan->vc.desc_issued); - list_del(&async_desc->desc_node); - } + list_for_each_entry_safe(async_desc, tmp, + &bchan->desc_list, desc_node) { + list_add(&async_desc->vd.node, &bchan->vc.desc_issued); + list_del(&async_desc->desc_node); + } =20 - vchan_get_all_descriptors(&bchan->vc, &head); - spin_unlock_irqrestore(&bchan->vc.lock, flag); + vchan_get_all_descriptors(&bchan->vc, &head); + } =20 vchan_dma_desc_free_list(&bchan->vc, &head); =20 @@ -773,17 +770,16 @@ static int bam_pause(struct dma_chan *chan) { struct bam_chan *bchan =3D to_bam_chan(chan); struct bam_device *bdev =3D bchan->bdev; - unsigned long flag; int ret; =20 ret =3D pm_runtime_get_sync(bdev->dev); if (ret < 0) return ret; =20 - spin_lock_irqsave(&bchan->vc.lock, flag); - writel_relaxed(1, bam_addr(bdev, bchan->id, BAM_P_HALT)); - bchan->paused =3D 1; - spin_unlock_irqrestore(&bchan->vc.lock, flag); + scoped_guard(spinlock_irqsave, &bchan->vc.lock) { + writel_relaxed(1, bam_addr(bdev, bchan->id, BAM_P_HALT)); + bchan->paused =3D 1; + } pm_runtime_mark_last_busy(bdev->dev); pm_runtime_put_autosuspend(bdev->dev); =20 @@ -799,17 +795,16 @@ static int bam_resume(struct dma_chan *chan) { struct bam_chan *bchan =3D to_bam_chan(chan); struct bam_device *bdev =3D bchan->bdev; - unsigned long flag; int ret; =20 ret =3D pm_runtime_get_sync(bdev->dev); if (ret < 0) return ret; =20 - spin_lock_irqsave(&bchan->vc.lock, flag); - writel_relaxed(0, bam_addr(bdev, bchan->id, BAM_P_HALT)); - bchan->paused =3D 0; - spin_unlock_irqrestore(&bchan->vc.lock, flag); + scoped_guard(spinlock_irqsave, &bchan->vc.lock) { + writel_relaxed(0, bam_addr(bdev, bchan->id, BAM_P_HALT)); + bchan->paused =3D 0; + } pm_runtime_mark_last_busy(bdev->dev); pm_runtime_put_autosuspend(bdev->dev); =20 @@ -826,7 +821,6 @@ static int bam_resume(struct dma_chan *chan) static u32 process_channel_irqs(struct bam_device *bdev) { u32 i, srcs, pipe_stts, offset, avail; - unsigned long flags; struct bam_async_desc *async_desc, *tmp; =20 srcs =3D readl_relaxed(bam_addr(bdev, 0, BAM_IRQ_SRCS_EE)); @@ -846,7 +840,7 @@ static u32 process_channel_irqs(struct bam_device *bdev) =20 writel_relaxed(pipe_stts, bam_addr(bdev, i, BAM_P_IRQ_CLR)); =20 - spin_lock_irqsave(&bchan->vc.lock, flags); + guard(spinlock_irqsave)(&bchan->vc.lock); =20 offset =3D readl_relaxed(bam_addr(bdev, i, BAM_P_SW_OFSTS)) & P_SW_OFSTS_MASK; @@ -885,8 +879,6 @@ static u32 process_channel_irqs(struct bam_device *bdev) } list_del(&async_desc->desc_node); } - - spin_unlock_irqrestore(&bchan->vc.lock, flags); } =20 return srcs; @@ -950,7 +942,6 @@ static enum dma_status bam_tx_status(struct dma_chan *c= han, dma_cookie_t cookie, int ret; size_t residue =3D 0; unsigned int i; - unsigned long flags; =20 ret =3D dma_cookie_status(chan, cookie, txstate); if (ret =3D=3D DMA_COMPLETE) @@ -959,23 +950,22 @@ static enum dma_status bam_tx_status(struct dma_chan = *chan, dma_cookie_t cookie, if (!txstate) return bchan->paused ? DMA_PAUSED : ret; =20 - spin_lock_irqsave(&bchan->vc.lock, flags); - vd =3D vchan_find_desc(&bchan->vc, cookie); - if (vd) { - residue =3D container_of(vd, struct bam_async_desc, vd)->length; - } else { - list_for_each_entry(async_desc, &bchan->desc_list, desc_node) { - if (async_desc->vd.tx.cookie !=3D cookie) - continue; + scoped_guard(spinlock_irqsave, &bchan->vc.lock) { + vd =3D vchan_find_desc(&bchan->vc, cookie); + if (vd) { + residue =3D container_of(vd, struct bam_async_desc, vd)->length; + } else { + list_for_each_entry(async_desc, &bchan->desc_list, desc_node) { + if (async_desc->vd.tx.cookie !=3D cookie) + continue; =20 - for (i =3D 0; i < async_desc->num_desc; i++) - residue +=3D le16_to_cpu( - async_desc->curr_desc[i].size); + for (i =3D 0; i < async_desc->num_desc; i++) + residue +=3D le16_to_cpu( + async_desc->curr_desc[i].size); + } } } =20 - spin_unlock_irqrestore(&bchan->vc.lock, flags); - dma_set_residue(txstate, residue); =20 if (ret =3D=3D DMA_IN_PROGRESS && bchan->paused) @@ -1116,17 +1106,16 @@ static void dma_tasklet(struct tasklet_struct *t) { struct bam_device *bdev =3D from_tasklet(bdev, t, task); struct bam_chan *bchan; - unsigned long flags; unsigned int i; =20 /* go through the channels and kick off transactions */ for (i =3D 0; i < bdev->num_channels; i++) { bchan =3D &bdev->channels[i]; - spin_lock_irqsave(&bchan->vc.lock, flags); + + guard(spinlock_irqsave)(&bchan->vc.lock); =20 if (!list_empty(&bchan->vc.desc_issued) && !IS_BUSY(bchan)) bam_start_dma(bchan); - spin_unlock_irqrestore(&bchan->vc.lock, flags); } =20 } @@ -1140,15 +1129,12 @@ static void dma_tasklet(struct tasklet_struct *t) static void bam_issue_pending(struct dma_chan *chan) { struct bam_chan *bchan =3D to_bam_chan(chan); - unsigned long flags; =20 - spin_lock_irqsave(&bchan->vc.lock, flags); + guard(spinlock_irqsave)(&bchan->vc.lock); =20 /* if work pending and idle, start a transaction */ if (vchan_issue_pending(&bchan->vc) && !IS_BUSY(bchan)) bam_start_dma(bchan); - - spin_unlock_irqrestore(&bchan->vc.lock, flags); } =20 /** --=20 2.51.0 From nobody Fri Dec 19 17:14:27 2025 Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2CA4F34167B for ; Thu, 6 Nov 2025 15:45:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762443906; cv=none; b=EjrroMCF9FvbBuw3N8qQQKeIyTHe9d0RhGBHrmracRipHAuqNQsyOridEOrqUNyWx5dSZB9PJdS7rrSTdjJ72H1JIVjHbAH2F1dd2qoMM/1sd6oHCqY4qKzUVtd83zAdzhIbaNcPtRBL17rv9/IGM4hVGriQrgRyQ5890segDZo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762443906; c=relaxed/simple; bh=ZWq7Pm27cK1DpvY/EMDI4nfic014qXdOnMiOukcqk+0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VGA+T953TiDtilaYukZYxzdg4WfVSnCQ3kzPcxAY1tqc7Z1cKzgidjqrnGwGPzm89QJz2Yl0pfozn5GIjyDTbZQ9IwO+JjVdQQg8zwMTYXywoYkwFr/amCzo6Hc6IioTYe2CNkQ0OStni1YoMKHS3/TZlLp6Kp59XL7use4TED0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl; spf=none smtp.mailfrom=bgdev.pl; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b=LuMVblwO; arc=none smtp.client-ip=209.85.128.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b="LuMVblwO" Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-4775e891b5eso5669285e9.2 for ; Thu, 06 Nov 2025 07:45:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1762443903; x=1763048703; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=esEdcTh2LbyZ9Fgnuw95sR3yJENLiwNORj0la+mn6sE=; b=LuMVblwOk4/RnFDvvuzNd5ulo5Kp/fNm8Y8FrAVDofmfTdHYS0ebNnUdCjNi7nMDs/ OBUQKKUdgDCI/eXAMWwdaPfMPn9DpqI0h1H3jtOMrAmy+9NJyV49xxcnWIiua977en7/ sDOkqXuT6aAZ5J3XkyinBbrcQEzxSGsZPEGr6Xoip1/7cqvuFlXt6/XMh34K4FksKcEA MEsqKyZ8JCxgI+wEy6HXjXQhQLNMk8doMaUE6iVCHlA4MiqHjiuBINSSG9Bv02mysZMc dvYOBIv5cZg87g30dewNgojvm0CXgnhRtADQcqxUrapLNsdj7/MtjZQElmGwRbguQnml vVEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762443903; x=1763048703; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=esEdcTh2LbyZ9Fgnuw95sR3yJENLiwNORj0la+mn6sE=; b=rP/fv56AGTSKZLF1iLokAOyko6PmYr97teSlMppHtk7pgh0j1/unNuWDaw1VJ4rMQa 1GxV7CE7h6GzlHi74N6/UApxFfYuXkjgQsGtfmpkA9wFVO1XwC83LKZqnW8bsmHI0h+R Hss355xkyr9hOKp0YIjI6neGDBBLg4XixpyqOIddn6K8N5O/WUvAMGHyIzznPi7HZmrD tSdPLMF774R0h+iB7zaId2zfm8YYQ8O1nHd39eI0e2scqZ35DBLsyJ4ORprElmNgNor7 qJeNQYpZUfcJqtU/5gP+uhEv3jOYsPuOdalP4O6V8CScwrOinHZHc1TEb2J+9bKJM4z/ RFQw== X-Forwarded-Encrypted: i=1; AJvYcCWX0bjCD8HYvnpfgSgVq5ser0lCOPYrG3ldbsGTMj7zVKiV8yEQTK+h2MjtrHYNK+r5VIO7/ZEPsiasqOc=@vger.kernel.org X-Gm-Message-State: AOJu0YyaWFs9H8a5rPAuNzp6VEUBiSrZEt11wWbImG4USO5Ys8baOkZK pNl7XJKbCcfm+OYRlGGU1xcKtyEZAo/cvLCl/BRnVU3jzvpIhW1/ALaTJz5esgB1yKo= X-Gm-Gg: ASbGnctx67/2Jj27XWq4rFUx6PQH/qMkFh/JKtXBkrtFodd3VTkzNDAMCOIsSR79NFS 5/FPmp7Kr6nvBo3HBQvPM2/XvpDGB6cj+y5CNoULwAkIXWVhlH9KCHMnZurliuRli4L1+jIbQ5C Vtba4zX5YvdJGRc/9XF5XYIIrTODADQuGgG6gcxAdSlpwaFioPFXL/bWd5FaCUbX9+OmXgGMB/Q /9ktH7N9I0HvU1EGCAPxyEcPndU9A0OHgSngks7Sw4YK6NP8h9t6mukqM6ynDxwDBU77E3oz5eA plVIbZt3ipED+PIXwafxnsW0XXoDvVzM0ldnU7YjJRz8VjpvET0izBg0eo8GX/EWS13trvgiShK jp2EQkzzFVR8GuzL9/r//+5ptaCikPS6vtU/0yxUUwsLfWLXVton6AxgeRWLy1MN+P8kp2wRCIr 0/lVgZ X-Google-Smtp-Source: AGHT+IEhmTqYfdZXcR34f8oucO4sNMzMcglUrQpy+XWcCDtrKQdVYJjqpPhuV6/BnBrxb3O3h50pRA== X-Received: by 2002:a05:600c:46ce:b0:471:14af:c715 with SMTP id 5b1f17b1804b1-4775cd9c05emr66589085e9.3.1762443903419; Thu, 06 Nov 2025 07:45:03 -0800 (PST) Received: from [127.0.1.1] ([2a01:cb1d:dc:7e00:d9de:4038:a78:acab]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47763e66b1fsm20621705e9.1.2025.11.06.07.45.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Nov 2025 07:45:01 -0800 (PST) From: Bartosz Golaszewski Date: Thu, 06 Nov 2025 16:44:52 +0100 Subject: [PATCH 3/3] dmaengine: qcom: bam_dma: convert tasklet to a workqueue Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251106-qcom-bam-dma-refactor-v1-3-0e2baaf3d81a@linaro.org> References: <20251106-qcom-bam-dma-refactor-v1-0-0e2baaf3d81a@linaro.org> In-Reply-To: <20251106-qcom-bam-dma-refactor-v1-0-0e2baaf3d81a@linaro.org> To: Vinod Koul Cc: linux-arm-msm@vger.kernel.org, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3969; i=bartosz.golaszewski@linaro.org; h=from:subject:message-id; bh=si4pCCUV8uwm3sY3u1lXmrBH/4Zfvei8bJceXOrOIWE=; b=owEBbQKS/ZANAwAKARGnLqAUcddyAcsmYgBpDMJ3UfxwOakrKsFNxGyj8BtSpDAPTF7NZNotr edMLaTHzJKJAjMEAAEKAB0WIQQWnetsC8PEYBPSx58Rpy6gFHHXcgUCaQzCdwAKCRARpy6gFHHX cqTAEAChjL6VcpPC0zJqB1yMKMOSrYLQog0rwwZiC1Oui8df2pl3D9j2p+GPRjhF93EMzGzkCof 7DP7fiVmCT0Okz7U5KY8JVvN+VIPTUbzLTnF3GFMsvRjHV4GZ8aU9EUmmEHzi6raKf0ve+PY0Yn NBDj3uwtyFS4OgXhlierqbUjbPLCqzB0zR9e5jhNgS4jW9BkjnNt8Mm8jeEkFU4uHBRar0IUedc S8LoYwuVfdkzkRNsshO58gNkhVhn6UnkuCgwBmqwGTMtiS6gdiHfIVQznzvhuU+zCUWxGO9rLg3 e2wpKh6HQNmJbcG2KqWCm5LYTWlWtC7wr+mPPDApuArqiVENpWCVkB3mY9t2u+fXgbv7rSnvQAm yBUy0xjkl8RHoDkCAfEKN+xiC6W34w+rNp9SzltMkhlGzLO38Pz9ZYMU5rSCM0IseTIiWnttscF dIJlPCS2EU6jugDEZZqfZwHg8oA1gaLVxoq3DvSjGERQVB+iu/MA4jApbT6+2hUGgqKo6AWVAjb 00kGSDAkwEf7EarmDe9HFZ7seubicjCzCjeJz/CBoF6sl+KRezsMv/nhm1eZDv/2wWVxJZp2ZQ3 XCu2NyXc5TLZTHpZ4Lq/axxkH+EZwA10AbhBwE7gPeUzv9tygCCB6c5en6tWGoYSp8HhNb6Cg4x H5jpNhLUBCKdX0A== X-Developer-Key: i=bartosz.golaszewski@linaro.org; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 From: Bartosz Golaszewski There is nothing in the interrupt handling that requires us to run in atomic context so convert the tasklet to a workqueue. Signed-off-by: Bartosz Golaszewski Reviewed-by: Bjorn Andersson Reviewed-by: Dmitry Baryshkov --- drivers/dma/qcom/bam_dma.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/dma/qcom/bam_dma.c b/drivers/dma/qcom/bam_dma.c index bcd8de9a9a12621a36b49c31bff96f474468be06..40ad4179177fb7a074776db05b8= 34da012f6a35f 100644 --- a/drivers/dma/qcom/bam_dma.c +++ b/drivers/dma/qcom/bam_dma.c @@ -42,6 +42,7 @@ #include #include #include +#include =20 #include "../dmaengine.h" #include "../virt-dma.h" @@ -397,8 +398,8 @@ struct bam_device { struct clk *bamclk; int irq; =20 - /* dma start transaction tasklet */ - struct tasklet_struct task; + /* dma start transaction workqueue */ + struct work_struct work; }; =20 /** @@ -869,7 +870,7 @@ static u32 process_channel_irqs(struct bam_device *bdev) /* * if complete, process cookie. Otherwise * push back to front of desc_issued so that - * it gets restarted by the tasklet + * it gets restarted by the work queue. */ if (!async_desc->num_desc) { vchan_cookie_complete(&async_desc->vd); @@ -899,9 +900,9 @@ static irqreturn_t bam_dma_irq(int irq, void *data) =20 srcs |=3D process_channel_irqs(bdev); =20 - /* kick off tasklet to start next dma transfer */ + /* kick off the work queue to start next dma transfer */ if (srcs & P_IRQ) - tasklet_schedule(&bdev->task); + schedule_work(&bdev->work); =20 ret =3D pm_runtime_get_sync(bdev->dev); if (ret < 0) @@ -1097,14 +1098,14 @@ static void bam_start_dma(struct bam_chan *bchan) } =20 /** - * dma_tasklet - DMA IRQ tasklet - * @t: tasklet argument (bam controller structure) + * bam_dma_work() - DMA interrupt work queue callback + * @work: work queue struct embedded in the BAM controller device struct * * Sets up next DMA operation and then processes all completed transactions */ -static void dma_tasklet(struct tasklet_struct *t) +static void bam_dma_work(struct work_struct *work) { - struct bam_device *bdev =3D from_tasklet(bdev, t, task); + struct bam_device *bdev =3D from_work(bdev, work, work); struct bam_chan *bchan; unsigned int i; =20 @@ -1117,14 +1118,13 @@ static void dma_tasklet(struct tasklet_struct *t) if (!list_empty(&bchan->vc.desc_issued) && !IS_BUSY(bchan)) bam_start_dma(bchan); } - } =20 /** * bam_issue_pending - starts pending transactions * @chan: dma channel * - * Calls tasklet directly which in turn starts any pending transactions + * Calls work queue directly which in turn starts any pending transactions */ static void bam_issue_pending(struct dma_chan *chan) { @@ -1292,14 +1292,14 @@ static int bam_dma_probe(struct platform_device *pd= ev) if (ret) goto err_disable_clk; =20 - tasklet_setup(&bdev->task, dma_tasklet); + INIT_WORK(&bdev->work, bam_dma_work); =20 bdev->channels =3D devm_kcalloc(bdev->dev, bdev->num_channels, sizeof(*bdev->channels), GFP_KERNEL); =20 if (!bdev->channels) { ret =3D -ENOMEM; - goto err_tasklet_kill; + goto err_workqueue_cancel; } =20 /* allocate and initialize channels */ @@ -1364,8 +1364,8 @@ static int bam_dma_probe(struct platform_device *pdev) err_bam_channel_exit: for (i =3D 0; i < bdev->num_channels; i++) tasklet_kill(&bdev->channels[i].vc.task); -err_tasklet_kill: - tasklet_kill(&bdev->task); +err_workqueue_cancel: + cancel_work_sync(&bdev->work); err_disable_clk: clk_disable_unprepare(bdev->bamclk); =20 @@ -1399,7 +1399,7 @@ static void bam_dma_remove(struct platform_device *pd= ev) bdev->channels[i].fifo_phys); } =20 - tasklet_kill(&bdev->task); + cancel_work_sync(&bdev->work); =20 clk_disable_unprepare(bdev->bamclk); } --=20 2.51.0