Skip to content

Commit 2cc2278

Browse files
committed
target/xtensa: fetch HW version from configuration overlay
Xtensa architecture has features which behavior depends on hardware version. Provide hardware version information to translators: add XtensaConfig::hw_version and use XCHAL_HW_VERSION from configuration overlay to initialize it. Signed-off-by: Max Filippov <[email protected]>
1 parent 59afd43 commit 2cc2278

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

target/xtensa/cpu.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -464,6 +464,7 @@ struct XtensaConfig {
464464
XtensaMemory sysrom;
465465
XtensaMemory sysram;
466466

467+
unsigned hw_version;
467468
uint32_t configid[2];
468469

469470
void *isa_internal;

target/xtensa/overlay_tool.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,9 @@
6060
#define XCHAL_RESET_VECTOR1_VADDR XCHAL_RESET_VECTOR_VADDR
6161
#endif
6262

63-
#ifndef XCHAL_HW_MIN_VERSION
64-
#define XCHAL_HW_MIN_VERSION 0
63+
#ifndef XCHAL_HW_VERSION
64+
#define XCHAL_HW_VERSION (XCHAL_HW_VERSION_MAJOR * 100 \
65+
+ XCHAL_HW_VERSION_MINOR)
6566
#endif
6667

6768
#ifndef XCHAL_LOOP_BUFFER_SIZE
@@ -100,7 +101,7 @@
100101
XCHAL_OPTION(XCHAL_HAVE_FP, XTENSA_OPTION_FP_COPROCESSOR) | \
101102
XCHAL_OPTION(XCHAL_HAVE_RELEASE_SYNC, XTENSA_OPTION_MP_SYNCHRO) | \
102103
XCHAL_OPTION(XCHAL_HAVE_S32C1I, XTENSA_OPTION_CONDITIONAL_STORE) | \
103-
XCHAL_OPTION(((XCHAL_HAVE_S32C1I && XCHAL_HW_MIN_VERSION >= 230000) || \
104+
XCHAL_OPTION(((XCHAL_HAVE_S32C1I && XCHAL_HW_VERSION >= 230000) || \
104105
XCHAL_HAVE_EXCLUSIVE), XTENSA_OPTION_ATOMCTL) | \
105106
XCHAL_OPTION(XCHAL_HAVE_DEPBITS, XTENSA_OPTION_DEPBITS) | \
106107
/* Interrupts and exceptions */ \
@@ -498,6 +499,7 @@
498499
}
499500

500501
#define CONFIG_SECTION \
502+
.hw_version = XCHAL_HW_VERSION, \
501503
.configid = { \
502504
XCHAL_HW_CONFIGID0, \
503505
XCHAL_HW_CONFIGID1, \

0 commit comments

Comments
 (0)