| Message ID | 1600742967-12933-7-git-send-email-chenhc@lemote.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | mips: Add Loongson-3 machine support | expand |
On 9/22/20 4:49 AM, Huacai Chen wrote: > Implement fw_cfg_arch_key_name(), which returns the name of a > mips-specific key. > > Signed-off-by: Huacai Chen <chenhc@lemote.com> > Co-developed-by: Jiaxun Yang <jiaxun.yang@flygoat.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/mips/fw_cfg.c | 35 +++++++++++++++++++++++++++++++++++ > hw/mips/fw_cfg.h | 19 +++++++++++++++++++ > hw/mips/meson.build | 2 +- > 3 files changed, 55 insertions(+), 1 deletion(-) > create mode 100644 hw/mips/fw_cfg.c > create mode 100644 hw/mips/fw_cfg.h > > diff --git a/hw/mips/fw_cfg.c b/hw/mips/fw_cfg.c > new file mode 100644 > index 0000000000..67c4a74f4b > --- /dev/null > +++ b/hw/mips/fw_cfg.c > @@ -0,0 +1,35 @@ > +/* > + * QEMU fw_cfg helpers (MIPS specific) > + * > + * Copyright (c) 2020 Lemote, Inc. > + * > + * Author: > + * Huacai Chen (chenhc@lemote.com) > + * > + * SPDX-License-Identifier: GPL-2.0-or-later > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or later. > + * See the COPYING file in the top-level directory. > + */ > + > +#include "qemu/osdep.h" > +#include "hw/mips/fw_cfg.h" > +#include "hw/nvram/fw_cfg.h" > + > +const char *fw_cfg_arch_key_name(uint16_t key) > +{ > + static const struct { > + uint16_t key; > + const char *name; > + } fw_cfg_arch_wellknown_keys[] = { > + {FW_CFG_MACHINE_VERSION, "machine_version"}, > + {FW_CFG_CPU_FREQ, "cpu_frequency"}, > + }; > + > + for (size_t i = 0; i < ARRAY_SIZE(fw_cfg_arch_wellknown_keys); i++) { > + if (fw_cfg_arch_wellknown_keys[i].key == key) { > + return fw_cfg_arch_wellknown_keys[i].name; > + } > + } > + return NULL; > +} > diff --git a/hw/mips/fw_cfg.h b/hw/mips/fw_cfg.h > new file mode 100644 > index 0000000000..e317d5b9a3 > --- /dev/null > +++ b/hw/mips/fw_cfg.h > @@ -0,0 +1,19 @@ > +/* > + * QEMU fw_cfg helpers (MIPS specific) > + * > + * Copyright (c) 2020 Huacai Chen > + * > + * SPDX-License-Identifier: MIT > + */ > + > +#ifndef HW_MIPS_FW_CFG_H > +#define HW_MIPS_FW_CFG_H > + > +#include "hw/boards.h" > +#include "hw/nvram/fw_cfg.h" > + > +/* Data for BIOS to identify machine */ > +#define FW_CFG_MACHINE_VERSION (FW_CFG_ARCH_LOCAL + 0) > +#define FW_CFG_CPU_FREQ (FW_CFG_ARCH_LOCAL + 1) > + > +#endif > diff --git a/hw/mips/meson.build b/hw/mips/meson.build > index 46294b7382..c98391ce99 100644 > --- a/hw/mips/meson.build > +++ b/hw/mips/meson.build > @@ -1,5 +1,5 @@ > mips_ss = ss.source_set() > -mips_ss.add(files('addr.c', 'mips_int.c')) > +mips_ss.add(files('addr.c', 'mips_int.c', 'fw_cfg.c')) > mips_ss.add(when: 'CONFIG_FULOONG', if_true: files('fuloong2e.c')) > mips_ss.add(when: 'CONFIG_JAZZ', if_true: files('jazz.c')) > mips_ss.add(when: 'CONFIG_MALTA', if_true: files('gt64xxx_pci.c', 'malta.c')) >
diff --git a/hw/mips/fw_cfg.c b/hw/mips/fw_cfg.c new file mode 100644 index 0000000000..67c4a74f4b --- /dev/null +++ b/hw/mips/fw_cfg.c @@ -0,0 +1,35 @@ +/* + * QEMU fw_cfg helpers (MIPS specific) + * + * Copyright (c) 2020 Lemote, Inc. + * + * Author: + * Huacai Chen (chenhc@lemote.com) + * + * SPDX-License-Identifier: GPL-2.0-or-later + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" +#include "hw/mips/fw_cfg.h" +#include "hw/nvram/fw_cfg.h" + +const char *fw_cfg_arch_key_name(uint16_t key) +{ + static const struct { + uint16_t key; + const char *name; + } fw_cfg_arch_wellknown_keys[] = { + {FW_CFG_MACHINE_VERSION, "machine_version"}, + {FW_CFG_CPU_FREQ, "cpu_frequency"}, + }; + + for (size_t i = 0; i < ARRAY_SIZE(fw_cfg_arch_wellknown_keys); i++) { + if (fw_cfg_arch_wellknown_keys[i].key == key) { + return fw_cfg_arch_wellknown_keys[i].name; + } + } + return NULL; +} diff --git a/hw/mips/fw_cfg.h b/hw/mips/fw_cfg.h new file mode 100644 index 0000000000..e317d5b9a3 --- /dev/null +++ b/hw/mips/fw_cfg.h @@ -0,0 +1,19 @@ +/* + * QEMU fw_cfg helpers (MIPS specific) + * + * Copyright (c) 2020 Huacai Chen + * + * SPDX-License-Identifier: MIT + */ + +#ifndef HW_MIPS_FW_CFG_H +#define HW_MIPS_FW_CFG_H + +#include "hw/boards.h" +#include "hw/nvram/fw_cfg.h" + +/* Data for BIOS to identify machine */ +#define FW_CFG_MACHINE_VERSION (FW_CFG_ARCH_LOCAL + 0) +#define FW_CFG_CPU_FREQ (FW_CFG_ARCH_LOCAL + 1) + +#endif diff --git a/hw/mips/meson.build b/hw/mips/meson.build index 46294b7382..c98391ce99 100644 --- a/hw/mips/meson.build +++ b/hw/mips/meson.build @@ -1,5 +1,5 @@ mips_ss = ss.source_set() -mips_ss.add(files('addr.c', 'mips_int.c')) +mips_ss.add(files('addr.c', 'mips_int.c', 'fw_cfg.c')) mips_ss.add(when: 'CONFIG_FULOONG', if_true: files('fuloong2e.c')) mips_ss.add(when: 'CONFIG_JAZZ', if_true: files('jazz.c')) mips_ss.add(when: 'CONFIG_MALTA', if_true: files('gt64xxx_pci.c', 'malta.c'))
Implement fw_cfg_arch_key_name(), which returns the name of a mips-specific key. Signed-off-by: Huacai Chen <chenhc@lemote.com> Co-developed-by: Jiaxun Yang <jiaxun.yang@flygoat.com> --- hw/mips/fw_cfg.c | 35 +++++++++++++++++++++++++++++++++++ hw/mips/fw_cfg.h | 19 +++++++++++++++++++ hw/mips/meson.build | 2 +- 3 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 hw/mips/fw_cfg.c create mode 100644 hw/mips/fw_cfg.h