From: Olof Johansson <email@example.com>
To: Paul Walmsley <firstname.lastname@example.org>
Cc: Damien Le Moal <email@example.com>,
Albert Ou <firstname.lastname@example.org>,
Jason Cooper <email@example.com>,
Marc Zyngier <firstname.lastname@example.org>,
Daniel Lezcano <email@example.com>,
Linux Kernel Mailing List <firstname.lastname@example.org>,
Christoph Hellwig <email@example.com>,
Palmer Dabbelt <firstname.lastname@example.org>,
Thomas Gleixner <email@example.com>,
Subject: Re: [PATCH] riscv: change CSR M/S defines to use "X" for prefix
Date: Fri, 3 Jan 2020 19:05:04 -0800 [thread overview]
Message-ID: <CAOesGMir810kVTDyoTFuhK-PdFe4J2u2VM+L8jOdO8DghAELQg@mail.gmail.com> (raw)
On Fri, Jan 3, 2020 at 5:28 PM Paul Walmsley <firstname.lastname@example.org> wrote:
> On Wed, 18 Dec 2019, Olof Johansson wrote:
> > Commit a4c3733d32a7 ("riscv: abstract out CSR names for supervisor vs
> > machine mode") introduced new non-S/M-specific defines for some of the
> > CSRs and fields that differ for when you run the kernel in machine or
> > supervisor mode.
> > One of those was "IRQ_TIMER" (instead of IRQ_S_TIMER/IRQ_M_MTIMER),
> > which was generic enough to cause conflicts with other defines in
> > drivers. Since it was in csr.h, it ended up getting pulled in through
> > fairly generic include files, etc.
> > I looked at just renaming those, but for consistency I chose to rename all
> > M/S symbols to using 'X' instead of 'S'/'M' in the identifiers instead,
> > which gives them all less generic names.
> > This is pretty churny, and I'm sure there'll be opinions on naming, but
> > I figured I'd do the busywork of fixing it up instead of just pointing
> > out the conflicts.
> > Fixes: a4c3733d32a7 ("riscv: abstract out CSR names for supervisor vs machine mode")
> > Cc: Christoph Hellwig <email@example.com>
> > Cc: Thomas Gleixner <firstname.lastname@example.org>
> > Signed-off-by: Olof Johansson <email@example.com>
> Thanks for taking a stab at fixing the issue. I queued the following
> minimal fix has been queued for v5.5-rc, adding an RV_ prefix to the IRQ_*
> macros. It may be that we need to do the same thing to the rest of the
> CSRs. But, based on a quick look, I think we should be OK for the moment.
> Let us know if you have a different point of view.
Sure, this does the job. I'd personally prefer consistent prefixes but
that's just bikeshed color preferences -- this is fine.
Acked-by: Olof Johansson <firstname.lastname@example.org>
(Builds are still failing for some configs, but will be fixed if/when
you pick up https://email@example.com/)
next prev parent reply other threads:[~2020-01-04 3:05 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-18 17:06 [PATCH] riscv: change CSR M/S defines to use "X" for prefix Olof Johansson
2019-12-18 18:35 ` Paul Walmsley
2020-01-04 1:28 ` Paul Walmsley
2020-01-04 3:05 ` Olof Johansson [this message]
2020-01-07 11:15 ` Paul Walmsley
2020-01-23 0:22 ` Palmer Dabbelt
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:
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
* 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).