projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7e77359)
sfc: Move EF100 efx_nic_type structs to the end of the file
authorJonathan Cooper <jonathan.s.cooper@amd.com>
Tue, 28 Jun 2022 14:00:10 +0000 (15:00 +0100)
committerDavid S. Miller <davem@davemloft.net>
Wed, 29 Jun 2022 12:40:47 +0000 (13:40 +0100)
This avoids a forward declaration in a subsequent patch.

Signed-off-by: Jonathan Cooper <jonathan.s.cooper@amd.com>
Co-developed-by: Martin Habets <habetsm.xilinx@gmail.com>
Signed-off-by: Martin Habets <habetsm.xilinx@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/sfc/ef100_nic.c patch | blob | history

diff --git a/drivers/net/ethernet/sfc/ef100_nic.c b/drivers/net/ethernet/sfc/ef100_nic.c
index b2536d2..fcbc9de 100644 (file)
--- a/drivers/net/ethernet/sfc/ef100_nic.c
+++ b/drivers/net/ethernet/sfc/ef100_nic.c
@@ -704,178 +704,6 @@ static unsigned int efx_ef100_recycle_ring_size(const struct efx_nic *efx)
        return 10 * EFX_RECYCLE_RING_SIZE_10G;
 }
 
-/*     NIC level access functions
- */
-#define EF100_OFFLOAD_FEATURES (NETIF_F_HW_CSUM | NETIF_F_RXCSUM |     \
-       NETIF_F_HIGHDMA | NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_NTUPLE | \
-       NETIF_F_RXHASH | NETIF_F_RXFCS | NETIF_F_TSO_ECN | NETIF_F_RXALL | \
-       NETIF_F_HW_VLAN_CTAG_TX)
-
-const struct efx_nic_type ef100_pf_nic_type = {
-       .revision = EFX_REV_EF100,
-       .is_vf = false,
-       .probe = ef100_probe_pf,
-       .offload_features = EF100_OFFLOAD_FEATURES,
-       .mcdi_max_ver = 2,
-       .mcdi_request = ef100_mcdi_request,
-       .mcdi_poll_response = ef100_mcdi_poll_response,
-       .mcdi_read_response = ef100_mcdi_read_response,
-       .mcdi_poll_reboot = ef100_mcdi_poll_reboot,
-       .mcdi_reboot_detected = ef100_mcdi_reboot_detected,
-       .irq_enable_master = efx_port_dummy_op_void,
-       .irq_test_generate = efx_ef100_irq_test_generate,
-       .irq_disable_non_ev = efx_port_dummy_op_void,
-       .push_irq_moderation = efx_channel_dummy_op_void,
-       .min_interrupt_mode = EFX_INT_MODE_MSIX,
-       .map_reset_reason = ef100_map_reset_reason,
-       .map_reset_flags = ef100_map_reset_flags,
-       .reset = ef100_reset,
-
-       .check_caps = ef100_check_caps,
-
-       .ev_probe = ef100_ev_probe,
-       .ev_init = ef100_ev_init,
-       .ev_fini = efx_mcdi_ev_fini,
-       .ev_remove = efx_mcdi_ev_remove,
-       .irq_handle_msi = ef100_msi_interrupt,
-       .ev_process = ef100_ev_process,
-       .ev_read_ack = ef100_ev_read_ack,
-       .ev_test_generate = efx_ef100_ev_test_generate,
-       .tx_probe = ef100_tx_probe,
-       .tx_init = ef100_tx_init,
-       .tx_write = ef100_tx_write,
-       .tx_enqueue = ef100_enqueue_skb,
-       .rx_probe = efx_mcdi_rx_probe,
-       .rx_init = efx_mcdi_rx_init,
-       .rx_remove = efx_mcdi_rx_remove,
-       .rx_write = ef100_rx_write,
-       .rx_packet = __ef100_rx_packet,
-       .rx_buf_hash_valid = ef100_rx_buf_hash_valid,
-       .fini_dmaq = efx_fini_dmaq,
-       .max_rx_ip_filters = EFX_MCDI_FILTER_TBL_ROWS,
-       .filter_table_probe = ef100_filter_table_up,
-       .filter_table_restore = efx_mcdi_filter_table_restore,
-       .filter_table_remove = ef100_filter_table_down,
-       .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
-
-       .get_phys_port_id = efx_ef100_get_phys_port_id,
-
-       .rx_prefix_size = ESE_GZ_RX_PKT_PREFIX_LEN,
-       .rx_hash_offset = ESF_GZ_RX_PREFIX_RSS_HASH_LBN / 8,
-       .rx_ts_offset = ESF_GZ_RX_PREFIX_PARTIAL_TSTAMP_LBN / 8,
-       .rx_hash_key_size = 40,
-       .rx_pull_rss_config = efx_mcdi_rx_pull_rss_config,
-       .rx_push_rss_config = efx_mcdi_pf_rx_push_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_recycle_ring_size = efx_ef100_recycle_ring_size,
-
-       .reconfigure_mac = ef100_reconfigure_mac,
-       .reconfigure_port = efx_mcdi_port_reconfigure,
-       .test_nvram = efx_new_mcdi_nvram_test_all,
-       .describe_stats = ef100_describe_stats,
-       .start_stats = efx_mcdi_mac_start_stats,
-       .update_stats = ef100_update_stats,
-       .pull_stats = efx_mcdi_mac_pull_stats,
-       .stop_stats = efx_mcdi_mac_stop_stats,
-#ifdef CONFIG_SFC_SRIOV
-       .sriov_configure = efx_ef100_sriov_configure,
-#endif
-
-       /* Per-type bar/size configuration not used on ef100. Location of
-        * registers is defined by extended capabilities.
-        */
-       .mem_bar = NULL,
-       .mem_map_size = NULL,
-
-};
-
-const struct efx_nic_type ef100_vf_nic_type = {
-       .revision = EFX_REV_EF100,
-       .is_vf = true,
-       .probe = ef100_probe_vf,
-       .offload_features = EF100_OFFLOAD_FEATURES,
-       .mcdi_max_ver = 2,
-       .mcdi_request = ef100_mcdi_request,
-       .mcdi_poll_response = ef100_mcdi_poll_response,
-       .mcdi_read_response = ef100_mcdi_read_response,
-       .mcdi_poll_reboot = ef100_mcdi_poll_reboot,
-       .mcdi_reboot_detected = ef100_mcdi_reboot_detected,
-       .irq_enable_master = efx_port_dummy_op_void,
-       .irq_test_generate = efx_ef100_irq_test_generate,
-       .irq_disable_non_ev = efx_port_dummy_op_void,
-       .push_irq_moderation = efx_channel_dummy_op_void,
-       .min_interrupt_mode = EFX_INT_MODE_MSIX,
-       .map_reset_reason = ef100_map_reset_reason,
-       .map_reset_flags = ef100_map_reset_flags,
-       .reset = ef100_reset,
-       .check_caps = ef100_check_caps,
-       .ev_probe = ef100_ev_probe,
-       .ev_init = ef100_ev_init,
-       .ev_fini = efx_mcdi_ev_fini,
-       .ev_remove = efx_mcdi_ev_remove,
-       .irq_handle_msi = ef100_msi_interrupt,
-       .ev_process = ef100_ev_process,
-       .ev_read_ack = ef100_ev_read_ack,
-       .ev_test_generate = efx_ef100_ev_test_generate,
-       .tx_probe = ef100_tx_probe,
-       .tx_init = ef100_tx_init,
-       .tx_write = ef100_tx_write,
-       .tx_enqueue = ef100_enqueue_skb,
-       .rx_probe = efx_mcdi_rx_probe,
-       .rx_init = efx_mcdi_rx_init,
-       .rx_remove = efx_mcdi_rx_remove,
-       .rx_write = ef100_rx_write,
-       .rx_packet = __ef100_rx_packet,
-       .rx_buf_hash_valid = ef100_rx_buf_hash_valid,
-       .fini_dmaq = efx_fini_dmaq,
-       .max_rx_ip_filters = EFX_MCDI_FILTER_TBL_ROWS,
-       .filter_table_probe = ef100_filter_table_up,
-       .filter_table_restore = efx_mcdi_filter_table_restore,
-       .filter_table_remove = ef100_filter_table_down,
-       .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
-
-       .rx_prefix_size = ESE_GZ_RX_PKT_PREFIX_LEN,
-       .rx_hash_offset = ESF_GZ_RX_PREFIX_RSS_HASH_LBN / 8,
-       .rx_ts_offset = ESF_GZ_RX_PREFIX_PARTIAL_TSTAMP_LBN / 8,
-       .rx_hash_key_size = 40,
-       .rx_pull_rss_config = efx_mcdi_rx_pull_rss_config,
-       .rx_push_rss_config = efx_mcdi_pf_rx_push_rss_config,
-       .rx_restore_rss_contexts = efx_mcdi_rx_restore_rss_contexts,
-       .rx_recycle_ring_size = efx_ef100_recycle_ring_size,
-
-       .reconfigure_mac = ef100_reconfigure_mac,
-       .test_nvram = efx_new_mcdi_nvram_test_all,
-       .describe_stats = ef100_describe_stats,
-       .start_stats = efx_mcdi_mac_start_stats,
-       .update_stats = ef100_update_stats,
-       .pull_stats = efx_mcdi_mac_pull_stats,
-       .stop_stats = efx_mcdi_mac_stop_stats,
-
-       .mem_bar = NULL,
-       .mem_map_size = NULL,
-
-};
-
 static int compare_versions(const char *a, const char *b)
 {
        int a_major, a_minor, a_point, a_patch;
@@ -1303,3 +1131,175 @@ void ef100_remove(struct efx_nic *efx)
        kfree(nic_data);
        efx->nic_data = NULL;
 }
+
+/*     NIC level access functions
+ */
+#define EF100_OFFLOAD_FEATURES (NETIF_F_HW_CSUM | NETIF_F_RXCSUM |     \
+       NETIF_F_HIGHDMA | NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_NTUPLE | \
+       NETIF_F_RXHASH | NETIF_F_RXFCS | NETIF_F_TSO_ECN | NETIF_F_RXALL | \
+       NETIF_F_HW_VLAN_CTAG_TX)
+
+const struct efx_nic_type ef100_pf_nic_type = {
+       .revision = EFX_REV_EF100,
+       .is_vf = false,
+       .probe = ef100_probe_pf,
+       .offload_features = EF100_OFFLOAD_FEATURES,
+       .mcdi_max_ver = 2,
+       .mcdi_request = ef100_mcdi_request,
+       .mcdi_poll_response = ef100_mcdi_poll_response,
+       .mcdi_read_response = ef100_mcdi_read_response,
+       .mcdi_poll_reboot = ef100_mcdi_poll_reboot,
+       .mcdi_reboot_detected = ef100_mcdi_reboot_detected,
+       .irq_enable_master = efx_port_dummy_op_void,
+       .irq_test_generate = efx_ef100_irq_test_generate,
+       .irq_disable_non_ev = efx_port_dummy_op_void,
+       .push_irq_moderation = efx_channel_dummy_op_void,
+       .min_interrupt_mode = EFX_INT_MODE_MSIX,
+       .map_reset_reason = ef100_map_reset_reason,
+       .map_reset_flags = ef100_map_reset_flags,
+       .reset = ef100_reset,
+
+       .check_caps = ef100_check_caps,
+
+       .ev_probe = ef100_ev_probe,
+       .ev_init = ef100_ev_init,
+       .ev_fini = efx_mcdi_ev_fini,
+       .ev_remove = efx_mcdi_ev_remove,
+       .irq_handle_msi = ef100_msi_interrupt,
+       .ev_process = ef100_ev_process,
+       .ev_read_ack = ef100_ev_read_ack,
+       .ev_test_generate = efx_ef100_ev_test_generate,
+       .tx_probe = ef100_tx_probe,
+       .tx_init = ef100_tx_init,
+       .tx_write = ef100_tx_write,
+       .tx_enqueue = ef100_enqueue_skb,
+       .rx_probe = efx_mcdi_rx_probe,
+       .rx_init = efx_mcdi_rx_init,
+       .rx_remove = efx_mcdi_rx_remove,
+       .rx_write = ef100_rx_write,
+       .rx_packet = __ef100_rx_packet,
+       .rx_buf_hash_valid = ef100_rx_buf_hash_valid,
+       .fini_dmaq = efx_fini_dmaq,
+       .max_rx_ip_filters = EFX_MCDI_FILTER_TBL_ROWS,
+       .filter_table_probe = ef100_filter_table_up,
+       .filter_table_restore = efx_mcdi_filter_table_restore,
+       .filter_table_remove = ef100_filter_table_down,
+       .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
+
+       .get_phys_port_id = efx_ef100_get_phys_port_id,
+
+       .rx_prefix_size = ESE_GZ_RX_PKT_PREFIX_LEN,
+       .rx_hash_offset = ESF_GZ_RX_PREFIX_RSS_HASH_LBN / 8,
+       .rx_ts_offset = ESF_GZ_RX_PREFIX_PARTIAL_TSTAMP_LBN / 8,
+       .rx_hash_key_size = 40,
+       .rx_pull_rss_config = efx_mcdi_rx_pull_rss_config,
+       .rx_push_rss_config = efx_mcdi_pf_rx_push_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_recycle_ring_size = efx_ef100_recycle_ring_size,
+
+       .reconfigure_mac = ef100_reconfigure_mac,
+       .reconfigure_port = efx_mcdi_port_reconfigure,
+       .test_nvram = efx_new_mcdi_nvram_test_all,
+       .describe_stats = ef100_describe_stats,
+       .start_stats = efx_mcdi_mac_start_stats,
+       .update_stats = ef100_update_stats,
+       .pull_stats = efx_mcdi_mac_pull_stats,
+       .stop_stats = efx_mcdi_mac_stop_stats,
+#ifdef CONFIG_SFC_SRIOV
+       .sriov_configure = efx_ef100_sriov_configure,
+#endif
+
+       /* Per-type bar/size configuration not used on ef100. Location of
+        * registers is defined by extended capabilities.
+        */
+       .mem_bar = NULL,
+       .mem_map_size = NULL,
+
+};
+
+const struct efx_nic_type ef100_vf_nic_type = {
+       .revision = EFX_REV_EF100,
+       .is_vf = true,
+       .probe = ef100_probe_vf,
+       .offload_features = EF100_OFFLOAD_FEATURES,
+       .mcdi_max_ver = 2,
+       .mcdi_request = ef100_mcdi_request,
+       .mcdi_poll_response = ef100_mcdi_poll_response,
+       .mcdi_read_response = ef100_mcdi_read_response,
+       .mcdi_poll_reboot = ef100_mcdi_poll_reboot,
+       .mcdi_reboot_detected = ef100_mcdi_reboot_detected,
+       .irq_enable_master = efx_port_dummy_op_void,
+       .irq_test_generate = efx_ef100_irq_test_generate,
+       .irq_disable_non_ev = efx_port_dummy_op_void,
+       .push_irq_moderation = efx_channel_dummy_op_void,
+       .min_interrupt_mode = EFX_INT_MODE_MSIX,
+       .map_reset_reason = ef100_map_reset_reason,
+       .map_reset_flags = ef100_map_reset_flags,
+       .reset = ef100_reset,
+       .check_caps = ef100_check_caps,
+       .ev_probe = ef100_ev_probe,
+       .ev_init = ef100_ev_init,
+       .ev_fini = efx_mcdi_ev_fini,
+       .ev_remove = efx_mcdi_ev_remove,
+       .irq_handle_msi = ef100_msi_interrupt,
+       .ev_process = ef100_ev_process,
+       .ev_read_ack = ef100_ev_read_ack,
+       .ev_test_generate = efx_ef100_ev_test_generate,
+       .tx_probe = ef100_tx_probe,
+       .tx_init = ef100_tx_init,
+       .tx_write = ef100_tx_write,
+       .tx_enqueue = ef100_enqueue_skb,
+       .rx_probe = efx_mcdi_rx_probe,
+       .rx_init = efx_mcdi_rx_init,
+       .rx_remove = efx_mcdi_rx_remove,
+       .rx_write = ef100_rx_write,
+       .rx_packet = __ef100_rx_packet,
+       .rx_buf_hash_valid = ef100_rx_buf_hash_valid,
+       .fini_dmaq = efx_fini_dmaq,
+       .max_rx_ip_filters = EFX_MCDI_FILTER_TBL_ROWS,
+       .filter_table_probe = ef100_filter_table_up,
+       .filter_table_restore = efx_mcdi_filter_table_restore,
+       .filter_table_remove = ef100_filter_table_down,
+       .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
+
+       .rx_prefix_size = ESE_GZ_RX_PKT_PREFIX_LEN,
+       .rx_hash_offset = ESF_GZ_RX_PREFIX_RSS_HASH_LBN / 8,
+       .rx_ts_offset = ESF_GZ_RX_PREFIX_PARTIAL_TSTAMP_LBN / 8,
+       .rx_hash_key_size = 40,
+       .rx_pull_rss_config = efx_mcdi_rx_pull_rss_config,
+       .rx_push_rss_config = efx_mcdi_pf_rx_push_rss_config,
+       .rx_restore_rss_contexts = efx_mcdi_rx_restore_rss_contexts,
+       .rx_recycle_ring_size = efx_ef100_recycle_ring_size,
+
+       .reconfigure_mac = ef100_reconfigure_mac,
+       .test_nvram = efx_new_mcdi_nvram_test_all,
+       .describe_stats = ef100_describe_stats,
+       .start_stats = efx_mcdi_mac_start_stats,
+       .update_stats = ef100_update_stats,
+       .pull_stats = efx_mcdi_mac_pull_stats,
+       .stop_stats = efx_mcdi_mac_stop_stats,
+
+       .mem_bar = NULL,
+       .mem_map_size = NULL,
+
+};
Domain: System / Kernel;