bugfix:: disable interrupts beginning of ISR (#15)

akifsaglam · web-flow · commit 0aa9cc974efa · 2021-02-03T19:24:33.000-08:00
* bugfix:: disable interrupts beginning of ISR

* In case of net_pkt_write failure, make sure to skip passing the pkt to upper layers
diff --git a/drivers/ethernet/eth_lowRISC.c b/drivers/ethernet/eth_lowRISC.c
@@ -209,6 +209,8 @@ static void lr_isr(struct device *dev)
    struct net_pkt *pkt = NULL;
    uint16_t vlan_tag = NET_VLAN_TAG_UNSPEC;
 
+   lr_eth_disable_irq(priv);
+
    if ((n = lr_eth_recv_size(priv)) > 0)
    {
 
@@ -219,14 +221,15 @@ static void lr_isr(struct device *dev)
 	    goto out;
 	}
 
-        assert(lr_eth_recv(priv, priv->rxb, n) == n);
+        lr_eth_recv(priv, priv->rxb, n);
 
         hexdump(priv->rxb, n, "%zd byte(s)", n);
 
 	if (net_pkt_write(pkt, priv->rxb, n)) {
         	LOG_ERR("Out of memory for received frame");
 		net_pkt_unref(pkt);
 		pkt = NULL;
+		goto out;
 	}
 	net_recv_data(get_iface(priv, vlan_tag), pkt);
    }

Original file line number	Diff line number	Diff line change
`@@ -209,6 +209,8 @@ static void lr_isr(struct device *dev)`
`209`	`209`	`struct net_pkt *pkt = NULL;`
`210`	`210`	`uint16_t vlan_tag = NET_VLAN_TAG_UNSPEC;`
`211`	`211`
	`212`	`+ lr_eth_disable_irq(priv);`
	`213`	`+`
`212`	`214`	`if ((n = lr_eth_recv_size(priv)) > 0)`
`213`	`215`	`{`
`214`	`216`
`@@ -219,14 +221,15 @@ static void lr_isr(struct device *dev)`
`219`	`221`	`goto out;`
`220`	`222`	`}`
`221`	`223`
`222`		`- assert(lr_eth_recv(priv, priv->rxb, n) == n);`
	`224`	`+ lr_eth_recv(priv, priv->rxb, n);`
`223`	`225`
`224`	`226`	`hexdump(priv->rxb, n, "%zd byte(s)", n);`
`225`	`227`
`226`	`228`	`if (net_pkt_write(pkt, priv->rxb, n)) {`
`227`	`229`	`LOG_ERR("Out of memory for received frame");`
`228`	`230`	`net_pkt_unref(pkt);`
`229`	`231`	`pkt = NULL;`
	`232`	`+ goto out;`
`230`	`233`	`}`
`231`	`234`	`net_recv_data(get_iface(priv, vlan_tag), pkt);`
`232`	`235`	`}`