 @@ -1,14 +1,14 @@
-/*	$NetBSD: ehci.c,v 1.315.2.3 2024/02/06 12:18:55 martin Exp $ */
+/*	$NetBSD: ehci.c,v 1.315.2.4 2024/02/17 11:27:30 martin Exp $ */
 /*
  * Copyright (c) 2004-2012,2016,2020 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net), Charles M. Hannum,
  * Jeremy Morse (jeremy.morse@gmail.com), Jared D. McNeill
  * (jmcneill@invisible.ca). Matthew R. Green (mrg@eterna.com.au), and
  * Nick Hudson .
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
 @@ -44,27 +44,27 @@
 /*
  * TODO:
  * 1) hold off explorations by companion controllers until ehci has started.
+ *
  * 2) The hub driver needs to handle and schedule the transaction translator,
  *    to assign place in frame where different devices get to go. See chapter
  *    on hubs in USB 2.0 for details.
+ *
  * 3) Command failures are not recovered correctly.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.315.2.3 2024/02/06 12:18:55 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.315.2.4 2024/02/17 11:27:30 martin Exp $");
 #include "ohci.h"
 #include "uhci.h"
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #endif
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 @@ -279,26 +279,27 @@ Static void		ehci_sync_hc(ehci_softc_t *
 Static void		ehci_close_pipe(struct usbd_pipe *, ehci_soft_qh_t *);
 Static void		ehci_abortx(struct usbd_xfer *);
 #ifdef EHCI_DEBUG
 Static ehci_softc_t 	*theehci;
 void			ehci_dump(void);
 #endif
 #ifdef EHCI_DEBUG
 Static void		ehci_dump_regs(ehci_softc_t *);
 Static void		ehci_dump_sqtds(ehci_soft_qtd_t *);
 Static void		ehci_dump_sqtd(ehci_soft_qtd_t *);
 Static void		ehci_dump_qh_qtd(struct ehci_qh_qtd_t *);
 Static void		ehci_dump_qtd(ehci_qtd_t *);
 Static void		ehci_dump_sqh(ehci_soft_qh_t *);
 Static void		ehci_dump_sitd(struct ehci_soft_itd *);
 Static void 		ehci_dump_itds(ehci_soft_itd_t *);
 Static void		ehci_dump_itd(struct ehci_soft_itd *);
 Static void		ehci_dump_exfer(struct ehci_xfer *);
 #endif
 #define EHCI_NULL htole32(EHCI_LINK_TERMINATE)
 static inline void
 ehci_add_intr_list(ehci_softc_t *sc, struct ehci_xfer *ex)
+{
 @@ -1740,26 +1741,44 @@ ehci_dump_sqtd(ehci_soft_qtd_t *sqtd)
 	usb_syncmem(&sqtd->dma, sqtd->offs,
 	    sizeof(sqtd->qtd), BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 	DPRINTFN(10, "QTD(%#jx) at 0x%08jx:", (uintptr_t)sqtd, sqtd->physaddr,
 , 0);
 	ehci_dump_qtd(&sqtd->qtd);
 	usb_syncmem(&sqtd->dma, sqtd->offs,
 	    sizeof(sqtd->qtd), BUS_DMASYNC_PREREAD);
+}
 Static void
 ehci_dump_qh_qtd(struct ehci_qh_qtd_t *qh_qtd)
+{
 	ehci_qtd_t qtd = {
 		.qtd_next = qh_qtd->qtd_next,
 		.qtd_altnext = qh_qtd->qtd_altnext,
 		.qtd_status = qh_qtd->qtd_status,
 	};
 	/* Manually memcpy(), because of volatile. */
 	for (unsigned i = 0; i < EHCI_QTD_NBUFFERS; i++) {
 		qtd.qtd_buffer[i] = qh_qtd->qtd_buffer[i];
 		qtd.qtd_buffer_hi[i] = qh_qtd->qtd_buffer_hi[i];
+	}
 	ehci_dump_qtd(&qtd);
+}
 Static void
 ehci_dump_qtd(ehci_qtd_t *qtd)
+{
 	EHCIHIST_FUNC();	EHCIHIST_CALLED();
 	uint32_t s = le32toh(qtd->qtd_status);
 	DPRINTFN(10,
 	    "     next = 0x%08jx  altnext = 0x%08jx  status = 0x%08jx",
 	    qtd->qtd_next, qtd->qtd_altnext, s, 0);
 	DPRINTFN(10,
 	    "   toggle = %jd ioc = %jd bytes = %#jx c_page = %#jx",
 	    EHCI_QTD_GET_TOGGLE(s), EHCI_QTD_GET_IOC(s),
 	    EHCI_QTD_GET_BYTES(s), EHCI_QTD_GET_C_PAGE(s));
 	DPRINTFN(10,
 @@ -1815,27 +1834,27 @@ ehci_dump_sqh(ehci_soft_qh_t *sqh)
 	    EHCI_QH_GET_MPL(endp), EHCI_QH_GET_MPL(endp));
 	endphub = le32toh(qh->qh_endphub);
 	DPRINTFN(10, " endphub = %#jx", endphub, 0, 0, 0);
 	DPRINTFN(10, "      smask = 0x%02jx  cmask = 0x%02jx one %jx",
 	    EHCI_QH_GET_SMASK(endphub), EHCI_QH_GET_CMASK(endphub), 1, 0);
 	DPRINTFN(10, "      huba  = 0x%02jx  port  = %jd  mult = %jd",
 	    EHCI_QH_GET_HUBA(endphub), EHCI_QH_GET_PORT(endphub),
 	    EHCI_QH_GET_MULT(endphub), 0);
 	link = le32toh(qh->qh_curqtd);
 	ehci_dump_link(link, false);
 	DPRINTFN(10, "Overlay qTD:", 0, 0, 0, 0);
-	ehci_dump_qtd(&qh->qh_qtd);
+	ehci_dump_qh_qtd(&qh->qh_qtd);
 	usb_syncmem(&sqh->dma, sqh->offs, sizeof(sqh->qh),
 	    BUS_DMASYNC_PREREAD);
+}
 Static void
 ehci_dump_itds(ehci_soft_itd_t *itd)
+{
 	EHCIHIST_FUNC(); EHCIHIST_CALLED();
 	int i;
 	uint32_t stop = 0;
 	for (i = 0; itd && i < 20 && !stop; itd = itd->xfer_next, i++) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ehcireg.h,v 1.37.50.1 2024/02/06 12:18:55 martin Exp $	*/
+/*	$NetBSD: ehcireg.h,v 1.37.50.2 2024/02/17 11:27:30 martin Exp $	*/
 /*
  * Copyright (c) 2001, 2004 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net).
+ *
  * 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.
 @@ -384,27 +384,27 @@ typedef struct {
 #define EHCI_QH_SET_HUBA(x)	__SHIFTIN((x), EHCI_QH_HUBA_MASK)
 #define EHCI_QH_PORT_MASK	__BITS(29,23)	 /* hub port */
 #define EHCI_QH_GET_PORT(x)	__SHIFTOUT((x), EHCI_QH_PORT_MASK)
 #define EHCI_QH_SET_PORT(x)	__SHIFTIN((x), EHCI_QH_PORT_MASK)
 #define EHCI_QH_MULTI_MASK	__BITS(31,30)	/* pipe multiplier */
 #define EHCI_QH_GET_MULT(x)	__SHIFTOUT((x), EHCI_QH_MULTI_MASK)
 #define EHCI_QH_SET_MULT(x)	__SHIFTIN((x), EHCI_QH_MULTI_MASK)
 	volatile ehci_link_t	qh_curqtd;
 	/*
 	 * The QH descriptor contains a TD overlay, but it is not
 	 * 32-byte aligned, so declare the fields instead of embedding
 	 * a ehci_qtd_t directly.
 	 */
-	struct {
+	struct ehci_qh_qtd_t {
 		volatile ehci_link_t	qtd_next;
 		volatile ehci_link_t	qtd_altnext;
 		volatile uint32_t	qtd_status;
 		volatile ehci_physaddr_t qtd_buffer[EHCI_QTD_NBUFFERS];
 		volatile ehci_physaddr_t qtd_buffer_hi[EHCI_QTD_NBUFFERS];
 	} qh_qtd;
 } __aligned(EHCI_QH_ALIGN) ehci_qh_t;
 /* Periodic Frame Span Traversal Node */
 #define EHCI_FSTN_ALIGN 32
 typedef struct {
 	volatile ehci_link_t	fstn_link;
 	volatile ehci_link_t	fstn_back;