Revert "drm/xe/nvm: add on-die non-volatile memory device"

JIRA: https://issues.redhat.com/browse/RHEL-113577
Upstream Status: RHEL only

This reverts commit c28bfb1.

This commit was backported automatically as part of the DRM backport.

The mtd infrastructure required by this commit is not available in this
tree. Bringing it in would require backporting [1] and its dependencies
(if any). Revert the patch instead.

NOTE: This commit does not compile due to missing RHEL-specific fix-ups,
which are split out into separate Git commits following this one.

If git bisect selected this commit, run "git bisect skip" and try again.
Repeat this until it selects a commit which compiles.

[1] https://lore.kernel.org/all/20250617145159.3803852-1-alexander.usyskin@intel.com/
Signed-off-by: José Expósito <jexposit@redhat.com>

Author: jexposit

drivers/gpu/drm/xe/Makefile

@@ -87,7 +87,6 @@ xe-y += xe_bb.o \
 	xe_mmio.o \
 	xe_mocs.o \
 	xe_module.o \
-	xe_nvm.o \
 	xe_oa.o \
 	xe_observation.o \
 	xe_pat.o \

drivers/gpu/drm/xe/xe_device.c

@@ -47,7 +47,6 @@
 #include "xe_irq.h"
 #include "xe_mmio.h"
 #include "xe_module.h"
-#include "xe_nvm.h"
 #include "xe_oa.h"
 #include "xe_observation.h"
 #include "xe_pat.h"
@@ -869,8 +868,6 @@ int xe_device_probe(struct xe_device *xe)
 	if (err)
 		return err;
 
-	xe_nvm_init(xe);
-
 	err = xe_heci_gsc_init(xe);
 	if (err)
 		return err;
@@ -932,8 +929,6 @@ void xe_device_remove(struct xe_device *xe)
 {
 	xe_display_unregister(xe);
 
-	xe_nvm_fini(xe);
-
 	drm_dev_unplug(&xe->drm);
 
 	xe_bo_pci_dev_remove_all(xe);

drivers/gpu/drm/xe/xe_device_types.h

@@ -34,7 +34,6 @@
 
 struct dram_info;
 struct intel_display;
-struct intel_dg_nvm_dev;
 struct xe_ggtt;
 struct xe_i2c;
 struct xe_pat_ops;
@@ -322,8 +321,6 @@ struct xe_device {
 		u8 has_fan_control:1;
 		/** @info.has_flat_ccs: Whether flat CCS metadata is used */
 		u8 has_flat_ccs:1;
-		/** @info.has_gsc_nvm: Device has gsc non-volatile memory */
-		u8 has_gsc_nvm:1;
 		/** @info.has_heci_cscfi: device has heci cscfi */
 		u8 has_heci_cscfi:1;
 		/** @info.has_heci_gscfi: device has heci gscfi */
@@ -578,9 +575,6 @@ struct xe_device {
 	/** @heci_gsc: graphics security controller */
 	struct xe_heci_gsc heci_gsc;
 
-	/** @nvm: discrete graphics non-volatile memory */
-	struct intel_dg_nvm_dev *nvm;
-
 	/** @oa: oa observation subsystem */
 	struct xe_oa oa;
 

drivers/gpu/drm/xe/xe_nvm.c

@@ -239,7 +239,6 @@ static const struct xe_device_desc dg1_desc = {
 	PLATFORM(DG1),
 	.dma_mask_size = 39,
 	.has_display = true,
-	.has_gsc_nvm = 1,
 	.has_heci_gscfi = 1,
 	.max_gt_per_tile = 1,
 	.require_force_probe = true,
@@ -252,7 +251,6 @@ static const u16 dg2_g12_ids[] = { INTEL_DG2_G12_IDS(NOP), 0 };
 #define DG2_FEATURES \
 	DGFX_FEATURES, \
 	PLATFORM(DG2), \
-	.has_gsc_nvm = 1, \
 	.has_heci_gscfi = 1, \
 	.subplatforms = (const struct xe_subplatform_desc[]) { \
 		{ XE_SUBPLATFORM_DG2_G10, "G10", dg2_g10_ids }, \
@@ -291,7 +289,6 @@ static const __maybe_unused struct xe_device_desc pvc_desc = {
 	PLATFORM(PVC),
 	.dma_mask_size = 52,
 	.has_display = false,
-	.has_gsc_nvm = 1,
 	.has_heci_gscfi = 1,
 	.max_gt_per_tile = 1,
 	.max_remote_tiles = 1,
@@ -325,7 +322,6 @@ static const struct xe_device_desc bmg_desc = {
 	.has_display = true,
 	.has_fan_control = true,
 	.has_mbx_power_limits = true,
-	.has_gsc_nvm = 1,
 	.has_heci_cscfi = 1,
 	.has_sriov = true,
 	.max_gt_per_tile = 2,
@@ -571,7 +567,6 @@ static int xe_info_init_early(struct xe_device *xe,
 	xe->info.is_dgfx = desc->is_dgfx;
 	xe->info.has_fan_control = desc->has_fan_control;
 	xe->info.has_mbx_power_limits = desc->has_mbx_power_limits;
-	xe->info.has_gsc_nvm = desc->has_gsc_nvm;
 	xe->info.has_heci_gscfi = desc->has_heci_gscfi;
 	xe->info.has_heci_cscfi = desc->has_heci_cscfi;
 	xe->info.has_llc = desc->has_llc;