sfc_ef100: add nic-type for VFs, and bind to them

We don't yet have a .sriov_configure() to create them, though.

Signed-off-by: Edward Cree <ecree@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/sfc/ef100.c b/drivers/net/ethernet/sfc/ef100.c
index de611c0..9729983 100644 (file)
--- a/drivers/net/ethernet/sfc/ef100.c
+++ b/drivers/net/ethernet/sfc/ef100.c
@@ -527,6 +527,8 @@ fail:
 static const struct pci_device_id ef100_pci_table[] = {
        {PCI_DEVICE(PCI_VENDOR_ID_XILINX, 0x0100),  /* Riverhead PF */
                .driver_data = (unsigned long) &ef100_pf_nic_type },
+       {PCI_DEVICE(PCI_VENDOR_ID_XILINX, 0x1100),  /* Riverhead VF */
+               .driver_data = (unsigned long) &ef100_vf_nic_type },
        {0}                     /* end of list */
 };
 

diff --git a/drivers/net/ethernet/sfc/ef100_nic.c b/drivers/net/ethernet/sfc/ef100_nic.c
index 10748ef..8a2126f 100644 (file)
--- a/drivers/net/ethernet/sfc/ef100_nic.c
+++ b/drivers/net/ethernet/sfc/ef100_nic.c
@@ -783,6 +783,78 @@ const struct efx_nic_type ef100_pf_nic_type = {
 
 };
 
+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,
+       .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,
+       .filter_rfs_expire_one = efx_mcdi_filter_rfs_expire_one,
+
+       .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,
+
+       .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;
@@ -1178,6 +1250,11 @@ fail:
        return rc;
 }
 
+int ef100_probe_vf(struct efx_nic *efx)
+{
+       return ef100_probe_main(efx);
+}
+
 void ef100_remove(struct efx_nic *efx)
 {
        struct ef100_nic_data *nic_data = efx->nic_data;

diff --git a/drivers/net/ethernet/sfc/ef100_nic.h b/drivers/net/ethernet/sfc/ef100_nic.h
index 4a64c94..e799688 100644 (file)
--- a/drivers/net/ethernet/sfc/ef100_nic.h
+++ b/drivers/net/ethernet/sfc/ef100_nic.h
@@ -13,8 +13,10 @@
 #include "nic_common.h"
 
 extern const struct efx_nic_type ef100_pf_nic_type;
+extern const struct efx_nic_type ef100_vf_nic_type;
 
 int ef100_probe_pf(struct efx_nic *efx);
+int ef100_probe_vf(struct efx_nic *efx);
 void ef100_remove(struct efx_nic *efx);
 
 enum {