Commit 3e4543ab authored by Bing Zhao's avatar Bing Zhao Committed by Gustavo Padovan

Bluetooth: btmrvl: operate on 16-bit opcodes instead of ogf/ocf

Replace ogf/ocf and its packing with 16-bit opcodes.
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarAmitkumar Karwar <akarwar@marvell.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 6a070e6e
...@@ -90,12 +90,12 @@ struct btmrvl_private { ...@@ -90,12 +90,12 @@ struct btmrvl_private {
#define MRVL_VENDOR_PKT 0xFE #define MRVL_VENDOR_PKT 0xFE
/* Bluetooth commands */ /* Vendor specific Bluetooth commands */
#define BT_CMD_AUTO_SLEEP_MODE 0x23 #define BT_CMD_AUTO_SLEEP_MODE 0xFC23
#define BT_CMD_HOST_SLEEP_CONFIG 0x59 #define BT_CMD_HOST_SLEEP_CONFIG 0xFC59
#define BT_CMD_HOST_SLEEP_ENABLE 0x5A #define BT_CMD_HOST_SLEEP_ENABLE 0xFC5A
#define BT_CMD_MODULE_CFG_REQ 0x5B #define BT_CMD_MODULE_CFG_REQ 0xFC5B
#define BT_CMD_LOAD_CONFIG_DATA 0x61 #define BT_CMD_LOAD_CONFIG_DATA 0xFC61
/* Sub-commands: Module Bringup/Shutdown Request/Response */ /* Sub-commands: Module Bringup/Shutdown Request/Response */
#define MODULE_BRINGUP_REQ 0xF1 #define MODULE_BRINGUP_REQ 0xF1
...@@ -104,6 +104,11 @@ struct btmrvl_private { ...@@ -104,6 +104,11 @@ struct btmrvl_private {
#define MODULE_SHUTDOWN_REQ 0xF2 #define MODULE_SHUTDOWN_REQ 0xF2
/* Vendor specific Bluetooth events */
#define BT_EVENT_AUTO_SLEEP_MODE 0x23
#define BT_EVENT_HOST_SLEEP_CONFIG 0x59
#define BT_EVENT_HOST_SLEEP_ENABLE 0x5A
#define BT_EVENT_MODULE_CFG_REQ 0x5B
#define BT_EVENT_POWER_STATE 0x20 #define BT_EVENT_POWER_STATE 0x20
/* Bluetooth Power States */ /* Bluetooth Power States */
...@@ -111,8 +116,6 @@ struct btmrvl_private { ...@@ -111,8 +116,6 @@ struct btmrvl_private {
#define BT_PS_DISABLE 0x03 #define BT_PS_DISABLE 0x03
#define BT_PS_SLEEP 0x01 #define BT_PS_SLEEP 0x01
#define OGF 0x3F
/* Host Sleep states */ /* Host Sleep states */
#define HS_ACTIVATED 0x01 #define HS_ACTIVATED 0x01
#define HS_DEACTIVATED 0x00 #define HS_DEACTIVATED 0x00
......
...@@ -50,12 +50,10 @@ bool btmrvl_check_evtpkt(struct btmrvl_private *priv, struct sk_buff *skb) ...@@ -50,12 +50,10 @@ bool btmrvl_check_evtpkt(struct btmrvl_private *priv, struct sk_buff *skb)
if (hdr->evt == HCI_EV_CMD_COMPLETE) { if (hdr->evt == HCI_EV_CMD_COMPLETE) {
struct hci_ev_cmd_complete *ec; struct hci_ev_cmd_complete *ec;
u16 opcode, ocf, ogf; u16 opcode;
ec = (void *) (skb->data + HCI_EVENT_HDR_SIZE); ec = (void *) (skb->data + HCI_EVENT_HDR_SIZE);
opcode = __le16_to_cpu(ec->opcode); opcode = __le16_to_cpu(ec->opcode);
ocf = hci_opcode_ocf(opcode);
ogf = hci_opcode_ogf(opcode);
if (priv->btmrvl_dev.sendcmdflag) { if (priv->btmrvl_dev.sendcmdflag) {
priv->btmrvl_dev.sendcmdflag = false; priv->btmrvl_dev.sendcmdflag = false;
...@@ -63,9 +61,8 @@ bool btmrvl_check_evtpkt(struct btmrvl_private *priv, struct sk_buff *skb) ...@@ -63,9 +61,8 @@ bool btmrvl_check_evtpkt(struct btmrvl_private *priv, struct sk_buff *skb)
wake_up_interruptible(&priv->adapter->cmd_wait_q); wake_up_interruptible(&priv->adapter->cmd_wait_q);
} }
if (ogf == OGF) { if (hci_opcode_ogf(opcode) == 0x3F) {
BT_DBG("vendor event skipped: ogf 0x%4.4x ocf 0x%4.4x", BT_DBG("vendor event skipped: opcode=%#4.4x", opcode);
ogf, ocf);
kfree_skb(skb); kfree_skb(skb);
return false; return false;
} }
...@@ -89,7 +86,7 @@ int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb) ...@@ -89,7 +86,7 @@ int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb)
} }
switch (event->data[0]) { switch (event->data[0]) {
case BT_CMD_AUTO_SLEEP_MODE: case BT_EVENT_AUTO_SLEEP_MODE:
if (!event->data[2]) { if (!event->data[2]) {
if (event->data[1] == BT_PS_ENABLE) if (event->data[1] == BT_PS_ENABLE)
adapter->psmode = 1; adapter->psmode = 1;
...@@ -102,7 +99,7 @@ int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb) ...@@ -102,7 +99,7 @@ int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb)
} }
break; break;
case BT_CMD_HOST_SLEEP_CONFIG: case BT_EVENT_HOST_SLEEP_CONFIG:
if (!event->data[3]) if (!event->data[3])
BT_DBG("gpio=%x, gap=%x", event->data[1], BT_DBG("gpio=%x, gap=%x", event->data[1],
event->data[2]); event->data[2]);
...@@ -110,7 +107,7 @@ int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb) ...@@ -110,7 +107,7 @@ int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb)
BT_DBG("HSCFG command failed"); BT_DBG("HSCFG command failed");
break; break;
case BT_CMD_HOST_SLEEP_ENABLE: case BT_EVENT_HOST_SLEEP_ENABLE:
if (!event->data[1]) { if (!event->data[1]) {
adapter->hs_state = HS_ACTIVATED; adapter->hs_state = HS_ACTIVATED;
if (adapter->psmode) if (adapter->psmode)
...@@ -121,7 +118,7 @@ int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb) ...@@ -121,7 +118,7 @@ int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb)
} }
break; break;
case BT_CMD_MODULE_CFG_REQ: case BT_EVENT_MODULE_CFG_REQ:
if (priv->btmrvl_dev.sendcmdflag && if (priv->btmrvl_dev.sendcmdflag &&
event->data[1] == MODULE_BRINGUP_REQ) { event->data[1] == MODULE_BRINGUP_REQ) {
BT_DBG("EVENT:%s", BT_DBG("EVENT:%s",
...@@ -166,7 +163,7 @@ int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb) ...@@ -166,7 +163,7 @@ int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb)
} }
EXPORT_SYMBOL_GPL(btmrvl_process_event); EXPORT_SYMBOL_GPL(btmrvl_process_event);
static int btmrvl_send_sync_cmd(struct btmrvl_private *priv, u16 cmd_no, static int btmrvl_send_sync_cmd(struct btmrvl_private *priv, u16 opcode,
const void *param, u8 len) const void *param, u8 len)
{ {
struct sk_buff *skb; struct sk_buff *skb;
...@@ -179,7 +176,7 @@ static int btmrvl_send_sync_cmd(struct btmrvl_private *priv, u16 cmd_no, ...@@ -179,7 +176,7 @@ static int btmrvl_send_sync_cmd(struct btmrvl_private *priv, u16 cmd_no,
} }
hdr = (struct hci_command_hdr *)skb_put(skb, HCI_COMMAND_HDR_SIZE); hdr = (struct hci_command_hdr *)skb_put(skb, HCI_COMMAND_HDR_SIZE);
hdr->opcode = cpu_to_le16(hci_opcode_pack(OGF, cmd_no)); hdr->opcode = cpu_to_le16(opcode);
hdr->plen = len; hdr->plen = len;
if (len) if (len)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment