| Message ID | 20170804162712.20468-8-michal.wajdeczko@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 8/4/2017 9:27 AM, Michal Wajdeczko wrote: > From: Oscar Mateo <oscar.mateo@intel.com> > > This function, symmetrical to the send(), will handle Guc2Host message > interrupts (which at the moment still only covers requests to flush > the GuC logs). > > Cc: Michal Wajdeczko <michal.wajdeczko@intel.com> > Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> > Signed-off-by: Oscar Mateo <oscar.mateo@intel.com> > Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com> > --- > drivers/gpu/drm/i915/intel_uc.c | 18 +++++++++++++++++- > drivers/gpu/drm/i915/intel_uc.h | 5 +++++ > 2 files changed, 22 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c > index a091e83..258e0d0 100644 > --- a/drivers/gpu/drm/i915/intel_uc.c > +++ b/drivers/gpu/drm/i915/intel_uc.c > @@ -109,6 +109,7 @@ void intel_uc_init_early(struct drm_i915_private *dev_priv) > > mutex_init(&guc->send_mutex); > guc->send = intel_guc_send_nop; > + guc->recv = intel_guc_receive_nop; > guc->notify = guc_write_irq_trigger; > } > > @@ -315,6 +316,7 @@ static int guc_enable_communication(struct intel_guc *guc) > return intel_guc_enable_ct(guc); > > guc->send = intel_guc_send_mmio; > + guc->recv = intel_guc_receive_mmio; > return 0; > } > > @@ -326,6 +328,7 @@ static void guc_disable_communication(struct intel_guc *guc) > intel_guc_disable_ct(guc); > > guc->send = intel_guc_send_nop; > + guc->recv = intel_guc_receive_nop; > } > > int intel_uc_init_hw(struct drm_i915_private *dev_priv) > @@ -466,6 +469,11 @@ int intel_guc_send_nop(struct intel_guc *guc, const u32 *action, u32 len, > return -ENODEV; > } > > +void intel_guc_receive_nop(struct intel_guc *guc) > +{ > + WARN(1, "Unexpected receive\n"); > +} > + > /* > * This function implements the MMIO based host to GuC interface. > */ > @@ -532,7 +540,10 @@ int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len, > return ret; > } > > -void intel_guc_notification_handler(struct intel_guc *guc) > +/* > + * This function implements the MMIO based GuC to host interface. > + */ > +void intel_guc_receive_mmio(struct intel_guc *guc) > { > struct drm_i915_private *dev_priv = guc_to_i915(guc); > u32 msg, flush; > @@ -565,6 +576,11 @@ void intel_guc_notification_handler(struct intel_guc *guc) > } > } > > +void intel_guc_notification_handler(struct intel_guc *guc) > +{ > + guc->recv(guc); > +} > + > int intel_guc_sample_forcewake(struct intel_guc *guc) > { > struct drm_i915_private *dev_priv = guc_to_i915(guc); > diff --git a/drivers/gpu/drm/i915/intel_uc.h b/drivers/gpu/drm/i915/intel_uc.h > index 4808f47..6f20e66 100644 > --- a/drivers/gpu/drm/i915/intel_uc.h > +++ b/drivers/gpu/drm/i915/intel_uc.h > @@ -208,6 +208,9 @@ struct intel_guc { > /* GuC's FW specific send function */ > int (*send)(struct intel_guc *guc, const u32 *data, u32 len, u32 *resp); > > + /* GuC's FW specific receive function */ > + void (*recv)(struct intel_guc *guc); > + I think you already explained to some of us why returning any error code in recv would be pretty much useless (the error would be useful to whoever send the data). But feel free to say it yourself ;) > /* GuC's FW specific notify function */ > void (*notify)(struct intel_guc *guc); > }; > @@ -230,6 +233,8 @@ void intel_guc_notification_handler(struct intel_guc *guc); > int intel_guc_sample_forcewake(struct intel_guc *guc); > int intel_guc_send_nop(struct intel_guc *guc, const u32 *action, u32 len, u32 *response); > int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len, u32 *response); > +void intel_guc_receive_nop(struct intel_guc *guc); > +void intel_guc_receive_mmio(struct intel_guc *guc); > > static inline int intel_guc_send(struct intel_guc *guc, const u32 *action, u32 len) > { > -- > 2.7.4 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx >
diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c index a091e83..258e0d0 100644 --- a/drivers/gpu/drm/i915/intel_uc.c +++ b/drivers/gpu/drm/i915/intel_uc.c @@ -109,6 +109,7 @@ void intel_uc_init_early(struct drm_i915_private *dev_priv) mutex_init(&guc->send_mutex); guc->send = intel_guc_send_nop; + guc->recv = intel_guc_receive_nop; guc->notify = guc_write_irq_trigger; } @@ -315,6 +316,7 @@ static int guc_enable_communication(struct intel_guc *guc) return intel_guc_enable_ct(guc); guc->send = intel_guc_send_mmio; + guc->recv = intel_guc_receive_mmio; return 0; } @@ -326,6 +328,7 @@ static void guc_disable_communication(struct intel_guc *guc) intel_guc_disable_ct(guc); guc->send = intel_guc_send_nop; + guc->recv = intel_guc_receive_nop; } int intel_uc_init_hw(struct drm_i915_private *dev_priv) @@ -466,6 +469,11 @@ int intel_guc_send_nop(struct intel_guc *guc, const u32 *action, u32 len, return -ENODEV; } +void intel_guc_receive_nop(struct intel_guc *guc) +{ + WARN(1, "Unexpected receive\n"); +} + /* * This function implements the MMIO based host to GuC interface. */ @@ -532,7 +540,10 @@ int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len, return ret; } -void intel_guc_notification_handler(struct intel_guc *guc) +/* + * This function implements the MMIO based GuC to host interface. + */ +void intel_guc_receive_mmio(struct intel_guc *guc) { struct drm_i915_private *dev_priv = guc_to_i915(guc); u32 msg, flush; @@ -565,6 +576,11 @@ void intel_guc_notification_handler(struct intel_guc *guc) } } +void intel_guc_notification_handler(struct intel_guc *guc) +{ + guc->recv(guc); +} + int intel_guc_sample_forcewake(struct intel_guc *guc) { struct drm_i915_private *dev_priv = guc_to_i915(guc); diff --git a/drivers/gpu/drm/i915/intel_uc.h b/drivers/gpu/drm/i915/intel_uc.h index 4808f47..6f20e66 100644 --- a/drivers/gpu/drm/i915/intel_uc.h +++ b/drivers/gpu/drm/i915/intel_uc.h @@ -208,6 +208,9 @@ struct intel_guc { /* GuC's FW specific send function */ int (*send)(struct intel_guc *guc, const u32 *data, u32 len, u32 *resp); + /* GuC's FW specific receive function */ + void (*recv)(struct intel_guc *guc); + /* GuC's FW specific notify function */ void (*notify)(struct intel_guc *guc); }; @@ -230,6 +233,8 @@ void intel_guc_notification_handler(struct intel_guc *guc); int intel_guc_sample_forcewake(struct intel_guc *guc); int intel_guc_send_nop(struct intel_guc *guc, const u32 *action, u32 len, u32 *response); int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len, u32 *response); +void intel_guc_receive_nop(struct intel_guc *guc); +void intel_guc_receive_mmio(struct intel_guc *guc); static inline int intel_guc_send(struct intel_guc *guc, const u32 *action, u32 len) {