lkml.org 
[lkml]   [2018]   [Feb]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v15 03/11] fw_cfg: fix sparse warnings in fw_cfg_sel_endianness()
    Date
    Dispatch to the appropriate iowrite() instead of casting restricted
    type to u16.

    - if fw_cfg_is_mmio:
    before: iowrite16(cpu_to_be16(key))
    after: iowrite16be(key)
    - if !fw_cfg_is_mmio:
    before: iowrite16(cpu_to_le16(key))
    after: iowrite16(key)
    which is equivalent on little-endian systems, where fw_cfg IO is supported.

    Fixes:
    $ make C=1 CF=-D__CHECK_ENDIAN__ drivers/firmware/qemu_fw_cfg.o

    drivers/firmware/qemu_fw_cfg.c:55:33: warning: restricted __be16 degrades to integer
    drivers/firmware/qemu_fw_cfg.c:55:52: warning: restricted __le16 degrades to integer

    Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
    ---
    drivers/firmware/qemu_fw_cfg.c | 9 ++++++---
    1 file changed, 6 insertions(+), 3 deletions(-)

    diff --git a/drivers/firmware/qemu_fw_cfg.c b/drivers/firmware/qemu_fw_cfg.c
    index 42601a3eaed5..6164731a3c35 100644
    --- a/drivers/firmware/qemu_fw_cfg.c
    +++ b/drivers/firmware/qemu_fw_cfg.c
    @@ -50,9 +50,12 @@ static void __iomem *fw_cfg_reg_data;
    static DEFINE_MUTEX(fw_cfg_dev_lock);

    /* pick appropriate endianness for selector key */
    -static inline u16 fw_cfg_sel_endianness(u16 key)
    +static void fw_cfg_sel_endianness(u16 key)
    {
    - return fw_cfg_is_mmio ? cpu_to_be16(key) : cpu_to_le16(key);
    + if (fw_cfg_is_mmio)
    + iowrite16be(key, fw_cfg_reg_ctrl);
    + else
    + iowrite16(key, fw_cfg_reg_ctrl);
    }

    /* read chunk of given fw_cfg blob (caller responsible for sanity-check) */
    @@ -74,7 +77,7 @@ static inline void fw_cfg_read_blob(u16 key,
    }

    mutex_lock(&fw_cfg_dev_lock);
    - iowrite16(fw_cfg_sel_endianness(key), fw_cfg_reg_ctrl);
    + fw_cfg_sel_endianness(key);
    while (pos-- > 0)
    ioread8(fw_cfg_reg_data);
    ioread8_rep(fw_cfg_reg_data, buf, count);
    --
    2.16.1.73.g5832b7e9f2
    \
     
     \ /
      Last update: 2018-02-15 22:36    [W:3.785 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site