* [PATCH 07/11] powerpc/8xx: macro for handling CPU15 errata
@ 2015-04-20 5:26 Christophe Leroy
2015-04-20 11:40 ` David Laight
0 siblings, 1 reply; 4+ messages in thread
From: Christophe Leroy @ 2015-04-20 5:26 UTC (permalink / raw)
To: Benjamin Herrenschmidt, Paul Mackerras, Michael Ellerman,
scottwood
Cc: linuxppc-dev, linux-kernel
Having a macro will help keep clear code.
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
---
arch/powerpc/kernel/head_8xx.S | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/arch/powerpc/kernel/head_8xx.S b/arch/powerpc/kernel/head_8xx.S
index b227902e..b3f3cb5 100644
--- a/arch/powerpc/kernel/head_8xx.S
+++ b/arch/powerpc/kernel/head_8xx.S
@@ -297,6 +297,17 @@ SystemCall:
* We have to use the MD_xxx registers for the tablewalk because the
* equivalent MI_xxx registers only perform the attribute functions.
*/
+
+#ifdef CONFIG_8xx_CPU15
+#define DO_8xx_CPU15(tmp, addr) \
+ addi tmp, addr, PAGE_SIZE; \
+ tlbie tmp; \
+ addi tmp, addr, PAGE_SIZE; \
+ tlbie tmp
+#else
+#define DO_8xx_CPU15(tmp, addr)
+#endif
+
InstructionTLBMiss:
#ifdef CONFIG_8xx_CPU6
mtspr SPRN_DAR, r3
@@ -304,12 +315,7 @@ InstructionTLBMiss:
EXCEPTION_PROLOG_0
mtspr SPRN_SPRG_SCRATCH2, r10
mfspr r10, SPRN_SRR0 /* Get effective address of fault */
-#ifdef CONFIG_8xx_CPU15
- addi r11, r10, PAGE_SIZE
- tlbie r11
- addi r11, r10, -PAGE_SIZE
- tlbie r11
-#endif
+ DO_8xx_CPU15(r11, r10)
/* If we are faulting a kernel address, we have to use the
* kernel page tables.
--
2.1.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* RE: [PATCH 07/11] powerpc/8xx: macro for handling CPU15 errata
2015-04-20 5:26 [PATCH 07/11] powerpc/8xx: macro for handling CPU15 errata Christophe Leroy
@ 2015-04-20 11:40 ` David Laight
2015-04-20 11:43 ` leroy christophe
0 siblings, 1 reply; 4+ messages in thread
From: David Laight @ 2015-04-20 11:40 UTC (permalink / raw)
To: 'Christophe Leroy', Benjamin Herrenschmidt,
Paul Mackerras, Michael Ellerman, scottwood@freescale.com
Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org
RnJvbTogQ2hyaXN0b3BoZSBMZXJveQ0KPiBTZW50OiAyMCBBcHJpbCAyMDE1IDA2OjI3DQo+IEhh
dmluZyBhIG1hY3JvIHdpbGwgaGVscCBrZWVwIGNsZWFyIGNvZGUuDQouLi4NCj4gICAqIFdlIGhh
dmUgdG8gdXNlIHRoZSBNRF94eHggcmVnaXN0ZXJzIGZvciB0aGUgdGFibGV3YWxrIGJlY2F1c2Ug
dGhlDQo+ICAgKiBlcXVpdmFsZW50IE1JX3h4eCByZWdpc3RlcnMgb25seSBwZXJmb3JtIHRoZSBh
dHRyaWJ1dGUgZnVuY3Rpb25zLg0KPiAgICovDQo+ICsNCj4gKyNpZmRlZiBDT05GSUdfOHh4X0NQ
VTE1DQo+ICsjZGVmaW5lIERPXzh4eF9DUFUxNSh0bXAsIGFkZHIpCVwNCj4gKwlhZGRpCXRtcCwg
YWRkciwgUEFHRV9TSVpFOwlcDQo+ICsJdGxiaWUJdG1wOwkJCVwNCj4gKwlhZGRpCXRtcCwgYWRk
ciwgUEFHRV9TSVpFOwlcDQo+ICsJdGxiaWUJdG1wDQo+ICsjZWxzZQ0KPiArI2RlZmluZSBET184
eHhfQ1BVMTUodG1wLCBhZGRyKQ0KPiArI2VuZGlmDQoNCkknbSBzdXJlIEkndmUgc3BvdHRlZCB0
aGUgc2FtZSBvYnZpb3VzIGVycm9yIGluIHRoZSBhYm92ZSBiZWZvcmUuDQoNCkknZCBhbHNvIHN1
Z2dlc3QgY2FsbGluZyBpdCAnaW52YWxpZGF0ZV9hZGphY2VudF9wYWdlcycgLSBzaW5jZSB0aGF0
IGl0DQp3aGF0IGl0IGRvZXMuDQoNCkkgYWxzbyBndWVzcyB0aGF0IHRoZSBleGVjdXRpb24gdGlt
ZSBvZiAndGxiaWUnIGlzIG5vbi10cml2aWFsLg0KU28geW91IG1pZ2h0IGFzIHdlbGwgZ2V0IHJp
ZCBvZiB0aGUgdGVtcG9yYXJ5IHJlZ2lzdGVyIGFuZCBwdXQgYW4NCidhZGRpJyB0byByZXNldCAn
YWRkcicgYXQgdGhlIGVuZC4NCg0KCURhdmlkDQoNCg==
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 07/11] powerpc/8xx: macro for handling CPU15 errata
2015-04-20 11:40 ` David Laight
@ 2015-04-20 11:43 ` leroy christophe
0 siblings, 0 replies; 4+ messages in thread
From: leroy christophe @ 2015-04-20 11:43 UTC (permalink / raw)
To: David Laight, Benjamin Herrenschmidt, Paul Mackerras,
Michael Ellerman, scottwood@freescale.com
Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org
Le 20/04/2015 13:40, David Laight a écrit :
> From: Christophe Leroy
>> Sent: 20 April 2015 06:27
>> Having a macro will help keep clear code.
> ...
>> * We have to use the MD_xxx registers for the tablewalk because the
>> * equivalent MI_xxx registers only perform the attribute functions.
>> */
>> +
>> +#ifdef CONFIG_8xx_CPU15
>> +#define DO_8xx_CPU15(tmp, addr) \
>> + addi tmp, addr, PAGE_SIZE; \
>> + tlbie tmp; \
>> + addi tmp, addr, PAGE_SIZE; \
>> + tlbie tmp
>> +#else
>> +#define DO_8xx_CPU15(tmp, addr)
>> +#endif
> I'm sure I've spotted the same obvious error in the above before.
>
> I'd also suggest calling it 'invalidate_adjacent_pages' - since that it
> what it does.
>
> I also guess that the execution time of 'tlbie' is non-trivial.
> So you might as well get rid of the temporary register and put an
> 'addi' to reset 'addr' at the end.
>
> David
>
Forget it, I did a big mistake this morning, involontarily resent an old
patch.
Sorry for the noise.
Christophe
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 07/11] powerpc/8xx: macro for handling CPU15 errata
@ 2014-12-16 15:03 Christophe Leroy
0 siblings, 0 replies; 4+ messages in thread
From: Christophe Leroy @ 2014-12-16 15:03 UTC (permalink / raw)
To: Benjamin Herrenschmidt, Paul Mackerras, Michael Ellerman,
scottwood
Cc: linuxppc-dev, linux-kernel
Having a macro will help keep clear code.
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
---
arch/powerpc/kernel/head_8xx.S | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/arch/powerpc/kernel/head_8xx.S b/arch/powerpc/kernel/head_8xx.S
index b227902e..b3f3cb5 100644
--- a/arch/powerpc/kernel/head_8xx.S
+++ b/arch/powerpc/kernel/head_8xx.S
@@ -297,6 +297,17 @@ SystemCall:
* We have to use the MD_xxx registers for the tablewalk because the
* equivalent MI_xxx registers only perform the attribute functions.
*/
+
+#ifdef CONFIG_8xx_CPU15
+#define DO_8xx_CPU15(tmp, addr) \
+ addi tmp, addr, PAGE_SIZE; \
+ tlbie tmp; \
+ addi tmp, addr, PAGE_SIZE; \
+ tlbie tmp
+#else
+#define DO_8xx_CPU15(tmp, addr)
+#endif
+
InstructionTLBMiss:
#ifdef CONFIG_8xx_CPU6
mtspr SPRN_DAR, r3
@@ -304,12 +315,7 @@ InstructionTLBMiss:
EXCEPTION_PROLOG_0
mtspr SPRN_SPRG_SCRATCH2, r10
mfspr r10, SPRN_SRR0 /* Get effective address of fault */
-#ifdef CONFIG_8xx_CPU15
- addi r11, r10, PAGE_SIZE
- tlbie r11
- addi r11, r10, -PAGE_SIZE
- tlbie r11
-#endif
+ DO_8xx_CPU15(r11, r10)
/* If we are faulting a kernel address, we have to use the
* kernel page tables.
--
2.1.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-04-20 11:43 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-20 5:26 [PATCH 07/11] powerpc/8xx: macro for handling CPU15 errata Christophe Leroy
2015-04-20 11:40 ` David Laight
2015-04-20 11:43 ` leroy christophe
-- strict thread matches above, loose matches on Subject: below --
2014-12-16 15:03 Christophe Leroy
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).