UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

misc: pci_endpoint_test: Use full pci-endpoint-test name in request_irq() 

Use full pci-endpoint-test name in request_irq(), so that it's easy to
profile the device that actually raised the interrupt.

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
This commit is contained in:
Kishon Vijay Abraham I 2020-03-17 15:31:58 +05:30 committed by Lorenzo Pieralisi
parent 6b443e5c80
commit c2be14ab32
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/misc/pci_endpoint_test.c
View File

@ -109,6 +109,7 @@ struct pci_endpoint_test {
struct miscdevice miscdev; struct miscdevice miscdev;
enum pci_barno test_reg_bar; enum pci_barno test_reg_bar;
size_t alignment; size_t alignment;
const char *name;
}; };
struct pci_endpoint_test_data { struct pci_endpoint_test_data {
@ -227,7 +228,7 @@ static bool pci_endpoint_test_request_irq(struct pci_endpoint_test *test)
for (i = 0; i < test->num_irqs; i++) { for (i = 0; i < test->num_irqs; i++) {
err = devm_request_irq(dev, pci_irq_vector(pdev, i), err = devm_request_irq(dev, pci_irq_vector(pdev, i),
pci_endpoint_test_irqhandler, pci_endpoint_test_irqhandler,
IRQF_SHARED, DRV_MODULE_NAME, test); IRQF_SHARED, test->name, test);
if (err) if (err)
goto fail; goto fail;
} }
@ -807,9 +808,6 @@ static int pci_endpoint_test_probe(struct pci_dev *pdev,
if (!pci_endpoint_test_alloc_irq_vectors(test, irq_type)) if (!pci_endpoint_test_alloc_irq_vectors(test, irq_type))
goto err_disable_irq; goto err_disable_irq;
if (!pci_endpoint_test_request_irq(test))
goto err_disable_irq;
for (bar = 0; bar < PCI_STD_NUM_BARS; bar++) { for (bar = 0; bar < PCI_STD_NUM_BARS; bar++) {
if (pci_resource_flags(pdev, bar) & IORESOURCE_MEM) { if (pci_resource_flags(pdev, bar) & IORESOURCE_MEM) {
base = pci_ioremap_bar(pdev, bar); base = pci_ioremap_bar(pdev, bar);
@ -839,12 +837,21 @@ static int pci_endpoint_test_probe(struct pci_dev *pdev,
} }
snprintf(name, sizeof(name), DRV_MODULE_NAME ".%d", id); snprintf(name, sizeof(name), DRV_MODULE_NAME ".%d", id);
test->name = kstrdup(name, GFP_KERNEL);
if (!test->name) {
err = -ENOMEM;
goto err_ida_remove;
}
if (!pci_endpoint_test_request_irq(test))
goto err_kfree_test_name;
misc_device = &test->miscdev; misc_device = &test->miscdev;
misc_device->minor = MISC_DYNAMIC_MINOR; misc_device->minor = MISC_DYNAMIC_MINOR;
misc_device->name = kstrdup(name, GFP_KERNEL); misc_device->name = kstrdup(name, GFP_KERNEL);
if (!misc_device->name) { if (!misc_device->name) {
err = -ENOMEM; err = -ENOMEM;
goto err_ida_remove; goto err_release_irq;
} }
misc_device->fops = &pci_endpoint_test_fops, misc_device->fops = &pci_endpoint_test_fops,
@ -859,6 +866,12 @@ static int pci_endpoint_test_probe(struct pci_dev *pdev,
err_kfree_name: err_kfree_name:
kfree(misc_device->name); kfree(misc_device->name);
err_release_irq:
pci_endpoint_test_release_irq(test);
err_kfree_test_name:
kfree(test->name);
err_ida_remove: err_ida_remove:
ida_simple_remove(&pci_endpoint_test_ida, id); ida_simple_remove(&pci_endpoint_test_ida, id);
@ -867,7 +880,6 @@ err_iounmap:
if (test->bar[bar]) if (test->bar[bar])
pci_iounmap(pdev, test->bar[bar]); pci_iounmap(pdev, test->bar[bar]);
} }
pci_endpoint_test_release_irq(test);
err_disable_irq: err_disable_irq:
pci_endpoint_test_free_irq_vectors(test); pci_endpoint_test_free_irq_vectors(test);
@ -893,6 +905,7 @@ static void pci_endpoint_test_remove(struct pci_dev *pdev)
misc_deregister(&test->miscdev); misc_deregister(&test->miscdev);
kfree(misc_device->name); kfree(misc_device->name);
kfree(test->name);
ida_simple_remove(&pci_endpoint_test_ida, id); ida_simple_remove(&pci_endpoint_test_ida, id);
for (bar = 0; bar < PCI_STD_NUM_BARS; bar++) { for (bar = 0; bar < PCI_STD_NUM_BARS; bar++) {
if (test->bar[bar]) if (test->bar[bar])