Received: by 10.192.165.148 with SMTP id m20csp84381imm; Fri, 20 Apr 2018 03:29:58 -0700 (PDT) X-Google-Smtp-Source: AIpwx48z4MvqeqCpOkVCCO/WhyJSmmAXzaWPkIr/gvGONqSLdYemqe+1diVaBCKxiH9Ap8B6Uq+H X-Received: by 10.99.54.136 with SMTP id d130mr3613045pga.228.1524220198821; Fri, 20 Apr 2018 03:29:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524220198; cv=none; d=google.com; s=arc-20160816; b=M/j4qGrXbB9s91KxhvlWi2FL5O0s9dRojvHNO+fMDNOeutwJqnP8AiXGoEJoKfTv1a NtkGFAp8b/6MtuLW5jPpjGDqk2qUCiT+xk2esN4CNnMCa4ppCrhA8pH5wO4yBEYd0NYF d5Je42Loa2h8p1FsPjtQmAOVtyIfAjAf1NmKuOf3k0bZXFtBfbvmPMtnVzFO/XXF62oF RFPzKdTvVoHqpUtElhFMOyRowwyV2z+NJl5QNQch/5RtjAMMi92J5uMXvQcZ10KZmPro lqfAn0gjI+eaiH+DJtAkyMhZ5nPJjcaD8miVsFVWpOu2kGBD9k5ayHOqFCINGZVmdiTc R46w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:arc-authentication-results; bh=RO+q5oKaE6tetjmGVl3uS80DKOhPdtY/iZMXbRyfsHY=; b=bpd5Y1d5xMxVnyCOxaQRKKMuwxkzKRgS20XOAxZABTFEwbJCDcT6POZgDmEK1OCq6Y uhNMpNOGpa11iyU/vDzX6TQ1snAXfUQRATxSDCyl79l3xRt6Xj0A2tFW4O1fechI8YTG x+I4t77zaI/fTJc4dnNE++YuoZR4kWs7H17swJpWhwgfsgh5ThnMvgWeHsnHZzeqJ0+e ou5MJwn2SY9JzU0Ndbr7XTKNm1Xb1PmHomSTtSK4i0TNzB21n/Vjoel2SGjUkJjZFk1A iYWCTJVQy5cXNsQroEStzLhvu0v2subCkJY+rRPfe/nT9Wh06Bm2bFZteGHd3U2R0sUR Wpzw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c139si4962633pfb.259.2018.04.20.03.29.44; Fri, 20 Apr 2018 03:29:58 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754680AbeDTK1V (ORCPT + 99 others); Fri, 20 Apr 2018 06:27:21 -0400 Received: from 9pmail.ess.barracuda.com ([64.235.154.211]:54569 "EHLO 9pmail.ess.barracuda.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754458AbeDTK1U (ORCPT ); Fri, 20 Apr 2018 06:27:20 -0400 Received: from MIPSMAIL01.mipstec.com (mailrelay.mips.com [12.201.5.28]) by mx1401.ess.rzc.cudaops.com (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NO); Fri, 20 Apr 2018 10:27:00 +0000 Received: from mredfearn-linux.mipstec.com (192.168.155.41) by MIPSMAIL01.mipstec.com (10.20.43.31) with Microsoft SMTP Server (TLS) id 14.3.361.1; Fri, 20 Apr 2018 03:25:13 -0700 From: Matt Redfearn To: James Hogan , Ralf Baechle , Florian Fainelli CC: , Matt Redfearn , Namhyung Kim , Peter Zijlstra , , Ingo Molnar , Jiri Olsa , Alexander Shishkin , Arnaldo Carvalho de Melo Subject: [PATCH v3 6/7] MIPS: perf: Fold vpe_id() macro into it's one last usage Date: Fri, 20 Apr 2018 11:23:08 +0100 Message-ID: <1524219789-31241-7-git-send-email-matt.redfearn@mips.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1524219789-31241-1-git-send-email-matt.redfearn@mips.com> References: <1524219789-31241-1-git-send-email-matt.redfearn@mips.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [192.168.155.41] X-BESS-ID: 1524219945-321457-10557-42113-5 X-BESS-VER: 2018.5-r1804181636 X-BESS-Apparent-Source-IP: 12.201.5.28 X-BESS-Outbound-Spam-Score: 0.00 X-BESS-Outbound-Spam-Report: Code version 3.2, rules version 3.2.2.192194 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------- 0.00 BSF_BESS_OUTBOUND META: BESS Outbound X-BESS-Outbound-Spam-Status: SCORE=0.00 using account:ESS59374 scores of KILL_LEVEL=7.0 tests=BSF_BESS_OUTBOUND X-BESS-BRTS-Status: 1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The vpe_id() macro is now used only in mipsxx_pmu_enable_event when CONFIG_CPU_BMIPS5000 is defined. Fold the one used definition of the macro into it's usage and remove the now unused definitions. Since we know that cpu_has_mipsmt_pertccounters == 0 on BMIPS5000, remove the test on it and just set the counter to count the relevant VPE. Signed-off-by: Matt Redfearn --- Changes in v3: None Changes in v2: Since BMIPS5000 does not implement per TC counters, we can remove the check on cpu_has_mipsmt_pertccounters. arch/mips/kernel/perf_event_mipsxx.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/arch/mips/kernel/perf_event_mipsxx.c b/arch/mips/kernel/perf_event_mipsxx.c index a07777aa1b79..5b8811643e60 100644 --- a/arch/mips/kernel/perf_event_mipsxx.c +++ b/arch/mips/kernel/perf_event_mipsxx.c @@ -132,18 +132,6 @@ static struct mips_pmu mipspmu; static DEFINE_SPINLOCK(core_counters_lock); static DEFINE_RWLOCK(pmuint_rwlock); - -#if defined(CONFIG_CPU_BMIPS5000) -#define vpe_id() (cpu_has_mipsmt_pertccounters ? \ - 0 : (smp_processor_id() & MIPS_CPUID_TO_COUNTER_MASK)) -#else -#define vpe_id() (cpu_has_mipsmt_pertccounters ? \ - 0 : cpu_vpe_id(¤t_cpu_data)) -#endif - -#else /* !CONFIG_MIPS_PERF_SHARED_TC_COUNTERS */ -#define vpe_id() 0 - #endif /* CONFIG_MIPS_PERF_SHARED_TC_COUNTERS */ static void resume_local_counters(void); @@ -379,8 +367,10 @@ static void mipsxx_pmu_enable_event(struct hw_perf_event *evt, int idx) #ifdef CONFIG_CPU_BMIPS5000 { /* enable the counter for the calling thread */ - cpuc->saved_ctrl[idx] |= - (1 << (12 + vpe_id())) | BRCM_PERFCTRL_TC; + unsigned int vpe_id; + + vpe_id = smp_processor_id() & MIPS_CPUID_TO_COUNTER_MASK; + cpuc->saved_ctrl[idx] |= BIT(12 + vpe_id) | BRCM_PERFCTRL_TC; } #else #ifdef CONFIG_MIPS_MT_SMP -- 2.7.4