| Message ID | 20160222211818.GJ16357@HEDWIG.INI.CMU.EDU (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Feb 22, 2016 at 04:18:18PM -0500, Gabriel Somlo wrote: > Refrain from defining default fw_cfg register offsets on > unsupported architectures -- throw an error instead. If > QEMU were to add fw_cfg support on additional architectures, > we should add them to the FW_CFG_SYSFS depends statement in > drivers/firmware/Kconfig, and provide default values for > register offsets in drivers/firmware/qemu_fw_cfg.c at that > time. > > Suggested-by: Michael S. Tsirkin <mst@redhat.com> > Signed-off-by: Gabriel Somlo <somlo@cmu.edu> Acked-by: Michael S. Tsirkin <mst@redhat.com> > --- > drivers/firmware/qemu_fw_cfg.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/firmware/qemu_fw_cfg.c b/drivers/firmware/qemu_fw_cfg.c > index fedbff5..79f6b7b 100644 > --- a/drivers/firmware/qemu_fw_cfg.c > +++ b/drivers/firmware/qemu_fw_cfg.c > @@ -109,9 +109,7 @@ static void fw_cfg_io_cleanup(void) > # define FW_CFG_CTRL_OFF 0x00 > # define FW_CFG_DATA_OFF 0x01 > # else > -# warning "QEMU FW_CFG may not be available on this architecture!" > -# define FW_CFG_CTRL_OFF 0x00 > -# define FW_CFG_DATA_OFF 0x01 > +# error "QEMU FW_CFG not available on this architecture!" > # endif > #endif > > -- > 2.4.3
diff --git a/drivers/firmware/qemu_fw_cfg.c b/drivers/firmware/qemu_fw_cfg.c index fedbff5..79f6b7b 100644 --- a/drivers/firmware/qemu_fw_cfg.c +++ b/drivers/firmware/qemu_fw_cfg.c @@ -109,9 +109,7 @@ static void fw_cfg_io_cleanup(void) # define FW_CFG_CTRL_OFF 0x00 # define FW_CFG_DATA_OFF 0x01 # else -# warning "QEMU FW_CFG may not be available on this architecture!" -# define FW_CFG_CTRL_OFF 0x00 -# define FW_CFG_DATA_OFF 0x01 +# error "QEMU FW_CFG not available on this architecture!" # endif #endif
Refrain from defining default fw_cfg register offsets on unsupported architectures -- throw an error instead. If QEMU were to add fw_cfg support on additional architectures, we should add them to the FW_CFG_SYSFS depends statement in drivers/firmware/Kconfig, and provide default values for register offsets in drivers/firmware/qemu_fw_cfg.c at that time. Suggested-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Gabriel Somlo <somlo@cmu.edu> --- drivers/firmware/qemu_fw_cfg.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)