Skip to contentSkip to conversation

Use default .cfg file name for RTL8723BS devices with id of OBDA8723

PATCH NAK Ian W MORRISON 3 participants 3 messages Aug 14, 2018 Bluetooth drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Use default .cfg file name for RTL8723BS devices with id of OBDA8723

For RTL8723BS devices the current config file name is a composite of both the config name (rtl8723bs) and a postfix of the device-id.

Given the majority of RTL8723BS devices use a device-id of OBDA8723 this simplifies the config file name to use "rtl8723bs_config.bin" as a default of for these devices.

---
 drivers/bluetooth/hci_h5.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/bluetooth/hci_h5.c +3 -1
index 8eede1197cd2..cce422dc1b8d 100644
@@ -852,7 +852,9 @@ static int h5_btrtl_setup(struct h5 *h5)
 	bool flow_control;
 	int err;
 
-	btrtl_dev = btrtl_initialize(h5->hu->hdev, h5->id);
+	btrtl_dev = strcmp("OBDA8723", h5->id) ?
+		btrtl_initialize(h5->hu->hdev, h5->id) :
+			btrtl_initialize(h5->hu->hdev, NULL);
 	if (IS_ERR(btrtl_dev))
 		return PTR_ERR(btrtl_dev);
 
Signature · 1 line
2.17.1
maintainer
#1 lore raw

Hi Ian,

Quoted 17 lines

For RTL8723BS devices the current config file name is a composite of both the config name (rtl8723bs) and a postfix of the device-id.

Given the majority of RTL8723BS devices use a device-id of OBDA8723 this simplifies the config file name to use "rtl8723bs_config.bin" as a default of for these devices.

---
drivers/bluetooth/hci_h5.c | 4 +++-

1 file changed, 3 insertions(+), 1 deletion(-)
drivers/bluetooth/hci_h5.c +0 -0
index 8eede1197cd2..cce422dc1b8d 100644

drivers/bluetooth/hci_h5.c static int h5_btrtl_setup(struct h5 *h5) · line 857

Quoted 7 lines
drivers/bluetooth/hci_h5.c +3 -1
@@ -852,7 +852,9 @@ static int h5_btrtl_setup(struct h5 *h5)
 	bool flow_control;
 	int err;
 
-	btrtl_dev = btrtl_initialize(h5->hu->hdev, h5->id);
+	btrtl_dev = strcmp("OBDA8723", h5->id) ?
+		btrtl_initialize(h5->hu->hdev, h5->id) :
+			btrtl_initialize(h5->hu->hdev, NULL);

I am not letting you duplicate the PNPID here. This needs to be done cleanly with the device table that is already present.

Regards

Marcel

#2 lore raw
In reply to Ian W MORRISON

Hi,

Quoted 6 lines · Ian W MORRISON

For RTL8723BS devices the current config file name is a composite of both the config name (rtl8723bs) and a postfix of the device-id.

Given the majority of RTL8723BS devices use a device-id of OBDA8723 this simplifies the config file name to use "rtl8723bs_config.bin" as a default of for these devices.

NACK, the device id is in there for a reason, once someone writes support for it we will also need a rtl8723bs_config file on ARM boards, which will definitely be board specific. I don't want us to pretend there is one config to rule them all.

Specifically I plan to submit both the firmware and rtl8723bs_config-OBDA8723.bin to linux-firmware soon, if the kernel instead looks for just rtl8723bs_config.bin then I need to give it that name in linux-firmware and then when we get ARM support and the kernel complains about e.g. rtl8723bs_config-NextThingCo-CHIP.bin not being there people may be tempted to think they can just link to the "generic" one from linux-firmware which then turns out to not be generic at all.

Regards,

Hans

Quoted 22 lines
---
  drivers/bluetooth/hci_h5.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
drivers/bluetooth/hci_h5.c +3 -1
index 8eede1197cd2..cce422dc1b8d 100644
@@ -852,7 +852,9 @@ static int h5_btrtl_setup(struct h5 *h5)
  	bool flow_control;
  	int err;
 
-	btrtl_dev = btrtl_initialize(h5->hu->hdev, h5->id);
+	btrtl_dev = strcmp("OBDA8723", h5->id) ?
+		btrtl_initialize(h5->hu->hdev, h5->id) :
+			btrtl_initialize(h5->hu->hdev, NULL);
  	if (IS_ERR(btrtl_dev))
  		return PTR_ERR(btrtl_dev);