From patchwork Tue Jul 8 06:38:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 4502781 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8930FBEEAA for ; Tue, 8 Jul 2014 06:38:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7DF6A202D1 for ; Tue, 8 Jul 2014 06:38:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AD14F202BE for ; Tue, 8 Jul 2014 06:38:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752471AbaGHGik (ORCPT ); Tue, 8 Jul 2014 02:38:40 -0400 Received: from mail-pd0-f175.google.com ([209.85.192.175]:60986 "EHLO mail-pd0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752269AbaGHGij (ORCPT ); Tue, 8 Jul 2014 02:38:39 -0400 Received: by mail-pd0-f175.google.com with SMTP id v10so6632360pde.20 for ; Mon, 07 Jul 2014 23:38:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jms.id.au; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hXizau0tM+2SlqmOjpZiBLLj4e5/iatvjzJLYxJnT5M=; b=JmPNRNUoXzzfmHJ928wqhuNUGrPqTUUrCc1qSEBIQQ8uog1Nuhqjdg+ZUy7ue74YnI x/+9clX1+32il7n2sf63uPaLjmxGEdcIYJpL95Hy6RyaQXFEqjGeaO4E/hUUMOWPiJhy 6fNGxTP2qwG5YaOFe/GmB6g4ij9/nuElIUi1I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hXizau0tM+2SlqmOjpZiBLLj4e5/iatvjzJLYxJnT5M=; b=ln4zvU9Y9oeKEETAFoYASGyQv6SX1zh53V34n8KRK5fuIqbek1Eg14TwT19xWmfOny rBTRRvjiAYZsND/Bi0EF9Dmm84SoR2OMS8hlnfgb152c3YBV1D4AEu8rDs5G4gc3nEaA Ac/unKvw4NwloffpXsBsyoRhcXYimiNGr+HyKF9vxjUKEyh+pqVSQHoN4nOiTZd4DJ1n tXhCPbfL15gbJ6cly2CyACY7FSEeRNAdwAjho04mC2Jz/NLFgUdjNk2AFTu02KbtU1yk 4RefQFe7NNuYjDU88sq3amlhtFGy/jFlx1Tnrc3fNB4cADTrUJNzAYSRsSxrB3nG3mXQ RP0A== X-Gm-Message-State: ALoCoQlbzAeIGaYZu/a/CvJ6wRC4dl2vfrhvO87PKL3Ce2FLL+bt43j09kGqgLNwrDS4meTOzyWT X-Received: by 10.66.234.202 with SMTP id ug10mr7755319pac.109.1404801518575; Mon, 07 Jul 2014 23:38:38 -0700 (PDT) Received: from icarus.au.ibm.com (ppp14-2-14-154.lns21.adl2.internode.on.net. [14.2.14.154]) by mx.google.com with ESMTPSA id rb8sm74064931pab.27.2014.07.07.23.38.35 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 07 Jul 2014 23:38:38 -0700 (PDT) From: Joel Stanley To: benh@kernel.crashing.org, paulus@samba.org, mpe@ellerman.id.au, Alexander Graf Cc: linuxppc-dev@lists.ozlabs.org, kvm@vger.kernel.org, kvm-ppc@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH v2 1/3] powerpc/kvm: Remove redundant save of SIER AND MMCR2 Date: Tue, 8 Jul 2014 16:08:20 +0930 Message-Id: <1404801502-4663-2-git-send-email-joel@jms.id.au> X-Mailer: git-send-email 2.0.0 In-Reply-To: <1404801502-4663-1-git-send-email-joel@jms.id.au> References: <1404801502-4663-1-git-send-email-joel@jms.id.au> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP These two registers are already saved in the block above. Aside from being unnecessary, by the time we get down to the second save location r8 no longer contains MMCR2, so we are clobbering the saved value with PMC5. MMCR2 primarily consists of counter freeze bits. So restoring the value of PMC5 into MMCR2 will most likely have the effect of freezing counters. Fixes: 72cde5a88d37 ("KVM: PPC: Book3S HV: Save/restore host PMU registers that are new in POWER8") Cc: stable@vger.kernel.org Signed-off-by: Joel Stanley Acked-by: Michael Ellerman Acked-by: Paul Mackerras Reviewed-by: Alexander Graf --- V2: - Add comments from mpe arch/powerpc/kvm/book3s_hv_interrupts.S | 5 ----- 1 file changed, 5 deletions(-) diff --git a/arch/powerpc/kvm/book3s_hv_interrupts.S b/arch/powerpc/kvm/book3s_hv_interrupts.S index 8c86422..731be74 100644 --- a/arch/powerpc/kvm/book3s_hv_interrupts.S +++ b/arch/powerpc/kvm/book3s_hv_interrupts.S @@ -127,11 +127,6 @@ BEGIN_FTR_SECTION stw r10, HSTATE_PMC + 24(r13) stw r11, HSTATE_PMC + 28(r13) END_FTR_SECTION_IFSET(CPU_FTR_ARCH_201) -BEGIN_FTR_SECTION - mfspr r9, SPRN_SIER - std r8, HSTATE_MMCR + 40(r13) - std r9, HSTATE_MMCR + 48(r13) -END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S) 31: /*