Re: [PATCH] platform/x86: intel: chtwc_int33fe: don't dereference swnode args
From: Philipp Zabel
Date: Fri Nov 21 2025 - 09:44:00 EST
Hi Bartosz,
On Fr, 2025-11-21 at 14:50 +0100, Bartosz Golaszewski wrote:
> On Fri, Nov 21, 2025 at 2:40 PM Hans de Goede <hansg@xxxxxxxxxx> wrote:
> >
> > On 21-Nov-25 11:04 AM, Bartosz Golaszewski wrote:
> > > From: Bartosz Golaszewski <bartosz.golaszewski@xxxxxxxxxx>
> > >
> > > Members of struct software_node_ref_args should not be dereferenced
> > > directly but set using the provided macros. Commit d7cdbbc93c56
> > > ("software node: allow referencing firmware nodes") changed the name of
> > > the software node member and caused a build failure. Remove all direct
> > > dereferences of the ref struct as a fix.
> > >
> > > However, this driver also seems to abuse the software node interface by
> > > waiting for a node with an arbitrary name "intel-xhci-usb-sw" to appear
> > > in the system before setting up the reference for the I2C device, while
> > > the actual software node already exists in the intel-xhci-usb-role-switch
> > > module and should be used to set up a static reference. Add a FIXME for
> > > a future improvement.
> > >
> > > Fixes: d7cdbbc93c56 ("software node: allow referencing firmware nodes")
> > > Fixes: 53c24c2932e5 ("platform/x86: intel_cht_int33fe: use inline reference properties")
> > > Cc: stable@xxxxxxxxxxxxxxx
> > > Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> > > Closes: https://lore.kernel.org/all/20251121111534.7cdbfe5c@xxxxxxxxxxxxxxxx/
> > > Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@xxxxxxxxxx>
> > > ---
> > > This should go into the reset tree as a fix to the regression introduced
> > > by the reset-gpio driver rework.
> >
> > Thanks, patch looks good to me:
> >
> > Reviewed-by: Hans de Goede <johannes.goede@xxxxxxxxxxxxxxxx>
> >
> > Also ack for merging this through the reset tree.
> >
> > Ilpo please do *not* pick this one up as it will be merged
> > through the reset tree.
> >
>
> Philipp: I'm afraid this too must go into an immutable branch shared
> with the GPIO tree or else Linus Torvalds will yell at me if by chance
> he pulls my changes first into mainline. Unless you plan to do your PR
> early into the merge window in which case I can wait until it's in his
> tree and submit mine. Let me know what your preference is.
The following changes since commit 5fc4e4cf7a2268b5f73700fd1e8d02159f2417d8:
reset: gpio: use software nodes to setup the GPIO lookup (2025-11-20 16:51:49 +0100)
are available in the Git repository at:
https://git.pengutronix.de/git/pza/linux.git tags/reset-gpio-for-v6.19-2
for you to fetch changes up to 527250cd9092461f1beac3e4180a4481bffa01b5:
platform/x86: intel: chtwc_int33fe: don't dereference swnode args (2025-11-21 15:31:43 +0100)
----------------------------------------------------------------
Reset/GPIO/swnode changes for v6.19 (v2)
* Fix chtwc_int33fe build issue since commit d7cdbbc93c56 ("software
node: allow referencing firmware nodes").
----------------------------------------------------------------
Bartosz Golaszewski (1):
platform/x86: intel: chtwc_int33fe: don't dereference swnode args
drivers/platform/x86/intel/chtwc_int33fe.c | 29 ++++++++++++++++++++---------
1 file changed, 20 insertions(+), 9 deletions(-)