package/kernel/mac80211/patches/314-v4.16-0005-brcmfmac-Remove-func0-from-function-array.patch

   1 From 99d7b6fdfc8c24052c92c720330d31ca1332f996 Mon Sep 17 00:00:00 2001
   2 From: Ian Molton <ian@mnementh.co.uk>
   3 Date: Tue, 19 Dec 2017 13:47:11 +0100
   4 Subject: [PATCH] brcmfmac: Remove func0 from function array
   5
   6 func0 is not provided by the mmc stack as a function when probing.
   7 Instead providing specific access functions to read/write it.
   8
   9 This prepares for a patch to remove the actual array entry itself.
  10
  11 Signed-off-by: Ian Molton <ian@mnementh.co.uk>
  12 Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
  13 [arend: rephrased the commit message]
  14 [arend: removed unrelated comment for which separate patch is warranted]
  15 Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
  16 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  17 ---
  18  drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c |  5 +----
  19  drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c   |  7 ++++---
  20  drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h   | 13 ++++++-------
  21  3 files changed, 11 insertions(+), 14 deletions(-)
  22
  23 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
  24 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
  25 @@ -1022,8 +1022,7 @@ static int brcmf_ops_sdio_probe(struct s
  26         /* store refs to functions used. mmc_card does
  27          * not hold the F0 function pointer.
  28          */
  29 -       sdiodev->func[0] = kmemdup(func, sizeof(*func), GFP_KERNEL);
  30 -       sdiodev->func[0]->num = 0;
  31 +       sdiodev->func[0] = NULL;
  32         sdiodev->func[1] = func->card->sdio_func[0];
  33         sdiodev->func[2] = func;
  34
  35 @@ -1049,7 +1048,6 @@ static int brcmf_ops_sdio_probe(struct s
  36  fail:
  37         dev_set_drvdata(&func->dev, NULL);
  38         dev_set_drvdata(&sdiodev->func[1]->dev, NULL);
  39 -       kfree(sdiodev->func[0]);
  40         kfree(sdiodev);
  41         kfree(bus_if);
  42         return err;
  43 @@ -1082,7 +1080,6 @@ static void brcmf_ops_sdio_remove(struct
  44                 dev_set_drvdata(&sdiodev->func[2]->dev, NULL);
  45
  46                 kfree(bus_if);
  47 -               kfree(sdiodev->func[0]);
  48                 kfree(sdiodev);
  49         }
  50
  51 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
  52 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
  53 @@ -3771,9 +3771,10 @@ static u32 brcmf_sdio_buscore_read32(voi
  54         u32 val, rev;
  55
  56         val = brcmf_sdiod_readl(sdiodev, addr, NULL);
  57 -       if ((sdiodev->func[0]->device == SDIO_DEVICE_ID_BROADCOM_4335_4339 ||
  58 -            sdiodev->func[0]->device == SDIO_DEVICE_ID_BROADCOM_4339) &&
  59 -           addr == CORE_CC_REG(SI_ENUM_BASE, chipid)) {
  60 +
  61 +       if ((sdiodev->func[1]->device == SDIO_DEVICE_ID_BROADCOM_4335_4339 ||
  62 +            sdiodev->func[1]->device == SDIO_DEVICE_ID_BROADCOM_4339) &&
  63 +            addr == CORE_CC_REG(SI_ENUM_BASE, chipid)) {
  64                 rev = (val & CID_REV_MASK) >> CID_REV_SHIFT;
  65                 if (rev >= 2) {
  66                         val &= ~CID_ID_MASK;
  67 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h
  68 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h
  69 @@ -21,7 +21,9 @@
  70  #include <linux/firmware.h>
  71  #include "firmware.h"
  72
  73 -#define SDIO_FUNC_0            0
  74 +/* Maximum number of I/O funcs */
  75 +#define NUM_SDIO_FUNCS 3
  76 +
  77  #define SDIO_FUNC_1            1
  78  #define SDIO_FUNC_2            2
  79
  80 @@ -39,9 +41,6 @@
  81  #define INTR_STATUS_FUNC1      0x2
  82  #define INTR_STATUS_FUNC2      0x4
  83
  84 -/* Maximum number of I/O funcs */
  85 -#define SDIOD_MAX_IOFUNCS      7
  86 -
  87  /* mask of register map */
  88  #define REG_F0_REG_MASK                0x7FF
  89  #define REG_F1_MISC_MASK       0x1FFFF
  90 @@ -175,7 +174,7 @@ struct brcmf_sdio;
  91  struct brcmf_sdiod_freezer;
  92
  93  struct brcmf_sdio_dev {
  94 -       struct sdio_func *func[SDIO_MAX_FUNCS];
  95 +       struct sdio_func *func[NUM_SDIO_FUNCS];
  96         u8 num_funcs;                   /* Supported funcs on client */
  97         u32 sbwad;                      /* Save backplane window address */
  98         struct brcmf_core *cc_core;     /* chipcommon core info struct */
  99 @@ -297,10 +296,10 @@ void brcmf_sdiod_intr_unregister(struct
 100  /* SDIO device register access interface */
 101  /* Accessors for SDIO Function 0 */
 102  #define brcmf_sdiod_func0_rb(sdiodev, addr, r) \
 103 -       sdio_f0_readb((sdiodev)->func[0], (addr), (r))
 104 +       sdio_f0_readb((sdiodev)->func[1], (addr), (r))
 105
 106  #define brcmf_sdiod_func0_wb(sdiodev, addr, v, ret) \
 107 -       sdio_f0_writeb((sdiodev)->func[0], (v), (addr), (ret))
 108 +       sdio_f0_writeb((sdiodev)->func[1], (v), (addr), (ret))
 109
 110  /* Accessors for SDIO Function 1 */
 111  #define brcmf_sdiod_readb(sdiodev, addr, r) \