lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

chelsio: spaces, tabs and friends

Browse Source 
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
This commit is contained in:
Francois Romieu
2006-12-11 23:47:00 +01:00
committed by Jeff Garzik
parent b7d58394e6
commit 356bd1460d
15 changed files with 285 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/chelsio/espi.c
View File

@@ -341,8 +341,7 @@ u32 t1_espi_get_mon(adapter_t *adapter, u32 addr, u8 wait)
* compare with t1_espi_get_mon(), it reads espiInTxSop[0 ~ 3] in * compare with t1_espi_get_mon(), it reads espiInTxSop[0 ~ 3] in
* one shot, since there is no per port counter on the out side. * one shot, since there is no per port counter on the out side.
*/ */
int int t1_espi_get_mon_t204(adapter_t *adapter, u32 *valp, u8 wait)
t1_espi_get_mon_t204(adapter_t *adapter, u32 *valp, u8 wait)
{ {
struct peespi *espi = adapter->espi; struct peespi *espi = adapter->espi;
u8 i, nport = (u8)adapter->params.nports; u8 i, nport = (u8)adapter->params.nports;

11
drivers/net/chelsio/gmac.h
View File

@@ -42,8 +42,15 @@
#include "common.h" #include "common.h"
enum { MAC_STATS_UPDATE_FAST, MAC_STATS_UPDATE_FULL }; enum {
enum { MAC_DIRECTION_RX = 1, MAC_DIRECTION_TX = 2 }; MAC_STATS_UPDATE_FAST,
MAC_STATS_UPDATE_FULL
};
enum {
MAC_DIRECTION_RX = 1,
MAC_DIRECTION_TX = 2
};
struct cmac_statistics { struct cmac_statistics {
/* Transmit */ /* Transmit */

9
drivers/net/chelsio/mv88e1xxx.c
View File

@@ -73,9 +73,8 @@ static int mv88e1xxx_interrupt_enable(struct cphy *cphy)
t1_tpi_read(cphy->adapter, A_ELMER0_INT_ENABLE, &elmer); t1_tpi_read(cphy->adapter, A_ELMER0_INT_ENABLE, &elmer);
elmer |= ELMER0_GP_BIT1; elmer |= ELMER0_GP_BIT1;
if (is_T2(cphy->adapter)) { if (is_T2(cphy->adapter))
elmer |= ELMER0_GP_BIT2 | ELMER0_GP_BIT3 | ELMER0_GP_BIT4; elmer |= ELMER0_GP_BIT2 | ELMER0_GP_BIT3 | ELMER0_GP_BIT4;
}
t1_tpi_write(cphy->adapter, A_ELMER0_INT_ENABLE, elmer); t1_tpi_write(cphy->adapter, A_ELMER0_INT_ENABLE, elmer);
} }
return 0; return 0;
@@ -92,9 +91,8 @@ static int mv88e1xxx_interrupt_disable(struct cphy *cphy)
t1_tpi_read(cphy->adapter, A_ELMER0_INT_ENABLE, &elmer); t1_tpi_read(cphy->adapter, A_ELMER0_INT_ENABLE, &elmer);
elmer &= ~ELMER0_GP_BIT1; elmer &= ~ELMER0_GP_BIT1;
if (is_T2(cphy->adapter)) { if (is_T2(cphy->adapter))
elmer &= ~(ELMER0_GP_BIT2|ELMER0_GP_BIT3|ELMER0_GP_BIT4); elmer &= ~(ELMER0_GP_BIT2|ELMER0_GP_BIT3|ELMER0_GP_BIT4);
}
t1_tpi_write(cphy->adapter, A_ELMER0_INT_ENABLE, elmer); t1_tpi_write(cphy->adapter, A_ELMER0_INT_ENABLE, elmer);
} }
return 0; return 0;
@@ -112,9 +110,8 @@ static int mv88e1xxx_interrupt_clear(struct cphy *cphy)
if (t1_is_asic(cphy->adapter)) { if (t1_is_asic(cphy->adapter)) {
t1_tpi_read(cphy->adapter, A_ELMER0_INT_CAUSE, &elmer); t1_tpi_read(cphy->adapter, A_ELMER0_INT_CAUSE, &elmer);
elmer |= ELMER0_GP_BIT1; elmer |= ELMER0_GP_BIT1;
if (is_T2(cphy->adapter)) { if (is_T2(cphy->adapter))
elmer |= ELMER0_GP_BIT2|ELMER0_GP_BIT3|ELMER0_GP_BIT4; elmer |= ELMER0_GP_BIT2|ELMER0_GP_BIT3|ELMER0_GP_BIT4;
}
t1_tpi_write(cphy->adapter, A_ELMER0_INT_CAUSE, elmer); t1_tpi_write(cphy->adapter, A_ELMER0_INT_CAUSE, elmer);
} }
return 0; return 0;

25
drivers/net/chelsio/sge.c
View File

@@ -850,7 +850,6 @@ static void refill_free_list(struct sge *sge, struct freelQ *q)
struct freelQ_e *e = &q->entries[q->pidx]; struct freelQ_e *e = &q->entries[q->pidx];
unsigned int dma_len = q->rx_buffer_size - q->dma_offset; unsigned int dma_len = q->rx_buffer_size - q->dma_offset;
while (q->credits < q->size) { while (q->credits < q->size) {
struct sk_buff *skb; struct sk_buff *skb;
dma_addr_t mapping; dma_addr_t mapping;
@@ -881,7 +880,6 @@ static void refill_free_list(struct sge *sge, struct freelQ *q)
} }
q->credits++; q->credits++;
} }
} }
/* /*
@@ -1137,6 +1135,7 @@ static void unexpected_offload(struct adapter *adapter, struct freelQ *fl)
static inline unsigned int compute_large_page_tx_descs(struct sk_buff *skb) static inline unsigned int compute_large_page_tx_descs(struct sk_buff *skb)
{ {
unsigned int count = 0; unsigned int count = 0;
if (PAGE_SIZE > SGE_TX_DESC_MAX_PLEN) { if (PAGE_SIZE > SGE_TX_DESC_MAX_PLEN) {
unsigned int nfrags = skb_shinfo(skb)->nr_frags; unsigned int nfrags = skb_shinfo(skb)->nr_frags;
unsigned int i, len = skb->len - skb->data_len; unsigned int i, len = skb->len - skb->data_len;
@@ -2099,18 +2098,23 @@ static void espibug_workaround_t204(unsigned long data)
if (adapter->open_device_map & PORT_MASK) { if (adapter->open_device_map & PORT_MASK) {
int i; int i;
if (t1_espi_get_mon_t204(adapter, &(seop[0]), 0) < 0) {
if (t1_espi_get_mon_t204(adapter, &(seop[0]), 0) < 0)
return; return;
}
for (i = 0; i < nports; i++) { for (i = 0; i < nports; i++) {
struct sk_buff *skb = sge->espibug_skb[i]; struct sk_buff *skb = sge->espibug_skb[i];
if ( (netif_running(adapter->port[i].dev)) &&
!(netif_queue_stopped(adapter->port[i].dev)) && if (!netif_running(adapter->port[i].dev) ||
(seop[i] && ((seop[i] & 0xfff) == 0)) && netif_queue_stopped(adapter->port[i].dev) ||
skb ) { !seop[i] || ((seop[i] & 0xfff) != 0) || !skb)
continue;
if (!skb->cb[0]) { if (!skb->cb[0]) {
u8 ch_mac_addr[ETH_ALEN] = u8 ch_mac_addr[ETH_ALEN] = {
{0x0, 0x7, 0x43, 0x0, 0x0, 0x0}; 0x0, 0x7, 0x43, 0x0, 0x0, 0x0
};
memcpy(skb->data + sizeof(struct cpl_tx_pkt), memcpy(skb->data + sizeof(struct cpl_tx_pkt),
ch_mac_addr, ETH_ALEN); ch_mac_addr, ETH_ALEN);
memcpy(skb->data + skb->len - 10, memcpy(skb->data + skb->len - 10,
@@ -2125,7 +2129,6 @@ static void espibug_workaround_t204(unsigned long data)
t1_sge_tx(skb, adapter, 0, adapter->port[i].dev); t1_sge_tx(skb, adapter, 0, adapter->port[i].dev);
} }
} }
}
mod_timer(&sge->espibug_timer, jiffies + sge->espibug_timeout); mod_timer(&sge->espibug_timer, jiffies + sge->espibug_timeout);
} }

3
drivers/net/chelsio/subr.c
View File

@@ -262,8 +262,7 @@ static int mi1_wait_until_ready(adapter_t *adapter, int mi1_reg)
udelay(10); udelay(10);
} while (busy && --attempts); } while (busy && --attempts);
if (busy) if (busy)
CH_ALERT("%s: MDIO operation timed out\n", CH_ALERT("%s: MDIO operation timed out\n", adapter->name);
adapter->name);
return busy; return busy;
} }

16
drivers/net/chelsio/tp.c
View File

@@ -17,27 +17,26 @@ struct petp {
static void tp_init(adapter_t * ap, const struct tp_params *p, static void tp_init(adapter_t * ap, const struct tp_params *p,
unsigned int tp_clk) unsigned int tp_clk)
{ {
if (t1_is_asic(ap)) {
u32 val; u32 val;
if (!t1_is_asic(ap))
return;
val = F_TP_IN_CSPI_CPL | F_TP_IN_CSPI_CHECK_IP_CSUM | val = F_TP_IN_CSPI_CPL | F_TP_IN_CSPI_CHECK_IP_CSUM |
F_TP_IN_CSPI_CHECK_TCP_CSUM | F_TP_IN_ESPI_ETHERNET; F_TP_IN_CSPI_CHECK_TCP_CSUM | F_TP_IN_ESPI_ETHERNET;
if (!p->pm_size) if (!p->pm_size)
val |= F_OFFLOAD_DISABLE; val |= F_OFFLOAD_DISABLE;
else else
val |= F_TP_IN_ESPI_CHECK_IP_CSUM | val |= F_TP_IN_ESPI_CHECK_IP_CSUM | F_TP_IN_ESPI_CHECK_TCP_CSUM;
F_TP_IN_ESPI_CHECK_TCP_CSUM;
writel(val, ap->regs + A_TP_IN_CONFIG); writel(val, ap->regs + A_TP_IN_CONFIG);
writel(F_TP_OUT_CSPI_CPL | writel(F_TP_OUT_CSPI_CPL |
F_TP_OUT_ESPI_ETHERNET | F_TP_OUT_ESPI_ETHERNET |
F_TP_OUT_ESPI_GENERATE_IP_CSUM | F_TP_OUT_ESPI_GENERATE_IP_CSUM |
F_TP_OUT_ESPI_GENERATE_TCP_CSUM, F_TP_OUT_ESPI_GENERATE_TCP_CSUM, ap->regs + A_TP_OUT_CONFIG);
ap->regs + A_TP_OUT_CONFIG);
writel(V_IP_TTL(64) | writel(V_IP_TTL(64) |
F_PATH_MTU /* IP DF bit */ | F_PATH_MTU /* IP DF bit */ |
V_5TUPLE_LOOKUP(p->use_5tuple_mode) | V_5TUPLE_LOOKUP(p->use_5tuple_mode) |
V_SYN_COOKIE_PARAMETER(29), V_SYN_COOKIE_PARAMETER(29), ap->regs + A_TP_GLOBAL_CONFIG);
ap->regs + A_TP_GLOBAL_CONFIG);
/* /*
* Enable pause frame deadlock prevention. * Enable pause frame deadlock prevention.
*/ */
@@ -49,8 +48,6 @@ static void tp_init(adapter_t * ap, const struct tp_params *p,
V_NUM_PKTS_DROPPED(DROP_PKTS_CNT), V_NUM_PKTS_DROPPED(DROP_PKTS_CNT),
ap->regs + A_TP_TX_DROP_CONFIG); ap->regs + A_TP_TX_DROP_CONFIG);
} }
}
} }
void t1_tp_destroy(struct petp *tp) void t1_tp_destroy(struct petp *tp)
@@ -61,6 +58,7 @@ void t1_tp_destroy(struct petp *tp)
struct petp *__devinit t1_tp_create(adapter_t * adapter, struct tp_params *p) struct petp *__devinit t1_tp_create(adapter_t * adapter, struct tp_params *p)
{ {
struct petp *tp = kzalloc(sizeof(*tp), GFP_KERNEL); struct petp *tp = kzalloc(sizeof(*tp), GFP_KERNEL);
if (!tp) if (!tp)
return NULL; return NULL;

7
drivers/net/chelsio/vsc7326.c
View File

@@ -327,9 +327,8 @@ static int run_bist_all(adapter_t *adapter)
vsc_write(adapter, REG_MEM_BIST, 0x5); vsc_write(adapter, REG_MEM_BIST, 0x5);
vsc_read(adapter, REG_MEM_BIST, &val); vsc_read(adapter, REG_MEM_BIST, &val);
for(port=0; port<12; port++){ for (port = 0; port < 12; port++)
vsc_write(adapter, REG_DEV_SETUP(port), 0x0); vsc_write(adapter, REG_DEV_SETUP(port), 0x0);
}
udelay(300); udelay(300);
vsc_write(adapter, REG_SPI4_MISC, 0x00040409); vsc_write(adapter, REG_SPI4_MISC, 0x00040409);
@@ -352,9 +351,9 @@ static int run_bist_all(adapter_t *adapter)
udelay(300); udelay(300);
vsc_write(adapter, REG_SPI4_MISC, 0x60040400); vsc_write(adapter, REG_SPI4_MISC, 0x60040400);
udelay(300); udelay(300);
for(port=0; port<12; port++){ for (port = 0; port < 12; port++)
vsc_write(adapter, REG_DEV_SETUP(port), 0x1); vsc_write(adapter, REG_DEV_SETUP(port), 0x1);
}
udelay(300); udelay(300);
vsc_write(adapter, REG_MEM_BIST, 0x0); vsc_write(adapter, REG_MEM_BIST, 0x0);
mdelay(10); mdelay(10);

12
drivers/net/chelsio/vsc8244.c
View File

@@ -100,9 +100,8 @@ static int vsc8244_intr_enable(struct cphy *cphy)
t1_tpi_read(cphy->adapter, A_ELMER0_INT_ENABLE, &elmer); t1_tpi_read(cphy->adapter, A_ELMER0_INT_ENABLE, &elmer);
elmer |= ELMER0_GP_BIT1; elmer |= ELMER0_GP_BIT1;
if (is_T2(cphy->adapter)) { if (is_T2(cphy->adapter))
elmer |= ELMER0_GP_BIT2|ELMER0_GP_BIT3|ELMER0_GP_BIT4; elmer |= ELMER0_GP_BIT2|ELMER0_GP_BIT3|ELMER0_GP_BIT4;
}
t1_tpi_write(cphy->adapter, A_ELMER0_INT_ENABLE, elmer); t1_tpi_write(cphy->adapter, A_ELMER0_INT_ENABLE, elmer);
} }
@@ -118,9 +117,8 @@ static int vsc8244_intr_disable(struct cphy *cphy)
t1_tpi_read(cphy->adapter, A_ELMER0_INT_ENABLE, &elmer); t1_tpi_read(cphy->adapter, A_ELMER0_INT_ENABLE, &elmer);
elmer &= ~ELMER0_GP_BIT1; elmer &= ~ELMER0_GP_BIT1;
if (is_T2(cphy->adapter)) { if (is_T2(cphy->adapter))
elmer &= ~(ELMER0_GP_BIT2|ELMER0_GP_BIT3|ELMER0_GP_BIT4); elmer &= ~(ELMER0_GP_BIT2|ELMER0_GP_BIT3|ELMER0_GP_BIT4);
}
t1_tpi_write(cphy->adapter, A_ELMER0_INT_ENABLE, elmer); t1_tpi_write(cphy->adapter, A_ELMER0_INT_ENABLE, elmer);
} }
@@ -138,9 +136,8 @@ static int vsc8244_intr_clear(struct cphy *cphy)
if (t1_is_asic(cphy->adapter)) { if (t1_is_asic(cphy->adapter)) {
t1_tpi_read(cphy->adapter, A_ELMER0_INT_CAUSE, &elmer); t1_tpi_read(cphy->adapter, A_ELMER0_INT_CAUSE, &elmer);
elmer |= ELMER0_GP_BIT1; elmer |= ELMER0_GP_BIT1;
if (is_T2(cphy->adapter)) { if (is_T2(cphy->adapter))
elmer |= ELMER0_GP_BIT2|ELMER0_GP_BIT3|ELMER0_GP_BIT4; elmer |= ELMER0_GP_BIT2|ELMER0_GP_BIT3|ELMER0_GP_BIT4;
}
t1_tpi_write(cphy->adapter, A_ELMER0_INT_CAUSE, elmer); t1_tpi_write(cphy->adapter, A_ELMER0_INT_CAUSE, elmer);
} }
@@ -343,7 +340,8 @@ static struct cphy_ops vsc8244_ops = {
.get_link_status = vsc8244_get_link_status .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); struct cphy *cphy = kzalloc(sizeof(*cphy), GFP_KERNEL);