Add MSI-X support to pcitest tool.

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

Signed-off-by: Gustavo Pimentel <gustavo.pimen...@synopsys.com>
---
 include/uapi/linux/pcitest.h |  1 +
 tools/pci/pcitest.c          | 18 +++++++++++++++++-
 tools/pci/pcitest.sh         | 25 +++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/include/uapi/linux/pcitest.h b/include/uapi/linux/pcitest.h
index 953cf03..d746fb1 100644
--- a/include/uapi/linux/pcitest.h
+++ b/include/uapi/linux/pcitest.h
@@ -16,5 +16,6 @@
 #define PCITEST_WRITE          _IOW('P', 0x4, unsigned long)
 #define PCITEST_READ           _IOW('P', 0x5, unsigned long)
 #define PCITEST_COPY           _IOW('P', 0x6, unsigned long)
+#define PCITEST_MSIX           _IOW('P', 0x7, int)
 
 #endif /* __UAPI_LINUX_PCITEST_H */
diff --git a/tools/pci/pcitest.c b/tools/pci/pcitest.c
index 9074b47..9d145a3 100644
--- a/tools/pci/pcitest.c
+++ b/tools/pci/pcitest.c
@@ -37,6 +37,7 @@ struct pci_test {
        char            barnum;
        bool            legacyirq;
        unsigned int    msinum;
+       unsigned int    msixnum;
        bool            read;
        bool            write;
        bool            copy;
@@ -83,6 +84,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 +143,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:lrwcs:")) != EOF)
        switch (c) {
        case 'D':
                test->device = optarg;
@@ -151,6 +161,11 @@ 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 'r':
                test->read = true;
                continue;
@@ -173,6 +188,7 @@ 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>        MSI-X test (msix number between 
1..2048)\n"
                        "\t-l                   Legacy IRQ test\n"
                        "\t-r                   Read buffer test\n"
                        "\t-w                   Write buffer test\n"
diff --git a/tools/pci/pcitest.sh b/tools/pci/pcitest.sh
index 77e8c85..86709a2 100644
--- a/tools/pci/pcitest.sh
+++ b/tools/pci/pcitest.sh
@@ -4,6 +4,8 @@
 echo "BAR tests"
 echo
 
+modprobe pci_endpoint_test
+sleep 2
 bar=0
 
 while [ $bar -lt 6 ]
@@ -16,7 +18,14 @@ echo
 echo "Interrupt tests"
 echo
 
+rmmod pci_endpoint_test
+sleep 2
+modprobe pci_endpoint_test irq_type=0
 pcitest -l
+
+rmmod pci_endpoint_test
+sleep 2
+modprobe pci_endpoint_test irq_type=1
 msi=1
 
 while [ $msi -lt 33 ]
@@ -26,9 +35,25 @@ do
 done
 echo
 
+rmmod pci_endpoint_test
+sleep 2
+modprobe pci_endpoint_test irq_type=2
+msix=1
+
+while [ $msix -lt 2049 ]
+do
+        pcitest -x $msix
+        msix=`expr $msix + 1`
+done
+echo
+
 echo "Read Tests"
 echo
 
+rmmod pci_endpoint_test
+sleep 2
+modprobe pci_endpoint_test irq_type=1
+
 pcitest -r -s 1
 pcitest -r -s 1024
 pcitest -r -s 1025
-- 
2.7.4


--
To unsubscribe from this list: send the line "unsubscribe linux-doc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to