Re: [PATCH 1/3] soc: qcom: smd: Transition client drivers from smd to rpmsg
On Wed, Mar 22, 2017 at 11:44:39AM -0700, David Miller wrote: > From: Bjorn Andersson > Date: Mon, 20 Mar 2017 16:35:42 -0700 > > > By moving these client drivers to use RPMSG instead of the direct SMD > > API we can reuse them ontop of the newly added GLINK wire-protocol > > support found in the 820 and 835 Qualcomm platforms. > > > > As the new (RPMSG-based) and old SMD implementations are mutually > > exclusive we have to change all client drivers in one commit, to make > > sure we have a working system before and after this transition. > > > > Signed-off-by: Bjorn Andersson > > --- > > > > Based on v4.11-rc3 with Arnd's Kconfig dependency fixes for BT_QCOMSMD > > (https://lkml.org/lkml/2017/3/20/1038). > > Just some questions since I'm supposed to merge this into my net-next > tree. > > What is the status of the Kconfig dependency fix and how will I be > getting it? > > Second, should I merge all three of these patches to net-next or just > this one? David, I ack'd all three. Please take these through your tree. Bjorn, Are we going to need an immutable branch or tag for sychronizing work? Regards, Andy Gross
Re: [PATCH 3/3] soc: qcom: smd-rpm: Add msm8996 compatibility
On Mon, Mar 20, 2017 at 04:35:44PM -0700, Bjorn Andersson wrote: > With the RPM driver transitioned to RPMSG we can reuse the SMD-RPM > driver ontop of GLINK for 8996, without any modifications. > > Signed-off-by: Bjorn Andersson Acked-by: Andy Gross
Re: [PATCH 2/3] soc: qcom: smd: Remove standalone driver
On Mon, Mar 20, 2017 at 04:35:43PM -0700, Bjorn Andersson wrote: > Remove the standalone SMD implementation as we have transitioned the > client drivers to use the RPMSG based one. > > Also remove all dependencies on QCOM_SMD from Kconfig files, in order to > keep them selectable in the absence of the removed symbol. > > Signed-off-by: Bjorn Andersson Acked-by: Andy Gross
Re: [PATCH 1/3] soc: qcom: smd: Transition client drivers from smd to rpmsg
On Mon, Mar 20, 2017 at 04:35:42PM -0700, Bjorn Andersson wrote: > By moving these client drivers to use RPMSG instead of the direct SMD > API we can reuse them ontop of the newly added GLINK wire-protocol > support found in the 820 and 835 Qualcomm platforms. > > As the new (RPMSG-based) and old SMD implementations are mutually > exclusive we have to change all client drivers in one commit, to make > sure we have a working system before and after this transition. > > Signed-off-by: Bjorn Andersson > --- For the qcom/smd parts: Acked-by: Andy Gross
Re: [v5,1/5] soc: qcom: smem_state: Fix include for ERR_PTR()
On 1 December 2016 at 04:17, Valo, Kalle wrote:
> Kalle Valo writes:
>
>> Kalle Valo writes:
>>
>>> "Valo, Kalle" writes:
>>>
>>>> Bjorn Andersson writes:
>>>>
>>>>> On Wed 16 Nov 10:49 PST 2016, Kalle Valo wrote:
>>>>>
>>>>>> Bjorn Andersson wrote:
>>>>>> > The correct include file for getting errno constants and ERR_PTR() is
>>>>>> > linux/err.h, rather than linux/errno.h, so fix the include.
>>>>>> >
>>>>>> > Fixes: e8b123e60084 ("soc: qcom: smem_state: Add stubs for disabled
>>>>>> > smem_state")
>>>>>> > Acked-by: Andy Gross
>>>>>> > Signed-off-by: Bjorn Andersson
>>>>>>
>>>>>> For some reason this fails to compile now. Can you take a look, please?
>>>>>>
>>>>>> ERROR: "qcom_wcnss_open_channel"
>>>>>> [drivers/net/wireless/ath/wcn36xx/wcn36xx.ko] undefined!
>>>>>> make[1]: *** [__modpost] Error 1
>>>>>> make: *** [modules] Error 2
>>>>>>
>>>>>> 5 patches set to Changes Requested.
>>>>>>
>>>>>> 9429045 [v5,1/5] soc: qcom: smem_state: Fix include for ERR_PTR()
>>>>>> 9429047 [v5,2/5] wcn36xx: Transition driver to SMD client
>>>>>
>>>>> This patch was updated with the necessary depends in Kconfig to catch
>>>>> this exact issue and when I pull in your .config (which has QCOM_SMD=n,
>>>>> QCOM_WCNSS_CTRL=n and WCN36XX=y) I can build this just fine.
>>>>>
>>>>> I've tested the various combinations and it seems to work fine. Do you
>>>>> have any other patches in your tree?
>>>>
>>>> This was with the pending branch of my ath.git tree. There are other
>>>> wireless patches (ath10k etc) but I would guess they don't affect here.
>>>>
>>>>> Any stale objects?
>>>>
>>>> Not sure what you mean with this question, but I didn't run 'make clean'
>>>> if that's what you are asking.
>>>>
>>>>> Would you mind retesting this, before I invest more time in trying to
>>>>> reproduce the issue you're seeing?
>>>>
>>>> Sure, I'll take a look but that might take few days.
>>>
>>> I didn't find enough time to look at this in detail. I applied this to
>>> my ath.git pending branch, let's see what the kbuild bot finds.
>>
>> It found the same problem. Interestingly I'm also building x86 with 32
>> bit, maybe it's related?
>>
>> tree: https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git pending
>> head: 1ea16a1c457939b4564643f7637d5cc639a8d3b7
>> commit: 5eb09c672b01460804fd49b1c9cc7d1072a102f0 [96/99] wcn36xx: Transition
>> driver to SMD client
>> config: i386-allmodconfig (attached as .config)
>> compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901
>> reproduce:
>> git checkout 5eb09c672b01460804fd49b1c9cc7d1072a102f0
>> # save the attached .config to linux build tree
>> make ARCH=i386
>>
>> All errors (new ones prefixed by >>):
>>
>>>> ERROR: "qcom_wcnss_open_channel"
>>>> [drivers/net/wireless/ath/wcn36xx/wcn36xx.ko] undefined!
>
> Bjorn mentioned me on IRC that this is because of a missing commit in my
> tree:
>
> daa6e41ce2b5 soc: qcom: wcnss_ctrl: Stub wcnss_ctrl API
>
> When I pull the tag below (which contains the above commit) wcn36xx
> builds fine for me:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git
> tags/qcom-drivers-for-4.10
>
> Andy, is it ok if I pull your tag also to my ath.git tree to solve the
> wcn36xx build problem? My trees go to Linus via net-next and I don't
> know when exactly Dave would send a pull request to Linus, before or
> after the arm trees, but as the tag seems to contain only few patches I
> hope it doesn't matter.
The qcom-drivers-for-4.10 tag was already merged into arm-soc. But
having you pull it as well won't cause issues so long as you are using
the tag (which you are). I don't see any issues with this approach.
Andy
Re: [PATCH 2/2] soc: qcom: smem_state: Fix include for ERR_PTR()
On 9 November 2016 at 12:02, Bjorn Andersson wrote:
> The correct include file for getting errno constants and ERR_PTR() is
> linux/err.h, rather than linux/errno.h, so fix the include.
>
> Fixes: e8b123e60084 ("soc: qcom: smem_state: Add stubs for disabled
> smem_state")
> Signed-off-by: Bjorn Andersson
> ---
>
> Andy, I don't see anything else going into v4.10 for smem_state.h. So if you
> are okay I would like Kalle to pick this patch through his tree and be able to
> merge my wcn36xx patches for v4.10.
>
> include/linux/soc/qcom/smem_state.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/linux/soc/qcom/smem_state.h
> b/include/linux/soc/qcom/smem_state.h
> index 7b88697929e9..b8478ee7a71f 100644
> --- a/include/linux/soc/qcom/smem_state.h
> +++ b/include/linux/soc/qcom/smem_state.h
> @@ -1,7 +1,7 @@
> #ifndef __QCOM_SMEM_STATE__
> #define __QCOM_SMEM_STATE__
>
> -#include
> +#include
>
> struct device_node;
> struct qcom_smem_state;
> --
> 2.5.0
>
This time with less html.
Acked-by: Andy Gross
Re: [PATCH v4 2/4] wcn36xx: Transition driver to SMD client
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 writes: > > > > > On Thu, Sep 8, 2016 at 5:16 AM, Kalle Valo wrote: > > >> Bjorn Andersson 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 > > >>> --- > > >>> > > >>> 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
Re: [PATCH v4 1/4] soc: qcom: wcnss_ctrl: Stub wcnss_ctrl API
On Tue, Sep 06, 2016 at 03:18:29PM -0700, Bjorn Andersson wrote: > Stub the wcnss_ctrl API to allow compile testing wcnss function drivers. > > Cc: Marcel Holtmann > Signed-off-by: Bjorn Andersson > --- > > There are no other pending changes colliding with this, so if Andy is okay > with > this it could be merged through Kalle's tree - together with the other > patches. > > Marcel, with this applied we can drop the depends on QCOM_SMD from the > btqcomsmd driver as well. > > Changes since v3: > - Added this patch to allow compile testing without SMD support after patch 2 > > include/linux/soc/qcom/wcnss_ctrl.h | 13 + > 1 file changed, 13 insertions(+) > This is fine. Acked-by: Andy Gross
Re: QRTR merge conflict resolution (was: Re: linux-next: build failure after merge of the net-next tree)
On 13 May 2016 at 17:19, Bjorn Andersson wrote: > On Fri 13 May 14:01 PDT 2016, Arnd Bergmann wrote: > >> On Tuesday 10 May 2016 11:39:34 Bjorn Andersson wrote: > [..] >> > I assume we could have the QRTR go through Andy and arm-soc, with >> > David's approval and this fix squashed in. But we're running rather late >> > in this cycle, perhaps we should just back the QRTR patches out and I >> > can respin and resend them after the merge window (for v4.8 instead)? >> >> I'd suggest you do a merge of next-next with the qcom/soc-2 branch that >> we have in arm-soc and resolve the conflict in the merge, then send >> a pull request with the merge to davem. >> > > Hi David, > > In case you missed this thread, linux-next highlighted an upcoming merge > conflict between the net-next and one of the branches included in the > arm-soc trees. > > I have prepared the merge of net-next and the conflicting tag from the > Qualcomm SOC, please include this in your pull towards Linus to avoid > the merge conflict. > > Regards, > Bjorn > > The following changes since commit ed7cbbce544856b20e5811de373cf92e92499771: > > udp: Resolve NULL pointer dereference over flow-based vxlan device > (2016-05-13 01:56:14 -0400) OK. The contents look good to me. Acked-by: Andy Gross
Re: linux-next: build failure after merge of the net-next tree
On 9 May 2016 at 20:29, Stephen Rothwell wrote:
> Hi all,
>
> After merging the net-next tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> net/qrtr/smd.c:106:14: error: initialization from incompatible pointer type
> [-Werror=incompatible-pointer-types]
> .callback = qcom_smd_qrtr_callback,
> ^
> net/qrtr/smd.c:106:14: note: (near initialization for
> 'qcom_smd_qrtr_driver.callback')
>
> Caused by commit
>
> bdabad3e363d ("net: Add Qualcomm IPC router")
>
> interacting with commit
>
> b853cb9628bf ("soc: qcom: smd: Make callback pass channel reference")
>
> from the arm-soc tree.
>
> I added the following merge fix patch (and it turned out I needed the
> new stubs).
Thanks for fixing this up. I'll work with Bjorn to get this resolved.
I'll have something up for tomorrow's next pull.
Regards,
Andy Gross
Re: [PATCH v3 1/2] soc: qcom: smd: Introduce compile stubs
On 27 April 2016 at 14:13, Bjorn Andersson wrote: > Introduce compile stubs for the SMD API, allowing consumers to be > compile tested. > > Signed-off-by: Bjorn Andersson > --- > > Changes since v2: > - Introduce this patch, to allow compile testing of QRTR_SMD > > include/linux/soc/qcom/smd.h | 28 +++- > 1 file changed, 27 insertions(+), 1 deletion(-) > Looks ok. Acked-by: Andy Gross
Re: [PATCH 4/4] dt: binding: Add Qualcomm wcn36xx WiFi binding
On Sun, Dec 27, 2015 at 05:34:27PM -0800, Bjorn Andersson wrote: > Add binding representing the Qualcomm wcn3620/60/80 WiFi block. > > Signed-off-by: Bjorn Andersson > --- > + > +- qcom,wcnss-mmio: > + Usage: required > + Value type: nit: encoded > + Definition: should specify base address and size of the WiFi related > + registers of WCNSS > + > +- qcom,state: > + Usage: required > + Value type: > + Definition: should specify the tx-enable and tx-ring-empty state > + references > + Otherwise looks good. Reviewed-by: Andy Gross -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] Bluetooth: hci_smd: Qualcomm WCNSS HCI driver
On Thu, Oct 08, 2015 at 10:07:44AM -0700, Bjorn Andersson wrote: > On Sat 03 Oct 09:55 PDT 2015, Marcel Holtmann wrote: > > > Hi Bjorn, > > > [..] > > >> Especially the kbuild test robot complained loudly. > > >> > > > > > > Sorry, I forgot to mention in the patch that the patch depends on the > > > qcom_smd_id patch - that's available in linux-next. I will take another > > > look, but I think that was the cause of all the issues. > > > > which means, I can only merge this driver when this other patch has > > hit net-next tree. Unless I take the qcom_smd_id through > > bluetooth-next tree which doesn't look like a good idea. > > > > I was going to suggest that we just wait for -rc1, but the new additions > to SMD adds a bunch of new items on the dependency list. > > Perhaps once we agree we can get your Ack and have Andy pull it through > the qcom-soc tree together with the SMD patches? This is fine by me. > > >>> obj-$(CONFIG_BT_INTEL) += btintel.o > > >>> obj-$(CONFIG_BT_ATH3K) += ath3k.o > > >>> diff --git a/drivers/bluetooth/hci_smd.c b/drivers/bluetooth/hci_smd.c > > > [..] > > >>> +#include > > >> > > >> The hci.h include is not needed. If you do, then you are doing > > >> something fishy. > > >> > > > -- Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
