Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

powerpc/8xx: Remove left-over instruction and comments in DataStoreTLBMiss handler

Commit ac9f97ff8b32 ("powerpc/8xx: Inconditionally use task PGDIR in
DTLB misses") removed the test that needed the valeur in SPRN_EPN but
failed to remove the read.

Remove it.

And remove related comments, including the very same comment
in InstructionTLBMiss that should have been removed by
commit 33c527522f39 ("powerpc/8xx: Inconditionally use task PGDIR in
ITLB misses").

Also update the comment about absence of a second level table which
has been handled implicitely since commit 5ddb75cee5af ("powerpc/8xx:
remove tests on PGDIR entry validity").

Fixes: ac9f97ff8b32 ("powerpc/8xx: Inconditionally use task PGDIR in DTLB misses")
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Madhavan Srinivasan <maddy@linux.ibm.com>
Link: https://patch.msgid.link/5811c8d1d6187f280ad140d6c0ad6010e41eeaeb.1755361995.git.christophe.leroy@csgroup.eu

authored by

Christophe Leroy and committed by
Madhavan Srinivasan
d9e46de4 6d84f851

+1 -8
+1 -8
arch/powerpc/kernel/head_8xx.S
··· 162 162 * For the MPC8xx, this is a software tablewalk to load the instruction 163 163 * TLB. The task switch loads the M_TWB register with the pointer to the first 164 164 * level table. 165 - * If we discover there is no second level table (value is zero) or if there 165 + * If there is no second level table (value is zero) or if there 166 166 * is an invalid pte, we load that into the TLB, which causes another fault 167 167 * into the TLB Error interrupt where we can handle such problems. 168 168 * We have to use the MD_xxx registers for the tablewalk because the ··· 183 183 mtspr SPRN_SPRG_SCRATCH2, r10 184 184 mtspr SPRN_M_TW, r11 185 185 186 - /* If we are faulting a kernel address, we have to use the 187 - * kernel page tables. 188 - */ 189 186 mfspr r10, SPRN_SRR0 /* Get effective address of fault */ 190 187 INVALIDATE_ADJACENT_PAGES_CPU15(r10, r11) 191 188 mtspr SPRN_MD_EPN, r10 ··· 225 228 mtspr SPRN_SPRG_SCRATCH2, r10 226 229 mtspr SPRN_M_TW, r11 227 230 228 - /* If we are faulting a kernel address, we have to use the 229 - * kernel page tables. 230 - */ 231 - mfspr r10, SPRN_MD_EPN 232 231 mfspr r10, SPRN_M_TWB /* Get level 1 table */ 233 232 lwz r11, 0(r10) /* Get level 1 entry */ 234 233