Commit 8781f051 authored by John Harrison's avatar John Harrison
Browse files

drm/i915/guc: Add fetch of hwconfig blob 



Implement support for fetching the hardware description table from the
GuC. The call is made twice - once without a destination buffer to
query the size and then a second time to fill in the buffer.

The table is stored in the GT structure so that it can be fetched once
at driver load time. Keeping inside a GuC structure would mean it
would be release and reloaded on a GuC reset (part of a full GT
reset). However, the table does not change just because the GT has been
reset and the GuC reloaded. Also, dynamic memory allocations inside
the reset path are a problem.

Note that the table is only available on ADL-P and later platforms.

v2 (John's v2 patch):
 * Move to GT level to avoid memory allocation during reset path (and
   unnecessary re-read of the table on a reset).

v5 (of Jordan's posting):
 * Various changes made by Jordan and recommended by Michal
   - Makefile ordering
   - Adjust "struct intel_guc_hwconfig hwconfig" comment
   - Set Copyright year to 2022 in intel_guc_hwconfig.c/.h
   - Drop inline from hwconfig_to_guc()
   - Replace hwconfig param with guc in __guc_action_get_hwconfig()
   - Move zero size check into guc_hwconfig_discover_size()
   - Change comment to say zero size offset/size is needed to get size
   - Add has_guc_hwconfig to devinfo and drop has_table()
   - Change drm_err to notice in __uc_init_hw() and use %pe

v6 (of Jordan's posting):
 * Added a couple more small changes recommended by Michal
 * Merge in John's v2 patch, but note:
   - Using drm_notice as recommended by Michal
   - Reverted Michal's suggestion of using devinfo

v7 (of Jordan's posting):
 * Change back to drm_err as preferred by John

Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarJohn Harrison <John.C.Harrison@Intel.com>
Reviewed-by: default avatarMatthew Brost <matthew.brost@intel.com>
Acked-by: default avatarJon Bloomfield <jon.bloomfield@intel.com>
Signed-off-by: default avatarJordan Justen <jordan.l.justen@intel.com>
Reviewed-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: default avatarJohn Harrison <John.C.Harrison@Intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220306232157.1174335-2-jordan.l.justen@intel.com
parent 7fe7c2a6

drivers/gpu/drm/i915/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ i915-y += gt/uc/intel_uc.o \ 
	  gt/uc/intel_guc_ct.o \

	  gt/uc/intel_guc_debugfs.o \

	  gt/uc/intel_guc_fw.o \

	  gt/uc/intel_guc_hwconfig.o \

	  gt/uc/intel_guc_log.o \

	  gt/uc/intel_guc_log_debugfs.o \

	  gt/uc/intel_guc_rc.o \

drivers/gpu/drm/i915/gt/intel_gt.c

+6 −0
Original line number Diff line number Diff line
@@ -718,6 +718,11 @@ int intel_gt_init(struct intel_gt *gt) 
	if (err)

		goto err_uc_init;



	err = intel_gt_init_hwconfig(gt);

	if (err)

		drm_err(&gt->i915->drm, "Failed to retrieve hwconfig table: %pe\n",

			ERR_PTR(err));



	err = __engines_record_defaults(gt);

	if (err)

		goto err_gt;
@@ -799,6 +804,7 @@ void intel_gt_driver_release(struct intel_gt *gt) 
	intel_gt_pm_fini(gt);

	intel_gt_fini_scratch(gt);

	intel_gt_fini_buffer_pool(gt);

	intel_gt_fini_hwconfig(gt);

}



void intel_gt_driver_late_release(struct intel_gt *gt)

drivers/gpu/drm/i915/gt/intel_gt_types.h

+4 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include "i915_vma.h"

#include "intel_engine_types.h"

#include "intel_gt_buffer_pool_types.h"

#include "intel_hwconfig.h"

#include "intel_llc_types.h"

#include "intel_reset_types.h"

#include "intel_rc6_types.h"
@@ -204,6 +205,9 @@ struct intel_gt { 
		struct sseu_dev_info sseu;



		unsigned long mslice_mask;



		/** @hwconfig: hardware configuration data */

		struct intel_hwconfig hwconfig;

	} info;



	struct {

drivers/gpu/drm/i915/gt/intel_hwconfig.h

0 → 100644
+21 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: MIT */

/*

 * Copyright © 2022 Intel Corporation

 */



#ifndef _INTEL_HWCONFIG_H_

#define _INTEL_HWCONFIG_H_



#include <linux/types.h>



struct intel_gt;



struct intel_hwconfig {

	u32 size;

	void *ptr;

};



int intel_gt_init_hwconfig(struct intel_gt *gt);

void intel_gt_fini_hwconfig(struct intel_gt *gt);



#endif /* _INTEL_HWCONFIG_H_ */

drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h

+1 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ enum intel_guc_action { 
	INTEL_GUC_ACTION_ENGINE_FAILURE_NOTIFICATION = 0x1009,

	INTEL_GUC_ACTION_SETUP_PC_GUCRC = 0x3004,

	INTEL_GUC_ACTION_AUTHENTICATE_HUC = 0x4000,

	INTEL_GUC_ACTION_GET_HWCONFIG = 0x4100,

	INTEL_GUC_ACTION_REGISTER_CONTEXT = 0x4502,

	INTEL_GUC_ACTION_DEREGISTER_CONTEXT = 0x4503,

	INTEL_GUC_ACTION_DEREGISTER_CONTEXT_DONE = 0x4600,