Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753201AbYLBFiy (ORCPT ); Tue, 2 Dec 2008 00:38:54 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750957AbYLBFil (ORCPT ); Tue, 2 Dec 2008 00:38:41 -0500 Received: from mga09.intel.com ([134.134.136.24]:4349 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750845AbYLBFik (ORCPT ); Tue, 2 Dec 2008 00:38:40 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.33,700,1220252400"; d="scan'208";a="470166047" Date: Tue, 2 Dec 2008 17:42:51 +0800 From: Yu Zhao To: "linux-pci@vger.kernel.org" Cc: "greg@kroah.com" , "matthew@wil.cx" , "linux-kernel@vger.kernel.org" , "kvm@vger.kernel.org" , "xen-devel@lists.xensource.com" , "virtualization@lists.linux-foundation.org" , "netdev@vger.kernel.org" , "Nakajima, Jun" , "Rose, Gregory V" Subject: [SR-IOV driver example 2/3 resend] PF driver: integrate with SR-IOV core Message-ID: <20081202094251.GB1974@yzhao12-linux.sh.intel.com> References: <20081121183605.GA7810@yzhao12-linux.sh.intel.com> <20081202092741.GA1859@yzhao12-linux.sh.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20081202092741.GA1859@yzhao12-linux.sh.intel.com> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3180 Lines: 92 This patch integrates the IGB driver with the SR-IOV core. It shows how the SR-IOV API is used to support the capability. Obviously people does not need to put much effort to integrate the PF driver with SR-IOV core. All SR-IOV standard stuff are handled by SR-IOV core and PF driver only concerns the device specific resource allocation and deallocation once it gets the necessary information (i.e. number of Virtual Functions) from the callback function. From: Intel Corporation, LAN Access Division Signed-off-by: Yu Zhao --- drivers/net/igb/igb_main.c | 46 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index f0361ef..78bda11 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c @@ -138,6 +138,7 @@ void igb_set_mc_list_pools(struct igb_adapter *, struct e1000_hw *, int, u16); static int igb_vmm_control(struct igb_adapter *, bool); static int igb_set_vf_mac(struct net_device *, int, u8*); static void igb_mbox_handler(struct igb_adapter *); +static int igb_virtual(struct pci_dev *, int); static int igb_suspend(struct pci_dev *, pm_message_t); #ifdef CONFIG_PM @@ -182,6 +183,7 @@ static struct pci_driver igb_driver = { #endif .shutdown = igb_shutdown, .err_handler = &igb_err_handler, + .virtual = igb_virtual }; static int global_quad_port_a; /* global quad port a indication */ @@ -5066,4 +5068,48 @@ void igb_set_mc_list_pools(struct igb_adapter *adapter, wr32(E1000_VMOLR(pool), reg_data); } +static int +igb_virtual(struct pci_dev *pdev, int nr_virtfn) +{ + int i; + struct net_device *netdev = pci_get_drvdata(pdev); + struct igb_adapter *adapter = netdev_priv(netdev); + /* the VFs' MAC addresses are hard-coded */ + unsigned char my_mac_addr[6] = {0x00, 0xDE, 0xAD, 0xBE, 0xEF, 0xFF}; + + /* + * the 82576 NIC supports 1-PF NIC + 7-VF NICs mode and 8-VF NICs + * mode. In the 8-VF NICs mode, the PF can't tx/rx packets -- it + * only behaves as 'VF supervisor'. For now we use the 1-PF NIC + + * 7-VF NICs mode to preserve PF's tx/rx capability for the debug + * purpose. + */ + if (nr_virtfn > (MAX_NUM_VFS - 1)) + return -EINVAL; + + if (nr_virtfn) { + dev_info(&pdev->dev, "SR-IOV is enabled\n"); + /* + * Currently VFs resources are pre-allocated, so just set + * the MAC addresses of each VF here. + */ + for (i = 0; i < nr_virtfn; i++) { + my_mac_addr[5] = (unsigned char)i; + igb_set_vf_mac(netdev, i, my_mac_addr); + igb_set_vf_vmolr(adapter, i); + } + } else { + /* + * Since we statically allocate tx/rx queues for the PF + * and the VFs, so we don't need to free any VF related + * resources here. + */ + dev_info(&pdev->dev, "SR-IOV is disabled\n"); + } + + adapter->vfs_allocated_count = nr_virtfn; + + return 0; +} + /* igb_main.c */ -- 1.5.6.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/