diff --git a/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-04-21-linux-5.15.35-update.md b/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-04-21-linux-5.15.35-update.md new file mode 100644 index 0000000000..a207912af0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-04-21-linux-5.15.35-update.md @@ -0,0 +1 @@ +- Linux ([5.15.35](https://lwn.net/Articles/892002)) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-5.15.34.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-5.15.35.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-5.15.34.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-5.15.35.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-5.15.34.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-5.15.35.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-5.15.34.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-5.15.35.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest index 0bbae26c92..e4a395d0fc 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest @@ -1,2 +1,2 @@ DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a -DIST patch-5.15.34.xz 1537076 BLAKE2B e97103ee599136755681bc5c8a8d7ec9287f5ac544473730636dd8e2874160d62794344409f2761b777987bf2258bbe3e388217ff7622c90440105fe49b3e4ef SHA512 2fdfcf49eda367617ea32753ffa87ef293c087f4e4a8d50b7c3321a1b7f61cdcb8c61b2d7dd151a527c453c3800c56e828eddf20c2ef278fe68f47834691d44a +DIST patch-5.15.35.xz 1573300 BLAKE2B 650cb9a7f5f4960f43ba081d84fc7bb942d25cecd67f284a6e3e1f5f84e5336c2eaf9796f86ef581e8c2cbb7f8f7ed11413091b91f6ad5d4815dd806cdd98ba1 SHA512 3e4e3f4634bb170b5ddf5cf090c0b17968af44485b23e791d91124ecb578ab58220a6c988e8e8a1bf775e03d1683565aa3ab3eb21964dcd0c2950cc6033a4861 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.15.34.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.15.35.ebuild similarity index 94% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.15.34.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.15.35.ebuild index b7be8550ea..22f5b03358 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.15.34.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.15.35.ebuild @@ -38,5 +38,4 @@ UNIPATCH_LIST=" ${PATCH_DIR}/z0004-PCI-hv-Add-arm64-Hyper-V-vPCI-support.patch \ ${PATCH_DIR}/z0005-Revert-PCI-MSI-Mask-MSI-X-vectors-only-on-success.patch \ ${PATCH_DIR}/z0006-Drivers-hv-vmbus-Propagate-VMbus-coherence-to-each-V.patch \ - ${PATCH_DIR}/z0007-PCI-hv-Propagate-coherence-from-VMbus-device-to-PCI-.patch \ " diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.15/z0007-PCI-hv-Propagate-coherence-from-VMbus-device-to-PCI-.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.15/z0007-PCI-hv-Propagate-coherence-from-VMbus-device-to-PCI-.patch deleted file mode 100644 index 6184cee196..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.15/z0007-PCI-hv-Propagate-coherence-from-VMbus-device-to-PCI-.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 9b38850d8ff2bbc6df27d394c825f92d846a6dd9 Mon Sep 17 00:00:00 2001 -From: Michael Kelley -Date: Thu, 24 Mar 2022 09:14:52 -0700 -Subject: [PATCH 2/2] PCI: hv: Propagate coherence from VMbus device to PCI - device - -PCI pass-thru devices in a Hyper-V VM are represented as a VMBus -device and as a PCI device. The coherence of the VMbus device is -set based on the VMbus node in ACPI, but the PCI device has no -ACPI node and defaults to not hardware coherent. This results -in extra software coherence management overhead on ARM64 when -devices are hardware coherent. - -Fix this by setting up the PCI host bus so that normal -PCI mechanisms will propagate the coherence of the VMbus -device to the PCI device. There's no effect on x86/x64 where -devices are always hardware coherent. - -Signed-off-by: Michael Kelley -Acked-by: Boqun Feng -Acked-by: Robin Murphy ---- - drivers/pci/controller/pci-hyperv.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c -index ddbbdadc8490..95806cb1e4d8 100644 ---- a/drivers/pci/controller/pci-hyperv.c -+++ b/drivers/pci/controller/pci-hyperv.c -@@ -3404,6 +3404,15 @@ static int hv_pci_probe(struct hv_device *hdev, - hbus->bridge->domain_nr = dom; - #ifdef CONFIG_X86 - hbus->sysdata.domain = dom; -+#elif defined(CONFIG_ARM64) -+ /* -+ * Set the PCI bus parent to be the corresponding VMbus -+ * device. Then the VMbus device will be assigned as the -+ * ACPI companion in pcibios_root_bridge_prepare() and -+ * pci_dma_configure() will propagate device coherence -+ * information to devices created on the bus. -+ */ -+ hbus->sysdata.parent = hdev->device.parent; - #endif - - hbus->hdev = hdev; --- -2.32.0 -