Re: [PATCH 1/2] drm/xe/hwmon: Add HWMON support for BMG

[Rodrigo Vivi <rodrigo.vivi@intel.com>]

On Thu, May 23, 2024 at 08:13:50PM +0530, Balasubramani Vivekanandan wrote:
> From: Karthik Poosa <karthik.poosa@intel.com>
> 
> Add HWMON support for BMG. Exposing the pkg power, current,
> energy info.
> 
> Signed-off-by: Karthik Poosa <karthik.poosa@intel.com>
> Signed-off-by: Balasubramani Vivekanandan <balasubramani.vivekanandan@intel.com>

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

> ---
>  drivers/gpu/drm/xe/regs/xe_pcode_regs.h |  5 +++++
>  drivers/gpu/drm/xe/xe_hwmon.c           | 16 ++++++++++++----
>  2 files changed, 17 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/regs/xe_pcode_regs.h b/drivers/gpu/drm/xe/regs/xe_pcode_regs.h
> index 3dae858508c8..beba16d592fc 100644
> --- a/drivers/gpu/drm/xe/regs/xe_pcode_regs.h
> +++ b/drivers/gpu/drm/xe/regs/xe_pcode_regs.h
> @@ -18,4 +18,9 @@
>  #define PVC_GT0_PLATFORM_ENERGY_STATUS          XE_REG(0x28106c)
>  #define PVC_GT0_PACKAGE_POWER_SKU               XE_REG(0x281080)
>  
> +#define BMG_PACKAGE_POWER_SKU			XE_REG(0x138098)
> +#define BMG_PACKAGE_POWER_SKU_UNIT		XE_REG(0x1380dc)
> +#define BMG_PACKAGE_ENERGY_STATUS		XE_REG(0x138120)
> +#define BMG_PACKAGE_RAPL_LIMIT			XE_REG(0x138440)
> +
>  #endif /* _XE_PCODE_REGS_H_ */
> diff --git a/drivers/gpu/drm/xe/xe_hwmon.c b/drivers/gpu/drm/xe/xe_hwmon.c
> index dca275117232..8daa070d7b1a 100644
> --- a/drivers/gpu/drm/xe/xe_hwmon.c
> +++ b/drivers/gpu/drm/xe/xe_hwmon.c
> @@ -86,19 +86,25 @@ static struct xe_reg xe_hwmon_get_reg(struct xe_hwmon *hwmon, enum xe_hwmon_reg
>  
>  	switch (hwmon_reg) {
>  	case REG_PKG_RAPL_LIMIT:
> -		if (xe->info.platform == XE_PVC && channel == CHANNEL_PKG)
> +		if (xe->info.platform == XE_BATTLEMAGE && channel == CHANNEL_PKG)
> +			return BMG_PACKAGE_RAPL_LIMIT;
> +		else if (xe->info.platform == XE_PVC && channel == CHANNEL_PKG)
>  			return PVC_GT0_PACKAGE_RAPL_LIMIT;
>  		else if ((xe->info.platform == XE_DG2) && (channel == CHANNEL_PKG))
>  			return PCU_CR_PACKAGE_RAPL_LIMIT;
>  		break;
>  	case REG_PKG_POWER_SKU:
> -		if (xe->info.platform == XE_PVC && channel == CHANNEL_PKG)
> +		if (xe->info.platform == XE_BATTLEMAGE)
> +			return BMG_PACKAGE_POWER_SKU;
> +		else if (xe->info.platform == XE_PVC && channel == CHANNEL_PKG)
>  			return PVC_GT0_PACKAGE_POWER_SKU;
>  		else if ((xe->info.platform == XE_DG2) && (channel == CHANNEL_PKG))
>  			return PCU_CR_PACKAGE_POWER_SKU;
>  		break;
>  	case REG_PKG_POWER_SKU_UNIT:
> -		if (xe->info.platform == XE_PVC)
> +		if (xe->info.platform == XE_BATTLEMAGE)
> +			return BMG_PACKAGE_POWER_SKU_UNIT;
> +		else if (xe->info.platform == XE_PVC)
>  			return PVC_GT0_PACKAGE_POWER_SKU_UNIT;
>  		else if (xe->info.platform == XE_DG2)
>  			return PCU_CR_PACKAGE_POWER_SKU_UNIT;
> @@ -108,7 +114,9 @@ static struct xe_reg xe_hwmon_get_reg(struct xe_hwmon *hwmon, enum xe_hwmon_reg
>  			return GT_PERF_STATUS;
>  		break;
>  	case REG_PKG_ENERGY_STATUS:
> -		if (xe->info.platform == XE_PVC && channel == CHANNEL_PKG)
> +		if (xe->info.platform == XE_BATTLEMAGE && channel == CHANNEL_PKG)
> +			return BMG_PACKAGE_ENERGY_STATUS;
> +		else if (xe->info.platform == XE_PVC && channel == CHANNEL_PKG)
>  			return PVC_GT0_PLATFORM_ENERGY_STATUS;
>  		else if ((xe->info.platform == XE_DG2) && (channel == CHANNEL_PKG))
>  			return PCU_CR_PACKAGE_ENERGY_STATUS;
> -- 
> 2.25.1
>