lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 061/408] drivers/perf: thunderx2_pmu: Fix memory resource error handling
    Date
    From: Mark Salter <msalter@redhat.com>

    [ Upstream commit 688494a407d1419a6b158c644b262c61cde39f48 ]

    In tx2_uncore_pmu_init_dev(), a call to acpi_dev_get_resources() is used
    to create a list _CRS resources which is searched for the device base
    address. There is an error check following this:

    if (!rentry->res)
    return NULL

    In no case, will rentry->res be NULL, so the test is useless. Even
    if the test worked, it comes before the resource list memory is
    freed. None of this really matters as long as the ACPI table has
    the memory resource. Let's clean it up so that it makes sense and
    will give a meaningful error should firmware leave out the memory
    resource.

    Fixes: 69c32972d593 ("drivers/perf: Add Cavium ThunderX2 SoC UNCORE PMU driver")
    Signed-off-by: Mark Salter <msalter@redhat.com>
    Link: https://lore.kernel.org/r/20200915204110.326138-2-msalter@redhat.com
    Signed-off-by: Will Deacon <will@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/perf/thunderx2_pmu.c | 7 +++++--
    1 file changed, 5 insertions(+), 2 deletions(-)

    diff --git a/drivers/perf/thunderx2_pmu.c b/drivers/perf/thunderx2_pmu.c
    index 9e1c3c7eeba9b..170ccb164c604 100644
    --- a/drivers/perf/thunderx2_pmu.c
    +++ b/drivers/perf/thunderx2_pmu.c
    @@ -627,14 +627,17 @@ static struct tx2_uncore_pmu *tx2_uncore_pmu_init_dev(struct device *dev,
    list_for_each_entry(rentry, &list, node) {
    if (resource_type(rentry->res) == IORESOURCE_MEM) {
    res = *rentry->res;
    + rentry = NULL;
    break;
    }
    }
    + acpi_dev_free_resource_list(&list);

    - if (!rentry->res)
    + if (rentry) {
    + dev_err(dev, "PMU type %d: Fail to find resource\n", type);
    return NULL;
    + }

    - acpi_dev_free_resource_list(&list);
    base = devm_ioremap_resource(dev, &res);
    if (IS_ERR(base)) {
    dev_err(dev, "PMU type %d: Fail to map resource\n", type);
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 18:47    [W:3.559 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site