Re: [RFC 1/5] drm/xe/soc_remapper: Initialize SoC remapper during Xe probe

[Michal Wajdeczko <michal.wajdeczko@intel.com>]

On 11/22/2025 5:58 AM, Anoop, Vijay wrote:
> From: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
> 
> SoC remapper is used to map different HW functions in the SoC to their
> respective drivers. Initialize SoC remapper during driver load.
> 
> Signed-off-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
> ---
>  drivers/gpu/drm/xe/Makefile          |  1 +
>  drivers/gpu/drm/xe/xe_device.c       |  5 +++++
>  drivers/gpu/drm/xe/xe_device_types.h |  6 ++++++
>  drivers/gpu/drm/xe/xe_soc_remapper.c | 15 +++++++++++++++
>  drivers/gpu/drm/xe/xe_soc_remapper.h | 15 +++++++++++++++
>  5 files changed, 42 insertions(+)
>  create mode 100644 drivers/gpu/drm/xe/xe_soc_remapper.c
>  create mode 100644 drivers/gpu/drm/xe/xe_soc_remapper.h
> 
> diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile
> index 1a3aa041820d..7ebfbf9051bf 100644
> --- a/drivers/gpu/drm/xe/Makefile
> +++ b/drivers/gpu/drm/xe/Makefile
> @@ -110,6 +110,7 @@ xe-y += xe_bb.o \
>  	xe_range_fence.o \
>  	xe_reg_sr.o \
>  	xe_reg_whitelist.o \
> +	xe_soc_remapper.o \

please keep .o in alphabetical order

>  	xe_ring_ops.o \
>  	xe_rtp.o \
>  	xe_sa.o \
> diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
> index 1197f914ef77..f15489c100af 100644
> --- a/drivers/gpu/drm/xe/xe_device.c
> +++ b/drivers/gpu/drm/xe/xe_device.c
> @@ -60,6 +60,7 @@
>  #include "xe_psmi.h"
>  #include "xe_pxp.h"
>  #include "xe_query.h"
> +#include "xe_soc_remapper.h"

please keep includes in alphabetical order

>  #include "xe_shrinker.h"
>  #include "xe_survivability_mode.h"
>  #include "xe_sriov.h"
> @@ -906,6 +907,10 @@ int xe_device_probe(struct xe_device *xe)
>  
>  	xe_nvm_init(xe);
>  
> +	err = xe_soc_remapper_init(xe);
> +	if (err)
> +		return err;
> +
>  	err = xe_heci_gsc_init(xe);
>  	if (err)
>  		return err;
> diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h
> index 0b2fa7c56d38..4d23b75bc728 100644
> --- a/drivers/gpu/drm/xe/xe_device_types.h
> +++ b/drivers/gpu/drm/xe/xe_device_types.h
> @@ -552,6 +552,12 @@ struct xe_device {
>  		struct mutex lock;
>  	} pmt;
>  
> +	/* @soc_remapper: SoC remapper object */

use proper kernel-doc format

	/** @soc_remapper: ...

> +	struct {
> +		/* Serialize access to SoC Remapper's index registers */

use proper kernel-doc format

		/** @soc_remapper.lock: ...

> +		spinlock_t lock;
> +	} soc_remapper;
> +
>  	/**
>  	 * @pm_callback_task: Track the active task that is running in either
>  	 * the runtime_suspend or runtime_resume callbacks.
> diff --git a/drivers/gpu/drm/xe/xe_soc_remapper.c b/drivers/gpu/drm/xe/xe_soc_remapper.c
> new file mode 100644
> index 000000000000..f5a02abd6ab1
> --- /dev/null
> +++ b/drivers/gpu/drm/xe/xe_soc_remapper.c
> @@ -0,0 +1,15 @@
> +// SPDX-License-Identifier: MIT
> +/*
> + * Copyright © 2025 Intel Corporation
> + */
> +
> +#include <linux/spinlock.h>

likely not need, try instead:

   #include "xe_device_types.h"

> +
> +#include "xe_soc_remapper.h"
> +
> +int xe_soc_remapper_init(struct xe_device *xe)
> +{
> +	spin_lock_init(&xe->soc_remapper.lock);
> +
> +	return 0;
> +}
> diff --git a/drivers/gpu/drm/xe/xe_soc_remapper.h b/drivers/gpu/drm/xe/xe_soc_remapper.h
> new file mode 100644
> index 000000000000..3cfd44f1fd74
> --- /dev/null
> +++ b/drivers/gpu/drm/xe/xe_soc_remapper.h
> @@ -0,0 +1,15 @@
> +/* SPDX-License-Identifier: MIT */
> +/*
> + * Copyright © 2025 Intel Corporation
> + */
> +
> +#ifndef _XE_SOC_REMAPPER_H_
> +#define _XE_SOC_REMAPPER_H_
> +
> +#include <linux/types.h>
> +
> +#include "xe_device_types.h"

we don't need full include here, use forward declaration instead:

struct xe_device;

> +
> +int xe_soc_remapper_init(struct xe_device *xe);
> +
> +#endif