chelsio 10G driver cleanups
Subsystems (2)
cover chelsio 10G driver cleanups
Some janitorial type house cleaning of the Chelsio 10G driver. Remove dead code spotted by Adrian and make iniatialization logic clearer.
PATCH 1/3 chelsio: remove unused code for 1G boards
Some code for Chelsio 1G boards was put in the driver
based on the vendor version (minus TOE). Well some of those board versions are only supported with TOE on the vendor driver, so additional dead code was added.
--- drivers/net/chelsio/Makefile | 4 drivers/net/chelsio/ixf1010.c | 505 -------------------------------------- drivers/net/chelsio/vsc8244.c | 367 --------------------------- drivers/net/chelsio/vsc8244_reg.h | 172 ------------ 4 files changed, 1 insertion(+), 1047 deletions(-)
drivers/net/chelsio/Makefile +1 -3
@@ -4,8 +4,6 @@ obj-$(CONFIG_CHELSIO_T1) += cxgb.o -cxgb-$(CONFIG_CHELSIO_T1_1G) += ixf1010.o mac.o mv88e1xxx.o vsc7326.o vsc8244.o +cxgb-$(CONFIG_CHELSIO_T1_1G) += mac.o mv88e1xxx.o vsc7326.o cxgb-objs := cxgb2.o espi.o tp.o pm3393.o sge.o subr.o \ mv88x201x.o my3126.o $(cxgb-y) - -
drivers/net/chelsio/ixf1010.c deleted +0 -505
505 lines not on this page · raw message
drivers/net/chelsio/vsc8244.c deleted +0 -367
367 lines not on this page · raw message
drivers/net/chelsio/vsc8244_reg.h deleted +0 -172
172 lines not on this page · raw message
Re: [PATCH 1/3] chelsio: remove unused code for 1G boards
Quoted 5 lines · Stephen Hemminger
Some code for Chelsio 1G boards was put in the driver
based on the vendor version (minus TOE). Well some of those board versions are only supported with TOE on the vendor driver, so additional dead code was added.
Quoted 8 lines
Signed-off-by Stephen Hemminger <[email protected]>--- drivers/net/chelsio/Makefile | 4 drivers/net/chelsio/ixf1010.c | 505 -------------------------------------- drivers/net/chelsio/vsc8244.c | 367 --------------------------- drivers/net/chelsio/vsc8244_reg.h | 172 ------------ 4 files changed, 1 insertion(+), 1047 deletions(-)
applied 1-3 to #upstream (2.6.22)
PATCH 2/3 chelsio: use C99 style initialization
In reply to Stephen HemmingerConvert some initialized structures to C99 style.
--- drivers/net/chelsio/subr.c | 195 ++++++++++++++++++++++++++++++--------------- 1 file changed, 134 insertions(+), 61 deletions(-)
drivers/net/chelsio/subr.c +134 -61
@@ -322,9 +322,9 @@ static int mi1_mdio_write(adapter_t *ada#if defined(CONFIG_CHELSIO_T1_1G ) || defined(CONFIG_CHELSIO_T1_COUGAR )static struct mdio_ops mi1_mdio_ops = { - mi1_mdio_init, - mi1_mdio_read, - mi1_mdio_write + .init = mi1_mdio_init, + .read = mi1_mdio_read, + .write = mi1_mdio_write };#endif
@@ -378,9 +378,9 @@ static int mi1_mdio_ext_write(adapter_t }static struct mdio_ops mi1_mdio_ext_ops = { - mi1_mdio_init, - mi1_mdio_ext_read, - mi1_mdio_ext_write + .init = mi1_mdio_init, + .read = mi1_mdio_ext_read, + .write = mi1_mdio_ext_write };enum {
@@ -392,63 +392,136 @@ enum { CH_BRD_N204_4CU, }; -static struct board_info t1_board[] = { - -{CHBT_BOARD_CHT110 ,1 /*ports#*/ , - SUPPORTED_10000baseT_Full/*caps*/ ,CHBT_TERM_T1 , -CHBT_MAC_PM3393 ,CHBT_PHY_MY3126 , -125000000 /*clk-core*/ ,150000000 /*clk-mc3*/ ,125000000 /*clk-mc4*/ , -1 /*espi-ports*/ ,0 /*clk-cspi*/ ,44 /*clk-elmer0*/ ,1 /*mdien*/ , -1 /*mdiinv*/ ,1 /*mdc*/ ,1 /*phybaseaddr*/ , &t1_pm3393_ops, - &t1_my3126_ops, &mi1_mdio_ext_ops, -"Chelsio T110 1x10GBase-CX4 TOE" }, - -{CHBT_BOARD_N110 ,1 /*ports#*/ , - SUPPORTED_10000baseT_Full |SUPPORTED_FIBRE /*caps*/ ,CHBT_TERM_T1 , -CHBT_MAC_PM3393 ,CHBT_PHY_88X2010 , -125000000 /*clk-core*/ ,0 /*clk-mc3*/ ,0 /*clk-mc4*/ , -1 /*espi-ports*/ ,0 /*clk-cspi*/ ,44 /*clk-elmer0*/ ,0 /*mdien*/ , -0 /*mdiinv*/ ,1 /*mdc*/ ,0 /*phybaseaddr*/ , &t1_pm3393_ops, - &t1_mv88x201x_ops, &mi1_mdio_ext_ops, -"Chelsio N110 1x10GBaseX NIC" }, - -{CHBT_BOARD_N210 ,1 /*ports#*/ , - SUPPORTED_10000baseT_Full |SUPPORTED_FIBRE /*caps*/ ,CHBT_TERM_T2 , -CHBT_MAC_PM3393 ,CHBT_PHY_88X2010 , -125000000 /*clk-core*/ ,0 /*clk-mc3*/ ,0 /*clk-mc4*/ , -1 /*espi-ports*/ ,0 /*clk-cspi*/ ,44 /*clk-elmer0*/ ,0 /*mdien*/ , -0 /*mdiinv*/ ,1 /*mdc*/ ,0 /*phybaseaddr*/ , &t1_pm3393_ops, - &t1_mv88x201x_ops, &mi1_mdio_ext_ops, -"Chelsio N210 1x10GBaseX NIC" }, - -{CHBT_BOARD_CHT210 ,1 /*ports#*/ , - SUPPORTED_10000baseT_Full/*caps*/ ,CHBT_TERM_T2 , -CHBT_MAC_PM3393 ,CHBT_PHY_88X2010 , -125000000 /*clk-core*/ ,133000000 /*clk-mc3*/ ,125000000 /*clk-mc4*/ , -1 /*espi-ports*/ ,0 /*clk-cspi*/ ,44 /*clk-elmer0*/ ,0 /*mdien*/ , -0 /*mdiinv*/ ,1 /*mdc*/ ,0 /*phybaseaddr*/ , &t1_pm3393_ops, - &t1_mv88x201x_ops, &mi1_mdio_ext_ops, -"Chelsio T210 1x10GBaseX TOE" }, - -{CHBT_BOARD_CHT210 ,1 /*ports#*/ , - SUPPORTED_10000baseT_Full/*caps*/ ,CHBT_TERM_T2 , -CHBT_MAC_PM3393 ,CHBT_PHY_MY3126 , -125000000 /*clk-core*/ ,133000000 /*clk-mc3*/ ,125000000 /*clk-mc4*/ , -1 /*espi-ports*/ ,0 /*clk-cspi*/ ,44 /*clk-elmer0*/ ,1 /*mdien*/ , -1 /*mdiinv*/ ,1 /*mdc*/ ,1 /*phybaseaddr*/ , &t1_pm3393_ops, - &t1_my3126_ops, &mi1_mdio_ext_ops, -"Chelsio T210 1x10GBase-CX4 TOE" }, +static const struct board_info t1_board[] = { + { + .board =CHBT_BOARD_CHT110 , + .port_number =1 , + .caps = SUPPORTED_10000baseT_Full, + .chip_term =CHBT_TERM_T1 , + .chip_mac =CHBT_MAC_PM3393 , + .chip_phy =CHBT_PHY_MY3126 , + .clock_core =125000000 , + .clock_mc3 =150000000 , + .clock_mc4 =125000000 , + .espi_nports =1 , + .clock_elmer0 =44 , + .mdio_mdien =1 , + .mdio_mdiinv =1 , + .mdio_mdc =1 , + .mdio_phybaseaddr =1 , + .gmac = &t1_pm3393_ops, + .gphy = &t1_my3126_ops, + .mdio_ops = &mi1_mdio_ext_ops, + .desc ="Chelsio T110 1x10GBase-CX4 TOE" , + }, + + { + .board =CHBT_BOARD_N110 , + .port_number =1 , + .caps = SUPPORTED_10000baseT_Full |SUPPORTED_FIBRE , + .chip_term =CHBT_TERM_T1 , + .chip_mac =CHBT_MAC_PM3393 , + .chip_phy =CHBT_PHY_88X2010 , + .clock_core =125000000 , + .espi_nports =1 , + .clock_elmer0 =44 , + .mdio_mdien =0 , + .mdio_mdiinv =0 , + .mdio_mdc =1 , + .mdio_phybaseaddr =0 , + .gmac = &t1_pm3393_ops, + .gphy = &t1_mv88x201x_ops, + .mdio_ops = &mi1_mdio_ext_ops, + .desc ="Chelsio N110 1x10GBaseX NIC" , + }, + + { + .board =CHBT_BOARD_N210 , + .port_number =1 , + .caps = SUPPORTED_10000baseT_Full |SUPPORTED_FIBRE , + .chip_term =CHBT_TERM_T2 , + .chip_mac =CHBT_MAC_PM3393 , + .chip_phy =CHBT_PHY_88X2010 , + .clock_core =125000000 , + .espi_nports =1 , + .clock_elmer0 =44 , + .mdio_mdien =0 , + .mdio_mdiinv =0 , + .mdio_mdc =1 , + .mdio_phybaseaddr =0 , + .gmac = &t1_pm3393_ops, + .gphy = &t1_mv88x201x_ops, + .mdio_ops = &mi1_mdio_ext_ops, + .desc ="Chelsio N210 1x10GBaseX NIC" , + }, + + { + .board =CHBT_BOARD_CHT210 , + .port_number =1 , + .caps = SUPPORTED_10000baseT_Full, + .chip_term =CHBT_TERM_T2 , + .chip_mac =CHBT_MAC_PM3393 , + .chip_phy =CHBT_PHY_88X2010 , + .clock_core =125000000 , + .clock_mc3 =133000000 , + .clock_mc4 =125000000 , + .espi_nports =1 , + .clock_elmer0 =44 , + .mdio_mdien =0 , + .mdio_mdiinv =0 , + .mdio_mdc =1 , + .mdio_phybaseaddr =0 , + .gmac = &t1_pm3393_ops, + .gphy = &t1_mv88x201x_ops, + .mdio_ops = &mi1_mdio_ext_ops, + .desc ="Chelsio T210 1x10GBaseX TOE" , + }, + + { + .board =CHBT_BOARD_CHT210 , + .port_number =1 , + .caps = SUPPORTED_10000baseT_Full, + .chip_term =CHBT_TERM_T2 , + .chip_mac =CHBT_MAC_PM3393 , + .chip_phy =CHBT_PHY_MY3126 , + .clock_core =125000000 , + .clock_mc3 =133000000 , + .clock_mc4 =125000000 , + .espi_nports =1 , + .clock_elmer0 =44 , + .mdio_mdien =1 , + .mdio_mdiinv =1 , + .mdio_mdc =1 , + .mdio_phybaseaddr =1 , + .gmac = &t1_pm3393_ops, + .gphy = &t1_my3126_ops, + .mdio_ops = &mi1_mdio_ext_ops, + .desc ="Chelsio T210 1x10GBase-CX4 TOE" , + }, #ifdef CONFIG_CHELSIO_T1_1G -{CHBT_BOARD_CHN204 ,4 /*ports#*/ , - SUPPORTED_10baseT_Half | SUPPORTED_10baseT_Full | SUPPORTED_100baseT_Half | - SUPPORTED_100baseT_Full | SUPPORTED_1000baseT_Full | SUPPORTED_Autoneg | -SUPPORTED_PAUSE |SUPPORTED_TP /*caps*/ ,CHBT_TERM_T2 ,CHBT_MAC_VSC7321 ,CHBT_PHY_88E1111 , -100000000 /*clk-core*/ ,0 /*clk-mc3*/ ,0 /*clk-mc4*/ , -4 /*espi-ports*/ ,0 /*clk-cspi*/ ,44 /*clk-elmer0*/ ,0 /*mdien*/ , -0 /*mdiinv*/ ,1 /*mdc*/ ,4 /*phybaseaddr*/ , &t1_vsc7326_ops, - &t1_mv88e1xxx_ops, &mi1_mdio_ops, -"Chelsio N204 4x100/1000BaseT NIC" }, + { + .board =CHBT_BOARD_CHN204 , + .port_number =4 , + .caps = SUPPORTED_10baseT_Half | SUPPORTED_10baseT_Full + | SUPPORTED_100baseT_Half | SUPPORTED_100baseT_Full + | SUPPORTED_1000baseT_Full | SUPPORTED_Autoneg | +SUPPORTED_PAUSE |SUPPORTED_TP , + .chip_term =CHBT_TERM_T2 , + .chip_mac =CHBT_MAC_VSC7321 , + .chip_phy =CHBT_PHY_88E1111 , + .clock_core =100000000 , + .espi_nports =4 , + .clock_elmer0 =44 , + .mdio_mdien =0 , + .mdio_mdiinv =0 , + .mdio_mdc =0 , + .mdio_phybaseaddr =4 , + .gmac = &t1_vsc7326_ops, + .gphy = &t1_mv88e1xxx_ops, + .mdio_ops = &mi1_mdio_ops, + .desc ="Chelsio N204 4x100/1000BaseT NIC" , + }, #endif };
PATCH 3/3 chelsio: use const for virtual functions
In reply to Stephen HemmingerThere are several uses of _ops structure in this driver that can be converted to const.
--- drivers/net/chelsio/common.h | 6 +++--- drivers/net/chelsio/cphy.h | 16 +++++++--------- drivers/net/chelsio/gmac.h | 10 +++------- drivers/net/chelsio/mac.c | 2 +- drivers/net/chelsio/mv88e1xxx.c | 8 ++++---- drivers/net/chelsio/mv88x201x.c | 8 ++++---- drivers/net/chelsio/my3126.c | 8 ++++---- drivers/net/chelsio/pm3393.c | 8 ++++---- drivers/net/chelsio/subr.c | 4 ++-- drivers/net/chelsio/vsc7326.c | 2 +- 10 files changed, 33 insertions(+), 39 deletions(-)
drivers/net/chelsio/common.h +3 -3
@@ -322,9 +322,9 @@ struct board_info {unsigned char mdio_mdiinv;unsigned char mdio_mdc;unsigned char mdio_phybaseaddr; -struct gmac *gmac; -struct gphy *gphy; -struct mdio_ops *mdio_ops; +const struct gmac *gmac; +const struct gphy *gphy; +const struct mdio_ops *mdio_ops;const char *desc; };
drivers/net/chelsio/cphy.h +7 -9
@@ -100,7 +100,7 @@ struct cphy {u32 elmer_gpo; -struct cphy_ops *ops;/* PHY operations */ +const struct cphy_ops *ops;/* PHY operations */ int (*mdio_read)(adapter_t *adapter,int phy_addr,int mmd_addr,int reg_addr,unsigned int *val); int (*mdio_write)(adapter_t *adapter, int phy_addr, int mmd_addr,
@@ -136,7 +136,7 @@ static inline int simple_mdio_write(stru/* Convenience initializer */ static inline void cphy_init (struct cphy *phy,adapter_t *adapter,int phy_addr,struct cphy_ops *phy_ops, -struct mdio_ops *mdio_ops) +const struct mdio_ops *mdio_ops) { phy->adapter = adapter; phy->addr = phy_addr;
@@ -151,7 +151,7 @@ static inline void cphy_init(struct cphystruct gphy {/* Construct a PHY instance with the given PHY address */ struct cphy *(*create)(adapter_t *adapter,int phy_addr, -struct mdio_ops *mdio_ops); +const struct mdio_ops *mdio_ops);/* * Reset the PHY chip. This resets the whole PHY chip, not individual
@@ -160,11 +160,9 @@ struct gphy { int (*reset)(adapter_t *adapter); }; -extern struct gphy t1_my3126_ops; -extern struct gphy t1_mv88e1xxx_ops; -extern struct gphy t1_vsc8244_ops; -extern struct gphy t1_xpak_ops; -extern struct gphy t1_mv88x201x_ops; -extern struct gphy t1_dummy_phy_ops; +extern const struct gphy t1_my3126_ops; +extern const struct gphy t1_mv88e1xxx_ops; +extern const struct gphy t1_vsc8244_ops; +extern const struct gphy t1_mv88x201x_ops;#endif /* _CXGB_CPHY_H_ */
drivers/net/chelsio/gmac.h +3 -7
@@ -126,7 +126,7 @@ typedef struct _cmac_instance cmac_instastruct cmac {struct cmac_statistics stats;adapter_t *adapter; -struct cmac_ops *ops; +const struct cmac_ops *ops;cmac_instance *instance; };
@@ -136,11 +136,7 @@ struct gmac { int (*reset)(adapter_t *); }; -extern struct gmac t1_pm3393_ops; -extern struct gmac t1_chelsio_mac_ops; -extern struct gmac t1_vsc7321_ops; -extern struct gmac t1_vsc7326_ops; -extern struct gmac t1_ixf1010_ops; -extern struct gmac t1_dummy_mac_ops; +extern const struct gmac t1_pm3393_ops; +extern const struct gmac t1_vsc7326_ops;#endif /* _CXGB_GMAC_H_ */
drivers/net/chelsio/mac.c +1 -1
@@ -363,6 +363,6 @@ static struct cmac *mac_create(adapter_treturn mac; } -struct gmac t1_chelsio_mac_ops = { +const struct gmac t1_chelsio_mac_ops = { .create = mac_create };
drivers/net/chelsio/mv88e1xxx.c +4 -4
@@ -354,7 +354,7 @@ static struct cphy_ops mv88e1xxx_ops = { };static struct cphy *mv88e1xxx_phy_create (adapter_t *adapter,int phy_addr, -struct mdio_ops *mdio_ops) +const struct mdio_ops *mdio_ops) {struct cphy *cphy =kzalloc (sizeof (*cphy),GFP_KERNEL );
@@ -390,7 +390,7 @@ static int mv88e1xxx_phy_reset(adapter_treturn 0 ; } -struct gphy t1_mv88e1xxx_ops = { - mv88e1xxx_phy_create, - mv88e1xxx_phy_reset +const struct gphy t1_mv88e1xxx_ops = { + .create = mv88e1xxx_phy_create, + .reset = mv88e1xxx_phy_reset };
drivers/net/chelsio/mv88x201x.c +4 -4
@@ -208,7 +208,7 @@ static struct cphy_ops mv88x201x_ops = { };static struct cphy *mv88x201x_phy_create (adapter_t *adapter,int phy_addr, -struct mdio_ops *mdio_ops) +const struct mdio_ops *mdio_ops) {u32 val;struct cphy *cphy =kzalloc (sizeof (*cphy),GFP_KERNEL );
@@ -252,7 +252,7 @@ static int mv88x201x_phy_reset(adapter_treturn 0 ; } -struct gphy t1_mv88x201x_ops = { - mv88x201x_phy_create, - mv88x201x_phy_reset +const struct gphy t1_mv88x201x_ops = { + .create = mv88x201x_phy_create, + .reset = mv88x201x_phy_reset };
drivers/net/chelsio/my3126.c +4 -4
@@ -166,7 +166,7 @@ static struct cphy_ops my3126_ops = { };static struct cphy *my3126_phy_create (adapter_t *adapter, -int phy_addr,struct mdio_ops *mdio_ops) +int phy_addr,const struct mdio_ops *mdio_ops) {struct cphy *cphy =kzalloc (sizeof (*cphy),GFP_KERNEL );
@@ -201,7 +201,7 @@ static int my3126_phy_reset(adapter_t *return 0 ; } -struct gphy t1_my3126_ops = { - my3126_phy_create, - my3126_phy_reset +const struct gphy t1_my3126_ops = { + .create = my3126_phy_create, + .reset = my3126_phy_reset };
drivers/net/chelsio/pm3393.c +4 -4
@@ -807,8 +807,8 @@ static int pm3393_mac_reset(adapter_t *return successful_reset ?0 :1 ; } -struct gmac t1_pm3393_ops = { -STATS_TICK_SECS , - pm3393_mac_create, - pm3393_mac_reset +const struct gmac t1_pm3393_ops = { + .stats_update_period =STATS_TICK_SECS , + .create = pm3393_mac_create, + .reset = pm3393_mac_reset, };
drivers/net/chelsio/subr.c +2 -2
@@ -321,7 +321,7 @@ static int mi1_mdio_write(adapter_t *ada }#if defined(CONFIG_CHELSIO_T1_1G ) || defined(CONFIG_CHELSIO_T1_COUGAR ) -static struct mdio_ops mi1_mdio_ops = { +static const struct mdio_ops mi1_mdio_ops = { .init = mi1_mdio_init, .read = mi1_mdio_read, .write = mi1_mdio_write
@@ -377,7 +377,7 @@ static int mi1_mdio_ext_write(adapter_treturn 0 ; } -static struct mdio_ops mi1_mdio_ext_ops = { +static const struct mdio_ops mi1_mdio_ext_ops = { .init = mi1_mdio_init, .read = mi1_mdio_ext_read, .write = mi1_mdio_ext_write
drivers/net/chelsio/vsc7326.c +1 -1
@@ -723,7 +723,7 @@ static int vsc7326_mac_reset(adapter_t *return 0 ; } -struct gmac t1_vsc7326_ops = { +const struct gmac t1_vsc7326_ops = { .stats_update_period =STATS_TICK_SECS , .create = vsc7326_mac_create, .reset = vsc7326_mac_reset,
PATCH 1/1 chelsio: Fix non-NAPI compile
In reply to Stephen HemmingerChelsio without NAPI enabled has been broken (won't compile) since 3de00b89 ("chelsio: NAPI speed improvement"):
drivers/net/chelsio/sge.c: In function t1_interrupt:
drivers/net/chelsio/sge.c:1716: error: Q undeclared (first use in this function)
The change below seems to add back in the declaration and initialization of Q that was removed by mistake, and at least makes the driver compile for me, although I have no hardware and hence no way to test whether this actually works.
---
Hi Stephen, since you seem to be looking after this driver a little bit (and since you broke it ;), I'll send this patch to you.
If this seems right to you, please merge it (although perhaps it would make more sense just to kill the non-NAPI code, since no one noticed it didn't compile).
drivers/net/chelsio/sge.c +1 -0
@@ -1696,6 +1696,7 @@ irqreturn_t t1_interrupt(int irq, void *cookie) {int work_done;struct adapter *adapter = cookie; +struct respQ *Q = &adapter->sge->respQ;spin_lock (&adapter->async_lock);
Re: [PATCH] chelsio: Fix non-NAPI compile
Quoted 6 lines · Roland Dreier
Chelsio without NAPI enabled has been broken (won't compile) since
3de00b89("chelsio: NAPI speed improvement"):
drivers/net/chelsio/sge.c: In functiont1_interrupt:
drivers/net/chelsio/sge.c:1716: error:Qundeclared (first use in this function)
Quoted 7 lines
The change below seems to add back in the declaration and initialization of
Qthat was removed by mistake, and at least makes the driver compile for me, although I have no hardware and hence no way to test whether this actually works.Signed-off-by Roland Dreier <[email protected]>
Roland,
You beat me :)
Cheers,
Divy
Quoted 26 lines
---
Hi Stephen, since you seem to be looking after this driver a little bit (and since you broke it ;), I'll send this patch to you.If this seems right to you, please merge it (although perhaps it would make more sense just to kill the non-NAPI code, since no one noticed it didn't compile).
drivers/net/chelsio/sge.c +1
-1@@ -1696,6 +1696,7 @@ irqreturn_t t1_interrupt(int irq, void *cookie) {int work_done;struct adapter *adapter = cookie; +struct respQ *Q = &adapter->sge->respQ;spin_lock (&adapter->async_lock); -To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH RESEND 1/1 chelsio: Fix non-NAPI compile
In reply to Roland DreierChelsio without NAPI enabled has been broken (won't compile) since 3de00b89 ("chelsio: NAPI speed improvement"):
drivers/net/chelsio/sge.c: In function t1_interrupt:
drivers/net/chelsio/sge.c:1716: error: Q undeclared (first use in this function)
The change below seems to add back in the declaration and initialization of Q that was removed by mistake, and at least makes the driver compile for me, although I have no hardware and hence no way to test whether this actually works.
---
Jeff, I haven't seen any response from Stephen but Divy from Chelsio seemed to agree with this patch, so can you please merge it? Right now the build is broken with CONFIG_CHELSIO_T1_NAPI=n.
Thanks.
drivers/net/chelsio/sge.c +1 -0
@@ -1696,6 +1696,7 @@ irqreturn_t t1_interrupt(int irq, void *cookie) {int work_done;struct adapter *adapter = cookie; +struct respQ *Q = &adapter->sge->respQ;spin_lock (&adapter->async_lock);
Re: [PATCH, RESEND] chelsio: Fix non-NAPI compile
Quoted 11 lines · On Mon, 26 Feb 2007 14:58:49 -0800 Roland Dreier <[email protected]> wrote:
Chelsio without NAPI enabled has been broken (won't compile) since
3de00b89("chelsio: NAPI speed improvement"):
drivers/net/chelsio/sge.c: In functiont1_interrupt:
drivers/net/chelsio/sge.c:1716: error:Qundeclared (first use in this function)The change below seems to add back in the declaration and initialization of
Qthat was removed by mistake, and at least makes the driver compile for me, although I have no hardware and hence no way to test whether this actually works.
Quoted 9 lines
Signed-off-by Roland Dreier <[email protected]>---
Jeff, I haven't seen any response from Stephen but Divy from Chelsio seemed to agree with this patch, so can you please merge it? Right now the build is broken withCONFIG_CHELSIO_T1_NAPI=n.Thanks.
I agree it was an obvious goof.
Signature · 1 line
Stephen Hemminger <[email protected]>
Jeff Garzik
AppliedRe: [PATCH, RESEND] chelsio: Fix non-NAPI compile
In reply to Roland DreierQuoted 11 lines · Roland Dreier
Chelsio without NAPI enabled has been broken (won't compile) since
3de00b89("chelsio: NAPI speed improvement"):
drivers/net/chelsio/sge.c: In functiont1_interrupt:
drivers/net/chelsio/sge.c:1716: error:Qundeclared (first use in this function)The change below seems to add back in the declaration and initialization of
Qthat was removed by mistake, and at least makes the driver compile for me, although I have no hardware and hence no way to test whether this actually works.
Quoted 5 lines
Signed-off-by Roland Dreier <[email protected]>---
Jeff, I haven't seen any response from Stephen but Divy from Chelsio seemed to agree with this patch, so can you please merge it? Right now the build is broken withCONFIG_CHELSIO_T1_NAPI=n.
applied