Commit f81c6906 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'sfc-next' 



Shradha Shah says:

====================
sfc: Clean up Siena SR-IOV support in preparation for EF10 SR-IOV support

This patch series provides a base and clean up for the upcoming
EF10 SRIOV patches.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7e5d7753 d98a4ffe

drivers/net/ethernet/sfc/ef10.c

+5 −0
Original line number Diff line number Diff line
@@ -3688,6 +3688,11 @@ const struct efx_nic_type efx_hunt_a0_nic_type = { 
	.ptp_write_host_time = efx_ef10_ptp_write_host_time,

	.ptp_set_ts_sync_events = efx_ef10_ptp_set_ts_sync_events,

	.ptp_set_ts_config = efx_ef10_ptp_set_ts_config,

	.sriov_init = efx_ef10_sriov_init,

	.sriov_fini = efx_ef10_sriov_fini,

	.sriov_mac_address_changed = efx_ef10_sriov_mac_address_changed,

	.sriov_wanted = efx_ef10_sriov_wanted,

	.sriov_reset = efx_ef10_sriov_reset,



	.revision = EFX_REV_HUNT_A0,

	.max_dma_mask = DMA_BIT_MASK(ESF_DZ_TX_KER_BUF_ADDR_WIDTH),

drivers/net/ethernet/sfc/efx.c

+12 −10
Original line number Diff line number Diff line
@@ -1314,7 +1314,7 @@ static unsigned int efx_wanted_parallelism(struct efx_nic *efx) 
	/* If RSS is requested for the PF *and* VFs then we can't write RSS

	 * table entries that are inaccessible to VFs

	 */

	if (efx_sriov_wanted(efx) && efx_vf_size(efx) > 1 &&

	if (efx->type->sriov_wanted(efx) && efx_vf_size(efx) > 1 &&

	    count > efx_vf_size(efx)) {

		netif_warn(efx, probe, efx->net_dev,

			   "Reducing number of RSS channels from %u to %u for "
@@ -1426,7 +1426,9 @@ static int efx_probe_interrupts(struct efx_nic *efx) 
	}



	/* RSS might be usable on VFs even if it is disabled on the PF */

	efx->rss_spread = ((efx->n_rx_channels > 1 || !efx_sriov_wanted(efx)) ?



	efx->rss_spread = ((efx->n_rx_channels > 1 ||

			    !efx->type->sriov_wanted(efx)) ?

			   efx->n_rx_channels : efx_vf_size(efx));



	return 0;
@@ -2166,7 +2168,7 @@ static int efx_set_mac_address(struct net_device *net_dev, void *data) 
	}



	ether_addr_copy(net_dev->dev_addr, new_addr);

	efx_sriov_mac_address_changed(efx);

	efx->type->sriov_mac_address_changed(efx);



	/* Reconfigure the MAC */

	mutex_lock(&efx->mac_lock);
@@ -2210,10 +2212,10 @@ static const struct net_device_ops efx_farch_netdev_ops = { 
	.ndo_set_rx_mode	= efx_set_rx_mode,

	.ndo_set_features	= efx_set_features,

#ifdef CONFIG_SFC_SRIOV

	.ndo_set_vf_mac		= efx_sriov_set_vf_mac,

	.ndo_set_vf_vlan	= efx_sriov_set_vf_vlan,

	.ndo_set_vf_spoofchk	= efx_sriov_set_vf_spoofchk,

	.ndo_get_vf_config	= efx_sriov_get_vf_config,

	.ndo_set_vf_mac		= efx_siena_sriov_set_vf_mac,

	.ndo_set_vf_vlan	= efx_siena_sriov_set_vf_vlan,

	.ndo_set_vf_spoofchk	= efx_siena_sriov_set_vf_spoofchk,

	.ndo_get_vf_config	= efx_siena_sriov_get_vf_config,

#endif

#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_poll_controller = efx_netpoll,
@@ -2433,7 +2435,7 @@ int efx_reset_up(struct efx_nic *efx, enum reset_type method, bool ok) 
	if (rc)

		goto fail;

	efx_restore_filters(efx);

	efx_sriov_reset(efx);

	efx->type->sriov_reset(efx);



	mutex_unlock(&efx->mac_lock);
@@ -2826,7 +2828,7 @@ static void efx_pci_remove(struct pci_dev *pci_dev) 
	efx_disable_interrupts(efx);

	rtnl_unlock();



	efx_sriov_fini(efx);

	efx->type->sriov_fini(efx);

	efx_unregister_netdev(efx);



	efx_mtd_remove(efx);
@@ -3023,7 +3025,7 @@ static int efx_pci_probe(struct pci_dev *pci_dev, 
	if (rc)

		goto fail4;



	rc = efx_sriov_init(efx);

	rc = efx->type->sriov_init(efx);

	if (rc)

		netif_err(efx, probe, efx->net_dev,

			  "SR-IOV can't be enabled rc %d\n", rc);

drivers/net/ethernet/sfc/falcon.c

+10 −0
Original line number Diff line number Diff line
@@ -2766,6 +2766,11 @@ const struct efx_nic_type falcon_a1_nic_type = { 
	.mtd_write = falcon_mtd_write,

	.mtd_sync = falcon_mtd_sync,

#endif

	.sriov_init = efx_falcon_sriov_init,

	.sriov_fini = efx_falcon_sriov_fini,

	.sriov_mac_address_changed = efx_falcon_sriov_mac_address_changed,

	.sriov_wanted = efx_falcon_sriov_wanted,

	.sriov_reset = efx_falcon_sriov_reset,



	.revision = EFX_REV_FALCON_A1,

	.txd_ptr_tbl_base = FR_AA_TX_DESC_PTR_TBL_KER,
@@ -2862,6 +2867,11 @@ const struct efx_nic_type falcon_b0_nic_type = { 
	.mtd_write = falcon_mtd_write,

	.mtd_sync = falcon_mtd_sync,

#endif

	.sriov_init = efx_falcon_sriov_init,

	.sriov_fini = efx_falcon_sriov_fini,

	.sriov_mac_address_changed = efx_falcon_sriov_mac_address_changed,

	.sriov_wanted = efx_falcon_sriov_wanted,

	.sriov_reset = efx_falcon_sriov_reset,



	.revision = EFX_REV_FALCON_B0,

	.txd_ptr_tbl_base = FR_BZ_TX_DESC_PTR_TBL,

drivers/net/ethernet/sfc/farch.c

+17 −10
Original line number Diff line number Diff line
@@ -226,6 +226,9 @@ static int efx_alloc_special_buffer(struct efx_nic *efx, 
				    struct efx_special_buffer *buffer,

				    unsigned int len)

{

#ifdef CONFIG_SFC_SRIOV

	struct siena_nic_data *nic_data = efx->nic_data;

#endif

	len = ALIGN(len, EFX_BUF_SIZE);



	if (efx_nic_alloc_buffer(efx, &buffer->buf, len, GFP_KERNEL))
@@ -237,8 +240,8 @@ static int efx_alloc_special_buffer(struct efx_nic *efx, 
	buffer->index = efx->next_buffer_table;

	efx->next_buffer_table += buffer->entries;

#ifdef CONFIG_SFC_SRIOV

	BUG_ON(efx_sriov_enabled(efx) &&

	       efx->vf_buftbl_base < efx->next_buffer_table);

	BUG_ON(efx_siena_sriov_enabled(efx) &&

	       nic_data->vf_buftbl_base < efx->next_buffer_table);

#endif



	netif_dbg(efx, probe, efx->net_dev,
@@ -667,7 +670,7 @@ static int efx_farch_do_flush(struct efx_nic *efx) 
		 * the firmware (though we will still have to poll for

		 * completion). If that fails, fall back to the old scheme.

		 */

		if (efx_sriov_enabled(efx)) {

		if (efx_siena_sriov_enabled(efx)) {

			rc = efx_mcdi_flush_rxqs(efx);

			if (!rc)

				goto wait;
@@ -1195,13 +1198,13 @@ efx_farch_handle_driver_event(struct efx_channel *channel, efx_qword_t *event) 
		netif_vdbg(efx, hw, efx->net_dev, "channel %d TXQ %d flushed\n",

			   channel->channel, ev_sub_data);

		efx_farch_handle_tx_flush_done(efx, event);

		efx_sriov_tx_flush_done(efx, event);

		efx_siena_sriov_tx_flush_done(efx, event);

		break;

	case FSE_AZ_RX_DESCQ_FLS_DONE_EV:

		netif_vdbg(efx, hw, efx->net_dev, "channel %d RXQ %d flushed\n",

			   channel->channel, ev_sub_data);

		efx_farch_handle_rx_flush_done(efx, event);

		efx_sriov_rx_flush_done(efx, event);

		efx_siena_sriov_rx_flush_done(efx, event);

		break;

	case FSE_AZ_EVQ_INIT_DONE_EV:

		netif_dbg(efx, hw, efx->net_dev,
@@ -1240,7 +1243,7 @@ efx_farch_handle_driver_event(struct efx_channel *channel, efx_qword_t *event) 
				  ev_sub_data);

			efx_schedule_reset(efx, RESET_TYPE_DMA_ERROR);

		} else

			efx_sriov_desc_fetch_err(efx, ev_sub_data);

			efx_siena_sriov_desc_fetch_err(efx, ev_sub_data);

		break;

	case FSE_BZ_TX_DSC_ERROR_EV:

		if (ev_sub_data < EFX_VI_BASE) {
@@ -1250,7 +1253,7 @@ efx_farch_handle_driver_event(struct efx_channel *channel, efx_qword_t *event) 
				  ev_sub_data);

			efx_schedule_reset(efx, RESET_TYPE_DMA_ERROR);

		} else

			efx_sriov_desc_fetch_err(efx, ev_sub_data);

			efx_siena_sriov_desc_fetch_err(efx, ev_sub_data);

		break;

	default:

		netif_vdbg(efx, hw, efx->net_dev,
@@ -1315,7 +1318,7 @@ int efx_farch_ev_process(struct efx_channel *channel, int budget) 
			efx_farch_handle_driver_event(channel, &event);

			break;

		case FSE_CZ_EV_CODE_USER_EV:

			efx_sriov_event(channel, &event);

			efx_siena_sriov_event(channel, &event);

			break;

		case FSE_CZ_EV_CODE_MCDI_EV:

			efx_mcdi_process_event(channel, &event);
@@ -1668,6 +1671,10 @@ void efx_farch_dimension_resources(struct efx_nic *efx, unsigned sram_lim_qw) 
{

	unsigned vi_count, buftbl_min;



#ifdef CONFIG_SFC_SRIOV

	struct siena_nic_data *nic_data = efx->nic_data;

#endif



	/* Account for the buffer table entries backing the datapath channels

	 * and the descriptor caches for those channels.

	 */
@@ -1678,10 +1685,10 @@ void efx_farch_dimension_resources(struct efx_nic *efx, unsigned sram_lim_qw) 
	vi_count = max(efx->n_channels, efx->n_tx_channels * EFX_TXQ_TYPES);



#ifdef CONFIG_SFC_SRIOV

	if (efx_sriov_wanted(efx)) {

	if (efx->type->sriov_wanted(efx)) {

		unsigned vi_dc_entries, buftbl_free, entries_per_vf, vf_limit;



		efx->vf_buftbl_base = buftbl_min;

		nic_data->vf_buftbl_base = buftbl_min;



		vi_dc_entries = RX_DC_ENTRIES + TX_DC_ENTRIES;

		vi_count = max(vi_count, EFX_VI_BASE);

drivers/net/ethernet/sfc/mcdi.c

+1 −1
Original line number Diff line number Diff line
@@ -1035,7 +1035,7 @@ void efx_mcdi_process_event(struct efx_channel *channel, 
		/* MAC stats are gather lazily.  We can ignore this. */

		break;

	case MCDI_EVENT_CODE_FLR:

		efx_sriov_flr(efx, MCDI_EVENT_FIELD(*event, FLR_VF));

		efx_siena_sriov_flr(efx, MCDI_EVENT_FIELD(*event, FLR_VF));

		break;

	case MCDI_EVENT_CODE_PTP_RX:

	case MCDI_EVENT_CODE_PTP_FAULT:

CRA Git | Maintained and supported by SUSTech CRA and CCSE