From: Bharat Bhushan <r65777@freescale.com> To: <kvm-ppc@vger.kernel.org>, <kvm@vger.kernel.org>, <agraf@suse.de>, <scottwood@freescale.com> Cc: Bharat Bhushan <Bharat.Bhushan@freescale.com>, Bharat Bhushan <bharat.bhushan@freescale.com> Subject: [PATCH 2/2] kvm: powerpc: set cache coherency only for kernel managed pages Date: Thu, 18 Jul 2013 11:34:16 +0530 [thread overview] Message-ID: <1374127456-9614-2-git-send-email-Bharat.Bhushan@freescale.com> (raw) In-Reply-To: <1374127456-9614-1-git-send-email-Bharat.Bhushan@freescale.com> If there is a struct page for the requested mapping then it's normal DDR and the mapping sets "M" bit (coherent, cacheable) else this is treated as I/O and we set "I + G" (cache inhibited, guarded) This helps setting proper TLB mapping for direct assigned device Signed-off-by: Bharat Bhushan <bharat.bhushan@freescale.com> --- arch/powerpc/kvm/e500_mmu_host.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/arch/powerpc/kvm/e500_mmu_host.c b/arch/powerpc/kvm/e500_mmu_host.c index 1c6a9d7..089c227 100644 --- a/arch/powerpc/kvm/e500_mmu_host.c +++ b/arch/powerpc/kvm/e500_mmu_host.c @@ -64,13 +64,20 @@ static inline u32 e500_shadow_mas3_attrib(u32 mas3, int usermode) return mas3; } -static inline u32 e500_shadow_mas2_attrib(u32 mas2, int usermode) +static inline u32 e500_shadow_mas2_attrib(u32 mas2, pfn_t pfn) { + u32 mas2_attr; + + mas2_attr = mas2 & MAS2_ATTRIB_MASK; + + if (!pfn_valid(pfn)) { + mas2_attr |= MAS2_I | MAS2_G; + } else { #ifdef CONFIG_SMP - return (mas2 & MAS2_ATTRIB_MASK) | MAS2_M; -#else - return mas2 & MAS2_ATTRIB_MASK; + mas2_attr |= MAS2_M; #endif + } + return mas2_attr; } /* @@ -313,7 +320,7 @@ static void kvmppc_e500_setup_stlbe( /* Force IPROT=0 for all guest mappings. */ stlbe->mas1 = MAS1_TSIZE(tsize) | get_tlb_sts(gtlbe) | MAS1_VALID; stlbe->mas2 = (gvaddr & MAS2_EPN) | - e500_shadow_mas2_attrib(gtlbe->mas2, pr); + e500_shadow_mas2_attrib(gtlbe->mas2, pfn); stlbe->mas7_3 = ((u64)pfn << PAGE_SHIFT) | e500_shadow_mas3_attrib(gtlbe->mas7_3, pr); -- 1.7.0.4
WARNING: multiple messages have this Message-ID (diff)
From: Bharat Bhushan <r65777@freescale.com> To: kvm-ppc@vger.kernel.org, kvm@vger.kernel.org, agraf@suse.de, scottwood@freescale.com Cc: Bharat Bhushan <Bharat.Bhushan@freescale.com>, Bharat Bhushan <bharat.bhushan@freescale.com> Subject: [PATCH 2/2] kvm: powerpc: set cache coherency only for kernel managed pages Date: Thu, 18 Jul 2013 06:16:16 +0000 [thread overview] Message-ID: <1374127456-9614-2-git-send-email-Bharat.Bhushan@freescale.com> (raw) In-Reply-To: <1374127456-9614-1-git-send-email-Bharat.Bhushan@freescale.com> If there is a struct page for the requested mapping then it's normal DDR and the mapping sets "M" bit (coherent, cacheable) else this is treated as I/O and we set "I + G" (cache inhibited, guarded) This helps setting proper TLB mapping for direct assigned device Signed-off-by: Bharat Bhushan <bharat.bhushan@freescale.com> --- arch/powerpc/kvm/e500_mmu_host.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/arch/powerpc/kvm/e500_mmu_host.c b/arch/powerpc/kvm/e500_mmu_host.c index 1c6a9d7..089c227 100644 --- a/arch/powerpc/kvm/e500_mmu_host.c +++ b/arch/powerpc/kvm/e500_mmu_host.c @@ -64,13 +64,20 @@ static inline u32 e500_shadow_mas3_attrib(u32 mas3, int usermode) return mas3; } -static inline u32 e500_shadow_mas2_attrib(u32 mas2, int usermode) +static inline u32 e500_shadow_mas2_attrib(u32 mas2, pfn_t pfn) { + u32 mas2_attr; + + mas2_attr = mas2 & MAS2_ATTRIB_MASK; + + if (!pfn_valid(pfn)) { + mas2_attr |= MAS2_I | MAS2_G; + } else { #ifdef CONFIG_SMP - return (mas2 & MAS2_ATTRIB_MASK) | MAS2_M; -#else - return mas2 & MAS2_ATTRIB_MASK; + mas2_attr |= MAS2_M; #endif + } + return mas2_attr; } /* @@ -313,7 +320,7 @@ static void kvmppc_e500_setup_stlbe( /* Force IPROT=0 for all guest mappings. */ stlbe->mas1 = MAS1_TSIZE(tsize) | get_tlb_sts(gtlbe) | MAS1_VALID; stlbe->mas2 = (gvaddr & MAS2_EPN) | - e500_shadow_mas2_attrib(gtlbe->mas2, pr); + e500_shadow_mas2_attrib(gtlbe->mas2, pfn); stlbe->mas7_3 = ((u64)pfn << PAGE_SHIFT) | e500_shadow_mas3_attrib(gtlbe->mas7_3, pr); -- 1.7.0.4
next prev parent reply other threads:[~2013-07-18 6:04 UTC|newest] Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-07-18 6:04 [PATCH 1/2] kvm: powerpc: Do not ignore "E" attribute in mas2 Bharat Bhushan 2013-07-18 6:16 ` Bharat Bhushan 2013-07-18 6:04 ` Bharat Bhushan [this message] 2013-07-18 6:16 ` [PATCH 2/2] kvm: powerpc: set cache coherency only for kernel managed pages Bharat Bhushan 2013-07-18 6:26 ` "“tiejun.chen”" 2013-07-18 6:26 ` "“tiejun.chen”" 2013-07-18 7:12 ` Bhushan Bharat-R65777 2013-07-18 7:12 ` Bhushan Bharat-R65777 2013-07-18 7:31 ` "“tiejun.chen”" 2013-07-18 7:31 ` "“tiejun.chen”" 2013-07-18 8:08 ` Bhushan Bharat-R65777 2013-07-18 8:08 ` Bhushan Bharat-R65777 2013-07-18 8:21 ` "“tiejun.chen”" 2013-07-18 8:21 ` "“tiejun.chen”" 2013-07-18 8:22 ` Bhushan Bharat-R65777 2013-07-18 8:22 ` Bhushan Bharat-R65777 2013-07-18 8:25 ` Bhushan Bharat-R65777 2013-07-18 8:25 ` Bhushan Bharat-R65777 2013-07-18 8:55 ` "“tiejun.chen”" 2013-07-18 8:55 ` "“tiejun.chen”" 2013-07-18 9:44 ` Alexander Graf 2013-07-18 9:44 ` Alexander Graf 2013-07-18 9:56 ` "“tiejun.chen”" 2013-07-18 9:56 ` "“tiejun.chen”" 2013-07-18 10:00 ` Alexander Graf 2013-07-18 10:00 ` Alexander Graf 2013-07-18 10:14 ` "“tiejun.chen”" 2013-07-18 10:14 ` "“tiejun.chen”" 2013-07-18 16:11 ` Scott Wood 2013-07-18 16:11 ` Scott Wood 2013-07-18 9:48 ` Alexander Graf 2013-07-18 9:48 ` Alexander Graf 2013-07-18 9:51 ` Bhushan Bharat-R65777 2013-07-18 10:08 ` "“tiejun.chen”" 2013-07-18 10:08 ` "“tiejun.chen”" 2013-07-18 10:12 ` Alexander Graf 2013-07-18 10:12 ` Alexander Graf 2013-07-18 10:19 ` "“tiejun.chen”" 2013-07-18 10:19 ` "“tiejun.chen”" 2013-07-18 10:27 ` Alexander Graf 2013-07-18 10:27 ` Alexander Graf 2013-07-24 2:26 ` "“tiejun.chen”" 2013-07-24 2:26 ` "“tiejun.chen”" 2013-07-24 8:25 ` Alexander Graf 2013-07-24 8:25 ` Alexander Graf 2013-07-24 9:11 ` Bhushan Bharat-R65777 2013-07-24 9:11 ` Bhushan Bharat-R65777 2013-07-24 9:21 ` Alexander Graf 2013-07-24 9:21 ` Alexander Graf 2013-07-24 9:35 ` Gleb Natapov 2013-07-24 9:35 ` Gleb Natapov 2013-07-24 9:39 ` Alexander Graf 2013-07-24 9:39 ` Alexander Graf 2013-07-24 20:32 ` Scott Wood 2013-07-24 20:32 ` Scott Wood 2013-07-24 20:32 ` Scott Wood 2013-07-25 8:50 ` Gleb Natapov 2013-07-25 8:50 ` Gleb Natapov 2013-07-25 8:50 ` Gleb Natapov 2013-07-25 16:07 ` Alexander Graf 2013-07-25 16:07 ` Alexander Graf 2013-07-25 16:07 ` Alexander Graf 2013-07-25 16:14 ` Gleb Natapov 2013-07-25 16:14 ` Gleb Natapov 2013-07-25 16:14 ` Gleb Natapov 2013-07-26 22:27 ` Scott Wood 2013-07-26 22:27 ` Scott Wood 2013-07-26 22:27 ` Scott Wood 2013-07-24 10:01 ` Gleb Natapov 2013-07-24 10:01 ` Gleb Natapov 2013-07-24 10:09 ` Alexander Graf 2013-07-24 10:09 ` Alexander Graf 2013-07-24 10:19 ` Gleb Natapov 2013-07-24 10:19 ` Gleb Natapov 2013-07-24 10:25 ` Alexander Graf 2013-07-24 10:25 ` Alexander Graf 2013-07-24 10:30 ` Gleb Natapov 2013-07-24 10:30 ` Gleb Natapov 2013-07-25 1:04 ` Andrea Arcangeli 2013-07-25 1:04 ` Andrea Arcangeli 2013-07-18 8:27 ` "“tiejun.chen”" 2013-07-18 8:27 ` "“tiejun.chen”"
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=1374127456-9614-2-git-send-email-Bharat.Bhushan@freescale.com \ --to=r65777@freescale.com \ --cc=Bharat.Bhushan@freescale.com \ --cc=agraf@suse.de \ --cc=kvm-ppc@vger.kernel.org \ --cc=kvm@vger.kernel.org \ --cc=scottwood@freescale.com \ /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: linkBe 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.