Commit b2ba9225 authored by Kishon Vijay Abraham I's avatar Kishon Vijay Abraham I Committed by Lorenzo Pieralisi
Browse files

misc: pci_endpoint_test: Avoid using module parameter to determine irqtype 



commit e0332712 ("pci_endpoint_test: Add 2 ioctl commands")
uses module parameter 'irqtype' in pci_endpoint_test_set_irq()
to check if IRQ vectors of a particular type (MSI or MSI-X or
LEGACY) is already allocated. However with multi-function devices,
'irqtype' will not correctly reflect the IRQ type of the PCI device.

Fix it here by adding 'irqtype' for each PCI device to show the
IRQ type of a particular PCI device.

Fixes: e0332712 ("pci_endpoint_test: Add 2 ioctl commands")
Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: stable@vger.kernel.org # v4.19+
parent 146d3288

drivers/misc/pci_endpoint_test.c

+9 −3
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ struct pci_endpoint_test { 
	struct completion irq_raised;

	int		last_irq;

	int		num_irqs;

	int		irq_type;

	/* mutex to protect the ioctls */

	struct mutex	mutex;

	struct miscdevice miscdev;
@@ -162,6 +163,7 @@ static void pci_endpoint_test_free_irq_vectors(struct pci_endpoint_test *test) 
	struct pci_dev *pdev = test->pdev;



	pci_free_irq_vectors(pdev);

	test->irq_type = IRQ_TYPE_UNDEFINED;

}



static bool pci_endpoint_test_alloc_irq_vectors(struct pci_endpoint_test *test,
@@ -196,6 +198,8 @@ static bool pci_endpoint_test_alloc_irq_vectors(struct pci_endpoint_test *test, 
		irq = 0;

		res = false;

	}



	test->irq_type = type;

	test->num_irqs = irq;



	return res;
@@ -340,6 +344,7 @@ static bool pci_endpoint_test_copy(struct pci_endpoint_test *test, 
	dma_addr_t orig_dst_phys_addr;

	size_t offset;

	size_t alignment = test->alignment;

	int irq_type = test->irq_type;

	u32 src_crc32;

	u32 dst_crc32;

	int err;
@@ -473,6 +478,7 @@ static bool pci_endpoint_test_write(struct pci_endpoint_test *test, 
	dma_addr_t orig_phys_addr;

	size_t offset;

	size_t alignment = test->alignment;

	int irq_type = test->irq_type;

	size_t size;

	u32 crc32;

	int err;
@@ -571,6 +577,7 @@ static bool pci_endpoint_test_read(struct pci_endpoint_test *test, 
	dma_addr_t orig_phys_addr;

	size_t offset;

	size_t alignment = test->alignment;

	int irq_type = test->irq_type;

	u32 crc32;

	int err;
@@ -656,7 +663,7 @@ static bool pci_endpoint_test_set_irq(struct pci_endpoint_test *test, 
		return false;

	}



	if (irq_type == req_irq_type)

	if (test->irq_type == req_irq_type)

		return true;



	pci_endpoint_test_release_irq(test);
@@ -668,12 +675,10 @@ static bool pci_endpoint_test_set_irq(struct pci_endpoint_test *test, 
	if (!pci_endpoint_test_request_irq(test))

		goto err;



	irq_type = req_irq_type;

	return true;



err:

	pci_endpoint_test_free_irq_vectors(test);

	irq_type = IRQ_TYPE_UNDEFINED;

	return false;

}
@@ -753,6 +758,7 @@ static int pci_endpoint_test_probe(struct pci_dev *pdev, 
	test->test_reg_bar = 0;

	test->alignment = 0;

	test->pdev = pdev;

	test->irq_type = IRQ_TYPE_UNDEFINED;



	if (no_msi)

		irq_type = IRQ_TYPE_LEGACY;

CRA Git | Maintained and supported by SUSTech CRA and CCSE