misc: pci_endpoint_test: Use INTX instead of LEGACY

[ Upstream commit acd288666979a49538d70e0c0d86e1118b445058 ]

In the root complex pci endpoint test function driver, change macros and
functions names using the term "legacy" to use "intx" instead to
match the term used in the PCI specifications.

Link: https://lore.kernel.org/r/20231122060406.14695-6-dlemoal@kernel.org
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Signed-off-by: Lorenzo Pieralisi <lpieralisi@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Stable-dep-of: 919d14603dab ("misc: pci_endpoint_test: Fix displaying 'irq_type' after 'request_irq' error")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/misc/pci_endpoint_test.c b/drivers/misc/pci_endpoint_test.c
index f9dd3e6546a5076998edea1ce7e6d05f41ec5155..fcb7dc8e79d4363d087bb883204cc2763dc4d758 100644 (file)
--- a/drivers/misc/pci_endpoint_test.c
+++ b/drivers/misc/pci_endpoint_test.c
@@ -27,14 +27,14 @@
 #define DRV_MODULE_NAME                                "pci-endpoint-test"
 
 #define IRQ_TYPE_UNDEFINED                     -1
-#define IRQ_TYPE_LEGACY                                0
+#define IRQ_TYPE_INTX                          0
 #define IRQ_TYPE_MSI                           1
 #define IRQ_TYPE_MSIX                          2
 
 #define PCI_ENDPOINT_TEST_MAGIC                        0x0
 
 #define PCI_ENDPOINT_TEST_COMMAND              0x4
-#define COMMAND_RAISE_LEGACY_IRQ               BIT(0)
+#define COMMAND_RAISE_INTX_IRQ                 BIT(0)
 #define COMMAND_RAISE_MSI_IRQ                  BIT(1)
 #define COMMAND_RAISE_MSIX_IRQ                 BIT(2)
 #define COMMAND_READ                           BIT(3)
@@ -170,8 +170,8 @@ static bool pci_endpoint_test_alloc_irq_vectors(struct pci_endpoint_test *test,
        bool res = true;
 
        switch (type) {
-       case IRQ_TYPE_LEGACY:
-               irq = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_LEGACY);
+       case IRQ_TYPE_INTX:
+               irq = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_INTX);
                if (irq < 0)
                        dev_err(dev, "Failed to get Legacy interrupt\n");
                break;
@@ -231,7 +231,7 @@ static bool pci_endpoint_test_request_irq(struct pci_endpoint_test *test)
 
 fail:
        switch (irq_type) {
-       case IRQ_TYPE_LEGACY:
+       case IRQ_TYPE_INTX:
                dev_err(dev, "Failed to request IRQ %d for Legacy\n",
                        pci_irq_vector(pdev, i));
                break;
@@ -281,15 +281,15 @@ static bool pci_endpoint_test_bar(struct pci_endpoint_test *test,
        return true;
 }
 
-static bool pci_endpoint_test_legacy_irq(struct pci_endpoint_test *test)
+static bool pci_endpoint_test_intx_irq(struct pci_endpoint_test *test)
 {
        u32 val;
 
        pci_endpoint_test_writel(test, PCI_ENDPOINT_TEST_IRQ_TYPE,
-                                IRQ_TYPE_LEGACY);
+                                IRQ_TYPE_INTX);
        pci_endpoint_test_writel(test, PCI_ENDPOINT_TEST_IRQ_NUMBER, 0);
        pci_endpoint_test_writel(test, PCI_ENDPOINT_TEST_COMMAND,
-                                COMMAND_RAISE_LEGACY_IRQ);
+                                COMMAND_RAISE_INTX_IRQ);
        val = wait_for_completion_timeout(&test->irq_raised,
                                          msecs_to_jiffies(1000));
        if (!val)
@@ -344,7 +344,7 @@ static bool pci_endpoint_test_copy(struct pci_endpoint_test *test, size_t size)
        if (size > SIZE_MAX - alignment)
                goto err;
 
-       if (irq_type < IRQ_TYPE_LEGACY || irq_type > IRQ_TYPE_MSIX) {
+       if (irq_type < IRQ_TYPE_INTX || irq_type > IRQ_TYPE_MSIX) {
                dev_err(dev, "Invalid IRQ type option\n");
                goto err;
        }
@@ -440,7 +440,7 @@ static bool pci_endpoint_test_write(struct pci_endpoint_test *test, size_t size)
        if (size > SIZE_MAX - alignment)
                goto err;
 
-       if (irq_type < IRQ_TYPE_LEGACY || irq_type > IRQ_TYPE_MSIX) {
+       if (irq_type < IRQ_TYPE_INTX || irq_type > IRQ_TYPE_MSIX) {
                dev_err(dev, "Invalid IRQ type option\n");
                goto err;
        }
@@ -509,7 +509,7 @@ static bool pci_endpoint_test_read(struct pci_endpoint_test *test, size_t size)
        if (size > SIZE_MAX - alignment)
                goto err;
 
-       if (irq_type < IRQ_TYPE_LEGACY || irq_type > IRQ_TYPE_MSIX) {
+       if (irq_type < IRQ_TYPE_INTX || irq_type > IRQ_TYPE_MSIX) {
                dev_err(dev, "Invalid IRQ type option\n");
                goto err;
        }
@@ -560,7 +560,7 @@ static bool pci_endpoint_test_set_irq(struct pci_endpoint_test *test,
        struct pci_dev *pdev = test->pdev;
        struct device *dev = &pdev->dev;
 
-       if (req_irq_type < IRQ_TYPE_LEGACY || req_irq_type > IRQ_TYPE_MSIX) {
+       if (req_irq_type < IRQ_TYPE_INTX || req_irq_type > IRQ_TYPE_MSIX) {
                dev_err(dev, "Invalid IRQ type option\n");
                return false;
        }
@@ -607,8 +607,8 @@ static long pci_endpoint_test_ioctl(struct file *file, unsigned int cmd,
                        goto ret;
                ret = pci_endpoint_test_bar(test, bar);
                break;
-       case PCITEST_LEGACY_IRQ:
-               ret = pci_endpoint_test_legacy_irq(test);
+       case PCITEST_INTX_IRQ:
+               ret = pci_endpoint_test_intx_irq(test);
                break;
        case PCITEST_MSI:
        case PCITEST_MSIX:
@@ -668,7 +668,7 @@ static int pci_endpoint_test_probe(struct pci_dev *pdev,
        test->irq_type = IRQ_TYPE_UNDEFINED;
 
        if (no_msi)
-               irq_type = IRQ_TYPE_LEGACY;
+               irq_type = IRQ_TYPE_INTX;
 
        data = (struct pci_endpoint_test_data *)ent->driver_data;
        if (data) {

diff --git a/include/uapi/linux/pcitest.h b/include/uapi/linux/pcitest.h
index cbf422e566962020bb5a09ca34935938209892e8..1f358a135de0403f4ebcbfe7ee577c3f700b66bd 100644 (file)
--- a/include/uapi/linux/pcitest.h
+++ b/include/uapi/linux/pcitest.h
@@ -11,7 +11,8 @@
 #define __UAPI_LINUX_PCITEST_H
 
 #define PCITEST_BAR            _IO('P', 0x1)
-#define PCITEST_LEGACY_IRQ     _IO('P', 0x2)
+#define PCITEST_INTX_IRQ       _IO('P', 0x2)
+#define PCITEST_LEGACY_IRQ     PCITEST_INTX_IRQ
 #define PCITEST_MSI            _IOW('P', 0x3, int)
 #define PCITEST_WRITE          _IOW('P', 0x4, unsigned long)
 #define PCITEST_READ           _IOW('P', 0x5, unsigned long)