iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/amdgpu: Increase potential product_name to 64 characters

Browse Source 
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: Kent Russell <kent.russell@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Kent Russell 2021-12-13 13:14:17 -05:00 committed by Alex Deucher
parent fd5256cbe1
commit 6c92fe5fa5
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/amd/amdgpu/amdgpu.h
View File

@ -813,6 +813,7 @@ struct amd_powerplay {
#define AMDGPU_RESET_MAGIC_NUM 64 #define AMDGPU_RESET_MAGIC_NUM 64
#define AMDGPU_MAX_DF_PERFMONS 4 #define AMDGPU_MAX_DF_PERFMONS 4
#define AMDGPU_PRODUCT_NAME_LEN 64
struct amdgpu_device { struct amdgpu_device {
struct device *dev; struct device *dev;
struct pci_dev *pdev; struct pci_dev *pdev;
@ -1083,7 +1084,7 @@ struct amdgpu_device {
/* Chip product information */ /* Chip product information */
char product_number[16]; char product_number[16];
char product_name[32]; char product_name[AMDGPU_PRODUCT_NAME_LEN];
char serial[20]; char serial[20];
atomic_t throttling_logging_enabled; atomic_t throttling_logging_enabled;

12
drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c
View File

@ -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) int amdgpu_fru_get_product_info(struct amdgpu_device *adev)
{ {
unsigned char buff[34]; unsigned char buff[AMDGPU_PRODUCT_NAME_LEN+2];
u32 addrptr; u32 addrptr;
int size, len; int size, len;
@ -131,12 +131,10 @@ int amdgpu_fru_get_product_info(struct amdgpu_device *adev)
} }
len = size; len = size;
/* Product name should only be 32 characters. Any more, if (len >= AMDGPU_PRODUCT_NAME_LEN) {
* and something could be wrong. Cap it at 32 to be safe DRM_WARN("FRU Product Name is larger than %d characters. This is likely a mistake",
*/ AMDGPU_PRODUCT_NAME_LEN);
if (len >= sizeof(adev->product_name)) { len = AMDGPU_PRODUCT_NAME_LEN - 1;
DRM_WARN("FRU Product Number is larger than 32 characters. This is likely a mistake");
len = sizeof(adev->product_name) - 1;
} }
/* Start at 2 due to buff using fields 0 and 1 for the address */ /* Start at 2 due to buff using fields 0 and 1 for the address */
memcpy(adev->product_name, &buff[2], len); memcpy(adev->product_name, &buff[2], len);