Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40fac5a1 authored by Larry Finger's avatar Larry Finger Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: Fix compiler warnings in os_dep/ioctl_linux.c 



The 0-DAY kernel build testing backend reports the following compiler
warnings not shown on my compiler version/options:

   drivers/staging/rtl8188eu/os_dep/ioctl_linux.c: In function 'rtw_mp_efuse_get':
>> drivers/staging/rtl8188eu/os_dep/ioctl_linux.c:5836:65: warning: iteration 16u invokes undefined behavior [-Waggressive-loop-optimizations]
        sprintf(extra, "%s%02X ", extra, pEfuseHal->fakeEfuseInitMap[i+j]);
                                                                    ^
   drivers/staging/rtl8188eu/os_dep/ioctl_linux.c:5830:3: note: containing loop
      for (i = 0; i < EFUSE_MAP_SIZE; i += 16) {
      ^
>> drivers/staging/rtl8188eu/os_dep/ioctl_linux.c:6042:69: warning: iteration 16u invokes undefined behavior [-Waggressive-loop-optimizations]
        sprintf(extra, "%s %02X", extra, pEfuseHal->fakeEfuseModifiedMap[i+j]);
                                                                        ^
   drivers/staging/rtl8188eu/os_dep/ioctl_linux.c:6036:3: note: containing loop
      for (i = 0; i < EFUSE_MAP_SIZE; i += 16) {
      ^

The problem is due to improper settings for some of the EFUSE_XXX defines such that
EFUSE_MAP_SIZE was larger than the sizes of the marked arrays. Thanks to
Fengguang Wu for helping me understand the root cause.

Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Cc: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 351699d7

drivers/staging/rtl8188eu/include/rtl8188e_hal.h

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,6 @@ struct txpowerinfo24g { 
};



#define EFUSE_REAL_CONTENT_LEN		512

#define EFUSE_MAP_LEN			128

#define EFUSE_MAX_SECTION		16

#define EFUSE_IC_ID_OFFSET		506 /* For some inferior IC purpose*/

#define AVAILABLE_EFUSE_ADDR(addr)	(addr < EFUSE_REAL_CONTENT_LEN)
@@ -215,6 +214,7 @@ struct txpowerinfo24g { 


#define		EFUSE_REAL_CONTENT_LEN_88E	256

#define		EFUSE_MAP_LEN_88E		512

#define EFUSE_MAP_LEN			EFUSE_MAP_LEN_88E

#define		EFUSE_MAX_SECTION_88E		64

#define		EFUSE_MAX_WORD_UNIT_88E		4

#define		EFUSE_IC_ID_OFFSET_88E		506

drivers/staging/rtl8188eu/include/rtw_efuse.h

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ enum _EFUSE_DEF_TYPE { 
#define EFUSE_MAX_SIZE      256

/* end of E-Fuse */



#define		EFUSE_MAX_MAP_LEN		256

#define		EFUSE_MAX_MAP_LEN		512

#define		EFUSE_MAX_HW_SIZE		512

#define		EFUSE_MAX_SECTION_BASE	16