diff mbox series

ath11k: select QRTR for AHB as well

Message ID 20220401093554.360211-1-robimarko@gmail.com (mailing list archive)
State Changes Requested
Delegated to: Kalle Valo
Headers show
Series ath11k: select QRTR for AHB as well | expand

Commit Message

Robert Marko April 1, 2022, 9:35 a.m. UTC
Currently, ath11k only selects QRTR if ath11k PCI is selected, however
AHB support requires QRTR, more precisely QRTR_SMD because it is using
QMI as well which in turn uses QRTR.

Without QRTR_SMD AHB does not work, so select QRTR in ATH11K and then
select QRTR_SMD for ATH11K_AHB and QRTR_MHI for ATH11K_PCI.

Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.5.0.1-01208-QCAHKSWPL_SILICONZ-1

Signed-off-by: Robert Marko <robimarko@gmail.com>
---
 drivers/net/wireless/ath/ath11k/Kconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Kalle Valo April 1, 2022, 2:50 p.m. UTC | #1
Robert Marko <robimarko@gmail.com> writes:

> Currently, ath11k only selects QRTR if ath11k PCI is selected, however
> AHB support requires QRTR, more precisely QRTR_SMD because it is using
> QMI as well which in turn uses QRTR.
>
> Without QRTR_SMD AHB does not work, so select QRTR in ATH11K and then
> select QRTR_SMD for ATH11K_AHB and QRTR_MHI for ATH11K_PCI.
>
> Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.5.0.1-01208-QCAHKSWPL_SILICONZ-1
>
> Signed-off-by: Robert Marko <robimarko@gmail.com>
> ---
>  drivers/net/wireless/ath/ath11k/Kconfig | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/ath/ath11k/Kconfig b/drivers/net/wireless/ath/ath11k/Kconfig
> index ad5cc6cac05b..b45baad184f6 100644
> --- a/drivers/net/wireless/ath/ath11k/Kconfig
> +++ b/drivers/net/wireless/ath/ath11k/Kconfig
> @@ -5,6 +5,7 @@ config ATH11K
>  	depends on CRYPTO_MICHAEL_MIC
>  	select ATH_COMMON
>  	select QCOM_QMI_HELPERS
> +	select QRTR
>  	help
>  	  This module adds support for Qualcomm Technologies 802.11ax family of
>  	  chipsets.
> @@ -15,6 +16,7 @@ config ATH11K_AHB
>  	tristate "Atheros ath11k AHB support"
>  	depends on ATH11K
>  	depends on REMOTEPROC
> +	select QRTR_SMD
>  	help
>  	  This module adds support for AHB bus
>  
> @@ -22,7 +24,6 @@ config ATH11K_PCI
>  	tristate "Atheros ath11k PCI support"
>  	depends on ATH11K && PCI
>  	select MHI_BUS
> -	select QRTR
>  	select QRTR_MHI
>  	help
>  	  This module adds support for PCIE bus

I now see a new warning:

WARNING: unmet direct dependencies detected for QRTR_SMD
  Depends on [n]: NET [=y] && QRTR [=m] && (RPMSG [=n] || COMPILE_TEST [=n] && RPMSG [=n]=n)
  Selected by [m]:
  - ATH11K_AHB [=m] && NETDEVICES [=y] && WLAN [=y] && WLAN_VENDOR_ATH [=y] && ATH11K [=m] && REMOTEPROC [=y]
Robert Marko April 2, 2022, 9:52 a.m. UTC | #2
On Fri, 1 Apr 2022 at 16:51, Kalle Valo <kvalo@kernel.org> wrote:
>
> Robert Marko <robimarko@gmail.com> writes:
>
> > Currently, ath11k only selects QRTR if ath11k PCI is selected, however
> > AHB support requires QRTR, more precisely QRTR_SMD because it is using
> > QMI as well which in turn uses QRTR.
> >
> > Without QRTR_SMD AHB does not work, so select QRTR in ATH11K and then
> > select QRTR_SMD for ATH11K_AHB and QRTR_MHI for ATH11K_PCI.
> >
> > Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.5.0.1-01208-QCAHKSWPL_SILICONZ-1
> >
> > Signed-off-by: Robert Marko <robimarko@gmail.com>
> > ---
> >  drivers/net/wireless/ath/ath11k/Kconfig | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/wireless/ath/ath11k/Kconfig b/drivers/net/wireless/ath/ath11k/Kconfig
> > index ad5cc6cac05b..b45baad184f6 100644
> > --- a/drivers/net/wireless/ath/ath11k/Kconfig
> > +++ b/drivers/net/wireless/ath/ath11k/Kconfig
> > @@ -5,6 +5,7 @@ config ATH11K
> >       depends on CRYPTO_MICHAEL_MIC
> >       select ATH_COMMON
> >       select QCOM_QMI_HELPERS
> > +     select QRTR
> >       help
> >         This module adds support for Qualcomm Technologies 802.11ax family of
> >         chipsets.
> > @@ -15,6 +16,7 @@ config ATH11K_AHB
> >       tristate "Atheros ath11k AHB support"
> >       depends on ATH11K
> >       depends on REMOTEPROC
> > +     select QRTR_SMD
> >       help
> >         This module adds support for AHB bus
> >
> > @@ -22,7 +24,6 @@ config ATH11K_PCI
> >       tristate "Atheros ath11k PCI support"
> >       depends on ATH11K && PCI
> >       select MHI_BUS
> > -     select QRTR
> >       select QRTR_MHI
> >       help
> >         This module adds support for PCIE bus
>
> I now see a new warning:
>
> WARNING: unmet direct dependencies detected for QRTR_SMD
>   Depends on [n]: NET [=y] && QRTR [=m] && (RPMSG [=n] || COMPILE_TEST [=n] && RPMSG [=n]=n)
>   Selected by [m]:
>   - ATH11K_AHB [=m] && NETDEVICES [=y] && WLAN [=y] && WLAN_VENDOR_ATH [=y] && ATH11K [=m] && REMOTEPROC [=y]

Ahh yeah, since it's SMD then it requires RPMGS which in turn requires
more stuff.
What do you think about making it depend on QRTR_SMD instead, because
without it AHB literally does not work?

Regards,
Robert
>
> --
> https://patchwork.kernel.org/project/linux-wireless/list/
>
> https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Kalle Valo April 4, 2022, 7:06 a.m. UTC | #3
Robert Marko <robimarko@gmail.com> writes:

> On Fri, 1 Apr 2022 at 16:51, Kalle Valo <kvalo@kernel.org> wrote:
>>
>> Robert Marko <robimarko@gmail.com> writes:
>>
>> > Currently, ath11k only selects QRTR if ath11k PCI is selected, however
>> > AHB support requires QRTR, more precisely QRTR_SMD because it is using
>> > QMI as well which in turn uses QRTR.
>> >
>> > Without QRTR_SMD AHB does not work, so select QRTR in ATH11K and then
>> > select QRTR_SMD for ATH11K_AHB and QRTR_MHI for ATH11K_PCI.
>> >
>> > Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.5.0.1-01208-QCAHKSWPL_SILICONZ-1
>> >
>> > Signed-off-by: Robert Marko <robimarko@gmail.com>
>> > ---
>> >  drivers/net/wireless/ath/ath11k/Kconfig | 3 ++-
>> >  1 file changed, 2 insertions(+), 1 deletion(-)
>> >
>> > diff --git a/drivers/net/wireless/ath/ath11k/Kconfig b/drivers/net/wireless/ath/ath11k/Kconfig
>> > index ad5cc6cac05b..b45baad184f6 100644
>> > --- a/drivers/net/wireless/ath/ath11k/Kconfig
>> > +++ b/drivers/net/wireless/ath/ath11k/Kconfig
>> > @@ -5,6 +5,7 @@ config ATH11K
>> >       depends on CRYPTO_MICHAEL_MIC
>> >       select ATH_COMMON
>> >       select QCOM_QMI_HELPERS
>> > +     select QRTR
>> >       help
>> >         This module adds support for Qualcomm Technologies 802.11ax family of
>> >         chipsets.
>> > @@ -15,6 +16,7 @@ config ATH11K_AHB
>> >       tristate "Atheros ath11k AHB support"
>> >       depends on ATH11K
>> >       depends on REMOTEPROC
>> > +     select QRTR_SMD
>> >       help
>> >         This module adds support for AHB bus
>> >
>> > @@ -22,7 +24,6 @@ config ATH11K_PCI
>> >       tristate "Atheros ath11k PCI support"
>> >       depends on ATH11K && PCI
>> >       select MHI_BUS
>> > -     select QRTR
>> >       select QRTR_MHI
>> >       help
>> >         This module adds support for PCIE bus
>>
>> I now see a new warning:
>>
>> WARNING: unmet direct dependencies detected for QRTR_SMD
>>   Depends on [n]: NET [=y] && QRTR [=m] && (RPMSG [=n] || COMPILE_TEST [=n] && RPMSG [=n]=n)
>>   Selected by [m]:
>>   - ATH11K_AHB [=m] && NETDEVICES [=y] && WLAN [=y] && WLAN_VENDOR_ATH [=y] && ATH11K [=m] && REMOTEPROC [=y]
>
> Ahh yeah, since it's SMD then it requires RPMGS which in turn requires
> more stuff. What do you think about making it depend on QRTR_SMD
> instead, because without it AHB literally does not work?

To be honest I don't know qrtr well enough to comment right now :)
Robert Marko April 4, 2022, 8:26 a.m. UTC | #4
On Mon, 4 Apr 2022 at 09:06, Kalle Valo <kvalo@kernel.org> wrote:
>
> Robert Marko <robimarko@gmail.com> writes:
>
> > On Fri, 1 Apr 2022 at 16:51, Kalle Valo <kvalo@kernel.org> wrote:
> >>
> >> Robert Marko <robimarko@gmail.com> writes:
> >>
> >> > Currently, ath11k only selects QRTR if ath11k PCI is selected, however
> >> > AHB support requires QRTR, more precisely QRTR_SMD because it is using
> >> > QMI as well which in turn uses QRTR.
> >> >
> >> > Without QRTR_SMD AHB does not work, so select QRTR in ATH11K and then
> >> > select QRTR_SMD for ATH11K_AHB and QRTR_MHI for ATH11K_PCI.
> >> >
> >> > Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.5.0.1-01208-QCAHKSWPL_SILICONZ-1
> >> >
> >> > Signed-off-by: Robert Marko <robimarko@gmail.com>
> >> > ---
> >> >  drivers/net/wireless/ath/ath11k/Kconfig | 3 ++-
> >> >  1 file changed, 2 insertions(+), 1 deletion(-)
> >> >
> >> > diff --git a/drivers/net/wireless/ath/ath11k/Kconfig b/drivers/net/wireless/ath/ath11k/Kconfig
> >> > index ad5cc6cac05b..b45baad184f6 100644
> >> > --- a/drivers/net/wireless/ath/ath11k/Kconfig
> >> > +++ b/drivers/net/wireless/ath/ath11k/Kconfig
> >> > @@ -5,6 +5,7 @@ config ATH11K
> >> >       depends on CRYPTO_MICHAEL_MIC
> >> >       select ATH_COMMON
> >> >       select QCOM_QMI_HELPERS
> >> > +     select QRTR
> >> >       help
> >> >         This module adds support for Qualcomm Technologies 802.11ax family of
> >> >         chipsets.
> >> > @@ -15,6 +16,7 @@ config ATH11K_AHB
> >> >       tristate "Atheros ath11k AHB support"
> >> >       depends on ATH11K
> >> >       depends on REMOTEPROC
> >> > +     select QRTR_SMD
> >> >       help
> >> >         This module adds support for AHB bus
> >> >
> >> > @@ -22,7 +24,6 @@ config ATH11K_PCI
> >> >       tristate "Atheros ath11k PCI support"
> >> >       depends on ATH11K && PCI
> >> >       select MHI_BUS
> >> > -     select QRTR
> >> >       select QRTR_MHI
> >> >       help
> >> >         This module adds support for PCIE bus
> >>
> >> I now see a new warning:
> >>
> >> WARNING: unmet direct dependencies detected for QRTR_SMD
> >>   Depends on [n]: NET [=y] && QRTR [=m] && (RPMSG [=n] || COMPILE_TEST [=n] && RPMSG [=n]=n)
> >>   Selected by [m]:
> >>   - ATH11K_AHB [=m] && NETDEVICES [=y] && WLAN [=y] && WLAN_VENDOR_ATH [=y] && ATH11K [=m] && REMOTEPROC [=y]
> >
> > Ahh yeah, since it's SMD then it requires RPMGS which in turn requires
> > more stuff. What do you think about making it depend on QRTR_SMD
> > instead, because without it AHB literally does not work?
>
> To be honest I don't know qrtr well enough to comment right now :)

I dont know details about QRTR as well, but I know that its used for
both AHB and PCI versions for QMI.
AHB versions use it over SMD and without it, AHB support wont work, it
will find the HW model and revision and that's it, only after the
QRTR_SMD is inserted you can use QMI to load the caldata etc.

Regards,
Robert
>
> --
> https://patchwork.kernel.org/project/linux-wireless/list/
>
> https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
diff mbox series

Patch

diff --git a/drivers/net/wireless/ath/ath11k/Kconfig b/drivers/net/wireless/ath/ath11k/Kconfig
index ad5cc6cac05b..b45baad184f6 100644
--- a/drivers/net/wireless/ath/ath11k/Kconfig
+++ b/drivers/net/wireless/ath/ath11k/Kconfig
@@ -5,6 +5,7 @@  config ATH11K
 	depends on CRYPTO_MICHAEL_MIC
 	select ATH_COMMON
 	select QCOM_QMI_HELPERS
+	select QRTR
 	help
 	  This module adds support for Qualcomm Technologies 802.11ax family of
 	  chipsets.
@@ -15,6 +16,7 @@  config ATH11K_AHB
 	tristate "Atheros ath11k AHB support"
 	depends on ATH11K
 	depends on REMOTEPROC
+	select QRTR_SMD
 	help
 	  This module adds support for AHB bus
 
@@ -22,7 +24,6 @@  config ATH11K_PCI
 	tristate "Atheros ath11k PCI support"
 	depends on ATH11K && PCI
 	select MHI_BUS
-	select QRTR
 	select QRTR_MHI
 	help
 	  This module adds support for PCIE bus