|
@@ -100,13 +100,13 @@ static QDF_STATUS p2p_psoc_obj_create_notification(
|
|
|
struct p2p_soc_priv_obj *p2p_soc_obj;
|
|
|
QDF_STATUS status;
|
|
|
|
|
|
- if (soc == NULL) {
|
|
|
+ if (!soc) {
|
|
|
p2p_err("psoc context passed is NULL");
|
|
|
return QDF_STATUS_E_INVAL;
|
|
|
}
|
|
|
|
|
|
p2p_soc_obj = qdf_mem_malloc(sizeof(*p2p_soc_obj));
|
|
|
- if (p2p_soc_obj == NULL) {
|
|
|
+ if (!p2p_soc_obj) {
|
|
|
p2p_err("Failed to allocate p2p soc private object");
|
|
|
return QDF_STATUS_E_NOMEM;
|
|
|
}
|
|
@@ -122,7 +122,7 @@ static QDF_STATUS p2p_psoc_obj_create_notification(
|
|
|
return status;
|
|
|
}
|
|
|
|
|
|
- p2p_info("p2p soc object create successful, %p", p2p_soc_obj);
|
|
|
+ p2p_debug("p2p soc object create successful, %p", p2p_soc_obj);
|
|
|
|
|
|
return QDF_STATUS_SUCCESS;
|
|
|
}
|
|
@@ -143,14 +143,14 @@ static QDF_STATUS p2p_psoc_obj_destroy_notification(
|
|
|
struct p2p_soc_priv_obj *p2p_soc_obj;
|
|
|
QDF_STATUS status;
|
|
|
|
|
|
- if (soc == NULL) {
|
|
|
+ if (!soc) {
|
|
|
p2p_err("psoc context passed is NULL");
|
|
|
return QDF_STATUS_E_INVAL;
|
|
|
}
|
|
|
|
|
|
p2p_soc_obj = wlan_objmgr_psoc_get_comp_private_obj(soc,
|
|
|
WLAN_UMAC_COMP_P2P);
|
|
|
- if (p2p_soc_obj == NULL) {
|
|
|
+ if (!p2p_soc_obj) {
|
|
|
p2p_err("p2p soc private object is NULL");
|
|
|
return QDF_STATUS_E_FAILURE;
|
|
|
}
|
|
@@ -164,7 +164,7 @@ static QDF_STATUS p2p_psoc_obj_destroy_notification(
|
|
|
return status;
|
|
|
}
|
|
|
|
|
|
- p2p_info("destroy p2p soc object, %p", p2p_soc_obj);
|
|
|
+ p2p_debug("destroy p2p soc object, %p", p2p_soc_obj);
|
|
|
|
|
|
qdf_mem_free(p2p_soc_obj);
|
|
|
|
|
@@ -186,14 +186,25 @@ static QDF_STATUS p2p_vdev_obj_create_notification(
|
|
|
{
|
|
|
struct p2p_vdev_priv_obj *p2p_vdev_obj;
|
|
|
QDF_STATUS status;
|
|
|
+ enum tQDF_ADAPTER_MODE mode;
|
|
|
|
|
|
- if (vdev == NULL) {
|
|
|
+ if (!vdev) {
|
|
|
p2p_err("vdev context passed is NULL");
|
|
|
return QDF_STATUS_E_INVAL;
|
|
|
}
|
|
|
|
|
|
- p2p_vdev_obj = qdf_mem_malloc(sizeof(*p2p_vdev_obj));
|
|
|
- if (p2p_vdev_obj == NULL) {
|
|
|
+ wlan_vdev_obj_lock(vdev);
|
|
|
+ mode = wlan_vdev_mlme_get_opmode(vdev);
|
|
|
+ wlan_vdev_obj_unlock(vdev);
|
|
|
+ p2p_debug("vdev mode:%d", mode);
|
|
|
+ if (mode != QDF_P2P_GO_MODE) {
|
|
|
+ p2p_debug("won't create p2p vdev private object if it is not GO");
|
|
|
+ return QDF_STATUS_SUCCESS;
|
|
|
+ }
|
|
|
+
|
|
|
+ p2p_vdev_obj =
|
|
|
+ qdf_mem_malloc(sizeof(*p2p_vdev_obj));
|
|
|
+ if (!p2p_vdev_obj) {
|
|
|
p2p_err("Failed to allocate p2p vdev object");
|
|
|
return QDF_STATUS_E_NOMEM;
|
|
|
}
|
|
@@ -210,7 +221,7 @@ static QDF_STATUS p2p_vdev_obj_create_notification(
|
|
|
return status;
|
|
|
}
|
|
|
|
|
|
- p2p_info("p2p vdev object create successful, %p", p2p_vdev_obj);
|
|
|
+ p2p_debug("p2p vdev object create successful, %p", p2p_vdev_obj);
|
|
|
|
|
|
return QDF_STATUS_SUCCESS;
|
|
|
}
|
|
@@ -230,17 +241,27 @@ static QDF_STATUS p2p_vdev_obj_destroy_notification(
|
|
|
{
|
|
|
struct p2p_vdev_priv_obj *p2p_vdev_obj;
|
|
|
QDF_STATUS status;
|
|
|
+ enum tQDF_ADAPTER_MODE mode;
|
|
|
|
|
|
- if (vdev == NULL) {
|
|
|
+ if (!vdev) {
|
|
|
p2p_err("vdev context passed is NULL");
|
|
|
return QDF_STATUS_E_INVAL;
|
|
|
}
|
|
|
|
|
|
+ wlan_vdev_obj_lock(vdev);
|
|
|
+ mode = wlan_vdev_mlme_get_opmode(vdev);
|
|
|
+ wlan_vdev_obj_unlock(vdev);
|
|
|
+ p2p_debug("vdev mode:%d", mode);
|
|
|
+ if (mode != QDF_P2P_GO_MODE) {
|
|
|
+ p2p_debug("no p2p vdev private object if it is not GO");
|
|
|
+ return QDF_STATUS_SUCCESS;
|
|
|
+ }
|
|
|
+
|
|
|
p2p_vdev_obj = wlan_objmgr_vdev_get_comp_private_obj(vdev,
|
|
|
WLAN_UMAC_COMP_P2P);
|
|
|
- if (p2p_vdev_obj == NULL) {
|
|
|
- p2p_err("p2p vdev object is NULL");
|
|
|
- return QDF_STATUS_E_FAILURE;
|
|
|
+ if (!p2p_vdev_obj) {
|
|
|
+ p2p_debug("p2p vdev object is NULL");
|
|
|
+ return QDF_STATUS_SUCCESS;
|
|
|
}
|
|
|
|
|
|
p2p_vdev_obj->vdev = NULL;
|
|
@@ -252,7 +273,7 @@ static QDF_STATUS p2p_vdev_obj_destroy_notification(
|
|
|
return status;
|
|
|
}
|
|
|
|
|
|
- p2p_info("destroy p2p vdev object, p2p vdev obj:%p, noa info:%p",
|
|
|
+ p2p_debug("destroy p2p vdev object, p2p vdev obj:%p, noa info:%p",
|
|
|
p2p_vdev_obj, p2p_vdev_obj->noa_info);
|
|
|
|
|
|
if (p2p_vdev_obj->noa_info)
|
|
@@ -263,6 +284,69 @@ static QDF_STATUS p2p_vdev_obj_destroy_notification(
|
|
|
return QDF_STATUS_SUCCESS;
|
|
|
}
|
|
|
|
|
|
+/**
|
|
|
+ * p2p_send_noa_to_pe() - send noa information to pe
|
|
|
+ * @noa_info: vdev context
|
|
|
+ *
|
|
|
+ * This function sends noa information to pe since MCL layer need noa
|
|
|
+ * event.
|
|
|
+ *
|
|
|
+ * Return: QDF_STATUS_SUCCESS - in case of success
|
|
|
+ */
|
|
|
+static QDF_STATUS p2p_send_noa_to_pe(struct p2p_noa_info *noa_info)
|
|
|
+{
|
|
|
+ struct p2p_noa_attr *noa_attr;
|
|
|
+ struct scheduler_msg msg;
|
|
|
+
|
|
|
+ if (!noa_info) {
|
|
|
+ p2p_err("noa info is null");
|
|
|
+ return QDF_STATUS_E_INVAL;
|
|
|
+ }
|
|
|
+
|
|
|
+ noa_attr = qdf_mem_malloc(sizeof(*noa_attr));
|
|
|
+ if (!noa_attr) {
|
|
|
+ p2p_err("Failed to allocate memory for tSirP2PNoaAttr");
|
|
|
+ return QDF_STATUS_E_NOMEM;
|
|
|
+ }
|
|
|
+
|
|
|
+ noa_attr->index = noa_info->index;
|
|
|
+ noa_attr->opps_ps = noa_info->opps_ps;
|
|
|
+ noa_attr->ct_win = noa_info->ct_window;
|
|
|
+ if (!noa_info->num_desc) {
|
|
|
+ p2p_debug("Zero noa descriptors");
|
|
|
+ } else {
|
|
|
+ p2p_debug("%d noa descriptors", noa_info->num_desc);
|
|
|
+
|
|
|
+ noa_attr->noa1_count =
|
|
|
+ noa_info->noa_desc[0].type_count;
|
|
|
+ noa_attr->noa1_duration =
|
|
|
+ noa_info->noa_desc[0].duration;
|
|
|
+ noa_attr->noa1_interval =
|
|
|
+ noa_info->noa_desc[0].interval;
|
|
|
+ noa_attr->noa1_start_time =
|
|
|
+ noa_info->noa_desc[0].start_time;
|
|
|
+ if (noa_info->num_desc > 1) {
|
|
|
+ noa_attr->noa2_count =
|
|
|
+ noa_info->noa_desc[1].type_count;
|
|
|
+ noa_attr->noa2_duration =
|
|
|
+ noa_info->noa_desc[1].duration;
|
|
|
+ noa_attr->noa2_interval =
|
|
|
+ noa_info->noa_desc[1].interval;
|
|
|
+ noa_attr->noa2_start_time =
|
|
|
+ noa_info->noa_desc[1].start_time;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ p2p_debug("Sending P2P_NOA_ATTR_IND to pe");
|
|
|
+
|
|
|
+ msg.type = P2P_NOA_ATTR_IND;
|
|
|
+ msg.bodyval = 0;
|
|
|
+ msg.bodyptr = noa_attr;
|
|
|
+ scheduler_post_msg(QDF_MODULE_ID_PE, &msg);
|
|
|
+
|
|
|
+ return QDF_STATUS_SUCCESS;
|
|
|
+}
|
|
|
+
|
|
|
QDF_STATUS p2p_component_init(void)
|
|
|
{
|
|
|
QDF_STATUS status;
|
|
@@ -373,14 +457,14 @@ QDF_STATUS p2p_psoc_object_open(struct wlan_objmgr_psoc *soc)
|
|
|
{
|
|
|
struct p2p_soc_priv_obj *p2p_soc_obj;
|
|
|
|
|
|
- if (soc == NULL) {
|
|
|
+ if (!soc) {
|
|
|
p2p_err("psoc context passed is NULL");
|
|
|
return QDF_STATUS_E_INVAL;
|
|
|
}
|
|
|
|
|
|
p2p_soc_obj = wlan_objmgr_psoc_get_comp_private_obj(soc,
|
|
|
WLAN_UMAC_COMP_P2P);
|
|
|
- if (p2p_soc_obj == NULL) {
|
|
|
+ if (!p2p_soc_obj) {
|
|
|
p2p_err("p2p soc priviate object is NULL");
|
|
|
return QDF_STATUS_E_FAILURE;
|
|
|
}
|
|
@@ -389,7 +473,6 @@ QDF_STATUS p2p_psoc_object_open(struct wlan_objmgr_psoc *soc)
|
|
|
qdf_list_create(&p2p_soc_obj->tx_q_roc, MAX_QUEUE_LENGTH);
|
|
|
qdf_list_create(&p2p_soc_obj->tx_q_ack, MAX_QUEUE_LENGTH);
|
|
|
qdf_event_create(&p2p_soc_obj->cancel_roc_done);
|
|
|
- /*TODO, register scan event, wmi lo and noa event */
|
|
|
|
|
|
p2p_debug("p2p psoc object open successful");
|
|
|
|
|
@@ -400,22 +483,22 @@ QDF_STATUS p2p_psoc_object_close(struct wlan_objmgr_psoc *soc)
|
|
|
{
|
|
|
struct p2p_soc_priv_obj *p2p_soc_obj;
|
|
|
|
|
|
- if (soc == NULL) {
|
|
|
+ if (!soc) {
|
|
|
p2p_err("psoc context passed is NULL");
|
|
|
return QDF_STATUS_E_INVAL;
|
|
|
}
|
|
|
|
|
|
p2p_soc_obj = wlan_objmgr_psoc_get_comp_private_obj(soc,
|
|
|
WLAN_UMAC_COMP_P2P);
|
|
|
- if (p2p_soc_obj == NULL) {
|
|
|
+ if (!p2p_soc_obj) {
|
|
|
p2p_err("p2p soc object is NULL");
|
|
|
return QDF_STATUS_E_FAILURE;
|
|
|
}
|
|
|
|
|
|
- qdf_list_destroy(&p2p_soc_obj->roc_q);
|
|
|
- qdf_list_destroy(&p2p_soc_obj->tx_q_roc);
|
|
|
+ qdf_event_destroy(&p2p_soc_obj->cancel_roc_done);
|
|
|
qdf_list_destroy(&p2p_soc_obj->tx_q_ack);
|
|
|
- /*TODO, ucfg_scan_clear_requestor_id(soc, p2p_soc_obj->scan_req_id);*/
|
|
|
+ qdf_list_destroy(&p2p_soc_obj->tx_q_roc);
|
|
|
+ qdf_list_destroy(&p2p_soc_obj->roc_q);
|
|
|
|
|
|
p2p_debug("p2p psoc object close successful");
|
|
|
|
|
@@ -428,20 +511,20 @@ QDF_STATUS p2p_psoc_start(struct wlan_objmgr_psoc *soc,
|
|
|
struct p2p_soc_priv_obj *p2p_soc_obj;
|
|
|
struct p2p_start_param *start_param;
|
|
|
|
|
|
- if (soc == NULL) {
|
|
|
+ if (!soc) {
|
|
|
p2p_err("psoc context passed is NULL");
|
|
|
return QDF_STATUS_E_INVAL;
|
|
|
}
|
|
|
|
|
|
p2p_soc_obj = wlan_objmgr_psoc_get_comp_private_obj(soc,
|
|
|
WLAN_UMAC_COMP_P2P);
|
|
|
- if (p2p_soc_obj == NULL) {
|
|
|
+ if (!p2p_soc_obj) {
|
|
|
p2p_err("P2P soc object is NULL");
|
|
|
return QDF_STATUS_E_FAILURE;
|
|
|
}
|
|
|
|
|
|
start_param = qdf_mem_malloc(sizeof(*start_param));
|
|
|
- if (start_param == NULL) {
|
|
|
+ if (!start_param) {
|
|
|
p2p_err("Failed to allocate start params");
|
|
|
return QDF_STATUS_E_NOMEM;
|
|
|
}
|
|
@@ -455,6 +538,10 @@ QDF_STATUS p2p_psoc_start(struct wlan_objmgr_psoc *soc,
|
|
|
start_param->lo_event_cb_data = req->lo_event_cb_data;
|
|
|
p2p_soc_obj->start_param = start_param;
|
|
|
|
|
|
+ /* register p2p lo stop and noa event */
|
|
|
+ tgt_p2p_register_lo_ev_handler(soc);
|
|
|
+ tgt_p2p_register_noa_ev_handler(soc);
|
|
|
+
|
|
|
p2p_debug("p2p psoc start successful");
|
|
|
|
|
|
return QDF_STATUS_SUCCESS;
|
|
@@ -465,25 +552,29 @@ QDF_STATUS p2p_psoc_stop(struct wlan_objmgr_psoc *soc)
|
|
|
struct p2p_soc_priv_obj *p2p_soc_obj;
|
|
|
struct p2p_start_param *start_param;
|
|
|
|
|
|
- if (soc == NULL) {
|
|
|
+ if (!soc) {
|
|
|
p2p_err("psoc context passed is NULL");
|
|
|
return QDF_STATUS_E_INVAL;
|
|
|
}
|
|
|
|
|
|
p2p_soc_obj = wlan_objmgr_psoc_get_comp_private_obj(soc,
|
|
|
WLAN_UMAC_COMP_P2P);
|
|
|
- if (p2p_soc_obj == NULL) {
|
|
|
+ if (!p2p_soc_obj) {
|
|
|
p2p_err("P2P soc object is NULL");
|
|
|
return QDF_STATUS_E_FAILURE;
|
|
|
}
|
|
|
|
|
|
start_param = p2p_soc_obj->start_param;
|
|
|
p2p_soc_obj->start_param = NULL;
|
|
|
- if (start_param == NULL) {
|
|
|
+ if (!start_param) {
|
|
|
p2p_err("start parameters is NULL");
|
|
|
return QDF_STATUS_E_FAILURE;
|
|
|
}
|
|
|
|
|
|
+ /* unregister p2p lo stop and noa event */
|
|
|
+ tgt_p2p_unregister_lo_ev_handler(soc);
|
|
|
+ tgt_p2p_unregister_noa_ev_handler(soc);
|
|
|
+
|
|
|
start_param->rx_cb = NULL;
|
|
|
start_param->rx_cb_data = NULL;
|
|
|
start_param->event_cb = NULL;
|
|
@@ -501,10 +592,10 @@ QDF_STATUS p2p_process_cmd(struct scheduler_msg *msg)
|
|
|
{
|
|
|
QDF_STATUS status;
|
|
|
|
|
|
- p2p_info("msg type %d, %s", msg->type,
|
|
|
+ p2p_debug("msg type %d, %s", msg->type,
|
|
|
p2p_get_cmd_type_str(msg->type));
|
|
|
|
|
|
- if (msg->bodyptr == NULL) {
|
|
|
+ if (!(msg->bodyptr)) {
|
|
|
p2p_err("Invalid message body");
|
|
|
return QDF_STATUS_E_INVAL;
|
|
|
}
|
|
@@ -546,10 +637,10 @@ QDF_STATUS p2p_process_evt(struct scheduler_msg *msg)
|
|
|
{
|
|
|
QDF_STATUS status;
|
|
|
|
|
|
- p2p_info("msg type %d, %s", msg->type,
|
|
|
+ p2p_debug("msg type %d, %s", msg->type,
|
|
|
p2p_get_event_type_str(msg->type));
|
|
|
|
|
|
- if (msg->bodyptr == NULL) {
|
|
|
+ if (!(msg->bodyptr)) {
|
|
|
p2p_err("Invalid message body");
|
|
|
return QDF_STATUS_E_INVAL;
|
|
|
}
|
|
@@ -591,10 +682,96 @@ QDF_STATUS p2p_process_evt(struct scheduler_msg *msg)
|
|
|
QDF_STATUS p2p_process_lo_stop(
|
|
|
struct p2p_lo_stop_event *lo_stop_event)
|
|
|
{
|
|
|
+ struct p2p_lo_event *lo_evt;
|
|
|
+ struct p2p_soc_priv_obj *p2p_soc_obj;
|
|
|
+ struct p2p_start_param *start_param;
|
|
|
+
|
|
|
+ if (!lo_stop_event) {
|
|
|
+ p2p_err("invalid lo stop event");
|
|
|
+ return QDF_STATUS_E_INVAL;
|
|
|
+ }
|
|
|
+ lo_evt = lo_stop_event->lo_event;
|
|
|
+ p2p_soc_obj = lo_stop_event->p2p_soc_obj;
|
|
|
+
|
|
|
+ p2p_debug("vdev_id %d, reason %d",
|
|
|
+ lo_evt->vdev_id, lo_evt->reason_code);
|
|
|
+
|
|
|
+ if (!p2p_soc_obj || !(p2p_soc_obj->start_param)) {
|
|
|
+ p2p_err("Invalid p2p soc object or start parameters");
|
|
|
+ return QDF_STATUS_E_INVAL;
|
|
|
+ }
|
|
|
+ start_param = p2p_soc_obj->start_param;
|
|
|
+ if (start_param->lo_event_cb)
|
|
|
+ start_param->lo_event_cb(
|
|
|
+ start_param->lo_event_cb_data, lo_evt);
|
|
|
+ else
|
|
|
+ p2p_err("Invalid p2p soc obj or hdd lo event callback");
|
|
|
+
|
|
|
+ qdf_mem_free(lo_evt);
|
|
|
+
|
|
|
return QDF_STATUS_SUCCESS;
|
|
|
}
|
|
|
|
|
|
QDF_STATUS p2p_process_noa(struct p2p_noa_event *noa_event)
|
|
|
{
|
|
|
- return QDF_STATUS_SUCCESS;
|
|
|
+ QDF_STATUS status = QDF_STATUS_SUCCESS;
|
|
|
+ struct p2p_noa_info *noa_info;
|
|
|
+ struct p2p_vdev_priv_obj *p2p_vdev_obj;
|
|
|
+ struct p2p_soc_priv_obj *p2p_soc_obj;
|
|
|
+ struct wlan_objmgr_vdev *vdev;
|
|
|
+ struct wlan_objmgr_psoc *psoc;
|
|
|
+ enum tQDF_ADAPTER_MODE mode;
|
|
|
+
|
|
|
+ if (!noa_event) {
|
|
|
+ p2p_err("invalid noa event");
|
|
|
+ return QDF_STATUS_E_INVAL;
|
|
|
+ }
|
|
|
+ noa_info = noa_event->noa_info;
|
|
|
+ p2p_soc_obj = noa_event->p2p_soc_obj;
|
|
|
+ psoc = p2p_soc_obj->soc;
|
|
|
+
|
|
|
+ p2p_debug("psoc:%p, index:%d, opps_ps:%d, ct_window:%d, num_desc:%d, vdev_id:%d",
|
|
|
+ psoc, noa_info->index, noa_info->opps_ps,
|
|
|
+ noa_info->ct_window, noa_info->num_desc,
|
|
|
+ noa_info->vdev_id);
|
|
|
+
|
|
|
+ vdev = wlan_objmgr_get_vdev_by_id_from_psoc(psoc,
|
|
|
+ noa_info->vdev_id, WLAN_P2P_ID);
|
|
|
+ if (!vdev) {
|
|
|
+ p2p_err("vdev obj is NULL");
|
|
|
+ qdf_mem_free(noa_event->noa_info);
|
|
|
+ return QDF_STATUS_E_INVAL;
|
|
|
+ }
|
|
|
+
|
|
|
+ wlan_vdev_obj_lock(vdev);
|
|
|
+ mode = wlan_vdev_mlme_get_opmode(vdev);
|
|
|
+ wlan_vdev_obj_unlock(vdev);
|
|
|
+ p2p_debug("vdev mode:%d", mode);
|
|
|
+ if (mode != QDF_P2P_GO_MODE) {
|
|
|
+ p2p_err("invalid p2p vdev mode:%d", mode);
|
|
|
+ status = QDF_STATUS_E_INVAL;
|
|
|
+ goto fail;
|
|
|
+ }
|
|
|
+
|
|
|
+ /* must send noa to pe since of limitation*/
|
|
|
+ p2p_send_noa_to_pe(noa_info);
|
|
|
+
|
|
|
+ p2p_vdev_obj = wlan_objmgr_vdev_get_comp_private_obj(vdev,
|
|
|
+ WLAN_UMAC_COMP_P2P);
|
|
|
+ if (!(p2p_vdev_obj->noa_info)) {
|
|
|
+ p2p_vdev_obj->noa_info =
|
|
|
+ qdf_mem_malloc(sizeof(struct p2p_noa_info));
|
|
|
+ if (!(p2p_vdev_obj->noa_info)) {
|
|
|
+ p2p_err("Failed to allocate p2p noa info");
|
|
|
+ status = QDF_STATUS_E_NOMEM;
|
|
|
+ goto fail;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ qdf_mem_copy(p2p_vdev_obj->noa_info, noa_info,
|
|
|
+ sizeof(struct p2p_noa_info));
|
|
|
+fail:
|
|
|
+ qdf_mem_free(noa_event->noa_info);
|
|
|
+ wlan_objmgr_vdev_release_ref(vdev, WLAN_P2P_ID);
|
|
|
+
|
|
|
+ return status;
|
|
|
}
|