* [PATCH net-next 0/3] sfc: defalconisation fixups
@ 2016-12-01 16:59 Edward Cree
2016-12-01 17:00 ` [PATCH net-next 1/3] sfc: fix debug message format string in efx_farch_handle_rx_not_ok Edward Cree
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Edward Cree @ 2016-12-01 16:59 UTC (permalink / raw)
To: linux-net-drivers, davem; +Cc: bkenward, netdev
A bug fix, the Kconfig change, and cleaning up a bit more unused code.
Edward Cree (3):
sfc: fix debug message format string in efx_farch_handle_rx_not_ok
sfc: don't select SFC_FALCON
sfc: remove RESET_TYPE_RX_RECOVERY
drivers/net/ethernet/sfc/Kconfig | 1 -
drivers/net/ethernet/sfc/efx.c | 1 -
drivers/net/ethernet/sfc/enum.h | 5 +----
drivers/net/ethernet/sfc/farch.c | 2 +-
4 files changed, 2 insertions(+), 7 deletions(-)
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH net-next 1/3] sfc: fix debug message format string in efx_farch_handle_rx_not_ok
2016-12-01 16:59 [PATCH net-next 0/3] sfc: defalconisation fixups Edward Cree
@ 2016-12-01 17:00 ` Edward Cree
2016-12-01 17:01 ` [PATCH net-next 2/3] sfc: don't select SFC_FALCON Edward Cree
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Edward Cree @ 2016-12-01 17:00 UTC (permalink / raw)
To: linux-net-drivers, davem; +Cc: bkenward, netdev
Defalconisation removed one of the string arguments, but missed the
corresponding %s.
Fixes: 5a6681e22c14 ("sfc: separate out SFC4000 ("Falcon") support into new sfc-falcon driver")
Signed-off-by: Edward Cree <ecree@solarflare.com>
---
drivers/net/ethernet/sfc/farch.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/sfc/farch.c b/drivers/net/ethernet/sfc/farch.c
index c282d66..91aa3ec 100644
--- a/drivers/net/ethernet/sfc/farch.c
+++ b/drivers/net/ethernet/sfc/farch.c
@@ -913,7 +913,7 @@ static u16 efx_farch_handle_rx_not_ok(struct efx_rx_queue *rx_queue,
if (rx_ev_other_err && net_ratelimit()) {
netif_dbg(efx, rx_err, efx->net_dev,
" RX queue %d unexpected RX event "
- EFX_QWORD_FMT "%s%s%s%s%s%s%s%s\n",
+ EFX_QWORD_FMT "%s%s%s%s%s%s%s\n",
efx_rx_queue_index(rx_queue), EFX_QWORD_VAL(*event),
rx_ev_buf_owner_id_err ? " [OWNER_ID_ERR]" : "",
rx_ev_ip_hdr_chksum_err ?
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH net-next 2/3] sfc: don't select SFC_FALCON
2016-12-01 16:59 [PATCH net-next 0/3] sfc: defalconisation fixups Edward Cree
2016-12-01 17:00 ` [PATCH net-next 1/3] sfc: fix debug message format string in efx_farch_handle_rx_not_ok Edward Cree
@ 2016-12-01 17:01 ` Edward Cree
2016-12-01 17:01 ` [PATCH net-next 3/3] sfc: remove RESET_TYPE_RX_RECOVERY Edward Cree
2016-12-01 20:39 ` [PATCH net-next 0/3] sfc: defalconisation fixups David Miller
3 siblings, 0 replies; 5+ messages in thread
From: Edward Cree @ 2016-12-01 17:01 UTC (permalink / raw)
To: linux-net-drivers, davem; +Cc: bkenward, netdev
Easy enough for Falcon users to enable it when making oldconfig.
Signed-off-by: Edward Cree <ecree@solarflare.com>
---
drivers/net/ethernet/sfc/Kconfig | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/ethernet/sfc/Kconfig b/drivers/net/ethernet/sfc/Kconfig
index 0e16197..605ebc7 100644
--- a/drivers/net/ethernet/sfc/Kconfig
+++ b/drivers/net/ethernet/sfc/Kconfig
@@ -6,7 +6,6 @@ config SFC
select I2C
select I2C_ALGOBIT
select PTP_1588_CLOCK
- select SFC_FALCON
---help---
This driver supports 10/40-gigabit Ethernet cards based on
the Solarflare SFC9000-family and SFC9100-family controllers.
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH net-next 3/3] sfc: remove RESET_TYPE_RX_RECOVERY
2016-12-01 16:59 [PATCH net-next 0/3] sfc: defalconisation fixups Edward Cree
2016-12-01 17:00 ` [PATCH net-next 1/3] sfc: fix debug message format string in efx_farch_handle_rx_not_ok Edward Cree
2016-12-01 17:01 ` [PATCH net-next 2/3] sfc: don't select SFC_FALCON Edward Cree
@ 2016-12-01 17:01 ` Edward Cree
2016-12-01 20:39 ` [PATCH net-next 0/3] sfc: defalconisation fixups David Miller
3 siblings, 0 replies; 5+ messages in thread
From: Edward Cree @ 2016-12-01 17:01 UTC (permalink / raw)
To: linux-net-drivers, davem; +Cc: bkenward, netdev
It's no longer used now that Falcon is gone.
Also remove a reference in a comment to an ioctl that doesn't exist.
Signed-off-by: Edward Cree <ecree@solarflare.com>
---
drivers/net/ethernet/sfc/efx.c | 1 -
drivers/net/ethernet/sfc/enum.h | 5 +----
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index 4a234a8..da7028d 100644
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -82,7 +82,6 @@ const char *const efx_reset_type_names[] = {
[RESET_TYPE_DISABLE] = "DISABLE",
[RESET_TYPE_TX_WATCHDOG] = "TX_WATCHDOG",
[RESET_TYPE_INT_ERROR] = "INT_ERROR",
- [RESET_TYPE_RX_RECOVERY] = "RX_RECOVERY",
[RESET_TYPE_DMA_ERROR] = "DMA_ERROR",
[RESET_TYPE_TX_SKIP] = "TX_SKIP",
[RESET_TYPE_MC_FAILURE] = "MC_FAILURE",
diff --git a/drivers/net/ethernet/sfc/enum.h b/drivers/net/ethernet/sfc/enum.h
index c94f562..6fa8242 100644
--- a/drivers/net/ethernet/sfc/enum.h
+++ b/drivers/net/ethernet/sfc/enum.h
@@ -148,7 +148,6 @@ enum efx_loopback_mode {
* @RESET_TYPE_DISABLE: Reset datapath, MAC and PHY; leave NIC disabled
* @RESET_TYPE_TX_WATCHDOG: reset due to TX watchdog
* @RESET_TYPE_INT_ERROR: reset due to internal error
- * @RESET_TYPE_RX_RECOVERY: reset to recover from RX datapath errors
* @RESET_TYPE_DMA_ERROR: DMA error
* @RESET_TYPE_TX_SKIP: hardware completed empty tx descriptors
* @RESET_TYPE_MC_FAILURE: MC reboot/assertion
@@ -166,15 +165,13 @@ enum reset_type {
RESET_TYPE_MAX_METHOD,
RESET_TYPE_TX_WATCHDOG,
RESET_TYPE_INT_ERROR,
- RESET_TYPE_RX_RECOVERY,
RESET_TYPE_DMA_ERROR,
RESET_TYPE_TX_SKIP,
RESET_TYPE_MC_FAILURE,
/* RESET_TYPE_MCDI_TIMEOUT is actually a method, not just a reason, but
* it doesn't fit the scope hierarchy (not well-ordered by inclusion).
* We encode this by having its enum value be greater than
- * RESET_TYPE_MAX_METHOD. This also prevents issuing it with
- * efx_ioctl_reset.
+ * RESET_TYPE_MAX_METHOD.
*/
RESET_TYPE_MCDI_TIMEOUT,
RESET_TYPE_MAX,
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH net-next 0/3] sfc: defalconisation fixups
2016-12-01 16:59 [PATCH net-next 0/3] sfc: defalconisation fixups Edward Cree
` (2 preceding siblings ...)
2016-12-01 17:01 ` [PATCH net-next 3/3] sfc: remove RESET_TYPE_RX_RECOVERY Edward Cree
@ 2016-12-01 20:39 ` David Miller
3 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2016-12-01 20:39 UTC (permalink / raw)
To: ecree; +Cc: linux-net-drivers, bkenward, netdev
From: Edward Cree <ecree@solarflare.com>
Date: Thu, 1 Dec 2016 16:59:13 +0000
> A bug fix, the Kconfig change, and cleaning up a bit more unused code.
>
> Edward Cree (3):
> sfc: fix debug message format string in efx_farch_handle_rx_not_ok
> sfc: don't select SFC_FALCON
> sfc: remove RESET_TYPE_RX_RECOVERY
Series applied, thank you.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-12-01 20:40 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-12-01 16:59 [PATCH net-next 0/3] sfc: defalconisation fixups Edward Cree
2016-12-01 17:00 ` [PATCH net-next 1/3] sfc: fix debug message format string in efx_farch_handle_rx_not_ok Edward Cree
2016-12-01 17:01 ` [PATCH net-next 2/3] sfc: don't select SFC_FALCON Edward Cree
2016-12-01 17:01 ` [PATCH net-next 3/3] sfc: remove RESET_TYPE_RX_RECOVERY Edward Cree
2016-12-01 20:39 ` [PATCH net-next 0/3] sfc: defalconisation fixups David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).