@@ -691,19 +691,8 @@ intel_engine_init_active(struct intel_engine_cs *engine, unsigned int subclass)
INIT_LIST_HEAD(&engine->active.hold);
spin_lock_init(&engine->active.lock);
- lockdep_set_subclass(&engine->active.lock, subclass);
-
- /*
- * Due to an interesting quirk in lockdep's internal debug tracking,
- * after setting a subclass we must ensure the lock is used. Otherwise,
- * nr_unused_locks is incremented once too often.
- */
-#ifdef CONFIG_DEBUG_LOCK_ALLOC
- local_irq_disable();
- lock_map_acquire(&engine->active.lock.dep_map);
- lock_map_release(&engine->active.lock.dep_map);
- local_irq_enable();
-#endif
+ lockdep_set_subclass_and_mark_as_used(&engine->active.lock, subclass,
+ true);
}
static struct intel_context *
@@ -519,7 +519,7 @@ int intel_guc_sample_forcewake(struct intel_guc *guc)
int intel_guc_auth_huc(struct intel_guc *guc, u32 rsa_offset)
{
u32 action[] = {
- INTEL_GUC_ACTION_AUTHENTICATE_HUC,
+ INTEL_GUC_ACTION_AUTHENTICATE_HUC | GUC_SEND_FLAG_NO_RESPONSE,
rsa_offset
};
@@ -41,10 +41,19 @@ static void ct_incoming_request_worker_func(struct work_struct *w);
*/
void intel_guc_ct_init_early(struct intel_guc_ct *ct)
{
+ int i;
+
spin_lock_init(&ct->requests.lock);
INIT_LIST_HEAD(&ct->requests.pending);
INIT_LIST_HEAD(&ct->requests.incoming);
INIT_WORK(&ct->requests.worker, ct_incoming_request_worker_func);
+ for (i = 0; i < ARRAY_SIZE(ct->ctbs); i++) {
+ spin_lock_init(&ct->ctbs[i].lock);
+
+ /* CTB_RECV lock will be used with irq disabled */
+ lockdep_set_subclass_and_mark_as_used(&ct->ctbs[i].lock, i,
+ i == CTB_RECV);
+ }
}
static inline struct intel_guc *ct_to_guc(struct intel_guc_ct *ct)
@@ -88,13 +97,6 @@ static void guc_ct_buffer_desc_init(struct guc_ct_buffer_desc *desc,
desc->owner = CTB_OWNER_HOST;
}
-static void guc_ct_buffer_desc_reset(struct guc_ct_buffer_desc *desc)
-{
- desc->head = 0;
- desc->tail = 0;
- desc->is_in_error = 0;
-}
-
static int guc_action_register_ct_buffer(struct intel_guc *guc,
u32 desc_addr,
u32 type)
@@ -317,6 +319,7 @@ static int ct_write(struct intel_guc_ct *ct,
{
struct intel_guc_ct_buffer *ctb = &ct->ctbs[CTB_SEND];
struct guc_ct_buffer_desc *desc = ctb->desc;
+ u32 action_code = action[0] & GUC_CT_MSG_ACTION_MASK;
u32 head = desc->head;
u32 tail = desc->tail;
u32 size = desc->size;
@@ -325,6 +328,8 @@ static int ct_write(struct intel_guc_ct *ct,
u32 *cmds = ctb->cmds;
unsigned int i;
+ lockdep_assert_held(&ctb->lock);
+
if (unlikely(desc->is_in_error))
return -EPIPE;
@@ -359,7 +364,7 @@ static int ct_write(struct intel_guc_ct *ct,
header = (len << GUC_CT_MSG_LEN_SHIFT) |
(GUC_CT_MSG_WRITE_FENCE_TO_DESC) |
(want_response ? GUC_CT_MSG_SEND_STATUS : 0) |
- (action[0] << GUC_CT_MSG_ACTION_SHIFT);
+ (action_code << GUC_CT_MSG_ACTION_SHIFT);
CT_DEBUG(ct, "writing %*ph %*ph %*ph\n",
4, &header, 4, &fence, 4 * (len - 1), &action[1]);
@@ -387,62 +392,11 @@ static int ct_write(struct intel_guc_ct *ct,
return -EPIPE;
}
-/**
- * wait_for_ctb_desc_update - Wait for the CT buffer descriptor update.
- * @desc: buffer descriptor
- * @fence: response fence
- * @status: placeholder for status
- *
- * Guc will update CT buffer descriptor with new fence and status
- * after processing the command identified by the fence. Wait for
- * specified fence and then read from the descriptor status of the
- * command.
- *
- * Return:
- * * 0 response received (status is valid)
- * * -ETIMEDOUT no response within hardcoded timeout
- * * -EPROTO no response, CT buffer is in error
- */
-static int wait_for_ctb_desc_update(struct guc_ct_buffer_desc *desc,
- u32 fence,
- u32 *status)
-{
- int err;
-
- /*
- * Fast commands should complete in less than 10us, so sample quickly
- * up to that length of time, then switch to a slower sleep-wait loop.
- * No GuC command should ever take longer than 10ms.
- */
-#define done (READ_ONCE(desc->fence) == fence)
- err = wait_for_us(done, 10);
- if (err)
- err = wait_for(done, 10);
-#undef done
-
- if (unlikely(err)) {
- DRM_ERROR("CT: fence %u failed; reported fence=%u\n",
- fence, desc->fence);
-
- if (WARN_ON(desc->is_in_error)) {
- /* Something went wrong with the messaging, try to reset
- * the buffer and hope for the best
- */
- guc_ct_buffer_desc_reset(desc);
- err = -EPROTO;
- }
- }
-
- *status = desc->status;
- return err;
-}
-
/**
* wait_for_ct_request_update - Wait for CT request state update.
* @req: pointer to pending request
- * @status: placeholder for status
*
- * For each sent request, Guc shall send bac CT response message.
+ * For each sent request, Guc shall send back CT response message.
* Our message handler will update status of tracked request once
* response message with given fence is received. Wait here and
* check for valid response status value.
@@ -451,7 +405,7 @@ static int wait_for_ctb_desc_update(struct guc_ct_buffer_desc *desc,
* * 0 response received (status is valid)
* * -ETIMEDOUT no response within hardcoded timeout
*/
-static int wait_for_ct_request_update(struct ct_request *req, u32 *status)
+static int wait_for_ct_request_update(struct ct_request *req)
{
int err;
@@ -466,10 +420,6 @@ static int wait_for_ct_request_update(struct ct_request *req, u32 *status)
err = wait_for(done, 10);
#undef done
- if (unlikely(err))
- DRM_ERROR("CT: fence %u err %d\n", req->fence, err);
-
- *status = req->status;
return err;
}
@@ -477,14 +427,11 @@ static int ct_send(struct intel_guc_ct *ct,
const u32 *action,
u32 len,
u32 *response_buf,
- u32 response_buf_size,
- u32 *status)
+ u32 response_buf_size)
{
struct intel_guc_ct_buffer *ctb = &ct->ctbs[CTB_SEND];
- struct guc_ct_buffer_desc *desc = ctb->desc;
struct ct_request request;
unsigned long flags;
- u32 fence;
int err;
GEM_BUG_ON(!ct->enabled);
@@ -492,8 +439,8 @@ static int ct_send(struct intel_guc_ct *ct,
GEM_BUG_ON(len & ~GUC_CT_MSG_LEN_MASK);
GEM_BUG_ON(!response_buf && response_buf_size);
- fence = ct_get_next_fence(ct);
- request.fence = fence;
+ spin_lock(&ctb->lock);
+ request.fence = ct_get_next_fence(ct);
request.status = 0;
request.response_len = response_buf_size;
request.response_buf = response_buf;
@@ -502,21 +449,22 @@ static int ct_send(struct intel_guc_ct *ct,
list_add_tail(&request.link, &ct->requests.pending);
spin_unlock_irqrestore(&ct->requests.lock, flags);
- err = ct_write(ct, action, len, fence, !!response_buf);
+ err = ct_write(ct, action, len, request.fence, true);
+ spin_unlock(&ctb->lock);
+
if (unlikely(err))
goto unlink;
intel_guc_notify(ct_to_guc(ct));
- if (response_buf)
- err = wait_for_ct_request_update(&request, status);
- else
- err = wait_for_ctb_desc_update(desc, fence, status);
+ err = wait_for_ct_request_update(&request);
if (unlikely(err))
goto unlink;
- if (!INTEL_GUC_MSG_IS_RESPONSE_SUCCESS(*status)) {
- err = -EIO;
+ if (!INTEL_GUC_MSG_IS_RESPONSE_SUCCESS(request.status)) {
+ CT_ERROR(ct, "Error response: action=%#x fence=%u status=%#x\n",
+ action[0], request.fence, request.status);
+ err = -ENXIO;
goto unlink;
}
@@ -529,7 +477,7 @@ static int ct_send(struct intel_guc_ct *ct,
/* There shall be no response payload */
WARN_ON(request.response_len);
/* Return data decoded from the status dword */
- err = INTEL_GUC_MSG_TO_DATA(*status);
+ err = INTEL_GUC_MSG_TO_DATA(request.status);
}
unlink:
@@ -540,14 +488,32 @@ static int ct_send(struct intel_guc_ct *ct,
return err;
}
+static int ct_send_no_response(struct intel_guc_ct *ct,
+ const u32 *action, u32 len)
+{
+ struct intel_guc_ct_buffer *ctb = &ct->ctbs[CTB_SEND];
+ int err;
+
+ GEM_BUG_ON(!ct->enabled);
+ GEM_BUG_ON(!len);
+ GEM_BUG_ON(len & ~GUC_CT_MSG_LEN_MASK);
+
+ spin_lock(&ctb->lock);
+ err = ct_write(ct, action, len, ct_get_next_fence(ct), false);
+ spin_unlock(&ctb->lock);
+
+ if (likely(!err))
+ intel_guc_notify(ct_to_guc(ct));
+
+ return err;
+}
+
/*
* Command Transport (CT) buffer based GuC send function.
*/
int intel_guc_ct_send(struct intel_guc_ct *ct, const u32 *action, u32 len,
u32 *response_buf, u32 response_buf_size)
{
- struct intel_guc *guc = ct_to_guc(ct);
- u32 status = ~0; /* undefined */
int ret;
if (unlikely(!ct->enabled)) {
@@ -555,18 +521,15 @@ int intel_guc_ct_send(struct intel_guc_ct *ct, const u32 *action, u32 len,
return -ENODEV;
}
- mutex_lock(&guc->send_mutex);
+ if (*action & GUC_SEND_FLAG_NO_RESPONSE)
+ ret = ct_send_no_response(ct, action, len);
+ else
+ ret = ct_send(ct, action, len, response_buf, response_buf_size);
- ret = ct_send(ct, action, len, response_buf, response_buf_size, &status);
- if (unlikely(ret < 0)) {
- CT_ERROR(ct, "Sending action %#x failed (err=%d status=%#X)\n",
- action[0], ret, status);
- } else if (unlikely(ret)) {
- CT_DEBUG(ct, "send action %#x returned %d (%#x)\n",
- action[0], ret, ret);
- }
+ if (unlikely(ret < 0))
+ CT_ERROR(ct, "Failed send: action=%#x (err=%d)\n",
+ *action, ret);
- mutex_unlock(&guc->send_mutex);
return ret;
}
@@ -597,6 +560,8 @@ static int ct_read(struct intel_guc_ct *ct, u32 *data)
unsigned int len;
unsigned int i;
+ lockdep_assert_held(&ctb->lock);
+
if (unlikely(desc->is_in_error))
return -EPIPE;
@@ -849,7 +814,9 @@ void intel_guc_ct_event_handler(struct intel_guc_ct *ct)
}
do {
+ spin_lock(&ct->ctbs[CTB_RECV].lock);
err = ct_read(ct, msg);
+ spin_unlock(&ct->ctbs[CTB_RECV].lock);
if (err)
break;
@@ -28,10 +28,12 @@ struct intel_guc;
* holds the commands.
*
* @desc: pointer to the buffer descriptor
+ * @lock: protects access to the descriptor
* @cmds: pointer to the commands buffer
*/
struct intel_guc_ct_buffer {
struct guc_ct_buffer_desc *desc;
+ spinlock_t lock;
u32 *cmds;
};
@@ -70,6 +72,8 @@ static inline bool intel_guc_ct_enabled(struct intel_guc_ct *ct)
return ct->enabled;
}
+#define GUC_SEND_FLAG_NO_RESPONSE 0x80000000
+
int intel_guc_ct_send(struct intel_guc_ct *ct, const u32 *action, u32 len,
u32 *response_buf, u32 response_buf_size);
void intel_guc_ct_event_handler(struct intel_guc_ct *ct);
@@ -443,4 +443,23 @@ static inline bool timer_expired(const struct timer_list *t)
*/
#define IS_ACTIVE(config) ((config) != 0)
+/*
+ * Due to an interesting quirk in lockdep's internal debug tracking,
+ * after setting a subclass we must ensure the lock is used. Otherwise,
+ * nr_unused_locks is incremented once too often and we might be hit by:
+ *
+ * DEBUG_LOCKS_WARN_ON(debug_atomic_read(nr_unused_locks) != nr_unused)
+ *
+ * @irq_off: mark lock subclass as used with irq disabled
+ */
+#define lockdep_set_subclass_and_mark_as_used(lock, sub, irq_off) \
+ do { \
+ lockdep_set_subclass((lock), (sub)); \
+ if (irq_off) \
+ local_irq_disable(); \
+ might_lock((lock)); \
+ if (irq_off) \
+ local_irq_enable(); \
+ } while (0)
+
#endif /* !__I915_UTILS_H */
While we are always using CT "send" buffer to send request messages to GuC, we usually don't ask GuC to use CT "receive" buffer to send back response messages, since almost all returned data can fit into reserved bits in status dword inside CT descriptor. However, relying on data modifications inside CT descriptor requires use of mutex to allow only single CT request in flight, until we read back that status dword from the CT descriptor. But some H2G actions (like AUTHENTICATE_HUC, and more to come) are like one-way requests for which we don't care about immediate status, since we will use a different way to confirm that given action was completed (ie. HUC_STATUS reg is used to verify HuC authentication). If we ask GuC to always send response messages over "receive" buffer for all requests for which we care about their status, then we can use CT descriptor option only for our new one-way requests, for which status can be temporary ignored. Since we only need to protect CT descriptor during reading/writing from the command buffer, we can drop mutex and switch to spinlock. v2: use separate locks, and set subclass (Chris) v3: try to avoid nr_unused_locks WARN (Chris) v4: mark CTB_RECV as used with irq disabled (Chris) reuse helper macro in intel_engine_init_active (Chris) Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> Cc: John Harrison <John.C.Harrison@Intel.com> Cc: Matthew Brost <matthew.brost@intel.com> --- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 15 +-- drivers/gpu/drm/i915/gt/uc/intel_guc.c | 2 +- drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 149 +++++++++------------- drivers/gpu/drm/i915/gt/uc/intel_guc_ct.h | 4 + drivers/gpu/drm/i915/i915_utils.h | 19 +++ 5 files changed, 84 insertions(+), 105 deletions(-)