Unverified Commit ac7b2a02 authored by Christoph Müllner's avatar Christoph Müllner Committed by Palmer Dabbelt
Browse files

tools: selftests: riscv: Fix compile warnings in cbo 



GCC prints a couple of format string warnings when compiling
the cbo test. Let's follow the recommendation in
Documentation/printk-formats.txt to fix these warnings.

Signed-off-by: default avatarChristoph Müllner <christoph.muellner@vrull.eu>
Reviewed-by: default avatarAlexandre Ghiti <alexghiti@rivosinc.com>
Reviewed-by: default avatarAndrew Jones <ajones@ventanamicro.com>
Link: https://lore.kernel.org/r/20231123185821.2272504-3-christoph.muellner@vrull.eu


Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent b91c26fd

tools/testing/selftests/riscv/hwprobe/cbo.c

+3 −3
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static void test_zicboz(void *arg) 
	block_size = pair.value;

	ksft_test_result(rc == 0 && pair.key == RISCV_HWPROBE_KEY_ZICBOZ_BLOCK_SIZE &&

			 is_power_of_2(block_size), "Zicboz block size\n");

	ksft_print_msg("Zicboz block size: %ld\n", block_size);

	ksft_print_msg("Zicboz block size: %llu\n", block_size);



	illegal_insn = false;

	cbo_zero(&mem[block_size]);
@@ -121,7 +121,7 @@ static void test_zicboz(void *arg) 
		for (j = 0; j < block_size; ++j) {

			if (mem[i * block_size + j] != expected) {

				ksft_test_result_fail("cbo.zero check\n");

				ksft_print_msg("cbo.zero check: mem[%d] != 0x%x\n",

				ksft_print_msg("cbo.zero check: mem[%llu] != 0x%x\n",

					       i * block_size + j, expected);

				return;

			}
@@ -201,7 +201,7 @@ int main(int argc, char **argv) 
	pair.key = RISCV_HWPROBE_KEY_IMA_EXT_0;

	rc = riscv_hwprobe(&pair, 1, sizeof(cpu_set_t), (unsigned long *)&cpus, 0);

	if (rc < 0)

		ksft_exit_fail_msg("hwprobe() failed with %d\n", rc);

		ksft_exit_fail_msg("hwprobe() failed with %ld\n", rc);

	assert(rc == 0 && pair.key == RISCV_HWPROBE_KEY_IMA_EXT_0);



	if (pair.value & RISCV_HWPROBE_EXT_ZICBOZ) {