[PATCH v2] drm/i915/huc: Add and use HuC oriented print macros
Ceraolo Spurio, Daniele
daniele.ceraolospurio at intel.com
Mon Feb 6 19:03:26 UTC 2023
On 2/3/2023 12:59 AM, Michal Wajdeczko wrote:
> Like we did it for GuC, introduce some helper print macros for
> HuC to have unified format of messages that also include GT#.
>
> While around improve some messages and use %pe if possible.
>
> v2: update GSC/PXP timeout message
>
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko at intel.com>
> Cc: John Harrison <John.C.Harrison at Intel.com>
> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio at intel.com>
Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio at intel.com>
Daniele
> ---
> drivers/gpu/drm/i915/gt/uc/intel_huc.c | 44 ++++++++++++++------------
> 1 file changed, 23 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
> index 410905da8e97..72884e21470b 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
> @@ -6,6 +6,7 @@
> #include <linux/types.h>
>
> #include "gt/intel_gt.h"
> +#include "gt/intel_gt_print.h"
> #include "intel_guc_reg.h"
> #include "intel_huc.h"
> #include "i915_drv.h"
> @@ -13,6 +14,15 @@
> #include <linux/device/bus.h>
> #include <linux/mei_aux.h>
>
> +#define huc_printk(_huc, _level, _fmt, ...) \
> + gt_##_level(huc_to_gt(_huc), "HuC: " _fmt, ##__VA_ARGS__)
> +#define huc_err(_huc, _fmt, ...) huc_printk((_huc), err, _fmt, ##__VA_ARGS__)
> +#define huc_warn(_huc, _fmt, ...) huc_printk((_huc), warn, _fmt, ##__VA_ARGS__)
> +#define huc_notice(_huc, _fmt, ...) huc_printk((_huc), notice, _fmt, ##__VA_ARGS__)
> +#define huc_info(_huc, _fmt, ...) huc_printk((_huc), info, _fmt, ##__VA_ARGS__)
> +#define huc_dbg(_huc, _fmt, ...) huc_printk((_huc), dbg, _fmt, ##__VA_ARGS__)
> +#define huc_probe_error(_huc, _fmt, ...) huc_printk((_huc), probe_error, _fmt, ##__VA_ARGS__)
> +
> /**
> * DOC: HuC
> *
> @@ -107,11 +117,9 @@ static enum hrtimer_restart huc_delayed_load_timer_callback(struct hrtimer *hrti
>
> if (!intel_huc_is_authenticated(huc)) {
> if (huc->delayed_load.status == INTEL_HUC_WAITING_ON_GSC)
> - drm_notice(&huc_to_gt(huc)->i915->drm,
> - "timed out waiting for MEI GSC init to load HuC\n");
> + huc_notice(huc, "timed out waiting for MEI GSC\n");
> else if (huc->delayed_load.status == INTEL_HUC_WAITING_ON_PXP)
> - drm_notice(&huc_to_gt(huc)->i915->drm,
> - "timed out waiting for MEI PXP init to load HuC\n");
> + huc_notice(huc, "timed out waiting for MEI PXP\n");
> else
> MISSING_CASE(huc->delayed_load.status);
>
> @@ -174,8 +182,7 @@ static int gsc_notifier(struct notifier_block *nb, unsigned long action, void *d
>
> case BUS_NOTIFY_DRIVER_NOT_BOUND: /* mei driver fails to be bound */
> case BUS_NOTIFY_UNBIND_DRIVER: /* mei driver about to be unbound */
> - drm_info(&huc_to_gt(huc)->i915->drm,
> - "mei driver not bound, disabling HuC load\n");
> + huc_info(huc, "MEI driver not bound, disabling load\n");
> gsc_init_error(huc);
> break;
> }
> @@ -193,8 +200,7 @@ void intel_huc_register_gsc_notifier(struct intel_huc *huc, struct bus_type *bus
> huc->delayed_load.nb.notifier_call = gsc_notifier;
> ret = bus_register_notifier(bus, &huc->delayed_load.nb);
> if (ret) {
> - drm_err(&huc_to_gt(huc)->i915->drm,
> - "failed to register GSC notifier\n");
> + huc_err(huc, "failed to register GSC notifier %pe\n", ERR_PTR(ret));
> huc->delayed_load.nb.notifier_call = NULL;
> gsc_init_error(huc);
> }
> @@ -306,29 +312,25 @@ static int check_huc_loading_mode(struct intel_huc *huc)
> GSC_LOADS_HUC;
>
> if (fw_needs_gsc != hw_uses_gsc) {
> - drm_err(>->i915->drm,
> - "mismatch between HuC FW (%s) and HW (%s) load modes\n",
> - HUC_LOAD_MODE_STRING(fw_needs_gsc),
> - HUC_LOAD_MODE_STRING(hw_uses_gsc));
> + huc_err(huc, "mismatch between FW (%s) and HW (%s) load modes\n",
> + HUC_LOAD_MODE_STRING(fw_needs_gsc), HUC_LOAD_MODE_STRING(hw_uses_gsc));
> return -ENOEXEC;
> }
>
> /* make sure we can access the GSC via the mei driver if we need it */
> if (!(IS_ENABLED(CONFIG_INTEL_MEI_PXP) && IS_ENABLED(CONFIG_INTEL_MEI_GSC)) &&
> fw_needs_gsc) {
> - drm_info(>->i915->drm,
> - "Can't load HuC due to missing MEI modules\n");
> + huc_info(huc, "can't load due to missing MEI modules\n");
> return -EIO;
> }
>
> - drm_dbg(>->i915->drm, "GSC loads huc=%s\n", str_yes_no(fw_needs_gsc));
> + huc_dbg(huc, "loaded by GSC = %s\n", str_yes_no(fw_needs_gsc));
>
> return 0;
> }
>
> int intel_huc_init(struct intel_huc *huc)
> {
> - struct drm_i915_private *i915 = huc_to_gt(huc)->i915;
> int err;
>
> err = check_huc_loading_mode(huc);
> @@ -345,7 +347,7 @@ int intel_huc_init(struct intel_huc *huc)
>
> out:
> intel_uc_fw_change_status(&huc->fw, INTEL_UC_FIRMWARE_INIT_FAIL);
> - drm_info(&i915->drm, "HuC init failed with %d\n", err);
> + huc_info(huc, "initialization failed %pe\n", ERR_PTR(err));
> return err;
> }
>
> @@ -389,13 +391,13 @@ int intel_huc_wait_for_auth_complete(struct intel_huc *huc)
> delayed_huc_load_complete(huc);
>
> if (ret) {
> - drm_err(>->i915->drm, "HuC: Firmware not verified %d\n", ret);
> + huc_err(huc, "firmware not verified %pe\n", ERR_PTR(ret));
> intel_uc_fw_change_status(&huc->fw, INTEL_UC_FIRMWARE_LOAD_FAIL);
> return ret;
> }
>
> intel_uc_fw_change_status(&huc->fw, INTEL_UC_FIRMWARE_RUNNING);
> - drm_info(>->i915->drm, "HuC authenticated\n");
> + huc_info(huc, "authenticated!\n");
> return 0;
> }
>
> @@ -430,7 +432,7 @@ int intel_huc_auth(struct intel_huc *huc)
>
> ret = intel_guc_auth_huc(guc, intel_guc_ggtt_offset(guc, huc->fw.rsa_data));
> if (ret) {
> - DRM_ERROR("HuC: GuC did not ack Auth request %d\n", ret);
> + huc_err(huc, "authentication by GuC failed %pe\n", ERR_PTR(ret));
> goto fail;
> }
>
> @@ -442,7 +444,7 @@ int intel_huc_auth(struct intel_huc *huc)
> return 0;
>
> fail:
> - i915_probe_error(gt->i915, "HuC: Authentication failed %d\n", ret);
> + huc_probe_error(huc, "authentication failed %pe\n", ERR_PTR(ret));
> return ret;
> }
>
More information about the dri-devel
mailing list