| Message ID | 20190712001708.170259-1-ndesaulniers@google.com |
|---|---|
| State | New |
| Headers | show |
| Series | [-next] iwlwifi: dbg: work around clang bug by marking debug strings static | expand |
Johannes Berg <johannes@sipsolutions.net> writes: >> Luca, you said this was already fixed in your internal tree, and the fix >> would appear soon in next, but I don't see anything in linux-next? > > Luca is still on vacation, but I just sent out a version of the patch we > had applied internally. Awesome, thanks. cheers
On Tue, Aug 06, 2019 at 03:37:42PM -0700, Nick Desaulniers wrote: > On Thu, Aug 1, 2019 at 12:11 AM Johannes Berg <johannes@sipsolutions.net> wrote: > > > > > > > Luca, you said this was already fixed in your internal tree, and the fix > > > would appear soon in next, but I don't see anything in linux-next? > > > > Luca is still on vacation, but I just sent out a version of the patch we > > had applied internally. > > > > Also turns out it wasn't actually _fixed_, just _moved_, so those > > internal patches wouldn't have helped anyway. > > Thanks for the report. Do you have a link? > I'll rebase my patch then. > -- > Thanks, > ~Nick Desaulniers Just for everyone else (since I commented on our issue tracker), this is now fixed in Linus's tree as of commit 1f6607250331 ("iwlwifi: dbg_ini: fix compile time assert build errors"). Cheers, Nathan
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c index e411ac98290d..f8c90ea4e9b4 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c +++ b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c @@ -2438,7 +2438,7 @@ static void iwl_fw_dbg_info_apply(struct iwl_fw_runtime *fwrt, { u32 img_name_len = le32_to_cpu(dbg_info->img_name_len); u32 dbg_cfg_name_len = le32_to_cpu(dbg_info->dbg_cfg_name_len); - const char err_str[] = + static const char err_str[] = "WRT: ext=%d. Invalid %s name length %d, expected %d\n"; if (img_name_len != IWL_FW_INI_MAX_IMG_NAME_LEN) { @@ -2775,7 +2775,7 @@ static void _iwl_fw_dbg_apply_point(struct iwl_fw_runtime *fwrt, struct iwl_ucode_tlv *tlv = iter; void *ini_tlv = (void *)tlv->data; u32 type = le32_to_cpu(tlv->type); - const char invalid_ap_str[] = + static const char invalid_ap_str[] = "WRT: ext=%d. Invalid apply point %d for %s\n"; switch (type) {
Commit r353569 in prerelease Clang-9 is producing a linkage failure: ld: drivers/net/wireless/intel/iwlwifi/fw/dbg.o: in function `_iwl_fw_dbg_apply_point': dbg.c:(.text+0x827a): undefined reference to `__compiletime_assert_2387' when the following configs are enabled: - CONFIG_IWLWIFI - CONFIG_IWLMVM - CONFIG_KASAN Work around the issue for now by marking the debug strings as `static`, which they probably should be any ways. Link: https://bugs.llvm.org/show_bug.cgi?id=42580 Link: https://github.com/ClangBuiltLinux/linux/issues/580 Reported-by: Arnd Bergmann <arnd@arndb.de> Reported-by: Nathan Chancellor <natechancellor@gmail.com> Signed-off-by: Nick Desaulniers <ndesaulniers@google.com> --- drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.22.0.410.gd8fdbe21b5-goog