Skip to contentSkip to conversation

drm/xe: Add mocs kunit

PATCH In review Ruthuvikas Ravikumar 2 participants 2 messages Oct 20, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/xe: Add mocs kunit

This kunit verifies the hardware values of mocs and l3cc registers with the KMD programmed values.

Cc Aravind Iddamsetty <[email protected]>
Cc Mathew D Roper <[email protected]>
---
 drivers/gpu/drm/xe/tests/Makefile       |   1 +
 drivers/gpu/drm/xe/tests/xe_mocs.c      | 142 ++++++++++++++++++++++++
 drivers/gpu/drm/xe/tests/xe_mocs_test.c |  24 ++++
 drivers/gpu/drm/xe/tests/xe_mocs_test.h |  13 +++
 drivers/gpu/drm/xe/xe_mocs.c            |   4 +
 5 files changed, 184 insertions(+)
 create mode 100644 drivers/gpu/drm/xe/tests/xe_mocs.c
 create mode 100644 drivers/gpu/drm/xe/tests/xe_mocs_test.c
 create mode 100644 drivers/gpu/drm/xe/tests/xe_mocs_test.h
drivers/gpu/drm/xe/tests/Makefile +1 -0
index 51f1a7f017d4..39d8a0892274 100644
@@ -4,6 +4,7 @@ obj-$(CONFIG_DRM_XE_KUNIT_TEST) += \
 	xe_bo_test.o \
 	xe_dma_buf_test.o \
 	xe_migrate_test.o \
+	xe_mocs_test.o \
 	xe_pci_test.o \
 	xe_rtp_test.o \
 	xe_wa_test.o
drivers/gpu/drm/xe/tests/xe_mocs.c new file +142 -0

142 lines not on this page · raw message

drivers/gpu/drm/xe/tests/xe_mocs_test.c new file +24 -0
new file mode 100644
index 000000000000..ef56bd517b28
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright © 2022 Intel Corporation
+ */
+
+#include "xe_mocs_test.h"
+
+#include <kunit/test.h>
+
+static struct kunit_case xe_mocs_tests[] = {
+	KUNIT_CASE(xe_live_mocs_kernel_kunit),
+	{}
+};
+
+static struct kunit_suite xe_mocs_test_suite = {
+	.name = "xe_mocs",
+	.test_cases = xe_mocs_tests,
+};
+
+kunit_test_suite(xe_mocs_test_suite);
+
+MODULE_AUTHOR("Intel Corporation");
+MODULE_LICENSE("GPL");
+MODULE_IMPORT_NS(EXPORTED_FOR_KUNIT_TESTING);
drivers/gpu/drm/xe/tests/xe_mocs_test.h new file +13 -0
new file mode 100644
index 000000000000..7faa3575e6c3
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: GPL-2.0 AND MIT */
+/*
+ * Copyright © 2023 Intel Corporation
+ */
+
+#ifndef _XE_MOCS_TEST_H_
+#define _XE_MOCS_TEST_H_
+
+struct kunit;
+
+void xe_live_mocs_kernel_kunit(struct kunit *test);
+
+#endif
drivers/gpu/drm/xe/xe_mocs.c +4 -0
index 19a8146ded9a..a73419ea0711 100644
@@ -579,3 +579,7 @@ void xe_mocs_init(struct xe_gt *gt)
 	if (table.table)
 		init_l3cc_table(gt, &table);
 }
+
+#if IS_ENABLED(CONFIG_DRM_XE_KUNIT_TEST)
+#include "tests/xe_mocs.c"
+#endif
Signature · 1 line
2.25.1
#1 lore raw
Quoted 3 lines · Ruthuvikas Ravikumar

This kunit verifies the hardware values of mocs and l3cc registers with the KMD programmed values.

In the future it's helpful to reviewers if you provide a list of updates since the previous version. E.g.,

v2:
- Changed foo to bar
- Dropped unnecessary abc
- Added def

Quoted 79 lines
Cc Aravind Iddamsetty <[email protected]>
Cc Mathew D Roper <[email protected]>
---
 drivers/gpu/drm/xe/tests/Makefile       |   1 +
 drivers/gpu/drm/xe/tests/xe_mocs.c      | 142 ++++++++++++++++++++++++
 drivers/gpu/drm/xe/tests/xe_mocs_test.c |  24 ++++
 drivers/gpu/drm/xe/tests/xe_mocs_test.h |  13 +++
 drivers/gpu/drm/xe/xe_mocs.c            |   4 +
 5 files changed, 184 insertions(+)
 create mode 100644 drivers/gpu/drm/xe/tests/xe_mocs.c
 create mode 100644 drivers/gpu/drm/xe/tests/xe_mocs_test.c
 create mode 100644 drivers/gpu/drm/xe/tests/xe_mocs_test.h
drivers/gpu/drm/xe/tests/Makefile +1 -0
index 51f1a7f017d4..39d8a0892274 100644
@@ -4,6 +4,7 @@ obj-$(CONFIG_DRM_XE_KUNIT_TEST) += \
 	xe_bo_test.o \
 	xe_dma_buf_test.o \
 	xe_migrate_test.o \
+	xe_mocs_test.o \
 	xe_pci_test.o \
 	xe_rtp_test.o \
 	xe_wa_test.o
drivers/gpu/drm/xe/tests/xe_mocs.c new file +47 -0
new file mode 100644
index 000000000000..c5d002526da7
@@ -0,0 +1,142 @@
+// SPDX-License-Identifier: GPL-2.0 AND MIT
+/*
+ * Copyright © 2022 Intel Corporation
+ */
+
+#include <kunit/test.h>
+#include <kunit/visibility.h>
+
+#include "tests/xe_mocs_test.h"
+#include "tests/xe_pci_test.h"
+#include "tests/xe_test.h"
+
+#include "xe_pci.h"
+#include "xe_pm.h"
+#include "xe_gt.h"
+#include "xe_mocs.h"
+#include "xe_bo.h"
+#include "xe_device.h"
+
+struct live_mocs {
+	struct xe_mocs_info table;
+	struct xe_mocs_info *mocs;
+	struct xe_mocs_info *l3cc;
+};
+
+static int live_mocs_init(struct live_mocs *arg, struct xe_gt *gt)
+{
+	unsigned int flags;
+	struct kunit *test = xe_cur_kunit();
+
+	memset(arg, 0, sizeof(*arg));
+
+	flags = get_mocs_settings(gt_to_xe(gt), &arg->table);
+
+	kunit_info(test, "table size %d", arg->table.size);
+	kunit_info(test, "table uc_index %d", arg->table.uc_index);
+	kunit_info(test, "table n_entries %d", arg->table.n_entries);
+
+	if (flags & HAS_GLOBAL_MOCS)
+		arg->mocs = &arg->table;
+
+	arg->l3cc = &arg->table;
+
+	return flags;
+}
+
+static void read_l3cc_table(struct xe_gt *gt, const struct xe_mocs_info *info)

drivers/gpu/drm/xe/tests/xe_mocs.c line 57

Quoted 10 lines
drivers/gpu/drm/xe/tests/xe_mocs.c new file +10 -0
+{
+	unsigned int i;
+	u32 l3cc;
+	u32 reg;
+	ssize_t ret;
+
+	struct kunit *test = xe_cur_kunit();
+
+	xe_device_mem_access_get(gt_to_xe(gt));
+	ret = xe_force_wake_get(gt_to_fw(gt), XE_FORCEWAKE_ALL);

As noted in the previous revision, you never release this forcewake when you're done. Same with the mocs function farther down.

Quoted 7 lines
drivers/gpu/drm/xe/tests/xe_mocs.c new file +7 -0
+	if (ret)
+		goto out;
+
+	mocs_dbg(&gt_to_xe(gt)->drm, "L3CC entries:%d\n", info->n_entries);
+	for (i = 0; i < (info->n_entries + 1) / 2 ?
+		    (l3cc = l3cc_combine(get_entry_l3cc(info, 2 * i),
+					 get_entry_l3cc(info, 2 * i + 1))),

drivers/gpu/drm/xe/tests/xe_mocs.c line 74

Quoted 10 lines
drivers/gpu/drm/xe/tests/xe_mocs.c new file +10 -0
+	    1 : 0;
+	     i++) {
+		reg = xe_mmio_read32(gt, LNCFCMOCS(i));
+		mocs_dbg(&gt_to_xe(gt)->drm, "%d 0x%x 0x%x 0x%x\n", i,
+			 LNCFCMOCS(i).addr, reg, l3cc);
+
+		if (reg != l3cc) {
+			KUNIT_FAIL(test, "l3cc reg 0x%x has incorrect val:\n",
+				   LNCFCMOCS(i).addr);
+		}

Minor nitpick: since you're only guarding a single statement with the 'if' condition, the braces aren't necessary.

Quoted 25 lines
drivers/gpu/drm/xe/tests/xe_mocs.c new file +25 -0
+	}
+
+out:
+	xe_device_mem_access_put(gt_to_xe(gt));
+}
+
+static void read_mocs_table(struct xe_gt *gt, const struct xe_mocs_info *info,
+			    u32 addr)
+{
+	struct xe_device *xe = gt_to_xe(gt);
+
+	unsigned int i;
+	u32 mocs;
+	u32 reg_val;
+
+	ssize_t ret;
+
+	struct kunit *test = xe_cur_kunit();
+
+	xe_device_mem_access_get(gt_to_xe(gt));
+	ret = xe_force_wake_get(gt_to_fw(gt), XE_FORCEWAKE_ALL);
+	if (ret)
+		goto out;
+
+	mocs_dbg(&gt_to_xe(gt)->drm, "Global MOCS entries:%d\n", info->n_entries);

drivers/gpu/drm/xe/tests/xe_mocs.c line 109

Quoted 10 lines
drivers/gpu/drm/xe/tests/xe_mocs.c new file +10 -0
+	drm_WARN_ONCE(&xe->drm, !info->unused_entries_index,
+		      "Unused entries index should have been defined\n");
+	for (i = 0;
+	     i < info->n_entries ? (mocs = get_entry_control(info, i)), 1 : 0;
+	     i++) {
+		struct xe_reg reg = XE_REG(addr + i * 4);
+
+		reg_val = xe_mmio_read32(gt, reg);
+		mocs_dbg(&gt_to_xe(gt)->drm, "%d 0x%x 0x%x\n", i, reg.addr,
+			 reg_val);

I think you want

	mocs_dbg(&gt_to_xe(gt)->drm, "%d 0x%x 0x%x 0x%x\n", i, reg.addr,
		 reg_val, mocs);

so that the output will show both the current and expected values, similar to how you did so earlier for l3cc.

Quoted 40 lines
drivers/gpu/drm/xe/tests/xe_mocs.c new file +33 -0
+		if (reg_val != mocs) {
+			KUNIT_FAIL(test, "mocs reg 0x%x has incorrect val:\n",
+				   reg.addr);
+		}
+	}
+out:
+	xe_device_mem_access_put(gt_to_xe(gt));
+}
+
+static int mocs_kernel_test_run_device(struct xe_device *xe)
+{
+	/* Basic check the system is configured with the expected mocs table */
+
+	struct live_mocs mocs;
+	struct xe_gt *gt;
+
+	unsigned int flags;
+	int id;
+
+	for_each_gt(gt, xe, id) {
+		flags = live_mocs_init(&mocs, gt);
+		if (flags & HAS_GLOBAL_MOCS)
+			read_mocs_table(gt, mocs.mocs, GLOBAL_MOCS(0).addr);
+		read_l3cc_table(gt, mocs.l3cc);
+	}
+	return 0;
+}
+
+void xe_live_mocs_kernel_kunit(struct kunit *test)
+{
+	xe_call_for_each_device(mocs_kernel_test_run_device);
+}
+EXPORT_SYMBOL_IF_KUNIT(xe_live_mocs_kernel_kunit);
drivers/gpu/drm/xe/tests/xe_mocs_test.c new file +1 -0
new file mode 100644
index 000000000000..ef56bd517b28
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: GPL-2.0

drivers/gpu/drm/xe/tests/xe_mocs_test.c line 11

Quoted 10 lines
drivers/gpu/drm/xe/tests/xe_mocs_test.c new file +10 -0
+/*
+ * Copyright © 2022 Intel Corporation
+ */
+
+#include "xe_mocs_test.h"
+
+#include <kunit/test.h>
+
+static struct kunit_case xe_mocs_tests[] = {
+	KUNIT_CASE(xe_live_mocs_kernel_kunit),

Is there still a plan to add more tests for other cases where we want to check MOCS? E.g., after reset, after suspend/resume cycle, etc.?

Matt

Quoted 47 lines
drivers/gpu/drm/xe/tests/xe_mocs_test.c new file +13 -0
+	{}
+};
+
+static struct kunit_suite xe_mocs_test_suite = {
+	.name = "xe_mocs",
+	.test_cases = xe_mocs_tests,
+};
+
+kunit_test_suite(xe_mocs_test_suite);
+
+MODULE_AUTHOR("Intel Corporation");
+MODULE_LICENSE("GPL");
+MODULE_IMPORT_NS(EXPORTED_FOR_KUNIT_TESTING);
drivers/gpu/drm/xe/tests/xe_mocs_test.h new file +13 -0
new file mode 100644
index 000000000000..7faa3575e6c3
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: GPL-2.0 AND MIT */
+/*
+ * Copyright © 2023 Intel Corporation
+ */
+
+#ifndef _XE_MOCS_TEST_H_
+#define _XE_MOCS_TEST_H_
+
+struct kunit;
+
+void xe_live_mocs_kernel_kunit(struct kunit *test);
+
+#endif
drivers/gpu/drm/xe/xe_mocs.c +4 -0
index 19a8146ded9a..a73419ea0711 100644
@@ -579,3 +579,7 @@ void xe_mocs_init(struct xe_gt *gt)
 	if (table.table)
 		init_l3cc_table(gt, &table);
 }
+
+#if IS_ENABLED(CONFIG_DRM_XE_KUNIT_TEST)
+#include "tests/xe_mocs.c"
+#endif
Signature · 1 line
2.25.1
Signature · 4 lines
Matt Roper
Graphics Software Engineer
Linux GPU Platform Enablement
Intel Corporation