From: Alistair Francis <alistair23@gmail.com>
To: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
Cc: "Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Bin Meng" <bin.meng@windriver.com>,
"open list:RISC-V" <qemu-riscv@nongnu.org>,
"qemu-devel@nongnu.org Developers" <qemu-devel@nongnu.org>,
"Paolo Bonzini" <pbonzini@redhat.com>
Subject: Re: [PATCH v2 1/3] hw/char/mchp_pfsoc_mmuart: Simplify MCHP_PFSOC_MMUART_REG definition
Date: Wed, 29 Sep 2021 08:16:51 +1000 [thread overview]
Message-ID: <CAKmqyKN_FvSf72uWRffe2H3hJvQmFtzqzJu1GzP3D=rCn89+UQ@mail.gmail.com> (raw)
In-Reply-To: <20210925133407.1259392-2-f4bug@amsat.org>
On Sat, Sep 25, 2021 at 11:34 PM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>
> The current MCHP_PFSOC_MMUART_REG_SIZE definition represent the
> size occupied by all the registers. However all registers are
> 32-bit wide, and the MemoryRegionOps handlers are restricted to
> 32-bit:
>
> static const MemoryRegionOps mchp_pfsoc_mmuart_ops = {
> .read = mchp_pfsoc_mmuart_read,
> .write = mchp_pfsoc_mmuart_write,
> .impl = {
> .min_access_size = 4,
> .max_access_size = 4,
> },
>
> Avoid being triskaidekaphobic, simplify by using the number of
> registers.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> include/hw/char/mchp_pfsoc_mmuart.h | 4 ++--
> hw/char/mchp_pfsoc_mmuart.c | 14 ++++++++------
> 2 files changed, 10 insertions(+), 8 deletions(-)
>
> diff --git a/include/hw/char/mchp_pfsoc_mmuart.h b/include/hw/char/mchp_pfsoc_mmuart.h
> index f61990215f0..9c012e6c977 100644
> --- a/include/hw/char/mchp_pfsoc_mmuart.h
> +++ b/include/hw/char/mchp_pfsoc_mmuart.h
> @@ -30,7 +30,7 @@
>
> #include "hw/char/serial.h"
>
> -#define MCHP_PFSOC_MMUART_REG_SIZE 52
> +#define MCHP_PFSOC_MMUART_REG_COUNT 13
>
> typedef struct MchpPfSoCMMUartState {
> MemoryRegion iomem;
> @@ -39,7 +39,7 @@ typedef struct MchpPfSoCMMUartState {
>
> SerialMM *serial;
>
> - uint32_t reg[MCHP_PFSOC_MMUART_REG_SIZE / sizeof(uint32_t)];
> + uint32_t reg[MCHP_PFSOC_MMUART_REG_COUNT];
> } MchpPfSoCMMUartState;
>
> /**
> diff --git a/hw/char/mchp_pfsoc_mmuart.c b/hw/char/mchp_pfsoc_mmuart.c
> index 2facf85c2d8..584e7fec17c 100644
> --- a/hw/char/mchp_pfsoc_mmuart.c
> +++ b/hw/char/mchp_pfsoc_mmuart.c
> @@ -29,13 +29,14 @@ static uint64_t mchp_pfsoc_mmuart_read(void *opaque, hwaddr addr, unsigned size)
> {
> MchpPfSoCMMUartState *s = opaque;
>
> - if (addr >= MCHP_PFSOC_MMUART_REG_SIZE) {
> + addr >>= 2;
> + if (addr >= MCHP_PFSOC_MMUART_REG_COUNT) {
> qemu_log_mask(LOG_GUEST_ERROR, "%s: read: addr=0x%" HWADDR_PRIx "\n",
> - __func__, addr);
> + __func__, addr << 2);
> return 0;
> }
>
> - return s->reg[addr / sizeof(uint32_t)];
> + return s->reg[addr];
> }
>
> static void mchp_pfsoc_mmuart_write(void *opaque, hwaddr addr,
> @@ -44,13 +45,14 @@ static void mchp_pfsoc_mmuart_write(void *opaque, hwaddr addr,
> MchpPfSoCMMUartState *s = opaque;
> uint32_t val32 = (uint32_t)value;
>
> - if (addr >= MCHP_PFSOC_MMUART_REG_SIZE) {
> + addr >>= 2;
> + if (addr >= MCHP_PFSOC_MMUART_REG_COUNT) {
> qemu_log_mask(LOG_GUEST_ERROR, "%s: bad write: addr=0x%" HWADDR_PRIx
> - " v=0x%x\n", __func__, addr, val32);
> + " v=0x%x\n", __func__, addr << 2, val32);
> return;
> }
>
> - s->reg[addr / sizeof(uint32_t)] = val32;
> + s->reg[addr] = val32;
> }
>
> static const MemoryRegionOps mchp_pfsoc_mmuart_ops = {
> --
> 2.31.1
>
next prev parent reply other threads:[~2021-09-28 22:19 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-25 13:34 [PATCH v2 0/3] hw/char/mchp_pfsoc_mmuart: QOM'ify PolarFire MMUART Philippe Mathieu-Daudé
2021-09-25 13:34 ` [PATCH v2 1/3] hw/char/mchp_pfsoc_mmuart: Simplify MCHP_PFSOC_MMUART_REG definition Philippe Mathieu-Daudé
2021-09-26 8:31 ` Bin Meng
2021-09-26 8:38 ` Bin Meng
2021-09-28 22:19 ` Alistair Francis
2021-09-28 22:16 ` Alistair Francis [this message]
2021-09-28 22:42 ` Alistair Francis
2021-09-25 13:34 ` [PATCH v2 2/3] hw/char/mchp_pfsoc_mmuart: Use a MemoryRegion container Philippe Mathieu-Daudé
2021-09-26 8:31 ` Bin Meng
2021-09-28 22:12 ` Alistair Francis
2021-09-25 13:34 ` [PATCH v2 3/3] hw/char/mchp_pfsoc_mmuart: QOM'ify PolarFire MMUART Philippe Mathieu-Daudé
2021-09-26 8:31 ` Bin Meng
2021-09-28 22:15 ` Alistair Francis
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='CAKmqyKN_FvSf72uWRffe2H3hJvQmFtzqzJu1GzP3D=rCn89+UQ@mail.gmail.com' \
--to=alistair23@gmail.com \
--cc=bin.meng@windriver.com \
--cc=f4bug@amsat.org \
--cc=marcandre.lureau@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-riscv@nongnu.org \
/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).