On Mon, 2024-06-03 at 15:36 +0200, Karolina Stolarek wrote:
> Update the tests and helpers to use unsigned kernel types.
>
> Signed-off-by: Karolina Stolarek <karolina.stolarek@xxxxxxxxx>
> Suggested-by: Thomas Hellström <thomas.hellstrom@xxxxxxxxxxxxxxx>
Reviewed-by: Thomas Hellström <thomas.hellstrom@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/ttm/tests/ttm_bo_test.c | 12 ++++++------
> drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c | 6 ++----
> drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.h | 4 ++--
> drivers/gpu/drm/ttm/tests/ttm_pool_test.c | 2 +-
> drivers/gpu/drm/ttm/tests/ttm_resource_test.c | 16 ++++++++--------
> drivers/gpu/drm/ttm/tests/ttm_tt_test.c | 12 ++++++------
> 6 files changed, 25 insertions(+), 27 deletions(-)
>
> diff --git a/drivers/gpu/drm/ttm/tests/ttm_bo_test.c
> b/drivers/gpu/drm/ttm/tests/ttm_bo_test.c
> index b53483ce3570..aafc22664c5e 100644
> --- a/drivers/gpu/drm/ttm/tests/ttm_bo_test.c
> +++ b/drivers/gpu/drm/ttm/tests/ttm_bo_test.c
> @@ -237,7 +237,7 @@ static void ttm_bo_unreserve_basic(struct kunit
> *test)
> struct ttm_place *place;
> struct ttm_resource_manager *man;
> unsigned int bo_prio = TTM_MAX_BO_PRIORITY - 1;
> - uint32_t mem_type = TTM_PL_SYSTEM;
> + u32 mem_type = TTM_PL_SYSTEM;
> int err;
>
> place = ttm_place_kunit_init(test, mem_type, 0);
> @@ -278,7 +278,7 @@ static void ttm_bo_unreserve_pinned(struct kunit
> *test)
> struct ttm_device *ttm_dev;
> struct ttm_resource *res1, *res2;
> struct ttm_place *place;
> - uint32_t mem_type = TTM_PL_SYSTEM;
> + u32 mem_type = TTM_PL_SYSTEM;
> int err;
>
> ttm_dev = kunit_kzalloc(test, sizeof(*ttm_dev), GFP_KERNEL);
> @@ -322,7 +322,7 @@ static void ttm_bo_unreserve_bulk(struct kunit
> *test)
> struct ttm_device *ttm_dev;
> struct ttm_place *place;
> struct dma_resv *resv;
> - uint32_t mem_type = TTM_PL_SYSTEM;
> + u32 mem_type = TTM_PL_SYSTEM;
> unsigned int bo_priority = 0;
> int err;
>
> @@ -380,7 +380,7 @@ static void ttm_bo_put_basic(struct kunit *test)
> struct ttm_resource *res;
> struct ttm_device *ttm_dev;
> struct ttm_place *place;
> - uint32_t mem_type = TTM_PL_SYSTEM;
> + u32 mem_type = TTM_PL_SYSTEM;
> int err;
>
> place = ttm_place_kunit_init(test, mem_type, 0);
> @@ -495,7 +495,7 @@ static void ttm_bo_pin_unpin_resource(struct
> kunit *test)
> struct ttm_resource *res;
> struct ttm_device *ttm_dev;
> struct ttm_place *place;
> - uint32_t mem_type = TTM_PL_SYSTEM;
> + u32 mem_type = TTM_PL_SYSTEM;
> unsigned int bo_priority = 0;
> int err;
>
> @@ -546,7 +546,7 @@ static void ttm_bo_multiple_pin_one_unpin(struct
> kunit *test)
> struct ttm_resource *res;
> struct ttm_device *ttm_dev;
> struct ttm_place *place;
> - uint32_t mem_type = TTM_PL_SYSTEM;
> + u32 mem_type = TTM_PL_SYSTEM;
> unsigned int bo_priority = 0;
> int err;
>
> diff --git a/drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c
> b/drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c
> index 48ab541f821f..c14cb2b48e68 100644
> --- a/drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c
> +++ b/drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c
> @@ -42,8 +42,7 @@ static struct ttm_placement mock_placement = {
> .placement = &mock2_place,
> };
>
> -static struct ttm_tt *ttm_tt_simple_create(struct ttm_buffer_object
> *bo,
> - uint32_t page_flags)
> +static struct ttm_tt *ttm_tt_simple_create(struct ttm_buffer_object
> *bo, u32 page_flags)
> {
> struct ttm_tt *tt;
>
> @@ -202,8 +201,7 @@ struct ttm_buffer_object
> *ttm_bo_kunit_init(struct kunit *test,
> }
> EXPORT_SYMBOL_GPL(ttm_bo_kunit_init);
>
> -struct ttm_place *ttm_place_kunit_init(struct kunit *test,
> - uint32_t mem_type, uint32_t
> flags)
> +struct ttm_place *ttm_place_kunit_init(struct kunit *test, u32
> mem_type, u32 flags)
> {
> struct ttm_place *place;
>
> diff --git a/drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.h
> b/drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.h
> index aa70b50e7640..c7da23232ffa 100644
> --- a/drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.h
> +++ b/drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.h
> @@ -38,8 +38,8 @@ struct ttm_buffer_object *ttm_bo_kunit_init(struct
> kunit *test,
> struct ttm_test_devices
> *devs,
> size_t size,
> struct dma_resv *obj);
> -struct ttm_place *ttm_place_kunit_init(struct kunit *test,
> - uint32_t mem_type, uint32_t
> flags);
> +struct ttm_place *ttm_place_kunit_init(struct kunit *test, u32
> mem_type,
> + u32 flags);
> void dummy_ttm_bo_destroy(struct ttm_buffer_object *bo);
>
> struct ttm_test_devices *ttm_test_devices_basic(struct kunit *test);
> diff --git a/drivers/gpu/drm/ttm/tests/ttm_pool_test.c
> b/drivers/gpu/drm/ttm/tests/ttm_pool_test.c
> index 9070ca43df53..5d4dc5b1c6d7 100644
> --- a/drivers/gpu/drm/ttm/tests/ttm_pool_test.c
> +++ b/drivers/gpu/drm/ttm/tests/ttm_pool_test.c
> @@ -48,7 +48,7 @@ static void ttm_pool_test_fini(struct kunit *test)
> }
>
> static struct ttm_tt *ttm_tt_kunit_init(struct kunit *test,
> - uint32_t page_flags,
> + u32 page_flags,
> enum ttm_caching caching,
> size_t size)
> {
> diff --git a/drivers/gpu/drm/ttm/tests/ttm_resource_test.c
> b/drivers/gpu/drm/ttm/tests/ttm_resource_test.c
> index b90523422d24..77be0942ab62 100644
> --- a/drivers/gpu/drm/ttm/tests/ttm_resource_test.c
> +++ b/drivers/gpu/drm/ttm/tests/ttm_resource_test.c
> @@ -11,8 +11,8 @@
>
> struct ttm_resource_test_case {
> const char *description;
> - uint32_t mem_type;
> - uint32_t flags;
> + u32 mem_type;
> + u32 flags;
> };
>
> struct ttm_resource_test_priv {
> @@ -47,7 +47,7 @@ static void ttm_resource_test_fini(struct kunit
> *test)
>
> static void ttm_init_test_mocks(struct kunit *test,
> struct ttm_resource_test_priv *priv,
> - uint32_t mem_type, uint32_t flags)
> + u32 mem_type, u32 flags)
> {
> size_t size = RES_SIZE;
>
> @@ -60,7 +60,7 @@ static void ttm_init_test_mocks(struct kunit *test,
>
> static void ttm_init_test_manager(struct kunit *test,
> struct ttm_resource_test_priv
> *priv,
> - uint32_t mem_type)
> + u32 mem_type)
> {
> struct ttm_device *ttm_dev = priv->devs->ttm_dev;
> struct ttm_resource_manager *man;
> @@ -112,7 +112,7 @@ static void ttm_resource_init_basic(struct kunit
> *test)
> struct ttm_buffer_object *bo;
> struct ttm_place *place;
> struct ttm_resource_manager *man;
> - uint64_t expected_usage;
> + u64 expected_usage;
>
> ttm_init_test_mocks(test, priv, params->mem_type, params-
> >flags);
> bo = priv->bo;
> @@ -230,7 +230,7 @@ static void
> ttm_resource_manager_usage_basic(struct kunit *test)
> struct ttm_buffer_object *bo;
> struct ttm_place *place;
> struct ttm_resource_manager *man;
> - uint64_t actual_usage;
> + u64 actual_usage;
>
> ttm_init_test_mocks(test, priv, TTM_PL_SYSTEM,
> TTM_PL_FLAG_TOPDOWN);
> bo = priv->bo;
> @@ -268,7 +268,7 @@ static void ttm_sys_man_alloc_basic(struct kunit
> *test)
> struct ttm_buffer_object *bo;
> struct ttm_place *place;
> struct ttm_resource *res;
> - uint32_t mem_type = TTM_PL_SYSTEM;
> + u32 mem_type = TTM_PL_SYSTEM;
> int ret;
>
> ttm_init_test_mocks(test, priv, mem_type, 0);
> @@ -293,7 +293,7 @@ static void ttm_sys_man_free_basic(struct kunit
> *test)
> struct ttm_buffer_object *bo;
> struct ttm_place *place;
> struct ttm_resource *res;
> - uint32_t mem_type = TTM_PL_SYSTEM;
> + u32 mem_type = TTM_PL_SYSTEM;
>
> ttm_init_test_mocks(test, priv, mem_type, 0);
> bo = priv->bo;
> diff --git a/drivers/gpu/drm/ttm/tests/ttm_tt_test.c
> b/drivers/gpu/drm/ttm/tests/ttm_tt_test.c
> index dd9bac7cb7b0..a8c76dbd6913 100644
> --- a/drivers/gpu/drm/ttm/tests/ttm_tt_test.c
> +++ b/drivers/gpu/drm/ttm/tests/ttm_tt_test.c
> @@ -11,8 +11,8 @@
>
> struct ttm_tt_test_case {
> const char *description;
> - uint32_t size;
> - uint32_t extra_pages_num;
> + u32 size;
> + u32 extra_pages_num;
> };
>
> static const struct ttm_tt_test_case ttm_tt_init_basic_cases[] = {
> @@ -41,9 +41,9 @@ static void ttm_tt_init_basic(struct kunit *test)
> const struct ttm_tt_test_case *params = test->param_value;
> struct ttm_buffer_object *bo;
> struct ttm_tt *tt;
> - uint32_t page_flags = TTM_TT_FLAG_ZERO_ALLOC;
> + u32 page_flags = TTM_TT_FLAG_ZERO_ALLOC;
> enum ttm_caching caching = ttm_cached;
> - uint32_t extra_pages = params->extra_pages_num;
> + u32 extra_pages = params->extra_pages_num;
> int num_pages = params->size >> PAGE_SHIFT;
> int err;
>
> @@ -69,7 +69,7 @@ static void ttm_tt_init_misaligned(struct kunit
> *test)
> struct ttm_buffer_object *bo;
> struct ttm_tt *tt;
> enum ttm_caching caching = ttm_cached;
> - uint32_t size = SZ_8K;
> + u32 size = SZ_8K;
> int num_pages = (size + SZ_4K) >> PAGE_SHIFT;
> int err;
>
> @@ -211,7 +211,7 @@ static void ttm_tt_create_ttm_exists(struct kunit
> *test)
> }
>
> static struct ttm_tt *ttm_tt_null_create(struct ttm_buffer_object
> *bo,
> - uint32_t page_flags)
> + u32 page_flags)
> {
> return NULL;
> }
