Received-SPF: pass (google.com: domain of linux-kernel+bounces-96452-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Fri, 8 Mar 2024 13:34:23 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Hans de Goede <hdegoede@redhat.com>, Mark Gross <markgross@kernel.org>
Cc: Armin Wolf <W_Armin@gmx.de>, Ilpo =?UTF-8?B?SsOkcnZpbmVu?=
 <ilpo.jarvinen@linux.intel.com>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Mario Limonciello
 <mario.limonciello@amd.com>, Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
Subject: linux-next: manual merge of the drivers-x86 tree with Linus' tree
Message-ID: <20240308133423.0f1ac39e@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/S96XBdrT0g5sPlo.kERvx0p";
 protocol="application/pgp-signature"; micalg=pgp-sha256

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

Hi all,

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

  drivers/platform/x86/amd/pmf/tee-if.c

between commits:

  3da01394c0f7 ("platform/x86/amd/pmf: Remove smart_pc_status enum")
  20545af302bb ("platform/x86/amd/pmf: Add debugging message for missing po=
licy data")
  e70961505808 ("platform/x86/amd/pmf: Fixup error handling for amd_pmf_ini=
t_smart_pc()")

from Linus' tree and commits:

  6ed210504a18 ("platform/x86/amd/pmf: Add missing __iomem attribute to pol=
icy_base")
  98cfcece0ab8 ("platform/x86/amd/pmf: Fix return value of amd_pmf_start_po=
licy_engine()")
  a87d92223084 ("platform/x86/amd/pmf: Use struct for cookie header")
  1e7a14ee259e ("platform/x86/amd/pmf: Fix possible out-of-bound memory acc=
esses")

from the drivers-x86 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/platform/x86/amd/pmf/tee-if.c
index dcbe8f85e122,75370431a82e..000000000000
--- a/drivers/platform/x86/amd/pmf/tee-if.c
+++ b/drivers/platform/x86/amd/pmf/tee-if.c
@@@ -246,19 -246,22 +246,24 @@@ static void amd_pmf_invoke_cmd(struct w
 =20
  static int amd_pmf_start_policy_engine(struct amd_pmf_dev *dev)
  {
- 	u32 cookie, length;
+ 	struct cookie_header *header;
  	int res;
 =20
- 	cookie =3D readl(dev->policy_buf + POLICY_COOKIE_OFFSET);
- 	length =3D readl(dev->policy_buf + POLICY_COOKIE_LEN);
+ 	if (dev->policy_sz < POLICY_COOKIE_OFFSET + sizeof(*header))
+ 		return -EINVAL;
 =20
- 	if (cookie !=3D POLICY_SIGN_COOKIE || !length) {
+ 	header =3D (struct cookie_header *)(dev->policy_buf + POLICY_COOKIE_OFFS=
ET);
+=20
 -	if (header->sign !=3D POLICY_SIGN_COOKIE || !header->length)
++	if (header->sign !=3D POLICY_SIGN_COOKIE || !header->length) {
 +		dev_dbg(dev->dev, "cookie doesn't match\n");
  		return -EINVAL;
 +	}
 =20
+ 	if (dev->policy_sz < header->length + 512)
+ 		return -EINVAL;
+=20
  	/* Update the actual length */
- 	dev->policy_sz =3D length + 512;
+ 	dev->policy_sz =3D header->length + 512;
  	res =3D amd_pmf_invoke_cmd_init(dev);
  	if (res =3D=3D TA_PMF_TYPE_SUCCESS) {
  		/* Now its safe to announce that smart pc is enabled */
@@@ -270,8 -273,8 +275,8 @@@
  		schedule_delayed_work(&dev->pb_work, msecs_to_jiffies(pb_actions_ms * 3=
));
  	} else {
  		dev_err(dev->dev, "ta invoke cmd init failed err: %x\n", res);
 -		dev->smart_pc_enabled =3D PMF_SMART_PC_DISABLED;
 +		dev->smart_pc_enabled =3D false;
- 		return res;
+ 		return -EIO;
  	}
 =20
  	return 0;
@@@ -436,46 -458,13 +441,46 @@@ int amd_pmf_init_smart_pc(struct amd_pm
  		return ret;
 =20
  	INIT_DELAYED_WORK(&dev->pb_work, amd_pmf_invoke_cmd);
 -	amd_pmf_set_dram_addr(dev, true);
 -	amd_pmf_get_bios_buffer(dev);
 -	dev->prev_data =3D kzalloc(sizeof(*dev->prev_data), GFP_KERNEL);
 -	if (!dev->prev_data)
 -		return -ENOMEM;
 =20
 -	return dev->smart_pc_enabled;
 +	ret =3D amd_pmf_set_dram_addr(dev, true);
 +	if (ret)
 +		goto error;
 +
 +	dev->policy_base =3D devm_ioremap(dev->dev, dev->policy_addr, dev->polic=
y_sz);
 +	if (!dev->policy_base) {
 +		ret =3D -ENOMEM;
 +		goto error;
 +	}
 +
 +	dev->policy_buf =3D kzalloc(dev->policy_sz, GFP_KERNEL);
 +	if (!dev->policy_buf) {
 +		ret =3D -ENOMEM;
 +		goto error;
 +	}
 +
- 	memcpy(dev->policy_buf, dev->policy_base, dev->policy_sz);
++	memcpy_fromio(dev->policy_buf, dev->policy_base, dev->policy_sz);
 +
 +	amd_pmf_hex_dump_pb(dev);
 +
 +	dev->prev_data =3D kzalloc(sizeof(*dev->prev_data), GFP_KERNEL);
 +	if (!dev->prev_data) {
 +		ret =3D -ENOMEM;
 +		goto error;
 +	}
 +
 +	ret =3D amd_pmf_start_policy_engine(dev);
 +	if (ret)
 +		goto error;
 +
 +	if (pb_side_load)
 +		amd_pmf_open_pb(dev, dev->dbgfs_dir);
 +
 +	return 0;
 +
 +error:
 +	amd_pmf_deinit_smart_pc(dev);
 +
 +	return ret;
  }
 =20
  void amd_pmf_deinit_smart_pc(struct amd_pmf_dev *dev)

--Sig_/S96XBdrT0g5sPlo.kERvx0p
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXqeS8ACgkQAVBC80lX
0GzdiQf/T2BOMvKQbMHbRZx2RvMUHun76ECGuJVWcU7A9BXLDlfn1640o+i5Dj9j
OVRg8jPfND3VcvPBLVGvaV8DYU7MQpFWa4UHSLJ7EE0RVBwyH+Bna/Gl/FvX760U
JPJyv40rrZrGCJho1bYUtUVorpjZu0FRG9HdTRTdKeUCA0f8JLjCYwV6MwgS5tEq
iuL1YnmfEuJBNojRKVy/qsN+LZRADH/uaJTNj+oIdo1xnb7YA1auv7tiSa5OHypH
NrOca/jqZTo/KvZdzKoNXBwhHVnum0WL1vf8j8OMoUG3QAx91NR91BEYyERx9nOr
ETDUHnqvom/jtwHpwdkpoyjNPbWrYA==
=l/0D
-----END PGP SIGNATURE-----

--Sig_/S96XBdrT0g5sPlo.kERvx0p--