 @@ -1,14 +1,14 @@
-/*	$NetBSD: oea_machdep.c,v 1.83 2021/12/05 07:53:57 msaitoh Exp $	*/
+/*	$NetBSD: oea_machdep.c,v 1.84 2022/08/07 09:37:46 andvar Exp $	*/
 /*
  * Copyright (C) 2002 Matt Thomas
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
  * Copyright (C) 1995, 1996 TooLs GmbH.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -23,27 +23,27 @@
  * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oea_machdep.c,v 1.83 2021/12/05 07:53:57 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oea_machdep.c,v 1.84 2022/08/07 09:37:46 andvar Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_altivec.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_multiprocessor.h"
 #include "opt_ppcarch.h"
 #endif
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/boot_flag.h>
 #include <sys/exec.h>
 @@ -410,27 +410,27 @@ oea_init(void (*handler)(void))
 	/*
 	 * Sync the changed instructions.
 	 */
 	__syncicache((void *) trapstart,
 	    (uintptr_t) trapend - (uintptr_t) trapstart);
 	__syncicache(dsitrap_fix_dbat4, 16);
 	__syncicache(dsitrap_fix_dbat7, 8);
 #ifdef PPC_OEA601
 	/*
 	 * If we are on a MPC601 processor, we need to zap any tlbsync
 	 * instructions into sync.  This differs from the above in
-	 * examing all kernel text, as opposed to just the exception handling.
+	 * examining all kernel text, as opposed to just the exception handling.
 	 * We sync the icache on every instruction found since there are
 	 * only very few of them.
 	 */
 	if (cpuvers == MPC601) {
 		extern int kernel_text[], etext[];
 		int *ip;
 		for (ip = kernel_text; ip < etext; ip++) {
 			if (*ip == TLBSYNC) {
 				*ip = SYNC;
 				__syncicache(ip, sizeof(*ip));
+			}
+		}

 @@ -1,14 +1,14 @@
-/* $NetBSD: ix_txrx.c,v 1.98 2022/05/11 17:22:20 bouyer Exp $ */
+/* $NetBSD: ix_txrx.c,v 1.99 2022/08/07 09:37:47 andvar Exp $ */
 /******************************************************************************
   Copyright (c) 2001-2017, Intel Corporation
   All rights reserved.
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
 . Redistributions of source code must retain the above copyright notice,
       this list of conditions and the following disclaimer.
 . Redistributions in binary form must reproduce the above copyright
 @@ -54,27 +54,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ix_txrx.c,v 1.98 2022/05/11 17:22:20 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ix_txrx.c,v 1.99 2022/08/07 09:37:47 andvar Exp $");
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "ixgbe.h"
 /*
  * HW RSC control:
  *  this feature only works with
  *  IPv4, and only on 82599 and later.
  *  Also this will cause IP forwarding to
  *  fail and that can't be controlled by
  *  the stack as LRO can. For all these
 @@ -306,27 +306,27 @@ ixgbe_mq_start_locked(struct ifnet *ifp,
 		return (ENETDOWN);
 	/* Process the queue */
 	while ((next = pcq_get(txr->txr_interq)) != NULL) {
 		if ((err = ixgbe_xmit(txr, next)) != 0) {
 			m_freem(next);
 			/* All errors are counted in ixgbe_xmit() */
 			break;
+		}
 		enqueued++;
 #if __FreeBSD_version >= 1100036
 		/*
 		 * Since we're looking at the tx ring, we can check
-		 * to see if we're a VF by examing our tail register
+		 * to see if we're a VF by examining our tail register
 		 * address.
 		 */
 		if ((txr->adapter->feat_en & IXGBE_FEATURE_VF) &&
 		    (next->m_flags & M_MCAST))
 			if_inc_counter(ifp, IFCOUNTER_OMCASTS, 1);
 #endif
 		/* Send a copy of the frame to the BPF listener */
 		bpf_mtap(ifp, next, BPF_D_OUT);
 		if ((ifp->if_flags & IFF_RUNNING) == 0)
 			break;
+	}
 	if (txr->tx_avail < IXGBE_TX_CLEANUP_THRESHOLD(txr->adapter))
 @@ -1954,27 +1954,27 @@ ixgbe_rxeof(struct ix_queue *que)
 			goto next_desc;
+		}
 		discard_multidesc = false;
 		bus_dmamap_sync(rxr->ptag->dt_dmat, rbuf->pmap, 0,
 		    rbuf->buf->m_pkthdr.len, BUS_DMASYNC_POSTREAD);
 		/*
 		 * On 82599 which supports a hardware
 		 * LRO (called HW RSC), packets need
 		 * not be fragmented across sequential
 		 * descriptors, rather the next descriptor
 		 * is indicated in bits of the descriptor.
-		 * This also means that we might proceses
+		 * This also means that we might process
 		 * more than one packet at a time, something
 		 * that has never been true before, it
 		 * required eliminating global chain pointers
 		 * in favor of what we are doing here.  -jfv
 		 */
 		if (!eop) {
 			/*
 			 * Figure out the next descriptor
 			 * of this frame.
 			 */
 			if (rxr->hw_rsc == TRUE) {
 				rsc = ixgbe_rsc_count(cur);
 				rxr->rsc_num += (rsc - 1);