Re: [PATCH v3] selftests: drivers: fpga: A test for interrupt support

[Moritz Fischer]

Tom,

On Sun, Jan 17, 2021 at 08:18:15AM -0800, trix@xxxxxxxxxx wrote:
> From: Tom Rix <trix@xxxxxxxxxx>
> 
> Check that the ioctl DFL_FPGA_PORT_ERR_GET_IRQ_NUM returns
> an expected result.
> 
> Tested on vf device 0xbcc1
> 
> Sample run with
>  # make -C tools/testing/selftests TARGETS=drivers/fpga run_tests
>  ...
>  TAP version 13
>  1..1
>  # selftests: drivers/fpga: intr
>  # TAP version 13
>  # 1..1
>  # # Starting 1 tests from 1 test cases.
>  # #  RUN           global.afu_intr ...
>  # #            OK  global.afu_intr
>  # ok 1 global.afu_intr
>  # # PASSED: 1 / 1 tests passed.
>  # # Totals: pass:1 fail:0 xfail:0 xpass:0 skip:0 error:0
>  ok 1 selftests: drivers/fpga: intr
> 
> Signed-off-by: Tom Rix <trix@xxxxxxxxxx>
> ---
> v1: Convert to kselftest_harness.h framework
> v2: reverse xmas tree variables
> ---
>  MAINTAINERS                                   |  1 +
>  tools/testing/selftests/Makefile              |  1 +
>  tools/testing/selftests/drivers/fpga/Makefile |  7 ++++
>  tools/testing/selftests/drivers/fpga/config   |  1 +
>  tools/testing/selftests/drivers/fpga/intr.c   | 36 +++++++++++++++++++
>  5 files changed, 46 insertions(+)
>  create mode 100644 tools/testing/selftests/drivers/fpga/Makefile
>  create mode 100644 tools/testing/selftests/drivers/fpga/config
>  create mode 100644 tools/testing/selftests/drivers/fpga/intr.c
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index de610a06cb5c..7ed3ce58d95e 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -6973,6 +6973,7 @@ F:	Documentation/driver-api/fpga/
>  F:	Documentation/fpga/
>  F:	drivers/fpga/
>  F:	include/linux/fpga/
> +F:	tools/testing/selftests/drivers/fpga/
>  
>  FPGA SECURITY MANAGER DRIVERS
>  M:	Russ Weight <russell.h.weight@xxxxxxxxx>
> diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile
> index afbab4aeef3c..aad4763ec348 100644
> --- a/tools/testing/selftests/Makefile
> +++ b/tools/testing/selftests/Makefile
> @@ -9,6 +9,7 @@ TARGETS += core
>  TARGETS += cpufreq
>  TARGETS += cpu-hotplug
>  TARGETS += drivers/dma-buf
> +TARGETS += drivers/fpga
>  TARGETS += efivarfs
>  TARGETS += exec
>  TARGETS += filesystems
> diff --git a/tools/testing/selftests/drivers/fpga/Makefile b/tools/testing/selftests/drivers/fpga/Makefile
> new file mode 100644
> index 000000000000..eba35c405d5b
> --- /dev/null
> +++ b/tools/testing/selftests/drivers/fpga/Makefile
> @@ -0,0 +1,7 @@
> +# SPDX-License-Identifier: GPL-2.0-only
> +CFLAGS += -I../../../../../usr/include/
> +CFLAGS += -I../../../../../include/uapi/
> +
> +TEST_GEN_PROGS := intr
> +
> +include ../../lib.mk
> diff --git a/tools/testing/selftests/drivers/fpga/config b/tools/testing/selftests/drivers/fpga/config
> new file mode 100644
> index 000000000000..e2111b81d8d7
> --- /dev/null
> +++ b/tools/testing/selftests/drivers/fpga/config
> @@ -0,0 +1 @@
> +CONFIG_FPGA_DFL_AFU=m
> diff --git a/tools/testing/selftests/drivers/fpga/intr.c b/tools/testing/selftests/drivers/fpga/intr.c
> new file mode 100644
> index 000000000000..927dcc757f0b
> --- /dev/null
> +++ b/tools/testing/selftests/drivers/fpga/intr.c
> @@ -0,0 +1,36 @@
> +// SPDX-License-Identifier: GPL-2.0
> +#include <stdio.h>
> +#include <stdlib.h>
> +#include <stdint.h>
> +#include <string.h>
> +#include <sys/fcntl.h>
> +#include <sys/ioctl.h>
> +#include <linux/fpga-dfl.h>
> +
> +#include "../../kselftest_harness.h"
> +
> +TEST(afu_intr)
> +{
> +	struct dfl_fpga_port_info port_info;
> +	uint32_t irq_num = UINT32_MAX;
> +	int devfd, status;
> +
> +	devfd = open("/dev/dfl-port.0", O_RDONLY);
> +	if (devfd < 0)
> +		SKIP(0, "no fpga afu device 0");
> +	/*
> +	 * From fpga-dl.h :
> +	 * Currently hardware supports up to 1 irq.
> +	 * Return: 0 on success, -errno on failure.
> +	 */
> +	status = ioctl(devfd, DFL_FPGA_PORT_ERR_GET_IRQ_NUM, &irq_num);
> +	ASSERT_EQ(0, status) {
> +		TH_LOG("ioctl() failed to get the number irqs");
> +	}
> +	ASSERT_LT(irq_num, 256) {
> +		TH_LOG("unexpeced number of irqs");
> +	}
> +	close(devfd);
> +}
> +
> +TEST_HARNESS_MAIN
> -- 
> 2.27.0
> 
Looks good to me, from FPGA perspective, needs Acked-by from Shua, though.

Also, this does not apply to linux-next, or for-5.12 or char-misc-next,
so I'm confused :)

Once that's sorted, feel free to add

Acked-by: Moritz Fischer <mdf@xxxxxxxxxx>

- Moritz