| Message ID | 20250502185652.67370-5-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | hw/i386/pc: Remove deprecated 2.6 and 2.7 PC machines | expand |
On Fri, May 02, 2025 at 08:56:36PM +0200, Philippe Mathieu-Daudé wrote: > Date: Fri, 2 May 2025 20:56:36 +0200 > From: Philippe Mathieu-Daudé <philmd@linaro.org> > Subject: [PATCH v3 04/19] hw/nvram/fw_cfg: Factor > fw_cfg_init_mem_internal() out > X-Mailer: git-send-email 2.47.1 > > 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@linaro.org> > --- > hw/nvram/fw_cfg.c | 20 ++++++++++++++------ > 1 file changed, 14 insertions(+), 6 deletions(-) > > diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c > index 54cfa07d3f5..d119c10d308 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,11 +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) How about mentioning DMA in the name? fw_cfg_init_mem_dma. > +{ > + assert(dma_iobase && dma_as); > + fw_cfg_init_mem_internal(ctl_addr, data_addr, data_addr, dma_addr, dma_as); > +} > + > FWCfgState *fw_cfg_init_mem(hwaddr ctl_addr, hwaddr data_addr) OK, now I'm sure fw_cfg_init_mem() only accepts 2 arguments. :-) > { > - return fw_cfg_init_mem_wide(ctl_addr, data_addr, > - fw_cfg_data_mem_ops.valid.max_access_size, > - 0, NULL); > + return fw_cfg_init_mem_internal(ctl_addr, data_addr, > + fw_cfg_data_mem_ops.valid.max_access_size, > + 0, NULL); > } > > > -- > 2.47.1 >
diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 54cfa07d3f5..d119c10d308 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,11 +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_iobase && dma_as); + fw_cfg_init_mem_internal(ctl_addr, data_addr, data_addr, dma_addr, dma_as); +} + FWCfgState *fw_cfg_init_mem(hwaddr ctl_addr, hwaddr data_addr) { - return fw_cfg_init_mem_wide(ctl_addr, data_addr, - fw_cfg_data_mem_ops.valid.max_access_size, - 0, NULL); + return fw_cfg_init_mem_internal(ctl_addr, data_addr, + fw_cfg_data_mem_ops.valid.max_access_size, + 0, NULL); }
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@linaro.org> --- hw/nvram/fw_cfg.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)