lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 305/800] drivers/perf: hisi: Fix data source control
    Date
    From: Shaokun Zhang <zhangshaokun@hisilicon.com>

    [ Upstream commit 814be609baae62aaa6c02fa6f3ad66cff32a6d15 ]

    'Data source' is a new function for HHA PMU and config / clear
    interface was wrong by mistake. 'HHA_DATSRC_CTRL' register is
    mainly used for data source configuration, if we enable bit0
    as driver, it will go on count the event and we didn't check
    it carefully. So fix the issue and do as the initial purpose.

    Fixes: 932f6a99f9b0 ("drivers/perf: hisi: Add new functions for HHA PMU")
    Reported-by: kernel test robot <lkp@intel.com>
    Cc: Will Deacon <will@kernel.org>
    Cc: Mark Rutland <mark.rutland@arm.com>
    Signed-off-by: Shaokun Zhang <zhangshaokun@hisilicon.com>
    Link: https://lore.kernel.org/r/1622709291-37996-1-git-send-email-zhangshaokun@hisilicon.com
    Signed-off-by: Will Deacon <will@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/perf/hisilicon/hisi_uncore_hha_pmu.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/perf/hisilicon/hisi_uncore_hha_pmu.c b/drivers/perf/hisilicon/hisi_uncore_hha_pmu.c
    index 0316fabe32f1..acc864bded2b 100644
    --- a/drivers/perf/hisilicon/hisi_uncore_hha_pmu.c
    +++ b/drivers/perf/hisilicon/hisi_uncore_hha_pmu.c
    @@ -90,7 +90,7 @@ static void hisi_hha_pmu_config_ds(struct perf_event *event)

    val = readl(hha_pmu->base + HHA_DATSRC_CTRL);
    val |= HHA_DATSRC_SKT_EN;
    - writel(ds_skt, hha_pmu->base + HHA_DATSRC_CTRL);
    + writel(val, hha_pmu->base + HHA_DATSRC_CTRL);
    }
    }

    @@ -104,7 +104,7 @@ static void hisi_hha_pmu_clear_ds(struct perf_event *event)

    val = readl(hha_pmu->base + HHA_DATSRC_CTRL);
    val &= ~HHA_DATSRC_SKT_EN;
    - writel(ds_skt, hha_pmu->base + HHA_DATSRC_CTRL);
    + writel(val, hha_pmu->base + HHA_DATSRC_CTRL);
    }
    }

    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-12 10:29    [W:3.946 / U:0.288 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site