qcacmn: change skb->cb to support 64 bit paddrs(2/2)

Prapogation from qcacld-3.0 to qcacld-3.1

Change skb->sb such that it is overlayed between tx and rx and
each one of then still fits 48 bytes.
Note that this will break IPA and it will be fixed subsequently
by another change.

Change-Id: I96168aee99dbdbecbdbd4259597e179b02d29f5d
CRs-Fixed: 881090

hif/src/ce/ce_main.c

@@ -578,10 +578,10 @@ hif_send_head(struct hif_opaque_softc *hif_ctx,
 	 */
 	ce_sendlist_init(&sendlist);
 	do {
-		uint32_t frag_paddr;
+		cdf_dma_addr_t frag_paddr;
 		int frag_bytes;
 
-		frag_paddr = cdf_nbuf_get_frag_paddr_lo(nbuf, nfrags);
+		frag_paddr = cdf_nbuf_get_frag_paddr(nbuf, nfrags);
 		frag_bytes = cdf_nbuf_get_frag_len(nbuf, nfrags);
 		/*
 		 * Clear the packet offset for all but the first CE desc.
@@ -654,7 +654,7 @@ void hif_send_complete_check(struct hif_opaque_softc *hif_ctx, uint8_t pipe,
 			return;
 		}
 	}
-#ifdef  ATH_11AC_TXCOMPACT
+#ifdef ATH_11AC_TXCOMPACT
 	ce_per_engine_servicereap(scn, pipe);
 #else
 	ce_per_engine_service(scn, pipe);
@@ -985,7 +985,7 @@ static int hif_post_recv_buffers_for_pipe(struct HIF_CE_pipe_info *pipe_info)
 			return 1;
 		}
 
-		CE_data = cdf_nbuf_get_frag_paddr_lo(nbuf, 0);
+		CE_data = cdf_nbuf_get_frag_paddr(nbuf, 0);
 
 		cdf_os_mem_dma_sync_single_for_device(scn->cdf_dev, CE_data,
 					       buf_sz, DMA_FROM_DEVICE);
@@ -1009,13 +1009,13 @@ static int hif_post_recv_buffers_for_pipe(struct HIF_CE_pipe_info *pipe_info)
 		bufs_posted++;
 	}
 	pipe_info->nbuf_alloc_err_count =
-		(pipe_info->nbuf_alloc_err_count > bufs_posted)?
+		(pipe_info->nbuf_alloc_err_count > bufs_posted) ?
 		pipe_info->nbuf_alloc_err_count - bufs_posted : 0;
 	pipe_info->nbuf_dma_err_count =
-		(pipe_info->nbuf_dma_err_count > bufs_posted)?
+		(pipe_info->nbuf_dma_err_count > bufs_posted) ?
 		pipe_info->nbuf_dma_err_count - bufs_posted : 0;
 	pipe_info->nbuf_ce_enqueue_err_count =
-		(pipe_info->nbuf_ce_enqueue_err_count > bufs_posted)?
+		(pipe_info->nbuf_ce_enqueue_err_count > bufs_posted) ?
 	     pipe_info->nbuf_ce_enqueue_err_count - bufs_posted : 0;
 
 	cdf_spin_unlock_bh(&pipe_info->recv_bufs_needed_lock);

hif/src/ce/ce_service.c

@@ -567,7 +567,7 @@ int ce_send_fast(struct CE_handle *copyeng, cdf_nbuf_t *msdus,
 		 * structure instead?
 		 */
 		/* HTT/HTC header can be passed as a argument */
-		dma_addr = cdf_nbuf_get_frag_paddr_lo(msdu, 0);
+		dma_addr = cdf_nbuf_get_frag_paddr(msdu, 0);
 		shadow_src_desc->buffer_addr = (uint32_t)(dma_addr &
 							  0xFFFFFFFF);
 		user_flags = cdf_nbuf_data_attr_get(msdu) & DESC_DATA_FLAG_MASK;
@@ -600,7 +600,7 @@ int ce_send_fast(struct CE_handle *copyeng, cdf_nbuf_t *msdus,
 		 * Now fill out the ring descriptor for the actual data
 		 * packet
 		 */
-		dma_addr = cdf_nbuf_get_frag_paddr_lo(msdu, 1);
+		dma_addr = cdf_nbuf_get_frag_paddr(msdu, 1);
 		shadow_src_desc->buffer_addr = (uint32_t)(dma_addr &
 							  0xFFFFFFFF);
 		/*
@@ -1722,7 +1722,7 @@ void ce_pkt_dl_len_set(void *hif_sc, u_int32_t pkt_download_len)
 
 	ce_state->download_len = pkt_download_len;
 
-	cdf_print("%s CE %d Pkt download length %d\n", __func__,
+	cdf_print("%s CE %d Pkt download length %d", __func__,
 		  ce_state->id, ce_state->download_len);
 }
 #else

hif/src/hif_napi.c

@@ -76,11 +76,11 @@ int hif_napi_create(struct hif_opaque_softc   *hif_ctx,
 	struct qca_napi_info *napii;
 	struct hif_softc *hif = HIF_GET_SOFTC(hif_ctx);
 
-	NAPI_DEBUG("-->(pipe=%d, budget=%d, scale=%d)\n",
+	NAPI_DEBUG("-->(pipe=%d, budget=%d, scale=%d)",
 		   pipe_id, budget, scale);
-	NAPI_DEBUG("hif->napi_data.state = 0x%08x\n",
+	NAPI_DEBUG("hif->napi_data.state = 0x%08x",
 		   hif->napi_data.state);
-	NAPI_DEBUG("hif->napi_data.ce_map = 0x%08x\n",
+	NAPI_DEBUG("hif->napi_data.ce_map = 0x%08x",
 		   hif->napi_data.ce_map);
 
 	napid = &(hif->napi_data);
@@ -91,36 +91,36 @@ int hif_napi_create(struct hif_opaque_softc   *hif_ctx,
 		init_dummy_netdev(&(napid->netdev));
 
 		napid->state |= HIF_NAPI_INITED;
-		HIF_INFO("%s: NAPI structures initialized\n", __func__);
+		HIF_INFO("%s: NAPI structures initialized", __func__);
 
-		NAPI_DEBUG("NAPI structures initialized\n");
+		NAPI_DEBUG("NAPI structures initialized");
 	}
 	napii = &(napid->napis[pipe_id]);
 	memset(napii, 0, sizeof(struct qca_napi_info));
 	napii->scale = scale;
 	napii->id    = NAPI_PIPE2ID(pipe_id);
 
-	NAPI_DEBUG("adding napi=%p to netdev=%p (poll=%p, bdgt=%d)\n",
+	NAPI_DEBUG("adding napi=%p to netdev=%p (poll=%p, bdgt=%d)",
 		   &(napii->napi), &(napid->netdev), poll, budget);
 	netif_napi_add(&(napid->netdev), &(napii->napi), poll, budget);
 
-	NAPI_DEBUG("after napi_add\n");
-	NAPI_DEBUG("napi=0x%p, netdev=0x%p\n",
+	NAPI_DEBUG("after napi_add");
+	NAPI_DEBUG("napi=0x%p, netdev=0x%p",
 		   &(napii->napi), &(napid->netdev));
-	NAPI_DEBUG("napi.dev_list.prev=0x%p, next=0x%p\n",
+	NAPI_DEBUG("napi.dev_list.prev=0x%p, next=0x%p",
 		   napii->napi.dev_list.prev, napii->napi.dev_list.next);
-	NAPI_DEBUG("dev.napi_list.prev=0x%p, next=0x%p\n",
+	NAPI_DEBUG("dev.napi_list.prev=0x%p, next=0x%p",
 		   napid->netdev.napi_list.prev, napid->netdev.napi_list.next);
 
 	/* It is OK to change the state variable below without protection
 	 * as there should be no-one around yet
 	 */
 	napid->ce_map |= (0x01 << pipe_id);
-	HIF_INFO("%s: NAPI id %d created for pipe %d\n", __func__,
+	HIF_INFO("%s: NAPI id %d created for pipe %d", __func__,
 		 napii->id, pipe_id);
 
-	NAPI_DEBUG("NAPI id %d created for pipe %d\n", napii->id, pipe_id);
-	NAPI_DEBUG("<--napi_id=%d]\n", napii->id);
+	NAPI_DEBUG("NAPI id %d created for pipe %d", napii->id, pipe_id);
+	NAPI_DEBUG("<--napi_id=%d]", napii->id);
 	return napii->id;
 }
 
@@ -151,7 +151,7 @@ int hif_napi_destroy(struct hif_opaque_softc *hif_ctx,
 	int rc = 0;
 	struct hif_softc *hif = HIF_GET_SOFTC(hif_ctx);
 
-	NAPI_DEBUG("-->(id=%d, force=%d)\n", id, force);
+	NAPI_DEBUG("-->(id=%d, force=%d)", id, force);
 
 	if (0 == (hif->napi_data.state & HIF_NAPI_INITED)) {
 		HIF_ERROR("%s: NAPI not initialized or entry %d not created\n",
@@ -173,7 +173,7 @@ int hif_napi_destroy(struct hif_opaque_softc *hif_ctx,
 				napi_disable(&(napii->napi));
 				HIF_INFO("%s: NAPI entry %d force disabled\n",
 					 __func__, id);
-				NAPI_DEBUG("NAPI %d force disabled\n", id);
+				NAPI_DEBUG("NAPI %d force disabled", id);
 			} else {
 				HIF_ERROR("%s: Cannot destroy active NAPI %d\n",
 					  __func__, id);
@@ -181,11 +181,11 @@ int hif_napi_destroy(struct hif_opaque_softc *hif_ctx,
 			}
 		}
 		if (0 == rc) {
-			NAPI_DEBUG("before napi_del\n");
-			NAPI_DEBUG("napi.dlist.prv=0x%p, next=0x%p\n",
+			NAPI_DEBUG("before napi_del");
+			NAPI_DEBUG("napi.dlist.prv=0x%p, next=0x%p",
 				  napii->napi.dev_list.prev,
 				  napii->napi.dev_list.next);
-			NAPI_DEBUG("dev.napi_l.prv=0x%p, next=0x%p\n",
+			NAPI_DEBUG("dev.napi_l.prv=0x%p, next=0x%p",
 				   napid->netdev.napi_list.prev,
 				   napid->netdev.napi_list.next);
 
@@ -258,7 +258,7 @@ int hif_napi_event(struct hif_opaque_softc *hif_ctx, enum qca_napi_event event,
 	struct napi_struct *napi;
 	struct hif_softc *hif = HIF_GET_SOFTC(hif_ctx);
 
-	NAPI_DEBUG("-->(event=%d, aux=%p)\n", event, data);
+	NAPI_DEBUG("-->(event=%d, aux=%p)", event, data);
 
 	mutex_lock(&(hif->napi_data.mutex));
 	prev_state = hif->napi_data.state;
@@ -308,7 +308,7 @@ int hif_napi_event(struct hif_opaque_softc *hif_ctx, enum qca_napi_event event,
 			for (i = 0; i < CE_COUNT_MAX; i++)
 				if ((hif->napi_data.ce_map & (0x01 << i))) {
 					napi = &(hif->napi_data.napis[i].napi);
-					NAPI_DEBUG("enabling NAPI %d\n", i);
+					NAPI_DEBUG("enabling NAPI %d", i);
 					napi_enable(napi);
 				}
 		} else {
@@ -316,7 +316,7 @@ int hif_napi_event(struct hif_opaque_softc *hif_ctx, enum qca_napi_event event,
 			for (i = 0; i < CE_COUNT_MAX; i++)
 				if (hif->napi_data.ce_map & (0x01 << i)) {
 					napi = &(hif->napi_data.napis[i].napi);
-					NAPI_DEBUG("disabling NAPI %d\n", i);
+					NAPI_DEBUG("disabling NAPI %d", i);
 					napi_disable(napi);
 				}
 		}
@@ -326,7 +326,7 @@ int hif_napi_event(struct hif_opaque_softc *hif_ctx, enum qca_napi_event event,
 		rc = (hif->napi_data.state == ENABLE_NAPI_MASK);
 	}
 
-	NAPI_DEBUG("<--[rc=%d]\n", rc);
+	NAPI_DEBUG("<--[rc=%d]", rc);
 	return rc;
 }
 
@@ -379,7 +379,7 @@ int hif_napi_schedule(struct hif_opaque_softc *hif_ctx, int ce_id)
 	struct hif_softc *scn = HIF_GET_SOFTC(hif_ctx);
 
 	scn->napi_data.napis[ce_id].stats[cpu].napi_schedules++;
-	NAPI_DEBUG("scheduling napi %d (ce:%d)\n",
+	NAPI_DEBUG("scheduling napi %d (ce:%d)",
 		   scn->napi_data.napis[ce_id].id, ce_id);
 	napi_schedule(&(scn->napi_data.napis[ce_id].napi));
 
@@ -417,7 +417,7 @@ int hif_napi_poll(struct hif_opaque_softc *hif_ctx, struct napi_struct *napi,
 	struct qca_napi_info *napi_info;
 	struct CE_state *ce_state;
 
-	NAPI_DEBUG("%s -->(.., budget=%d)\n", budget);
+	NAPI_DEBUG("%s -->(.., budget=%d)", budget);
 
 	napi_info = (struct qca_napi_info *)
 		container_of(napi, struct qca_napi_info, napi);
@@ -450,7 +450,7 @@ int hif_napi_poll(struct hif_opaque_softc *hif_ctx, struct napi_struct *napi,
 
 	/* if ce_per engine reports 0, then poll should be terminated */
 	if (0 == rc)
-		NAPI_DEBUG("%s:%d: nothing processed by CE. Completing NAPI\n",
+		NAPI_DEBUG("%s:%d: nothing processed by CE. Completing NAPI",
 			   __func__, __LINE__);
 
 	if (rc <= HIF_NAPI_MAX_RECEIVES) {
@@ -464,10 +464,10 @@ int hif_napi_poll(struct hif_opaque_softc *hif_ctx, struct napi_struct *napi,
 			cdf_atomic_dec(&(hif->active_tasklet_cnt));
 		}
 
-		NAPI_DEBUG("%s:%d: napi_complete + enabling the interrupts\n",
+		NAPI_DEBUG("%s:%d: napi_complete + enabling the interrupts",
 			   __func__, __LINE__);
 	}
 
-	NAPI_DEBUG("%s <--[normalized=%d]\n", _func__, normalized);
+	NAPI_DEBUG("%s <--[normalized=%d]", _func__, normalized);
 	return normalized;
 }