linux-mips.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Paul Cercueil <paul@crapouillou.net>
To: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: "Maciej W . Rozycki" <macro@linux-mips.org>,
	Paul Burton <paulburton@kernel.org>,
	Zhou Yanjie <zhouyanjie@wanyeetech.com>,
	od@zcrc.me, linux-kernel@vger.kernel.org,
	linux-mips@vger.kernel.org, Paul Cercueil <paul@crapouillou.net>
Subject: [PATCH v3 04/15] MIPS: cpu-probe: ingenic: Fix broken BUG_ON
Date: Sun,  6 Sep 2020 21:29:24 +0200	[thread overview]
Message-ID: <20200906192935.107086-5-paul@crapouillou.net> (raw)
In-Reply-To: <20200906192935.107086-1-paul@crapouillou.net>

The previous code was doing:
BUG_ON(!__builtin_constant_p(cpu_has_counter) || cpu_has_counter);

This only worked as the "cpu_has_counter" macro was overridden in
<cpu-feature-overrides.h>. The default "cpu_has_counter" macro is
non-constant, which triggered the BUG_ON() independently of the value
returned by the macro.

What we want to check here, is that *if* the macro was overridden to a
compile-time constant, then must be defined to zero, otherwise it's a
bug.

So the correct check is:
BUG_ON(__builtin_constant_p(cpu_has_counter) && cpu_has_counter);

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
---

Notes:
    v2-v3: No change

 arch/mips/kernel/cpu-probe.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index a07e66a6e063..6be23f205e74 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -2123,7 +2123,7 @@ static inline void cpu_probe_ingenic(struct cpuinfo_mips *c, unsigned int cpu)
 
 	/* XBurst does not implement the CP0 counter. */
 	c->options &= ~MIPS_CPU_COUNTER;
-	BUG_ON(!__builtin_constant_p(cpu_has_counter) || cpu_has_counter);
+	BUG_ON(__builtin_constant_p(cpu_has_counter) && cpu_has_counter);
 
 	/* XBurst has virtually tagged icache */
 	c->icache.flags |= MIPS_CACHE_VTAG;
-- 
2.28.0


  parent reply	other threads:[~2020-09-06 19:30 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-06 19:29 [PATCH v3 00/15] MIPS: Convert Ingenic to a generic board v3 Paul Cercueil
2020-09-06 19:29 ` [PATCH v3 01/15] MIPS: configs: lb60: Fix defconfig not selecting correct board Paul Cercueil
2020-09-06 19:29 ` [PATCH v3 02/15] MIPS: cpu-probe: Set Ingenic's writecombine to _CACHE_CACHABLE_WA Paul Cercueil
2020-09-06 19:29 ` [PATCH v3 03/15] MIPS: cpu-probe: Mark XBurst CPU as having vtagged caches Paul Cercueil
2020-09-06 19:29 ` Paul Cercueil [this message]
2020-09-06 19:29 ` [PATCH v3 05/15] MIPS: Kconfig: add MIPS_GENERIC_KERNEL symbol Paul Cercueil
2020-09-06 19:29 ` [PATCH v3 06/15] MIPS: generic: Allow boards to set system type Paul Cercueil
2020-09-08 16:27   ` Philippe Mathieu-Daudé
2020-09-06 19:29 ` [PATCH v3 07/15] MIPS: generic: Init command line with fw_init_cmdline() Paul Cercueil
2020-09-06 19:29 ` [PATCH v3 08/15] MIPS: generic: Support booting with built-in or appended DTB Paul Cercueil
2020-09-07  7:54   ` Sergei Shtylyov
2020-09-07 12:39     ` Paul Cercueil
2020-09-06 19:29 ` [PATCH v3 09/15] MIPS: generic: Add support for zboot Paul Cercueil
2020-09-06 19:29 ` [PATCH v3 10/15] MIPS: generic: Increase NR_IRQS to 256 Paul Cercueil
2020-09-07 19:53   ` Thomas Bogendoerfer
2020-09-06 19:29 ` [PATCH v3 11/15] MIPS: generic: Add support for Ingenic SoCs Paul Cercueil
2020-10-12 14:33   ` Guenter Roeck
2020-10-12 14:59     ` Paul Cercueil
2020-10-12 18:26       ` Guenter Roeck
2020-10-12 19:27     ` [PATCH] MIPS: ingenic: Remove CPU_SUPPORTS_HUGEPAGES Paul Cercueil
2020-10-13  9:31       ` Thomas Bogendoerfer
2020-09-06 19:29 ` [PATCH v3 12/15] MIPS: jz4740: Drop all obsolete files Paul Cercueil
2020-09-06 19:29 ` [PATCH v3 13/15] MIPS: jz4740: Rename jz4740 folders to ingenic Paul Cercueil
2020-09-06 19:29 ` [PATCH v3 14/15] MIPS: configs: Regenerate configs of Ingenic boards Paul Cercueil
2020-09-06 19:29 ` [PATCH v3 15/15] MAINTAINERS: Update paths to Ingenic platform code Paul Cercueil
2020-09-18 14:40 ` [PATCH v3 00/15] MIPS: Convert Ingenic to a generic board v3 Thomas Bogendoerfer

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=20200906192935.107086-5-paul@crapouillou.net \
    --to=paul@crapouillou.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mips@vger.kernel.org \
    --cc=macro@linux-mips.org \
    --cc=od@zcrc.me \
    --cc=paulburton@kernel.org \
    --cc=tsbogend@alpha.franken.de \
    --cc=zhouyanjie@wanyeetech.com \
    /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 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).