* [PATCH] MIPS: kernel: cps-vec: Replace "addi" with "addiu"
@ 2015-01-21 15:27 ` Markos Chandras
0 siblings, 0 replies; 7+ messages in thread
From: Markos Chandras @ 2015-01-21 15:27 UTC (permalink / raw)
To: linux-mips; +Cc: Markos Chandras, Maciej W. Rozycki, stable, Paul Burton
The "addi" instruction will trap on overflows which is not something
we need in this code, so we replace that with "addiu".
Link: http://www.linux-mips.org/archives/linux-mips/2015-01/msg00430.html
Cc: Maciej W. Rozycki <macro@linux-mips.org>
Cc: <stable@vger.kernel.org> # v3.15+
Cc: Paul Burton <paul.burton@imgtec.com>
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
---
Moving this out of the R6 patchset as requested by Maciej
---
arch/mips/kernel/cps-vec.S | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/mips/kernel/cps-vec.S b/arch/mips/kernel/cps-vec.S
index 0384b05ab5a0..55b759a0019e 100644
--- a/arch/mips/kernel/cps-vec.S
+++ b/arch/mips/kernel/cps-vec.S
@@ -99,11 +99,11 @@ not_nmi:
xori t2, t1, 0x7
beqz t2, 1f
li t3, 32
- addi t1, t1, 1
+ addiu t1, t1, 1
sllv t1, t3, t1
1: /* At this point t1 == I-cache sets per way */
_EXT t2, v0, MIPS_CONF1_IA_SHF, MIPS_CONF1_IA_SZ
- addi t2, t2, 1
+ addiu t2, t2, 1
mul t1, t1, t0
mul t1, t1, t2
@@ -126,11 +126,11 @@ icache_done:
xori t2, t1, 0x7
beqz t2, 1f
li t3, 32
- addi t1, t1, 1
+ addiu t1, t1, 1
sllv t1, t3, t1
1: /* At this point t1 == D-cache sets per way */
_EXT t2, v0, MIPS_CONF1_DA_SHF, MIPS_CONF1_DA_SZ
- addi t2, t2, 1
+ addiu t2, t2, 1
mul t1, t1, t0
mul t1, t1, t2
@@ -250,7 +250,7 @@ LEAF(mips_cps_core_init)
mfc0 t0, CP0_MVPCONF0
srl t0, t0, MVPCONF0_PVPE_SHIFT
andi t0, t0, (MVPCONF0_PVPE >> MVPCONF0_PVPE_SHIFT)
- addi t7, t0, 1
+ addiu t7, t0, 1
/* If there's only 1, we're done */
beqz t0, 2f
@@ -280,7 +280,7 @@ LEAF(mips_cps_core_init)
mttc0 t0, CP0_TCHALT
/* Next VPE */
- addi t5, t5, 1
+ addiu t5, t5, 1
slt t0, t5, t7
bnez t0, 1b
nop
@@ -317,7 +317,7 @@ LEAF(mips_cps_boot_vpes)
mfc0 t1, CP0_MVPCONF0
srl t1, t1, MVPCONF0_PVPE_SHIFT
andi t1, t1, MVPCONF0_PVPE >> MVPCONF0_PVPE_SHIFT
- addi t1, t1, 1
+ addiu t1, t1, 1
/* Calculate a mask for the VPE ID from EBase.CPUNum */
clz t1, t1
@@ -424,7 +424,7 @@ LEAF(mips_cps_boot_vpes)
/* Next VPE */
2: srl t6, t6, 1
- addi t5, t5, 1
+ addiu t5, t5, 1
bnez t6, 1b
nop
--
2.2.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH] MIPS: kernel: cps-vec: Replace "addi" with "addiu"
@ 2015-01-21 15:27 ` Markos Chandras
0 siblings, 0 replies; 7+ messages in thread
From: Markos Chandras @ 2015-01-21 15:27 UTC (permalink / raw)
To: linux-mips; +Cc: Markos Chandras, Maciej W. Rozycki, stable, Paul Burton
The "addi" instruction will trap on overflows which is not something
we need in this code, so we replace that with "addiu".
Link: http://www.linux-mips.org/archives/linux-mips/2015-01/msg00430.html
Cc: Maciej W. Rozycki <macro@linux-mips.org>
Cc: <stable@vger.kernel.org> # v3.15+
Cc: Paul Burton <paul.burton@imgtec.com>
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
---
Moving this out of the R6 patchset as requested by Maciej
---
arch/mips/kernel/cps-vec.S | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/mips/kernel/cps-vec.S b/arch/mips/kernel/cps-vec.S
index 0384b05ab5a0..55b759a0019e 100644
--- a/arch/mips/kernel/cps-vec.S
+++ b/arch/mips/kernel/cps-vec.S
@@ -99,11 +99,11 @@ not_nmi:
xori t2, t1, 0x7
beqz t2, 1f
li t3, 32
- addi t1, t1, 1
+ addiu t1, t1, 1
sllv t1, t3, t1
1: /* At this point t1 == I-cache sets per way */
_EXT t2, v0, MIPS_CONF1_IA_SHF, MIPS_CONF1_IA_SZ
- addi t2, t2, 1
+ addiu t2, t2, 1
mul t1, t1, t0
mul t1, t1, t2
@@ -126,11 +126,11 @@ icache_done:
xori t2, t1, 0x7
beqz t2, 1f
li t3, 32
- addi t1, t1, 1
+ addiu t1, t1, 1
sllv t1, t3, t1
1: /* At this point t1 == D-cache sets per way */
_EXT t2, v0, MIPS_CONF1_DA_SHF, MIPS_CONF1_DA_SZ
- addi t2, t2, 1
+ addiu t2, t2, 1
mul t1, t1, t0
mul t1, t1, t2
@@ -250,7 +250,7 @@ LEAF(mips_cps_core_init)
mfc0 t0, CP0_MVPCONF0
srl t0, t0, MVPCONF0_PVPE_SHIFT
andi t0, t0, (MVPCONF0_PVPE >> MVPCONF0_PVPE_SHIFT)
- addi t7, t0, 1
+ addiu t7, t0, 1
/* If there's only 1, we're done */
beqz t0, 2f
@@ -280,7 +280,7 @@ LEAF(mips_cps_core_init)
mttc0 t0, CP0_TCHALT
/* Next VPE */
- addi t5, t5, 1
+ addiu t5, t5, 1
slt t0, t5, t7
bnez t0, 1b
nop
@@ -317,7 +317,7 @@ LEAF(mips_cps_boot_vpes)
mfc0 t1, CP0_MVPCONF0
srl t1, t1, MVPCONF0_PVPE_SHIFT
andi t1, t1, MVPCONF0_PVPE >> MVPCONF0_PVPE_SHIFT
- addi t1, t1, 1
+ addiu t1, t1, 1
/* Calculate a mask for the VPE ID from EBase.CPUNum */
clz t1, t1
@@ -424,7 +424,7 @@ LEAF(mips_cps_boot_vpes)
/* Next VPE */
2: srl t6, t6, 1
- addi t5, t5, 1
+ addiu t5, t5, 1
bnez t6, 1b
nop
--
2.2.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] MIPS: kernel: cps-vec: Replace "addi" with "addiu"
2015-01-21 15:27 ` Markos Chandras
(?)
@ 2015-01-21 17:59 ` David Daney
2015-01-21 18:02 ` Paul Burton
-1 siblings, 1 reply; 7+ messages in thread
From: David Daney @ 2015-01-21 17:59 UTC (permalink / raw)
To: Markos Chandras; +Cc: linux-mips, Maciej W. Rozycki, stable, Paul Burton
On 01/21/2015 07:27 AM, Markos Chandras wrote:
> The "addi" instruction will trap on overflows which is not something
> we need in this code, so we replace that with "addiu".
>
> Link: http://www.linux-mips.org/archives/linux-mips/2015-01/msg00430.html
> Cc: Maciej W. Rozycki <macro@linux-mips.org>
> Cc: <stable@vger.kernel.org> # v3.15+
> Cc: Paul Burton <paul.burton@imgtec.com>
> Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Acked-by: David Daney <david.daney@cavium.com>
Same comment about the stable thing. Is it needed for anything other
than follow-on MIPS r6 Patches?
> ---
> Moving this out of the R6 patchset as requested by Maciej
> ---
> arch/mips/kernel/cps-vec.S | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
[...]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] MIPS: kernel: cps-vec: Replace "addi" with "addiu"
@ 2015-01-21 18:02 ` Paul Burton
0 siblings, 0 replies; 7+ messages in thread
From: Paul Burton @ 2015-01-21 18:02 UTC (permalink / raw)
To: David Daney; +Cc: Markos Chandras, linux-mips, Maciej W. Rozycki, stable
On Wed, Jan 21, 2015 at 09:59:59AM -0800, David Daney wrote:
> On 01/21/2015 07:27 AM, Markos Chandras wrote:
> >The "addi" instruction will trap on overflows which is not something
> >we need in this code, so we replace that with "addiu".
> >
> >Link: http://www.linux-mips.org/archives/linux-mips/2015-01/msg00430.html
> >Cc: Maciej W. Rozycki <macro@linux-mips.org>
> >Cc: <stable@vger.kernel.org> # v3.15+
> >Cc: Paul Burton <paul.burton@imgtec.com>
> >Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
>
> Acked-by: David Daney <david.daney@cavium.com>
>
> Same comment about the stable thing. Is it needed for anything other than
> follow-on MIPS r6 Patches?
In both this & the MSA asmmacro.h cases, the additions should never
cause overflow. So I agree, backporting to stable seems like overkill.
Paul
>
> >---
> >Moving this out of the R6 patchset as requested by Maciej
> >---
> > arch/mips/kernel/cps-vec.S | 16 ++++++++--------
> > 1 file changed, 8 insertions(+), 8 deletions(-)
> >
> [...]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] MIPS: kernel: cps-vec: Replace "addi" with "addiu"
@ 2015-01-21 18:02 ` Paul Burton
0 siblings, 0 replies; 7+ messages in thread
From: Paul Burton @ 2015-01-21 18:02 UTC (permalink / raw)
To: David Daney; +Cc: Markos Chandras, linux-mips, Maciej W. Rozycki, stable
On Wed, Jan 21, 2015 at 09:59:59AM -0800, David Daney wrote:
> On 01/21/2015 07:27 AM, Markos Chandras wrote:
> >The "addi" instruction will trap on overflows which is not something
> >we need in this code, so we replace that with "addiu".
> >
> >Link: http://www.linux-mips.org/archives/linux-mips/2015-01/msg00430.html
> >Cc: Maciej W. Rozycki <macro@linux-mips.org>
> >Cc: <stable@vger.kernel.org> # v3.15+
> >Cc: Paul Burton <paul.burton@imgtec.com>
> >Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
>
> Acked-by: David Daney <david.daney@cavium.com>
>
> Same comment about the stable thing. Is it needed for anything other than
> follow-on MIPS r6 Patches?
In both this & the MSA asmmacro.h cases, the additions should never
cause overflow. So I agree, backporting to stable seems like overkill.
Paul
>
> >---
> >Moving this out of the R6 patchset as requested by Maciej
> >---
> > arch/mips/kernel/cps-vec.S | 16 ++++++++--------
> > 1 file changed, 8 insertions(+), 8 deletions(-)
> >
> [...]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] MIPS: kernel: cps-vec: Replace "addi" with "addiu"
@ 2015-01-22 8:54 ` Markos Chandras
0 siblings, 0 replies; 7+ messages in thread
From: Markos Chandras @ 2015-01-22 8:54 UTC (permalink / raw)
To: Paul Burton, David Daney; +Cc: linux-mips, Maciej W. Rozycki, stable
On 01/21/2015 06:02 PM, Paul Burton wrote:
> On Wed, Jan 21, 2015 at 09:59:59AM -0800, David Daney wrote:
>> On 01/21/2015 07:27 AM, Markos Chandras wrote:
>>> The "addi" instruction will trap on overflows which is not something
>>> we need in this code, so we replace that with "addiu".
>>>
>>> Link: http://www.linux-mips.org/archives/linux-mips/2015-01/msg00430.html
>>> Cc: Maciej W. Rozycki <macro@linux-mips.org>
>>> Cc: <stable@vger.kernel.org> # v3.15+
>>> Cc: Paul Burton <paul.burton@imgtec.com>
>>> Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
>>
>> Acked-by: David Daney <david.daney@cavium.com>
>>
>> Same comment about the stable thing. Is it needed for anything other than
>> follow-on MIPS r6 Patches?
>
> In both this & the MSA asmmacro.h cases, the additions should never
> cause overflow. So I agree, backporting to stable seems like overkill.
>
> Paul
>
Maciej suggested to backport it to stable branches. I personally don't mind.
--
markos
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] MIPS: kernel: cps-vec: Replace "addi" with "addiu"
@ 2015-01-22 8:54 ` Markos Chandras
0 siblings, 0 replies; 7+ messages in thread
From: Markos Chandras @ 2015-01-22 8:54 UTC (permalink / raw)
To: Paul Burton, David Daney; +Cc: linux-mips, Maciej W. Rozycki, stable
On 01/21/2015 06:02 PM, Paul Burton wrote:
> On Wed, Jan 21, 2015 at 09:59:59AM -0800, David Daney wrote:
>> On 01/21/2015 07:27 AM, Markos Chandras wrote:
>>> The "addi" instruction will trap on overflows which is not something
>>> we need in this code, so we replace that with "addiu".
>>>
>>> Link: http://www.linux-mips.org/archives/linux-mips/2015-01/msg00430.html
>>> Cc: Maciej W. Rozycki <macro@linux-mips.org>
>>> Cc: <stable@vger.kernel.org> # v3.15+
>>> Cc: Paul Burton <paul.burton@imgtec.com>
>>> Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
>>
>> Acked-by: David Daney <david.daney@cavium.com>
>>
>> Same comment about the stable thing. Is it needed for anything other than
>> follow-on MIPS r6 Patches?
>
> In both this & the MSA asmmacro.h cases, the additions should never
> cause overflow. So I agree, backporting to stable seems like overkill.
>
> Paul
>
Maciej suggested to backport it to stable branches. I personally don't mind.
--
markos
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2015-01-22 8:54 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-21 15:27 [PATCH] MIPS: kernel: cps-vec: Replace "addi" with "addiu" Markos Chandras
2015-01-21 15:27 ` Markos Chandras
2015-01-21 17:59 ` David Daney
2015-01-21 18:02 ` Paul Burton
2015-01-21 18:02 ` Paul Burton
2015-01-22 8:54 ` Markos Chandras
2015-01-22 8:54 ` Markos Chandras
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.