Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
---
drivers/staging/octeon/cvmx-pow.h | 55 ++++++---------
drivers/staging/octeon/ethernet-mem.c | 18 ++---
drivers/staging/octeon/ethernet-spi.c | 115 ++++++++++++--------------------
drivers/staging/octeon/ethernet.c | 21 ++----
4 files changed, 80 insertions(+), 129 deletions(-)
diff --git a/drivers/staging/octeon/cvmx-pow.h b/drivers/staging/octeon/cvmx-pow.h
index c5d66f2..d87e149 100644
--- a/drivers/staging/octeon/cvmx-pow.h
+++ b/drivers/staging/octeon/cvmx-pow.h
@@ -1084,8 +1084,7 @@ static inline void cvmx_pow_tag_sw_wait(void)
if (unlikely(switch_complete))
break;
if (unlikely(cvmx_get_cycle() > start_cycle + MAX_CYCLES)) {
- pr_warning("Tag switch is taking a long time, "
- "possible deadlock\n");
+ pr_warning("Tag switch is taking a long time, possible deadlock\n");
start_cycle = -MAX_CYCLES - 1;
}
}
@@ -1302,13 +1301,11 @@ static inline void cvmx_pow_tag_sw_nocheck(uint32_t tag,
pr_warning("%s called with NULL tag\n", __func__);
if ((current_tag.s.type == tag_type)
&& (current_tag.s.tag == tag))
- pr_warning("%s called to perform a tag switch to the "
- "same tag\n",
- __func__);
+ pr_warning("%s called to perform a tag switch to the same tag\n",
+ __func__);
if (tag_type == CVMX_POW_TAG_TYPE_NULL)
- pr_warning("%s called to perform a tag switch to "
- "NULL. Use cvmx_pow_tag_sw_null() instead\n",
- __func__);
+ pr_warning("%s called to perform a tag switch to NULL. Use cvmx_pow_tag_sw_null() instead\n",
+ __func__);
}
/*
@@ -1411,19 +1408,16 @@ static inline void cvmx_pow_tag_sw_full_nocheck(cvmx_wqe_t *wqp, uint32_t tag,
__func__);
if ((current_tag.s.type == tag_type)
&& (current_tag.s.tag == tag))
- pr_warning("%s called to perform a tag switch to "
- "the same tag\n",
- __func__);
+ pr_warning("%s called to perform a tag switch to the same tag\n",
+ __func__);
if (tag_type == CVMX_POW_TAG_TYPE_NULL)
- pr_warning("%s called to perform a tag switch to "
- "NULL. Use cvmx_pow_tag_sw_null() instead\n",
- __func__);
+ pr_warning("%s called to perform a tag switch to NULL. Use cvmx_pow_tag_sw_null() instead\n",
+ __func__);
if (wqp != cvmx_phys_to_ptr(0x80))
if (wqp != cvmx_pow_get_current_wqp())
- pr_warning("%s passed WQE(%p) doesn't match "
- "the address in the POW(%p)\n",
- __func__, wqp,
- cvmx_pow_get_current_wqp());
+ pr_warning("%s passed WQE(%p) doesn't match the address in the POW(%p)\n",
+ __func__, wqp,
+ cvmx_pow_get_current_wqp());
}
/*
@@ -1510,9 +1504,8 @@ static inline void cvmx_pow_tag_sw_null_nocheck(void)
pr_warning("%s called with NULL_NULL tag\n",
__func__);
if (current_tag.s.type == CVMX_POW_TAG_TYPE_NULL)
- pr_warning("%s called when we already have a "
- "NULL tag\n",
- __func__);
+ pr_warning("%s called when we already have a NULL tag\n",
+ __func__);
}
tag_req.u64 = 0;
@@ -1659,9 +1652,8 @@ static inline void cvmx_pow_set_priority(uint64_t core_num,
prio_mask |= 1 << priority[i];
if (prio_mask ^ ((1 << cvmx_pop(prio_mask)) - 1)) {
- pr_err("POW static priorities should be "
- "contiguous (0x%llx)\n",
- (unsigned long long)prio_mask);
+ pr_err("POW static priorities should be contiguous (0x%llx)\n",
+ (unsigned long long)prio_mask);
return;
}
}
@@ -1728,14 +1720,12 @@ static inline void cvmx_pow_tag_sw_desched_nocheck(
pr_warning("%s called with NULL_NULL tag\n",
__func__);
if (current_tag.s.type == CVMX_POW_TAG_TYPE_NULL)
- pr_warning("%s called with NULL tag. Deschedule not "
- "allowed from NULL state\n",
- __func__);
+ pr_warning("%s called with NULL tag. Deschedule not allowed from NULL state\n",
+ __func__);
if ((current_tag.s.type != CVMX_POW_TAG_TYPE_ATOMIC)
&& (tag_type != CVMX_POW_TAG_TYPE_ATOMIC))
- pr_warning("%s called where neither the before or "
- "after tag is ATOMIC\n",
- __func__);
+ pr_warning("%s called where neither the before or after tag is ATOMIC\n",
+ __func__);
}
tag_req.u64 = 0;
@@ -1835,9 +1825,8 @@ static inline void cvmx_pow_desched(uint64_t no_sched)
pr_warning("%s called with NULL_NULL tag\n",
__func__);
if (current_tag.s.type == CVMX_POW_TAG_TYPE_NULL)
- pr_warning("%s called with NULL tag. Deschedule not "
- "expected from NULL state\n",
- __func__);
+ pr_warning("%s called with NULL tag. Deschedule not expected from NULL state\n",
+ __func__);
}
/* Need to make sure any writes to the work queue entry are complete */
diff --git a/drivers/staging/octeon/ethernet-mem.c b/drivers/staging/octeon/ethernet-mem.c
index b595903..ea5b444 100644
--- a/drivers/staging/octeon/ethernet-mem.c
+++ b/drivers/staging/octeon/ethernet-mem.c
@@ -120,8 +120,7 @@ static int cvm_oct_fill_hw_memory(int pool, int size, int elements)
panic("Unable to allocate %u bytes for FPA pool %d\n",
elements * size, pool);
- pr_notice("Memory range %p - %p reserved for "
- "hardware\n", memory,
+ pr_notice("Memory range %p - %p reserved for hardware\n", memory,
memory + elements * size - 1);
while (freed) {
@@ -134,9 +133,8 @@ static int cvm_oct_fill_hw_memory(int pool, int size, int elements)
/* We need to force alignment to 128 bytes here */
memory = kmalloc(size + 127, GFP_ATOMIC);
if (unlikely(memory == NULL)) {
- pr_warning("Unable to allocate %u bytes for "
- "FPA pool %d\n",
- elements * size, pool);
+ pr_warning("Unable to allocate %u bytes for FPA pool %d\n",
+ elements * size, pool);
break;
}
memory = (char *)(((unsigned long)memory + 127) & -128);
@@ -169,13 +167,11 @@ static void cvm_oct_free_hw_memory(int pool, int size, int elements)
} while (memory);
if (elements < 0)
- pr_warning("Freeing of pool %u had too many "
- "buffers (%d)\n",
- pool, elements);
+ pr_warning("Freeing of pool %u had too many buffers (%d)\n",
+ pool, elements);
else if (elements > 0)
- pr_warning("Warning: Freeing of pool %u is "
- "missing %d buffers\n",
- pool, elements);
+ pr_warning("Warning: Freeing of pool %u is missing %d buffers\n",
+ pool, elements);
}
}
diff --git a/drivers/staging/octeon/ethernet-spi.c b/drivers/staging/octeon/ethernet-spi.c
index 66190b0..e8db8f0 100644
--- a/drivers/staging/octeon/ethernet-spi.c
+++ b/drivers/staging/octeon/ethernet-spi.c
@@ -24,6 +24,9 @@
* This file may also be available under a different license from Cavium.
* Contact Cavium Networks for more information
**********************************************************************/
+
+#define pr_fmt(fmt) "SPI: " fmt
+
#include <linux/kernel.h>
#include <linux/netdevice.h>
#include <linux/mii.h>
@@ -62,35 +65,27 @@ static irqreturn_t cvm_oct_spi_rml_interrupt(int cpl, void *dev_id)
spx_int_reg.u64 &= cvmx_read_csr(CVMX_SPXX_INT_MSK(1));
if (spx_int_reg.s.spf)
- pr_err("SPI1: SRX Spi4 interface down\n");
+ pr_err("%d: SRX Spi4 interface down\n", 1);
if (spx_int_reg.s.calerr)
- pr_err("SPI1: SRX Spi4 Calendar table "
- "parity error\n");
+ pr_err("%d: SRX Spi4 Calendar table parity error\n", 1);
if (spx_int_reg.s.syncerr)
- pr_err("SPI1: SRX Consecutive Spi4 DIP4 "
- "errors have exceeded "
- "SPX_ERR_CTL[ERRCNT]\n");
+ pr_err("%d: SRX Consecutive Spi4 DIP4 errors have exceeded SPX_ERR_CTL[ERRCNT]\n", 1);
if (spx_int_reg.s.diperr)
- pr_err("SPI1: SRX Spi4 DIP4 error\n");
+ pr_err("%d: SRX Spi4 DIP4 error\n", 1);
if (spx_int_reg.s.tpaovr)
- pr_err("SPI1: SRX Selected port has hit "
- "TPA overflow\n");
+ pr_err("%d: SRX Selected port has hit TPA overflow\n", 1);
if (spx_int_reg.s.rsverr)
- pr_err("SPI1: SRX Spi4 reserved control "
- "word detected\n");
+ pr_err("%d: SRX Spi4 reserved control word detected\n", 1);
if (spx_int_reg.s.drwnng)
- pr_err("SPI1: SRX Spi4 receive FIFO "
- "drowning/overflow\n");
+ pr_err("%d: SRX Spi4 receive FIFO drowning/overflow\n", 1);
if (spx_int_reg.s.clserr)
- pr_err("SPI1: SRX Spi4 packet closed on "
- "non-16B alignment without EOP\n");
+ pr_err("%d: SRX Spi4 packet closed on non-16B alignment without EOP\n", 1);
if (spx_int_reg.s.spiovr)
- pr_err("SPI1: SRX Spi4 async FIFO overflow\n");
+ pr_err("%d: SRX Spi4 async FIFO overflow\n", 1);
if (spx_int_reg.s.abnorm)
- pr_err("SPI1: SRX Abnormal packet "
- "termination (ERR bit)\n");
+ pr_err("%d: SRX Abnormal packet termination (ERR bit)\n", 1);
if (spx_int_reg.s.prtnxa)
- pr_err("SPI1: SRX Port out of range\n");
+ pr_err("%d: SRX Port out of range\n", 1);
}
stx_int_reg.u64 = cvmx_read_csr(CVMX_STXX_INT_REG(1));
@@ -99,31 +94,23 @@ static irqreturn_t cvm_oct_spi_rml_interrupt(int cpl, void *dev_id)
stx_int_reg.u64 &= cvmx_read_csr(CVMX_STXX_INT_MSK(1));
if (stx_int_reg.s.syncerr)
- pr_err("SPI1: STX Interface encountered a "
- "fatal error\n");
+ pr_err("%d: STX Interface encountered a fatal error\n", 1);
if (stx_int_reg.s.frmerr)
- pr_err("SPI1: STX FRMCNT has exceeded "
- "STX_DIP_CNT[MAXFRM]\n");
+ pr_err("%d: STX FRMCNT has exceeded STX_DIP_CNT[MAXFRM]\n", 1);
if (stx_int_reg.s.unxfrm)
- pr_err("SPI1: STX Unexpected framing "
- "sequence\n");
+ pr_err("%d: STX Unexpected framing sequence\n", 1);
if (stx_int_reg.s.nosync)
- pr_err("SPI1: STX ERRCNT has exceeded "
- "STX_DIP_CNT[MAXDIP]\n");
+ pr_err("%d: STX ERRCNT has exceeded STX_DIP_CNT[MAXDIP]\n", 1);
if (stx_int_reg.s.diperr)
- pr_err("SPI1: STX DIP2 error on the Spi4 "
- "Status channel\n");
+ pr_err("%d: STX DIP2 error on the Spi4 Status channel\n", 1);
if (stx_int_reg.s.datovr)
- pr_err("SPI1: STX Spi4 FIFO overflow error\n");
+ pr_err("%d: STX Spi4 FIFO overflow error\n", 1);
if (stx_int_reg.s.ovrbst)
- pr_err("SPI1: STX Transmit packet burst "
- "too big\n");
+ pr_err("%d: STX Transmit packet burst too big\n", 1);
if (stx_int_reg.s.calpar1)
- pr_err("SPI1: STX Calendar Table Parity "
- "Error Bank1\n");
+ pr_err("%d: STX Calendar Table Parity Error Bank1\n", 1);
if (stx_int_reg.s.calpar0)
- pr_err("SPI1: STX Calendar Table Parity "
- "Error Bank0\n");
+ pr_err("%d: STX Calendar Table Parity Error Bank0\n", 1);
}
cvmx_write_csr(CVMX_SPXX_INT_MSK(1), 0);
@@ -142,35 +129,27 @@ static irqreturn_t cvm_oct_spi_rml_interrupt(int cpl, void *dev_id)
spx_int_reg.u64 &= cvmx_read_csr(CVMX_SPXX_INT_MSK(0));
if (spx_int_reg.s.spf)
- pr_err("SPI0: SRX Spi4 interface down\n");
+ pr_err("%d: SRX Spi4 interface down\n", 0);
if (spx_int_reg.s.calerr)
- pr_err("SPI0: SRX Spi4 Calendar table "
- "parity error\n");
+ pr_err("%d: SRX Spi4 Calendar table parity error\n", 0);
if (spx_int_reg.s.syncerr)
- pr_err("SPI0: SRX Consecutive Spi4 DIP4 "
- "errors have exceeded "
- "SPX_ERR_CTL[ERRCNT]\n");
+ pr_err("%d: SRX Consecutive Spi4 DIP4 errors have exceeded SPX_ERR_CTL[ERRCNT]\n", 0);
if (spx_int_reg.s.diperr)
- pr_err("SPI0: SRX Spi4 DIP4 error\n");
+ pr_err("%d: SRX Spi4 DIP4 error\n", 0);
if (spx_int_reg.s.tpaovr)
- pr_err("SPI0: SRX Selected port has hit "
- "TPA overflow\n");
+ pr_err("%d: SRX Selected port has hit TPA overflow\n", 0);
if (spx_int_reg.s.rsverr)
- pr_err("SPI0: SRX Spi4 reserved control "
- "word detected\n");
+ pr_err("%d: SRX Spi4 reserved control word detected\n", 0);
if (spx_int_reg.s.drwnng)
- pr_err("SPI0: SRX Spi4 receive FIFO "
- "drowning/overflow\n");
+ pr_err("%d: SRX Spi4 receive FIFO drowning/overflow\n", 0);
if (spx_int_reg.s.clserr)
- pr_err("SPI0: SRX Spi4 packet closed on "
- "non-16B alignment without EOP\n");
+ pr_err("%d: SRX Spi4 packet closed on non-16B alignment without EOP\n", 0);
if (spx_int_reg.s.spiovr)
- pr_err("SPI0: SRX Spi4 async FIFO overflow\n");
+ pr_err("%d: SRX Spi4 async FIFO overflow\n", 0);
if (spx_int_reg.s.abnorm)
- pr_err("SPI0: SRX Abnormal packet "
- "termination (ERR bit)\n");
+ pr_err("%d: SRX Abnormal packet termination (ERR bit)\n", 0);
if (spx_int_reg.s.prtnxa)
- pr_err("SPI0: SRX Port out of range\n");
+ pr_err("%d: SRX Port out of range\n", 0);
}
stx_int_reg.u64 = cvmx_read_csr(CVMX_STXX_INT_REG(0));
@@ -179,31 +158,23 @@ static irqreturn_t cvm_oct_spi_rml_interrupt(int cpl, void *dev_id)
stx_int_reg.u64 &= cvmx_read_csr(CVMX_STXX_INT_MSK(0));
if (stx_int_reg.s.syncerr)
- pr_err("SPI0: STX Interface encountered a "
- "fatal error\n");
+ pr_err("%d: STX Interface encountered a fatal error\n", 0);
if (stx_int_reg.s.frmerr)
- pr_err("SPI0: STX FRMCNT has exceeded "
- "STX_DIP_CNT[MAXFRM]\n");
+ pr_err("%d: STX FRMCNT has exceeded STX_DIP_CNT[MAXFRM]\n", 0);
if (stx_int_reg.s.unxfrm)
- pr_err("SPI0: STX Unexpected framing "
- "sequence\n");
+ pr_err("%d: STX Unexpected framing sequence\n", 0);
if (stx_int_reg.s.nosync)
- pr_err("SPI0: STX ERRCNT has exceeded "
- "STX_DIP_CNT[MAXDIP]\n");
+ pr_err("%d: STX ERRCNT has exceeded STX_DIP_CNT[MAXDIP]\n", 0);
if (stx_int_reg.s.diperr)
- pr_err("SPI0: STX DIP2 error on the Spi4 "
- "Status channel\n");
+ pr_err("%d: STX DIP2 error on the Spi4 Status channel\n", 0);
if (stx_int_reg.s.datovr)
- pr_err("SPI0: STX Spi4 FIFO overflow error\n");
+ pr_err("%d: STX Spi4 FIFO overflow error\n", 0);
if (stx_int_reg.s.ovrbst)
- pr_err("SPI0: STX Transmit packet burst "
- "too big\n");
+ pr_err("%d: STX Transmit packet burst too big\n", 0);
if (stx_int_reg.s.calpar1)
- pr_err("SPI0: STX Calendar Table Parity "
- "Error Bank1\n");
+ pr_err("%d: STX Calendar Table Parity Error Bank1\n", 0);
if (stx_int_reg.s.calpar0)
- pr_err("SPI0: STX Calendar Table Parity "
- "Error Bank0\n");
+ pr_err("%d: STX Calendar Table Parity Error Bank0\n", 0);
}
cvmx_write_csr(CVMX_SPXX_INT_MSK(0), 0);
diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
index b847951..228caa6 100644
--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
@@ -672,19 +672,16 @@ static int __init cvm_oct_init_module(void)
skb_queue_head_init(&priv->tx_free_list[qos]);
if (register_netdev(dev) < 0) {
- pr_err("Failed to register ethernet "
- "device for POW\n");
+ pr_err("Failed to register ethernet device for POW\n");
kfree(dev);
} else {
cvm_oct_device[CVMX_PIP_NUM_INPUT_PORTS] = dev;
- pr_info("%s: POW send group %d, receive "
- "group %d\n",
- dev->name, pow_send_group,
- pow_receive_group);
+ pr_info("%s: POW send group %d, receive group %d\n",
+ dev->name, pow_send_group,
+ pow_receive_group);
}
} else {
- pr_err("Failed to allocate ethernet device "
- "for POW\n");
+ pr_err("Failed to allocate ethernet device for POW\n");
}
}
@@ -702,8 +699,7 @@ static int __init cvm_oct_init_module(void)
struct net_device *dev =
alloc_etherdev(sizeof(struct octeon_ethernet));
if (!dev) {
- pr_err("Failed to allocate ethernet device "
- "for port %d\n", port);
+ pr_err("Failed to allocate ethernet device for port %d\n", port);
continue;
}
if (disable_core_queueing)
@@ -766,9 +762,8 @@ static int __init cvm_oct_init_module(void)
if (!dev->netdev_ops) {
kfree(dev);
} else if (register_netdev(dev) < 0) {
- pr_err("Failed to register ethernet device "
- "for interface %d, port %d\n",
- interface, priv->port);
+ pr_err("Failed to register ethernet device for interface %d, port %d\n",
+ interface, priv->port);
kfree(dev);
} else {
cvm_oct_device[priv->port] = dev;
--
1.6.5.rc3.dirty
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
