lkml.org 
[lkml]   [2019]   [Mar]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH v4 3/9] PCI: keystone: Convert to using hierarchy domain for legacy interrupts
On Thu, 07 Mar 2019 09:12:30 +0000,
Kishon Vijay Abraham I <kishon@ti.com> wrote:
>
> Hi,
>
> On 23/02/19 5:41 PM, Marc Zyngier wrote:
> > On Thu, 21 Feb 2019 16:24:14 +0000
> > Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> wrote:
> >
> >> On Thu, Feb 21, 2019 at 03:45:12PM +0530, Kishon Vijay Abraham I wrote:
> >>> K2G provides separate IRQ lines for each of the four legacy interrupts.
> >>> Model this using hierarchy domain instead of linear domain with chained
> >>> IRQ handler.
> >>>
> >>> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
> >>> ---
> >>> drivers/pci/controller/dwc/pci-keystone.c | 205 +++++++++++++---------
> >>> 1 file changed, 118 insertions(+), 87 deletions(-)
> >>
> >> Hi Kishon,
> >>
> >> I CC'ed Marc because you are actually re-writing an interrupt controller
> >> driver so I would be happier to merge this refactoring if Marc can have
> >> a look and he is satisfied with it - more so because most of the code can
> >> be reused by other host bridge drivers with similar behaviour.
> >
> > Cheers Lorenzo.
> >
> > It doesn't look too bad, but there is a couple of points I'd like to see
> > clarified. Comments below.
> >
> >>
> >> I will have a look too, unfortunately it is becoming a bit tight for
> >> v5.1 but let's see how it goes.
> >>
> >> Thanks,
> >> Lorenzo
> >>
> >>> diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c
> >>> index 47f0dcf638f2..7f1648453f54 100644
> >>> --- a/drivers/pci/controller/dwc/pci-keystone.c
> >>> +++ b/drivers/pci/controller/dwc/pci-keystone.c
> >>> @@ -61,6 +61,7 @@
> >>>
> >>> #define IRQ_STATUS(n) (0x184 + ((n) << 4))
> >>> #define IRQ_ENABLE_SET(n) (0x188 + ((n) << 4))
> >>> +#define IRQ_ENABLE_CLR(n) (0x18C + ((n) << 4))
> >>> #define INTx_EN BIT(0)
> >>>
> >>> #define ERR_IRQ_STATUS 0x1c4
> >>> @@ -87,7 +88,6 @@ struct keystone_pcie {
> >>> struct dw_pcie *pci;
> >>> /* PCI Device ID */
> >>> u32 device_id;
> >>> - int legacy_host_irqs[PCI_NUM_INTX];
> >>> struct device_node *legacy_intc_np;
> >>>
> >>> int msi_host_irqs[MAX_MSI_HOST_IRQS];
> >>> @@ -96,7 +96,6 @@ struct keystone_pcie {
> >>> struct phy **phy;
> >>> struct device_link **link;
> >>> struct device_node *msi_intc_np;
> >>> - struct irq_domain *legacy_irq_domain;
> >>> struct device_node *np;
> >>>
> >>> int error_irq;
> >>> @@ -199,26 +198,6 @@ static int ks_pcie_msi_host_init(struct pcie_port *pp)
> >>> return dw_pcie_allocate_domains(pp);
> >>> }
> >>>
> >>> -static void ks_pcie_handle_legacy_irq(struct keystone_pcie *ks_pcie,
> >>> - int offset)
> >>> -{
> >>> - struct dw_pcie *pci = ks_pcie->pci;
> >>> - struct device *dev = pci->dev;
> >>> - u32 pending;
> >>> - int virq;
> >>> -
> >>> - pending = ks_pcie_app_readl(ks_pcie, IRQ_STATUS(offset));
> >>> -
> >>> - if (BIT(0) & pending) {
> >>> - virq = irq_linear_revmap(ks_pcie->legacy_irq_domain, offset);
> >>> - dev_dbg(dev, ": irq: irq_offset %d, virq %d\n", offset, virq);
> >>> - generic_handle_irq(virq);
> >>> - }
> >>> -
> >>> - /* EOI the INTx interrupt */
> >>> - ks_pcie_app_writel(ks_pcie, IRQ_EOI, offset);
> >>> -}
> >>> -
> >>> static void ks_pcie_enable_error_irq(struct keystone_pcie *ks_pcie)
> >>> {
> >>> ks_pcie_app_writel(ks_pcie, ERR_IRQ_ENABLE_SET, ERR_IRQ_ALL);
> >>> @@ -256,39 +235,117 @@ static irqreturn_t ks_pcie_handle_error_irq(struct keystone_pcie *ks_pcie)
> >>> return IRQ_HANDLED;
> >>> }
> >>>
> >>> -static void ks_pcie_ack_legacy_irq(struct irq_data *d)
> >>> +void ks_pcie_irq_eoi(struct irq_data *data)
> >>> {
> >>> + struct keystone_pcie *ks_pcie = irq_data_get_irq_chip_data(data);
> >>> + irq_hw_number_t hwirq = data->hwirq;
> >>> +
> >>> + ks_pcie_app_writel(ks_pcie, IRQ_EOI, hwirq);
> >>> + irq_chip_eoi_parent(data);
> >>> }
> >>>
> >>> -static void ks_pcie_mask_legacy_irq(struct irq_data *d)
> >>> +void ks_pcie_irq_enable(struct irq_data *data)
> >>> {
> >>> + struct keystone_pcie *ks_pcie = irq_data_get_irq_chip_data(data);
> >>> + irq_hw_number_t hwirq = data->hwirq;
> >>> +
> >>> + ks_pcie_app_writel(ks_pcie, IRQ_ENABLE_SET(hwirq), INTx_EN);
> >>> + irq_chip_enable_parent(data);
> >>> }
> >>>
> >>> -static void ks_pcie_unmask_legacy_irq(struct irq_data *d)
> >>> +void ks_pcie_irq_disable(struct irq_data *data)
> >>> {
> >>> + struct keystone_pcie *ks_pcie = irq_data_get_irq_chip_data(data);
> >>> + irq_hw_number_t hwirq = data->hwirq;
> >>> +
> >>> + ks_pcie_app_writel(ks_pcie, IRQ_ENABLE_CLR(hwirq), INTx_EN);
> >>> + irq_chip_disable_parent(data);
> >>> }
> >>>
> >>> static struct irq_chip ks_pcie_legacy_irq_chip = {
> >>> - .name = "Keystone-PCI-Legacy-IRQ",
> >>> - .irq_ack = ks_pcie_ack_legacy_irq,
> >>> - .irq_mask = ks_pcie_mask_legacy_irq,
> >>> - .irq_unmask = ks_pcie_unmask_legacy_irq,
> >>> + .name = "Keystone-PCI-Legacy-IRQ",
> >>> + .irq_enable = ks_pcie_irq_enable,
> >>> + .irq_disable = ks_pcie_irq_disable,
> >>> + .irq_eoi = ks_pcie_irq_eoi,
> >>> + .irq_mask = irq_chip_mask_parent,
> >>> + .irq_unmask = irq_chip_unmask_parent,
> >>> + .irq_retrigger = irq_chip_retrigger_hierarchy,
> >>> + .irq_set_type = irq_chip_set_type_parent,
> >>> + .irq_set_affinity = irq_chip_set_affinity_parent,
> >>> };
> >>>
> >>> -static int ks_pcie_init_legacy_irq_map(struct irq_domain *d,
> >>> - unsigned int irq,
> >>> - irq_hw_number_t hw_irq)
> >>> +static int ks_pcie_legacy_irq_domain_alloc(struct irq_domain *domain,
> >>> + unsigned int virq,
> >>> + unsigned int nr_irqs, void *data)
> >>> {
> >>> - irq_set_chip_and_handler(irq, &ks_pcie_legacy_irq_chip,
> >>> - handle_level_irq);
> >>> - irq_set_chip_data(irq, d->host_data);
> >>> + struct keystone_pcie *ks_pcie = domain->host_data;
> >>> + struct device_node *np = ks_pcie->legacy_intc_np;
> >>> + struct irq_fwspec parent_fwspec, *fwspec = data;
> >>> + struct of_phandle_args out_irq;
> >>> + int ret, i;
> >>> +
> >>> + if (nr_irqs != 1)
> >>> + return -EINVAL;
> >>> +
> >>> + ret = of_irq_parse_one(np, fwspec->param[0], &out_irq);
> >>> + if (ret < 0) {
> >>> + pr_err("Failed to parse interrupt node\n");
> >>> + return ret;
> >>> + }
> >
> > What it this trying to do? Fishing out the interrupts from DT based on
> > the legacy pin? This looks at best obscure. I wonder why you don't do
> > that at probe time instead. Anyway, this requires documenting.
>
> The device-tree of PCIe node looks something like below.
>
> interrupt-map = <0 0 0 1 &pcie_intc0 0 IRQ_TYPE_EDGE_RISING>, /* INT A */
> <0 0 0 2 &pcie_intc0 1 IRQ_TYPE_EDGE_RISING>, /* INT B */
> <0 0 0 3 &pcie_intc0 2 IRQ_TYPE_EDGE_RISING>, /* INT C */
> <0 0 0 4 &pcie_intc0 3 IRQ_TYPE_EDGE_RISING>; /* INT D */
> pcie_intc0: legacy-interrupt-controller {
> interrupt-controller;
> #interrupt-cells = <2>;
> interrupt-parent = <&gic>;
> interrupts = <GIC_SPI 48 IRQ_TYPE_EDGE_RISING>,
> <GIC_SPI 49 IRQ_TYPE_EDGE_RISING>,
> <GIC_SPI 50 IRQ_TYPE_EDGE_RISING>,
> <GIC_SPI 51 IRQ_TYPE_EDGE_RISING>;
> };
>
> INTA corresponds to HWIRQ '0' of the hierarchy irq domain we create in this
> driver which in turn corresponds to GIC_SPI '48' of GIC.
>
> We could create an array of parent_fwspec for each of the four interrupt lines
> in legacy-interrupt-controller during probe and use it directly here while
> invoking irq_domain_alloc_irqs_parent. I think you want me to do that instead
> of using of_irq_parse_one here?

Up to you. I don't mind either way, but it is the lack of
documentation that annoys me the most here.

The more worrying part is that you are using an EDGE signalling in
these bindings, and that's wrong. PCI legacy interrupts are level,
always.

[...]

> > From the DT binding:
> >
> > pcie_intc: Interrupt controller device node for Legacy IRQ chip
> > interrupt-cells: should be set to 1
> >
> > So why do we have 2 cells here?
>
> With '1' cells, it's not possible to specify irq trigger type. DT
> binding has to be fixed. I'll fix this in the next revision of the
> patch series.

As I said above, this is wrong. Legacy interrupts are always level, by
definition. Why are you making them edge-triggered?

> >
> >>> +
> >>> + if (fwspec->param[0] >= PCI_NUM_INTX)
> >>> + return -EINVAL;
> >
> > Most of the OF code assumes that the pin number describing the legacy
> > interrupt is 1-based, while you obviously treat it as 0-based. How does
> > it work?
>
> INTA corresponds to '0' of the hierarchy interrupt domain (using
> interrupt-map).

I'm not disputing this. It is more that the DT code does number the
pin from 1, if memory serves well. Can you please verify this (see
of_irq_parse_pci).

> >
> >>> +
> >>> + *hwirq = fwspec->param[0];
> >>> + *type = fwspec->param[1];
> >
> > As far as I remember, PCI legacy interrupts are level triggered, so
> > there should be no need to advertise the trigger (which is consistent
> > with the way the binding is written).
>
> It is pulse triggered at subsystem level. Quoting the TRM
> "The interrupt request signal at the PCIe SS boundary is a pulse signal that is
> triggered each time an assert interrupt message is received." The PCIe
> subsystem also has a level signal (interrupt pending signal) but the interrupt
> request signal is the one that is connected to GIC.

This looks completely wrong. MSIs are always edge, and legacy always
level, end of story. If your HW is any different, then it doesn't seem
to be compliant with PCI.

Thanks,

M.

--
Jazz is not dead, it just smell funny.

\
 
 \ /
  Last update: 2019-03-07 13:03    [W:0.159 / U:4.092 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site