chelsio: spaces, tabs and friends
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
This commit is contained in:
parent
b7d58394e6
commit
356bd1460d
|
@ -233,7 +233,7 @@ static int cxgb_up(struct adapter *adapter)
|
|||
|
||||
t1_sge_start(adapter->sge);
|
||||
t1_interrupts_enable(adapter);
|
||||
out_err:
|
||||
out_err:
|
||||
return err;
|
||||
}
|
||||
|
||||
|
@ -1211,9 +1211,9 @@ static int __devinit init_one(struct pci_dev *pdev,
|
|||
|
||||
return 0;
|
||||
|
||||
out_release_adapter_res:
|
||||
out_release_adapter_res:
|
||||
t1_free_sw_modules(adapter);
|
||||
out_free_dev:
|
||||
out_free_dev:
|
||||
if (adapter) {
|
||||
if (adapter->regs)
|
||||
iounmap(adapter->regs);
|
||||
|
@ -1222,7 +1222,7 @@ static int __devinit init_one(struct pci_dev *pdev,
|
|||
free_netdev(adapter->port[i].dev);
|
||||
}
|
||||
pci_release_regions(pdev);
|
||||
out_disable_pdev:
|
||||
out_disable_pdev:
|
||||
pci_disable_device(pdev);
|
||||
pci_set_drvdata(pdev, NULL);
|
||||
return err;
|
||||
|
|
|
@ -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
|
||||
* one shot, since there is no per port counter on the out side.
|
||||
*/
|
||||
int
|
||||
t1_espi_get_mon_t204(adapter_t *adapter, u32 *valp, u8 wait)
|
||||
int t1_espi_get_mon_t204(adapter_t *adapter, u32 *valp, u8 wait)
|
||||
{
|
||||
struct peespi *espi = adapter->espi;
|
||||
u8 i, nport = (u8)adapter->params.nports;
|
||||
|
@ -353,7 +352,7 @@ t1_espi_get_mon_t204(adapter_t *adapter, u32 *valp, u8 wait)
|
|||
} else
|
||||
spin_lock(&espi->lock);
|
||||
|
||||
if ( (espi->misc_ctrl & MON_MASK) != F_MONITORED_DIRECTION ) {
|
||||
if ((espi->misc_ctrl & MON_MASK) != F_MONITORED_DIRECTION) {
|
||||
espi->misc_ctrl = (espi->misc_ctrl & ~MON_MASK) |
|
||||
F_MONITORED_DIRECTION;
|
||||
writel(espi->misc_ctrl, adapter->regs + A_ESPI_MISC_CONTROL);
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -73,9 +73,8 @@ static int mv88e1xxx_interrupt_enable(struct cphy *cphy)
|
|||
|
||||
t1_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(struct cphy *cphy)
|
|||
|
||||
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;
|
||||
|
@ -112,9 +110,8 @@ static int mv88e1xxx_interrupt_clear(struct cphy *cphy)
|
|||
if (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;
|
||||
|
|
|
@ -460,7 +460,7 @@ static struct sk_buff *sched_skb(struct sge *sge, struct sk_buff *skb,
|
|||
if (credits < MAX_SKB_FRAGS + 1)
|
||||
goto out;
|
||||
|
||||
again:
|
||||
again:
|
||||
for (i = 0; i < MAX_NPORTS; i++) {
|
||||
s->port = ++s->port & (MAX_NPORTS - 1);
|
||||
skbq = &s->p[s->port].skbq;
|
||||
|
@ -483,7 +483,7 @@ static struct sk_buff *sched_skb(struct sge *sge, struct sk_buff *skb,
|
|||
if (update-- && sched_update_avail(sge))
|
||||
goto again;
|
||||
|
||||
out:
|
||||
out:
|
||||
/* If there are more pending skbs, we use the hardware to schedule us
|
||||
* again.
|
||||
*/
|
||||
|
@ -850,7 +850,6 @@ static void refill_free_list(struct sge *sge, struct freelQ *q)
|
|||
struct freelQ_e *e = &q->entries[q->pidx];
|
||||
unsigned int dma_len = q->rx_buffer_size - q->dma_offset;
|
||||
|
||||
|
||||
while (q->credits < q->size) {
|
||||
struct sk_buff *skb;
|
||||
dma_addr_t mapping;
|
||||
|
@ -881,7 +880,6 @@ static void refill_free_list(struct sge *sge, struct freelQ *q)
|
|||
}
|
||||
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)
|
||||
{
|
||||
unsigned int count = 0;
|
||||
|
||||
if (PAGE_SIZE > SGE_TX_DESC_MAX_PLEN) {
|
||||
unsigned int nfrags = skb_shinfo(skb)->nr_frags;
|
||||
unsigned int i, len = skb->len - skb->data_len;
|
||||
|
@ -1796,7 +1795,7 @@ static int t1_sge_tx(struct sk_buff *skb, struct adapter *adapter,
|
|||
* through the scheduler.
|
||||
*/
|
||||
if (sge->tx_sched && !qid && skb->dev) {
|
||||
use_sched:
|
||||
use_sched:
|
||||
use_sched_skb = 1;
|
||||
/* Note that the scheduler might return a different skb than
|
||||
* the one passed in.
|
||||
|
@ -2099,18 +2098,23 @@ static void espibug_workaround_t204(unsigned long data)
|
|||
|
||||
if (adapter->open_device_map & PORT_MASK) {
|
||||
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;
|
||||
}
|
||||
|
||||
for (i = 0; i < nports; i++) {
|
||||
struct sk_buff *skb = sge->espibug_skb[i];
|
||||
if ( (netif_running(adapter->port[i].dev)) &&
|
||||
!(netif_queue_stopped(adapter->port[i].dev)) &&
|
||||
(seop[i] && ((seop[i] & 0xfff) == 0)) &&
|
||||
skb ) {
|
||||
|
||||
if (!netif_running(adapter->port[i].dev) ||
|
||||
netif_queue_stopped(adapter->port[i].dev) ||
|
||||
!seop[i] || ((seop[i] & 0xfff) != 0) || !skb)
|
||||
continue;
|
||||
|
||||
if (!skb->cb[0]) {
|
||||
u8 ch_mac_addr[ETH_ALEN] =
|
||||
{0x0, 0x7, 0x43, 0x0, 0x0, 0x0};
|
||||
u8 ch_mac_addr[ETH_ALEN] = {
|
||||
0x0, 0x7, 0x43, 0x0, 0x0, 0x0
|
||||
};
|
||||
|
||||
memcpy(skb->data + sizeof(struct cpl_tx_pkt),
|
||||
ch_mac_addr, ETH_ALEN);
|
||||
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);
|
||||
}
|
||||
}
|
||||
}
|
||||
mod_timer(&sge->espibug_timer, jiffies + sge->espibug_timeout);
|
||||
}
|
||||
|
||||
|
|
|
@ -262,8 +262,7 @@ static int mi1_wait_until_ready(adapter_t *adapter, int mi1_reg)
|
|||
udelay(10);
|
||||
} while (busy && --attempts);
|
||||
if (busy)
|
||||
CH_ALERT("%s: MDIO operation timed out\n",
|
||||
adapter->name);
|
||||
CH_ALERT("%s: MDIO operation timed out\n", adapter->name);
|
||||
return busy;
|
||||
}
|
||||
|
||||
|
@ -943,7 +942,7 @@ int t1_init_hw_modules(adapter_t *adapter)
|
|||
goto out_err;
|
||||
|
||||
err = 0;
|
||||
out_err:
|
||||
out_err:
|
||||
return err;
|
||||
}
|
||||
|
||||
|
|
|
@ -17,27 +17,26 @@ struct petp {
|
|||
static void tp_init(adapter_t * ap, const struct tp_params *p,
|
||||
unsigned int tp_clk)
|
||||
{
|
||||
if (t1_is_asic(ap)) {
|
||||
u32 val;
|
||||
|
||||
if (!t1_is_asic(ap))
|
||||
return;
|
||||
|
||||
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;
|
||||
if (!p->pm_size)
|
||||
val |= F_OFFLOAD_DISABLE;
|
||||
else
|
||||
val |= F_TP_IN_ESPI_CHECK_IP_CSUM |
|
||||
F_TP_IN_ESPI_CHECK_TCP_CSUM;
|
||||
val |= F_TP_IN_ESPI_CHECK_IP_CSUM | F_TP_IN_ESPI_CHECK_TCP_CSUM;
|
||||
writel(val, ap->regs + A_TP_IN_CONFIG);
|
||||
writel(F_TP_OUT_CSPI_CPL |
|
||||
F_TP_OUT_ESPI_ETHERNET |
|
||||
F_TP_OUT_ESPI_GENERATE_IP_CSUM |
|
||||
F_TP_OUT_ESPI_GENERATE_TCP_CSUM,
|
||||
ap->regs + A_TP_OUT_CONFIG);
|
||||
F_TP_OUT_ESPI_GENERATE_TCP_CSUM, ap->regs + A_TP_OUT_CONFIG);
|
||||
writel(V_IP_TTL(64) |
|
||||
F_PATH_MTU /* IP DF bit */ |
|
||||
V_5TUPLE_LOOKUP(p->use_5tuple_mode) |
|
||||
V_SYN_COOKIE_PARAMETER(29),
|
||||
ap->regs + A_TP_GLOBAL_CONFIG);
|
||||
V_SYN_COOKIE_PARAMETER(29), ap->regs + A_TP_GLOBAL_CONFIG);
|
||||
/*
|
||||
* 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),
|
||||
ap->regs + A_TP_TX_DROP_CONFIG);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
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 *tp = kzalloc(sizeof(*tp), GFP_KERNEL);
|
||||
|
||||
if (!tp)
|
||||
return NULL;
|
||||
|
||||
|
|
|
@ -234,10 +234,10 @@ static void run_table(adapter_t *adapter, struct init_table *ib, int len)
|
|||
|
||||
static int bist_rd(adapter_t *adapter, int moduleid, int address)
|
||||
{
|
||||
int data=0;
|
||||
u32 result=0;
|
||||
int data = 0;
|
||||
u32 result = 0;
|
||||
|
||||
if( (address != 0x0) &&
|
||||
if ((address != 0x0) &&
|
||||
(address != 0x1) &&
|
||||
(address != 0x2) &&
|
||||
(address != 0xd) &&
|
||||
|
@ -251,9 +251,9 @@ static int bist_rd(adapter_t *adapter, int moduleid, int address)
|
|||
udelay(10);
|
||||
|
||||
vsc_read(adapter, REG_RAM_BIST_RESULT, &result);
|
||||
if((result & (1<<9)) != 0x0)
|
||||
if ((result & (1 << 9)) != 0x0)
|
||||
CH_ERR("Still in bist read: 0x%x\n", result);
|
||||
else if((result & (1<<8)) != 0x0)
|
||||
else if ((result & (1 << 8)) != 0x0)
|
||||
CH_ERR("bist read error: 0x%x\n", result);
|
||||
|
||||
return (result & 0xff);
|
||||
|
@ -261,17 +261,17 @@ static int bist_rd(adapter_t *adapter, int moduleid, int address)
|
|||
|
||||
static int bist_wr(adapter_t *adapter, int moduleid, int address, int value)
|
||||
{
|
||||
int data=0;
|
||||
u32 result=0;
|
||||
int data = 0;
|
||||
u32 result = 0;
|
||||
|
||||
if( (address != 0x0) &&
|
||||
if ((address != 0x0) &&
|
||||
(address != 0x1) &&
|
||||
(address != 0x2) &&
|
||||
(address != 0xd) &&
|
||||
(address != 0xe))
|
||||
CH_ERR("No bist address: 0x%x\n", address);
|
||||
|
||||
if( value>255 )
|
||||
if (value > 255)
|
||||
CH_ERR("Suspicious write out of range value: 0x%x\n", value);
|
||||
|
||||
data = ((0x01 << 24) | ((address & 0xff) << 16) | (value << 8) |
|
||||
|
@ -281,9 +281,9 @@ static int bist_wr(adapter_t *adapter, int moduleid, int address, int value)
|
|||
udelay(5);
|
||||
|
||||
vsc_read(adapter, REG_RAM_BIST_CMD, &result);
|
||||
if((result & (1<<27)) != 0x0)
|
||||
if ((result & (1 << 27)) != 0x0)
|
||||
CH_ERR("Still in bist write: 0x%x\n", result);
|
||||
else if((result & (1<<26)) != 0x0)
|
||||
else if ((result & (1 << 26)) != 0x0)
|
||||
CH_ERR("bist write error: 0x%x\n", result);
|
||||
|
||||
return 0;
|
||||
|
@ -321,15 +321,14 @@ static int enable_mem(adapter_t *adapter, int moduleid)
|
|||
|
||||
static int run_bist_all(adapter_t *adapter)
|
||||
{
|
||||
int port=0;
|
||||
u32 val=0;
|
||||
int port = 0;
|
||||
u32 val = 0;
|
||||
|
||||
vsc_write(adapter, REG_MEM_BIST, 0x5);
|
||||
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);
|
||||
}
|
||||
|
||||
udelay(300);
|
||||
vsc_write(adapter, REG_SPI4_MISC, 0x00040409);
|
||||
|
@ -352,9 +351,9 @@ static int run_bist_all(adapter_t *adapter)
|
|||
udelay(300);
|
||||
vsc_write(adapter, REG_SPI4_MISC, 0x60040400);
|
||||
udelay(300);
|
||||
for(port=0; port<12; port++){
|
||||
for (port = 0; port < 12; port++)
|
||||
vsc_write(adapter, REG_DEV_SETUP(port), 0x1);
|
||||
}
|
||||
|
||||
udelay(300);
|
||||
vsc_write(adapter, REG_MEM_BIST, 0x0);
|
||||
mdelay(10);
|
||||
|
|
|
@ -100,9 +100,8 @@ static int vsc8244_intr_enable(struct cphy *cphy)
|
|||
|
||||
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);
|
||||
}
|
||||
|
||||
|
@ -118,9 +117,8 @@ static int vsc8244_intr_disable(struct cphy *cphy)
|
|||
|
||||
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);
|
||||
}
|
||||
|
||||
|
@ -138,9 +136,8 @@ static int vsc8244_intr_clear(struct cphy *cphy)
|
|||
if (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);
|
||||
}
|
||||
|
||||
|
@ -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);
|
||||
|
||||
|
|
Reference in New Issue