| Message ID | 20181219124207.13479-3-kishon@ti.com |
|---|---|
| State | New |
| Headers | show |
| Series | PCI: DWC/Keystone: MSI configuration cleanup | expand |
On Wed, Dec 19, 2018 at 06:11:59PM +0530, Kishon Vijay Abraham I wrote: > Instead of creating a new irqchip with empty callback functions, use > dummy_irq_chip. Since there is nothing to do in the irqchip callback > functions, use handle_simple_irq instead of handle_level_irq. > > Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> > --- > drivers/pci/controller/dwc/pci-keystone.c | 24 ++--------------------- > 1 file changed, 2 insertions(+), 22 deletions(-) > > diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c > index 5286a480f76b..1ef443009da5 100644 > --- a/drivers/pci/controller/dwc/pci-keystone.c > +++ b/drivers/pci/controller/dwc/pci-keystone.c > @@ -266,31 +266,12 @@ 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) > -{ > -} > - > -static void ks_pcie_mask_legacy_irq(struct irq_data *d) > -{ > -} > - > -static void ks_pcie_unmask_legacy_irq(struct irq_data *d) > -{ > -} > - > -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, > -}; > - > static int ks_pcie_init_legacy_irq_map(struct irq_domain *d, > unsigned int irq, > irq_hw_number_t hw_irq) > { > - irq_set_chip_and_handler(irq, &ks_pcie_legacy_irq_chip, > - handle_level_irq); > + irq_set_chip_and_handler(irq, &dummy_irq_chip, > + handle_simple_irq); Hi Kishon, thanks for putting it together. I think I'd rather move some of the logic for acking the interrupt in ks_pcie_handle_legacy_irq() into proper irq_chip methods than using a dummy_irq_chip (that Marc wants to deprecate). Also, the flow handler should be handle_level_irq() since that's what legacy IRQs are. I hope Marc can chime in when he has a minute to help you finalize this. Overall you are doing the right thing and I would like to get this series merged for v5.1. Thanks, Lorenzo > irq_set_chip_data(irq, d->host_data); > > return 0; > @@ -298,7 +279,6 @@ static int ks_pcie_init_legacy_irq_map(struct irq_domain *d, > > static const struct irq_domain_ops ks_pcie_legacy_irq_domain_ops = { > .map = ks_pcie_init_legacy_irq_map, > - .xlate = irq_domain_xlate_onetwocell, > }; > > /** > -- > 2.17.1 >
diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c index 5286a480f76b..1ef443009da5 100644 --- a/drivers/pci/controller/dwc/pci-keystone.c +++ b/drivers/pci/controller/dwc/pci-keystone.c @@ -266,31 +266,12 @@ 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) -{ -} - -static void ks_pcie_mask_legacy_irq(struct irq_data *d) -{ -} - -static void ks_pcie_unmask_legacy_irq(struct irq_data *d) -{ -} - -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, -}; - static int ks_pcie_init_legacy_irq_map(struct irq_domain *d, unsigned int irq, irq_hw_number_t hw_irq) { - irq_set_chip_and_handler(irq, &ks_pcie_legacy_irq_chip, - handle_level_irq); + irq_set_chip_and_handler(irq, &dummy_irq_chip, + handle_simple_irq); irq_set_chip_data(irq, d->host_data); return 0; @@ -298,7 +279,6 @@ static int ks_pcie_init_legacy_irq_map(struct irq_domain *d, static const struct irq_domain_ops ks_pcie_legacy_irq_domain_ops = { .map = ks_pcie_init_legacy_irq_map, - .xlate = irq_domain_xlate_onetwocell, }; /**
Instead of creating a new irqchip with empty callback functions, use dummy_irq_chip. Since there is nothing to do in the irqchip callback functions, use handle_simple_irq instead of handle_level_irq. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> --- drivers/pci/controller/dwc/pci-keystone.c | 24 ++--------------------- 1 file changed, 2 insertions(+), 22 deletions(-) -- 2.17.1