Thread (13 messages) 13 messages, 4 authors, 2017-08-14

Re: [PATCH net-next 1/3] Add LAN743X driver

flat view

From: Stephen Hemminger <stephen@networkplumber.org>
Date: 2017-08-11 22:57:42

On Fri, 11 Aug 2017 19:47:57 +0000
[off-list ref] wrote:
quoted hunk ↗ jump to hunk
+
+static int lan743x_rx_napi_poll(struct napi_struct *napi, int weight)
+{
+	int count;
+	bool finished = false;
+	struct lan743x_rx *rx = container_of(napi,
+		struct lan743x_rx, napi);
+	struct lan743x_adapter *adapter = rx->adapter;
+
+	if (weight < 0)
+		finished = true;
+
+	count = 0;
+	while (count < weight) {
+		int rx_process_result = -1;
+
+		/* clear int status bit before reading packet */
+		lan743x_csr_write(adapter, DMAC_INT_STS,
+				  DMAC_INT_BIT_RXFRM_(rx->channel_number));
+		lan743x_csr_read(adapter, DMAC_INT_STS);
+
+		rx_process_result = lan743x_rx_process_packet(rx);
+		if (rx_process_result == RX_PROCESS_RESULT_PACKET_RECEIVED) {
+			count++;
+		} else if (rx_process_result ==
+			RX_PROCESS_RESULT_NOTHING_TO_DO) {
+			finished = true;
+			break;
+		} else if (rx_process_result ==
+			RX_PROCESS_RESULT_PACKET_DROPPED) {
+			continue;
+		} else {
+			NETIF_ERROR(adapter, drv, adapter->netdev,
+				    "Unknown rx_process_result == %d",
+				    rx_process_result);
+		}
+	}
+
+	adapter->netdev->stats.rx_packets += count;
+
+	if (!finished) {
+		NETIF_ASSERT(adapter, drv, adapter->netdev, count == weight);
+		return count;
+	}
+
+	napi_complete_done(napi, count);
+
+	lan743x_csr_write(adapter, INT_EN_SET,
+			  INT_BIT_DMA_RX_(rx->channel_number));
+	lan743x_csr_read(adapter, INT_STS);
+
+	return 0;
NAPI poll routine is supposed to return count of packets processed.
If you write the code in a logical manner, you won't need the finished flag either.
Also with net_poll you should be checking return value from napi_complete_done.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help