| Message ID | 20240131084133.1671440-9-claudiu.beznea.uj@bp.renesas.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: ravb: Prepare for suspend to RAM and runtime PM support (part 1) | expand |
I said the subject needs to be changed to "net: ravb: Move getting/requesting IRQs in the probe() method", not "net: ravb: Move IRQs getting/requesting in the probe() method". That's not very proper English, AFAIK! =) On 1/31/24 11:41 AM, Claudiu wrote: > From: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com> > > The runtime PM implementation will disable clocks at the end of > ravb_probe(). As some IP variants switch to reset mode as a result of > setting module standby through clock disable APIs, to implement runtime PM > the resource parsing and requesting are moved in the probe function and IP > settings are moved in the open function. This is done because at the end of > the probe some IP variants will switch anyway to reset mode and the > registers content is lost. Also keeping only register settings operations > in the ravb_open()/ravb_close() functions will make them faster. > > Commit moves IRQ requests to ravb_probe() to have all the IRQs ready when > the interface is open. As now IRQs getting/requesting are in a single place Again, "getting/requesting IRQs is done"... > there is no need to keep intermediary data (like ravb_rx_irqs[] and > ravb_tx_irqs[] arrays or IRQs in struct ravb_private). > > In order to avoid accessing the IP registers while the IP is runtime > suspended (e.g. in the timeframe b/w the probe requests shared IRQs and > IP clocks are enabled) in the interrupt handlers were introduced But can't we just request our IRQs after we call pm_runtime_resume_and_get()? We proaobly can... but then again, we call pm_runtime_put_sync() in the remove() method before the IRQs are freed... So, it still seems OK that we're adding pm_runtime_active() calls to the IRQ handlers in this very patch, not when we'll start calling the RPM APIs in the ndo_{open|close}() methods, correct? :-) > pm_runtime_active() checks. The device runtime PM usage counter has been > incremented to avoid disabling the device's clocks while the check is in > progress (if any). > > This is a preparatory change to add runtime PM support for all IP variants. > > Reviewed-by: Sergey Shtylyov <s.shtylyov@omp.ru> > Signed-off-by: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com> [...] > diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c > index e70c930840ce..f9297224e527 100644 > --- a/drivers/net/ethernet/renesas/ravb_main.c > +++ b/drivers/net/ethernet/renesas/ravb_main.c [...] > @@ -1092,11 +1082,23 @@ static irqreturn_t ravb_emac_interrupt(int irq, void *dev_id) > { > struct net_device *ndev = dev_id; > struct ravb_private *priv = netdev_priv(ndev); > + struct device *dev = &priv->pdev->dev; > + irqreturn_t result = IRQ_HANDLED; > + > + pm_runtime_get_noresume(dev); > + Not sure we need en empty line here... > + if (unlikely(!pm_runtime_active(dev))) { > + result = IRQ_NONE; > + goto out_rpm_put; > + } > > spin_lock(&priv->lock); > ravb_emac_interrupt_unlocked(ndev); > spin_unlock(&priv->lock); > - return IRQ_HANDLED; > + > +out_rpm_put: > + pm_runtime_put_noidle(dev); > + return result; > } > > /* Error interrupt handler */ > @@ -1176,9 +1178,15 @@ static irqreturn_t ravb_interrupt(int irq, void *dev_id) > struct net_device *ndev = dev_id; > struct ravb_private *priv = netdev_priv(ndev); > const struct ravb_hw_info *info = priv->info; > + struct device *dev = &priv->pdev->dev; > irqreturn_t result = IRQ_NONE; > u32 iss; > > + pm_runtime_get_noresume(dev); > + And here... > + if (unlikely(!pm_runtime_active(dev))) > + goto out_rpm_put; > + > spin_lock(&priv->lock); > /* Get interrupt status */ > iss = ravb_read(ndev, ISS); [...] > @@ -1230,9 +1241,15 @@ static irqreturn_t ravb_multi_interrupt(int irq, void *dev_id) > { > struct net_device *ndev = dev_id; > struct ravb_private *priv = netdev_priv(ndev); > + struct device *dev = &priv->pdev->dev; > irqreturn_t result = IRQ_NONE; > u32 iss; > > + pm_runtime_get_noresume(dev); > + Here too... > + if (unlikely(!pm_runtime_active(dev))) > + goto out_rpm_put; > + > spin_lock(&priv->lock); > /* Get interrupt status */ > iss = ravb_read(ndev, ISS); [...] > @@ -1261,8 +1281,14 @@ static irqreturn_t ravb_dma_interrupt(int irq, void *dev_id, int q) > { > struct net_device *ndev = dev_id; > struct ravb_private *priv = netdev_priv(ndev); > + struct device *dev = &priv->pdev->dev; > irqreturn_t result = IRQ_NONE; > > + pm_runtime_get_noresume(dev); > + Here as well... > + if (unlikely(!pm_runtime_active(dev))) > + goto out_rpm_put; > + > spin_lock(&priv->lock); > > /* Network control/Best effort queue RX/TX */ [...] > @@ -2616,6 +2548,90 @@ static void ravb_parse_delay_mode(struct device_node *np, struct net_device *nde > } > } > > +static int ravb_setup_irq(struct ravb_private *priv, const char *irq_name, > + const char *ch, int *irq, irq_handler_t handler) > +{ > + struct platform_device *pdev = priv->pdev; > + struct net_device *ndev = priv->ndev; > + struct device *dev = &pdev->dev; > + const char *dev_name; > + unsigned long flags; > + int error; > + > + if (irq_name) { > + dev_name = devm_kasprintf(dev, GFP_KERNEL, "%s:%s", ndev->name, ch); > + if (!dev_name) > + return -ENOMEM; > + > + *irq = platform_get_irq_byname(pdev, irq_name); > + flags = 0; > + } else { > + dev_name = ndev->name; > + *irq = platform_get_irq(pdev, 0); > + flags = IRQF_SHARED; Perhaps it's worth passing flags as a parameter here instead? > + } > + if (*irq < 0) > + return *irq; > + > + error = devm_request_irq(dev, *irq, handler, flags, dev_name, ndev); > + if (error) > + netdev_err(ndev, "cannot request IRQ %s\n", dev_name); > + > + return error; > +} [...] MBR, Sergey
On 31.01.2024 21:51, Sergey Shtylyov wrote: > I said the subject needs to be changed to "net: ravb: Move getting/requesting IRQs in > the probe() method", not "net: ravb: Move IRQs getting/requesting in the probe() method". > That's not very proper English, AFAIK! =) It seems I messed this up. > > On 1/31/24 11:41 AM, Claudiu wrote: > >> From: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com> >> >> The runtime PM implementation will disable clocks at the end of >> ravb_probe(). As some IP variants switch to reset mode as a result of >> setting module standby through clock disable APIs, to implement runtime PM >> the resource parsing and requesting are moved in the probe function and IP >> settings are moved in the open function. This is done because at the end of >> the probe some IP variants will switch anyway to reset mode and the >> registers content is lost. Also keeping only register settings operations >> in the ravb_open()/ravb_close() functions will make them faster. >> >> Commit moves IRQ requests to ravb_probe() to have all the IRQs ready when >> the interface is open. As now IRQs getting/requesting are in a single place > > Again, "getting/requesting IRQs is done"... > >> there is no need to keep intermediary data (like ravb_rx_irqs[] and >> ravb_tx_irqs[] arrays or IRQs in struct ravb_private). >> >> In order to avoid accessing the IP registers while the IP is runtime >> suspended (e.g. in the timeframe b/w the probe requests shared IRQs and >> IP clocks are enabled) in the interrupt handlers were introduced > > But can't we just request our IRQs after we call pm_runtime_resume_and_get()? > We proaobly can... but then again, we call pm_runtime_put_sync() in the remove() > method before the IRQs are freed... So, it still seems OK that we're adding > pm_runtime_active() calls to the IRQ handlers in this very patch, not when we'll > start calling the RPM APIs in the ndo_{open|close}() methods, correct? :-) Yes, it should be safe. > >> pm_runtime_active() checks. The device runtime PM usage counter has been >> incremented to avoid disabling the device's clocks while the check is in >> progress (if any). >> >> This is a preparatory change to add runtime PM support for all IP variants. >> >> Reviewed-by: Sergey Shtylyov <s.shtylyov@omp.ru> >> Signed-off-by: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com> > [...] > >> diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c >> index e70c930840ce..f9297224e527 100644 >> --- a/drivers/net/ethernet/renesas/ravb_main.c >> +++ b/drivers/net/ethernet/renesas/ravb_main.c > [...] >> @@ -1092,11 +1082,23 @@ static irqreturn_t ravb_emac_interrupt(int irq, void *dev_id) >> { >> struct net_device *ndev = dev_id; >> struct ravb_private *priv = netdev_priv(ndev); >> + struct device *dev = &priv->pdev->dev; >> + irqreturn_t result = IRQ_HANDLED; >> + >> + pm_runtime_get_noresume(dev); >> + > > Not sure we need en empty line here... That's a personal taste... more like to emphasize that this is PM runtime "protected"... Same for the rest of occurrences you signaled below. > >> + if (unlikely(!pm_runtime_active(dev))) { >> + result = IRQ_NONE; >> + goto out_rpm_put; >> + } >> >> spin_lock(&priv->lock); >> ravb_emac_interrupt_unlocked(ndev); >> spin_unlock(&priv->lock); >> - return IRQ_HANDLED; >> + >> +out_rpm_put: >> + pm_runtime_put_noidle(dev); >> + return result; >> } >> >> /* Error interrupt handler */ >> @@ -1176,9 +1178,15 @@ static irqreturn_t ravb_interrupt(int irq, void *dev_id) >> struct net_device *ndev = dev_id; >> struct ravb_private *priv = netdev_priv(ndev); >> const struct ravb_hw_info *info = priv->info; >> + struct device *dev = &priv->pdev->dev; >> irqreturn_t result = IRQ_NONE; >> u32 iss; >> >> + pm_runtime_get_noresume(dev); >> + > > And here... > >> + if (unlikely(!pm_runtime_active(dev))) >> + goto out_rpm_put; >> + >> spin_lock(&priv->lock); >> /* Get interrupt status */ >> iss = ravb_read(ndev, ISS); > [...] >> @@ -1230,9 +1241,15 @@ static irqreturn_t ravb_multi_interrupt(int irq, void *dev_id) >> { >> struct net_device *ndev = dev_id; >> struct ravb_private *priv = netdev_priv(ndev); >> + struct device *dev = &priv->pdev->dev; >> irqreturn_t result = IRQ_NONE; >> u32 iss; >> >> + pm_runtime_get_noresume(dev); >> + > > Here too... > >> + if (unlikely(!pm_runtime_active(dev))) >> + goto out_rpm_put; >> + >> spin_lock(&priv->lock); >> /* Get interrupt status */ >> iss = ravb_read(ndev, ISS); > [...] >> @@ -1261,8 +1281,14 @@ static irqreturn_t ravb_dma_interrupt(int irq, void *dev_id, int q) >> { >> struct net_device *ndev = dev_id; >> struct ravb_private *priv = netdev_priv(ndev); >> + struct device *dev = &priv->pdev->dev; >> irqreturn_t result = IRQ_NONE; >> >> + pm_runtime_get_noresume(dev); >> + > > Here as well... > >> + if (unlikely(!pm_runtime_active(dev))) >> + goto out_rpm_put; >> + >> spin_lock(&priv->lock); >> >> /* Network control/Best effort queue RX/TX */ > [...] >> @@ -2616,6 +2548,90 @@ static void ravb_parse_delay_mode(struct device_node *np, struct net_device *nde >> } >> } >> >> +static int ravb_setup_irq(struct ravb_private *priv, const char *irq_name, >> + const char *ch, int *irq, irq_handler_t handler) >> +{ >> + struct platform_device *pdev = priv->pdev; >> + struct net_device *ndev = priv->ndev; >> + struct device *dev = &pdev->dev; >> + const char *dev_name; >> + unsigned long flags; >> + int error; >> + >> + if (irq_name) { >> + dev_name = devm_kasprintf(dev, GFP_KERNEL, "%s:%s", ndev->name, ch); >> + if (!dev_name) >> + return -ENOMEM; >> + >> + *irq = platform_get_irq_byname(pdev, irq_name); >> + flags = 0; >> + } else { >> + dev_name = ndev->name; >> + *irq = platform_get_irq(pdev, 0); >> + flags = IRQF_SHARED; > > Perhaps it's worth passing flags as a parameter here instead? I don't see it like this. We need this flag for a single call of ravb_setup_irq(), we can determine for which call we need to set this flag so I think it is redundant to have an extra argument for it. > >> + } >> + if (*irq < 0) >> + return *irq; >> + >> + error = devm_request_irq(dev, *irq, handler, flags, dev_name, ndev); >> + if (error) >> + netdev_err(ndev, "cannot request IRQ %s\n", dev_name); >> + >> + return error; >> +} > [...] > > MBR, Sergey
diff --git a/drivers/net/ethernet/renesas/ravb.h b/drivers/net/ethernet/renesas/ravb.h index e0f8276cffed..e3506888cca6 100644 --- a/drivers/net/ethernet/renesas/ravb.h +++ b/drivers/net/ethernet/renesas/ravb.h @@ -1089,10 +1089,6 @@ struct ravb_private { int msg_enable; int speed; int emac_irq; - int erra_irq; - int mgmta_irq; - int rx_irqs[NUM_RX_QUEUE]; - int tx_irqs[NUM_TX_QUEUE]; unsigned no_avb_link:1; unsigned avb_link_active_low:1; diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c index e70c930840ce..f9297224e527 100644 --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c @@ -38,16 +38,6 @@ NETIF_MSG_RX_ERR | \ NETIF_MSG_TX_ERR) -static const char *ravb_rx_irqs[NUM_RX_QUEUE] = { - "ch0", /* RAVB_BE */ - "ch1", /* RAVB_NC */ -}; - -static const char *ravb_tx_irqs[NUM_TX_QUEUE] = { - "ch18", /* RAVB_BE */ - "ch19", /* RAVB_NC */ -}; - void ravb_modify(struct net_device *ndev, enum ravb_reg reg, u32 clear, u32 set) { @@ -1092,11 +1082,23 @@ static irqreturn_t ravb_emac_interrupt(int irq, void *dev_id) { struct net_device *ndev = dev_id; struct ravb_private *priv = netdev_priv(ndev); + struct device *dev = &priv->pdev->dev; + irqreturn_t result = IRQ_HANDLED; + + pm_runtime_get_noresume(dev); + + if (unlikely(!pm_runtime_active(dev))) { + result = IRQ_NONE; + goto out_rpm_put; + } spin_lock(&priv->lock); ravb_emac_interrupt_unlocked(ndev); spin_unlock(&priv->lock); - return IRQ_HANDLED; + +out_rpm_put: + pm_runtime_put_noidle(dev); + return result; } /* Error interrupt handler */ @@ -1176,9 +1178,15 @@ static irqreturn_t ravb_interrupt(int irq, void *dev_id) struct net_device *ndev = dev_id; struct ravb_private *priv = netdev_priv(ndev); const struct ravb_hw_info *info = priv->info; + struct device *dev = &priv->pdev->dev; irqreturn_t result = IRQ_NONE; u32 iss; + pm_runtime_get_noresume(dev); + + if (unlikely(!pm_runtime_active(dev))) + goto out_rpm_put; + spin_lock(&priv->lock); /* Get interrupt status */ iss = ravb_read(ndev, ISS); @@ -1222,6 +1230,9 @@ static irqreturn_t ravb_interrupt(int irq, void *dev_id) } spin_unlock(&priv->lock); + +out_rpm_put: + pm_runtime_put_noidle(dev); return result; } @@ -1230,9 +1241,15 @@ static irqreturn_t ravb_multi_interrupt(int irq, void *dev_id) { struct net_device *ndev = dev_id; struct ravb_private *priv = netdev_priv(ndev); + struct device *dev = &priv->pdev->dev; irqreturn_t result = IRQ_NONE; u32 iss; + pm_runtime_get_noresume(dev); + + if (unlikely(!pm_runtime_active(dev))) + goto out_rpm_put; + spin_lock(&priv->lock); /* Get interrupt status */ iss = ravb_read(ndev, ISS); @@ -1254,6 +1271,9 @@ static irqreturn_t ravb_multi_interrupt(int irq, void *dev_id) } spin_unlock(&priv->lock); + +out_rpm_put: + pm_runtime_put_noidle(dev); return result; } @@ -1261,8 +1281,14 @@ static irqreturn_t ravb_dma_interrupt(int irq, void *dev_id, int q) { struct net_device *ndev = dev_id; struct ravb_private *priv = netdev_priv(ndev); + struct device *dev = &priv->pdev->dev; irqreturn_t result = IRQ_NONE; + pm_runtime_get_noresume(dev); + + if (unlikely(!pm_runtime_active(dev))) + goto out_rpm_put; + spin_lock(&priv->lock); /* Network control/Best effort queue RX/TX */ @@ -1270,6 +1296,9 @@ static irqreturn_t ravb_dma_interrupt(int irq, void *dev_id, int q) result = IRQ_HANDLED; spin_unlock(&priv->lock); + +out_rpm_put: + pm_runtime_put_noidle(dev); return result; } @@ -1727,85 +1756,21 @@ static const struct ethtool_ops ravb_ethtool_ops = { .set_wol = ravb_set_wol, }; -static inline int ravb_hook_irq(unsigned int irq, irq_handler_t handler, - struct net_device *ndev, struct device *dev, - const char *ch) -{ - char *name; - int error; - - name = devm_kasprintf(dev, GFP_KERNEL, "%s:%s", ndev->name, ch); - if (!name) - return -ENOMEM; - error = request_irq(irq, handler, 0, name, ndev); - if (error) - netdev_err(ndev, "cannot request IRQ %s\n", name); - - return error; -} - /* Network device open function for Ethernet AVB */ static int ravb_open(struct net_device *ndev) { struct ravb_private *priv = netdev_priv(ndev); const struct ravb_hw_info *info = priv->info; - struct platform_device *pdev = priv->pdev; - struct device *dev = &pdev->dev; int error; napi_enable(&priv->napi[RAVB_BE]); if (info->nc_queues) napi_enable(&priv->napi[RAVB_NC]); - if (!info->multi_irqs) { - error = request_irq(ndev->irq, ravb_interrupt, IRQF_SHARED, - ndev->name, ndev); - if (error) { - netdev_err(ndev, "cannot request IRQ\n"); - goto out_napi_off; - } - } else { - error = ravb_hook_irq(ndev->irq, ravb_multi_interrupt, ndev, - dev, "ch22:multi"); - if (error) - goto out_napi_off; - error = ravb_hook_irq(priv->emac_irq, ravb_emac_interrupt, ndev, - dev, "ch24:emac"); - if (error) - goto out_free_irq; - error = ravb_hook_irq(priv->rx_irqs[RAVB_BE], ravb_be_interrupt, - ndev, dev, "ch0:rx_be"); - if (error) - goto out_free_irq_emac; - error = ravb_hook_irq(priv->tx_irqs[RAVB_BE], ravb_be_interrupt, - ndev, dev, "ch18:tx_be"); - if (error) - goto out_free_irq_be_rx; - error = ravb_hook_irq(priv->rx_irqs[RAVB_NC], ravb_nc_interrupt, - ndev, dev, "ch1:rx_nc"); - if (error) - goto out_free_irq_be_tx; - error = ravb_hook_irq(priv->tx_irqs[RAVB_NC], ravb_nc_interrupt, - ndev, dev, "ch19:tx_nc"); - if (error) - goto out_free_irq_nc_rx; - - if (info->err_mgmt_irqs) { - error = ravb_hook_irq(priv->erra_irq, ravb_multi_interrupt, - ndev, dev, "err_a"); - if (error) - goto out_free_irq_nc_tx; - error = ravb_hook_irq(priv->mgmta_irq, ravb_multi_interrupt, - ndev, dev, "mgmt_a"); - if (error) - goto out_free_irq_erra; - } - } - /* Device init */ error = ravb_dmac_init(ndev); if (error) - goto out_free_irq_mgmta; + goto out_napi_off; ravb_emac_init(ndev); /* Initialise PTP Clock driver */ @@ -1826,26 +1791,6 @@ static int ravb_open(struct net_device *ndev) if (info->gptp) ravb_ptp_stop(ndev); ravb_stop_dma(ndev); -out_free_irq_mgmta: - if (!info->multi_irqs) - goto out_free_irq; - if (info->err_mgmt_irqs) - free_irq(priv->mgmta_irq, ndev); -out_free_irq_erra: - if (info->err_mgmt_irqs) - free_irq(priv->erra_irq, ndev); -out_free_irq_nc_tx: - free_irq(priv->tx_irqs[RAVB_NC], ndev); -out_free_irq_nc_rx: - free_irq(priv->rx_irqs[RAVB_NC], ndev); -out_free_irq_be_tx: - free_irq(priv->tx_irqs[RAVB_BE], ndev); -out_free_irq_be_rx: - free_irq(priv->rx_irqs[RAVB_BE], ndev); -out_free_irq_emac: - free_irq(priv->emac_irq, ndev); -out_free_irq: - free_irq(ndev->irq, ndev); out_napi_off: if (info->nc_queues) napi_disable(&priv->napi[RAVB_NC]); @@ -2180,19 +2125,6 @@ static int ravb_close(struct net_device *ndev) cancel_work_sync(&priv->work); - if (info->multi_irqs) { - free_irq(priv->tx_irqs[RAVB_NC], ndev); - free_irq(priv->rx_irqs[RAVB_NC], ndev); - free_irq(priv->tx_irqs[RAVB_BE], ndev); - free_irq(priv->rx_irqs[RAVB_BE], ndev); - free_irq(priv->emac_irq, ndev); - if (info->err_mgmt_irqs) { - free_irq(priv->erra_irq, ndev); - free_irq(priv->mgmta_irq, ndev); - } - } - free_irq(ndev->irq, ndev); - if (info->nc_queues) napi_disable(&priv->napi[RAVB_NC]); napi_disable(&priv->napi[RAVB_BE]); @@ -2616,6 +2548,90 @@ static void ravb_parse_delay_mode(struct device_node *np, struct net_device *nde } } +static int ravb_setup_irq(struct ravb_private *priv, const char *irq_name, + const char *ch, int *irq, irq_handler_t handler) +{ + struct platform_device *pdev = priv->pdev; + struct net_device *ndev = priv->ndev; + struct device *dev = &pdev->dev; + const char *dev_name; + unsigned long flags; + int error; + + if (irq_name) { + dev_name = devm_kasprintf(dev, GFP_KERNEL, "%s:%s", ndev->name, ch); + if (!dev_name) + return -ENOMEM; + + *irq = platform_get_irq_byname(pdev, irq_name); + flags = 0; + } else { + dev_name = ndev->name; + *irq = platform_get_irq(pdev, 0); + flags = IRQF_SHARED; + } + if (*irq < 0) + return *irq; + + error = devm_request_irq(dev, *irq, handler, flags, dev_name, ndev); + if (error) + netdev_err(ndev, "cannot request IRQ %s\n", dev_name); + + return error; +} + +static int ravb_setup_irqs(struct ravb_private *priv) +{ + const struct ravb_hw_info *info = priv->info; + struct net_device *ndev = priv->ndev; + const char *irq_name, *emac_irq_name; + int error, irq; + + if (!info->multi_irqs) + return ravb_setup_irq(priv, NULL, NULL, &ndev->irq, ravb_interrupt); + + if (info->err_mgmt_irqs) { + irq_name = "dia"; + emac_irq_name = "line3"; + } else { + irq_name = "ch22"; + emac_irq_name = "ch24"; + } + + error = ravb_setup_irq(priv, irq_name, "ch22:multi", &ndev->irq, ravb_multi_interrupt); + if (error) + return error; + + error = ravb_setup_irq(priv, emac_irq_name, "ch24:emac", &priv->emac_irq, + ravb_emac_interrupt); + if (error) + return error; + + if (info->err_mgmt_irqs) { + error = ravb_setup_irq(priv, "err_a", "err_a", &irq, ravb_multi_interrupt); + if (error) + return error; + + error = ravb_setup_irq(priv, "mgmt_a", "mgmt_a", &irq, ravb_multi_interrupt); + if (error) + return error; + } + + error = ravb_setup_irq(priv, "ch0", "ch0:rx_be", &irq, ravb_be_interrupt); + if (error) + return error; + + error = ravb_setup_irq(priv, "ch1", "ch1:rx_nc", &irq, ravb_nc_interrupt); + if (error) + return error; + + error = ravb_setup_irq(priv, "ch18", "ch18:tx_be", &irq, ravb_be_interrupt); + if (error) + return error; + + return ravb_setup_irq(priv, "ch19", "ch19:tx_nc", &irq, ravb_nc_interrupt); +} + static void ravb_set_delay_mode(struct net_device *ndev) { struct ravb_private *priv = netdev_priv(ndev); @@ -2635,9 +2651,8 @@ static int ravb_probe(struct platform_device *pdev) struct reset_control *rstc; struct ravb_private *priv; struct net_device *ndev; - int error, irq, q; struct resource *res; - int i; + int error, q; if (!np) { dev_err(&pdev->dev, @@ -2664,20 +2679,6 @@ static int ravb_probe(struct platform_device *pdev) if (error) goto out_free_netdev; - if (info->multi_irqs) { - if (info->err_mgmt_irqs) - irq = platform_get_irq_byname(pdev, "dia"); - else - irq = platform_get_irq_byname(pdev, "ch22"); - } else { - irq = platform_get_irq(pdev, 0); - } - if (irq < 0) { - error = irq; - goto out_reset_assert; - } - ndev->irq = irq; - SET_NETDEV_DEV(ndev, &pdev->dev); priv = netdev_priv(ndev); @@ -2692,6 +2693,10 @@ static int ravb_probe(struct platform_device *pdev) priv->num_rx_ring[RAVB_NC] = NC_RX_RING_SIZE; } + error = ravb_setup_irqs(priv); + if (error) + goto out_reset_assert; + priv->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(priv->clk)) { error = PTR_ERR(priv->clk); @@ -2739,50 +2744,6 @@ static int ravb_probe(struct platform_device *pdev) priv->avb_link_active_low = of_property_read_bool(np, "renesas,ether-link-active-low"); - if (info->multi_irqs) { - if (info->err_mgmt_irqs) - irq = platform_get_irq_byname(pdev, "line3"); - else - irq = platform_get_irq_byname(pdev, "ch24"); - if (irq < 0) { - error = irq; - goto out_rpm_put; - } - priv->emac_irq = irq; - for (i = 0; i < NUM_RX_QUEUE; i++) { - irq = platform_get_irq_byname(pdev, ravb_rx_irqs[i]); - if (irq < 0) { - error = irq; - goto out_rpm_put; - } - priv->rx_irqs[i] = irq; - } - for (i = 0; i < NUM_TX_QUEUE; i++) { - irq = platform_get_irq_byname(pdev, ravb_tx_irqs[i]); - if (irq < 0) { - error = irq; - goto out_rpm_put; - } - priv->tx_irqs[i] = irq; - } - - if (info->err_mgmt_irqs) { - irq = platform_get_irq_byname(pdev, "err_a"); - if (irq < 0) { - error = irq; - goto out_rpm_put; - } - priv->erra_irq = irq; - - irq = platform_get_irq_byname(pdev, "mgmt_a"); - if (irq < 0) { - error = irq; - goto out_rpm_put; - } - priv->mgmta_irq = irq; - } - } - ndev->max_mtu = info->rx_max_buf_size - (ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN); ndev->min_mtu = ETH_MIN_MTU;