Yeah that would make things a little clearer, and make it easier to change
going forward. Thanks!
Kent
> -----Original Message-----
> From: Chen, Guchun <guchun.c...@amd.com>
> Sent: Monday, December 13, 2021 10:33 PM
> To: Russell, Kent <kent.russ...@amd.com>; amd-gfx@lists.freedesktop.org
> Cc: Russell, Kent <kent.russ...@amd.com>
> Subject: RE: [PATCH 1/4] drm/amdgpu: Increase potential product_name to 64
> characters
>
> [Public]
>
> How about set a define like PRODUCT_NAME_LEN to be 64, and use it in FRU
> code? In this
> case, if it needs to bump string length of product name later on, it will be
> simple.
>
> #define PRODUCT_NAME_LEN 64
>
> unsigned char buff[PRODUCT_NAME_LEN + 2];
>
> Regards,
> Guchun
>
> -----Original Message-----
> From: amd-gfx <amd-gfx-boun...@lists.freedesktop.org> On Behalf Of Kent
> Russell
> Sent: Tuesday, December 14, 2021 3:34 AM
> To: amd-gfx@lists.freedesktop.org
> Cc: Russell, Kent <kent.russ...@amd.com>
> Subject: [PATCH 1/4] drm/amdgpu: Increase potential product_name to 64
> characters
>
> Having seen at least 1 42-character product_name, bump the number up to 64.
>
> Signed-off-by: Kent Russell <kent.russ...@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 8 ++++----
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> index e701dedce344..1afb3066f6dd 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> @@ -1083,7 +1083,7 @@ struct amdgpu_device {
>
> /* Chip product information */
> char product_number[16];
> - char product_name[32];
> + char product_name[64];
> char serial[20];
>
> atomic_t throttling_logging_enabled;
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c
> index 7709caeb233d..b3b951fe0861 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c
> @@ -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[66];
> u32 addrptr;
> int size, len;
>
> @@ -131,11 +131,11 @@ 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
> + /* Product name should logically be < 64 characters. Any more,
> + * and something could be wrong. Cap it at 64 to be safe
> */
> if (len >= sizeof(adev->product_name)) {
> - DRM_WARN("FRU Product Number is larger than 32 characters. This
> is likely
> a mistake");
> + DRM_WARN("FRU Product Name is larger than 64 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 */
> --
> 2.25.1
