Skip to content

[PW_SID:1100296] acpi/riscv: use a dedicated insertion point in riscv_acpi_register_ext_intc() #2007

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

Open
linux-riscv-bot wants to merge 1 commit into
base: workflow__riscv__fixes
Choose a base branch
from
Open

[PW_SID:1100296] acpi/riscv: use a dedicated insertion point in riscv_acpi_register_ext_intc() #2007

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 10 additions & 5 deletions drivers/acpi/riscv/irq.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,8 @@ struct fwnode_handle *riscv_acpi_get_gsi_domain_id(u32 gsi)
static int __init riscv_acpi_register_ext_intc(u32 gsi_base, u32 nr_irqs, u32 nr_idcs,
u32 id, u32 type)
{
struct riscv_ext_intc_list *ext_intc_element, *node, *prev;
struct riscv_ext_intc_list *ext_intc_element, *node;
struct list_head *pos = &ext_intc_list;

ext_intc_element = kzalloc_obj(*ext_intc_element);
if (!ext_intc_element)
Expand All @@ -153,18 +154,22 @@ static int __init riscv_acpi_register_ext_intc(u32 gsi_base, u32 nr_irqs, u32 nr
ext_intc_element->nr_idcs = nr_idcs;
ext_intc_element->id = id;
list_for_each_entry(node, &ext_intc_list, list) {
if (node->gsi_base < ext_intc_element->gsi_base)
if (node->gsi_base < ext_intc_element->gsi_base) {
pos = &node->list;
break;
}
}

/* Adjust the previous node's GSI range if that has pending registration */
prev = list_prev_entry(node, list);
if (!list_entry_is_head(prev, &ext_intc_list, list)) {
if (pos->prev != &ext_intc_list) {
struct riscv_ext_intc_list *prev =
list_entry(pos->prev, struct riscv_ext_intc_list, list);

if (prev->flag & RISCV_ACPI_INTC_FLAG_PENDING)
prev->nr_irqs = ext_intc_element->gsi_base - prev->gsi_base;
}

list_add_tail(&ext_intc_element->list, &node->list);
list_add_tail(&ext_intc_element->list, pos);
return 0;
}

Expand Down