* linux-next: build failure after merge of the mhi tree
@ 2020-09-28 8:42 Stephen Rothwell
2020-09-28 9:10 ` Manivannan Sadhasivam
2020-09-29 15:35 ` Manivannan Sadhasivam
0 siblings, 2 replies; 9+ messages in thread
From: Stephen Rothwell @ 2020-09-28 8:42 UTC (permalink / raw)
To: Manivannan Sadhasivam, David Miller, Networking
Cc: Govind Singh, Kalle Valo, Loic Poulain, Linux Next Mailing List,
Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 2560 bytes --]
Hi all,
After merging the mhi tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
drivers/net/wireless/ath/ath11k/mhi.c:27:4: error: 'struct mhi_channel_config' has no member named 'auto_start'
27 | .auto_start = false,
| ^~~~~~~~~~
drivers/net/wireless/ath/ath11k/mhi.c:42:4: error: 'struct mhi_channel_config' has no member named 'auto_start'
42 | .auto_start = false,
| ^~~~~~~~~~
drivers/net/wireless/ath/ath11k/mhi.c:57:4: error: 'struct mhi_channel_config' has no member named 'auto_start'
57 | .auto_start = true,
| ^~~~~~~~~~
drivers/net/wireless/ath/ath11k/mhi.c:72:4: error: 'struct mhi_channel_config' has no member named 'auto_start'
72 | .auto_start = true,
| ^~~~~~~~~~
Caused by commit
ed39d7816885 ("bus: mhi: Remove auto-start option")
interacting with commit
1399fb87ea3e ("ath11k: register MHI controller device for QCA6390")
from the net-next tree.
I applied the following merge fix patch, but maybe more is required.
Even if so, this could be fixed now in the net-next tree.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 28 Sep 2020 18:39:41 +1000
Subject: [PATCH] fix up for "ath11k: register MHI controller device for QCA6390"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/net/wireless/ath/ath11k/mhi.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/net/wireless/ath/ath11k/mhi.c b/drivers/net/wireless/ath/ath11k/mhi.c
index aded9a719d51..47a1ce1bee4f 100644
--- a/drivers/net/wireless/ath/ath11k/mhi.c
+++ b/drivers/net/wireless/ath/ath11k/mhi.c
@@ -24,7 +24,6 @@ static struct mhi_channel_config ath11k_mhi_channels[] = {
.offload_channel = false,
.doorbell_mode_switch = false,
.auto_queue = false,
- .auto_start = false,
},
{
.num = 1,
@@ -39,7 +38,6 @@ static struct mhi_channel_config ath11k_mhi_channels[] = {
.offload_channel = false,
.doorbell_mode_switch = false,
.auto_queue = false,
- .auto_start = false,
},
{
.num = 20,
@@ -54,7 +52,6 @@ static struct mhi_channel_config ath11k_mhi_channels[] = {
.offload_channel = false,
.doorbell_mode_switch = false,
.auto_queue = false,
- .auto_start = true,
},
{
.num = 21,
@@ -69,7 +66,6 @@ static struct mhi_channel_config ath11k_mhi_channels[] = {
.offload_channel = false,
.doorbell_mode_switch = false,
.auto_queue = true,
- .auto_start = true,
},
};
--
2.28.0
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: linux-next: build failure after merge of the mhi tree
2020-09-28 8:42 linux-next: build failure after merge of the mhi tree Stephen Rothwell
@ 2020-09-28 9:10 ` Manivannan Sadhasivam
2020-09-28 9:28 ` Stephen Rothwell
2020-09-28 9:34 ` Kalle Valo
2020-09-29 15:35 ` Manivannan Sadhasivam
1 sibling, 2 replies; 9+ messages in thread
From: Manivannan Sadhasivam @ 2020-09-28 9:10 UTC (permalink / raw)
To: Stephen Rothwell
Cc: David Miller, Networking, Govind Singh, Kalle Valo, Loic Poulain,
Linux Next Mailing List, Linux Kernel Mailing List
Hi,
On Mon, Sep 28, 2020 at 06:42:30PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> After merging the mhi tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> drivers/net/wireless/ath/ath11k/mhi.c:27:4: error: 'struct mhi_channel_config' has no member named 'auto_start'
> 27 | .auto_start = false,
> | ^~~~~~~~~~
> drivers/net/wireless/ath/ath11k/mhi.c:42:4: error: 'struct mhi_channel_config' has no member named 'auto_start'
> 42 | .auto_start = false,
> | ^~~~~~~~~~
> drivers/net/wireless/ath/ath11k/mhi.c:57:4: error: 'struct mhi_channel_config' has no member named 'auto_start'
> 57 | .auto_start = true,
> | ^~~~~~~~~~
> drivers/net/wireless/ath/ath11k/mhi.c:72:4: error: 'struct mhi_channel_config' has no member named 'auto_start'
> 72 | .auto_start = true,
> | ^~~~~~~~~~
>
> Caused by commit
>
> ed39d7816885 ("bus: mhi: Remove auto-start option")
>
> interacting with commit
>
> 1399fb87ea3e ("ath11k: register MHI controller device for QCA6390")
>
> from the net-next tree.
>
> I applied the following merge fix patch, but maybe more is required.
> Even if so, this could be fixed now in the net-next tree.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 28 Sep 2020 18:39:41 +1000
> Subject: [PATCH] fix up for "ath11k: register MHI controller device for QCA6390"
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Sorry, I forgot to submit a patch against net-next for fixing this while merging
the MHI change.
But your change looks good and I can just modify the subject/description and
resubmit. Or if Dave prefers to fix the original commit itself in net-next,
I'm fine!
Thanks,
Mani
> ---
> drivers/net/wireless/ath/ath11k/mhi.c | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath11k/mhi.c b/drivers/net/wireless/ath/ath11k/mhi.c
> index aded9a719d51..47a1ce1bee4f 100644
> --- a/drivers/net/wireless/ath/ath11k/mhi.c
> +++ b/drivers/net/wireless/ath/ath11k/mhi.c
> @@ -24,7 +24,6 @@ static struct mhi_channel_config ath11k_mhi_channels[] = {
> .offload_channel = false,
> .doorbell_mode_switch = false,
> .auto_queue = false,
> - .auto_start = false,
> },
> {
> .num = 1,
> @@ -39,7 +38,6 @@ static struct mhi_channel_config ath11k_mhi_channels[] = {
> .offload_channel = false,
> .doorbell_mode_switch = false,
> .auto_queue = false,
> - .auto_start = false,
> },
> {
> .num = 20,
> @@ -54,7 +52,6 @@ static struct mhi_channel_config ath11k_mhi_channels[] = {
> .offload_channel = false,
> .doorbell_mode_switch = false,
> .auto_queue = false,
> - .auto_start = true,
> },
> {
> .num = 21,
> @@ -69,7 +66,6 @@ static struct mhi_channel_config ath11k_mhi_channels[] = {
> .offload_channel = false,
> .doorbell_mode_switch = false,
> .auto_queue = true,
> - .auto_start = true,
> },
> };
>
> --
> 2.28.0
>
> --
> Cheers,
> Stephen Rothwell
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: build failure after merge of the mhi tree
2020-09-28 9:10 ` Manivannan Sadhasivam
@ 2020-09-28 9:28 ` Stephen Rothwell
2020-09-28 9:34 ` Kalle Valo
1 sibling, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2020-09-28 9:28 UTC (permalink / raw)
To: Manivannan Sadhasivam
Cc: David Miller, Networking, Govind Singh, Kalle Valo, Loic Poulain,
Linux Next Mailing List, Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 430 bytes --]
Hi Manivannan,
On Mon, 28 Sep 2020 14:40:35 +0530 Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> wrote:
>
> But your change looks good and I can just modify the subject/description and
> resubmit. Or if Dave prefers to fix the original commit itself in net-next,
> I'm fine!
Dave never rebase the net-next tree, so a new fix patch is required.
Thanks for taking case of it.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: build failure after merge of the mhi tree
2020-09-28 9:10 ` Manivannan Sadhasivam
2020-09-28 9:28 ` Stephen Rothwell
@ 2020-09-28 9:34 ` Kalle Valo
2020-09-28 9:47 ` Manivannan Sadhasivam
1 sibling, 1 reply; 9+ messages in thread
From: Kalle Valo @ 2020-09-28 9:34 UTC (permalink / raw)
To: Manivannan Sadhasivam
Cc: Stephen Rothwell, David Miller, Networking, Govind Singh,
Loic Poulain, Linux Next Mailing List, Linux Kernel Mailing List,
ath11k
Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> writes:
> On Mon, Sep 28, 2020 at 06:42:30PM +1000, Stephen Rothwell wrote:
>> Hi all,
>>
>> After merging the mhi tree, today's linux-next build (x86_64 allmodconfig)
>> failed like this:
>>
>> drivers/net/wireless/ath/ath11k/mhi.c:27:4: error: 'struct
>> mhi_channel_config' has no member named 'auto_start'
>> 27 | .auto_start = false,
>> | ^~~~~~~~~~
>> drivers/net/wireless/ath/ath11k/mhi.c:42:4: error: 'struct
>> mhi_channel_config' has no member named 'auto_start'
>> 42 | .auto_start = false,
>> | ^~~~~~~~~~
>> drivers/net/wireless/ath/ath11k/mhi.c:57:4: error: 'struct
>> mhi_channel_config' has no member named 'auto_start'
>> 57 | .auto_start = true,
>> | ^~~~~~~~~~
>> drivers/net/wireless/ath/ath11k/mhi.c:72:4: error: 'struct
>> mhi_channel_config' has no member named 'auto_start'
>> 72 | .auto_start = true,
>> | ^~~~~~~~~~
>>
>> Caused by commit
>>
>> ed39d7816885 ("bus: mhi: Remove auto-start option")
>>
>> interacting with commit
>>
>> 1399fb87ea3e ("ath11k: register MHI controller device for QCA6390")
>>
>> from the net-next tree.
>>
>> I applied the following merge fix patch, but maybe more is required.
>> Even if so, this could be fixed now in the net-next tree.
>>
>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>> Date: Mon, 28 Sep 2020 18:39:41 +1000
>> Subject: [PATCH] fix up for "ath11k: register MHI controller device for QCA6390"
>>
>> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>
> Sorry, I forgot to submit a patch against net-next for fixing this while merging
> the MHI change.
Try to notify the ath11k list (CCed) whenever changing MHI API so that
we (ath11k folks) can be prepared for any major changes.
> But your change looks good and I can just modify the subject/description and
> resubmit. Or if Dave prefers to fix the original commit itself in net-next,
> I'm fine!
Actually I prefer to apply the fix to my ath.git tree, less conflicts
that way (I have still quite a lot of ath11k patches pending for -next).
I'll then send a pull request to Dave end of this week.
So please submit the patch like a normal ath11k patch documented here:
https://wireless.wiki.kernel.org/en/users/drivers/ath11k/submittingpatches
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: build failure after merge of the mhi tree
2020-09-28 9:34 ` Kalle Valo
@ 2020-09-28 9:47 ` Manivannan Sadhasivam
2020-09-28 16:45 ` Kalle Valo
0 siblings, 1 reply; 9+ messages in thread
From: Manivannan Sadhasivam @ 2020-09-28 9:47 UTC (permalink / raw)
To: Kalle Valo
Cc: Stephen Rothwell, David Miller, Networking, Govind Singh,
Loic Poulain, Linux Next Mailing List, Linux Kernel Mailing List,
ath11k
On Mon, Sep 28, 2020 at 12:34:40PM +0300, Kalle Valo wrote:
> Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> writes:
>
> > On Mon, Sep 28, 2020 at 06:42:30PM +1000, Stephen Rothwell wrote:
> >> Hi all,
> >>
> >> After merging the mhi tree, today's linux-next build (x86_64 allmodconfig)
> >> failed like this:
> >>
> >> drivers/net/wireless/ath/ath11k/mhi.c:27:4: error: 'struct
> >> mhi_channel_config' has no member named 'auto_start'
> >> 27 | .auto_start = false,
> >> | ^~~~~~~~~~
> >> drivers/net/wireless/ath/ath11k/mhi.c:42:4: error: 'struct
> >> mhi_channel_config' has no member named 'auto_start'
> >> 42 | .auto_start = false,
> >> | ^~~~~~~~~~
> >> drivers/net/wireless/ath/ath11k/mhi.c:57:4: error: 'struct
> >> mhi_channel_config' has no member named 'auto_start'
> >> 57 | .auto_start = true,
> >> | ^~~~~~~~~~
> >> drivers/net/wireless/ath/ath11k/mhi.c:72:4: error: 'struct
> >> mhi_channel_config' has no member named 'auto_start'
> >> 72 | .auto_start = true,
> >> | ^~~~~~~~~~
> >>
> >> Caused by commit
> >>
> >> ed39d7816885 ("bus: mhi: Remove auto-start option")
> >>
> >> interacting with commit
> >>
> >> 1399fb87ea3e ("ath11k: register MHI controller device for QCA6390")
> >>
> >> from the net-next tree.
> >>
> >> I applied the following merge fix patch, but maybe more is required.
> >> Even if so, this could be fixed now in the net-next tree.
> >>
> >> From: Stephen Rothwell <sfr@canb.auug.org.au>
> >> Date: Mon, 28 Sep 2020 18:39:41 +1000
> >> Subject: [PATCH] fix up for "ath11k: register MHI controller device for QCA6390"
> >>
> >> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> >
> > Sorry, I forgot to submit a patch against net-next for fixing this while merging
> > the MHI change.
>
> Try to notify the ath11k list (CCed) whenever changing MHI API so that
> we (ath11k folks) can be prepared for any major changes.
>
Okay sure, will do!
> > But your change looks good and I can just modify the subject/description and
> > resubmit. Or if Dave prefers to fix the original commit itself in net-next,
> > I'm fine!
>
> Actually I prefer to apply the fix to my ath.git tree, less conflicts
> that way (I have still quite a lot of ath11k patches pending for -next).
> I'll then send a pull request to Dave end of this week.
>
> So please submit the patch like a normal ath11k patch documented here:
>
Okay.
Thanks,
Mani
> https://wireless.wiki.kernel.org/en/users/drivers/ath11k/submittingpatches
>
> --
> https://patchwork.kernel.org/project/linux-wireless/list/
>
> https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: build failure after merge of the mhi tree
2020-09-28 9:47 ` Manivannan Sadhasivam
@ 2020-09-28 16:45 ` Kalle Valo
2020-09-28 17:04 ` Manivannan Sadhasivam
0 siblings, 1 reply; 9+ messages in thread
From: Kalle Valo @ 2020-09-28 16:45 UTC (permalink / raw)
To: Manivannan Sadhasivam
Cc: Stephen Rothwell, Loic Poulain, Networking,
Linux Kernel Mailing List, ath11k, Linux Next Mailing List,
Govind Singh, David Miller
Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> writes:
> On Mon, Sep 28, 2020 at 12:34:40PM +0300, Kalle Valo wrote:
>> Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> writes:
>>
>> > On Mon, Sep 28, 2020 at 06:42:30PM +1000, Stephen Rothwell wrote:
>> >> Hi all,
>> >>
>> >> After merging the mhi tree, today's linux-next build (x86_64 allmodconfig)
>> >> failed like this:
>> >>
>> >> drivers/net/wireless/ath/ath11k/mhi.c:27:4: error: 'struct
>> >> mhi_channel_config' has no member named 'auto_start'
>> >> 27 | .auto_start = false,
>> >> | ^~~~~~~~~~
>> >> drivers/net/wireless/ath/ath11k/mhi.c:42:4: error: 'struct
>> >> mhi_channel_config' has no member named 'auto_start'
>> >> 42 | .auto_start = false,
>> >> | ^~~~~~~~~~
>> >> drivers/net/wireless/ath/ath11k/mhi.c:57:4: error: 'struct
>> >> mhi_channel_config' has no member named 'auto_start'
>> >> 57 | .auto_start = true,
>> >> | ^~~~~~~~~~
>> >> drivers/net/wireless/ath/ath11k/mhi.c:72:4: error: 'struct
>> >> mhi_channel_config' has no member named 'auto_start'
>> >> 72 | .auto_start = true,
>> >> | ^~~~~~~~~~
>> >>
>> >> Caused by commit
>> >>
>> >> ed39d7816885 ("bus: mhi: Remove auto-start option")
>> >>
>> >> interacting with commit
>> >>
>> >> 1399fb87ea3e ("ath11k: register MHI controller device for QCA6390")
>> >>
>> >> from the net-next tree.
>> >>
>> >> I applied the following merge fix patch, but maybe more is required.
>> >> Even if so, this could be fixed now in the net-next tree.
>> >>
>> >> From: Stephen Rothwell <sfr@canb.auug.org.au>
>> >> Date: Mon, 28 Sep 2020 18:39:41 +1000
>> >> Subject: [PATCH] fix up for "ath11k: register MHI controller device for QCA6390"
>> >>
>> >> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>> >
>> > Sorry, I forgot to submit a patch against net-next for fixing this while merging
>> > the MHI change.
>>
>> Try to notify the ath11k list (CCed) whenever changing MHI API so that
>> we (ath11k folks) can be prepared for any major changes.
>>
>
> Okay sure, will do!
Thanks. It's important that ath11k is taken into account while making
changes to MHI, otherwise there can easily be regressions.
I was looking at commit ed39d7816885 ("bus: mhi: Remove auto-start
option") and noticed this in the commit log:
This is really up to the MHI device(channel) driver to manage the state
of its channels.
So does this mean we have to make changes in ath11k to accomodate this?
I haven't tested linux-next yet.
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: build failure after merge of the mhi tree
2020-09-28 16:45 ` Kalle Valo
@ 2020-09-28 17:04 ` Manivannan Sadhasivam
2020-09-29 6:18 ` Kalle Valo
0 siblings, 1 reply; 9+ messages in thread
From: Manivannan Sadhasivam @ 2020-09-28 17:04 UTC (permalink / raw)
To: Kalle Valo
Cc: Stephen Rothwell, Loic Poulain, Networking,
Linux Kernel Mailing List, ath11k, Linux Next Mailing List,
Govind Singh, David Miller
On Mon, Sep 28, 2020 at 07:45:37PM +0300, Kalle Valo wrote:
> Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> writes:
>
> > On Mon, Sep 28, 2020 at 12:34:40PM +0300, Kalle Valo wrote:
> >> Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> writes:
> >>
> >> > On Mon, Sep 28, 2020 at 06:42:30PM +1000, Stephen Rothwell wrote:
> >> >> Hi all,
> >> >>
> >> >> After merging the mhi tree, today's linux-next build (x86_64 allmodconfig)
> >> >> failed like this:
> >> >>
> >> >> drivers/net/wireless/ath/ath11k/mhi.c:27:4: error: 'struct
> >> >> mhi_channel_config' has no member named 'auto_start'
> >> >> 27 | .auto_start = false,
> >> >> | ^~~~~~~~~~
> >> >> drivers/net/wireless/ath/ath11k/mhi.c:42:4: error: 'struct
> >> >> mhi_channel_config' has no member named 'auto_start'
> >> >> 42 | .auto_start = false,
> >> >> | ^~~~~~~~~~
> >> >> drivers/net/wireless/ath/ath11k/mhi.c:57:4: error: 'struct
> >> >> mhi_channel_config' has no member named 'auto_start'
> >> >> 57 | .auto_start = true,
> >> >> | ^~~~~~~~~~
> >> >> drivers/net/wireless/ath/ath11k/mhi.c:72:4: error: 'struct
> >> >> mhi_channel_config' has no member named 'auto_start'
> >> >> 72 | .auto_start = true,
> >> >> | ^~~~~~~~~~
> >> >>
> >> >> Caused by commit
> >> >>
> >> >> ed39d7816885 ("bus: mhi: Remove auto-start option")
> >> >>
> >> >> interacting with commit
> >> >>
> >> >> 1399fb87ea3e ("ath11k: register MHI controller device for QCA6390")
> >> >>
> >> >> from the net-next tree.
> >> >>
> >> >> I applied the following merge fix patch, but maybe more is required.
> >> >> Even if so, this could be fixed now in the net-next tree.
> >> >>
> >> >> From: Stephen Rothwell <sfr@canb.auug.org.au>
> >> >> Date: Mon, 28 Sep 2020 18:39:41 +1000
> >> >> Subject: [PATCH] fix up for "ath11k: register MHI controller device for QCA6390"
> >> >>
> >> >> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> >> >
> >> > Sorry, I forgot to submit a patch against net-next for fixing this while merging
> >> > the MHI change.
> >>
> >> Try to notify the ath11k list (CCed) whenever changing MHI API so that
> >> we (ath11k folks) can be prepared for any major changes.
> >>
> >
> > Okay sure, will do!
>
> Thanks. It's important that ath11k is taken into account while making
> changes to MHI, otherwise there can easily be regressions.
>
I completely agree. Actually I thought about holding that patch till next
release and making the ath11k change together but somehow I applied that
patch blindly, my bad :(
> I was looking at commit ed39d7816885 ("bus: mhi: Remove auto-start
> option") and noticed this in the commit log:
>
> This is really up to the MHI device(channel) driver to manage the state
> of its channels.
>
> So does this mean we have to make changes in ath11k to accomodate this?
Nope. The change is needed in the MHI client driver like qrtr which is already
taken care: https://lkml.org/lkml/2020/9/28/30
Will make sure to include ath11k list for any future API changes.
Thanks,
Mani
> I haven't tested linux-next yet.
>
> --
> https://patchwork.kernel.org/project/linux-wireless/list/
>
> https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: build failure after merge of the mhi tree
2020-09-28 17:04 ` Manivannan Sadhasivam
@ 2020-09-29 6:18 ` Kalle Valo
0 siblings, 0 replies; 9+ messages in thread
From: Kalle Valo @ 2020-09-29 6:18 UTC (permalink / raw)
To: Manivannan Sadhasivam
Cc: Stephen Rothwell, Loic Poulain, Networking,
Linux Kernel Mailing List, David Miller, Linux Next Mailing List,
Govind Singh, ath11k
Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> writes:
>> I was looking at commit ed39d7816885 ("bus: mhi: Remove auto-start
>> option") and noticed this in the commit log:
>>
>> This is really up to the MHI device(channel) driver to manage the state
>> of its channels.
>>
>> So does this mean we have to make changes in ath11k to accomodate this?
>
> Nope. The change is needed in the MHI client driver like qrtr which is already
> taken care: https://lkml.org/lkml/2020/9/28/30
Ok, that's good.
> Will make sure to include ath11k list for any future API changes.
Thanks!
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: build failure after merge of the mhi tree
2020-09-28 8:42 linux-next: build failure after merge of the mhi tree Stephen Rothwell
2020-09-28 9:10 ` Manivannan Sadhasivam
@ 2020-09-29 15:35 ` Manivannan Sadhasivam
1 sibling, 0 replies; 9+ messages in thread
From: Manivannan Sadhasivam @ 2020-09-29 15:35 UTC (permalink / raw)
To: Stephen Rothwell
Cc: David Miller, Networking, Govind Singh, Kalle Valo, Loic Poulain,
Linux Next Mailing List, Linux Kernel Mailing List, ath11k
Hi,
On Mon, Sep 28, 2020 at 06:42:30PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> After merging the mhi tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> drivers/net/wireless/ath/ath11k/mhi.c:27:4: error: 'struct mhi_channel_config' has no member named 'auto_start'
> 27 | .auto_start = false,
> | ^~~~~~~~~~
> drivers/net/wireless/ath/ath11k/mhi.c:42:4: error: 'struct mhi_channel_config' has no member named 'auto_start'
> 42 | .auto_start = false,
> | ^~~~~~~~~~
> drivers/net/wireless/ath/ath11k/mhi.c:57:4: error: 'struct mhi_channel_config' has no member named 'auto_start'
> 57 | .auto_start = true,
> | ^~~~~~~~~~
> drivers/net/wireless/ath/ath11k/mhi.c:72:4: error: 'struct mhi_channel_config' has no member named 'auto_start'
> 72 | .auto_start = true,
> | ^~~~~~~~~~
>
> Caused by commit
>
> ed39d7816885 ("bus: mhi: Remove auto-start option")
>
After having the discussion with Kalle, we decided to drop these offending
patches from mhi-next (reason is net-next will be broken without these patches).
So we'll deal with this in next merge window.
Thanks,
Mani
> interacting with commit
>
> 1399fb87ea3e ("ath11k: register MHI controller device for QCA6390")
>
> from the net-next tree.
>
> I applied the following merge fix patch, but maybe more is required.
> Even if so, this could be fixed now in the net-next tree.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 28 Sep 2020 18:39:41 +1000
> Subject: [PATCH] fix up for "ath11k: register MHI controller device for QCA6390"
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/net/wireless/ath/ath11k/mhi.c | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath11k/mhi.c b/drivers/net/wireless/ath/ath11k/mhi.c
> index aded9a719d51..47a1ce1bee4f 100644
> --- a/drivers/net/wireless/ath/ath11k/mhi.c
> +++ b/drivers/net/wireless/ath/ath11k/mhi.c
> @@ -24,7 +24,6 @@ static struct mhi_channel_config ath11k_mhi_channels[] = {
> .offload_channel = false,
> .doorbell_mode_switch = false,
> .auto_queue = false,
> - .auto_start = false,
> },
> {
> .num = 1,
> @@ -39,7 +38,6 @@ static struct mhi_channel_config ath11k_mhi_channels[] = {
> .offload_channel = false,
> .doorbell_mode_switch = false,
> .auto_queue = false,
> - .auto_start = false,
> },
> {
> .num = 20,
> @@ -54,7 +52,6 @@ static struct mhi_channel_config ath11k_mhi_channels[] = {
> .offload_channel = false,
> .doorbell_mode_switch = false,
> .auto_queue = false,
> - .auto_start = true,
> },
> {
> .num = 21,
> @@ -69,7 +66,6 @@ static struct mhi_channel_config ath11k_mhi_channels[] = {
> .offload_channel = false,
> .doorbell_mode_switch = false,
> .auto_queue = true,
> - .auto_start = true,
> },
> };
>
> --
> 2.28.0
>
> --
> Cheers,
> Stephen Rothwell
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2020-09-29 15:35 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-28 8:42 linux-next: build failure after merge of the mhi tree Stephen Rothwell
2020-09-28 9:10 ` Manivannan Sadhasivam
2020-09-28 9:28 ` Stephen Rothwell
2020-09-28 9:34 ` Kalle Valo
2020-09-28 9:47 ` Manivannan Sadhasivam
2020-09-28 16:45 ` Kalle Valo
2020-09-28 17:04 ` Manivannan Sadhasivam
2020-09-29 6:18 ` Kalle Valo
2020-09-29 15:35 ` Manivannan Sadhasivam
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).