| Message ID | 20250508133550.81391-4-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | hw/i386/pc: Remove deprecated 2.6 and 2.7 PC machines | expand |
On Thu, May 08, 2025 at 03:35:26PM +0200, Philippe Mathieu-Daudé wrote: > Date: Thu, 8 May 2025 15:35:26 +0200 > From: Philippe Mathieu-Daudé <philmd@linaro.org> > Subject: [PATCH v4 03/27] hw/nvram/fw_cfg: Rename fw_cfg_init_mem() with > '_nodma' suffix > X-Mailer: git-send-email 2.47.1 > > Rename fw_cfg_init_mem() as fw_cfg_init_mem_nodma() > to distinct with the DMA version (currently named > fw_cfg_init_mem_wide). > > Suggested-by: Zhao Liu <zhao1.liu@intel.com> > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > include/hw/nvram/fw_cfg.h | 3 ++- > hw/hppa/machine.c | 2 +- > hw/nvram/fw_cfg.c | 7 +++---- > 3 files changed, 6 insertions(+), 6 deletions(-) Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
On Thu, 8 May 2025 15:35:26 +0200 Philippe Mathieu-Daudé <philmd@linaro.org> wrote: > Rename fw_cfg_init_mem() as fw_cfg_init_mem_nodma() > to distinct with the DMA version (currently named > fw_cfg_init_mem_wide). > > Suggested-by: Zhao Liu <zhao1.liu@intel.com> > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Igor Mammedov <imammedo@redhat.com> > --- > include/hw/nvram/fw_cfg.h | 3 ++- > hw/hppa/machine.c | 2 +- > hw/nvram/fw_cfg.c | 7 +++---- > 3 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h > index d41b9328fd1..d5161a79436 100644 > --- a/include/hw/nvram/fw_cfg.h > +++ b/include/hw/nvram/fw_cfg.h > @@ -307,7 +307,8 @@ bool fw_cfg_add_file_from_generator(FWCfgState *s, > > FWCfgState *fw_cfg_init_io_dma(uint32_t iobase, uint32_t dma_iobase, > AddressSpace *dma_as); > -FWCfgState *fw_cfg_init_mem(hwaddr ctl_addr, hwaddr data_addr); > +FWCfgState *fw_cfg_init_mem_nodma(hwaddr ctl_addr, hwaddr data_addr, > + unsigned data_width); > FWCfgState *fw_cfg_init_mem_wide(hwaddr ctl_addr, > hwaddr data_addr, uint32_t data_width, > hwaddr dma_addr, AddressSpace *dma_as); > diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c > index dacedc5409c..0d768cb90b0 100644 > --- a/hw/hppa/machine.c > +++ b/hw/hppa/machine.c > @@ -201,7 +201,7 @@ static FWCfgState *create_fw_cfg(MachineState *ms, PCIBus *pci_bus, > int btlb_entries = HPPA_BTLB_ENTRIES(&cpu[0]->env); > int len; > > - fw_cfg = fw_cfg_init_mem(addr, addr + 4); > + fw_cfg = fw_cfg_init_mem_nodma(addr, addr + 4, 1); > fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, ms->smp.cpus); > fw_cfg_add_i16(fw_cfg, FW_CFG_MAX_CPUS, HPPA_MAX_CPUS); > fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, ms->ram_size); > diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c > index 54cfa07d3f5..10f8f8db86f 100644 > --- a/hw/nvram/fw_cfg.c > +++ b/hw/nvram/fw_cfg.c > @@ -1087,11 +1087,10 @@ FWCfgState *fw_cfg_init_mem_wide(hwaddr ctl_addr, > return s; > } > > -FWCfgState *fw_cfg_init_mem(hwaddr ctl_addr, hwaddr data_addr) > +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, > - fw_cfg_data_mem_ops.valid.max_access_size, > - 0, NULL); > + return fw_cfg_init_mem_wide(ctl_addr, data_addr, data_width, 0, NULL); > } > >
diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h index d41b9328fd1..d5161a79436 100644 --- a/include/hw/nvram/fw_cfg.h +++ b/include/hw/nvram/fw_cfg.h @@ -307,7 +307,8 @@ bool fw_cfg_add_file_from_generator(FWCfgState *s, FWCfgState *fw_cfg_init_io_dma(uint32_t iobase, uint32_t dma_iobase, AddressSpace *dma_as); -FWCfgState *fw_cfg_init_mem(hwaddr ctl_addr, hwaddr data_addr); +FWCfgState *fw_cfg_init_mem_nodma(hwaddr ctl_addr, hwaddr data_addr, + unsigned data_width); FWCfgState *fw_cfg_init_mem_wide(hwaddr ctl_addr, hwaddr data_addr, uint32_t data_width, hwaddr dma_addr, AddressSpace *dma_as); diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index dacedc5409c..0d768cb90b0 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -201,7 +201,7 @@ static FWCfgState *create_fw_cfg(MachineState *ms, PCIBus *pci_bus, int btlb_entries = HPPA_BTLB_ENTRIES(&cpu[0]->env); int len; - fw_cfg = fw_cfg_init_mem(addr, addr + 4); + fw_cfg = fw_cfg_init_mem_nodma(addr, addr + 4, 1); fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, ms->smp.cpus); fw_cfg_add_i16(fw_cfg, FW_CFG_MAX_CPUS, HPPA_MAX_CPUS); fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, ms->ram_size); diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 54cfa07d3f5..10f8f8db86f 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -1087,11 +1087,10 @@ FWCfgState *fw_cfg_init_mem_wide(hwaddr ctl_addr, return s; } -FWCfgState *fw_cfg_init_mem(hwaddr ctl_addr, hwaddr data_addr) +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, - fw_cfg_data_mem_ops.valid.max_access_size, - 0, NULL); + return fw_cfg_init_mem_wide(ctl_addr, data_addr, data_width, 0, NULL); }
Rename fw_cfg_init_mem() as fw_cfg_init_mem_nodma() to distinct with the DMA version (currently named fw_cfg_init_mem_wide). Suggested-by: Zhao Liu <zhao1.liu@intel.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- include/hw/nvram/fw_cfg.h | 3 ++- hw/hppa/machine.c | 2 +- hw/nvram/fw_cfg.c | 7 +++---- 3 files changed, 6 insertions(+), 6 deletions(-)