diff mbox series

[05/12] net: ks8851: Remove type_frame_head

Message ID 20200325184501.200580-5-marex@denx.de
State Accepted
Commit 63f22f5998bc813ae5eacbf9210aa15cf80c0177
Headers show
Series [01/12] net: ks8851: Replace malloc()+memset() with calloc() | expand

Commit Message

Marek Vasut March 25, 2020, 6:44 p.m. UTC 
The packet status and length information should be extracted from the
FIFO per-packet. Adjust the code such that it reads the packet meta
data and then the packet afterward, if applicable.

Signed-off-by: Marek Vasut <marex at denx.de>
Cc: Eugen Hristev <eugen.hristev at microchip.com>
Cc: Joe Hershberger <joe.hershberger at ni.com>
---
 drivers/net/ks8851_mll.c | 36 +++++++-----------------------------
 1 file changed, 7 insertions(+), 29 deletions(-)
diff mbox series

Patch

diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ks8851_mll.c
index 7d6328afab..2d854d855d 100644
--- a/drivers/net/ks8851_mll.c
+++ b/drivers/net/ks8851_mll.c
@@ -15,9 +15,6 @@ 
 
 #define DRIVERNAME			"ks8851_mll"
 
-#define MAX_RECV_FRAMES			32
-#define MAX_BUF_SIZE			2048
-#define TX_BUF_SIZE			2000
 #define RX_BUF_SIZE			2000
 
 static const struct chip_id chip_ids[] =  {
@@ -27,20 +24,11 @@  static const struct chip_id chip_ids[] =  {
 
 /*
  * struct ks_net - KS8851 driver private data
- * @frame_head_info	: frame header information for multi-pkt rx.
  * @bus_width	: i/o bus width.
  * @sharedbus	: Multipex(addr and data bus) mode indicator.
- * @extra_byte		: number of extra byte prepended rx pkt.
+ * @extra_byte	: number of extra byte prepended rx pkt.
  */
-
-/* Receive multiplex framer header info */
-struct type_frame_head {
-	u16	sts;         /* Frame status */
-	u16	len;         /* Byte count */
-} fr_h_i[MAX_RECV_FRAMES];
-
 struct ks_net {
-	struct type_frame_head	*frame_head_info;
 	int			bus_width;
 	u16			sharedbus;
 	u8			extra_byte;
@@ -238,8 +226,8 @@  static inline void ks_read_qmu(struct eth_device *dev, u16 *buf, u32 len)
 
 static void ks_rcv(struct eth_device *dev, uchar **pv_data)
 {
-	struct type_frame_head *frame_hdr = ks->frame_head_info;
 	unsigned int frame_cnt;
+	u16 sts, len;
 	int i;
 
 	frame_cnt = ks_rdreg16(dev, KS_RXFCTR) >> 8;
@@ -247,28 +235,21 @@  static void ks_rcv(struct eth_device *dev, uchar **pv_data)
 	/* read all header information */
 	for (i = 0; i < frame_cnt; i++) {
 		/* Checking Received packet status */
-		frame_hdr->sts = ks_rdreg16(dev, KS_RXFHSR);
+		sts = ks_rdreg16(dev, KS_RXFHSR);
 		/* Get packet len from hardware */
-		frame_hdr->len = ks_rdreg16(dev, KS_RXFHBCR);
-		frame_hdr++;
-	}
+		len = ks_rdreg16(dev, KS_RXFHBCR);
 
-	frame_hdr = ks->frame_head_info;
-	while (frame_cnt--) {
-		if ((frame_hdr->sts & RXFSHR_RXFV) &&
-		    (frame_hdr->len < RX_BUF_SIZE) &&
-		    frame_hdr->len) {
+		if ((sts & RXFSHR_RXFV) && len && (len < RX_BUF_SIZE)) {
 			/* read data block including CRC 4 bytes */
-			ks_read_qmu(dev, (u16 *)(*pv_data), frame_hdr->len);
+			ks_read_qmu(dev, (u16 *)(*pv_data), len);
 
 			/* net_rx_packets buffer size is ok (*pv_data) */
-			net_process_received_packet(*pv_data, frame_hdr->len);
+			net_process_received_packet(*pv_data, len);
 			pv_data++;
 		} else {
 			ks_wrreg16(dev, KS_RXQCR, RXQCR_CMD_CNTL | RXQCR_RRXEF);
 			printf(DRIVERNAME ": bad packet\n");
 		}
-		frame_hdr++;
 	}
 }
 
@@ -437,9 +418,6 @@  static int ks8851_mll_init(struct eth_device *dev, bd_t *bd)
 	/* Configure the PHY, initialize the link state */
 	ks8851_mll_phy_configure(dev);
 
-	/* static allocation of private informations */
-	ks->frame_head_info = fr_h_i;
-
 	/* Turn on Tx + Rx */
 	ks8851_mll_enable(dev);