Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-07-27 20:29:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hw/net/can: sja1000 ignore CAN FD frames

Browse Source 
Signed-off-by: Jan Charvat <charvj10@fel.cvut.cz>
Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
Reviewed-by: Vikram Garhwal <fnu.vikram@xilinx.com>
Message-Id: <48d9ebf6b64e7652851c12fe4566e06b44803372.1600069689.git.pisa@cmp.felk.cvut.cz>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Jan Charvat 2020-09-14 10:13:37 +02:00 committed by Paolo Bonzini
parent d44948ccbd
commit 46b25fe08b
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
hw/net/can/can_sja1000.c
View File

@ -323,11 +323,16 @@ static void buff2frame_bas(const uint8_t *buff, qemu_can_frame *frame)
static int frame2buff_pel(const qemu_can_frame *frame, uint8_t *buff) static int frame2buff_pel(const qemu_can_frame *frame, uint8_t *buff)
{ {
int i; int i;
int dlen = frame->can_dlc;
if (frame->can_id & QEMU_CAN_ERR_FLAG) { /* error frame, NOT support now. */ if (frame->can_id & QEMU_CAN_ERR_FLAG) { /* error frame, NOT support now. */
return -1; return -1;
} }
if (dlen > 8) {
return -1;
}
buff[0] = 0x0f & frame->can_dlc; /* DLC */ buff[0] = 0x0f & frame->can_dlc; /* DLC */
if (frame->can_id & QEMU_CAN_RTR_FLAG) { /* RTR */ if (frame->can_id & QEMU_CAN_RTR_FLAG) { /* RTR */
buff[0] |= (1 << 6); buff[0] |= (1 << 6);
@ -338,18 +343,18 @@ static int frame2buff_pel(const qemu_can_frame *frame, uint8_t *buff)
buff[2] = extract32(frame->can_id, 13, 8); /* ID.20~ID.13 */ buff[2] = extract32(frame->can_id, 13, 8); /* ID.20~ID.13 */
buff[3] = extract32(frame->can_id, 5, 8); /* ID.12~ID.05 */ buff[3] = extract32(frame->can_id, 5, 8); /* ID.12~ID.05 */
buff[4] = extract32(frame->can_id, 0, 5) << 3; /* ID.04~ID.00,xxx */ buff[4] = extract32(frame->can_id, 0, 5) << 3; /* ID.04~ID.00,xxx */
for (i = 0; i < frame->can_dlc; i++) { for (i = 0; i < dlen; i++) {
buff[5 + i] = frame->data[i]; buff[5 + i] = frame->data[i];
} }
return frame->can_dlc + 5; return dlen + 5;
} else { /* SFF */ } else { /* SFF */
buff[1] = extract32(frame->can_id, 3, 8); /* ID.10~ID.03 */ buff[1] = extract32(frame->can_id, 3, 8); /* ID.10~ID.03 */
buff[2] = extract32(frame->can_id, 0, 3) << 5; /* ID.02~ID.00,xxxxx */ buff[2] = extract32(frame->can_id, 0, 3) << 5; /* ID.02~ID.00,xxxxx */
for (i = 0; i < frame->can_dlc; i++) { for (i = 0; i < dlen; i++) {
buff[3 + i] = frame->data[i]; buff[3 + i] = frame->data[i];
} }
return frame->can_dlc + 3; return dlen + 3;
} }
return -1; return -1;
@ -358,6 +363,7 @@ static int frame2buff_pel(const qemu_can_frame *frame, uint8_t *buff)
static int frame2buff_bas(const qemu_can_frame *frame, uint8_t *buff) static int frame2buff_bas(const qemu_can_frame *frame, uint8_t *buff)
{ {
int i; int i;
int dlen = frame->can_dlc;
/* /*
* EFF, no support for BasicMode * EFF, no support for BasicMode
@ -369,17 +375,21 @@ static int frame2buff_bas(const qemu_can_frame *frame, uint8_t *buff)
return -1; return -1;
} }
if (dlen > 8) {
return -1;
}
buff[0] = extract32(frame->can_id, 3, 8); /* ID.10~ID.03 */ buff[0] = extract32(frame->can_id, 3, 8); /* ID.10~ID.03 */
buff[1] = extract32(frame->can_id, 0, 3) << 5; /* ID.02~ID.00,xxxxx */ buff[1] = extract32(frame->can_id, 0, 3) << 5; /* ID.02~ID.00,xxxxx */
if (frame->can_id & QEMU_CAN_RTR_FLAG) { /* RTR */ if (frame->can_id & QEMU_CAN_RTR_FLAG) { /* RTR */
buff[1] |= (1 << 4); buff[1] |= (1 << 4);
} }
buff[1] |= frame->can_dlc & 0x0f; buff[1] |= frame->can_dlc & 0x0f;
for (i = 0; i < frame->can_dlc; i++) { for (i = 0; i < dlen; i++) {
buff[2 + i] = frame->data[i]; buff[2 + i] = frame->data[i];
} }
return frame->can_dlc + 2; return dlen + 2;
} }
static void can_sja_update_pel_irq(CanSJA1000State *s) static void can_sja_update_pel_irq(CanSJA1000State *s)
@ -766,6 +776,13 @@ ssize_t can_sja_receive(CanBusClientState *client, const qemu_can_frame *frames,
if (frames_cnt <= 0) { if (frames_cnt <= 0) {
return 0; return 0;
} }
if (frame->flags & QEMU_CAN_FRMF_TYPE_FD) {
if (DEBUG_FILTER) {
can_display_msg("[cansja]: ignor fd frame ", frame);
}
return 1;
}
if (DEBUG_FILTER) { if (DEBUG_FILTER) {
can_display_msg("[cansja]: receive ", frame); can_display_msg("[cansja]: receive ", frame);
} }