iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

coresight: Handle errors in finding input/output ports

Browse Source 
[ Upstream commit fe470f5f7f ]

If we fail to find the input / output port for a LINK component
while enabling a path, we should fail gracefully rather than
assuming port "0".

Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Suzuki K Poulose
2018-07-11 13:40:28 -06:00
committed by Greg Kroah-Hartman
parent 05925d7571
commit bfb2cbf2aa
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/hwtracing/coresight/coresight.c
View File

@ -86,7 +86,7 @@ static int coresight_find_link_inport(struct coresight_device *csdev)
dev_err(&csdev->dev, "couldn't find inport, parent: %s, child: %s\n", dev_err(&csdev->dev, "couldn't find inport, parent: %s, child: %s\n",
dev_name(&parent->dev), dev_name(&csdev->dev)); dev_name(&parent->dev), dev_name(&csdev->dev));
return 0; return -ENODEV;
} }
static int coresight_find_link_outport(struct coresight_device *csdev) static int coresight_find_link_outport(struct coresight_device *csdev)
@ -107,7 +107,7 @@ static int coresight_find_link_outport(struct coresight_device *csdev)
dev_err(&csdev->dev, "couldn't find outport, parent: %s, child: %s\n", dev_err(&csdev->dev, "couldn't find outport, parent: %s, child: %s\n",
dev_name(&csdev->dev), dev_name(&child->dev)); dev_name(&csdev->dev), dev_name(&child->dev));
return 0; return -ENODEV;
} }
static int coresight_enable_sink(struct coresight_device *csdev) static int coresight_enable_sink(struct coresight_device *csdev)
@ -155,6 +155,9 @@ static int coresight_enable_link(struct coresight_device *csdev)
else else
refport = 0; refport = 0;
if (refport < 0)
return refport;
if (atomic_inc_return(&csdev->refcnt[refport]) == 1) { if (atomic_inc_return(&csdev->refcnt[refport]) == 1) {
if (link_ops(csdev)->enable) { if (link_ops(csdev)->enable) {
ret = link_ops(csdev)->enable(csdev, inport, outport); ret = link_ops(csdev)->enable(csdev, inport, outport);