| Message ID | 1490697808-5538-2-git-send-email-arend.vanspriel@broadcom.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 62c50a34883c6b821d816b6a661e5d47c09d42b2 |
| Delegated to: | Kalle Valo |
| Headers | show |
On 03/28/2017 12:43 PM, Arend van Spriel wrote: > From: Franky Lin <franky.lin@broadcom.com> > > Create a new protocol layer interface brcmf_proto_init_cb for protocol > layer to finish initialzation after core module components(fweh and > etc.) are initialized. > > Signed-off-by: Franky Lin <franky.lin@broadcom.com> > Change-Id: I560d2478a7c09766cf07b20d74b31dff5ca6ac7b > Reviewed-on: http://hnd-swgit.sj.broadcom.com:8080/8156 These 2 lines are rather useless. > Reviewed-by: brcm80211 ci <brcm80211-ci@broadcom.com> Please use full names only. > Reviewed-by: Arend Van Spriel <arend.vanspriel@broadcom.com> > Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com> > --- > drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c | 7 +++++++ > drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c | 2 +- > drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h | 9 +++++++++ > 3 files changed, 17 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c > index 92eafcc..bc24b00 100644 > --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c > +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c > @@ -417,6 +417,12 @@ static void brcmf_proto_bcdc_rxreorder(struct brcmf_if *ifp, > brcmf_fws_reset_interface(ifp); > } > > +static int > +brcmf_proto_bcdc_init_done(struct brcmf_pub *drvr) > +{ > + return brcmf_fws_init(drvr); > +} > + > int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr) > { > struct brcmf_bcdc *bcdc; > @@ -443,6 +449,7 @@ int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr) > drvr->proto->add_if = brcmf_proto_bcdc_add_if; > drvr->proto->del_if = brcmf_proto_bcdc_del_if; > drvr->proto->reset_if = brcmf_proto_bcdc_reset_if; > + drvr->proto->init_done = brcmf_proto_bcdc_init_done; > drvr->proto->pd = bcdc; > > drvr->hdrlen += BCDC_HEADER_LEN + BRCMF_PROT_FW_SIGNAL_MAX_TXBYTES; > diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c > index 60c6c78..9886280 100644 > --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c > +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c > @@ -986,7 +986,7 @@ int brcmf_bus_started(struct device *dev) > } > brcmf_feat_attach(drvr); > > - ret = brcmf_fws_init(drvr); > + ret = brcmf_proto_init_done(drvr); > if (ret < 0) > goto fail; > > diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h > index 3048ed5..600fd33 100644 > --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h > +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h > @@ -47,6 +47,7 @@ struct brcmf_proto { > void (*add_if)(struct brcmf_if *ifp); > void (*del_if)(struct brcmf_if *ifp); > void (*reset_if)(struct brcmf_if *ifp); > + int (*init_done)(struct brcmf_pub *drvr); > void *pd; > }; > > @@ -145,4 +146,12 @@ static inline bool brcmf_proto_is_reorder_skb(struct sk_buff *skb) > drvr->proto->reset_if(ifp); > } > > +static inline int > +brcmf_proto_init_done(struct brcmf_pub *drvr) > +{ > + if (!drvr->proto->init_done) > + return 0; > + return drvr->proto->init_done(drvr); > +} > + > #endif /* BRCMFMAC_PROTO_H */ So how is it any different from change in my: [PATCH] brcmfmac: wrap brcmf_fws_(de)init into bcdc layer ? Is it only about replacing "init" with "init_done"? I don't see why you couldn't rebase your changes on top of my patch.
On 29-3-2017 13:18, Rafał Miłecki wrote: > On 03/28/2017 12:43 PM, Arend van Spriel wrote: >> From: Franky Lin <franky.lin@broadcom.com> >> >> Create a new protocol layer interface brcmf_proto_init_cb for protocol >> layer to finish initialzation after core module components(fweh and >> etc.) are initialized. >> >> Signed-off-by: Franky Lin <franky.lin@broadcom.com> >> Change-Id: I560d2478a7c09766cf07b20d74b31dff5ca6ac7b >> Reviewed-on: http://hnd-swgit.sj.broadcom.com:8080/8156 > > These 2 lines are rather useless. Sorry. Our Gerrit server adds these and I make an effort to remove this before submitting, but every now and then a few slip through. >> Reviewed-by: brcm80211 ci <brcm80211-ci@broadcom.com> > > Please use full names only. Sure thing. This is actually Jenkins account we use for building and smoketesting the driver. >> Reviewed-by: Arend Van Spriel <arend.vanspriel@broadcom.com> >> Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com> >> --- >> drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c | 7 +++++++ >> drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c | 2 +- >> drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h | 9 +++++++++ >> 3 files changed, 17 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c >> b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c >> index 92eafcc..bc24b00 100644 >> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c >> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c >> @@ -417,6 +417,12 @@ static void brcmf_proto_bcdc_rxreorder(struct >> brcmf_if *ifp, >> brcmf_fws_reset_interface(ifp); >> } >> >> +static int >> +brcmf_proto_bcdc_init_done(struct brcmf_pub *drvr) >> +{ >> + return brcmf_fws_init(drvr); >> +} >> + >> int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr) >> { >> struct brcmf_bcdc *bcdc; >> @@ -443,6 +449,7 @@ int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr) >> drvr->proto->add_if = brcmf_proto_bcdc_add_if; >> drvr->proto->del_if = brcmf_proto_bcdc_del_if; >> drvr->proto->reset_if = brcmf_proto_bcdc_reset_if; >> + drvr->proto->init_done = brcmf_proto_bcdc_init_done; >> drvr->proto->pd = bcdc; >> >> drvr->hdrlen += BCDC_HEADER_LEN + BRCMF_PROT_FW_SIGNAL_MAX_TXBYTES; >> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c >> b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c >> index 60c6c78..9886280 100644 >> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c >> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c >> @@ -986,7 +986,7 @@ int brcmf_bus_started(struct device *dev) >> } >> brcmf_feat_attach(drvr); >> >> - ret = brcmf_fws_init(drvr); >> + ret = brcmf_proto_init_done(drvr); >> if (ret < 0) >> goto fail; >> >> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h >> b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h >> index 3048ed5..600fd33 100644 >> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h >> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h >> @@ -47,6 +47,7 @@ struct brcmf_proto { >> void (*add_if)(struct brcmf_if *ifp); >> void (*del_if)(struct brcmf_if *ifp); >> void (*reset_if)(struct brcmf_if *ifp); >> + int (*init_done)(struct brcmf_pub *drvr); >> void *pd; >> }; >> >> @@ -145,4 +146,12 @@ static inline bool >> brcmf_proto_is_reorder_skb(struct sk_buff *skb) >> drvr->proto->reset_if(ifp); >> } >> >> +static inline int >> +brcmf_proto_init_done(struct brcmf_pub *drvr) >> +{ >> + if (!drvr->proto->init_done) >> + return 0; >> + return drvr->proto->init_done(drvr); >> +} >> + >> #endif /* BRCMFMAC_PROTO_H */ > > So how is it any different from change in my: > [PATCH] brcmfmac: wrap brcmf_fws_(de)init into bcdc layer > ? Is it only about replacing "init" with "init_done"? > > I don't see why you couldn't rebase your changes on top of my patch. What would be the benefit? These changes were under review/testing when you submitted your patch so I felt it made sense to go with that. Regards, Arend
Arend Van Spriel <arend.vanspriel@broadcom.com> writes: > On 29-3-2017 13:18, Rafał Miłecki wrote: >> On 03/28/2017 12:43 PM, Arend van Spriel wrote: >>> From: Franky Lin <franky.lin@broadcom.com> >>> >>> Create a new protocol layer interface brcmf_proto_init_cb for protocol >>> layer to finish initialzation after core module components(fweh and >>> etc.) are initialized. >>> >>> Signed-off-by: Franky Lin <franky.lin@broadcom.com> >>> Change-Id: I560d2478a7c09766cf07b20d74b31dff5ca6ac7b >>> Reviewed-on: http://hnd-swgit.sj.broadcom.com:8080/8156 >> >> These 2 lines are rather useless. > > Sorry. Our Gerrit server adds these and I make an effort to remove this > before submitting, but every now and then a few slip through. > >>> Reviewed-by: brcm80211 ci <brcm80211-ci@broadcom.com> >> >> Please use full names only. > > Sure thing. This is actually Jenkins account we use for building and > smoketesting the driver. I'll remove these from patches 1-4 during commit. (patch 5 seems to be ok)
Arend Van Spriel <arend.vanspriel@broadcom.com> wrote: > From: Franky Lin <franky.lin@broadcom.com> > > Create a new protocol layer interface brcmf_proto_init_cb for protocol > layer to finish initialzation after core module components(fweh and > etc.) are initialized. > > Signed-off-by: Franky Lin <franky.lin@broadcom.com> > Reviewed-by: Arend Van Spriel <arend.vanspriel@broadcom.com> > Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com> 5 patches applied to wireless-drivers-next.git, thanks. 62c50a34883c brcmfmac: wrap brcmf_fws_init into bcdc layer 8f9dd1a97438 brcmfmac: move brcmf_fws_deinit to bcdc layer 0cc0236cf713 brcmfmac: add support to move wiphy instance into network namespace 49fe9b59f0e9 brcmfmac: restore bus state when enter_D3 fails 78b9ccb81377 brcmfmac: no need for d11inf instance in brcmf_pno_start_sched_scan()
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c index 92eafcc..bc24b00 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c @@ -417,6 +417,12 @@ static void brcmf_proto_bcdc_rxreorder(struct brcmf_if *ifp, brcmf_fws_reset_interface(ifp); } +static int +brcmf_proto_bcdc_init_done(struct brcmf_pub *drvr) +{ + return brcmf_fws_init(drvr); +} + int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr) { struct brcmf_bcdc *bcdc; @@ -443,6 +449,7 @@ int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr) drvr->proto->add_if = brcmf_proto_bcdc_add_if; drvr->proto->del_if = brcmf_proto_bcdc_del_if; drvr->proto->reset_if = brcmf_proto_bcdc_reset_if; + drvr->proto->init_done = brcmf_proto_bcdc_init_done; drvr->proto->pd = bcdc; drvr->hdrlen += BCDC_HEADER_LEN + BRCMF_PROT_FW_SIGNAL_MAX_TXBYTES; diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c index 60c6c78..9886280 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c @@ -986,7 +986,7 @@ int brcmf_bus_started(struct device *dev) } brcmf_feat_attach(drvr); - ret = brcmf_fws_init(drvr); + ret = brcmf_proto_init_done(drvr); if (ret < 0) goto fail; diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h index 3048ed5..600fd33 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h @@ -47,6 +47,7 @@ struct brcmf_proto { void (*add_if)(struct brcmf_if *ifp); void (*del_if)(struct brcmf_if *ifp); void (*reset_if)(struct brcmf_if *ifp); + int (*init_done)(struct brcmf_pub *drvr); void *pd; }; @@ -145,4 +146,12 @@ static inline bool brcmf_proto_is_reorder_skb(struct sk_buff *skb) drvr->proto->reset_if(ifp); } +static inline int +brcmf_proto_init_done(struct brcmf_pub *drvr) +{ + if (!drvr->proto->init_done) + return 0; + return drvr->proto->init_done(drvr); +} + #endif /* BRCMFMAC_PROTO_H */