Re: [PATCH 2/2] hw/ppc/ppc440_uc: Remove dead l2sram_update_mappings()

[BALATON Zoltan]

On Wed, 11 Oct 2023, Philippe Mathieu-Daudé wrote:
> Apparently l2sram_update_mappings() bit-rotted over time,
> when defining MAP_L2SRAM we get:
>
>  hw/ppc/ppc440_uc.c:83:17: error: no member named 'isarc' in 'struct 
> ppc4xx_l2sram_t'
>      if (l2sram->isarc != isarc ||
>          ~~~~~~  ^
>  hw/ppc/ppc440_uc.c:84:18: error: no member named 'isacntl' in 'struct 
> ppc4xx_l2sram_t'
>          (l2sram->isacntl & 0x80000000) != (isacntl & 0x80000000)) {
>           ~~~~~~  ^
>  hw/ppc/ppc440_uc.c:85:21: error: no member named 'isacntl' in 'struct 
> ppc4xx_l2sram_t'
>          if (l2sram->isacntl & 0x80000000) {
>              ~~~~~~  ^
>  hw/ppc/ppc440_uc.c:88:50: error: no member named 'isarc_ram' in 'struct 
> ppc4xx_l2sram_t'
>                                          &l2sram->isarc_ram);
>                                           ~~~~~~  ^
>  hw/ppc/ppc440_uc.c:93:50: error: no member named 'isarc_ram' in 'struct 
> ppc4xx_l2sram_t'
>                                          &l2sram->isarc_ram);
>                                           ~~~~~~  ^
>  hw/ppc/ppc440_uc.c:96:17: error: no member named 'dsarc' in 'struct 
> ppc4xx_l2sram_t'
>      if (l2sram->dsarc != dsarc ||
>          ~~~~~~  ^
>  hw/ppc/ppc440_uc.c:97:18: error: no member named 'dsacntl' in 'struct 
> ppc4xx_l2sram_t'
>          (l2sram->dsacntl & 0x80000000) != (dsacntl & 0x80000000)) {
>           ~~~~~~  ^
>  hw/ppc/ppc440_uc.c:98:21: error: no member named 'dsacntl' in 'struct 
> ppc4xx_l2sram_t'
>          if (l2sram->dsacntl & 0x80000000) {
>              ~~~~~~  ^
>  hw/ppc/ppc440_uc.c:100:52: error: no member named 'dsarc' in 'struct 
> ppc4xx_l2sram_t'
>              if (!(isacntl & 0x80000000) || l2sram->dsarc != isarc) {
>                                             ~~~~~~  ^
>  hw/ppc/ppc440_uc.c:103:54: error: no member named 'dsarc_ram' in 'struct 
> ppc4xx_l2sram_t'
>                                              &l2sram->dsarc_ram);
>                                               ~~~~~~  ^
>  hw/ppc/ppc440_uc.c:111:54: error: no member named 'dsarc_ram' in 'struct 
> ppc4xx_l2sram_t'
>                                              &l2sram->dsarc_ram);
>                                               ~~~~~~  ^
>
> Remove that dead code.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
> hw/ppc/ppc440_uc.c | 40 ----------------------------------------
> 1 file changed, 40 deletions(-)
>
> diff --git a/hw/ppc/ppc440_uc.c b/hw/ppc/ppc440_uc.c
> index 4181c843a8..643a79e330 100644
> --- a/hw/ppc/ppc440_uc.c
> +++ b/hw/ppc/ppc440_uc.c
> @@ -73,46 +73,6 @@ typedef struct ppc4xx_l2sram_t {
>     uint32_t isram0[11];
> } ppc4xx_l2sram_t;
>
> -#ifdef MAP_L2SRAM
> -static void l2sram_update_mappings(ppc4xx_l2sram_t *l2sram,
> -                                   uint32_t isarc, uint32_t isacntl,
> -                                   uint32_t dsarc, uint32_t dsacntl)

If you remove this then nobody will remember this could be modelled or may 
be fixed so maybe leave it as a reminder for now.

Regards,
BALATON Zoltan

> -{
> -    if (l2sram->isarc != isarc ||
> -        (l2sram->isacntl & 0x80000000) != (isacntl & 0x80000000)) {
> -        if (l2sram->isacntl & 0x80000000) {
> -            /* Unmap previously assigned memory region */
> -            memory_region_del_subregion(get_system_memory(),
> -                                        &l2sram->isarc_ram);
> -        }
> -        if (isacntl & 0x80000000) {
> -            /* Map new instruction memory region */
> -            memory_region_add_subregion(get_system_memory(), isarc,
> -                                        &l2sram->isarc_ram);
> -        }
> -    }
> -    if (l2sram->dsarc != dsarc ||
> -        (l2sram->dsacntl & 0x80000000) != (dsacntl & 0x80000000)) {
> -        if (l2sram->dsacntl & 0x80000000) {
> -            /* Beware not to unmap the region we just mapped */
> -            if (!(isacntl & 0x80000000) || l2sram->dsarc != isarc) {
> -                /* Unmap previously assigned memory region */
> -                memory_region_del_subregion(get_system_memory(),
> -                                            &l2sram->dsarc_ram);
> -            }
> -        }
> -        if (dsacntl & 0x80000000) {
> -            /* Beware not to remap the region we just mapped */
> -            if (!(isacntl & 0x80000000) || dsarc != isarc) {
> -                /* Map new data memory region */
> -                memory_region_add_subregion(get_system_memory(), dsarc,
> -                                            &l2sram->dsarc_ram);
> -            }
> -        }
> -    }
> -}
> -#endif
> -
> static uint32_t dcr_read_l2sram(void *opaque, int dcrn)
> {
>     ppc4xx_l2sram_t *l2sram = opaque;