brcmfmac: fix SDIO access for big-endian host
PATCH 1/1 brcmfmac: fix SDIO access for big-endian host
These full-mac chips use little-endian byte ordering. This patch adds a few missing conversions to/from little-endian so that the driver may be used with a big-endian host.
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +4 -4
@@ -1340,7 +1340,7 @@ static void brcmf_sdio_free_glom(struct brcmf_sdio *bus)static inline u8 brcmf_sdio_getdatoffset (u8 *swheader) {u32 hdrvalue; - hdrvalue = *(u32 *)swheader; + hdrvalue =le32_to_cpu (*(__le32 *)swheader);return (u8)((hdrvalue &SDPCM_DOFFSET_MASK ) >>SDPCM_DOFFSET_SHIFT ); }
@@ -1349,7 +1349,7 @@ static inline bool brcmf_sdio_fromevntchan(u8 *swheader)u32 hdrvalue;u8 ret; - hdrvalue = *(u32 *)swheader; + hdrvalue =le32_to_cpu (*(__le32 *)swheader); ret = (u8)((hdrvalue &SDPCM_CHANNEL_MASK ) >>SDPCM_CHANNEL_SHIFT );return (ret ==SDPCM_EVENT_CHANNEL );
@@ -3544,7 +3544,7 @@ static int brcmf_sdio_bus_preinit(struct device *dev)/* otherwise, set txglomalign */ value = sdiodev->settings->bus.sdio.sd_sgentry_align;/* SDIO ADMA requires at least 32 bit alignment */ - value =max_t (u32, value,ALIGNMENT ); + value =cpu_to_le32 (max_t (u32, value,ALIGNMENT )); err =brcmf_iovar_data_set (dev,"bus:txglomalign" , &value,sizeof (u32)); }
@@ -3555,7 +3555,7 @@ static int brcmf_sdio_bus_preinit(struct device *dev) bus->tx_hdrlen =SDPCM_HWHDR_LEN +SDPCM_SWHDR_LEN ;if (sdiodev->sg_support) { bus->txglom = false; - value =1 ; + value =cpu_to_le32 (1 ); err =brcmf_iovar_data_set (bus->sdiodev->dev,"bus:rxglom" , &value,sizeof (u32));if (err <0 ) {
Signature · 1 line
2.17.1
Quoted 5 lines · Remi Depommier
These full-mac chips use little-endian byte ordering. This patch adds a few missing conversions to/from little-endian so that the driver may be used with a big-endian host.
Signed-off-by Remi Depommier <[email protected]>
Patch applied to wireless-drivers-next.git, thanks.
d56fd83cf99c brcmfmac: fix SDIO access for big-endian host
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
PATCH 1/1 brcmfmac: Fix incorrect type in assignment
In reply to Remi DepommierThe left-hand side of the assignment from cpu_to_le32() should be of type __le32. This commit clears the warning reported by sparse when building with C=1 CF="-D__CHECK_ENDIAN__".
--- .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +9 -8
@@ -3517,6 +3517,7 @@ static int brcmf_sdio_bus_preinit(struct device *dev)struct brcmf_sdio *bus = sdiodev->bus;struct brcmf_core *core = bus->sdio_core;u32 value; +__le32 iovar;int err;/* maxctl provided by common layer */
@@ -3537,16 +3538,16 @@ static int brcmf_sdio_bus_preinit(struct device *dev)*/ if (core->rev <12 ) {/* for sdio core rev < 12, disable txgloming */ - value =0 ; - err =brcmf_iovar_data_set (dev,"bus:txglom" , &value, -sizeof (u32)); + iovar =0 ; + err =brcmf_iovar_data_set (dev,"bus:txglom" , &iovar, +sizeof (iovar)); }else {/* otherwise, set txglomalign */ value = sdiodev->settings->bus.sdio.sd_sgentry_align;/* SDIO ADMA requires at least 32 bit alignment */ - value =cpu_to_le32 (max_t (u32, value,ALIGNMENT )); - err =brcmf_iovar_data_set (dev,"bus:txglomalign" , &value, -sizeof (u32)); + iovar =cpu_to_le32 (max_t (u32, value,ALIGNMENT )); + err =brcmf_iovar_data_set (dev,"bus:txglomalign" , &iovar, +sizeof (iovar)); }if (err <0 )
@@ -3555,9 +3556,9 @@ static int brcmf_sdio_bus_preinit(struct device *dev) bus->tx_hdrlen =SDPCM_HWHDR_LEN +SDPCM_SWHDR_LEN ;if (sdiodev->sg_support) { bus->txglom = false; - value =cpu_to_le32 (1 ); + iovar =cpu_to_le32 (1 ); err =brcmf_iovar_data_set (bus->sdiodev->dev,"bus:rxglom" , - &value,sizeof (u32)); + &iovar,sizeof (iovar));if (err <0 ) {/* bus:rxglom is allowed to fail */ err =0 ;
Signature · 1 line
2.17.1
Re: [PATCH] brcmfmac: Fix incorrect type in assignment
Quoted 7 lines · Remi Depommier
The left-hand side of the assignment from
cpu_to_le32()should be of type__le32. This commit clears the warning reported by sparse when building with C=1 CF="-D__CHECK_ENDIAN__".Fixes d56fd83cf99c ("brcmfmac: fix SDIO access for big-endian host")Reported-by kernel test robot <[email protected]>Signed-off-by Remi Depommier <[email protected]>
Patch applied to wireless-drivers-next.git, thanks.
fa3622bbea10 brcmfmac: Fix incorrect type in assignment
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches