diff options
| author |   visa <visa@openbsd.org> | 2019-10-15 03:31:35 +0000 |
|---|---|---|
| committer | visa <visa@openbsd.org> | 2019-10-15 03:31:35 +0000 |
| commit | d4ce8ef6e9b9ee3e216ced681f963a2ce288d25a (patch) | |
| tree | f2eaec9a87fed158259b65fdcfb03f458db8a8c4 /sys | |
| parent | When setting the modification time on the retrieved file, use utimensat() (diff) | |
| download | wireguard-openbsd-d4ce8ef6e9b9ee3e216ced681f963a2ce288d25a.tar.xz wireguard-openbsd-d4ce8ef6e9b9ee3e216ced681f963a2ce288d25a.zip | |
Fix compiler's view of the alignment of xhci structs. Because the struct
fields are naturally aligned, it is enough to remove __packed.
This lets the compiler generate saner machine code. In particular, now
the compiler does not use lwl/lwr and swl/swr instructions on mips64
for changing xhci descriptors. The descriptors are properly aligned in
memory, so lwl/lwr and swl/swr end up doing a redundant load or store.
Feedback from guenther@ deraadt@
Tested on amd64 by krw@
OK mpi@ krw@ kettenis@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/usb/xhcireg.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/usb/xhcireg.h b/sys/dev/usb/xhcireg.h index 3c93a3a7f80..371a4e302be 100644 --- a/sys/dev/usb/xhcireg.h +++ b/sys/dev/usb/xhcireg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: xhcireg.h,v 1.16 2019/05/10 02:05:35 guenther Exp $ */ +/* $OpenBSD: xhcireg.h,v 1.17 2019/10/15 03:31:35 visa Exp $ */ /*- * Copyright (c) 2014 Martin Pieuchot. All rights reserved. @@ -251,7 +251,7 @@ struct xhci_erseg { uint64_t er_addr; uint32_t er_size; uint32_t er_rsvd; -} __packed; +}; struct xhci_sctx { @@ -279,7 +279,7 @@ struct xhci_sctx { #define XHCI_SCTX_SLOT_STATE(x) (((x) >> 27) & 0x1f) uint32_t rsvd[4]; -} __packed; +}; struct xhci_epctx { uint32_t info_lo; @@ -321,7 +321,7 @@ struct xhci_epctx { #define XHCI_EPCTX_MAX_ESIT_PAYLOAD(x) (((x) & 0xffff) << 16) uint32_t rsvd[3]; -} __packed; +}; struct xhci_inctx { @@ -330,7 +330,7 @@ struct xhci_inctx { #define XHCI_INCTX_MASK_DCI(n) (0x1 << (n)) uint32_t rsvd[6]; -} __packed; +}; struct xhci_trb { @@ -367,7 +367,7 @@ struct xhci_trb { #define XHCI_TRB_GET_SLOT(x) (((x) >> 24) & 0xff) #define XHCI_TRB_SET_SLOT(x) (((x) & 0xff) << 24) #define XHCI_TRB_SIA (1U << 31) -} __packed; +}; #define XHCI_TRB_FLAGS_BITMASK \ "\20" "\040SIA" "\022TRT_OUT" "\021DIR_IN" "\012BSR" "\007IDT" \ |