superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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
pull/1322/head
Rafael J. Wysocki 2025-08-21 20:47:23 +02:00
parent b21d1fbb97 8151320c74
commit 670b51121e
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/acpi/pfr_update.c
View File

@ -329,7 +329,7 @@ static bool applicable_image(const void *data, struct pfru_update_cap_info *cap,
if (type == PFRU_CODE_INJECT_TYPE) if (type == PFRU_CODE_INJECT_TYPE)
return payload_hdr->rt_ver >= cap->code_rt_version; 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, static void print_update_debug_info(struct pfru_updated_result *result,

1
include/uapi/linux/pfrut.h
View File

@ -89,6 +89,7 @@ struct pfru_payload_hdr {
__u32 hw_ver; __u32 hw_ver;
__u32 rt_ver; __u32 rt_ver;
__u8 platform_id[16]; __u8 platform_id[16];
__u32 svn_ver;
}; };
enum pfru_dsm_status { enum pfru_dsm_status {