| Message ID | 20210520124406.2731873-9-tabba@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Tidy up cache.S | expand |
On Thu, May 20, 2021 at 01:43:56PM +0100, Fuad Tabba wrote: > The comment describing the macro dcache_by_line_op is placed > right before the previous macro of the one it describes, which is > a bit confusing. Move it to the macro it describes (dcache_by_line_op). > > No functional change intended. > > Signed-off-by: Fuad Tabba <tabba@google.com> Acked-by: Mark Rutland <mark.rutland@arm.com> Mark. > --- > arch/arm64/include/asm/assembler.h | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h > index 0a276b46ef50..ced791124b28 100644 > --- a/arch/arm64/include/asm/assembler.h > +++ b/arch/arm64/include/asm/assembler.h > @@ -387,6 +387,14 @@ alternative_cb_end > bfi \tcr, \tmp0, \pos, #3 > .endm > > + .macro __dcache_op_workaround_clean_cache, op, addr > +alternative_if_not ARM64_WORKAROUND_CLEAN_CACHE > + dc \op, \addr > +alternative_else > + dc civac, \addr > +alternative_endif > + .endm > + > /* > * Macro to perform a data cache maintenance for the interval > * [addr, addr + size) > @@ -398,14 +406,6 @@ alternative_cb_end > * fixup: optional label to branch to on user fault > * Corrupts: addr, size, tmp1, tmp2 > */ > - .macro __dcache_op_workaround_clean_cache, op, addr > -alternative_if_not ARM64_WORKAROUND_CLEAN_CACHE > - dc \op, \addr > -alternative_else > - dc civac, \addr > -alternative_endif > - .endm > - > .macro dcache_by_line_op op, domain, addr, size, tmp1, tmp2, fixup > dcache_line_size \tmp1, \tmp2 > add \size, \addr, \size > -- > 2.31.1.751.gd2f1c929bd-goog >
diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h index 0a276b46ef50..ced791124b28 100644 --- a/arch/arm64/include/asm/assembler.h +++ b/arch/arm64/include/asm/assembler.h @@ -387,6 +387,14 @@ alternative_cb_end bfi \tcr, \tmp0, \pos, #3 .endm + .macro __dcache_op_workaround_clean_cache, op, addr +alternative_if_not ARM64_WORKAROUND_CLEAN_CACHE + dc \op, \addr +alternative_else + dc civac, \addr +alternative_endif + .endm + /* * Macro to perform a data cache maintenance for the interval * [addr, addr + size) @@ -398,14 +406,6 @@ alternative_cb_end * fixup: optional label to branch to on user fault * Corrupts: addr, size, tmp1, tmp2 */ - .macro __dcache_op_workaround_clean_cache, op, addr -alternative_if_not ARM64_WORKAROUND_CLEAN_CACHE - dc \op, \addr -alternative_else - dc civac, \addr -alternative_endif - .endm - .macro dcache_by_line_op op, domain, addr, size, tmp1, tmp2, fixup dcache_line_size \tmp1, \tmp2 add \size, \addr, \size
The comment describing the macro dcache_by_line_op is placed right before the previous macro of the one it describes, which is a bit confusing. Move it to the macro it describes (dcache_by_line_op). No functional change intended. Signed-off-by: Fuad Tabba <tabba@google.com> --- arch/arm64/include/asm/assembler.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)