Skip to contentSkip to conversation

drm/amdgpu: Re-enable FRU check for most models

PATCH In review Kent Russell 2 participants 3 messages Apr 3, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amdgpu: Re-enable FRU check for most models

There are 2 SKUs that do not have the FRU on there, and trying to read that will cause a hang. For now, check for the gaming SKU until a proper fix can be implemented. This re-enables serial number reporting for server cards

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c +13 -2
index bfe4259f9508..281bdfd4630a 100644
@@ -31,9 +31,20 @@
 
 bool is_fru_eeprom_supported(struct amdgpu_device *adev)
 {
-	/* TODO: Resolve supported ASIC type */
+	struct atom_context *atom_ctx = adev->mode_info.atom_context;
 
-	return false;
+	if (!atom_ctx)
+		return false;
+
+	/* TODO: Gaming SKUs don't have the FRU EEPROM.
+	 * Use this to address hangs on modprobe on gaming SKUs
+	 * until a proper solution can be implemented
+	 */
+	if (strnstr(atom_ctx->vbios_version, "D360",
+			sizeof(atom_ctx->vbios_version)))
+		return false;
+
+	return true;
 }
 
 int amdgpu_fru_read_eeprom(struct amdgpu_device *adev, uint32_t addrptr,
Signature · 6 lines
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#1 lore raw

[AMD Public Use]

Does this need to be protected by a asic_type check as well or is just the vbios version enough? Will we have other asics with D360 in the vbios version?

Alex

________________________________
From: amd-gfx <[email protected]> on behalf of Kent Russell <[email protected]>
Sent: Friday, April 3, 2020 10:43 AM
To: [email protected] <[email protected]>
Cc: Russell, Kent <[email protected]>
Subject: [PATCH] drm/amdgpu: Re-enable FRU check for most models

There are 2 SKUs that do not have the FRU on there, and trying to read that will cause a hang. For now, check for the gaming SKU until a proper fix can be implemented. This re-enables serial number reporting for server cards

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c +13 -2
index bfe4259f9508..281bdfd4630a 100644
@@ -31,9 +31,20 @@
 
 bool is_fru_eeprom_supported(struct amdgpu_device *adev)
 {
-       /* TODO: Resolve supported ASIC type */
+       struct atom_context *atom_ctx = adev->mode_info.atom_context;
 
-       return false;
+       if (!atom_ctx)
+               return false;
+
+       /* TODO: Gaming SKUs don't have the FRU EEPROM.
+        * Use this to address hangs on modprobe on gaming SKUs
+        * until a proper solution can be implemented
+        */
+       if (strnstr(atom_ctx->vbios_version, "D360",
+                       sizeof(atom_ctx->vbios_version)))
+               return false;
+
+       return true;
 }
 
 int amdgpu_fru_read_eeprom(struct amdgpu_device *adev, uint32_t addrptr,

--
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&amp;data=02%7C01%7Calexander.deucher%40amd.com%7C97d3aa4c34464592264508d7d7dd69a0%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637215218317453581&amp;sdata=ABysYVGVyaYWc2HuebwGNdPbOkvC%2Fmmduk4EMROoDfw%3D&amp;reserved=0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#2 lore raw

[AMD Public Use]

There's always the possibility. I'll add it for sanity and sensibility.

Kent

From: Deucher, Alexander <[email protected]>
Sent: Friday, April 3, 2020 11:53 AM
To: Russell, Kent <[email protected]>; [email protected]
Subject: Re: [PATCH] drm/amdgpu: Re-enable FRU check for most models

[AMD Public Use]

Does this need to be protected by a asic_type check as well or is just the vbios version enough? Will we have other asics with D360 in the vbios version?

Alex

________________________________
From: amd-gfx <[email protected]<mailto:[email protected]>> on behalf of Kent Russell <[email protected]<mailto:[email protected]>>
Sent: Friday, April 3, 2020 10:43 AM
To: [email protected]<mailto:[email protected]> <[email protected]<mailto:[email protected]>>
Cc: Russell, Kent <[email protected]<mailto:[email protected]>>
Subject: [PATCH] drm/amdgpu: Re-enable FRU check for most models

There are 2 SKUs that do not have the FRU on there, and trying to read that will cause a hang. For now, check for the gaming SKU until a proper fix can be implemented. This re-enables serial number reporting for server cards

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c +13 -2
index bfe4259f9508..281bdfd4630a 100644
@@ -31,9 +31,20 @@
 
 bool is_fru_eeprom_supported(struct amdgpu_device *adev)
 {
-       /* TODO: Resolve supported ASIC type */
+       struct atom_context *atom_ctx = adev->mode_info.atom_context;
 
-       return false;
+       if (!atom_ctx)
+               return false;
+
+       /* TODO: Gaming SKUs don't have the FRU EEPROM.
+        * Use this to address hangs on modprobe on gaming SKUs
+        * until a proper solution can be implemented
+        */
+       if (strnstr(atom_ctx->vbios_version, "D360",
+                       sizeof(atom_ctx->vbios_version)))
+               return false;
+
+       return true;
 }
 
 int amdgpu_fru_read_eeprom(struct amdgpu_device *adev, uint32_t addrptr,

--
2.17.1

_______________________________________________
amd-gfx mailing list [email protected]<mailto:[email protected]>
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&amp;data=02%7C01%7Calexander.deucher%40amd.com%7C97d3aa4c34464592264508d7d7dd69a0%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637215218317453581&amp;sdata=ABysYVGVyaYWc2HuebwGNdPbOkvC%2Fmmduk4EMROoDfw%3D&amp;reserved=0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx