Re: [Intel-gfx] [PATCH] drm/i915/guc: Support for extended GuC notification messages

2019-03-24 Thread Chris Wilson 
Quoting Daniele Ceraolo Spurio (2019-03-22 23:29:13)
> 
> 
> On 3/21/19 5:00 AM, Michal Wajdeczko wrote:
> > GuC may send notification messages with payload larger than
> > single u32. Prepare driver to accept longer messages.
> > 
> 
> Reviewed-by: Daniele Ceraolo Spurio 
> 
> To give a bit more context, for example the RESET_COMPLETE G2H will 
> provide the engine class in the second dword.

And pushed, thanks for the patch.
-Chris
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH] drm/i915/guc: Support for extended GuC notification messages

2019-03-22 Thread Daniele Ceraolo Spurio 



On 3/21/19 5:00 AM, Michal Wajdeczko wrote:

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



Reviewed-by: Daniele Ceraolo Spurio 

To give a bit more context, for example the RESET_COMPLETE G2H will 
provide the engine class in the second dword.


Daniele


Signed-off-by: Michal Wajdeczko 
Cc: Daniele Ceraolo Spurio 
Cc: Vinay Belgaumkar 
Cc: Michal Winiarski 
Cc: Tomasz Lis 
---
  drivers/gpu/drm/i915/intel_guc.c| 14 +++---
  drivers/gpu/drm/i915/intel_guc.h|  3 ++-
  drivers/gpu/drm/i915/intel_guc_ct.c |  5 +++--
  3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_guc.c b/drivers/gpu/drm/i915/intel_guc.c
index a59448a56f55..f2b4eaee8d52 100644
--- 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 77ec1bd4df5a..2c59ff8d9f39 100644
--- 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 79ddb8088311..dde1dc0d6e69 100644
--- 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:



___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH] drm/i915/guc: Support for extended GuC notification messages

2019-03-21 Thread Michal Wajdeczko 
GuC may send notification messages with payload larger than
single u32. Prepare driver to accept longer messages.

Signed-off-by: Michal Wajdeczko 
Cc: Daniele Ceraolo Spurio 
Cc: Vinay Belgaumkar 
Cc: Michal Winiarski 
Cc: Tomasz Lis 
---
 drivers/gpu/drm/i915/intel_guc.c| 14 +++---
 drivers/gpu/drm/i915/intel_guc.h|  3 ++-
 drivers/gpu/drm/i915/intel_guc_ct.c |  5 +++--
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_guc.c b/drivers/gpu/drm/i915/intel_guc.c
index a59448a56f55..f2b4eaee8d52 100644
--- 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 77ec1bd4df5a..2c59ff8d9f39 100644
--- 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 79ddb8088311..dde1dc0d6e69 100644
--- 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:
-- 
2.19.2

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx