GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-06-17 20:25:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bluetooth: btintel: Create common Intel Secure Send function

Browse source 
The Intel Secure Send command is used the same in USB and UART drivers
and with that move a generic version into the Intel module.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Marcel Holtmann 2015-07-05 14:55:36 +02:00
parent 35ab8150ee
commit 09df123d2d
4 changed files with 42 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

32
drivers/bluetooth/hci_intel.c
View file

@ -111,30 +111,6 @@ static int inject_cmd_complete(struct hci_dev *hdev, __u16 opcode)
return hci_recv_frame(hdev, skb);
}
static int intel_secure_send(struct hci_dev *hdev, u8 fragment_type,
u32 plen, const void *param)
{
while (plen > 0) {
struct sk_buff *skb;
u8 cmd_param[253], fragment_len = (plen > 252) ? 252 : plen;
cmd_param[0] = fragment_type;
memcpy(cmd_param + 1, param, fragment_len);
skb = __hci_cmd_sync(hdev, 0xfc09, fragment_len + 1,
cmd_param, HCI_INIT_TIMEOUT);
if (IS_ERR(skb))
return PTR_ERR(skb);
kfree_skb(skb);
plen -= fragment_len;
param += fragment_len;
}
return 0;
}
static void intel_version_info(struct hci_dev *hdev,
struct intel_version *ver)
{
@ -350,7 +326,7 @@ static int intel_setup(struct hci_uart *hu)
/* Start the firmware download transaction with the Init fragment
* represented by the 128 bytes of CSS header.
*/
err = intel_secure_send(hdev, 0x00, 128, fw->data);
err = btintel_secure_send(hdev, 0x00, 128, fw->data);
if (err < 0) {
BT_ERR("%s: Failed to send firmware header (%d)",
hdev->name, err);
@ -360,7 +336,7 @@ static int intel_setup(struct hci_uart *hu)
/* Send the 256 bytes of public key information from the firmware
* as the PKey fragment.
*/
err = intel_secure_send(hdev, 0x03, 256, fw->data + 128);
err = btintel_secure_send(hdev, 0x03, 256, fw->data + 128);
if (err < 0) {
BT_ERR("%s: Failed to send firmware public key (%d)",
hdev->name, err);
@ -370,7 +346,7 @@ static int intel_setup(struct hci_uart *hu)
/* Send the 256 bytes of signature information from the firmware
* as the Sign fragment.
*/
err = intel_secure_send(hdev, 0x02, 256, fw->data + 388);
err = btintel_secure_send(hdev, 0x02, 256, fw->data + 388);
if (err < 0) {
BT_ERR("%s: Failed to send firmware signature (%d)",
hdev->name, err);
@ -402,7 +378,7 @@ static int intel_setup(struct hci_uart *hu)
/* Send each command from the firmware data buffer as
* a single Data fragment.
*/
err = intel_secure_send(hdev, 0x01, frag_len, fw_ptr);
err = btintel_secure_send(hdev, 0x01, frag_len, fw_ptr);
if (err < 0) {
BT_ERR("%s: Failed to send firmware data (%d)",
hdev->name, err);