From patchwork Mon Nov 14 12:16:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Balbir Singh X-Patchwork-Id: 694498 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tHVC256mfz9s9Y for ; Mon, 14 Nov 2016 23:27:10 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="AXHDRlXu"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3tHVC241m9zDw6h for ; Mon, 14 Nov 2016 23:27:10 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="AXHDRlXu"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from ozlabs.org (ozlabs.org [103.22.144.67]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3tHTyt5gD9zDvhd for ; Mon, 14 Nov 2016 23:16:38 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="AXHDRlXu"; dkim-atps=neutral Received: by ozlabs.org (Postfix) id 3tHTyt4rn0z9t0q; Mon, 14 Nov 2016 23:16:38 +1100 (AEDT) Delivered-To: linuxppc-dev@ozlabs.org Received: from mail-pg0-x243.google.com (mail-pg0-x243.google.com [IPv6:2607:f8b0:400e:c05::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tHTyt1Bv4z9t17 for ; Mon, 14 Nov 2016 23:16:38 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="AXHDRlXu"; dkim-atps=neutral Received: by mail-pg0-x243.google.com with SMTP id 3so8880048pgd.0 for ; Mon, 14 Nov 2016 04:16:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=36YpKC1acHGUW2RneJQ+1crJcG2nNbP1HEf9fXs9pws=; b=AXHDRlXumBO/h8kxL4HyiKn8TSTGCPqdNGTw/QDNgWVP8kcjAq1NYiduBktfH51Z55 67cNpDVZlRPu78vX2YEZQYMV1A4iptJK2BxIh/Ws3bLOeqAMNd8HDyvGlweV0T20oSvO nAXEQALQFMBlUmWJaxTlvHIv6GF2hTy9r0vMxwYMuyVSMmXRrqtRgdHFB+bUFDHr2BHL CJCxe5G3c+yoLpzIU0XOUVH9zSc5G3nDmeHztxe6YCy1G9e2glPHKbyj5pvaxefGS3fF V0Tzu53mtmIRrdh8LtmPCMtzYGEQL+julAcgyRB5fFpYsD+KDUE0iSJSABkKDT8FKYW5 nrFQ== 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=36YpKC1acHGUW2RneJQ+1crJcG2nNbP1HEf9fXs9pws=; b=gHE+ZOz07gALlwKerfff7gAmGy/9jvikgyYzOF8AU13Bvpjvitn5WJNWCpY4vFIj0C C+Nm0W2oTmJJI8ZbPd6E9xdKF2cgZDH7ytHFVDYBrXb7PKqIGG4zdm0D4Xw7VYGq9TzS maDznC1JlDqPWDokpXbLG7gpM1UF3ozhEMVyPFoDnzBACmFwzwbDbMk3SlipVh8erTHl klZ2y+UPTiCVIZ50d/UEVz6xZN6HT33KVBxgiCEMx0CxzvBDm4p5NGK2lxKnN0qtmLGa ZU1zBBdtPi8pkehiUeQKWlyqj3Z77YIxOL/Vk0fNPNk82e5Fe1haodLB9DxDwPj2vy91 6Agw== X-Gm-Message-State: ABUngvcJMiuzyiGP2GwFuon5de4wYHoJ91fybjVNHSG/Vx4SXL6uH7sSx8jCg2WYYX+GeQ== X-Received: by 10.98.48.69 with SMTP id w66mr36189864pfw.0.1479125796706; Mon, 14 Nov 2016 04:16:36 -0800 (PST) Received: from balbir.ozlabs.ibm.com (14-202-194-140.static.tpgi.com.au. [14.202.194.140]) by smtp.gmail.com with ESMTPSA id b80sm22865707pfe.52.2016.11.14.04.16.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Nov 2016 04:16:36 -0800 (PST) From: Balbir Singh To: linuxppc-dev@ozlabs.org, mpe@ellerman.id.au Subject: [powerpc v5 1/3] Setup AMOR in HV mode Date: Mon, 14 Nov 2016 23:16:16 +1100 Message-Id: <1479125778-18496-2-git-send-email-bsingharora@gmail.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1479125778-18496-1-git-send-email-bsingharora@gmail.com> References: <1479125778-18496-1-git-send-email-bsingharora@gmail.com> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: aneesh.kumar@linux.vnet.ibm.com Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" AMOR should be setup in HV mode, we set it up once and let the generic kernel handle IAMR. This patch is used to enable storage keys in a following patch as defined in ISA 3 Reported-by: Aneesh Kumar K.V Signed-off-by: Balbir Singh --- arch/powerpc/mm/pgtable-radix.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/arch/powerpc/mm/pgtable-radix.c b/arch/powerpc/mm/pgtable-radix.c index ed7bddc..7c21a52 100644 --- a/arch/powerpc/mm/pgtable-radix.c +++ b/arch/powerpc/mm/pgtable-radix.c @@ -320,6 +320,25 @@ static void update_hid_for_radix(void) cpu_relax(); } +/* + * In HV mode, we init AMOR so that the hypervisor + * and guest can setup IMAR, enable key 0 and set + * it to 1 + * AMOR = 1100....00 (Mask for key 0 is 11) + */ +static void radix_init_amor(void) +{ + unsigned long amor_mask = 0xc000000000000000; + unsigned long amor = mfspr(SPRN_AMOR); + + if (cpu_has_feature(CPU_FTR_POWER9_DD1)) + return; + + amor = amor_mask; + + mtspr(SPRN_AMOR, amor); +} + void __init radix__early_init_mmu(void) { unsigned long lpcr; @@ -376,6 +395,7 @@ void __init radix__early_init_mmu(void) lpcr = mfspr(SPRN_LPCR); mtspr(SPRN_LPCR, lpcr | LPCR_UPRT | LPCR_HR); radix_init_partition_table(); + radix_init_amor(); } radix_init_pgtable(); @@ -393,6 +413,7 @@ void radix__early_init_mmu_secondary(void) mtspr(SPRN_PTCR, __pa(partition_tb) | (PATB_SIZE_SHIFT - 12)); + radix_init_amor(); } }