From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795053746; b=I/OKK2UgVvrZbQyH1MPdeUYJJWIox2TIthVJ9VggpsOE97P/+K3EbwbcIvE+NtW62PXh idrxRzYRtGePZkt8GbMIUR+p1peHO/F9Pv1ksflVafkOGTIAN9qgyZ86UXzFH/A+X/pFq cJGdfryl/Pd79TT9J8adKwJQ5PxSj2NxKckDXg3xP/Hc6hyLRKyAbIOcW3waU+PrspSo/ et2EsQaWaqzKQknWVHSjoYnb+7JGukZDxF4ciFJ0wT6p8mQm5E85eLr4JIqojOYxOZ/pt YrP4RJA3hvyqgQ5sgJkF7Mrsvkhc7HRp/1CTqyH8KRw4VVcAH9+7YOZBHGJC98bNdmQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795053746; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=1rnXPph6O/KX+bha+jY8X6Djh1XedQyCdRigAqst8Fs=; b=TTIp3efbAEB9enK7w3zHxkG7VRr4m/mpbGHGKzgsv7m1Y2eFuFeRuXh2MLNmTiChhmtA BM5BPn6xuouVQdN6uuFKV3yX1bRcc9WkZd/7h04+1IluXVWbWqYOsuo1cjtBiVBloiWAy NHBluMspo0oKUvbTslcK1ADDWsQ8R2KEN4xxdm7XWA4hzSOCC9/g/HsrLqJPhB76FfvhV kzqV7Gd8tC582wyn0SGugX8Coj5gsFo6FLg4Sp3jo3mKAJxf8NMwilixpScn8fZ4L/600 cawnD68cVwKrz1pVVkMSFVZTZG6L5U3ehvcGY+bozy1LmkLlNV09CvVOqsO4tQwc2Kg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=cwQwVlsu; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B7293606A325; Thu, 19 Nov 2026 02:02:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=cwQwVlsu Received: by smtp.kernel.org (Postfix) with ESMTPSA id CF6151F000C4; Thu, 19 Nov 2026 02:02:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795053746; bh=1rnXPph6O/KX+bha+jY8X6Djh1XedQyCdRigAqst8Fs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=cwQwVlsu93vyVA83g69bztBXQBUUhF2VkAwMVdMEXYoifaKDU93Cg9nlHOpeA/5Az ljvBC4VN8THQDrFvbaL0qufppOScIgwJpfmobBEFPemTdGIqFrX1SlHVJjbZnIk58V n5g0VeeX+jQzRR9eQa5DE+09fwj3MK1Mtb6L/L/U= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Eugen Hristev , Balakrishnan Sambath , Hans Verkuil , Sasha Levin Subject: [PATCH 5.15 0977/2214] media: microchip-isc: fix WB offset and gain register field masking Date: Wed, 18 Nov 2026 15:44:13 +0100 Message-ID: <20261118150051.340380918@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Balakrishnan Sambath [ Upstream commit 6e9eaa3b93870e4edac1bd2539fe113c24663eaf ] ISC_WB_O_* and ISC_WB_G_* each pack two 13-bit fields. A negative offset sign-extends and corrupts the adjacent field. Add masks for the two fields and write them with FIELD_PREP(), which masks each value into its field, so sign extension can no longer bleed across. Fixes: 73c1a577b839 ("media: atmel: atmel-isc: reworked white balance feature") Cc: stable@vger.kernel.org Reviewed-by: Eugen Hristev Signed-off-by: Balakrishnan Sambath Signed-off-by: Hans Verkuil [ sashal: adapted to older driver filenames with an explicit bitfield header include for FIELD_PREP(). ] Signed-off-by: Sasha Levin --- drivers/media/platform/atmel/atmel-isc-base.c | 17 +++++++++-------- drivers/media/platform/atmel/atmel-isc-regs.h | 6 ++++++ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/drivers/media/platform/atmel/atmel-isc-base.c b/drivers/media/platform/atmel/atmel-isc-base.c index eeaf91d80acd7..c856891adf99e 100644 --- a/drivers/media/platform/atmel/atmel-isc-base.c +++ b/drivers/media/platform/atmel/atmel-isc-base.c @@ -9,6 +9,7 @@ * */ +#include #include #include #include @@ -75,17 +76,17 @@ static inline void isc_update_awb_ctrls(struct isc_device *isc) /* In here we set our actual hw pipeline config */ regmap_write(isc->regmap, ISC_WB_O_RGR, - ((ctrls->offset[ISC_HIS_CFG_MODE_R])) | - ((ctrls->offset[ISC_HIS_CFG_MODE_GR]) << 16)); + FIELD_PREP(ISC_WB_O_LO, ctrls->offset[ISC_HIS_CFG_MODE_R]) | + FIELD_PREP(ISC_WB_O_HI, ctrls->offset[ISC_HIS_CFG_MODE_GR])); regmap_write(isc->regmap, ISC_WB_O_BGB, - ((ctrls->offset[ISC_HIS_CFG_MODE_B])) | - ((ctrls->offset[ISC_HIS_CFG_MODE_GB]) << 16)); + FIELD_PREP(ISC_WB_O_LO, ctrls->offset[ISC_HIS_CFG_MODE_B]) | + FIELD_PREP(ISC_WB_O_HI, ctrls->offset[ISC_HIS_CFG_MODE_GB])); regmap_write(isc->regmap, ISC_WB_G_RGR, - ctrls->gain[ISC_HIS_CFG_MODE_R] | - (ctrls->gain[ISC_HIS_CFG_MODE_GR] << 16)); + FIELD_PREP(ISC_WB_G_LO, ctrls->gain[ISC_HIS_CFG_MODE_R]) | + FIELD_PREP(ISC_WB_G_HI, ctrls->gain[ISC_HIS_CFG_MODE_GR])); regmap_write(isc->regmap, ISC_WB_G_BGB, - ctrls->gain[ISC_HIS_CFG_MODE_B] | - (ctrls->gain[ISC_HIS_CFG_MODE_GB] << 16)); + FIELD_PREP(ISC_WB_G_LO, ctrls->gain[ISC_HIS_CFG_MODE_B]) | + FIELD_PREP(ISC_WB_G_HI, ctrls->gain[ISC_HIS_CFG_MODE_GB])); } static inline void isc_reset_awb_ctrls(struct isc_device *isc) diff --git a/drivers/media/platform/atmel/atmel-isc-regs.h b/drivers/media/platform/atmel/atmel-isc-regs.h index d06b72228d4fa..bac10cd653982 100644 --- a/drivers/media/platform/atmel/atmel-isc-regs.h +++ b/drivers/media/platform/atmel/atmel-isc-regs.h @@ -149,6 +149,12 @@ /* ISC White Balance Gain for B, GB Register */ #define ISC_WB_G_BGB 0x0000006c +/* Each WB offset/gain register packs two 13-bit fields, low and high */ +#define ISC_WB_O_LO GENMASK(12, 0) /* R or B offset [12:0] */ +#define ISC_WB_O_HI GENMASK(28, 16) /* GR or GB offset [28:16] */ +#define ISC_WB_G_LO GENMASK(12, 0) /* R or B gain [12:0] */ +#define ISC_WB_G_HI GENMASK(28, 16) /* GR or GB gain [28:16] */ + /* ISC Color Filter Array Control Register */ #define ISC_CFA_CTRL 0x00000070 -- 2.53.0