Skip to content

Commit 4dea285

Browse files
authored
Enable x86_amd_platform_device builtin (#10808)
This is a customer request to further support AMD devices with ACPI. Specifically it "interpret(s) AMD specific ACPI device to platform device such as I2C, UART, GPIO". This will help resolve issues with i2c clock related functionality.
1 parent 8dd677a commit 4dea285

11 files changed

Lines changed: 27 additions & 12 deletions

File tree

SPECS-SIGNED/kernel-signed/kernel-signed.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
Summary: Signed Linux Kernel for %{buildarch} systems
1111
Name: kernel-signed-%{buildarch}
1212
Version: 6.6.56.1
13-
Release: 1%{?dist}
13+
Release: 2%{?dist}
1414
License: GPLv2
1515
Vendor: Microsoft Corporation
1616
Distribution: Azure Linux
@@ -145,6 +145,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
145145
%exclude /module_info.ld
146146

147147
%changelog
148+
* Tue Oct 22 2024 Rachel Menge <rachelmenge@microsoft.com> - 6.6.56.1-2
149+
- Bump release to match kernel
150+
148151
* Thu Oct 17 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 6.6.56.1-1
149152
- Auto-upgrade to 6.6.56.1
150153

SPECS-SIGNED/kernel-uki-signed/kernel-uki-signed.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
Summary: Signed Unified Kernel Image for %{buildarch} systems
77
Name: kernel-uki-signed-%{buildarch}
88
Version: 6.6.56.1
9-
Release: 1%{?dist}
9+
Release: 2%{?dist}
1010
License: GPLv2
1111
Vendor: Microsoft Corporation
1212
Distribution: Azure Linux
@@ -68,6 +68,9 @@ popd
6868
/boot/efi/EFI/Linux/vmlinuz-uki-%{kernelver}.efi
6969

7070
%changelog
71+
* Tue Oct 22 2024 Rachel Menge <rachelmenge@microsoft.com> - 6.6.56.1-2
72+
- Bump release to match kernel
73+
7174
* Thu Oct 17 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 6.6.56.1-1
7275
- Auto-upgrade to 6.6.56.1
7376

SPECS/kernel-headers/kernel-headers.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
Summary: Linux API header files
1515
Name: kernel-headers
1616
Version: 6.6.56.1
17-
Release: 1%{?dist}
17+
Release: 2%{?dist}
1818
License: GPLv2
1919
Vendor: Microsoft Corporation
2020
Distribution: Azure Linux
@@ -75,6 +75,9 @@ done
7575
%endif
7676

7777
%changelog
78+
* Tue Oct 22 2024 Rachel Menge <rachelmenge@microsoft.com> - 6.6.56.1-2
79+
- Bump release to match kernel
80+
7881
* Thu Oct 17 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 6.6.56.1-1
7982
- Auto-upgrade to 6.6.56.1
8083

SPECS/kernel/config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ CONFIG_X86_EXTENDED_PLATFORM=y
347347
# CONFIG_X86_GOLDFISH is not set
348348
CONFIG_X86_INTEL_MID=y
349349
CONFIG_X86_INTEL_LPSS=y
350-
# CONFIG_X86_AMD_PLATFORM_DEVICE is not set
350+
CONFIG_X86_AMD_PLATFORM_DEVICE=y
351351
CONFIG_IOSF_MBI=y
352352
# CONFIG_IOSF_MBI_DEBUG is not set
353353
CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y

SPECS/kernel/kernel-uki.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
Summary: Unified Kernel Image
1919
Name: kernel-uki
2020
Version: 6.6.56.1
21-
Release: 1%{?dist}
21+
Release: 2%{?dist}
2222
License: GPLv2
2323
Vendor: Microsoft Corporation
2424
Distribution: Azure Linux
@@ -75,6 +75,9 @@ cp %{buildroot}/boot/vmlinuz-uki-%{kernelver}.efi %{buildroot}/boot/efi/EFI/Linu
7575
/boot/efi/EFI/Linux/vmlinuz-uki-%{kernelver}.efi
7676

7777
%changelog
78+
* Tue Oct 22 2024 Rachel Menge <rachelmenge@microsoft.com> - 6.6.56.1-2
79+
- Bump release to match kernel
80+
7881
* Thu Oct 17 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 6.6.56.1-1
7982
- Auto-upgrade to 6.6.56.1
8083

SPECS/kernel/kernel.signatures.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"Signatures": {
33
"cbl-mariner-ca-20211013.pem": "5ef124b0924cb1047c111a0ecff1ae11e6ad7cac8d1d9b40f98f99334121f0b0",
4-
"config": "0dab3b01177078e6acae4b4dc5d7fab7e6bce0885fc85489d676755b7aec17b7",
4+
"config": "88a40d5173de5c1f173f16ca7b7d7e9d133681bb19c2628053f44972ceb90328",
55
"config_aarch64": "a5117187fc325a25396429db647a0121aacbd838c966b55787c26805b9fc2664",
66
"cpupower": "d7518767bf2b1110d146a49c7d42e76b803f45eb8bd14d931aa6d0d346fae985",
77
"cpupower.service": "b057fe9e5d0e8c36f485818286b80e3eba8ff66ff44797940e99b1fd5361bb98",

SPECS/kernel/kernel.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
Summary: Linux Kernel
3131
Name: kernel
3232
Version: 6.6.56.1
33-
Release: 1%{?dist}
33+
Release: 2%{?dist}
3434
License: GPLv2
3535
Vendor: Microsoft Corporation
3636
Distribution: Azure Linux
@@ -407,6 +407,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
407407
%{_sysconfdir}/bash_completion.d/bpftool
408408

409409
%changelog
410+
* Tue Oct 22 2024 Rachel Menge <rachelmenge@microsoft.com> - 6.6.56.1-2
411+
- Enable CONFIG_X86_AMD_PLATFORM_DEVICE built-in
412+
410413
* Thu Oct 17 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 6.6.56.1-1
411414
- Auto-upgrade to 6.6.56.1
412415

toolkit/resources/manifests/package/pkggen_core_aarch64.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
filesystem-1.1-21.azl3.aarch64.rpm
2-
kernel-headers-6.6.56.1-1.azl3.noarch.rpm
2+
kernel-headers-6.6.56.1-2.azl3.noarch.rpm
33
glibc-2.38-8.azl3.aarch64.rpm
44
glibc-devel-2.38-8.azl3.aarch64.rpm
55
glibc-i18n-2.38-8.azl3.aarch64.rpm

toolkit/resources/manifests/package/pkggen_core_x86_64.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
filesystem-1.1-21.azl3.x86_64.rpm
2-
kernel-headers-6.6.56.1-1.azl3.noarch.rpm
2+
kernel-headers-6.6.56.1-2.azl3.noarch.rpm
33
glibc-2.38-8.azl3.x86_64.rpm
44
glibc-devel-2.38-8.azl3.x86_64.rpm
55
glibc-i18n-2.38-8.azl3.x86_64.rpm

toolkit/resources/manifests/package/toolchain_aarch64.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ intltool-0.51.0-7.azl3.noarch.rpm
156156
itstool-2.0.7-1.azl3.noarch.rpm
157157
kbd-2.2.0-2.azl3.aarch64.rpm
158158
kbd-debuginfo-2.2.0-2.azl3.aarch64.rpm
159-
kernel-headers-6.6.56.1-1.azl3.noarch.rpm
159+
kernel-headers-6.6.56.1-2.azl3.noarch.rpm
160160
kmod-30-1.azl3.aarch64.rpm
161161
kmod-debuginfo-30-1.azl3.aarch64.rpm
162162
kmod-devel-30-1.azl3.aarch64.rpm

0 commit comments

Comments
 (0)