Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: proper IR quirk handling for Xilinx FPGAs #1620

Merged
merged 7 commits into from
Oct 29, 2023
Merged

Fix: proper IR quirk handling for Xilinx FPGAs #1620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5d0ecbe
xilinx: added a more robust jtag device listing for xilinx parts with…
lethalbit Sep 9, 2023
7166734
jtag: had to increase the `JTAG_MAX_IR_LEN` and the `jtag_ir_quirks_s…
lethalbit Sep 9, 2023
7d30ea6
xilinx: fixed the formatting for the IR return value for the XCVU440
lethalbit Sep 9, 2023
3b10933
jtag: fixed a sleepy bug that specified a 12-bit xilinx IR as 6
lethalbit Sep 10, 2023
8e981e1
jtag: removed the redundant `#endif/#ifdef`
lethalbit Sep 10, 2023
30ab5c6
jtag: adjusted the `0x03600093U` Xilinx 6-bit IR quirk to expect the…
lethalbit Sep 16, 2023
5c63108
jtag_scan: updated JTAG_MAX_IR_LEN to be the max bit-length of the IR…
lethalbit Oct 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
230 changes: 230 additions & 0 deletions src/target/jtag_devs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,236 @@ const jtag_dev_descr_s dev_descr[] = {
.idmask = 0xffffffffU,
.descr = "NXP: LPC17xx family.",
},
{
.idcode = 0x1396d093U,
.idmask = 0xffffffffU,
.descr = "Xilinx XCVU440.",
.ir_quirks =
{
.ir_length = 18U,
.ir_value = 0x11451U,
},
},
{
.idcode = 0x0484a093U,
.idmask = 0x0fffffffU,
.descr = "Xilinx, 6-bit IR.",
.ir_quirks =
{
.ir_length = 6U,
.ir_value = 1U,
},
},
{
.idcode = 0x04af2093U,
.idmask = 0x0fffffffU,
.descr = "Xilinx 12-bit IR.",
.ir_quirks =
{
.ir_length = 12U,
.ir_value = 1U,
},
},
{
.idcode = 0x036d9093U,
.idmask = 0x0fffffffU,
.descr = "Xilinx 22-bit IR.",
.ir_quirks =
{
.ir_length = 22U,
.ir_value = 1U,
},
},
{
.idcode = 0x036db093U,
.idmask = 0x0fffffffU,
.descr = "Xilinx 38-bit IR.",
.ir_quirks =
{
.ir_length = 38U,
.ir_value = 1U,
},
},
{
.idcode = 0x0396d093U,
.idmask = 0x0fffdfffU,
.descr = "Xilinx 18-bit IR.",
.ir_quirks =
{
.ir_length = 18U,
.ir_value = 1U,
},
},
{
.idcode = 0x03931093U,
.idmask = 0x0fffdfffU,
.descr = "Xilinx 18-bit IR.",
.ir_quirks =
{
.ir_length = 18U,
.ir_value = 1U,
},
},
{
.idcode = 0x04b79093U,
.idmask = 0x0fffbfffU,
.descr = "Xilinx 18-bit IR.",
.ir_quirks =
{
.ir_length = 18U,
.ir_value = 1U,
},
},
{
.idcode = 0x04ac0033U,
.idmask = 0x0fff9fffU,
.descr = "Xilinx 6-bit IR.",
.ir_quirks =
{
.ir_length = 6U,
.ir_value = 1U,
},
},
{
.idcode = 0x0380d093U,
.idmask = 0x0feddfffU,
.descr = "Xilinx 12-bit IR.",
.ir_quirks =
{
.ir_length = 12U,
.ir_value = 1U,
},
},
{
.idcode = 0x04600093U,
.idmask = 0x0fe53fffU,
.descr = "Xilinx 12-bit IR.",
.ir_quirks =
{
.ir_length = 12U,
.ir_value = 1U,
},
},
{
.idcode = 0x04b21093U,
.idmask = 0x0ffa1fffU,
.descr = "Xilinx 12-bit IR.",
.ir_quirks =
{
.ir_length = 12U,
.ir_value = 1U,
},
},
{
.idcode = 0x04b01093U,
.idmask = 0x0ffa1fffU,
.descr = "Xilinx 18-bit IR.",
.ir_quirks =
{
.ir_length = 18U,
.ir_value = 1U,
},
},
{
.idcode = 0x04b01093U,
.idmask = 0x0ff81fffU,
.descr = "Xilinx 18-bit IR.",
.ir_quirks =
{
.ir_length = 18U,
.ir_value = 1U,
},
},
{
.idcode = 0x04b01093U,
.idmask = 0x0ff09fffU,
.descr = "Xilinx 24-bit IR.",
.ir_quirks =
{
.ir_length = 24U,
.ir_value = 1U,
},
},
{
.idcode = 0x04d00093U,
.idmask = 0x0ffc0fffU,
.descr = "Xilinx 21-bit OR 14-bit IR.",
.ir_quirks =
{
.ir_length = 21U, // Not ideal but *shrug*
.ir_value = 1U,
},
},
{
.idcode = 0x03681093U,
.idmask = 0x0ff81fffU,
.descr = "Xilinx 24-bit IR.",
.ir_quirks =
{
.ir_length = 6U,
.ir_value = 1U,
},
},
{
.idcode = 0x04c00093U,
.idmask = 0x0fe88fffU,
.descr = "Xilinx 28-bit IR.",
.ir_quirks =
{
.ir_length = 28U,
.ir_value = 1U,
},
},
{
.idcode = 0x03800093U,
.idmask = 0x0fe80fffU,
.descr = "Xilinx 6-bit IR.",
.ir_quirks =
{
.ir_length = 6U,
.ir_value = 1U,
},
},
{
.idcode = 0x03600093U,
.idmask = 0x0fe00fffU,
.descr = "Xilinx 6-bit IR.",
.ir_quirks =
{
.ir_length = 6U,
.ir_value = 0x11U,
},
},
{
.idcode = 0x04c00093U,
.idmask = 0x0fe00fffU,
.descr = "Xilinx 6-bit IR.",
.ir_quirks =
{
.ir_length = 6U,
.ir_value = 1U,
},
},
{
.idcode = 0x04a00093U,
.idmask = 0x0fe00fffU,
.descr = "Xilinx 6-bit IR.",
.ir_quirks =
{
.ir_length = 6U,
.ir_value = 1U,
},
},
{
.idcode = 0x04600093U,
.idmask = 0x0fe00fffU,
.descr = "Xilinx 12-bit IR.",
.ir_quirks =
{
.ir_length = 12U,
.ir_value = 1U,
},
},
#endif
{
.idcode = 0x00000093U,
Expand Down
2 changes: 1 addition & 1 deletion src/target/jtag_devs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <stdint.h>

typedef struct jtag_ir_quirks {
uint16_t ir_value;
uint32_t ir_value;
uint8_t ir_length;
} jtag_ir_quirks_s;

Expand Down
2 changes: 1 addition & 1 deletion src/target/jtag_scan.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include "jtagtap.h"

#define JTAG_MAX_DEVS 32U
#define JTAG_MAX_IR_LEN 16U
#define JTAG_MAX_IR_LEN 32U /* NOTE: This is not long enough for all Xilinx devices */

typedef struct jtag_dev {
uint32_t jd_idcode;
Expand Down