package/kernel/mac80211/patches/327-v4.17-0003-brcmfmac-use-brcmf_chip_name-for-consistency.patch

   1 From c88cfa075de356ddf40c668896b2126340f19ba4 Mon Sep 17 00:00:00 2001
   2 From: Arend Van Spriel <arend.vanspriel@broadcom.com>
   3 Date: Thu, 22 Mar 2018 21:28:22 +0100
   4 Subject: [PATCH] brcmfmac: use brcmf_chip_name() for consistency
   5
   6 When logging the chip id/revision information make use of
   7 brcmf_chip_name() so it is always the same.
   8
   9 Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
  10 Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
  11 Reviewed-by: Franky Lin <franky.lin@broadcom.com>
  12 Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
  13 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  14 ---
  15  drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c     | 5 ++---
  16  drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c | 7 +++++--
  17  2 files changed, 7 insertions(+), 5 deletions(-)
  18
  19 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
  20 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
  21 @@ -926,9 +926,8 @@ static int brcmf_chip_recognition(struct
  22
  23         brcmf_chip_name(ci->pub.chip, ci->pub.chiprev,
  24                         ci->pub.name, sizeof(ci->pub.name));
  25 -       brcmf_dbg(INFO, "found %s chip: BCM%s, rev=%d\n",
  26 -                 socitype == SOCI_SB ? "SB" : "AXI", ci->pub.name,
  27 -                 ci->pub.chiprev);
  28 +       brcmf_dbg(INFO, "found %s chip: %s\n",
  29 +                 socitype == SOCI_SB ? "SB" : "AXI", ci->pub.name);
  30
  31         if (socitype == SOCI_SB) {
  32                 if (ci->pub.chip != BRCM_CC_4329_CHIP_ID) {
  33 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
  34 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
  35 @@ -25,6 +25,7 @@
  36  #include "firmware.h"
  37  #include "core.h"
  38  #include "common.h"
  39 +#include "chip.h"
  40
  41  #define BRCMF_FW_MAX_NVRAM_SIZE                        64000
  42  #define BRCMF_FW_NVRAM_DEVPATH_LEN             19      /* devpath0=pcie/1/4/ */
  43 @@ -567,6 +568,7 @@ int brcmf_fw_map_chip_to_name(u32 chip,
  44                               u32 table_size, char fw_name[BRCMF_FW_NAME_LEN],
  45                               char nvram_name[BRCMF_FW_NAME_LEN])
  46  {
  47 +       char chipname[12];
  48         u32 i;
  49         char end;
  50
  51 @@ -581,6 +583,8 @@ int brcmf_fw_map_chip_to_name(u32 chip,
  52                 return -ENODEV;
  53         }
  54
  55 +       brcmf_chip_name(chip, chiprev, chipname, sizeof(chipname));
  56 +
  57         /* check if firmware path is provided by module parameter */
  58         if (brcmf_mp_global.firmware_path[0] != '\0') {
  59                 strlcpy(fw_name, brcmf_mp_global.firmware_path,
  60 @@ -601,8 +605,7 @@ int brcmf_fw_map_chip_to_name(u32 chip,
  61         if ((nvram_name) && (mapping_table[i].nvram))
  62                 strlcat(nvram_name, mapping_table[i].nvram, BRCMF_FW_NAME_LEN);
  63
  64 -       brcmf_info("using %s for chip %#08x(%d) rev %#08x\n",
  65 -                  fw_name, chip, chip, chiprev);
  66 +       brcmf_info("using %s for chip %s\n", fw_name, chipname);
  67
  68         return 0;
  69  }