Bluetooth: Track feature pages in a single table

The local and remote features are organized by page number. Page 0
are the LMP features, page 1 the host features, and any pages beyond 1
features that future core specification versions may define. So far
we've only had the first two pages and two separate variables has been
convenient enough, however with the introduction of Core Specification
Addendum 4 there are features defined on page 2.

Instead of requiring the addition of a new variable each time a new page
number is defined, this patch refactors the code to use a single table
for the features. The patch needs to update both the hci_dev and
hci_conn structures since there are macros that depend on the features
being represented in the same way in both of them.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

2 files changed, 38 insertions, 36 deletions

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index e4d4d231fd8a..8adc3915ece4 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -433,9 +433,9 @@ static void hci_cc_write_ssp_mode(struct hci_dev *hdev, struct sk_buff *skb)
 
         if (!status) {
                 if (sent->mode)
-                        hdev->host_features[0] |= LMP_HOST_SSP;
+                        hdev->features[1][0] |= LMP_HOST_SSP;
                 else
-                        hdev->host_features[0] &= ~LMP_HOST_SSP;
+                        hdev->features[1][0] &= ~LMP_HOST_SSP;
         }
 
         if (test_bit(HCI_MGMT, &hdev->dev_flags))
@@ -493,18 +493,18 @@ static void hci_cc_read_local_features(struct hci_dev *hdev,
         /* Adjust default settings according to features
          * supported by device. */
 
-        if (hdev->features[0] & LMP_3SLOT)
+        if (hdev->features[0][0] & LMP_3SLOT)
                 hdev->pkt_type |= (HCI_DM3 | HCI_DH3);
 
-        if (hdev->features[0] & LMP_5SLOT)
+        if (hdev->features[0][0] & LMP_5SLOT)
                 hdev->pkt_type |= (HCI_DM5 | HCI_DH5);
 
-        if (hdev->features[1] & LMP_HV2) {
+        if (hdev->features[0][1] & LMP_HV2) {
                 hdev->pkt_type  |= (HCI_HV2);
                 hdev->esco_type |= (ESCO_HV2);
         }
 
-        if (hdev->features[1] & LMP_HV3) {
+        if (hdev->features[0][1] & LMP_HV3) {
                 hdev->pkt_type  |= (HCI_HV3);
                 hdev->esco_type |= (ESCO_HV3);
         }
@@ -512,26 +512,26 @@ static void hci_cc_read_local_features(struct hci_dev *hdev,
         if (lmp_esco_capable(hdev))
                 hdev->esco_type |= (ESCO_EV3);
 
-        if (hdev->features[4] & LMP_EV4)
+        if (hdev->features[0][4] & LMP_EV4)
                 hdev->esco_type |= (ESCO_EV4);
 
-        if (hdev->features[4] & LMP_EV5)
+        if (hdev->features[0][4] & LMP_EV5)
                 hdev->esco_type |= (ESCO_EV5);
 
-        if (hdev->features[5] & LMP_EDR_ESCO_2M)
+        if (hdev->features[0][5] & LMP_EDR_ESCO_2M)
                 hdev->esco_type |= (ESCO_2EV3);
 
-        if (hdev->features[5] & LMP_EDR_ESCO_3M)
+        if (hdev->features[0][5] & LMP_EDR_ESCO_3M)
                 hdev->esco_type |= (ESCO_3EV3);
 
-        if (hdev->features[5] & LMP_EDR_3S_ESCO)
+        if (hdev->features[0][5] & LMP_EDR_3S_ESCO)
                 hdev->esco_type |= (ESCO_2EV5 | ESCO_3EV5);
 
         BT_DBG("%s features 0x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x", hdev->name,
-               hdev->features[0], hdev->features[1],
-               hdev->features[2], hdev->features[3],
-               hdev->features[4], hdev->features[5],
-               hdev->features[6], hdev->features[7]);
+               hdev->features[0][0], hdev->features[0][1],
+               hdev->features[0][2], hdev->features[0][3],
+               hdev->features[0][4], hdev->features[0][5],
+               hdev->features[0][6], hdev->features[0][7]);
 }
 
 static void hci_cc_read_local_ext_features(struct hci_dev *hdev,
@@ -544,14 +544,8 @@ static void hci_cc_read_local_ext_features(struct hci_dev *hdev,
         if (rp->status)
                 return;
 
-        switch (rp->page) {
-        case 0:
-                memcpy(hdev->features, rp->features, 8);
-                break;
-        case 1:
-                memcpy(hdev->host_features, rp->features, 8);
-                break;
-        }
+        if (rp->page < HCI_MAX_PAGES)
+                memcpy(hdev->features[rp->page], rp->features, 8);
 }
 
 static void hci_cc_read_flow_control_mode(struct hci_dev *hdev,
@@ -1046,14 +1040,14 @@ static void hci_cc_write_le_host_supported(struct hci_dev *hdev,
 
         if (!status) {
                 if (sent->le)
-                        hdev->host_features[0] |= LMP_HOST_LE;
+                        hdev->features[1][0] |= LMP_HOST_LE;
                 else
-                        hdev->host_features[0] &= ~LMP_HOST_LE;
+                        hdev->features[1][0] &= ~LMP_HOST_LE;
 
                 if (sent->simul)
-                        hdev->host_features[0] |= LMP_HOST_LE_BREDR;
+                        hdev->features[1][0] |= LMP_HOST_LE_BREDR;
                 else
-                        hdev->host_features[0] &= ~LMP_HOST_LE_BREDR;
+                        hdev->features[1][0] &= ~LMP_HOST_LE_BREDR;
         }
 
         if (test_bit(HCI_MGMT, &hdev->dev_flags) &&
@@ -2076,7 +2070,7 @@ static void hci_remote_features_evt(struct hci_dev *hdev,
                 goto unlock;
 
         if (!ev->status)
-                memcpy(conn->features, ev->features, 8);
+                memcpy(conn->features[0], ev->features, 8);
 
         if (conn->state != BT_CONFIG)
                 goto unlock;
@@ -2888,6 +2882,9 @@ static void hci_remote_ext_features_evt(struct hci_dev *hdev,
         if (!conn)
                 goto unlock;
 
+        if (ev->page < HCI_MAX_PAGES)
+                memcpy(conn->features[ev->page], ev->features, 8);
+
         if (!ev->status && ev->page == 0x01) {
                 struct inquiry_entry *ie;
 
@@ -3346,11 +3343,16 @@ static void hci_remote_host_features_evt(struct hci_dev *hdev,
 {
         struct hci_ev_remote_host_features *ev = (void *) skb->data;
         struct inquiry_entry *ie;
+        struct hci_conn *conn;
 
         BT_DBG("%s", hdev->name);
 
         hci_dev_lock(hdev);
 
+        conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &ev->bdaddr);
+        if (conn)
+                memcpy(conn->features[1], ev->features, 8);
+
         ie = hci_inquiry_cache_lookup(hdev, &ev->bdaddr);
         if (ie)
                 ie->data.ssp_mode = (ev->features[0] & LMP_HOST_SSP);
diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c
index 6fe15c822847..7ad6ecf36f20 100644
--- a/net/bluetooth/hci_sysfs.c
+++ b/net/bluetooth/hci_sysfs.c
@@ -48,10 +48,10 @@ static ssize_t show_link_features(struct device *dev,
         struct hci_conn *conn = to_hci_conn(dev);
 
         return sprintf(buf, "0x%02x%02x%02x%02x%02x%02x%02x%02x\n",
-                       conn->features[0], conn->features[1],
-                       conn->features[2], conn->features[3],
-                       conn->features[4], conn->features[5],
-                       conn->features[6], conn->features[7]);
+                       conn->features[0][0], conn->features[0][1],
+                       conn->features[0][2], conn->features[0][3],
+                       conn->features[0][4], conn->features[0][5],
+                       conn->features[0][6], conn->features[0][7]);
 }
 
 #define LINK_ATTR(_name, _mode, _show, _store) \
@@ -233,10 +233,10 @@ static ssize_t show_features(struct device *dev,
         struct hci_dev *hdev = to_hci_dev(dev);
 
         return sprintf(buf, "0x%02x%02x%02x%02x%02x%02x%02x%02x\n",
-                       hdev->features[0], hdev->features[1],
-                       hdev->features[2], hdev->features[3],
-                       hdev->features[4], hdev->features[5],
-                       hdev->features[6], hdev->features[7]);
+                       hdev->features[0][0], hdev->features[0][1],
+                       hdev->features[0][2], hdev->features[0][3],
+                       hdev->features[0][4], hdev->features[0][5],
+                       hdev->features[0][6], hdev->features[0][7]);
 }
 
 static ssize_t show_manufacturer(struct device *dev,