|
@@ -147,13 +147,13 @@ extern struct tsb_phys_patch_entry __tsb_phys_patch, __tsb_phys_patch_end;
|
|
brz,pn REG1, FAIL_LABEL; \
|
|
brz,pn REG1, FAIL_LABEL; \
|
|
sllx VADDR, 64 - (PMD_SHIFT + PMD_BITS), REG2; \
|
|
sllx VADDR, 64 - (PMD_SHIFT + PMD_BITS), REG2; \
|
|
srlx REG2, 64 - PAGE_SHIFT, REG2; \
|
|
srlx REG2, 64 - PAGE_SHIFT, REG2; \
|
|
- sllx REG1, 11, REG1; \
|
|
|
|
|
|
+ sllx REG1, PGD_PADDR_SHIFT, REG1; \
|
|
andn REG2, 0x3, REG2; \
|
|
andn REG2, 0x3, REG2; \
|
|
lduwa [REG1 + REG2] ASI_PHYS_USE_EC, REG1; \
|
|
lduwa [REG1 + REG2] ASI_PHYS_USE_EC, REG1; \
|
|
brz,pn REG1, FAIL_LABEL; \
|
|
brz,pn REG1, FAIL_LABEL; \
|
|
sllx VADDR, 64 - PMD_SHIFT, REG2; \
|
|
sllx VADDR, 64 - PMD_SHIFT, REG2; \
|
|
srlx REG2, 64 - (PAGE_SHIFT - 1), REG2; \
|
|
srlx REG2, 64 - (PAGE_SHIFT - 1), REG2; \
|
|
- sllx REG1, 11, REG1; \
|
|
|
|
|
|
+ sllx REG1, PMD_PADDR_SHIFT, REG1; \
|
|
andn REG2, 0x7, REG2; \
|
|
andn REG2, 0x7, REG2; \
|
|
add REG1, REG2, REG1;
|
|
add REG1, REG2, REG1;
|
|
|
|
|
|
@@ -172,13 +172,13 @@ extern struct tsb_phys_patch_entry __tsb_phys_patch, __tsb_phys_patch_end;
|
|
brz,pn REG1, FAIL_LABEL; \
|
|
brz,pn REG1, FAIL_LABEL; \
|
|
sllx VADDR, 64 - (PMD_SHIFT + PMD_BITS), REG2; \
|
|
sllx VADDR, 64 - (PMD_SHIFT + PMD_BITS), REG2; \
|
|
srlx REG2, 64 - PAGE_SHIFT, REG2; \
|
|
srlx REG2, 64 - PAGE_SHIFT, REG2; \
|
|
- sllx REG1, 11, REG1; \
|
|
|
|
|
|
+ sllx REG1, PGD_PADDR_SHIFT, REG1; \
|
|
andn REG2, 0x3, REG2; \
|
|
andn REG2, 0x3, REG2; \
|
|
lduwa [REG1 + REG2] ASI_PHYS_USE_EC, REG1; \
|
|
lduwa [REG1 + REG2] ASI_PHYS_USE_EC, REG1; \
|
|
brz,pn REG1, FAIL_LABEL; \
|
|
brz,pn REG1, FAIL_LABEL; \
|
|
sllx VADDR, 64 - PMD_SHIFT, REG2; \
|
|
sllx VADDR, 64 - PMD_SHIFT, REG2; \
|
|
srlx REG2, 64 - (PAGE_SHIFT - 1), REG2; \
|
|
srlx REG2, 64 - (PAGE_SHIFT - 1), REG2; \
|
|
- sllx REG1, 11, REG1; \
|
|
|
|
|
|
+ sllx REG1, PMD_PADDR_SHIFT, REG1; \
|
|
andn REG2, 0x7, REG2; \
|
|
andn REG2, 0x7, REG2; \
|
|
add REG1, REG2, REG1;
|
|
add REG1, REG2, REG1;
|
|
|
|
|