[PATCH 1/6] platform/x86/intel/vsec.h: Move to include/linux
Ruhl, Michael J
michael.j.ruhl at intel.com
Tue May 28 15:43:05 UTC 2024
Hi David,
Do you have any comments on the first 3 patches?
What are the next steps to move them forward?
Thanks,
Mike
>-----Original Message-----
>From: Intel-xe <intel-xe-bounces at lists.freedesktop.org> On Behalf Of Michael
>J. Ruhl
>Sent: Friday, May 10, 2024 5:00 PM
>To: intel-xe at lists.freedesktop.org
>Cc: david.e.box at linux.intel.com
>Subject: [PATCH 1/6] platform/x86/intel/vsec.h: Move to include/linux
>
>From: "David E. Box" <david.e.box at linux.intel.com>
>
>Some drivers outside of PDX86 need access to the vsec header. Move it to
>include/linux to make it easier to include.
>
>Signed-off-by: David E. Box <david.e.box at linux.intel.com>
>---
> drivers/platform/x86/intel/pmc/core_ssram.c | 2 +-
> drivers/platform/x86/intel/pmt/class.c | 2 +-
> drivers/platform/x86/intel/pmt/class.h | 2 +-
> drivers/platform/x86/intel/pmt/crashlog.c | 2 +-
> drivers/platform/x86/intel/pmt/telemetry.c | 2 +-
> drivers/platform/x86/intel/sdsi.c | 3 +--
> drivers/platform/x86/intel/tpmi.c | 3 +--
> drivers/platform/x86/intel/vsec.c | 5 ++---
> .../platform/x86/intel/vsec.h => include/linux/intel_vsec.h | 4 ++--
> 9 files changed, 11 insertions(+), 14 deletions(-)
> rename drivers/platform/x86/intel/vsec.h => include/linux/intel_vsec.h (98%)
>
>diff --git a/drivers/platform/x86/intel/pmc/core_ssram.c
>b/drivers/platform/x86/intel/pmc/core_ssram.c
>index 1bde86c54eb9..baddaaec25ee 100644
>--- a/drivers/platform/x86/intel/pmc/core_ssram.c
>+++ b/drivers/platform/x86/intel/pmc/core_ssram.c
>@@ -9,11 +9,11 @@
> */
>
> #include <linux/cleanup.h>
>+#include <linux/intel_vsec.h>
> #include <linux/pci.h>
> #include <linux/io-64-nonatomic-lo-hi.h>
>
> #include "core.h"
>-#include "../vsec.h"
> #include "../pmt/telemetry.h"
>
> #define SSRAM_HDR_SIZE 0x100
>diff --git a/drivers/platform/x86/intel/pmt/class.c
>b/drivers/platform/x86/intel/pmt/class.c
>index 4b53940a64e2..d7939b28e937 100644
>--- a/drivers/platform/x86/intel/pmt/class.c
>+++ b/drivers/platform/x86/intel/pmt/class.c
>@@ -9,12 +9,12 @@
> */
>
> #include <linux/kernel.h>
>+#include <linux/intel_vsec.h>
> #include <linux/io-64-nonatomic-lo-hi.h>
> #include <linux/module.h>
> #include <linux/mm.h>
> #include <linux/pci.h>
>
>-#include "../vsec.h"
> #include "class.h"
>
> #define PMT_XA_START 1
>diff --git a/drivers/platform/x86/intel/pmt/class.h
>b/drivers/platform/x86/intel/pmt/class.h
>index d23c63b73ab7..d6f9ccaf28c8 100644
>--- a/drivers/platform/x86/intel/pmt/class.h
>+++ b/drivers/platform/x86/intel/pmt/class.h
>@@ -2,13 +2,13 @@
> #ifndef _INTEL_PMT_CLASS_H
> #define _INTEL_PMT_CLASS_H
>
>+#include <linux/intel_vsec.h>
> #include <linux/xarray.h>
> #include <linux/types.h>
> #include <linux/bits.h>
> #include <linux/err.h>
> #include <linux/io.h>
>
>-#include "../vsec.h"
> #include "telemetry.h"
>
> /* PMT access types */
>diff --git a/drivers/platform/x86/intel/pmt/crashlog.c
>b/drivers/platform/x86/intel/pmt/crashlog.c
>index 4014c02cafdb..9079d5dffc03 100644
>--- a/drivers/platform/x86/intel/pmt/crashlog.c
>+++ b/drivers/platform/x86/intel/pmt/crashlog.c
>@@ -9,6 +9,7 @@
> */
>
> #include <linux/auxiliary_bus.h>
>+#include <linux/intel_vsec.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/pci.h>
>@@ -16,7 +17,6 @@
> #include <linux/uaccess.h>
> #include <linux/overflow.h>
>
>-#include "../vsec.h"
> #include "class.h"
>
> /* Crashlog discovery header types */
>diff --git a/drivers/platform/x86/intel/pmt/telemetry.c
>b/drivers/platform/x86/intel/pmt/telemetry.c
>index 09258564dfc4..3478f891ea0b 100644
>--- a/drivers/platform/x86/intel/pmt/telemetry.c
>+++ b/drivers/platform/x86/intel/pmt/telemetry.c
>@@ -9,6 +9,7 @@
> */
>
> #include <linux/auxiliary_bus.h>
>+#include <linux/intel_vsec.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/pci.h>
>@@ -16,7 +17,6 @@
> #include <linux/uaccess.h>
> #include <linux/overflow.h>
>
>-#include "../vsec.h"
> #include "class.h"
>
> #define TELEM_SIZE_OFFSET 0x0
>diff --git a/drivers/platform/x86/intel/sdsi.c
>b/drivers/platform/x86/intel/sdsi.c
>index 556e7c6dbb05..322ada188ee9 100644
>--- a/drivers/platform/x86/intel/sdsi.c
>+++ b/drivers/platform/x86/intel/sdsi.c
>@@ -12,6 +12,7 @@
> #include <linux/bits.h>
> #include <linux/bitfield.h>
> #include <linux/device.h>
>+#include <linux/intel_vsec.h>
> #include <linux/iopoll.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
>@@ -21,8 +22,6 @@
> #include <linux/types.h>
> #include <linux/uaccess.h>
>
>-#include "vsec.h"
>-
> #define ACCESS_TYPE_BARID 2
> #define ACCESS_TYPE_LOCAL 3
>
>diff --git a/drivers/platform/x86/intel/tpmi.c
>b/drivers/platform/x86/intel/tpmi.c
>index 910df7c654f4..be7ea557b72d 100644
>--- a/drivers/platform/x86/intel/tpmi.c
>+++ b/drivers/platform/x86/intel/tpmi.c
>@@ -51,6 +51,7 @@
> #include <linux/debugfs.h>
> #include <linux/delay.h>
> #include <linux/intel_tpmi.h>
>+#include <linux/intel_vsec.h>
> #include <linux/io.h>
> #include <linux/iopoll.h>
> #include <linux/module.h>
>@@ -59,8 +60,6 @@
> #include <linux/sizes.h>
> #include <linux/string_helpers.h>
>
>-#include "vsec.h"
>-
> /**
> * struct intel_tpmi_pfs_entry - TPMI PM Feature Structure (PFS) entry
> * @tpmi_id: TPMI feature identifier (what the feature is and its data
>format).
>diff --git a/drivers/platform/x86/intel/vsec.c
>b/drivers/platform/x86/intel/vsec.c
>index 0fdfaf3a4f5c..5a1e964783cc 100644
>--- a/drivers/platform/x86/intel/vsec.c
>+++ b/drivers/platform/x86/intel/vsec.c
>@@ -17,14 +17,13 @@
> #include <linux/bits.h>
> #include <linux/cleanup.h>
> #include <linux/delay.h>
>-#include <linux/kernel.h>
> #include <linux/idr.h>
>+#include <linux/intel_vsec.h>
>+#include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/pci.h>
> #include <linux/types.h>
>
>-#include "vsec.h"
>-
> #define PMT_XA_START 0
> #define PMT_XA_MAX INT_MAX
> #define PMT_XA_LIMIT XA_LIMIT(PMT_XA_START,
>PMT_XA_MAX)
>diff --git a/drivers/platform/x86/intel/vsec.h b/include/linux/intel_vsec.h
>similarity index 98%
>rename from drivers/platform/x86/intel/vsec.h
>rename to include/linux/intel_vsec.h
>index e23e76129691..7f19a3d90abe 100644
>--- a/drivers/platform/x86/intel/vsec.h
>+++ b/include/linux/intel_vsec.h
>@@ -1,6 +1,6 @@
> /* SPDX-License-Identifier: GPL-2.0 */
>-#ifndef _VSEC_H
>-#define _VSEC_H
>+#ifndef _INTEL_VSEC_H
>+#define _INTEL_VSEC_H
>
> #include <linux/auxiliary_bus.h>
> #include <linux/bits.h>
>--
>2.44.0
More information about the Intel-xe
mailing list