From: "Maciej W. Rozycki" <macro@orcam.me.uk>
To: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
Cc: linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org,
liwei391@huawei.com, nbd@nbd.name,
Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
yangtiezhu@loongson.cn
Subject: Re: [PATCH v2] MIPS: add support for buggy MT7621S core detection
Date: Wed, 7 Apr 2021 15:52:38 +0200 (CEST) [thread overview]
Message-ID: <alpine.DEB.2.21.2104071549560.65251@angie.orcam.me.uk> (raw)
In-Reply-To: <20210406042334.1318117-1-ilya.lipnitskiy@gmail.com>
On Mon, 5 Apr 2021, Ilya Lipnitskiy wrote:
> diff --git a/arch/mips/include/asm/mips-cps.h b/arch/mips/include/asm/mips-cps.h
> index fd43d876892e..9f495ffef2b7 100644
> --- a/arch/mips/include/asm/mips-cps.h
> +++ b/arch/mips/include/asm/mips-cps.h
> @@ -165,11 +167,29 @@ static inline uint64_t mips_cps_cluster_config(unsigned int cluster)
> */
> static inline unsigned int mips_cps_numcores(unsigned int cluster)
> {
> + struct cpulaunch *launch;
> + unsigned int ncores;
> +
> if (!mips_cm_present())
> return 0;
>
> /* Add one before masking to handle 0xff indicating no cores */
> - return (mips_cps_cluster_config(cluster) + 1) & CM_GCR_CONFIG_PCORES;
> + ncores = (mips_cps_cluster_config(cluster) + 1) & CM_GCR_CONFIG_PCORES;
> +
> + if (IS_ENABLED(CONFIG_SOC_MT7621)) {
> + /*
> + * Ralink MT7621S SoC is single core, but the GCR_CONFIG method
> + * always reports 2 cores. Check the second core's LAUNCH_FREADY
> + * flag to detect if the second core is missing. This method
> + * only works before the core has been started.
> + */
> + launch = (struct cpulaunch *)CKSEG0ADDR(CPULAUNCH);
> + launch += 2; /* MT7621 has 2 VPEs per core */
> + if (!(launch->flags & LAUNCH_FREADY))
> + ncores = 1;
> + }
> +
> + return ncores;
> }
>
> /**
Much better to me, but please move the declaration of `launch' into the
conditional block, which is the only place that uses it.
Maciej
next prev parent reply other threads:[~2021-04-07 13:52 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-03 6:19 [PATCH] MIPS: add support for buggy MT7621S core detection Ilya Lipnitskiy
2021-04-06 1:22 ` Maciej W. Rozycki
2021-04-06 1:54 ` Ilya Lipnitskiy
2021-04-07 13:49 ` Maciej W. Rozycki
2021-04-07 18:49 ` Ilya Lipnitskiy
2021-06-25 10:54 ` Strontium
2021-04-06 4:23 ` [PATCH v2] " Ilya Lipnitskiy
2021-04-07 13:52 ` Maciej W. Rozycki [this message]
2021-04-07 20:07 ` [PATCH v3] " Ilya Lipnitskiy
2021-04-12 15:03 ` 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=alpine.DEB.2.21.2104071549560.65251@angie.orcam.me.uk \
--to=macro@orcam.me.uk \
--cc=ilya.lipnitskiy@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=liwei391@huawei.com \
--cc=nbd@nbd.name \
--cc=tsbogend@alpha.franken.de \
--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 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 read-only IMAP folder(s) and NNTP newsgroup(s).