* [PATCH v2] powerpc/fsl-booke: Fix settlbcam for 64-bit
@ 2011-10-12 21:17 Becky Bruce
2011-10-13 5:02 ` Kumar Gala
0 siblings, 1 reply; 2+ messages in thread
From: Becky Bruce @ 2011-10-12 21:17 UTC (permalink / raw)
To: linuxppc-dev
From: Becky Bruce <beckyb@kernel•crashing.org>
Currently, it does a cntlzd on the size and then subtracts it from
21.... this doesn't take into account the varying size of a "long".
Just use __ilog instead (and subtract the 10 we have to subtract
to get to the tsize encoding).
Also correct the comment about page sizes supported.
Signed-off-by: Becky Bruce <beckyb@kernel•crashing.org>
---
Sent the wrong version last time; also noticed that the comment is
incorrect now that we have 64-bit and added that to the patch.
arch/powerpc/mm/fsl_booke_mmu.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/powerpc/mm/fsl_booke_mmu.c b/arch/powerpc/mm/fsl_booke_mmu.c
index f7802c8..5b8fd3b 100644
--- a/arch/powerpc/mm/fsl_booke_mmu.c
+++ b/arch/powerpc/mm/fsl_booke_mmu.c
@@ -101,17 +101,17 @@ unsigned long p_mapped_by_tlbcam(phys_addr_t pa)
/*
* Set up a variable-size TLB entry (tlbcam). The parameters are not checked;
- * in particular size must be a power of 4 between 4k and 256M (or 1G, for cpus
- * that support extended page sizes). Note that while some cpus support a
- * page size of 4G, we don't allow its use here.
+ * in particular size must be a power of 4 between 4k and the max supported by
+ * an implementation; max may further be limited by what can be represented in
+ * an unsigned long (for example, 32-bit implementations cannot support a 4GB
+ * size).
*/
static void settlbcam(int index, unsigned long virt, phys_addr_t phys,
unsigned long size, unsigned long flags, unsigned int pid)
{
- unsigned int tsize, lz;
+ unsigned int tsize;
- asm (PPC_CNTLZL "%0,%1" : "=r" (lz) : "r" (size));
- tsize = 21 - lz;
+ tsize = __ilog2(size) - 10;
#ifdef CONFIG_SMP
if ((flags & _PAGE_NO_CACHE) == 0)
--
1.5.6.5
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH v2] powerpc/fsl-booke: Fix settlbcam for 64-bit
2011-10-12 21:17 [PATCH v2] powerpc/fsl-booke: Fix settlbcam for 64-bit Becky Bruce
@ 2011-10-13 5:02 ` Kumar Gala
0 siblings, 0 replies; 2+ messages in thread
From: Kumar Gala @ 2011-10-13 5:02 UTC (permalink / raw)
To: Becky Bruce; +Cc: linuxppc-dev
On Oct 12, 2011, at 4:17 PM, Becky Bruce wrote:
> From: Becky Bruce <beckyb@kernel•crashing.org>
>
> Currently, it does a cntlzd on the size and then subtracts it from
> 21.... this doesn't take into account the varying size of a "long".
> Just use __ilog instead (and subtract the 10 we have to subtract
> to get to the tsize encoding).
>
> Also correct the comment about page sizes supported.
>
> Signed-off-by: Becky Bruce <beckyb@kernel•crashing.org>
> ---
> Sent the wrong version last time; also noticed that the comment is
> incorrect now that we have 64-bit and added that to the patch.
>
> arch/powerpc/mm/fsl_booke_mmu.c | 12 ++++++------
> 1 files changed, 6 insertions(+), 6 deletions(-)
applied
- k
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-10-13 5:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-12 21:17 [PATCH v2] powerpc/fsl-booke: Fix settlbcam for 64-bit Becky Bruce
2011-10-13 5:02 ` Kumar Gala
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox