Enable PCI_HYPERV as a builtin

microsoft · Jan 24, 2025 · f0d3143 · f0d3143
1 parent 1f00bee
commit f0d3143
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 16 deletions.
diff --git a/SPECS-SIGNED/kernel-64k-signed/kernel-64k-signed.spec b/SPECS-SIGNED/kernel-64k-signed/kernel-64k-signed.spec
@@ -7,7 +7,7 @@
 Summary:        Signed Linux Kernel for %{buildarch} systems
 Name:           kernel-64k-signed-%{buildarch}
 Version:        6.6.64.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        GPLv2
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -105,6 +105,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
 %exclude /module_info.ld
 
 %changelog
+* Sat Jan 18 2025 Rachel Menge <[email protected]> - 6.6.64.2-3
+- Bump release to match kernel-64k
+
 * Thu Jan 15 2025 Rachel Menge <[email protected]> - 6.6.64.2-3
 - Bump release to match kernel
 

diff --git a/SPECS-SIGNED/kernel-signed/kernel-signed.spec b/SPECS-SIGNED/kernel-signed/kernel-signed.spec
@@ -10,7 +10,7 @@
 Summary:        Signed Linux Kernel for %{buildarch} systems
 Name:           kernel-signed-%{buildarch}
 Version:        6.6.64.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        GPLv2
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -145,6 +145,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
 %exclude /module_info.ld
 
 %changelog
+* Sat Jan 18 2025 Rachel Menge <[email protected]> - 6.6.64.2-4
+- Bump release to match kernel
+
 * Thu Jan 15 2025 Rachel Menge <[email protected]> - 6.6.64.2-3
 - Bump release to match kernel
 

diff --git a/SPECS-SIGNED/kernel-uki-signed/kernel-uki-signed.spec b/SPECS-SIGNED/kernel-uki-signed/kernel-uki-signed.spec
@@ -6,7 +6,7 @@
 Summary:        Signed Unified Kernel Image for %{buildarch} systems
 Name:           kernel-uki-signed-%{buildarch}
 Version:        6.6.64.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        GPLv2
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -68,6 +68,9 @@ popd
 /boot/efi/EFI/Linux/vmlinuz-uki-%{kernelver}.efi
 
 %changelog
+* Sat Jan 18 2025 Rachel Menge <[email protected]> - 6.6.64.2-4
+- Bump release to match kernel
+
 * Thu Jan 15 2025 Rachel Menge <[email protected]> - 6.6.64.2-3
 - Bump release to match kernel
 

diff --git a/SPECS/kernel-64k/config_aarch64 b/SPECS/kernel-64k/config_aarch64
@@ -2085,7 +2085,7 @@ CONFIG_PCI_PRI=y
 CONFIG_PCI_PASID=y
 # CONFIG_PCI_P2PDMA is not set
 CONFIG_PCI_LABEL=y
-CONFIG_PCI_HYPERV=m
+CONFIG_PCI_HYPERV=y
 # CONFIG_PCI_DYNAMIC_OF_NODES is not set
 # CONFIG_PCIE_BUS_TUNE_OFF is not set
 CONFIG_PCIE_BUS_DEFAULT=y
@@ -2119,7 +2119,7 @@ CONFIG_PCI_HOST_GENERIC=y
 CONFIG_PCIE_MEDIATEK=y
 # CONFIG_PCIE_MEDIATEK_GEN3 is not set
 # CONFIG_PCIE_MICROCHIP_HOST is not set
-CONFIG_PCI_HYPERV_INTERFACE=m
+CONFIG_PCI_HYPERV_INTERFACE=y
 # CONFIG_PCI_TEGRA is not set
 CONFIG_PCIE_RCAR_HOST=y
 # CONFIG_PCIE_RCAR_EP is not set

diff --git a/SPECS/kernel-64k/kernel-64k.signatures.json b/SPECS/kernel-64k/kernel-64k.signatures.json
@@ -1,7 +1,7 @@
 {
   "Signatures": {
     "azurelinux-ca-20230216.pem": "d545401163c75878319f01470455e6bc18a5968e39dd964323225e3fe308849b",
-    "config_aarch64": "6f1c7d15f41c38d45b131e3fd33fa4161f732e4afa1c47fbb2aaea078fbb3183",
+    "config_aarch64": "dc7727f4d1b35ec323bc80aadeeba093a92bd45627093c4db49b500b14675add",
     "cpupower": "d7518767bf2b1110d146a49c7d42e76b803f45eb8bd14d931aa6d0d346fae985",
     "cpupower.service": "b057fe9e5d0e8c36f485818286b80e3eba8ff66ff44797940e99b1fd5361bb98",
     "sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f",

diff --git a/SPECS/kernel-64k/kernel-64k.spec b/SPECS/kernel-64k/kernel-64k.spec
@@ -25,7 +25,7 @@
 Summary:        Linux Kernel
 Name:           kernel-64k
 Version:        6.6.64.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        GPLv2
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -370,6 +370,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
 %{_sysconfdir}/bash_completion.d/bpftool
 
 %changelog
+* Sat Jan 18 2025 Rachel Menge <[email protected]> - 6.6.64.2-4
+- Build PCI_HYPERV as builtin
+
 * Thu Jan 15 2025 Rachel Menge <[email protected]> - 6.6.64.2-3
 - Bump release to match kernel
 

diff --git a/SPECS/kernel-headers/kernel-headers.spec b/SPECS/kernel-headers/kernel-headers.spec
@@ -14,7 +14,7 @@
 Summary:        Linux API header files
 Name:           kernel-headers
 Version:        6.6.64.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        GPLv2
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -75,6 +75,9 @@ done
 %endif
 
 %changelog
+* Sat Jan 18 2025 Rachel Menge <[email protected]> - 6.6.64.2-4
+- Bump release to match kernel
+
 * Thu Jan 15 2025 Rachel Menge <[email protected]> - 6.6.64.2-3
 - Bump release to match kernel
 

diff --git a/SPECS/kernel/config b/SPECS/kernel/config
@@ -1925,7 +1925,7 @@ CONFIG_PCI_PRI=y
 CONFIG_PCI_PASID=y
 # CONFIG_PCI_P2PDMA is not set
 CONFIG_PCI_LABEL=y
-CONFIG_PCI_HYPERV=m
+CONFIG_PCI_HYPERV=y
 # CONFIG_PCIE_BUS_TUNE_OFF is not set
 CONFIG_PCIE_BUS_DEFAULT=y
 # CONFIG_PCIE_BUS_SAFE is not set
@@ -1943,7 +1943,7 @@ CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 # PCI controller drivers
 #
 CONFIG_VMD=y
-CONFIG_PCI_HYPERV_INTERFACE=m
+CONFIG_PCI_HYPERV_INTERFACE=y
 
 #
 # Cadence-based PCIe controllers

diff --git a/SPECS/kernel/config_aarch64 b/SPECS/kernel/config_aarch64
@@ -2087,7 +2087,7 @@ CONFIG_PCI_PRI=y
 CONFIG_PCI_PASID=y
 # CONFIG_PCI_P2PDMA is not set
 CONFIG_PCI_LABEL=y
-CONFIG_PCI_HYPERV=m
+CONFIG_PCI_HYPERV=y
 # CONFIG_PCI_DYNAMIC_OF_NODES is not set
 # CONFIG_PCIE_BUS_TUNE_OFF is not set
 CONFIG_PCIE_BUS_DEFAULT=y
@@ -2121,7 +2121,7 @@ CONFIG_PCI_HOST_GENERIC=y
 CONFIG_PCIE_MEDIATEK=y
 # CONFIG_PCIE_MEDIATEK_GEN3 is not set
 # CONFIG_PCIE_MICROCHIP_HOST is not set
-CONFIG_PCI_HYPERV_INTERFACE=m
+CONFIG_PCI_HYPERV_INTERFACE=y
 # CONFIG_PCI_TEGRA is not set
 CONFIG_PCIE_RCAR_HOST=y
 # CONFIG_PCIE_RCAR_EP is not set

diff --git a/SPECS/kernel/kernel-uki.spec b/SPECS/kernel/kernel-uki.spec
@@ -13,7 +13,7 @@
 Summary:        Unified Kernel Image
 Name:           kernel-uki
 Version:        6.6.64.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        GPLv2
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -70,6 +70,9 @@ cp %{buildroot}/boot/vmlinuz-uki-%{kernelver}.efi %{buildroot}/boot/efi/EFI/Linu
 /boot/efi/EFI/Linux/vmlinuz-uki-%{kernelver}.efi
 
 %changelog
+* Sat Jan 18 2025 Rachel Menge <[email protected]> - 6.6.64.2-4
+- Bump release to match kernel
+
 * Thu Jan 15 2025 Rachel Menge <[email protected]> - 6.6.64.2-3
 - Bump release to match kernel
 

diff --git a/SPECS/kernel/kernel.signatures.json b/SPECS/kernel/kernel.signatures.json
@@ -1,8 +1,8 @@
 {
   "Signatures": {
     "azurelinux-ca-20230216.pem": "d545401163c75878319f01470455e6bc18a5968e39dd964323225e3fe308849b",
-    "config": "0cef3115393e9ad463e1a13eeefa920e7b3e3b97c9695cb75cc04556cd0a1bc2",
-    "config_aarch64": "27a07a9652c8dcfff7edb3134372dd0f53a9a6c8ab9c3dc5bf580ee08410bd27",
+    "config": "5a525032e8d3594867cc43bc4a8fb3e22851c16d48d4eb82fd1a4879dbcf2bcf",
+    "config_aarch64": "017245201dda4a823fc51f8e212c410d2b12ab849a2da7588d000bcb8cc48ef4",
     "cpupower": "d7518767bf2b1110d146a49c7d42e76b803f45eb8bd14d931aa6d0d346fae985",
     "cpupower.service": "b057fe9e5d0e8c36f485818286b80e3eba8ff66ff44797940e99b1fd5361bb98",
     "sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f",

diff --git a/SPECS/kernel/kernel.spec b/SPECS/kernel/kernel.spec
@@ -30,7 +30,7 @@
 Summary:        Linux Kernel
 Name:           kernel
 Version:        6.6.64.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        GPLv2
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -428,6 +428,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
 %{_sysconfdir}/bash_completion.d/bpftool
 
 %changelog
+* Sat Jan 18 2025 Rachel Menge <[email protected]> - 6.6.64.2-4
+- Build PCI_HYPERV as builtin
+
 * Thu Jan 15 2025 Rachel Menge <[email protected]> - 6.6.64.2-3
 - Disable DEBUG_PREEMPT