| Message ID | 20191024225132.13410-5-samitolvanen@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2,01/17] arm64: mm: don't use x18 in idmap_kpti_install_ng_mappings | expand |
Minor nit, but could we make the title a bit more specific (and more uniform across the series)? e.g. arm64: kvm: avoid x18 in __cpu_soft_restart That makes things a bit nicer when trawling through git logs as the scope of the patch is clearer. On Thu, Oct 24, 2019 at 03:51:19PM -0700, samitolvanen@google.com wrote: > From: Ard Biesheuvel <ard.biesheuvel@linaro.org> > > The code in __cpu_soft_restart() uses x18 as an arbitrary temp register, > which will shortly be disallowed. So use x8 instead. > > Link: https://patchwork.kernel.org/patch/9836877/ > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> > Signed-off-by: Sami Tolvanen <samitolvanen@google.com> Either way: Reviewed-by: Mark Rutland <mark.rutland@arm.com> > --- > arch/arm64/kernel/cpu-reset.S | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm64/kernel/cpu-reset.S b/arch/arm64/kernel/cpu-reset.S > index 6ea337d464c4..32c7bf858dd9 100644 > --- a/arch/arm64/kernel/cpu-reset.S > +++ b/arch/arm64/kernel/cpu-reset.S > @@ -42,11 +42,11 @@ ENTRY(__cpu_soft_restart) > mov x0, #HVC_SOFT_RESTART > hvc #0 // no return > > -1: mov x18, x1 // entry > +1: mov x8, x1 // entry > mov x0, x2 // arg0 > mov x1, x3 // arg1 > mov x2, x4 // arg2 > - br x18 > + br x8 > ENDPROC(__cpu_soft_restart) > > .popsection > -- > 2.24.0.rc0.303.g954a862665-goog >
diff --git a/arch/arm64/kernel/cpu-reset.S b/arch/arm64/kernel/cpu-reset.S index 6ea337d464c4..32c7bf858dd9 100644 --- a/arch/arm64/kernel/cpu-reset.S +++ b/arch/arm64/kernel/cpu-reset.S @@ -42,11 +42,11 @@ ENTRY(__cpu_soft_restart) mov x0, #HVC_SOFT_RESTART hvc #0 // no return -1: mov x18, x1 // entry +1: mov x8, x1 // entry mov x0, x2 // arg0 mov x1, x3 // arg1 mov x2, x4 // arg2 - br x18 + br x8 ENDPROC(__cpu_soft_restart) .popsection