Received-SPF: pass (google.com: domain of linux-kernel+bounces-64543-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Wed, 14 Feb 2024 10:30:08 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>, Bjorn Helgaas
 <bhelgaas@google.com>, Lorenzo Pieralisi <lpieralisi@kernel.org>, Krzysztof
 =?UTF-8?B?V2lsY3p5xYRza2k=?= <kw@linux.com>
Cc: Alex Williamson <alex.williamson@redhat.com>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, "Rafael J. Wysocki"
 <rafael.j.wysocki@intel.com>, Sakari Ailus <sakari.ailus@linux.intel.com>
Subject: linux-next: manual merge of the pm tree with the pci-current tree
Message-ID: <20240214103008.0bb12069@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/CjylUucKiAPUPy98I.Dpp4t";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/CjylUucKiAPUPy98I.Dpp4t
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the pm tree got a conflict in:

  drivers/pci/pci.c

between commit:

  41044d536068 ("PCI: Fix active state requirement in PME polling")

from the pci-current tree and commit:

  c0ef3df8dbae ("PM: runtime: Simplify pm_runtime_get_if_active() usage")

from the pm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

--=20
Cheers,
Stephen Rothwell

diff --cc drivers/pci/pci.c
index a532bf597e57,cb51c4079013..000000000000
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@@ -2361,36 -2522,29 +2361,36 @@@ static void pci_pme_list_scan(struct wo
  		if (pdev->pme_poll) {
  			struct pci_dev *bridge =3D pdev->bus->self;
  			struct device *dev =3D &pdev->dev;
 -			int pm_status;
 +			struct device *bdev =3D bridge ? &bridge->dev : NULL;
 +			int bref =3D 0;
 =20
  			/*
 -			 * If bridge is in low power state, the
 -			 * configuration space of subordinate devices
 -			 * may be not accessible
 +			 * If we have a bridge, it should be in an active/D0
 +			 * state or the configuration space of subordinate
 +			 * devices may not be accessible or stable over the
 +			 * course of the call.
  			 */
 -			if (bridge && bridge->current_state !=3D PCI_D0)
 -				continue;
 +			if (bdev) {
- 				bref =3D pm_runtime_get_if_active(bdev, true);
++				bref =3D pm_runtime_get_if_active(bdev);
 +				if (!bref)
 +					continue;
 +
 +				if (bridge->current_state !=3D PCI_D0)
 +					goto put_bridge;
 +			}
 =20
  			/*
 -			 * If the device is in a low power state it
 -			 * should not be polled either.
 +			 * The device itself should be suspended but config
 +			 * space must be accessible, therefore it cannot be in
 +			 * D3cold.
  			 */
 -			pm_status =3D pm_runtime_get_if_active(dev);
 -			if (!pm_status)
 -				continue;
 -
 -			if (pdev->current_state !=3D PCI_D3cold)
 +			if (pm_runtime_suspended(dev) &&
 +			    pdev->current_state !=3D PCI_D3cold)
  				pci_pme_wakeup(pdev, NULL);
 =20
 -			if (pm_status > 0)
 -				pm_runtime_put(dev);
 +put_bridge:
 +			if (bref > 0)
 +				pm_runtime_put(bdev);
  		} else {
  			list_del(&pme_dev->list);
  			kfree(pme_dev);

--Sig_/CjylUucKiAPUPy98I.Dpp4t
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXL+4AACgkQAVBC80lX
0GxorAf9EfEqMCVJVb8TqWHS5bC2IMANFydH3wDCtEx3H181jUlGPm5/ILxIn3+f
ONcRv8FVGwEJWSiVDkPS/dLg/q0gcbz46khaxpC1GN3n+1+BJCmJPNuVIftSL3bh
j7si/FsmxUVsa0Ji3ySIf40JvJwyD3dVOVJRAjK60E/TOz4dQ2hAzuJGAg1VSNMF
e5RxDK0QaagWrGrw02vVydvfKiXxX1XjnEb8KeCR0KB5QVG9VrEkhENB+vdxWvr0
s6DABfEKsZzOrrNTDxMoxJmc3SSeyrWmHqzUz8P79LFOA24hEcbjRsp9YAjKShXu
sxjfT5eJlpax6C3pjqfkUInLiFWcNw==
=a//M
-----END PGP SIGNATURE-----

--Sig_/CjylUucKiAPUPy98I.Dpp4t--