Received-SPF: pass (google.com: domain of linux-kernel+bounces-14006-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Tue, 2 Jan 2024 14:55:34 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dan Williams <dan.j.williams@intel.com>, "Rafael J. Wysocki"
 <rjw@rjwysocki.net>
Cc: Dave Jiang <dave.jiang@intel.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>, Yuntao Wang <ytcoode@gmail.com>
Subject: linux-next: manual merge of the cxl tree with the pm tree
Message-ID: <20240102145534.5c977c95@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/a.JrPGJ7CTLo+ha_W7wqBAa";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/a.JrPGJ7CTLo+ha_W7wqBAa
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  lib/fw_table.c

between commit:

  4b3805daaacb ("ACPI: tables: Correct and clean up the logic of acpi_parse=
_entries_array()")

from the pm tree and commit:

  60e43fe5285e ("lib/firmware_table: tables: Add CDAT table parsing support=
")

from the cxl tree.

Dan, thanks again for the heads up.

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 lib/fw_table.c
index c49a09ee3853,1e5e0b2f7012..000000000000
--- a/lib/fw_table.c
+++ b/lib/fw_table.c
@@@ -85,9 -98,27 +98,22 @@@ acpi_get_subtable_type(char *id
  	return ACPI_SUBTABLE_COMMON;
  }
 =20
- static __init_or_acpilib int call_handler(struct acpi_subtable_proc *proc,
- 					  union acpi_subtable_headers *hdr,
- 					  unsigned long end)
+ static unsigned long __init_or_fwtbl_lib
+ acpi_table_get_length(enum acpi_subtable_type type,
+ 		      union fw_table_header *header)
+ {
+ 	if (type =3D=3D CDAT_SUBTABLE) {
+ 		__le32 length =3D (__force __le32)header->cdat.length;
+=20
+ 		return le32_to_cpu(length);
+ 	}
+=20
+ 	return header->acpi.length;
+ }
+=20
 -static __init_or_fwtbl_lib bool has_handler(struct acpi_subtable_proc *pr=
oc)
 -{
 -	return proc->handler || proc->handler_arg;
 -}
 -
+ static __init_or_fwtbl_lib int call_handler(struct acpi_subtable_proc *pr=
oc,
+ 					    union acpi_subtable_headers *hdr,
+ 					    unsigned long end)
  {
  	if (proc->handler)
  		return proc->handler(hdr, end);
@@@ -127,10 -158,14 +153,13 @@@ acpi_parse_entries_array(char *id, unsi
  {
  	unsigned long table_end, subtable_len, entry_len;
  	struct acpi_subtable_entry entry;
+ 	enum acpi_subtable_type type;
  	int count =3D 0;
 -	int errs =3D 0;
  	int i;
 =20
- 	table_end =3D (unsigned long)table_header + table_header->length;
+ 	type =3D acpi_get_subtable_type(id);
+ 	table_end =3D (unsigned long)table_header +
+ 		    acpi_table_get_length(type, table_header);
 =20
  	/* Parse all entries looking for a match. */
 =20
@@@ -168,9 -209,31 +197,31 @@@
  	}
 =20
  	if (max_entries && count > max_entries) {
 -		pr_warn("[%4.4s:0x%02x] found the maximum %i entries\n",
 -			id, proc->id, count);
 +		pr_warn("[%4.4s:0x%02x] ignored %i entries of %i found\n",
 +			id, proc->id, count - max_entries, count);
  	}
 =20
 -	return errs ? -EINVAL : count;
 +	return count;
  }
+=20
+ int __init_or_fwtbl_lib
+ cdat_table_parse(enum acpi_cdat_type type,
+ 		 acpi_tbl_entry_handler_arg handler_arg,
+ 		 void *arg,
+ 		 struct acpi_table_cdat *table_header)
+ {
+ 	struct acpi_subtable_proc proc =3D {
+ 		.id		=3D type,
+ 		.handler_arg	=3D handler_arg,
+ 		.arg		=3D arg,
+ 	};
+=20
+ 	if (!table_header)
+ 		return -EINVAL;
+=20
+ 	return acpi_parse_entries_array(ACPI_SIG_CDAT,
+ 					sizeof(struct acpi_table_cdat),
+ 					(union fw_table_header *)table_header,
+ 					&proc, 1, 0);
+ }
+ EXPORT_SYMBOL_FWTBL_LIB(cdat_table_parse);

--Sig_/a.JrPGJ7CTLo+ha_W7wqBAa
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWTiTYACgkQAVBC80lX
0Gxfjwf7BoXSKRmPb56yX1xFojky3aQn1ISSt90PYAKtNAarGy4pJOkLHznVjg+l
tcI5bWjvzanbSOZ3BJRPfOUdtyNBoM6tbfnstOFZJTyQNIe2amlgZppMDzr3MVeG
Vp+oIr6m3+V5/4n3No1uknJvr7c0DtpJJdj+pJbFzS9F5vTGwlSn076lDnrtaQgS
hN/p9pC1WgRNRO31m1cw862P99CfMvP9WWBX3g9KLxYk4pnlM5eJrwHYFpy3jV7g
fJWoA+tTD4et4pT1/YOlcCRTfje29lWG4s3NNfApUN+rOf3dM4W5rtcey+6tm0sf
0fYsdSS0H2jEArM9S7A9d6CMTuex/g==
=zpug
-----END PGP SIGNATURE-----

--Sig_/a.JrPGJ7CTLo+ha_W7wqBAa--