diff options
| author | Denis Pynkin <denis.pynkin@collabora.com> | 2017-07-21 19:28:42 +0300 |
|---|---|---|
| committer | Joe Hershberger <joe.hershberger@ni.com> | 2017-08-07 15:18:31 -0500 |
| commit | 704f3acfcf55343043bbed01c5fb0a0094a68e8a (patch) | |
| tree | 0cfaa8fdbf7794beb1773b79a6b526e83f693a4d /net | |
| parent | 66c89ee31b778a3c45b63b4d39ada2c6b5a2844a (diff) | |
| download | u-boot-704f3acfcf55343043bbed01c5fb0a0094a68e8a.tar.gz | |
net: Use packed structures for networking
PXE boot is broken with GCC 7.1 due option '-fstore-merging' enabled
by default for '-O2':
BOOTP broadcast 1
data abort
pc : [<8ff8bb30>] lr : [<00004f1f>]
reloc pc : [<17832b30>] lr : [<878abf1f>]
sp : 8f558bc0 ip : 00000000 fp : 8ffef5a4
r10: 8ffed248 r9 : 8f558ee0 r8 : 8ffef594
r7 : 0000000e r6 : 8ffed700 r5 : 00000000 r4 : 8ffed74e
r3 : 00060101 r2 : 8ffed230 r1 : 8ffed706 r0 : 00000ddd
Flags: nzcv IRQs off FIQs off Mode SVC_32
Resetting CPU ...
Core reason is usage of structures for network headers without packed
attribute.
Reviewed-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bootp.h | 2 | ||||
| -rw-r--r-- | net/dns.h | 2 | ||||
| -rw-r--r-- | net/nfs.h | 2 | ||||
| -rw-r--r-- | net/sntp.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/net/bootp.h b/net/bootp.h index fcb0a64e61..567340ec5d 100644 --- a/net/bootp.h +++ b/net/bootp.h @@ -49,7 +49,7 @@ struct bootp_hdr { char bp_sname[64]; /* Server host name */ char bp_file[128]; /* Boot file name */ char bp_vend[OPT_FIELD_SIZE]; /* Vendor information */ -}; +} __attribute__((packed)); #define BOOTP_HDR_SIZE sizeof(struct bootp_hdr) @@ -29,7 +29,7 @@ struct header { uint16_t nauth; /* Authority PRs */ uint16_t nother; /* Other PRs */ unsigned char data[1]; /* Data, variable length */ -}; +} __attribute__((packed)); void dns_start(void); /* Begin DNS */ @@ -79,7 +79,7 @@ struct rpc_t { uint32_t data[NFS_READ_SIZE]; } reply; } u; -}; +} __attribute__((packed)); void nfs_start(void); /* Begin NFS */ diff --git a/net/sntp.h b/net/sntp.h index 6a9c6bb82f..c38bceed3f 100644 --- a/net/sntp.h +++ b/net/sntp.h @@ -51,7 +51,7 @@ struct sntp_pkt_t { unsigned long long originate_timestamp; unsigned long long receive_timestamp; unsigned long long transmit_timestamp; -}; +} __attribute__((packed)); void sntp_start(void); /* Begin SNTP */ |