| Message ID | 1366279869-23387-6-git-send-email-nobuhiro.iwamatsu.yj@renesas.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
Hello. On 18-04-2013 14:11, Nobuhiro Iwamatsu wrote: > sh-eth is supporting some SH and shmobile CPU. CPU with two or more networked > devices is in these, these specify IRQF_SHARED as IRQ configureation flags. > This changes to set IRQ configureation flags using in sh_eth_cpu_data. > Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> [...] > diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c > index af8c225..a4e337f 100644 > --- a/drivers/net/ethernet/renesas/sh_eth.c > +++ b/drivers/net/ethernet/renesas/sh_eth.c [...] > @@ -1920,14 +1923,7 @@ static int sh_eth_open(struct net_device *ndev) > pm_runtime_get_sync(&mdp->pdev->dev); > > ret = request_irq(ndev->irq, sh_eth_interrupt, > -#if defined(CONFIG_CPU_SUBTYPE_SH7763) || \ > - defined(CONFIG_CPU_SUBTYPE_SH7764) || \ > - defined(CONFIG_CPU_SUBTYPE_SH7757) > - IRQF_SHARED, > -#else > - 0, > -#endif Isn't it simpler to always pass IRQF_SHARED? > - ndev->name, ndev); > + mdp->cd->irq_flags, ndev->name, ndev); > if (ret) { > dev_err(&ndev->dev, "Can not assign IRQ number\n"); > return ret; > diff --git a/drivers/net/ethernet/renesas/sh_eth.h b/drivers/net/ethernet/renesas/sh_eth.h > index f86ea96..0772ec1 100644 > --- a/drivers/net/ethernet/renesas/sh_eth.h > +++ b/drivers/net/ethernet/renesas/sh_eth.h > @@ -463,6 +463,7 @@ struct sh_eth_cpu_data { > unsigned long tx_error_check; > > /* hardware features */ > + unsigned long irq_flags; /* IRQ configuration flags */ Comment should have been indented with tabs like the others. > unsigned no_psr:1; /* EtherC DO NOT have PSR */ > unsigned apr:1; /* EtherC have APR */ > unsigned mpr:1; /* EtherC have MPR */ > @@ -508,6 +509,7 @@ struct sh_eth_private { > int duplex; > int port; /* for TSU */ > int vlan_num_ids; /* for VLAN tag filter */ > + unsigned long irq_flags; /* IRQ configuration flags */ You don't seem to use this... WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, (2013/04/18 23:57), Sergei Shtylyov wrote: > Hello. > > On 18-04-2013 14:11, Nobuhiro Iwamatsu wrote: > >> sh-eth is supporting some SH and shmobile CPU. CPU with two or more networked >> devices is in these, these specify IRQF_SHARED as IRQ configureation flags. >> This changes to set IRQ configureation flags using in sh_eth_cpu_data. > >> Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> > [...] > >> diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c >> index af8c225..a4e337f 100644 >> --- a/drivers/net/ethernet/renesas/sh_eth.c >> +++ b/drivers/net/ethernet/renesas/sh_eth.c > [...] >> @@ -1920,14 +1923,7 @@ static int sh_eth_open(struct net_device *ndev) >> pm_runtime_get_sync(&mdp->pdev->dev); >> >> ret = request_irq(ndev->irq, sh_eth_interrupt, >> -#if defined(CONFIG_CPU_SUBTYPE_SH7763) || \ >> - defined(CONFIG_CPU_SUBTYPE_SH7764) || \ >> - defined(CONFIG_CPU_SUBTYPE_SH7757) >> - IRQF_SHARED, >> -#else >> - 0, >> -#endif > > Isn't it simpler to always pass IRQF_SHARED? > I think there is a mechanism to separate the setting par CPU, split is good. >> - ndev->name, ndev); >> + mdp->cd->irq_flags, ndev->name, ndev); >> if (ret) { >> dev_err(&ndev->dev, "Can not assign IRQ number\n"); >> return ret; >> diff --git a/drivers/net/ethernet/renesas/sh_eth.h b/drivers/net/ethernet/renesas/sh_eth.h >> index f86ea96..0772ec1 100644 >> --- a/drivers/net/ethernet/renesas/sh_eth.h >> +++ b/drivers/net/ethernet/renesas/sh_eth.h >> @@ -463,6 +463,7 @@ struct sh_eth_cpu_data { >> unsigned long tx_error_check; >> >> /* hardware features */ >> + unsigned long irq_flags; /* IRQ configuration flags */ > > Comment should have been indented with tabs like the others. > OK, I will fix. >> unsigned no_psr:1; /* EtherC DO NOT have PSR */ >> unsigned apr:1; /* EtherC have APR */ >> unsigned mpr:1; /* EtherC have MPR */ >> @@ -508,6 +509,7 @@ struct sh_eth_private { >> int duplex; >> int port; /* for TSU */ >> int vlan_num_ids; /* for VLAN tag filter */ >> + unsigned long irq_flags; /* IRQ configuration flags */ > > You don't seem to use this... Oh, I will remove. thank you. Best regards, Nobuhiro -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index af8c225..a4e337f 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c @@ -468,6 +468,7 @@ static struct sh_eth_cpu_data sh_eth_my_cpu_data = { EESR_RFRMER | EESR_TFE | EESR_TDE | EESR_ECI, .tx_error_check = EESR_TWB | EESR_TABT | EESR_TDE | EESR_TFE, + .irq_flags = IRQF_SHARED, .apr = 1, .mpr = 1, .tpauser = 1, @@ -576,6 +577,7 @@ static struct sh_eth_cpu_data sh_eth_my_cpu_data_giga = { .fdr_value = 0x0000072f, .rmcr_value = 0x00000001, + .irq_flags = IRQF_SHARED, .apr = 1, .mpr = 1, .tpauser = 1, @@ -658,6 +660,7 @@ static struct sh_eth_cpu_data sh_eth_my_cpu_data = { .hw_crc = 1, .select_mii = 1, #else + .irq_flags = IRQF_SHARED, .tsu_multi_reg = 1, #endif }; @@ -1920,14 +1923,7 @@ static int sh_eth_open(struct net_device *ndev) pm_runtime_get_sync(&mdp->pdev->dev); ret = request_irq(ndev->irq, sh_eth_interrupt, -#if defined(CONFIG_CPU_SUBTYPE_SH7763) || \ - defined(CONFIG_CPU_SUBTYPE_SH7764) || \ - defined(CONFIG_CPU_SUBTYPE_SH7757) - IRQF_SHARED, -#else - 0, -#endif - ndev->name, ndev); + mdp->cd->irq_flags, ndev->name, ndev); if (ret) { dev_err(&ndev->dev, "Can not assign IRQ number\n"); return ret; diff --git a/drivers/net/ethernet/renesas/sh_eth.h b/drivers/net/ethernet/renesas/sh_eth.h index f86ea96..0772ec1 100644 --- a/drivers/net/ethernet/renesas/sh_eth.h +++ b/drivers/net/ethernet/renesas/sh_eth.h @@ -463,6 +463,7 @@ struct sh_eth_cpu_data { unsigned long tx_error_check; /* hardware features */ + unsigned long irq_flags; /* IRQ configuration flags */ unsigned no_psr:1; /* EtherC DO NOT have PSR */ unsigned apr:1; /* EtherC have APR */ unsigned mpr:1; /* EtherC have MPR */ @@ -508,6 +509,7 @@ struct sh_eth_private { int duplex; int port; /* for TSU */ int vlan_num_ids; /* for VLAN tag filter */ + unsigned long irq_flags; /* IRQ configuration flags */ unsigned no_ether_link:1; unsigned ether_link_active_low:1;
sh-eth is supporting some SH and shmobile CPU. CPU with two or more networked devices is in these, these specify IRQF_SHARED as IRQ configureation flags. This changes to set IRQ configureation flags using in sh_eth_cpu_data. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> --- v2: no change. drivers/net/ethernet/renesas/sh_eth.c | 12 ++++-------- drivers/net/ethernet/renesas/sh_eth.h | 2 ++ 2 files changed, 6 insertions(+), 8 deletions(-)