Unverified Commit a402006d authored by Kunihiko Hayashi's avatar Kunihiko Hayashi Committed by Krzysztof Wilczyński
Browse files

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



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: default avatarNiklas Cassel <cassel@kernel.org>
Suggested-by: default avatarManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: default avatarKunihiko Hayashi <hayashi.kunihiko@socionext.com>
[kwilczynski: commit log]
Signed-off-by: default avatarKrzysztof Wilczyński <kwilczynski@kernel.org>
Reviewed-by: default avatarManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20250225110252.28866-6-hayashi.kunihiko@socionext.com
parent baaef0a2

drivers/misc/pci_endpoint_test.c

+3 −15
Original line number Diff line number Diff line
@@ -96,14 +96,6 @@ static DEFINE_IDA(pci_endpoint_test_ida); 
#define to_endpoint_test(priv) container_of((priv), struct pci_endpoint_test, \

					    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 {

	BAR_0,

	BAR_1,
@@ -833,7 +825,6 @@ static int pci_endpoint_test_set_irq(struct pci_endpoint_test *test, 
		return ret;

	}



	irq_type = test->irq_type;

	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);

		break;

	case PCITEST_GET_IRQTYPE:

		ret = irq_type;

		ret = test->irq_type;

		break;

	case PCITEST_CLEAR_IRQ:

		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->irq_type = IRQ_TYPE_UNDEFINED;



	if (no_msi)

		irq_type = IRQ_TYPE_INTX;



	data = (struct pci_endpoint_test_data *)ent->driver_data;

	if (data) {

		test_reg_bar = data->test_reg_bar;

		test->test_reg_bar = test_reg_bar;

		test->alignment = data->alignment;

		irq_type = data->irq_type;

		test->irq_type = data->irq_type;

	}



	init_completion(&test->irq_raised);
@@ -969,7 +957,7 @@ static int pci_endpoint_test_probe(struct pci_dev *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)

		goto err_disable_irq;