Commit 25907304 authored by Asad Kamal's avatar Asad Kamal Committed by Alex Deucher
Browse files

drm/amd/pm: Fetch fru product info for smu_v13_0_12 



Fetch fru product info for smu_v13_0_12 from static metrics table

v2: Field by field copy for fru info(Lijo)

Signed-off-by: default avatarAsad Kamal <asad.kamal@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 95eebc05

drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c

+9 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 


#define FRU_EEPROM_MADDR_6      0x60000

#define FRU_EEPROM_MADDR_8      0x80000

#define FRU_EEPROM_MADDR_INV    0xFFFFF



static bool is_fru_eeprom_supported(struct amdgpu_device *adev, u32 *fru_addr)

{
@@ -104,6 +105,10 @@ static bool is_fru_eeprom_supported(struct amdgpu_device *adev, u32 *fru_addr) 
			if (fru_addr)

				*fru_addr = FRU_EEPROM_MADDR_8;

			return true;

	case IP_VERSION(13, 0, 12):

			if (fru_addr)

				*fru_addr = FRU_EEPROM_MADDR_INV;

			return true;

	default:

		return false;

	}
@@ -120,6 +125,10 @@ int amdgpu_fru_get_product_info(struct amdgpu_device *adev) 
	if (!is_fru_eeprom_supported(adev, &fru_addr))

		return 0;



	/* FRU data avaialble, but no direct EEPROM access */

	if (fru_addr == FRU_EEPROM_MADDR_INV)

		return 0;



	if (!adev->fru_info) {

		adev->fru_info = kzalloc(sizeof(*adev->fru_info), GFP_KERNEL);

		if (!adev->fru_info)

drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c

+31 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include "smu_v13_0_12_ppsmc.h"

#include "smu_v13_0.h"

#include "amdgpu_xgmi.h"

#include "amdgpu_fru_eeprom.h"

#include <linux/pci.h>

#include "smu_cmn.h"
@@ -145,6 +146,33 @@ static int smu_v13_0_12_get_enabled_mask(struct smu_context *smu, 
	return ret;

}



static int smu_v13_0_12_fru_get_product_info(struct smu_context *smu,

					     StaticMetricsTable_t *static_metrics)

{

	struct amdgpu_fru_info *fru_info;

	struct amdgpu_device *adev = smu->adev;



	if (!adev->fru_info) {

		adev->fru_info = kzalloc(sizeof(*adev->fru_info), GFP_KERNEL);

		if (!adev->fru_info)

			return -ENOMEM;

	}



	fru_info = adev->fru_info;

	strscpy(fru_info->product_number, static_metrics->ProductInfo.ModelNumber,

		sizeof(fru_info->product_number));

	strscpy(fru_info->product_name, static_metrics->ProductInfo.Name,

		sizeof(fru_info->product_name));

	strscpy(fru_info->serial, static_metrics->ProductInfo.Serial,

		sizeof(fru_info->serial));

	strscpy(fru_info->manufacturer_name, static_metrics->ProductInfo.ManufacturerName,

		sizeof(fru_info->manufacturer_name));

	strscpy(fru_info->fru_id, static_metrics->ProductInfo.FruId,

		sizeof(fru_info->fru_id));



	return 0;

}



int smu_v13_0_12_get_max_metrics_size(void)

{

	return sizeof(StaticMetricsTable_t);
@@ -208,6 +236,9 @@ int smu_v13_0_12_setup_driver_pptable(struct smu_context *smu) 
		/* use AID0 serial number by default */

		pptable->PublicSerialNumber_AID =

			static_metrics->PublicSerialNumber_AID[0];

		ret = smu_v13_0_12_fru_get_product_info(smu, static_metrics);

		if (ret)

			return ret;



		pptable->Init = true;

	}