Commit 63064d82 authored by Daniele Ceraolo Spurio's avatar Daniele Ceraolo Spurio Committed by Chris Wilson
Browse files

drm/i915/uc: Move uC WOPCM setup in uc_init_hw 



The register we write are not WOPCM regs but uC ones related to how
GuC and HuC are going to use the WOPCM, so it makes logical sense
for them to be programmed as part of uc_init_hw. The WOPCM map on the
other side is not uC-specific (although that is our main use-case), so
keep that separate.

v2: move write_and_verify to uncore, fix log, re-use err_out tag,
    add intel_wopcm_guc_base, fix log

Signed-off-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190730230743.19542-2-daniele.ceraolospurio@intel.com
parent 602776f9

drivers/gpu/drm/i915/gt/uc/intel_uc.c

+47 −0
Original line number Diff line number Diff line
@@ -397,6 +397,49 @@ void intel_uc_sanitize(struct intel_uc *uc) 
	__uc_sanitize(uc);

}



/* Initialize and verify the uC regs related to uC positioning in WOPCM */

static int uc_init_wopcm(struct intel_uc *uc)

{

	struct intel_gt *gt = uc_to_gt(uc);

	struct intel_uncore *uncore = gt->uncore;

	u32 base = intel_wopcm_guc_base(&gt->i915->wopcm);

	u32 size = intel_wopcm_guc_size(&gt->i915->wopcm);

	u32 huc_agent = intel_uc_is_using_huc(uc) ? HUC_LOADING_AGENT_GUC : 0;

	u32 mask;

	int err;



	GEM_BUG_ON(!intel_uc_is_using_guc(uc));

	GEM_BUG_ON(!(base & GUC_WOPCM_OFFSET_MASK));

	GEM_BUG_ON(base & ~GUC_WOPCM_OFFSET_MASK);

	GEM_BUG_ON(!(size & GUC_WOPCM_SIZE_MASK));

	GEM_BUG_ON(size & ~GUC_WOPCM_SIZE_MASK);



	mask = GUC_WOPCM_SIZE_MASK | GUC_WOPCM_SIZE_LOCKED;

	err = intel_uncore_write_and_verify(uncore, GUC_WOPCM_SIZE, size, mask,

					    size | GUC_WOPCM_SIZE_LOCKED);

	if (err)

		goto err_out;



	mask = GUC_WOPCM_OFFSET_MASK | GUC_WOPCM_OFFSET_VALID | huc_agent;

	err = intel_uncore_write_and_verify(uncore, DMA_GUC_WOPCM_OFFSET,

					    base | huc_agent, mask,

					    base | huc_agent |

					    GUC_WOPCM_OFFSET_VALID);

	if (err)

		goto err_out;



	return 0;



err_out:

	DRM_ERROR("Failed to init uC WOPCM registers:\n");

	DRM_ERROR("DMA_GUC_WOPCM_OFFSET=%#x\n",

		  intel_uncore_read(uncore, DMA_GUC_WOPCM_OFFSET));

	DRM_ERROR("GUC_WOPCM_SIZE=%#x\n",

		  intel_uncore_read(uncore, GUC_WOPCM_SIZE));



	return err;

}



int intel_uc_init_hw(struct intel_uc *uc)

{

	struct drm_i915_private *i915 = uc_to_gt(uc)->i915;
@@ -409,6 +452,10 @@ int intel_uc_init_hw(struct intel_uc *uc) 


	GEM_BUG_ON(!intel_uc_fw_supported(&guc->fw));



	ret = uc_init_wopcm(uc);

	if (ret)

		goto err_out;



	guc_reset_interrupts(guc);



	/* WaEnableuKernelHeaderValidFix:skl */

drivers/gpu/drm/i915/i915_drv.h

+1 −2
Original line number Diff line number Diff line
@@ -2274,10 +2274,9 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, 


#define HAS_GT_UC(dev_priv)	(INTEL_INFO(dev_priv)->has_gt_uc)



/* Having GuC/HuC is not the same as using GuC/HuC */

/* Having GuC is not the same as using GuC */

#define USES_GUC(dev_priv)		intel_uc_is_using_guc(&(dev_priv)->gt.uc)

#define USES_GUC_SUBMISSION(dev_priv)	intel_uc_is_using_guc_submission(&(dev_priv)->gt.uc)

#define USES_HUC(dev_priv)		intel_uc_is_using_huc(&(dev_priv)->gt.uc)



#define HAS_POOLED_EU(dev_priv)	(INTEL_INFO(dev_priv)->has_pooled_eu)

drivers/gpu/drm/i915/i915_gem.c

+1 −7
Original line number Diff line number Diff line
@@ -1240,14 +1240,8 @@ int i915_gem_init_hw(struct drm_i915_private *i915) 
		goto out;

	}



	ret = intel_wopcm_init_hw(&i915->wopcm, gt);

	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(&i915->gt.uc);

	ret = intel_uc_init_hw(&gt->uc);

	if (ret) {

		DRM_ERROR("Enabling uc failed (%d)\n", ret);

		goto out;

drivers/gpu/drm/i915/intel_uncore.h

+12 −0
Original line number Diff line number Diff line
@@ -393,6 +393,18 @@ static inline void intel_uncore_rmw_fw(struct intel_uncore *uncore, 
	intel_uncore_write_fw(uncore, reg, val);

}



static inline int intel_uncore_write_and_verify(struct intel_uncore *uncore,

						i915_reg_t reg, u32 val,

						u32 mask, u32 expected_val)

{

	u32 reg_val;



	intel_uncore_write(uncore, reg, val);

	reg_val = intel_uncore_read(uncore, reg);



	return (reg_val & mask) != expected_val ? -EINVAL : 0;

}



#define raw_reg_read(base, reg) \

	readl(base + i915_mmio_reg_offset(reg))

#define raw_reg_write(base, reg, value) \

drivers/gpu/drm/i915/intel_wopcm.c

+0 −68
Original line number Diff line number Diff line
@@ -224,71 +224,3 @@ int intel_wopcm_init(struct intel_wopcm *wopcm) 


	return 0;

}
 


static int

write_and_verify(struct intel_gt *gt,

		 i915_reg_t reg, u32 val, u32 mask, u32 locked_bit)

{

	struct intel_uncore *uncore = gt->uncore;

	u32 reg_val;



	GEM_BUG_ON(val & ~mask);



	intel_uncore_write(uncore, reg, val);



	reg_val = intel_uncore_read(uncore, reg);



	return (reg_val & mask) != (val | locked_bit) ? -EIO : 0;

}



/**

 * intel_wopcm_init_hw() - Setup GuC WOPCM registers.

 * @wopcm: pointer to intel_wopcm.

 * @gt: pointer to the containing GT

 *

 * Setup the GuC WOPCM size and offset registers with the calculated values. It

 * will verify the register values to make sure the registers are locked with

 * correct values.

 *

 * Return: 0 on success. -EIO if registers were locked with incorrect values.

 */

int intel_wopcm_init_hw(struct intel_wopcm *wopcm, struct intel_gt *gt)

{

	struct drm_i915_private *i915 = wopcm_to_i915(wopcm);

	struct intel_uncore *uncore = gt->uncore;

	u32 huc_agent;

	u32 mask;

	int err;



	if (!USES_GUC(i915))

		return 0;



	GEM_BUG_ON(!HAS_GT_UC(i915));

	GEM_BUG_ON(!wopcm->guc.size);

	GEM_BUG_ON(!wopcm->guc.base);



	err = write_and_verify(gt, GUC_WOPCM_SIZE, wopcm->guc.size,

			       GUC_WOPCM_SIZE_MASK | GUC_WOPCM_SIZE_LOCKED,

			       GUC_WOPCM_SIZE_LOCKED);

	if (err)

		goto err_out;



	huc_agent = USES_HUC(i915) ? HUC_LOADING_AGENT_GUC : 0;

	mask = GUC_WOPCM_OFFSET_MASK | GUC_WOPCM_OFFSET_VALID | huc_agent;

	err = write_and_verify(gt, DMA_GUC_WOPCM_OFFSET,

			       wopcm->guc.base | huc_agent, mask,

			       GUC_WOPCM_OFFSET_VALID);

	if (err)

		goto err_out;



	return 0;



err_out:

	DRM_ERROR("Failed to init WOPCM registers:\n");

	DRM_ERROR("DMA_GUC_WOPCM_OFFSET=%#x\n",

		  intel_uncore_read(uncore, DMA_GUC_WOPCM_OFFSET));

	DRM_ERROR("GUC_WOPCM_SIZE=%#x\n",

		  intel_uncore_read(uncore, GUC_WOPCM_SIZE));



	return err;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE