Skip to contentSkip to conversation

GuC code restructuring and fixes

PATCH In review Sagar Arun Kamble 3 participants 23 messages Sep 19, 2017 – Sep 20, 2017

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

cover GuC code restructuring and fixes

This series is based on reviews from https://patchwork.freedesktop.org/series/30502/.

Cc Michal Wajdeczko <[email protected]>
Cc Michał Winiarski <[email protected]>

Sagar Arun Kamble (14):
drm/i915/guc: Pass intel_guc struct as parameter to
intel_guc_wopcm_size
drm/i915: Create intel_uc_init_mmio to initialize MMIO interface prior
to uc init
drm/i915/guc: Create intel_guc_init_early
drm/i915: Create intel_guc.h, intel_huc.h and intel_uc_common.h drm/i915/guc: Move GuC specific functionality from intel_uc.c to
intel_guc.c
drm/i915: Create uc runtime and system suspend/resume helpers drm/i915/guc: Update prototype/name of GuC suspend/resume fns and move
to intel_guc.c
drm/i915/guc: Update GuC ggtt.invalidate/interrupts/communication
across RPM suspend/resume
drm/i915/guc: Update suspend functionality in intel_uc_suspend path drm/i915/guc: Reuse GuC suspend functionality in reset path drm/i915/guc: Fix GuC cleanup in unload path
drm/i915/guc: Remove i915_guc_log_unregister
drm/i915/guc: Enable default/critical logging in GuC by default from
GuC v9
drm/i915: Reorganize HuC authentication

 drivers/gpu/drm/i915/Makefile              |   1 +
 drivers/gpu/drm/i915/i915_drv.c            |  28 +++-
 drivers/gpu/drm/i915/i915_gem.c            |   9 +-
 drivers/gpu/drm/i915/i915_guc_submission.c |  54 +------
 drivers/gpu/drm/i915/intel_guc.c           | 246 +++++++++++++++++++++++++++++
 drivers/gpu/drm/i915/intel_guc.h           | 185 ++++++++++++++++++++++
 drivers/gpu/drm/i915/intel_guc_fwif.h      |   4 +-
 drivers/gpu/drm/i915/intel_guc_loader.c    |   3 +-
 drivers/gpu/drm/i915/intel_guc_log.c       |  25 ++-
 drivers/gpu/drm/i915/intel_huc.c           |  22 +--
 drivers/gpu/drm/i915/intel_huc.h           |  41 +++++
 drivers/gpu/drm/i915/intel_uc.c            | 165 ++++++-------------
 drivers/gpu/drm/i915/intel_uc.h            | 205 ++----------------------
 drivers/gpu/drm/i915/intel_uc_common.h     |  67 ++++++++
 14 files changed, 653 insertions(+), 402 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
 create mode 100644 drivers/gpu/drm/i915/intel_uc_common.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/14 drm/i915/guc: Pass intel_guc struct as parameter to intel_guc_wopcm_size

Pass intel_guc struct as parameter to intel_guc_wopcm_size instead of drm_i915_private. intel_guc_suspend/resume parameters are not updated in this patch as those functions are updated in the upcoming patches.

Cc Michal Wajdeczko <[email protected]>
Cc Michał Winiarski <[email protected]>
---
 drivers/gpu/drm/i915/intel_guc_loader.c | 3 ++-
 drivers/gpu/drm/i915/intel_uc.c         | 4 ++--
 drivers/gpu/drm/i915/intel_uc.h         | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_guc_loader.c +2 -1
index 8b0ae7f..6ee7c16 100644
@@ -250,8 +250,9 @@ static int guc_ucode_xfer_dma(struct drm_i915_private *dev_priv,
 	return ret;
 }
 
-u32 intel_guc_wopcm_size(struct drm_i915_private *dev_priv)
+u32 intel_guc_wopcm_size(struct intel_guc *guc)
 {
+	struct drm_i915_private *dev_priv = guc_to_i915(guc);
 	u32 wopcm_size = GUC_WOPCM_TOP;
 
 	/* On BXT, the top of WOPCM is reserved for RC6 context */
drivers/gpu/drm/i915/intel_uc.c +2 -2
index 0178ba4..b91f848 100644
@@ -188,7 +188,7 @@ static void fetch_uc_fw(struct drm_i915_private *dev_priv,
 		size = uc_fw->header_size + uc_fw->ucode_size;
 
 		/* Top 32k of WOPCM is reserved (8K stack + 24k RC6 context). */
-		if (size > intel_guc_wopcm_size(dev_priv)) {
+		if (size > intel_guc_wopcm_size(&dev_priv->guc)) {
 			DRM_ERROR("Firmware is too large to fit in WOPCM\n");
 			goto fail;
 		}
@@ -353,7 +353,7 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)
 	}
 
 	/* init WOPCM */
-	I915_WRITE(GUC_WOPCM_SIZE, intel_guc_wopcm_size(dev_priv));
+	I915_WRITE(GUC_WOPCM_SIZE, intel_guc_wopcm_size(guc));
 	I915_WRITE(DMA_GUC_WOPCM_OFFSET,
 		   GUC_WOPCM_OFFSET_VALUE | HUC_LOADING_AGENT_GUC);
 
drivers/gpu/drm/i915/intel_uc.h +1 -1
index 7703c9a..8560a7e 100644
@@ -227,7 +227,7 @@ static inline void intel_guc_notify(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);
+u32 intel_guc_wopcm_size(struct intel_guc *guc);
 
 /* i915_guc_submission.c */
 int i915_guc_submission_init(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
#2 lore raw

Re: [PATCH 01/14] drm/i915/guc: Pass intel_guc struct as parameter to intel_guc_wopcm_size

Quoted 4 lines · Sagar Arun Kamble

Pass intel_guc struct as parameter to intel_guc_wopcm_size instead of drm_i915_private. intel_guc_suspend/resume parameters are not updated in this patch as those functions are updated in the upcoming patches.

hmm, missing answer to the "why" question.

Quoted 14 lines
Cc Michal Wajdeczko <[email protected]>
Cc Michał Winiarski <[email protected]>
---
 drivers/gpu/drm/i915/intel_guc_loader.c | 3 ++-
 drivers/gpu/drm/i915/intel_uc.c         | 4 ++--
 drivers/gpu/drm/i915/intel_uc.h         | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_guc_loader.c +0 -0
index 8b0ae7f..6ee7c16 100644

drivers/gpu/drm/i915/intel_guc_loader.c static int guc_ucode_xfer_dma(struct · line 253

Quoted 5 lines
drivers/gpu/drm/i915/intel_guc_loader.c +1 -1
@@ -250,8 +250,9 @@ static int guc_ucode_xfer_dma(struct  
 drm_i915_private *dev_priv,
 	return ret;
 }
-u32 intel_guc_wopcm_size(struct drm_i915_private *dev_priv)
+u32 intel_guc_wopcm_size(struct intel_guc *guc)

Maybe better option would be to convert this function into inline as it is used only in uc.c file.

Michal

Quoted 30 lines
drivers/gpu/drm/i915/intel_guc_loader.c +1 -0
 {
+	struct drm_i915_private *dev_priv = guc_to_i915(guc);
 	u32 wopcm_size = GUC_WOPCM_TOP;
 	/* On BXT, the top of WOPCM is reserved for RC6 context */
drivers/gpu/drm/i915/intel_uc.c +2 -2
index 0178ba4..b91f848 100644
@@ -188,7 +188,7 @@ static void fetch_uc_fw(struct drm_i915_private  
 *dev_priv,
 		size = uc_fw->header_size + uc_fw->ucode_size;
 		/* Top 32k of WOPCM is reserved (8K stack + 24k RC6 context). */
-		if (size > intel_guc_wopcm_size(dev_priv)) {
+		if (size > intel_guc_wopcm_size(&dev_priv->guc)) {
 			DRM_ERROR("Firmware is too large to fit in WOPCM\n");
 			goto fail;
 		}
@@ -353,7 +353,7 @@ int intel_uc_init_hw(struct drm_i915_private  
 *dev_priv)
 	}
 	/* init WOPCM */
-	I915_WRITE(GUC_WOPCM_SIZE, intel_guc_wopcm_size(dev_priv));
+	I915_WRITE(GUC_WOPCM_SIZE, intel_guc_wopcm_size(guc));
 	I915_WRITE(DMA_GUC_WOPCM_OFFSET,
 		   GUC_WOPCM_OFFSET_VALUE | HUC_LOADING_AGENT_GUC);
drivers/gpu/drm/i915/intel_uc.h +0 -0
index 7703c9a..8560a7e 100644

drivers/gpu/drm/i915/intel_uc.h static inline void intel_guc_notify(struct intel_guc · line 233

Quoted 8 lines
drivers/gpu/drm/i915/intel_uc.h +1 -1
@@ -227,7 +227,7 @@ static inline void intel_guc_notify(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);
+u32 intel_guc_wopcm_size(struct intel_guc *guc);
 /* i915_guc_submission.c */
 int i915_guc_submission_init(struct drm_i915_private *dev_priv);

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

#3 lore raw

Re: [PATCH 01/14] drm/i915/guc: Pass intel_guc struct as parameter to intel_guc_wopcm_size

Quoted 8 lines · Michal Wajdeczko
Quoted 4 lines · Sagar Arun Kamble

Pass intel_guc struct as parameter to intel_guc_wopcm_size instead of drm_i915_private. intel_guc_suspend/resume parameters are not updated in this patch as those functions are updated in the upcoming patches.

hmm, missing answer to the "why" question.

To maintain the symmetry with other intel_guc* functions defined in intel_guc_loader.c I changed this even though this only accesses dev_priv. Also thought in future some member in intel_guc will have info about wopcm size. But currently since it only depends on dev_priv I think it makes more sense to move this as inline into intel_uc.c as you said below.

Quoted 56 lines
Quoted 15 lines
Cc Michal Wajdeczko <[email protected]>
Cc Michał Winiarski <[email protected]>
---
 drivers/gpu/drm/i915/intel_guc_loader.c | 3 ++-
 drivers/gpu/drm/i915/intel_uc.c         | 4 ++--
 drivers/gpu/drm/i915/intel_uc.h         | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_guc_loader.c +0 -0
index 8b0ae7f..6ee7c16 100644

drivers/gpu/drm/i915/intel_guc_loader.c static int guc_ucode_xfer_dma(struct · line 253

Quoted 5 lines
drivers/gpu/drm/i915/intel_guc_loader.c +1 -1
@@ -250,8 +250,9 @@ static int guc_ucode_xfer_dma(struct 
 drm_i915_private *dev_priv,
     return ret;
 }
-u32 intel_guc_wopcm_size(struct drm_i915_private *dev_priv)
+u32 intel_guc_wopcm_size(struct intel_guc *guc)

Maybe better option would be to convert this function into inline as it is used only in uc.c file.

Michal

Quoted 30 lines
drivers/gpu/drm/i915/intel_guc_loader.c +1 -0
 {
+    struct drm_i915_private *dev_priv = guc_to_i915(guc);
     u32 wopcm_size = GUC_WOPCM_TOP;
    /* On BXT, the top of WOPCM is reserved for RC6 context */
drivers/gpu/drm/i915/intel_uc.c +2 -2
index 0178ba4..b91f848 100644
@@ -188,7 +188,7 @@ static void fetch_uc_fw(struct drm_i915_private 
 *dev_priv,
         size = uc_fw->header_size + uc_fw->ucode_size;
        /* Top 32k of WOPCM is reserved (8K stack + 24k RC6 context). */
-        if (size > intel_guc_wopcm_size(dev_priv)) {
+        if (size > intel_guc_wopcm_size(&dev_priv->guc)) {
             DRM_ERROR("Firmware is too large to fit in WOPCM\n");
             goto fail;
         }
@@ -353,7 +353,7 @@ int intel_uc_init_hw(struct drm_i915_private 
 *dev_priv)
     }
    /* init WOPCM */
-    I915_WRITE(GUC_WOPCM_SIZE, intel_guc_wopcm_size(dev_priv));
+    I915_WRITE(GUC_WOPCM_SIZE, intel_guc_wopcm_size(guc));
     I915_WRITE(DMA_GUC_WOPCM_OFFSET,
            GUC_WOPCM_OFFSET_VALUE | HUC_LOADING_AGENT_GUC);
drivers/gpu/drm/i915/intel_uc.h +0 -0
index 7703c9a..8560a7e 100644
@@ -227,7 +227,7 @@ static inline void intel_guc_notify(struct 
Quoted 8 lines

drivers/gpu/drm/i915/intel_uc.h static inline void intel_guc_notify(struct intel_guc *guc) · line 233

Quoted 8 lines
drivers/gpu/drm/i915/intel_uc.h +1 -1
 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);
+u32 intel_guc_wopcm_size(struct intel_guc *guc);
 /* i915_guc_submission.c */
 int i915_guc_submission_init(struct drm_i915_private *dev_priv);

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

#4 lore raw

PATCH 2/14 drm/i915: Create intel_uc_init_mmio to initialize MMIO interface prior to uc init

In reply to Sagar Arun Kamble

This patch adds new function intel_uc_init_mmio which will initialize MMIO access related variables prior to uc load/init.

v2: Removed unnecessary export of guc_send_init_regs. Created intel_uc_init_mmio that currently wraps guc_init_send_regs. (Michal)

Cc Michal Wajdeczko <[email protected]>
Cc Michał Winiarski <[email protected]>
---
 drivers/gpu/drm/i915/i915_drv.c | 2 ++
 drivers/gpu/drm/i915/intel_uc.c | 7 +++++--
 drivers/gpu/drm/i915/intel_uc.h | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +2 -0
index 5c111ea..ef4f84d 100644
@@ -1002,6 +1002,8 @@ static int i915_driver_init_mmio(struct drm_i915_private *dev_priv)
 
 	intel_uncore_init(dev_priv);
 
+	intel_uc_init_mmio(dev_priv);
+
 	ret = intel_engines_init_mmio(dev_priv);
 	if (ret)
 		goto err_uncore;
drivers/gpu/drm/i915/intel_uc.c +5 -2
index b91f848..f2ccb7c 100644
@@ -288,6 +288,11 @@ static void guc_init_send_regs(struct intel_guc *guc)
 	guc->send_regs.fw_domains = fw_domains;
 }
 
+void intel_uc_init_mmio(struct drm_i915_private *dev_priv)
+{
+	guc_init_send_regs(&dev_priv->guc);
+}
+
 static void guc_capture_load_err_log(struct intel_guc *guc)
 {
 	if (!guc->log.vma || i915.guc_log_level < 0)
@@ -309,8 +314,6 @@ static int guc_enable_communication(struct intel_guc *guc)
 {
 	struct drm_i915_private *dev_priv = guc_to_i915(guc);
 
-	guc_init_send_regs(guc);
-
 	if (HAS_GUC_CT(dev_priv))
 		return intel_guc_enable_ct(guc);
 
drivers/gpu/drm/i915/intel_uc.h +1 -0
index 8560a7e..60bf814 100644
@@ -206,6 +206,7 @@ struct intel_huc {
 void intel_uc_init_early(struct drm_i915_private *dev_priv);
 void intel_uc_init_fw(struct drm_i915_private *dev_priv);
 void intel_uc_fini_fw(struct drm_i915_private *dev_priv);
+void intel_uc_init_mmio(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);
Signature · 6 lines
1.9.1

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

Re: [PATCH 02/14] drm/i915: Create intel_uc_init_mmio to initialize MMIO interface prior to uc init

Quoted 56 lines · Sagar Arun Kamble

This patch adds new function intel_uc_init_mmio which will initialize MMIO access related variables prior to uc load/init.

v2: Removed unnecessary export of guc_send_init_regs. Created intel_uc_init_mmio that currently wraps guc_init_send_regs. (Michal)

Cc Michal Wajdeczko <[email protected]>
Cc Michał Winiarski <[email protected]>
---
 drivers/gpu/drm/i915/i915_drv.c | 2 ++
 drivers/gpu/drm/i915/intel_uc.c | 7 +++++--
 drivers/gpu/drm/i915/intel_uc.h | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +2 -0
index 5c111ea..ef4f84d 100644
@@ -1002,6 +1002,8 @@ static int i915_driver_init_mmio(struct  
 drm_i915_private *dev_priv)
 	intel_uncore_init(dev_priv);
+	intel_uc_init_mmio(dev_priv);
+
 	ret = intel_engines_init_mmio(dev_priv);
 	if (ret)
 		goto err_uncore;
drivers/gpu/drm/i915/intel_uc.c +5 -2
index b91f848..f2ccb7c 100644
@@ -288,6 +288,11 @@ static void guc_init_send_regs(struct intel_guc  
 *guc)
 	guc->send_regs.fw_domains = fw_domains;
 }
+void intel_uc_init_mmio(struct drm_i915_private *dev_priv)
+{
+	guc_init_send_regs(&dev_priv->guc);
+}
+
 static void guc_capture_load_err_log(struct intel_guc *guc)
 {
 	if (!guc->log.vma || i915.guc_log_level < 0)
@@ -309,8 +314,6 @@ static int guc_enable_communication(struct intel_guc  
 *guc)
 {
 	struct drm_i915_private *dev_priv = guc_to_i915(guc);
-	guc_init_send_regs(guc);
-
 	if (HAS_GUC_CT(dev_priv))
 		return intel_guc_enable_ct(guc);
drivers/gpu/drm/i915/intel_uc.h +0 -0
index 8560a7e..60bf814 100644

drivers/gpu/drm/i915/intel_uc.h struct intel_huc { · line 209

Quoted 4 lines
drivers/gpu/drm/i915/intel_uc.h +1 -0
@@ -206,6 +206,7 @@ struct intel_huc {
 void intel_uc_init_early(struct drm_i915_private *dev_priv);
 void intel_uc_init_fw(struct drm_i915_private *dev_priv);
 void intel_uc_fini_fw(struct drm_i915_private *dev_priv);
+void intel_uc_init_mmio(struct drm_i915_private *dev_priv);

As init_mmio() is called prior to init_fw() please try to keep the same order in their declarations.

Michal

drivers/gpu/drm/i915/intel_uc.h struct intel_huc { · line 212

Quoted 3 lines
drivers/gpu/drm/i915/intel_uc.h +0 -0
 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-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#6 lore raw

Re: [PATCH 02/14] drm/i915: Create intel_uc_init_mmio to initialize MMIO interface prior to uc init

Quoted 66 lines · Michal Wajdeczko
Quoted 56 lines · Sagar Arun Kamble

This patch adds new function intel_uc_init_mmio which will initialize MMIO access related variables prior to uc load/init.

v2: Removed unnecessary export of guc_send_init_regs. Created intel_uc_init_mmio that currently wraps guc_init_send_regs. (Michal)

Cc Michal Wajdeczko <[email protected]>
Cc Michał Winiarski <[email protected]>
---
 drivers/gpu/drm/i915/i915_drv.c | 2 ++
 drivers/gpu/drm/i915/intel_uc.c | 7 +++++--
 drivers/gpu/drm/i915/intel_uc.h | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +2 -0
index 5c111ea..ef4f84d 100644
@@ -1002,6 +1002,8 @@ static int i915_driver_init_mmio(struct 
 drm_i915_private *dev_priv)
    intel_uncore_init(dev_priv);
+    intel_uc_init_mmio(dev_priv);
+
     ret = intel_engines_init_mmio(dev_priv);
     if (ret)
         goto err_uncore;
drivers/gpu/drm/i915/intel_uc.c +5 -2
index b91f848..f2ccb7c 100644
@@ -288,6 +288,11 @@ static void guc_init_send_regs(struct intel_guc 
 *guc)
     guc->send_regs.fw_domains = fw_domains;
 }
+void intel_uc_init_mmio(struct drm_i915_private *dev_priv)
+{
+    guc_init_send_regs(&dev_priv->guc);
+}
+
 static void guc_capture_load_err_log(struct intel_guc *guc)
 {
     if (!guc->log.vma || i915.guc_log_level < 0)
@@ -309,8 +314,6 @@ static int guc_enable_communication(struct 
 intel_guc *guc)
 {
     struct drm_i915_private *dev_priv = guc_to_i915(guc);
-    guc_init_send_regs(guc);
-
     if (HAS_GUC_CT(dev_priv))
         return intel_guc_enable_ct(guc);
drivers/gpu/drm/i915/intel_uc.h +0 -0
index 8560a7e..60bf814 100644

drivers/gpu/drm/i915/intel_uc.h struct intel_huc { · line 209

Quoted 4 lines
drivers/gpu/drm/i915/intel_uc.h +1 -0
@@ -206,6 +206,7 @@ struct intel_huc {
 void intel_uc_init_early(struct drm_i915_private *dev_priv);
 void intel_uc_init_fw(struct drm_i915_private *dev_priv);
 void intel_uc_fini_fw(struct drm_i915_private *dev_priv);
+void intel_uc_init_mmio(struct drm_i915_private *dev_priv);

As init_mmio() is called prior to init_fw() please try to keep the same order in their declarations.

Quoted 1 line

Michal

Ok. Will update this.

Quoted 4 lines

drivers/gpu/drm/i915/intel_uc.h struct intel_huc { · line 212

Quoted 4 lines
drivers/gpu/drm/i915/intel_uc.h +0 -0
 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-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#7 lore raw

PATCH 3/14 drm/i915/guc: Create intel_guc_init_early

In reply to Sagar Arun Kamble

Prepared intel_guc_init_early for GuC Specific early initialization to be done from intel_uc_init_early.

Cc Michal Wajdeczko <[email protected]>
Cc Michał Winiarski <[email protected]>
---
 drivers/gpu/drm/i915/intel_uc.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_uc.c +6 -3
index f2ccb7c..a637bd1 100644
@@ -101,10 +101,8 @@ static void gen8_guc_raise_irq(struct intel_guc *guc)
 	I915_WRITE(GUC_SEND_INTERRUPT, GUC_SEND_TRIGGER);
 }
 
-void intel_uc_init_early(struct drm_i915_private *dev_priv)
+static inline void intel_guc_init_early(struct intel_guc *guc)
 {
-	struct intel_guc *guc = &dev_priv->guc;
-
 	intel_guc_ct_init_early(&guc->ct);
 
 	mutex_init(&guc->send_mutex);
@@ -112,6 +110,11 @@ void intel_uc_init_early(struct drm_i915_private *dev_priv)
 	guc->notify = gen8_guc_raise_irq;
 }
 
+void intel_uc_init_early(struct drm_i915_private *dev_priv)
+{
+	intel_guc_init_early(&dev_priv->guc);
+}
+
 static void fetch_uc_fw(struct drm_i915_private *dev_priv,
 			struct intel_uc_fw *uc_fw)
 {
Signature · 6 lines
1.9.1

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

PATCH 4/14 drm/i915: Create intel_guc.h, intel_huc.h and intel_uc_common.h

In reply to Sagar Arun Kamble

With this patch, GuC specific declarations moved to intel_guc.h, HuC specific declarations to intel_huc.h. intel_uc_common.h contains declarations that are common to GuC and HuC structures. intel_uc.h includes all these headers and defines additional generic functionality.
Note that function definitions specific to GuC/HuC will be moved to respective .c files in the next patch.
Removed obsolete drm_i915_gem_request declaration from intel_uc.h

Cc Michal Wajdeczko <[email protected]>
Cc Michał Winiarski <[email protected]>
---
 drivers/gpu/drm/i915/intel_guc.h       | 173 +++++++++++++++++++++++++++++
 drivers/gpu/drm/i915/intel_huc.h       |  41 +++++++
 drivers/gpu/drm/i915/intel_uc.h        | 197 +--------------------------------
 drivers/gpu/drm/i915/intel_uc_common.h |  67 +++++++++++
 4 files changed, 284 insertions(+), 194 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/intel_guc.h
 create mode 100644 drivers/gpu/drm/i915/intel_huc.h
 create mode 100644 drivers/gpu/drm/i915/intel_uc_common.h
drivers/gpu/drm/i915/intel_guc.h new file +173 -0
new file mode 100644
index 0000000..0504350
@@ -0,0 +1,173 @@
+/*
+ * 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_GUC_H_
+#define _INTEL_GUC_H_
+
+#include "intel_uc_common.h"
+#include "intel_guc_fwif.h"
+#include "i915_guc_reg.h"
+#include "intel_guc_ct.h"
+
+/*
+ * This structure primarily describes the GEM object shared with the GuC.
+ * The specs sometimes refer to this object as a "GuC context", but we use
+ * the term "client" to avoid confusion with hardware contexts. This
+ * GEM object is held for the entire lifetime of our interaction with
+ * the GuC, being allocated before the GuC is loaded with its firmware.
+ * Because there's no way to update the address used by the GuC after
+ * initialisation, the shared object must stay pinned into the GGTT as
+ * long as the GuC is in use. We also keep the first page (only) mapped
+ * into kernel address space, as it includes shared data that must be
+ * updated on every request submission.
+ *
+ * The single GEM object described here is actually made up of several
+ * separate areas, as far as the GuC is concerned. The first page (kept
+ * kmap'd) includes the "process descriptor" which holds sequence data for
+ * the doorbell, and one cacheline which actually *is* the doorbell; a
+ * write to this will "ring the doorbell" (i.e. send an interrupt to the
+ * GuC). The subsequent  pages of the client object constitute the work
+ * queue (a circular array of work items), again described in the process
+ * descriptor. Work queue pages are mapped momentarily as required.
+ */
+struct i915_guc_client {
+	struct i915_vma *vma;
+	void *vaddr;
+	struct i915_gem_context *owner;
+	struct intel_guc *guc;
+
+	uint32_t engines;		/* bitmap of (host) engine ids	*/
+	uint32_t priority;
+	u32 stage_id;
+	uint32_t proc_desc_offset;
+
+	u16 doorbell_id;
+	unsigned long doorbell_offset;
+
+	spinlock_t wq_lock;
+	/* Per-engine counts of GuC submissions */
+	uint64_t submissions[I915_NUM_ENGINES];
+};
+
+struct intel_guc_log {
+	uint32_t flags;
+	struct i915_vma *vma;
+	/* The runtime stuff gets created only when GuC logging gets enabled */
+	struct {
+		void *buf_addr;
+		struct workqueue_struct *flush_wq;
+		struct work_struct flush_work;
+		struct rchan *relay_chan;
+	} runtime;
+	/* logging related stats */
+	u32 capture_miss_count;
+	u32 flush_interrupt_count;
+	u32 prev_overflow_count[GUC_MAX_LOG_BUFFER];
+	u32 total_overflow_count[GUC_MAX_LOG_BUFFER];
+	u32 flush_count[GUC_MAX_LOG_BUFFER];
+};
+
+struct intel_guc {
+	struct intel_uc_fw fw;
+	struct intel_guc_log log;
+	struct intel_guc_ct ct;
+
+	/* Log snapshot if GuC errors during load */
+	struct drm_i915_gem_object *load_err_log;
+
+	/* intel_guc_recv interrupt related state */
+	bool interrupts_enabled;
+
+	struct i915_vma *ads_vma;
+	struct i915_vma *stage_desc_pool;
+	void *stage_desc_pool_vaddr;
+	struct ida stage_ids;
+
+	struct i915_guc_client *execbuf_client;
+
+	DECLARE_BITMAP(doorbell_bitmap, GUC_NUM_DOORBELLS);
+	uint32_t db_cacheline;		/* Cyclic counter mod pagesize	*/
+
+	/* GuC's FW specific registers used in MMIO send */
+	struct {
+		u32 base;
+		unsigned int count;
+		enum forcewake_domains fw_domains;
+	} send_regs;
+
+	/* To serialize the intel_guc_send actions */
+	struct mutex send_mutex;
+
+	/* GuC's FW specific send function */
+	int (*send)(struct intel_guc *guc, const u32 *data, u32 len);
+
+	/* GuC's FW specific notify function */
+	void (*notify)(struct intel_guc *guc);
+};
+
+/* intel_uc.c */
+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);
+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 intel_guc *guc);
+
+/* i915_guc_submission.c */
+int i915_guc_submission_init(struct drm_i915_private *dev_priv);
+int i915_guc_submission_enable(struct drm_i915_private *dev_priv);
+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);
+
+/* intel_guc_log.c */
+int intel_guc_log_create(struct intel_guc *guc);
+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);
+
+static inline u32 guc_ggtt_offset(struct i915_vma *vma)
+{
+	u32 offset = i915_ggtt_offset(vma);
+
+	GEM_BUG_ON(offset < GUC_WOPCM_TOP);
+	GEM_BUG_ON(range_overflows_t(u64, offset, vma->size, GUC_GGTT_TOP));
+	return offset;
+}
+
+#endif
drivers/gpu/drm/i915/intel_huc.h new file +41 -0

41 lines not on this page · raw message

drivers/gpu/drm/i915/intel_uc.h +3 -194

220 lines not on this page · raw message

drivers/gpu/drm/i915/intel_uc_common.h new file +67 -0

67 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 5/14 drm/i915/guc: Move GuC specific functionality from intel_uc.c to intel_guc.c

In reply to Sagar Arun Kamble

Create intel_guc.c and added GuC specific functionality from intel_uc.c. Moved below functions to intel_guc.c.
1. intel_guc_send_nop
2. gen8_guc_raise_irq
3. guc_send_reg
4. intel_guc_init_send_regs (s/guc_init_send_regs/intel_guc_init_send_regs)
5. intel_guc_send_mmio
6. intel_guc_sample_forcewake

v2: Moved intel_guc_init_early to intel_guc.h. Updated commit subject.

Cc Michal Wajdeczko <[email protected]>
Cc Michał Winiarski <[email protected]>
---
 drivers/gpu/drm/i915/Makefile    |   1 +
 drivers/gpu/drm/i915/intel_guc.c | 138 +++++++++++++++++++++++++++++++++++++++
 drivers/gpu/drm/i915/intel_guc.h |  15 ++++-
 drivers/gpu/drm/i915/intel_uc.c  | 123 +---------------------------------
 4 files changed, 153 insertions(+), 124 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/intel_guc.c
drivers/gpu/drm/i915/Makefile +1 -0
index 5182e3d..d1327f6 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/intel_guc.c new file +138 -0

138 lines not on this page · raw message

drivers/gpu/drm/i915/intel_guc.h +13 -2
index 0504350..6276c6d 100644
@@ -125,10 +125,12 @@ struct intel_guc {
 	void (*notify)(struct intel_guc *guc);
 };
 
-/* intel_uc.c */
-int intel_guc_sample_forcewake(struct intel_guc *guc);
+/* intel_guc.c */
 int intel_guc_send_nop(struct intel_guc *guc, const u32 *action, u32 len);
+void gen8_guc_raise_irq(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);
 
 static inline int intel_guc_send(struct intel_guc *guc, const u32 *action, u32 len)
 {
@@ -140,6 +142,15 @@ static inline void intel_guc_notify(struct intel_guc *guc)
 	guc->notify(guc);
 }
 
+static inline void intel_guc_init_early(struct intel_guc *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_loader.c */
 int intel_guc_select_fw(struct intel_guc *guc);
 int intel_guc_init_hw(struct intel_guc *guc);
drivers/gpu/drm/i915/intel_uc.c +1 -122

140 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
#10 lore raw

PATCH 6/14 drm/i915: Create uc runtime and system suspend/resume helpers

In reply to Sagar Arun Kamble

Prepared generic helpers intel_uc_suspend, intel_uc_resume, intel_uc_runtime_suspend, intel_uc_runtime_resume. Added error handling to all the calls for suspend/resume.

Cc Michal Wajdeczko <[email protected]>
Cc Michał Winiarski <[email protected]>
---
 drivers/gpu/drm/i915/i915_drv.c | 23 ++++++++++++++++++++---
 drivers/gpu/drm/i915/i915_gem.c |  7 ++++++-
 drivers/gpu/drm/i915/intel_uc.c | 20 ++++++++++++++++++++
 drivers/gpu/drm/i915/intel_uc.h |  4 ++++
 4 files changed, 50 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +20 -3
index ef4f84d..d54f35f 100644
@@ -1693,7 +1693,15 @@ static int i915_drm_resume(struct drm_device *dev)
 	}
 	mutex_unlock(&dev->struct_mutex);
 
-	intel_guc_resume(dev_priv);
+	/*
+	 * NB: Full gem reinitialization is being done above, hence
+	 * intel_uc_resume will be of no use. Currently intel_uc_resume
+	 * is nop. If full reinitialization is removed, will  need to put
+	 * functionality to resume from sleep in intel_uc_resume.
+	 */
+	ret = intel_uc_resume(dev_priv);
+	if (ret)
+		DRM_ERROR("failed to resume uc\n");
 
 	intel_modeset_init_hw(dev);
 
@@ -2495,7 +2503,12 @@ static int intel_runtime_suspend(struct device *kdev)
 	 */
 	i915_gem_runtime_suspend(dev_priv);
 
-	intel_guc_suspend(dev_priv);
+	ret = intel_uc_runtime_suspend(dev_priv);
+	if (ret) {
+		DRM_ERROR("uc runtime suspend failed, disabling it(%d)\n", ret);
+		enable_rpm_wakeref_asserts(dev_priv);
+		return ret;
+	}
 
 	intel_runtime_pm_disable_interrupts(dev_priv);
 
@@ -2580,7 +2593,11 @@ 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);
+	ret = intel_uc_runtime_resume(dev_priv);
+	if (ret) {
+		DRM_ERROR("uc runtime resume failed (%d)\n", ret);
+		return ret;
+	}
 
 	if (IS_GEN9_LP(dev_priv)) {
 		bxt_disable_dc9(dev_priv);
drivers/gpu/drm/i915/i915_gem.c +6 -1
index c4bf348..dd56d45 100644
@@ -4539,7 +4539,11 @@ 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);
+	ret = intel_uc_suspend(dev_priv);
+	if (ret) {
+		DRM_ERROR("uc suspend failed (%d)\n", ret);
+		goto out;
+	}
 
 	cancel_delayed_work_sync(&dev_priv->gpu_error.hangcheck_work);
 	cancel_delayed_work_sync(&dev_priv->gt.retire_work);
@@ -4583,6 +4587,7 @@ int i915_gem_suspend(struct drm_i915_private *dev_priv)
 
 err_unlock:
 	mutex_unlock(&dev->struct_mutex);
+out:
 	intel_runtime_pm_put(dev_priv);
 	return ret;
 }
drivers/gpu/drm/i915/intel_uc.c +20 -0
index 5045b5e..0a7d216 100644
@@ -422,3 +422,23 @@ void intel_uc_fini_hw(struct drm_i915_private *dev_priv)
 
 	i915_ggtt_disable_guc(dev_priv);
 }
+
+int intel_uc_runtime_suspend(struct drm_i915_private *dev_priv)
+{
+	return intel_guc_suspend(dev_priv);
+}
+
+int intel_uc_runtime_resume(struct drm_i915_private *dev_priv)
+{
+	return intel_guc_resume(dev_priv);
+}
+
+int intel_uc_suspend(struct drm_i915_private *dev_priv)
+{
+	return intel_guc_suspend(dev_priv);
+}
+
+int intel_uc_resume(struct drm_i915_private *dev_priv)
+{
+	return 0;
+}
drivers/gpu/drm/i915/intel_uc.h +4 -0
index aed2b86..c9f83f5 100644
@@ -65,5 +65,9 @@ static inline const char *intel_uc_fw_type_repr(enum intel_uc_fw_type type)
 void intel_uc_init_mmio(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_uc_runtime_suspend(struct drm_i915_private *dev_priv);
+int intel_uc_runtime_resume(struct drm_i915_private *dev_priv);
+int intel_uc_suspend(struct drm_i915_private *dev_priv);
+int intel_uc_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 7/14 drm/i915/guc: Update prototype/name of GuC suspend/resume fns and move to intel_guc.c

In reply to Sagar Arun Kamble

Renamed intel_guc_suspend to intel_guc_enter_sleep and intel_guc_resume to intel_guc_exit_sleep to match GuC nomenclature compatibility. Also, We plan to use intel_guc_suspend and intel_guc_resume through intel_uc_suspend and intel_uc_resume in the path i915_drm_suspend and i915_drm_resume respectively for better naming.
Also, with this patch we pass intel_guc struct as parameter to enter_sleep and exit_sleep functions. Moved the definition to intel_guc.c for better code structuring. If needed we can pull some of the functions from intel_guc.c to new file intel_guc_pm.c in future.

Cc Michal Wajdeczko <[email protected]>
Cc Michał Winiarski <[email protected]>
---
 drivers/gpu/drm/i915/i915_guc_submission.c | 52 ------------------------------
 drivers/gpu/drm/i915/intel_guc.c           | 52 ++++++++++++++++++++++++++++++
 drivers/gpu/drm/i915/intel_guc.h           |  4 +--
 drivers/gpu/drm/i915/intel_uc.c            |  6 ++--
 4 files changed, 57 insertions(+), 57 deletions(-)
drivers/gpu/drm/i915/i915_guc_submission.c +0 -52
index e191d56..94efe32 100644
@@ -1205,55 +1205,3 @@ void i915_guc_submission_disable(struct drm_i915_private *dev_priv)
 	guc_client_free(guc->execbuf_client);
 	guc->execbuf_client = NULL;
 }
-
-/**
- * intel_guc_suspend() - notify GuC entering suspend state
- * @dev_priv:	i915 device private
- */
-int intel_guc_suspend(struct drm_i915_private *dev_priv)
-{
-	struct intel_guc *guc = &dev_priv->guc;
-	struct i915_gem_context *ctx;
-	u32 data[3];
-
-	if (guc->fw.load_status != INTEL_UC_FIRMWARE_SUCCESS)
-		return 0;
-
-	gen9_disable_guc_interrupts(dev_priv);
-
-	ctx = dev_priv->kernel_context;
-
-	data[0] = INTEL_GUC_ACTION_ENTER_S_STATE;
-	/* any value greater than GUC_POWER_D0 */
-	data[1] = GUC_POWER_D1;
-	/* first page is shared data with GuC */
-	data[2] = guc_ggtt_offset(ctx->engine[RCS].state) + LRC_GUCSHR_PN * PAGE_SIZE;
-
-	return intel_guc_send(guc, data, ARRAY_SIZE(data));
-}
-
-/**
- * intel_guc_resume() - notify GuC resuming from suspend state
- * @dev_priv:	i915 device private
- */
-int intel_guc_resume(struct drm_i915_private *dev_priv)
-{
-	struct intel_guc *guc = &dev_priv->guc;
-	struct i915_gem_context *ctx;
-	u32 data[3];
-
-	if (guc->fw.load_status != INTEL_UC_FIRMWARE_SUCCESS)
-		return 0;
-
-	if (i915.guc_log_level >= 0)
-		gen9_enable_guc_interrupts(dev_priv);
-
-	ctx = dev_priv->kernel_context;
-
-	data[0] = INTEL_GUC_ACTION_EXIT_S_STATE;
-	data[1] = GUC_POWER_D0;
-	/* first page is shared data with GuC */
-	data[2] = guc_ggtt_offset(ctx->engine[RCS].state) + LRC_GUCSHR_PN * PAGE_SIZE;
-
-	return intel_guc_send(guc, data, ARRAY_SIZE(data));
-}
drivers/gpu/drm/i915/intel_guc.c +52 -0

55 lines not on this page · raw message

drivers/gpu/drm/i915/intel_guc.h +2 -2
index 6276c6d..512d8f0 100644
@@ -131,6 +131,8 @@ struct intel_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_enter_sleep(struct intel_guc *guc);
+int intel_guc_exit_sleep(struct intel_guc *guc);
 
 static inline int intel_guc_send(struct intel_guc *guc, const u32 *action, u32 len)
 {
@@ -154,8 +156,6 @@ static inline void intel_guc_init_early(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 intel_guc *guc);
 
 /* i915_guc_submission.c */
drivers/gpu/drm/i915/intel_uc.c +3 -3
index 0a7d216..671bcf8 100644
@@ -425,17 +425,17 @@ void intel_uc_fini_hw(struct drm_i915_private *dev_priv)
 
 int intel_uc_runtime_suspend(struct drm_i915_private *dev_priv)
 {
-	return intel_guc_suspend(dev_priv);
+	return intel_guc_enter_sleep(&dev_priv->guc);
 }
 
 int intel_uc_runtime_resume(struct drm_i915_private *dev_priv)
 {
-	return intel_guc_resume(dev_priv);
+	return intel_guc_exit_sleep(&dev_priv->guc);
 }
 
 int intel_uc_suspend(struct drm_i915_private *dev_priv)
 {
-	return intel_guc_suspend(dev_priv);
+	return intel_guc_enter_sleep(&dev_priv->guc);
 }
 
 int intel_uc_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 8/14 drm/i915/guc: Update GuC ggtt.invalidate/interrupts/communication across RPM suspend/resume

In reply to Sagar Arun Kamble

Apart from configuring interrupts, we need to update the ggtt invalidate interface and GuC communication on Suspend. This functionality can be reused for other suspend and reset paths.
Prepared GuC specific helpers to handle these suspend/resume tasks namely - intel_guc_runtime_suspend, intel_guc_runtime_resume.

Cc Michal Wajdeczko <[email protected]>
Cc Michał Winiarski <[email protected]>
---
 drivers/gpu/drm/i915/intel_guc.c | 42 ++++++++++++++++++++++++++++++++++------
 drivers/gpu/drm/i915/intel_guc.h |  3 ++-
 drivers/gpu/drm/i915/intel_uc.c  | 26 +++++++++++++++++++++++--
 3 files changed, 62 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/intel_guc.c +36 -6
index df5417f..08ba59b 100644
@@ -150,8 +150,6 @@ int intel_guc_enter_sleep(struct intel_guc *guc)
 	if (guc->fw.load_status != INTEL_UC_FIRMWARE_SUCCESS)
 		return 0;
 
-	gen9_disable_guc_interrupts(dev_priv);
-
 	ctx = dev_priv->kernel_context;
 
 	data[0] = INTEL_GUC_ACTION_ENTER_S_STATE;
@@ -167,7 +165,7 @@ int intel_guc_enter_sleep(struct intel_guc *guc)
  * intel_guc_exit_sleep() - notify GuC exit from sleep state
  * @guc:	guc structure
  */
-int intel_guc_exit_sleep(struct intel_guc *guc)
+static int intel_guc_exit_sleep(struct intel_guc *guc)
 {
 	struct drm_i915_private *dev_priv = guc_to_i915(guc);
 	struct i915_gem_context *ctx;
@@ -176,9 +174,6 @@ int intel_guc_exit_sleep(struct intel_guc *guc)
 	if (guc->fw.load_status != INTEL_UC_FIRMWARE_SUCCESS)
 		return 0;
 
-	if (i915.guc_log_level >= 0)
-		gen9_enable_guc_interrupts(dev_priv);
-
 	ctx = dev_priv->kernel_context;
 
 	data[0] = INTEL_GUC_ACTION_EXIT_S_STATE;
@@ -188,3 +183,38 @@ int intel_guc_exit_sleep(struct intel_guc *guc)
 
 	return intel_guc_send(guc, data, ARRAY_SIZE(data));
 }
+
+int intel_guc_runtime_suspend(struct intel_guc *guc)
+{
+	struct drm_i915_private *dev_priv = guc_to_i915(guc);
+	int ret;
+
+	ret = intel_guc_enter_sleep(guc);
+	if (ret) {
+		DRM_ERROR("GuC enter sleep failed (%d)\n", ret);
+		return ret;
+	}
+
+	i915_ggtt_disable_guc(dev_priv);
+	gen9_disable_guc_interrupts(dev_priv);
+
+	return 0;
+}
+
+int intel_guc_runtime_resume(struct intel_guc *guc)
+{
+	struct drm_i915_private *dev_priv = guc_to_i915(guc);
+	int ret;
+
+	if (i915.guc_log_level >= 0)
+		gen9_enable_guc_interrupts(dev_priv);
+	i915_ggtt_enable_guc(dev_priv);
+
+	ret = intel_guc_exit_sleep(guc);
+	if (ret) {
+		DRM_ERROR("GuC exit sleep failed (%d)\n", ret);
+		return ret;
+	}
+
+	return 0;
+}
drivers/gpu/drm/i915/intel_guc.h +2 -1
index 512d8f0..d323802 100644
@@ -132,7 +132,8 @@ struct intel_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_enter_sleep(struct intel_guc *guc);
-int intel_guc_exit_sleep(struct intel_guc *guc);
+int intel_guc_runtime_suspend(struct intel_guc *guc);
+int intel_guc_runtime_resume(struct intel_guc *guc);
 
 static inline int intel_guc_send(struct intel_guc *guc, const u32 *action, u32 len)
 {
drivers/gpu/drm/i915/intel_uc.c +24 -2
index 671bcf8..4da5f7e 100644
@@ -425,12 +425,34 @@ void intel_uc_fini_hw(struct drm_i915_private *dev_priv)
 
 int intel_uc_runtime_suspend(struct drm_i915_private *dev_priv)
 {
-	return intel_guc_enter_sleep(&dev_priv->guc);
+	int ret;
+
+	if (!i915.enable_guc_loading)
+		return 0;
+
+	ret = intel_guc_runtime_suspend(&dev_priv->guc);
+	if (ret)
+		return ret;
+
+	guc_disable_communication(&dev_priv->guc);
+
+	return 0;
 }
 
 int intel_uc_runtime_resume(struct drm_i915_private *dev_priv)
 {
-	return intel_guc_exit_sleep(&dev_priv->guc);
+	int ret;
+
+	if (!i915.enable_guc_loading)
+		return 0;
+
+	ret = guc_enable_communication(&dev_priv->guc);
+	if (ret) {
+		DRM_ERROR("GuC enable communication failed (%d)\n", ret);
+		return ret;
+	}
+
+	return intel_guc_runtime_resume(&dev_priv->guc);
 }
 
 int intel_uc_suspend(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
#13 lore raw

PATCH 9/14 drm/i915/guc: Update suspend functionality in intel_uc_suspend path

In reply to Sagar Arun Kamble

With this patch we disable GuC submission in i915_drm_suspend. This will destroy the client which will be setup back again. We also reuse the complete sanitization done via intel_uc_runtime_suspend in this path. Post drm resume this state is recreated by intel_uc_init_hw hence we need not have similar reuse for intel_uc_resume.
This also fixes issue where intel_uc_fini_hw was being called after GPU reset happening in i915_gem_suspend in i915_driver_unload.

Cc Michal Wajdeczko <[email protected]>
Cc Michał Winiarski <[email protected]>
---
 drivers/gpu/drm/i915/intel_guc.c |  2 +-
 drivers/gpu/drm/i915/intel_guc.h |  1 -
 drivers/gpu/drm/i915/intel_uc.c  | 14 ++++++++++----
 3 files changed, 11 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/intel_guc.c +1 -1
index 08ba59b..e5c37b5 100644
@@ -141,7 +141,7 @@ int intel_guc_sample_forcewake(struct intel_guc *guc)
  * intel_guc_enter_sleep() - notify GuC entering sleep state
  * @guc:	guc structure
  */
-int intel_guc_enter_sleep(struct intel_guc *guc)
+static int intel_guc_enter_sleep(struct intel_guc *guc)
 {
 	struct drm_i915_private *dev_priv = guc_to_i915(guc);
 	struct i915_gem_context *ctx;
drivers/gpu/drm/i915/intel_guc.h +0 -1
index d323802..1429d34 100644
@@ -131,7 +131,6 @@ struct intel_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_enter_sleep(struct intel_guc *guc);
 int intel_guc_runtime_suspend(struct intel_guc *guc);
 int intel_guc_runtime_resume(struct intel_guc *guc);
 
drivers/gpu/drm/i915/intel_uc.c +10 -4
index 4da5f7e..51876f9 100644
@@ -410,9 +410,6 @@ void intel_uc_fini_hw(struct drm_i915_private *dev_priv)
 	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) {
@@ -457,7 +454,16 @@ int intel_uc_runtime_resume(struct drm_i915_private *dev_priv)
 
 int intel_uc_suspend(struct drm_i915_private *dev_priv)
 {
-	return intel_guc_enter_sleep(&dev_priv->guc);
+	int ret;
+
+	if (i915.enable_guc_submission)
+		i915_guc_submission_disable(dev_priv);
+
+	ret = intel_uc_runtime_suspend(dev_priv);
+	if (ret)
+		return ret;
+
+	return 0;
 }
 
 int intel_uc_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
#14 lore raw

PATCH 10/14 drm/i915/guc: Reuse GuC suspend functionality in reset path

In reply to Sagar Arun Kamble

With this patch we reuse the complete sanitization done via intel_uc_suspend called in new function intel_uc_reset_prepare. Post reset this state is recreated by intel_uc_init_hw.

Cc Michal Wajdeczko <[email protected]>
Cc Michał Winiarski <[email protected]>
---
 drivers/gpu/drm/i915/i915_gem.c | 2 ++
 drivers/gpu/drm/i915/intel_uc.c | 5 +++++
 drivers/gpu/drm/i915/intel_uc.h | 1 +
 3 files changed, 8 insertions(+)
drivers/gpu/drm/i915/i915_gem.c +2 -0
index dd56d45..76e1bb2 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;
 }
 
drivers/gpu/drm/i915/intel_uc.c +5 -0
index 51876f9..a5b4f4d 100644
@@ -470,3 +470,8 @@ int intel_uc_resume(struct drm_i915_private *dev_priv)
 {
 	return 0;
 }
+
+int intel_uc_reset_prepare(struct drm_i915_private *dev_priv)
+{
+	return intel_uc_suspend(dev_priv);
+}
drivers/gpu/drm/i915/intel_uc.h +1 -0
index c9f83f5..d0c2a27 100644
@@ -69,5 +69,6 @@ static inline const char *intel_uc_fw_type_repr(enum intel_uc_fw_type type)
 int intel_uc_runtime_resume(struct drm_i915_private *dev_priv);
 int intel_uc_suspend(struct drm_i915_private *dev_priv);
 int intel_uc_resume(struct drm_i915_private *dev_priv);
+int intel_uc_reset_prepare(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
#15 lore raw

PATCH 11/14 drm/i915/guc: Fix GuC cleanup in unload path

In reply to Sagar Arun Kamble

We ensure that GuC is completely suspended and client is destroyed in i915_gem_suspend during i915_driver_unload. So now intel_uc_fini_hw should just take care of cleanup,
hence s/intel_uc_fini_hw/intel_uc_cleanup. Correspondingly
we also updated as s/i915_guc_submission_fini/i915_guc_submission_cleanup Other functionality to disable communication, disable interrupts and update of ggtt.invalidate is taken care by intel_uc_suspend. With this patch we are also doing guc_free_load_err_log only if i915.enable_guc_loading is set.
Created intel_guc_cleanup function to wrap the cleanup functions specific to GuC.

Cc Michal Wajdeczko <[email protected]>
Cc Michał Winiarski <[email protected]>
---
 drivers/gpu/drm/i915/i915_drv.c            |  2 +-
 drivers/gpu/drm/i915/i915_guc_submission.c |  2 +-
 drivers/gpu/drm/i915/intel_guc.c           |  8 ++++++++
 drivers/gpu/drm/i915/intel_guc.h           |  3 ++-
 drivers/gpu/drm/i915/intel_uc.c            | 15 ++++-----------
 drivers/gpu/drm/i915/intel_uc.h            |  2 +-
 6 files changed, 17 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +1 -1
index d54f35f..5f09185 100644
@@ -602,7 +602,7 @@ static void i915_gem_fini(struct drm_i915_private *dev_priv)
 	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);
drivers/gpu/drm/i915/i915_guc_submission.c +1 -1
index 94efe32..12f1195 100644
@@ -1050,7 +1050,7 @@ int i915_guc_submission_init(struct drm_i915_private *dev_priv)
 	return ret;
 }
 
-void i915_guc_submission_fini(struct drm_i915_private *dev_priv)
+void i915_guc_submission_cleanup(struct drm_i915_private *dev_priv)
 {
 	struct intel_guc *guc = &dev_priv->guc;
 
drivers/gpu/drm/i915/intel_guc.c +8 -0
index e5c37b5..86a518f 100644
@@ -218,3 +218,11 @@ int intel_guc_runtime_resume(struct intel_guc *guc)
 
 	return 0;
 }
+
+void intel_guc_cleanup(struct intel_guc *guc)
+{
+	struct drm_i915_private *dev_priv = guc_to_i915(guc);
+
+	if (i915.enable_guc_submission)
+		i915_guc_submission_cleanup(dev_priv);
+}
drivers/gpu/drm/i915/intel_guc.h +2 -1
index 1429d34..dfe0638 100644
@@ -133,6 +133,7 @@ struct intel_guc {
 int intel_guc_sample_forcewake(struct intel_guc *guc);
 int intel_guc_runtime_suspend(struct intel_guc *guc);
 int intel_guc_runtime_resume(struct intel_guc *guc);
+void intel_guc_cleanup(struct intel_guc *guc);
 
 static inline int intel_guc_send(struct intel_guc *guc, const u32 *action, u32 len)
 {
@@ -162,7 +163,7 @@ static inline void intel_guc_init_early(struct intel_guc *guc)
 int i915_guc_submission_init(struct drm_i915_private *dev_priv);
 int i915_guc_submission_enable(struct drm_i915_private *dev_priv);
 void i915_guc_submission_disable(struct drm_i915_private *dev_priv);
-void i915_guc_submission_fini(struct drm_i915_private *dev_priv);
+void i915_guc_submission_cleanup(struct drm_i915_private *dev_priv);
 struct i915_vma *intel_guc_allocate_vma(struct intel_guc *guc, u32 size);
 
 /* intel_guc_log.c */
drivers/gpu/drm/i915/intel_uc.c +4 -11
index a5b4f4d..9ecf0e0 100644
@@ -382,7 +382,7 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)
 	guc_capture_load_err_log(guc);
 err_submission:
 	if (i915.enable_guc_submission)
-		i915_guc_submission_fini(dev_priv);
+		i915_guc_submission_cleanup(dev_priv);
 err_guc:
 	i915_ggtt_disable_guc(dev_priv);
 
@@ -403,21 +403,14 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)
 	return ret;
 }
 
-void intel_uc_fini_hw(struct drm_i915_private *dev_priv)
+void intel_uc_cleanup(struct drm_i915_private *dev_priv)
 {
-	guc_free_load_err_log(&dev_priv->guc);
-
 	if (!i915.enable_guc_loading)
 		return;
 
-	guc_disable_communication(&dev_priv->guc);
-
-	if (i915.enable_guc_submission) {
-		gen9_disable_guc_interrupts(dev_priv);
-		i915_guc_submission_fini(dev_priv);
-	}
+	guc_free_load_err_log(&dev_priv->guc);
 
-	i915_ggtt_disable_guc(dev_priv);
+	intel_guc_cleanup(&dev_priv->guc);
 }
 
 int intel_uc_runtime_suspend(struct drm_i915_private *dev_priv)
drivers/gpu/drm/i915/intel_uc.h +1 -1
index d0c2a27..0801e6a 100644
@@ -64,7 +64,7 @@ static inline const char *intel_uc_fw_type_repr(enum intel_uc_fw_type type)
 void intel_uc_fini_fw(struct drm_i915_private *dev_priv);
 void intel_uc_init_mmio(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);
 int intel_uc_runtime_suspend(struct drm_i915_private *dev_priv);
 int intel_uc_runtime_resume(struct drm_i915_private *dev_priv);
 int intel_uc_suspend(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
#16 lore raw

PATCH 12/14 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.

v3: Rebase as intel_guc.h is removed.

v4: Rebase as intel_guc.h is created again. :)

---
 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 5f09185..ec0e770 100644
@@ -1254,7 +1254,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 dfe0638..0726002 100644
@@ -171,7 +171,6 @@ static inline void intel_guc_init_early(struct intel_guc *guc)
 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);
 
 static inline u32 guc_ggtt_offset(struct i915_vma *vma)
 {
drivers/gpu/drm/i915/intel_guc_log.c +0 -12
index 16d3b87..3c45681 100644
@@ -648,15 +648,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
#17 lore raw

PATCH 13/14 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 3c45681..b820175 100644
@@ -586,10 +586,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;
 
@@ -603,6 +611,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
#18 lore raw

PATCH 14/14 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.

v2: Changed argument preparation for AUTHENTICATE_HUC. s/intel_auth_huc/intel_huc_auth. Deferred creation of intel_huc.h to later patch.

v3: Rebase as intel_guc.h is removed. Added param description to intel_huc_auth. (Michal)

v4: Rebase as intel_guc.h is added again. :)

---
 drivers/gpu/drm/i915/intel_guc.c | 18 ++++++++++++++++++
 drivers/gpu/drm/i915/intel_guc.h |  1 +
 drivers/gpu/drm/i915/intel_huc.c | 22 +++++++---------------
 drivers/gpu/drm/i915/intel_huc.h |  2 +-
 drivers/gpu/drm/i915/intel_uc.c  |  2 +-
 5 files changed, 28 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/intel_guc.c +18 -0
index 86a518f..c731cff 100644
@@ -226,3 +226,21 @@ void intel_guc_cleanup(struct intel_guc *guc)
 	if (i915.enable_guc_submission)
 		i915_guc_submission_cleanup(dev_priv);
 }
+
+/**
+ * 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 action[] = {
+		INTEL_GUC_ACTION_AUTHENTICATE_HUC,
+		rsa_offset
+	};
+
+	return intel_guc_send(guc, action, ARRAY_SIZE(action));
+}
drivers/gpu/drm/i915/intel_guc.h +1 -0
index 0726002..a894991 100644
@@ -134,6 +134,7 @@ struct intel_guc {
 int intel_guc_runtime_suspend(struct intel_guc *guc);
 int intel_guc_runtime_resume(struct intel_guc *guc);
 void intel_guc_cleanup(struct intel_guc *guc);
+int intel_guc_auth_huc(struct intel_guc *guc, u32 rsa_offset);
 
 static inline int intel_guc_send(struct intel_guc *guc, const u32 *action, u32 len)
 {
drivers/gpu/drm/i915/intel_huc.c +7 -15
index 6145fa0..d3da4d3 100644
@@ -225,19 +225,16 @@ 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_huc_auth() - authenticate ucode
+ * @huc: intel_huc structure
  */
-void intel_guc_auth_huc(struct drm_i915_private *dev_priv)
+void intel_huc_auth(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;
@@ -250,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;
@@ -266,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;
@@ -275,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 +1 -1
index 9755e12..f9cf81a8 100644
@@ -36,6 +36,6 @@ struct intel_huc {
 /* 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);
+void intel_huc_auth(struct intel_huc *huc);
 
 #endif
drivers/gpu/drm/i915/intel_uc.c +1 -1
index 9ecf0e0..bb31243 100644
@@ -354,7 +354,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_huc_auth(&dev_priv->huc);
 	if (i915.enable_guc_submission) {
 		if (i915.guc_log_level >= 0)
 			gen9_enable_guc_interrupts(dev_priv);
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#19 lore raw
In reply to Sagar Arun Kamble
Quoted 18 lines · Sagar Arun Kamble

This series is based on reviews from https://patchwork.freedesktop.org/series/30502/.

Cc Michal Wajdeczko <[email protected]>
Cc Michał Winiarski <[email protected]>

Sagar Arun Kamble (14):
drm/i915/guc: Pass intel_guc struct as parameter to
intel_guc_wopcm_size
drm/i915: Create intel_uc_init_mmio to initialize MMIO interface prior
to uc init
drm/i915/guc: Create intel_guc_init_early
drm/i915: Create intel_guc.h, intel_huc.h and intel_uc_common.h drm/i915/guc: Move GuC specific functionality from intel_uc.c to
intel_guc.c
drm/i915: Create uc runtime and system suspend/resume helpers drm/i915/guc: Update prototype/name of GuC suspend/resume fns and move
to intel_guc.c
drm/i915/guc: Update GuC ggtt.invalidate/interrupts/communication

Quoted 9 lines

across RPM suspend/resume
drm/i915/guc: Update suspend functionality in intel_uc_suspend path drm/i915/guc: Reuse GuC suspend functionality in reset path drm/i915/guc: Fix GuC cleanup in unload path drm/i915/guc: Remove i915_guc_log_unregister drm/i915/guc: Enable default/critical logging in GuC by default from
GuC v9
drm/i915: Reorganize HuC authentication

Refactoring whole guc code in one series can be very long task. By adding more and more fixes here you're preventing merge of the most important patch.

Michal

Quoted 13 lines
 drivers/gpu/drm/i915/Makefile              |   1 +
 drivers/gpu/drm/i915/i915_drv.c            |  28 +++-
 drivers/gpu/drm/i915/i915_gem.c            |   9 +-
 drivers/gpu/drm/i915/i915_guc_submission.c |  54 +------
 drivers/gpu/drm/i915/intel_guc.c           | 246  
+++++++++++++++++++++++++++++
 drivers/gpu/drm/i915/intel_guc.h           | 185 ++++++++++++++++++++++
 drivers/gpu/drm/i915/intel_guc_fwif.h      |   4 +-
 drivers/gpu/drm/i915/intel_guc_loader.c    |   3 +-
 drivers/gpu/drm/i915/intel_guc_log.c       |  25 ++-
 drivers/gpu/drm/i915/intel_huc.c           |  22 +--
 drivers/gpu/drm/i915/intel_huc.h           |  41 +++++
 drivers/gpu/drm/i915/intel_uc.c            | 165 ++++++-------------
Quoted 8 lines
 drivers/gpu/drm/i915/intel_uc.h            | 205  
++----------------------
 drivers/gpu/drm/i915/intel_uc_common.h     |  67 ++++++++
 14 files changed, 653 insertions(+), 402 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
 create mode 100644 drivers/gpu/drm/i915/intel_uc_common.h

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

#20 lore raw
Quoted 30 lines · Michal Wajdeczko
Quoted 18 lines · Sagar Arun Kamble

This series is based on reviews from https://patchwork.freedesktop.org/series/30502/.

Cc Michal Wajdeczko <[email protected]>
Cc Michał Winiarski <[email protected]>

Sagar Arun Kamble (14):
drm/i915/guc: Pass intel_guc struct as parameter to
intel_guc_wopcm_size
drm/i915: Create intel_uc_init_mmio to initialize MMIO interface prior
to uc init
drm/i915/guc: Create intel_guc_init_early
drm/i915: Create intel_guc.h, intel_huc.h and intel_uc_common.h drm/i915/guc: Move GuC specific functionality from intel_uc.c to
intel_guc.c
drm/i915: Create uc runtime and system suspend/resume helpers drm/i915/guc: Update prototype/name of GuC suspend/resume fns and move
to intel_guc.c
drm/i915/guc: Update GuC ggtt.invalidate/interrupts/communication

Quoted 9 lines

across RPM suspend/resume
drm/i915/guc: Update suspend functionality in intel_uc_suspend path drm/i915/guc: Reuse GuC suspend functionality in reset path drm/i915/guc: Fix GuC cleanup in unload path drm/i915/guc: Remove i915_guc_log_unregister drm/i915/guc: Enable default/critical logging in GuC by default from
GuC v9
drm/i915: Reorganize HuC authentication

Quoted 5 lines

Refactoring whole guc code in one series can be very long task. By adding more and more fixes here you're preventing merge of the most important patch.

Michal

Will float the fixes first now and then will restart the restructuring.
Current patches are smaller logical changes w.r.t restructuring compared to my earlier series so I thought it would be nice to get those in along with the fixes. Thanks Michal.

Quoted 13 lines
Quoted 13 lines
 drivers/gpu/drm/i915/Makefile |   1 +
 drivers/gpu/drm/i915/i915_drv.c            |  28 +++-
 drivers/gpu/drm/i915/i915_gem.c            |   9 +-
 drivers/gpu/drm/i915/i915_guc_submission.c |  54 +------
 drivers/gpu/drm/i915/intel_guc.c           | 246 
+++++++++++++++++++++++++++++
 drivers/gpu/drm/i915/intel_guc.h           | 185 ++++++++++++++++++++++
 drivers/gpu/drm/i915/intel_guc_fwif.h      |   4 +-
 drivers/gpu/drm/i915/intel_guc_loader.c    |   3 +-
 drivers/gpu/drm/i915/intel_guc_log.c       |  25 ++-
 drivers/gpu/drm/i915/intel_huc.c           |  22 +--
 drivers/gpu/drm/i915/intel_huc.h           |  41 +++++
 drivers/gpu/drm/i915/intel_uc.c            | 165 ++++++-------------
Quoted 8 lines
Quoted 8 lines
 drivers/gpu/drm/i915/intel_uc.h            | 205 
++----------------------
 drivers/gpu/drm/i915/intel_uc_common.h     |  67 ++++++++
 14 files changed, 653 insertions(+), 402 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
 create mode 100644 drivers/gpu/drm/i915/intel_uc_common.h

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

#21 lore raw

✓ Fi.CI.BAT: success for GuC code restructuring and fixes (rev3)

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

== Series Details ==

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

== Summary ==

Series 30351v3 GuC code restructuring and fixes
https://patchwork.freedesktop.org/api/1.0/series/30351/revisions/3/mbox/

Test kms_frontbuffer_tracking:

        Subgroup basic:
                dmesg-warn -> PASS       (fi-kbl-7500u)
Test kms_pipe_crc_basic:
        Subgroup hang-read-crc-pipe-b:
                incomplete -> DMESG-WARN (fi-cfl-s) fdo#102294 +1
        Subgroup suspend-read-crc-pipe-a:
                incomplete -> PASS       (fi-kbl-7500u)
Test drv_module_reload:
        Subgroup basic-reload:
                pass       -> DMESG-WARN (fi-glk-1) fdo#102777

fdo#102294 https://bugs.freedesktop.org/show_bug.cgi?id=102294
fdo#102777 https://bugs.freedesktop.org/show_bug.cgi?id=102777

fi-bdw-5557u     total:289  pass:268  dwarn:0   dfail:0   fail:0   skip:21  time:439s
fi-bdw-gvtdvm    total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:472s
fi-blb-e6850     total:289  pass:224  dwarn:1   dfail:0   fail:0   skip:64  time:415s
fi-bsw-n3050     total:289  pass:243  dwarn:0   dfail:0   fail:0   skip:46  time:512s
fi-bwr-2160      total:289  pass:184  dwarn:0   dfail:0   fail:0   skip:105 time:278s
fi-bxt-j4205     total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:498s
fi-byt-j1900     total:289  pass:254  dwarn:1   dfail:0   fail:0   skip:34  time:488s
fi-byt-n2820     total:289  pass:250  dwarn:1   dfail:0   fail:0   skip:38  time:497s
fi-cfl-s         total:245  pass:188  dwarn:26  dfail:0   fail:0   skip:30 
fi-elk-e7500     total:289  pass:230  dwarn:0   dfail:0   fail:0   skip:59  time:416s
fi-glk-1         total:289  pass:259  dwarn:1   dfail:0   fail:0   skip:29  time:568s
fi-hsw-4770      total:289  pass:263  dwarn:0   dfail:0   fail:0   skip:26  time:423s
fi-hsw-4770r     total:289  pass:263  dwarn:0   dfail:0   fail:0   skip:26  time:403s
fi-ilk-650       total:289  pass:229  dwarn:0   dfail:0   fail:0   skip:60  time:430s
fi-ivb-3520m     total:289  pass:261  dwarn:0   dfail:0   fail:0   skip:28  time:480s
fi-ivb-3770      total:289  pass:261  dwarn:0   dfail:0   fail:0   skip:28  time:468s
fi-kbl-7500u     total:289  pass:264  dwarn:1   dfail:0   fail:0   skip:24  time:467s
fi-kbl-7560u     total:289  pass:270  dwarn:0   dfail:0   fail:0   skip:19  time:575s
fi-kbl-r         total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:583s
fi-pnv-d510      total:289  pass:223  dwarn:1   dfail:0   fail:0   skip:65  time:546s
fi-skl-6260u     total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:452s
fi-skl-6700k     total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:750s
fi-skl-6770hq    total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:489s
fi-skl-gvtdvm    total:289  pass:266  dwarn:0   dfail:0   fail:0   skip:23  time:469s
fi-snb-2520m     total:289  pass:251  dwarn:0   dfail:0   fail:0   skip:38  time:569s
fi-snb-2600      total:289  pass:250  dwarn:0   dfail:0   fail:0   skip:39  time:422s

bf6ecf6d25c1c45e576643b7d7a65e8b1e6b4f01 drm-tip: 2017y-09m-19d-17h-23m-04s UTC integration manifest a6f7a1534535 drm/i915: Reorganize HuC authentication
427e3bf35bdb drm/i915/guc: Enable default/critical logging in GuC by default from GuC v9 b7626345d6b6 drm/i915/guc: Remove i915_guc_log_unregister
d9376dd928c1 drm/i915/guc: Fix GuC cleanup in unload path
202d501afe14 drm/i915/guc: Reuse GuC suspend functionality in reset path
9c6b660e184f drm/i915/guc: Update suspend functionality in intel_uc_suspend path c4218b4ff8aa drm/i915/guc: Update GuC ggtt.invalidate/interrupts/communication across RPM suspend/resume c7db4b2debc1 drm/i915/guc: Update prototype/name of GuC suspend/resume fns and move to intel_guc.c e5cc64cd4532 drm/i915: Create uc runtime and system suspend/resume helpers
2f5030791f7f drm/i915/guc: Move GuC specific functionality from intel_uc.c to intel_guc.c c22d27f3b0a0 drm/i915: Create intel_guc.h, intel_huc.h and intel_uc_common.h 83e0c1e93c4b drm/i915/guc: Create intel_guc_init_early
46df37fea2a0 drm/i915: Create intel_uc_init_mmio to initialize MMIO interface prior to uc init 48c6aa4afa19 drm/i915/guc: Pass intel_guc struct as parameter to intel_guc_wopcm_size

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5753/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#22 lore raw

✗ Fi.CI.IGT: warning for GuC code restructuring and fixes (rev3)

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

== Series Details ==

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

== Summary ==

Test perf:

        Subgroup blocking:
                pass       -> FAIL       (shard-hsw) fdo#102252 +1
Test kms_flip:
        Subgroup rcs-wf_vblank-vs-dpms:
                dmesg-warn -> PASS       (shard-hsw)
Test kms_atomic:
        Subgroup plane_primary_legacy:
                pass       -> SKIP       (shard-hsw)

fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252

shard-hsw total:2317 pass:1244 dwarn:3 dfail:0 fail:12 skip:1058 time:9654s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5753/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx