Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755520AbbHDIbO (ORCPT ); Tue, 4 Aug 2015 04:31:14 -0400 Received: from e39.co.us.ibm.com ([32.97.110.160]:53421 "EHLO e39.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751294AbbHDIbK (ORCPT ); Tue, 4 Aug 2015 04:31:10 -0400 X-Helo: d01dlp02.pok.ibm.com X-MailFrom: ego@linux.vnet.ibm.com X-RcptTo: linux-kernel@vger.kernel.org From: "Gautham R. Shenoy" To: Paul Mackerras , Michael Ellerman , linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, mikey@neuling.org Cc: "Gautham R. Shenoy" Subject: [PATCH] powerpc: Add an inline function to update HID0 Date: Tue, 4 Aug 2015 14:00:58 +0530 Message-Id: <1438677058-12883-1-git-send-email-ego@linux.vnet.ibm.com> X-Mailer: git-send-email 1.9.3 X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15080408-0033-0000-0000-00000560812A Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2103 Lines: 63 Section 3.7 of Version 1.2 of the Power8 Processor User's Manual prescribes that updates to HID0 be preceded by a SYNC instruction and followed by an ISYNC instruction (Page 91). Create a function name update_hid0() which follows this recipe and invoke it from the static split core path. Signed-off-by: Gautham R. Shenoy --- arch/powerpc/include/asm/kvm_ppc.h | 11 +++++++++++ arch/powerpc/platforms/powernv/subcore.c | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/include/asm/kvm_ppc.h b/arch/powerpc/include/asm/kvm_ppc.h index c6ef05b..325f1d6 100644 --- a/arch/powerpc/include/asm/kvm_ppc.h +++ b/arch/powerpc/include/asm/kvm_ppc.h @@ -685,4 +685,15 @@ static inline ulong kvmppc_get_ea_indexed(struct kvm_vcpu *vcpu, int ra, int rb) extern void xics_wake_cpu(int cpu); +static inline void update_hid0(unsigned long hid0) +{ + /* + * The HID0 update should at the very least be preceded by a + * a SYNC instruction followed by an ISYNC instruction + */ + mb(); + mtspr(SPRN_HID0, hid0); + isync(); +} + #endif /* __POWERPC_KVM_PPC_H__ */ diff --git a/arch/powerpc/platforms/powernv/subcore.c b/arch/powerpc/platforms/powernv/subcore.c index f60f80a..37e77bf 100644 --- a/arch/powerpc/platforms/powernv/subcore.c +++ b/arch/powerpc/platforms/powernv/subcore.c @@ -190,7 +190,7 @@ static void unsplit_core(void) hid0 = mfspr(SPRN_HID0); hid0 &= ~HID0_POWER8_DYNLPARDIS; - mtspr(SPRN_HID0, hid0); + update_hid0(hid0); update_hid_in_slw(hid0); while (mfspr(SPRN_HID0) & mask) @@ -227,7 +227,7 @@ static void split_core(int new_mode) /* Write new mode */ hid0 = mfspr(SPRN_HID0); hid0 |= HID0_POWER8_DYNLPARDIS | split_parms[i].value; - mtspr(SPRN_HID0, hid0); + update_hid0(hid0); update_hid_in_slw(hid0); /* Wait for it to happen */ -- 1.9.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/