Commit 6c92fe5f authored by Kent Russell's avatar Kent Russell Committed by Alex Deucher
Browse files

drm/amdgpu: Increase potential product_name to 64 characters 



Having seen at least 1 42-character product_name, bump the number up to
64, and put that definition into amdgpu.h to make future adjustments
simpler.

Signed-off-by: default avatarKent Russell <kent.russell@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent fd5256cb

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+2 −1
Original line number Diff line number Diff line
@@ -813,6 +813,7 @@ struct amd_powerplay { 


#define AMDGPU_RESET_MAGIC_NUM 64

#define AMDGPU_MAX_DF_PERFMONS 4

#define AMDGPU_PRODUCT_NAME_LEN 64

struct amdgpu_device {

	struct device			*dev;

	struct pci_dev			*pdev;
@@ -1083,7 +1084,7 @@ struct amdgpu_device { 


	/* Chip product information */

	char				product_number[16];

	char				product_name[32];

	char				product_name[AMDGPU_PRODUCT_NAME_LEN];

	char				serial[20];



	atomic_t			throttling_logging_enabled;

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

+5 −7
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ static int amdgpu_fru_read_eeprom(struct amdgpu_device *adev, uint32_t addrptr, 


int amdgpu_fru_get_product_info(struct amdgpu_device *adev)

{

	unsigned char buff[34];

	unsigned char buff[AMDGPU_PRODUCT_NAME_LEN+2];

	u32 addrptr;

	int size, len;
@@ -131,12 +131,10 @@ int amdgpu_fru_get_product_info(struct amdgpu_device *adev) 
	}



	len = size;

	/* Product name should only be 32 characters. Any more,

	 * and something could be wrong. Cap it at 32 to be safe

	 */

	if (len >= sizeof(adev->product_name)) {

		DRM_WARN("FRU Product Number is larger than 32 characters. This is likely a mistake");

		len = sizeof(adev->product_name) - 1;

	if (len >= AMDGPU_PRODUCT_NAME_LEN) {

		DRM_WARN("FRU Product Name is larger than %d characters. This is likely a mistake",

				AMDGPU_PRODUCT_NAME_LEN);

		len = AMDGPU_PRODUCT_NAME_LEN - 1;

	}

	/* Start at 2 due to buff using fields 0 and 1 for the address */

	memcpy(adev->product_name, &buff[2], len);