* Andrei Emeltchenko <Andrei.Emeltchenko.news@xxxxxxxxx> [2012-07-24 16:21:46 +0300]:
> From: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx>
>
> When receiving A2MP Get AMP Assoc Request execute Read Local AMP Assoc
> HCI command to AMP controller. If the AMP Assoc data is larger then it
> can fit to HCI event only fragment is read. When all fragments are read
> A2MP Get AMP Assoc Response is run from HCI callback.
>
> Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx>
> ---
> include/net/bluetooth/amp.h | 2 ++
> include/net/bluetooth/hci.h | 2 ++
> include/net/bluetooth/hci_core.h | 8 +++++
> net/bluetooth/a2mp.c | 13 +++++----
> net/bluetooth/amp.c | 60 ++++++++++++++++++++++++++++++++++++++
> net/bluetooth/hci_event.c | 41 ++++++++++++++++++++++++++
> 6 files changed, 120 insertions(+), 6 deletions(-)
>
> diff --git a/include/net/bluetooth/amp.h b/include/net/bluetooth/amp.h
> index ec7bea7..e861675 100644
> --- a/include/net/bluetooth/amp.h
> +++ b/include/net/bluetooth/amp.h
> @@ -15,5 +15,7 @@
> #define __AMP_H
>
> void amp_read_loc_info(struct hci_dev *hdev, struct amp_mgr *mgr);
> +void amp_read_loc_assoc_frag(struct hci_dev *hdev, u8 phy_handle);
> +void amp_read_loc_assoc(struct hci_dev *hdev, struct amp_mgr *mgr);
>
> #endif /* __AMP_H */
> diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
> index 7f19556..2b19703 100644
> --- a/include/net/bluetooth/hci.h
> +++ b/include/net/bluetooth/hci.h
> @@ -33,6 +33,8 @@
> #define HCI_LINK_KEY_SIZE 16
> #define HCI_AMP_LINK_KEY_SIZE (2 * HCI_LINK_KEY_SIZE)
>
> +#define HCI_MAX_AMP_ASSOC_SIZE 672
> +
> /* HCI dev events */
> #define HCI_DEV_REG 1
> #define HCI_DEV_UNREG 2
> diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
> index 9626b21..5aea1cc 100644
> --- a/include/net/bluetooth/hci_core.h
> +++ b/include/net/bluetooth/hci_core.h
> @@ -135,6 +135,12 @@ struct hci_cb_cmd {
> void (*destructor)(struct hci_dev *hdev, struct hci_cb_cmd *cmd);
> };
>
> +struct amp_assoc {
> + __u16 len;
> + __u16 offset;
> + __u8 data[HCI_MAX_AMP_ASSOC_SIZE];
> +};
> +
> #define NUM_REASSEMBLY 4
> struct hci_dev {
> struct list_head list;
> @@ -188,6 +194,8 @@ struct hci_dev {
> __u32 amp_max_flush_to;
> __u32 amp_be_flush_to;
>
> + struct amp_assoc loc_assoc;
> +
> __u8 flow_ctl_mode;
>
> unsigned int auto_accept_delay;
> diff --git a/net/bluetooth/a2mp.c b/net/bluetooth/a2mp.c
> index df40683..9803f74 100644
> --- a/net/bluetooth/a2mp.c
> +++ b/net/bluetooth/a2mp.c
> @@ -230,15 +230,16 @@ static int a2mp_getampassoc_req(struct amp_mgr *mgr, struct sk_buff *skb,
>
> a2mp_send(mgr, A2MP_GETAMPASSOC_RSP, hdr->ident, sizeof(rsp),
> &rsp);
> - goto clean;
> - }
>
> - /* Placeholder for HCI Read AMP Assoc */
> + if (hdev)
> + hci_dev_put(hdev);
>
> -clean:
> - if (hdev)
> - hci_dev_put(hdev);
> + goto done;
> + }
> +
> + amp_read_loc_assoc(hdev, mgr);
>
> +done:
> skb_pull(skb, sizeof(*req));
> return 0;
> }
> diff --git a/net/bluetooth/amp.c b/net/bluetooth/amp.c
> index 4aea7be..b76f369 100644
> --- a/net/bluetooth/amp.c
> +++ b/net/bluetooth/amp.c
> @@ -61,3 +61,63 @@ void amp_read_loc_info(struct hci_dev *hdev, struct amp_mgr *mgr)
> hci_cmd_cb(hdev, HCI_OP_READ_LOCAL_AMP_INFO, 0, NULL,
> amp_read_loc_info_complete, mgr, cb_destructor, GFP_KERNEL);
> }
> +
> +void amp_read_loc_assoc_frag(struct hci_dev *hdev, u8 phy_handle)
> +{
> + struct hci_cp_read_local_amp_assoc cp;
> + struct amp_assoc *loc_assoc = &hdev->loc_assoc;
> +
> + BT_DBG("%s handle %d", hdev->name, phy_handle);
> +
> + cp.phy_handle = phy_handle;
> + cp.max_len = cpu_to_le16(hdev->amp_assoc_size);
> + cp.len_so_far = cpu_to_le16(loc_assoc->offset);
> +
> + hci_send_cmd(hdev, HCI_OP_READ_LOCAL_AMP_ASSOC, sizeof(cp), &cp);
> +}
> +
> +static void amp_read_loc_assoc_complete(struct hci_dev *hdev,
> + struct hci_cb_cmd *cmd)
> +{
> + struct amp_mgr *mgr = cmd->opt;
> + struct amp_assoc *loc_assoc = &hdev->loc_assoc;
> + struct a2mp_amp_assoc_rsp *rsp;
> + size_t len;
> +
> + BT_DBG("%s cmd %p", hdev->name, cmd);
> +
> + len = sizeof(struct a2mp_amp_assoc_rsp) + loc_assoc->len;
> + rsp = kzalloc(len, GFP_KERNEL);
> + if (!rsp)
> + return;
> +
> + rsp->id = hdev->id;
> +
> + if (cmd->status) {
> + rsp->status = A2MP_STATUS_INVALID_CTRL_ID;
> + goto send;
> + }
> +
> + rsp->status = A2MP_STATUS_SUCCESS;
> + memcpy(rsp->amp_assoc, loc_assoc->data, loc_assoc->len);
> +
> +send:
> + a2mp_send(mgr, A2MP_GETAMPASSOC_RSP, mgr->ident, len, rsp);
> + kfree(rsp);
> +}
> +
> +void amp_read_loc_assoc(struct hci_dev *hdev, struct amp_mgr *mgr)
> +{
> + struct hci_cp_read_local_amp_assoc cp;
> +
> + memset(&hdev->loc_assoc, 0, sizeof(struct amp_assoc));
> + memset(&cp, 0, sizeof(cp));
> +
> + cp.max_len = cpu_to_le16(hdev->amp_assoc_size);
> +
> + amp_mgr_get(mgr);
> +
> + hci_cmd_cb(hdev, HCI_OP_READ_LOCAL_AMP_ASSOC, sizeof(cp), &cp,
> + amp_read_loc_assoc_complete, mgr, cb_destructor,
> + GFP_KERNEL);
> +}
> diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
> index 7222421..a1ad489 100644
> --- a/net/bluetooth/hci_event.c
> +++ b/net/bluetooth/hci_event.c
> @@ -30,6 +30,7 @@
> #include <net/bluetooth/bluetooth.h>
> #include <net/bluetooth/hci_core.h>
> #include <net/bluetooth/a2mp.h>
> +#include <net/bluetooth/amp.h>
>
> /* Handle HCI Event packets */
>
> @@ -865,6 +866,42 @@ process_cb:
> hci_process_cb(hdev, HCI_OP_READ_LOCAL_AMP_INFO, rp->status);
> }
>
> +static void hci_cc_read_local_amp_assoc(struct hci_dev *hdev,
> + struct sk_buff *skb)
> +{
> + struct hci_rp_read_local_amp_assoc *rp = (void *) skb->data;
> + struct amp_assoc *assoc = &hdev->loc_assoc;
> + size_t rem_len, frag_len;
> +
> + BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
> +
> + if (rp->status)
> + goto process_cb;
> +
> + frag_len = skb->len - sizeof(*rp);
> + rem_len = __le16_to_cpu(rp->rem_len);
> +
> + if (rem_len > frag_len) {
> + BT_DBG("frag_len %d rem_len %d", frag_len, rem_len);
> +
> + memcpy(assoc->data + assoc->offset, rp->frag, frag_len);
> + assoc->offset += frag_len;
> +
> + /* Read other fragments */
> + amp_read_loc_assoc_frag(hdev, rp->phy_handle);
> +
> + return;
> + }
> +
> + memcpy(assoc->data + assoc->offset, rp->frag, rem_len);
> + assoc->len = assoc->offset + rem_len;
> + assoc->offset = 0;
> +
> +process_cb:
> + /* Run callback when all fragments received */
> + hci_process_cb(hdev, HCI_OP_READ_LOCAL_AMP_ASSOC, rp->status);
So, I have a question here, why are we going with this callback system here?
This code and A2MP code runs inside the same module, so why do we need
callbacks? I wonder if switch all of this to directly calls to the A2MP code,
this simplifies things a lot.
Not sure if there was any discussion regarding this when you started this
implementation.
Gustavo
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
