Commit cf06766f authored by Jonathan Cooper's avatar Jonathan Cooper Committed by Jakub Kicinski
Browse files

sfc: Add X4 PF support 



Add X4 series. Most functionality is the same as previous
EF10 nics but enough is different to warrant a new nic type struct
and revision; for example legacy interrupts and SRIOV are
not supported.

Most removed features will be re-added later as new implementations.

Signed-off-by: default avatarJonathan Cooper <jonathan.s.cooper@amd.com>
Acked-by: default avatarEdward Cree <ecree.xilinx@gmail.com>
Acked-by: default avatarMartin Habets <habetsm.xilinx@gmail.com>
Link: https://patch.msgid.link/20240910153014.12803-1-jonathan.s.cooper@amd.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent af647fe2

drivers/net/ethernet/sfc/ef10.c

+127 −0
Original line number Diff line number Diff line
@@ -4302,3 +4302,130 @@ const struct efx_nic_type efx_hunt_a0_nic_type = { 
	.sensor_event = efx_mcdi_sensor_event,

	.rx_recycle_ring_size = efx_ef10_recycle_ring_size,

};



const struct efx_nic_type efx_x4_nic_type = {

	.is_vf = false,

	.mem_bar = efx_ef10_pf_mem_bar,

	.mem_map_size = efx_ef10_mem_map_size,

	.probe = efx_ef10_probe_pf,

	.remove = efx_ef10_remove,

	.dimension_resources = efx_ef10_dimension_resources,

	.init = efx_ef10_init_nic,

	.fini = efx_ef10_fini_nic,

	.map_reset_reason = efx_ef10_map_reset_reason,

	.map_reset_flags = efx_ef10_map_reset_flags,

	.reset = efx_ef10_reset,

	.probe_port = efx_mcdi_port_probe,

	.remove_port = efx_mcdi_port_remove,

	.fini_dmaq = efx_fini_dmaq,

	.prepare_flr = efx_ef10_prepare_flr,

	.finish_flr = efx_port_dummy_op_void,

	.describe_stats = efx_ef10_describe_stats,

	.update_stats = efx_ef10_update_stats_pf,

	.start_stats = efx_mcdi_mac_start_stats,

	.pull_stats = efx_mcdi_mac_pull_stats,

	.stop_stats = efx_mcdi_mac_stop_stats,

	.push_irq_moderation = efx_ef10_push_irq_moderation,

	.reconfigure_mac = efx_ef10_mac_reconfigure,

	.check_mac_fault = efx_mcdi_mac_check_fault,

	.reconfigure_port = efx_mcdi_port_reconfigure,

	.get_wol = efx_ef10_get_wol,

	.set_wol = efx_ef10_set_wol,

	.resume_wol = efx_port_dummy_op_void,

	.get_fec_stats = efx_ef10_get_fec_stats,

	.test_chip = efx_ef10_test_chip,

	.test_nvram = efx_mcdi_nvram_test_all,

	.mcdi_request = efx_ef10_mcdi_request,

	.mcdi_poll_response = efx_ef10_mcdi_poll_response,

	.mcdi_read_response = efx_ef10_mcdi_read_response,

	.mcdi_poll_reboot = efx_ef10_mcdi_poll_reboot,

	.mcdi_reboot_detected = efx_ef10_mcdi_reboot_detected,

	.irq_enable_master = efx_port_dummy_op_void,

	.irq_test_generate = efx_ef10_irq_test_generate,

	.irq_disable_non_ev = efx_port_dummy_op_void,

	.irq_handle_msi = efx_ef10_msi_interrupt,

	.tx_probe = efx_ef10_tx_probe,

	.tx_init = efx_ef10_tx_init,

	.tx_write = efx_ef10_tx_write,

	.tx_limit_len = efx_ef10_tx_limit_len,

	.tx_enqueue = __efx_enqueue_skb,

	.rx_push_rss_config = efx_mcdi_pf_rx_push_rss_config,

	.rx_pull_rss_config = efx_mcdi_rx_pull_rss_config,

	.rx_push_rss_context_config = efx_mcdi_rx_push_rss_context_config,

	.rx_pull_rss_context_config = efx_mcdi_rx_pull_rss_context_config,

	.rx_restore_rss_contexts = efx_mcdi_rx_restore_rss_contexts,

	.rx_probe = efx_mcdi_rx_probe,

	.rx_init = efx_mcdi_rx_init,

	.rx_remove = efx_mcdi_rx_remove,

	.rx_write = efx_ef10_rx_write,

	.rx_defer_refill = efx_ef10_rx_defer_refill,

	.rx_packet = __efx_rx_packet,

	.ev_probe = efx_mcdi_ev_probe,

	.ev_init = efx_ef10_ev_init,

	.ev_fini = efx_mcdi_ev_fini,

	.ev_remove = efx_mcdi_ev_remove,

	.ev_process = efx_ef10_ev_process,

	.ev_read_ack = efx_ef10_ev_read_ack,

	.ev_test_generate = efx_ef10_ev_test_generate,

	.filter_table_probe = efx_ef10_filter_table_probe,

	.filter_table_restore = efx_mcdi_filter_table_restore,

	.filter_table_remove = efx_ef10_filter_table_remove,

	.filter_insert = efx_mcdi_filter_insert,

	.filter_remove_safe = efx_mcdi_filter_remove_safe,

	.filter_get_safe = efx_mcdi_filter_get_safe,

	.filter_clear_rx = efx_mcdi_filter_clear_rx,

	.filter_count_rx_used = efx_mcdi_filter_count_rx_used,

	.filter_get_rx_id_limit = efx_mcdi_filter_get_rx_id_limit,

	.filter_get_rx_ids = efx_mcdi_filter_get_rx_ids,

#ifdef CONFIG_RFS_ACCEL

	.filter_rfs_expire_one = efx_mcdi_filter_rfs_expire_one,

#endif

#ifdef CONFIG_SFC_MTD

	.mtd_probe = efx_ef10_mtd_probe,

	.mtd_rename = efx_mcdi_mtd_rename,

	.mtd_read = efx_mcdi_mtd_read,

	.mtd_erase = efx_mcdi_mtd_erase,

	.mtd_write = efx_mcdi_mtd_write,

	.mtd_sync = efx_mcdi_mtd_sync,

#endif

	.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,

	.vlan_rx_add_vid = efx_ef10_vlan_rx_add_vid,

	.vlan_rx_kill_vid = efx_ef10_vlan_rx_kill_vid,

	.udp_tnl_push_ports = efx_ef10_udp_tnl_push_ports,

	.udp_tnl_has_port = efx_ef10_udp_tnl_has_port,

#ifdef CONFIG_SFC_SRIOV

	/* currently set to the VF versions of these functions

	 * because SRIOV will be reimplemented later.

	 */

	.vswitching_probe = efx_ef10_vswitching_probe_vf,

	.vswitching_restore = efx_ef10_vswitching_restore_vf,

	.vswitching_remove = efx_ef10_vswitching_remove_vf,

#endif

	.get_mac_address = efx_ef10_get_mac_address_pf,

	.set_mac_address = efx_ef10_set_mac_address,

	.tso_versions = efx_ef10_tso_versions,



	.get_phys_port_id = efx_ef10_get_phys_port_id,

	.revision = EFX_REV_X4,

	.max_dma_mask = DMA_BIT_MASK(ESF_DZ_TX_KER_BUF_ADDR_WIDTH),

	.rx_prefix_size = ES_DZ_RX_PREFIX_SIZE,

	.rx_hash_offset = ES_DZ_RX_PREFIX_HASH_OFST,

	.rx_ts_offset = ES_DZ_RX_PREFIX_TSTAMP_OFST,

	.can_rx_scatter = true,

	.always_rx_scatter = true,

	.option_descriptors = true,

	.min_interrupt_mode = EFX_INT_MODE_MSIX,

	.timer_period_max = 1 << ERF_DD_EVQ_IND_TIMER_VAL_WIDTH,

	.offload_features = EF10_OFFLOAD_FEATURES,

	.mcdi_max_ver = 2,

	.max_rx_ip_filters = EFX_MCDI_FILTER_TBL_ROWS,

	.hwtstamp_filters = 1 << HWTSTAMP_FILTER_NONE |

			    1 << HWTSTAMP_FILTER_ALL,

	.check_caps = ef10_check_caps,

	.print_additional_fwver = efx_ef10_print_additional_fwver,

	.sensor_event = efx_mcdi_sensor_event,

	.rx_recycle_ring_size = efx_ef10_recycle_ring_size,

};

drivers/net/ethernet/sfc/efx.c

+4 −0
Original line number Diff line number Diff line
@@ -821,6 +821,10 @@ static const struct pci_device_id efx_pci_table[] = { 
	 .driver_data = (unsigned long) &efx_hunt_a0_nic_type},

	{PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, 0x1b03),  /* SFC9250 VF */

	 .driver_data = (unsigned long) &efx_hunt_a0_vf_nic_type},

	{PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, 0x0c03),  /* X4 PF (FF/LL) */

	 .driver_data = (unsigned long)&efx_x4_nic_type},

	{PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, 0x2c03),  /* X4 PF (FF only) */

	 .driver_data = (unsigned long)&efx_x4_nic_type},

	{0}			/* end of list */

};

drivers/net/ethernet/sfc/nic.h

+2 −0
Original line number Diff line number Diff line
@@ -211,4 +211,6 @@ int efx_ef10_tx_tso_desc(struct efx_tx_queue *tx_queue, struct sk_buff *skb, 
extern const struct efx_nic_type efx_hunt_a0_nic_type;

extern const struct efx_nic_type efx_hunt_a0_vf_nic_type;



extern const struct efx_nic_type efx_x4_nic_type;



#endif /* EFX_NIC_H */

drivers/net/ethernet/sfc/nic_common.h

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ enum { 
	 */

	EFX_REV_HUNT_A0 = 4,

	EFX_REV_EF100 = 5,

	EFX_REV_X4 = 6,

};



static inline int efx_nic_rev(struct efx_nic *efx)