drm/amdkfd: fix the missed asic name while inited renoir_device_info

Submitted by Huang, Ray on Sept. 10, 2019, 11:17 a.m.

Details

Message ID 1568114232-28889-1-git-send-email-ray.huang@amd.com
State Accepted
Commit acb9acbefef234bd0904e298b4c93732e1a8d6f4
Headers show
Series "drm/amdkfd: fix the missed asic name while inited renoir_device_info" ( rev: 1 ) in AMD X.Org drivers

Not browsing as part of any series.

Commit Message

Huang, Ray Sept. 10, 2019, 11:17 a.m.
This patch fixes null pointer issue below, I missed to init the asic renior name
while I rebase the patches.

[  106.004250] BUG: kernel NULL pointer dereference, address: 0000000000000000
[  106.004254] #PF: supervisor read access in kernel mode
[  106.004256] #PF: error_code(0x0000) - not-present page
[  106.004257] PGD 0 P4D 0
[  106.004261] Oops: 0000 [#1] SMP NOPTI
[  106.004264] CPU: 3 PID: 1422 Comm: modprobe Not tainted 5.2.0-rc1-custom #1
[  106.004266] Hardware name: AMD Celadon-RN/Celadon-RN, BIOS
WCD9814N_Weekly_19_08_1 08/14/2019
[  106.004272] RIP: 0010:strncpy+0x12/0x30
[  106.004274] Code: c1 c0 11 48 c1 c6 15 48 31 d0 48 c1 c2 20 31 c2 89 d0 31 f0
41 5c 5d c3 55 48 85 d2 48 89 f8 48 89 e5 74 1e 48 01 fa 48 89 f9 <44> 0f b6 06
41 80 f8 01 44 88 01 48 83 de ff 48 83 c1 01 48 39 d1
[  106.004278] RSP: 0018:ffffc092c1fd37a8 EFLAGS: 00010286
[  106.004281] RAX: ffff9e943466a28c RBX: 00000000000036ed RCX: ffff9e943466a28c
[  106.004283] RDX: ffff9e943466a2ac RSI: 0000000000000000 RDI: ffff9e943466a28c
[  106.004285] RBP: ffffc092c1fd37a8 R08: ffff9e943d100000 R09: 0000000000000228
[  106.004287] R10: ffff9e94418dc5a8 R11: ffff9e944746c0d0 R12: 0000000000000000
[  106.004289] R13: ffff9e943fa1ec00 R14: ffff9e943466a200 R15: ffff9e943466a200
[  106.004291] FS:  00007f7a022c5540(0000) GS:ffff9e9447ac0000(0000)
knlGS:0000000000000000
[  106.004294] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[  106.004296] CR2: 0000000000000000 CR3: 00000001ff0b0000 CR4: 0000000000340ee0
[  106.004298] Call Trace:
[  106.004382]  kfd_topology_add_device+0x150/0x610 [amdgpu]
[  106.004445]  kgd2kfd_device_init+0x2e0/0x4f0 [amdgpu]
[  106.004509]  amdgpu_amdkfd_device_init+0x14c/0x1b0 [amdgpu]

Signed-off-by: Huang Rui <ray.huang@amd.com>
---
 drivers/gpu/drm/amd/amdkfd/kfd_device.c | 1 +
 1 file changed, 1 insertion(+)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
index a2fe0cb..f329b82 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
@@ -353,6 +353,7 @@  static const struct kfd_device_info arcturus_device_info = {
 
 static const struct kfd_device_info renoir_device_info = {
 	.asic_family = CHIP_RENOIR,
+	.asic_name = "renoir",
 	.max_pasid_bits = 16,
 	.max_no_of_hqd  = 24,
 	.doorbell_size  = 8,

Comments

Reviewed & Tested-by: Aaron Liu <aaron.liu@amd.com>

BR,
Aaron Liu

> -----Original Message-----
> From: Huang, Ray <Ray.Huang@amd.com>
> Sent: Tuesday, September 10, 2019 7:17 PM
> To: amd-gfx@lists.freedesktop.org
> Cc: Kuehling, Felix <Felix.Kuehling@amd.com>; Liu, Aaron
> <Aaron.Liu@amd.com>; Huang, Ray <Ray.Huang@amd.com>
> Subject: [PATCH] drm/amdkfd: fix the missed asic name while inited
> renoir_device_info
> 
> This patch fixes null pointer issue below, I missed to init the asic renior name
> while I rebase the patches.
> 
> [  106.004250] BUG: kernel NULL pointer dereference, address:
> 0000000000000000 [  106.004254] #PF: supervisor read access in kernel
> mode [  106.004256] #PF: error_code(0x0000) - not-present page
> [  106.004257] PGD 0 P4D 0 [  106.004261] Oops: 0000 [#1] SMP NOPTI
> [  106.004264] CPU: 3 PID: 1422 Comm: modprobe Not tainted 5.2.0-rc1-
> custom #1 [  106.004266] Hardware name: AMD Celadon-RN/Celadon-RN,
> BIOS
> WCD9814N_Weekly_19_08_1 08/14/2019
> [  106.004272] RIP: 0010:strncpy+0x12/0x30 [  106.004274] Code: c1 c0 11
> 48 c1 c6 15 48 31 d0 48 c1 c2 20 31 c2 89 d0 31 f0
> 41 5c 5d c3 55 48 85 d2 48 89 f8 48 89 e5 74 1e 48 01 fa 48 89 f9 <44> 0f b6
> 06
> 41 80 f8 01 44 88 01 48 83 de ff 48 83 c1 01 48 39 d1 [  106.004278] RSP:
> 0018:ffffc092c1fd37a8 EFLAGS: 00010286 [  106.004281] RAX:
> ffff9e943466a28c RBX: 00000000000036ed RCX: ffff9e943466a28c
> [  106.004283] RDX: ffff9e943466a2ac RSI: 0000000000000000 RDI:
> ffff9e943466a28c [  106.004285] RBP: ffffc092c1fd37a8 R08:
> ffff9e943d100000 R09: 0000000000000228 [  106.004287] R10:
> ffff9e94418dc5a8 R11: ffff9e944746c0d0 R12: 0000000000000000
> [  106.004289] R13: ffff9e943fa1ec00 R14: ffff9e943466a200 R15:
> ffff9e943466a200 [  106.004291] FS:  00007f7a022c5540(0000)
> GS:ffff9e9447ac0000(0000)
> knlGS:0000000000000000
> [  106.004294] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
> [  106.004296] CR2: 0000000000000000 CR3: 00000001ff0b0000 CR4:
> 0000000000340ee0 [  106.004298] Call Trace:
> [  106.004382]  kfd_topology_add_device+0x150/0x610 [amdgpu]
> [  106.004445]  kgd2kfd_device_init+0x2e0/0x4f0 [amdgpu] [  106.004509]
> amdgpu_amdkfd_device_init+0x14c/0x1b0 [amdgpu]
> 
> Signed-off-by: Huang Rui <ray.huang@amd.com>
> ---
>  drivers/gpu/drm/amd/amdkfd/kfd_device.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> index a2fe0cb..f329b82 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> @@ -353,6 +353,7 @@ static const struct kfd_device_info
> arcturus_device_info = {
> 
>  static const struct kfd_device_info renoir_device_info = {
>  	.asic_family = CHIP_RENOIR,
> +	.asic_name = "renoir",
>  	.max_pasid_bits = 16,
>  	.max_no_of_hqd  = 24,
>  	.doorbell_size  = 8,
> --
> 2.7.4