From: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
To: Huang Pei <huangpei@loongson.cn>
Cc: ambrosehua@gmail.com, Bibo Mao <maobibo@loongson.cn>,
linux-mips@vger.kernel.org, Jiaxun Yang <jiaxun.yang@flygoat.com>,
Paul Burton <paulburton@kernel.org>,
Li Xuefeng <lixuefeng@loongson.cn>,
Yang Tiezhu <yangtiezhu@loongson.cn>,
Gao Juxin <gaojuxin@loongson.cn>,
Huacai Chen <chenhuacai@loongson.cn>,
"Maciej W . Rozycki" <macro@orcam.me.uk>
Subject: Re: [PATCH 4/4] MIPS: retire "asm/llsc.h"
Date: Wed, 5 Jan 2022 11:39:44 +0100 [thread overview]
Message-ID: <20220105103944.GC7009@alpha.franken.de> (raw)
In-Reply-To: <20211215084500.24444-5-huangpei@loongson.cn>
On Wed, Dec 15, 2021 at 04:45:00PM +0800, Huang Pei wrote:
> all that "asm/llsc.h" does is just to help inline asm, which can be
> stringifyed from "asm/asm.h"
>
> +. Since "asm/asm.h" has all we need, retire "asm/llsc.h"
>
> +. remove unused header file
>
> Inspired-by: Maciej W. Rozycki <macro@orcam.me.uk>
> Signed-off-by: Huang Pei <huangpei@loongson.cn>
> ---
> arch/mips/include/asm/asm.h | 4 +++
> arch/mips/include/asm/atomic.h | 10 +++-----
> arch/mips/include/asm/bitops.h | 24 ++++++++----------
> arch/mips/include/asm/cmpxchg.h | 8 +++---
> arch/mips/include/asm/kvm_host.h | 12 ++++-----
> arch/mips/include/asm/llsc.h | 43 --------------------------------
> 6 files changed, 28 insertions(+), 73 deletions(-)
> delete mode 100644 arch/mips/include/asm/llsc.h
>
> diff --git a/arch/mips/include/asm/asm.h b/arch/mips/include/asm/asm.h
> index f3302b13d3e0..ed74a6032ec8 100644
> --- a/arch/mips/include/asm/asm.h
> +++ b/arch/mips/include/asm/asm.h
> @@ -182,6 +182,8 @@ symbol = value
> #define INT_SRLV srlv
> #define INT_SRA sra
> #define INT_SRAV srav
> +#define LONG_INS ins
> +#define LONG_EXT ext
> #endif
>
> #if (_MIPS_SZINT == 64)
> @@ -199,6 +201,8 @@ symbol = value
> #define INT_SRLV dsrlv
> #define INT_SRA dsra
> #define INT_SRAV dsrav
> +#define LONG_INS dins
> +#define LONG_EXT dext
> #endif
this is the wrong place for the defines. I wonder how you compiled it
as it blew up a loongson64 build.
> diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
> index a0b9e7c1e4fc..77ba1e36701f 100644
> --- a/arch/mips/include/asm/atomic.h
> +++ b/arch/mips/include/asm/atomic.h
> @@ -20,9 +20,7 @@
> #include <asm/compiler.h>
> #include <asm/cpu-features.h>
> #include <asm/cmpxchg.h>
> -#include <asm/llsc.h>
> #include <asm/sync.h>
> -#include <asm/war.h>
I've added an #include <asm/asm.h> as this file is now using defines
out of it.
> diff --git a/arch/mips/include/asm/cmpxchg.h b/arch/mips/include/asm/cmpxchg.h
> index 66a8b293fd80..b47a5e49f519 100644
> --- a/arch/mips/include/asm/cmpxchg.h
> +++ b/arch/mips/include/asm/cmpxchg.h
> @@ -11,9 +11,7 @@
> #include <linux/bug.h>
> #include <linux/irqflags.h>
> #include <asm/compiler.h>
> -#include <asm/llsc.h>
> #include <asm/sync.h>
> -#include <asm/war.h>
same here. This also caused compile errors...
applied to mips-next with the compile fixes.
Thomas.
--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]
prev parent reply other threads:[~2022-01-05 10:42 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-15 8:44 [PATCH V6]: bugfix Huang Pei
2021-12-15 8:44 ` [PATCH 1/4] MIPS: fix local_{add,sub}_return on MIPS64 Huang Pei
2021-12-16 12:49 ` Thomas Bogendoerfer
2021-12-18 3:23 ` Huang Pei
2022-01-05 10:34 ` Thomas Bogendoerfer
2021-12-15 8:44 ` [PATCH 2/4] MIPS: tx39: adjust tx39_flush_cache_page Huang Pei
2021-12-16 8:29 ` Sergey Shtylyov
2021-12-16 12:52 ` Thomas Bogendoerfer
2021-12-18 3:30 ` Huang Pei
2021-12-15 8:44 ` [PATCH 3/4] MIPS: rework local_t operation on MIPS64 Huang Pei
2022-01-05 10:35 ` Thomas Bogendoerfer
2021-12-15 8:45 ` [PATCH 4/4] MIPS: retire "asm/llsc.h" Huang Pei
2022-01-05 10:39 ` Thomas Bogendoerfer [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220105103944.GC7009@alpha.franken.de \
--to=tsbogend@alpha.franken.de \
--cc=ambrosehua@gmail.com \
--cc=chenhuacai@loongson.cn \
--cc=gaojuxin@loongson.cn \
--cc=huangpei@loongson.cn \
--cc=jiaxun.yang@flygoat.com \
--cc=linux-mips@vger.kernel.org \
--cc=lixuefeng@loongson.cn \
--cc=macro@orcam.me.uk \
--cc=maobibo@loongson.cn \
--cc=paulburton@kernel.org \
--cc=yangtiezhu@loongson.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.