Skip to content

Commit

Permalink
sfc: determine flag word automatically in efx_has_cap()
Browse files Browse the repository at this point in the history
Now that we have an _OFST definition for each individual flag bit,
 callers of efx_has_cap() don't need to specify which flag word it's
 in; we can just use the flag name directly in MCDI_CAPABILITY_OFST.

Signed-off-by: Edward Cree <ecree@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Edward Cree authored and David S. Miller committed Jun 30, 2020
1 parent 0dc9508 commit 6d9b5dc
Showing 3 changed files with 7 additions and 8 deletions.
5 changes: 2 additions & 3 deletions drivers/net/ethernet/sfc/mcdi.h
Original file line number Diff line number Diff line change
@@ -332,10 +332,9 @@ void efx_mcdi_sensor_event(struct efx_nic *efx, efx_qword_t *ev);
#define MCDI_CAPABILITY_OFST(field) \
MC_CMD_GET_CAPABILITIES_V4_OUT_ ## field ## _OFST

/* field is FLAGS1 or FLAGS2 */
#define efx_has_cap(efx, flag, field) \
#define efx_has_cap(efx, field) \
efx->type->check_caps(efx, \
MCDI_CAPABILITY(flag), \
MCDI_CAPABILITY(field), \
MCDI_CAPABILITY_OFST(field))

void efx_mcdi_print_fwver(struct efx_nic *efx, char *buf, size_t len);
8 changes: 4 additions & 4 deletions drivers/net/ethernet/sfc/mcdi_filters.c
Original file line number Diff line number Diff line change
@@ -828,7 +828,7 @@ static int efx_mcdi_filter_insert_def(struct efx_nic *efx,
efx_filter_set_uc_def(&spec);

if (encap_type) {
if (efx_has_cap(efx, VXLAN_NVGRE, FLAGS1))
if (efx_has_cap(efx, VXLAN_NVGRE))
efx_filter_set_encap_type(&spec, encap_type);
else
/*
@@ -1304,7 +1304,7 @@ int efx_mcdi_filter_table_probe(struct efx_nic *efx, bool multicast_chaining)
rc = efx_mcdi_filter_table_probe_matches(efx, table, false);
if (rc)
goto fail;
if (efx_has_cap(efx, VXLAN_NVGRE, FLAGS1))
if (efx_has_cap(efx, VXLAN_NVGRE))
rc = efx_mcdi_filter_table_probe_matches(efx, table, true);
if (rc)
goto fail;
@@ -1927,7 +1927,7 @@ static int efx_mcdi_filter_alloc_rss_context(struct efx_nic *efx, bool exclusive
return 0;
}

if (efx_has_cap(efx, RX_RSS_LIMITED, FLAGS1))
if (efx_has_cap(efx, RX_RSS_LIMITED))
return -EOPNOTSUPP;

MCDI_SET_DWORD(inbuf, RSS_CONTEXT_ALLOC_IN_UPSTREAM_PORT_ID,
@@ -1948,7 +1948,7 @@ static int efx_mcdi_filter_alloc_rss_context(struct efx_nic *efx, bool exclusive
if (context_size)
*context_size = rss_spread;

if (efx_has_cap(efx, ADDITIONAL_RSS_MODES, FLAGS1))
if (efx_has_cap(efx, ADDITIONAL_RSS_MODES))
efx_mcdi_set_rss_context_flags(efx, ctx);

return 0;
2 changes: 1 addition & 1 deletion drivers/net/ethernet/sfc/ptp.c
Original file line number Diff line number Diff line change
@@ -352,7 +352,7 @@ static int efx_phc_enable(struct ptp_clock_info *ptp,

bool efx_ptp_use_mac_tx_timestamps(struct efx_nic *efx)
{
return efx_has_cap(efx, TX_MAC_TIMESTAMPING, FLAGS2);
return efx_has_cap(efx, TX_MAC_TIMESTAMPING);
}

/* PTP 'extra' channel is still a traffic channel, but we only create TX queues

0 comments on commit 6d9b5dc

Please sign in to comment.