On Thu, Aug 26, 2021 at 05:25:04PM +0300, Kalle Valo wrote:
> (Adding Linus and Greg)
>
> Kalle Valo <[email protected]> writes:
>
> > (Adding Dave and Jakub to CC)
> >
> > Nicolas Schichan <[email protected]> writes:
> >
> >> On 23/08/2021 14:53, Kalle Valo wrote:
> >>> (adding linux-wireless, regressions and some mhi folks)
> >>>
> >>> Wren Turkal <[email protected]> writes:
> >>>
> >>>> I have no device for the wifi on my computer. 5.13 worked pretty well.
> >>>> I also found others reporting similar issues:
> >>>> https://forum.manjaro.org/t/kernel5-14-rc6-ath11k-on-qca6390-regression-mhi-probe-failure/79362
> >>>>
> >>>> Here's info about the hardware on my laptop:
> >>>> ➜ ~ sudo dmidecode -s system-product-name
> >>>> XPS 13 9310
> >>>>
> >>>> ➜ ~ sudo dmidecode -s bios-version
> >>>> 3.0.4
> >>>
> >>> Do you get the same mhi error as in the forum post?
> >>>
> >>> qcom_mhi_qrtr: probe of mhi0_IPCR failed with error -22
> >>>
> >>> MHI folks, any ideas? I have XPS 13 9310 myself but I'm not able to test
> >>> v5.14-rc6 kernel right now.
> >>
> >> Hello,
> >>
> >> I have hit the same issue on Linux 5.14-rc7:
> >>
> >> [ 14.780566] qcom_mhi_qrtr: probe of mhi0_IPCR failed with error -22
> >>
> >> This looks to be caused by commit:
> >>
> >> ce78ffa3ef16 net: really fix the build...
> >>
> >> Reverting this commit results in ath11k being able to load without errors.
> >
> > Thanks, this helps a lot. Commit ce78ffa3ef16 was introduced in
> > v5.14-rc5 so I assume that's the first release which broke ath11k.
> >
> > Dave, what build issue did you fix with commit ce78ffa3ef16? Could we
> > revert the commit? The problem is that, unless we fix this issue, with
> > v5.14 WLAN will be broken on a quite few newer Dell laptops.
>
> I did some investiation and I suspect that commit ce78ffa3ef16 ("net:
> really fix the build...")[1] is for handling a conflict between net-next
> and char-misc-next trees related to Loic's commit 0092a1e3f763 ("bus:
> mhi: Add inbound buffers allocation flag"). Greg mentions this in a
> commit[2]:
>
> commit 813272ed5238b37c81e448b302048e8008570121
> Merge: de0534df9347 36a21d51725a
> Author: Greg Kroah-Hartman <[email protected]>
>
> Merge 5.14-rc5 into char-misc-next
>
> We need the fixes in here as well, and resolves some merge issues with
> the mhi codebase.
>
> If my assumption is correct when I propose that we revert commit
> ce78ffa3ef16 for v5.14, AFAICS it's not really needed for v5.14 (commit
> 0092a1e3f763 is in -next, not in Linus' tree yet) and commit
> ce78ffa3ef16 breaks ath11k. And the conflict between net-next and
> char-misc-next can be then later fixed during the merge window.
>
> Will this work for everyone? If no objections, I'll submit the revert to
> Linus later today. We are getting really close to final v5.14 release so
> not much time left to fix this.
>
> Just to reiterate why the urgency: commit ce78ffa3ef16 broke ath11k in
> v5.14-rc5, users have reported (and I have confirmed) that at least
> QCA6390 support is broken but I suspect all Qualcomm Wi-Fi 6 devices
> supported by ath11k are currently broken.
No objection from me for reverting that, if it fixes the problems you
are seeing for 5.14-final.
The goal was for the mhi changes to go through the networking tree in
the first place, I don't see how this got out of sync.
If this is reverted, some help on how to resolve the merge issues it
will cause would be appreciated.
thanks,
greg k-h
On Thu, 26 Aug 2021 16:38:35 +0200 Greg Kroah-Hartman wrote:
> > I did some investiation and I suspect that commit ce78ffa3ef16 ("net:
> > really fix the build...")[1] is for handling a conflict between net-next
> > and char-misc-next trees related to Loic's commit 0092a1e3f763 ("bus:
> > mhi: Add inbound buffers allocation flag"). Greg mentions this in a
> > commit[2]:
> >
> > commit 813272ed5238b37c81e448b302048e8008570121
> > Merge: de0534df9347 36a21d51725a
> > Author: Greg Kroah-Hartman <[email protected]>
> >
> > Merge 5.14-rc5 into char-misc-next
> >
> > We need the fixes in here as well, and resolves some merge issues with
> > the mhi codebase.
> >
> > If my assumption is correct when I propose that we revert commit
> > ce78ffa3ef16 for v5.14, AFAICS it's not really needed for v5.14 (commit
> > 0092a1e3f763 is in -next, not in Linus' tree yet) and commit
> > ce78ffa3ef16 breaks ath11k. And the conflict between net-next and
> > char-misc-next can be then later fixed during the merge window.
> >
> > Will this work for everyone? If no objections, I'll submit the revert to
> > Linus later today. We are getting really close to final v5.14 release so
> > not much time left to fix this.
> >
> > Just to reiterate why the urgency: commit ce78ffa3ef16 broke ath11k in
> > v5.14-rc5, users have reported (and I have confirmed) that at least
> > QCA6390 support is broken but I suspect all Qualcomm Wi-Fi 6 devices
> > supported by ath11k are currently broken.
>
> No objection from me for reverting that, if it fixes the problems you
> are seeing for 5.14-final.
>
> The goal was for the mhi changes to go through the networking tree in
> the first place, I don't see how this got out of sync.
>
> If this is reverted, some help on how to resolve the merge issues it
> will cause would be appreciated.
Also no objections here. FWIW I'm about to send the last PR for
networking, still waiting on BPF. You can send the revert to netdev,
or directly to Linus as you prefer. LMK.
Jakub Kicinski <[email protected]> writes:
> On Thu, 26 Aug 2021 16:38:35 +0200 Greg Kroah-Hartman wrote:
>> > I did some investiation and I suspect that commit ce78ffa3ef16 ("net:
>> > really fix the build...")[1] is for handling a conflict between net-next
>> > and char-misc-next trees related to Loic's commit 0092a1e3f763 ("bus:
>> > mhi: Add inbound buffers allocation flag"). Greg mentions this in a
>> > commit[2]:
>> >
>> > commit 813272ed5238b37c81e448b302048e8008570121
>> > Merge: de0534df9347 36a21d51725a
>> > Author: Greg Kroah-Hartman <[email protected]>
>> >
>> > Merge 5.14-rc5 into char-misc-next
>> >
>> > We need the fixes in here as well, and resolves some merge issues with
>> > the mhi codebase.
>> >
>> > If my assumption is correct when I propose that we revert commit
>> > ce78ffa3ef16 for v5.14, AFAICS it's not really needed for v5.14 (commit
>> > 0092a1e3f763 is in -next, not in Linus' tree yet) and commit
>> > ce78ffa3ef16 breaks ath11k. And the conflict between net-next and
>> > char-misc-next can be then later fixed during the merge window.
>> >
>> > Will this work for everyone? If no objections, I'll submit the revert to
>> > Linus later today. We are getting really close to final v5.14 release so
>> > not much time left to fix this.
>> >
>> > Just to reiterate why the urgency: commit ce78ffa3ef16 broke ath11k in
>> > v5.14-rc5, users have reported (and I have confirmed) that at least
>> > QCA6390 support is broken but I suspect all Qualcomm Wi-Fi 6 devices
>> > supported by ath11k are currently broken.
>>
>> No objection from me for reverting that, if it fixes the problems you
>> are seeing for 5.14-final.
>>
>> The goal was for the mhi changes to go through the networking tree in
>> the first place, I don't see how this got out of sync.
>>
>> If this is reverted, some help on how to resolve the merge issues it
>> will cause would be appreciated.
>
> Also no objections here. FWIW I'm about to send the last PR for
> networking, still waiting on BPF. You can send the revert to netdev,
> or directly to Linus as you prefer. LMK.
I prefer take it via the net tree if possible, so if you can wait ~2h
and I'll send it to you.
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Kalle Valo <[email protected]> writes:
> Jakub Kicinski <[email protected]> writes:
>
>> On Thu, 26 Aug 2021 16:38:35 +0200 Greg Kroah-Hartman wrote:
>>> > I did some investiation and I suspect that commit ce78ffa3ef16 ("net:
>>> > really fix the build...")[1] is for handling a conflict between net-next
>>> > and char-misc-next trees related to Loic's commit 0092a1e3f763 ("bus:
>>> > mhi: Add inbound buffers allocation flag"). Greg mentions this in a
>>> > commit[2]:
>>> >
>>> > commit 813272ed5238b37c81e448b302048e8008570121
>>> > Merge: de0534df9347 36a21d51725a
>>> > Author: Greg Kroah-Hartman <[email protected]>
>>> >
>>> > Merge 5.14-rc5 into char-misc-next
>>> >
>>> > We need the fixes in here as well, and resolves some merge issues with
>>> > the mhi codebase.
>>> >
>>> > If my assumption is correct when I propose that we revert commit
>>> > ce78ffa3ef16 for v5.14, AFAICS it's not really needed for v5.14 (commit
>>> > 0092a1e3f763 is in -next, not in Linus' tree yet) and commit
>>> > ce78ffa3ef16 breaks ath11k. And the conflict between net-next and
>>> > char-misc-next can be then later fixed during the merge window.
>>> >
>>> > Will this work for everyone? If no objections, I'll submit the revert to
>>> > Linus later today. We are getting really close to final v5.14 release so
>>> > not much time left to fix this.
>>> >
>>> > Just to reiterate why the urgency: commit ce78ffa3ef16 broke ath11k in
>>> > v5.14-rc5, users have reported (and I have confirmed) that at least
>>> > QCA6390 support is broken but I suspect all Qualcomm Wi-Fi 6 devices
>>> > supported by ath11k are currently broken.
>>>
>>> No objection from me for reverting that, if it fixes the problems you
>>> are seeing for 5.14-final.
>>>
>>> The goal was for the mhi changes to go through the networking tree in
>>> the first place, I don't see how this got out of sync.
>>>
>>> If this is reverted, some help on how to resolve the merge issues it
>>> will cause would be appreciated.
>>
>> Also no objections here. FWIW I'm about to send the last PR for
>> networking, still waiting on BPF. You can send the revert to netdev,
>> or directly to Linus as you prefer. LMK.
>
> I prefer take it via the net tree if possible, so if you can wait ~2h
> and I'll send it to you.
I now submitted the revert, please take it into the net tree if you
still can:
https://patchwork.kernel.org/project/netdevbpf/patch/[email protected]/
I also tested the build with various QRTR options and didn't see any
build errors.
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
On Thu, 26 Aug 2021 20:33:47 +0300 Kalle Valo wrote:
> >> Also no objections here. FWIW I'm about to send the last PR for
> >> networking, still waiting on BPF. You can send the revert to netdev,
> >> or directly to Linus as you prefer. LMK.
> >
> > I prefer take it via the net tree if possible, so if you can wait ~2h
> > and I'll send it to you.
>
> I now submitted the revert, please take it into the net tree if you
> still can:
>
> https://patchwork.kernel.org/project/netdevbpf/patch/[email protected]/
>
> I also tested the build with various QRTR options and didn't see any
> build errors.
Done, thank you!
Jakub Kicinski <[email protected]> writes:
> On Thu, 26 Aug 2021 20:33:47 +0300 Kalle Valo wrote:
>> >> Also no objections here. FWIW I'm about to send the last PR for
>> >> networking, still waiting on BPF. You can send the revert to netdev,
>> >> or directly to Linus as you prefer. LMK.
>> >
>> > I prefer take it via the net tree if possible, so if you can wait ~2h
>> > and I'll send it to you.
>>
>> I now submitted the revert, please take it into the net tree if you
>> still can:
>>
>> https://patchwork.kernel.org/project/netdevbpf/patch/[email protected]/
>>
>> I also tested the build with various QRTR options and didn't see any
>> build errors.
>
> Done, thank you!
Thank you waiting for me :)
I just tested commit 7e9965cddea8 from Linus' tree on Dell XPS 13 9310
laptop with QCA6390 and ath11k works without problems. So the issue
should be solved in the final v5.14 release.
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Greg Kroah-Hartman <[email protected]> writes:
>> I did some investiation and I suspect that commit ce78ffa3ef16 ("net:
>> really fix the build...")[1] is for handling a conflict between net-next
>> and char-misc-next trees related to Loic's commit 0092a1e3f763 ("bus:
>> mhi: Add inbound buffers allocation flag"). Greg mentions this in a
>> commit[2]:
>>
>> commit 813272ed5238b37c81e448b302048e8008570121
>> Merge: de0534df9347 36a21d51725a
>> Author: Greg Kroah-Hartman <[email protected]>
>>
>> Merge 5.14-rc5 into char-misc-next
>>
>> We need the fixes in here as well, and resolves some merge issues with
>> the mhi codebase.
>>
>> If my assumption is correct when I propose that we revert commit
>> ce78ffa3ef16 for v5.14, AFAICS it's not really needed for v5.14 (commit
>> 0092a1e3f763 is in -next, not in Linus' tree yet) and commit
>> ce78ffa3ef16 breaks ath11k. And the conflict between net-next and
>> char-misc-next can be then later fixed during the merge window.
>>
>> Will this work for everyone? If no objections, I'll submit the revert to
>> Linus later today. We are getting really close to final v5.14 release so
>> not much time left to fix this.
>>
>> Just to reiterate why the urgency: commit ce78ffa3ef16 broke ath11k in
>> v5.14-rc5, users have reported (and I have confirmed) that at least
>> QCA6390 support is broken but I suspect all Qualcomm Wi-Fi 6 devices
>> supported by ath11k are currently broken.
>
> No objection from me for reverting that, if it fixes the problems you
> are seeing for 5.14-final.
Thanks!
> The goal was for the mhi changes to go through the networking tree in
> the first place, I don't see how this got out of sync.
>
> If this is reverted, some help on how to resolve the merge issues it
> will cause would be appreciated.
Yes, I'll help with this. I see that Stephen already reported the
reappeared merge issue. It's just that I'm not familiar with inner
workings of the MHI subsystem, but I can test code etc.
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
On Fri, Aug 27, 2021 at 2:41 PM Kalle Valo <[email protected]> wrote:
> Jakub Kicinski <[email protected]> writes:
> > Done, thank you!
>
> Thank you waiting for me :)
>
> I just tested commit 7e9965cddea8 from Linus' tree on Dell XPS 13 9310
> laptop with QCA6390 and ath11k works without problems. So the issue
> should be solved in the final v5.14 release.
>
Good evening,
I have tested loading ath11k on v5.14.0 and I can confirm that the
driver loads fine now, with a phy and wlan interface being created as
a result.
Thanks and best regards,
--
Nicolas Schichan
Nicolas Schichan <[email protected]> writes:
> On Fri, Aug 27, 2021 at 2:41 PM Kalle Valo <[email protected]> wrote:
>> Jakub Kicinski <[email protected]> writes:
>> > Done, thank you!
>>
>> Thank you waiting for me :)
>>
>> I just tested commit 7e9965cddea8 from Linus' tree on Dell XPS 13 9310
>> laptop with QCA6390 and ath11k works without problems. So the issue
>> should be solved in the final v5.14 release.
>>
>
> Good evening,
>
> I have tested loading ath11k on v5.14.0 and I can confirm that the
> driver loads fine now, with a phy and wlan interface being created as
> a result.
Great, thanks for testing and letting us know. And espeacially huge
thanks for finding the commit which broke this!
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches