[igt-dev] [PATCH i-g-t v3] tests/i915: Add simple test for HuC

[igt-dev] [PATCH i-g-t v3] tests/i915: Add simple test for HuC

[Michal Wajdeczko]

Add simple test to check that HuC firmware is available.
Use existing I915_GETPARAM and debugfs entry.

v2: make it even simpler
v3: dump with IGT_LOG_INFO, decode status

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Martin Peres <martin.peres@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tony Ye <tony.ye@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> #v2
---
 tests/Makefile.sources |  3 +++
 tests/i915/i915_huc.c  | 53 ++++++++++++++++++++++++++++++++++++++++++
 tests/meson.build      |  1 +
 3 files changed, 57 insertions(+)
 create mode 100644 tests/i915/i915_huc.c

diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index 7f921f6c..dfa3fcd3 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -475,6 +475,9 @@ i915_getparams_basic_SOURCES = i915/i915_getparams_basic.c
 TESTS_progs += i915_hangman
 i915_hangman_SOURCES = i915/i915_hangman.c
 
+TESTS_progs += i915_huc
+i915_huc_SOURCES = i915/i915_huc.c
+
 TESTS_progs += i915_module_load
 i915_module_load_SOURCES = i915/i915_module_load.c
 
diff --git a/tests/i915/i915_huc.c b/tests/i915/i915_huc.c
new file mode 100644
index 00000000..2b4bc0d9
--- /dev/null
+++ b/tests/i915/i915_huc.c
@@ -0,0 +1,53 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright (c) 2019 Intel Corporation
+ */
+
+#include "igt.h"
+#include <fcntl.h>
+#include <i915_drm.h>
+#include <sys/ioctl.h>
+
+IGT_TEST_DESCRIPTION("Test HuC firmware");
+
+static int get_huc_status(int fd)
+{
+	int status = 0;
+	drm_i915_getparam_t gp = {
+		.param = I915_PARAM_HUC_STATUS,
+		.value = &status,
+	};
+
+	if (igt_ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp))
+		return -errno;
+
+	errno = 0;
+	return status;
+}
+
+igt_main
+{
+	int fd;
+
+	igt_fixture {
+		int status;
+
+		fd = drm_open_driver(DRIVER_INTEL);
+		igt_require_intel(fd);
+		__igt_debugfs_dump(fd, "i915_huc_load_status", IGT_LOG_INFO);
+
+		status = get_huc_status(fd);
+		igt_skip_on_f(status == -ENODEV,
+			      "HuC is not available on this platform!\n");
+		igt_skip_on_f(status < 0, "HuC firmware error: %i, %s\n",
+			      -status, strerror(-status));
+		igt_skip_on_f(status == 0, "HuC firmware is not loaded!\n");
+	}
+
+	igt_subtest("basic")
+		igt_success();
+
+	igt_fixture {
+		close(fd);
+	}
+}
diff --git a/tests/meson.build b/tests/meson.build
index 351594fa..22ed165c 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -220,6 +220,7 @@ i915_progs = [
 	'i915_fb_tiling',
 	'i915_getparams_basic',
 	'i915_hangman',
+	'i915_huc',
 	'i915_module_load',
 	'i915_pm_backlight',
 	'i915_pm_lpsp',
-- 
2.19.2

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

[igt-dev] ✓ Fi.CI.BAT: success for tests/i915: Add simple test for HuC (rev3)

[Patchwork]

== Series Details ==

Series: tests/i915: Add simple test for HuC (rev3)
URL   : https://patchwork.freedesktop.org/series/60800/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_6097 -> IGTPW_3002
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  External URL: https://patchwork.freedesktop.org/api/1.0/series/60800/revisions/3/mbox/

Known issues
------------

  Here are the changes found in IGTPW_3002 that come from known issues:

### IGT changes ###

#### Possible fixes ####

  * igt@amdgpu/amd_basic@userptr:
    - fi-kbl-8809g:       [DMESG-WARN][1] ([fdo#108965]) -> [PASS][2]
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/fi-kbl-8809g/igt@amdgpu/amd_basic@userptr.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3002/fi-kbl-8809g/igt@amdgpu/amd_basic@userptr.html

  * igt@i915_selftest@live_hangcheck:
    - fi-skl-iommu:       [INCOMPLETE][3] ([fdo#108602] / [fdo#108744]) -> [PASS][4]
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/fi-skl-iommu/igt@i915_selftest@live_hangcheck.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3002/fi-skl-iommu/igt@i915_selftest@live_hangcheck.html

  
#### Warnings ####

  * igt@i915_selftest@live_hangcheck:
    - fi-apl-guc:         [FAIL][5] ([fdo#110623]) -> [DMESG-FAIL][6] ([fdo#110620])
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/fi-apl-guc/igt@i915_selftest@live_hangcheck.html
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3002/fi-apl-guc/igt@i915_selftest@live_hangcheck.html

  
  {name}: This element is suppressed. This means it is ignored when computing
          the status of the difference (SUCCESS, WARNING, or FAILURE).

  [fdo#106107]: https://bugs.freedesktop.org/show_bug.cgi?id=106107
  [fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
  [fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
  [fdo#108602]: https://bugs.freedesktop.org/show_bug.cgi?id=108602
  [fdo#108744]: https://bugs.freedesktop.org/show_bug.cgi?id=108744
  [fdo#108965]: https://bugs.freedesktop.org/show_bug.cgi?id=108965
  [fdo#110620]: https://bugs.freedesktop.org/show_bug.cgi?id=110620
  [fdo#110623]: https://bugs.freedesktop.org/show_bug.cgi?id=110623


Participating hosts (52 -> 42)
------------------------------

  Additional (1): fi-pnv-d510 
  Missing    (11): fi-ilk-m540 fi-bdw-5557u fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-bwr-2160 fi-ctg-p8600 fi-gdg-551 fi-icl-u3 fi-byt-clapper fi-bdw-samus 


Build changes
-------------

  * IGT: IGT_4996 -> IGTPW_3002

  CI_DRM_6097: 3f2d6a47d9eec66594887b1e9718bc1a29aa6a77 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGTPW_3002: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3002/
  IGT_4996: 6fe5d254ec1b9b47d61408e1b49a7339876bf1e7 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools



== Testlist changes ==

+igt@i915_huc@basic

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3002/
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

[igt-dev] ✓ Fi.CI.IGT: success for tests/i915: Add simple test for HuC (rev3)

[Patchwork]

== Series Details ==

Series: tests/i915: Add simple test for HuC (rev3)
URL   : https://patchwork.freedesktop.org/series/60800/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_6097_full -> IGTPW_3002_full
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  External URL: https://patchwork.freedesktop.org/api/1.0/series/60800/revisions/3/mbox/

Possible new issues
-------------------

  Here are the unknown changes that may have been introduced in IGTPW_3002_full:

### IGT changes ###

#### Possible regressions ####

  * {igt@i915_huc@basic} (NEW):
    - shard-iclb:         NOTRUN -> [SKIP][1]
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3002/shard-iclb3/igt@i915_huc@basic.html

  
New tests
---------

  New tests have been introduced between CI_DRM_6097_full and IGTPW_3002_full:

### New IGT tests (1) ###

  * igt@i915_huc@basic:
    - Statuses : 6 skip(s)
    - Exec time: [0.0] s

  

Known issues
------------

  Here are the changes found in IGTPW_3002_full that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@gem_eio@in-flight-suspend:
    - shard-apl:          [PASS][2] -> [DMESG-WARN][3] ([fdo#108566]) +5 similar issues
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-apl8/igt@gem_eio@in-flight-suspend.html
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3002/shard-apl5/igt@gem_eio@in-flight-suspend.html

  * igt@gem_exec_whisper@normal:
    - shard-iclb:         [PASS][4] -> [INCOMPLETE][5] ([fdo#107713] / [fdo#109100]) +1 similar issue
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-iclb6/igt@gem_exec_whisper@normal.html
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3002/shard-iclb7/igt@gem_exec_whisper@normal.html

  * igt@i915_suspend@fence-restore-tiled2untiled:
    - shard-kbl:          [PASS][6] -> [INCOMPLETE][7] ([fdo#103665])
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-kbl2/igt@i915_suspend@fence-restore-tiled2untiled.html
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3002/shard-kbl4/igt@i915_suspend@fence-restore-tiled2untiled.html

  * igt@kms_cursor_legacy@2x-nonblocking-modeset-vs-cursor-atomic:
    - shard-glk:          [PASS][8] -> [FAIL][9] ([fdo#107409])
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-glk7/igt@kms_cursor_legacy@2x-nonblocking-modeset-vs-cursor-atomic.html
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3002/shard-glk9/igt@kms_cursor_legacy@2x-nonblocking-modeset-vs-cursor-atomic.html

  * igt@kms_cursor_legacy@all-pipes-torture-move:
    - shard-iclb:         [PASS][10] -> [INCOMPLETE][11] ([fdo#107713]) +1 similar issue
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-iclb2/igt@kms_cursor_legacy@all-pipes-torture-move.html
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3002/shard-iclb7/igt@kms_cursor_legacy@all-pipes-torture-move.html

  * igt@kms_flip@flip-vs-suspend:
    - shard-hsw:          [PASS][12] -> [INCOMPLETE][13] ([fdo#103540])
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-hsw6/igt@kms_flip@flip-vs-suspend.html
   [13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3002/shard-hsw5/igt@kms_flip@flip-vs-suspend.html
    - shard-kbl:          [PASS][14] -> [DMESG-WARN][15] ([fdo#103313])
   [14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-kbl2/igt@kms_flip@flip-vs-suspend.html
   [15]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3002/shard-kbl3/igt@kms_flip@flip-vs-suspend.html

  * igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-spr-indfb-draw-pwrite:
    - shard-glk:          [PASS][16] -> [FAIL][17] ([fdo#103167])
   [16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-glk2/igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-spr-indfb-draw-pwrite.html
   [17]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3002/shard-glk7/igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-spr-indfb-draw-pwrite.html

  * igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-blt:
    - shard-iclb:         [PASS][18] -> [FAIL][19] ([fdo#103167]) +2 similar issues
   [18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-iclb8/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-blt.html
   [19]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3002/shard-iclb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-blt.html

  * igt@kms_psr@no_drrs:
    - shard-iclb:         [PASS][20] -> [FAIL][21] ([fdo#108341])
   [20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-iclb5/igt@kms_psr@no_drrs.html
   [21]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3002/shard-iclb1/igt@kms_psr@no_drrs.html

  * igt@kms_psr@psr2_dpms:
    - shard-iclb:         [PASS][22] -> [SKIP][23] ([fdo#109441]) +2 similar issues
   [22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-iclb2/igt@kms_psr@psr2_dpms.html
   [23]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3002/shard-iclb8/igt@kms_psr@psr2_dpms.html

  * igt@kms_setmode@basic:
    - shard-apl:          [PASS][24] -> [FAIL][25] ([fdo#99912])
   [24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-apl6/igt@kms_setmode@basic.html
   [25]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3002/shard-apl3/igt@kms_setmode@basic.html

  
#### Possible fixes ####

  * igt@gem_mmap_gtt@forked-medium-copy-odd:
    - shard-iclb:         [INCOMPLETE][26] ([fdo#107713]) -> [PASS][27]
   [26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-iclb7/igt@gem_mmap_gtt@forked-medium-copy-odd.html
   [27]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3002/shard-iclb1/igt@gem_mmap_gtt@forked-medium-copy-odd.html

  * igt@gem_tiled_swapping@non-threaded:
    - shard-glk:          [DMESG-WARN][28] ([fdo#108686]) -> [PASS][29]
   [28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-glk7/igt@gem_tiled_swapping@non-threaded.html
   [29]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3002/shard-glk9/igt@gem_tiled_swapping@non-threaded.html
    - shard-hsw:          [FAIL][30] ([fdo#108686]) -> [PASS][31]
   [30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-hsw6/igt@gem_tiled_swapping@non-threaded.html
   [31]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3002/shard-hsw4/igt@gem_tiled_swapping@non-threaded.html

  * igt@kms_color@pipe-b-ctm-green-to-red:
    - shard-kbl:          [FAIL][32] ([fdo#107201]) -> [PASS][33]
   [32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-kbl7/igt@kms_color@pipe-b-ctm-green-to-red.html
   [33]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3002/shard-kbl2/igt@kms_color@pipe-b-ctm-green-to-red.html
    - shard-apl:          [FAIL][34] ([fdo#107201]) -> [PASS][35]
   [34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-apl5/igt@kms_color@pipe-b-ctm-green-to-red.html
   [35]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3002/shard-apl8/igt@kms_color@pipe-b-ctm-green-to-red.html

  * igt@kms_flip@2x-flip-vs-expired-vblank:
    - shard-glk:          [FAIL][36] ([fdo#102887]) -> [PASS][37]
   [36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-glk8/igt@kms_flip@2x-flip-vs-expired-vblank.html
   [37]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3002/shard-glk3/igt@kms_flip@2x-flip-vs-expired-vblank.html

  * igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render:
    - shard-iclb:         [FAIL][38] ([fdo#103167]) -> [PASS][39] +1 similar issue
   [38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-iclb8/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html
   [39]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3002/shard-iclb1/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html

  * igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
    - shard-apl:          [DMESG-WARN][40] ([fdo#108566]) -> [PASS][41] +1 similar issue
   [40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-apl2/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b.html
   [41]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3002/shard-apl8/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b.html

  * igt@kms_plane_lowres@pipe-a-tiling-y:
    - shard-iclb:         [FAIL][42] ([fdo#103166]) -> [PASS][43]
   [42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-iclb5/igt@kms_plane_lowres@pipe-a-tiling-y.html
   [43]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3002/shard-iclb7/igt@kms_plane_lowres@pipe-a-tiling-y.html

  * igt@kms_psr@psr2_cursor_plane_onoff:
    - shard-iclb:         [SKIP][44] ([fdo#109441]) -> [PASS][45] +2 similar issues
   [44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-iclb1/igt@kms_psr@psr2_cursor_plane_onoff.html
   [45]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3002/shard-iclb2/igt@kms_psr@psr2_cursor_plane_onoff.html

  
#### Warnings ####

  * igt@gem_mmap_gtt@forked-big-copy-odd:
    - shard-iclb:         [INCOMPLETE][46] ([fdo#107713] / [fdo#109100]) -> [TIMEOUT][47] ([fdo#109673])
   [46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-iclb6/igt@gem_mmap_gtt@forked-big-copy-odd.html
   [47]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3002/shard-iclb6/igt@gem_mmap_gtt@forked-big-copy-odd.html

  
  {name}: This element is suppressed. This means it is ignored when computing
          the status of the difference (SUCCESS, WARNING, or FAILURE).

  [fdo#102887]: https://bugs.freedesktop.org/show_bug.cgi?id=102887
  [fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
  [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
  [fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
  [fdo#103313]: https://bugs.freedesktop.org/show_bug.cgi?id=103313
  [fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
  [fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
  [fdo#107201]: https://bugs.freedesktop.org/show_bug.cgi?id=107201
  [fdo#107409]: https://bugs.freedesktop.org/show_bug.cgi?id=107409
  [fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
  [fdo#108341]: https://bugs.freedesktop.org/show_bug.cgi?id=108341
  [fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
  [fdo#108686]: https://bugs.freedesktop.org/show_bug.cgi?id=108686
  [fdo#109100]: https://bugs.freedesktop.org/show_bug.cgi?id=109100
  [fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
  [fdo#109673]: https://bugs.freedesktop.org/show_bug.cgi?id=109673
  [fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912


Participating hosts (10 -> 6)
------------------------------

  Missing    (4): pig-skl-6260u shard-skl pig-hsw-4770r pig-glk-j5005 


Build changes
-------------

  * IGT: IGT_4996 -> IGTPW_3002
  * Piglit: piglit_4509 -> None

  CI_DRM_6097: 3f2d6a47d9eec66594887b1e9718bc1a29aa6a77 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGTPW_3002: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3002/
  IGT_4996: 6fe5d254ec1b9b47d61408e1b49a7339876bf1e7 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3002/
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Re: [igt-dev] [PATCH i-g-t v3] tests/i915: Add simple test for HuC

[Chris Wilson]

Quoting Michal Wajdeczko (2019-05-19 21:16:34)
> Add simple test to check that HuC firmware is available.
> Use existing I915_GETPARAM and debugfs entry.
> 
> v2: make it even simpler
> v3: dump with IGT_LOG_INFO, decode status
> 
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Cc: Martin Peres <martin.peres@linux.intel.com>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Tony Ye <tony.ye@intel.com>
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> #v2
> ---
>  tests/Makefile.sources |  3 +++
>  tests/i915/i915_huc.c  | 53 ++++++++++++++++++++++++++++++++++++++++++
>  tests/meson.build      |  1 +
>  3 files changed, 57 insertions(+)
>  create mode 100644 tests/i915/i915_huc.c
> 
> diff --git a/tests/Makefile.sources b/tests/Makefile.sources
> index 7f921f6c..dfa3fcd3 100644
> --- a/tests/Makefile.sources
> +++ b/tests/Makefile.sources
> @@ -475,6 +475,9 @@ i915_getparams_basic_SOURCES = i915/i915_getparams_basic.c
>  TESTS_progs += i915_hangman
>  i915_hangman_SOURCES = i915/i915_hangman.c
>  
> +TESTS_progs += i915_huc
> +i915_huc_SOURCES = i915/i915_huc.c
> +
>  TESTS_progs += i915_module_load
>  i915_module_load_SOURCES = i915/i915_module_load.c
>  
> diff --git a/tests/i915/i915_huc.c b/tests/i915/i915_huc.c
> new file mode 100644
> index 00000000..2b4bc0d9
> --- /dev/null
> +++ b/tests/i915/i915_huc.c
> @@ -0,0 +1,53 @@
> +/* SPDX-License-Identifier: MIT */
> +/*
> + * Copyright (c) 2019 Intel Corporation
> + */
> +
> +#include "igt.h"
> +#include <fcntl.h>
> +#include <i915_drm.h>
> +#include <sys/ioctl.h>
> +
> +IGT_TEST_DESCRIPTION("Test HuC firmware");
> +
> +static int get_huc_status(int fd)
> +{
> +       int status = 0;
> +       drm_i915_getparam_t gp = {
> +               .param = I915_PARAM_HUC_STATUS,
> +               .value = &status,
> +       };
> +
> +       if (igt_ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp))
> +               return -errno;
> +
> +       errno = 0;
> +       return status;
> +}
> +
> +igt_main
> +{
> +       int fd;
> +
> +       igt_fixture {
> +               int status;
> +
> +               fd = drm_open_driver(DRIVER_INTEL);
> +               igt_require_intel(fd);
> +               __igt_debugfs_dump(fd, "i915_huc_load_status", IGT_LOG_INFO);
> +
> +               status = get_huc_status(fd);
> +               igt_skip_on_f(status == -ENODEV,
> +                             "HuC is not available on this platform!\n");
> +               igt_skip_on_f(status < 0, "HuC firmware error: %i, %s\n",
> +                             -status, strerror(-status));
> +               igt_skip_on_f(status == 0, "HuC firmware is not loaded!\n");

Yup, that I think is for the best; intelligible error messages even I
can digest.

(I was thinking a switch, e.g.
static bool has_addfb2_iface(int fd)
{
        struct local_drm_mode_fb_cmd2 f = {};
        int err;

        err = 0;
        if (drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f))
                err = -errno;
        switch (err) {
        case -ENOTTY: /* ioctl unrecognised (kernel too old) */
        case -ENOTSUP: /* driver doesn't support KMS */
                return false;

                /*
                 * The only other valid response is -EINVAL, but we leave
                 * that for the actual tests themselves to discover for
                 * more accurate reporting.
                 */
        default:
                return true;
        }
}
igt_require(has_adddb2_iface(fd))

But with sensible error messages, you win ;)

Just need to hold off until we agree on the best error codes.
-Chris
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Re: [igt-dev] [PATCH i-g-t v3] tests/i915: Add simple test for HuC

[Michal Wajdeczko]

On Mon, 20 May 2019 11:41:12 +0200, Chris Wilson  
<chris@chris-wilson.co.uk> wrote:

> Quoting Michal Wajdeczko (2019-05-19 21:16:34)
>> Add simple test to check that HuC firmware is available.
>> Use existing I915_GETPARAM and debugfs entry.
>>
>> v2: make it even simpler
>> v3: dump with IGT_LOG_INFO, decode status
>>
>> Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
>> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
>> Cc: Martin Peres <martin.peres@linux.intel.com>
>> Cc: Chris Wilson <chris@chris-wilson.co.uk>
>> Cc: Tony Ye <tony.ye@intel.com>
>> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> #v2
>> ---
>>  tests/Makefile.sources |  3 +++
>>  tests/i915/i915_huc.c  | 53 ++++++++++++++++++++++++++++++++++++++++++
>>  tests/meson.build      |  1 +
>>  3 files changed, 57 insertions(+)
>>  create mode 100644 tests/i915/i915_huc.c
>>
>> diff --git a/tests/Makefile.sources b/tests/Makefile.sources
>> index 7f921f6c..dfa3fcd3 100644
>> --- a/tests/Makefile.sources
>> +++ b/tests/Makefile.sources
>> @@ -475,6 +475,9 @@ i915_getparams_basic_SOURCES =  
>> i915/i915_getparams_basic.c
>>  TESTS_progs += i915_hangman
>>  i915_hangman_SOURCES = i915/i915_hangman.c
>>
>> +TESTS_progs += i915_huc
>> +i915_huc_SOURCES = i915/i915_huc.c
>> +
>>  TESTS_progs += i915_module_load
>>  i915_module_load_SOURCES = i915/i915_module_load.c
>>
>> diff --git a/tests/i915/i915_huc.c b/tests/i915/i915_huc.c
>> new file mode 100644
>> index 00000000..2b4bc0d9
>> --- /dev/null
>> +++ b/tests/i915/i915_huc.c
>> @@ -0,0 +1,53 @@
>> +/* SPDX-License-Identifier: MIT */
>> +/*
>> + * Copyright (c) 2019 Intel Corporation
>> + */
>> +
>> +#include "igt.h"
>> +#include <fcntl.h>
>> +#include <i915_drm.h>
>> +#include <sys/ioctl.h>
>> +
>> +IGT_TEST_DESCRIPTION("Test HuC firmware");
>> +
>> +static int get_huc_status(int fd)
>> +{
>> +       int status = 0;
>> +       drm_i915_getparam_t gp = {
>> +               .param = I915_PARAM_HUC_STATUS,
>> +               .value = &status,
>> +       };
>> +
>> +       if (igt_ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp))
>> +               return -errno;
>> +
>> +       errno = 0;
>> +       return status;
>> +}
>> +
>> +igt_main
>> +{
>> +       int fd;
>> +
>> +       igt_fixture {
>> +               int status;
>> +
>> +               fd = drm_open_driver(DRIVER_INTEL);
>> +               igt_require_intel(fd);
>> +               __igt_debugfs_dump(fd, "i915_huc_load_status",  
>> IGT_LOG_INFO);
>> +
>> +               status = get_huc_status(fd);
>> +               igt_skip_on_f(status == -ENODEV,
>> +                             "HuC is not available on this  
>> platform!\n");
>> +               igt_skip_on_f(status < 0, "HuC firmware error: %i,  
>> %s\n",
>> +                             -status, strerror(-status));
>> +               igt_skip_on_f(status == 0, "HuC firmware is not  
>> loaded!\n");

After [1] this could be changed to "HuC firmware is not enabled" and
we can also add:

	igt_skip_on_f(status == -ENOPKG, "HuC firmware is not installed")

[1] https://patchwork.freedesktop.org/patch/305806/?series=60807&rev=2

>
> Yup, that I think is for the best; intelligible error messages even I
> can digest.
>
> (I was thinking a switch, e.g.
> static bool has_addfb2_iface(int fd)
> {
>         struct local_drm_mode_fb_cmd2 f = {};
>         int err;
>
>         err = 0;
>         if (drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f))
>                 err = -errno;
>         switch (err) {
>         case -ENOTTY: /* ioctl unrecognised (kernel too old) */
>         case -ENOTSUP: /* driver doesn't support KMS */
>                 return false;
>
>                 /*
>                  * The only other valid response is -EINVAL, but we leave
>                  * that for the actual tests themselves to discover for
>                  * more accurate reporting.
>                  */
>         default:
>                 return true;
>         }
> }
> igt_require(has_adddb2_iface(fd))
>
> But with sensible error messages, you win ;)
>
> Just need to hold off until we agree on the best error codes.
> -Chris
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev