Skip to content

Commit 9684d7b

Browse files
davem330davem330
committed
Merge branch 'sfc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc
Ben Hutchings says: ==================== Some more fixes for EF10 support; hopefully the last lot: 1. Fixes for reading statistics, from Edward Cree and Jon Cooper. 2. Addition of ethtool statistics for packets dropped by the hardware before they were associated with a specific function, from Edward Cree. 3. Only bind to functions that are in control of their associated port, as the driver currently assumes this is the case. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
2 parents 7eec417 + ecb1c9c commit 9684d7b

File tree

5 files changed

+151
-31
lines changed

5 files changed

+151
-31
lines changed

‎drivers/net/ethernet/sfc/ef10.c

Lines changed: 65 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,18 @@ static const struct efx_hw_stat_desc efx_ef10_stat_desc[EF10_STAT_COUNT] = {
444444
EF10_DMA_STAT(rx_align_error, RX_ALIGN_ERROR_PKTS),
445445
EF10_DMA_STAT(rx_length_error, RX_LENGTH_ERROR_PKTS),
446446
EF10_DMA_STAT(rx_nodesc_drops, RX_NODESC_DROPS),
447+
EF10_DMA_STAT(rx_pm_trunc_bb_overflow, PM_TRUNC_BB_OVERFLOW),
448+
EF10_DMA_STAT(rx_pm_discard_bb_overflow, PM_DISCARD_BB_OVERFLOW),
449+
EF10_DMA_STAT(rx_pm_trunc_vfifo_full, PM_TRUNC_VFIFO_FULL),
450+
EF10_DMA_STAT(rx_pm_discard_vfifo_full, PM_DISCARD_VFIFO_FULL),
451+
EF10_DMA_STAT(rx_pm_trunc_qbb, PM_TRUNC_QBB),
452+
EF10_DMA_STAT(rx_pm_discard_qbb, PM_DISCARD_QBB),
453+
EF10_DMA_STAT(rx_pm_discard_mapping, PM_DISCARD_MAPPING),
454+
EF10_DMA_STAT(rx_dp_q_disabled_packets, RXDP_Q_DISABLED_PKTS),
455+
EF10_DMA_STAT(rx_dp_di_dropped_packets, RXDP_DI_DROPPED_PKTS),
456+
EF10_DMA_STAT(rx_dp_streaming_packets, RXDP_STREAMING_PKTS),
457+
EF10_DMA_STAT(rx_dp_emerg_fetch, RXDP_EMERGENCY_FETCH_CONDITIONS),
458+
EF10_DMA_STAT(rx_dp_emerg_wait, RXDP_EMERGENCY_WAIT_CONDITIONS),
447459
};
448460

449461
#define HUNT_COMMON_STAT_MASK ((1ULL << EF10_STAT_tx_bytes) | \
@@ -498,53 +510,82 @@ static const struct efx_hw_stat_desc efx_ef10_stat_desc[EF10_STAT_COUNT] = {
498510
#define HUNT_40G_EXTRA_STAT_MASK ((1ULL << EF10_STAT_rx_align_error) | \
499511
(1ULL << EF10_STAT_rx_length_error))
500512

501-
#if BITS_PER_LONG == 64
502-
#define STAT_MASK_BITMAP(bits) (bits)
503-
#else
504-
#define STAT_MASK_BITMAP(bits) (bits) & 0xffffffff, (bits) >> 32
505-
#endif
506-
507-
static const unsigned long *efx_ef10_stat_mask(struct efx_nic *efx)
508-
{
509-
static const unsigned long hunt_40g_stat_mask[] = {
510-
STAT_MASK_BITMAP(HUNT_COMMON_STAT_MASK |
511-
HUNT_40G_EXTRA_STAT_MASK)
512-
};
513-
static const unsigned long hunt_10g_only_stat_mask[] = {
514-
STAT_MASK_BITMAP(HUNT_COMMON_STAT_MASK |
515-
HUNT_10G_ONLY_STAT_MASK)
516-
};
513+
/* These statistics are only provided if the firmware supports the
514+
* capability PM_AND_RXDP_COUNTERS.
515+
*/
516+
#define HUNT_PM_AND_RXDP_STAT_MASK ( \
517+
(1ULL << EF10_STAT_rx_pm_trunc_bb_overflow) | \
518+
(1ULL << EF10_STAT_rx_pm_discard_bb_overflow) | \
519+
(1ULL << EF10_STAT_rx_pm_trunc_vfifo_full) | \
520+
(1ULL << EF10_STAT_rx_pm_discard_vfifo_full) | \
521+
(1ULL << EF10_STAT_rx_pm_trunc_qbb) | \
522+
(1ULL << EF10_STAT_rx_pm_discard_qbb) | \
523+
(1ULL << EF10_STAT_rx_pm_discard_mapping) | \
524+
(1ULL << EF10_STAT_rx_dp_q_disabled_packets) | \
525+
(1ULL << EF10_STAT_rx_dp_di_dropped_packets) | \
526+
(1ULL << EF10_STAT_rx_dp_streaming_packets) | \
527+
(1ULL << EF10_STAT_rx_dp_emerg_fetch) | \
528+
(1ULL << EF10_STAT_rx_dp_emerg_wait))
529+
530+
static u64 efx_ef10_raw_stat_mask(struct efx_nic *efx)
531+
{
532+
u64 raw_mask = HUNT_COMMON_STAT_MASK;
517533
u32 port_caps = efx_mcdi_phy_get_caps(efx);
534+
struct efx_ef10_nic_data *nic_data = efx->nic_data;
518535

519536
if (port_caps & (1 << MC_CMD_PHY_CAP_40000FDX_LBN))
520-
return hunt_40g_stat_mask;
537+
raw_mask |= HUNT_40G_EXTRA_STAT_MASK;
521538
else
522-
return hunt_10g_only_stat_mask;
539+
raw_mask |= HUNT_10G_ONLY_STAT_MASK;
540+
541+
if (nic_data->datapath_caps &
542+
(1 << MC_CMD_GET_CAPABILITIES_OUT_PM_AND_RXDP_COUNTERS_LBN))
543+
raw_mask |= HUNT_PM_AND_RXDP_STAT_MASK;
544+
545+
return raw_mask;
546+
}
547+
548+
static void efx_ef10_get_stat_mask(struct efx_nic *efx, unsigned long *mask)
549+
{
550+
u64 raw_mask = efx_ef10_raw_stat_mask(efx);
551+
552+
#if BITS_PER_LONG == 64
553+
mask[0] = raw_mask;
554+
#else
555+
mask[0] = raw_mask & 0xffffffff;
556+
mask[1] = raw_mask >> 32;
557+
#endif
523558
}
524559

525560
static size_t efx_ef10_describe_stats(struct efx_nic *efx, u8 *names)
526561
{
562+
DECLARE_BITMAP(mask, EF10_STAT_COUNT);
563+
564+
efx_ef10_get_stat_mask(efx, mask);
527565
return efx_nic_describe_stats(efx_ef10_stat_desc, EF10_STAT_COUNT,
528-
efx_ef10_stat_mask(efx), names);
566+
mask, names);
529567
}
530568

531569
static int efx_ef10_try_update_nic_stats(struct efx_nic *efx)
532570
{
533571
struct efx_ef10_nic_data *nic_data = efx->nic_data;
534-
const unsigned long *stats_mask = efx_ef10_stat_mask(efx);
572+
DECLARE_BITMAP(mask, EF10_STAT_COUNT);
535573
__le64 generation_start, generation_end;
536574
u64 *stats = nic_data->stats;
537575
__le64 *dma_stats;
538576

577+
efx_ef10_get_stat_mask(efx, mask);
578+
539579
dma_stats = efx->stats_buffer.addr;
540580
nic_data = efx->nic_data;
541581

542582
generation_end = dma_stats[MC_CMD_MAC_GENERATION_END];
543583
if (generation_end == EFX_MC_STATS_GENERATION_INVALID)
544584
return 0;
545585
rmb();
546-
efx_nic_update_stats(efx_ef10_stat_desc, EF10_STAT_COUNT, stats_mask,
586+
efx_nic_update_stats(efx_ef10_stat_desc, EF10_STAT_COUNT, mask,
547587
stats, efx->stats_buffer.addr, false);
588+
rmb();
548589
generation_start = dma_stats[MC_CMD_MAC_GENERATION_START];
549590
if (generation_end != generation_start)
550591
return -EAGAIN;
@@ -563,12 +604,14 @@ static int efx_ef10_try_update_nic_stats(struct efx_nic *efx)
563604
static size_t efx_ef10_update_stats(struct efx_nic *efx, u64 *full_stats,
564605
struct rtnl_link_stats64 *core_stats)
565606
{
566-
const unsigned long *mask = efx_ef10_stat_mask(efx);
607+
DECLARE_BITMAP(mask, EF10_STAT_COUNT);
567608
struct efx_ef10_nic_data *nic_data = efx->nic_data;
568609
u64 *stats = nic_data->stats;
569610
size_t stats_count = 0, index;
570611
int retry;
571612

613+
efx_ef10_get_stat_mask(efx, mask);
614+
572615
/* If we're unlucky enough to read statistics during the DMA, wait
573616
* up to 10ms for it to finish (typically takes <500us)
574617
*/

‎drivers/net/ethernet/sfc/mcdi.c

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -963,7 +963,7 @@ static int efx_mcdi_drv_attach(struct efx_nic *efx, bool driver_operating,
963963
bool *was_attached)
964964
{
965965
MCDI_DECLARE_BUF(inbuf, MC_CMD_DRV_ATTACH_IN_LEN);
966-
MCDI_DECLARE_BUF(outbuf, MC_CMD_DRV_ATTACH_OUT_LEN);
966+
MCDI_DECLARE_BUF(outbuf, MC_CMD_DRV_ATTACH_EXT_OUT_LEN);
967967
size_t outlen;
968968
int rc;
969969

@@ -981,6 +981,22 @@ static int efx_mcdi_drv_attach(struct efx_nic *efx, bool driver_operating,
981981
goto fail;
982982
}
983983

984+
/* We currently assume we have control of the external link
985+
* and are completely trusted by firmware. Abort probing
986+
* if that's not true for this function.
987+
*/
988+
if (driver_operating &&
989+
outlen >= MC_CMD_DRV_ATTACH_EXT_OUT_LEN &&
990+
(MCDI_DWORD(outbuf, DRV_ATTACH_EXT_OUT_FUNC_FLAGS) &
991+
(1 << MC_CMD_DRV_ATTACH_EXT_OUT_FLAG_LINKCTRL |
992+
1 << MC_CMD_DRV_ATTACH_EXT_OUT_FLAG_TRUSTED)) !=
993+
(1 << MC_CMD_DRV_ATTACH_EXT_OUT_FLAG_LINKCTRL |
994+
1 << MC_CMD_DRV_ATTACH_EXT_OUT_FLAG_TRUSTED)) {
995+
netif_err(efx, probe, efx->net_dev,
996+
"This driver version only supports one function per port\n");
997+
return -ENODEV;
998+
}
999+
9841000
if (was_attached != NULL)
9851001
*was_attached = MCDI_DWORD(outbuf, DRV_ATTACH_OUT_OLD_STATE);
9861002
return 0;

‎drivers/net/ethernet/sfc/mcdi_pcol.h

Lines changed: 54 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2574,8 +2574,58 @@
25742574
#define MC_CMD_MAC_RX_LANES01_DISP_ERR 0x39 /* enum */
25752575
#define MC_CMD_MAC_RX_LANES23_DISP_ERR 0x3a /* enum */
25762576
#define MC_CMD_MAC_RX_MATCH_FAULT 0x3b /* enum */
2577-
#define MC_CMD_GMAC_DMABUF_START 0x40 /* enum */
2578-
#define MC_CMD_GMAC_DMABUF_END 0x5f /* enum */
2577+
/* enum: PM trunc_bb_overflow counter. Valid for EF10 with PM_AND_RXDP_COUNTERS
2578+
* capability only.
2579+
*/
2580+
#define MC_CMD_MAC_PM_TRUNC_BB_OVERFLOW 0x3c
2581+
/* enum: PM discard_bb_overflow counter. Valid for EF10 with
2582+
* PM_AND_RXDP_COUNTERS capability only.
2583+
*/
2584+
#define MC_CMD_MAC_PM_DISCARD_BB_OVERFLOW 0x3d
2585+
/* enum: PM trunc_vfifo_full counter. Valid for EF10 with PM_AND_RXDP_COUNTERS
2586+
* capability only.
2587+
*/
2588+
#define MC_CMD_MAC_PM_TRUNC_VFIFO_FULL 0x3e
2589+
/* enum: PM discard_vfifo_full counter. Valid for EF10 with
2590+
* PM_AND_RXDP_COUNTERS capability only.
2591+
*/
2592+
#define MC_CMD_MAC_PM_DISCARD_VFIFO_FULL 0x3f
2593+
/* enum: PM trunc_qbb counter. Valid for EF10 with PM_AND_RXDP_COUNTERS
2594+
* capability only.
2595+
*/
2596+
#define MC_CMD_MAC_PM_TRUNC_QBB 0x40
2597+
/* enum: PM discard_qbb counter. Valid for EF10 with PM_AND_RXDP_COUNTERS
2598+
* capability only.
2599+
*/
2600+
#define MC_CMD_MAC_PM_DISCARD_QBB 0x41
2601+
/* enum: PM discard_mapping counter. Valid for EF10 with PM_AND_RXDP_COUNTERS
2602+
* capability only.
2603+
*/
2604+
#define MC_CMD_MAC_PM_DISCARD_MAPPING 0x42
2605+
/* enum: RXDP counter: Number of packets dropped due to the queue being
2606+
* disabled. Valid for EF10 with PM_AND_RXDP_COUNTERS capability only.
2607+
*/
2608+
#define MC_CMD_MAC_RXDP_Q_DISABLED_PKTS 0x43
2609+
/* enum: RXDP counter: Number of packets dropped by the DICPU. Valid for EF10
2610+
* with PM_AND_RXDP_COUNTERS capability only.
2611+
*/
2612+
#define MC_CMD_MAC_RXDP_DI_DROPPED_PKTS 0x45
2613+
/* enum: RXDP counter: Number of non-host packets. Valid for EF10 with
2614+
* PM_AND_RXDP_COUNTERS capability only.
2615+
*/
2616+
#define MC_CMD_MAC_RXDP_STREAMING_PKTS 0x46
2617+
/* enum: RXDP counter: Number of times an emergency descriptor fetch was
2618+
* performed. Valid for EF10 with PM_AND_RXDP_COUNTERS capability only.
2619+
*/
2620+
#define MC_CMD_MAC_RXDP_EMERGENCY_FETCH_CONDITIONS 0x47
2621+
/* enum: RXDP counter: Number of times the DPCPU waited for an existing
2622+
* descriptor fetch. Valid for EF10 with PM_AND_RXDP_COUNTERS capability only.
2623+
*/
2624+
#define MC_CMD_MAC_RXDP_EMERGENCY_WAIT_CONDITIONS 0x48
2625+
/* enum: Start of GMAC stats buffer space, for Siena only. */
2626+
#define MC_CMD_GMAC_DMABUF_START 0x40
2627+
/* enum: End of GMAC stats buffer space, for Siena only. */
2628+
#define MC_CMD_GMAC_DMABUF_END 0x5f
25792629
#define MC_CMD_MAC_GENERATION_END 0x60 /* enum */
25802630
#define MC_CMD_MAC_NSTATS 0x61 /* enum */
25812631

@@ -5065,6 +5115,8 @@
50655115
#define MC_CMD_GET_CAPABILITIES_OUT_RX_BATCHING_WIDTH 1
50665116
#define MC_CMD_GET_CAPABILITIES_OUT_MCAST_FILTER_CHAINING_LBN 26
50675117
#define MC_CMD_GET_CAPABILITIES_OUT_MCAST_FILTER_CHAINING_WIDTH 1
5118+
#define MC_CMD_GET_CAPABILITIES_OUT_PM_AND_RXDP_COUNTERS_LBN 27
5119+
#define MC_CMD_GET_CAPABILITIES_OUT_PM_AND_RXDP_COUNTERS_WIDTH 1
50685120
/* RxDPCPU firmware id. */
50695121
#define MC_CMD_GET_CAPABILITIES_OUT_RX_DPCPU_FW_ID_OFST 4
50705122
#define MC_CMD_GET_CAPABILITIES_OUT_RX_DPCPU_FW_ID_LEN 2

‎drivers/net/ethernet/sfc/nic.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -469,8 +469,7 @@ size_t efx_nic_describe_stats(const struct efx_hw_stat_desc *desc, size_t count,
469469
* @count: Length of the @desc array
470470
* @mask: Bitmask of which elements of @desc are enabled
471471
* @stats: Buffer to update with the converted statistics. The length
472-
* of this array must be at least the number of set bits in the
473-
* first @count bits of @mask.
472+
* of this array must be at least @count.
474473
* @dma_buf: DMA buffer containing hardware statistics
475474
* @accumulate: If set, the converted values will be added rather than
476475
* directly stored to the corresponding elements of @stats
@@ -503,11 +502,9 @@ void efx_nic_update_stats(const struct efx_hw_stat_desc *desc, size_t count,
503502
}
504503

505504
if (accumulate)
506-
*stats += val;
505+
stats[index] += val;
507506
else
508-
*stats = val;
507+
stats[index] = val;
509508
}
510-
511-
++stats;
512509
}
513510
}

‎drivers/net/ethernet/sfc/nic.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,18 @@ enum {
386386
EF10_STAT_rx_align_error,
387387
EF10_STAT_rx_length_error,
388388
EF10_STAT_rx_nodesc_drops,
389+
EF10_STAT_rx_pm_trunc_bb_overflow,
390+
EF10_STAT_rx_pm_discard_bb_overflow,
391+
EF10_STAT_rx_pm_trunc_vfifo_full,
392+
EF10_STAT_rx_pm_discard_vfifo_full,
393+
EF10_STAT_rx_pm_trunc_qbb,
394+
EF10_STAT_rx_pm_discard_qbb,
395+
EF10_STAT_rx_pm_discard_mapping,
396+
EF10_STAT_rx_dp_q_disabled_packets,
397+
EF10_STAT_rx_dp_di_dropped_packets,
398+
EF10_STAT_rx_dp_streaming_packets,
399+
EF10_STAT_rx_dp_emerg_fetch,
400+
EF10_STAT_rx_dp_emerg_wait,
389401
EF10_STAT_COUNT
390402
};
391403

0 commit comments

Comments
 (0)