drm/xe: Add mocs kunit
Subsystems (2)
PATCH v9 1/1 drm/xe: Add mocs kunit
This kunit verifies the hardware values of mocs and l3cc registers with the KMD programmed values.
v9: Add Forcewake Fail.
v8: Remove xe_bo.h and xe_pm.h
Remove mocs and l3cc from live_mocs.
Pull debug and err msg for mocs/l3cc out of if else block. Add HAS_LNCF_MOCS.
v7: correct checkpath
v6: Change ssize_t type.
Change forcewake domain to XE_FW_GT.
Update change of MOCS registers are multicast on Xe_HP and beyond patch.
v5: Release forcewake.
Remove single statement braces.
Fix debug statements.
v4: Drop stratch and vaddr.
Fix debug statements.
Fix indentation.
v3: Fix checkpath.
v2: Fix checkpath.
--- drivers/gpu/drm/xe/tests/Makefile | 1 + drivers/gpu/drm/xe/tests/xe_mocs.c | 138 ++++++++++++++++++++++++ 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, 180 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
@@ -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 +138 -0
138 lines not on this page · raw message
drivers/gpu/drm/xe/tests/xe_mocs_test.c new file +24 -0
@@ -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
@@ -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
@@ -588,3 +588,7 @@ void xe_mocs_init(struct xe_gt *gt)if (flags &HAS_LNCF_MOCS )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
Patchwork
CI[Intel-xe] ✗ CI.Patch_applied: failure for drm/xe: Add mocs kunit (rev10)
== Series Details ==
== Series Details ==
Series: drm/xe: Add mocs kunit (rev10)
URL : https://patchwork.freedesktop.org/series/124926/
State : failure
== Summary ==
=== Applying kernel patches on branch 'drm-xe-next' with base: === Base commit: 58c0bd519 drm/xe: Add Wa_14019877138
=== git am output follows ===
Applying: drm/xe: Add mocs kunit
Quoted 122 lines · Ruthuvikas Ravikumar
This kunit verifies the hardware values of mocs and l3cc registers with the KMD programmed values.
v9: Add Forcewake Fail.
v8: Remove
xe_bo.handxe_pm.h
Remove mocs and l3cc fromlive_mocs.
Pull debug and err msg for mocs/l3cc out of if else block. AddHAS_LNCF_MOCS.v7: correct checkpath
v6: Change
ssize_ttype.
Change forcewake domain toXE_FW_GT.
Update change of MOCS registers are multicast onXe_HPand beyond patch.v5: Release forcewake.
Remove single statement braces.
Fix debug statements.v4: Drop stratch and vaddr.
Fix debug statements.
Fix indentation.v3: Fix checkpath.
v2: Fix checkpath.
Cc Aravind Iddamsetty <[email protected]>Cc Mathew D Roper <[email protected]>Signed-off-by Ruthuvikas Ravikumar <[email protected]>--- drivers/gpu/drm/xe/tests/Makefile | 1 + drivers/gpu/drm/xe/tests/xe_mocs.c | 138 ++++++++++++++++++++++++ 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, 180 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.hdrivers/gpu/drm/xe/tests/Makefile +1
-0@@ -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.odrivers/gpu/drm/xe/tests/xe_mocs.c new file +61
-0@@ -0,0 +1,138 @@ +// 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_gt.h" +#include "xe_mocs.h" +#include "xe_device.h" + +struct live_mocs { +struct xe_mocs_info table; +}; + +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); + +return flags; +} + +static void read_l3cc_table (struct xe_gt *gt, +const struct xe_mocs_info *info) +{ +unsigned int i; +u32 l3cc; +u32 reg_val; +u32 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_FW_GT ); +if (ret) + goto out; +mocs_dbg (>_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 ))),1 :0 ; + i++) { +if (GRAPHICS_VERx100 (gt_to_xe (gt)) >=1250 ) + reg_val =xe_gt_mcr_unicast_read_any (gt,XEHP_LNCFCMOCS (i)); +else + reg_val =xe_mmio_read32 (gt,XELP_LNCFCMOCS (i));
drivers/gpu/drm/xe/tests/xe_mocs.c line 71
Quoted 10 lines
drivers/gpu/drm/xe/tests/xe_mocs.c new file +10
-0+mocs_dbg (>_to_xe (gt)->drm,"%d 0x%x 0x%x 0x%x\n" , i, +XELP_LNCFCMOCS (i).addr, reg_val, l3cc); +if (reg_val != l3cc) +KUNIT_FAIL (test,"l3cc reg 0x%x has incorrect val.\n" , +XELP_LNCFCMOCS (i).addr); + } +xe_force_wake_put (gt_to_fw (gt),XE_FW_GT ); +out: +xe_device_mem_access_put (gt_to_xe (gt)); +KUNIT_FAIL (test,"Forcewake Failed.\n" );
Putting this here will make the test always fail 100% of the time. There's no way to exit this function without executing this line of code.
If you want to only fail on error, you'd either need to place this at the point where the forcewake fails, or you'd need to replace the line here with something like "KUNIT_ASSERT_EQ(test, ret, 0)"
Quoted 17 lines
drivers/gpu/drm/xe/tests/xe_mocs.c new file +17
-0+} + +static void read_mocs_table (struct xe_gt *gt, +const struct xe_mocs_info *info) +{ +struct xe_device *xe =gt_to_xe (gt); + +unsigned int i; +u32 mocs; +u32 reg_val; +u32 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_FW_GT ); +if (ret)
drivers/gpu/drm/xe/tests/xe_mocs.c line 98
Quoted 10 lines
drivers/gpu/drm/xe/tests/xe_mocs.c new file +10
-0+ goto out; + +mocs_dbg (>_to_xe (gt)->drm,"Global MOCS entries:%d\n" , info->n_entries); +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++) { + +if (GRAPHICS_VERx100 (gt_to_xe (gt)) >1250 )
This should probably be >= to match the condition in the l3cc function. Technically it doesn't matter too much since the only platform with exactly version 12.50 was a non-product development platform (xehpsdv) which we're not supporting in this driver, but 12.50 is technically the first version where these registers became multicast, so ">=" would still be the most accurate form here.
drivers/gpu/drm/xe/tests/xe_mocs.c line 111
Quoted 13 lines
drivers/gpu/drm/xe/tests/xe_mocs.c new file +13
-0+ reg_val =xe_gt_mcr_unicast_read_any (gt,XEHP_GLOBAL_MOCS (i)); + else + reg_val =xe_mmio_read32 (gt,XELP_GLOBAL_MOCS (i)); +mocs_dbg (>_to_xe (gt)->drm,"%d 0x%x 0x%x 0x%x\n" , i, +XELP_GLOBAL_MOCS (i).addr, reg_val, mocs); +if (reg_val != mocs) +KUNIT_FAIL (test,"mocs reg 0x%x has incorrect val.\n" , +XELP_GLOBAL_MOCS (i).addr); + } +xe_force_wake_put (gt_to_fw (gt),XE_FW_GT ); +out: +xe_device_mem_access_put (gt_to_xe (gt)); +KUNIT_FAIL (test,"Forcewake Failed.\n" );
Same problem here; this line always gets executed, so your test is guaranteed to report a failure, even when it actually succeeded.
Matt
Quoted 91 lines
drivers/gpu/drm/xe/tests/xe_mocs.c new file +27
-0+} + +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.table); +if (flags &HAS_LNCF_MOCS ) +read_l3cc_table (gt, &mocs.table); + } +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 +24
-0@@ -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@@ -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@@ -588,3 +588,7 @@ void xe_mocs_init(struct xe_gt *gt)if (flags &HAS_LNCF_MOCS )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