From 4349f459a81bd3561e7d249d313f16e9c5a623a4 Mon Sep 17 00:00:00 2001 From: Andreas Zaugg Date: Mon, 27 Jul 2026 15:04:45 -0400 Subject: [PATCH 1/3] enable Broadcom RoCE driver (bnxt_re) as module on x86_64 Set CONFIG_INFINIBAND_BNXT_RE=m, reenabling RDMA support on Broadcom NetXtreme NICs. Bump azl_pkgrelease to 10 with a %changelog entry and refresh the kernel lock input-fingerprint. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- base/comps/kernel/6.18-x86_64-azl.config | 2 +- base/comps/kernel/kernel.azl.macros | 2 +- base/comps/kernel/kernel.spec | 3 +++ locks/kernel.lock | 2 +- .../kernel_configs_json/azl4-os-required-kernel-configs.json | 4 ++-- specs/k/kernel/6.18-x86_64-azl.config | 2 +- specs/k/kernel/kernel.azl.macros | 2 +- specs/k/kernel/kernel.spec | 3 +++ 8 files changed, 13 insertions(+), 7 deletions(-) diff --git a/base/comps/kernel/6.18-x86_64-azl.config b/base/comps/kernel/6.18-x86_64-azl.config index 47be8bfd15d..54901aefb83 100644 --- a/base/comps/kernel/6.18-x86_64-azl.config +++ b/base/comps/kernel/6.18-x86_64-azl.config @@ -6179,7 +6179,7 @@ CONFIG_INFINIBAND_ON_DEMAND_PAGING=y CONFIG_INFINIBAND_ADDR_TRANS=y CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y CONFIG_INFINIBAND_VIRT_DMA=y -# CONFIG_INFINIBAND_BNXT_RE is not set +CONFIG_INFINIBAND_BNXT_RE=m # CONFIG_INFINIBAND_CXGB4 is not set CONFIG_INFINIBAND_EFA=m CONFIG_INFINIBAND_ERDMA=m diff --git a/base/comps/kernel/kernel.azl.macros b/base/comps/kernel/kernel.azl.macros index e2e2d29bc43..dbf6294c51c 100644 --- a/base/comps/kernel/kernel.azl.macros +++ b/base/comps/kernel/kernel.azl.macros @@ -2,6 +2,6 @@ # Removed once these defines move directly into kernel.spec. %_without_debug 1 %_without_selftests 1 -%azl_pkgrelease 9 +%azl_pkgrelease 10 %kextraversion 1 %nvidia_open_version 595.58.03 diff --git a/base/comps/kernel/kernel.spec b/base/comps/kernel/kernel.spec index ead1ac54a9f..957efd4d92f 100644 --- a/base/comps/kernel/kernel.spec +++ b/base/comps/kernel/kernel.spec @@ -4575,6 +4575,9 @@ fi\ # AZL-KMOD-FILES-ANCHOR — do not remove (kmod overlays chain here) %changelog +* Mon Jul 27 2026 Andreas Zaugg - 6.18.31-1.10 +- feat(kernel): enable Broadcom RoCE driver (bnxt_re) as module on x86_64 + * Thu Jul 23 2026 Rachel Menge - 6.18.31-1.9 - feat(kernel): convert component to local spec diff --git a/locks/kernel.lock b/locks/kernel.lock index a888e9d96d1..18243ff0010 100644 --- a/locks/kernel.lock +++ b/locks/kernel.lock @@ -1,4 +1,4 @@ # Managed by azldev component update. Do not edit manually. version = 1 -input-fingerprint = 'sha256:4e4d424d225920f299c3475a3a4d866822f501de3e8d1db2dfe53b8b9d92e6ac' +input-fingerprint = 'sha256:6ee67ba00fec219ea0720d9864e4507644cee729f05af50604022d12b2be46c4' resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e' diff --git a/scripts/ci/kernel/kernel-config-checker/kernel_config_checker/kernel_configs_json/azl4-os-required-kernel-configs.json b/scripts/ci/kernel/kernel-config-checker/kernel_config_checker/kernel_configs_json/azl4-os-required-kernel-configs.json index 78585918892..00d8c7587c9 100644 --- a/scripts/ci/kernel/kernel-config-checker/kernel_config_checker/kernel_configs_json/azl4-os-required-kernel-configs.json +++ b/scripts/ci/kernel/kernel-config-checker/kernel_config_checker/kernel_configs_json/azl4-os-required-kernel-configs.json @@ -3233,9 +3233,9 @@ { "name": "CONFIG_INFINIBAND_BNXT_RE", "values": [ - { "architecture": "x86_64", "value": "n" } + { "architecture": "x86_64", "value": "m" } ], - "justification": "Align kernel 6.18 with its generated configuration" + "justification": "https://microsoft.visualstudio.com/OS/_workitems/edit/63295045" }, { "name": "CONFIG_IP_VS_DEBUG", diff --git a/specs/k/kernel/6.18-x86_64-azl.config b/specs/k/kernel/6.18-x86_64-azl.config index 47be8bfd15d..54901aefb83 100644 --- a/specs/k/kernel/6.18-x86_64-azl.config +++ b/specs/k/kernel/6.18-x86_64-azl.config @@ -6179,7 +6179,7 @@ CONFIG_INFINIBAND_ON_DEMAND_PAGING=y CONFIG_INFINIBAND_ADDR_TRANS=y CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y CONFIG_INFINIBAND_VIRT_DMA=y -# CONFIG_INFINIBAND_BNXT_RE is not set +CONFIG_INFINIBAND_BNXT_RE=m # CONFIG_INFINIBAND_CXGB4 is not set CONFIG_INFINIBAND_EFA=m CONFIG_INFINIBAND_ERDMA=m diff --git a/specs/k/kernel/kernel.azl.macros b/specs/k/kernel/kernel.azl.macros index e2e2d29bc43..dbf6294c51c 100644 --- a/specs/k/kernel/kernel.azl.macros +++ b/specs/k/kernel/kernel.azl.macros @@ -2,6 +2,6 @@ # Removed once these defines move directly into kernel.spec. %_without_debug 1 %_without_selftests 1 -%azl_pkgrelease 9 +%azl_pkgrelease 10 %kextraversion 1 %nvidia_open_version 595.58.03 diff --git a/specs/k/kernel/kernel.spec b/specs/k/kernel/kernel.spec index 094e134d7c9..67a8d330600 100644 --- a/specs/k/kernel/kernel.spec +++ b/specs/k/kernel/kernel.spec @@ -4578,6 +4578,9 @@ fi\ # AZL-KMOD-FILES-ANCHOR — do not remove (kmod overlays chain here) %changelog +* Mon Jul 27 2026 Andreas Zaugg - 6.18.31-1.10 +- feat(kernel): enable Broadcom RoCE driver (bnxt_re) as module on x86_64 + * Thu Jul 23 2026 Rachel Menge - 6.18.31-1.9 - feat(kernel): convert component to local spec From 13102e92c50200e1927f9be15ac8484e2eaebc3e Mon Sep 17 00:00:00 2001 From: Andreas Zaugg Date: Mon, 27 Jul 2026 15:10:00 -0400 Subject: [PATCH 2/3] feat(kernel): enable ACPI APEI GHES on x86_64 Enable CONFIG_ACPI_APEI_GHES=y (Generic Hardware Error Source) in the x86_64 kernel config to support APEI/GHES firmware-first hardware error reporting. aarch64 already has GHES enabled. All select dependencies (ACPI_HED, IRQ_WORK, GENERIC_ALLOCATOR) and the ACPI_APEI dependency are already satisfied, so this is an additive change. Bumps azl_pkgrelease 10 -> 11 with a matching changelog entry. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- base/comps/kernel/6.18-x86_64-azl.config | 2 +- base/comps/kernel/kernel.azl.macros | 2 +- base/comps/kernel/kernel.spec | 3 +++ locks/kernel.lock | 2 +- .../azl4-os-required-kernel-configs.json | 10 ++++++++++ specs/k/kernel/6.18-x86_64-azl.config | 2 +- specs/k/kernel/kernel.azl.macros | 2 +- specs/k/kernel/kernel.spec | 3 +++ 8 files changed, 21 insertions(+), 5 deletions(-) diff --git a/base/comps/kernel/6.18-x86_64-azl.config b/base/comps/kernel/6.18-x86_64-azl.config index 54901aefb83..95d6bf2af83 100644 --- a/base/comps/kernel/6.18-x86_64-azl.config +++ b/base/comps/kernel/6.18-x86_64-azl.config @@ -671,7 +671,7 @@ CONFIG_ACPI_HMAT=y CONFIG_HAVE_ACPI_APEI=y CONFIG_HAVE_ACPI_APEI_NMI=y CONFIG_ACPI_APEI=y -# CONFIG_ACPI_APEI_GHES is not set +CONFIG_ACPI_APEI_GHES=y CONFIG_ACPI_APEI_PCIEAER=y CONFIG_ACPI_APEI_MEMORY_FAILURE=y # CONFIG_ACPI_APEI_EINJ is not set diff --git a/base/comps/kernel/kernel.azl.macros b/base/comps/kernel/kernel.azl.macros index dbf6294c51c..18fdabce526 100644 --- a/base/comps/kernel/kernel.azl.macros +++ b/base/comps/kernel/kernel.azl.macros @@ -2,6 +2,6 @@ # Removed once these defines move directly into kernel.spec. %_without_debug 1 %_without_selftests 1 -%azl_pkgrelease 10 +%azl_pkgrelease 11 %kextraversion 1 %nvidia_open_version 595.58.03 diff --git a/base/comps/kernel/kernel.spec b/base/comps/kernel/kernel.spec index 957efd4d92f..054b0cf9dc3 100644 --- a/base/comps/kernel/kernel.spec +++ b/base/comps/kernel/kernel.spec @@ -4575,6 +4575,9 @@ fi\ # AZL-KMOD-FILES-ANCHOR — do not remove (kmod overlays chain here) %changelog +* Mon Jul 27 2026 Andreas Zaugg - 6.18.31-1.11 +- feat(kernel): enable ACPI APEI GHES (Generic Hardware Error Source) on x86_64 + * Mon Jul 27 2026 Andreas Zaugg - 6.18.31-1.10 - feat(kernel): enable Broadcom RoCE driver (bnxt_re) as module on x86_64 diff --git a/locks/kernel.lock b/locks/kernel.lock index 18243ff0010..3d37a407e4c 100644 --- a/locks/kernel.lock +++ b/locks/kernel.lock @@ -1,4 +1,4 @@ # Managed by azldev component update. Do not edit manually. version = 1 -input-fingerprint = 'sha256:6ee67ba00fec219ea0720d9864e4507644cee729f05af50604022d12b2be46c4' +input-fingerprint = 'sha256:035dd07045148e5cb73e2ec0231f0494d328b2122938303450035ff378eb9435' resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e' diff --git a/scripts/ci/kernel/kernel-config-checker/kernel_config_checker/kernel_configs_json/azl4-os-required-kernel-configs.json b/scripts/ci/kernel/kernel-config-checker/kernel_config_checker/kernel_configs_json/azl4-os-required-kernel-configs.json index 00d8c7587c9..e0ce3a2b199 100644 --- a/scripts/ci/kernel/kernel-config-checker/kernel_config_checker/kernel_configs_json/azl4-os-required-kernel-configs.json +++ b/scripts/ci/kernel/kernel-config-checker/kernel_config_checker/kernel_configs_json/azl4-os-required-kernel-configs.json @@ -3014,6 +3014,16 @@ { "name": "kernel", "kernel_configs": [ + { + "name": "CONFIG_ACPI_APEI_GHES", + "values": [ + { + "architecture": "x86_64", + "value": "y" + } + ], + "justification": "https://microsoft.visualstudio.com/OS/_workitems/edit/63295066" + }, { "name": "CONFIG_DRM_ACCEL_IVPU", "values": [ diff --git a/specs/k/kernel/6.18-x86_64-azl.config b/specs/k/kernel/6.18-x86_64-azl.config index 54901aefb83..95d6bf2af83 100644 --- a/specs/k/kernel/6.18-x86_64-azl.config +++ b/specs/k/kernel/6.18-x86_64-azl.config @@ -671,7 +671,7 @@ CONFIG_ACPI_HMAT=y CONFIG_HAVE_ACPI_APEI=y CONFIG_HAVE_ACPI_APEI_NMI=y CONFIG_ACPI_APEI=y -# CONFIG_ACPI_APEI_GHES is not set +CONFIG_ACPI_APEI_GHES=y CONFIG_ACPI_APEI_PCIEAER=y CONFIG_ACPI_APEI_MEMORY_FAILURE=y # CONFIG_ACPI_APEI_EINJ is not set diff --git a/specs/k/kernel/kernel.azl.macros b/specs/k/kernel/kernel.azl.macros index dbf6294c51c..18fdabce526 100644 --- a/specs/k/kernel/kernel.azl.macros +++ b/specs/k/kernel/kernel.azl.macros @@ -2,6 +2,6 @@ # Removed once these defines move directly into kernel.spec. %_without_debug 1 %_without_selftests 1 -%azl_pkgrelease 10 +%azl_pkgrelease 11 %kextraversion 1 %nvidia_open_version 595.58.03 diff --git a/specs/k/kernel/kernel.spec b/specs/k/kernel/kernel.spec index 67a8d330600..38065e06a6f 100644 --- a/specs/k/kernel/kernel.spec +++ b/specs/k/kernel/kernel.spec @@ -4578,6 +4578,9 @@ fi\ # AZL-KMOD-FILES-ANCHOR — do not remove (kmod overlays chain here) %changelog +* Mon Jul 27 2026 Andreas Zaugg - 6.18.31-1.11 +- feat(kernel): enable ACPI APEI GHES (Generic Hardware Error Source) on x86_64 + * Mon Jul 27 2026 Andreas Zaugg - 6.18.31-1.10 - feat(kernel): enable Broadcom RoCE driver (bnxt_re) as module on x86_64 From f5f7dd4db418ac9ebc398b1d4a702a3bd3be4426 Mon Sep 17 00:00:00 2001 From: Rachel Menge Date: Wed, 29 Jul 2026 22:07:27 +0000 Subject: [PATCH 3/3] fix(kernel-config): clarify GHES requirement --- .../kernel_configs_json/azl4-os-required-kernel-configs.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/kernel/kernel-config-checker/kernel_config_checker/kernel_configs_json/azl4-os-required-kernel-configs.json b/scripts/ci/kernel/kernel-config-checker/kernel_config_checker/kernel_configs_json/azl4-os-required-kernel-configs.json index e0ce3a2b199..8d817fa3c7e 100644 --- a/scripts/ci/kernel/kernel-config-checker/kernel_config_checker/kernel_configs_json/azl4-os-required-kernel-configs.json +++ b/scripts/ci/kernel/kernel-config-checker/kernel_config_checker/kernel_configs_json/azl4-os-required-kernel-configs.json @@ -3022,7 +3022,7 @@ "value": "y" } ], - "justification": "https://microsoft.visualstudio.com/OS/_workitems/edit/63295066" + "justification": "Enable firmware-first hardware error reporting through ACPI APEI GHES on x86_64 - Work item: https://microsoft.visualstudio.com/OS/_workitems/edit/63295066" }, { "name": "CONFIG_DRM_ACCEL_IVPU",