{"id":816298,"url":"http://patchwork.ozlabs.org/api/patches/816298/?format=json","web_url":"http://patchwork.ozlabs.org/project/ubuntu-kernel/patch/4a7d6d4d63baa722b3753e41dfb28580ede71b31.1505244765.git.joseph.salisbury@canonical.com/","project":{"id":15,"url":"http://patchwork.ozlabs.org/api/projects/15/?format=json","name":"Ubuntu Kernel","link_name":"ubuntu-kernel","list_id":"kernel-team.lists.ubuntu.com","list_email":"kernel-team@lists.ubuntu.com","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<4a7d6d4d63baa722b3753e41dfb28580ede71b31.1505244765.git.joseph.salisbury@canonical.com>","list_archive_url":null,"date":"2017-09-20T15:17:18","name":"[SRU,Zesty,2/2] powerpc/perf: POWER9 PMU stops after idle workaround","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"6fe87e1054183ec26f68c707eed736d185d30d8e","submitter":{"id":7793,"url":"http://patchwork.ozlabs.org/api/people/7793/?format=json","name":"Joseph Salisbury","email":"joseph.salisbury@canonical.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/ubuntu-kernel/patch/4a7d6d4d63baa722b3753e41dfb28580ede71b31.1505244765.git.joseph.salisbury@canonical.com/mbox/","series":[{"id":4145,"url":"http://patchwork.ozlabs.org/api/series/4145/?format=json","web_url":"http://patchwork.ozlabs.org/project/ubuntu-kernel/list/?series=4145","date":"2017-09-20T15:17:17","name":"Fixes for LP:1716491","version":1,"mbox":"http://patchwork.ozlabs.org/series/4145/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/816298/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/816298/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com\n\t(client-ip=91.189.94.19; helo=huckleberry.canonical.com;\n\tenvelope-from=kernel-team-bounces@lists.ubuntu.com;\n\treceiver=)","Received":["from huckleberry.canonical.com (huckleberry.canonical.com\n\t[91.189.94.19])\n\tby ozlabs.org (Postfix) with ESMTP id 3xy3JQ66Ssz9t2V;\n\tThu, 21 Sep 2017 01:17:26 +1000 (AEST)","from localhost ([127.0.0.1] helo=huckleberry.canonical.com)\n\tby huckleberry.canonical.com with esmtp (Exim 4.86_2)\n\t(envelope-from )\n\tid 1dugkd-0003hk-Fa; Wed, 20 Sep 2017 15:17:23 +0000","from youngberry.canonical.com ([91.189.89.112])\n\tby huckleberry.canonical.com with esmtps\n\t(TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128)\n\t(Exim 4.86_2) (envelope-from )\n\tid 1dugkZ-0003ed-Vd\n\tfor kernel-team@lists.ubuntu.com; Wed, 20 Sep 2017 15:17:19 +0000","from 1.general.jsalisbury.us.vpn ([10.172.67.212] helo=salisbury)\n\tby youngberry.canonical.com with esmtpsa\n\t(TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.76) (envelope-from )\n\tid 1dugkZ-0002S7-KJ\n\tfor kernel-team@lists.ubuntu.com; Wed, 20 Sep 2017 15:17:19 +0000","by salisbury (Postfix, from userid 1000)\n\tid 9CE437E280B; Wed, 20 Sep 2017 11:17:18 -0400 (EDT)"],"From":"Joseph Salisbury ","To":"kernel-team@lists.ubuntu.com","Subject":"[SRU][Zesty][PATCH 2/2] powerpc/perf: POWER9 PMU stops after idle\n\tworkaround","Date":"Wed, 20 Sep 2017 11:17:18 -0400","Message-Id":"<4a7d6d4d63baa722b3753e41dfb28580ede71b31.1505244765.git.joseph.salisbury@canonical.com>","X-Mailer":"git-send-email 2.7.4","In-Reply-To":["",""],"References":["",""],"X-BeenThere":"kernel-team@lists.ubuntu.com","X-Mailman-Version":"2.1.20","Precedence":"list","List-Id":"Kernel team discussions ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"kernel-team-bounces@lists.ubuntu.com","Sender":"\"kernel-team\" "},"content":"From: Nicholas Piggin \n\nBugLink: http://bugs.launchpad.net/bugs/1716491\n\nPOWER9 DD2 PMU can stop after a state-loss idle in some conditions.\n\nA solution is to set then clear MMCRA[60] after wake from state-loss\nidle. MMCRA[60] is a non-architected bit, see the user manual for\ndetails.\n\nSigned-off-by: Nicholas Piggin \nAcked-by: Madhavan Srinivasan \nReviewed-by: Vaidyanathan Srinivasan \nAcked-by: Anton Blanchard \nSigned-off-by: Michael Ellerman \n(cherry picked from commit 09539f9b123652e969894d6299ae0df2fe12cb5d)\nSigned-off-by: Joseph Salisbury \n---\n arch/powerpc/kernel/idle_book3s.S | 8 +++++++-\n 1 file changed, 7 insertions(+), 1 deletion(-)","diff":"diff --git a/arch/powerpc/kernel/idle_book3s.S b/arch/powerpc/kernel/idle_book3s.S\nindex e003fb9..6be7cd4 100644\n--- a/arch/powerpc/kernel/idle_book3s.S\n+++ b/arch/powerpc/kernel/idle_book3s.S\n@@ -444,11 +444,17 @@ ALT_FTR_SECTION_END_NESTED_IFSET(CPU_FTR_POWER9_DD1, 70)\n \t/*\n \t * Workaround for POWER9, if we lost resources, the ERAT\n \t * might have been mixed up and needs flushing. We also need\n-\t * to reload MMCR0 (see comment above).\n+\t * to reload MMCR0 (see comment above). We also need to set\n+\t * then clear bit 60 in MMCRA to ensure the PMU starts running.\n \t */\n \tblt\tcr3,1f\n \tPPC_INVALIDATE_ERAT\n \tld\tr1,PACAR1(r13)\n+\tmfspr\tr4,SPRN_MMCRA\n+\tori\tr4,r4,(1 << (63-60))\n+\tmtspr\tSPRN_MMCRA,r4\n+\txori\tr4,r4,(1 << (63-60))\n+\tmtspr\tSPRN_MMCRA,r4\n \tld\tr4,_MMCR0(r1)\n \tmtspr\tSPRN_MMCR0,r4\n 1:\n","prefixes":["SRU","Zesty","2/2"]}