package/kernel/mac80211/patches/319-v4.12-0020-brcmfmac-wrap-brcmf_fws_init-into-bcdc-layer.patch

   1 From 62c50a34883c6b821d816b6a661e5d47c09d42b2 Mon Sep 17 00:00:00 2001
   2 From: Franky Lin <franky.lin@broadcom.com>
   3 Date: Tue, 28 Mar 2017 11:43:24 +0100
   4 Subject: [PATCH] brcmfmac: wrap brcmf_fws_init into bcdc layer
   5
   6 Create a new protocol layer interface brcmf_proto_init_cb for protocol
   7 layer to finish initialzation after core module components(fweh and
   8 etc.) are initialized.
   9
  10 Signed-off-by: Franky Lin <franky.lin@broadcom.com>
  11 Reviewed-by: Arend Van Spriel <arend.vanspriel@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/bcdc.c  | 7 +++++++
  16  drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c  | 2 +-
  17  drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h | 9 +++++++++
  18  3 files changed, 17 insertions(+), 1 deletion(-)
  19
  20 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c
  21 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c
  22 @@ -417,6 +417,12 @@ brcmf_proto_bcdc_reset_if(struct brcmf_i
  23         brcmf_fws_reset_interface(ifp);
  24  }
  25
  26 +static int
  27 +brcmf_proto_bcdc_init_done(struct brcmf_pub *drvr)
  28 +{
  29 +       return brcmf_fws_init(drvr);
  30 +}
  31 +
  32  int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr)
  33  {
  34         struct brcmf_bcdc *bcdc;
  35 @@ -443,6 +449,7 @@ int brcmf_proto_bcdc_attach(struct brcmf
  36         drvr->proto->add_if = brcmf_proto_bcdc_add_if;
  37         drvr->proto->del_if = brcmf_proto_bcdc_del_if;
  38         drvr->proto->reset_if = brcmf_proto_bcdc_reset_if;
  39 +       drvr->proto->init_done = brcmf_proto_bcdc_init_done;
  40         drvr->proto->pd = bcdc;
  41
  42         drvr->hdrlen += BCDC_HEADER_LEN + BRCMF_PROT_FW_SIGNAL_MAX_TXBYTES;
  43 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
  44 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
  45 @@ -996,7 +996,7 @@ int brcmf_bus_started(struct device *dev
  46         }
  47         brcmf_feat_attach(drvr);
  48
  49 -       ret = brcmf_fws_init(drvr);
  50 +       ret = brcmf_proto_init_done(drvr);
  51         if (ret < 0)
  52                 goto fail;
  53
  54 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h
  55 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h
  56 @@ -47,6 +47,7 @@ struct brcmf_proto {
  57         void (*add_if)(struct brcmf_if *ifp);
  58         void (*del_if)(struct brcmf_if *ifp);
  59         void (*reset_if)(struct brcmf_if *ifp);
  60 +       int (*init_done)(struct brcmf_pub *drvr);
  61         void *pd;
  62  };
  63
  64 @@ -145,4 +146,12 @@ brcmf_proto_reset_if(struct brcmf_pub *d
  65         drvr->proto->reset_if(ifp);
  66  }
  67
  68 +static inline int
  69 +brcmf_proto_init_done(struct brcmf_pub *drvr)
  70 +{
  71 +       if (!drvr->proto->init_done)
  72 +               return 0;
  73 +       return drvr->proto->init_done(drvr);
  74 +}
  75 +
  76  #endif /* BRCMFMAC_PROTO_H */