| Message ID | 87k2emsi22.fsf@kamboji.qca.qualcomm.com (mailing list archive) |
|---|---|
| State | Deferred, archived |
| Delegated to: | Andy Gross |
| Headers | show |
On Thu, Sep 8, 2016 at 5:16 AM, Kalle Valo <kvalo@codeaurora.org> wrote: > Bjorn Andersson <bjorn.andersson@linaro.org> writes: > >> The wcn36xx wifi driver follows the life cycle of the WLAN_CTRL SMD >> channel, as such it should be a SMD client. This patch makes this >> transition, now that we have the necessary frameworks available. >> >> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> >> --- >> >> Changes since v3: >> - Made msg_header const in wcn36xx_smd_rsp_process() >> >> Changes since v2: >> - Correct the call to the new ieee80211_scan_completed() >> >> drivers/net/wireless/ath/wcn36xx/dxe.c | 16 +++--- >> drivers/net/wireless/ath/wcn36xx/main.c | 79 ++++++++++++++++++++---------- >> drivers/net/wireless/ath/wcn36xx/smd.c | 31 +++++------- >> drivers/net/wireless/ath/wcn36xx/smd.h | 5 ++ >> drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 21 +++----- >> 5 files changed, 86 insertions(+), 66 deletions(-) > > This doesn't compile for me: > I thought I mentioned this in the mail, sorry for missing that. There is a patch for this issue in linux-next already [1] which is part of [2], which was part of the pull request to arm-soc for inclusion in v4.9. [1] https://patchwork.kernel.org/patch/9272457/ [2] https://git.kernel.org/cgit/linux/kernel/git/agross/linux.git/tag/?h=qcom-drivers-for-4.9 Regards, Bjorn -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Bjorn Andersson <bjorn.andersson@linaro.org> writes: > On Thu, Sep 8, 2016 at 5:16 AM, Kalle Valo <kvalo@codeaurora.org> wrote: >> Bjorn Andersson <bjorn.andersson@linaro.org> writes: >> >>> The wcn36xx wifi driver follows the life cycle of the WLAN_CTRL SMD >>> channel, as such it should be a SMD client. This patch makes this >>> transition, now that we have the necessary frameworks available. >>> >>> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> >>> --- >>> >>> Changes since v3: >>> - Made msg_header const in wcn36xx_smd_rsp_process() >>> >>> Changes since v2: >>> - Correct the call to the new ieee80211_scan_completed() >>> >>> drivers/net/wireless/ath/wcn36xx/dxe.c | 16 +++--- >>> drivers/net/wireless/ath/wcn36xx/main.c | 79 ++++++++++++++++++++---------- >>> drivers/net/wireless/ath/wcn36xx/smd.c | 31 +++++------- >>> drivers/net/wireless/ath/wcn36xx/smd.h | 5 ++ >>> drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 21 +++----- >>> 5 files changed, 86 insertions(+), 66 deletions(-) >> >> This doesn't compile for me: >> > > I thought I mentioned this in the mail, sorry for missing that. Maybe you did and I just forgot, I have a tendency to do that :) > There is a patch for this issue in linux-next already [1] which is > part of [2], which was part of the pull request to arm-soc for > inclusion in v4.9. > > [1] https://patchwork.kernel.org/patch/9272457/ > [2] https://git.kernel.org/cgit/linux/kernel/git/agross/linux.git/tag/?h=qcom-drivers-for-4.9 So the commit in question is: soc: qcom: smd: Correct compile stub prototypes https://git.kernel.org/cgit/linux/kernel/git/agross/linux.git/commit/?h=qcom-drivers-for-4.9&id=3a1281848830fcb3202cfd7ffe62d19641471d05 But that's not obviously in my tree yet, but I should have it after 4.9-rc1 is released. I think it's easiest that I wait for that before applying these. Do you agree?
On Thu 08 Sep 10:35 PDT 2016, Kalle Valo wrote: > Bjorn Andersson <bjorn.andersson@linaro.org> writes: > > > On Thu, Sep 8, 2016 at 5:16 AM, Kalle Valo <kvalo@codeaurora.org> wrote: > >> Bjorn Andersson <bjorn.andersson@linaro.org> writes: > >> > >>> The wcn36xx wifi driver follows the life cycle of the WLAN_CTRL SMD > >>> channel, as such it should be a SMD client. This patch makes this > >>> transition, now that we have the necessary frameworks available. > >>> > >>> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> > >>> --- > >>> > >>> Changes since v3: > >>> - Made msg_header const in wcn36xx_smd_rsp_process() > >>> > >>> Changes since v2: > >>> - Correct the call to the new ieee80211_scan_completed() > >>> > >>> drivers/net/wireless/ath/wcn36xx/dxe.c | 16 +++--- > >>> drivers/net/wireless/ath/wcn36xx/main.c | 79 ++++++++++++++++++++---------- > >>> drivers/net/wireless/ath/wcn36xx/smd.c | 31 +++++------- > >>> drivers/net/wireless/ath/wcn36xx/smd.h | 5 ++ > >>> drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 21 +++----- > >>> 5 files changed, 86 insertions(+), 66 deletions(-) > >> > >> This doesn't compile for me: > >> > > > > I thought I mentioned this in the mail, sorry for missing that. > > Maybe you did and I just forgot, I have a tendency to do that :) > > > There is a patch for this issue in linux-next already [1] which is > > part of [2], which was part of the pull request to arm-soc for > > inclusion in v4.9. > > > > [1] https://patchwork.kernel.org/patch/9272457/ > > [2] https://git.kernel.org/cgit/linux/kernel/git/agross/linux.git/tag/?h=qcom-drivers-for-4.9 > > So the commit in question is: > > soc: qcom: smd: Correct compile stub prototypes > https://git.kernel.org/cgit/linux/kernel/git/agross/linux.git/commit/?h=qcom-drivers-for-4.9&id=3a1281848830fcb3202cfd7ffe62d19641471d05 > Correct > But that's not obviously in my tree yet, but I should have it after > 4.9-rc1 is released. I think it's easiest that I wait for that before > applying these. Do you agree? > Would be nice to have it land sooner rather than later, but I'm okay with this. Regards, Bjorn -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Sep 08, 2016 at 09:21:59PM -0700, Bjorn Andersson wrote: > On Thu 08 Sep 10:35 PDT 2016, Kalle Valo wrote: > > > Bjorn Andersson <bjorn.andersson@linaro.org> writes: > > > > > On Thu, Sep 8, 2016 at 5:16 AM, Kalle Valo <kvalo@codeaurora.org> wrote: > > >> Bjorn Andersson <bjorn.andersson@linaro.org> writes: > > >> > > >>> The wcn36xx wifi driver follows the life cycle of the WLAN_CTRL SMD > > >>> channel, as such it should be a SMD client. This patch makes this > > >>> transition, now that we have the necessary frameworks available. > > >>> > > >>> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> > > >>> --- > > >>> > > >>> Changes since v3: > > >>> - Made msg_header const in wcn36xx_smd_rsp_process() > > >>> > > >>> Changes since v2: > > >>> - Correct the call to the new ieee80211_scan_completed() > > >>> > > >>> drivers/net/wireless/ath/wcn36xx/dxe.c | 16 +++--- > > >>> drivers/net/wireless/ath/wcn36xx/main.c | 79 ++++++++++++++++++++---------- > > >>> drivers/net/wireless/ath/wcn36xx/smd.c | 31 +++++------- > > >>> drivers/net/wireless/ath/wcn36xx/smd.h | 5 ++ > > >>> drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 21 +++----- > > >>> 5 files changed, 86 insertions(+), 66 deletions(-) > > >> > > >> This doesn't compile for me: > > >> > > > > > > I thought I mentioned this in the mail, sorry for missing that. > > > > Maybe you did and I just forgot, I have a tendency to do that :) > > > > > There is a patch for this issue in linux-next already [1] which is > > > part of [2], which was part of the pull request to arm-soc for > > > inclusion in v4.9. > > > > > > [1] https://patchwork.kernel.org/patch/9272457/ > > > [2] https://git.kernel.org/cgit/linux/kernel/git/agross/linux.git/tag/?h=qcom-drivers-for-4.9 > > > > So the commit in question is: > > > > soc: qcom: smd: Correct compile stub prototypes > > https://git.kernel.org/cgit/linux/kernel/git/agross/linux.git/commit/?h=qcom-drivers-for-4.9&id=3a1281848830fcb3202cfd7ffe62d19641471d05 > > > > Correct > > > But that's not obviously in my tree yet, but I should have it after > > 4.9-rc1 is released. I think it's easiest that I wait for that before > > applying these. Do you agree? > > > > Would be nice to have it land sooner rather than later, but I'm okay > with this. We could just treat the tag as immutable. You can merge the tag in and arm-soc can as well. it'll just get nop'd the second time it is taken. The only downside is if arm-soc doesn't take my merge request. Or we can wait till -rc1 Regards, Andy -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Andy Gross <andy.gross@linaro.org> writes: >> > >> This doesn't compile for me: >> > >> >> > > >> > > I thought I mentioned this in the mail, sorry for missing that. >> > >> > Maybe you did and I just forgot, I have a tendency to do that :) >> > >> > > There is a patch for this issue in linux-next already [1] which is >> > > part of [2], which was part of the pull request to arm-soc for >> > > inclusion in v4.9. >> > > >> > > [1] https://patchwork.kernel.org/patch/9272457/ >> > > [2] https://git.kernel.org/cgit/linux/kernel/git/agross/linux.git/tag/?h=qcom-drivers-for-4.9 >> > >> > So the commit in question is: >> > >> > soc: qcom: smd: Correct compile stub prototypes >> > https://git.kernel.org/cgit/linux/kernel/git/agross/linux.git/commit/?h=qcom-drivers-for-4.9&id=3a1281848830fcb3202cfd7ffe62d19641471d05 >> > >> >> Correct >> >> > But that's not obviously in my tree yet, but I should have it after >> > 4.9-rc1 is released. I think it's easiest that I wait for that before >> > applying these. Do you agree? >> > >> >> Would be nice to have it land sooner rather than later, but I'm okay >> with this. > > We could just treat the tag as immutable. You can merge the tag in and arm-soc > can as well. it'll just get nop'd the second time it is taken. The only > downside is if arm-soc doesn't take my merge request. I take it that you are talking about this tag: git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git qcom-drivers-for-4.9 I did a test pull and there are only 8 commits so in theory that could work. But my trees go via Dave Miller's net-next so I can't control when they hit Linus' tree. It might be that Linus pulls the net-next tree before arm-soc and arm-soc commits coming from net-next might confuse people. I'm just afraid that the hassle would outweight the benefit. > Or we can wait till -rc1 To keep things simple I prefer this option. Of course it means waiting few more extra weeks, but when working with new subsystems that can happen. The crystall ball[1] says that 4.9-rc1 would be released on 2016-10-16 so it's not that far away. [1] http://phb-crystal-ball.org/
--- a/include/linux/soc/qcom/smd.h +++ b/include/linux/soc/qcom/smd.h @@ -83,14 +83,14 @@ qcom_smd_open_channel(struct qcom_smd_channel *channel, return NULL; } -void *qcom_smd_get_drvdata(struct qcom_smd_channel *channel) +static inline void *qcom_smd_get_drvdata(struct qcom_smd_channel *channel) { /* This shouldn't be possible */ WARN_ON(1); return NULL; } -void qcom_smd_set_drvdata(struct qcom_smd_channel *channel, void *data) +static inline void qcom_smd_set_drvdata(struct qcom_smd_channel *channel, void *data) { /* This shouldn't be possible */ WARN_ON(1);