update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c
..
..
@@ -23,7 +23,8 @@
23
23
 #include "kfd_priv.h"
24
24
 #include "kfd_events.h"
25
25
 #include "soc15_int.h"
26
-
26
+#include "kfd_device_queue_manager.h"
27
+#include "kfd_smi_events.h"
27
28
 
28
29
 static bool event_interrupt_isr_v9(struct kfd_dev *dev,
29
30
 					const uint32_t *ih_ring_entry,
..
..
@@ -37,21 +38,39 @@
37
38
 	vmid = SOC15_VMID_FROM_IH_ENTRY(ih_ring_entry);
38
39
 	if (vmid < dev->vm_info.first_vmid_kfd ||
39
40
 	    vmid > dev->vm_info.last_vmid_kfd)
40
-		return 0;
41
-
42
-	/* If there is no valid PASID, it's likely a firmware bug */
43
-	pasid = SOC15_PASID_FROM_IH_ENTRY(ih_ring_entry);
44
-	if (WARN_ONCE(pasid == 0, "FW bug: No PASID in KFD interrupt"))
45
-		return 0;
41
+		return false;
46
42
 
47
43
 	source_id = SOC15_SOURCE_ID_FROM_IH_ENTRY(ih_ring_entry);
48
44
 	client_id = SOC15_CLIENT_ID_FROM_IH_ENTRY(ih_ring_entry);
45
+	pasid = SOC15_PASID_FROM_IH_ENTRY(ih_ring_entry);
49
46
 
50
-	pr_debug("client id 0x%x, source id %d, pasid 0x%x. raw data:\n",
51
-		 client_id, source_id, pasid);
47
+	/* This is a known issue for gfx9. Under non HWS, pasid is not set
48
+	 * in the interrupt payload, so we need to find out the pasid on our
49
+	 * own.
50
+	 */
51
+	if (!pasid && dev->dqm->sched_policy == KFD_SCHED_POLICY_NO_HWS) {
52
+		const uint32_t pasid_mask = 0xffff;
53
+
54
+		*patched_flag = true;
55
+		memcpy(patched_ihre, ih_ring_entry,
56
+				dev->device_info->ih_ring_entry_size);
57
+
58
+		pasid = dev->dqm->vmid_pasid[vmid];
59
+
60
+		/* Patch the pasid field */
61
+		patched_ihre[3] = cpu_to_le32((le32_to_cpu(patched_ihre[3])
62
+					& ~pasid_mask) | pasid);
63
+	}
64
+
65
+	pr_debug("client id 0x%x, source id %d, vmid %d, pasid 0x%x. raw data:\n",
66
+		 client_id, source_id, vmid, pasid);
52
67
 	pr_debug("%8X, %8X, %8X, %8X, %8X, %8X, %8X, %8X.\n",
53
68
 		 data[0], data[1], data[2], data[3],
54
69
 		 data[4], data[5], data[6], data[7]);
70
+
71
+	/* If there is no valid PASID, it's likely a bug */
72
+	if (WARN_ONCE(pasid == 0, "Bug: No PASID in KFD interrupt"))
73
+		return false;
55
74
 
56
75
 	/* Interrupt types we care about: various signals and faults.
57
76
 	 * They will be forwarded to a work queue (see below).
..
..
@@ -61,6 +80,7 @@
61
80
 		source_id == SOC15_INTSRC_SQ_INTERRUPT_MSG ||
62
81
 		source_id == SOC15_INTSRC_CP_BAD_OPCODE ||
63
82
 		client_id == SOC15_IH_CLIENTID_VMC ||
83
+		client_id == SOC15_IH_CLIENTID_VMC1 ||
64
84
 		client_id == SOC15_IH_CLIENTID_UTCL2;
65
85
 }
66
86
 
..
..
@@ -85,6 +105,7 @@
85
105
 	else if (source_id == SOC15_INTSRC_CP_BAD_OPCODE)
86
106
 		kfd_signal_hw_exception_event(pasid);
87
107
 	else if (client_id == SOC15_IH_CLIENTID_VMC ||
108
+		client_id == SOC15_IH_CLIENTID_VMC1 ||
88
109
 		 client_id == SOC15_IH_CLIENTID_UTCL2) {
89
110
 		struct kfd_vm_fault_info info = {0};
90
111
 		uint16_t ring_id = SOC15_RING_ID_FROM_IH_ENTRY(ih_ring_entry);
..
..
@@ -97,6 +118,7 @@
97
118
 		info.prot_read  = ring_id & 0x10;
98
119
 		info.prot_write = ring_id & 0x20;
99
120
 
121
+		kfd_smi_event_update_vmfault(dev, pasid);
100
122
 		kfd_process_vm_fault(dev->dqm, pasid);
101
123
 		kfd_signal_vm_fault_event(dev, pasid, &info);
102
124
 	}