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 91F2D13777E for ; Fri, 1 May 2026 12:26:02 +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=1777638362; cv=none; b=BYZmadTszn4XAWV3qW328nSfm8aQg4/c5V+dRHzlzQQCpfHG1548+itRHfIManjXGZ3CEdN8L9O9MdV/zqXiy51fBPESRQL2JhlquDFOjAOjZYLZf49Cu1PV77q/XAZJWK9UWCiCrZVi9MW3V+ibaqykbeNfXTMiGXCHkkPWFtM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777638362; c=relaxed/simple; bh=KqhuU4rooN9GeQuBTWZwkqWX2YNHJBdaspO6EXm6ahM=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=KiGRR0O2AxZTHYk1KGr5KeYl3Af0Y+/DwpaFIvB6Y8QXKXPSU5bIPaji9Euxof6edV1wM5XclpZbVrJM91QZeo1yLVRVH8tZlcBPVcd56d5KgUj6d9JeXlyfJ07aA/7Sn+F9wO58/8Y6PgjD5xqd3l1lCPFcPkoz8jjOb+uyY+U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=u3wN5jpv; 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="u3wN5jpv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D788AC2BCB4; Fri, 1 May 2026 12:26:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1777638362; bh=KqhuU4rooN9GeQuBTWZwkqWX2YNHJBdaspO6EXm6ahM=; h=Subject:To:Cc:From:Date:From; b=u3wN5jpvK5w5Z6l24jGFTIo3BNZtpyQCrvrvfSqrH4J2gDoYpzDNOsy0dwG7yJ5Ct NlSctzrWWmEZ1R6Uua0FNd2WcUGkHr2/k2/0iy3QblvR52u/KKuEDdKvp8kJDktkkm UwnOT1KK2164qHXkM4NrHlF5Z+DdMAzR7vZNhxnA= Subject: FAILED: patch "[PATCH] hwmon: (powerz) Avoid cacheline sharing for DMA buffer" failed to apply to 6.18-stable tree To: linux@weissschuh.net,linux@roeck-us.net Cc: From: Date: Fri, 01 May 2026 14:25:59 +0200 Message-ID: <2026050159-extinct-precision-0d22@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.18-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.18.y git checkout FETCH_HEAD git cherry-pick -x 3023c050af3600bf451153335dea5e073c9a3088 # git commit -s git send-email --to '' --in-reply-to '2026050159-extinct-precision-0d22@gregkh' --subject-prefix 'PATCH 6.18.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 3023c050af3600bf451153335dea5e073c9a3088 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= Date: Wed, 8 Apr 2026 20:45:50 +0200 Subject: [PATCH] hwmon: (powerz) Avoid cacheline sharing for DMA buffer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Depending on the architecture the transfer buffer may share a cacheline with the following mutex. As the buffer may be used for DMA, that is problematic. Use the high-level DMA helpers to make sure that cacheline sharing can not happen. Also drop the comment, as the helpers are documentation enough. https://sashiko.dev/#/message/20260408175814.934BFC19421%40smtp.kernel.org Fixes: 4381a36abdf1c ("hwmon: add POWER-Z driver") Cc: stable@vger.kernel.org # ca085faabb42: dma-mapping: add __dma_from_device_group_begin()/end() Signed-off-by: Thomas Weißschuh Link: https://lore.kernel.org/r/20260408-powerz-cacheline-alias-v1-1-1254891be0dd@weissschuh.net Signed-off-by: Guenter Roeck diff --git a/drivers/hwmon/powerz.c b/drivers/hwmon/powerz.c index 96438f5f05d4..6e1359144cab 100644 --- a/drivers/hwmon/powerz.c +++ b/drivers/hwmon/powerz.c @@ -6,6 +6,7 @@ #include #include +#include #include #include #include @@ -33,7 +34,9 @@ struct powerz_sensor_data { } __packed; struct powerz_priv { - char transfer_buffer[64]; /* first member to satisfy DMA alignment */ + __dma_from_device_group_begin(); + char transfer_buffer[64]; + __dma_from_device_group_end(); struct mutex mutex; struct completion completion; struct urb *urb;