• Linus Torvalds's avatar
    Merge tag 'x86_cc_for_v6.11_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 98896d87
    Linus Torvalds authored
    Pull x86 confidential computing updates from Borislav Petkov:
     "Unrelated x86/cc changes queued here to avoid ugly cross-merges and
      conflicts:
    
       - Carve out CPU hotplug function declarations into a separate header
         with the goal to be able to use the lockdep assertions in a more
         flexible manner
    
       - As a result, refactor cacheinfo code after carving out a function
         to return the cache ID associated with a given cache level
    
       - Cleanups
    
      Add support to be able to kexec TDX guests:
    
       - Expand ACPI MADT CPU offlining support
    
       - Add machinery to prepare CoCo guests memory before kexec-ing into a
         new kernel
    
       - Cleanup, readjust and massage related code"
    
    * tag 'x86_cc_for_v6.11_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (24 commits)
      ACPI: tables: Print MULTIPROC_WAKEUP when MADT is parsed
      x86/acpi: Add support for CPU offlining for ACPI MADT wakeup method
      x86/mm: Introduce kernel_ident_mapping_free()
      x86/smp: Add smp_ops.stop_this_cpu() callback
      x86/acpi: Do not attempt to bring up secondary CPUs in the kexec case
      x86/acpi: Rename fields in the acpi_madt_multiproc_wakeup structure
      x86/mm: Do not zap page table entries mapping unaccepted memory table during kdump
      x86/mm: Make e820__end_ram_pfn() cover E820_TYPE_ACPI ranges
      x86/tdx: Convert shared memory back to private on kexec
      x86/mm: Add callbacks to prepare encrypted memory for kexec
      x86/tdx: Account shared memory
      x86/mm: Return correct level from lookup_address() if pte is none
      x86/mm: Make x86_platform.guest.enc_status_change_*() return an error
      x86/kexec: Keep CR4.MCE set during kexec for TDX guest
      x86/relocate_kernel: Use named labels for less confusion
      cpu/hotplug, x86/acpi: Disable CPU offlining for ACPI MADT wakeup
      cpu/hotplug: Add support for declaring CPU offlining not supported
      x86/apic: Mark acpi_mp_wake_* variables as __ro_after_init
      x86/acpi: Extract ACPI MADT wakeup code into a separate file
      x86/kexec: Remove spurious unconditional JMP from from identity_mapped()
      ...
    98896d87
cpu.c 78.1 KB