Skip to content

[Deepin-Kernel-SIG] [linux 6.6.y] [zhaoxin] x86/microcode/zhaoxin: Fix NULL check for the P4D page allocation x86/mce/zhaoxin: Fix bus number shift in ZDI error reporting #2031

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
opsiff merged 2 commits into from
Jul 30, 2026
+2 −2
Merged

[Deepin-Kernel-SIG] [linux 6.6.y] [zhaoxin] x86/microcode/zhaoxin: Fix NULL check for the P4D page allocation x86/mce/zhaoxin: Fix bus number shift in ZDI error reporting #2031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53d2e43
x86/microcode/zhaoxin: Fix NULL check for the P4D page allocation
opsiff Jul 30, 2026
644aa3b
x86/mce/zhaoxin: Fix bus number shift in ZDI error reporting
opsiff Jul 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion arch/x86/kernel/cpu/mce/apei.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ void zx_apei_mce_report_zdi_error(struct cper_sec_proc_generic *zdi_err)
mce_setup(&m);
m.misc = 0;
m.misc |= (zdi_err->requestor_id & 0xff) << 19;
m.misc |= ((zdi_err->requestor_id & 0xff00) >> 8) >> 24;
m.misc |= ((zdi_err->requestor_id & 0xff00) >> 8) << 24;
m.bank = 5;
switch (zdi_err->responder_id) {
case 2:
Expand Down
2 changes: 1 addition & 1 deletion arch/x86/kernel/cpu/microcode/zhaoxin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ static __init void init_microcode_pages(void)

if (pgtable_l5_enabled()) {
microcode_p4d_page = (p4d_t *)__get_free_page(GFP_KERNEL_ACCOUNT);
if (!microcode_pud_page) {
if (!microcode_p4d_page) {
pr_err("Failed to allocate P4D page\n");
goto fail_pud;
}
Expand Down