From 87fbd0f726b718a6d51ca5312d0add787e01642e Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Mon, 3 Jul 2023 12:51:07 +0200 Subject: [PATCH] sys-kernel/coreos-overlay: adjust Hyper-V patch for 5.15.119 Since 5.15.119 or newer changed Hyper-V code via 34e21b8ff3e6 https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=34e21b8ff3e6445baedb813b2ba8d306d6f312c8, it is necessary to adjust the z0006 patch of Flatcar to apply the patch. --- ...-hv-Avoid-the-retarget-interrupt-hypercall-in-irq.patch | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.15/z0006-PCI-hv-Avoid-the-retarget-interrupt-hypercall-in-irq.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.15/z0006-PCI-hv-Avoid-the-retarget-interrupt-hypercall-in-irq.patch index e95fbd646c..805870792b 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.15/z0006-PCI-hv-Avoid-the-retarget-interrupt-hypercall-in-irq.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.15/z0006-PCI-hv-Avoid-the-retarget-interrupt-hypercall-in-irq.patch @@ -173,7 +173,7 @@ index 42c625bc5944..165dfb98d3d8 100644 #endif /* CONFIG_ARM64 */ /** -@@ -1462,122 +1586,9 @@ static void hv_irq_mask(struct irq_data *data) +@@ -1462,127 +1586,9 @@ static void hv_irq_mask(struct irq_data *data) irq_chip_mask_parent(data); } @@ -207,6 +207,11 @@ index 42c625bc5944..165dfb98d3d8 100644 - pbus = pdev->bus; - hbus = container_of(pbus->sysdata, struct hv_pcibus_device, sysdata); - int_desc = data->chip_data; +- if (!int_desc) { +- dev_warn(&hbus->hdev->device, "%s() can not unmask irq %u\n", +- __func__, data->irq); +- return; +- } - - spin_lock_irqsave(&hbus->retarget_msi_interrupt_lock, flags); -