Re: [PATCH 3/6] aspeed/smc: Remove 'num_cs' field

[Alistair Francis]

On Mon, Mar 7, 2022 at 5:19 PM Cédric Le Goater <clg@kaod.org> wrote:
>
> It is not used anymore.
>
> Signed-off-by: Cédric Le Goater <clg@kaod.org>

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

Alistair

> ---
>  include/hw/ssi/aspeed_smc.h | 1 -
>  hw/arm/aspeed.c             | 2 --
>  hw/arm/aspeed_ast2600.c     | 2 --
>  hw/arm/aspeed_soc.c         | 2 --
>  hw/ssi/aspeed_smc.c         | 7 -------
>  5 files changed, 14 deletions(-)
>
> diff --git a/include/hw/ssi/aspeed_smc.h b/include/hw/ssi/aspeed_smc.h
> index cad73ddc13f2..4a9354e13c7f 100644
> --- a/include/hw/ssi/aspeed_smc.h
> +++ b/include/hw/ssi/aspeed_smc.h
> @@ -57,7 +57,6 @@ struct AspeedSMCState {
>
>      qemu_irq irq;
>
> -    uint32_t num_cs;
>      qemu_irq *cs_lines;
>      bool inject_failure;
>
> diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
> index be24508a9854..8f14738676f6 100644
> --- a/hw/arm/aspeed.c
> +++ b/hw/arm/aspeed.c
> @@ -352,8 +352,6 @@ static void aspeed_machine_init(MachineState *machine)
>                              &error_abort);
>      object_property_set_int(OBJECT(&bmc->soc), "hw-strap2", amc->hw_strap2,
>                              &error_abort);
> -    object_property_set_int(OBJECT(&bmc->soc), "num-cs", amc->num_cs,
> -                            &error_abort);
>      object_property_set_link(OBJECT(&bmc->soc), "dram",
>                               OBJECT(machine->ram), &error_abort);
>      if (machine->kernel_filename) {
> diff --git a/hw/arm/aspeed_ast2600.c b/hw/arm/aspeed_ast2600.c
> index 21cd3342c578..c1e15e37739c 100644
> --- a/hw/arm/aspeed_ast2600.c
> +++ b/hw/arm/aspeed_ast2600.c
> @@ -163,7 +163,6 @@ static void aspeed_soc_ast2600_init(Object *obj)
>
>      snprintf(typename, sizeof(typename), "aspeed.fmc-%s", socname);
>      object_initialize_child(obj, "fmc", &s->fmc, typename);
> -    object_property_add_alias(obj, "num-cs", OBJECT(&s->fmc), "num-cs");
>
>      for (i = 0; i < sc->spis_num; i++) {
>          snprintf(typename, sizeof(typename), "aspeed.spi%d-%s", i + 1, 
> socname);
> @@ -383,7 +382,6 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev, 
> Error **errp)
>      for (i = 0; i < sc->spis_num; i++) {
>          object_property_set_link(OBJECT(&s->spi[i]), "dram",
>                                   OBJECT(s->dram_mr), &error_abort);
> -        object_property_set_int(OBJECT(&s->spi[i]), "num-cs", 1, 
> &error_abort);
>          if (!sysbus_realize(SYS_BUS_DEVICE(&s->spi[i]), errp)) {
>              return;
>          }
> diff --git a/hw/arm/aspeed_soc.c b/hw/arm/aspeed_soc.c
> index 7d53cf2f5133..58714cb2a01d 100644
> --- a/hw/arm/aspeed_soc.c
> +++ b/hw/arm/aspeed_soc.c
> @@ -170,7 +170,6 @@ static void aspeed_soc_init(Object *obj)
>
>      snprintf(typename, sizeof(typename), "aspeed.fmc-%s", socname);
>      object_initialize_child(obj, "fmc", &s->fmc, typename);
> -    object_property_add_alias(obj, "num-cs", OBJECT(&s->fmc), "num-cs");
>
>      for (i = 0; i < sc->spis_num; i++) {
>          snprintf(typename, sizeof(typename), "aspeed.spi%d-%s", i + 1, 
> socname);
> @@ -327,7 +326,6 @@ static void aspeed_soc_realize(DeviceState *dev, Error 
> **errp)
>
>      /* SPI */
>      for (i = 0; i < sc->spis_num; i++) {
> -        object_property_set_int(OBJECT(&s->spi[i]), "num-cs", 1, 
> &error_abort);
>          if (!sysbus_realize(SYS_BUS_DEVICE(&s->spi[i]), errp)) {
>              return;
>          }
> diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c
> index a5d8bb717fc7..6859f061c8be 100644
> --- a/hw/ssi/aspeed_smc.c
> +++ b/hw/ssi/aspeed_smc.c
> @@ -1127,12 +1127,6 @@ static void aspeed_smc_realize(DeviceState *dev, Error 
> **errp)
>      s->r_timings = asc->r_timings;
>      s->conf_enable_w0 = asc->conf_enable_w0;
>
> -    /* Enforce some real HW limits */
> -    if (s->num_cs > asc->max_peripherals) {
> -        aspeed_smc_error("num_cs cannot exceed: %d", asc->max_peripherals);
> -        s->num_cs = asc->max_peripherals;
> -    }
> -
>      /* DMA irq. Keep it first for the initialization in the SoC */
>      sysbus_init_irq(sbd, &s->irq);
>
> @@ -1211,7 +1205,6 @@ static const VMStateDescription vmstate_aspeed_smc = {
>  };
>
>  static Property aspeed_smc_properties[] = {
> -    DEFINE_PROP_UINT32("num-cs", AspeedSMCState, num_cs, 1),
>      DEFINE_PROP_BOOL("inject-failure", AspeedSMCState, inject_failure, 
> false),
>      DEFINE_PROP_LINK("dram", AspeedSMCState, dram_mr,
>                       TYPE_MEMORY_REGION, MemoryRegion *),
> --
> 2.34.1
>
>