Merge branches 'acpi-apei' and 'acpi-pfrut'

rafaeljw · rafaeljw · commit 670b51121ed0 · 2025-08-21T20:47:23.000+02:00
Merge ACPI APEI fixes and an ACPI platform firmware runtime update fix
for 6.17-rc3.

* acpi-apei:
  ACPI: APEI: EINJ: Fix resource leak by remove callback in .exit.text
  ACPI: APEI: EINJ: fix potential NULL dereference in __einj_error_inject()
  ACPI: APEI: EINJ: Check if user asked for EINJV2 injection

* acpi-pfrut:
  ACPI: pfr_update: Fix the driver update version check
diff --git a/drivers/acpi/pfr_update.c b/drivers/acpi/pfr_update.c
@@ -329,7 +329,7 @@ static bool applicable_image(const void *data, struct pfru_update_cap_info *cap,
 	if (type == PFRU_CODE_INJECT_TYPE)
 		return payload_hdr->rt_ver >= cap->code_rt_version;
 
-	return payload_hdr->rt_ver >= cap->drv_rt_version;
+	return payload_hdr->svn_ver >= cap->drv_svn;
 }
 
 static void print_update_debug_info(struct pfru_updated_result *result,
diff --git a/include/uapi/linux/pfrut.h b/include/uapi/linux/pfrut.h
@@ -89,6 +89,7 @@ struct pfru_payload_hdr {
 	__u32 hw_ver;
 	__u32 rt_ver;
 	__u8 platform_id[16];
+	__u32 svn_ver;
 };
 
 enum pfru_dsm_status {

Original file line number	Diff line number	Diff line change
`@@ -329,7 +329,7 @@ static bool applicable_image(const void data, struct pfru_update_cap_info cap,`
`329`	`329`	`if (type == PFRU_CODE_INJECT_TYPE)`
`330`	`330`	`return payload_hdr->rt_ver >= cap->code_rt_version;`
`331`	`331`
`332`		`- return payload_hdr->rt_ver >= cap->drv_rt_version;`
	`332`	`+ return payload_hdr->svn_ver >= cap->drv_svn;`
`333`	`333`	`}`
`334`	`334`
`335`	`335`	`static void print_update_debug_info(struct pfru_updated_result *result,`