On Thu, 8 May 2025 15:35:28 +0200
Philippe Mathieu-Daudé <philmd@xxxxxxxxxx> wrote:
> Factor fw_cfg_init_mem_internal() out of fw_cfg_init_mem_wide().
> In fw_cfg_init_mem_wide(), assert DMA arguments are provided.
> Callers without DMA have to use the fw_cfg_init_mem() helper.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@xxxxxxxxxx>
Reviewed-by: Igor Mammedov <imammedo@xxxxxxxxxx>
> ---
> hw/nvram/fw_cfg.c | 17 +++++++++++++----
> 1 file changed, 13 insertions(+), 4 deletions(-)
>
> diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
> index 10f8f8db86f..4067324fb09 100644
> --- a/hw/nvram/fw_cfg.c
> +++ b/hw/nvram/fw_cfg.c
> @@ -1053,9 +1053,9 @@ FWCfgState *fw_cfg_init_io_dma(uint32_t iobase, uint32_t dma_iobase,
> return s;
> }
>
> -FWCfgState *fw_cfg_init_mem_wide(hwaddr ctl_addr,
> - hwaddr data_addr, uint32_t data_width,
> - hwaddr dma_addr, AddressSpace *dma_as)
> +static FWCfgState *fw_cfg_init_mem_internal(hwaddr ctl_addr,
> + hwaddr data_addr, uint32_t data_width,
> + hwaddr dma_addr, AddressSpace *dma_as)
> {
> DeviceState *dev;
> SysBusDevice *sbd;
> @@ -1087,10 +1087,19 @@ FWCfgState *fw_cfg_init_mem_wide(hwaddr ctl_addr,
> return s;
> }
>
> +FWCfgState *fw_cfg_init_mem_wide(hwaddr ctl_addr,
> + hwaddr data_addr, uint32_t data_width,
> + hwaddr dma_addr, AddressSpace *dma_as)
> +{
> + assert(dma_addr && dma_as);
> + return fw_cfg_init_mem_internal(ctl_addr, data_addr, data_addr,
> + dma_addr, dma_as);
> +}
> +
> FWCfgState *fw_cfg_init_mem_nodma(hwaddr ctl_addr, hwaddr data_addr,
> unsigned data_width)
> {
> - return fw_cfg_init_mem_wide(ctl_addr, data_addr, data_width, 0, NULL);
> + return fw_cfg_init_mem_internal(ctl_addr, data_addr, data_width, 0, NULL);
> }
>
>
