Commit c0f7c6cb5dbb6d90e0334e62376dbc6ac3d1d315
1 parent
7a883eaf62
Exists in
master
and in
7 other branches
[POWERPC] Expand RPN field to 34 bits when using 64k pages
The real page number field in our PTEs when configured for 64kB pages is currently 32 bits, which turns out to be not quite enough for the resources that the eHCA driver wants to map. This expands the RPN field to include 2 adjacent, previously-unused bits. Signed-off-by: Paul Mackerras <paulus@samba.org> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Showing 1 changed file with 3 additions and 5 deletions Side-by-side Diff
include/asm-powerpc/pgtable-64k.h
| ... | ... | @@ -49,12 +49,10 @@ |
| 49 | 49 | |
| 50 | 50 | /* Shift to put page number into pte. |
| 51 | 51 | * |
| 52 | - * That gives us a max RPN of 32 bits, which means a max of 48 bits | |
| 53 | - * of addressable physical space. | |
| 54 | - * We could get 3 more bits here by setting PTE_RPN_SHIFT to 29 but | |
| 55 | - * 32 makes PTEs more readable for debugging for now :) | |
| 52 | + * That gives us a max RPN of 34 bits, which means a max of 50 bits | |
| 53 | + * of addressable physical space, or 46 bits for the special 4k PFNs. | |
| 56 | 54 | */ |
| 57 | -#define PTE_RPN_SHIFT (32) | |
| 55 | +#define PTE_RPN_SHIFT (30) | |
| 58 | 56 | #define PTE_RPN_MAX (1UL << (64 - PTE_RPN_SHIFT)) |
| 59 | 57 | #define PTE_RPN_MASK (~((1UL<<PTE_RPN_SHIFT)-1)) |
| 60 | 58 |