From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8A08C43331 for ; Tue, 12 Nov 2019 00:50:45 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9B54F206A5 for ; Tue, 12 Nov 2019 00:50:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="mBfZDcCy" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9B54F206A5 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=hisilicon.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date: Message-ID:From:References:To:Subject:Reply-To:Content-ID:Content-Description :Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=rDb/G4ySo11IrLBlxu88O8HunRoeanxHULIFH1lgdHI=; b=mBfZDcCytUhcY8 uLcx2ruwrTa4N2T9ZKEb87T0lfgBX7Ic/n/ZqtcLnRm4FOQdYkNncefDf2pehyEQ4aHMtQp8u0MIo M/zVjGJ+gTwNIgEcESFtdj6QoLWjzXiR5JJ2Ea8fxLEu6bM1eWDidyZsgJfqpwvauRj2ak6ERhcmE R6a0gcNY1efI8hXQ2TYTiQfYmbnBcargd49O3pS+856PfEv6GzdNkUritW6BNYAHd6R2E2hp+HNqs NRqmUJ+BKrXbQMFi1WXMG+Omitt3G1xRXrOoyGtlpgXyshNjKi3IxHToUtmV5ZTeF+ZLuD31W0C4O JXI5hd021Slv9lQw8gwg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iUKOK-0001mU-I4; Tue, 12 Nov 2019 00:50:44 +0000 Received: from szxga05-in.huawei.com ([45.249.212.191] helo=huawei.com) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iUKOG-0001kw-SX for linux-arm-kernel@lists.infradead.org; Tue, 12 Nov 2019 00:50:42 +0000 Received: from DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 2187AE3771B860B6FDD0; Tue, 12 Nov 2019 08:50:31 +0800 (CST) Received: from [127.0.0.1] (10.74.221.148) by DGGEMS402-HUB.china.huawei.com (10.3.19.202) with Microsoft SMTP Server id 14.3.439.0; Tue, 12 Nov 2019 08:50:21 +0800 Subject: Re: [PATCH] drivers/perf: hisi: Simplify hisi_read_sccl_and_ccl_id and its comment To: John Garry , References: <20191108094940.GA18838@willie-the-truck> <1573267867-21991-1-git-send-email-zhangshaokun@hisilicon.com> <365e965d-b24b-1316-e818-a3d6ad7caf6e@huawei.com> From: Shaokun Zhang Message-ID: Date: Tue, 12 Nov 2019 08:50:21 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.1.1 MIME-Version: 1.0 In-Reply-To: <365e965d-b24b-1316-e818-a3d6ad7caf6e@huawei.com> X-Originating-IP: [10.74.221.148] X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191111_165041_088547_8FBBFCE4 X-CRM114-Status: GOOD ( 17.54 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Will Deacon Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi John, On 2019/11/11 21:49, John Garry wrote: > On 09/11/2019 02:51, Shaokun Zhang wrote: >> hisi_read_sccl_and_ccl_id is not readable > > That's a little strong :) > > and its comment is a little >> confused, so simplify the function and its comment as Mark's suggestion. >> >> Cc: John Garry >> Cc: Mark Rutland >> Cc: Will Deacon >> Suggested-by: Mark Rutland >> Signed-off-by: Shaokun Zhang >> --- >> drivers/perf/hisilicon/hisi_uncore_pmu.c | 58 ++++++++++++++++++-------------- >> 1 file changed, 32 insertions(+), 26 deletions(-) >> >> diff --git a/drivers/perf/hisilicon/hisi_uncore_pmu.c b/drivers/perf/hisilicon/hisi_uncore_pmu.c >> index 96183e31b96a..9e9625a1f388 100644 >> --- a/drivers/perf/hisilicon/hisi_uncore_pmu.c >> +++ b/drivers/perf/hisilicon/hisi_uncore_pmu.c >> @@ -337,38 +337,44 @@ void hisi_uncore_pmu_disable(struct pmu *pmu) >> hisi_pmu->ops->stop_counters(hisi_pmu); >> } >> + >> /* >> - * Read Super CPU cluster and CPU cluster ID from MPIDR_EL1. >> - * If multi-threading is supported, On Huawei Kunpeng 920 SoC whose cpu >> - * core is tsv110, CCL_ID is the low 3-bits in MPIDR[Aff2] and SCCL_ID >> - * is the upper 5-bits of Aff2 field; while for other cpu types, SCCL_ID >> - * is in MPIDR[Aff3] and CCL_ID is in MPIDR[Aff2], if not, SCCL_ID >> - * is in MPIDR[Aff2] and CCL_ID is in MPIDR[Aff1]. >> + * The Super CPU Cluster (SCCL) and CPU Cluster (CCL) IDs can be >> + * determined from the MPIDR_EL1, but the encoding varies by CPU: >> + * >> + * - For MT variants of TSV110 (e.g. found in Kunpeng 920): > > I wish that you would drop the "found in Kunpeng 920", as I find it confusing/misleading. > How about * - For MT variants of TSV110 (e.g. found in Kunpeng 920 if the CPU variant is 0x1): ? If this is also confusing, I will drop it. Thanks, Shaokun > Thanks, > John > >> + * SCCL is Aff2[7:3], CCL is Aff2[2:0] >> + * >> + * - For other MT parts: >> + * SCCL is Aff3[7:0], CCL is Aff2[7:0] >> + * >> + * - For non-MT parts: >> + * SCCL is Aff2[7:0], CCL is Aff1[7:0] >> */ >> -static void hisi_read_sccl_and_ccl_id(int *sccl_id, int *ccl_id) >> +static void hisi_read_sccl_and_ccl_id(int *scclp, int *cclp) >> { >> u64 mpidr = read_cpuid_mpidr(); >> - >> - if (mpidr & MPIDR_MT_BITMASK) { >> - if (read_cpuid_part_number() == HISI_CPU_PART_TSV110) { >> - int aff2 = MPIDR_AFFINITY_LEVEL(mpidr, 2); >> - >> - if (sccl_id) >> - *sccl_id = aff2 >> 3; >> - if (ccl_id) >> - *ccl_id = aff2 & 0x7; >> - } else { >> - if (sccl_id) >> - *sccl_id = MPIDR_AFFINITY_LEVEL(mpidr, 3); >> - if (ccl_id) >> - *ccl_id = MPIDR_AFFINITY_LEVEL(mpidr, 2); >> - } >> + int aff3 = MPIDR_AFFINITY_LEVEL(mpidr, 3); >> + int aff2 = MPIDR_AFFINITY_LEVEL(mpidr, 2); >> + int aff1 = MPIDR_AFFINITY_LEVEL(mpidr, 1); >> + bool mt = mpidr & MPIDR_MT_BITMASK; >> + int sccl, ccl; >> + >> + if (mt && read_cpuid_part_number() == HISI_CPU_PART_TSV110) { >> + sccl = aff2 >> 3; >> + ccl = aff2 & 0x7; >> + } else if (mt) { >> + sccl = aff3; >> + ccl = aff2; >> } else { >> - if (sccl_id) >> - *sccl_id = MPIDR_AFFINITY_LEVEL(mpidr, 2); >> - if (ccl_id) >> - *ccl_id = MPIDR_AFFINITY_LEVEL(mpidr, 1); >> + sccl = aff2; >> + ccl = aff1; >> } >> + >> + if (scclp) >> + *scclp = sccl; >> + if (cclp) >> + *cclp = ccl; >> } >> /* >> > > > . > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel