Skip to content

[bsp][rk3500] fixup the PCIe INTx IRQ information #11325

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

Merged
Rbb666 merged 1 commit into from
Apr 12, 2026
Merged

[bsp][rk3500] fixup the PCIe INTx IRQ information #11325

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
12 changes: 11 additions & 1 deletion bsp/rockchip/dm/pci/pcie-dw-rockchip.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ struct rockchip_pcie
struct rt_work hot_rst_work;

int intx_irq;
int intx_cpu;
rt_uint32_t intx;
struct rt_ofw_node *intx_np;
struct rt_pic intx_pic;
Expand Down Expand Up @@ -225,6 +226,7 @@ static void rockchip_pcie_intx_irq_unmask(struct rt_pic_irq *pirq)
static int rockchip_pcie_intx_irq_map(struct rt_pic *pic, int hwirq, rt_uint32_t mode)
{
int irq;
struct rockchip_pcie *rk_pcie = pic->priv_data;
struct rt_pic_irq *pirq = rt_pic_find_irq(pic, hwirq);

if (pirq)
Expand All @@ -236,7 +238,8 @@ static int rockchip_pcie_intx_irq_map(struct rt_pic *pic, int hwirq, rt_uint32_t
else
{
irq = rt_pic_config_irq(pic, hwirq, hwirq);
rt_pic_irq_set_triger_mode(irq, RT_IRQ_MODE_LEVEL_HIGH);
pirq->mode = mode;
RT_IRQ_AFFINITY_SET(pirq->affinity, rk_pcie->intx_cpu);
}
}
else
Expand Down Expand Up @@ -1486,6 +1489,8 @@ static rt_err_t rockchip_pcie_dw_probe(struct rt_platform_device *pdev)

if (rk_pcie->intx_irq >= 0)
{
RT_IRQ_AFFINITY_DECLARE(intx_affinity);

/* Legacy (INTx) init */
if (!(intx_np = rt_ofw_get_child_by_tag(np, "legacy-interrupt-controller")))
{
Expand All @@ -1505,6 +1510,11 @@ static rt_err_t rockchip_pcie_dw_probe(struct rt_platform_device *pdev)

rt_hw_interrupt_install(rk_pcie->intx_irq, rockchip_pcie_legacy_isr, rk_pcie, "rk-pcie-legacy");
rt_hw_interrupt_umask(rk_pcie->intx_irq);

if (!rt_pic_irq_get_affinity(rk_pcie->intx_irq, intx_affinity))
{
rk_pcie->intx_cpu = rt_bitmap_next_set_bit(intx_affinity, 0, RT_CPUS_NR);
}
}
else
{
Expand Down
Loading