drm/i915/guc: Rename guc_ggtt_offset to intel_guc_ggtt_offset
Subsystems (2)
PATCH v13 1/6 drm/i915/guc: Rename guc_ggtt_offset to intel_guc_ggtt_offset
GuC related exported functions should start with "intel_guc_" prefix and pass intel_guc as the first parameter since its GuC related. Current guc_ggtt_offset() failed to follow this code convention and this is a problem for future patches that needs to access intel_guc data to verify the GGTT offset against the GuC WOPCM top.
This patch renames the guc_ggtt_offset to intel_guc_ggtt_offset and updates the related code to pass intel_guc pointer to this function call, so that we can have a unified coding style for GuC code and also enable the future patches to get GuC related data from intel_guc to do the offset verification. Meanwhile, this patch also moves the GUC_GGTT_TOP from intel_guc_regs.h to intel_guc.h since it is not GuC register related definition.
v8:
- Fixed coding style issues and moved GUC_GGTT_TOP to intel_guc.h (Sagar)
- Updated commit message to explain to reason and motivation to add intel_guc as the first parameter of intel_guc_ggtt_offset (Chris)
v9:
- Fixed code alignment issue due to line break (Chris)
v10:
- Removed unnecessary comments, redundant code and avoided reuse variable to avoid potential issues (Joonas)
v13:
- Updated the ordering of s-o-b/cc/r-b tags (Sagar)
--- drivers/gpu/drm/i915/intel_guc.c | 11 ++++++----- drivers/gpu/drm/i915/intel_guc.h | 14 ++++++++++++-- drivers/gpu/drm/i915/intel_guc_ads.c | 8 ++++---- drivers/gpu/drm/i915/intel_guc_ct.c | 5 +++-- drivers/gpu/drm/i915/intel_guc_fw.c | 2 +- drivers/gpu/drm/i915/intel_guc_log.c | 2 +- drivers/gpu/drm/i915/intel_guc_reg.h | 3 --- drivers/gpu/drm/i915/intel_guc_submission.c | 10 +++++----- drivers/gpu/drm/i915/intel_huc.c | 3 ++- drivers/gpu/drm/i915/intel_huc_fw.c | 3 ++- 10 files changed, 36 insertions(+), 25 deletions(-)
drivers/gpu/drm/i915/intel_guc.c +6 -5
@@ -269,8 +269,9 @@ void intel_guc_init_params(struct intel_guc *guc)/* If GuC submission is enabled, set up additional parameters here */ if (USES_GUC_SUBMISSION (dev_priv)) { -u32 ads =guc_ggtt_offset (guc->ads_vma) >>PAGE_SHIFT ; -u32 pgs =guc_ggtt_offset (dev_priv->guc.stage_desc_pool); +u32 ads =intel_guc_ggtt_offset (guc, + guc->ads_vma) >>PAGE_SHIFT ; +u32 pgs =intel_guc_ggtt_offset (guc, guc->stage_desc_pool);u32 ctx_in_16 =GUC_MAX_STAGE_DESCRIPTORS /16 ; params[GUC_CTL_DEBUG ] |= ads <<GUC_ADS_ADDR_SHIFT ;
@@ -447,7 +448,7 @@ int intel_guc_suspend(struct intel_guc *guc)u32 data[] = {INTEL_GUC_ACTION_ENTER_S_STATE ,GUC_POWER_D1 ,/* any value greater than GUC_POWER_D0 */ -guc_ggtt_offset (guc->shared_data) +intel_guc_ggtt_offset (guc, guc->shared_data) };return intel_guc_send (guc, data,ARRAY_SIZE (data));
@@ -471,7 +472,7 @@ int intel_guc_reset_engine(struct intel_guc *guc, data[3 ] =0 ; data[4 ] =0 ; data[5 ] = guc->execbuf_client->stage_id; - data[6 ] =guc_ggtt_offset (guc->shared_data); + data[6 ] =intel_guc_ggtt_offset (guc, guc->shared_data);return intel_guc_send (guc, data,ARRAY_SIZE (data)); }
@@ -485,7 +486,7 @@ int intel_guc_resume(struct intel_guc *guc)u32 data[] = {INTEL_GUC_ACTION_EXIT_S_STATE ,GUC_POWER_D0 , -guc_ggtt_offset (guc->shared_data) +intel_guc_ggtt_offset (guc, guc->shared_data) };return intel_guc_send (guc, data,ARRAY_SIZE (data));
drivers/gpu/drm/i915/intel_guc.h +12 -2
@@ -100,13 +100,23 @@ static inline void intel_guc_notify(struct intel_guc *guc) guc->notify (guc); } -/* +/* GuC addresses above GUC_GGTT_TOP also don't map through the GTT */ +#define GUC_GGTT_TOP 0xFEE00000 + +/** +* intel_guc_ggtt_offset() - Get and validate the GGTT offset of @vma +* @guc: intel_guc structure. +* @vma: i915 graphics virtual memory area. +* * GuC does not allow any gfx GGTT address that falls into range [0, WOPCM_TOP), * which is reserved for Boot ROM, SRAM and WOPCM. Currently this top address is * 512K. In order to exclude 0-512K address space from GGTT, all gfx objects * used by GuC is pinned with PIN_OFFSET_BIAS along with size of WOPCM. +* +* Return: GGTT offset that meets the GuC gfx address requirement. */ -static inline u32 guc_ggtt_offset (struct i915_vma *vma) +static inline u32 intel_guc_ggtt_offset (struct intel_guc *guc, +struct i915_vma *vma) {u32 offset =i915_ggtt_offset (vma);
drivers/gpu/drm/i915/intel_guc_ads.c +4 -4
@@ -75,7 +75,7 @@ static void guc_policies_init(struct guc_policies *policies)int intel_guc_ads_create (struct intel_guc *guc) {struct drm_i915_private *dev_priv =guc_to_i915 (guc); -struct i915_vma *vma; +struct i915_vma *vma, *kernel_ctx_vma;struct page *page;/* The ads obj includes the struct itself and buffers passed to GuC */ struct {
@@ -121,9 +121,9 @@ int intel_guc_ads_create(struct intel_guc *guc)* to find it. Note that we have to skip our header (1 page), * because our GuC shared data is there. */ + kernel_ctx_vma = dev_priv->kernel_context->engine[RCS ].state; blob->ads.golden_context_lrca = -guc_ggtt_offset (dev_priv->kernel_context->engine[RCS ].state) + - skipped_offset; +intel_guc_ggtt_offset (guc, kernel_ctx_vma) + skipped_offset;/* * The GuC expects us to exclude the portion of the context image that
@@ -135,7 +135,7 @@ int intel_guc_ads_create(struct intel_guc *guc) blob->ads.eng_state_size[engine->guc_id] = engine->context_size - skipped_size; - base =guc_ggtt_offset (vma); + base =intel_guc_ggtt_offset (guc, vma); blob->ads.scheduler_policies = base +ptr_offset (blob, policies); blob->ads.reg_state_buffer = base +ptr_offset (blob, reg_state_buffer); blob->ads.reg_state_addr = base +ptr_offset (blob, reg_state);
drivers/gpu/drm/i915/intel_guc_ct.c +3 -2
@@ -156,7 +156,8 @@ static int ctch_init(struct intel_guc *guc, err =PTR_ERR (blob); goto err_vma; } -DRM_DEBUG_DRIVER ("CT: vma base=%#x\n" ,guc_ggtt_offset (ctch->vma)); +DRM_DEBUG_DRIVER ("CT: vma base=%#x\n" , +intel_guc_ggtt_offset (guc, ctch->vma));/* store pointers to desc and cmds */ for (i =0 ; i <ARRAY_SIZE (ctch->ctbs); i++) {
@@ -202,7 +203,7 @@ static int ctch_open(struct intel_guc *guc, }/* vma should be already allocated and map'ed */ - base =guc_ggtt_offset (ctch->vma); + base =intel_guc_ggtt_offset (guc, ctch->vma);/* (re)initialize descriptors * cmds buffers are in the second half of the blob page
drivers/gpu/drm/i915/intel_guc_fw.c +1 -1
@@ -165,7 +165,7 @@ static int guc_xfer_ucode(struct intel_guc *guc, struct i915_vma *vma)I915_WRITE (DMA_COPY_SIZE , guc_fw->header_size + guc_fw->ucode_size);/* Set the source address for the new blob */ - offset =guc_ggtt_offset (vma) + guc_fw->header_offset; + offset =intel_guc_ggtt_offset (guc, vma) + guc_fw->header_offset;I915_WRITE (DMA_ADDR_0_LOW ,lower_32_bits (offset));I915_WRITE (DMA_ADDR_0_HIGH ,upper_32_bits (offset) &0xFFFF );
drivers/gpu/drm/i915/intel_guc_log.c +1 -1
@@ -581,7 +581,7 @@ int intel_guc_log_create(struct intel_guc *guc) (GUC_LOG_ISR_PAGES <<GUC_LOG_ISR_SHIFT ) | (GUC_LOG_CRASH_PAGES <<GUC_LOG_CRASH_SHIFT ); - offset =guc_ggtt_offset (vma) >>PAGE_SHIFT ;/* in pages */ + offset =intel_guc_ggtt_offset (guc, vma) >>PAGE_SHIFT ; guc->log.flags = (offset <<GUC_LOG_BUF_ADDR_SHIFT ) | flags;return 0 ;
drivers/gpu/drm/i915/intel_guc_reg.h +0 -3
@@ -80,9 +80,6 @@#define GUC_WOPCM_TOP (0x80 << 12)/* 512KB */ #define BXT_GUC_WOPCM_RC6_RESERVED (0x10 << 12)/* 64KB */ -/* GuC addresses above GUC_GGTT_TOP also don't map through the GTT */ -#define GUC_GGTT_TOP 0xFEE00000 -#define GEN8_GT_PM_CONFIG _MMIO(0x138140)#define GEN9LP_GT_PM_CONFIG _MMIO(0x138140)#define GEN9_GT_PM_CONFIG _MMIO(0x13816c)
drivers/gpu/drm/i915/intel_guc_submission.c +5 -5
@@ -386,8 +386,8 @@ static void guc_stage_desc_init(struct intel_guc *guc, lrc->context_desc =lower_32_bits (ce->lrc_desc);/* The state page is after PPHWSP */ - lrc->ring_lrca = -guc_ggtt_offset (ce->state) +LRC_STATE_PN *PAGE_SIZE ; + lrc->ring_lrca =intel_guc_ggtt_offset (guc, ce->state) + +LRC_STATE_PN *PAGE_SIZE ;/* XXX: In direct submission, the GuC wants the HW context id * here. In proxy submission, it wants the stage id
@@ -395,7 +395,7 @@ static void guc_stage_desc_init(struct intel_guc *guc, lrc->context_id = (client->stage_id <<GUC_ELC_CTXID_OFFSET ) | (guc_engine_id <<GUC_ELC_ENGINE_OFFSET ); - lrc->ring_begin =guc_ggtt_offset (ce->ring->vma); + lrc->ring_begin =intel_guc_ggtt_offset (guc, ce->ring->vma); lrc->ring_end = lrc->ring_begin + ce->ring->size -1 ; lrc->ring_next_free_location = lrc->ring_begin; lrc->ring_current_tail_pointer_value =0 ;
@@ -411,7 +411,7 @@ static void guc_stage_desc_init(struct intel_guc *guc,* The doorbell, process descriptor, and workqueue are all parts * of the client object, which the GuC will reference via the GGTT */ - gfx_addr =guc_ggtt_offset (client->vma); + gfx_addr =intel_guc_ggtt_offset (guc, client->vma); desc->db_trigger_phy =sg_dma_address (client->vma->pages->sgl) + client->doorbell_offset; desc->db_trigger_cpu =ptr_to_u64 (__get_doorbell (client));
@@ -584,7 +584,7 @@ static void inject_preempt_context(struct work_struct *work) data[3 ] = engine->guc_id; data[4 ] = guc->execbuf_client->priority; data[5 ] = guc->execbuf_client->stage_id; - data[6 ] =guc_ggtt_offset (guc->shared_data); + data[6 ] =intel_guc_ggtt_offset (guc, guc->shared_data);if (WARN_ON (intel_guc_send (guc, data,ARRAY_SIZE (data)))) { execlists_clear_active(&engine->execlists,
drivers/gpu/drm/i915/intel_huc.c +2 -1
@@ -63,7 +63,8 @@ int intel_huc_auth(struct intel_huc *huc) } ret =intel_guc_auth_huc (guc, -guc_ggtt_offset (vma) + huc->fw.rsa_offset); +intel_guc_ggtt_offset (guc, vma) + + huc->fw.rsa_offset);if (ret) {DRM_ERROR ("HuC: GuC did not ack Auth request %d\n" , ret); goto fail_unpin;
drivers/gpu/drm/i915/intel_huc_fw.c +2 -1
@@ -118,7 +118,8 @@ static int huc_fw_xfer(struct intel_uc_fw *huc_fw, struct i915_vma *vma)intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL );/* Set the source address for the uCode */ - offset =guc_ggtt_offset (vma) + huc_fw->header_offset; + offset =intel_guc_ggtt_offset (&dev_priv->guc, vma) + + huc_fw->header_offset;I915_WRITE (DMA_ADDR_0_LOW ,lower_32_bits (offset));I915_WRITE (DMA_ADDR_0_HIGH ,upper_32_bits (offset) &0xFFFF );
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v13 2/6 drm/i915: Implement dynamic GuC WOPCM offset and size calculation
Hardware may have specific restrictions on GuC WOPCM offset and size. On Gen9, the value of the GuC WOPCM size register needs to be larger than the value of GuC WOPCM offset register + a Gen9 specific offset (144KB) for reserved GuC WOPCM. Fail to enforce such a restriction on GuC WOPCM size will lead to GuC firmware execution failures. On the other hand, with current static GuC WOPCM offset and size values (512KB for both offset and size), the GuC WOPCM size verification will fail on Gen9 even if it can be fixed by lowering the GuC WOPCM offset by calculating its value based on HuC firmware size (which is likely less than 200KB on Gen9), so that we can have a GuC WOPCM size value which is large enough to pass the GuC WOPCM size check.
This patch updates the reserved GuC WOPCM size for RC6 context on Gen9 to 24KB to strictly align with the Gen9 GuC WOPCM layout. It also adds support to verify the GuC WOPCM size aganist the Gen9 hardware restrictions. To meet all above requirements, let's provide dynamic partitioning of the WOPCM that will be based on platform specific HuC/GuC firmware sizes.
v2:
- Removed intel_wopcm_init (Ville/Sagar/Joonas)
- Renamed and Moved the intel_wopcm_partition into intel_guc (Sagar)
- Removed unnecessary function calls (Joonas)
- Init GuC WOPCM partition as soon as firmware fetching is completed
v3:
- Fixed indentation issues (Chris)
- Removed layering violation code (Chris/Michal)
- Created separat files for GuC wopcm code (Michal)
- Used inline function to avoid code duplication (Michal)
v4:
- Preset the GuC WOPCM top during early GuC init (Chris)
- Fail intel_uc_init_hw() as soon as GuC WOPCM partitioning failed
v5:
- Moved GuC DMA WOPCM register updating code into intel_wopcm.c
- Took care of the locking status before writing to GuC DMA Write-Once registers. (Joonas)
v6:
- Made sure the GuC WOPCM size to be multiple of 4K (4K aligned)
v8:
- Updated comments and fixed naming issues (Sagar/Joonas)
- Updated commit message to include more description about the hardware restriction on GuC WOPCM size (Sagar)
v9:
- Minor changes variable names and code comments (Sagar)
- Added detailed GuC WOPCM layout drawing (Sagar/Michal)
- Refined macro definitions to be reader friendly (Michal)
- Removed redundent check to valid flag (Michal)
- Unified first parameter for exported GuC WOPCM functions (Michal)
- Refined the name and parameter list of hardware restriction checking functions (Michal)
v10:
- Used shorter function name for internal functions (Joonas)
- Moved init-ealry function into c file (Joonas)
- Consolidated and removed redundant size checks (Joonas/Michal)
- Removed unnecessary unlikely() from code which is only called once during boot (Joonas)
- More fixes to kernel-doc format and content (Michal)
- Avoided the use of PAGE_MASK for 4K pages (Michal)
- Added error log messages to error paths (Michal)
v11:
- Replaced intel_guc_wopcm with more generic intel_wopcm and attached intel_wopcm to drm_i915_private instead intel_guc (Michal)
- dynamic calculation of GuC non-wopcm memory start (a.k.a WOPCM Top offset from GuC WOPCM base) (Michal)
- Moved WOPCM marco definitions into .c source file (Michal)
- Exported WOPCM layout diagram as kernel-doc (Michal)
v12:
- Updated naming, function kernel-doc to align with new changes (Michal)
v13:
- Updated the ordering of s-o-b/cc/r-b tags (Sagar)
- Corrected one tense error in comment (Sagar)
- Corrected typos and removed spurious comments (Joonas)
Bspec: 12690
--- drivers/gpu/drm/i915/Makefile | 3 +- drivers/gpu/drm/i915/i915_drv.c | 1 + drivers/gpu/drm/i915/i915_drv.h | 8 ++ drivers/gpu/drm/i915/i915_gem.c | 4 + drivers/gpu/drm/i915/i915_gem_context.c | 5 +- drivers/gpu/drm/i915/intel_guc.c | 66 +++++++++--- drivers/gpu/drm/i915/intel_guc.h | 18 ++-- drivers/gpu/drm/i915/intel_guc_reg.h | 8 +- drivers/gpu/drm/i915/intel_huc.c | 2 +- drivers/gpu/drm/i915/intel_uc.c | 6 +- drivers/gpu/drm/i915/intel_uc_fw.c | 13 +-- drivers/gpu/drm/i915/intel_uc_fw.h | 16 +++ drivers/gpu/drm/i915/intel_wopcm.c | 182 ++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_wopcm.h | 30 ++++++ 14 files changed, 321 insertions(+), 41 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_wopcm.c create mode 100644 drivers/gpu/drm/i915/intel_wopcm.h
drivers/gpu/drm/i915/Makefile +2 -1
@@ -79,7 +79,8 @@ i915-y += i915_cmd_parser.o \ intel_lrc.o \ intel_mocs.o \ intel_ringbuffer.o \ - intel_uncore.o + intel_uncore.o \ + intel_wopcm.o # general-purpose microcontroller (GuC) support i915-y += intel_uc.o \
drivers/gpu/drm/i915/i915_drv.c +1 -0
@@ -919,6 +919,7 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,mutex_init (&dev_priv->wm.wm_mutex);mutex_init (&dev_priv->pps_mutex); +intel_wopcm_init_early (&dev_priv->wopcm);intel_uc_init_early (dev_priv);i915_memcpy_init_early (dev_priv);
drivers/gpu/drm/i915/i915_drv.h +8 -0
@@ -64,6 +64,7 @@#include "intel_opregion.h" #include "intel_ringbuffer.h" #include "intel_uncore.h" +#include "intel_wopcm.h" #include "intel_uc.h" #include "i915_gem.h"
@@ -1588,6 +1589,8 @@ struct drm_i915_private {struct intel_gvt *gvt; +struct intel_wopcm wopcm; +struct intel_huc huc;struct intel_guc guc;
@@ -2120,6 +2123,11 @@ static inline struct drm_i915_private *kdev_to_i915(struct device *kdev)return to_i915 (dev_get_drvdata (kdev)); } +static inline struct drm_i915_private *wopcm_to_i915 (struct intel_wopcm *wopcm) +{ + return container_of(wopcm, struct drm_i915_private, wopcm); +} +static inline struct drm_i915_private *guc_to_i915 (struct intel_guc *guc) { return container_of(guc, struct drm_i915_private, guc);
drivers/gpu/drm/i915/i915_gem.c +4 -0
@@ -5304,6 +5304,10 @@ int i915_gem_init(struct drm_i915_private *dev_priv)if (ret)return ret; + ret =intel_wopcm_init (&dev_priv->wopcm); +if (ret) +return ret; + ret =intel_uc_init_misc (dev_priv);if (ret)return ret;
drivers/gpu/drm/i915/i915_gem_context.c +3 -2
@@ -318,12 +318,13 @@ __create_hw_context(struct drm_i915_private *dev_priv, ctx->desc_template =default_desc_template (dev_priv, dev_priv->mm.aliasing_ppgtt); -/* GuC requires the ring to be placed above GUC_WOPCM_TOP. If GuC is not +/* +* GuC requires the ring to be placed in Non-WOPCM memory. If GuC is not * present or not in use we still need a small bias as ring wraparound * at offset 0 sometimes hangs. No idea why. */ if (USES_GUC (dev_priv)) - ctx->ggtt_offset_bias =GUC_WOPCM_TOP ; + ctx->ggtt_offset_bias = dev_priv->guc.ggtt_pin_bias;else ctx->ggtt_offset_bias =I915_GTT_PAGE_SIZE ;
drivers/gpu/drm/i915/intel_guc.c +53 -13
87 lines not on this page · raw message
drivers/gpu/drm/i915/intel_guc.h +11 -7
@@ -49,6 +49,9 @@ struct intel_guc {struct intel_guc_log log;struct intel_guc_ct ct; +/* Offset where Non-WOPCM memory starts. */ +u32 ggtt_pin_bias; +/* Log snapshot if GuC errors during load */ struct drm_i915_gem_object *load_err_log;
@@ -108,19 +111,20 @@ static inline void intel_guc_notify(struct intel_guc *guc)* @guc: intel_guc structure. * @vma: i915 graphics virtual memory area. * -* GuC does not allow any gfx GGTT address that falls into range [0, WOPCM_TOP), -* which is reserved for Boot ROM, SRAM and WOPCM. Currently this top address is -* 512K. In order to exclude 0-512K address space from GGTT, all gfx objects -* used by GuC is pinned with PIN_OFFSET_BIAS along with size of WOPCM. +* GuC does not allow any gfx GGTT address that falls into range +* [0, GuC ggtt_pin_bias), which is reserved for Boot ROM, SRAM and WOPCM. +* Currently, in order to exclude [0, GuC ggtt_pin_bias) address space from +* GGTT, all gfx objects used by GuC are allocated with intel_guc_allocate_vma() +* and pinned with PIN_OFFSET_BIAS along with the value of GuC ggtt_pin_bias. * -* Return: GGTT offset that meets the GuC gfx address requirement. +* Return: GGTT offset of the @vma. */ static inline u32 intel_guc_ggtt_offset (struct intel_guc *guc,struct i915_vma *vma) {u32 offset =i915_ggtt_offset (vma); -GEM_BUG_ON (offset <GUC_WOPCM_TOP ); +GEM_BUG_ON (offset < guc->ggtt_pin_bias);GEM_BUG_ON (range_overflows_t (u64, offset, vma->size,GUC_GGTT_TOP ));return offset;
@@ -129,6 +133,7 @@ static inline u32 intel_guc_ggtt_offset(struct intel_guc *guc,void intel_guc_init_early (struct intel_guc *guc);void intel_guc_init_send_regs (struct intel_guc *guc);void intel_guc_init_params (struct intel_guc *guc); +void intel_guc_init_ggtt_pin_bias (struct intel_guc *guc);int intel_guc_init_wq (struct intel_guc *guc);void intel_guc_fini_wq (struct intel_guc *guc);int intel_guc_init (struct intel_guc *guc);
@@ -141,7 +146,6 @@ int intel_guc_auth_huc(struct intel_guc *guc, u32 rsa_offset);int intel_guc_suspend (struct intel_guc *guc);int intel_guc_resume (struct intel_guc *guc);struct i915_vma *intel_guc_allocate_vma (struct intel_guc *guc,u32 size); -u32 intel_guc_wopcm_size (struct drm_i915_private *dev_priv);static inline int intel_guc_sanitize (struct intel_guc *guc) {
drivers/gpu/drm/i915/intel_guc_reg.h +3 -5
@@ -68,17 +68,15 @@#define DMA_GUC_WOPCM_OFFSET _MMIO(0xc340)#define HUC_LOADING_AGENT_VCR (0<<1)#define HUC_LOADING_AGENT_GUC (1<<1) -#define GUC_WOPCM_OFFSET_VALUE 0x80000/* 512KB */ +#define GUC_WOPCM_OFFSET_SHIFT 14#define GUC_MAX_IDLE_COUNT _MMIO(0xC3E4)#define HUC_STATUS2 _MMIO(0xD3B0)#define HUC_FW_VERIFIED (1<<7) -/* Defines WOPCM space available to GuC firmware */ #define GUC_WOPCM_SIZE _MMIO(0xc050) -/* GuC addresses below GUC_WOPCM_TOP don't map through the GTT */ -#define GUC_WOPCM_TOP (0x80 << 12)/* 512KB */ -#define BXT_GUC_WOPCM_RC6_RESERVED (0x10 << 12)/* 64KB */ +#define GUC_WOPCM_SIZE_SHIFT 12 +#define GUC_WOPCM_SIZE_MASK (0xfffff << GUC_WOPCM_SIZE_SHIFT)#define GEN8_GT_PM_CONFIG _MMIO(0x138140)#define GEN9LP_GT_PM_CONFIG _MMIO(0x138140)
drivers/gpu/drm/i915/intel_huc.c +1 -1
@@ -55,7 +55,7 @@ int intel_huc_auth(struct intel_huc *huc)return -ENOEXEC ; vma =i915_gem_object_ggtt_pin (huc->fw.obj,NULL ,0 ,0 , -PIN_OFFSET_BIAS |GUC_WOPCM_TOP ); +PIN_OFFSET_BIAS | guc->ggtt_pin_bias);if (IS_ERR (vma)) { ret =PTR_ERR (vma);DRM_ERROR ("HuC: Failed to pin huc fw object %d\n" , ret);
drivers/gpu/drm/i915/intel_uc.c +4 -2
@@ -272,6 +272,8 @@ int intel_uc_init_misc(struct drm_i915_private *dev_priv)if (!USES_GUC (dev_priv))return 0 ; +intel_guc_init_ggtt_pin_bias (guc); + ret =intel_guc_init_wq (guc);if (ret)return ret;
@@ -366,9 +368,9 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)gen9_reset_guc_interrupts (dev_priv);/* init WOPCM */ -I915_WRITE (GUC_WOPCM_SIZE ,intel_guc_wopcm_size (dev_priv)); +I915_WRITE (GUC_WOPCM_SIZE , dev_priv->wopcm.guc.size);I915_WRITE (DMA_GUC_WOPCM_OFFSET , -GUC_WOPCM_OFFSET_VALUE |HUC_LOADING_AGENT_GUC ); + dev_priv->wopcm.guc.base |HUC_LOADING_AGENT_GUC );/* WaEnableuKernelHeaderValidFix:skl */ /* WaEnableGuCBootHashCheckNotSet:skl,bxt,kbl */
drivers/gpu/drm/i915/intel_uc_fw.c +3 -10
@@ -95,15 +95,6 @@ void intel_uc_fw_fetch(struct drm_i915_private *dev_priv, uc_fw->ucode_offset = uc_fw->header_offset + uc_fw->header_size; uc_fw->ucode_size = (css->size_dw - css->header_size_dw) *sizeof (u32); -/* Header and uCode will be loaded to WOPCM */ - size = uc_fw->header_size + uc_fw->ucode_size; -if (size >intel_guc_wopcm_size (dev_priv)) { -DRM_WARN ("%s: Firmware is too large to fit in WOPCM\n" , -intel_uc_fw_type_repr (uc_fw->type)); - err = -E2BIG ; - goto fail; - } -/* now RSA */ if (css->key_size_dw !=UOS_RSA_SCRATCH_COUNT ) { DRM_WARN("%s: Mismatched firmware RSA key size (%u)\n",
@@ -208,6 +199,7 @@ int intel_uc_fw_upload(struct intel_uc_fw *uc_fw,int (*xfer)(struct intel_uc_fw *uc_fw, struct i915_vma *vma)) { +struct drm_i915_private *i915 =to_i915 (uc_fw->obj->base.dev);struct i915_vma *vma;int err;
@@ -231,7 +223,8 @@ int intel_uc_fw_upload(struct intel_uc_fw *uc_fw, } vma =i915_gem_object_ggtt_pin (uc_fw->obj,NULL ,0 ,0 , -PIN_OFFSET_BIAS |GUC_WOPCM_TOP ); +PIN_OFFSET_BIAS | + i915->guc.ggtt_pin_bias);if (IS_ERR (vma)) { err =PTR_ERR (vma); DRM_DEBUG_DRIVER("%s fw ggtt-pin err=%d\n",
drivers/gpu/drm/i915/intel_uc_fw.h +16 -0
@@ -121,6 +121,22 @@ static inline void intel_uc_fw_sanitize(struct intel_uc_fw *uc_fw) uc_fw->load_status =INTEL_UC_FIRMWARE_PENDING ; } +/** +* intel_uc_fw_get_upload_size() - Get size of firmware needed to be uploaded. +* @uc_fw: uC firmware. +* +* Get the size of the firmware and header that will be uploaded to WOPCM. +* +* Return: Upload firmware size, or zero on firmware fetch failure. +*/ +static inline u32 intel_uc_fw_get_upload_size (struct intel_uc_fw *uc_fw) +{ +if (uc_fw->fetch_status !=INTEL_UC_FIRMWARE_SUCCESS ) +return 0 ; + +return uc_fw->header_size + uc_fw->ucode_size; +} +void intel_uc_fw_fetch (struct drm_i915_private *dev_priv,struct intel_uc_fw *uc_fw); int intel_uc_fw_upload(struct intel_uc_fw *uc_fw,
drivers/gpu/drm/i915/intel_wopcm.c new file +182 -0
182 lines not on this page · raw message
drivers/gpu/drm/i915/intel_wopcm.h new file +30 -0
@@ -0,0 +1,30 @@ +/* +* SPDX-License-Identifier: MIT +* +* Copyright © 2017-2018 Intel Corporation +*/ + +#ifndef _INTEL_WOPCM_H_ +#define _INTEL_WOPCM_H_ + +#include <linux/types.h> + +/** +* struct intel_wopcm - Overall WOPCM info and WOPCM regions. +* @size: Size of overall WOPCM. +* @guc: GuC WOPCM Region info. +* @guc.base: GuC WOPCM base which is offset from WOPCM base. +* @guc.size: Size of the GuC WOPCM region. +*/ +struct intel_wopcm { +u32 size; +struct { +u32 base; +u32 size; + } guc; +}; + +void intel_wopcm_init_early (struct intel_wopcm *wopcm); +int intel_wopcm_init (struct intel_wopcm *wopcm); + +#endif
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v13 2/6] drm/i915: Implement dynamic GuC WOPCM offset and size calculation
Quoting Jackie Li (2018-03-14 02:32:50)
Quoted 84 lines
Hardware may have specific restrictions on GuC WOPCM offset and size. On Gen9, the value of the GuC WOPCM size register needs to be larger than the value of GuC WOPCM offset register + a Gen9 specific offset (144KB) for reserved GuC WOPCM. Fail to enforce such a restriction on GuC WOPCM size will lead to GuC firmware execution failures. On the other hand, with current static GuC WOPCM offset and size values (512KB for both offset and size), the GuC WOPCM size verification will fail on Gen9 even if it can be fixed by lowering the GuC WOPCM offset by calculating its value based on HuC firmware size (which is likely less than 200KB on Gen9), so that we can have a GuC WOPCM size value which is large enough to pass the GuC WOPCM size check.
This patch updates the reserved GuC WOPCM size for RC6 context on Gen9 to 24KB to strictly align with the Gen9 GuC WOPCM layout. It also adds support to verify the GuC WOPCM size aganist the Gen9 hardware restrictions. To meet all above requirements, let's provide dynamic partitioning of the WOPCM that will be based on platform specific HuC/GuC firmware sizes.
v2:
- Removedintel_wopcm_init(Ville/Sagar/Joonas)
- Renamed and Moved theintel_wopcm_partitionintointel_guc(Sagar)
- Removed unnecessary function calls (Joonas)
- Init GuC WOPCM partition as soon as firmware fetching is completedv3:
- Fixed indentation issues (Chris)
- Removed layering violation code (Chris/Michal)
- Created separat files for GuC wopcm code (Michal)
- Used inline function to avoid code duplication (Michal)v4:
- Preset the GuC WOPCM top during early GuC init (Chris)
- Failintel_uc_init_hw()as soon as GuC WOPCM partitioning failedv5:
- Moved GuC DMA WOPCM register updating code intointel_wopcm.c
- Took care of the locking status before writing to GuC DMA Write-Once registers. (Joonas)v6:
- Made sure the GuC WOPCM size to be multiple of 4K (4K aligned)v8:
- Updated comments and fixed naming issues (Sagar/Joonas)
- Updated commit message to include more description about the hardware restriction on GuC WOPCM size (Sagar)v9:
- Minor changes variable names and code comments (Sagar)
- Added detailed GuC WOPCM layout drawing (Sagar/Michal)
- Refined macro definitions to be reader friendly (Michal)
- Removed redundent check to valid flag (Michal)
- Unified first parameter for exported GuC WOPCM functions (Michal)
- Refined the name and parameter list of hardware restriction checking functions (Michal)v10:
- Used shorter function name for internal functions (Joonas)
- Moved init-ealry function into c file (Joonas)
- Consolidated and removed redundant size checks (Joonas/Michal)
- Removed unnecessaryunlikely()from code which is only called once during boot (Joonas)
- More fixes to kernel-doc format and content (Michal)
- Avoided the use ofPAGE_MASKfor 4K pages (Michal)
- Added error log messages to error paths (Michal)v11:
- Replacedintel_guc_wopcmwith more genericintel_wopcmand attachedintel_wopcmtodrm_i915_privateinsteadintel_guc(Michal)
- dynamic calculation of GuC non-wopcm memory start (a.k.a WOPCM Top offset from GuC WOPCM base) (Michal)
- Moved WOPCM marco definitions into .c source file (Michal)
- Exported WOPCM layout diagram as kernel-doc (Michal)v12:
- Updated naming, function kernel-doc to align with new changes (Michal)v13:
- Updated the ordering of s-o-b/cc/r-b tags (Sagar)
- Corrected one tense error in comment (Sagar)
- Corrected typos and removed spurious comments (Joonas)Bspec: 12690
Quoted 13 lines
Signed-off-by Jackie Li <[email protected]>Cc Michal Wajdeczko <[email protected]>Cc Sagar Arun Kamble <[email protected]>Cc Sujaritha Sundaresan <[email protected]>Cc Daniele Ceraolo Spurio <[email protected]>Cc John Spotswood <[email protected]>Cc Oscar Mateo <[email protected]>Cc Chris Wilson <[email protected]>Cc Joonas Lahtinen <[email protected]>Reviewed-by Sagar Arun Kamble <[email protected]> (v8)Reviewed-by Joonas Lahtinen <[email protected]> (v9)Reviewed-by Michal Wajdeczko <[email protected]> (v11)Reviewed-by Joonas Lahtinen <[email protected]> (v12)
Regards, Joonas
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v13 3/6 drm/i915: Add support to return CNL specific reserved WOPCM size
In reply to Jackie LiCNL has its specific reserved GuC WOPCM size for RC6 and other hardware contexts.
This patch updates the code to return CNL specific reserved GuC WOPCM size for RC6 and other hardware contexts so that the GuC WOPCM size can be calculated correctly for CNL.
v9:
- Created a new patch for these changes originally made in v8 4/6 patch of this series (Sagar/Michal)
v10:
- Used if-else ladder to the returning of context sizes (Joonas)
v11:
- Removed GUC_ prefix from context size macro (Michal)
v13:
- Updated the ordering of s-o-b/cc/r-b tags (Sagar)
Bspec: 12690
--- drivers/gpu/drm/i915/intel_wopcm.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/i915/intel_wopcm.c +4 -0
@@ -54,6 +54,8 @@/* 24KB at the end of WOPCM is reserved for RC6 CTX on BXT. */ #define BXT_WOPCM_RC6_CTX_RESERVED (24 * 1024) +/* 36KB WOPCM reserved at the end of WOPCM on CNL. */ +#define CNL_WOPCM_HW_CTX_RESERVED (36 * 1024)/* 128KB from GUC_WOPCM_RESERVED is reserved for FW on Gen9. */ #define GEN9_GUC_FW_RESERVED (128 * 1024)
@@ -76,6 +78,8 @@ static inline u32 context_reserved_size(struct drm_i915_private *i915) {if (IS_GEN9_LP (i915))return BXT_WOPCM_RC6_CTX_RESERVED ; +else if (INTEL_GEN (i915) >=10 ) +return CNL_WOPCM_HW_CTX_RESERVED ;else return 0 ; }
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v13 3/6] drm/i915: Add support to return CNL specific reserved WOPCM size
Quoting Jackie Li (2018-03-14 02:32:51)
Quoted 22 lines
CNL has its specific reserved GuC WOPCM size for RC6 and other hardware contexts.
This patch updates the code to return CNL specific reserved GuC WOPCM size for RC6 and other hardware contexts so that the GuC WOPCM size can be calculated correctly for CNL.
v9:
- Created a new patch for these changes originally made in v8 4/6 patch of this series (Sagar/Michal)v10:
- Used if-else ladder to the returning of context sizes (Joonas)v11:
- RemovedGUC_prefix from context size macro (Michal)v13:
- Updated the ordering of s-o-b/cc/r-b tags (Sagar)Bspec: 12690
Quoted 8 lines
Signed-off-by Jackie Li <[email protected]>Cc Sagar Arun Kamble <[email protected]>Cc Michal Wajdeczko <[email protected]>Cc Chris Wilson <[email protected]>Cc Joonas Lahtinen <[email protected]>Reviewed-by Joonas Lahtinen <[email protected]> (v9)Reviewed-by Michal Wajdeczko <[email protected]> (v11)Reviewed-by Joonas Lahtinen <[email protected]> (v12)
Regards, Joonas
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v13 4/6 drm/i915: Add HuC firmware size related restriction for Gen9 and CNL A0
In reply to Jackie LiOn CNL A0 and Gen9, there's a hardware restriction that requires the available GuC WOPCM size to be larger than or equal to HuC firmware size.
This patch adds new verification code to ensure the available GuC WOPCM size to be larger than or equal to HuC firmware size on both Gen9 and CNL A0.
v6:
- Extended HuC FW size check against GuC WOPCM size to all Gen9 and CNL A0 platforms
v7:
- Fixed patch format issues
v8:
- Renamed variables and functions to avoid ambiguity (Joonas)
- Updated commit message and comments to be more comprehensive (Sagar)
v9:
- Moved code that is not related to restriction check into a separate patch and updated the commit message accordingly (Sagar/Michal)
- Avoided to call uc_get_fw_size for better layer isolation (Michal)
v10:
- Shorten function names and reorganized size_check code to have clear isolation (Joonas)
- Removed unnecessary comments (Joonas)
v11:
- Fixed logic error in size check (Michal)
v12:
- Add space between "HuC FW" and "(%uKiB)" in error message (Michal)
v13:
- Updated the ordering of s-o-b/cc/r-b tags (Sagar)
BSpec: 10875
--- drivers/gpu/drm/i915/intel_wopcm.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_wopcm.c +25 -2
@@ -105,14 +105,36 @@ static inline int gen9_check_dword_gap(u32 guc_wopcm_base, u32 guc_wopcm_size)return 0 ; } +static inline int gen9_check_huc_fw_fits (u32 guc_wopcm_size,u32 huc_fw_size) +{ +/* +* On Gen9 & CNL A0, hardware requires the total available GuC WOPCM +* size to be larger than or equal to HuC firmware size. Otherwise, +* firmware uploading would fail. +*/ +if (huc_fw_size > guc_wopcm_size -GUC_WOPCM_RESERVED ) { +DRM_ERROR ("HuC FW (%uKiB) won't fit in GuC WOPCM (%uKiB).\n" , + huc_fw_size /1024 , + (guc_wopcm_size -GUC_WOPCM_RESERVED ) /1024 ); +return -E2BIG ; + } + +return 0 ; +} +static inline int check_hw_restriction (struct drm_i915_private *i915, -u32 guc_wopcm_base,u32 guc_wopcm_size) +u32 guc_wopcm_base,u32 guc_wopcm_size, +u32 huc_fw_size) {int err =0 ;if (IS_GEN9 (i915)) err =gen9_check_dword_gap (guc_wopcm_base, guc_wopcm_size); +if (!err && + (IS_GEN9 (i915) ||IS_CNL_REVID (i915,CNL_REVID_A0 ,CNL_REVID_A0 ))) + err =gen9_check_huc_fw_fits (guc_wopcm_size, huc_fw_size); +return err; }
@@ -175,7 +197,8 @@ int intel_wopcm_init(struct intel_wopcm *wopcm)return -E2BIG ; } - err =check_hw_restriction (i915, guc_wopcm_base, guc_wopcm_size); + err =check_hw_restriction (i915, guc_wopcm_base, guc_wopcm_size, + huc_fw_size);if (err)return err;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v13 4/6] drm/i915: Add HuC firmware size related restriction for Gen9 and CNL A0
Quoting Jackie Li (2018-03-14 02:32:52)
Quoted 39 lines
On CNL A0 and Gen9, there's a hardware restriction that requires the available GuC WOPCM size to be larger than or equal to HuC firmware size.
This patch adds new verification code to ensure the available GuC WOPCM size to be larger than or equal to HuC firmware size on both Gen9 and CNL A0.
v6:
- Extended HuC FW size check against GuC WOPCM size to all Gen9 and CNL A0 platformsv7:
- Fixed patch format issuesv8:
- Renamed variables and functions to avoid ambiguity (Joonas)
- Updated commit message and comments to be more comprehensive (Sagar)v9:
- Moved code that is not related to restriction check into a separate patch and updated the commit message accordingly (Sagar/Michal)
- Avoided to calluc_get_fw_sizefor better layer isolation (Michal)v10:
- Shorten function names and reorganizedsize_checkcode to have clear isolation (Joonas)
- Removed unnecessary comments (Joonas)v11:
- Fixed logic error in size check (Michal)v12:
- Add space between "HuC FW" and "(%uKiB)" in error message (Michal)v13:
- Updated the ordering of s-o-b/cc/r-b tags (Sagar)BSpec: 10875
Quoted 10 lines
Signed-off-by Jackie Li <[email protected]>Cc Michal Wajdeczko <[email protected]>Cc Sagar Arun Kamble <[email protected]>Cc John Spotswood <[email protected]>Cc Jeff McGee <[email protected]>Cc Chris Wilson <[email protected]>Cc Joonas Lahtinen <[email protected]>Reviewed-by Sagar Arun Kamble <[email protected]> (v8)Reviewed-by Michal Wajdeczko <[email protected]> (v11)Reviewed-by Joonas Lahtinen <[email protected]> (v12)
Regards, Joonas
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v13 5/6 drm/i915/guc: Check the locking status of GuC WOPCM registers
In reply to Jackie LiGuC WOPCM registers are write-once registers. Current driver code accesses these registers without checking the accessibility to these registers which will lead to unpredictable driver behaviors if these registers were touch by other components (such as faulty BIOS code).
This patch moves the GuC WOPCM registers updating code into intel_wopcm.c and adds check before and after the update to GuC WOPCM registers so that we can make sure the driver is in a known state after writing to these write-once registers.
v6:
- Made sure module reloading won't bug the kernel while doing locking status checking
v7:
- Fixed patch format issues
v8:
- Fixed coding style issue on register lock bit macro definition (Sagar)
v9:
- Avoided to use redundant !! to cast uint to bool (Chris)
- Return error code instead of GEM_BUG_ON for locked with invalid register values case (Sagar)
- Updated guc_wopcm_hw_init to use guc_wopcm as first parameter (Michal)
- Added code to set and validate the HuC_LOADING_AGENT_GUC bit in GuC WOPCM offset register based on the presence of HuC firmware (Michal)
- Use bit fields instead of macros for GuC WOPCM flags (Michal)
v10:
- Refined variable names, removed redundant comments (Joonas)
- Introduced lockable_reg to handle the write once register write and propagate the write error to caller (Joonas)
- Used lockable_reg abstraction to avoid locking bit check on generic i915_reg_t (Michal)
- Added log message for error paths (Michal)
- Removed hw_updated flag and only relies on real hardware status
v11:
- Replaced lockable_reg with simplified function (Michal)
- Used new macros for locking bits of WOPCM size/offset registers instead of using BIT(0) directly (Michal)
- use intel_wopcm_init_hw() called from intel_gem_init_hw() to do GuC WOPCM register setup instead of calling from intel_uc_init_hw() (Michal)
v12:
- Updated function kernel-doc to align with code changes (Michal)
- Updated code to use wopcm pointer directly (Michal)
v13:
- Updated the ordering of s-o-b/cc/r-b tags (Sagar)
BSpec: 10875, 10833
--- drivers/gpu/drm/i915/i915_gem.c | 6 ++++ drivers/gpu/drm/i915/intel_guc_reg.h | 3 ++ drivers/gpu/drm/i915/intel_uc.c | 5 --- drivers/gpu/drm/i915/intel_wopcm.c | 64 ++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_wopcm.h | 1 + 5 files changed, 74 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_gem.c +6 -0
@@ -5147,6 +5147,12 @@ int i915_gem_init_hw(struct drm_i915_private *dev_priv) goto out; } + ret =intel_wopcm_init_hw (&dev_priv->wopcm); +if (ret) { +DRM_ERROR ("Enabling WOPCM failed (%d)\n" , ret); + goto out; + } +/* We can't enable contexts until all firmware is loaded */ ret =intel_uc_init_hw (dev_priv);if (ret) {
drivers/gpu/drm/i915/intel_guc_reg.h +3 -0
@@ -66,15 +66,18 @@#define UOS_MOVE (1<<4)#define START_DMA (1<<0)#define DMA_GUC_WOPCM_OFFSET _MMIO(0xc340) +#define GUC_WOPCM_OFFSET_VALID (1<<0)#define HUC_LOADING_AGENT_VCR (0<<1)#define HUC_LOADING_AGENT_GUC (1<<1)#define GUC_WOPCM_OFFSET_SHIFT 14 +#define GUC_WOPCM_OFFSET_MASK (0x3ffff << GUC_WOPCM_OFFSET_SHIFT)#define GUC_MAX_IDLE_COUNT _MMIO(0xC3E4)#define HUC_STATUS2 _MMIO(0xD3B0)#define HUC_FW_VERIFIED (1<<7)#define GUC_WOPCM_SIZE _MMIO(0xc050) +#define GUC_WOPCM_SIZE_LOCKED (1<<0)#define GUC_WOPCM_SIZE_SHIFT 12#define GUC_WOPCM_SIZE_MASK (0xfffff << GUC_WOPCM_SIZE_SHIFT)
drivers/gpu/drm/i915/intel_uc.c +0 -5
@@ -367,11 +367,6 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)gen9_reset_guc_interrupts (dev_priv); -/* init WOPCM */ -I915_WRITE (GUC_WOPCM_SIZE , dev_priv->wopcm.guc.size); -I915_WRITE (DMA_GUC_WOPCM_OFFSET , - dev_priv->wopcm.guc.base |HUC_LOADING_AGENT_GUC ); -/* WaEnableuKernelHeaderValidFix:skl */ /* WaEnableGuCBootHashCheckNotSet:skl,bxt,kbl */ if (IS_GEN9 (dev_priv))
drivers/gpu/drm/i915/intel_wopcm.c +64 -0
67 lines not on this page · raw message
drivers/gpu/drm/i915/intel_wopcm.h +1 -0
@@ -26,5 +26,6 @@ struct intel_wopcm {void intel_wopcm_init_early (struct intel_wopcm *wopcm);int intel_wopcm_init (struct intel_wopcm *wopcm); +int intel_wopcm_init_hw (struct intel_wopcm *wopcm);#endif
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v13 5/6] drm/i915/guc: Check the locking status of GuC WOPCM registers
Quoting Jackie Li (2018-03-14 02:32:53)
Quoted 60 lines
GuC WOPCM registers are write-once registers. Current driver code accesses these registers without checking the accessibility to these registers which will lead to unpredictable driver behaviors if these registers were touch by other components (such as faulty BIOS code).
This patch moves the GuC WOPCM registers updating code into
intel_wopcm.cand adds check before and after the update to GuC WOPCM registers so that we can make sure the driver is in a known state after writing to these write-once registers.v6:
- Made sure module reloading won't bug the kernel while doing locking status checkingv7:
- Fixed patch format issuesv8:
- Fixed coding style issue on register lock bit macro definition (Sagar)v9:
- Avoided to use redundant !! to cast uint to bool (Chris)
- Return error code instead ofGEM_BUG_ONfor locked with invalid register values case (Sagar)
- Updatedguc_wopcm_hw_initto useguc_wopcmas first parameter (Michal)
- Added code to set and validate theHuC_LOADING_AGENT_GUCbit in GuC WOPCM offset register based on the presence of HuC firmware (Michal)
- Use bit fields instead of macros for GuC WOPCM flags (Michal)v10:
- Refined variable names, removed redundant comments (Joonas)
- Introducedlockable_regto handle the write once register write and propagate the write error to caller (Joonas)
- Usedlockable_regabstraction to avoid locking bit check on generici915_reg_t(Michal)
- Added log message for error paths (Michal)
- Removedhw_updatedflag and only relies on real hardware statusv11:
- Replacedlockable_regwith simplified function (Michal)
- Used new macros for locking bits of WOPCM size/offset registers instead of using BIT(0) directly (Michal)
- useintel_wopcm_init_hw()called fromintel_gem_init_hw()to do GuC WOPCM register setup instead of calling fromintel_uc_init_hw()(Michal)v12:
- Updated function kernel-doc to align with code changes (Michal)
- Updated code to use wopcm pointer directly (Michal)v13:
- Updated the ordering of s-o-b/cc/r-b tags (Sagar)BSpec: 10875, 10833
Signed-off-by Jackie Li <[email protected]>Cc Michal Wajdeczko <[email protected]>Cc Chris Wilson <[email protected]>Cc Joonas Lahtinen <[email protected]>Reviewed-by Michal Wajdeczko <[email protected]> (v11)Reviewed-by Joonas Lahtinen <[email protected]> (v12)
<SNIP>
drivers/gpu/drm/i915/i915_gem.c int i915_gem_init_hw(struct drm_i915_private *dev_priv) · line 5152
Quoted 8 lines
+++
b/drivers/gpu/drm/i915/i915_gem.cdrivers/gpu/drm/i915/i915_gem.c +3
-0@@ -5147,6 +5147,12 @@ int i915_gem_init_hw(struct drm_i915_private *dev_priv) goto out; } + ret =intel_wopcm_init_hw (&dev_priv->wopcm); +if (ret) { +DRM_ERROR ("Enabling WOPCM failed (%d)\n" , ret);
This (or the other instance inside) can still be removed, it's a duplicate message.
Regards, Joonas
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v13 6/6 HAX Enable GuC Submission for CI
In reply to Jackie Li--- drivers/gpu/drm/i915/i915_params.c | 2 +- drivers/gpu/drm/i915/i915_params.h | 2 +- drivers/gpu/drm/i915/intel_uc.c | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_params.c +1 -1
@@ -152,7 +152,7 @@ i915_param_named_unsafe(edp_vswing, int, 0400,i915_param_named_unsafe (enable_guc, int,0400 ,"Enable GuC load for GuC submission and/or HuC load. " "Required functionality can be selected using bitmask values. " -"(-1=auto, 0=disable [default], 1=GuC submission, 2=HuC load)" ); +"(-1=auto [default], 0=disable, 1=GuC submission, 2=HuC load)" );i915_param_named (guc_log_level, int,0400 , "GuC firmware logging level. Requires GuC to be loaded. "
drivers/gpu/drm/i915/i915_params.h +1 -1
@@ -47,7 +47,7 @@ struct drm_printer; param(int, disable_power_well, -1) \ param(int, enable_ips, 1) \ param(int, invert_brightness, 0) \ - param(int, enable_guc, 0) \ + param(int, enable_guc, -1) \ param(int, guc_log_level, 0) \ param(char *, guc_firmware_path, NULL) \param (char *, huc_firmware_path, NULL) \
drivers/gpu/drm/i915/intel_uc.c +2 -0
@@ -63,6 +63,8 @@ static int __get_platform_enable_guc(struct drm_i915_private *dev_priv) enable_guc |=ENABLE_GUC_LOAD_HUC ;/* Any platform specific fine-tuning can be done here */ +if (boot_cpu_has (X86_FEATURE_HYPERVISOR )) + enable_guc =0 ;return enable_guc; }
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [v13,1/6] drm/i915/guc: Rename guc_ggtt_offset to intel_guc_ggtt_offset
In reply to Jackie Li== Series Details ==
== Series Details ==
Series: series starting with [v13,1/6] drm/i915/guc: Rename guc_ggtt_offset to intel_guc_ggtt_offset
URL : https://patchwork.freedesktop.org/series/39919/
State : success
== Summary ==
Series 39919v1 series starting with [v13,1/6] drm/i915/guc: Rename guc_ggtt_offset to intel_guc_ggtt_offset
https://patchwork.freedesktop.org/api/1.0/series/39919/revisions/1/mbox/
---- Known issues:
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-b:
pass -> INCOMPLETE (fi-snb-2520m) fdo#103713fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:432s fi-bdw-gvtdvm total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:431s fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:381s fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:534s fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:299s fi-bxt-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:507s fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:509s fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:508s fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:496s fi-cfl-8700k total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:411s fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:579s fi-cnl-y3 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:595s fi-elk-e7500 total:288 pass:229 dwarn:0 dfail:0 fail:0 skip:59 time:430s fi-gdg-551 total:288 pass:179 dwarn:0 dfail:0 fail:1 skip:108 time:311s fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:530s fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:405s fi-ilk-650 total:288 pass:228 dwarn:0 dfail:0 fail:0 skip:60 time:419s fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:478s fi-ivb-3770 total:288 pass:255 dwarn:0 dfail:0 fail:0 skip:33 time:426s fi-kbl-7500u total:288 pass:263 dwarn:1 dfail:0 fail:0 skip:24 time:471s fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:471s fi-kbl-r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:515s fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:437s fi-skl-6600u total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:529s fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:539s fi-skl-6700k2 total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:511s fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:493s fi-skl-guc total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:427s fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:435s fi-snb-2520m total:245 pass:211 dwarn:0 dfail:0 fail:0 skip:33 fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:398s Blacklisted hosts: fi-cfl-u total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:511s fi-cnl-drrs total:288 pass:257 dwarn:3 dfail:0 fail:0 skip:28 time:528s
c30d96215a171b633dae0098d1e62a2556c8bf90 drm-tip: 2018y-03m-13d-22h-35m-59s UTC integration manifest 22e9694f14d6 HAX Enable GuC Submission for CI31a3b5eae69e drm/i915/guc: Check the locking status of GuC WOPCM registers 23c80b602dc0 drm/i915: Add HuC firmware size related restriction for Gen9 and CNL A0 cf2c9b868d79 drm/i915: Add support to return CNL specific reserved WOPCM size 7c56dd389449 drm/i915: Implement dynamic GuC WOPCM offset and size calculation d8280854bf5e drm/i915/guc: Rename guc_ggtt_offset to intel_guc_ggtt_offset
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8336/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.IGT: failure for series starting with [v13,1/6] drm/i915/guc: Rename guc_ggtt_offset to intel_guc_ggtt_offset
In reply to Jackie Li== Series Details ==
== Series Details ==
Series: series starting with [v13,1/6] drm/i915/guc: Rename guc_ggtt_offset to intel_guc_ggtt_offset
URL : https://patchwork.freedesktop.org/series/39919/
State : failure
== Summary ==
---- Possible new issues:
Test drv_missed_irq:
pass -> SKIP (shard-apl)
Test drv_selftest:
Subgroup live_guc:
pass -> DMESG-WARN (shard-apl)
Test perf:
Subgroup gen8-unprivileged-single-ctx-counters:
pass -> FAIL (shard-apl)---- Known issues:
Test gem_eio:
Subgroup in-flight:
pass -> INCOMPLETE (shard-apl) fdo#105341 +1
Test gem_softpin:
Subgroup noreloc-s3:
skip -> PASS (shard-snb) fdo#103375 +1
Test kms_atomic_transition:
Subgroup 1x-modeset-transitions:
pass -> FAIL (shard-apl) fdo#103207
Test kms_flip:
Subgroup 2x-flip-vs-expired-vblank:
pass -> FAIL (shard-hsw) fdo#102887
Subgroup dpms-vs-vblank-race:
pass -> FAIL (shard-hsw) fdo#103060
Test kms_sysfs_edid_timing:
warn -> PASS (shard-apl) fdo#100047
Test kms_vblank:
Subgroup pipe-b-ts-continuation-suspend:
skip -> FAIL (shard-snb) fdo#105411fdo#105341 https://bugs.freedesktop.org/show_bug.cgi?id=105341
fdo#103375 https://bugs.freedesktop.org/show_bug.cgi?id=103375
fdo#103207 https://bugs.freedesktop.org/show_bug.cgi?id=103207
fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
fdo#100047 https://bugs.freedesktop.org/show_bug.cgi?id=100047
fdo#105411 https://bugs.freedesktop.org/show_bug.cgi?id=105411
shard-apl total:3288 pass:1734 dwarn:2 dfail:0 fail:9 skip:1541 time:12626s shard-hsw total:3444 pass:1768 dwarn:1 dfail:0 fail:3 skip:1671 time:11848s shard-snb total:3444 pass:1359 dwarn:1 dfail:0 fail:3 skip:2081 time:7198s
Blacklisted hosts:
shard-kbl total:2971 pass:1612 dwarn:27 dfail:0 fail:12 skip:1312 time:7636s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8336/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Joonas Lahtinen
maintainerRe: ✗ Fi.CI.IGT: failure for series starting with [v13,1/6] drm/i915/guc: Rename guc_ggtt_offset to intel_guc_ggtt_offset
Quoting Patchwork (2018-03-14 06:23:25)
Quoted 8 lines
== Series Details ==
Series: series starting with [v13,1/6] drm/i915/guc: Rename
guc_ggtt_offsettointel_guc_ggtt_offset
URL : https://patchwork.freedesktop.org/series/39919/
State : failure== Summary ==
Quoted 7 lines
---- Possible new issues:
Test
drv_missed_irq:pass -> SKIP (shard-apl) Test drv_selftest: Subgroup live_guc: pass -> DMESG-WARN (shard-apl)
This seems to be an especially suspicious one:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8336/shard-apl4/igt@drv_selftest@live_guc.html
Could you please make sure it's not related to these changes?
Regards, Joonas
Quoted 40 lines
Test perf:
Subgroup gen8-unprivileged-single-ctx-counters: pass -> FAIL (shard-apl)---- Known issues:
Test
gem_eio:Subgroup in-flight: pass -> INCOMPLETE (shard-apl) fdo#105341 +1 Test gem_softpin: Subgroup noreloc-s3: skip -> PASS (shard-snb) fdo#103375 +1 Test kms_atomic_transition: Subgroup 1x-modeset-transitions: pass -> FAIL (shard-apl) fdo#103207 Test kms_flip: Subgroup 2x-flip-vs-expired-vblank: pass -> FAIL (shard-hsw) fdo#102887 Subgroup dpms-vs-vblank-race: pass -> FAIL (shard-hsw) fdo#103060 Test kms_sysfs_edid_timing: warn -> PASS (shard-apl) fdo#100047 Test kms_vblank: Subgroup pipe-b-ts-continuation-suspend: skip -> FAIL (shard-snb) fdo#105411fdo#105341 https://bugs.freedesktop.org/show_bug.cgi?id=105341
fdo#103375 https://bugs.freedesktop.org/show_bug.cgi?id=103375
fdo#103207 https://bugs.freedesktop.org/show_bug.cgi?id=103207
fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
fdo#100047 https://bugs.freedesktop.org/show_bug.cgi?id=100047
fdo#105411 https://bugs.freedesktop.org/show_bug.cgi?id=105411shard-apl total:3288 pass:1734 dwarn:2 dfail:0 fail:9 skip:1541 time:12626s shard-hsw total:3444 pass:1768 dwarn:1 dfail:0 fail:3 skip:1671 time:11848s shard-snb total:3444 pass:1359 dwarn:1 dfail:0 fail:3 skip:2081 time:7198sBlacklisted hosts:
shard-kbl total:2971 pass:1612 dwarn:27 dfail:0 fail:12 skip:1312 time:7636s
Quoted 7 lines
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8336/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Fi.CI.IGT: failure for series starting with [v13,1/6] drm/i915/guc: Rename guc_ggtt_offset to intel_guc_ggtt_offset
Quoted 17 lines · Joonas Lahtinen
Quoting Patchwork (2018-03-14 06:23:25)
Quoted 8 lines
== Series Details ==
Series: series starting with [v13,1/6] drm/i915/guc: Rename
guc_ggtt_offsettointel_guc_ggtt_offset
URL : https://patchwork.freedesktop.org/series/39919/
State : failure== Summary ==
Quoted 7 lines
---- Possible new issues:
Test
drv_missed_irq:pass -> SKIP (shard-apl) Test drv_selftest: Subgroup live_guc: pass -> DMESG-WARN (shard-apl)
Quoted 6 lines
This seems to be an especially suspicious one:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8336/shard-apl4/igt@drv_selftest@live_guc.html
Could you please make sure it's not related to these changes?
It's not related, and been there for a while. Compare earlier results from CI [1] after enabling the GuC [2]
/Michal
[1] https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8117/shard-apl6/igt@drv_selftest@live_guc.html
[2] https://patchwork.freedesktop.org/series/38615/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Joonas Lahtinen
maintainerRe: ✗ Fi.CI.IGT: failure for series starting with [v13,1/6] drm/i915/guc: Rename guc_ggtt_offset to intel_guc_ggtt_offset
Quoting Michal Wajdeczko (2018-03-14 14:47:28)
Quoted 21 lines
Quoted 18 lines · Joonas Lahtinen
Quoting Patchwork (2018-03-14 06:23:25)
Quoted 16 lines
== Series Details ==
Series: series starting with [v13,1/6] drm/i915/guc: Rename
guc_ggtt_offsettointel_guc_ggtt_offset
URL : https://patchwork.freedesktop.org/series/39919/
State : failure== Summary ==
---- Possible new issues:
Test
drv_missed_irq:pass -> SKIP (shard-apl) Test drv_selftest: Subgroup live_guc: pass -> DMESG-WARN (shard-apl)
Quoted 8 lines
Quoted 6 lines
This seems to be an especially suspicious one:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8336/shard-apl4/igt@drv_selftest@live_guc.html
Could you please make sure it's not related to these changes?
It's not related, and been there for a while.
We should get that fixed then, no? :)
So this series should be good for merging.
Regards, Joonas
Quoted 7 lines
Compare earlier results from CI [1] after enabling the GuC [2]
/Michal
[1]
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8117/shard-apl6/igt@drv_selftest@live_guc.html
[2] https://patchwork.freedesktop.org/series/38615/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Joonas Lahtinen
maintainerRe: ✗ Fi.CI.IGT: failure for series starting with [v13,1/6] drm/i915/guc: Rename guc_ggtt_offset to intel_guc_ggtt_offset
Quoting Joonas Lahtinen (2018-03-14 15:10:46)
Quoted 26 lines
Quoting Michal Wajdeczko (2018-03-14 14:47:28)
Quoted 25 lines
Quoted 22 lines · Joonas Lahtinen
Quoting Patchwork (2018-03-14 06:23:25)
Quoted 9 lines
== Series Details ==
Series: series starting with [v13,1/6] drm/i915/guc: Rename
guc_ggtt_offsettointel_guc_ggtt_offset
URL : https://patchwork.freedesktop.org/series/39919/
State : failure== Summary ==
Quoted 7 lines
---- Possible new issues:
Test
drv_missed_irq:pass -> SKIP (shard-apl) Test drv_selftest: Subgroup live_guc: pass -> DMESG-WARN (shard-apl)This seems to be an especially suspicious one:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8336/shard-apl4/igt@drv_selftest@live_guc.html
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
Could you please make sure it's not related to these changes?
It's not related, and been there for a while.
We should get that fixed then, no? :)
So this series should be good for merging.
And merged, thanks for the patches and review.
Regards, Joonas
Quoted 7 lines
Regards, Joonas
Quoted 4 lines
Compare earlier results from CI [1] after enabling the GuC [2]
/Michal
Quoted 7 lines
Quoted 3 lines
[1]
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8117/shard-apl6/igt@drv_selftest@live_guc.html
[2] https://patchwork.freedesktop.org/series/38615/_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Jackie Li (2018-03-14 02:32:49)
Quoted 29 lines
GuC related exported functions should start with "
intel_guc_" prefix and passintel_gucas the first parameter since its GuC related. Currentguc_ggtt_offset()failed to follow this code convention and this is a problem for future patches that needs to accessintel_gucdata to verify the GGTT offset against the GuC WOPCM top.This patch renames the
guc_ggtt_offsettointel_guc_ggtt_offsetand updates the related code to passintel_gucpointer to this function call, so that we can have a unified coding style for GuC code and also enable the future patches to get GuC related data fromintel_gucto do the offset verification. Meanwhile, this patch also moves theGUC_GGTT_TOPfromintel_guc_regs.htointel_guc.hsince it is not GuC register related definition.v8:
- Fixed coding style issues and movedGUC_GGTT_TOPtointel_guc.h(Sagar)
- Updated commit message to explain to reason and motivation to addintel_gucas the first parameter ofintel_guc_ggtt_offset(Chris)v9:
- Fixed code alignment issue due to line break (Chris)v10:
- Removed unnecessary comments, redundant code and avoided reuse variable to avoid potential issues (Joonas)v13:
- Updated the ordering of s-o-b/cc/r-b tags (Sagar)
Quoted 9 lines
Signed-off-by Jackie Li <[email protected]>Cc Michal Wajdeczko <[email protected]>Cc Sagar Arun Kamble <[email protected]>Cc Chris Wilson <[email protected]>Cc Joonas Lahtinen <[email protected]>Reviewed-by Sagar Arun Kamble <[email protected]> (v8)Reviewed-by Joonas Lahtinen <[email protected]> (v9)Reviewed-by Michal Wajdeczko <[email protected]> (v11)Reviewed-by Joonas Lahtinen <[email protected]> (v12)
Regards, Joonas
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx