Commit f46f3818 authored by David E. Box's avatar David E. Box Committed by Jia, Yingbao
Browse files

platform/x86/intel/vsec: remove platform_info from vsec device structure 

mainline inclusion
from mainline-v6.8
commit 0a0a52abaa65b844afde3d7229c209a8cddc5a07
category: bugfix
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/IB6QCG
CVE: NA
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0a0a52abaa65b844afde3d7229c209a8cddc5a07



-------------------------------------------------

Intel-SIG: commit 0a0a52abaa65 platform/x86/intel/vsec: remove platform_info from vsec device structure.
Backport intel tpmi base driver update for 5.10

In preparation for exporting an API to register Intel Vendor Specific
Extended Capabilities (VSEC) from other drivers, remove the pointer to
platform_info from intel_vsec_device. This prevents a potential page fault
when auxiliary drivers probe and attempt to dereference this pointer to
access the needed quirks field. Instead, just add the quirks to
intel_vsec_device.

Signed-off-by: default avatarDavid E. Box <david.e.box@linux.intel.com>
Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20231129222132.2331261-5-david.e.box@linux.intel.com


Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
[ Yingbao Jia: amend commit log ]
Signed-off-by: default avatarYingbao Jia <yingbao.jia@intel.com>
parent 231ad7a7

drivers/platform/x86/intel_pmt_class.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ bool intel_pmt_is_early_client_hw(struct device *dev) 
	 * differences from the server platforms (which use the Out Of Band

	 * Management Services Module OOBMSM).

	*/

	return !!(ivdev->info->quirks & VSEC_QUIRK_EARLY_HW);

	return !!(ivdev->quirks & VSEC_QUIRK_EARLY_HW);

}

EXPORT_SYMBOL_NS_GPL(intel_pmt_is_early_client_hw, INTEL_PMT);

drivers/platform/x86/intel_vsec.c

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ static int intel_vsec_add_dev(struct pci_dev *pdev, struct intel_vsec_header *he 
	intel_vsec_dev->pcidev = pdev;

	intel_vsec_dev->resource = res;

	intel_vsec_dev->num_resources = header->num_entries;

	intel_vsec_dev->info = info;

	intel_vsec_dev->quirks = info->quirks;

	intel_vsec_dev->ida = &intel_vsec_ida;



	return intel_vsec_add_aux(pdev, NULL, intel_vsec_dev,

drivers/platform/x86/intel_vsec.h

+1 −1
Original line number Diff line number Diff line
@@ -77,11 +77,11 @@ struct intel_vsec_device { 
	struct pci_dev *pcidev;

	struct resource *resource;

	struct ida *ida;

	struct intel_vsec_platform_info *info;

	int num_resources;

	int id; /* xa */

	void *priv_data;

	size_t priv_data_size;

	unsigned long quirks;

};



int intel_vsec_add_aux(struct pci_dev *pdev, struct device *parent,