Merge branch 'onload-9.0'

Xilinx-CNS · Jan 13, 2025 · 31246a4 · 31246a4
2 parents eeab4c9 + b770c67
commit 31246a4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 26 deletions.
diff --git a/src/driver/linux_net/drivers/net/ethernet/sfc/ef10.c b/src/driver/linux_net/drivers/net/ethernet/sfc/ef10.c
@@ -3311,6 +3311,10 @@ efx_ef10_handle_rx_event_errors(struct efx_rx_queue *rx_queue,
 		}
 		handled = true;
 	}
+	if (EFX_QWORD_FIELD(*event, ESF_DZ_RX_TRUNC_ERR)) {
+		rx_queue->n_rx_frm_trunc += n_packets;
+		return EFX_RX_PKT_DISCARD;
+	}
 	if (EFX_QWORD_FIELD(*event, ESF_DZ_RX_IPCKSUM_ERR)) {
 		if (unlikely(rx_encap_hdr != ESE_EZ_ENCAP_HDR_VXLAN &&
 			     rx_l3_class != ESE_DZ_L3_CLASS_IP4 &&
@@ -3477,7 +3481,8 @@ static int efx_ef10_handle_rx_event(struct efx_channel *channel,
 		n_packets = 1;
 	}
 
-	EFX_POPULATE_QWORD_5(errors, ESF_DZ_RX_ECRC_ERR, 1,
+	EFX_POPULATE_QWORD_6(errors, ESF_DZ_RX_ECRC_ERR, 1,
+				     ESF_DZ_RX_TRUNC_ERR, 1,
 				     ESF_DZ_RX_IPCKSUM_ERR, 1,
 				     ESF_DZ_RX_TCPUDP_CKSUM_ERR, 1,
 				     ESF_EZ_RX_IP_INNER_CHKSUM_ERR, 1,

diff --git a/src/driver/linux_net/drivers/net/ethernet/sfc/io.h b/src/driver/linux_net/drivers/net/ethernet/sfc/io.h
@@ -241,28 +241,4 @@ _efx_writed_page(struct efx_nic *efx, const efx_dword_t *value,
 					   (reg) != 0xa1c),		\
 			 page)
 
-/* Write TIMER_COMMAND.  This is a page-mapped 32-bit CSR, but a bug
- * in the BIU means that writes to TIMER_COMMAND[0] invalidate the
- * collector register.
- */
-static inline void _efx_writed_page_locked(struct efx_nic *efx,
-					   const efx_dword_t *value,
-					   unsigned int reg,
-					   unsigned int page)
-{
-	unsigned long flags __attribute__ ((unused));
-
-	if (page == 0) {
-		spin_lock_irqsave(&efx->biu_lock, flags);
-		efx_writed(efx, value, efx_paged_reg(efx, page, reg));
-		spin_unlock_irqrestore(&efx->biu_lock, flags);
-	} else {
-		efx_writed(efx, value, efx_paged_reg(efx, page, reg));
-	}
-}
-#define efx_writed_page_locked(efx, value, reg, page)			\
-	_efx_writed_page_locked(efx, value,				\
-				reg + BUILD_BUG_ON_ZERO((reg) != 0x420), \
-				page)
-
 #endif /* EFX_IO_H */
diff --git a/src/driver/linux_net/drivers/net/ethernet/sfc/net_driver.h b/src/driver/linux_net/drivers/net/ethernet/sfc/net_driver.h
@@ -92,7 +92,7 @@
  **************************************************************************/
 
 #ifdef EFX_NOT_UPSTREAM
-#define EFX_DRIVER_VERSION	"6.0.2.1001"
+#define EFX_DRIVER_VERSION	"6.0.2.1002"
 #endif
 
 #ifdef DEBUG