summaryrefslogtreecommitdiff
path: root/tools/pci/pcitest.c
diff options
context:
space:
mode:
authorManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>2025-01-16 20:16:48 +0300
committerBjorn Helgaas <bhelgaas@google.com>2025-01-21 23:17:55 +0300
commitf26d37ee9bda938e968d0e11ba1f8f1588b2a135 (patch)
tree637d302d19233568a94c4dcad9498f5457e888b0 /tools/pci/pcitest.c
parent4644db83642d92f6d7407a7786a72cb65c56c10a (diff)
downloadlinux-f26d37ee9bda938e968d0e11ba1f8f1588b2a135.tar.xz
misc: pci_endpoint_test: Fix IOCTL return value
IOCTLs are supposed to return 0 for success and negative error codes for failure. Currently, this driver is returning 0 for failure and 1 for success, that's not correct. Hence, fix it! Link: https://lore.kernel.org/r/20250116171650.33585-3-manivannan.sadhasivam@linaro.org Fixes: 2c156ac71c6b ("misc: Add host side PCI driver for PCI test function device") Reported-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Closes: https://lore.kernel.org/r/YvzNg5ROnxEApDgS@kroah.com Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Tested-by: Niklas Cassel <cassel@kernel.org> Reviewed-by: Damien Le Moal <dlemoal@kernel.org> Reviewed-by: Niklas Cassel <cassel@kernel.org>
Diffstat (limited to 'tools/pci/pcitest.c')
-rw-r--r--tools/pci/pcitest.c51
1 files changed, 26 insertions, 25 deletions
diff --git a/tools/pci/pcitest.c b/tools/pci/pcitest.c
index 08f355083754..b96cc118839b 100644
--- a/tools/pci/pcitest.c
+++ b/tools/pci/pcitest.c
@@ -16,7 +16,6 @@
#include <linux/pcitest.h>
-static char *result[] = { "NOT OKAY", "OKAY" };
static char *irq[] = { "LEGACY", "MSI", "MSI-X" };
struct pci_test {
@@ -53,72 +52,74 @@ static int run_test(struct pci_test *test)
ret = ioctl(fd, PCITEST_BAR, test->barnum);
fprintf(stdout, "BAR%d:\t\t", test->barnum);
if (ret < 0)
- fprintf(stdout, "TEST FAILED\n");
+ fprintf(stdout, "NOT OKAY\n");
else
- fprintf(stdout, "%s\n", result[ret]);
+ fprintf(stdout, "OKAY\n");
}
if (test->consecutive_bar_test) {
ret = ioctl(fd, PCITEST_BARS);
fprintf(stdout, "Consecutive BAR test:\t\t");
if (ret < 0)
- fprintf(stdout, "TEST FAILED\n");
+ fprintf(stdout, "NOT OKAY\n");
else
- fprintf(stdout, "%s\n", result[ret]);
+ fprintf(stdout, "OKAY\n");
}
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");
+ fprintf(stdout, "NOT OKAY\n");
else
- fprintf(stdout, "%s\n", result[ret]);
+ fprintf(stdout, "OKAY\n");
}
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
+ if (ret < 0) {
+ fprintf(stdout, "NOT OKAY\n");
+ } else {
fprintf(stdout, "%s\n", irq[ret]);
+ ret = 0;
+ }
}
if (test->clear_irq) {
ret = ioctl(fd, PCITEST_CLEAR_IRQ);
fprintf(stdout, "CLEAR IRQ:\t\t");
if (ret < 0)
- fprintf(stdout, "FAILED\n");
+ fprintf(stdout, "NOT OKAY\n");
else
- fprintf(stdout, "%s\n", result[ret]);
+ fprintf(stdout, "OKAY\n");
}
if (test->legacyirq) {
ret = ioctl(fd, PCITEST_LEGACY_IRQ, 0);
fprintf(stdout, "LEGACY IRQ:\t");
if (ret < 0)
- fprintf(stdout, "TEST FAILED\n");
+ fprintf(stdout, "NOT OKAY\n");
else
- fprintf(stdout, "%s\n", result[ret]);
+ fprintf(stdout, "OKAY\n");
}
if (test->msinum > 0 && test->msinum <= 32) {
ret = ioctl(fd, PCITEST_MSI, test->msinum);
fprintf(stdout, "MSI%u:\t\t", test->msinum);
if (ret < 0)
- fprintf(stdout, "TEST FAILED\n");
+ fprintf(stdout, "NOT OKAY\n");
else
- fprintf(stdout, "%s\n", result[ret]);
+ fprintf(stdout, "OKAY\n");
}
if (test->msixnum > 0 && test->msixnum <= 2048) {
ret = ioctl(fd, PCITEST_MSIX, test->msixnum);
fprintf(stdout, "MSI-X%u:\t\t", test->msixnum);
if (ret < 0)
- fprintf(stdout, "TEST FAILED\n");
+ fprintf(stdout, "NOT OKAY\n");
else
- fprintf(stdout, "%s\n", result[ret]);
+ fprintf(stdout, "OKAY\n");
}
if (test->write) {
@@ -128,9 +129,9 @@ static int run_test(struct pci_test *test)
ret = ioctl(fd, PCITEST_WRITE, &param);
fprintf(stdout, "WRITE (%7lu bytes):\t\t", test->size);
if (ret < 0)
- fprintf(stdout, "TEST FAILED\n");
+ fprintf(stdout, "NOT OKAY\n");
else
- fprintf(stdout, "%s\n", result[ret]);
+ fprintf(stdout, "OKAY\n");
}
if (test->read) {
@@ -140,9 +141,9 @@ static int run_test(struct pci_test *test)
ret = ioctl(fd, PCITEST_READ, &param);
fprintf(stdout, "READ (%7lu bytes):\t\t", test->size);
if (ret < 0)
- fprintf(stdout, "TEST FAILED\n");
+ fprintf(stdout, "NOT OKAY\n");
else
- fprintf(stdout, "%s\n", result[ret]);
+ fprintf(stdout, "OKAY\n");
}
if (test->copy) {
@@ -152,14 +153,14 @@ static int run_test(struct pci_test *test)
ret = ioctl(fd, PCITEST_COPY, &param);
fprintf(stdout, "COPY (%7lu bytes):\t\t", test->size);
if (ret < 0)
- fprintf(stdout, "TEST FAILED\n");
+ fprintf(stdout, "NOT OKAY\n");
else
- fprintf(stdout, "%s\n", result[ret]);
+ fprintf(stdout, "OKAY\n");
}
fflush(stdout);
close(fd);
- return (ret < 0) ? ret : 1 - ret; /* return 0 if test succeeded */
+ return ret;
}
int main(int argc, char **argv)