|
36 | 36 | #define VSC_TP_XFER_TIMEOUT_BYTES 700
|
37 | 37 | #define VSC_TP_PACKET_PADDING_SIZE 1
|
38 | 38 | #define VSC_TP_PACKET_SIZE(pkt) \
|
39 |
| - (sizeof(struct vsc_tp_packet) + le16_to_cpu((pkt)->len) + VSC_TP_CRC_SIZE) |
| 39 | + (sizeof(struct vsc_tp_packet_hdr) + le16_to_cpu((pkt)->hdr.len) + VSC_TP_CRC_SIZE) |
40 | 40 | #define VSC_TP_MAX_PACKET_SIZE \
|
41 |
| - (sizeof(struct vsc_tp_packet) + VSC_TP_MAX_MSG_SIZE + VSC_TP_CRC_SIZE) |
| 41 | + (sizeof(struct vsc_tp_packet_hdr) + VSC_TP_MAX_MSG_SIZE + VSC_TP_CRC_SIZE) |
42 | 42 | #define VSC_TP_MAX_XFER_SIZE \
|
43 | 43 | (VSC_TP_MAX_PACKET_SIZE + VSC_TP_XFER_TIMEOUT_BYTES)
|
44 | 44 | #define VSC_TP_NEXT_XFER_LEN(len, offset) \
|
45 |
| - (len + sizeof(struct vsc_tp_packet) + VSC_TP_CRC_SIZE - offset + VSC_TP_PACKET_PADDING_SIZE) |
| 45 | + (len + sizeof(struct vsc_tp_packet_hdr) + VSC_TP_CRC_SIZE - offset + VSC_TP_PACKET_PADDING_SIZE) |
46 | 46 |
|
47 |
| -struct vsc_tp_packet { |
| 47 | +struct vsc_tp_packet_hdr { |
48 | 48 | __u8 sync;
|
49 | 49 | __u8 cmd;
|
50 | 50 | __le16 len;
|
51 | 51 | __le32 seq;
|
52 |
| - __u8 buf[] __counted_by(len); |
| 52 | +}; |
| 53 | + |
| 54 | +struct vsc_tp_packet { |
| 55 | + struct vsc_tp_packet_hdr hdr; |
| 56 | + __u8 buf[VSC_TP_MAX_XFER_SIZE - sizeof(struct vsc_tp_packet_hdr)]; |
53 | 57 | };
|
54 | 58 |
|
55 | 59 | struct vsc_tp {
|
@@ -158,12 +162,12 @@ static int vsc_tp_dev_xfer(struct vsc_tp *tp, void *obuf, void *ibuf, size_t len
|
158 | 162 | static int vsc_tp_xfer_helper(struct vsc_tp *tp, struct vsc_tp_packet *pkt,
|
159 | 163 | void *ibuf, u16 ilen)
|
160 | 164 | {
|
161 |
| - int ret, offset = 0, cpy_len, src_len, dst_len = sizeof(struct vsc_tp_packet); |
| 165 | + int ret, offset = 0, cpy_len, src_len, dst_len = sizeof(struct vsc_tp_packet_hdr); |
162 | 166 | int next_xfer_len = VSC_TP_PACKET_SIZE(pkt) + VSC_TP_XFER_TIMEOUT_BYTES;
|
163 | 167 | u8 *src, *crc_src, *rx_buf = tp->rx_buf;
|
164 | 168 | int count_down = VSC_TP_MAX_XFER_COUNT;
|
165 | 169 | u32 recv_crc = 0, crc = ~0;
|
166 |
| - struct vsc_tp_packet ack; |
| 170 | + struct vsc_tp_packet_hdr ack; |
167 | 171 | u8 *dst = (u8 *)&ack;
|
168 | 172 | bool synced = false;
|
169 | 173 |
|
@@ -280,10 +284,10 @@ int vsc_tp_xfer(struct vsc_tp *tp, u8 cmd, const void *obuf, size_t olen,
|
280 | 284 |
|
281 | 285 | guard(mutex)(&tp->mutex);
|
282 | 286 |
|
283 |
| - pkt->sync = VSC_TP_PACKET_SYNC; |
284 |
| - pkt->cmd = cmd; |
285 |
| - pkt->len = cpu_to_le16(olen); |
286 |
| - pkt->seq = cpu_to_le32(++tp->seq); |
| 287 | + pkt->hdr.sync = VSC_TP_PACKET_SYNC; |
| 288 | + pkt->hdr.cmd = cmd; |
| 289 | + pkt->hdr.len = cpu_to_le16(olen); |
| 290 | + pkt->hdr.seq = cpu_to_le32(++tp->seq); |
287 | 291 | memcpy(pkt->buf, obuf, olen);
|
288 | 292 |
|
289 | 293 | crc = ~crc32(~0, (u8 *)pkt, sizeof(pkt) + olen);
|
|
0 commit comments