Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

[platform/kernel/linux-starfive.git] / tools / pci / pcitest.c

diff --git a/tools/pci/pcitest.c b/tools/pci/pcitest.c
index 32b7c6f..0a1344c 100644 (file)
--- a/tools/pci/pcitest.c
+++ b/tools/pci/pcitest.c
@@ -30,14 +30,17 @@ struct pci_test {
        int             irqtype;
        bool            set_irqtype;
        bool            get_irqtype;
+       bool            clear_irq;
        bool            read;
        bool            write;
        bool            copy;
        unsigned long   size;
+       bool            use_dma;
 };
 
 static int run_test(struct pci_test *test)
 {
+       struct pci_endpoint_test_xfer_param param;
        int ret = -EINVAL;
        int fd;
 
@@ -74,6 +77,15 @@ static int run_test(struct pci_test *test)
                        fprintf(stdout, "%s\n", irq[ret]);
        }
 
+       if (test->clear_irq) {
+               ret = ioctl(fd, PCITEST_CLEAR_IRQ);
+               fprintf(stdout, "CLEAR IRQ:\t\t");
+               if (ret < 0)
+                       fprintf(stdout, "FAILED\n");
+               else
+                       fprintf(stdout, "%s\n", result[ret]);
+       }
+
        if (test->legacyirq) {
                ret = ioctl(fd, PCITEST_LEGACY_IRQ, 0);
                fprintf(stdout, "LEGACY IRQ:\t");
@@ -102,7 +114,10 @@ static int run_test(struct pci_test *test)
        }
 
        if (test->write) {
-               ret = ioctl(fd, PCITEST_WRITE, test->size);
+               param.size = test->size;
+               if (test->use_dma)
+                       param.flags = PCITEST_FLAGS_USE_DMA;
+               ret = ioctl(fd, PCITEST_WRITE, &param);
                fprintf(stdout, "WRITE (%7ld bytes):\t\t", test->size);
                if (ret < 0)
                        fprintf(stdout, "TEST FAILED\n");
@@ -111,7 +126,10 @@ static int run_test(struct pci_test *test)
        }
 
        if (test->read) {
-               ret = ioctl(fd, PCITEST_READ, test->size);
+               param.size = test->size;
+               if (test->use_dma)
+                       param.flags = PCITEST_FLAGS_USE_DMA;
+               ret = ioctl(fd, PCITEST_READ, &param);
                fprintf(stdout, "READ (%7ld bytes):\t\t", test->size);
                if (ret < 0)
                        fprintf(stdout, "TEST FAILED\n");
@@ -120,7 +138,10 @@ static int run_test(struct pci_test *test)
        }
 
        if (test->copy) {
-               ret = ioctl(fd, PCITEST_COPY, test->size);
+               param.size = test->size;
+               if (test->use_dma)
+                       param.flags = PCITEST_FLAGS_USE_DMA;
+               ret = ioctl(fd, PCITEST_COPY, &param);
                fprintf(stdout, "COPY (%7ld bytes):\t\t", test->size);
                if (ret < 0)
                        fprintf(stdout, "TEST FAILED\n");
@@ -153,7 +174,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:x:i:Ilhrwcs:")) != EOF)
+       while ((c = getopt(argc, argv, "D:b:m:x:i:deIlhrwcs:")) != EOF)
        switch (c) {
        case 'D':
                test->device = optarg;
@@ -194,9 +215,15 @@ int main(int argc, char **argv)
        case 'c':
                test->copy = true;
                continue;
+       case 'e':
+               test->clear_irq = true;
+               continue;
        case 's':
                test->size = strtoul(optarg, NULL, 0);
                continue;
+       case 'd':
+               test->use_dma = true;
+               continue;
        case 'h':
        default:
 usage:
@@ -208,7 +235,9 @@ usage:
                        "\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-e                   Clear IRQ\n"
                        "\t-I                   Get current IRQ type configured\n"
+                       "\t-d                   Use DMA\n"
                        "\t-l                   Legacy IRQ test\n"
                        "\t-r                   Read buffer test\n"
                        "\t-w                   Write buffer test\n"