Merge branch 'lorenzo/pci/endpoint'

  - use usleep() instead of mdelay() in endpoint test (Jia-Ju Bai)

  - add configfs entries for pci_epf_driver device IDs (Kishon Vijay
    Abraham I)

  - clean up pci_endpoint_test driver (Gustavo Pimentel)

* lorenzo/pci/endpoint:
  PCI: endpoint: Create configfs entry for each pci_epf_device_id table entry
  misc: pci_endpoint_test: Use pci_irq_vector function
  PCI: endpoint: functions/pci-epf-test: Replace lower into upper case characters
  misc: pci_endpoint_test: Replace lower into upper case characters
  PCI: endpoint: Replace mdelay with usleep_range() in pci_epf_test_write()

4 files changed, 51 insertions, 32 deletions

diff --git a/drivers/misc/pci_endpoint_test.c b/drivers/misc/pci_endpoint_test.c
index 58a88ba71e2a..7b370466a227 100644
--- a/drivers/misc/pci_endpoint_test.c
+++ b/drivers/misc/pci_endpoint_test.c
@@ -203,7 +203,7 @@ static bool pci_endpoint_test_msi_irq(struct pci_endpoint_test *test,
         if (!val)
                 return false;
 
-        if (test->last_irq - pdev->irq == msi_num - 1)
+        if (pci_irq_vector(pdev, msi_num - 1) == test->last_irq)
                 return true;
 
         return false;
@@ -233,7 +233,7 @@ static bool pci_endpoint_test_copy(struct pci_endpoint_test *test, size_t size)
         orig_src_addr = dma_alloc_coherent(dev, size + alignment,
                                            &orig_src_phys_addr, GFP_KERNEL);
         if (!orig_src_addr) {
-                dev_err(dev, "failed to allocate source buffer\n");
+                dev_err(dev, "Failed to allocate source buffer\n");
                 ret = false;
                 goto err;
         }
@@ -259,7 +259,7 @@ static bool pci_endpoint_test_copy(struct pci_endpoint_test *test, size_t size)
         orig_dst_addr = dma_alloc_coherent(dev, size + alignment,
                                            &orig_dst_phys_addr, GFP_KERNEL);
         if (!orig_dst_addr) {
-                dev_err(dev, "failed to allocate destination address\n");
+                dev_err(dev, "Failed to allocate destination address\n");
                 ret = false;
                 goto err_orig_src_addr;
         }
@@ -321,7 +321,7 @@ static bool pci_endpoint_test_write(struct pci_endpoint_test *test, size_t size)
         orig_addr = dma_alloc_coherent(dev, size + alignment, &orig_phys_addr,
                                        GFP_KERNEL);
         if (!orig_addr) {
-                dev_err(dev, "failed to allocate address\n");
+                dev_err(dev, "Failed to allocate address\n");
                 ret = false;
                 goto err;
         }
@@ -382,7 +382,7 @@ static bool pci_endpoint_test_read(struct pci_endpoint_test *test, size_t size)
         orig_addr = dma_alloc_coherent(dev, size + alignment, &orig_phys_addr,
                                        GFP_KERNEL);
         if (!orig_addr) {
-                dev_err(dev, "failed to allocate destination address\n");
+                dev_err(dev, "Failed to allocate destination address\n");
                 ret = false;
                 goto err;
         }
@@ -513,31 +513,31 @@ static int pci_endpoint_test_probe(struct pci_dev *pdev,
         if (!no_msi) {
                 irq = pci_alloc_irq_vectors(pdev, 1, 32, PCI_IRQ_MSI);
                 if (irq < 0)
-                        dev_err(dev, "failed to get MSI interrupts\n");
+                        dev_err(dev, "Failed to get MSI interrupts\n");
                 test->num_irqs = irq;
         }
 
         err = devm_request_irq(dev, pdev->irq, pci_endpoint_test_irqhandler,
                                IRQF_SHARED, DRV_MODULE_NAME, test);
         if (err) {
-                dev_err(dev, "failed to request IRQ %d\n", pdev->irq);
+                dev_err(dev, "Failed to request IRQ %d\n", pdev->irq);
                 goto err_disable_msi;
         }
 
         for (i = 1; i < irq; i++) {
-                err = devm_request_irq(dev, pdev->irq + i,
+                err = devm_request_irq(dev, pci_irq_vector(pdev, i),
                                        pci_endpoint_test_irqhandler,
                                        IRQF_SHARED, DRV_MODULE_NAME, test);
                 if (err)
                         dev_err(dev, "failed to request IRQ %d for MSI %d\n",
-                                pdev->irq + i, i + 1);
+                                pci_irq_vector(pdev, i), i + 1);
         }
 
         for (bar = BAR_0; bar <= BAR_5; bar++) {
                 if (pci_resource_flags(pdev, bar) & IORESOURCE_MEM) {
                         base = pci_ioremap_bar(pdev, bar);
                         if (!base) {
-                                dev_err(dev, "failed to read BAR%d\n", bar);
+                                dev_err(dev, "Failed to read BAR%d\n", bar);
                                 WARN_ON(bar == test_reg_bar);
                         }
                         test->bar[bar] = base;
@@ -557,7 +557,7 @@ static int pci_endpoint_test_probe(struct pci_dev *pdev,
         id = ida_simple_get(&pci_endpoint_test_ida, 0, 0, GFP_KERNEL);
         if (id < 0) {
                 err = id;
-                dev_err(dev, "unable to get id\n");
+                dev_err(dev, "Unable to get id\n");
                 goto err_iounmap;
         }
 
@@ -573,7 +573,7 @@ static int pci_endpoint_test_probe(struct pci_dev *pdev,
 
         err = misc_register(misc_device);
         if (err) {
-                dev_err(dev, "failed to register device\n");
+                dev_err(dev, "Failed to register device\n");
                 goto err_kfree_name;
         }
 
@@ -592,7 +592,7 @@ err_iounmap:
         }
 
         for (i = 0; i < irq; i++)
-                devm_free_irq(dev, pdev->irq + i, test);
+                devm_free_irq(&pdev->dev, pci_irq_vector(pdev, i), test);
 
 err_disable_msi:
         pci_disable_msi(pdev);
@@ -625,7 +625,7 @@ static void pci_endpoint_test_remove(struct pci_dev *pdev)
                         pci_iounmap(pdev, test->bar[bar]);
         }
         for (i = 0; i < test->num_irqs; i++)
-                devm_free_irq(&pdev->dev, pdev->irq + i, test);
+                devm_free_irq(&pdev->dev, pci_irq_vector(pdev, i), test);
         pci_disable_msi(pdev);
         pci_release_regions(pdev);
         pci_disable_device(pdev);
diff --git a/drivers/pci/endpoint/functions/pci-epf-test.c b/drivers/pci/endpoint/functions/pci-epf-test.c
index bee401d99217..63ed706445b9 100644
--- a/drivers/pci/endpoint/functions/pci-epf-test.c
+++ b/drivers/pci/endpoint/functions/pci-epf-test.c
@@ -87,7 +87,7 @@ static int pci_epf_test_copy(struct pci_epf_test *epf_test)
 
         src_addr = pci_epc_mem_alloc_addr(epc, &src_phys_addr, reg->size);
         if (!src_addr) {
-                dev_err(dev, "failed to allocate source address\n");
+                dev_err(dev, "Failed to allocate source address\n");
                 reg->status = STATUS_SRC_ADDR_INVALID;
                 ret = -ENOMEM;
                 goto err;
@@ -96,14 +96,14 @@ static int pci_epf_test_copy(struct pci_epf_test *epf_test)
         ret = pci_epc_map_addr(epc, epf->func_no, src_phys_addr, reg->src_addr,
                                reg->size);
         if (ret) {
-                dev_err(dev, "failed to map source address\n");
+                dev_err(dev, "Failed to map source address\n");
                 reg->status = STATUS_SRC_ADDR_INVALID;
                 goto err_src_addr;
         }
 
         dst_addr = pci_epc_mem_alloc_addr(epc, &dst_phys_addr, reg->size);
         if (!dst_addr) {
-                dev_err(dev, "failed to allocate destination address\n");
+                dev_err(dev, "Failed to allocate destination address\n");