|
46 | 46 | drivers/iommu/iommu.c | 22 + |
47 | 47 | drivers/media/i2c/ov08x40.c | 2 +- |
48 | 48 | drivers/net/wireless/ath/ath11k/core.c | 54 +- |
49 | | - drivers/pci/controller/vmd.c | 13 + |
50 | 49 | drivers/pci/quirks.c | 24 + |
51 | 50 | drivers/platform/x86/intel/int3472/discrete.c | 58 +- |
52 | 51 | drivers/scsi/sd.c | 10 + |
|
71 | 70 | security/lockdown/lockdown.c | 11 + |
72 | 71 | tools/testing/selftests/bpf/Makefile | 2 +- |
73 | 72 | tools/testing/selftests/bpf/prog_tests/ksyms_btf.c | 31 - |
74 | | - 73 files changed, 2512 insertions(+), 292 deletions(-) |
| 73 | + 72 files changed, 2499 insertions(+), 292 deletions(-) |
75 | 74 |
|
76 | 75 | diff --git a/Documentation/arch/x86/tdx.rst b/Documentation/arch/x86/tdx.rst |
77 | 76 | index 719043cd8b46..61670e7df2f7 100644 |
@@ -127,7 +126,7 @@ index 97d958c945e4..c7e27e2edfe4 100644 |
127 | 126 | M: David E. Box < [email protected]> |
128 | 127 | S: Supported |
129 | 128 | diff --git a/Makefile b/Makefile |
130 | | -index 4c3092dae03c..d94f8028a8d4 100644 |
| 129 | +index 072a3be62551..052cfe6c163e 100644 |
131 | 130 | --- a/Makefile |
132 | 131 | +++ b/Makefile |
133 | 132 | @@ -355,6 +355,17 @@ ifneq ($(filter install,$(MAKECMDGOALS)),) |
@@ -213,10 +212,10 @@ index b1f3df39ed40..5e1c1169e27e 100644 |
213 | 212 | The VM uses one page of physical memory for each page table. |
214 | 213 | For systems with a lot of processes, this can use a lot of |
215 | 214 | diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig |
216 | | -index e9bbfacc35a6..59f8e55f3ec0 100644 |
| 215 | +index 93f391e67af1..237f7f623b4a 100644 |
217 | 216 | --- a/arch/arm64/Kconfig |
218 | 217 | +++ b/arch/arm64/Kconfig |
219 | | -@@ -1429,7 +1429,7 @@ endchoice |
| 218 | +@@ -1430,7 +1430,7 @@ endchoice |
220 | 219 |
|
221 | 220 | config ARM64_FORCE_52BIT |
222 | 221 | bool "Force 52-bit virtual addresses for userspace" |
@@ -638,7 +637,7 @@ index 7ddef3a69866..913199b1954b 100644 |
638 | 637 | #endif /* !__ASSEMBLER__ */ |
639 | 638 | #endif /* _ASM_X86_TDX_H */ |
640 | 639 | diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c |
641 | | -index a6f88ca1a6b4..5398db4dedb4 100644 |
| 640 | +index a11e17f3b4b1..ccaa51ce63f6 100644 |
642 | 641 | --- a/arch/x86/kernel/cpu/amd.c |
643 | 642 | +++ b/arch/x86/kernel/cpu/amd.c |
644 | 643 | @@ -545,6 +545,23 @@ static void early_detect_mem_encrypt(struct cpuinfo_x86 *c) |
@@ -2618,44 +2617,6 @@ index 2810752260f2..6c35a289d374 100644 |
2618 | 2617 | DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), |
2619 | 2618 | DMI_MATCH(DMI_PRODUCT_NAME, "21F9"), |
2620 | 2619 | }, |
2621 | | -diff --git a/drivers/pci/controller/vmd.c b/drivers/pci/controller/vmd.c |
2622 | | -index 1bd5bf4a6097..b4b62b9ccc45 100644 |
2623 | | ---- a/drivers/pci/controller/vmd.c |
2624 | | -+++ b/drivers/pci/controller/vmd.c |
2625 | | -@@ -192,6 +192,12 @@ static void vmd_pci_msi_enable(struct irq_data *data) |
2626 | | - data->chip->irq_unmask(data); |
2627 | | - } |
2628 | | - |
2629 | | -+static unsigned int vmd_pci_msi_startup(struct irq_data *data) |
2630 | | -+{ |
2631 | | -+ vmd_pci_msi_enable(data); |
2632 | | -+ return 0; |
2633 | | -+} |
2634 | | -+ |
2635 | | - static void vmd_irq_disable(struct irq_data *data) |
2636 | | - { |
2637 | | - struct vmd_irq *vmdirq = data->chip_data; |
2638 | | -@@ -210,6 +216,11 @@ static void vmd_pci_msi_disable(struct irq_data *data) |
2639 | | - vmd_irq_disable(data->parent_data); |
2640 | | - } |
2641 | | - |
2642 | | -+static void vmd_pci_msi_shutdown(struct irq_data *data) |
2643 | | -+{ |
2644 | | -+ vmd_pci_msi_disable(data); |
2645 | | -+} |
2646 | | -+ |
2647 | | - static struct irq_chip vmd_msi_controller = { |
2648 | | - .name = "VMD-MSI", |
2649 | | - .irq_compose_msi_msg = vmd_compose_msi_msg, |
2650 | | -@@ -309,6 +320,8 @@ static bool vmd_init_dev_msi_info(struct device *dev, struct irq_domain *domain, |
2651 | | - if (!msi_lib_init_dev_msi_info(dev, domain, real_parent, info)) |
2652 | | - return false; |
2653 | | - |
2654 | | -+ info->chip->irq_startup = vmd_pci_msi_startup; |
2655 | | -+ info->chip->irq_shutdown = vmd_pci_msi_shutdown; |
2656 | | - info->chip->irq_enable = vmd_pci_msi_enable; |
2657 | | - info->chip->irq_disable = vmd_pci_msi_disable; |
2658 | | - return true; |
2659 | 2620 | diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c |
2660 | 2621 | index d97335a40193..3b0c24a0bf32 100644 |
2661 | 2622 | --- a/drivers/pci/quirks.c |
|
0 commit comments