Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753995AbdGCJkM (ORCPT ); Mon, 3 Jul 2017 05:40:12 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:34773 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753934AbdGCJkB (ORCPT ); Mon, 3 Jul 2017 05:40:01 -0400 From: Anju T Sudhakar To: mpe@ellerman.id.au Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, ego@linux.vnet.ibm.com, bsingharora@gmail.com, anton@samba.org, sukadev@linux.vnet.ibm.com, mikey@neuling.org, stewart@linux.vnet.ibm.com, dja@axtens.net, eranian@google.com, hemant@linux.vnet.ibm.com, maddy@linux.vnet.ibm.com, anju@linux.vnet.ibm.com, tglx@linutronix.de Subject: [PATCH v12 10/10] powerpc/perf: Thread IMC PMU functions Date: Mon, 3 Jul 2017 15:08:48 +0530 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1499074728-30680-1-git-send-email-anju@linux.vnet.ibm.com> References: <1499074728-30680-1-git-send-email-anju@linux.vnet.ibm.com> X-TM-AS-MML: disable x-cbid: 17070309-0012-0000-0000-00000251A2F7 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17070309-0013-0000-0000-0000076AC4B2 Message-Id: <1499074728-30680-3-git-send-email-anju@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-07-03_06:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=3 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1703280000 definitions=main-1707030161 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2781 Lines: 92 Code to add support for thread IMC on cpuhotplug. When a cpu goes offline, the LDBAR for that cpu is disabled, and when it comes back online the previous ldbar value is written back to the LDBAR for that cpu. To register the hotplug functions for thread_imc, a new state CPUHP_AP_PERF_POWERPC_THREAD_IMC_ONLINE is added to the list of existing states. Signed-off-by: Anju T Sudhakar Signed-off-by: Madhavan Srinivasan --- arch/powerpc/perf/imc-pmu.c | 38 +++++++++++++++++++++++++++++++++++++- include/linux/cpuhotplug.h | 1 + 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/perf/imc-pmu.c b/arch/powerpc/perf/imc-pmu.c index bea4dafc2aad..700e3cb0c89f 100644 --- a/arch/powerpc/perf/imc-pmu.c +++ b/arch/powerpc/perf/imc-pmu.c @@ -931,6 +931,37 @@ static int thread_imc_mem_alloc(int cpu_id, int size) return 0; } +static int ppc_thread_imc_cpu_online(unsigned int cpu) +{ + int rc = 0; + u64 ldbar_value; + + if (per_cpu(thread_imc_mem, cpu) == NULL) + rc = thread_imc_mem_alloc(cpu, thread_imc_mem_size); + + if (rc) + mtspr(SPRN_LDBAR, 0); + + ldbar_value = ((u64)per_cpu(thread_imc_mem, cpu) & (u64)THREAD_IMC_LDBAR_MASK) | + (u64)THREAD_IMC_ENABLE; + mtspr(SPRN_LDBAR, ldbar_value); + return 0; +} + +static int ppc_thread_imc_cpu_offline(unsigned int cpu) +{ + mtspr(SPRN_LDBAR, 0); + return 0; +} + +void thread_imc_cpu_init(void) +{ + cpuhp_setup_state(CPUHP_AP_PERF_POWERPC_THREAD_IMC_ONLINE, + "perf/powerpc/imc_thread:online", + ppc_thread_imc_cpu_online, + ppc_thread_imc_cpu_offline); +} + /* * imc_mem_init : Function to support memory allocation for core imc. */ @@ -1044,6 +1075,9 @@ int init_imc_pmu(struct imc_events *events, int idx, return ret; } break; + case IMC_DOMAIN_THREAD: + thread_imc_cpu_init(); + break; default: return -1; /* Unknown domain */ } @@ -1095,7 +1129,9 @@ int init_imc_pmu(struct imc_events *events, int idx, cleanup_all_core_imc_memory(pmu_ptr); } /* For thread_imc, we have allocated memory, we need to free it */ - if (pmu_ptr->domain == IMC_DOMAIN_THREAD) + if (pmu_ptr->domain == IMC_DOMAIN_THREAD) { + cpuhp_remove_state(CPUHP_AP_PERF_POWERPC_THREAD_IMC_ONLINE); cleanup_all_thread_imc_memory(); + } return ret; } diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h index e145fffec093..937d1ec8c3e9 100644 --- a/include/linux/cpuhotplug.h +++ b/include/linux/cpuhotplug.h @@ -141,6 +141,7 @@ enum cpuhp_state { CPUHP_AP_PERF_ARM_QCOM_L3_ONLINE, CPUHP_AP_PERF_POWERPC_NEST_IMC_ONLINE, CPUHP_AP_PERF_POWERPC_CORE_IMC_ONLINE, + CPUHP_AP_PERF_POWERPC_THREAD_IMC_ONLINE, CPUHP_AP_WORKQUEUE_ONLINE, CPUHP_AP_RCUTREE_ONLINE, CPUHP_AP_ONLINE_DYN, -- 2.11.0