From: Balbir Singh <bsingharora@gmail.com>
To: linuxppc-dev@ozlabs.org, mpe@ellerman.id.au
Cc: aneesh.kumar@linux.vnet.ibm.com, Balbir Singh <bsingharora@gmail.com>
Subject: [powerpc v5 1/3] Setup AMOR in HV mode
Date: Mon, 14 Nov 2016 23:16:16 +1100 [thread overview]
Message-ID: <1479125778-18496-2-git-send-email-bsingharora@gmail.com> (raw)
In-Reply-To: <1479125778-18496-1-git-send-email-bsingharora@gmail.com>
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 <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Balbir Singh <bsingharora@gmail.com>
---
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();
}
}
--
2.5.5
next prev parent reply other threads:[~2016-11-14 12:16 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-14 12:16 [powerpc v5 0/3] Enable IAMR storage keys for radix Balbir Singh
2016-11-14 12:16 ` Balbir Singh [this message]
2016-11-14 12:16 ` [powerpc v5 2/3] Detect instruction fetch denied and report Balbir Singh
2016-11-15 2:39 ` Michael Ellerman
2016-11-14 12:16 ` [powerpc v5 3/3] Enable storage keys for radix - user mode execution Balbir Singh
2016-11-15 2:40 ` [powerpc v5 0/3] Enable IAMR storage keys for radix Michael Ellerman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1479125778-18496-2-git-send-email-bsingharora@gmail.com \
--to=bsingharora@gmail.com \
--cc=aneesh.kumar@linux.vnet.ibm.com \
--cc=linuxppc-dev@ozlabs.org \
--cc=mpe@ellerman.id.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.