Commit 4a387c98 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-5.17a-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip 

Pull xen fixes from Juergen Gross:

 - Two small cleanups

 - Another fix for addressing the EFI framebuffer above 4GB when running
   as Xen dom0

 - A patch to let Xen guests use reserved bits in MSI- and IO-APIC-
   registers for extended APIC-IDs the same way KVM guests are doing it
   already

* tag 'for-linus-5.17a-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/pci: Make use of the helper macro LIST_HEAD()
  xen/x2apic: Fix inconsistent indenting
  xen/x86: detect support for extended destination ID
  xen/x86: obtain full video frame buffer address for Dom0 also under EFI
parents eef8cffc f66edf68

arch/x86/include/asm/xen/cpuid.h

+7 −0
Original line number Diff line number Diff line
@@ -100,6 +100,13 @@ 
/* Memory mapped from other domains has valid IOMMU entries */

#define XEN_HVM_CPUID_IOMMU_MAPPINGS   (1u << 2)

#define XEN_HVM_CPUID_VCPU_ID_PRESENT  (1u << 3) /* vcpu id is present in EBX */

#define XEN_HVM_CPUID_DOMID_PRESENT    (1u << 4) /* domid is present in ECX */

/*

 * Bits 55:49 from the IO-APIC RTE and bits 11:5 from the MSI address can be

 * used to store high bits for the Destination ID. This expands the Destination

 * ID field from 8 to 15 bits, allowing to target APIC IDs up 32768.

 */

#define XEN_HVM_CPUID_EXT_DEST_ID      (1u << 5)



/*

 * Leaf 6 (0x40000x05)

arch/x86/xen/enlighten_hvm.c

+7 −2
Original line number Diff line number Diff line
@@ -185,7 +185,6 @@ static int xen_cpu_dead_hvm(unsigned int cpu) 


	if (xen_have_vector_callback && xen_feature(XENFEAT_hvm_safe_pvclock))

		xen_teardown_timer(cpu);



	return 0;

}
@@ -248,6 +247,11 @@ static __init bool xen_x2apic_available(void) 
	return x2apic_supported();

}



static bool __init msi_ext_dest_id(void)

{

       return cpuid_eax(xen_cpuid_base() + 4) & XEN_HVM_CPUID_EXT_DEST_ID;

}



static __init void xen_hvm_guest_late_init(void)

{

#ifdef CONFIG_XEN_PVH
@@ -310,6 +314,7 @@ struct hypervisor_x86 x86_hyper_xen_hvm __initdata = { 
	.init.x2apic_available  = xen_x2apic_available,

	.init.init_mem_mapping	= xen_hvm_init_mem_mapping,

	.init.guest_late_init	= xen_hvm_guest_late_init,

	.init.msi_ext_dest_id   = msi_ext_dest_id,

	.runtime.pin_vcpu       = xen_pin_vcpu,

	.ignore_nopv            = true,

};

arch/x86/xen/vga.c

+8 −8
Original line number Diff line number Diff line
@@ -57,6 +57,14 @@ void __init xen_init_vga(const struct dom0_vga_console_info *info, size_t size) 
		screen_info->rsvd_size = info->u.vesa_lfb.rsvd_size;

		screen_info->rsvd_pos = info->u.vesa_lfb.rsvd_pos;



		if (size >= offsetof(struct dom0_vga_console_info,

				     u.vesa_lfb.ext_lfb_base)

		    + sizeof(info->u.vesa_lfb.ext_lfb_base)

		    && info->u.vesa_lfb.ext_lfb_base) {

			screen_info->ext_lfb_base = info->u.vesa_lfb.ext_lfb_base;

			screen_info->capabilities |= VIDEO_CAPABILITY_64BIT_BASE;

		}



		if (info->video_type == XEN_VGATYPE_EFI_LFB) {

			screen_info->orig_video_isVGA = VIDEO_TYPE_EFI;

			break;
@@ -66,14 +74,6 @@ void __init xen_init_vga(const struct dom0_vga_console_info *info, size_t size) 
				     u.vesa_lfb.mode_attrs)

		    + sizeof(info->u.vesa_lfb.mode_attrs))

			screen_info->vesa_attributes = info->u.vesa_lfb.mode_attrs;



		if (size >= offsetof(struct dom0_vga_console_info,

				     u.vesa_lfb.ext_lfb_base)

		    + sizeof(info->u.vesa_lfb.ext_lfb_base)

		    && info->u.vesa_lfb.ext_lfb_base) {

			screen_info->ext_lfb_base = info->u.vesa_lfb.ext_lfb_base;

			screen_info->capabilities |= VIDEO_CAPABILITY_64BIT_BASE;

		}

		break;

	}

}

drivers/xen/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ struct xen_device_domain_owner { 
};



static DEFINE_SPINLOCK(dev_domain_list_spinlock);

static struct list_head dev_domain_list = LIST_HEAD_INIT(dev_domain_list);

static LIST_HEAD(dev_domain_list);



static struct xen_device_domain_owner *find_device(struct pci_dev *dev)

{