* [PATCH] Bluetooth: btrsi: rework dependencies
@ 2018-03-15 15:42 Arnd Bergmann
2018-03-15 15:50 ` Marcel Holtmann
0 siblings, 1 reply; 4+ messages in thread
From: Arnd Bergmann @ 2018-03-15 15:42 UTC (permalink / raw)
To: Marcel Holtmann, Johan Hedberg, Kalle Valo, Arnd Bergmann
Cc: linux-bluetooth, linux-kernel, linux-wireless, netdev
The linkage between the bluetooth driver and the wireless
driver is not defined properly, leading to build problems
such as:
warning: (BT_HCIRSI) selects RSI_COEX which has unmet direct dependencies (NETDEVICES && WLAN && WLAN_VENDOR_RSI && BT_HCIRSI && RSI_91X)
drivers/net/wireless/rsi/rsi_91x_main.o: In function `rsi_read_pkt':
(.text+0x205): undefined reference to `rsi_bt_ops'
To actually make it work, we need the following steps:
- remove the bogus 'select RSI_COEX', this is already covered
by the default
- change RSI_COEX to a 'bool' symbol so that the #ifdefs work
all the time
- ensure that BT_HCIRSI is built-in whenever RSI_91X is built-in
- prevent BT_HCIRSI from being enabled when CONFIG_BT=m and
RSI_91X=y, as this cannot work
Fixes: 38aa4da50483 ("Bluetooth: btrsi: add new rsi bluetooth driver")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/bluetooth/Kconfig | 9 ++++++++-
drivers/bluetooth/Makefile | 2 +-
drivers/net/wireless/rsi/Kconfig | 6 +-----
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig
index d8bbd661dbdb..6b3e8bf69d07 100644
--- a/drivers/bluetooth/Kconfig
+++ b/drivers/bluetooth/Kconfig
@@ -394,8 +394,9 @@ config BT_QCOMSMD
config BT_HCIRSI
tristate "Redpine HCI support"
+ depends on RSI_91X
+ depends on !(BT=m && RSI_91X=y)
default n
- select RSI_COEX
help
Redpine BT driver.
This driver handles BT traffic from upper layers and pass
@@ -404,4 +405,10 @@ config BT_HCIRSI
Say Y here to compile support for HCI over Redpine into the
kernel or say M to compile as a module.
+config BT_HCIRSI_MODULE
+ tristate
+ # ensure that the BT_HCIRSI driver is visible to the core
+ default y if BT_HCIRSI=m && RSI_91X=y
+ default BT_HCIRSI
+
endmenu
diff --git a/drivers/bluetooth/Makefile b/drivers/bluetooth/Makefile
index 03cfc1b20c4a..9e8d22712ff3 100644
--- a/drivers/bluetooth/Makefile
+++ b/drivers/bluetooth/Makefile
@@ -28,7 +28,7 @@ obj-$(CONFIG_BT_QCA) += btqca.o
obj-$(CONFIG_BT_HCIUART_NOKIA) += hci_nokia.o
-obj-$(CONFIG_BT_HCIRSI) += btrsi.o
+obj-$(CONFIG_BT_HCIRSI_MODULE) += btrsi.o
btmrvl-y := btmrvl_main.o
btmrvl-$(CONFIG_DEBUG_FS) += btmrvl_debugfs.o
diff --git a/drivers/net/wireless/rsi/Kconfig b/drivers/net/wireless/rsi/Kconfig
index f004be33fcfa..bc6195767c61 100644
--- a/drivers/net/wireless/rsi/Kconfig
+++ b/drivers/net/wireless/rsi/Kconfig
@@ -43,12 +43,8 @@ config RSI_USB
Select M (recommended), if you have a RSI 1x1 wireless module.
config RSI_COEX
- bool "Redpine Signals WLAN BT Coexistence support"
- depends on BT_HCIRSI && RSI_91X
- default y
+ def_bool BT_HCIRSI && RSI_91X
---help---
This option enables the WLAN BT coex support in rsi drivers.
- Select M (recommended), if you have want to use this feature
- and you have RS9113 module.
endif # WLAN_VENDOR_RSI
--
2.9.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] Bluetooth: btrsi: rework dependencies
2018-03-15 15:42 [PATCH] Bluetooth: btrsi: rework dependencies Arnd Bergmann
@ 2018-03-15 15:50 ` Marcel Holtmann
2018-03-15 15:57 ` Arnd Bergmann
0 siblings, 1 reply; 4+ messages in thread
From: Marcel Holtmann @ 2018-03-15 15:50 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Johan Hedberg, Kalle Valo, Linux Bluetooth mailing list, LKML,
linux-wireless, netdev
Hi Arnd,
> The linkage between the bluetooth driver and the wireless
> driver is not defined properly, leading to build problems
> such as:
>
> warning: (BT_HCIRSI) selects RSI_COEX which has unmet direct dependencies (NETDEVICES && WLAN && WLAN_VENDOR_RSI && BT_HCIRSI && RSI_91X)
> drivers/net/wireless/rsi/rsi_91x_main.o: In function `rsi_read_pkt':
> (.text+0x205): undefined reference to `rsi_bt_ops'
>
> To actually make it work, we need the following steps:
>
> - remove the bogus 'select RSI_COEX', this is already covered
> by the default
> - change RSI_COEX to a 'bool' symbol so that the #ifdefs work
> all the time
> - ensure that BT_HCIRSI is built-in whenever RSI_91X is built-in
> - prevent BT_HCIRSI from being enabled when CONFIG_BT=m and
> RSI_91X=y, as this cannot work
>
> Fixes: 38aa4da50483 ("Bluetooth: btrsi: add new rsi bluetooth driver")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> drivers/bluetooth/Kconfig | 9 ++++++++-
> drivers/bluetooth/Makefile | 2 +-
> drivers/net/wireless/rsi/Kconfig | 6 +-----
> 3 files changed, 10 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig
> index d8bbd661dbdb..6b3e8bf69d07 100644
> --- a/drivers/bluetooth/Kconfig
> +++ b/drivers/bluetooth/Kconfig
> @@ -394,8 +394,9 @@ config BT_QCOMSMD
>
> config BT_HCIRSI
> tristate "Redpine HCI support"
> + depends on RSI_91X
> + depends on !(BT=m && RSI_91X=y)
> default n
> - select RSI_COEX
> help
> Redpine BT driver.
> This driver handles BT traffic from upper layers and pass
> @@ -404,4 +405,10 @@ config BT_HCIRSI
> Say Y here to compile support for HCI over Redpine into the
> kernel or say M to compile as a module.
>
> +config BT_HCIRSI_MODULE
> + tristate
> + # ensure that the BT_HCIRSI driver is visible to the core
> + default y if BT_HCIRSI=m && RSI_91X=y
> + default BT_HCIRSI
> +
> endmenu
> diff --git a/drivers/bluetooth/Makefile b/drivers/bluetooth/Makefile
> index 03cfc1b20c4a..9e8d22712ff3 100644
> --- a/drivers/bluetooth/Makefile
> +++ b/drivers/bluetooth/Makefile
> @@ -28,7 +28,7 @@ obj-$(CONFIG_BT_QCA) += btqca.o
>
> obj-$(CONFIG_BT_HCIUART_NOKIA) += hci_nokia.o
>
> -obj-$(CONFIG_BT_HCIRSI) += btrsi.o
> +obj-$(CONFIG_BT_HCIRSI_MODULE) += btrsi.o
do we need this new option? I have avoided these kind of complex things multi config entries. Can we not just select the RSI_91X?
Regards
Marcel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Bluetooth: btrsi: rework dependencies
2018-03-15 15:50 ` Marcel Holtmann
@ 2018-03-15 15:57 ` Arnd Bergmann
2018-03-15 16:03 ` Marcel Holtmann
0 siblings, 1 reply; 4+ messages in thread
From: Arnd Bergmann @ 2018-03-15 15:57 UTC (permalink / raw)
To: Marcel Holtmann
Cc: Johan Hedberg, Kalle Valo, Linux Bluetooth mailing list, LKML,
linux-wireless, Networking
On Thu, Mar 15, 2018 at 4:50 PM, Marcel Holtmann <marcel@holtmann.org> wrote:
>> diff --git a/drivers/bluetooth/Makefile b/drivers/bluetooth/Makefile
>> index 03cfc1b20c4a..9e8d22712ff3 100644
>> --- a/drivers/bluetooth/Makefile
>> +++ b/drivers/bluetooth/Makefile
>> @@ -28,7 +28,7 @@ obj-$(CONFIG_BT_QCA) += btqca.o
>>
>> obj-$(CONFIG_BT_HCIUART_NOKIA) += hci_nokia.o
>>
>> -obj-$(CONFIG_BT_HCIRSI) += btrsi.o
>> +obj-$(CONFIG_BT_HCIRSI_MODULE) += btrsi.o
>
> do we need this new option? I have avoided these kind of complex things multi config entries. Can we not just select the RSI_91X?
>
I couldn't come up with a simpler way to do this.
Selecting RSI_91X is not possible unless we make the BT
driver 'depend on WLAN_VENDOR_RSI && MAC80211',
which is even more backwards.
The problem here is that it's actually a reverse dependency:
the wlan driver calls into the bt driver.
What we could do is to make BT_HCIRSI a silent symbol
and have that selected by RSI_COEX, which can then
be user-visible. With that, the Kconfig structure would follow
what the code does.
Arnd
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Bluetooth: btrsi: rework dependencies
2018-03-15 15:57 ` Arnd Bergmann
@ 2018-03-15 16:03 ` Marcel Holtmann
0 siblings, 0 replies; 4+ messages in thread
From: Marcel Holtmann @ 2018-03-15 16:03 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Johan Hedberg, Kalle Valo, Linux Bluetooth mailing list, LKML,
linux-wireless, Networking
Hi Arnd,
>>> diff --git a/drivers/bluetooth/Makefile b/drivers/bluetooth/Makefile
>>> index 03cfc1b20c4a..9e8d22712ff3 100644
>>> --- a/drivers/bluetooth/Makefile
>>> +++ b/drivers/bluetooth/Makefile
>>> @@ -28,7 +28,7 @@ obj-$(CONFIG_BT_QCA) += btqca.o
>>>
>>> obj-$(CONFIG_BT_HCIUART_NOKIA) += hci_nokia.o
>>>
>>> -obj-$(CONFIG_BT_HCIRSI) += btrsi.o
>>> +obj-$(CONFIG_BT_HCIRSI_MODULE) += btrsi.o
>>
>> do we need this new option? I have avoided these kind of complex things multi config entries. Can we not just select the RSI_91X?
>>
>
> I couldn't come up with a simpler way to do this.
> Selecting RSI_91X is not possible unless we make the BT
> driver 'depend on WLAN_VENDOR_RSI && MAC80211',
> which is even more backwards.
>
> The problem here is that it's actually a reverse dependency:
> the wlan driver calls into the bt driver.
>
> What we could do is to make BT_HCIRSI a silent symbol
> and have that selected by RSI_COEX, which can then
> be user-visible. With that, the Kconfig structure would follow
> what the code does.
that sounds a bit better to me. If the RSI driver maintainers don’t like that, then they should re-architect the code to make this more dynamic and flexible.
Regards
Marcel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-03-15 16:03 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-15 15:42 [PATCH] Bluetooth: btrsi: rework dependencies Arnd Bergmann
2018-03-15 15:50 ` Marcel Holtmann
2018-03-15 15:57 ` Arnd Bergmann
2018-03-15 16:03 ` Marcel Holtmann
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.