ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target/riscv: Update default priority table for local interrupts 

The latest AIA draft v0.3.0 defines a relatively simpler scheme for
default priority assignments where:
1) local interrupts 24 to 31 and 48 to 63 are reserved for custom use
   and have implementation specific default priority.
2) remaining local interrupts 0 to 23 and 32 to 47 have a recommended
   (not mandatory) priority assignments.

We update the default priority table and hviprio mapping as-per above.

Signed-off-by: Anup Patel <apatel@ventanamicro.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-Id: <20220616031543.953776-3-apatel@ventanamicro.com>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
This commit is contained in:
Anup Patel 2022-06-16 08:45:43 +05:30 committed by Alistair Francis
parent df01af337f
commit 435774992e
2 changed files with 62 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/riscv/cpu_bits.h
View File

@ -774,7 +774,7 @@ typedef enum RISCVException {
#define IPRIO_IRQ_BITS 8 #define IPRIO_IRQ_BITS 8
#define IPRIO_MMAXIPRIO 255 #define IPRIO_MMAXIPRIO 255
#define IPRIO_DEFAULT_UPPER 4 #define IPRIO_DEFAULT_UPPER 4
#define IPRIO_DEFAULT_MIDDLE (IPRIO_DEFAULT_UPPER + 24) #define IPRIO_DEFAULT_MIDDLE (IPRIO_DEFAULT_UPPER + 12)
#define IPRIO_DEFAULT_M IPRIO_DEFAULT_MIDDLE #define IPRIO_DEFAULT_M IPRIO_DEFAULT_MIDDLE
#define IPRIO_DEFAULT_S (IPRIO_DEFAULT_M + 3) #define IPRIO_DEFAULT_S (IPRIO_DEFAULT_M + 3)
#define IPRIO_DEFAULT_SGEXT (IPRIO_DEFAULT_S + 3) #define IPRIO_DEFAULT_SGEXT (IPRIO_DEFAULT_S + 3)

126
target/riscv/cpu_helper.c
View File

@ -168,17 +168,17 @@ void riscv_cpu_update_mask(CPURISCVState *env)
* 14 " * 14 "
* 15 " * 15 "
* 16 " * 16 "
* 18 Debug/trace interrupt * 17 "
* 20 (Reserved interrupt) * 18 "
* 19 "
* 20 "
* 21 "
* 22 " * 22 "
* 24 " * 23 "
* 26 "
* 28 "
* 30 (Reserved for standard reporting of bus or system errors)
*/ */
static const int hviprio_index2irq[] = { static const int hviprio_index2irq[] = {
0, 1, 4, 5, 8, 13, 14, 15, 16, 18, 20, 22, 24, 26, 28, 30 }; 0, 1, 4, 5, 8, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23 };
static const int hviprio_index2rdzero[] = { static const int hviprio_index2rdzero[] = {
1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
@ -207,50 +207,60 @@ int riscv_cpu_hviprio_index2irq(int index, int *out_irq, int *out_rdzero)
* Default | * Default |
* Priority | Major Interrupt Numbers * Priority | Major Interrupt Numbers
* ---------------------------------------------------------------- * ----------------------------------------------------------------
* Highest | 63 (3f), 62 (3e), 31 (1f), 30 (1e), 61 (3d), 60 (3c), * Highest | 47, 23, 46, 45, 22, 44,
* | 59 (3b), 58 (3a), 29 (1d), 28 (1c), 57 (39), 56 (38), * | 43, 21, 42, 41, 20, 40
* | 55 (37), 54 (36), 27 (1b), 26 (1a), 53 (35), 52 (34),
* | 51 (33), 50 (32), 25 (19), 24 (18), 49 (31), 48 (30)
* | * |
* | 11 (0b), 3 (03), 7 (07) * | 11 (0b), 3 (03), 7 (07)
* | 9 (09), 1 (01), 5 (05) * | 9 (09), 1 (01), 5 (05)
* | 12 (0c) * | 12 (0c)
* | 10 (0a), 2 (02), 6 (06) * | 10 (0a), 2 (02), 6 (06)
* | * |
* | 47 (2f), 46 (2e), 23 (17), 22 (16), 45 (2d), 44 (2c), * | 39, 19, 38, 37, 18, 36,
* | 43 (2b), 42 (2a), 21 (15), 20 (14), 41 (29), 40 (28), * Lowest | 35, 17, 34, 33, 16, 32
* | 39 (27), 38 (26), 19 (13), 18 (12), 37 (25), 36 (24),
* Lowest | 35 (23), 34 (22), 17 (11), 16 (10), 33 (21), 32 (20)
* ---------------------------------------------------------------- * ----------------------------------------------------------------
*/ */
static const uint8_t default_iprio[64] = { static const uint8_t default_iprio[64] = {
[63] = IPRIO_DEFAULT_UPPER, /* Custom interrupts 48 to 63 */
[62] = IPRIO_DEFAULT_UPPER + 1, [63] = IPRIO_MMAXIPRIO,
[31] = IPRIO_DEFAULT_UPPER + 2, [62] = IPRIO_MMAXIPRIO,
[30] = IPRIO_DEFAULT_UPPER + 3, [61] = IPRIO_MMAXIPRIO,
[61] = IPRIO_DEFAULT_UPPER + 4, [60] = IPRIO_MMAXIPRIO,
[60] = IPRIO_DEFAULT_UPPER + 5, [59] = IPRIO_MMAXIPRIO,
[58] = IPRIO_MMAXIPRIO,
[57] = IPRIO_MMAXIPRIO,
[56] = IPRIO_MMAXIPRIO,
[55] = IPRIO_MMAXIPRIO,
[54] = IPRIO_MMAXIPRIO,
[53] = IPRIO_MMAXIPRIO,
[52] = IPRIO_MMAXIPRIO,
[51] = IPRIO_MMAXIPRIO,
[50] = IPRIO_MMAXIPRIO,
[49] = IPRIO_MMAXIPRIO,
[48] = IPRIO_MMAXIPRIO,
[59] = IPRIO_DEFAULT_UPPER + 6, /* Custom interrupts 24 to 31 */
[58] = IPRIO_DEFAULT_UPPER + 7, [31] = IPRIO_MMAXIPRIO,
[29] = IPRIO_DEFAULT_UPPER + 8, [30] = IPRIO_MMAXIPRIO,
[28] = IPRIO_DEFAULT_UPPER + 9, [29] = IPRIO_MMAXIPRIO,
[57] = IPRIO_DEFAULT_UPPER + 10, [28] = IPRIO_MMAXIPRIO,
[56] = IPRIO_DEFAULT_UPPER + 11, [27] = IPRIO_MMAXIPRIO,
[26] = IPRIO_MMAXIPRIO,
[25] = IPRIO_MMAXIPRIO,
[24] = IPRIO_MMAXIPRIO,
[55] = IPRIO_DEFAULT_UPPER + 12, [47] = IPRIO_DEFAULT_UPPER,
[54] = IPRIO_DEFAULT_UPPER + 13, [23] = IPRIO_DEFAULT_UPPER + 1,
[27] = IPRIO_DEFAULT_UPPER + 14, [46] = IPRIO_DEFAULT_UPPER + 2,
[26] = IPRIO_DEFAULT_UPPER + 15, [45] = IPRIO_DEFAULT_UPPER + 3,
[53] = IPRIO_DEFAULT_UPPER + 16, [22] = IPRIO_DEFAULT_UPPER + 4,
[52] = IPRIO_DEFAULT_UPPER + 17, [44] = IPRIO_DEFAULT_UPPER + 5,
[51] = IPRIO_DEFAULT_UPPER + 18, [43] = IPRIO_DEFAULT_UPPER + 6,
[50] = IPRIO_DEFAULT_UPPER + 19, [21] = IPRIO_DEFAULT_UPPER + 7,
[25] = IPRIO_DEFAULT_UPPER + 20, [42] = IPRIO_DEFAULT_UPPER + 8,
[24] = IPRIO_DEFAULT_UPPER + 21, [41] = IPRIO_DEFAULT_UPPER + 9,
[49] = IPRIO_DEFAULT_UPPER + 22, [20] = IPRIO_DEFAULT_UPPER + 10,
[48] = IPRIO_DEFAULT_UPPER + 23, [40] = IPRIO_DEFAULT_UPPER + 11,
[11] = IPRIO_DEFAULT_M, [11] = IPRIO_DEFAULT_M,
[3] = IPRIO_DEFAULT_M + 1, [3] = IPRIO_DEFAULT_M + 1,
@ -266,33 +276,19 @@ static const uint8_t default_iprio[64] = {
[2] = IPRIO_DEFAULT_VS + 1, [2] = IPRIO_DEFAULT_VS + 1,
[6] = IPRIO_DEFAULT_VS + 2, [6] = IPRIO_DEFAULT_VS + 2,
[47] = IPRIO_DEFAULT_LOWER, [39] = IPRIO_DEFAULT_LOWER,
[46] = IPRIO_DEFAULT_LOWER + 1, [19] = IPRIO_DEFAULT_LOWER + 1,
[23] = IPRIO_DEFAULT_LOWER + 2, [38] = IPRIO_DEFAULT_LOWER + 2,
[22] = IPRIO_DEFAULT_LOWER + 3, [37] = IPRIO_DEFAULT_LOWER + 3,
[45] = IPRIO_DEFAULT_LOWER + 4, [18] = IPRIO_DEFAULT_LOWER + 4,
[44] = IPRIO_DEFAULT_LOWER + 5, [36] = IPRIO_DEFAULT_LOWER + 5,
[43] = IPRIO_DEFAULT_LOWER + 6, [35] = IPRIO_DEFAULT_LOWER + 6,
[42] = IPRIO_DEFAULT_LOWER + 7, [17] = IPRIO_DEFAULT_LOWER + 7,
[21] = IPRIO_DEFAULT_LOWER + 8, [34] = IPRIO_DEFAULT_LOWER + 8,
[20] = IPRIO_DEFAULT_LOWER + 9, [33] = IPRIO_DEFAULT_LOWER + 9,
[41] = IPRIO_DEFAULT_LOWER + 10, [16] = IPRIO_DEFAULT_LOWER + 10,
[40] = IPRIO_DEFAULT_LOWER + 11, [32] = IPRIO_DEFAULT_LOWER + 11,
[39] = IPRIO_DEFAULT_LOWER + 12,
[38] = IPRIO_DEFAULT_LOWER + 13,
[19] = IPRIO_DEFAULT_LOWER + 14,
[18] = IPRIO_DEFAULT_LOWER + 15,
[37] = IPRIO_DEFAULT_LOWER + 16,
[36] = IPRIO_DEFAULT_LOWER + 17,
[35] = IPRIO_DEFAULT_LOWER + 18,
[34] = IPRIO_DEFAULT_LOWER + 19,
[17] = IPRIO_DEFAULT_LOWER + 20,
[16] = IPRIO_DEFAULT_LOWER + 21,
[33] = IPRIO_DEFAULT_LOWER + 22,
[32] = IPRIO_DEFAULT_LOWER + 23,
}; };
uint8_t riscv_cpu_default_priority(int irq) uint8_t riscv_cpu_default_priority(int irq)