chelsio: lightweight review
Subsystems (2)
cover chelsio: lightweight review
The serie applies against netdev-2.6#upstream-linus or linux-2.6#master
Patches have been compiled. No further test.
It is available as:
git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6.git#chelsio
Former 'chelsio' branch is archived as 'chelsio-20061206'.
Distance from 'master' (e62438630ca37539c8cc1553710bbfaa3cf960a7)
-----------------------------------------------------------------
c021b7a9f2dcb8867f513983c42049b46bc97999e9c87a1d5674c56a33288177913b27911cefc7a3b335493ac99e2a4c716e597d6a11108fc670db904cf12df7a8e19339038f4e7952abf8555473391689e9d8ea4fbd032872e0a96b3f455b9de912b1f63c086dfee287469d5ee7b860eaec9be56b4ef0ef9b59cb170afa01d1dd86383c5178b9c306dbd275
Diffstat
--------
drivers/net/chelsio/common.h | 2 drivers/net/chelsio/cpl5_cmd.h | 18 ++-- drivers/net/chelsio/cxgb2.c | 161 ++++++++++++++++++------------------- drivers/net/chelsio/elmer0.h | 40 +++++---- drivers/net/chelsio/espi.c | 44 +++++----- drivers/net/chelsio/fpga_defs.h | 6 + drivers/net/chelsio/gmac.h | 11 ++ drivers/net/chelsio/ixf1010.c | 13 ++- drivers/net/chelsio/mv88e1xxx.c | 27 +++--- drivers/net/chelsio/my3126.c | 16 ++-- drivers/net/chelsio/pm3393.c | 8 +- drivers/net/chelsio/sge.c | 172 ++++++++++++++++++--------------------- drivers/net/chelsio/subr.c | 89 ++++++++++---------- drivers/net/chelsio/tp.c | 62 +++++++------- drivers/net/chelsio/vsc7326.c | 75 ++++++++--------- drivers/net/chelsio/vsc8244.c | 41 +++++---- 16 files changed, 388 insertions(+), 397 deletions(-)
Shortlog
--------
Francois Romieu:
chelsio: move return, break and continue statements on their own line
chelsio: the return statement is not a function
chelsio: spaces, tabs and friends
chelsio: use netdev_priv
chelsio: useless curly braces
chelsio: useless test in cxgb2::remove_one
chelsio: misc cleanups in sge
Patch
-----
See following messages.
Signature · 1 line
Ueimor
PATCH 1/7 chelsio: move return, break and continue statements on their own line
--- drivers/net/chelsio/espi.c | 3 ++- drivers/net/chelsio/ixf1010.c | 9 ++++++--- drivers/net/chelsio/mv88e1xxx.c | 6 ++++-- drivers/net/chelsio/subr.c | 6 ++++-- drivers/net/chelsio/vsc7326.c | 3 ++- drivers/net/chelsio/vsc8244.c | 3 ++- 6 files changed, 20 insertions(+), 10 deletions(-)
drivers/net/chelsio/espi.c +2 -1
@@ -301,7 +301,8 @@ void t1_espi_set_misc_ctrl(adapter_t *ad {struct peespi *espi = adapter->espi; -if (!is_T2 (adapter))return ; +if (!is_T2 (adapter)) +return ;spin_lock (&espi->lock); espi->misc_ctrl = (val & ~MON_MASK ) | (espi->misc_ctrl &MON_MASK );
drivers/net/chelsio/ixf1010.c +6 -3
@@ -273,7 +273,8 @@ static int mac_set_rx_mode(struct cmac *static int mac_set_mtu (struct cmac *mac,int mtu) {/* MAX_FRAME_SIZE inludes header + FCS, mtu doesn't */ -if (mtu > (MAX_FRAME_SIZE -14 -4 ))return -EINVAL ; +if (mtu > (MAX_FRAME_SIZE -14 -4 )) +return -EINVAL ;t1_tpi_write (mac->adapter,MACREG (mac,REG_MAX_FRAME_SIZE ), mtu +14 +4 );return 0 ;
@@ -460,10 +461,12 @@ static struct cmac *ixf1010_mac_create(astruct cmac *mac;u32 val; -if (index >9 )return NULL ; +if (index >9 ) +return NULL ; mac =kzalloc (sizeof (*mac) +sizeof (cmac_instance),GFP_KERNEL ); -if (!mac)return NULL ; +if (!mac) +return NULL ; mac->ops = &ixf1010_ops; mac->instance = (cmac_instance *)(mac +1 );
drivers/net/chelsio/mv88e1xxx.c +4 -2
@@ -308,7 +308,8 @@ static int mv88e1xxx_interrupt_handler(sMV88E1XXX_INTERRUPT_STATUS_REGISTER , &cause); cause &=INTR_ENABLE_MASK ; -if (!cause)break ; +if (!cause) +break ;if (cause &MV88E1XXX_INTR_LINK_CHNG ) { (void) simple_mdio_read(cphy,
@@ -360,7 +361,8 @@ static struct cphy *mv88e1xxx_phy_create {struct cphy *cphy =kzalloc (sizeof (*cphy),GFP_KERNEL ); -if (!cphy)return NULL ; +if (!cphy) +return NULL ;cphy_init (cphy, adapter, phy_addr, &mv88e1xxx_ops, mdio_ops);
drivers/net/chelsio/subr.c +4 -2
@@ -612,7 +612,8 @@ int t1_elmer0_ext_intr_handler(adapter_tint i, port_bit;for_each_port (adapter, i) { port_bit = i +1 ; -if (!(cause & (1 << port_bit)))continue ; +if (!(cause & (1 << port_bit))) +continue ; phy = adapter->port[i].phy; phy_cause = phy->ops->interrupt_handler (phy);
@@ -688,7 +689,8 @@ int t1_elmer0_ext_intr_handler(adapter_tfor_each_port (adapter, i) { port_bit = i ? i +1 :0 ; -if (!(cause & (1 << port_bit)))continue ; +if (!(cause & (1 << port_bit))) +continue ; phy = adapter->port[i].phy; phy_cause = phy->ops->interrupt_handler (phy);
drivers/net/chelsio/vsc7326.c +2 -1
@@ -686,7 +686,8 @@ static struct cmac *vsc7326_mac_create(aint i; mac =kzalloc (sizeof (*mac) +sizeof (cmac_instance),GFP_KERNEL ); -if (!mac)return NULL ; +if (!mac) +return NULL ; mac->ops = &vsc7326_ops; mac->instance = (cmac_instance *)(mac +1 );
drivers/net/chelsio/vsc8244.c +2 -1
@@ -347,7 +347,8 @@ static struct cphy* vsc8244_phy_create(a {struct cphy *cphy =kzalloc (sizeof (*cphy),GFP_KERNEL ); -if (!cphy)return NULL ; +if (!cphy) +return NULL ;cphy_init (cphy, adapter, phy_addr, &vsc8244_ops, mdio_ops);
Signature · 1 line
1.4.4.1
PATCH 2/7 chelsio: the return statement is not a function
In reply to Francois Romieu--- drivers/net/chelsio/my3126.c | 16 ++++++++-------- drivers/net/chelsio/vsc7326.c | 12 ++++++------ 2 files changed, 14 insertions(+), 14 deletions(-)
drivers/net/chelsio/my3126.c +8 -8
@@ -10,25 +10,25 @@ static int my3126_reset(struct cphy *cph* This can be done through registers. It is not required since * a full chip reset is used. */ -return (0 ); +return 0 ; }static int my3126_interrupt_enable (struct cphy *cphy) {schedule_delayed_work (&cphy->phy_update,HZ /30 );t1_tpi_read (cphy->adapter,A_ELMER0_GPO , &cphy->elmer_gpo); -return (0 ); +return 0 ; }static int my3126_interrupt_disable (struct cphy *cphy) {cancel_rearming_delayed_work (&cphy->phy_update); -return (0 ); +return 0 ; }static int my3126_interrupt_clear (struct cphy *cphy) { -return (0 ); +return 0 ; }#define OFFSET (REG_ADDR ) (REG_ADDR << 2)
@@ -100,7 +100,7 @@ static void my3216_poll(void *arg)static int my3126_set_loopback (struct cphy *cphy,int on) { -return (0 ); +return 0 ; }/* To check the activity LED */
@@ -144,7 +144,7 @@ static int my3126_get_link_status(structif (fc) *fc =PAUSE_RX |PAUSE_TX ; -return (0 ); +return 0 ; }static void my3126_destroy (struct cphy *cphy)
@@ -174,7 +174,7 @@ static struct cphy *my3126_phy_create(adINIT_WORK (&cphy->phy_update, my3216_poll, cphy); cphy->bmsr =0 ; -return (cphy); +return cphy; }/* Chip Reset */
@@ -195,7 +195,7 @@ static int my3126_phy_reset(adapter_t * val |=0x8000 ;t1_tpi_write (adapter,A_ELMER0_GPO , val);udelay (100 ); -return (0 ); +return 0 ; }struct gphy t1_my3126_ops = {
drivers/net/chelsio/vsc7326.c +6 -6
@@ -256,7 +256,7 @@ static int bist_rd(adapter_t *adapter, ielse if ((result & (1 <<8 )) !=0x0 )CH_ERR ("bist read error: 0x%x\n" , result); -return (result &0xff ); +return (result &0xff ); }static int bist_wr (adapter_t *adapter,int moduleid,int address,int value)
@@ -286,7 +286,7 @@ static int bist_wr(adapter_t *adapter, ielse if ((result & (1 <<26 )) !=0x0 )CH_ERR ("bist write error: 0x%x\n" , result); -return (0 ); +return 0 ; }static int run_bist (adapter_t *adapter,int moduleid)
@@ -295,7 +295,7 @@ static int run_bist(adapter_t *adapter, (void )bist_wr (adapter,moduleid,0x00 ,0x02 ); (void )bist_wr (adapter,moduleid,0x01 ,0x01 ); -return (0 ); +return 0 ; }static int check_bist (adapter_t *adapter,int moduleid)
@@ -309,14 +309,14 @@ static int check_bist(adapter_t *adapterif ((result &3 ) !=0x3 )CH_ERR ("Result: 0x%x BIST error in ram %d, column: 0x%04x\n" , result, moduleid, column); -return (0 ); +return 0 ; }static int enable_mem (adapter_t *adapter,int moduleid) {/*enable mem*/ (void )bist_wr (adapter,moduleid,0x00 ,0x00 ); -return (0 ); +return 0 ; }static int run_bist_all (adapter_t *adapter)
@@ -358,7 +358,7 @@ static int run_bist_all(adapter_t *adaptudelay (300 );vsc_write (adapter,REG_MEM_BIST ,0x0 );mdelay (10 ); -return (0 ); +return 0 ; }static int mac_intr_handler (struct cmac *mac)
Signature · 1 line
1.4.4.1
PATCH 3/7 chelsio: spaces, tabs and friends
In reply to Francois Romieu--- drivers/net/chelsio/common.h | 2 +- drivers/net/chelsio/cpl5_cmd.h | 18 +++--- drivers/net/chelsio/cxgb2.c | 64 +++++++++++----------- drivers/net/chelsio/elmer0.h | 40 +++++++------- drivers/net/chelsio/espi.c | 41 +++++++------- drivers/net/chelsio/fpga_defs.h | 6 +- drivers/net/chelsio/gmac.h | 11 +++- drivers/net/chelsio/ixf1010.c | 4 +- drivers/net/chelsio/mv88e1xxx.c | 17 +++---- drivers/net/chelsio/pm3393.c | 8 ++-- drivers/net/chelsio/sge.c | 115 ++++++++++++++++++++------------------- drivers/net/chelsio/subr.c | 83 ++++++++++++++-------------- drivers/net/chelsio/tp.c | 62 ++++++++++----------- drivers/net/chelsio/vsc7326.c | 57 ++++++++++---------- drivers/net/chelsio/vsc8244.c | 38 ++++++------- 15 files changed, 283 insertions(+), 283 deletions(-)
drivers/net/chelsio/common.h +1 -1
@@ -324,7 +324,7 @@ struct board_info {unsigned char mdio_phybaseaddr;struct gmac *gmac;struct gphy *gphy; -struct mdio_ops *mdio_ops; +struct mdio_ops *mdio_ops;const char *desc; };
drivers/net/chelsio/cpl5_cmd.h +9 -9
@@ -103,7 +103,7 @@ enum CPL_opcode {CPL_MIGRATE_C2T_RPL =0xDD ,CPL_ERROR =0xD7 , -/* internal: driver -> TOM */ +/* internal: driver -> TOM */ CPL_MSS_CHANGE = 0xE1 };
@@ -159,8 +159,8 @@ enum { // TX_PKT_LSO ethe };union opcode_tid { -u32 opcode_tid; -u8 opcode; +u32 opcode_tid; +u8 opcode; };#define S_OPCODE 24
@@ -234,7 +234,7 @@ struct cpl_pass_accept_req {u32 local_ip;u32 peer_ip;u32 tos_tid; -struct tcp_options tcp_options; +struct tcp_options tcp_options;u8 dst_mac[6 ];u16 vlan_tag;u8 src_mac[6 ];
@@ -250,12 +250,12 @@ struct cpl_pass_accept_rpl {u32 peer_ip;u32 opt0h;union { -u32 opt0l; -struct { -u8 rsvd[3 ]; -u8 status; +u32 opt0l; +struct { +u8 rsvd[3 ]; +u8 status; + }; }; - }; };struct cpl_act_open_req {
drivers/net/chelsio/cxgb2.c +32 -32
142 lines not on this page · raw message
drivers/net/chelsio/elmer0.h +20 -20
@@ -46,14 +46,14 @@ enum { };/* ELMER0 registers */ -#define A_ELMER0_VERSION 0x100000 -#define A_ELMER0_PHY_CFG 0x100004 -#define A_ELMER0_INT_ENABLE 0x100008 -#define A_ELMER0_INT_CAUSE 0x10000c -#define A_ELMER0_GPI_CFG 0x100010 -#define A_ELMER0_GPI_STAT 0x100014 -#define A_ELMER0_GPO 0x100018 -#define A_ELMER0_PORT0_MI1_CFG 0x400000 +#define A_ELMER0_VERSION 0x100000 +#define A_ELMER0_PHY_CFG 0x100004 +#define A_ELMER0_INT_ENABLE 0x100008 +#define A_ELMER0_INT_CAUSE 0x10000c +#define A_ELMER0_GPI_CFG 0x100010 +#define A_ELMER0_GPI_STAT 0x100014 +#define A_ELMER0_GPO 0x100018 +#define A_ELMER0_PORT0_MI1_CFG 0x400000#define S_MI1_MDI_ENABLE 0#define V_MI1_MDI_ENABLE (x) ((x) << S_MI1_MDI_ENABLE)
@@ -111,18 +111,18 @@ enum {#define V_MI1_OP_BUSY (x) ((x) << S_MI1_OP_BUSY)#define F_MI1_OP_BUSY V_MI1_OP_BUSY(1U) -#define A_ELMER0_PORT1_MI1_CFG 0x500000 -#define A_ELMER0_PORT1_MI1_ADDR 0x500004 -#define A_ELMER0_PORT1_MI1_DATA 0x500008 -#define A_ELMER0_PORT1_MI1_OP 0x50000c -#define A_ELMER0_PORT2_MI1_CFG 0x600000 -#define A_ELMER0_PORT2_MI1_ADDR 0x600004 -#define A_ELMER0_PORT2_MI1_DATA 0x600008 -#define A_ELMER0_PORT2_MI1_OP 0x60000c -#define A_ELMER0_PORT3_MI1_CFG 0x700000 -#define A_ELMER0_PORT3_MI1_ADDR 0x700004 -#define A_ELMER0_PORT3_MI1_DATA 0x700008 -#define A_ELMER0_PORT3_MI1_OP 0x70000c +#define A_ELMER0_PORT1_MI1_CFG 0x500000 +#define A_ELMER0_PORT1_MI1_ADDR 0x500004 +#define A_ELMER0_PORT1_MI1_DATA 0x500008 +#define A_ELMER0_PORT1_MI1_OP 0x50000c +#define A_ELMER0_PORT2_MI1_CFG 0x600000 +#define A_ELMER0_PORT2_MI1_ADDR 0x600004 +#define A_ELMER0_PORT2_MI1_DATA 0x600008 +#define A_ELMER0_PORT2_MI1_OP 0x60000c +#define A_ELMER0_PORT3_MI1_CFG 0x700000 +#define A_ELMER0_PORT3_MI1_ADDR 0x700004 +#define A_ELMER0_PORT3_MI1_DATA 0x700008 +#define A_ELMER0_PORT3_MI1_OP 0x70000c/* Simple bit definition for GPI and GP0 registers. */ #define ELMER0_GP_BIT0 0x0001
drivers/net/chelsio/espi.c +20 -21
71 lines not on this page · raw message
drivers/net/chelsio/fpga_defs.h +3 -3
@@ -98,9 +98,9 @@#define A_MI0_DATA_INT 0xb10/* GMAC registers */ -#define A_GMAC_MACID_LO 0x28 -#define A_GMAC_MACID_HI 0x2c -#define A_GMAC_CSR 0x30 +#define A_GMAC_MACID_LO 0x28 +#define A_GMAC_MACID_HI 0x2c +#define A_GMAC_CSR 0x30#define S_INTERFACE 0#define M_INTERFACE 0x3
drivers/net/chelsio/gmac.h +9 -2
@@ -42,8 +42,15 @@#include "common.h" -enum {MAC_STATS_UPDATE_FAST ,MAC_STATS_UPDATE_FULL }; -enum {MAC_DIRECTION_RX =1 ,MAC_DIRECTION_TX =2 }; +enum { +MAC_STATS_UPDATE_FAST , +MAC_STATS_UPDATE_FULL +}; + +enum { +MAC_DIRECTION_RX =1 , +MAC_DIRECTION_TX =2 +};struct cmac_statistics {/* Transmit */
drivers/net/chelsio/ixf1010.c +2 -2
@@ -358,8 +358,8 @@ static void enable_port(struct cmac *mac val |= (1 << index);t1_tpi_write (adapter,REG_PORT_ENABLE , val); - index <<=2 ; -if (is_T2 (adapter)) { + index <<=2 ; +if (is_T2 (adapter)) {/* T204: set the Fifo water level & threshold */ t1_tpi_write (adapter,RX_FIFO_HIGH_WATERMARK_BASE + index,0x740 );t1_tpi_write (adapter,RX_FIFO_LOW_WATERMARK_BASE + index,0x730 );
drivers/net/chelsio/mv88e1xxx.c +7 -10
@@ -73,9 +73,8 @@ static int mv88e1xxx_interrupt_enable(stt1_tpi_read (cphy->adapter,A_ELMER0_INT_ENABLE , &elmer); elmer |=ELMER0_GP_BIT1 ; -if (is_T2 (cphy->adapter)) { - elmer |=ELMER0_GP_BIT2 |ELMER0_GP_BIT3 |ELMER0_GP_BIT4 ; - } +if (is_T2 (cphy->adapter)) + elmer |=ELMER0_GP_BIT2 |ELMER0_GP_BIT3 |ELMER0_GP_BIT4 ;t1_tpi_write (cphy->adapter,A_ELMER0_INT_ENABLE , elmer); }return 0 ;
@@ -92,9 +91,8 @@ static int mv88e1xxx_interrupt_disable(st1_tpi_read (cphy->adapter,A_ELMER0_INT_ENABLE , &elmer); elmer &= ~ELMER0_GP_BIT1 ; -if (is_T2 (cphy->adapter)) { +if (is_T2 (cphy->adapter)) elmer &= ~(ELMER0_GP_BIT2 |ELMER0_GP_BIT3 |ELMER0_GP_BIT4 ); - }t1_tpi_write (cphy->adapter,A_ELMER0_INT_ENABLE , elmer); }return 0 ;
@@ -112,9 +110,8 @@ static int mv88e1xxx_interrupt_clear(strif (t1_is_asic (cphy->adapter)) {t1_tpi_read (cphy->adapter,A_ELMER0_INT_CAUSE , &elmer); elmer |=ELMER0_GP_BIT1 ; -if (is_T2 (cphy->adapter)) { +if (is_T2 (cphy->adapter)) elmer |=ELMER0_GP_BIT2 |ELMER0_GP_BIT3 |ELMER0_GP_BIT4 ; - }t1_tpi_write (cphy->adapter,A_ELMER0_INT_CAUSE , elmer); }return 0 ;
@@ -300,7 +297,7 @@ static int mv88e1xxx_interrupt_handler(s/* * Loop until cause reads zero. Need to handle bouncing interrupts. -*/ +*/ while (1 ) {u32 cause;
@@ -379,11 +376,11 @@ static struct cphy *mv88e1xxx_phy_create } (void )mv88e1xxx_downshift_set (cphy,1 );/* Enable downshift */ -/* LED */ +/* LED */ if (is_T2 (adapter)) { (void )simple_mdio_write (cphy,MV88E1XXX_LED_CONTROL_REGISTER ,0x1 ); - } + }return cphy; }
drivers/net/chelsio/pm3393.c +4 -4
@@ -455,8 +455,8 @@ static void pm3393_rmon_update(struct adstatic const struct cmac_statistics *pm3393_update_statistics (struct cmac *mac,int flag) { -u64 ro; -u32 val0, val1, val2, val3; +u64 ro; +u32 val0, val1, val2, val3;/* Snap the counters */ pmwrite(mac, SUNI1x10GEXP_REG_MSTAT_CONTROL,
@@ -534,9 +534,9 @@ static int pm3393_macaddress_set(struct/* Store local copy */ memcpy (cmac->instance->mac_addr, ma,6 ); - lo = ((u32 ) ma[1 ] <<8 ) | (u32 ) ma[0 ]; + lo = ((u32 ) ma[1 ] <<8 ) | (u32 ) ma[0 ]; mid = ((u32 ) ma[3 ] <<8 ) | (u32 ) ma[2 ]; - hi = ((u32 ) ma[5 ] <<8 ) | (u32 ) ma[4 ]; + hi = ((u32 ) ma[5 ] <<8 ) | (u32 ) ma[4 ];/* Disable Rx/Tx MAC before configuring it. */ if (enabled)
drivers/net/chelsio/sge.c +59 -56
278 lines not on this page · raw message
drivers/net/chelsio/subr.c +41 -42
184 lines not on this page · raw message
drivers/net/chelsio/tp.c +30 -32
75 lines not on this page · raw message
drivers/net/chelsio/vsc7326.c +28 -29
115 lines not on this page · raw message
drivers/net/chelsio/vsc8244.c +18 -20
@@ -54,7 +54,7 @@ enum { };#define CFG_CHG_INTR_MASK (VSC_INTR_LINK_CHG | VSC_INTR_NEG_ERR | \ - VSC_INTR_NEG_DONE) + VSC_INTR_NEG_DONE)#define INTR_MASK (CFG_CHG_INTR_MASK | VSC_INTR_TX_FIFO | VSC_INTR_RX_FIFO | \ VSC_INTR_ENABLE)
@@ -94,19 +94,18 @@ static int vsc8244_intr_enable(struct cp {simple_mdio_write (cphy,VSC8244_INTR_ENABLE ,INTR_MASK ); -/* Enable interrupts through Elmer */ +/* Enable interrupts through Elmer */ if (t1_is_asic (cphy->adapter)) {u32 elmer;t1_tpi_read (cphy->adapter,A_ELMER0_INT_ENABLE , &elmer); elmer |=ELMER0_GP_BIT1 ; -if (is_T2 (cphy->adapter)) { +if (is_T2 (cphy->adapter)) elmer |=ELMER0_GP_BIT2 |ELMER0_GP_BIT3 |ELMER0_GP_BIT4 ; - }t1_tpi_write (cphy->adapter,A_ELMER0_INT_ENABLE , elmer); } -return 0 ; +return 0 ; }static int vsc8244_intr_disable (struct cphy *cphy)
@@ -118,19 +117,18 @@ static int vsc8244_intr_disable(struct ct1_tpi_read (cphy->adapter,A_ELMER0_INT_ENABLE , &elmer); elmer &= ~ELMER0_GP_BIT1 ; -if (is_T2 (cphy->adapter)) { +if (is_T2 (cphy->adapter)) elmer &= ~(ELMER0_GP_BIT2 |ELMER0_GP_BIT3 |ELMER0_GP_BIT4 ); - }t1_tpi_write (cphy->adapter,A_ELMER0_INT_ENABLE , elmer); } -return 0 ; +return 0 ; }static int vsc8244_intr_clear (struct cphy *cphy) {u32 val; -u32 elmer; +u32 elmer;/* Clear PHY interrupts by reading the register. */ simple_mdio_read (cphy,VSC8244_INTR_ENABLE , &val);
@@ -138,13 +136,12 @@ static int vsc8244_intr_clear(struct cphif (t1_is_asic (cphy->adapter)) {t1_tpi_read (cphy->adapter,A_ELMER0_INT_CAUSE , &elmer); elmer |=ELMER0_GP_BIT1 ; -if (is_T2 (cphy->adapter)) { +if (is_T2 (cphy->adapter)) elmer |=ELMER0_GP_BIT2 |ELMER0_GP_BIT3 |ELMER0_GP_BIT4 ; - }t1_tpi_write (cphy->adapter,A_ELMER0_INT_CAUSE , elmer); } -return 0 ; +return 0 ; }/*
@@ -179,13 +176,13 @@ static int vsc8244_set_speed_duplex(struint t1_mdio_set_bits (struct cphy *phy,int mmd,int reg,unsigned int bits) { -int ret; -unsigned int val; +int ret; +unsigned int val; - ret =mdio_read (phy, mmd, reg, &val); -if (!ret) - ret =mdio_write (phy, mmd, reg, val | bits); -return ret; + ret =mdio_read (phy, mmd, reg, &val); +if (!ret) + ret =mdio_write (phy, mmd, reg, val | bits); +return ret; }static int vsc8244_autoneg_enable (struct cphy *cphy)
@@ -235,7 +232,7 @@ static int vsc8244_advertise(struct cphy }static int vsc8244_get_link_status (struct cphy *cphy,int *link_ok, -int *speed,int *duplex,int *fc) +int *speed,int *duplex,int *fc) {unsigned int bmcr, status, lpa, adv;int err, sp =-1 , dplx =-1 , pause =0 ;
@@ -343,7 +340,8 @@ static struct cphy_ops vsc8244_ops = { .get_link_status = vsc8244_get_link_status }; -static struct cphy *vsc8244_phy_create (adapter_t *adapter,int phy_addr,struct mdio_ops *mdio_ops) +static struct cphy *vsc8244_phy_create (adapter_t *adapter,int phy_addr, +struct mdio_ops *mdio_ops) {struct cphy *cphy =kzalloc (sizeof (*cphy),GFP_KERNEL );
Signature · 1 line
1.4.4.1
PATCH 4/7 chelsio: use netdev_priv
In reply to Francois Romieu--- drivers/net/chelsio/cxgb2.c | 60 +++++++++++++++++++++--------------------- drivers/net/chelsio/sge.c | 4 +- 2 files changed, 32 insertions(+), 32 deletions(-)
drivers/net/chelsio/cxgb2.c +30 -30
@@ -120,7 +120,7 @@ static const char pci_speed[][4] = {*/ static void t1_set_rxmode (struct net_device *dev) { -struct adapter *adapter = dev->priv; +struct adapter *adapter =netdev_priv (dev);struct cmac *mac = adapter->port[dev->if_port].mac;struct t1_rx_mode rm;
@@ -253,7 +253,7 @@ static void cxgb_down(struct adapter *adstatic int cxgb_open (struct net_device *dev) {int err; -struct adapter *adapter = dev->priv; +struct adapter *adapter =netdev_priv (dev);int other_ports = adapter->open_device_map &PORT_MASK ;if (!adapter->open_device_map && (err =cxgb_up (adapter)) <0 )
@@ -270,7 +270,7 @@ static int cxgb_open(struct net_device *static int cxgb_close (struct net_device *dev) { -struct adapter *adapter = dev->priv; +struct adapter *adapter =netdev_priv (dev);struct port_info *p = &adapter->port[dev->if_port];struct cmac *mac = p->mac;
@@ -295,7 +295,7 @@ static int cxgb_close(struct net_devicestatic struct net_device_stats *t1_get_stats (struct net_device *dev) { -struct adapter *adapter = dev->priv; +struct adapter *adapter =netdev_priv (dev);struct port_info *p = &adapter->port[dev->if_port];struct net_device_stats *ns = &p->netstats;const struct cmac_statistics *pstats;
@@ -343,14 +343,14 @@ static struct net_device_stats *t1_get_sstatic u32 get_msglevel (struct net_device *dev) { -struct adapter *adapter = dev->priv; +struct adapter *adapter =netdev_priv (dev);return adapter->msg_enable; }static void set_msglevel (struct net_device *dev,u32 val) { -struct adapter *adapter = dev->priv; +struct adapter *adapter =netdev_priv (dev); adapter->msg_enable = val; }
@@ -428,7 +428,7 @@ static int get_regs_len(struct net_devicstatic void get_drvinfo (struct net_device *dev,struct ethtool_drvinfo *info) { -struct adapter *adapter = dev->priv; +struct adapter *adapter =netdev_priv (dev);strcpy (info->driver,DRV_NAME );strcpy (info->version,DRV_VERSION );
@@ -450,7 +450,7 @@ static void get_strings(struct net_devicstatic void get_stats (struct net_device *dev,struct ethtool_stats *stats,u64 *data) { -struct adapter *adapter = dev->priv; +struct adapter *adapter =netdev_priv (dev);struct cmac *mac = adapter->port[dev->if_port].mac;const struct cmac_statistics *s;const struct sge_intr_counts *t;
@@ -538,7 +538,7 @@ static inline void reg_block_dump(structstatic void get_regs (struct net_device *dev,struct ethtool_regs *regs,void *buf) { -struct adapter *ap = dev->priv; +struct adapter *ap =netdev_priv (dev);/* * Version scheme: bits 0..9: chip version, bits 10..15: chip revision
@@ -560,7 +560,7 @@ static void get_regs(struct net_device *static int get_settings (struct net_device *dev,struct ethtool_cmd *cmd) { -struct adapter *adapter = dev->priv; +struct adapter *adapter =netdev_priv (dev);struct port_info *p = &adapter->port[dev->if_port]; cmd->supported = p->link_config.supported;
@@ -620,7 +620,7 @@ static int speed_duplex_to_caps(int speestatic int set_settings (struct net_device *dev,struct ethtool_cmd *cmd) { -struct adapter *adapter = dev->priv; +struct adapter *adapter =netdev_priv (dev);struct port_info *p = &adapter->port[dev->if_port];struct link_config *lc = &p->link_config;
@@ -655,7 +655,7 @@ static int set_settings(struct net_devicstatic void get_pauseparam (struct net_device *dev,struct ethtool_pauseparam *epause) { -struct adapter *adapter = dev->priv; +struct adapter *adapter =netdev_priv (dev);struct port_info *p = &adapter->port[dev->if_port]; epause->autoneg = (p->link_config.requested_fc &PAUSE_AUTONEG ) !=0 ;
@@ -666,7 +666,7 @@ static void get_pauseparam(struct net_destatic int set_pauseparam (struct net_device *dev,struct ethtool_pauseparam *epause) { -struct adapter *adapter = dev->priv; +struct adapter *adapter =netdev_priv (dev);struct port_info *p = &adapter->port[dev->if_port];struct link_config *lc = &p->link_config;
@@ -695,14 +695,14 @@ static int set_pauseparam(struct net_devstatic u32 get_rx_csum (struct net_device *dev) { -struct adapter *adapter = dev->priv; +struct adapter *adapter =netdev_priv (dev);return (adapter->flags &RX_CSUM_ENABLED ) !=0 ; }static int set_rx_csum (struct net_device *dev,u32 data) { -struct adapter *adapter = dev->priv; +struct adapter *adapter =netdev_priv (dev);if (data) adapter->flags |=RX_CSUM_ENABLED ;
@@ -713,7 +713,7 @@ static int set_rx_csum(struct net_devicestatic int set_tso (struct net_device *dev,u32 value) { -struct adapter *adapter = dev->priv; +struct adapter *adapter =netdev_priv (dev);if (!(adapter->flags &TSO_CAPABLE ))return value ? -EOPNOTSUPP :0 ;
@@ -722,7 +722,7 @@ static int set_tso(struct net_device *destatic void get_sge_param (struct net_device *dev,struct ethtool_ringparam *e) { -struct adapter *adapter = dev->priv; +struct adapter *adapter =netdev_priv (dev);int jumbo_fl =t1_is_T1B (adapter) ?1 :0 ; e->rx_max_pending =MAX_RX_BUFFERS ;
@@ -738,7 +738,7 @@ static void get_sge_param(struct net_devstatic int set_sge_param (struct net_device *dev,struct ethtool_ringparam *e) { -struct adapter *adapter = dev->priv; +struct adapter *adapter =netdev_priv (dev);int jumbo_fl =t1_is_T1B (adapter) ?1 :0 ; if (e->rx_pending > MAX_RX_BUFFERS || e->rx_mini_pending ||
@@ -762,7 +762,7 @@ static int set_sge_param(struct net_devistatic int set_coalesce (struct net_device *dev,struct ethtool_coalesce *c) { -struct adapter *adapter = dev->priv; +struct adapter *adapter =netdev_priv (dev);/* * If RX coalescing is requested we use NAPI, otherwise interrupts.
@@ -784,7 +784,7 @@ static int set_coalesce(struct net_devicstatic int get_coalesce (struct net_device *dev,struct ethtool_coalesce *c) { -struct adapter *adapter = dev->priv; +struct adapter *adapter =netdev_priv (dev); c->rx_coalesce_usecs = adapter->params.sge.rx_coalesce_usecs; c->rate_sample_interval = adapter->params.sge.sample_interval_usecs;
@@ -794,7 +794,7 @@ static int get_coalesce(struct net_devicstatic int get_eeprom_len (struct net_device *dev) { -struct adapter *adapter = dev->priv; +struct adapter *adapter =netdev_priv (dev);return t1_is_asic (adapter) ?EEPROM_SIZE :0 ; }
@@ -807,7 +807,7 @@ static int get_eeprom(struct net_device {int i; u8 buf[EEPROM_SIZE] __attribute__((aligned(4))); -struct adapter *adapter = dev->priv; +struct adapter *adapter =netdev_priv (dev); e->magic =EEPROM_MAGIC (adapter);for (i = e->offset & ~3 ; i < e->offset + e->len; i +=sizeof (u32))
@@ -848,7 +848,7 @@ static const struct ethtool_ops t1_ethtostatic int t1_ioctl (struct net_device *dev,struct ifreq *req,int cmd) { -struct adapter *adapter = dev->priv; +struct adapter *adapter =netdev_priv (dev);struct mii_ioctl_data *data =if_mii (req);switch (cmd) {
@@ -887,7 +887,7 @@ static int t1_ioctl(struct net_device *dstatic int t1_change_mtu (struct net_device *dev,int new_mtu) {int ret; -struct adapter *adapter = dev->priv; +struct adapter *adapter =netdev_priv (dev);struct cmac *mac = adapter->port[dev->if_port].mac;if (!mac->ops->set_mtu)
@@ -902,7 +902,7 @@ static int t1_change_mtu(struct net_devistatic int t1_set_mac_addr (struct net_device *dev,void *p) { -struct adapter *adapter = dev->priv; +struct adapter *adapter =netdev_priv (dev);struct cmac *mac = adapter->port[dev->if_port].mac;struct sockaddr *addr = p;
@@ -918,7 +918,7 @@ static int t1_set_mac_addr(struct net_destatic void vlan_rx_register (struct net_device *dev,struct vlan_group *grp) { -struct adapter *adapter = dev->priv; +struct adapter *adapter =netdev_priv (dev);spin_lock_irq (&adapter->async_lock); adapter->vlan_grp = grp;
@@ -928,7 +928,7 @@ static void vlan_rx_register(struct net_static void vlan_rx_kill_vid (struct net_device *dev,unsigned short vid) { -struct adapter *adapter = dev->priv; +struct adapter *adapter =netdev_priv (dev);spin_lock_irq (&adapter->async_lock);if (adapter->vlan_grp)
@@ -941,7 +941,7 @@ static void vlan_rx_kill_vid(struct net_static void t1_netpoll (struct net_device *dev) {unsigned long flags; -struct adapter *adapter = dev->priv; +struct adapter *adapter =netdev_priv (dev);local_irq_save (flags);t1_select_intr_handler (adapter)(adapter->pdev->irq, adapter);
@@ -1086,7 +1086,7 @@ static int __devinit init_one(struct pciSET_NETDEV_DEV (netdev, &pdev->dev);if (!adapter) { - adapter = netdev->priv; + adapter =netdev_priv (netdev); adapter->pdev = pdev; adapter->port[0 ].dev = netdev;/* so we don't leak it */
@@ -1396,7 +1396,7 @@ static void __devexit remove_one(structif (dev) {int i; -struct adapter *adapter = dev->priv; +struct adapter *adapter =netdev_priv (dev);for_each_port (adapter, i)if (test_bit (i, &adapter->registered_device_map))
drivers/net/chelsio/sge.c +2 -2
@@ -1620,7 +1620,7 @@ static int process_pure_responses(struct*/ static int t1_poll (struct net_device *dev,int *budget) { -struct adapter *adapter = dev->priv; +struct adapter *adapter =netdev_priv (dev);int effective_budget =min (*budget, dev->quota);int work_done =process_responses (adapter, effective_budget);
@@ -1884,7 +1884,7 @@ static inline int eth_hdr_len(const void*/ int t1_start_xmit (struct sk_buff *skb,struct net_device *dev) { -struct adapter *adapter = dev->priv; +struct adapter *adapter =netdev_priv (dev);struct sge *sge = adapter->sge;struct sge_port_stats *st =per_cpu_ptr (sge->port_stats[dev->if_port],smp_processor_id ());struct cpl_tx_pkt *cpl;
Signature · 1 line
1.4.4.1
Re: [PATCH 4/7] chelsio: use netdev_priv
Quoted 11 lines · On Wed, 6 Dec 2006 01:16:52 +0100 Francois Romieu <[email protected]> wrote:
Signed-off-by Francois Romieu <[email protected]>--- drivers/net/chelsio/cxgb2.c | 60 +++++++++++++++++++++--------------------- drivers/net/chelsio/sge.c | 4 +- 2 files changed, 32 insertions(+), 32 deletions(-)drivers/net/chelsio/cxgb2.c +0
-0
drivers/net/chelsio/cxgb2.c static const char pci_speed[][4] = { · line 126
Quoted 8 lines
drivers/net/chelsio/cxgb2.c +1
-1@@ -120,7 +120,7 @@ static const char pci_speed[][4] = {*/ static void t1_set_rxmode (struct net_device *dev) { -struct adapter *adapter = dev->priv; +struct adapter *adapter =netdev_priv (dev);struct cmac *mac = adapter->port[dev->if_port].mac;struct t1_rx_mode rm;
NAK for this driver. dev->priv points to a different location for each port on dual port board. To use netdev_priv() requires more serious surgery..
Re: [PATCH 4/7] chelsio: use netdev_priv
Stephen Hemminger <[email protected]> :
[...]
Quoted 2 lines
NAK for this driver.
dev->privpoints to a different location for each port on dual port board. To usenetdev_priv()requires more serious surgery..Q
Ok, it's removed from the branch. Patch #6 has been modified.
Should I wait for someone to pick-up #1..#3 before resending #5..#7 ?
Signature · 1 line
Ueimor
PATCH 5/7 chelsio: useless curly braces
In reply to Francois Romieu--- drivers/net/chelsio/cxgb2.c | 9 ++++----- drivers/net/chelsio/mv88e1xxx.c | 4 ++-- drivers/net/chelsio/sge.c | 3 +-- drivers/net/chelsio/vsc7326.c | 3 +-- 4 files changed, 8 insertions(+), 11 deletions(-)
drivers/net/chelsio/cxgb2.c +4 -5
@@ -771,11 +771,11 @@ static int set_coalesce(struct net_devicif (adapter->open_device_map ==0 ) adapter->params.sge.polling = c->use_adaptive_rx_coalesce; -if (adapter->params.sge.polling) { +if (adapter->params.sge.polling) adapter->params.sge.rx_coalesce_usecs =0 ; - }else { +else adapter->params.sge.rx_coalesce_usecs = c->rx_coalesce_usecs; - } + adapter->params.sge.coalesce_enable = c->use_adaptive_rx_coalesce; adapter->params.sge.sample_interval_usecs = c->rate_sample_interval;t1_sge_set_coalesce_params (adapter->sge, &adapter->params.sge);
@@ -1299,9 +1299,8 @@ static int t1_clock(struct adapter *adapif (!t1_is_T1B (adapter))return -ENODEV ;/* Can't re-clock this chip. */ -if (mode &2 ) { +if (mode &2 )return 0 ;/* show current mode. */ - }if ((adapter->t1powersave &1 ) == (mode &1 ))return -EALREADY ;/* ASIC already running in mode. */
drivers/net/chelsio/mv88e1xxx.c +2 -2
@@ -312,9 +312,9 @@ static int mv88e1xxx_interrupt_handler(s (void )simple_mdio_read (cphy,MV88E1XXX_SPECIFIC_STATUS_REGISTER , &status); -if (status &MV88E1XXX_INTR_LINK_CHNG ) { +if (status &MV88E1XXX_INTR_LINK_CHNG ) cphy->state |=PHY_LINK_UP ; - }else { +else { cphy->state &= ~PHY_LINK_UP ;if (cphy->state &PHY_AUTONEG_EN ) cphy->state &= ~PHY_AUTONEG_RDY ;
drivers/net/chelsio/sge.c +1 -2
@@ -2211,9 +2211,8 @@ struct sge * __devinit t1_sge_create(strif (adapter->params.nports >1 ) {tx_sched_init (sge); sge->espibug_timer.function = espibug_workaround_t204; - }else { + }else sge->espibug_timer.function = espibug_workaround; - } sge->espibug_timer.data = (unsigned long )sge->adapter; sge->espibug_timeout =1 ;
drivers/net/chelsio/vsc7326.c +1 -2
@@ -226,9 +226,8 @@ static void run_table(adapter_t *adapterif (ib[i].addr ==INITBLOCK_SLEEP ) {udelay ( ib[i].data );CH_ERR ("sleep %d us\n" ,ib[i].data); - }else { + }else vsc_write ( adapter, ib[i].addr, ib[i].data ); - } } }
Signature · 1 line
1.4.4.1
PATCH 6/7 chelsio: useless test in cxgb2::remove_one
In reply to Francois Romieupci_get_drvadata() is necessarily distinct from NULL if cxgb2::init_one succeeded. cxgb2::remove_one is solely issued through the PCI device callback.
--- drivers/net/chelsio/cxgb2.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-)
drivers/net/chelsio/cxgb2.c +16 -16
@@ -1392,26 +1392,26 @@ static inline void t1_sw_reset(struct pc static void __devexit remove_one(struct pci_dev *pdev) {struct net_device *dev =pci_get_drvdata (pdev); +struct adapter *adapter =netdev_priv (dev); +int i; -if (dev) { -int i; -struct adapter *adapter =netdev_priv (dev); - -for_each_port (adapter, i) -if (test_bit (i, &adapter->registered_device_map)) -unregister_netdev (adapter->port[i].dev); +for_each_port (adapter, i) { +if (test_bit (i, &adapter->registered_device_map)) +unregister_netdev (adapter->port[i].dev); + } -t1_free_sw_modules (adapter); -iounmap (adapter->regs); -while (--i >=0 ) -if (adapter->port[i].dev) -free_netdev (adapter->port[i].dev); +t1_free_sw_modules (adapter); +iounmap (adapter->regs); -pci_release_regions (pdev); -pci_disable_device (pdev); -pci_set_drvdata (pdev,NULL ); -t1_sw_reset (pdev); +while (--i >=0 ) { +if (adapter->port[i].dev) +free_netdev (adapter->port[i].dev); } + +pci_release_regions (pdev); +pci_disable_device (pdev); +pci_set_drvdata (pdev,NULL ); +t1_sw_reset (pdev); }static struct pci_driver driver = {
Signature · 1 line
1.4.4.1
PATCH 7/7 chelsio: misc cleanups in sge
In reply to Francois Romieu- duplicated code in sge::free_cmdQ_buffers ;
- NET_IP_ALIGN is already defined in (included) <linux/skbuff.h> ;
- pci_alloc_consistent() returns void * ;
- pci_alloc_consistent() returns a zeroed chunk of memory ;
- early return in restart_tx_queues.
--- drivers/net/chelsio/sge.c | 54 +++++++++++++++----------------------------- 1 files changed, 19 insertions(+), 35 deletions(-)
drivers/net/chelsio/sge.c +19 -35
@@ -85,10 +85,6 @@*/ #define TX_RECLAIM_PERIOD (HZ / 4) -#ifndef NET_IP_ALIGN -# define NET_IP_ALIGN 2 -#endif -#define M_CMD_LEN 0x7fffffff#define V_CMD_LEN (v) (v)#define G_CMD_LEN (v) ((v) & M_CMD_LEN)
@@ -575,11 +571,10 @@ static int alloc_rx_resources(struct sge q->size = p->freelQ_size[i]; q->dma_offset = sge->rx_pkt_pad ?0 :NET_IP_ALIGN ; size =sizeof (struct freelQ_e ) * q->size; - q->entries = (struct freelQ_e *) -pci_alloc_consistent (pdev, size, &q->dma_addr); + q->entries =pci_alloc_consistent (pdev, size, &q->dma_addr);if (!q->entries) goto err_no_mem; -memset (q->entries,0 , size); + size =sizeof (struct freelQ_ce ) * q->size; q->centries =kzalloc (size,GFP_KERNEL );if (!q->centries)
@@ -613,11 +608,10 @@ static int alloc_rx_resources(struct sge sge->respQ.size =SGE_RESPQ_E_N ; sge->respQ.credits =0 ; size =sizeof (struct respQ_e ) * sge->respQ.size; - sge->respQ.entries = (struct respQ_e *) + sge->respQ.entries =pci_alloc_consistent (pdev, size, &sge->respQ.dma_addr);if (!sge->respQ.entries) goto err_no_mem; -memset (sge->respQ.entries,0 , size);return 0 ; err_no_mem:
@@ -637,20 +631,12 @@ static void free_cmdQ_buffers(struct sge q->in_use -= n; ce = &q->centries[cidx];while (n--) { -if (q->sop) { -if (likely (pci_unmap_len (ce, dma_len))) { -pci_unmap_single (pdev, -pci_unmap_addr (ce, dma_addr), -pci_unmap_len (ce, dma_len), -PCI_DMA_TODEVICE ); +if (likely (pci_unmap_len (ce, dma_len))) { +pci_unmap_single (pdev,pci_unmap_addr (ce, dma_addr), +pci_unmap_len (ce, dma_len), +PCI_DMA_TODEVICE ); +if (q->sop) q->sop =0 ; - } - }else { -if (likely (pci_unmap_len (ce, dma_len))) { -pci_unmap_page (pdev,pci_unmap_addr (ce, dma_addr), -pci_unmap_len (ce, dma_len), -PCI_DMA_TODEVICE ); - } }if (ce->skb) {dev_kfree_skb_any (ce->skb);
@@ -711,11 +697,10 @@ static int alloc_tx_resources(struct sge q->stop_thres =0 ;spin_lock_init (&q->lock); size =sizeof (struct cmdQ_e ) * q->size; - q->entries = (struct cmdQ_e *) -pci_alloc_consistent (pdev, size, &q->dma_addr); + q->entries =pci_alloc_consistent (pdev, size, &q->dma_addr);if (!q->entries) goto err_no_mem; -memset (q->entries,0 , size); + size =sizeof (struct cmdQ_ce ) * q->size; q->centries =kzalloc (size,GFP_KERNEL );if (!q->centries)
@@ -1443,19 +1428,18 @@ static inline int enough_free_Tx_descs(cstatic void restart_tx_queues (struct sge *sge) {struct adapter *adap = sge->adapter; +int i; -if (enough_free_Tx_descs (&sge->cmdQ[0 ])) { -int i; +if (!enough_free_Tx_descs (&sge->cmdQ[0 ])) +return ; -for_each_port (adap, i) { -struct net_device *nd = adap->port[i].dev; +for_each_port (adap, i) { +struct net_device *nd = adap->port[i].dev; -if (test_and_clear_bit (nd->if_port, - &sge->stopped_tx_queues) && -netif_running (nd)) { - sge->stats.cmdQ_restarted[2 ]++; -netif_wake_queue (nd); - } +if (test_and_clear_bit (nd->if_port, &sge->stopped_tx_queues) && +netif_running (nd)) { + sge->stats.cmdQ_restarted[2 ]++; +netif_wake_queue (nd); } } }
Signature · 1 line
1.4.4.1