Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751930AbdCPHhr (ORCPT ); Thu, 16 Mar 2017 03:37:47 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:51888 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751271AbdCPHho (ORCPT ); Thu, 16 Mar 2017 03:37:44 -0400 From: Madhavan Srinivasan To: mpe@ellerman.id.au Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Anju T Sudhakar , "Gautham R . Shenoy" , Balbir Singh , Benjamin Herrenschmidt , Paul Mackerras , Anton Blanchard , Sukadev Bhattiprolu , Michael Neuling , Stewart Smith , Daniel Axtens , Stephane Eranian , Madhavan Srinivasan Subject: [PATCH 12/13] powerpc/perf: Thread imc cpuhotplug support Date: Thu, 16 Mar 2017 13:05:06 +0530 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1489649707-8021-1-git-send-email-maddy@linux.vnet.ibm.com> References: <1489649707-8021-1-git-send-email-maddy@linux.vnet.ibm.com> X-TM-AS-MML: disable x-cbid: 17031607-1617-0000-0000-000001B7C892 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17031607-1618-0000-0000-000047F212F6 Message-Id: <1489649707-8021-13-git-send-email-maddy@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-03-16_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-1702020001 definitions=main-1703160061 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3349 Lines: 102 From: Anju T Sudhakar This patch adds 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_THREADIMC_ONLINE is added to the list of existing states. Cc: Gautham R. Shenoy Cc: Balbir Singh Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Anton Blanchard Cc: Sukadev Bhattiprolu Cc: Michael Neuling Cc: Stewart Smith Cc: Daniel Axtens Cc: Stephane Eranian Signed-off-by: Anju T Sudhakar Signed-off-by: Madhavan Srinivasan --- arch/powerpc/perf/imc-pmu.c | 33 ++++++++++++++++++++++++++++----- include/linux/cpuhotplug.h | 1 + 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/arch/powerpc/perf/imc-pmu.c b/arch/powerpc/perf/imc-pmu.c index 6802960db51c..2ff39fe2a5ce 100644 --- a/arch/powerpc/perf/imc-pmu.c +++ b/arch/powerpc/perf/imc-pmu.c @@ -687,6 +687,16 @@ static void cleanup_all_thread_imc_memory(void) on_each_cpu(cleanup_thread_imc_memory, NULL, 1); } +static void thread_imc_update_ldbar(unsigned int cpu_id) +{ + u64 ldbar_addr, ldbar_value; + + ldbar_addr = (u64)virt_to_phys((void *)per_cpu_add[cpu_id]); + ldbar_value = (ldbar_addr & (u64)THREAD_IMC_LDBAR_MASK) | + (u64)THREAD_IMC_ENABLE; + mtspr(SPRN_LDBAR, ldbar_value); +} + /* * Allocates a page of memory for each of the online cpus, and, writes the * physical base address of that page to the LDBAR for that cpu. This starts @@ -694,20 +704,33 @@ static void cleanup_all_thread_imc_memory(void) */ static void thread_imc_mem_alloc(void *dummy) { - u64 ldbar_addr, ldbar_value; int cpu_id = smp_processor_id(); per_cpu_add[cpu_id] = (u64)__get_free_pages(GFP_KERNEL | __GFP_ZERO, 0); - ldbar_addr = (u64)virt_to_phys((void *)per_cpu_add[cpu_id]); - ldbar_value = (ldbar_addr & (u64)THREAD_IMC_LDBAR_MASK) | - (u64)THREAD_IMC_ENABLE; - mtspr(SPRN_LDBAR, ldbar_value); + thread_imc_update_ldbar(cpu_id); +} + +static int ppc_thread_imc_cpu_online(unsigned int cpu) +{ + thread_imc_update_ldbar(cpu); + return 0; + +} + +static int ppc_thread_imc_cpu_offline(unsigned int cpu) +{ + mtspr(SPRN_LDBAR, 0); + return 0; } void thread_imc_cpu_init(void) { on_each_cpu(thread_imc_mem_alloc, NULL, 1); + cpuhp_setup_state(CPUHP_AP_PERF_POWERPC_THREADIMC_ONLINE, + "POWER_THREAD_IMC_ONLINE", + ppc_thread_imc_cpu_online, + ppc_thread_imc_cpu_offline); } static void thread_imc_ldbar_disable(void *dummy) diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h index abde85d9511a..724df46b2c3c 100644 --- a/include/linux/cpuhotplug.h +++ b/include/linux/cpuhotplug.h @@ -138,6 +138,7 @@ enum cpuhp_state { CPUHP_AP_PERF_ARM_L2X0_ONLINE, CPUHP_AP_PERF_POWERPC_NEST_ONLINE, CPUHP_AP_PERF_POWERPC_COREIMC_ONLINE, + CPUHP_AP_PERF_POWERPC_THREADIMC_ONLINE, CPUHP_AP_PERF_ARM_QCOM_L2_ONLINE, CPUHP_AP_WORKQUEUE_ONLINE, CPUHP_AP_RCUTREE_ONLINE, -- 2.7.4