Bluetooth: hci_sync: Add EXPORT_SYMBOL to hci_reset_sync
Subsystems (2)
Luiz Augusto von Dentz
maintainerPATCH v3 1/2 Bluetooth: hci_sync: Add EXPORT_SYMBOL to hci_reset_sync
From: Luiz Augusto von Dentz <[email protected]>
This adds EXPORT_SYMBOL to hci_reset_sync so it can be used by modules.
--- net/bluetooth/hci_sync.c | 1 + 1 file changed, 1 insertion(+)
net/bluetooth/hci_sync.c +1 -0
@@ -3486,6 +3486,7 @@ int hci_reset_sync(struct hci_dev *hdev)return 0 ; } +EXPORT_SYMBOL (hci_reset_sync);static int hci_init0_sync (struct hci_dev *hdev) {
Signature · 1 line
2.44.0
Luiz Augusto von Dentz
maintainerPATCH v3 2/2 Bluetooth: btintel: Attempt to reset if Read Version fail during setup
From: Luiz Augusto von Dentz <[email protected]>
During setup callback the code would attempt to send Read Version which sometimes can fail due to ncmd being set to 0 which would block any command from being send which is why INTEL_BROKEN_INITIAL_NCMD was introduced.
--- drivers/bluetooth/btintel.c | 70 ++++++++++++++++++++++++------------- 1 file changed, 45 insertions(+), 25 deletions(-)
drivers/bluetooth/btintel.c +45 -25
@@ -430,18 +430,18 @@ int btintel_set_event_mask_mfg(struct hci_dev *hdev, bool debug) }EXPORT_SYMBOL_GPL (btintel_set_event_mask_mfg); +static struct sk_buff *btintel_read_version_skb (struct hci_dev *hdev, +u32 plen,const char *param) +{ +return __hci_cmd_sync (hdev,0xfc05 , plen, param,HCI_CMD_TIMEOUT ); +} +int btintel_read_version (struct hci_dev *hdev,struct intel_version *ver) {struct sk_buff *skb; - skb =__hci_cmd_sync (hdev,0xfc05 ,0 ,NULL ,HCI_CMD_TIMEOUT ); -if (IS_ERR (skb)) { -bt_dev_err (hdev,"Reading Intel version information failed (%ld)" , -PTR_ERR (skb)); -return PTR_ERR (skb); - } - -if (!skb || skb->len !=sizeof (*ver)) { + skb =btintel_read_version_skb (hdev,0 ,NULL ); +if (IS_ERR (skb) || skb->len !=sizeof (*ver)) {bt_dev_err (hdev,"Intel version event size mismatch" );kfree_skb (skb);return -EILSEQ ;
@@ -655,12 +655,9 @@ static int btintel_read_version_tlv(struct hci_dev *hdev,struct sk_buff *skb;const u8 param[1 ] = {0xFF }; -if (!version) -return -EINVAL ; - - skb =__hci_cmd_sync (hdev,0xfc05 ,1 , param,HCI_CMD_TIMEOUT ); + skb =btintel_read_version_skb (hdev,sizeof (param), param);if (IS_ERR (skb)) { -bt_dev_err (hdev,"Reading Intel version information failed (%ld)" , +bt_dev_err (hdev,"Intel Read Version command failed (%ld)" ,PTR_ERR (skb));return PTR_ERR (skb); }
@@ -672,12 +669,44 @@ static int btintel_read_version_tlv(struct hci_dev *hdev,return -EIO ; } -btintel_parse_version_tlv (hdev, version, skb); +if (version) +btintel_parse_version_tlv (hdev, version, skb);kfree_skb (skb);return 0 ; } +static struct sk_buff *btintel_read_version_setup (struct hci_dev *hdev) +{ +int err; +struct sk_buff *skb; +const u8 param[1 ] = {0xFF }; + + skb =btintel_read_version_skb (hdev,sizeof (param), param); +if (!IS_ERR (skb)) + goto done; + +/* Attempt to reset if the command times out since this could be +* because the ncmd is set to 0 therefore no command will be able to be +* sent. +*/ + err =hci_reset_sync (hdev); +if (err) +return ERR_PTR (err); + + skb =btintel_read_version_skb (hdev,sizeof (param), param); +if (IS_ERR (skb)) +return skb; + +done: +if (skb->data[0 ]) { +kfree_skb (skb); +return ERR_PTR (-EIO ); + } + +return skb; +} +/* ------- REGMAP IBT SUPPORT ------- */ #define IBT_REG_MODE_8BIT 0x00
@@ -2821,7 +2850,6 @@ static void btintel_print_fseq_info(struct hci_dev *hdev)static int btintel_setup_combined (struct hci_dev *hdev) { -const u8 param[1 ] = {0xFF };struct intel_version ver;struct intel_version_tlv ver_tlv;struct sk_buff *skb;
@@ -2862,18 +2890,10 @@ static int btintel_setup_combined(struct hci_dev *hdev)* command has a parameter and returns a correct version information. * So, it uses new format to support both legacy and new format. */ - skb =__hci_cmd_sync (hdev,0xfc05 ,1 , param,HCI_CMD_TIMEOUT ); + skb =btintel_read_version_setup (hdev);if (IS_ERR (skb)) { -bt_dev_err (hdev,"Reading Intel version command failed (%ld)" , +bt_dev_err (hdev,"Intel Read Version command failed (%ld)" ,PTR_ERR (skb)); -return PTR_ERR (skb); - } - -/* Check the status */ -if (skb->data[0 ]) { -bt_dev_err (hdev,"Intel Read Version command failed (%02x)" , - skb->data[0 ]); - err = -EIO ; goto exit_error; }
Signature · 1 line
2.44.0
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=843648
---Test result---
Test Summary:
CheckPatch PASS 1.01 seconds GitLint PASS 0.58 seconds SubjectPrefix PASS 0.11 seconds BuildKernel PASS 30.69 seconds CheckAllWarning PASS 32.86 seconds CheckSparse PASS 38.69 seconds CheckSmatch FAIL 35.00 seconds BuildKernel32 PASS 28.81 seconds TestRunnerSetup PASS 518.19 seconds TestRunner_l2cap-tester PASS 18.29 seconds TestRunner_iso-tester PASS 30.92 seconds TestRunner_bnep-tester PASS 4.67 seconds TestRunner_mgmt-tester PASS 110.54 seconds TestRunner_rfcomm-tester PASS 7.22 seconds TestRunner_sco-tester PASS 14.90 seconds TestRunner_ioctl-tester PASS 7.60 seconds TestRunner_mesh-tester PASS 5.77 seconds TestRunner_smp-tester PASS 6.72 seconds TestRunner_userchan-tester PASS 4.78 seconds IncrementalBuild PASS 32.82 seconds
Details
##############################
Test: CheckSmatch - FAIL
Desc: Run smatch tool with source
Output:
Segmentation fault (core dumped)
make[4]: *** [scripts/Makefile.build:244: net/bluetooth/hci_core.o] Error 139 make[4]: *** Deleting file 'net/bluetooth/hci_core.o'
make[3]: *** [scripts/Makefile.build:485: net/bluetooth] Error 2 make[2]: *** [scripts/Makefile.build:485: net] Error 2
make[2]: *** Waiting for unfinished jobs....
Segmentation fault (core dumped)
make[4]: *** [scripts/Makefile.build:244: drivers/bluetooth/bcm203x.o] Error 139 make[4]: *** Deleting file 'drivers/bluetooth/bcm203x.o'
make[4]: *** Waiting for unfinished jobs....
make[3]: *** [scripts/Makefile.build:485: drivers/bluetooth] Error 2 make[2]: *** [scripts/Makefile.build:485: drivers] Error 2
make[1]: *** [/github/workspace/src/src/Makefile:1919: .] Error 2
make: *** [Makefile:240: __sub-make] Error 2
---
Regards,
Linux Bluetooth