Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 265316
b: refs/heads/master
c: 665d7eb
h: refs/heads/master
v: v3
  • Loading branch information
Marc Kleine-Budde committed Aug 15, 2011
1 parent f5ddf5e commit 050e703
Show file tree
Hide file tree
Showing 30 changed files with 362 additions and 421 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c6865cb3cc6f3c2857fa4c6f5fda2945d70b1e84
refs/heads/master: 665d7eb8877c6bb777039efb22f894740be10bcb
3 changes: 0 additions & 3 deletions trunk/drivers/net/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,9 +186,6 @@ config MII

source "drivers/net/phy/Kconfig"

config SUNGEM_PHY
tristate

#
# Ethernet
#
Expand Down
2 changes: 0 additions & 2 deletions trunk/drivers/net/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,3 @@ obj-$(CONFIG_VIRTIO_NET) += virtio_net.o

obj-$(CONFIG_WIMAX) += wimax/
obj-$(CONFIG_CAIF) += caif/

obj-$(CONFIG_SUNGEM_PHY) += sungem_phy.o
26 changes: 13 additions & 13 deletions trunk/drivers/net/can/mscan/mscan.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ static enum can_state state_map[] = {
static int mscan_set_mode(struct net_device *dev, u8 mode)
{
struct mscan_priv *priv = netdev_priv(dev);
struct mscan_regs *regs = (struct mscan_regs *)priv->reg_base;
struct mscan_regs __iomem *regs = priv->reg_base;
int ret = 0;
int i;
u8 canctl1;
Expand Down Expand Up @@ -138,7 +138,7 @@ static int mscan_set_mode(struct net_device *dev, u8 mode)
static int mscan_start(struct net_device *dev)
{
struct mscan_priv *priv = netdev_priv(dev);
struct mscan_regs *regs = (struct mscan_regs *)priv->reg_base;
struct mscan_regs __iomem *regs = priv->reg_base;
u8 canrflg;
int err;

Expand Down Expand Up @@ -178,7 +178,7 @@ static int mscan_restart(struct net_device *dev)
struct mscan_priv *priv = netdev_priv(dev);

if (priv->type == MSCAN_TYPE_MPC5121) {
struct mscan_regs *regs = (struct mscan_regs *)priv->reg_base;
struct mscan_regs __iomem *regs = priv->reg_base;

priv->can.state = CAN_STATE_ERROR_ACTIVE;
WARN(!(in_8(&regs->canmisc) & MSCAN_BOHOLD),
Expand All @@ -199,7 +199,7 @@ static netdev_tx_t mscan_start_xmit(struct sk_buff *skb, struct net_device *dev)
{
struct can_frame *frame = (struct can_frame *)skb->data;
struct mscan_priv *priv = netdev_priv(dev);
struct mscan_regs *regs = (struct mscan_regs *)priv->reg_base;
struct mscan_regs __iomem *regs = priv->reg_base;
int i, rtr, buf_id;
u32 can_id;

Expand Down Expand Up @@ -305,7 +305,7 @@ static enum can_state check_set_state(struct net_device *dev, u8 canrflg)
static void mscan_get_rx_frame(struct net_device *dev, struct can_frame *frame)
{
struct mscan_priv *priv = netdev_priv(dev);
struct mscan_regs *regs = (struct mscan_regs *)priv->reg_base;
struct mscan_regs __iomem *regs = priv->reg_base;
u32 can_id;
int i;

Expand Down Expand Up @@ -343,7 +343,7 @@ static void mscan_get_err_frame(struct net_device *dev, struct can_frame *frame,
u8 canrflg)
{
struct mscan_priv *priv = netdev_priv(dev);
struct mscan_regs *regs = (struct mscan_regs *)priv->reg_base;
struct mscan_regs __iomem *regs = priv->reg_base;
struct net_device_stats *stats = &dev->stats;
enum can_state old_state;

Expand Down Expand Up @@ -406,7 +406,7 @@ static int mscan_rx_poll(struct napi_struct *napi, int quota)
{
struct mscan_priv *priv = container_of(napi, struct mscan_priv, napi);
struct net_device *dev = napi->dev;
struct mscan_regs *regs = (struct mscan_regs *)priv->reg_base;
struct mscan_regs __iomem *regs = priv->reg_base;
struct net_device_stats *stats = &dev->stats;
int npackets = 0;
int ret = 1;
Expand Down Expand Up @@ -453,7 +453,7 @@ static irqreturn_t mscan_isr(int irq, void *dev_id)
{
struct net_device *dev = (struct net_device *)dev_id;
struct mscan_priv *priv = netdev_priv(dev);
struct mscan_regs *regs = (struct mscan_regs *)priv->reg_base;
struct mscan_regs __iomem *regs = priv->reg_base;
struct net_device_stats *stats = &dev->stats;
u8 cantier, cantflg, canrflg;
irqreturn_t ret = IRQ_NONE;
Expand Down Expand Up @@ -537,7 +537,7 @@ static int mscan_do_set_mode(struct net_device *dev, enum can_mode mode)
static int mscan_do_set_bittiming(struct net_device *dev)
{
struct mscan_priv *priv = netdev_priv(dev);
struct mscan_regs *regs = (struct mscan_regs *)priv->reg_base;
struct mscan_regs __iomem *regs = priv->reg_base;
struct can_bittiming *bt = &priv->can.bittiming;
u8 btr0, btr1;

Expand All @@ -559,7 +559,7 @@ static int mscan_open(struct net_device *dev)
{
int ret;
struct mscan_priv *priv = netdev_priv(dev);
struct mscan_regs *regs = (struct mscan_regs *)priv->reg_base;
struct mscan_regs __iomem *regs = priv->reg_base;

/* common open */
ret = open_candev(dev);
Expand Down Expand Up @@ -598,7 +598,7 @@ static int mscan_open(struct net_device *dev)
static int mscan_close(struct net_device *dev)
{
struct mscan_priv *priv = netdev_priv(dev);
struct mscan_regs *regs = (struct mscan_regs *)priv->reg_base;
struct mscan_regs __iomem *regs = priv->reg_base;

netif_stop_queue(dev);
napi_disable(&priv->napi);
Expand All @@ -622,7 +622,7 @@ static const struct net_device_ops mscan_netdev_ops = {
int register_mscandev(struct net_device *dev, int mscan_clksrc)
{
struct mscan_priv *priv = netdev_priv(dev);
struct mscan_regs *regs = (struct mscan_regs *)priv->reg_base;
struct mscan_regs __iomem *regs = priv->reg_base;
u8 ctl1;

ctl1 = in_8(&regs->canctl1);
Expand Down Expand Up @@ -659,7 +659,7 @@ int register_mscandev(struct net_device *dev, int mscan_clksrc)
void unregister_mscandev(struct net_device *dev)
{
struct mscan_priv *priv = netdev_priv(dev);
struct mscan_regs *regs = (struct mscan_regs *)priv->reg_base;
struct mscan_regs __iomem *regs = priv->reg_base;
mscan_set_mode(dev, MSCAN_INIT_MODE);
clrbits8(&regs->canctl1, MSCAN_CANE);
unregister_candev(dev);
Expand Down
67 changes: 36 additions & 31 deletions trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,68 +66,73 @@
#define BNX2X_MSG_SP 0x100000 /* was: NETIF_MSG_INTR */
#define BNX2X_MSG_FP 0x200000 /* was: NETIF_MSG_INTR */

#define DP_LEVEL KERN_NOTICE /* was: KERN_DEBUG */

/* regular debug print */
#define DP(__mask, fmt, ...) \
#define DP(__mask, __fmt, __args...) \
do { \
if (bp->msg_enable & (__mask)) \
pr_notice("[%s:%d(%s)]" fmt, \
__func__, __LINE__, \
bp->dev ? (bp->dev->name) : "?", \
##__VA_ARGS__); \
printk(DP_LEVEL "[%s:%d(%s)]" __fmt, \
__func__, __LINE__, \
bp->dev ? (bp->dev->name) : "?", \
##__args); \
} while (0)

#define DP_CONT(__mask, fmt, ...) \
#define DP_CONT(__mask, __fmt, __args...) \
do { \
if (bp->msg_enable & (__mask)) \
pr_cont(fmt, ##__VA_ARGS__); \
pr_cont(__fmt, ##__args); \
} while (0)

/* errors debug print */
#define BNX2X_DBG_ERR(fmt, ...) \
#define BNX2X_DBG_ERR(__fmt, __args...) \
do { \
if (netif_msg_probe(bp)) \
pr_err("[%s:%d(%s)]" fmt, \
pr_err("[%s:%d(%s)]" __fmt, \
__func__, __LINE__, \
bp->dev ? (bp->dev->name) : "?", \
##__VA_ARGS__); \
##__args); \
} while (0)

/* for errors (never masked) */
#define BNX2X_ERR(fmt, ...) \
#define BNX2X_ERR(__fmt, __args...) \
do { \
pr_err("[%s:%d(%s)]" fmt, \
pr_err("[%s:%d(%s)]" __fmt, \
__func__, __LINE__, \
bp->dev ? (bp->dev->name) : "?", \
##__VA_ARGS__); \
} while (0)
##__args); \
} while (0)

#define BNX2X_ERROR(fmt, ...) \
pr_err("[%s:%d]" fmt, __func__, __LINE__, ##__VA_ARGS__)
#define BNX2X_ERROR(__fmt, __args...) do { \
pr_err("[%s:%d]" __fmt, __func__, __LINE__, ##__args); \
} while (0)


/* before we have a dev->name use dev_info() */
#define BNX2X_DEV_INFO(fmt, ...) \
#define BNX2X_DEV_INFO(__fmt, __args...) \
do { \
if (netif_msg_probe(bp)) \
dev_info(&bp->pdev->dev, fmt, ##__VA_ARGS__); \
dev_info(&bp->pdev->dev, __fmt, ##__args); \
} while (0)

#define BNX2X_MAC_FMT "%pM"
#define BNX2X_MAC_PRN_LIST(mac) (mac)


#ifdef BNX2X_STOP_ON_ERROR
void bnx2x_int_disable(struct bnx2x *bp);
#define bnx2x_panic() \
do { \
bp->panic = 1; \
BNX2X_ERR("driver assert\n"); \
bnx2x_int_disable(bp); \
bnx2x_panic_dump(bp); \
} while (0)
#define bnx2x_panic() do { \
bp->panic = 1; \
BNX2X_ERR("driver assert\n"); \
bnx2x_int_disable(bp); \
bnx2x_panic_dump(bp); \
} while (0)
#else
#define bnx2x_panic() \
do { \
bp->panic = 1; \
BNX2X_ERR("driver assert\n"); \
bnx2x_panic_dump(bp); \
} while (0)
#define bnx2x_panic() do { \
bp->panic = 1; \
BNX2X_ERR("driver assert\n"); \
bnx2x_panic_dump(bp); \
} while (0)
#endif

#define bnx2x_mc_addr(ha) ((ha)->addr)
Expand Down
48 changes: 21 additions & 27 deletions trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
*
*/

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include <linux/etherdevice.h>
#include <linux/if_vlan.h>
#include <linux/interrupt.h>
Expand Down Expand Up @@ -955,16 +953,15 @@ void __bnx2x_link_report(struct bnx2x *bp)
netdev_err(bp->dev, "NIC Link is Down\n");
return;
} else {
const char *duplex;
const char *flow;

netif_carrier_on(bp->dev);
netdev_info(bp->dev, "NIC Link is Up, ");
pr_cont("%d Mbps ", cur_data.line_speed);

if (test_and_clear_bit(BNX2X_LINK_REPORT_FD,
&cur_data.link_report_flags))
duplex = "full";
pr_cont("full duplex");
else
duplex = "half";
pr_cont("half duplex");

/* Handle the FC at the end so that only these flags would be
* possibly set. This way we may easily check if there is no FC
Expand All @@ -973,19 +970,16 @@ void __bnx2x_link_report(struct bnx2x *bp)
if (cur_data.link_report_flags) {
if (test_bit(BNX2X_LINK_REPORT_RX_FC_ON,
&cur_data.link_report_flags)) {
pr_cont(", receive ");
if (test_bit(BNX2X_LINK_REPORT_TX_FC_ON,
&cur_data.link_report_flags))
flow = "ON - receive & transmit";
else
flow = "ON - receive";
pr_cont("& transmit ");
} else {
flow = "ON - transmit";
pr_cont(", transmit ");
}
} else {
flow = "none";
pr_cont("flow control ON");
}
netdev_info(bp->dev, "NIC Link is Up, %d Mbps %s duplex, Flow control: %s\n",
cur_data.line_speed, duplex, flow);
pr_cont("\n");
}
}

Expand Down Expand Up @@ -2590,7 +2584,7 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
#endif

/* enable this debug print to view the transmission queue being used
DP(BNX2X_MSG_FP, "indices: txq %d, fp %d, txdata %d\n",
DP(BNX2X_MSG_FP, "indices: txq %d, fp %d, txdata %d",
txq_index, fp_index, txdata_index); */

/* locate the fastpath and the txdata */
Expand All @@ -2599,7 +2593,7 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)

/* enable this debug print to view the tranmission details
DP(BNX2X_MSG_FP,"transmitting packet cid %d fp index %d txdata_index %d"
" tx_data ptr %p fp pointer %p\n",
" tx_data ptr %p fp pointer %p",
txdata->cid, fp_index, txdata_index, txdata, fp); */

if (unlikely(bnx2x_tx_avail(bp, txdata) <
Expand Down Expand Up @@ -2916,22 +2910,22 @@ int bnx2x_setup_tc(struct net_device *dev, u8 num_tc)
/* requested to support too many traffic classes */
if (num_tc > bp->max_cos) {
DP(NETIF_MSG_TX_ERR, "support for too many traffic classes"
" requested: %d. max supported is %d\n",
" requested: %d. max supported is %d",
num_tc, bp->max_cos);
return -EINVAL;
}

/* declare amount of supported traffic classes */
if (netdev_set_num_tc(dev, num_tc)) {
DP(NETIF_MSG_TX_ERR, "failed to declare %d traffic classes\n",
DP(NETIF_MSG_TX_ERR, "failed to declare %d traffic classes",
num_tc);
return -EINVAL;
}

/* configure priority to traffic class mapping */
for (prio = 0; prio < BNX2X_MAX_PRIORITY; prio++) {
netdev_set_prio_tc_map(dev, prio, bp->prio_to_cos[prio]);
DP(BNX2X_MSG_SP, "mapping priority %d to tc %d\n",
DP(BNX2X_MSG_SP, "mapping priority %d to tc %d",
prio, bp->prio_to_cos[prio]);
}

Expand All @@ -2940,18 +2934,18 @@ int bnx2x_setup_tc(struct net_device *dev, u8 num_tc)
This can be used for ets or pfc, and save the effort of setting
up a multio class queue disc or negotiating DCBX with a switch
netdev_set_prio_tc_map(dev, 0, 0);
DP(BNX2X_MSG_SP, "mapping priority %d to tc %d\n", 0, 0);
DP(BNX2X_MSG_SP, "mapping priority %d to tc %d", 0, 0);
for (prio = 1; prio < 16; prio++) {
netdev_set_prio_tc_map(dev, prio, 1);
DP(BNX2X_MSG_SP, "mapping priority %d to tc %d\n", prio, 1);
DP(BNX2X_MSG_SP, "mapping priority %d to tc %d", prio, 1);
} */

/* configure traffic class to transmission queue mapping */
for (cos = 0; cos < bp->max_cos; cos++) {
count = BNX2X_NUM_ETH_QUEUES(bp);
offset = cos * MAX_TXQS_PER_COS;
netdev_set_tc_queue(dev, cos, count, offset);
DP(BNX2X_MSG_SP, "mapping tc %d to offset %d count %d\n",
DP(BNX2X_MSG_SP, "mapping tc %d to offset %d count %d",
cos, offset, count);
}

Expand Down Expand Up @@ -3039,7 +3033,7 @@ static void bnx2x_free_fp_mem_at(struct bnx2x *bp, int fp_index)
struct bnx2x_fp_txdata *txdata = &fp->txdata[cos];

DP(BNX2X_MSG_SP,
"freeing tx memory of fp %d cos %d cid %d\n",
"freeing tx memory of fp %d cos %d cid %d",
fp_index, cos, txdata->cid);

BNX2X_FREE(txdata->tx_buf_ring);
Expand Down Expand Up @@ -3121,7 +3115,7 @@ static int bnx2x_alloc_fp_mem_at(struct bnx2x *bp, int index)
struct bnx2x_fp_txdata *txdata = &fp->txdata[cos];

DP(BNX2X_MSG_SP, "allocating tx memory of "
"fp %d cos %d\n",
"fp %d cos %d",
index, cos);

BNX2X_ALLOC(txdata->tx_buf_ring,
Expand Down Expand Up @@ -3371,7 +3365,7 @@ int bnx2x_change_mtu(struct net_device *dev, int new_mtu)
struct bnx2x *bp = netdev_priv(dev);

if (bp->recovery_state != BNX2X_RECOVERY_DONE) {
pr_err("Handling parity error recovery. Try again later\n");
printk(KERN_ERR "Handling parity error recovery. Try again later\n");
return -EAGAIN;
}

Expand Down Expand Up @@ -3497,7 +3491,7 @@ int bnx2x_resume(struct pci_dev *pdev)
bp = netdev_priv(dev);

if (bp->recovery_state != BNX2X_RECOVERY_DONE) {
pr_err("Handling parity error recovery. Try again later\n");
printk(KERN_ERR "Handling parity error recovery. Try again later\n");
return -EAGAIN;
}

Expand Down
Loading

0 comments on commit 050e703

Please sign in to comment.