nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

misc: pci_endpoint_test: Remove global 'irq_type' and 'no_msi'

Browse source 
The global variable "irq_type" preserves the current value of
ioctl(GET_IRQTYPE).

However, all tests that use interrupts first call ioctl(SET_IRQTYPE)
to set "test->irq_type", then write the value of test->irq_type into
the register pointed by test_reg_bar, and request the interrupt to the
endpoint. The endpoint function driver, pci-epf-test, refers to the
register, and determine which type of interrupt to raise.

The global variable "irq_type" is never used in the actual test,
so remove the variable and replace it with "test->irq_type".

Also, for the same reason, the variable "no_msi" can be removed.

Initially, "test->irq_type" has IRQ_TYPE_UNDEFINED, and the
ioctl(GET_IRQTYPE) before calling ioctl(SET_IRQTYPE) will return
an error.

Suggested-by: Niklas Cassel <cassel@kernel.org>
Suggested-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
[kwilczynski: commit log]
Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20250225110252.28866-6-hayashi.kunihiko@socionext.com
This commit is contained in:
Kunihiko Hayashi 2025-02-25 20:02:51 +09:00 committed by Krzysztof Wilczyński
parent baaef0a274
commit a402006d48
No known key found for this signature in database
GPG key ID: 7C64768D3DE334E7
1 changed files with 3 additions and 15 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/misc/pci_endpoint_test.c
View file

@ -96,14 +96,6 @@ static DEFINE_IDA(pci_endpoint_test_ida);
#define to_endpoint_test(priv) container_of((priv), struct pci_endpoint_test, \ #define to_endpoint_test(priv) container_of((priv), struct pci_endpoint_test, \
miscdev) miscdev)
static bool no_msi;
module_param(no_msi, bool, 0444);
MODULE_PARM_DESC(no_msi, "Disable MSI interrupt in pci_endpoint_test");
static int irq_type = IRQ_TYPE_MSI;
module_param(irq_type, int, 0444);
MODULE_PARM_DESC(irq_type, "IRQ mode selection in pci_endpoint_test (0 - Legacy, 1 - MSI, 2 - MSI-X)");
enum pci_barno { enum pci_barno {
BAR_0, BAR_0,
BAR_1, BAR_1,
@ -833,7 +825,6 @@ static int pci_endpoint_test_set_irq(struct pci_endpoint_test *test,
return ret; return ret;
} }
irq_type = test->irq_type;
return 0; return 0;
} }
@ -882,7 +873,7 @@ static long pci_endpoint_test_ioctl(struct file *file, unsigned int cmd,
ret = pci_endpoint_test_set_irq(test, arg); ret = pci_endpoint_test_set_irq(test, arg);
break; break;
case PCITEST_GET_IRQTYPE: case PCITEST_GET_IRQTYPE:
ret = irq_type; ret = test->irq_type;
break; break;
case PCITEST_CLEAR_IRQ: case PCITEST_CLEAR_IRQ:
ret = pci_endpoint_test_clear_irq(test); ret = pci_endpoint_test_clear_irq(test);
@ -939,15 +930,12 @@ static int pci_endpoint_test_probe(struct pci_dev *pdev,
test->pdev = pdev; test->pdev = pdev;
test->irq_type = IRQ_TYPE_UNDEFINED; test->irq_type = IRQ_TYPE_UNDEFINED;
if (no_msi)
irq_type = IRQ_TYPE_INTX;
data = (struct pci_endpoint_test_data *)ent->driver_data; data = (struct pci_endpoint_test_data *)ent->driver_data;
if (data) { if (data) {
test_reg_bar = data->test_reg_bar; test_reg_bar = data->test_reg_bar;
test->test_reg_bar = test_reg_bar; test->test_reg_bar = test_reg_bar;
test->alignment = data->alignment; test->alignment = data->alignment;
irq_type = data->irq_type; test->irq_type = data->irq_type;
} }
init_completion(&test->irq_raised); init_completion(&test->irq_raised);
@ -969,7 +957,7 @@ static int pci_endpoint_test_probe(struct pci_dev *pdev,
pci_set_master(pdev); pci_set_master(pdev);
ret = pci_endpoint_test_alloc_irq_vectors(test, irq_type); ret = pci_endpoint_test_alloc_irq_vectors(test, test->irq_type);
if (ret) if (ret)
goto err_disable_irq; goto err_disable_irq;