From mboxrd@z Thu Jan 1 00:00:00 1970 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=-14.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,HK_RANDOM_FROM,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 8B31BC433ED for ; Sat, 24 Apr 2021 09:03:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6364B61467 for ; Sat, 24 Apr 2021 09:03:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237258AbhDXJDk (ORCPT ); Sat, 24 Apr 2021 05:03:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58216 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236929AbhDXJD0 (ORCPT ); Sat, 24 Apr 2021 05:03:26 -0400 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4010AC06174A for ; Sat, 24 Apr 2021 02:02:47 -0700 (PDT) Received: by mail-wr1-x432.google.com with SMTP id h4so41638110wrt.12 for ; Sat, 24 Apr 2021 02:02:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fUd9HxcHs367PrWd2VzT9ubkbPclmdBjBx4thm1/S1c=; b=pkG+Rf41rwJAQxzswPmXC3dUL8UELUIWMtuNNLzFagmTGP5nDxKR94ceazoRN/buhT ycS8AuGWboBOcPDEVXQcKkQarFszrt6qH5iUjaxwZuYuKO6oFtdSKcXIjEz38kdgIl85 HrAZ8ZvYHN4Rx5SLJOEBzfSuS/LqbK8IzV/pX3aGhG486+2GZ61PMGfW/MsK4BoNUexu 9H485AiGEKre3VuTe28tY8AnaW1nBbpt3PY9aSI56UsElncGPeeGWU2aGIWDbpOHxFDB +/hrMJanNUZrDLcCDYzV9bRWArSnREGxhBC5PVYghsGyvQ+s7w5ZZOIQikGXX/AfiYTB VkQA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=fUd9HxcHs367PrWd2VzT9ubkbPclmdBjBx4thm1/S1c=; b=PQBdLTf1FwvvhCiyKk7ca2aqms99qNxH//CwwvlYubiVwfZvjrFDOvcDn+xtzgSJNy PhjTtqpvkzPV6kUMRSzpX85Q9g/HKtFr0xApyzNOPATCzqY5sAncn5E4HvDt9ti8G2pp eX6GcVWnHjDNK5PTNbAeJ23wL6pPJrXbLk679+GkaAJZiywCs2udZhw99GoPmipmoQ5u yLe0V/45rhgrQ6+jXubzzxZtd+DmUa6ViDJgGr3s5cNZ0+X4trzL5hjUDkimht4UMX3/ 3ZXcOs8lag2EJKwle28QBfsCoV8y1b/fswL+umvzsQcEDdBMFEzdfXKDEHEzMZqwPmeI RJqQ== X-Gm-Message-State: AOAM533QoHhjbn2pgnMf5QSd1rBbrGKhLtZ12XXoKaiY5CjJVOsOrbAd 07KqUHw00q/+h58QLgcntrxnioQvjrDxhQ== X-Google-Smtp-Source: ABdhPJygfG0NALyHPu0gj5S3qg5ZlRtmrfGyoRLWw7vzEkSLOX0/0WVwUs7N5+oZrV5IPGlENrxQUw== X-Received: by 2002:a05:6000:1ac7:: with SMTP id i7mr9924685wry.9.1619254960622; Sat, 24 Apr 2021 02:02:40 -0700 (PDT) Received: from agape ([5.171.80.252]) by smtp.gmail.com with ESMTPSA id u8sm11211038wrp.66.2021.04.24.02.02.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Apr 2021 02:02:40 -0700 (PDT) From: Fabio Aiuto To: gregkh@linuxfoundation.org Cc: joe@perches.com, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 03/50] staging: rtl8723bs: add two functions to improve register dump in core/rtw_debug.c Date: Sat, 24 Apr 2021 11:01:46 +0200 Message-Id: <0f3300e6b07f811c0d3fc9c6dd46e5270dfb7a54.1619254603.git.fabioaiuto83@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Beautify register dump by adding two functions printing four register values per line. This is necessary after old macro replacement with netdev_dbg(), the former wrapped a raw printk, the latter prints lots of driver information overhead per line for each call. So avoid this noisy behaviour by dumping four values on each line. Suggested-by: Joe Perches Signed-off-by: Fabio Aiuto --- drivers/staging/rtl8723bs/core/rtw_debug.c | 63 ++++++++++++---------- 1 file changed, 35 insertions(+), 28 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_debug.c b/drivers/staging/rtl8723bs/core/rtw_debug.c index a43fa38cae62..0e13a226e9be 100644 --- a/drivers/staging/rtl8723bs/core/rtw_debug.c +++ b/drivers/staging/rtl8723bs/core/rtw_debug.c @@ -14,41 +14,54 @@ u32 GlobalDebugLevel = _drv_err_; #include +static void dump_4_regs(struct adapter *adapter, int offset) +{ + u32 reg[4]; + int i; + + for (i = 0; i < 4; i++) + reg[i] = rtw_read32(adapter, offset + i); + + netdev_dbg(adapter->pnetdev, "0x%03x 0x%08x 0x%08x 0x%08x 0x%08x\n", + i, reg[0], reg[1], reg[2], reg[3]); +} + void mac_reg_dump(void *sel, struct adapter *adapter) { - int i, j = 1; + int i; netdev_dbg(adapter->pnetdev, "======= MAC REG =======\n"); - for (i = 0x0; i < 0x800; i += 4) { - if (j%4 == 1) - netdev_dbg(adapter->pnetdev, "0x%03x", i); - netdev_dbg(adapter->pnetdev, " 0x%08x ", - rtw_read32(adapter, i)); - if ((j++)%4 == 0) - netdev_dbg(adapter->pnetdev, "\n"); - } + for (i = 0x0; i < 0x800; i += 4) + dump_4_regs(adapter, i); } void bb_reg_dump(void *sel, struct adapter *adapter) { - int i, j = 1; + int i; netdev_dbg(adapter->pnetdev, "======= BB REG =======\n"); - for (i = 0x800; i < 0x1000 ; i += 4) { - if (j%4 == 1) - netdev_dbg(adapter->pnetdev, "0x%03x", i); - netdev_dbg(adapter->pnetdev, " 0x%08x ", - rtw_read32(adapter, i)); - if ((j++)%4 == 0) - netdev_dbg(adapter->pnetdev, "\n"); - } + + for (i = 0x800; i < 0x1000 ; i += 4) + dump_4_regs(adapter, i); +} + +static void dump_4_rf_regs(struct adapter *adapter, int path, int offset) +{ + u8 reg[4]; + int i; + + for (i = 0; i < 4; i++) + reg[i] = rtw_hal_read_rfreg(adapter, path, offset + i, + 0xffffffff); + + netdev_dbg(adapter->pnetdev, "0x%02x 0x%08x 0x%08x 0x%08x 0x%08x\n", + i, reg[0], reg[1], reg[2], reg[3]); } void rf_reg_dump(void *sel, struct adapter *adapter) { - int i, j = 1, path; - u32 value; + int i, path; u8 rf_type = 0; u8 path_nums = 0; @@ -62,13 +75,7 @@ void rf_reg_dump(void *sel, struct adapter *adapter) for (path = 0; path < path_nums; path++) { netdev_dbg(adapter->pnetdev, "RF_Path(%x)\n", path); - for (i = 0; i < 0x100; i++) { - value = rtw_hal_read_rfreg(adapter, path, i, 0xffffffff); - if (j%4 == 1) - netdev_dbg(adapter->pnetdev, "0x%02x ", i); - netdev_dbg(adapter->pnetdev, " 0x%08x ", value); - if ((j++)%4 == 0) - netdev_dbg(adapter->pnetdev, "\n"); - } + for (i = 0; i < 0x100; i++) + dump_4_rf_regs(adapter, path, i); } } -- 2.20.1