From patchwork Fri Jul 12 00:17:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Desaulniers X-Patchwork-Id: 1131080 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="Grb/FtAm"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45lD5D4RVJz9s8m for ; Fri, 12 Jul 2019 10:17:20 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730505AbfGLARS (ORCPT ); Thu, 11 Jul 2019 20:17:18 -0400 Received: from mail-pg1-f201.google.com ([209.85.215.201]:51983 "EHLO mail-pg1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728574AbfGLARS (ORCPT ); Thu, 11 Jul 2019 20:17:18 -0400 Received: by mail-pg1-f201.google.com with SMTP id o16so4582255pgk.18 for ; Thu, 11 Jul 2019 17:17:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=w66HmPq4DsASMlERtyuZxwvEbhjRa6bY9sh7WF19zZA=; b=Grb/FtAmD7S6qiP7UTPMcpxLI/FOc3jeld4A1buTh8PFgn8eanDSppYavnoTdkPcNA awQdxO7iZWj39P8Ru6CmtLAFWfptS3/9OWcnJNtXpUgM1c++KhG6ecw2SXZuH3TMS/xB c+YY3/eIquAWrnMIZcuNbSAkkg88tL5NsML5EKS8QE5FymmDdztWt5kRKDoFXCiPY8tS 3Vf9C4KrUkmCkBWfktU6lRDdG2utkiJ3uUMn0I7D1KiygiqgU11hJdSkXXzL6w7OaauV 5ZrwkWKXnBpos/ipY2Y4Uy+DuaNvQxZiKQ3MAPGZ/fomO85VLCAcW4HyahNdSRIJDQI6 +cmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=w66HmPq4DsASMlERtyuZxwvEbhjRa6bY9sh7WF19zZA=; b=KjTPx/NdlnPFU6SSP4IVkRJZKjqcOkutPSRevr+9fiMVytwXwAyEnVwRzZrSNrrJoh R97BVbrKx0+3blTouhb9z5OIB/c8O5QQnq52V6qMspWDNGJZAcUF5vFQRkktVRX1IPGe rvNJAGzmsBsdNaub1vBN6/GSDb0LPZ/T6WkgkqgMunqAd2+m60kFzatUyTB+vbm/QxAl kZlZP0fiKNcrkfu9C0zs2/Jj/jVy5WG7Oz8me9SMiPYYgyg5vAVrBg/K/KSHhU5d5qtq 1WMTjGepgF8OfcHGmnRHqn6Ssupy51oxX7vfhAldHoluMyX5HrQj4kw6b8QamW4A4atd ZhQg== X-Gm-Message-State: APjAAAW0z/h+aSCRxuLtLM5Kz++FQ59IcoqGNqFqssfwbPAFT6jUZDYv uIOlDr7GkM1xuw73bk2SB5yo6Bq0tSyg3Qg+gwY= X-Google-Smtp-Source: APXvYqwZkJvWCP2kEkaaTJ/i9YjTiw1o2lW3XwT/9mh0N24TJP7NfY4x0EnHqdaqplthq1yPxJ+0pf17FvIKfYsQEhM= X-Received: by 2002:a65:44ca:: with SMTP id g10mr7094676pgs.435.1562890637164; Thu, 11 Jul 2019 17:17:17 -0700 (PDT) Date: Thu, 11 Jul 2019 17:17:06 -0700 Message-Id: <20190712001708.170259-1-ndesaulniers@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.22.0.410.gd8fdbe21b5-goog Subject: [PATCH -next] iwlwifi: dbg: work around clang bug by marking debug strings static From: Nick Desaulniers To: kvalo@codeaurora.org Cc: Nick Desaulniers , Arnd Bergmann , Nathan Chancellor , Johannes Berg , Emmanuel Grumbach , Luca Coelho , Intel Linux Wireless , "David S. Miller" , Shahar S Matityahu , Sara Sharon , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, clang-built-linux@googlegroups.com Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Reported-by: Nathan Chancellor Signed-off-by: Nick Desaulniers Reviewed-by: Nathan Chancellor Tested-by: Nathan Chancellor --- drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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) {