Commit b408817d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'platform-drivers-x86-v6.2-5' of... 

Merge tag 'platform-drivers-x86-v6.2-5' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86

Pull x86 platform drivers fix from Hans de Goede:
 "Intel vsec driver Meteor Lake PCI ids addition"

* tag 'platform-drivers-x86-v6.2-5' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86:
  platform/x86/intel/vsec: Add support for Meteor Lake
parents ceaa837f eb4b55f2

drivers/platform/x86/intel/vsec.c

+9 −0
Original line number Diff line number Diff line
@@ -408,14 +408,23 @@ static const struct intel_vsec_platform_info dg1_info = { 
	.quirks = VSEC_QUIRK_NO_DVSEC | VSEC_QUIRK_EARLY_HW,

};



/* MTL info */

static const struct intel_vsec_platform_info mtl_info = {

	.quirks = VSEC_QUIRK_NO_WATCHER | VSEC_QUIRK_NO_CRASHLOG,

};



#define PCI_DEVICE_ID_INTEL_VSEC_ADL		0x467d

#define PCI_DEVICE_ID_INTEL_VSEC_DG1		0x490e

#define PCI_DEVICE_ID_INTEL_VSEC_MTL_M		0x7d0d

#define PCI_DEVICE_ID_INTEL_VSEC_MTL_S		0xad0d

#define PCI_DEVICE_ID_INTEL_VSEC_OOBMSM		0x09a7

#define PCI_DEVICE_ID_INTEL_VSEC_RPL		0xa77d

#define PCI_DEVICE_ID_INTEL_VSEC_TGL		0x9a0d

static const struct pci_device_id intel_vsec_pci_ids[] = {

	{ PCI_DEVICE_DATA(INTEL, VSEC_ADL, &tgl_info) },

	{ PCI_DEVICE_DATA(INTEL, VSEC_DG1, &dg1_info) },

	{ PCI_DEVICE_DATA(INTEL, VSEC_MTL_M, &mtl_info) },

	{ PCI_DEVICE_DATA(INTEL, VSEC_MTL_S, &mtl_info) },

	{ PCI_DEVICE_DATA(INTEL, VSEC_OOBMSM, &(struct intel_vsec_platform_info) {}) },

	{ PCI_DEVICE_DATA(INTEL, VSEC_RPL, &tgl_info) },

	{ PCI_DEVICE_DATA(INTEL, VSEC_TGL, &tgl_info) },