qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Cédric Le Goater" <clg@kaod.org>
To: qemu-arm@nongnu.org, qemu-devel@nongnu.org
Cc: "Andrew Jeffery" <andrew@aj.id.au>,
	"Peter Maydell" <peter.maydell@linaro.org>,
	"Alistair Francis" <alistair@alistair23.me>,
	"Joel Stanley" <joel@jms.id.au>,
	"Cédric Le Goater" <clg@kaod.org>
Subject: [PATCH 1/6] aspeed/smc: Use max number of CE instead of 'num_cs'
Date: Mon,  7 Mar 2022 08:18:51 +0100	[thread overview]
Message-ID: <20220307071856.1410731-2-clg@kaod.org> (raw)
In-Reply-To: <20220307071856.1410731-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.

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



  reply	other threads:[~2022-03-07  7:44 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-07  7:18 [PATCH 0/6] aspeed/smc: 'num_cs' cleanup Cédric Le Goater
2022-03-07  7:18 ` Cédric Le Goater [this message]
2022-03-07 10:19   ` [PATCH 1/6] aspeed/smc: Use max number of CE instead of 'num_cs' Philippe Mathieu-Daudé
2022-03-07 11:03   ` Alistair Francis
2022-03-07  7:18 ` [PATCH 2/6] aspeed: Rework aspeed_board_init_flashes() interface Cédric Le Goater
2022-03-07 10:21   ` Philippe Mathieu-Daudé
2022-03-07 20:51   ` Alistair Francis
2022-03-07  7:18 ` [PATCH 3/6] aspeed/smc: Remove 'num_cs' field Cédric Le Goater
2022-03-07 10:22   ` Philippe Mathieu-Daudé
2022-03-07 11:05   ` Alistair Francis
2022-03-07  7:18 ` [PATCH 4/6] aspeed/smc: Rename 'max_peripherals' to 'max_cs' Cédric Le Goater
2022-03-07 10:21   ` Philippe Mathieu-Daudé
2022-03-07 11:07   ` Alistair Francis
2022-03-07  7:18 ` [PATCH 5/6] aspeed/smc: Let the SSI core layer define the bus name Cédric Le Goater
2022-03-07 10:25   ` Philippe Mathieu-Daudé
2022-03-07 10:36     ` Cédric Le Goater
2022-03-08  6:41   ` Alistair Francis
2022-03-07  7:18 ` [PATCH 6/6] aspeed/smc: Fix error log Cédric Le Goater
2022-03-07 10:23   ` Philippe Mathieu-Daudé
2022-03-07 11:01   ` 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=20220307071856.1410731-2-clg@kaod.org \
    --to=clg@kaod.org \
    --cc=alistair@alistair23.me \
    --cc=andrew@aj.id.au \
    --cc=joel@jms.id.au \
    --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 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).