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

Jump to bottom

drivers: plic: fix compilation warning when PLIC_SHELL is enabled on 64bit platform #67193

Merged
merged 3 commits into from
Jan 8, 2024
Merged

drivers: plic: fix compilation warning when PLIC_SHELL is enabled on 64bit platform #67193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d4a6958
drivers: intc: plic: fix compilation warning
ycsin Jan 4, 2024
56dd2f6
drivers: intc: plic: simplify the handling of the `irq_count` array
ycsin Jan 4, 2024
47addd3
tests: build_all: plic: add test for `PLIC_SHELL` build
ycsin Jan 4, 2024
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
15 changes: 7 additions & 8 deletions drivers/interrupt_controller/intc_plic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ struct plic_config {
};

struct plic_stats {
uint16_t *irq_count;
uint16_t *const irq_count;
const int irq_count_len;
};

struct plic_data {
Expand Down Expand Up @@ -455,7 +456,6 @@ static int cmd_get_stats(const struct shell *sh, size_t argc, char *argv[])
return ret;
}

const struct plic_config *config = dev->config;
const struct plic_data *data = dev->data;
struct plic_stats stat = data->stats;

Expand All @@ -466,7 +466,7 @@ static int cmd_get_stats(const struct shell *sh, size_t argc, char *argv[])

shell_print(sh, " IRQ\t Hits");
shell_print(sh, "==================");
for (size_t i = 0; i < MIN(config->num_irqs, CONFIG_MAX_IRQ_PER_AGGREGATOR); i++) {
for (int i = 0; i < stat.irq_count_len; i++) {
if (stat.irq_count[i] > min_hit) {
shell_print(sh, "%6d\t%10d", i, stat.irq_count[i]);
}
Expand All @@ -485,12 +485,10 @@ static int cmd_clear_stats(const struct shell *sh, size_t argc, char *argv[])
return ret;
}

const struct plic_config *config = dev->config;
const struct plic_data *data = dev->data;
struct plic_stats stat = data->stats;

memset(stat.irq_count, 0,
MIN(config->num_irqs, CONFIG_MAX_IRQ_PER_AGGREGATOR) * sizeof(uint16_t));
memset(stat.irq_count, 0, stat.irq_count_len * sizeof(uint16_t));

shell_print(sh, "Cleared stats of %s.\n", dev->name);

Expand Down Expand Up @@ -536,15 +534,16 @@ static int cmd_plic(const struct shell *sh, size_t argc, char **argv)
SHELL_CMD_ARG_REGISTER(plic, &plic_cmds, "PLIC shell commands",
cmd_plic, 2, 0);

#define PLIC_MIN_IRQ_NUM(n) MIN(DT_INST_PROP(n, riscv_ndev), CONFIG_MAX_IRQ_PER_AGGREGATOR)
#define PLIC_INTC_IRQ_COUNT_BUF_DEFINE(n) \
static uint16_t local_irq_count_##n[MIN(DT_INST_PROP(n, riscv_ndev), \
CONFIG_MAX_IRQ_PER_AGGREGATOR)];
static uint16_t local_irq_count_##n[PLIC_MIN_IRQ_NUM(n)];

#define PLIC_INTC_DATA_INIT(n) \
PLIC_INTC_IRQ_COUNT_BUF_DEFINE(n); \
static struct plic_data plic_data_##n = { \
.stats = { \
.irq_count = local_irq_count_##n, \
.irq_count_len = PLIC_MIN_IRQ_NUM(n), \
}, \
};

Expand Down
6 changes: 6 additions & 0 deletions tests/drivers/build_all/interrupt_controller/intc_plic/testcase.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ common:
- plic
tests:
drivers.interrupt_controller.intc_plic.build: {}
drivers.interrupt_controller.intc_plic.plic_shell.build:
tags:
- shell
extra_configs:
- CONFIG_SHELL=y
- CONFIG_PLIC_SHELL=y
drivers.interrupt_controller.intc_plic.multi_instance.build:
extra_args:
DTC_OVERLAY_FILE="./app.multi_instance.overlay"
Expand Down
Loading