Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0653217c authored by Gustavo Pimentel's avatar Gustavo Pimentel Committed by Lorenzo Pieralisi
Browse files

tools: PCI: Add MSI-X support 



Add MSI-X support to pcitest tool.

Modify pcitest.sh script to accommodate MSI-X interrupt tests.

Update documentation accordingly.

Signed-off-by: default avatarGustavo Pimentel <gustavo.pimentel@synopsys.com>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
parent e0332712

Documentation/PCI/endpoint/pci-test-howto.txt

+22 −14
Original line number Diff line number Diff line
@@ -121,7 +121,9 @@ following commands. 


	Interrupt tests



	SET IRQ TYPE TO LEGACY:         OKAY

	LEGACY IRQ:     NOT OKAY

	SET IRQ TYPE TO MSI:            OKAY

	MSI1:           OKAY

	MSI2:           OKAY

	MSI3:           OKAY
@@ -154,24 +156,30 @@ following commands. 
	MSI30:          NOT OKAY

	MSI31:          NOT OKAY

	MSI32:          NOT OKAY

	MSIX1:          OKAY

	MSIX2:          OKAY

	MSIX3:          OKAY

	MSIX4:          OKAY

	MSIX5:          OKAY

	MSIX6:          OKAY

	MSIX7:          OKAY

	MSIX8:          OKAY

	MSIX9:          NOT OKAY

	MSIX10:         NOT OKAY

	MSIX11:         NOT OKAY

	MSIX12:         NOT OKAY

	MSIX13:         NOT OKAY

	SET IRQ TYPE TO MSI-X:          OKAY

	MSI-X1:         OKAY

	MSI-X2:         OKAY

	MSI-X3:         OKAY

	MSI-X4:         OKAY

	MSI-X5:         OKAY

	MSI-X6:         OKAY

	MSI-X7:         OKAY

	MSI-X8:         OKAY

	MSI-X9:         NOT OKAY

	MSI-X10:        NOT OKAY

	MSI-X11:        NOT OKAY

	MSI-X12:        NOT OKAY

	MSI-X13:        NOT OKAY

	MSI-X14:        NOT OKAY

	MSI-X15:        NOT OKAY

	MSI-X16:        NOT OKAY

	[...]

	MSIX2048:       NOT OKAY

	MSI-X2047:      NOT OKAY

	MSI-X2048:      NOT OKAY



	Read Tests



	SET IRQ TYPE TO MSI:            OKAY

	READ (      1 bytes):           OKAY

	READ (   1024 bytes):           OKAY

	READ (   1025 bytes):           OKAY

tools/pci/pcitest.c

+50 −1
Original line number Diff line number Diff line
@@ -31,12 +31,17 @@ 
#define BILLION 1E9



static char *result[] = { "NOT OKAY", "OKAY" };

static char *irq[] = { "LEGACY", "MSI", "MSI-X" };



struct pci_test {

	char		*device;

	char		barnum;

	bool		legacyirq;

	unsigned int	msinum;

	unsigned int	msixnum;

	int		irqtype;

	bool		set_irqtype;

	bool		get_irqtype;

	bool		read;

	bool		write;

	bool		copy;
@@ -65,6 +70,24 @@ static int run_test(struct pci_test *test) 
			fprintf(stdout, "%s\n", result[ret]);

	}



	if (test->set_irqtype) {

		ret = ioctl(fd, PCITEST_SET_IRQTYPE, test->irqtype);

		fprintf(stdout, "SET IRQ TYPE TO %s:\t\t", irq[test->irqtype]);

		if (ret < 0)

			fprintf(stdout, "FAILED\n");

		else

			fprintf(stdout, "%s\n", result[ret]);

	}



	if (test->get_irqtype) {

		ret = ioctl(fd, PCITEST_GET_IRQTYPE);

		fprintf(stdout, "GET IRQ TYPE:\t\t");

		if (ret < 0)

			fprintf(stdout, "FAILED\n");

		else

			fprintf(stdout, "%s\n", irq[ret]);

	}



	if (test->legacyirq) {

		ret = ioctl(fd, PCITEST_LEGACY_IRQ, 0);

		fprintf(stdout, "LEGACY IRQ:\t");
@@ -83,6 +106,15 @@ static int run_test(struct pci_test *test) 
			fprintf(stdout, "%s\n", result[ret]);

	}



	if (test->msixnum > 0 && test->msixnum <= 2048) {

		ret = ioctl(fd, PCITEST_MSIX, test->msixnum);

		fprintf(stdout, "MSI-X%d:\t\t", test->msixnum);

		if (ret < 0)

			fprintf(stdout, "TEST FAILED\n");

		else

			fprintf(stdout, "%s\n", result[ret]);

	}



	if (test->write) {

		ret = ioctl(fd, PCITEST_WRITE, test->size);

		fprintf(stdout, "WRITE (%7ld bytes):\t\t", test->size);
@@ -133,7 +165,7 @@ int main(int argc, char **argv) 
	/* set default endpoint device */

	test->device = "/dev/pci-endpoint-test.0";



	while ((c = getopt(argc, argv, "D:b:m:lrwcs:")) != EOF)

	while ((c = getopt(argc, argv, "D:b:m:x:i:Ilrwcs:")) != EOF)

	switch (c) {

	case 'D':

		test->device = optarg;
@@ -151,6 +183,20 @@ int main(int argc, char **argv) 
		if (test->msinum < 1 || test->msinum > 32)

			goto usage;

		continue;

	case 'x':

		test->msixnum = atoi(optarg);

		if (test->msixnum < 1 || test->msixnum > 2048)

			goto usage;

		continue;

	case 'i':

		test->irqtype = atoi(optarg);

		if (test->irqtype < 0 || test->irqtype > 2)

			goto usage;

		test->set_irqtype = true;

		continue;

	case 'I':

		test->get_irqtype = true;

		continue;

	case 'r':

		test->read = true;

		continue;
@@ -173,6 +219,9 @@ int main(int argc, char **argv) 
			"\t-D <dev>		PCI endpoint test device {default: /dev/pci-endpoint-test.0}\n"

			"\t-b <bar num>		BAR test (bar number between 0..5)\n"

			"\t-m <msi num>		MSI test (msi number between 1..32)\n"

			"\t-x <msix num>	\tMSI-X test (msix number between 1..2048)\n"

			"\t-i <irq type>	\tSet IRQ type (0 - Legacy, 1 - MSI, 2 - MSI-X)\n"

			"\t-I			Get current IRQ type configured\n"

			"\t-l			Legacy IRQ test\n"

			"\t-r			Read buffer test\n"

			"\t-w			Write buffer test\n"

tools/pci/pcitest.sh

+15 −0
Original line number Diff line number Diff line
@@ -16,7 +16,10 @@ echo 
echo "Interrupt tests"

echo



pcitest -i 0

pcitest -l



pcitest -i 1

msi=1



while [ $msi -lt 33 ]
@@ -26,9 +29,21 @@ do 
done

echo



pcitest -i 2

msix=1



while [ $msix -lt 2049 ]

do

        pcitest -x $msix

        msix=`expr $msix + 1`

done

echo



echo "Read Tests"

echo



pcitest -i 1



pcitest -r -s 1

pcitest -r -s 1024

pcitest -r -s 1025