Commit 9dd31b11 authored by Cédric Le Goater's avatar Cédric Le Goater Committed by Michael Ellerman

powerpc/vas: Fix IRQ name allocation

The VAS device allocates a generic interrupt to handle page faults but
the IRQ name doesn't show under /proc. This is because it's on
stack. Allocate the name.
Signed-off-by: default avatarCédric Le Goater <clg@kaod.org>
Acked-by: default avatarHaren Myneni <haren@linux.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20201212142707.2102141-1-clg@kaod.org
parent 691602aa
...@@ -28,12 +28,10 @@ static DEFINE_PER_CPU(int, cpu_vas_id); ...@@ -28,12 +28,10 @@ static DEFINE_PER_CPU(int, cpu_vas_id);
static int vas_irq_fault_window_setup(struct vas_instance *vinst) static int vas_irq_fault_window_setup(struct vas_instance *vinst)
{ {
char devname[64];
int rc = 0; int rc = 0;
snprintf(devname, sizeof(devname), "vas-%d", vinst->vas_id);
rc = request_threaded_irq(vinst->virq, vas_fault_handler, rc = request_threaded_irq(vinst->virq, vas_fault_handler,
vas_fault_thread_fn, 0, devname, vinst); vas_fault_thread_fn, 0, vinst->name, vinst);
if (rc) { if (rc) {
pr_err("VAS[%d]: Request IRQ(%d) failed with %d\n", pr_err("VAS[%d]: Request IRQ(%d) failed with %d\n",
...@@ -80,6 +78,12 @@ static int init_vas_instance(struct platform_device *pdev) ...@@ -80,6 +78,12 @@ static int init_vas_instance(struct platform_device *pdev)
if (!vinst) if (!vinst)
return -ENOMEM; return -ENOMEM;
vinst->name = kasprintf(GFP_KERNEL, "vas-%d", vasid);
if (!vinst->name) {
kfree(vinst);
return -ENOMEM;
}
INIT_LIST_HEAD(&vinst->node); INIT_LIST_HEAD(&vinst->node);
ida_init(&vinst->ida); ida_init(&vinst->ida);
mutex_init(&vinst->mutex); mutex_init(&vinst->mutex);
...@@ -162,6 +166,7 @@ static int init_vas_instance(struct platform_device *pdev) ...@@ -162,6 +166,7 @@ static int init_vas_instance(struct platform_device *pdev)
return 0; return 0;
free_vinst: free_vinst:
kfree(vinst->name);
kfree(vinst); kfree(vinst);
return -ENODEV; return -ENODEV;
......
...@@ -340,6 +340,7 @@ struct vas_instance { ...@@ -340,6 +340,7 @@ struct vas_instance {
struct vas_window *rxwin[VAS_COP_TYPE_MAX]; struct vas_window *rxwin[VAS_COP_TYPE_MAX];
struct vas_window *windows[VAS_WINDOWS_PER_CHIP]; struct vas_window *windows[VAS_WINDOWS_PER_CHIP];
char *name;
char *dbgname; char *dbgname;
struct dentry *dbgdir; struct dentry *dbgdir;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment