Re: kern/56574: uaudio at ehci (not xhci) only outputs rapid gunfire noises in 9.99.93

[Nick Hudson <nick.hudson%gmx.co.uk@localhost>]

The following reply was made to PR kern/56574; it has been noted by GNATS.

From: Nick Hudson <nick.hudson%gmx.co.uk@localhost>
To: gnats-bugs%netbsd.org@localhost, kern-bug-people%netbsd.org@localhost,
 gnats-admin%netbsd.org@localhost, netbsd-bugs%netbsd.org@localhost
Cc: 
Subject: Re: kern/56574: uaudio at ehci (not xhci) only outputs rapid gunfire
 noises in 9.99.93
Date: Fri, 24 Dec 2021 22:25:58 +0000

 This is a multi-part message in MIME format.
 --------------96500818F4B3ECFABC258C47
 Content-Type: text/plain; charset=utf-8; format=flowed
 Content-Transfer-Encoding: 7bit
 
 Does this fix it?
 
 Thanks
 Nick
 
 --------------96500818F4B3ECFABC258C47
 Content-Type: text/x-patch; charset=UTF-8;
  name="ehci.c.diff"
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: attachment;
  filename="ehci.c.diff"
 
 Index: sys/dev/usb/ehci.c
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /cvsroot/src/sys/dev/usb/ehci.c,v
 retrieving revision 1.298
 diff -u -p -r1.298 ehci.c
 =2D-- sys/dev/usb/ehci.c	23 Dec 2021 11:03:48 -0000	1.298
 +++ sys/dev/usb/ehci.c	24 Dec 2021 22:24:54 -0000
 @@ -4414,12 +4414,16 @@ ehci_device_fs_isoc_transfer(struct usbd
  		    EHCI_SITD_SET_LEN(xfer->ux_frlengths[i]));
 
  		/* Set page0 index and offset - TP and T-offset are set below */
 -		sitd->sitd.sitd_buffer[0] =3D htole32(DMAADDR(dma_buf, offs));
 +		const bus_addr_t sba =3D DMAADDR(dma_buf, offs);
 +		sitd->sitd.sitd_buffer[0] =3D htole32(BUS_ADDR_LO32(sitdba));
 +		sitd->sitd.sitd_buffer_hi[0] =3D htole32(BUS_ADDR_HI32(sitdba));
 
  		offs +=3D xfer->ux_frlengths[i];
 
 +		const bus_addr_t eba =3D DMAADDR(dma_buf, offs - 1);
  		sitd->sitd.sitd_buffer[1] =3D
 -		    htole32(EHCI_SITD_SET_BPTR(DMAADDR(dma_buf, offs - 1)));
 +		    htole32(EHCI_SITD_SET_BPTR(BUS_ADDR_LO32(eba)));
 +		sitd->sitd.sitd_buffer_hi[1] =3D htole32(BUS_ADDR_HI32(eba));
 
  		u_int huba __diagused =3D dev->ud_myhsport->up_parent->ud_addr;
 
 
 --------------96500818F4B3ECFABC258C47--