From patchwork Sun Oct 11 15:54:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rix X-Patchwork-Id: 11830919 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3E5A6C43457 for ; Sun, 11 Oct 2020 15:55:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 046FD22244 for ; Sun, 11 Oct 2020 15:55:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="RnA8Q/+W" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730218AbgJKPzO (ORCPT ); Sun, 11 Oct 2020 11:55:14 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:32943 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730205AbgJKPyr (ORCPT ); Sun, 11 Oct 2020 11:54:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602431686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc; bh=pR1M69yxrP9JSOS0Ie5ezAaQo49msGZptm8kNeSlSi4=; b=RnA8Q/+Wp2v9p6Ns6o4gZ+upo/MszJ1ShQDpQK5jFKPyD9YvqAiC+WqQWg9F9n91yq1kIm FNeQU+aDeVSlDMWmVMSKDXZ58Jnk9uKtzj2ze4NUzoMn5ZxETB9iU0kKGcS4mziBhnRADp 3Vz5PZ976w6POx5rdDUmVvzPCmkI8RE= Received: from mail-oo1-f70.google.com (mail-oo1-f70.google.com [209.85.161.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-19-OPkJv3QgOAC7NQaKkRYyog-1; Sun, 11 Oct 2020 11:54:44 -0400 X-MC-Unique: OPkJv3QgOAC7NQaKkRYyog-1 Received: by mail-oo1-f70.google.com with SMTP id p6so5859703ooo.0 for ; Sun, 11 Oct 2020 08:54:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=pR1M69yxrP9JSOS0Ie5ezAaQo49msGZptm8kNeSlSi4=; b=K1mY+2v2qUKYiSeesS0nrrPtxchSz6zKMXgHoPn/GI6zZy1DMANIYHTcKvtaiQbEEo E3CkEk110UBeOTtyyUTSIkb8SbXKBregZxB9Q/OtHMllvjoFWye5tMAhkDzDO4gzU+qa DpItKGn4N0GYr/wkdglPgHI7jo60hZ94b7ufzcE5Vt7UsTiSlC4kqkCCngQJVDIgWeFS IzFCrlv/8cqgT8ioN4VVjXtKGqZsEOFs8yvJMfvQtW8SgTgRucVls9KYSqoRE5B4bzPn qGjXPvKWXJpHr/MBJd+DsNuFTlzFvH5zqkLWbJ/aHfmYuWwS3J4N5P8m1t8NLyGZ549s akuw== X-Gm-Message-State: AOAM5310E370AMAAE8QNrjnM86HSucdcMaEPTzdIjTqniu+Wc9xH7jur x221sTxfrsYihYt4g74ccG9F6CBMFVCmL75ba+gXVG3dbjASYNDVeMF73zFisbOB3VO6V46LS4x BgI5kjEKtmiVpXqLo X-Received: by 2002:a4a:da53:: with SMTP id f19mr15863001oou.38.1602431684162; Sun, 11 Oct 2020 08:54:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyPJ4u/OeZjHz4mlSxVIynu+KwH6mw6NHjvdnFA3ZLQHkWtrDgVgyM85WaG5gdk1n/GnBdINg== X-Received: by 2002:a4a:da53:: with SMTP id f19mr15862992oou.38.1602431683974; Sun, 11 Oct 2020 08:54:43 -0700 (PDT) Received: from trix.remote.csb (075-142-250-213.res.spectrum.com. [75.142.250.213]) by smtp.gmail.com with ESMTPSA id t22sm7969499otk.24.2020.10.11.08.54.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Oct 2020 08:54:43 -0700 (PDT) From: trix@redhat.com To: yhchuang@realtek.com, kvalo@codeaurora.org, davem@davemloft.net, kuba@kernel.org, natechancellor@gmail.com, ndesaulniers@google.com Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, clang-built-linux@googlegroups.com, Tom Rix Subject: [PATCH] rtw88: fix fw_fifo_addr check Date: Sun, 11 Oct 2020 08:54:38 -0700 Message-Id: <20201011155438.15892-1-trix@redhat.com> X-Mailer: git-send-email 2.18.1 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Tom Rix The clang build reports this warning fw.c:1485:21: warning: address of array 'rtwdev->chip->fw_fifo_addr' will always evaluate to 'true' if (!rtwdev->chip->fw_fifo_addr) { fw_fifo_addr is an array in rtw_chip_info so it is always nonzero. A better check is if the first element of the array is nonzero. In the cases where fw_fifo_addr is initialized by rtw88b and rtw88c, the first array element is 0x780. Signed-off-by: Tom Rix Reviewed-by: Nathan Chancellor Acked-by: Tzu-En Huang --- drivers/net/wireless/realtek/rtw88/fw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/realtek/rtw88/fw.c b/drivers/net/wireless/realtek/rtw88/fw.c index 042015bc8055..b2fd87834f23 100644 --- a/drivers/net/wireless/realtek/rtw88/fw.c +++ b/drivers/net/wireless/realtek/rtw88/fw.c @@ -1482,7 +1482,7 @@ static bool rtw_fw_dump_check_size(struct rtw_dev *rtwdev, int rtw_fw_dump_fifo(struct rtw_dev *rtwdev, u8 fifo_sel, u32 addr, u32 size, u32 *buffer) { - if (!rtwdev->chip->fw_fifo_addr) { + if (!rtwdev->chip->fw_fifo_addr[0]) { rtw_dbg(rtwdev, RTW_DBG_FW, "chip not support dump fw fifo\n"); return -ENOTSUPP; }