public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: "David E. Box" <david.e.box@linux.intel.com>
To: linux-kernel@vger.kernel.org,
	platform-driver-x86@vger.kernel.org,
	ilpo.jarvinen@linux.intel.com, rajvi.jingar@linux.intel.com
Subject: [PATCH V4 02/17] platform/x86/intel/vsec: remove platform_info from vsec device structure
Date: Wed, 18 Oct 2023 16:16:09 -0700	[thread overview]
Message-ID: <20231018231624.1044633-3-david.e.box@linux.intel.com> (raw)
In-Reply-To: <20231018231624.1044633-1-david.e.box@linux.intel.com>

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: David E. Box <david.e.box@linux.intel.com>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
---
V4 - No change

V3 - No change

V2 - New patch splitting previous PATCH 1

 drivers/platform/x86/intel/pmt/class.c | 2 +-
 drivers/platform/x86/intel/vsec.c      | 2 +-
 drivers/platform/x86/intel/vsec.h      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/platform/x86/intel/pmt/class.c b/drivers/platform/x86/intel/pmt/class.c
index f32a233470de..2ad91d2fd954 100644
--- a/drivers/platform/x86/intel/pmt/class.c
+++ b/drivers/platform/x86/intel/pmt/class.c
@@ -31,7 +31,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);
 
diff --git a/drivers/platform/x86/intel/vsec.c b/drivers/platform/x86/intel/vsec.c
index e82a009be630..b14eba545770 100644
--- a/drivers/platform/x86/intel/vsec.c
+++ b/drivers/platform/x86/intel/vsec.c
@@ -193,7 +193,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;
 
 	if (header->id == VSEC_ID_SDSI)
 		intel_vsec_dev->ida = &intel_vsec_sdsi_ida;
diff --git a/drivers/platform/x86/intel/vsec.h b/drivers/platform/x86/intel/vsec.h
index 8900cb95afd3..d3fefba3e623 100644
--- a/drivers/platform/x86/intel/vsec.h
+++ b/drivers/platform/x86/intel/vsec.h
@@ -79,10 +79,10 @@ struct intel_vsec_device {
 	struct pci_dev *pcidev;
 	struct resource *resource;
 	struct ida *ida;
-	struct intel_vsec_platform_info *info;
 	int num_resources;
 	void *priv_data;
 	size_t priv_data_size;
+	unsigned long quirks;
 };
 
 int intel_vsec_add_aux(struct pci_dev *pdev, struct device *parent,
-- 
2.34.1


  parent reply	other threads:[~2023-10-18 23:16 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-18 23:16 [PATCH V4 00/17] intel_pmc: Add telemetry API to read counters David E. Box
2023-10-18 23:16 ` [PATCH V4 01/17] platform/x86/intel/vsec: Move structures to header David E. Box
2023-10-18 23:16 ` David E. Box [this message]
2023-10-18 23:16 ` [PATCH V4 03/17] platform/x86/intel/vsec: Use cleanup.h David E. Box
2023-10-19  1:03   ` kernel test robot
2023-10-23 15:15   ` Ilpo Järvinen
2023-10-18 23:16 ` [PATCH V4 04/17] platform/x86/intel/vsec: Add intel_vsec_register David E. Box
2023-10-23 15:21   ` Ilpo Järvinen
2023-10-24 23:25     ` David E. Box
2023-10-18 23:16 ` [PATCH V4 05/17] platform/x86/intel/vsec: Add base address field David E. Box
2023-10-18 23:16 ` [PATCH V4 06/17] platform/x86/intel/pmt: Add header to struct intel_pmt_entry David E. Box
2023-10-23 15:14   ` Ilpo Järvinen
2023-10-18 23:16 ` [PATCH V4 07/17] platform/x86/intel/pmt: telemetry: Export API to read telemetry David E. Box
2023-10-18 23:16 ` [PATCH V4 08/17] platform/x86:intel/pmc: Call pmc_get_low_power_modes from platform init David E. Box
2023-10-18 23:16 ` [PATCH V4 09/17] platform/x86/intel/pmc: Allow pmc_core_ssram_init to fail David E. Box
2023-10-23 15:17   ` Ilpo Järvinen
2023-10-18 23:16 ` [PATCH V4 10/17] linux/io.h: iounmap/ioport_unmap cleanup.h support David E. Box
2023-10-19  2:12   ` kernel test robot
2023-10-19  2:23   ` kernel test robot
2023-10-23 15:25   ` Ilpo Järvinen
2023-10-18 23:16 ` [PATCH V4 11/17] platform/x86/intel/pmc: Split pmc_core_ssram_get_pmc() David E. Box
2023-10-23 16:01   ` Ilpo Järvinen
2023-10-18 23:16 ` [PATCH V4 12/17] platform/x86/intel/pmc: Find and register PMC telemetry entries David E. Box
2023-10-18 23:16 ` [PATCH V4 13/17] platform/x86/intel/pmc: Display LPM requirements for multiple PMCs David E. Box
2023-10-23 16:15   ` Ilpo Järvinen
2023-10-18 23:16 ` [PATCH V4 14/17] platform/x86/intel/pmc: Retrieve LPM information using Intel PMT David E. Box
2023-10-23 16:19   ` Ilpo Järvinen
2023-10-18 23:16 ` [PATCH V4 15/17] platform/x86/intel/pmc: Read low power mode requirements for MTL-M and MTL-P David E. Box
2023-10-18 23:16 ` [PATCH V4 16/17] platform/x86/intel/pmc: Add debug attribute for Die C6 counter David E. Box
2023-10-23 16:31   ` Ilpo Järvinen
2023-10-26 20:28     ` David E. Box
2023-10-18 23:16 ` [PATCH V4 17/17] platform/x86/intel/pmc: Show Die C6 counter on Meteor Lake David E. Box
2023-10-23 16:33   ` Ilpo Järvinen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231018231624.1044633-3-david.e.box@linux.intel.com \
    --to=david.e.box@linux.intel.com \
    --cc=ilpo.jarvinen@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=platform-driver-x86@vger.kernel.org \
    --cc=rajvi.jingar@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox