All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Cédric Le Goater" <clg@kaod.org>
To: qemu-arm@nongnu.org, qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
	"Alistair Francis" <alistair.francis@wdc.com>,
	"Cédric Le Goater" <clg@kaod.org>,
	"Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: [PULL 02/11] aspeed/smc: Use max number of CE instead of 'num_cs'
Date: Tue,  8 Mar 2022 13:21:40 +0100	[thread overview]
Message-ID: <20220308122149.1602798-3-clg@kaod.org> (raw)
In-Reply-To: <20220308122149.1602798-1-clg@kaod.org>

The Aspeed SMC model uses the 'num_cs' field to allocate resources
fitting the number of devices of the machine. This is a small
optimization without real need in the controller. Simplify modelling
and use the max_peripherals field instead.

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-Id: <20220307071856.1410731-2-clg@kaod.org>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
 hw/ssi/aspeed_smc.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c
index d899be17fd71..a5d8bb717fc7 100644
--- a/hw/ssi/aspeed_smc.c
+++ b/hw/ssi/aspeed_smc.c
@@ -693,7 +693,7 @@ static void aspeed_smc_reset(DeviceState *d)
     }
 
     /* Unselect all peripherals */
-    for (i = 0; i < s->num_cs; ++i) {
+    for (i = 0; i < asc->max_peripherals; ++i) {
         s->regs[s->r_ctrl0 + i] |= CTRL_CE_STOP_ACTIVE;
         qemu_set_irq(s->cs_lines[i], true);
     }
@@ -1042,7 +1042,7 @@ static void aspeed_smc_write(void *opaque, hwaddr addr, uint64_t data,
          addr < s->r_timings + asc->nregs_timings) ||
         addr == s->r_ce_ctrl) {
         s->regs[addr] = value;
-    } else if (addr >= s->r_ctrl0 && addr < s->r_ctrl0 + s->num_cs) {
+    } else if (addr >= s->r_ctrl0 && addr < s->r_ctrl0 + asc->max_peripherals) {
         int cs = addr - s->r_ctrl0;
         aspeed_smc_flash_update_ctrl(&s->flashes[cs], value);
     } else if (addr >= R_SEG_ADDR0 &&
@@ -1139,9 +1139,9 @@ static void aspeed_smc_realize(DeviceState *dev, Error **errp)
     s->spi = ssi_create_bus(dev, "spi");
 
     /* Setup cs_lines for peripherals */
-    s->cs_lines = g_new0(qemu_irq, s->num_cs);
+    s->cs_lines = g_new0(qemu_irq, asc->max_peripherals);
 
-    for (i = 0; i < s->num_cs; ++i) {
+    for (i = 0; i < asc->max_peripherals; ++i) {
         sysbus_init_irq(sbd, &s->cs_lines[i]);
     }
 
-- 
2.34.1



  parent reply	other threads:[~2022-03-08 12:23 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-08 12:21 [PULL 00/11] aspeed queue Cédric Le Goater
2022-03-08 12:21 ` [PULL 01/11] aspeed: Fix a potential memory leak bug in write_boot_rom() Cédric Le Goater
2022-03-08 12:21 ` Cédric Le Goater [this message]
2022-03-08 12:21 ` [PULL 03/11] aspeed: Rework aspeed_board_init_flashes() interface Cédric Le Goater
2022-03-08 12:21 ` [PULL 04/11] aspeed/smc: Remove 'num_cs' field Cédric Le Goater
2022-03-08 12:21 ` [PULL 05/11] aspeed/smc: Rename 'max_peripherals' to 'cs_num_max' Cédric Le Goater
2022-03-08 12:21 ` [PULL 06/11] aspeed/smc: Let the SSI core layer define the bus name Cédric Le Goater
2022-03-08 12:21 ` [PULL 07/11] aspeed/smc: Fix error log Cédric Le Goater
2022-03-08 12:21 ` [PULL 08/11] hw/block: m25p80: Add support for w25q01jvq Cédric Le Goater
2022-03-08 12:21 ` [PULL 09/11] hw/arm/aspeed: allow missing spi_model Cédric Le Goater
2022-03-08 12:21 ` [PULL 10/11] hw/arm/aspeed: add Bletchley machine type Cédric Le Goater
2022-03-08 12:21 ` [PULL 11/11] hw: aspeed_gpio: Cleanup stray semicolon after switch Cédric Le Goater
2022-03-09 19:56 ` [PULL 00/11] aspeed queue Peter Maydell

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=20220308122149.1602798-3-clg@kaod.org \
    --to=clg@kaod.org \
    --cc=alistair.francis@wdc.com \
    --cc=f4bug@amsat.org \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@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 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.