drm/i915/guc: Support for extended GuC notification messages

GuC may send notification messages with payload larger than
single u32. Prepare driver to accept longer messages.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Vinay Belgaumkar <vinay.belgaumkar@intel.com>
Cc: Michal Winiarski <michal.winiarski@intel.com>
Cc: Tomasz Lis <tomasz.lis@intel.com>
Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190321120004.53012-1-michal.wajdeczko@intel.com

diff --git a/drivers/gpu/drm/i915/intel_guc.c b/drivers/gpu/drm/i915/intel_guc.c
index a59448a56f55ea08a0657165655c012bc6cd1784..f2b4eaee8d526274ca2e33ff76ce8cb78d222a56 100644 (file)
--- a/drivers/gpu/drm/i915/intel_guc.c
+++ b/drivers/gpu/drm/i915/intel_guc.c
@@ -484,17 +484,25 @@ void intel_guc_to_host_event_handler_mmio(struct intel_guc *guc)
        spin_unlock(&guc->irq_lock);
        enable_rpm_wakeref_asserts(dev_priv);
 
-       intel_guc_to_host_process_recv_msg(guc, msg);
+       intel_guc_to_host_process_recv_msg(guc, &msg, 1);
 }
 
-void intel_guc_to_host_process_recv_msg(struct intel_guc *guc, u32 msg)
+int intel_guc_to_host_process_recv_msg(struct intel_guc *guc,
+                                      const u32 *payload, u32 len)
 {
+       u32 msg;
+
+       if (unlikely(!len))
+               return -EPROTO;
+
        /* Make sure to handle only enabled messages */
-       msg &= guc->msg_enabled_mask;
+       msg = payload[0] & guc->msg_enabled_mask;
 
        if (msg & (INTEL_GUC_RECV_MSG_FLUSH_LOG_BUFFER |
                   INTEL_GUC_RECV_MSG_CRASH_DUMP_POSTED))
                intel_guc_log_handle_flush_event(&guc->log);
+
+       return 0;
 }
 
 int intel_guc_sample_forcewake(struct intel_guc *guc)

diff --git a/drivers/gpu/drm/i915/intel_guc.h b/drivers/gpu/drm/i915/intel_guc.h
index 77ec1bd4df5ab504e11fdb4e51d57c5e9cdf9bcb..2c59ff8d9f39d041eaca80d07db734e910dd52da 100644 (file)
--- a/drivers/gpu/drm/i915/intel_guc.h
+++ b/drivers/gpu/drm/i915/intel_guc.h
@@ -165,7 +165,8 @@ int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len,
 void intel_guc_to_host_event_handler(struct intel_guc *guc);
 void intel_guc_to_host_event_handler_nop(struct intel_guc *guc);
 void intel_guc_to_host_event_handler_mmio(struct intel_guc *guc);
-void intel_guc_to_host_process_recv_msg(struct intel_guc *guc, u32 msg);
+int intel_guc_to_host_process_recv_msg(struct intel_guc *guc,
+                                      const u32 *payload, u32 len);
 int intel_guc_sample_forcewake(struct intel_guc *guc);
 int intel_guc_auth_huc(struct intel_guc *guc, u32 rsa_offset);
 int intel_guc_suspend(struct intel_guc *guc);

diff --git a/drivers/gpu/drm/i915/intel_guc_ct.c b/drivers/gpu/drm/i915/intel_guc_ct.c
index 79ddb80883116a66e51aec5686f4c9690776c5a1..dde1dc0d6e69d7bc87a96962d429e8c9ff49334d 100644 (file)
--- a/drivers/gpu/drm/i915/intel_guc_ct.c
+++ b/drivers/gpu/drm/i915/intel_guc_ct.c
@@ -701,14 +701,15 @@ static void ct_process_request(struct intel_guc_ct *ct,
                               u32 action, u32 len, const u32 *payload)
 {
        struct intel_guc *guc = ct_to_guc(ct);
+       int ret;
 
        CT_DEBUG_DRIVER("CT: request %x %*ph\n", action, 4 * len, payload);
 
        switch (action) {
        case INTEL_GUC_ACTION_DEFAULT:
-               if (unlikely(len < 1))
+               ret = intel_guc_to_host_process_recv_msg(guc, payload, len);
+               if (unlikely(ret))
                        goto fail_unexpected;
-               intel_guc_to_host_process_recv_msg(guc, *payload);
                break;
 
        default: