Skip to contentSkip to conversation

GuC code restructuring and fixes

PATCH In review Sagar Arun Kamble 3 participants 17 messages Sep 15, 2017 – Sep 16, 2017

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover GuC code restructuring and fixes

This series is based on https://patchwork.freedesktop.org/series/30345/.

Sagar Arun Kamble (11):
drm/i915/guc: Pass intel_guc to intel_guc_suspend/resume instead of

    drm_i915_private

drm/i915/guc: Create intel_guc.c for defining GuC specific
functionality
drm/i915/guc: Move guc_send_* functions to intel_guc.c drm/i915/guc: Move guc_sample_forcewake to intel_guc.c drm/i915: Reorganize HuC authentication
drm/i915/guc: Move GuC specific declarations from intel_uc.h to
intel_guc.h
drm/i915/huc: Move HuC specific declarations from intel_uc.h to
intel_huc.h
drm/i915/guc: Fix GuC interaction in reset/suspend scenarios drm/i915/guc: Fix GuC HW/SW state cleanup in unload path drm/i915/guc: Enable default/critical logging in GuC by default from
GuC v9
drm/i915/guc: Remove i915_guc_log_unregister

 drivers/gpu/drm/i915/Makefile              |   1 +
 drivers/gpu/drm/i915/i915_drv.c            |  24 ++-
 drivers/gpu/drm/i915/i915_drv.h            |   3 +
 drivers/gpu/drm/i915/i915_gem.c            |  54 ++++-
 drivers/gpu/drm/i915/i915_guc_submission.c |  53 +----
 drivers/gpu/drm/i915/intel_guc.c           | 336 +++++++++++++++++++++++++++++
 drivers/gpu/drm/i915/intel_guc.h           | 178 +++++++++++++++
 drivers/gpu/drm/i915/intel_guc_ct.c        |   1 +
 drivers/gpu/drm/i915/intel_guc_fwif.h      |   4 +-
 drivers/gpu/drm/i915/intel_guc_log.c       |  26 +--
 drivers/gpu/drm/i915/intel_huc.c           |  22 +-
 drivers/gpu/drm/i915/intel_huc.h           |  39 ++++
 drivers/gpu/drm/i915/intel_uc.c            | 173 +++------------
 drivers/gpu/drm/i915/intel_uc.h            | 156 +-------------
 14 files changed, 679 insertions(+), 391 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/intel_guc.c
 create mode 100644 drivers/gpu/drm/i915/intel_guc.h
 create mode 100644 drivers/gpu/drm/i915/intel_huc.h
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

PATCH 1/11 drm/i915/guc: Pass intel_guc to intel_guc_suspend/resume instead of drm_i915_private

Also put the declaration under the i915_guc_submission section in intel_uc.h.

Cc Michal Wajdeczko <[email protected]>
Cc Michał Winiarski <[email protected]>
---
 drivers/gpu/drm/i915/i915_drv.c            |  6 +++---
 drivers/gpu/drm/i915/i915_gem.c            |  2 +-
 drivers/gpu/drm/i915/i915_guc_submission.c | 10 ++++------
 drivers/gpu/drm/i915/intel_uc.h            |  4 ++--
 4 files changed, 10 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +3 -3
index 5c111ea..dec2850 100644
@@ -1691,7 +1691,7 @@ static int i915_drm_resume(struct drm_device *dev)
 	}
 	mutex_unlock(&dev->struct_mutex);
 
-	intel_guc_resume(dev_priv);
+	intel_guc_resume(&dev_priv->guc);
 
 	intel_modeset_init_hw(dev);
 
@@ -2493,7 +2493,7 @@ static int intel_runtime_suspend(struct device *kdev)
 	 */
 	i915_gem_runtime_suspend(dev_priv);
 
-	intel_guc_suspend(dev_priv);
+	intel_guc_suspend(&dev_priv->guc);
 
 	intel_runtime_pm_disable_interrupts(dev_priv);
 
@@ -2578,7 +2578,7 @@ static int intel_runtime_resume(struct device *kdev)
 	if (intel_uncore_unclaimed_mmio(dev_priv))
 		DRM_DEBUG_DRIVER("Unclaimed access during suspend, bios?\n");
 
-	intel_guc_resume(dev_priv);
+	intel_guc_resume(&dev_priv->guc);
 
 	if (IS_GEN9_LP(dev_priv)) {
 		bxt_disable_dc9(dev_priv);
drivers/gpu/drm/i915/i915_gem.c +1 -1
index f445587..eb20e73 100644
@@ -4575,7 +4575,7 @@ int i915_gem_suspend(struct drm_i915_private *dev_priv)
 	i915_gem_contexts_lost(dev_priv);
 	mutex_unlock(&dev->struct_mutex);
 
-	intel_guc_suspend(dev_priv);
+	intel_guc_suspend(&dev_priv->guc);
 
 	cancel_delayed_work_sync(&dev_priv->gpu_error.hangcheck_work);
 	cancel_delayed_work_sync(&dev_priv->gt.retire_work);
drivers/gpu/drm/i915/i915_guc_submission.c +4 -6
index 3f9d227..9c9d639 100644
@@ -1208,11 +1208,10 @@ void i915_guc_submission_disable(struct drm_i915_private *dev_priv)
 
 /**
  * intel_guc_suspend() - notify GuC entering suspend state
- * @dev_priv:	i915 device private
  */
-int intel_guc_suspend(struct drm_i915_private *dev_priv)
+int intel_guc_suspend(struct intel_guc *guc)
 {
-	struct intel_guc *guc = &dev_priv->guc;
+	struct drm_i915_private *dev_priv = guc_to_i915(guc);
 	struct i915_gem_context *ctx;
 	u32 data[3];
 
@@ -1234,11 +1233,10 @@ int intel_guc_suspend(struct drm_i915_private *dev_priv)
 
 /**
  * intel_guc_resume() - notify GuC resuming from suspend state
- * @dev_priv:	i915 device private
  */
-int intel_guc_resume(struct drm_i915_private *dev_priv)
+int intel_guc_resume(struct intel_guc *guc)
 {
-	struct intel_guc *guc = &dev_priv->guc;
+	struct drm_i915_private *dev_priv = guc_to_i915(guc);
 	struct i915_gem_context *ctx;
 	u32 data[3];
 
drivers/gpu/drm/i915/intel_uc.h +2 -2
index 7703c9a..6ed8ece 100644
@@ -225,8 +225,6 @@ static inline void intel_guc_notify(struct intel_guc *guc)
 /* intel_guc_loader.c */
 int intel_guc_select_fw(struct intel_guc *guc);
 int intel_guc_init_hw(struct intel_guc *guc);
-int intel_guc_suspend(struct drm_i915_private *dev_priv);
-int intel_guc_resume(struct drm_i915_private *dev_priv);
 u32 intel_guc_wopcm_size(struct drm_i915_private *dev_priv);
 
 /* i915_guc_submission.c */
@@ -235,6 +233,8 @@ static inline void intel_guc_notify(struct intel_guc *guc)
 void i915_guc_submission_disable(struct drm_i915_private *dev_priv);
 void i915_guc_submission_fini(struct drm_i915_private *dev_priv);
 struct i915_vma *intel_guc_allocate_vma(struct intel_guc *guc, u32 size);
+int intel_guc_suspend(struct intel_guc *guc);
+int intel_guc_resume(struct intel_guc *guc);
 
 /* intel_guc_log.c */
 int intel_guc_log_create(struct intel_guc *guc);
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw

Re: [PATCH 01/11] drm/i915/guc: Pass intel_guc to intel_guc_suspend/resume instead of drm_i915_private

Quoted 102 lines · Sagar Arun Kamble

Also put the declaration under the i915_guc_submission section in intel_uc.h.

Cc Michal Wajdeczko <[email protected]>
Cc Michał Winiarski <[email protected]>
---
 drivers/gpu/drm/i915/i915_drv.c            |  6 +++---
 drivers/gpu/drm/i915/i915_gem.c            |  2 +-
 drivers/gpu/drm/i915/i915_guc_submission.c | 10 ++++------
 drivers/gpu/drm/i915/intel_uc.h            |  4 ++--
 4 files changed, 10 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +3 -3
index 5c111ea..dec2850 100644
@@ -1691,7 +1691,7 @@ static int i915_drm_resume(struct drm_device *dev)
 	}
 	mutex_unlock(&dev->struct_mutex);
-	intel_guc_resume(dev_priv);
+	intel_guc_resume(&dev_priv->guc);
 	intel_modeset_init_hw(dev);
@@ -2493,7 +2493,7 @@ static int intel_runtime_suspend(struct device  
 *kdev)
 	 */
 	i915_gem_runtime_suspend(dev_priv);
-	intel_guc_suspend(dev_priv);
+	intel_guc_suspend(&dev_priv->guc);
 	intel_runtime_pm_disable_interrupts(dev_priv);
@@ -2578,7 +2578,7 @@ static int intel_runtime_resume(struct device  
 *kdev)
 	if (intel_uncore_unclaimed_mmio(dev_priv))
 		DRM_DEBUG_DRIVER("Unclaimed access during suspend, bios?\n");
-	intel_guc_resume(dev_priv);
+	intel_guc_resume(&dev_priv->guc);
 	if (IS_GEN9_LP(dev_priv)) {
 		bxt_disable_dc9(dev_priv);
drivers/gpu/drm/i915/i915_gem.c +1 -1
index f445587..eb20e73 100644
@@ -4575,7 +4575,7 @@ int i915_gem_suspend(struct drm_i915_private  
 *dev_priv)
 	i915_gem_contexts_lost(dev_priv);
 	mutex_unlock(&dev->struct_mutex);
-	intel_guc_suspend(dev_priv);
+	intel_guc_suspend(&dev_priv->guc);
 	cancel_delayed_work_sync(&dev_priv->gpu_error.hangcheck_work);
 	cancel_delayed_work_sync(&dev_priv->gt.retire_work);
drivers/gpu/drm/i915/i915_guc_submission.c +4 -6
index 3f9d227..9c9d639 100644
@@ -1208,11 +1208,10 @@ void i915_guc_submission_disable(struct  
 drm_i915_private *dev_priv)
 /**
  * intel_guc_suspend() - notify GuC entering suspend state
- * @dev_priv:	i915 device private
  */
-int intel_guc_suspend(struct drm_i915_private *dev_priv)
+int intel_guc_suspend(struct intel_guc *guc)
 {
-	struct intel_guc *guc = &dev_priv->guc;
+	struct drm_i915_private *dev_priv = guc_to_i915(guc);
 	struct i915_gem_context *ctx;
 	u32 data[3];
@@ -1234,11 +1233,10 @@ int intel_guc_suspend(struct drm_i915_private  
 *dev_priv)
 /**
  * intel_guc_resume() - notify GuC resuming from suspend state
- * @dev_priv:	i915 device private
  */
-int intel_guc_resume(struct drm_i915_private *dev_priv)
+int intel_guc_resume(struct intel_guc *guc)
 {
-	struct intel_guc *guc = &dev_priv->guc;
+	struct drm_i915_private *dev_priv = guc_to_i915(guc);
 	struct i915_gem_context *ctx;
 	u32 data[3];
drivers/gpu/drm/i915/intel_uc.h +2 -2
index 7703c9a..6ed8ece 100644
@@ -225,8 +225,6 @@ static inline void intel_guc_notify(struct intel_guc  
 *guc)
 /* intel_guc_loader.c */
 int intel_guc_select_fw(struct intel_guc *guc);
 int intel_guc_init_hw(struct intel_guc *guc);
-int intel_guc_suspend(struct drm_i915_private *dev_priv);
-int intel_guc_resume(struct drm_i915_private *dev_priv);
 u32 intel_guc_wopcm_size(struct drm_i915_private *dev_priv);
 /* i915_guc_submission.c */
@@ -235,6 +233,8 @@ static inline void intel_guc_notify(struct intel_guc  
 *guc)
 void i915_guc_submission_disable(struct drm_i915_private *dev_priv);
 void i915_guc_submission_fini(struct drm_i915_private *dev_priv);
 struct i915_vma *intel_guc_allocate_vma(struct intel_guc *guc, u32  
 size);
+int intel_guc_suspend(struct intel_guc *guc);
+int intel_guc_resume(struct intel_guc *guc);
 /* intel_guc_log.c */
Quoted 1 line

int intel_guc_log_create(struct intel_guc *guc);

Hmm, this patch seems to be fully consumed by other patch "[08/11] Fix GuC interaction in reset/suspend scenarios" Please reorder your patches.

Michal
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw

PATCH 2/11 drm/i915/guc: Create intel_guc.c for defining GuC specific functionality

In reply to Sagar Arun Kamble

Create intel_guc.c and move guc communication init functionality from intel_uc.c. Prepared new initialization function intel_guc_init_early. Moved below functions to intel_guc.c.
1. intel_guc_send_nop
2. gen8_guc_raise_irq
And below functions to intel_guc.h.
1. intel_guc_send
2. intel_guc_notify

Cc Michal Wajdeczko <[email protected]>
Cc Michał Winiarski <[email protected]>
---
 drivers/gpu/drm/i915/Makefile              |  1 +
 drivers/gpu/drm/i915/i915_guc_submission.c |  1 +
 drivers/gpu/drm/i915/intel_guc.c           | 47 ++++++++++++++++++++++++++++++
 drivers/gpu/drm/i915/intel_guc.h           | 43 +++++++++++++++++++++++++++
 drivers/gpu/drm/i915/intel_guc_ct.c        |  1 +
 drivers/gpu/drm/i915/intel_guc_log.c       |  1 +
 drivers/gpu/drm/i915/intel_huc.c           |  1 +
 drivers/gpu/drm/i915/intel_uc.c            | 22 ++------------
 drivers/gpu/drm/i915/intel_uc.h            | 11 -------
 9 files changed, 97 insertions(+), 31 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/intel_guc.c
 create mode 100644 drivers/gpu/drm/i915/intel_guc.h
drivers/gpu/drm/i915/Makefile +1 -0
index 1cb8059..e13fc19 100644
@@ -59,6 +59,7 @@ i915-y += i915_cmd_parser.o \
 
 # general-purpose microcontroller (GuC) support
 i915-y += intel_uc.o \
+	  intel_guc.o \
 	  intel_guc_ct.o \
 	  intel_guc_log.o \
 	  intel_guc_loader.o \
drivers/gpu/drm/i915/i915_guc_submission.c +1 -0
index 9c9d639..8ad1abe 100644
@@ -24,6 +24,7 @@
 #include <linux/circ_buf.h>
 #include "i915_drv.h"
 #include "intel_uc.h"
+#include "intel_guc.h"
 
 #include <trace/events/dma_fence.h>
 
drivers/gpu/drm/i915/intel_guc.c new file +47 -0

47 lines not on this page · raw message

drivers/gpu/drm/i915/intel_guc.h new file +43 -0

43 lines not on this page · raw message

drivers/gpu/drm/i915/intel_guc_ct.c +1 -0
index c4cbec1..87dd12d 100644
@@ -23,6 +23,7 @@
 
 #include "i915_drv.h"
 #include "intel_guc_ct.h"
+#include "intel_guc.h"
 
 enum { CTB_SEND = 0, CTB_RECV = 1 };
 
drivers/gpu/drm/i915/intel_guc_log.c +1 -0
index 16d3b87..5c7e0c2 100644
@@ -24,6 +24,7 @@
 #include <linux/debugfs.h>
 #include <linux/relay.h>
 #include "i915_drv.h"
+#include "intel_guc.h"
 
 static void guc_log_capture_logs(struct intel_guc *guc);
 
drivers/gpu/drm/i915/intel_huc.c +1 -0
index 6145fa0..b81c6af 100644
@@ -24,6 +24,7 @@
 #include <linux/firmware.h>
 #include "i915_drv.h"
 #include "intel_uc.h"
+#include "intel_guc.h"
 
 /**
  * DOC: HuC Firmware
drivers/gpu/drm/i915/intel_uc.c +2 -20
index 0178ba4..9ff5c97 100644
@@ -24,6 +24,7 @@
 
 #include "i915_drv.h"
 #include "intel_uc.h"
+#include "intel_guc.h"
 #include <linux/firmware.h>
 
 /* Cleans up uC firmware by releasing the firmware GEM obj.
@@ -94,22 +95,9 @@ void intel_uc_sanitize_options(struct drm_i915_private *dev_priv)
 		i915.enable_guc_submission = HAS_GUC_SCHED(dev_priv);
 }
 
-static void gen8_guc_raise_irq(struct intel_guc *guc)
-{
-	struct drm_i915_private *dev_priv = guc_to_i915(guc);
-
-	I915_WRITE(GUC_SEND_INTERRUPT, GUC_SEND_TRIGGER);
-}
-
 void intel_uc_init_early(struct drm_i915_private *dev_priv)
 {
-	struct intel_guc *guc = &dev_priv->guc;
-
-	intel_guc_ct_init_early(&guc->ct);
-
-	mutex_init(&guc->send_mutex);
-	guc->send = intel_guc_send_nop;
-	guc->notify = gen8_guc_raise_irq;
+	intel_guc_init_early(&dev_priv->guc);
 }
 
 static void fetch_uc_fw(struct drm_i915_private *dev_priv,
@@ -459,12 +447,6 @@ void intel_uc_fini_hw(struct drm_i915_private *dev_priv)
 	i915_ggtt_disable_guc(dev_priv);
 }
 
-int intel_guc_send_nop(struct intel_guc *guc, const u32 *action, u32 len)
-{
-	WARN(1, "Unexpected send: action=%#x\n", *action);
-	return -ENODEV;
-}
-
 /*
  * This function implements the MMIO based host to GuC interface.
  */
drivers/gpu/drm/i915/intel_uc.h +0 -11
index 6ed8ece..057ef7e 100644
@@ -209,19 +209,8 @@ struct intel_huc {
 int intel_uc_init_hw(struct drm_i915_private *dev_priv);
 void intel_uc_fini_hw(struct drm_i915_private *dev_priv);
 int intel_guc_sample_forcewake(struct intel_guc *guc);
-int intel_guc_send_nop(struct intel_guc *guc, const u32 *action, u32 len);
 int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len);
 
-static inline int intel_guc_send(struct intel_guc *guc, const u32 *action, u32 len)
-{
-	return guc->send(guc, action, len);
-}
-
-static inline void intel_guc_notify(struct intel_guc *guc)
-{
-	guc->notify(guc);
-}
-
 /* intel_guc_loader.c */
 int intel_guc_select_fw(struct intel_guc *guc);
 int intel_guc_init_hw(struct intel_guc *guc);
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#4 lore raw

PATCH 3/11 drm/i915/guc: Move guc_send_* functions to intel_guc.c

In reply to Sagar Arun Kamble

s/guc_init_send_regs/intel_guc_init_send_regs. Calling intel_guc_init_send_regs from intel_uc_init_hw. Moved below functions to intel_guc.c from intel_uc.c
1. guc_send_regs
2. intel_guc_init_send_regs
3. intel_guc_send_mmio

Cc Michal Wajdeczko <[email protected]>
Cc Michał Winiarski <[email protected]>
---
 drivers/gpu/drm/i915/intel_guc.c | 84 ++++++++++++++++++++++++++++++++++++++
 drivers/gpu/drm/i915/intel_guc.h |  2 +
 drivers/gpu/drm/i915/intel_uc.c  | 87 +---------------------------------------
 drivers/gpu/drm/i915/intel_uc.h  |  1 -
 4 files changed, 88 insertions(+), 86 deletions(-)
drivers/gpu/drm/i915/intel_guc.c +84 -0
index 0c62cc2..02b8251 100644
@@ -23,6 +23,7 @@
  */
 
 #include "i915_drv.h"
+#include "intel_guc.h"
 
 int intel_guc_send_nop(struct intel_guc *guc, const u32 *action, u32 len)
 {
@@ -45,3 +46,86 @@ void intel_guc_init_early(struct intel_guc *guc)
 	guc->send = intel_guc_send_nop;
 	guc->notify = gen8_guc_raise_irq;
 }
+
+static inline i915_reg_t guc_send_reg(struct intel_guc *guc, u32 i)
+{
+	GEM_BUG_ON(!guc->send_regs.base);
+	GEM_BUG_ON(!guc->send_regs.count);
+	GEM_BUG_ON(i >= guc->send_regs.count);
+
+	return _MMIO(guc->send_regs.base + 4 * i);
+}
+
+void intel_guc_init_send_regs(struct intel_guc *guc)
+{
+	struct drm_i915_private *dev_priv = guc_to_i915(guc);
+	enum forcewake_domains fw_domains = 0;
+	unsigned int i;
+
+	guc->send_regs.base = i915_mmio_reg_offset(SOFT_SCRATCH(0));
+	guc->send_regs.count = SOFT_SCRATCH_COUNT - 1;
+
+	for (i = 0; i < guc->send_regs.count; i++) {
+		fw_domains |= intel_uncore_forcewake_for_reg(dev_priv,
+					guc_send_reg(guc, i),
+					FW_REG_READ | FW_REG_WRITE);
+	}
+	guc->send_regs.fw_domains = fw_domains;
+}
+
+/*
+ * This function implements the MMIO based host to GuC interface.
+ */
+int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len)
+{
+	struct drm_i915_private *dev_priv = guc_to_i915(guc);
+	u32 status;
+	int i;
+	int ret;
+
+	GEM_BUG_ON(!len);
+	GEM_BUG_ON(len > guc->send_regs.count);
+
+	/* If CT is available, we expect to use MMIO only during init/fini */
+	GEM_BUG_ON(HAS_GUC_CT(dev_priv) &&
+		*action != INTEL_GUC_ACTION_REGISTER_COMMAND_TRANSPORT_BUFFER &&
+		*action != INTEL_GUC_ACTION_DEREGISTER_COMMAND_TRANSPORT_BUFFER);
+
+	mutex_lock(&guc->send_mutex);
+	intel_uncore_forcewake_get(dev_priv, guc->send_regs.fw_domains);
+
+	for (i = 0; i < len; i++)
+		I915_WRITE(guc_send_reg(guc, i), action[i]);
+
+	POSTING_READ(guc_send_reg(guc, i - 1));
+
+	intel_guc_notify(guc);
+
+	/*
+	 * No GuC command should ever take longer than 10ms.
+	 * Fast commands should still complete in 10us.
+	 */
+	ret = __intel_wait_for_register_fw(dev_priv,
+					   guc_send_reg(guc, 0),
+					   INTEL_GUC_RECV_MASK,
+					   INTEL_GUC_RECV_MASK,
+					   10, 10, &status);
+	if (status != INTEL_GUC_STATUS_SUCCESS) {
+		/*
+		 * Either the GuC explicitly returned an error (which
+		 * we convert to -EIO here) or no response at all was
+		 * received within the timeout limit (-ETIMEDOUT)
+		 */
+		if (ret != -ETIMEDOUT)
+			ret = -EIO;
+
+		DRM_WARN("INTEL_GUC_SEND: Action 0x%X failed;"
+			 " ret=%d status=0x%08X response=0x%08X\n",
+			 action[0], ret, status, I915_READ(SOFT_SCRATCH(15)));
+	}
+
+	intel_uncore_forcewake_put(dev_priv, guc->send_regs.fw_domains);
+	mutex_unlock(&guc->send_mutex);
+
+	return ret;
+}
drivers/gpu/drm/i915/intel_guc.h +2 -0
index 76b7113..7860b8f 100644
@@ -39,5 +39,7 @@ static inline void intel_guc_notify(struct intel_guc *guc)
 /* intel_guc.c */
 int intel_guc_send_nop(struct intel_guc *guc, const u32 *action, u32 len);
 void intel_guc_init_early(struct intel_guc *guc);
+void intel_guc_init_send_regs(struct intel_guc *guc);
+int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len);
 
 #endif
drivers/gpu/drm/i915/intel_uc.c +2 -85

111 lines not on this page · raw message

drivers/gpu/drm/i915/intel_uc.h +0 -1
index 057ef7e..6da5f1c 100644
@@ -209,7 +209,6 @@ struct intel_huc {
 int intel_uc_init_hw(struct drm_i915_private *dev_priv);
 void intel_uc_fini_hw(struct drm_i915_private *dev_priv);
 int intel_guc_sample_forcewake(struct intel_guc *guc);
-int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len);
 
 /* intel_guc_loader.c */
 int intel_guc_select_fw(struct intel_guc *guc);
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#5 lore raw

PATCH 4/11 drm/i915/guc: Move guc_sample_forcewake to intel_guc.c

In reply to Sagar Arun Kamble
Cc Michal Wajdeczko <[email protected]>
Cc Michał Winiarski <[email protected]>
---
 drivers/gpu/drm/i915/intel_guc.c | 16 ++++++++++++++++
 drivers/gpu/drm/i915/intel_guc.h |  1 +
 drivers/gpu/drm/i915/intel_uc.c  | 16 ----------------
 drivers/gpu/drm/i915/intel_uc.h  |  1 -
 4 files changed, 17 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/intel_guc.c +16 -0
index 02b8251..0767ec2 100644
@@ -129,3 +129,19 @@ int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len)
 
 	return ret;
 }
+
+int intel_guc_sample_forcewake(struct intel_guc *guc)
+{
+	struct drm_i915_private *dev_priv = guc_to_i915(guc);
+	u32 action[2];
+
+	action[0] = INTEL_GUC_ACTION_SAMPLE_FORCEWAKE;
+	/* WaRsDisableCoarsePowerGating:skl,bxt */
+	if (!intel_enable_rc6() || NEEDS_WaRsDisableCoarsePowerGating(dev_priv))
+		action[1] = 0;
+	else
+		/* bit 0 and 1 are for Render and Media domain separately */
+		action[1] = GUC_FORCEWAKE_RENDER | GUC_FORCEWAKE_MEDIA;
+
+	return intel_guc_send(guc, action, ARRAY_SIZE(action));
+}
drivers/gpu/drm/i915/intel_guc.h +1 -0
index 7860b8f..06f2d27 100644
@@ -41,5 +41,6 @@ static inline void intel_guc_notify(struct intel_guc *guc)
 void intel_guc_init_early(struct intel_guc *guc);
 void intel_guc_init_send_regs(struct intel_guc *guc);
 int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len);
+int intel_guc_sample_forcewake(struct intel_guc *guc);
 
 #endif
drivers/gpu/drm/i915/intel_uc.c +0 -16
index 700ec70..4f8f0ff 100644
@@ -420,19 +420,3 @@ void intel_uc_fini_hw(struct drm_i915_private *dev_priv)
 
 	i915_ggtt_disable_guc(dev_priv);
 }
-
-int intel_guc_sample_forcewake(struct intel_guc *guc)
-{
-	struct drm_i915_private *dev_priv = guc_to_i915(guc);
-	u32 action[2];
-
-	action[0] = INTEL_GUC_ACTION_SAMPLE_FORCEWAKE;
-	/* WaRsDisableCoarsePowerGating:skl,bxt */
-	if (!intel_enable_rc6() || NEEDS_WaRsDisableCoarsePowerGating(dev_priv))
-		action[1] = 0;
-	else
-		/* bit 0 and 1 are for Render and Media domain separately */
-		action[1] = GUC_FORCEWAKE_RENDER | GUC_FORCEWAKE_MEDIA;
-
-	return intel_guc_send(guc, action, ARRAY_SIZE(action));
-}
drivers/gpu/drm/i915/intel_uc.h +0 -1
index 6da5f1c..bbba6c4 100644
@@ -208,7 +208,6 @@ struct intel_huc {
 void intel_uc_fini_fw(struct drm_i915_private *dev_priv);
 int intel_uc_init_hw(struct drm_i915_private *dev_priv);
 void intel_uc_fini_hw(struct drm_i915_private *dev_priv);
-int intel_guc_sample_forcewake(struct intel_guc *guc);
 
 /* intel_guc_loader.c */
 int intel_guc_select_fw(struct intel_guc *guc);
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#6 lore raw

PATCH 5/11 drm/i915: Reorganize HuC authentication

In reply to Sagar Arun Kamble

Prepared intel_auth_huc to separate HuC specific functionality from GuC send action. Created new header intel_huc.h to group HuC specific declarations.

Cc Michal Wajdeczko <[email protected]>
Cc Michał Winiarski <[email protected]>
---
 drivers/gpu/drm/i915/intel_guc.c | 19 +++++++++++++++++++
 drivers/gpu/drm/i915/intel_guc.h |  1 +
 drivers/gpu/drm/i915/intel_huc.c | 21 ++++++---------------
 drivers/gpu/drm/i915/intel_huc.h | 30 ++++++++++++++++++++++++++++++
 drivers/gpu/drm/i915/intel_uc.c  |  3 ++-
 drivers/gpu/drm/i915/intel_uc.h  |  1 -
 6 files changed, 58 insertions(+), 17 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/intel_huc.h
drivers/gpu/drm/i915/intel_guc.c +19 -0
index 0767ec2..b507e71 100644
@@ -145,3 +145,22 @@ int intel_guc_sample_forcewake(struct intel_guc *guc)
 
 	return intel_guc_send(guc, action, ARRAY_SIZE(action));
 }
+
+/**
+ * intel_guc_auth_huc() - authenticate ucode
+ * @guc: struct intel_guc*
+ * @offset: rsa offset w.r.t GGTT base of huc vma
+ *
+ * Triggers a HuC fw authentication request to the GuC via intel_guc_send
+ * AUTHENTICATE_HUC interface.
+ */
+int intel_guc_auth_huc(struct intel_guc *guc, u32 rsa_offset)
+{
+	u32 data[2];
+
+	/* Specify auth action and where public signature is. */
+	data[0] = INTEL_GUC_ACTION_AUTHENTICATE_HUC;
+	data[1] = rsa_offset;
+
+	return intel_guc_send(guc, data, ARRAY_SIZE(data));
+}
drivers/gpu/drm/i915/intel_guc.h +1 -0
index 06f2d27..34bf497 100644
@@ -42,5 +42,6 @@ static inline void intel_guc_notify(struct intel_guc *guc)
 void intel_guc_init_send_regs(struct intel_guc *guc);
 int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len);
 int intel_guc_sample_forcewake(struct intel_guc *guc);
+int intel_guc_auth_huc(struct intel_guc *guc, u32 rsa_offset);
 
 #endif
drivers/gpu/drm/i915/intel_huc.c +6 -15
index b81c6af..57fb08f 100644
@@ -226,19 +226,15 @@ void intel_huc_init_hw(struct intel_huc *huc)
 }
 
 /**
- * intel_guc_auth_huc() - authenticate ucode
- * @dev_priv: the drm_i915_device
- *
- * Triggers a HuC fw authentication request to the GuC via intel_guc_action_
- * authenticate_huc interface.
+ * intel_auth_huc() - authenticate ucode
  */
-void intel_guc_auth_huc(struct drm_i915_private *dev_priv)
+void intel_auth_huc(struct intel_huc *huc)
 {
+	struct drm_i915_private *dev_priv = huc_to_i915(huc);
 	struct intel_guc *guc = &dev_priv->guc;
-	struct intel_huc *huc = &dev_priv->huc;
 	struct i915_vma *vma;
+	u32 offset;
 	int ret;
-	u32 data[2];
 
 	if (huc->fw.load_status != INTEL_UC_FIRMWARE_SUCCESS)
 		return;
@@ -251,11 +247,8 @@ void intel_guc_auth_huc(struct drm_i915_private *dev_priv)
 		return;
 	}
 
-	/* Specify auth action and where public signature is. */
-	data[0] = INTEL_GUC_ACTION_AUTHENTICATE_HUC;
-	data[1] = guc_ggtt_offset(vma) + huc->fw.rsa_offset;
-
-	ret = intel_guc_send(guc, data, ARRAY_SIZE(data));
+	offset = guc_ggtt_offset(vma) + huc->fw.rsa_offset;
+	ret = intel_guc_auth_huc(guc, offset);
 	if (ret) {
 		DRM_ERROR("HuC: GuC did not ack Auth request %d\n", ret);
 		goto out;
@@ -267,7 +260,6 @@ void intel_guc_auth_huc(struct drm_i915_private *dev_priv)
 				HUC_FW_VERIFIED,
 				HUC_FW_VERIFIED,
 				50);
-
 	if (ret) {
 		DRM_ERROR("HuC: Authentication failed %d\n", ret);
 		goto out;
@@ -276,4 +268,3 @@ void intel_guc_auth_huc(struct drm_i915_private *dev_priv)
 out:
 	i915_vma_unpin(vma);
 }
-
drivers/gpu/drm/i915/intel_huc.h new file +30 -0
new file mode 100644
index 0000000..6277e1f
@@ -0,0 +1,30 @@
+/*
+ * Copyright © 2017 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ */
+#ifndef _INTEL_HUC_H_
+#define _INTEL_HUC_H_
+
+/* intel_huc.c */
+void intel_auth_huc(struct intel_huc *huc);
+
+#endif
drivers/gpu/drm/i915/intel_uc.c +2 -1
index 4f8f0ff..c7cc8c46 100644
@@ -25,6 +25,7 @@
 #include "i915_drv.h"
 #include "intel_uc.h"
 #include "intel_guc.h"
+#include "intel_huc.h"
 #include <linux/firmware.h>
 
 /* Cleans up uC firmware by releasing the firmware GEM obj.
@@ -352,7 +353,7 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)
 	if (ret)
 		goto err_log_capture;
 
-	intel_guc_auth_huc(dev_priv);
+	intel_auth_huc(&dev_priv->huc);
 	if (i915.enable_guc_submission) {
 		if (i915.guc_log_level >= 0)
 			gen9_enable_guc_interrupts(dev_priv);
drivers/gpu/drm/i915/intel_uc.h +0 -1
index bbba6c4..0c44d5a 100644
@@ -241,6 +241,5 @@ static inline u32 guc_ggtt_offset(struct i915_vma *vma)
 /* intel_huc.c */
 void intel_huc_select_fw(struct intel_huc *huc);
 void intel_huc_init_hw(struct intel_huc *huc);
-void intel_guc_auth_huc(struct drm_i915_private *dev_priv);
 
 #endif
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#7 lore raw

Re: [PATCH 05/11] drm/i915: Reorganize HuC authentication

Quoted 35 lines · Sagar Arun Kamble

Prepared intel_auth_huc to separate HuC specific functionality from GuC send action. Created new header intel_huc.h to group HuC specific declarations.

Cc Michal Wajdeczko <[email protected]>
Cc Michał Winiarski <[email protected]>
---
 drivers/gpu/drm/i915/intel_guc.c | 19 +++++++++++++++++++
 drivers/gpu/drm/i915/intel_guc.h |  1 +
 drivers/gpu/drm/i915/intel_huc.c | 21 ++++++---------------
 drivers/gpu/drm/i915/intel_huc.h | 30 ++++++++++++++++++++++++++++++
 drivers/gpu/drm/i915/intel_uc.c  |  3 ++-
 drivers/gpu/drm/i915/intel_uc.h  |  1 -
 6 files changed, 58 insertions(+), 17 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/intel_huc.h
drivers/gpu/drm/i915/intel_guc.c +7 -0
index 0767ec2..b507e71 100644
@@ -145,3 +145,22 @@ int intel_guc_sample_forcewake(struct intel_guc  
 *guc)
 	return intel_guc_send(guc, action, ARRAY_SIZE(action));
 }
+
+/**
+ * intel_guc_auth_huc() - authenticate ucode
+ * @guc: struct intel_guc*
+ * @offset: rsa offset w.r.t GGTT base of huc vma
+ *
+ * Triggers a HuC fw authentication request to the GuC via  

intel_guc_send
+ * AUTHENTICATE_HUC interface.
+ */

drivers/gpu/drm/i915/intel_guc.c int intel_guc_sample_forcewake(struct intel_guc *guc) · line 163

Quoted 7 lines
drivers/gpu/drm/i915/intel_guc.c +7 -0
+int intel_guc_auth_huc(struct intel_guc *guc, u32 rsa_offset)
+{
+	u32 data[2];
+
+	/* Specify auth action and where public signature is. */
+	data[0] = INTEL_GUC_ACTION_AUTHENTICATE_HUC;
+	data[1] = rsa_offset;

In most of other functions we're defining guc command like this:

	u32 action[];
		INTEL_GUC_ACTION_AUTHENTICATE_HUC,
		rsa_offset
	};
Quoted 30 lines
drivers/gpu/drm/i915/intel_guc.c +3 -0
+
+	return intel_guc_send(guc, data, ARRAY_SIZE(data));
+}
drivers/gpu/drm/i915/intel_guc.h +1 -0
index 06f2d27..34bf497 100644
@@ -42,5 +42,6 @@ static inline void intel_guc_notify(struct intel_guc  
 *guc)
 void intel_guc_init_send_regs(struct intel_guc *guc);
 int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32  
 len);
 int intel_guc_sample_forcewake(struct intel_guc *guc);
+int intel_guc_auth_huc(struct intel_guc *guc, u32 rsa_offset);

#endif

drivers/gpu/drm/i915/intel_huc.c +0 -4
index b81c6af..57fb08f 100644
@@ -226,19 +226,15 @@ void intel_huc_init_hw(struct intel_huc *huc)
 }
 /**
- * intel_guc_auth_huc() - authenticate ucode
- * @dev_priv: the drm_i915_device
- *
- * Triggers a HuC fw authentication request to the GuC via  

intel_guc_action_
- * authenticate_huc interface.
+ * intel_auth_huc() - authenticate ucode
*/

drivers/gpu/drm/i915/intel_huc.c void intel_huc_init_hw(struct intel_huc *huc) · line 231

Quoted 2 lines
drivers/gpu/drm/i915/intel_huc.c +1 -1
-void intel_guc_auth_huc(struct drm_i915_private *dev_priv)
+void intel_auth_huc(struct intel_huc *huc)

s/intel_auth_huc/intel_huc_auth to match naming convention

Quoted 80 lines

{

drivers/gpu/drm/i915/intel_huc.c +2 -2
+	struct drm_i915_private *dev_priv = huc_to_i915(huc);
 	struct intel_guc *guc = &dev_priv->guc;
-	struct intel_huc *huc = &dev_priv->huc;
 	struct i915_vma *vma;
+	u32 offset;
 	int ret;
-	u32 data[2];
	if (huc->fw.load_status != INTEL_UC_FIRMWARE_SUCCESS)
drivers/gpu/drm/i915/intel_huc.c +2 -6
 		return;
@@ -251,11 +247,8 @@ void intel_guc_auth_huc(struct drm_i915_private  
 *dev_priv)
 		return;
 	}
-	/* Specify auth action and where public signature is. */
-	data[0] = INTEL_GUC_ACTION_AUTHENTICATE_HUC;
-	data[1] = guc_ggtt_offset(vma) + huc->fw.rsa_offset;
-
-	ret = intel_guc_send(guc, data, ARRAY_SIZE(data));
+	offset = guc_ggtt_offset(vma) + huc->fw.rsa_offset;
+	ret = intel_guc_auth_huc(guc, offset);
 	if (ret) {
 		DRM_ERROR("HuC: GuC did not ack Auth request %d\n", ret);
 		goto out;
@@ -267,7 +260,6 @@ void intel_guc_auth_huc(struct drm_i915_private  
 *dev_priv)
 				HUC_FW_VERIFIED,
 				HUC_FW_VERIFIED,
 				50);
-
 	if (ret) {
 		DRM_ERROR("HuC: Authentication failed %d\n", ret);
drivers/gpu/drm/i915/intel_huc.c +0 -1
 		goto out;
@@ -276,4 +268,3 @@ void intel_guc_auth_huc(struct drm_i915_private  
 *dev_priv)
 out:
 	i915_vma_unpin(vma);
 }
-
drivers/gpu/drm/i915/intel_huc.h new file +4 -0
new file mode 100644
index 0000000..6277e1f
@@ -0,0 +1,30 @@
+/*
+ * Copyright © 2017 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person  

obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ */

drivers/gpu/drm/i915/intel_huc.h line 30

Quoted 7 lines
drivers/gpu/drm/i915/intel_huc.h new file +7 -0
+#ifndef _INTEL_HUC_H_
+#define _INTEL_HUC_H_
+
+/* intel_huc.c */
+void intel_auth_huc(struct intel_huc *huc);
+
+#endif

I would postpone creation of intel_huc.h to separate patch, as then more related changes can be done at once.

Michal

Quoted 25 lines
drivers/gpu/drm/i915/intel_uc.c +2 -1
index 4f8f0ff..c7cc8c46 100644
@@ -25,6 +25,7 @@
 #include "i915_drv.h"
 #include "intel_uc.h"
 #include "intel_guc.h"
+#include "intel_huc.h"
 #include <linux/firmware.h>
 /* Cleans up uC firmware by releasing the firmware GEM obj.
@@ -352,7 +353,7 @@ int intel_uc_init_hw(struct drm_i915_private  
 *dev_priv)
 	if (ret)
 		goto err_log_capture;
-	intel_guc_auth_huc(dev_priv);
+	intel_auth_huc(&dev_priv->huc);
 	if (i915.enable_guc_submission) {
 		if (i915.guc_log_level >= 0)
 			gen9_enable_guc_interrupts(dev_priv);
drivers/gpu/drm/i915/intel_uc.h +0 -0
index bbba6c4..0c44d5a 100644

drivers/gpu/drm/i915/intel_uc.h static inline u32 guc_ggtt_offset(struct i915_vma · line 245

Quoted 6 lines
drivers/gpu/drm/i915/intel_uc.h +0 -1
@@ -241,6 +241,5 @@ static inline u32 guc_ggtt_offset(struct i915_vma  
 *vma)
 /* intel_huc.c */
 void intel_huc_select_fw(struct intel_huc *huc);
 void intel_huc_init_hw(struct intel_huc *huc);
-void intel_guc_auth_huc(struct drm_i915_private *dev_priv);
 #endif

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#8 lore raw

PATCH 6/11 drm/i915/guc: Move GuC specific declarations from intel_uc.h to intel_guc.h

In reply to Sagar Arun Kamble
Cc Michal Wajdeczko <[email protected]>
Cc Michał Winiarski <[email protected]>
---
 drivers/gpu/drm/i915/i915_drv.h  |   1 +
 drivers/gpu/drm/i915/intel_guc.h | 126 +++++++++++++++++++++++++++++++++++++++
 drivers/gpu/drm/i915/intel_uc.h  | 125 --------------------------------------
 3 files changed, 127 insertions(+), 125 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
index 5aecbf7..b0f38bb 100644
@@ -59,6 +59,7 @@
 #include "intel_bios.h"
 #include "intel_dpll_mgr.h"
 #include "intel_uc.h"
+#include "intel_guc.h"
 #include "intel_lrc.h"
 #include "intel_ringbuffer.h"
 
drivers/gpu/drm/i915/intel_guc.h +126 -0

142 lines not on this page · raw message

drivers/gpu/drm/i915/intel_uc.h +0 -125

143 lines not on this page · raw message

Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#9 lore raw

PATCH 7/11 drm/i915/huc: Move HuC specific declarations from intel_uc.h to intel_huc.h

In reply to Sagar Arun Kamble
Cc Michal Wajdeczko <[email protected]>
Cc Michał Winiarski <[email protected]>
---
 drivers/gpu/drm/i915/i915_drv.h  |  1 +
 drivers/gpu/drm/i915/intel_huc.h |  9 +++++++++
 drivers/gpu/drm/i915/intel_uc.h  | 11 -----------
 3 files changed, 10 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
index b0f38bb..a3b7435 100644
@@ -60,6 +60,7 @@
 #include "intel_dpll_mgr.h"
 #include "intel_uc.h"
 #include "intel_guc.h"
+#include "intel_huc.h"
 #include "intel_lrc.h"
 #include "intel_ringbuffer.h"
 
drivers/gpu/drm/i915/intel_huc.h +9 -0
index 6277e1f..f9ed365 100644
@@ -24,7 +24,16 @@
 #ifndef _INTEL_HUC_H_
 #define _INTEL_HUC_H_
 
+struct intel_huc {
+	/* Generic uC firmware management */
+	struct intel_uc_fw fw;
+
+	/* HuC-specific additions */
+};
+
 /* intel_huc.c */
 void intel_auth_huc(struct intel_huc *huc);
+void intel_huc_select_fw(struct intel_huc *huc);
+void intel_huc_init_hw(struct intel_huc *huc);
 
 #endif
drivers/gpu/drm/i915/intel_uc.h +0 -11
index bd3d126..0d346ef 100644
@@ -98,13 +98,6 @@ struct intel_uc_fw {
 	uint32_t ucode_offset;
 };
 
-struct intel_huc {
-	/* Generic uC firmware management */
-	struct intel_uc_fw fw;
-
-	/* HuC-specific additions */
-};
-
 /* intel_uc.c */
 void intel_uc_sanitize_options(struct drm_i915_private *dev_priv);
 void intel_uc_init_early(struct drm_i915_private *dev_priv);
@@ -113,8 +106,4 @@ struct intel_huc {
 int intel_uc_init_hw(struct drm_i915_private *dev_priv);
 void intel_uc_fini_hw(struct drm_i915_private *dev_priv);
 
-/* intel_huc.c */
-void intel_huc_select_fw(struct intel_huc *huc);
-void intel_huc_init_hw(struct intel_huc *huc);
-
 #endif
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#10 lore raw

PATCH 8/11 drm/i915/guc: Fix GuC interaction in reset/suspend scenarios

In reply to Sagar Arun Kamble

guc_ggtt_invalidate/guc_interrupts should be disabled towards end of reset/suspend post GuC suspension as these are setup back again during recovery/resume.

Prepared helpers intel_guc_pause and intel_guc_unpause that will do teardown/bringup of this setup along with suspension/resumption of GuC if loaded. These helpers can then be used along the system or runtime suspend/resume paths as applicable. Currently post system resume, since GuC is loaded completely system_resume function for GuC is doing nothing. We rely on the setup happening in intel_uc_init_hw path. During runtime_suspend we will call intel_guc_pause helper. Another helper added is intel_guc_reset_prepare, this will make sure that disabling of ggtt_invalidate and GuC interrupts happens prior to reset and updates the firmware load status to PENDING.

v2: Updated commit message. Added note about skipped call to intel_guc_system_resume. guc_enable/disable_communication was moved to earlier patch so corresponding rebase. (Michal Wajdeczko)

v3: Introduction of intel_uc_runtime/system_suspend/resume. Updated changes for enable/disable_communication.

Cc Michal Wajdeczko <[email protected]>
Cc Michał Winiarski <[email protected]>
---
 drivers/gpu/drm/i915/i915_drv.c            |  11 ++-
 drivers/gpu/drm/i915/i915_gem.c            |   4 +-
 drivers/gpu/drm/i915/i915_guc_submission.c |  50 -----------
 drivers/gpu/drm/i915/intel_guc.c           | 129 +++++++++++++++++++++++++++++
 drivers/gpu/drm/i915/intel_guc.h           |   7 +-
 drivers/gpu/drm/i915/intel_uc.c            |  30 +++++++
 drivers/gpu/drm/i915/intel_uc.h            |   5 ++
 7 files changed, 179 insertions(+), 57 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +7 -4
index dec2850..4751679 100644
@@ -1684,6 +1684,11 @@ static int i915_drm_resume(struct drm_device *dev)
 
 	drm_mode_config_reset(dev);
 
+	/*
+	 * NB: Full gem reinitialization is being done during i915_drm_resume,
+	 * hence intel_guc_system_resume will be of no use. If full
+	 * reinitialization is avoided, need to call intel_guc_system_resume.
+	 */
 	mutex_lock(&dev->struct_mutex);
 	if (i915_gem_init_hw(dev_priv)) {
 		DRM_ERROR("failed to re-initialize GPU, declaring wedged!\n");
@@ -1691,8 +1696,6 @@ static int i915_drm_resume(struct drm_device *dev)
 	}
 	mutex_unlock(&dev->struct_mutex);
 
-	intel_guc_resume(&dev_priv->guc);
-
 	intel_modeset_init_hw(dev);
 
 	spin_lock_irq(&dev_priv->irq_lock);
@@ -2493,7 +2496,7 @@ static int intel_runtime_suspend(struct device *kdev)
 	 */
 	i915_gem_runtime_suspend(dev_priv);
 
-	intel_guc_suspend(&dev_priv->guc);
+	intel_uc_runtime_suspend(dev_priv);
 
 	intel_runtime_pm_disable_interrupts(dev_priv);
 
@@ -2578,7 +2581,7 @@ static int intel_runtime_resume(struct device *kdev)
 	if (intel_uncore_unclaimed_mmio(dev_priv))
 		DRM_DEBUG_DRIVER("Unclaimed access during suspend, bios?\n");
 
-	intel_guc_resume(&dev_priv->guc);
+	intel_uc_runtime_resume(dev_priv);
 
 	if (IS_GEN9_LP(dev_priv)) {
 		bxt_disable_dc9(dev_priv);
drivers/gpu/drm/i915/i915_gem.c +3 -1
index eb20e73..7354307 100644
@@ -2847,6 +2847,8 @@ int i915_gem_reset_prepare(struct drm_i915_private *dev_priv)
 
 	i915_gem_revoke_fences(dev_priv);
 
+	intel_uc_reset_prepare(dev_priv);
+
 	return err;
 }
 
@@ -4575,7 +4577,7 @@ int i915_gem_suspend(struct drm_i915_private *dev_priv)
 	i915_gem_contexts_lost(dev_priv);
 	mutex_unlock(&dev->struct_mutex);
 
-	intel_guc_suspend(&dev_priv->guc);
+	intel_uc_system_suspend(dev_priv);
 
 	cancel_delayed_work_sync(&dev_priv->gpu_error.hangcheck_work);
 	cancel_delayed_work_sync(&dev_priv->gt.retire_work);
drivers/gpu/drm/i915/i915_guc_submission.c +0 -50

53 lines not on this page · raw message

drivers/gpu/drm/i915/intel_guc.c +129 -0

132 lines not on this page · raw message

drivers/gpu/drm/i915/intel_guc.h +5 -2
index 29d7200..e912667 100644
@@ -148,6 +148,11 @@ static inline u32 guc_ggtt_offset(struct i915_vma *vma)
 int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len);
 int intel_guc_sample_forcewake(struct intel_guc *guc);
 int intel_guc_auth_huc(struct intel_guc *guc, u32 rsa_offset);
+void intel_guc_reset_prepare(struct intel_guc *guc);
+int intel_guc_runtime_suspend(struct intel_guc *guc);
+int intel_guc_runtime_resume(struct intel_guc *guc);
+int intel_guc_system_suspend(struct intel_guc *guc);
+int intel_guc_system_resume(struct intel_guc *guc);
 
 /* intel_guc_loader.c */
 int intel_guc_select_fw(struct intel_guc *guc);
@@ -160,8 +165,6 @@ static inline u32 guc_ggtt_offset(struct i915_vma *vma)
 void i915_guc_submission_disable(struct drm_i915_private *dev_priv);
 void i915_guc_submission_fini(struct drm_i915_private *dev_priv);
 struct i915_vma *intel_guc_allocate_vma(struct intel_guc *guc, u32 size);
-int intel_guc_suspend(struct intel_guc *guc);
-int intel_guc_resume(struct intel_guc *guc);
 
 /* intel_guc_log.c */
 int intel_guc_log_create(struct intel_guc *guc);
drivers/gpu/drm/i915/intel_uc.c +30 -0
index c7cc8c46..8fd1798 100644
@@ -421,3 +421,33 @@ void intel_uc_fini_hw(struct drm_i915_private *dev_priv)
 
 	i915_ggtt_disable_guc(dev_priv);
 }
+
+void intel_uc_reset_prepare(struct drm_i915_private *dev_priv)
+{
+	intel_guc_reset_prepare(&dev_priv->guc);
+	guc_disable_communication(&dev_priv->guc);
+}
+
+void intel_uc_runtime_suspend(struct drm_i915_private *dev_priv)
+{
+	intel_guc_runtime_suspend(&dev_priv->guc);
+	guc_disable_communication(&dev_priv->guc);
+}
+
+int intel_uc_runtime_resume(struct drm_i915_private *dev_priv)
+{
+	intel_guc_runtime_resume(&dev_priv->guc);
+	return guc_enable_communication(&dev_priv->guc);
+}
+
+void intel_uc_system_suspend(struct drm_i915_private *dev_priv)
+{
+	intel_guc_system_suspend(&dev_priv->guc);
+	guc_disable_communication(&dev_priv->guc);
+}
+
+int intel_uc_system_resume(struct drm_i915_private *dev_priv)
+{
+	intel_guc_system_resume(&dev_priv->guc);
+	return guc_enable_communication(&dev_priv->guc);
+}
drivers/gpu/drm/i915/intel_uc.h +5 -0
index 0d346ef..4d49a19 100644
@@ -105,5 +105,10 @@ struct intel_uc_fw {
 void intel_uc_fini_fw(struct drm_i915_private *dev_priv);
 int intel_uc_init_hw(struct drm_i915_private *dev_priv);
 void intel_uc_fini_hw(struct drm_i915_private *dev_priv);
+void intel_uc_reset_prepare(struct drm_i915_private *dev_priv);
+void intel_uc_runtime_suspend(struct drm_i915_private *dev_priv);
+int intel_uc_runtime_resume(struct drm_i915_private *dev_priv);
+void intel_uc_system_suspend(struct drm_i915_private *dev_priv);
+int intel_uc_system_resume(struct drm_i915_private *dev_priv);
 
 #endif
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#11 lore raw

PATCH 9/11 drm/i915/guc: Fix GuC HW/SW state cleanup in unload path

In reply to Sagar Arun Kamble

Teardown of GuC HW/SW state was not properly done in unload path. guc_submission_disable was called as part of intel_uc_fini_hw which happens post gem_unload in the i915_driver_unload path. s/i915_gem_fini/i915_gem_cleanup as it looks more suitable as that function does cleanup.
To differentiate the tasks during suspend and unload w.r.t GuC this patch introduces new function i915_gem_fini which in addition to disabling GuC interfaces also disables GuC submission during which communication with GuC is needed for destroying doorbell. i915_gem_fini is copy of i915_gem_suspend with difference w.r.t GuC operations. To achieve this, new helpers i915_gem_context_suspend and i915_gem_suspend_complete are prepared.

This patch updates the functions responsibilities as follows:
1. intel_uc_fini_hw: Disable all things that involve communication with GuC and internal operation of GuC firmware, currently submission. Post this disable all other state like guc_ggtt_invalidate, guc_communication and guc_interrupts.
2. intel_uc_cleanup: Free up all UC related memory and other data.

v2: Prepared i915_gem_unload. (Michal)

v3: Moved guc_free_load_err_log past i915.enable_guc_loading check in intel_uc_cleanup_hw. Prepared i915_gem_contexts_suspend and i915_gem_suspend_complete that are used in the two paths i915_gem_suspend and i915_gem_unload. Unload specific actions like disabling GuC submission and GuC communication are being done in i915_gem_unload. Commit message update. (Michał Winiarski)

v4: prepared i915_gem_cleanup and intel_uc_cleanup.

Cc Michal Wajdeczko <[email protected]>
Cc Michał Winiarski <[email protected]>
---
 drivers/gpu/drm/i915/i915_drv.c  | 12 +++++-----
 drivers/gpu/drm/i915/i915_drv.h  |  1 +
 drivers/gpu/drm/i915/i915_gem.c  | 52 ++++++++++++++++++++++++++++++++++++----
 drivers/gpu/drm/i915/intel_guc.c | 41 +++++++++++++++++++++++++++++++
 drivers/gpu/drm/i915/intel_guc.h |  3 +++
 drivers/gpu/drm/i915/intel_uc.c  | 39 +++++-------------------------
 drivers/gpu/drm/i915/intel_uc.h  |  1 +
 7 files changed, 105 insertions(+), 44 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +6 -6
index 4751679..f9622fc 100644
@@ -596,13 +596,13 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
 	.can_switch = i915_switcheroo_can_switch,
 };
 
-static void i915_gem_fini(struct drm_i915_private *dev_priv)
+static void i915_gem_cleanup(struct drm_i915_private *dev_priv)
 {
 	/* Flush any outstanding unpin_work. */
 	i915_gem_drain_workqueue(dev_priv);
 
 	mutex_lock(&dev_priv->drm.struct_mutex);
-	intel_uc_fini_hw(dev_priv);
+	intel_uc_cleanup(dev_priv);
 	i915_gem_cleanup_engines(dev_priv);
 	i915_gem_contexts_fini(dev_priv);
 	i915_gem_cleanup_userptr(dev_priv);
@@ -683,9 +683,9 @@ static int i915_load_modeset_init(struct drm_device *dev)
 	return 0;
 
 cleanup_gem:
-	if (i915_gem_suspend(dev_priv))
+	if (i915_gem_fini(dev_priv))
 		DRM_ERROR("failed to idle hardware; continuing to unload!\n");
-	i915_gem_fini(dev_priv);
+	i915_gem_cleanup(dev_priv);
 cleanup_uc:
 	intel_uc_fini_fw(dev_priv);
 cleanup_irq:
@@ -1376,7 +1376,7 @@ void i915_driver_unload(struct drm_device *dev)
 
 	i915_driver_unregister(dev_priv);
 
-	if (i915_gem_suspend(dev_priv))
+	if (i915_gem_fini(dev_priv))
 		DRM_ERROR("failed to idle hardware; continuing to unload!\n");
 
 	intel_display_power_get(dev_priv, POWER_DOMAIN_INIT);
@@ -1410,7 +1410,7 @@ void i915_driver_unload(struct drm_device *dev)
 	cancel_delayed_work_sync(&dev_priv->gpu_error.hangcheck_work);
 	i915_reset_error_state(dev_priv);
 
-	i915_gem_fini(dev_priv);
+	i915_gem_cleanup(dev_priv);
 	intel_uc_fini_fw(dev_priv);
 	intel_fbc_cleanup_cfb(dev_priv);
 
drivers/gpu/drm/i915/i915_drv.h +1 -0
index a3b7435..341f2ba 100644
@@ -3671,6 +3671,7 @@ void i915_gem_reset_engine(struct intel_engine_cs *engine,
 int i915_gem_wait_for_idle(struct drm_i915_private *dev_priv,
 			   unsigned int flags);
 int __must_check i915_gem_suspend(struct drm_i915_private *dev_priv);
+int __must_check i915_gem_fini(struct drm_i915_private *dev_priv);
 void i915_gem_resume(struct drm_i915_private *dev_priv);
 int i915_gem_fault(struct vm_fault *vmf);
 int i915_gem_object_wait(struct drm_i915_gem_object *obj,
drivers/gpu/drm/i915/i915_gem.c +47 -5

79 lines not on this page · raw message

drivers/gpu/drm/i915/intel_guc.c +41 -0

44 lines not on this page · raw message

drivers/gpu/drm/i915/intel_guc.h +3 -0
index e912667..4d7561c 100644
@@ -153,6 +153,9 @@ static inline u32 guc_ggtt_offset(struct i915_vma *vma)
 int intel_guc_runtime_resume(struct intel_guc *guc);
 int intel_guc_system_suspend(struct intel_guc *guc);
 int intel_guc_system_resume(struct intel_guc *guc);
+void intel_guc_fini_hw(struct intel_guc *guc);
+void intel_guc_capture_load_err_log(struct intel_guc *guc);
+void intel_guc_cleanup(struct intel_guc *guc);
 
 /* intel_guc_loader.c */
 int intel_guc_select_fw(struct intel_guc *guc);
drivers/gpu/drm/i915/intel_uc.c +6 -33
index 8fd1798..e7e0750 100644
@@ -251,23 +251,6 @@ void intel_uc_fini_fw(struct drm_i915_private *dev_priv)
 	__intel_uc_fw_fini(&dev_priv->huc.fw);
 }
 
-static void guc_capture_load_err_log(struct intel_guc *guc)
-{
-	if (!guc->log.vma || i915.guc_log_level < 0)
-		return;
-
-	if (!guc->load_err_log)
-		guc->load_err_log = i915_gem_object_get(guc->log.vma->obj);
-
-	return;
-}
-
-static void guc_free_load_err_log(struct intel_guc *guc)
-{
-	if (guc->load_err_log)
-		i915_gem_object_put(guc->load_err_log);
-}
-
 static int guc_enable_communication(struct intel_guc *guc)
 {
 	struct drm_i915_private *dev_priv = guc_to_i915(guc);
@@ -378,7 +361,7 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)
 	guc_disable_communication(guc);
 	gen9_disable_guc_interrupts(dev_priv);
 err_log_capture:
-	guc_capture_load_err_log(guc);
+	intel_guc_capture_load_err_log(guc);
 err_submission:
 	if (i915.enable_guc_submission)
 		i915_guc_submission_fini(dev_priv);
@@ -404,22 +387,12 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)
 
 void intel_uc_fini_hw(struct drm_i915_private *dev_priv)
 {
-	guc_free_load_err_log(&dev_priv->guc);
-
-	if (!i915.enable_guc_loading)
-		return;
-
-	if (i915.enable_guc_submission)
-		i915_guc_submission_disable(dev_priv);
-
-	guc_disable_communication(&dev_priv->guc);
-
-	if (i915.enable_guc_submission) {
-		gen9_disable_guc_interrupts(dev_priv);
-		i915_guc_submission_fini(dev_priv);
-	}
+	intel_guc_fini_hw(&dev_priv->guc);
+}
 
-	i915_ggtt_disable_guc(dev_priv);
+void intel_uc_cleanup(struct drm_i915_private *dev_priv)
+{
+	intel_guc_cleanup(&dev_priv->guc);
 }
 
 void intel_uc_reset_prepare(struct drm_i915_private *dev_priv)
drivers/gpu/drm/i915/intel_uc.h +1 -0
index 4d49a19..9fd8626 100644
@@ -105,6 +105,7 @@ struct intel_uc_fw {
 void intel_uc_fini_fw(struct drm_i915_private *dev_priv);
 int intel_uc_init_hw(struct drm_i915_private *dev_priv);
 void intel_uc_fini_hw(struct drm_i915_private *dev_priv);
+void intel_uc_cleanup(struct drm_i915_private *dev_priv);
 void intel_uc_reset_prepare(struct drm_i915_private *dev_priv);
 void intel_uc_runtime_suspend(struct drm_i915_private *dev_priv);
 int intel_uc_runtime_resume(struct drm_i915_private *dev_priv);
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#12 lore raw

PATCH 10/11 drm/i915/guc: Enable default/critical logging in GuC by default from GuC v9

In reply to Sagar Arun Kamble

With GuC v9, new type of Default/critical logging in GuC to enable capturing minimal important logs in production systems efficiently. This patch enables this logging in GuC by default always. It should be noted that streaming support with half-full interrupt mechanism that is present for normal logging is not present for this type of logging.

v2: Emulated GuC critical logging through i915.guc_log_level.

v3: Commit message update. Enable default/critical logging in GuC always. Fixed RPM wake during guc_log_unregister in the unload path.

v4: Moved RPM wake change to separate patch. Removed GUC_DEBUG_RESERVED and updated name of new bit to be version agnostic. Updated parameter to struct intel_guc * and name of macro NEEDS_GUC_CRITICAL_LOGGING. Removed explicit clearing of GUC_CRITICAL_LOGGING_DISABLED from params[GUC_CTL_DEBUG] as it is unnecessary. (Michal Wajdeczko)

v5: Removed GUC_CRITICAL_LOGGING_DISABLED. Added HAS_GUC check to GUC_NEEDS_CRITICAL_LOGGING. (Michal Wajdeczko)

v6: More refined version of GUC_NEEDS_CRITICAL_LOGGING. Commit message update. (Michal Wajdeczko)

Cc Chheda Harsh J <[email protected]>
Cc Fry Gregory P <[email protected]>
Cc Spotswood John A <[email protected]>
Cc Anusha Srivatsa <[email protected]>
Cc Michal Wajdeczko <[email protected]>
Cc Michał Winiarski <[email protected]>
---
 drivers/gpu/drm/i915/intel_guc_fwif.h |  4 ++--
 drivers/gpu/drm/i915/intel_guc_log.c  | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_guc_fwif.h +2 -2
index 7eb6b4f..fed875a 100644
@@ -127,7 +127,6 @@
 #define   GUC_PROFILE_ENABLED		(1 << 7)
 #define   GUC_WQ_TRACK_ENABLED		(1 << 8)
 #define   GUC_ADS_ENABLED		(1 << 9)
-#define   GUC_DEBUG_RESERVED		(1 << 10)
 #define   GUC_ADS_ADDR_SHIFT		11
 #define   GUC_ADS_ADDR_MASK		0xfffff800
 
@@ -539,7 +538,8 @@ struct guc_log_buffer_state {
 		u32 logging_enabled:1;
 		u32 reserved1:3;
 		u32 verbosity:4;
-		u32 reserved2:24;
+		u32 critical_logging_enabled:1;
+		u32 reserved2:23;
 	};
 	u32 value;
 } __packed;
drivers/gpu/drm/i915/intel_guc_log.c +12 -1
index 5c7e0c2..1bd91ec 100644
@@ -587,10 +587,18 @@ void intel_guc_log_destroy(struct intel_guc *guc)
 	i915_vma_unpin_and_release(&guc->log.vma);
 }
 
+/*
+ * Critical logging in GuC is to be enabled always from GuC v9+.
+ * (for KBL - v9.39+)
+ */
+#define GUC_NEEDS_CRITICAL_LOGGING(guc)	\
+	(HAS_GUC(guc_to_i915(guc)) && \
+	 (guc->fw.major_ver_found >= 9) && \
+	 (guc->fw.minor_ver_found >= (IS_KABYLAKE(guc_to_i915(guc)) ? 39 : 0)))
+
 int i915_guc_log_control(struct drm_i915_private *dev_priv, u64 control_val)
 {
 	struct intel_guc *guc = &dev_priv->guc;
-
 	union guc_log_control log_param;
 	int ret;
 
@@ -604,6 +612,9 @@ int i915_guc_log_control(struct drm_i915_private *dev_priv, u64 control_val)
 	if (!log_param.logging_enabled && (i915.guc_log_level < 0))
 		return 0;
 
+	if (GUC_NEEDS_CRITICAL_LOGGING(guc))
+		log_param.critical_logging_enabled = 1;
+
 	ret = guc_log_control(guc, log_param.value);
 	if (ret < 0) {
 		DRM_DEBUG_DRIVER("guc_logging_control action failed %d\n", ret);
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 10/11
#13 lore raw

Re: [PATCH 10/11] drm/i915/guc: Enable default/critical logging in GuC by default from GuC v9

Quoted 32 lines · Sagar Arun Kamble

With GuC v9, new type of Default/critical logging in GuC to enable capturing minimal important logs in production systems efficiently. This patch enables this logging in GuC by default always. It should be noted that streaming support with half-full interrupt mechanism that is present for normal logging is not present for this type of logging.

v2: Emulated GuC critical logging through i915.guc_log_level.

v3: Commit message update. Enable default/critical logging in GuC always. Fixed RPM wake during guc_log_unregister in the unload path.

v4: Moved RPM wake change to separate patch. Removed GUC_DEBUG_RESERVED and updated name of new bit to be version agnostic. Updated parameter to struct intel_guc * and name of macro NEEDS_GUC_CRITICAL_LOGGING. Removed explicit clearing of GUC_CRITICAL_LOGGING_DISABLED from params[GUC_CTL_DEBUG] as it is unnecessary. (Michal Wajdeczko)

v5: Removed GUC_CRITICAL_LOGGING_DISABLED. Added HAS_GUC check to GUC_NEEDS_CRITICAL_LOGGING. (Michal Wajdeczko)

v6: More refined version of GUC_NEEDS_CRITICAL_LOGGING. Commit message update. (Michal Wajdeczko)

Cc Chheda Harsh J <[email protected]>
Cc Fry Gregory P <[email protected]>
Cc Spotswood John A <[email protected]>
Cc Anusha Srivatsa <[email protected]>
Cc Michal Wajdeczko <[email protected]>
Cc Michał Winiarski <[email protected]>
Quoted 1 line

---

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#14 lore raw

PATCH 11/11 drm/i915/guc: Remove i915_guc_log_unregister

In reply to Sagar Arun Kamble

Functionality needed to disable GuC interrupts and cleanup the runtime/relay data structures is already covered in the unload path via intel_guc_fini_hw and intel_guc_cleanup hence remove i915_guc_log_unregister

v2: Removed the function i915_guc_log_unregister.

---
 drivers/gpu/drm/i915/i915_drv.c      |  1 -
 drivers/gpu/drm/i915/intel_guc.h     |  1 -
 drivers/gpu/drm/i915/intel_guc_log.c | 12 ------------
 3 files changed, 14 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +0 -1
index f9622fc..99d2e27 100644
@@ -1252,7 +1252,6 @@ static void i915_driver_unregister(struct drm_i915_private *dev_priv)
 	i915_perf_unregister(dev_priv);
 
 	i915_teardown_sysfs(dev_priv);
-	i915_guc_log_unregister(dev_priv);
 	drm_dev_unregister(&dev_priv->drm);
 
 	i915_gem_shrinker_cleanup(dev_priv);
drivers/gpu/drm/i915/intel_guc.h +0 -1
index 4d7561c..1767059 100644
@@ -174,6 +174,5 @@ static inline u32 guc_ggtt_offset(struct i915_vma *vma)
 void intel_guc_log_destroy(struct intel_guc *guc);
 int i915_guc_log_control(struct drm_i915_private *dev_priv, u64 control_val);
 void i915_guc_log_register(struct drm_i915_private *dev_priv);
-void i915_guc_log_unregister(struct drm_i915_private *dev_priv);
 
 #endif
drivers/gpu/drm/i915/intel_guc_log.c +0 -12
index 1bd91ec..b71fe8d 100644
@@ -660,15 +660,3 @@ void i915_guc_log_register(struct drm_i915_private *dev_priv)
 	guc_log_late_setup(&dev_priv->guc);
 	mutex_unlock(&dev_priv->drm.struct_mutex);
 }
-
-void i915_guc_log_unregister(struct drm_i915_private *dev_priv)
-{
-	if (!i915.enable_guc_submission)
-		return;
-
-	mutex_lock(&dev_priv->drm.struct_mutex);
-	/* GuC logging is currently the only user of Guc2Host interrupts */
-	gen9_disable_guc_interrupts(dev_priv);
-	guc_log_runtime_destroy(&dev_priv->guc);
-	mutex_unlock(&dev_priv->drm.struct_mutex);
-}
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 11/11
#15 lore raw

Re: [PATCH 11/11] drm/i915/guc: Remove i915_guc_log_unregister

Quoted 10 lines · Sagar Arun Kamble

Functionality needed to disable GuC interrupts and cleanup the runtime/relay data structures is already covered in the unload path via intel_guc_fini_hw and intel_guc_cleanup hence remove i915_guc_log_unregister

v2: Removed the function i915_guc_log_unregister.

---

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#16 lore raw

✗ Fi.CI.BAT: failure for GuC code restructuring and fixes (rev2)

In reply to Sagar Arun Kamble
== Series Details ==

== Series Details ==

Series: GuC code restructuring and fixes (rev2)
URL : https://patchwork.freedesktop.org/series/30351/
State : failure

== Summary ==

  CHK     include/config/kernel.release
  CHK     include/generated/uapi/linux/version.h
  CHK     include/generated/utsrelease.h
  CHK     include/generated/bounds.h
  CHK     include/generated/timeconst.h
  CHK     include/generated/asm-offsets.h
  CALL    scripts/checksyscalls.sh
  CHK     scripts/mod/devicetable-offsets.h
  CHK     include/generated/compile.h
  CHK     kernel/config_data.h
  CC [M]  drivers/gpu/drm/i915/i915_drv.o
In file included from drivers/gpu/drm/i915/i915_drv.h:61:0,
                 from drivers/gpu/drm/i915/i915_drv.c:49:

drivers/gpu/drm/i915/intel_uc.h:35:1: error: version control conflict marker in file
<<<<<<< HEAD
^~~~~~~
drivers/gpu/drm/i915/intel_uc.h:94:1: error: version control conflict marker in file
=======
^~~~~~~
drivers/gpu/drm/i915/intel_uc.h:105:42: error: ‘enum intel_uc_fw_status’ declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
const char *intel_uc_fw_status_repr(enum intel_uc_fw_status status)

                                          ^~~~~~~~~~~~~~~~~~
drivers/gpu/drm/i915/intel_uc.h:105:61: error: parameter 1 (‘status’) has incomplete type
 const char *intel_uc_fw_status_repr(enum intel_uc_fw_status status)
                                                             ^~~~~~
drivers/gpu/drm/i915/intel_uc.h:105:13: error: function declaration isn’t a prototype [-Werror=strict-prototypes]
 const char *intel_uc_fw_status_repr(enum intel_uc_fw_status status)
             ^~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/i915/intel_uc.h: In function ‘intel_uc_fw_status_repr’:
drivers/gpu/drm/i915/intel_uc.h:108:7: error: ‘INTEL_UC_FIRMWARE_FAIL’ undeclared (first use in this function)
  case INTEL_UC_FIRMWARE_FAIL:
       ^~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/i915/intel_uc.h:108:7: note: each undeclared identifier is reported only once for each function it appears in
drivers/gpu/drm/i915/intel_uc.h:110:7: error: ‘INTEL_UC_FIRMWARE_NONE’ undeclared (first use in this function)
  case INTEL_UC_FIRMWARE_NONE:
       ^~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/i915/intel_uc.h:112:7: error: ‘INTEL_UC_FIRMWARE_PENDING’ undeclared (first use in this function)
  case INTEL_UC_FIRMWARE_PENDING:
       ^~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/i915/intel_uc.h:114:7: error: ‘INTEL_UC_FIRMWARE_SUCCESS’ undeclared (first use in this function)
  case INTEL_UC_FIRMWARE_SUCCESS:
       ^~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/i915/intel_uc.h: At top level:
drivers/gpu/drm/i915/intel_uc.h:145:26: error: field ‘fetch_status’ has incomplete type
  enum intel_uc_fw_status fetch_status;
                          ^~~~~~~~~~~~
drivers/gpu/drm/i915/intel_uc.h:146:26: error: field ‘load_status’ has incomplete type
  enum intel_uc_fw_status load_status;
                          ^~~~~~~~~~~

drivers/gpu/drm/i915/intel_uc.h:177:1: error: version control conflict marker in file
<<<<<<< HEAD
^~~~~~~
drivers/gpu/drm/i915/intel_uc.h:209:1: error: version control conflict marker in file
=======
^~~~~~~
In file included from drivers/gpu/drm/i915/i915_drv.h:62:0,

                 from drivers/gpu/drm/i915/i915_drv.c:49:
drivers/gpu/drm/i915/intel_guc.h:135:19: error: redefinition of ‘guc_ggtt_offset’
 static inline u32 guc_ggtt_offset(struct i915_vma *vma)
                   ^~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/i915/i915_drv.h:61:0,
                 from drivers/gpu/drm/i915/i915_drv.c:49:
drivers/gpu/drm/i915/intel_uc.h:201:19: note: previous definition of ‘guc_ggtt_offset’ was here
 static inline u32 guc_ggtt_offset(struct i915_vma *vma)
                   ^~~~~~~~~~~~~~~

cc1: all warnings being treated as errors
scripts/Makefile.build:302: recipe for target 'drivers/gpu/drm/i915/i915_drv.o' failed make[4]: *** [drivers/gpu/drm/i915/i915_drv.o] Error 1 scripts/Makefile.build:561: recipe for target 'drivers/gpu/drm/i915' failed make[3]: *** [drivers/gpu/drm/i915] Error 2
scripts/Makefile.build:561: recipe for target 'drivers/gpu/drm' failed make[2]: *** [drivers/gpu/drm] Error 2
scripts/Makefile.build:561: recipe for target 'drivers/gpu' failed make[1]: *** [drivers/gpu] Error 2
Makefile:1019: recipe for target 'drivers' failed
make: *** [drivers] Error 2

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx