sfc: Allocate SRAM between buffer table and descriptor caches at init time (28e47c49) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/net/ethernet/sfc/efx.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1420,6 +1420,8 @@ static int efx_probe_nic(struct efx_nic *efx)
	if (rc)		if (rc)
	goto fail;		goto fail;

			efx->type->dimension_resources(efx);

	if (efx->n_channels > 1)		if (efx->n_channels > 1)
	get_random_bytes(&efx->rx_hash_key, sizeof(efx->rx_hash_key));		get_random_bytes(&efx->rx_hash_key, sizeof(efx->rx_hash_key));
	for (i = 0; i < ARRAY_SIZE(efx->rx_indir_table); i++)		for (i = 0; i < ARRAY_SIZE(efx->rx_indir_table); i++)

drivers/net/ethernet/sfc/falcon.c

+8 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1333,6 +1333,12 @@ static int falcon_probe_nvconfig(struct efx_nic *efx)
	return rc;		return rc;
	}		}

			static void falcon_dimension_resources(struct efx_nic *efx)
			{
			efx->rx_dc_base = 0x20000;
			efx->tx_dc_base = 0x26000;
			}

	/* Probe all SPI devices on the NIC */		/* Probe all SPI devices on the NIC */
	static void falcon_probe_spi_devices(struct efx_nic *efx)		static void falcon_probe_spi_devices(struct efx_nic *efx)
	{		{
	@@ -1749,6 +1755,7 @@ const struct efx_nic_type falcon_a1_nic_type = {
	.probe = falcon_probe_nic,		.probe = falcon_probe_nic,
	.remove = falcon_remove_nic,		.remove = falcon_remove_nic,
	.init = falcon_init_nic,		.init = falcon_init_nic,
			.dimension_resources = falcon_dimension_resources,
	.fini = efx_port_dummy_op_void,		.fini = efx_port_dummy_op_void,
	.monitor = falcon_monitor,		.monitor = falcon_monitor,
	.map_reset_reason = falcon_map_reset_reason,		.map_reset_reason = falcon_map_reset_reason,
	@@ -1783,8 +1790,6 @@ const struct efx_nic_type falcon_a1_nic_type = {
	.max_interrupt_mode = EFX_INT_MODE_MSI,		.max_interrupt_mode = EFX_INT_MODE_MSI,
	.phys_addr_channels = 4,		.phys_addr_channels = 4,
	.timer_period_max = 1 << FRF_AB_TC_TIMER_VAL_WIDTH,		.timer_period_max = 1 << FRF_AB_TC_TIMER_VAL_WIDTH,
	.tx_dc_base = 0x130000,
	.rx_dc_base = 0x100000,
	.offload_features = NETIF_F_IP_CSUM,		.offload_features = NETIF_F_IP_CSUM,
	};		};

	@@ -1792,6 +1797,7 @@ const struct efx_nic_type falcon_b0_nic_type = {
	.probe = falcon_probe_nic,		.probe = falcon_probe_nic,
	.remove = falcon_remove_nic,		.remove = falcon_remove_nic,
	.init = falcon_init_nic,		.init = falcon_init_nic,
			.dimension_resources = falcon_dimension_resources,
	.fini = efx_port_dummy_op_void,		.fini = efx_port_dummy_op_void,
	.monitor = falcon_monitor,		.monitor = falcon_monitor,
	.map_reset_reason = falcon_map_reset_reason,		.map_reset_reason = falcon_map_reset_reason,
	@@ -1835,8 +1841,6 @@ const struct efx_nic_type falcon_b0_nic_type = {
	* interrupt handler only supports 32		* interrupt handler only supports 32
	* channels */		* channels */
	.timer_period_max = 1 << FRF_AB_TC_TIMER_VAL_WIDTH,		.timer_period_max = 1 << FRF_AB_TC_TIMER_VAL_WIDTH,
	.tx_dc_base = 0x130000,
	.rx_dc_base = 0x100000,
	.offload_features = NETIF_F_IP_CSUM \| NETIF_F_RXHASH \| NETIF_F_NTUPLE,		.offload_features = NETIF_F_IP_CSUM \| NETIF_F_RXHASH \| NETIF_F_NTUPLE,
	};		};

drivers/net/ethernet/sfc/net_driver.h

+9 −4

Original line number	Original line	Diff line number	Diff line
	@@ -658,6 +658,9 @@ struct efx_filter_state;
	* should be allocated for this NIC		* should be allocated for this NIC
	* @rxq_entries: Size of receive queues requested by user.		* @rxq_entries: Size of receive queues requested by user.
	* @txq_entries: Size of transmit queues requested by user.		* @txq_entries: Size of transmit queues requested by user.
			* @tx_dc_base: Base qword address in SRAM of TX queue descriptor caches
			* @rx_dc_base: Base qword address in SRAM of RX queue descriptor caches
			* @sram_lim_qw: Qword address limit of SRAM
	* @next_buffer_table: First available buffer table id		* @next_buffer_table: First available buffer table id
	* @n_channels: Number of channels in use		* @n_channels: Number of channels in use
	* @n_rx_channels: Number of channels used for RX (= number of RX queues)		* @n_rx_channels: Number of channels used for RX (= number of RX queues)
	@@ -753,6 +756,9 @@ struct efx_nic {

	unsigned rxq_entries;		unsigned rxq_entries;
	unsigned txq_entries;		unsigned txq_entries;
			unsigned tx_dc_base;
			unsigned rx_dc_base;
			unsigned sram_lim_qw;
	unsigned next_buffer_table;		unsigned next_buffer_table;
	unsigned n_channels;		unsigned n_channels;
	unsigned n_rx_channels;		unsigned n_rx_channels;
	@@ -839,6 +845,8 @@ static inline unsigned int efx_port_num(struct efx_nic *efx)
	* @probe: Probe the controller		* @probe: Probe the controller
	* @remove: Free resources allocated by probe()		* @remove: Free resources allocated by probe()
	* @init: Initialise the controller		* @init: Initialise the controller
			* @dimension_resources: Dimension controller resources (buffer table,
			* and VIs once the available interrupt resources are clear)
	* @fini: Shut down the controller		* @fini: Shut down the controller
	* @monitor: Periodic function for polling link state and hardware monitor		* @monitor: Periodic function for polling link state and hardware monitor
	* @map_reset_reason: Map ethtool reset reason to a reset method		* @map_reset_reason: Map ethtool reset reason to a reset method
	@@ -878,8 +886,6 @@ static inline unsigned int efx_port_num(struct efx_nic *efx)
	* @phys_addr_channels: Number of channels with physically addressed		* @phys_addr_channels: Number of channels with physically addressed
	* descriptors		* descriptors
	* @timer_period_max: Maximum period of interrupt timer (in ticks)		* @timer_period_max: Maximum period of interrupt timer (in ticks)
	* @tx_dc_base: Base address in SRAM of TX queue descriptor caches
	* @rx_dc_base: Base address in SRAM of RX queue descriptor caches
	* @offload_features: net_device feature flags for protocol offload		* @offload_features: net_device feature flags for protocol offload
	* features implemented in hardware		* features implemented in hardware
	*/		*/
	@@ -887,6 +893,7 @@ struct efx_nic_type {
	int (probe)(struct efx_nic efx);		int (probe)(struct efx_nic efx);
	void (remove)(struct efx_nic efx);		void (remove)(struct efx_nic efx);
	int (init)(struct efx_nic efx);		int (init)(struct efx_nic efx);
			void (dimension_resources)(struct efx_nic efx);
	void (fini)(struct efx_nic efx);		void (fini)(struct efx_nic efx);
	void (monitor)(struct efx_nic efx);		void (monitor)(struct efx_nic efx);
	enum reset_type (*map_reset_reason)(enum reset_type reason);		enum reset_type (*map_reset_reason)(enum reset_type reason);
	@@ -923,8 +930,6 @@ struct efx_nic_type {
	unsigned int max_interrupt_mode;		unsigned int max_interrupt_mode;
	unsigned int phys_addr_channels;		unsigned int phys_addr_channels;
	unsigned int timer_period_max;		unsigned int timer_period_max;
	unsigned int tx_dc_base;
	unsigned int rx_dc_base;
	netdev_features_t offload_features;		netdev_features_t offload_features;
	};		};

drivers/net/ethernet/sfc/nic.c

+19 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1609,6 +1609,23 @@ void efx_nic_fini_interrupt(struct efx_nic *efx)
	free_irq(efx->legacy_irq, efx);		free_irq(efx->legacy_irq, efx);
	}		}

			void efx_nic_dimension_resources(struct efx_nic *efx, unsigned sram_lim_qw)
			{
			unsigned vi_count, buftbl_min;

			/* Account for the buffer table entries backing the datapath channels
			* and the descriptor caches for those channels.
			*/
			buftbl_min = ((efx->n_rx_channels * EFX_MAX_DMAQ_SIZE +
			efx->n_tx_channels * EFX_TXQ_TYPES * EFX_MAX_DMAQ_SIZE +
			efx->n_channels * EFX_MAX_EVQ_SIZE)
			* sizeof(efx_qword_t) / EFX_BUF_SIZE);
			vi_count = max(efx->n_channels, efx->n_tx_channels * EFX_TXQ_TYPES);

			efx->tx_dc_base = sram_lim_qw - vi_count * TX_DC_ENTRIES;
			efx->rx_dc_base = efx->tx_dc_base - vi_count * RX_DC_ENTRIES;
			}

	u32 efx_nic_fpga_ver(struct efx_nic *efx)		u32 efx_nic_fpga_ver(struct efx_nic *efx)
	{		{
	efx_oword_t altera_build;		efx_oword_t altera_build;
	@@ -1621,11 +1638,9 @@ void efx_nic_init_common(struct efx_nic *efx)
	efx_oword_t temp;		efx_oword_t temp;

	/* Set positions of descriptor caches in SRAM. */		/* Set positions of descriptor caches in SRAM. */
	EFX_POPULATE_OWORD_1(temp, FRF_AZ_SRM_TX_DC_BASE_ADR,		EFX_POPULATE_OWORD_1(temp, FRF_AZ_SRM_TX_DC_BASE_ADR, efx->tx_dc_base);
	efx->type->tx_dc_base / 8);
	efx_writeo(efx, &temp, FR_AZ_SRM_TX_DC_CFG);		efx_writeo(efx, &temp, FR_AZ_SRM_TX_DC_CFG);
	EFX_POPULATE_OWORD_1(temp, FRF_AZ_SRM_RX_DC_BASE_ADR,		EFX_POPULATE_OWORD_1(temp, FRF_AZ_SRM_RX_DC_BASE_ADR, efx->rx_dc_base);
	efx->type->rx_dc_base / 8);
	efx_writeo(efx, &temp, FR_AZ_SRM_RX_DC_CFG);		efx_writeo(efx, &temp, FR_AZ_SRM_RX_DC_CFG);

	/* Set TX descriptor cache size. */		/* Set TX descriptor cache size. */

drivers/net/ethernet/sfc/nic.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -230,6 +230,8 @@ extern void falcon_start_nic_stats(struct efx_nic *efx);
	extern void falcon_stop_nic_stats(struct efx_nic *efx);		extern void falcon_stop_nic_stats(struct efx_nic *efx);
	extern void falcon_setup_xaui(struct efx_nic *efx);		extern void falcon_setup_xaui(struct efx_nic *efx);
	extern int falcon_reset_xaui(struct efx_nic *efx);		extern int falcon_reset_xaui(struct efx_nic *efx);
			extern void
			efx_nic_dimension_resources(struct efx_nic *efx, unsigned sram_lim_qw);
	extern void efx_nic_init_common(struct efx_nic *efx);		extern void efx_nic_init_common(struct efx_nic *efx);
	extern void efx_nic_push_rx_indir_table(struct efx_nic *efx);		extern void efx_nic_push_rx_indir_table(struct efx_nic *efx);