Merge branch 'remotes/lorenzo/pci/dwc'

  - Add Kirin MSI support (Xiaowei Song)

  - Drop unnecessary root_bus_nr setting from exynos, imx6, keystone,
    armada8k, artpec6, designware-plat, histb, qcom, spear13xx (Shawn Guo)

  - Move link notification settings from DesignWare core to individual
    drivers (Gustavo Pimentel)

  - Add endpoint library MSI-X interfaces (Gustavo Pimentel)

  - Correct signature of endpoint library IRQ interfaces (Gustavo Pimentel)

  - Add DesignWare endpoint library MSI-X callbacks (Gustavo Pimentel)

  - Add endpoint library MSI-X test support (Gustavo Pimentel)

* remotes/lorenzo/pci/dwc:
  PCI: endpoint: Add MSI set maximum restriction
  tools: PCI: Add MSI-X support
  pci_endpoint_test: Add 2 ioctl commands
  pci-epf-test/pci_endpoint_test: Add MSI-X support
  pci-epf-test/pci_endpoint_test: Use irq_type module parameter
  pci-epf-test/pci_endpoint_test: Cleanup PCI_ENDPOINT_TEST memspace
  PCI: dwc: Add legacy interrupt callback handler
  PCI: dwc: Rework MSI callbacks handler
  PCI: dwc: Add MSI-X callbacks handler
  PCI: Update xxx_pcie_ep_raise_irq() and pci_epc_raise_irq() signatures
  PCI: endpoint: Add MSI-X interfaces
  PCI: dwc: Fix EP link notification implementation
  PCI: spear13xx: Drop unnecessary root_bus_nr setting
  PCI: qcom: Drop unnecessary root_bus_nr setting
  PCI: histb: Drop unnecessary root_bus_nr setting
  PCI: designware-plat: Drop unnecessary root_bus_nr setting
  PCI: artpec6: Drop unnecessary root_bus_nr setting
  PCI: armada8k: Drop unnecessary root_bus_nr setting
  PCI: keystone: Drop unnecessary root_bus_nr setting
  PCI: imx6: Drop unnecessary root_bus_nr setting
  PCI: exynos: Drop unnecessary root_bus_nr setting
  PCI: kirin: Add MSI support

2 files changed, 65 insertions, 1 deletions

diff --git a/tools/pci/pcitest.c b/tools/pci/pcitest.c
index 9074b477bff0..af146bb03b4d 100644
--- a/tools/pci/pcitest.c
+++ b/tools/pci/pcitest.c
@@ -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 @@ usage:
                         "\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"
diff --git a/tools/pci/pcitest.sh b/tools/pci/pcitest.sh
index 77e8c85ef744..75ed48ff2990 100644
--- a/tools/pci/pcitest.sh
+++ b/tools/pci/pcitest.sh
@@ -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