* [PATCH 1/5] samsung: xgmac: Neatening
2014-03-05 19:20 [PATCH 0/5] samsung: xgmac: Joe Perches
@ 2014-03-05 19:20 ` Joe Perches
2014-03-05 19:20 ` [PATCH 2/5] samsung: xgmac: Fix pr_<level> uses Joe Perches
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Joe Perches @ 2014-03-05 19:20 UTC (permalink / raw)
To: Byungho An
Cc: linux-samsung-soc, davem, siva.kallam, vipul.pandya, ks.giri,
ilho215.lee, netdev
Quiet checkpatch noise:
o Multi-line statement alignment
o Add braces
o Move logical continuations
o Remove externs from .h
o Remove unnecessary blank lines around braces
Typo fixes where noticed.
Change logic to return first to reduce indentation.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/ethernet/samsung/xgmac_common.h | 24 ++++----
drivers/net/ethernet/samsung/xgmac_desc.c | 4 --
drivers/net/ethernet/samsung/xgmac_dma.c | 32 +++++-----
drivers/net/ethernet/samsung/xgmac_ethtool.c | 67 ++++++++++----------
drivers/net/ethernet/samsung/xgmac_main.c | 92 +++++++++++++---------------
drivers/net/ethernet/samsung/xgmac_mdio.c | 13 ++--
drivers/net/ethernet/samsung/xgmac_mtl.c | 4 +-
7 files changed, 115 insertions(+), 121 deletions(-)
diff --git a/drivers/net/ethernet/samsung/xgmac_common.h b/drivers/net/ethernet/samsung/xgmac_common.h
index 4932824..4c46504 100644
--- a/drivers/net/ethernet/samsung/xgmac_common.h
+++ b/drivers/net/ethernet/samsung/xgmac_common.h
@@ -544,24 +544,24 @@ struct xgmac_priv_data {
};
/* Function prototypes */
-extern struct xgmac_priv_data *xgmac_dvr_probe(struct device *device,
+struct xgmac_priv_data *xgmac_dvr_probe(struct device *device,
struct xgmac_plat_data *plat_dat,
void __iomem *addr);
-extern int xgmac_dvr_remove(struct net_device *ndev);
-extern void xgmac_set_ethtool_ops(struct net_device *netdev);
-extern int xgmac_mdio_unregister(struct net_device *ndev);
-extern int xgmac_mdio_register(struct net_device *ndev);
-extern int xgmac_register_platform(void);
-extern void xgmac_unregister_platform(void);
+int xgmac_dvr_remove(struct net_device *ndev);
+void xgmac_set_ethtool_ops(struct net_device *netdev);
+int xgmac_mdio_unregister(struct net_device *ndev);
+int xgmac_mdio_register(struct net_device *ndev);
+int xgmac_register_platform(void);
+void xgmac_unregister_platform(void);
#ifdef CONFIG_PM
-extern int xgmac_suspend(struct net_device *ndev);
-extern int xgmac_resume(struct net_device *ndev);
-extern int xgmac_freeze(struct net_device *ndev);
-extern int xgmac_restore(struct net_device *ndev);
+int xgmac_suspend(struct net_device *ndev);
+int xgmac_resume(struct net_device *ndev);
+int xgmac_freeze(struct net_device *ndev);
+int xgmac_restore(struct net_device *ndev);
#endif /* CONFIG_PM */
-extern const struct xgmac_mtl_ops *xgmac_get_mtl_ops(void);
+const struct xgmac_mtl_ops *xgmac_get_mtl_ops(void);
void xgmac_disable_eee_mode(struct xgmac_priv_data * const priv);
bool xgmac_eee_init(struct xgmac_priv_data * const priv);
diff --git a/drivers/net/ethernet/samsung/xgmac_desc.c b/drivers/net/ethernet/samsung/xgmac_desc.c
index c5417de..ddf3e94 100644
--- a/drivers/net/ethernet/samsung/xgmac_desc.c
+++ b/drivers/net/ethernet/samsung/xgmac_desc.c
@@ -196,7 +196,6 @@ static void xgmac_tx_ctxt_desc_set_tstamp(struct xgmac_tx_ctxt_desc *p,
p->tstamp_lo = (u32) tstamp;
p->tstamp_hi = (u32) (tstamp>>32);
}
-
}
/* Close TX context descriptor */
static void xgmac_tx_ctxt_desc_close(struct xgmac_tx_ctxt_desc *p)
@@ -217,7 +216,6 @@ static void xgmac_init_rx_desc(struct xgmac_rx_norm_desc *p, int disable_rx_ic,
p->rdes23.rx_rd_des23.own_bit = 1;
if (disable_rx_ic)
p->rdes23.rx_rd_des23.int_on_com = disable_rx_ic;
-
}
/* Get RX own bit */
@@ -337,7 +335,6 @@ static int xgmac_rx_wbstatus(struct xgmac_rx_norm_desc *p,
pr_err("\tInvalid L2 Packet type\n");
break;
}
-
}
/* L3/L4 Pkt type */
@@ -443,7 +440,6 @@ static void xgmac_rx_ctxt_wbstatus(struct xgmac_rx_ctxt_desc *p,
x->rx_ptp_signal++;
else if (p->ptp_msgtype == RX_PTP_RESV_MSG)
x->rx_ptp_resv_msg_type++;
-
}
/* get rx timestamp status */
diff --git a/drivers/net/ethernet/samsung/xgmac_dma.c b/drivers/net/ethernet/samsung/xgmac_dma.c
index 47945a3..384866c 100644
--- a/drivers/net/ethernet/samsung/xgmac_dma.c
+++ b/drivers/net/ethernet/samsung/xgmac_dma.c
@@ -85,14 +85,14 @@ static void xgmac_dma_channel_init(void __iomem *ioaddr, int cha_num,
/* program desc registers */
writel((dma_tx >> 32),
- ioaddr + XGMAC_DMA_CHA_TXDESC_HADD_REG(cha_num));
+ ioaddr + XGMAC_DMA_CHA_TXDESC_HADD_REG(cha_num));
writel((dma_tx & 0xFFFFFFFF),
- ioaddr + XGMAC_DMA_CHA_TXDESC_LADD_REG(cha_num));
+ ioaddr + XGMAC_DMA_CHA_TXDESC_LADD_REG(cha_num));
writel((dma_rx >> 32),
- ioaddr + XGMAC_DMA_CHA_RXDESC_HADD_REG(cha_num));
+ ioaddr + XGMAC_DMA_CHA_RXDESC_HADD_REG(cha_num));
writel((dma_rx & 0xFFFFFFFF),
- ioaddr + XGMAC_DMA_CHA_RXDESC_LADD_REG(cha_num));
+ ioaddr + XGMAC_DMA_CHA_RXDESC_LADD_REG(cha_num));
/* program tail pointers */
/* assumption: upper 32 bits are constant and
@@ -100,18 +100,18 @@ static void xgmac_dma_channel_init(void __iomem *ioaddr, int cha_num,
*/
dma_addr = dma_tx + ((t_rsize-1) * XGMAC_DESC_SIZE_BYTES);
writel((dma_addr & 0xFFFFFFFF),
- ioaddr + XGMAC_DMA_CHA_TXDESC_TAILPTR_REG(cha_num));
+ ioaddr + XGMAC_DMA_CHA_TXDESC_TAILPTR_REG(cha_num));
dma_addr = dma_rx + ((r_rsize-1) * XGMAC_DESC_SIZE_BYTES);
writel((dma_addr & 0xFFFFFFFF),
- ioaddr + XGMAC_DMA_CHA_RXDESC_LADD_REG(cha_num));
+ ioaddr + XGMAC_DMA_CHA_RXDESC_LADD_REG(cha_num));
/* program the ring sizes */
writel(t_rsize-1, ioaddr + XGMAC_DMA_CHA_TXDESC_RINGLEN_REG(cha_num));
writel(r_rsize-1, ioaddr + XGMAC_DMA_CHA_RXDESC_RINGLEN_REG(cha_num));
/* Enable TX/RX interrupts */
writel(XGMAC_DMA_ENA_INT,
- ioaddr + XGMAC_DMA_CHA_INT_ENABLE_REG(cha_num));
+ ioaddr + XGMAC_DMA_CHA_INT_ENABLE_REG(cha_num));
}
static void xgmac_enable_dma_transmission(void __iomem *ioaddr, int cha_num)
@@ -126,7 +126,7 @@ static void xgmac_enable_dma_irq(void __iomem *ioaddr, int dma_cnum)
{
/* Enable TX/RX interrupts */
writel(XGMAC_DMA_ENA_INT,
- ioaddr + XGMAC_DMA_CHA_INT_ENABLE_REG(dma_cnum));
+ ioaddr + XGMAC_DMA_CHA_INT_ENABLE_REG(dma_cnum));
}
static void xgmac_disable_dma_irq(void __iomem *ioaddr, int dma_cnum)
@@ -144,7 +144,7 @@ static void xgmac_dma_start_tx(void __iomem *ioaddr, int tchannels)
tx_ctl_reg = readl(ioaddr + XGMAC_DMA_CHA_TXCTL_REG(cnum));
tx_ctl_reg |= XGMAC_TX_ENABLE;
writel(tx_ctl_reg,
- ioaddr + XGMAC_DMA_CHA_TXCTL_REG(cnum));
+ ioaddr + XGMAC_DMA_CHA_TXCTL_REG(cnum));
}
}
@@ -187,7 +187,7 @@ static void xgmac_dma_start_rx(void __iomem *ioaddr, int rchannels)
rx_ctl_reg = readl(ioaddr + XGMAC_DMA_CHA_RXCTL_REG(cnum));
rx_ctl_reg |= XGMAC_RX_ENABLE;
writel(rx_ctl_reg,
- ioaddr + XGMAC_DMA_CHA_RXCTL_REG(cnum));
+ ioaddr + XGMAC_DMA_CHA_RXCTL_REG(cnum));
}
}
@@ -245,14 +245,16 @@ static int xgmac_tx_dma_int_status(void __iomem *ioaddr, int channel_no,
if (int_status & XGMAC_DMA_INT_STATUS_TEB0) {
x->tx_read_transfer_err++;
clear_val |= XGMAC_DMA_INT_STATUS_TEB0;
- } else
+ } else {
x->tx_write_transfer_err++;
+ }
if (int_status & XGMAC_DMA_INT_STATUS_TEB1) {
x->tx_desc_access_err++;
clear_val |= XGMAC_DMA_INT_STATUS_TEB1;
- } else
+ } else {
x->tx_buffer_access_err++;
+ }
if (int_status & XGMAC_DMA_INT_STATUS_TEB2) {
x->tx_data_transfer_err++;
@@ -315,14 +317,16 @@ static int xgmac_rx_dma_int_status(void __iomem *ioaddr, int channel_no,
if (int_status & XGMAC_DMA_INT_STATUS_REB0) {
x->rx_read_transfer_err++;
clear_val |= XGMAC_DMA_INT_STATUS_REB0;
- } else
+ } else {
x->rx_write_transfer_err++;
+ }
if (int_status & XGMAC_DMA_INT_STATUS_REB1) {
x->rx_desc_access_err++;
clear_val |= XGMAC_DMA_INT_STATUS_REB1;
- } else
+ } else {
x->rx_buffer_access_err++;
+ }
if (int_status & XGMAC_DMA_INT_STATUS_REB2) {
x->rx_data_transfer_err++;
diff --git a/drivers/net/ethernet/samsung/xgmac_ethtool.c b/drivers/net/ethernet/samsung/xgmac_ethtool.c
index 74af3865..3f0698a 100644
--- a/drivers/net/ethernet/samsung/xgmac_ethtool.c
+++ b/drivers/net/ethernet/samsung/xgmac_ethtool.c
@@ -152,9 +152,9 @@ static int xgmac_set_eee(struct net_device *dev,
priv->eee_enabled = edata->eee_enabled;
- if (!priv->eee_enabled)
+ if (!priv->eee_enabled) {
xgmac_disable_eee_mode(priv);
- else {
+ } else {
/* We are asking for enabling the EEE but it is safe
* to verify all by invoking the eee_init function.
* In case of failure it will return an error.
@@ -251,7 +251,6 @@ static void xgmac_setmsglevel(struct net_device *dev, u32 level)
{
struct xgmac_priv_data *priv = netdev_priv(dev);
priv->msg_enable = level;
-
}
static int xgmac_get_ts_info(struct net_device *dev,
@@ -259,38 +258,38 @@ static int xgmac_get_ts_info(struct net_device *dev,
{
struct xgmac_priv_data *priv = netdev_priv(dev);
- if (priv->hw_cap.atime_stamp) {
-
- info->so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE |
- SOF_TIMESTAMPING_RX_SOFTWARE |
- SOF_TIMESTAMPING_SOFTWARE |
- SOF_TIMESTAMPING_TX_HARDWARE |
- SOF_TIMESTAMPING_RX_HARDWARE |
- SOF_TIMESTAMPING_RAW_HARDWARE;
-
- if (priv->ptp_clock)
- info->phc_index = ptp_clock_index(priv->ptp_clock);
-
- info->tx_types = (1 << HWTSTAMP_TX_OFF) | (1 << HWTSTAMP_TX_ON)
- | (1 << HWTSTAMP_TX_ONESTEP_SYNC);
-
- info->rx_filters = ((1 << HWTSTAMP_FILTER_NONE) |
- (1 << HWTSTAMP_FILTER_PTP_V1_L4_EVENT) |
- (1 << HWTSTAMP_FILTER_PTP_V1_L4_SYNC) |
- (1 << HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ) |
- (1 << HWTSTAMP_FILTER_PTP_V2_L4_EVENT) |
- (1 << HWTSTAMP_FILTER_PTP_V2_L4_SYNC) |
- (1 << HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ) |
- (1 << HWTSTAMP_FILTER_PTP_V2_L2_EVENT) |
- (1 << HWTSTAMP_FILTER_PTP_V2_L2_SYNC) |
- (1 << HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ) |
- (1 << HWTSTAMP_FILTER_PTP_V2_EVENT) |
- (1 << HWTSTAMP_FILTER_PTP_V2_SYNC) |
- (1 << HWTSTAMP_FILTER_PTP_V2_DELAY_REQ) |
- (1 << HWTSTAMP_FILTER_ALL));
- return 0;
- } else
+ if (!priv->hw_cap.atime_stamp)
return ethtool_op_get_ts_info(dev, info);
+
+ info->so_timestamping = (SOF_TIMESTAMPING_TX_SOFTWARE |
+ SOF_TIMESTAMPING_RX_SOFTWARE |
+ SOF_TIMESTAMPING_SOFTWARE |
+ SOF_TIMESTAMPING_TX_HARDWARE |
+ SOF_TIMESTAMPING_RX_HARDWARE |
+ SOF_TIMESTAMPING_RAW_HARDWARE);
+
+ if (priv->ptp_clock)
+ info->phc_index = ptp_clock_index(priv->ptp_clock);
+
+ info->tx_types = ((1 << HWTSTAMP_TX_OFF) |
+ (1 << HWTSTAMP_TX_ON) |
+ (1 << HWTSTAMP_TX_ONESTEP_SYNC));
+
+ info->rx_filters = ((1 << HWTSTAMP_FILTER_NONE) |
+ (1 << HWTSTAMP_FILTER_PTP_V1_L4_EVENT) |
+ (1 << HWTSTAMP_FILTER_PTP_V1_L4_SYNC) |
+ (1 << HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ) |
+ (1 << HWTSTAMP_FILTER_PTP_V2_L4_EVENT) |
+ (1 << HWTSTAMP_FILTER_PTP_V2_L4_SYNC) |
+ (1 << HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ) |
+ (1 << HWTSTAMP_FILTER_PTP_V2_L2_EVENT) |
+ (1 << HWTSTAMP_FILTER_PTP_V2_L2_SYNC) |
+ (1 << HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ) |
+ (1 << HWTSTAMP_FILTER_PTP_V2_EVENT) |
+ (1 << HWTSTAMP_FILTER_PTP_V2_SYNC) |
+ (1 << HWTSTAMP_FILTER_PTP_V2_DELAY_REQ) |
+ (1 << HWTSTAMP_FILTER_ALL));
+ return 0;
}
int xgmac_set_flow_ctrl(struct xgmac_priv_data *priv, int rx, int tx)
diff --git a/drivers/net/ethernet/samsung/xgmac_main.c b/drivers/net/ethernet/samsung/xgmac_main.c
index 1eae636..05853d2 100644
--- a/drivers/net/ethernet/samsung/xgmac_main.c
+++ b/drivers/net/ethernet/samsung/xgmac_main.c
@@ -212,9 +212,8 @@ static void xgmac_clk_csr_set(struct xgmac_priv_data *priv)
(clk_rate <= XGMAC_CSR_F_400M))
priv->clk_csr = XGMAC_CSR_350_400M;
else if ((clk_rate >= XGMAC_CSR_F_400M) &&
- (clk_rate <= XGMAC_CSR_F_500M))
+ (clk_rate <= XGMAC_CSR_F_500M))
priv->clk_csr = XGMAC_CSR_400_500M;
-
}
static void print_pkt(unsigned char *buf, int len)
@@ -271,8 +270,8 @@ static void xgmac_adjust_link(struct net_device *dev)
break;
default:
if (netif_msg_link(priv))
- pr_err("%s: Speed (%d) not suppoted\n",
- dev->name, phydev->speed);
+ pr_err("%s: Speed (%d) not supported\n",
+ dev->name, phydev->speed);
}
priv->speed = phydev->speed;
@@ -346,7 +345,7 @@ static int xgmac_init_phy(struct net_device *ndev)
}
pr_debug("xgmac_init_phy: %s: attached to PHY (UID 0x%x) Link = %d\n",
- ndev->name, phydev->phy_id, phydev->link);
+ ndev->name, phydev->phy_id, phydev->link);
/* save phy device in private structure */
priv->phydev = phydev;
@@ -554,7 +553,6 @@ static int init_rx_ring(struct net_device *dev, u8 queue_no,
rx_ring->cur_rx = 0;
rx_ring->dirty_rx = (unsigned int)(desc_index - rx_rsize);
priv->dma_buf_sz = bfsize;
-
}
return 0;
@@ -656,9 +654,9 @@ static void tx_free_ring_skbufs(struct xgmac_tx_queue *txqueue)
if (txqueue->tx_skbuff_dma[dma_desc])
dma_unmap_single(priv->device,
- txqueue->tx_skbuff_dma[dma_desc],
- priv->hw->desc->get_tx_len(tdesc),
- DMA_TO_DEVICE);
+ txqueue->tx_skbuff_dma[dma_desc],
+ priv->hw->desc->get_tx_len(tdesc),
+ DMA_TO_DEVICE);
dev_kfree_skb_any(txqueue->tx_skbuff[dma_desc]);
txqueue->tx_skbuff[dma_desc] = NULL;
@@ -745,25 +743,26 @@ static void xgmac_mtl_operation_mode(struct xgmac_priv_data *priv)
/* set TC mode for TX QUEUES */
XGMAC_FOR_EACH_QUEUE(priv->hw_cap.tx_mtl_queues, queue_num)
priv->hw->mtl->set_tx_mtl_mode(priv->ioaddr, queue_num,
- XGMAC_MTL_SFMODE);
+ XGMAC_MTL_SFMODE);
tx_tc = XGMAC_MTL_SFMODE;
/* set TC mode for RX QUEUES */
XGMAC_FOR_EACH_QUEUE(priv->hw_cap.rx_mtl_queues, queue_num)
priv->hw->mtl->set_rx_mtl_mode(priv->ioaddr, queue_num,
- XGMAC_MTL_SFMODE);
+ XGMAC_MTL_SFMODE);
rx_tc = XGMAC_MTL_SFMODE;
} else if (unlikely(priv->plat->force_thresh_dma_mode)) {
/* set TC mode for TX QUEUES */
XGMAC_FOR_EACH_QUEUE(priv->hw_cap.tx_mtl_queues, queue_num)
priv->hw->mtl->set_tx_mtl_mode(priv->ioaddr, queue_num,
- tx_tc);
+ tx_tc);
/* set TC mode for RX QUEUES */
XGMAC_FOR_EACH_QUEUE(priv->hw_cap.rx_mtl_queues, queue_num)
priv->hw->mtl->set_rx_mtl_mode(priv->ioaddr, queue_num,
- rx_tc);
- } else
+ rx_tc);
+ } else {
pr_err("ERROR: %s: Invalid TX threshold mode\n", __func__);
+ }
}
/**
@@ -796,13 +795,13 @@ static void xgmac_tx_queue_clean(struct xgmac_tx_queue *tqueue)
if (netif_msg_tx_done(priv))
pr_debug("%s: curr %d, dirty %d\n", __func__,
- tqueue->cur_tx, tqueue->dirty_tx);
+ tqueue->cur_tx, tqueue->dirty_tx);
if (likely(tqueue->tx_skbuff_dma[entry])) {
dma_unmap_single(priv->device,
- tqueue->tx_skbuff_dma[entry],
- priv->hw->desc->get_tx_len(p),
- DMA_TO_DEVICE);
+ tqueue->tx_skbuff_dma[entry],
+ priv->hw->desc->get_tx_len(p),
+ DMA_TO_DEVICE);
tqueue->tx_skbuff_dma[entry] = 0;
}
@@ -818,10 +817,10 @@ static void xgmac_tx_queue_clean(struct xgmac_tx_queue *tqueue)
/* wake up queue */
if (unlikely(netif_tx_queue_stopped(dev_txq) &&
- xgmac_tx_avail(tqueue, tx_rsize) > XGMAC_TX_THRESH(priv))) {
+ xgmac_tx_avail(tqueue, tx_rsize) > XGMAC_TX_THRESH(priv))) {
netif_tx_lock(priv->dev);
if (netif_tx_queue_stopped(dev_txq) &&
- xgmac_tx_avail(tqueue, tx_rsize) > XGMAC_TX_THRESH(priv)) {
+ xgmac_tx_avail(tqueue, tx_rsize) > XGMAC_TX_THRESH(priv)) {
if (netif_msg_tx_done(priv))
pr_debug("%s: restart transmit\n", __func__);
netif_tx_wake_queue(dev_txq);
@@ -984,8 +983,7 @@ static void xgmac_check_ether_addr(struct xgmac_priv_data *priv)
eth_hw_addr_random(priv->dev);
}
dev_info(priv->device, "device MAC address %pM\n",
- priv->dev->dev_addr);
-
+ priv->dev->dev_addr);
}
/**
@@ -1035,7 +1033,6 @@ static void xgmac_init_mtl_engine(struct xgmac_priv_data *priv)
priv->hw_cap.tx_mtl_qsize);
priv->hw->mtl->mtl_enable_txqueue(priv->ioaddr, queue_num);
}
-
}
/**
@@ -1121,7 +1118,7 @@ static int xgmac_open(struct net_device *dev)
ret = xgmac_init_phy(dev);
if (ret) {
pr_err("%s: Cannot attach to PHY (error: %d)\n",
- __func__, ret);
+ __func__, ret);
goto phy_error;
}
@@ -1190,7 +1187,7 @@ static int xgmac_open(struct net_device *dev)
dev->name, priv->txq[queue_num]);
if (unlikely(ret < 0)) {
pr_err("%s: ERROR: allocating TX IRQ %d (error: %d)\n",
- __func__, dev->irq, ret);
+ __func__, dev->irq, ret);
goto init_error;
}
}
@@ -1203,7 +1200,7 @@ static int xgmac_open(struct net_device *dev)
dev->name, priv->rxq[queue_num]);
if (unlikely(ret < 0)) {
pr_err("%s: ERROR: allocating TX IRQ %d (error: %d)\n",
- __func__, dev->irq, ret);
+ __func__, dev->irq, ret);
goto init_error;
}
}
@@ -1301,7 +1298,6 @@ static int xgmac_release(struct net_device *dev)
clk_disable_unprepare(priv->xgmac_clk);
return 0;
-
}
/* Prepare first Tx descriptor for doing TSO operation */
@@ -1324,7 +1320,6 @@ void xgmac_tso_prepare(struct xgmac_priv_data *priv,
priv->hw->desc->tx_desc_enable_tse(first_desc, 1, total_hdr_len,
tcp_hdr_len,
skb->len - total_hdr_len);
-
}
/**
@@ -1355,10 +1350,10 @@ static netdev_tx_t xgmac_xmit(struct sk_buff *skb, struct net_device *dev)
/* get the TX queue handle */
dev_txq = netdev_get_tx_queue(dev, txq_index);
- if (likely(skb_is_gso(skb)
- || vlan_tx_tag_present(skb)
- || ((skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)
- && tqueue->hwts_tx_en)))
+ if (likely(skb_is_gso(skb) ||
+ vlan_tx_tag_present(skb) ||
+ ((skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) &&
+ tqueue->hwts_tx_en)))
ctxt_desc_req = 1;
/* get the spinlock */
@@ -1371,7 +1366,7 @@ static netdev_tx_t xgmac_xmit(struct sk_buff *skb, struct net_device *dev)
if (!netif_tx_queue_stopped(dev_txq)) {
netif_tx_stop_queue(dev_txq);
pr_err("%s: Tx Ring is full when %d queue is awake\n",
- __func__, txq_index);
+ __func__, txq_index);
}
/* release the spin lock in case of BUSY */
spin_unlock(&tqueue->tx_lock);
@@ -1446,9 +1441,10 @@ static netdev_tx_t xgmac_xmit(struct sk_buff *skb, struct net_device *dev)
priv->hw->desc->clear_tx_ic(tx_desc);
priv->xstats.tx_reset_ic_bit++;
mod_timer(&tqueue->txtimer,
- XGMAC_COAL_TIMER(tqueue->tx_coal_timer));
- } else
+ XGMAC_COAL_TIMER(tqueue->tx_coal_timer));
+ } else {
tqueue->tx_count_frames = 0;
+ }
/* set owner for first desc */
priv->hw->desc->set_tx_owner(first_desc);
@@ -1461,9 +1457,9 @@ static netdev_tx_t xgmac_xmit(struct sk_buff *skb, struct net_device *dev)
/* display current ring */
if (netif_msg_pktdata(priv)) {
pr_debug("%s: curr %d dirty=%d entry=%d, first=%p, nfrags=%d",
- __func__, (tqueue->cur_tx % tx_rsize),
- (tqueue->dirty_tx % tx_rsize), entry,
- first_desc, nr_frags);
+ __func__, (tqueue->cur_tx % tx_rsize),
+ (tqueue->dirty_tx % tx_rsize), entry,
+ first_desc, nr_frags);
pr_debug(">>> xgmac: tx frame to be transmitted: ");
print_pkt(skb->data, skb->len);
@@ -1587,7 +1583,7 @@ static int xgmac_rx(struct xgmac_priv_data *priv, int limit)
if (unlikely(!skb)) {
pr_err("%s: rx descriptor is not in consistent\n",
- priv->dev->name);
+ priv->dev->name);
}
prefetch(skb->data - NET_IP_ALIGN);
@@ -1921,10 +1917,10 @@ static void xgmac_set_rx_mode(struct net_device *dev)
pr_debug("%s: # mcasts %d, # unicast %d\n", __func__,
netdev_mc_count(dev), netdev_uc_count(dev));
- if (dev->flags & IFF_PROMISC)
+ if (dev->flags & IFF_PROMISC) {
value = XGMAC_FRAME_FILTER_PR;
- else if ((netdev_mc_count(dev) > XGMAC_HASH_TABLE_SIZE)
- || (dev->flags & IFF_ALLMULTI)) {
+ } else if ((netdev_mc_count(dev) > XGMAC_HASH_TABLE_SIZE) ||
+ (dev->flags & IFF_ALLMULTI)) {
value = XGMAC_FRAME_FILTER_PM; /* pass all multi */
writel(0xffffffff, ioaddr + XGMAC_HASH_HIGH);
writel(0xffffffff, ioaddr + XGMAC_HASH_LOW);
@@ -1967,7 +1963,7 @@ static void xgmac_set_rx_mode(struct net_device *dev)
writel(value, ioaddr + XGMAC_FRAME_FILTER);
pr_debug("\tFilter: 0x%08x\n\tHash: HI 0x%08x, LO 0x%08x\n",
- readl(ioaddr + XGMAC_FRAME_FILTER),
+ readl(ioaddr + XGMAC_FRAME_FILTER),
readl(ioaddr + XGMAC_HASH_HIGH), readl(ioaddr + XGMAC_HASH_LOW));
}
@@ -2106,7 +2102,7 @@ static int xgmac_hw_init(struct xgmac_priv_data * const priv)
priv->hw->ctrl_uid = (ctrl_ids & 0x00ff0000) >> 16;
priv->hw->ctrl_id = (ctrl_ids & 0x000000ff);
pr_info("xgmac - user ID: 0x%x, Controller ID: 0x%x\n",
- priv->hw->ctrl_uid, priv->hw->ctrl_id);
+ priv->hw->ctrl_uid, priv->hw->ctrl_id);
/* get the H/W features */
if (!xgmac_get_hw_features(priv))
@@ -2267,8 +2263,8 @@ struct xgmac_priv_data *xgmac_dvr_probe(struct device *device,
/* MDIO bus Registration */
ret = xgmac_mdio_register(ndev);
if (ret < 0) {
- pr_debug("%s: MDIO bus (id: %d) registration failed",
- __func__, priv->plat->bus_id);
+ pr_debug("%s: MDIO bus (id: %d) registration failed\n",
+ __func__, priv->plat->bus_id);
goto error_mdio_register;
}
@@ -2337,9 +2333,9 @@ int xgmac_suspend(struct net_device *ndev)
priv->hw->mtl->mtl_readout_rxqueue(priv->ioaddr, queue_num);
/* Enable Power down mode by programming the PMT regs */
- if (device_may_wakeup(priv->device))
+ if (device_may_wakeup(priv->device)) {
priv->hw->mac->pmt(priv->ioaddr, priv->wolopts);
- else {
+ } else {
netdev_for_each_uc_addr(ha, ndev)
priv->hw->mac->set_umac_addr(priv->ioaddr, ha->addr,
reg++);
diff --git a/drivers/net/ethernet/samsung/xgmac_mdio.c b/drivers/net/ethernet/samsung/xgmac_mdio.c
index 647a7bd..568c2fb 100644
--- a/drivers/net/ethernet/samsung/xgmac_mdio.c
+++ b/drivers/net/ethernet/samsung/xgmac_mdio.c
@@ -78,7 +78,7 @@ static int xgmac_mdio_read(struct mii_bus *bus, int phyaddr, int phyreg)
*/
if (phyaddr < 4)
writel((1 << phyaddr),
- priv->ioaddr + XGMAC_MDIO_CLAUSE22_PORT_REG);
+ priv->ioaddr + XGMAC_MDIO_CLAUSE22_PORT_REG);
else
return -ENODEV;
/* set mdio address register */
@@ -137,12 +137,12 @@ static int xgmac_mdio_write(struct mii_bus *bus, int phyaddr, int phyreg,
/* configure the port for C22
* ports 0-3 only supports C22
*/
- if (phyaddr < 4)
- writel((1 << phyaddr),
- priv->ioaddr + XGMAC_MDIO_CLAUSE22_PORT_REG);
- else
+ if (phyaddr >= 4)
return -ENODEV;
+ writel((1 << phyaddr),
+ priv->ioaddr + XGMAC_MDIO_CLAUSE22_PORT_REG);
+
/* set mdio address register */
reg_val = (phyaddr << 16) | (phyreg & 0x1F);
writel(reg_val, priv->ioaddr + mii_addr);
@@ -173,8 +173,7 @@ int xgmac_mdio_register(struct net_device *ndev)
/* allocate the new mdio bus */
mdio_bus = mdiobus_alloc();
if (!mdio_bus) {
- pr_err("%s : mii bus allocation failed\n",
- __func__);
+ pr_err("%s : mii bus allocation failed\n", __func__);
return -ENOMEM;
}
diff --git a/drivers/net/ethernet/samsung/xgmac_mtl.c b/drivers/net/ethernet/samsung/xgmac_mtl.c
index 85e0132..82d275b 100644
--- a/drivers/net/ethernet/samsung/xgmac_mtl.c
+++ b/drivers/net/ethernet/samsung/xgmac_mtl.c
@@ -208,9 +208,9 @@ static void xgmac_set_tx_mtl_mode(void __iomem *ioaddr, int queue_num,
reg_val = readl(ioaddr + XGMAC_MTL_TXQ_OPMODE_REG(queue_num));
/* TX specific MTL mode settings */
- if (tx_mode == XGMAC_MTL_SFMODE)
+ if (tx_mode == XGMAC_MTL_SFMODE) {
reg_val |= XGMAC_MTL_SFMODE;
- else {
+ } else {
/* set the TTC values */
if (tx_mode <= 64)
reg_val |= MTL_CONTROL_TTC_64;
--
1.8.1.2.459.gbcd45b4.dirty
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/5] samsung: xgmac: Fix pr_<level> uses
2014-03-05 19:20 [PATCH 0/5] samsung: xgmac: Joe Perches
2014-03-05 19:20 ` [PATCH 1/5] samsung: xgmac: Neatening Joe Perches
@ 2014-03-05 19:20 ` Joe Perches
2014-03-05 19:20 ` [PATCH 3/5] samsung: xgmac: Use more current logging style Joe Perches
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Joe Perches @ 2014-03-05 19:20 UTC (permalink / raw)
To: Byungho An
Cc: linux-samsung-soc, davem, siva.kallam, vipul.pandya, ks.giri,
ilho215.lee, netdev
Use pr_fmt to prefix messages consistently with "samsung_xgmac: ".
Add missing newlines.
Use print_hex_dump_debug.
Alignment neatening of pr_<level> uses.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/ethernet/samsung/xgmac_core.c | 8 ++--
drivers/net/ethernet/samsung/xgmac_desc.c | 11 +++--
drivers/net/ethernet/samsung/xgmac_ethtool.c | 5 +-
drivers/net/ethernet/samsung/xgmac_main.c | 69 +++++++++++++--------------
drivers/net/ethernet/samsung/xgmac_mdio.c | 5 +-
drivers/net/ethernet/samsung/xgmac_mtl.c | 7 ++-
drivers/net/ethernet/samsung/xgmac_platform.c | 15 +++---
7 files changed, 67 insertions(+), 53 deletions(-)
diff --git a/drivers/net/ethernet/samsung/xgmac_core.c b/drivers/net/ethernet/samsung/xgmac_core.c
index 8fa2241..c5afba4 100644
--- a/drivers/net/ethernet/samsung/xgmac_core.c
+++ b/drivers/net/ethernet/samsung/xgmac_core.c
@@ -11,6 +11,8 @@
* published by the Free Software Foundation.
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/export.h>
#include <linux/io.h>
#include <linux/netdevice.h>
@@ -92,15 +94,15 @@ static void xgmac_core_pmt(void __iomem *ioaddr, unsigned long mode)
unsigned int pmt = 0;
if (mode & WAKE_MAGIC) {
- pr_debug("GMAC: WOL Magic frame\n");
+ pr_debug("WOL Magic frame\n");
pmt |= PMT_MGPKT_EN;
}
if (mode & WAKE_UCAST) {
- pr_debug("GMAC: WOL on global unicast\n");
+ pr_debug("WOL on global unicast\n");
pmt |= PMT_GUCAST_EN;
}
if (mode & (WAKE_MCAST | WAKE_BCAST)) {
- pr_debug("GMAC: WOL on any other packet\n");
+ pr_debug("WOL on any other packet\n");
pmt |= PMT_RWKPKT_EN;
}
diff --git a/drivers/net/ethernet/samsung/xgmac_desc.c b/drivers/net/ethernet/samsung/xgmac_desc.c
index ddf3e94..ef25efd 100644
--- a/drivers/net/ethernet/samsung/xgmac_desc.c
+++ b/drivers/net/ethernet/samsung/xgmac_desc.c
@@ -9,6 +9,9 @@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/bitops.h>
#include <linux/export.h>
#include <linux/io.h>
@@ -287,7 +290,7 @@ static int xgmac_rx_wbstatus(struct xgmac_rx_norm_desc *p,
x->overflow_error++;
break;
default:
- pr_err("\tInvalid Error type\n");
+ pr_err("Invalid Error type\n");
break;
}
} else {
@@ -332,7 +335,7 @@ static int xgmac_rx_wbstatus(struct xgmac_rx_norm_desc *p,
x->dvlan_ocvlan_icvlan_pkt++;
break;
default:
- pr_err("\tInvalid L2 Packet type\n");
+ pr_err("Invalid L2 Packet type\n");
break;
}
}
@@ -367,7 +370,7 @@ static int xgmac_rx_wbstatus(struct xgmac_rx_norm_desc *p,
x->ip6_unknown_pkt++;
break;
default:
- pr_err("\tInvalid L3/L4 Packet type\n");
+ pr_err("Invalid L3/L4 Packet type\n");
break;
}
@@ -446,7 +449,7 @@ static void xgmac_rx_ctxt_wbstatus(struct xgmac_rx_ctxt_desc *p,
static int xgmac_get_rx_ctxt_tstamp_status(struct xgmac_rx_ctxt_desc *p)
{
if ((p->tstamp_hi == 0xffffffff) && (p->tstamp_lo == 0xffffffff)) {
- pr_err("\tTime stamp corrupted\n");
+ pr_err("Time stamp corrupted\n");
return 0;
}
diff --git a/drivers/net/ethernet/samsung/xgmac_ethtool.c b/drivers/net/ethernet/samsung/xgmac_ethtool.c
index 3f0698a..576b23e 100644
--- a/drivers/net/ethernet/samsung/xgmac_ethtool.c
+++ b/drivers/net/ethernet/samsung/xgmac_ethtool.c
@@ -9,6 +9,9 @@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/clk.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
@@ -200,7 +203,7 @@ static int xgmac_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
return -EOPNOTSUPP;
if (wol->wolopts) {
- pr_info("xgmac: wakeup enable\n");
+ pr_info("wakeup enable\n");
device_set_wakeup_enable(priv->device, true);
enable_irq_wake(priv->wol_irq);
} else {
diff --git a/drivers/net/ethernet/samsung/xgmac_main.c b/drivers/net/ethernet/samsung/xgmac_main.c
index 05853d2..a212abf 100644
--- a/drivers/net/ethernet/samsung/xgmac_main.c
+++ b/drivers/net/ethernet/samsung/xgmac_main.c
@@ -9,6 +9,9 @@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/clk.h>
#include <linux/crc32.h>
#include <linux/dma-mapping.h>
@@ -166,7 +169,7 @@ bool xgmac_eee_init(struct xgmac_priv_data * const priv)
XGMAC_DEFAULT_LPI_TIMER,
priv->tx_lpi_timer);
- pr_info("xgmac: Energy-Efficient Ethernet initialized\n");
+ pr_info("Energy-Efficient Ethernet initialized\n");
ret = true;
}
@@ -218,14 +221,9 @@ static void xgmac_clk_csr_set(struct xgmac_priv_data *priv)
static void print_pkt(unsigned char *buf, int len)
{
- int j;
- pr_debug("len = %d byte, buf addr: 0x%p", len, buf);
- for (j = 0; j < len; j++) {
- if ((j % 16) == 0)
- pr_debug("\n %03x:", j);
- pr_debug(" %02x", buf[j]);
- }
- pr_debug("\n");
+ pr_debug("len = %d byte, buf addr: 0x%p\n", len, buf);
+ print_hex_dump_debug(KBUILD_MODNAME ": ", DUMP_PREFIX_OFFSET, 16, 1,
+ buf, len, true);
}
/* minimum number of free TX descriptors required to wake up TX process */
@@ -325,7 +323,7 @@ static int xgmac_init_phy(struct net_device *ndev)
snprintf(phy_id_fmt, MII_BUS_ID_SIZE + 3, PHY_ID_FMT, bus_id,
priv->plat->phy_addr);
- pr_debug("xgmac_init_phy: trying to attach to %s\n", phy_id_fmt);
+ pr_debug("%s: trying to attach to %s\n", __func__, phy_id_fmt);
phydev = phy_connect(ndev, phy_id_fmt, &xgmac_adjust_link, phy_iface);
@@ -344,8 +342,8 @@ static int xgmac_init_phy(struct net_device *ndev)
return -ENODEV;
}
- pr_debug("xgmac_init_phy: %s: attached to PHY (UID 0x%x) Link = %d\n",
- ndev->name, phydev->phy_id, phydev->link);
+ pr_debug("%s: %s: attached to PHY (UID 0x%x) Link = %d\n",
+ __func__, ndev->name, phydev->phy_id, phydev->link);
/* save phy device in private structure */
priv->phydev = phydev;
@@ -506,7 +504,7 @@ static int init_rx_ring(struct net_device *dev, u8 queue_no,
/* RX ring is not allcoated */
if (rx_ring == NULL) {
- pr_err("No memory for RX queue of XGMAC\n");
+ pr_err("No memory for RX queue\n");
goto error;
} else {
/* assign queue number */
@@ -518,7 +516,7 @@ static int init_rx_ring(struct net_device *dev, u8 queue_no,
&rx_ring->dma_rx_phy, GFP_KERNEL);
if (rx_ring->dma_rx == NULL) {
- pr_err("No memory for RX desc of XGMAC\n");
+ pr_err("No memory for RX desc\n");
goto error;
}
@@ -527,7 +525,7 @@ static int init_rx_ring(struct net_device *dev, u8 queue_no,
sizeof(dma_addr_t), GFP_KERNEL);
if (rx_ring->rx_skbuff_dma == NULL) {
- pr_err("No memory for RX skbuffs DMA of XGMAC\n");
+ pr_err("No memory for RX skbuffs DMA\n");
goto dmamem_err;
}
@@ -535,7 +533,7 @@ static int init_rx_ring(struct net_device *dev, u8 queue_no,
sizeof(struct sk_buff *), GFP_KERNEL);
if (rx_ring->rx_skbuff == NULL) {
- pr_err("No memory for RX skbuffs of XGMAC\n");
+ pr_err("No memory for RX skbuffs\n");
goto rxbuff_err;
}
@@ -794,8 +792,8 @@ static void xgmac_tx_queue_clean(struct xgmac_tx_queue *tqueue)
break;
if (netif_msg_tx_done(priv))
- pr_debug("%s: curr %d, dirty %d\n", __func__,
- tqueue->cur_tx, tqueue->dirty_tx);
+ pr_debug("%s: curr %d, dirty %d\n",
+ __func__, tqueue->cur_tx, tqueue->dirty_tx);
if (likely(tqueue->tx_skbuff_dma[entry])) {
dma_unmap_single(priv->device,
@@ -1117,8 +1115,7 @@ static int xgmac_open(struct net_device *dev)
/* Init the phy */
ret = xgmac_init_phy(dev);
if (ret) {
- pr_err("%s: Cannot attach to PHY (error: %d)\n",
- __func__, ret);
+ pr_err("%s: Cannot attach to PHY (error: %d)\n", __func__, ret);
goto phy_error;
}
@@ -1401,8 +1398,8 @@ static netdev_tx_t xgmac_xmit(struct sk_buff *skb, struct net_device *dev)
tx_desc->tdes01 = dma_map_single(priv->device,
skb->data, no_pagedlen, DMA_TO_DEVICE);
if (dma_mapping_error(priv->device, tx_desc->tdes01))
- pr_err("%s: TX dma mapping failed!!\n"
- , __func__);
+ pr_err("%s: TX dma mapping failed!!\n",
+ __func__);
priv->hw->desc->prepare_tx_desc(tx_desc, 1, no_pagedlen,
no_pagedlen, cksum_flag);
@@ -1456,12 +1453,12 @@ static netdev_tx_t xgmac_xmit(struct sk_buff *skb, struct net_device *dev)
/* display current ring */
if (netif_msg_pktdata(priv)) {
- pr_debug("%s: curr %d dirty=%d entry=%d, first=%p, nfrags=%d",
+ pr_debug("%s: curr %d dirty=%d entry=%d, first=%p, nfrags=%d\n",
__func__, (tqueue->cur_tx % tx_rsize),
(tqueue->dirty_tx % tx_rsize), entry,
first_desc, nr_frags);
- pr_debug(">>> xgmac: tx frame to be transmitted: ");
+ pr_debug(">>> xgmac: tx frame to be transmitted:\n");
print_pkt(skb->data, skb->len);
}
@@ -1858,8 +1855,8 @@ static int xgmac_change_mtu(struct net_device *dev, int new_mtu)
* a datagram of 68 octets without further fragmentation."
*/
if (new_mtu < MIN_MTU || (new_mtu > MAX_MTU)) {
- pr_err("%s: invalid MTU, MTU should be in between %d and %d\n"
- , dev->name, MIN_MTU, MAX_MTU);
+ pr_err("%s: invalid MTU, MTU should be in between %d and %d\n",
+ dev->name, MIN_MTU, MAX_MTU);
return -EINVAL;
}
@@ -1914,8 +1911,8 @@ static void xgmac_set_rx_mode(struct net_device *dev)
struct netdev_hw_addr *ha;
int reg = 1;
- pr_debug("%s: # mcasts %d, # unicast %d\n", __func__,
- netdev_mc_count(dev), netdev_uc_count(dev));
+ pr_debug("%s: # mcasts %d, # unicast %d\n",
+ __func__, netdev_mc_count(dev), netdev_uc_count(dev));
if (dev->flags & IFF_PROMISC) {
value = XGMAC_FRAME_FILTER_PR;
@@ -1962,7 +1959,7 @@ static void xgmac_set_rx_mode(struct net_device *dev)
#endif
writel(value, ioaddr + XGMAC_FRAME_FILTER);
- pr_debug("\tFilter: 0x%08x\n\tHash: HI 0x%08x, LO 0x%08x\n",
+ pr_debug("Filter: 0x%08x\n\tHash: HI 0x%08x, LO 0x%08x\n",
readl(ioaddr + XGMAC_FRAME_FILTER),
readl(ioaddr + XGMAC_HASH_HIGH), readl(ioaddr + XGMAC_HASH_LOW));
}
@@ -2106,13 +2103,13 @@ static int xgmac_hw_init(struct xgmac_priv_data * const priv)
/* get the H/W features */
if (!xgmac_get_hw_features(priv))
- pr_info("XGMAC Hardware features not found\n");
+ pr_info("Hardware features not found\n");
if (priv->hw_cap.tx_csum_offload)
- pr_info("XGMAC: TX Checksum offload supported\n");
+ pr_info("TX Checksum offload supported\n");
if (priv->hw_cap.rx_csum_offload)
- pr_info("XGMAC: RX Checksum offload supported\n");
+ pr_info("RX Checksum offload supported\n");
return 0;
}
@@ -2230,7 +2227,7 @@ struct xgmac_priv_data *xgmac_dvr_probe(struct device *device,
/* Rx Watchdog is available, enable depend on platform data */
if (!priv->plat->riwt_off) {
priv->use_riwt = 1;
- pr_info(" Enable RX Mitigation via HW Watchdog Timer\n");
+ pr_info("Enable RX Mitigation via HW Watchdog Timer\n");
}
netif_napi_add(ndev, &priv->napi, xgmac_poll, 64);
@@ -2295,7 +2292,7 @@ int xgmac_dvr_remove(struct net_device *ndev)
{
struct xgmac_priv_data *priv = netdev_priv(ndev);
- pr_info("%s:\n\tremoving driver", __func__);
+ pr_info("%s: removing driver\n", __func__);
priv->hw->dma->stop_rx(priv->ioaddr, XGMAC_RX_QUEUES);
priv->hw->dma->stop_tx(priv->ioaddr, XGMAC_TX_QUEUES);
@@ -2384,7 +2381,7 @@ static int __init xgmac_init(void)
goto err;
return 0;
err:
- pr_err("xgmac: driver registration failed\n");
+ pr_err("driver registration failed\n");
return ret;
}
@@ -2412,7 +2409,7 @@ static int __init xgmac_cmdline_opt(char *str)
return 0;
err:
- pr_err("%s: ERROR broken module parameter conversion", __func__);
+ pr_err("%s: ERROR broken module parameter conversion\n", __func__);
return -EINVAL;
}
diff --git a/drivers/net/ethernet/samsung/xgmac_mdio.c b/drivers/net/ethernet/samsung/xgmac_mdio.c
index 568c2fb..98cd311 100644
--- a/drivers/net/ethernet/samsung/xgmac_mdio.c
+++ b/drivers/net/ethernet/samsung/xgmac_mdio.c
@@ -9,6 +9,9 @@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/io.h>
#include <linux/mii.h>
#include <linux/netdevice.h>
@@ -173,7 +176,7 @@ int xgmac_mdio_register(struct net_device *ndev)
/* allocate the new mdio bus */
mdio_bus = mdiobus_alloc();
if (!mdio_bus) {
- pr_err("%s : mii bus allocation failed\n", __func__);
+ pr_err("%s: mii bus allocation failed\n", __func__);
return -ENOMEM;
}
diff --git a/drivers/net/ethernet/samsung/xgmac_mtl.c b/drivers/net/ethernet/samsung/xgmac_mtl.c
index 82d275b..2edad0f 100644
--- a/drivers/net/ethernet/samsung/xgmac_mtl.c
+++ b/drivers/net/ethernet/samsung/xgmac_mtl.c
@@ -9,6 +9,9 @@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/io.h>
#include <linux/errno.h>
#include <linux/export.h>
@@ -172,7 +175,7 @@ static int xgmac_mtl_flush_txqueue(void __iomem *ioaddr, int queue_num)
while ((reg_val &
(XGMAC_MTL_TXQ_EMPTY_STAT | XGMAC_MTL_TXQ_WRITE_STAT))) {
if (time_after(jiffies, timeout)) {
- pr_err("cannot flush tx queue - timeout");
+ pr_err("cannot flush tx queue - timeout\n");
return -ETIMEDOUT;
}
reg_val = readl(ioaddr + XGMAC_MTL_TXQ_OPMODE_REG(queue_num));
@@ -192,7 +195,7 @@ static int xgmac_mtl_readout_rxqueue(void __iomem *ioaddr, int queue_num)
while ((reg_val &
(XGMAC_MTL_TXQ_EMPTY_STAT | XGMAC_MTL_TXQ_WRITE_STAT))) {
if (time_after(jiffies, timeout)) {
- pr_err("cannot flush tx queue - timeout");
+ pr_err("cannot flush tx queue - timeout\n");
return -ETIMEDOUT;
}
reg_val = readl(ioaddr + XGMAC_MTL_TXQ_OPMODE_REG(queue_num));
diff --git a/drivers/net/ethernet/samsung/xgmac_platform.c b/drivers/net/ethernet/samsung/xgmac_platform.c
index d0cf6cf..f6b3d20 100644
--- a/drivers/net/ethernet/samsung/xgmac_platform.c
+++ b/drivers/net/ethernet/samsung/xgmac_platform.c
@@ -9,6 +9,9 @@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/etherdevice.h>
#include <linux/io.h>
#include <linux/module.h>
@@ -69,7 +72,7 @@ static int xgmac_probe_config_dt(struct platform_device *pdev,
"samsung,force_thresh_dma_mode");
if (plat->force_thresh_dma_mode) {
plat->force_sf_dma_mode = 0;
- pr_warn("force_sf_dma_mode is ignored as force_thresh_dma_mode is set.");
+ pr_warn("force_sf_dma_mode is ignored as force_thresh_dma_mode is set\n");
}
return 0;
@@ -119,20 +122,20 @@ static int xgmac_platform_probe(struct platform_device *pdev)
sizeof(struct xgmac_plat_data),
GFP_KERNEL);
if (!plat_dat) {
- pr_err("%s: ERROR: no memory", __func__);
+ pr_err("%s: ERROR: no memory\n", __func__);
return -ENOMEM;
}
ret = xgmac_probe_config_dt(pdev, plat_dat, &mac);
if (ret) {
- pr_err("%s: main dt probe failed", __func__);
+ pr_err("%s: main dt probe failed\n", __func__);
return ret;
}
}
priv = xgmac_dvr_probe(&(pdev->dev), plat_dat, addr);
if (!priv) {
- pr_err("%s: main driver probe failed", __func__);
+ pr_err("%s: main driver probe failed\n", __func__);
return -ENODEV;
}
@@ -176,7 +179,7 @@ static int xgmac_platform_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, priv->dev);
- pr_debug("XGMAC platform driver registration completed");
+ pr_debug("platform driver registration completed\n");
return 0;
}
@@ -261,7 +264,7 @@ int xgmac_register_platform(void)
err = platform_driver_register(&xgmac_platform_driver);
if (err)
- pr_err("xgmac: failed to register the platform driver\n");
+ pr_err("failed to register the platform driver\n");
return err;
}
--
1.8.1.2.459.gbcd45b4.dirty
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/5] samsung: xgmac: Use more current logging style
2014-03-05 19:20 [PATCH 0/5] samsung: xgmac: Joe Perches
2014-03-05 19:20 ` [PATCH 1/5] samsung: xgmac: Neatening Joe Perches
2014-03-05 19:20 ` [PATCH 2/5] samsung: xgmac: Fix pr_<level> uses Joe Perches
@ 2014-03-05 19:20 ` Joe Perches
2014-03-05 19:20 ` [PATCH 4/5] samsung: xgmac: Neaten comments Joe Perches
2014-03-05 19:20 ` [PATCH 5/5] samsung: xgmac: Mostly whitespace neatening Joe Perches
4 siblings, 0 replies; 6+ messages in thread
From: Joe Perches @ 2014-03-05 19:20 UTC (permalink / raw)
To: Byungho An
Cc: linux-samsung-soc, davem, siva.kallam, vipul.pandya, ks.giri,
ilho215.lee, netdev
Use netdev_<level> and netif_<level> where appropriate.
Remove else and unnecessary indentation around if goto else.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/ethernet/samsung/xgmac_ethtool.c | 2 +-
drivers/net/ethernet/samsung/xgmac_main.c | 185 ++++++++++++--------------
drivers/net/ethernet/samsung/xgmac_mdio.c | 13 +-
drivers/net/ethernet/samsung/xgmac_platform.c | 4 +-
4 files changed, 95 insertions(+), 109 deletions(-)
diff --git a/drivers/net/ethernet/samsung/xgmac_ethtool.c b/drivers/net/ethernet/samsung/xgmac_ethtool.c
index 576b23e..378f6f1 100644
--- a/drivers/net/ethernet/samsung/xgmac_ethtool.c
+++ b/drivers/net/ethernet/samsung/xgmac_ethtool.c
@@ -203,7 +203,7 @@ static int xgmac_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
return -EOPNOTSUPP;
if (wol->wolopts) {
- pr_info("wakeup enable\n");
+ netdev_info(dev, "wakeup enable\n");
device_set_wakeup_enable(priv->device, true);
enable_irq_wake(priv->wol_irq);
} else {
diff --git a/drivers/net/ethernet/samsung/xgmac_main.c b/drivers/net/ethernet/samsung/xgmac_main.c
index a212abf..f642c99 100644
--- a/drivers/net/ethernet/samsung/xgmac_main.c
+++ b/drivers/net/ethernet/samsung/xgmac_main.c
@@ -267,9 +267,9 @@ static void xgmac_adjust_link(struct net_device *dev)
speed = XGMAC_SPEED_1G;
break;
default:
- if (netif_msg_link(priv))
- pr_err("%s: Speed (%d) not supported\n",
- dev->name, phydev->speed);
+ netif_err(priv, link, dev,
+ "Speed (%d) not supported\n",
+ phydev->speed);
}
priv->speed = phydev->speed;
@@ -323,12 +323,12 @@ static int xgmac_init_phy(struct net_device *ndev)
snprintf(phy_id_fmt, MII_BUS_ID_SIZE + 3, PHY_ID_FMT, bus_id,
priv->plat->phy_addr);
- pr_debug("%s: trying to attach to %s\n", __func__, phy_id_fmt);
+ netdev_dbg(ndev, "%s: trying to attach to %s\n", __func__, phy_id_fmt);
phydev = phy_connect(ndev, phy_id_fmt, &xgmac_adjust_link, phy_iface);
if (IS_ERR(phydev)) {
- pr_err("%s: Could not attach to PHY\n", ndev->name);
+ netdev_err(ndev, "Could not attach to PHY\n");
return PTR_ERR(phydev);
}
@@ -342,8 +342,8 @@ static int xgmac_init_phy(struct net_device *ndev)
return -ENODEV;
}
- pr_debug("%s: %s: attached to PHY (UID 0x%x) Link = %d\n",
- __func__, ndev->name, phydev->phy_id, phydev->link);
+ netdev_dbg(ndev, "%s: attached to PHY (UID 0x%x) Link = %d\n",
+ __func__, phydev->phy_id, phydev->link);
/* save phy device in private structure */
priv->phydev = phydev;
@@ -387,7 +387,7 @@ static int xgmac_init_rx_buffers(struct net_device *dev,
skb = __netdev_alloc_skb(dev, dma_buf_sz, GFP_KERNEL);
if (!skb) {
- pr_err("%s: Rx init fails; skb is NULL\n", __func__);
+ netdev_err(dev, "%s: Rx init fails; skb is NULL\n", __func__);
return -ENOMEM;
}
skb_reserve(skb, NET_IP_ALIGN);
@@ -397,9 +397,9 @@ static int xgmac_init_rx_buffers(struct net_device *dev,
dma_buf_sz, DMA_FROM_DEVICE);
if (dma_mapping_error(priv->device, rx_ring->rx_skbuff_dma[i])) {
- pr_err("%s: DMA mapping error\n", __func__);
- dev_kfree_skb_any(skb);
- return -EINVAL;
+ netdev_err(dev, "%s: DMA mapping error\n", __func__);
+ dev_kfree_skb_any(skb);
+ return -EINVAL;
}
p->rdes23.rx_rd_des23.buf2_addr = rx_ring->rx_skbuff_dma[i];
@@ -499,60 +499,51 @@ static int init_rx_ring(struct net_device *dev, u8 queue_no,
/* Set the max buffer size according to the MTU. */
bfsize = ALIGN(dev->mtu + ETH_HLEN + ETH_FCS_LEN + NET_IP_ALIGN, 8);
- if (netif_msg_probe(priv))
- pr_debug("%s: bfsize %d\n", __func__, bfsize);
+ netif_dbg(priv, probe, dev, "%s: bfsize %d\n", __func__, bfsize);
/* RX ring is not allcoated */
if (rx_ring == NULL) {
- pr_err("No memory for RX queue\n");
+ netdev_err(dev, "No memory for RX queue\n");
goto error;
- } else {
- /* assign queue number */
- rx_ring->queue_no = queue_no;
-
- /* allocate memory for RX descriptors */
- rx_ring->dma_rx = dma_zalloc_coherent(priv->device,
- rx_rsize * sizeof(struct xgmac_rx_norm_desc),
- &rx_ring->dma_rx_phy, GFP_KERNEL);
-
- if (rx_ring->dma_rx == NULL) {
- pr_err("No memory for RX desc\n");
- goto error;
- }
+ }
- /* allocate memory for RX skbuff array */
- rx_ring->rx_skbuff_dma = kmalloc_array(rx_rsize,
- sizeof(dma_addr_t), GFP_KERNEL);
+ /* assign queue number */
+ rx_ring->queue_no = queue_no;
- if (rx_ring->rx_skbuff_dma == NULL) {
- pr_err("No memory for RX skbuffs DMA\n");
- goto dmamem_err;
- }
+ /* allocate memory for RX descriptors */
+ rx_ring->dma_rx = dma_zalloc_coherent(priv->device,
+ rx_rsize * sizeof(struct xgmac_rx_norm_desc),
+ &rx_ring->dma_rx_phy, GFP_KERNEL);
- rx_ring->rx_skbuff = kmalloc_array(rx_rsize,
- sizeof(struct sk_buff *), GFP_KERNEL);
+ if (rx_ring->dma_rx == NULL)
+ goto error;
- if (rx_ring->rx_skbuff == NULL) {
- pr_err("No memory for RX skbuffs\n");
- goto rxbuff_err;
- }
+ /* allocate memory for RX skbuff array */
+ rx_ring->rx_skbuff_dma = kmalloc_array(rx_rsize,
+ sizeof(dma_addr_t), GFP_KERNEL);
+ if (rx_ring->rx_skbuff_dma == NULL)
+ goto dmamem_err;
- /* initalise the buffers */
- for (desc_index = 0; desc_index < rx_rsize; desc_index++) {
- struct xgmac_rx_norm_desc *p;
- p = rx_ring->dma_rx + desc_index;
- ret = xgmac_init_rx_buffers(dev, p, desc_index,
- bfsize, rx_ring);
- if (ret)
- goto err_init_rx_buffers;
- }
+ rx_ring->rx_skbuff = kmalloc_array(rx_rsize,
+ sizeof(struct sk_buff *), GFP_KERNEL);
+ if (rx_ring->rx_skbuff == NULL)
+ goto rxbuff_err;
- /* initalise counters */
- rx_ring->cur_rx = 0;
- rx_ring->dirty_rx = (unsigned int)(desc_index - rx_rsize);
- priv->dma_buf_sz = bfsize;
+ /* initialise the buffers */
+ for (desc_index = 0; desc_index < rx_rsize; desc_index++) {
+ struct xgmac_rx_norm_desc *p;
+ p = rx_ring->dma_rx + desc_index;
+ ret = xgmac_init_rx_buffers(dev, p, desc_index,
+ bfsize, rx_ring);
+ if (ret)
+ goto err_init_rx_buffers;
}
+ /* initalise counters */
+ rx_ring->cur_rx = 0;
+ rx_ring->dirty_rx = (unsigned int)(desc_index - rx_rsize);
+ priv->dma_buf_sz = bfsize;
+
return 0;
err_init_rx_buffers:
@@ -616,7 +607,7 @@ static int init_dma_desc_rings(struct net_device *netd)
ret = init_rx_ring(netd, queue_num,
priv->rxq[queue_num], rx_rsize);
if (ret) {
- pr_err("RX DMA ring allocation failed!!\n");
+ netdev_err(netd, "RX DMA ring allocation failed!!\n");
goto rxalloc_err;
}
@@ -717,10 +708,8 @@ static int rxring_mem_alloc(struct xgmac_priv_data *priv)
XGMAC_FOR_EACH_QUEUE(XGMAC_RX_QUEUES, queue_num) {
priv->rxq[queue_num] = devm_kmalloc(priv->device,
sizeof(struct xgmac_rx_queue), GFP_KERNEL);
- if (!priv->rxq[queue_num]) {
- pr_err("No memory for RX queue of XGMAC\n");
+ if (!priv->rxq[queue_num])
return -ENOMEM;
- }
}
return 0;
@@ -1115,7 +1104,8 @@ static int xgmac_open(struct net_device *dev)
/* Init the phy */
ret = xgmac_init_phy(dev);
if (ret) {
- pr_err("%s: Cannot attach to PHY (error: %d)\n", __func__, ret);
+ netdev_err(dev, "%s: Cannot attach to PHY (error: %d)\n",
+ __func__, ret);
goto phy_error;
}
@@ -1128,7 +1118,7 @@ static int xgmac_open(struct net_device *dev)
/* DMA initialization and SW reset */
ret = xgmac_init_dma_engine(priv);
if (ret < 0) {
- pr_err("%s: DMA initialization failed\n", __func__);
+ netdev_err(dev, "%s: DMA initialization failed\n", __func__);
goto init_error;
}
@@ -1145,8 +1135,8 @@ static int xgmac_open(struct net_device *dev)
ret = devm_request_irq(priv->device, dev->irq, xgmac_common_interrupt,
IRQF_SHARED, dev->name, dev);
if (unlikely(ret < 0)) {
- pr_err("%s: ERROR: allocating the IRQ %d (error: %d)\n",
- __func__, dev->irq, ret);
+ netdev_err(dev, "%s: ERROR: allocating the IRQ %d (error: %d)\n",
+ __func__, dev->irq, ret);
goto init_error;
}
@@ -1156,8 +1146,8 @@ static int xgmac_open(struct net_device *dev)
xgmac_common_interrupt, IRQF_SHARED,
dev->name, dev);
if (unlikely(ret < 0)) {
- pr_err("%s: ERROR: allocating the WoL IRQ %d (%d)\n",
- __func__, priv->wol_irq, ret);
+ netdev_err(dev, "%s: ERROR: allocating the WoL IRQ %d (%d)\n",
+ __func__, priv->wol_irq, ret);
goto init_error;
}
}
@@ -1170,8 +1160,8 @@ static int xgmac_open(struct net_device *dev)
xgmac_common_interrupt,
IRQF_SHARED, dev->name, dev);
if (unlikely(ret < 0)) {
- pr_err("%s: ERROR: allocating the LPI IRQ %d (%d)\n",
- __func__, priv->lpi_irq, ret);
+ netdev_err(dev, "%s: ERROR: allocating the LPI IRQ %d (%d)\n",
+ __func__, priv->lpi_irq, ret);
goto init_error;
}
}
@@ -1183,8 +1173,8 @@ static int xgmac_open(struct net_device *dev)
xgmac_tx_interrupt, 0,
dev->name, priv->txq[queue_num]);
if (unlikely(ret < 0)) {
- pr_err("%s: ERROR: allocating TX IRQ %d (error: %d)\n",
- __func__, dev->irq, ret);
+ netdev_err(dev, "%s: ERROR: allocating TX IRQ %d (error: %d)\n",
+ __func__, dev->irq, ret);
goto init_error;
}
}
@@ -1196,8 +1186,8 @@ static int xgmac_open(struct net_device *dev)
xgmac_rx_interrupt, 0,
dev->name, priv->rxq[queue_num]);
if (unlikely(ret < 0)) {
- pr_err("%s: ERROR: allocating TX IRQ %d (error: %d)\n",
- __func__, dev->irq, ret);
+ netdev_err(dev, "%s: ERROR: allocating TX IRQ %d (error: %d)\n",
+ __func__, dev->irq, ret);
goto init_error;
}
}
@@ -1216,7 +1206,7 @@ static int xgmac_open(struct net_device *dev)
priv->xstats.rx_threshold = rx_tc;
/* Start the ball rolling... */
- pr_debug("%s: DMA RX/TX processes started...\n", dev->name);
+ netdev_dbg(dev, "DMA RX/TX processes started...\n");
priv->hw->dma->start_tx(priv->ioaddr, XGMAC_TX_QUEUES);
priv->hw->dma->start_rx(priv->ioaddr, XGMAC_RX_QUEUES);
@@ -1362,8 +1352,8 @@ static netdev_tx_t xgmac_xmit(struct sk_buff *skb, struct net_device *dev)
if (unlikely(xgmac_tx_avail(tqueue, tx_rsize) < nr_frags + 1)) {
if (!netif_tx_queue_stopped(dev_txq)) {
netif_tx_stop_queue(dev_txq);
- pr_err("%s: Tx Ring is full when %d queue is awake\n",
- __func__, txq_index);
+ netdev_err(dev, "%s: Tx Ring is full when %d queue is awake\n",
+ __func__, txq_index);
}
/* release the spin lock in case of BUSY */
spin_unlock(&tqueue->tx_lock);
@@ -1398,8 +1388,8 @@ static netdev_tx_t xgmac_xmit(struct sk_buff *skb, struct net_device *dev)
tx_desc->tdes01 = dma_map_single(priv->device,
skb->data, no_pagedlen, DMA_TO_DEVICE);
if (dma_mapping_error(priv->device, tx_desc->tdes01))
- pr_err("%s: TX dma mapping failed!!\n",
- __func__);
+ netdev_err(dev, "%s: TX dma mapping failed!!\n",
+ __func__);
priv->hw->desc->prepare_tx_desc(tx_desc, 1, no_pagedlen,
no_pagedlen, cksum_flag);
@@ -1453,18 +1443,18 @@ static netdev_tx_t xgmac_xmit(struct sk_buff *skb, struct net_device *dev)
/* display current ring */
if (netif_msg_pktdata(priv)) {
- pr_debug("%s: curr %d dirty=%d entry=%d, first=%p, nfrags=%d\n",
- __func__, (tqueue->cur_tx % tx_rsize),
- (tqueue->dirty_tx % tx_rsize), entry,
- first_desc, nr_frags);
+ netdev_dbg(dev, "%s: curr %d dirty=%d entry=%d, first=%p, nfrags=%d\n",
+ __func__, (tqueue->cur_tx % tx_rsize),
+ (tqueue->dirty_tx % tx_rsize), entry,
+ first_desc, nr_frags);
- pr_debug(">>> xgmac: tx frame to be transmitted:\n");
+ pr_debug(">>> tx frame to be transmitted:\n");
print_pkt(skb->data, skb->len);
}
if (unlikely(xgmac_tx_avail(tqueue, tx_rsize) <= (MAX_SKB_FRAGS + 1))) {
- if (netif_msg_hw(priv))
- pr_debug("%s: stop transmitted packets\n", __func__);
+ netif_dbg(priv, hw, dev, "%s: stop transmitted packets\n",
+ __func__);
netif_tx_stop_queue(dev_txq);
}
@@ -1578,10 +1568,8 @@ static int xgmac_rx(struct xgmac_priv_data *priv, int limit)
skb = priv->rxq[qnum]->rx_skbuff[entry];
- if (unlikely(!skb)) {
- pr_err("%s: rx descriptor is not in consistent\n",
- priv->dev->name);
- }
+ if (unlikely(!skb))
+ netdev_err(priv->dev, "rx descriptor is not consistent\n");
prefetch(skb->data - NET_IP_ALIGN);
priv->rxq[qnum]->rx_skbuff[entry] = NULL;
@@ -1855,8 +1843,8 @@ static int xgmac_change_mtu(struct net_device *dev, int new_mtu)
* a datagram of 68 octets without further fragmentation."
*/
if (new_mtu < MIN_MTU || (new_mtu > MAX_MTU)) {
- pr_err("%s: invalid MTU, MTU should be in between %d and %d\n",
- dev->name, MIN_MTU, MAX_MTU);
+ netdev_err(dev, "invalid MTU, MTU should be in between %d and %d\n",
+ MIN_MTU, MAX_MTU);
return -EINVAL;
}
@@ -1911,8 +1899,8 @@ static void xgmac_set_rx_mode(struct net_device *dev)
struct netdev_hw_addr *ha;
int reg = 1;
- pr_debug("%s: # mcasts %d, # unicast %d\n",
- __func__, netdev_mc_count(dev), netdev_uc_count(dev));
+ netdev_dbg(dev, "%s: # mcasts %d, # unicast %d\n",
+ __func__, netdev_mc_count(dev), netdev_uc_count(dev));
if (dev->flags & IFF_PROMISC) {
value = XGMAC_FRAME_FILTER_PR;
@@ -1959,8 +1947,8 @@ static void xgmac_set_rx_mode(struct net_device *dev)
#endif
writel(value, ioaddr + XGMAC_FRAME_FILTER);
- pr_debug("Filter: 0x%08x\n\tHash: HI 0x%08x, LO 0x%08x\n",
- readl(ioaddr + XGMAC_FRAME_FILTER),
+ netdev_dbg(dev, "Filter: 0x%08x\n\tHash: HI 0x%08x, LO 0x%08x\n",
+ readl(ioaddr + XGMAC_FRAME_FILTER),
readl(ioaddr + XGMAC_HASH_HIGH), readl(ioaddr + XGMAC_HASH_LOW));
}
@@ -1982,13 +1970,13 @@ static int xgmac_config(struct net_device *dev, struct ifmap *map)
/* Don't allow changing the I/O address */
if (map->base_addr != dev->base_addr) {
- pr_warn("%s: can't change I/O address\n", dev->name);
+ netdev_warn(dev, "can't change I/O address\n");
return -EOPNOTSUPP;
}
/* Don't allow changing the IRQ */
if (map->irq != dev->irq) {
- pr_warn("%s: not change IRQ number %d\n", dev->name, dev->irq);
+ netdev_warn(dev, "not change IRQ number %d\n", dev->irq);
return -EOPNOTSUPP;
}
@@ -2098,7 +2086,7 @@ static int xgmac_hw_init(struct xgmac_priv_data * const priv)
ctrl_ids = priv->hw->mac->get_controller_version(priv->ioaddr);
priv->hw->ctrl_uid = (ctrl_ids & 0x00ff0000) >> 16;
priv->hw->ctrl_id = (ctrl_ids & 0x000000ff);
- pr_info("xgmac - user ID: 0x%x, Controller ID: 0x%x\n",
+ pr_info("user ID: 0x%x, Controller ID: 0x%x\n",
priv->hw->ctrl_uid, priv->hw->ctrl_id);
/* get the H/W features */
@@ -2242,7 +2230,8 @@ struct xgmac_priv_data *xgmac_dvr_probe(struct device *device,
priv->xgmac_clk = clk_get(priv->device, XGMAC_RESOURCE_NAME);
if (IS_ERR(priv->xgmac_clk)) {
- pr_warn("%s: warning: cannot get CSR clock\n", __func__);
+ netdev_warn(ndev, "%s: warning: cannot get CSR clock\n",
+ __func__);
goto error_clk_get;
}
@@ -2260,8 +2249,8 @@ struct xgmac_priv_data *xgmac_dvr_probe(struct device *device,
/* MDIO bus Registration */
ret = xgmac_mdio_register(ndev);
if (ret < 0) {
- pr_debug("%s: MDIO bus (id: %d) registration failed\n",
- __func__, priv->plat->bus_id);
+ netdev_dbg(ndev, "%s: MDIO bus (id: %d) registration failed\n",
+ __func__, priv->plat->bus_id);
goto error_mdio_register;
}
@@ -2292,7 +2281,7 @@ int xgmac_dvr_remove(struct net_device *ndev)
{
struct xgmac_priv_data *priv = netdev_priv(ndev);
- pr_info("%s: removing driver\n", __func__);
+ netdev_info(ndev, "%s: removing driver\n", __func__);
priv->hw->dma->stop_rx(priv->ioaddr, XGMAC_RX_QUEUES);
priv->hw->dma->stop_tx(priv->ioaddr, XGMAC_TX_QUEUES);
diff --git a/drivers/net/ethernet/samsung/xgmac_mdio.c b/drivers/net/ethernet/samsung/xgmac_mdio.c
index 98cd311..5e1e40e 100644
--- a/drivers/net/ethernet/samsung/xgmac_mdio.c
+++ b/drivers/net/ethernet/samsung/xgmac_mdio.c
@@ -176,7 +176,7 @@ int xgmac_mdio_register(struct net_device *ndev)
/* allocate the new mdio bus */
mdio_bus = mdiobus_alloc();
if (!mdio_bus) {
- pr_err("%s: mii bus allocation failed\n", __func__);
+ netdev_err(ndev, "%s: mii bus allocation failed\n", __func__);
return -ENOMEM;
}
@@ -198,7 +198,7 @@ int xgmac_mdio_register(struct net_device *ndev)
/* register with kernel subsystem */
err = mdiobus_register(mdio_bus);
if (err != 0) {
- pr_err("mdiobus register failed\n");
+ netdev_err(ndev, "mdiobus register failed\n");
goto mdiobus_err;
}
@@ -236,16 +236,15 @@ int xgmac_mdio_register(struct net_device *ndev)
irq_str = irq_num;
break;
}
- pr_info("%s: PHY ID %08x at %d IRQ %s (%s)%s\n",
- ndev->name, phy->phy_id, phy_addr,
- irq_str, dev_name(&phy->dev),
- act ? " active" : "");
+ netdev_info(ndev, "PHY ID %08x at %d IRQ %s (%s)%s\n",
+ phy->phy_id, phy_addr, irq_str,
+ dev_name(&phy->dev), act ? " active" : "");
phy_found = 1;
}
}
if (!phy_found) {
- pr_err("%s: PHY not found\n", ndev->name);
+ netdev_err(ndev, "PHY not found\n");
mdiobus_unregister(mdio_bus);
mdiobus_free(mdio_bus);
return -ENODEV;
diff --git a/drivers/net/ethernet/samsung/xgmac_platform.c b/drivers/net/ethernet/samsung/xgmac_platform.c
index f6b3d20..fb80c2c 100644
--- a/drivers/net/ethernet/samsung/xgmac_platform.c
+++ b/drivers/net/ethernet/samsung/xgmac_platform.c
@@ -121,10 +121,8 @@ static int xgmac_platform_probe(struct platform_device *pdev)
plat_dat = devm_kzalloc(&pdev->dev,
sizeof(struct xgmac_plat_data),
GFP_KERNEL);
- if (!plat_dat) {
- pr_err("%s: ERROR: no memory\n", __func__);
+ if (!plat_dat)
return -ENOMEM;
- }
ret = xgmac_probe_config_dt(pdev, plat_dat, &mac);
if (ret) {
--
1.8.1.2.459.gbcd45b4.dirty
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 4/5] samsung: xgmac: Neaten comments
2014-03-05 19:20 [PATCH 0/5] samsung: xgmac: Joe Perches
` (2 preceding siblings ...)
2014-03-05 19:20 ` [PATCH 3/5] samsung: xgmac: Use more current logging style Joe Perches
@ 2014-03-05 19:20 ` Joe Perches
2014-03-05 19:20 ` [PATCH 5/5] samsung: xgmac: Mostly whitespace neatening Joe Perches
4 siblings, 0 replies; 6+ messages in thread
From: Joe Perches @ 2014-03-05 19:20 UTC (permalink / raw)
To: Byungho An
Cc: linux-samsung-soc, davem, siva.kallam, vipul.pandya, ks.giri,
ilho215.lee, netdev
Fix a couple of typos
Fix some comments that seem to have been kernel-doc style.
Fix alignment where noticed.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/ethernet/samsung/xgmac_core.c | 1 -
drivers/net/ethernet/samsung/xgmac_desc.c | 14 +++++++-------
drivers/net/ethernet/samsung/xgmac_desc.h | 2 +-
drivers/net/ethernet/samsung/xgmac_dma.c | 3 ++-
drivers/net/ethernet/samsung/xgmac_dma.h | 2 +-
drivers/net/ethernet/samsung/xgmac_main.c | 14 ++++++++------
drivers/net/ethernet/samsung/xgmac_reg.h | 8 ++++----
7 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/drivers/net/ethernet/samsung/xgmac_core.c b/drivers/net/ethernet/samsung/xgmac_core.c
index c5afba4..40b1946 100644
--- a/drivers/net/ethernet/samsung/xgmac_core.c
+++ b/drivers/net/ethernet/samsung/xgmac_core.c
@@ -1,4 +1,3 @@
-
/* 10G controller driver for Samsung SoCs
*
* Copyright (C) 2013 Samsung Electronics Co., Ltd.
diff --git a/drivers/net/ethernet/samsung/xgmac_desc.c b/drivers/net/ethernet/samsung/xgmac_desc.c
index ef25efd..2a7fd21 100644
--- a/drivers/net/ethernet/samsung/xgmac_desc.c
+++ b/drivers/net/ethernet/samsung/xgmac_desc.c
@@ -84,7 +84,7 @@ static void xgmac_release_tx_desc(struct xgmac_tx_norm_desc *p)
/* Clear interrupt on tx frame completion. When this bit is
* set an interrupt happens as soon as the frame is transmitted
-*/
+ */
static void xgmac_clear_tx_ic(struct xgmac_tx_norm_desc *p)
{
p->tdes23.tx_rd_des23.int_on_com = 0;
@@ -158,8 +158,8 @@ static void xgmac_tx_ctxt_desc_reset_ostc(struct xgmac_tx_ctxt_desc *p)
/* Set IVLAN information */
static void xgmac_tx_ctxt_desc_set_ivlantag(struct xgmac_tx_ctxt_desc *p,
- int is_ivlanvalid, int ivlan_tag,
- int ivlan_ctl)
+ int is_ivlanvalid, int ivlan_tag,
+ int ivlan_ctl)
{
if (is_ivlanvalid) {
p->ivlan_tag_valid = is_ivlanvalid;
@@ -176,7 +176,7 @@ static int xgmac_tx_ctxt_desc_get_ivlantag(struct xgmac_tx_ctxt_desc *p)
/* Set VLAN Tag */
static void xgmac_tx_ctxt_desc_set_vlantag(struct xgmac_tx_ctxt_desc *p,
- int is_vlanvalid, int vlan_tag)
+ int is_vlanvalid, int vlan_tag)
{
if (is_vlanvalid) {
p->vltag_valid = is_vlanvalid;
@@ -214,7 +214,7 @@ static int xgmac_tx_ctxt_desc_get_cde(struct xgmac_tx_ctxt_desc *p)
/* DMA RX descriptor ring initialization */
static void xgmac_init_rx_desc(struct xgmac_rx_norm_desc *p, int disable_rx_ic,
- int mode, int end)
+ int mode, int end)
{
p->rdes23.rx_rd_des23.own_bit = 1;
if (disable_rx_ic)
@@ -413,7 +413,7 @@ static void xgmac_set_ctxt_rx_owner(struct xgmac_rx_ctxt_desc *p)
/* Return the reception status looking at Context control information */
static void xgmac_rx_ctxt_wbstatus(struct xgmac_rx_ctxt_desc *p,
- struct xgmac_extra_stats *x)
+ struct xgmac_extra_stats *x)
{
if (p->tstamp_dropped)
x->timestamp_dropped++;
@@ -445,7 +445,7 @@ static void xgmac_rx_ctxt_wbstatus(struct xgmac_rx_ctxt_desc *p,
x->rx_ptp_resv_msg_type++;
}
-/* get rx timestamp status */
+/* Get rx timestamp status */
static int xgmac_get_rx_ctxt_tstamp_status(struct xgmac_rx_ctxt_desc *p)
{
if ((p->tstamp_hi == 0xffffffff) && (p->tstamp_lo == 0xffffffff)) {
diff --git a/drivers/net/ethernet/samsung/xgmac_desc.h b/drivers/net/ethernet/samsung/xgmac_desc.h
index 028b505..8433030 100644
--- a/drivers/net/ethernet/samsung/xgmac_desc.h
+++ b/drivers/net/ethernet/samsung/xgmac_desc.h
@@ -14,7 +14,7 @@
#define XGMAC_DESC_SIZE_BYTES 16
-/* forward declatarion */
+/* forward declaration */
struct xgmac_extra_stats;
/* Transmit checksum insertion control */
diff --git a/drivers/net/ethernet/samsung/xgmac_dma.c b/drivers/net/ethernet/samsung/xgmac_dma.c
index 384866c..9a22990a 100644
--- a/drivers/net/ethernet/samsung/xgmac_dma.c
+++ b/drivers/net/ethernet/samsung/xgmac_dma.c
@@ -20,9 +20,10 @@
#include "xgmac_dma.h"
#include "xgmac_reg.h"
#include "xgmac_desc.h"
+
/* DMA core initialization */
static int xgmac_dma_init(void __iomem *ioaddr, int fix_burst,
- int burst_map, int adv_addr_mode)
+ int burst_map, int adv_addr_mode)
{
int retry_count = 10;
u32 reg_val;
diff --git a/drivers/net/ethernet/samsung/xgmac_dma.h b/drivers/net/ethernet/samsung/xgmac_dma.h
index 2e76ae0..022fd2b 100644
--- a/drivers/net/ethernet/samsung/xgmac_dma.h
+++ b/drivers/net/ethernet/samsung/xgmac_dma.h
@@ -12,7 +12,7 @@
#ifndef __XGMAC_DMA_H__
#define __XGMAC_DMA_H__
-/* forward declatarion */
+/* forward declaration */
struct xgmac_extra_stats;
#define XGMAC_DMA_BLENMAP_LSHIFT 1
diff --git a/drivers/net/ethernet/samsung/xgmac_main.c b/drivers/net/ethernet/samsung/xgmac_main.c
index f642c99..e0e339e 100644
--- a/drivers/net/ethernet/samsung/xgmac_main.c
+++ b/drivers/net/ethernet/samsung/xgmac_main.c
@@ -1880,7 +1880,8 @@ static void xgmac_set_umac_addr(void __iomem *ioaddr, unsigned char *addr,
writel(data, ioaddr + XGMAC_ADDR_LOW(reg_n));
}
-/* xgmac_set_rx_mode - entry point for setting different receive mode of
+/**
+ * xgmac_set_rx_mode - entry point for setting different receive mode of
* a device. unicast, multicast addressing
* @dev : pointer to the device structure
* Description:
@@ -1952,7 +1953,8 @@ static void xgmac_set_rx_mode(struct net_device *dev)
readl(ioaddr + XGMAC_HASH_HIGH), readl(ioaddr + XGMAC_HASH_LOW));
}
-/* xgmac_config - entry point for changing configuration mode passed on by
+/**
+ * xgmac_config - entry point for changing configuration mode passed on by
* ifconfig
* @dev : pointer to the device structure
* @map : pointer to the device mapping structure
@@ -1984,7 +1986,8 @@ static int xgmac_config(struct net_device *dev, struct ifmap *map)
}
#ifdef CONFIG_NET_POLL_CONTROLLER
-/* xgmac_poll_controller - entry point for polling receive by device
+/**
+ * xgmac_poll_controller - entry point for polling receive by device
* @dev : pointer to the device structure
* Description:
* This function is used by NETCONSOLE and other diagnostic tools
@@ -2048,7 +2051,7 @@ static const struct net_device_ops xgmac_netdev_ops = {
.ndo_set_mac_address = eth_mac_addr,
};
-/* get the hardware ops */
+/* Get the hardware ops */
void xgmac_get_ops(struct xgmac_ops * const ops_ptr)
{
ops_ptr->mac = xgmac_get_core_ops();
@@ -2359,8 +2362,7 @@ int xgmac_restore(struct net_device *ndev)
}
#endif /* CONFIG_PM */
-/* Driver is configured as Platf drivers
- */
+/* Driver is configured as Platform driver */
static int __init xgmac_init(void)
{
int ret;
diff --git a/drivers/net/ethernet/samsung/xgmac_reg.h b/drivers/net/ethernet/samsung/xgmac_reg.h
index 1218f8d..b26d99b 100644
--- a/drivers/net/ethernet/samsung/xgmac_reg.h
+++ b/drivers/net/ethernet/samsung/xgmac_reg.h
@@ -195,7 +195,7 @@
#define XGMAC_CORE_RSS_ADD_REG 0x0C88
#define XGMAC_CORE_RSS_DATA_REG 0x0C8C
-/* RSS conrol register bits */
+/* RSS control register bits */
#define XGMAC_CORE_RSS_CTL_UDP4TE BIT(3)
#define XGMAC_CORE_RSS_CTL_TCP4TE BIT(2)
#define XGMAC_CORE_RSS_CTL_IP2TE BIT(1)
@@ -256,7 +256,7 @@
#define XGMAC_MTL_TX_PRTYMAP0_REG (XGMAC_MTL_BASE_REG + 0x0040)
#define XGMAC_MTL_TX_PRTYMAP1_REG (XGMAC_MTL_BASE_REG + 0x0044)
-/* TC/Queue registers , qnum=0-15 */
+/* TC/Queue registers, qnum=0-15 */
#define XGMAC_MTL_TC_TXBASE_REG (XGMAC_MTL_BASE_REG + 0x0100)
#define XGMAC_MTL_TXQ_OPMODE_REG(qnum) \
(XGMAC_MTL_TC_TXBASE_REG + (qnum * 0x80) + 0x00)
@@ -404,10 +404,10 @@ enum vlan_tag_ctl_tx {
#define XGMAC_RX_UNICAST_DETECT BIT(1)
#define XGMAC_RX_PRTYFLOW_CTL_ENABLE BIT(8)
-/* xgmac rx Q control0 register bifields */
+/* xgmac rx Q control0 register bitfields */
#define XGMAC_RX_Q_ENABLE 0x2
-/* XGMAC hardware features bit field specific */
+/* XGMAC hardware features bitfield specific */
/* Capability Register 0 */
#define XGMAC_HW_FEAT_GMII(cap) ((cap & 0x00000002) >> 1)
#define XGMAC_HW_FEAT_VLAN_HASH_FILTER(cap) ((cap & 0x00000010) >> 4)
--
1.8.1.2.459.gbcd45b4.dirty
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 5/5] samsung: xgmac: Mostly whitespace neatening
2014-03-05 19:20 [PATCH 0/5] samsung: xgmac: Joe Perches
` (3 preceding siblings ...)
2014-03-05 19:20 ` [PATCH 4/5] samsung: xgmac: Neaten comments Joe Perches
@ 2014-03-05 19:20 ` Joe Perches
4 siblings, 0 replies; 6+ messages in thread
From: Joe Perches @ 2014-03-05 19:20 UTC (permalink / raw)
To: Byungho An
Cc: linux-samsung-soc, davem, siva.kallam, vipul.pandya, ks.giri,
ilho215.lee, netdev
Alignment to parenthesis and adding parenthesis where appropriate.
Added a conversion of if (foo < x) bar ; else return baz to
if (foo >= x) return baz; and unindented.
git diff -w shows trivial changes.
Added a few > 80 column lines.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/ethernet/samsung/xgmac_common.h | 32 ++---
drivers/net/ethernet/samsung/xgmac_core.c | 19 ++-
drivers/net/ethernet/samsung/xgmac_desc.c | 10 +-
drivers/net/ethernet/samsung/xgmac_desc.h | 14 +-
drivers/net/ethernet/samsung/xgmac_dma.c | 14 +-
drivers/net/ethernet/samsung/xgmac_dma.h | 10 +-
drivers/net/ethernet/samsung/xgmac_ethtool.c | 23 ++--
drivers/net/ethernet/samsung/xgmac_main.c | 95 +++++++-------
drivers/net/ethernet/samsung/xgmac_mdio.c | 33 +++--
drivers/net/ethernet/samsung/xgmac_mtl.c | 4 +-
drivers/net/ethernet/samsung/xgmac_mtl.h | 14 +-
drivers/net/ethernet/samsung/xgmac_platform.c | 28 ++--
drivers/net/ethernet/samsung/xgmac_reg.h | 182 +++++++++++++-------------
13 files changed, 240 insertions(+), 238 deletions(-)
diff --git a/drivers/net/ethernet/samsung/xgmac_common.h b/drivers/net/ethernet/samsung/xgmac_common.h
index 4c46504..47721b6 100644
--- a/drivers/net/ethernet/samsung/xgmac_common.h
+++ b/drivers/net/ethernet/samsung/xgmac_common.h
@@ -8,7 +8,7 @@
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
-*/
+ */
#ifndef __XGMAC_COMMON_H__
#define __XGMAC_COMMON_H__
@@ -167,21 +167,21 @@ enum dma_irq_status {
handle_rx = BIT(5),
};
-#define NETIF_F_HW_VLAN_ALL (NETIF_F_HW_VLAN_CTAG_RX |\
- NETIF_F_HW_VLAN_STAG_RX |\
- NETIF_F_HW_VLAN_CTAG_TX |\
- NETIF_F_HW_VLAN_STAG_TX |\
- NETIF_F_HW_VLAN_CTAG_FILTER |\
- NETIF_F_HW_VLAN_STAG_FILTER)
+#define NETIF_F_HW_VLAN_ALL (NETIF_F_HW_VLAN_CTAG_RX | \
+ NETIF_F_HW_VLAN_STAG_RX | \
+ NETIF_F_HW_VLAN_CTAG_TX | \
+ NETIF_F_HW_VLAN_STAG_TX | \
+ NETIF_F_HW_VLAN_CTAG_FILTER | \
+ NETIF_F_HW_VLAN_STAG_FILTER)
/* MMC control defines */
#define XGMAC_MMC_CTRL_CNT_FRZ 0x00000008
/* XGMAC HW ADDR regs */
#define XGMAC_ADDR_HIGH(reg) (((reg > 15) ? 0x00000800 : 0x00000040) + \
- (reg * 8))
+ (reg * 8))
#define XGMAC_ADDR_LOW(reg) (((reg > 15) ? 0x00000804 : 0x00000044) + \
- (reg * 8))
+ (reg * 8))
#define XGMAC_MAX_PERFECT_ADDRESSES 32 /* Maximum unicast perfect filtering */
#define XGMAC_FRAME_FILTER 0x00000004 /* Frame Filter */
@@ -207,7 +207,7 @@ enum dma_irq_status {
#define MIN_MTU 68
#define MAX_MTU 9000
-#define XGMAC_FOR_EACH_QUEUE(max_queues, queue_num) \
+#define XGMAC_FOR_EACH_QUEUE(max_queues, queue_num) \
for (queue_num = 0; queue_num < max_queues; queue_num++)
#define DRV_VERSION "1.0.0"
@@ -331,7 +331,7 @@ struct xgmac_hwtimestamp {
int (*init_systime)(void __iomem *ioaddr, u32 sec, u32 nsec);
int (*config_addend)(void __iomem *ioaddr, u32 addend);
int (*adjust_systime)(void __iomem *ioaddr, u32 sec, u32 nsec,
- int add_sub);
+ int add_sub);
u64 (*get_systime)(void __iomem *ioaddr);
};
@@ -353,14 +353,14 @@ struct xgmac_core_ops {
void (*dump_regs)(void __iomem *ioaddr);
/* Handle extra events on specific interrupts hw dependent */
int (*host_irq_status)(void __iomem *ioaddr,
- struct xgmac_extra_stats *x);
+ struct xgmac_extra_stats *x);
/* Set power management mode (e.g. magic frame) */
void (*pmt)(void __iomem *ioaddr, unsigned long mode);
/* Set/Get Unicast MAC addresses */
void (*set_umac_addr)(void __iomem *ioaddr, unsigned char *addr,
- unsigned int reg_n);
+ unsigned int reg_n);
void (*get_umac_addr)(void __iomem *ioaddr, unsigned char *addr,
- unsigned int reg_n);
+ unsigned int reg_n);
void (*enable_rx)(void __iomem *ioaddr, bool enable);
void (*enable_tx)(void __iomem *ioaddr, bool enable);
@@ -369,7 +369,7 @@ struct xgmac_core_ops {
/* If supported then get the optional core features */
unsigned int (*get_hw_feature)(void __iomem *ioaddr,
- unsigned char feature_index);
+ unsigned char feature_index);
/* adjust XGMAC speed */
void (*set_speed)(void __iomem *ioaddr, unsigned char speed);
@@ -377,7 +377,7 @@ struct xgmac_core_ops {
void (*set_eee_mode)(void __iomem *ioaddr);
void (*reset_eee_mode)(void __iomem *ioaddr);
void (*set_eee_timer)(void __iomem *ioaddr, const int ls,
- const int tw);
+ const int tw);
void (*set_eee_pls)(void __iomem *ioaddr, const int link);
/* Enable disable checksum offload operations */
diff --git a/drivers/net/ethernet/samsung/xgmac_core.c b/drivers/net/ethernet/samsung/xgmac_core.c
index 40b1946..2a239d1 100644
--- a/drivers/net/ethernet/samsung/xgmac_core.c
+++ b/drivers/net/ethernet/samsung/xgmac_core.c
@@ -69,7 +69,7 @@ static int xgmac_get_lpi_status(void __iomem *ioaddr, const u32 irq_status)
/* Handle extra events on specific interrupts hw dependent */
static int xgmac_core_host_irq_status(void __iomem *ioaddr,
- struct xgmac_extra_stats *x)
+ struct xgmac_extra_stats *x)
{
int irq_status, status = 0;
@@ -110,26 +110,26 @@ static void xgmac_core_pmt(void __iomem *ioaddr, unsigned long mode)
/* Enable power down bit if any of the requested mode is enabled */
if (pmt) {
writel(XGMAC_RX_ENABLE, ioaddr + XGMAC_CORE_RX_CONFIG_REG);
- pmt |= PMT_PWRDWN;
+ pmt |= PMT_PWRDWN;
writel(pmt, ioaddr + XGMAC_CORE_PMT_CTL_STATUS_REG);
}
}
/* Set/Get Unicast MAC addresses */
static void xgmac_core_set_umac_addr(void __iomem *ioaddr, unsigned char *addr,
- unsigned int reg_n)
+ unsigned int reg_n)
{
u32 high_word, low_word;
high_word = (addr[5] << 8) || (addr[4]);
- low_word = (addr[3] << 24) || (addr[2] << 16) ||
- (addr[1] << 8) || (addr[0]);
+ low_word = ((addr[3] << 24) || (addr[2] << 16) ||
+ (addr[1] << 8) || (addr[0]));
writel(high_word, ioaddr + XGMAC_CORE_ADD_HIGHOFFSET(reg_n));
writel(low_word, ioaddr + XGMAC_CORE_ADD_LOWOFFSET(reg_n));
}
static void xgmac_core_get_umac_addr(void __iomem *ioaddr, unsigned char *addr,
- unsigned int reg_n)
+ unsigned int reg_n)
{
u32 high_word, low_word;
@@ -176,13 +176,12 @@ static int xgmac_get_controller_version(void __iomem *ioaddr)
/* If supported then get the optional core features */
static unsigned int xgmac_get_hw_feature(void __iomem *ioaddr,
- unsigned char feature_index)
+ unsigned char feature_index)
{
return readl(ioaddr + (XGMAC_CORE_HW_FEA_REG(feature_index)));
}
-static void xgmac_core_set_speed(void __iomem *ioaddr,
- unsigned char speed)
+static void xgmac_core_set_speed(void __iomem *ioaddr, unsigned char speed)
{
u32 tx_cfg = readl(ioaddr + XGMAC_CORE_TX_CONFIG_REG);
@@ -233,7 +232,7 @@ static void xgmac_set_eee_pls(void __iomem *ioaddr, const int link)
}
static void xgmac_set_eee_timer(void __iomem *ioaddr,
- const int ls, const int tw)
+ const int ls, const int tw)
{
int value = ((tw & 0xffff)) | ((ls & 0x7ff) << 16);
diff --git a/drivers/net/ethernet/samsung/xgmac_desc.c b/drivers/net/ethernet/samsung/xgmac_desc.c
index 2a7fd21..45e6676 100644
--- a/drivers/net/ethernet/samsung/xgmac_desc.c
+++ b/drivers/net/ethernet/samsung/xgmac_desc.c
@@ -29,8 +29,8 @@ static void xgmac_init_tx_desc(struct xgmac_tx_norm_desc *p)
}
static void xgmac_tx_desc_enable_tse(struct xgmac_tx_norm_desc *p, u8 is_tse,
- u32 total_hdr_len, u32 tcp_hdr_len,
- u32 tcp_payload_len)
+ u32 total_hdr_len, u32 tcp_hdr_len,
+ u32 tcp_payload_len)
{
p->tdes23.tx_rd_des23.tse_bit = is_tse;
p->tdes23.tx_rd_des23.buf1_size = total_hdr_len;
@@ -40,7 +40,7 @@ static void xgmac_tx_desc_enable_tse(struct xgmac_tx_norm_desc *p, u8 is_tse,
/* Assign buffer lengths for descriptor */
static void xgmac_prepare_tx_desc(struct xgmac_tx_norm_desc *p, u8 is_fd,
- int buf1_len, int pkt_len, int cksum)
+ int buf1_len, int pkt_len, int cksum)
{
p->tdes23.tx_rd_des23.first_desc = is_fd;
p->tdes23.tx_rd_des23.buf1_size = buf1_len;
@@ -49,7 +49,7 @@ static void xgmac_prepare_tx_desc(struct xgmac_tx_norm_desc *p, u8 is_fd,
if (cksum)
p->tdes23.tx_rd_des23.tx_pkt_len.cksum_pktlen.cksum_ctl =
- cic_full;
+ cic_full;
}
/* Set VLAN control information */
@@ -192,7 +192,7 @@ static int xgmac_tx_ctxt_desc_get_vlantag(struct xgmac_tx_ctxt_desc *p)
/* Set Time stamp */
static void xgmac_tx_ctxt_desc_set_tstamp(struct xgmac_tx_ctxt_desc *p,
- u8 ostc_enable, u64 tstamp)
+ u8 ostc_enable, u64 tstamp)
{
if (ostc_enable) {
p->ostc = ostc_enable;
diff --git a/drivers/net/ethernet/samsung/xgmac_desc.h b/drivers/net/ethernet/samsung/xgmac_desc.h
index 8433030..adf5a0f 100644
--- a/drivers/net/ethernet/samsung/xgmac_desc.h
+++ b/drivers/net/ethernet/samsung/xgmac_desc.h
@@ -125,7 +125,7 @@ struct xgmac_rx_norm_desc {
u32 recv_context_desc:1;
u32 own_bit:1;
} rx_wb_des23;
- } rdes23;
+ } rdes23;
};
/* Context descriptor structure */
@@ -173,7 +173,7 @@ struct xgmac_desc_ops {
/* Assign buffer lengths for descriptor */
void (*prepare_tx_desc)(struct xgmac_tx_norm_desc *p, u8 is_fd,
- int buf1_len, int pkt_len, int cksum);
+ int buf1_len, int pkt_len, int cksum);
/* Set VLAN control information */
void (*tx_vlanctl_desc)(struct xgmac_tx_norm_desc *p, int vlan_ctl);
@@ -230,22 +230,22 @@ struct xgmac_desc_ops {
/* Set IVLAN information */
void (*tx_ctxt_desc_set_ivlantag)(struct xgmac_tx_ctxt_desc *p,
- int is_ivlanvalid, int ivlan_tag,
- int ivlan_ctl);
+ int is_ivlanvalid, int ivlan_tag,
+ int ivlan_ctl);
/* Return IVLAN Tag */
int (*tx_ctxt_desc_get_ivlantag)(struct xgmac_tx_ctxt_desc *p);
/* Set VLAN Tag */
void (*tx_ctxt_desc_set_vlantag)(struct xgmac_tx_ctxt_desc *p,
- int is_vlanvalid, int vlan_tag);
+ int is_vlanvalid, int vlan_tag);
/* Return VLAN Tag */
int (*tx_ctxt_desc_get_vlantag)(struct xgmac_tx_ctxt_desc *p);
/* Set Time stamp */
void (*tx_ctxt_set_tstamp)(struct xgmac_tx_ctxt_desc *p,
- u8 ostc_enable, u64 tstamp);
+ u8 ostc_enable, u64 tstamp);
/* Close TX context descriptor */
void (*close_tx_ctxt_desc)(struct xgmac_tx_ctxt_desc *p);
@@ -255,7 +255,7 @@ struct xgmac_desc_ops {
/* DMA RX descriptor ring initialization */
void (*init_rx_desc)(struct xgmac_rx_norm_desc *p, int disable_rx_ic,
- int mode, int end);
+ int mode, int end);
/* Get own bit */
int (*get_rx_owner)(struct xgmac_rx_norm_desc *p);
diff --git a/drivers/net/ethernet/samsung/xgmac_dma.c b/drivers/net/ethernet/samsung/xgmac_dma.c
index 9a22990a..e606ea7 100644
--- a/drivers/net/ethernet/samsung/xgmac_dma.c
+++ b/drivers/net/ethernet/samsung/xgmac_dma.c
@@ -32,7 +32,7 @@ static int xgmac_dma_init(void __iomem *ioaddr, int fix_burst,
writel(XGMAC_DMA_SOFT_RESET, ioaddr + XGMAC_DMA_MODE_REG);
while (retry_count--) {
if (!(readl(ioaddr + XGMAC_DMA_MODE_REG) &
- XGMAC_DMA_SOFT_RESET))
+ XGMAC_DMA_SOFT_RESET))
break;
mdelay(10);
}
@@ -63,8 +63,8 @@ static int xgmac_dma_init(void __iomem *ioaddr, int fix_burst,
}
static void xgmac_dma_channel_init(void __iomem *ioaddr, int cha_num,
- int fix_burst, int pbl, dma_addr_t dma_tx,
- dma_addr_t dma_rx, int t_rsize, int r_rsize)
+ int fix_burst, int pbl, dma_addr_t dma_tx,
+ dma_addr_t dma_rx, int t_rsize, int r_rsize)
{
u32 reg_val;
dma_addr_t dma_addr;
@@ -205,7 +205,7 @@ static void xgmac_dma_stop_rx(void __iomem *ioaddr, int rchannels)
}
static int xgmac_tx_dma_int_status(void __iomem *ioaddr, int channel_no,
- struct xgmac_extra_stats *x)
+ struct xgmac_extra_stats *x)
{
u32 int_status = readl(ioaddr + XGMAC_DMA_CHA_STATUS_REG(channel_no));
u32 clear_val = 0;
@@ -254,7 +254,7 @@ static int xgmac_tx_dma_int_status(void __iomem *ioaddr, int channel_no,
x->tx_desc_access_err++;
clear_val |= XGMAC_DMA_INT_STATUS_TEB1;
} else {
- x->tx_buffer_access_err++;
+ x->tx_buffer_access_err++;
}
if (int_status & XGMAC_DMA_INT_STATUS_TEB2) {
@@ -277,7 +277,7 @@ static int xgmac_tx_dma_int_status(void __iomem *ioaddr, int channel_no,
}
static int xgmac_rx_dma_int_status(void __iomem *ioaddr, int channel_no,
- struct xgmac_extra_stats *x)
+ struct xgmac_extra_stats *x)
{
u32 int_status = readl(ioaddr + XGMAC_DMA_CHA_STATUS_REG(channel_no));
u32 clear_val = 0;
@@ -326,7 +326,7 @@ static int xgmac_rx_dma_int_status(void __iomem *ioaddr, int channel_no,
x->rx_desc_access_err++;
clear_val |= XGMAC_DMA_INT_STATUS_REB1;
} else {
- x->rx_buffer_access_err++;
+ x->rx_buffer_access_err++;
}
if (int_status & XGMAC_DMA_INT_STATUS_REB2) {
diff --git a/drivers/net/ethernet/samsung/xgmac_dma.h b/drivers/net/ethernet/samsung/xgmac_dma.h
index 022fd2b..64ccd91 100644
--- a/drivers/net/ethernet/samsung/xgmac_dma.h
+++ b/drivers/net/ethernet/samsung/xgmac_dma.h
@@ -23,10 +23,10 @@ struct xgmac_extra_stats;
struct xgmac_dma_ops {
/* DMA core initialization */
int (*init)(void __iomem *ioaddr, int fix_burst,
- int burst_map, int enhance_amode);
+ int burst_map, int enhance_amode);
void (*cha_init)(void __iomem *ioaddr, int cha_num, int fix_burst,
- int pbl, dma_addr_t dma_tx, dma_addr_t dma_rx,
- int t_rzie, int r_rsize);
+ int pbl, dma_addr_t dma_tx, dma_addr_t dma_rx,
+ int t_rzie, int r_rsize);
void (*enable_dma_transmission)(void __iomem *ioaddr, int dma_cnum);
void (*enable_dma_irq)(void __iomem *ioaddr, int dma_cnum);
void (*disable_dma_irq)(void __iomem *ioaddr, int dma_cnum);
@@ -37,9 +37,9 @@ struct xgmac_dma_ops {
void (*start_rx)(void __iomem *ioaddr, int rchannels);
void (*stop_rx)(void __iomem *ioaddr, int rchannels);
int (*tx_dma_int_status)(void __iomem *ioaddr, int channel_no,
- struct xgmac_extra_stats *x);
+ struct xgmac_extra_stats *x);
int (*rx_dma_int_status)(void __iomem *ioaddr, int channel_no,
- struct xgmac_extra_stats *x);
+ struct xgmac_extra_stats *x);
/* Program the HW RX Watchdog */
void (*rx_watchdog)(void __iomem *ioaddr, u32 riwt);
/* Enable TSO for each DMA channel */
diff --git a/drivers/net/ethernet/samsung/xgmac_ethtool.c b/drivers/net/ethernet/samsung/xgmac_ethtool.c
index 378f6f1..46198bf 100644
--- a/drivers/net/ethernet/samsung/xgmac_ethtool.c
+++ b/drivers/net/ethernet/samsung/xgmac_ethtool.c
@@ -30,9 +30,12 @@ struct xgmac_stats {
int stat_offset;
};
-#define XGMAC_STAT(m) \
- { #m, FIELD_SIZEOF(struct xgmac_extra_stats, m), \
- offsetof(struct xgmac_priv_data, xstats.m)}
+#define XGMAC_STAT(m) \
+{ \
+ #m, \
+ FIELD_SIZEOF(struct xgmac_extra_stats, m), \
+ offsetof(struct xgmac_priv_data, xstats.m) \
+}
static const struct xgmac_stats xgmac_gstrings_stats[] = {
/* TX/RX IRQ events */
@@ -134,7 +137,7 @@ static const struct xgmac_stats xgmac_gstrings_stats[] = {
#define XGMAC_STATS_LEN ARRAY_SIZE(xgmac_gstrings_stats)
static int xgmac_get_eee(struct net_device *dev,
- struct ethtool_eee *edata)
+ struct ethtool_eee *edata)
{
struct xgmac_priv_data *priv = netdev_priv(dev);
@@ -149,7 +152,7 @@ static int xgmac_get_eee(struct net_device *dev,
}
static int xgmac_set_eee(struct net_device *dev,
- struct ethtool_eee *edata)
+ struct ethtool_eee *edata)
{
struct xgmac_priv_data *priv = netdev_priv(dev);
@@ -217,14 +220,14 @@ static int xgmac_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
}
static void xgmac_getdrvinfo(struct net_device *dev,
- struct ethtool_drvinfo *info)
+ struct ethtool_drvinfo *info)
{
strlcpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
strlcpy(info->version, DRV_VERSION, sizeof(info->version));
}
static int xgmac_getsettings(struct net_device *dev,
- struct ethtool_cmd *cmd)
+ struct ethtool_cmd *cmd)
{
struct xgmac_priv_data *priv = netdev_priv(dev);
@@ -257,7 +260,7 @@ static void xgmac_setmsglevel(struct net_device *dev, u32 level)
}
static int xgmac_get_ts_info(struct net_device *dev,
- struct ethtool_ts_info *info)
+ struct ethtool_ts_info *info)
{
struct xgmac_priv_data *priv = netdev_priv(dev);
@@ -370,12 +373,12 @@ static void xgmac_get_ethtool_stats(struct net_device *dev,
for (i = 0; i < XGMAC_STATS_LEN; i++) {
p = (char *)priv + xgmac_gstrings_stats[i].stat_offset;
data[j++] = (xgmac_gstrings_stats[i].sizeof_stat == sizeof(u64))
- ? (*(u64 *)p) : (*(u32 *)p);
+ ? (*(u64 *)p) : (*(u32 *)p);
}
}
static void xgmac_get_channels(struct net_device *dev,
- struct ethtool_channels *channel)
+ struct ethtool_channels *channel)
{
channel->max_rx = XGMAC_MAX_RX_CHANNELS;
channel->max_tx = XGMAC_MAX_TX_CHANNELS;
diff --git a/drivers/net/ethernet/samsung/xgmac_main.c b/drivers/net/ethernet/samsung/xgmac_main.c
index e0e339e..4a2a55d 100644
--- a/drivers/net/ethernet/samsung/xgmac_main.c
+++ b/drivers/net/ethernet/samsung/xgmac_main.c
@@ -394,7 +394,7 @@ static int xgmac_init_rx_buffers(struct net_device *dev,
rx_ring->rx_skbuff[i] = skb;
rx_ring->rx_skbuff_dma[i] = dma_map_single(priv->device, skb->data,
- dma_buf_sz, DMA_FROM_DEVICE);
+ dma_buf_sz, DMA_FROM_DEVICE);
if (dma_mapping_error(priv->device, rx_ring->rx_skbuff_dma[i])) {
netdev_err(dev, "%s: DMA mapping error\n", __func__);
@@ -424,8 +424,8 @@ static int init_tx_ring(struct device *dev, u8 queue_no,
/* allocate memory for TX descriptors */
tx_ring->dma_tx = dma_zalloc_coherent(dev,
- tx_rsize * sizeof(struct xgmac_tx_norm_desc),
- &tx_ring->dma_tx_phy, GFP_KERNEL);
+ tx_rsize * sizeof(struct xgmac_tx_norm_desc),
+ &tx_ring->dma_tx_phy, GFP_KERNEL);
if (!tx_ring->dma_tx) {
dev_err(dev, "No memory for TX desc of XGMAC\n");
return -ENOMEM;
@@ -433,14 +433,14 @@ static int init_tx_ring(struct device *dev, u8 queue_no,
/* allocate memory for TX skbuff array */
tx_ring->tx_skbuff_dma = devm_kcalloc(dev, tx_rsize,
- sizeof(dma_addr_t), GFP_KERNEL);
+ sizeof(dma_addr_t), GFP_KERNEL);
if (!tx_ring->tx_skbuff_dma) {
dev_err(dev, "No memory for TX skbuffs DMA of XGMAC\n");
goto dmamem_err;
}
tx_ring->tx_skbuff = devm_kcalloc(dev, tx_rsize,
- sizeof(struct sk_buff *), GFP_KERNEL);
+ sizeof(struct sk_buff *), GFP_KERNEL);
if (!tx_ring->tx_skbuff) {
dev_err(dev, "No memory for TX skbuffs of XGMAC\n");
@@ -473,7 +473,7 @@ dmamem_err:
* Description: this function initializes the DMA RX descriptor
*/
void free_rx_ring(struct device *dev, struct xgmac_rx_queue *rx_ring,
- int rx_rsize)
+ int rx_rsize)
{
dma_free_coherent(dev, rx_rsize * sizeof(struct xgmac_rx_norm_desc),
rx_ring->dma_rx, rx_ring->dma_rx_phy);
@@ -567,7 +567,7 @@ error:
* Description: this function initializes the DMA TX descriptor
*/
void free_tx_ring(struct device *dev, struct xgmac_tx_queue *tx_ring,
- int tx_rsize)
+ int tx_rsize)
{
dma_free_coherent(dev, tx_rsize * sizeof(struct xgmac_tx_norm_desc),
tx_ring->dma_tx, tx_ring->dma_tx_phy);
@@ -690,7 +690,7 @@ static int txring_mem_alloc(struct xgmac_priv_data *priv)
XGMAC_FOR_EACH_QUEUE(XGMAC_TX_QUEUES, queue_num) {
priv->txq[queue_num] = devm_kmalloc(priv->device,
- sizeof(struct xgmac_tx_queue), GFP_KERNEL);
+ sizeof(struct xgmac_tx_queue), GFP_KERNEL);
if (!priv->txq[queue_num]) {
dev_err(priv->device,
"No memory for TX queue of XGMAC\n");
@@ -707,7 +707,7 @@ static int rxring_mem_alloc(struct xgmac_priv_data *priv)
XGMAC_FOR_EACH_QUEUE(XGMAC_RX_QUEUES, queue_num) {
priv->rxq[queue_num] = devm_kmalloc(priv->device,
- sizeof(struct xgmac_rx_queue), GFP_KERNEL);
+ sizeof(struct xgmac_rx_queue), GFP_KERNEL);
if (!priv->rxq[queue_num])
return -ENOMEM;
}
@@ -848,7 +848,7 @@ static void xgmac_restart_tx_queue(struct xgmac_priv_data *priv, int queue_num)
{
struct xgmac_tx_queue *tx_ring = priv->txq[queue_num];
struct netdev_queue *dev_txq = netdev_get_tx_queue(priv->dev,
- queue_num);
+ queue_num);
/* stop the queue */
netif_tx_stop_queue(dev_txq);
@@ -910,15 +910,15 @@ static int xgmac_get_hw_features(struct xgmac_priv_data * const priv)
features->vlan_hfilter = XGMAC_HW_FEAT_VLAN_HASH_FILTER(rval);
features->sma_mdio = XGMAC_HW_FEAT_SMA(rval);
features->pmt_remote_wake_up =
- XGMAC_HW_FEAT_PMT_TEMOTE_WOP(rval);
+ XGMAC_HW_FEAT_PMT_TEMOTE_WOP(rval);
features->pmt_magic_frame = XGMAC_HW_FEAT_PMT_MAGIC_PKT(rval);
features->rmon = XGMAC_HW_FEAT_RMON(rval);
features->arp_offload = XGMAC_HW_FEAT_ARP_OFFLOAD(rval);
features->atime_stamp = XGMAC_HW_FEAT_IEEE1500_2008(rval);
features->tx_csum_offload =
- XGMAC_HW_FEAT_TX_CSUM_OFFLOAD(rval);
+ XGMAC_HW_FEAT_TX_CSUM_OFFLOAD(rval);
features->rx_csum_offload =
- XGMAC_HW_FEAT_RX_CSUM_OFFLOAD(rval);
+ XGMAC_HW_FEAT_RX_CSUM_OFFLOAD(rval);
features->multi_macaddr = XGMAC_HW_FEAT_MACADDR_COUNT(rval);
features->tstamp_srcselect = XGMAC_HW_FEAT_TSTMAP_SRC(rval);
features->sa_vlan_insert = XGMAC_HW_FEAT_SRCADDR_VLAN(rval);
@@ -1002,7 +1002,7 @@ static int xgmac_init_dma_engine(struct xgmac_priv_data *priv)
priv->dma_tx_size, priv->dma_rx_size);
return priv->hw->dma->init(priv->ioaddr, fixed_burst,
- burst_map, adv_addr_mode);
+ burst_map, adv_addr_mode);
}
/**
@@ -1017,7 +1017,7 @@ static void xgmac_init_mtl_engine(struct xgmac_priv_data *priv)
XGMAC_FOR_EACH_QUEUE(XGMAC_TX_QUEUES, queue_num) {
priv->hw->mtl->mtl_set_txfifosize(priv->ioaddr, queue_num,
- priv->hw_cap.tx_mtl_qsize);
+ priv->hw_cap.tx_mtl_qsize);
priv->hw->mtl->mtl_enable_txqueue(priv->ioaddr, queue_num);
}
}
@@ -1133,7 +1133,7 @@ static int xgmac_open(struct net_device *dev)
/* Request the IRQ lines */
ret = devm_request_irq(priv->device, dev->irq, xgmac_common_interrupt,
- IRQF_SHARED, dev->name, dev);
+ IRQF_SHARED, dev->name, dev);
if (unlikely(ret < 0)) {
netdev_err(dev, "%s: ERROR: allocating the IRQ %d (error: %d)\n",
__func__, dev->irq, ret);
@@ -1143,8 +1143,8 @@ static int xgmac_open(struct net_device *dev)
/* Request the Wake IRQ in case of another line is used for WoL */
if (priv->wol_irq != dev->irq) {
ret = devm_request_irq(priv->device, priv->wol_irq,
- xgmac_common_interrupt, IRQF_SHARED,
- dev->name, dev);
+ xgmac_common_interrupt, IRQF_SHARED,
+ dev->name, dev);
if (unlikely(ret < 0)) {
netdev_err(dev, "%s: ERROR: allocating the WoL IRQ %d (%d)\n",
__func__, priv->wol_irq, ret);
@@ -1169,9 +1169,9 @@ static int xgmac_open(struct net_device *dev)
/* Request TX DMA irq lines */
XGMAC_FOR_EACH_QUEUE(XGMAC_TX_QUEUES, queue_num) {
ret = devm_request_irq(priv->device,
- (priv->txq[queue_num])->irq_no,
- xgmac_tx_interrupt, 0,
- dev->name, priv->txq[queue_num]);
+ (priv->txq[queue_num])->irq_no,
+ xgmac_tx_interrupt, 0,
+ dev->name, priv->txq[queue_num]);
if (unlikely(ret < 0)) {
netdev_err(dev, "%s: ERROR: allocating TX IRQ %d (error: %d)\n",
__func__, dev->irq, ret);
@@ -1182,9 +1182,9 @@ static int xgmac_open(struct net_device *dev)
/* Request RX DMA irq lines */
XGMAC_FOR_EACH_QUEUE(XGMAC_RX_QUEUES, queue_num) {
ret = devm_request_irq(priv->device,
- (priv->rxq[queue_num])->irq_no,
- xgmac_rx_interrupt, 0,
- dev->name, priv->rxq[queue_num]);
+ (priv->rxq[queue_num])->irq_no,
+ xgmac_rx_interrupt, 0,
+ dev->name, priv->rxq[queue_num]);
if (unlikely(ret < 0)) {
netdev_err(dev, "%s: ERROR: allocating TX IRQ %d (error: %d)\n",
__func__, dev->irq, ret);
@@ -1386,13 +1386,13 @@ static netdev_tx_t xgmac_xmit(struct sk_buff *skb, struct net_device *dev)
xgmac_tso_prepare(priv, first_desc, skb);
} else {
tx_desc->tdes01 = dma_map_single(priv->device,
- skb->data, no_pagedlen, DMA_TO_DEVICE);
+ skb->data, no_pagedlen, DMA_TO_DEVICE);
if (dma_mapping_error(priv->device, tx_desc->tdes01))
netdev_err(dev, "%s: TX dma mapping failed!!\n",
__func__);
priv->hw->desc->prepare_tx_desc(tx_desc, 1, no_pagedlen,
- no_pagedlen, cksum_flag);
+ no_pagedlen, cksum_flag);
}
}
@@ -1506,11 +1506,11 @@ static void xgmac_rx_refill(struct xgmac_priv_data *priv)
priv->rxq[qnum]->rx_skbuff[entry] = skb;
priv->rxq[qnum]->rx_skbuff_dma[entry] =
- dma_map_single(priv->device, skb->data, bfsize,
- DMA_FROM_DEVICE);
+ dma_map_single(priv->device, skb->data, bfsize,
+ DMA_FROM_DEVICE);
p->rdes23.rx_rd_des23.buf2_addr =
- priv->rxq[qnum]->rx_skbuff_dma[entry];
+ priv->rxq[qnum]->rx_skbuff_dma[entry];
}
/* Added memory barrier for RX descriptor modification */
@@ -1603,7 +1603,7 @@ static int xgmac_rx(struct xgmac_priv_data *priv, int limit)
static int xgmac_poll(struct napi_struct *napi, int budget)
{
struct xgmac_priv_data *priv = container_of(napi,
- struct xgmac_priv_data, napi);
+ struct xgmac_priv_data, napi);
int work_done = 0;
u8 qnum = priv->cur_rx_qnum;
@@ -1680,7 +1680,7 @@ static irqreturn_t xgmac_tx_interrupt(int irq, void *dev_id)
/* get the channel status */
status = priv->hw->dma->tx_dma_int_status(priv->ioaddr, txq->queue_no,
- &priv->xstats);
+ &priv->xstats);
/* check for normal path */
if (likely((status & handle_tx)))
napi_schedule(&priv->napi);
@@ -1716,7 +1716,7 @@ static irqreturn_t xgmac_rx_interrupt(int irq, void *dev_id)
/* get the channel status */
status = priv->hw->dma->rx_dma_int_status(priv->ioaddr, rxq->queue_no,
- &priv->xstats);
+ &priv->xstats);
if (likely((status & handle_rx) && (napi_schedule_prep(&priv->napi)))) {
priv->hw->dma->disable_dma_irq(priv->ioaddr, rxq->queue_no);
@@ -1747,7 +1747,7 @@ static irqreturn_t xgmac_rx_interrupt(int irq, void *dev_id)
* This function returns various statistical information of device.
*/
static struct rtnl_link_stats64 *xgmac_get_stats64(struct net_device *dev,
- struct rtnl_link_stats64 *stats)
+ struct rtnl_link_stats64 *stats)
{
struct xgmac_priv_data *priv = netdev_priv(dev);
void __iomem *ioaddr = priv->ioaddr;
@@ -1761,23 +1761,23 @@ static struct rtnl_link_stats64 *xgmac_get_stats64(struct net_device *dev,
stats->rx_bytes = readl(ioaddr + XGMAC_MMC_RXOCTETLO_GCNT_REG);
stats->rx_bytes |= (u64)(readl(ioaddr + XGMAC_MMC_RXOCTETHI_GCNT_REG))
- << 32;
+ << 32;
stats->rx_packets = readl(ioaddr + XGMAC_MMC_RXFRAMELO_GBCNT_REG);
stats->rx_packets |=
(u64)(readl(ioaddr + XGMAC_MMC_RXFRAMEHI_GBCNT_REG)) << 32;
stats->multicast = readl(ioaddr + XGMAC_MMC_RXMULTILO_GCNT_REG);
stats->multicast |= (u64)(readl(ioaddr + XGMAC_MMC_RXMULTIHI_GCNT_REG))
- << 32;
+ << 32;
stats->rx_crc_errors = readl(ioaddr + XGMAC_MMC_RXCRCERRLO_REG);
stats->rx_crc_errors |= (u64)(readl(ioaddr + XGMAC_MMC_RXCRCERRHI_REG))
- << 32;
+ << 32;
stats->rx_length_errors = readl(ioaddr + XGMAC_MMC_RXLENERRLO_REG);
stats->rx_length_errors |=
- (u64)(readl(ioaddr + XGMAC_MMC_RXLENERRHI_REG)) << 32;
+ (u64)(readl(ioaddr + XGMAC_MMC_RXLENERRHI_REG)) << 32;
stats->rx_missed_errors = readl(ioaddr +
- XGMAC_MMC_RXFIFOOVERFLOWLO_GBCNT_REG);
+ XGMAC_MMC_RXFIFOOVERFLOWLO_GBCNT_REG);
stats->rx_missed_errors |= (u64)(readl(ioaddr +
- XGMAC_MMC_RXFIFOOVERFLOWHI_GBCNT_REG));
+ XGMAC_MMC_RXFIFOOVERFLOWHI_GBCNT_REG));
stats->tx_bytes = readl(ioaddr + XGMAC_MMC_TXOCTETLO_GCNT_REG);
stats->tx_bytes |=
@@ -1787,12 +1787,12 @@ static struct rtnl_link_stats64 *xgmac_get_stats64(struct net_device *dev,
count |= (u64)(readl(ioaddr + XGMAC_MMC_TXFRAMEHI_GBCNT_REG)) << 32;
stats->tx_errors = readl(ioaddr + XGMAC_MMC_TXFRAMELO_GCNT_REG);
stats->tx_errors |= (u64)(readl(ioaddr + XGMAC_MMC_TXFRAMEHI_GCNT_REG))
- << 32;
+ << 32;
stats->tx_errors = count - stats->tx_errors;
stats->tx_packets = count;
stats->tx_fifo_errors = readl(ioaddr + XGMAC_MMC_TXUFLWLO_GBCNT_REG);
stats->tx_fifo_errors |= (u64)(readl(ioaddr +
- XGMAC_MMC_TXUFLWHI_GBCNT_REG));
+ XGMAC_MMC_TXUFLWHI_GBCNT_REG));
writel(0, ioaddr + XGMAC_MMC_CTL_REG);
spin_unlock(&priv->stats_lock);
@@ -1950,7 +1950,8 @@ static void xgmac_set_rx_mode(struct net_device *dev)
netdev_dbg(dev, "Filter: 0x%08x\n\tHash: HI 0x%08x, LO 0x%08x\n",
readl(ioaddr + XGMAC_FRAME_FILTER),
- readl(ioaddr + XGMAC_HASH_HIGH), readl(ioaddr + XGMAC_HASH_LOW));
+ readl(ioaddr + XGMAC_HASH_HIGH),
+ readl(ioaddr + XGMAC_HASH_LOW));
}
/**
@@ -2135,8 +2136,8 @@ static void xgmac_set_pmt_capabilities(struct xgmac_priv_data *priv)
* call the alloc_etherdev, allocate the priv structure.
*/
struct xgmac_priv_data *xgmac_dvr_probe(struct device *device,
- struct xgmac_plat_data *plat_dat,
- void __iomem *addr)
+ struct xgmac_plat_data *plat_dat,
+ void __iomem *addr)
{
int ret = 0;
struct net_device *ndev = NULL;
@@ -2144,7 +2145,7 @@ struct xgmac_priv_data *xgmac_dvr_probe(struct device *device,
u8 queue_num;
ndev = alloc_etherdev_mqs(sizeof(struct xgmac_priv_data),
- XGMAC_TX_QUEUES, XGMAC_RX_QUEUES);
+ XGMAC_TX_QUEUES, XGMAC_RX_QUEUES);
if (!ndev)
return NULL;
@@ -2187,8 +2188,8 @@ struct xgmac_priv_data *xgmac_dvr_probe(struct device *device,
ndev->netdev_ops = &xgmac_netdev_ops;
ndev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
- NETIF_F_RXCSUM | NETIF_F_TSO | NETIF_F_TSO6 |
- NETIF_F_GRO;
+ NETIF_F_RXCSUM | NETIF_F_TSO | NETIF_F_TSO6 |
+ NETIF_F_GRO;
ndev->features |= ndev->hw_features | NETIF_F_HIGHDMA;
ndev->watchdog_timeo = msecs_to_jiffies(watchdog);
diff --git a/drivers/net/ethernet/samsung/xgmac_mdio.c b/drivers/net/ethernet/samsung/xgmac_mdio.c
index 5e1e40e..6d85b65 100644
--- a/drivers/net/ethernet/samsung/xgmac_mdio.c
+++ b/drivers/net/ethernet/samsung/xgmac_mdio.c
@@ -67,30 +67,28 @@ static int xgmac_mdio_read(struct mii_bus *bus, int phyaddr, int phyreg)
if (phyreg & MII_ADDR_C45) {
devaddr = (phyreg >> 16) & 0x1F;
/* set mdio address register */
- reg_val = (phyaddr << 16) | (devaddr << 21) |
- (phyreg & 0xFFFF);
+ reg_val = (phyaddr << 16) | (devaddr << 21) | (phyreg & 0xFFFF);
writel(reg_val, priv->ioaddr + mii_addr);
/* set mdio control/data register */
- reg_val = (XGMAC_SMA_READ_CMD << 16) | XGMAC_SMA_SKIP_ADDRFRM |
- ((priv->clk_csr & 0x7) << 19) | XGMAC_MII_BUSY;
+ reg_val = ((XGMAC_SMA_READ_CMD << 16) | XGMAC_SMA_SKIP_ADDRFRM |
+ ((priv->clk_csr & 0x7) << 19) | XGMAC_MII_BUSY);
writel(reg_val, priv->ioaddr + mii_data);
} else {
/* configure the port for C22
* ports 0-3 only supports C22
*/
- if (phyaddr < 4)
- writel((1 << phyaddr),
- priv->ioaddr + XGMAC_MDIO_CLAUSE22_PORT_REG);
- else
+ if (phyaddr >= 4)
return -ENODEV;
+ writel((1 << phyaddr),
+ priv->ioaddr + XGMAC_MDIO_CLAUSE22_PORT_REG);
/* set mdio address register */
reg_val = (phyaddr << 16) | (phyreg & 0x1F);
writel(reg_val, priv->ioaddr + mii_addr);
/* set mdio control/data register */
- reg_val = (XGMAC_SMA_READ_CMD << 16) | XGMAC_SMA_SKIP_ADDRFRM |
- ((priv->clk_csr & 0x7) << 19) | XGMAC_MII_BUSY;
+ reg_val = ((XGMAC_SMA_READ_CMD << 16) | XGMAC_SMA_SKIP_ADDRFRM |
+ ((priv->clk_csr & 0x7) << 19) | XGMAC_MII_BUSY);
writel(reg_val, priv->ioaddr + mii_data);
}
@@ -111,7 +109,7 @@ static int xgmac_mdio_read(struct mii_bus *bus, int phyaddr, int phyreg)
* Description: this function is used for C45 and C22 MDIO write
*/
static int xgmac_mdio_write(struct mii_bus *bus, int phyaddr, int phyreg,
- u16 phydata)
+ u16 phydata)
{
struct net_device *ndev = bus->priv;
struct xgmac_priv_data *priv = netdev_priv(ndev);
@@ -126,13 +124,13 @@ static int xgmac_mdio_write(struct mii_bus *bus, int phyaddr, int phyreg,
if (phyreg & MII_ADDR_C45) {
devaddr = (phyreg >> 16) & 0x1F;
/* set mdio address register */
- reg_val = (phyaddr << 16) | (devaddr << 21) |
- (phyreg & 0xFFFF);
+ reg_val = (phyaddr << 16) | (devaddr << 21) | (phyreg & 0xFFFF);
writel(reg_val, priv->ioaddr + mii_addr);
/* set mdio control/data register */
- reg_val = (XGMAC_SMA_WRITE_CMD << 16) | XGMAC_SMA_SKIP_ADDRFRM |
- ((priv->clk_csr & 0x7) << 19) | XGMAC_MII_BUSY;
+ reg_val = ((XGMAC_SMA_WRITE_CMD << 16) |
+ XGMAC_SMA_SKIP_ADDRFRM |
+ ((priv->clk_csr & 0x7) << 19) | XGMAC_MII_BUSY);
reg_val |= phydata;
writel(reg_val, priv->ioaddr + mii_data);
@@ -151,8 +149,9 @@ static int xgmac_mdio_write(struct mii_bus *bus, int phyaddr, int phyreg,
writel(reg_val, priv->ioaddr + mii_addr);
/* set mdio control/data register */
- reg_val = (XGMAC_SMA_WRITE_CMD << 16) | XGMAC_SMA_SKIP_ADDRFRM |
- ((priv->clk_csr & 0x7) << 19) | XGMAC_MII_BUSY;
+ reg_val = ((XGMAC_SMA_WRITE_CMD << 16) |
+ XGMAC_SMA_SKIP_ADDRFRM |
+ ((priv->clk_csr & 0x7) << 19) | XGMAC_MII_BUSY);
reg_val |= phydata;
writel(reg_val, priv->ioaddr + mii_data);
}
diff --git a/drivers/net/ethernet/samsung/xgmac_mtl.c b/drivers/net/ethernet/samsung/xgmac_mtl.c
index 2edad0f..0c1e100 100644
--- a/drivers/net/ethernet/samsung/xgmac_mtl.c
+++ b/drivers/net/ethernet/samsung/xgmac_mtl.c
@@ -61,7 +61,7 @@ static void xgmac_mtl_dma_dm_rxqueue(void __iomem *ioaddr)
}
static void xgmac_mtl_set_txfifosize(void __iomem *ioaddr, int queue_num,
- int queue_fifo)
+ int queue_fifo)
{
u32 fifo_bits, reg_val;
/* 0 means 256 bytes */
@@ -72,7 +72,7 @@ static void xgmac_mtl_set_txfifosize(void __iomem *ioaddr, int queue_num,
}
static void xgmac_mtl_set_rxfifosize(void __iomem *ioaddr, int queue_num,
- int queue_fifo)
+ int queue_fifo)
{
u32 fifo_bits, reg_val;
/* 0 means 256 bytes */
diff --git a/drivers/net/ethernet/samsung/xgmac_mtl.h b/drivers/net/ethernet/samsung/xgmac_mtl.h
index bacd5e3..2c80753 100644
--- a/drivers/net/ethernet/samsung/xgmac_mtl.h
+++ b/drivers/net/ethernet/samsung/xgmac_mtl.h
@@ -62,31 +62,31 @@ enum flow_control_th {
struct xgmac_mtl_ops {
void (*mtl_init)(void __iomem *ioaddr, unsigned int etsalg,
- unsigned int raa);
+ unsigned int raa);
void (*mtl_set_txfifosize)(void __iomem *ioaddr, int queue_num,
- int mtl_fifo);
+ int mtl_fifo);
void (*mtl_set_rxfifosize)(void __iomem *ioaddr, int queue_num,
- int queue_fifo);
+ int queue_fifo);
void (*mtl_enable_txqueue)(void __iomem *ioaddr, int queue_num);
void (*mtl_disable_txqueue)(void __iomem *ioaddr, int queue_num);
void (*set_tx_mtl_mode)(void __iomem *ioaddr, int queue_num,
- int tx_mode);
+ int tx_mode);
void (*set_rx_mtl_mode)(void __iomem *ioaddr, int queue_num,
- int rx_mode);
+ int rx_mode);
void (*mtl_dynamic_dma_rxqueue)(void __iomem *ioaddr);
void (*mtl_fc_active)(void __iomem *ioaddr, int queue_num,
- int threshold);
+ int threshold);
void (*mtl_fc_deactive)(void __iomem *ioaddr, int queue_num,
- int threshold);
+ int threshold);
void (*mtl_fc_enable)(void __iomem *ioaddr, int queue_num);
diff --git a/drivers/net/ethernet/samsung/xgmac_platform.c b/drivers/net/ethernet/samsung/xgmac_platform.c
index fb80c2c..d56602c 100644
--- a/drivers/net/ethernet/samsung/xgmac_platform.c
+++ b/drivers/net/ethernet/samsung/xgmac_platform.c
@@ -28,8 +28,8 @@
#ifdef CONFIG_OF
static int xgmac_probe_config_dt(struct platform_device *pdev,
- struct xgmac_plat_data *plat,
- const char **mac)
+ struct xgmac_plat_data *plat,
+ const char **mac)
{
struct device_node *np = pdev->dev.of_node;
struct xgmac_dma_cfg *dma_cfg;
@@ -55,7 +55,7 @@ static int xgmac_probe_config_dt(struct platform_device *pdev,
plat->pmt = 1;
plat->force_sf_dma_mode = of_property_read_bool(np,
- "samsung,force_sf_dma_mode");
+ "samsung,force_sf_dma_mode");
dma_cfg = devm_kzalloc(&pdev->dev, sizeof(*dma_cfg), GFP_KERNEL);
if (!dma_cfg)
@@ -66,10 +66,10 @@ static int xgmac_probe_config_dt(struct platform_device *pdev,
of_property_read_u32(np, "samsung,burst-map", &dma_cfg->burst_map);
dma_cfg->fixed_burst = of_property_read_bool(np, "samsung,fixed-burst");
dma_cfg->adv_addr_mode = of_property_read_bool(np,
- "samsung,adv-addr-mode");
+ "samsung,adv-addr-mode");
plat->force_thresh_dma_mode = of_property_read_bool(np,
- "samsung,force_thresh_dma_mode");
+ "samsung,force_thresh_dma_mode");
if (plat->force_thresh_dma_mode) {
plat->force_sf_dma_mode = 0;
pr_warn("force_sf_dma_mode is ignored as force_thresh_dma_mode is set\n");
@@ -79,8 +79,8 @@ static int xgmac_probe_config_dt(struct platform_device *pdev,
}
#else
static int xgmac_probe_config_dt(struct platform_device *pdev,
- struct xgmac_plat_data *plat,
- const char **mac)
+ struct xgmac_plat_data *plat,
+ const char **mac)
{
return -ENOSYS;
}
@@ -119,8 +119,8 @@ static int xgmac_platform_probe(struct platform_device *pdev)
if (pdev->dev.of_node) {
if (!plat_dat)
plat_dat = devm_kzalloc(&pdev->dev,
- sizeof(struct xgmac_plat_data),
- GFP_KERNEL);
+ sizeof(struct xgmac_plat_data),
+ GFP_KERNEL);
if (!plat_dat)
return -ENOMEM;
@@ -249,11 +249,11 @@ struct platform_driver xgmac_platform_driver = {
.probe = xgmac_platform_probe,
.remove = xgmac_platform_remove,
.driver = {
- .name = XGMAC_RESOURCE_NAME,
- .owner = THIS_MODULE,
- .pm = &xgmac_platform_pm_ops,
- .of_match_table = of_match_ptr(xgmac_dt_ids),
- },
+ .name = XGMAC_RESOURCE_NAME,
+ .owner = THIS_MODULE,
+ .pm = &xgmac_platform_pm_ops,
+ .of_match_table = of_match_ptr(xgmac_dt_ids),
+ },
};
int xgmac_register_platform(void)
diff --git a/drivers/net/ethernet/samsung/xgmac_reg.h b/drivers/net/ethernet/samsung/xgmac_reg.h
index b26d99b..5ed738e 100644
--- a/drivers/net/ethernet/samsung/xgmac_reg.h
+++ b/drivers/net/ethernet/samsung/xgmac_reg.h
@@ -75,12 +75,12 @@
/* port specific, addr = 0-3 */
#define XGMAC_MDIO_DEV_BASE_REG 0x0230
-#define XGMAC_MDIO_PORT_DEV_REG(addr) \
- (XGMAC_MDIO_DEV_BASE_REG + (0x10 * addr) + 0x0)
-#define XGMAC_MDIO_PORT_LSTATUS_REG(addr) \
- (XGMAC_MDIO_DEV_BASE_REG + (0x10 * addr) + 0x4)
-#define XGMAC_MDIO_PORT_ALIVE_REG(addr) \
- (XGMAC_MDIO_DEV_BASE_REG + (0x10 * addr) + 0x8)
+#define XGMAC_MDIO_PORT_DEV_REG(addr) \
+ (XGMAC_MDIO_DEV_BASE_REG + (0x10 * addr) + 0x0)
+#define XGMAC_MDIO_PORT_LSTATUS_REG(addr) \
+ (XGMAC_MDIO_DEV_BASE_REG + (0x10 * addr) + 0x4)
+#define XGMAC_MDIO_PORT_ALIVE_REG(addr) \
+ (XGMAC_MDIO_DEV_BASE_REG + (0x10 * addr) + 0x8)
#define XGMAC_CORE_GPIO_CTL_REG 0x0278
#define XGMAC_CORE_GPIO_STATUS_REG 0x027C
@@ -89,10 +89,10 @@
#define XGMAC_CORE_ADD_BASE_REG 0x0300
/* addr = 0-31 */
-#define XGMAC_CORE_ADD_HIGHOFFSET(addr) \
- (XGMAC_CORE_ADD_BASE_REG + (0x8 * addr) + 0x0)
-#define XGMAC_CORE_ADD_LOWOFFSET(addr) \
- (XGMAC_CORE_ADD_BASE_REG + (0x8 * addr) + 0x4)
+#define XGMAC_CORE_ADD_HIGHOFFSET(addr) \
+ (XGMAC_CORE_ADD_BASE_REG + (0x8 * addr) + 0x0)
+#define XGMAC_CORE_ADD_LOWOFFSET(addr) \
+ (XGMAC_CORE_ADD_BASE_REG + (0x8 * addr) + 0x4)
/* XGMAC MMC registers */
#define XGMAC_MMC_CTL_REG 0x0800
@@ -229,14 +229,14 @@
#define XGMAC_CORE_PPS_BASE 0x0D80
/* addr = 0 - 3 */
-#define XGMAC_CORE_PPS_TTIME_SEC_REG(addr) \
- (XGMAC_CORE_PPS_BASE + (0x10 * addr) + 0x0)
-#define XGMAC_CORE_PPS_TTIME_NSEC_REG(addr) \
- (XGMAC_CORE_PPS_BASE + (0x10 * addr) + 0x4)
-#define XGMAC_CORE_PPS_INTERVAL_REG(addr) \
- (XGMAC_CORE_PPS_BASE + (0x10 * addr) + 0x8)
-#define XGMAC_CORE_PPS_WIDTH_REG(addr) \
- (XGMAC_CORE_PPS_BASE + (0x10 * addr) + 0xC)
+#define XGMAC_CORE_PPS_TTIME_SEC_REG(addr) \
+ (XGMAC_CORE_PPS_BASE + (0x10 * addr) + 0x0)
+#define XGMAC_CORE_PPS_TTIME_NSEC_REG(addr) \
+ (XGMAC_CORE_PPS_BASE + (0x10 * addr) + 0x4)
+#define XGMAC_CORE_PPS_INTERVAL_REG(addr) \
+ (XGMAC_CORE_PPS_BASE + (0x10 * addr) + 0x8)
+#define XGMAC_CORE_PPS_WIDTH_REG(addr) \
+ (XGMAC_CORE_PPS_BASE + (0x10 * addr) + 0xC)
#define XGMAC_CORE_PTO_CTL_REG 0x0DC0
#define XGMAC_CORE_SRCPORT_ITY0_REG 0x0DC4
#define XGMAC_CORE_SRCPORT_ITY1_REG 0x0DC8
@@ -258,39 +258,39 @@
/* TC/Queue registers, qnum=0-15 */
#define XGMAC_MTL_TC_TXBASE_REG (XGMAC_MTL_BASE_REG + 0x0100)
-#define XGMAC_MTL_TXQ_OPMODE_REG(qnum) \
- (XGMAC_MTL_TC_TXBASE_REG + (qnum * 0x80) + 0x00)
+#define XGMAC_MTL_TXQ_OPMODE_REG(qnum) \
+ (XGMAC_MTL_TC_TXBASE_REG + (qnum * 0x80) + 0x00)
#define XGMAC_MTL_SFMODE BIT(1)
#define XGMAC_MTL_FIFO_LSHIFT 16
#define XGMAC_MTL_ENABLE_QUEUE 0x00000008
#define XGMAC_MTL_TXQ_EMPTY_STAT BIT(4)
#define XGMAC_MTL_TXQ_WRITE_STAT BIT(3)
-#define XGMAC_MTL_TXQ_UNDERFLOW_REG(qnum) \
- (XGMAC_MTL_TC_TXBASE_REG + (qnum * 0x80) + 0x04)
-#define XGMAC_MTL_TXQ_DEBUG_REG(qnum) \
- (XGMAC_MTL_TC_TXBASE_REG + (qnum * 0x80) + 0x08)
-#define XGMAC_MTL_TXQ_ETSCTL_REG(qnum) \
- (XGMAC_MTL_TC_TXBASE_REG + (qnum * 0x80) + 0x10)
-#define XGMAC_MTL_TXQ_ETSSTATUS_REG(qnum) \
- (XGMAC_MTL_TC_TXBASE_REG + (qnum * 0x80) + 0x14)
-#define XGMAC_MTL_TXQ_QUANTWEIGHT_REG(qnum) \
- (XGMAC_MTL_TC_TXBASE_REG + (qnum * 0x80) + 0x18)
+#define XGMAC_MTL_TXQ_UNDERFLOW_REG(qnum) \
+ (XGMAC_MTL_TC_TXBASE_REG + (qnum * 0x80) + 0x04)
+#define XGMAC_MTL_TXQ_DEBUG_REG(qnum) \
+ (XGMAC_MTL_TC_TXBASE_REG + (qnum * 0x80) + 0x08)
+#define XGMAC_MTL_TXQ_ETSCTL_REG(qnum) \
+ (XGMAC_MTL_TC_TXBASE_REG + (qnum * 0x80) + 0x10)
+#define XGMAC_MTL_TXQ_ETSSTATUS_REG(qnum) \
+ (XGMAC_MTL_TC_TXBASE_REG + (qnum * 0x80) + 0x14)
+#define XGMAC_MTL_TXQ_QUANTWEIGHT_REG(qnum) \
+ (XGMAC_MTL_TC_TXBASE_REG + (qnum * 0x80) + 0x18)
#define XGMAC_MTL_TC_RXBASE_REG 0x1140
#define XGMAC_RX_MTL_SFMODE BIT(5)
-#define XGMAC_MTL_RXQ_OPMODE_REG(qnum) \
- (XGMAC_MTL_TC_RXBASE_REG + (qnum * 0x80) + 0x00)
-#define XGMAC_MTL_RXQ_MISPKTOVERFLOW_REG(qnum) \
- (XGMAC_MTL_TC_RXBASE_REG + (qnum * 0x80) + 0x04)
-#define XGMAC_MTL_RXQ_DEBUG_REG(qnum) \
- (XGMAC_MTL_TC_RXBASE_REG + (qnum * 0x80) + 0x08)
-#define XGMAC_MTL_RXQ_CTL_REG(qnum) \
- (XGMAC_MTL_TC_RXBASE_REG + (qnum * 0x80) + 0x0C)
-#define XGMAC_MTL_RXQ_INTENABLE_REG(qnum) \
- (XGMAC_MTL_TC_RXBASE_REG + (qnum * 0x80) + 0x30)
-#define XGMAC_MTL_RXQ_INTSTATUS_REG(qnum) \
- (XGMAC_MTL_TC_RXBASE_REG + (qnum * 0x80) + 0x34)
+#define XGMAC_MTL_RXQ_OPMODE_REG(qnum) \
+ (XGMAC_MTL_TC_RXBASE_REG + (qnum * 0x80) + 0x00)
+#define XGMAC_MTL_RXQ_MISPKTOVERFLOW_REG(qnum) \
+ (XGMAC_MTL_TC_RXBASE_REG + (qnum * 0x80) + 0x04)
+#define XGMAC_MTL_RXQ_DEBUG_REG(qnum) \
+ (XGMAC_MTL_TC_RXBASE_REG + (qnum * 0x80) + 0x08)
+#define XGMAC_MTL_RXQ_CTL_REG(qnum) \
+ (XGMAC_MTL_TC_RXBASE_REG + (qnum * 0x80) + 0x0C)
+#define XGMAC_MTL_RXQ_INTENABLE_REG(qnum) \
+ (XGMAC_MTL_TC_RXBASE_REG + (qnum * 0x80) + 0x30)
+#define XGMAC_MTL_RXQ_INTSTATUS_REG(qnum) \
+ (XGMAC_MTL_TC_RXBASE_REG + (qnum * 0x80) + 0x34)
/* XGMAC DMA Registers */
#define XGMAC_DMA_BASE_REG 0x3000
@@ -310,50 +310,50 @@
#define XGMAC_DMA_DEBUG_STATUS5_REG (XGMAC_DMA_BASE_REG + 0x0034)
/* Channel Registers, cha_num = 0-15 */
-#define XGMAC_DMA_CHA_BASE_REG \
- (XGMAC_DMA_BASE_REG + 0x0100)
-#define XGMAC_DMA_CHA_CTL_REG(cha_num) \
- (XGMAC_DMA_CHA_BASE_REG + (cha_num * 0x80) + 0x00)
+#define XGMAC_DMA_CHA_BASE_REG \
+ (XGMAC_DMA_BASE_REG + 0x0100)
+#define XGMAC_DMA_CHA_CTL_REG(cha_num) \
+ (XGMAC_DMA_CHA_BASE_REG + (cha_num * 0x80) + 0x00)
#define XGMAC_DMA_PBL_X8MODE BIT(16)
#define XGMAC_DMA_CHA_TXCTL_TSE_ENABLE BIT(12)
-#define XGMAC_DMA_CHA_TXCTL_REG(cha_num) \
- (XGMAC_DMA_CHA_BASE_REG + (cha_num * 0x80) + 0x04)
-#define XGMAC_DMA_CHA_RXCTL_REG(cha_num) \
- (XGMAC_DMA_CHA_BASE_REG + (cha_num * 0x80) + 0x08)
-#define XGMAC_DMA_CHA_TXDESC_HADD_REG(cha_num) \
- (XGMAC_DMA_CHA_BASE_REG + (cha_num * 0x80) + 0x10)
-#define XGMAC_DMA_CHA_TXDESC_LADD_REG(cha_num) \
- (XGMAC_DMA_CHA_BASE_REG + (cha_num * 0x80) + 0x14)
-#define XGMAC_DMA_CHA_RXDESC_HADD_REG(cha_num) \
- (XGMAC_DMA_CHA_BASE_REG + (cha_num * 0x80) + 0x18)
-#define XGMAC_DMA_CHA_RXDESC_LADD_REG(cha_num) \
- (XGMAC_DMA_CHA_BASE_REG + (cha_num * 0x80) + 0x1C)
-#define XGMAC_DMA_CHA_TXDESC_TAILPTR_REG(cha_num) \
- (XGMAC_DMA_CHA_BASE_REG + (cha_num * 0x80) + 0x24)
-#define XGMAC_DMA_CHA_RXDESC_TAILPTR_REG(cha_num) \
- (XGMAC_DMA_CHA_BASE_REG + (cha_num * 0x80) + 0x2C)
-#define XGMAC_DMA_CHA_TXDESC_RINGLEN_REG(cha_num) \
- (XGMAC_DMA_CHA_BASE_REG + (cha_num * 0x80) + 0x30)
-#define XGMAC_DMA_CHA_RXDESC_RINGLEN_REG(cha_num) \
- (XGMAC_DMA_CHA_BASE_REG + (cha_num * 0x80) + 0x34)
-#define XGMAC_DMA_CHA_INT_ENABLE_REG(cha_num) \
- (XGMAC_DMA_CHA_BASE_REG + (cha_num * 0x80) + 0x38)
-#define XGMAC_DMA_CHA_INT_RXWATCHTMR_REG(cha_num) \
- (XGMAC_DMA_CHA_BASE_REG + (cha_num * 0x80) + 0x3C)
-#define XGMAC_DMA_CHA_TXDESC_CURADDLO_REG(cha_num) \
- (XGMAC_DMA_CHA_BASE_REG + (cha_num * 0x80) + 0x44)
-#define XGMAC_DMA_CHA_RXDESC_CURADDLO_REG(cha_num) \
- (XGMAC_DMA_CHA_BASE_REG + (cha_num * 0x80) + 0x4C)
-#define XGMAC_DMA_CHA_CURTXBUF_ADDHI_REG(cha_num) \
- (XGMAC_DMA_CHA_BASE_REG + (cha_num * 0x80) + 0x50)
-#define XGMAC_DMA_CHA_CURTXBUF_ADDLO_REG(cha_num) \
- (XGMAC_DMA_CHA_BASE_REG + (cha_num * 0x80) + 0x54)
-#define XGMAC_DMA_CHA_CURRXBUF_ADDHI_REG(cha_num) \
- (XGMAC_DMA_CHA_BASE_REG + (cha_num * 0x80) + 0x58)
-#define XGMAC_DMA_CHA_CURRXBUF_ADDLO_REG(cha_num) \
- (XGMAC_DMA_CHA_BASE_REG + (cha_num * 0x80) + 0x5C)
-#define XGMAC_DMA_CHA_STATUS_REG(cha_num) \
- (XGMAC_DMA_CHA_BASE_REG + (cha_num * 0x80) + 0x60)
+#define XGMAC_DMA_CHA_TXCTL_REG(cha_num) \
+ (XGMAC_DMA_CHA_BASE_REG + (cha_num * 0x80) + 0x04)
+#define XGMAC_DMA_CHA_RXCTL_REG(cha_num) \
+ (XGMAC_DMA_CHA_BASE_REG + (cha_num * 0x80) + 0x08)
+#define XGMAC_DMA_CHA_TXDESC_HADD_REG(cha_num) \
+ (XGMAC_DMA_CHA_BASE_REG + (cha_num * 0x80) + 0x10)
+#define XGMAC_DMA_CHA_TXDESC_LADD_REG(cha_num) \
+ (XGMAC_DMA_CHA_BASE_REG + (cha_num * 0x80) + 0x14)
+#define XGMAC_DMA_CHA_RXDESC_HADD_REG(cha_num) \
+ (XGMAC_DMA_CHA_BASE_REG + (cha_num * 0x80) + 0x18)
+#define XGMAC_DMA_CHA_RXDESC_LADD_REG(cha_num) \
+ (XGMAC_DMA_CHA_BASE_REG + (cha_num * 0x80) + 0x1C)
+#define XGMAC_DMA_CHA_TXDESC_TAILPTR_REG(cha_num) \
+ (XGMAC_DMA_CHA_BASE_REG + (cha_num * 0x80) + 0x24)
+#define XGMAC_DMA_CHA_RXDESC_TAILPTR_REG(cha_num) \
+ (XGMAC_DMA_CHA_BASE_REG + (cha_num * 0x80) + 0x2C)
+#define XGMAC_DMA_CHA_TXDESC_RINGLEN_REG(cha_num) \
+ (XGMAC_DMA_CHA_BASE_REG + (cha_num * 0x80) + 0x30)
+#define XGMAC_DMA_CHA_RXDESC_RINGLEN_REG(cha_num) \
+ (XGMAC_DMA_CHA_BASE_REG + (cha_num * 0x80) + 0x34)
+#define XGMAC_DMA_CHA_INT_ENABLE_REG(cha_num) \
+ (XGMAC_DMA_CHA_BASE_REG + (cha_num * 0x80) + 0x38)
+#define XGMAC_DMA_CHA_INT_RXWATCHTMR_REG(cha_num) \
+ (XGMAC_DMA_CHA_BASE_REG + (cha_num * 0x80) + 0x3C)
+#define XGMAC_DMA_CHA_TXDESC_CURADDLO_REG(cha_num) \
+ (XGMAC_DMA_CHA_BASE_REG + (cha_num * 0x80) + 0x44)
+#define XGMAC_DMA_CHA_RXDESC_CURADDLO_REG(cha_num) \
+ (XGMAC_DMA_CHA_BASE_REG + (cha_num * 0x80) + 0x4C)
+#define XGMAC_DMA_CHA_CURTXBUF_ADDHI_REG(cha_num) \
+ (XGMAC_DMA_CHA_BASE_REG + (cha_num * 0x80) + 0x50)
+#define XGMAC_DMA_CHA_CURTXBUF_ADDLO_REG(cha_num) \
+ (XGMAC_DMA_CHA_BASE_REG + (cha_num * 0x80) + 0x54)
+#define XGMAC_DMA_CHA_CURRXBUF_ADDHI_REG(cha_num) \
+ (XGMAC_DMA_CHA_BASE_REG + (cha_num * 0x80) + 0x58)
+#define XGMAC_DMA_CHA_CURRXBUF_ADDLO_REG(cha_num) \
+ (XGMAC_DMA_CHA_BASE_REG + (cha_num * 0x80) + 0x5C)
+#define XGMAC_DMA_CHA_STATUS_REG(cha_num) \
+ (XGMAC_DMA_CHA_BASE_REG + (cha_num * 0x80) + 0x60)
/* TX DMA control register specific */
#define XGMAC_TX_START_DMA BIT(0)
@@ -451,9 +451,9 @@ enum vlan_tag_ctl_tx {
#define XGMAC_DMA_INT_ENA_TUE BIT(2) /* Transmit Buffer Unavailable */
#define XGMAC_DMA_INT_ENA_RIE BIT(6) /* Receive Interrupt */
-#define XGMAC_DMA_INT_NORMAL \
- (XGMAC_DMA_INT_ENA_NIE | XGMAC_DMA_INT_ENA_RIE | \
- XGMAC_DMA_INT_ENA_TIE | XGMAC_DMA_INT_ENA_TUE)
+#define XGMAC_DMA_INT_NORMAL \
+ (XGMAC_DMA_INT_ENA_NIE | XGMAC_DMA_INT_ENA_RIE | \
+ XGMAC_DMA_INT_ENA_TIE | XGMAC_DMA_INT_ENA_TUE)
/* DMA Abnormal interrupt */
#define XGMAC_DMA_INT_ENA_AIE BIT(15) /* Abnormal Summary */
@@ -463,10 +463,10 @@ enum vlan_tag_ctl_tx {
#define XGMAC_DMA_INT_ENA_FBE BIT(12) /* Fatal Bus Error */
#define XGMAC_DMA_INT_ENA_CDEE BIT(13) /* Context Descriptor Error */
-#define XGMAC_DMA_INT_ABNORMAL \
- (XGMAC_DMA_INT_ENA_AIE | XGMAC_DMA_INT_ENA_TSE | \
- XGMAC_DMA_INT_ENA_RUE | XGMAC_DMA_INT_ENA_RSE | \
- XGMAC_DMA_INT_ENA_FBE | XGMAC_DMA_INT_ENA_CDEE)
+#define XGMAC_DMA_INT_ABNORMAL \
+ (XGMAC_DMA_INT_ENA_AIE | XGMAC_DMA_INT_ENA_TSE | \
+ XGMAC_DMA_INT_ENA_RUE | XGMAC_DMA_INT_ENA_RSE | \
+ XGMAC_DMA_INT_ENA_FBE | XGMAC_DMA_INT_ENA_CDEE)
#define XGMAC_DMA_ENA_INT (XGMAC_DMA_INT_NORMAL | XGMAC_DMA_INT_ABNORMAL)
--
1.8.1.2.459.gbcd45b4.dirty
^ permalink raw reply related [flat|nested] 6+ messages in thread