From: Yu Zhao <yu.zhao@intel.com>
To: "linux-pci@vger.kernel.org" <linux-pci@vger.kernel.org>
Cc: "greg@kroah.com" <greg@kroah.com>,
"matthew@wil.cx" <matthew@wil.cx>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"kvm@vger.kernel.org" <kvm@vger.kernel.org>,
"xen-devel@lists.xensource.com" <xen-devel@lists.xensource.com>,
"virtualization@lists.linux-foundation.org"
<virtualization@lists.linux-foundation.org>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
"Nakajima, Jun" <jun.nakajima@intel.com>,
"Rose, Gregory V" <gregory.v.rose@intel.com>
Subject: [SR-IOV driver example 2/3 resend] PF driver: integrate with SR-IOV core
Date: Tue, 2 Dec 2008 17:42:51 +0800 [thread overview]
Message-ID: <20081202094251.GB1974@yzhao12-linux.sh.intel.com> (raw)
In-Reply-To: <20081202092741.GA1859@yzhao12-linux.sh.intel.com>
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 <e1000-devel@lists.sourceforge.net>
Signed-off-by: Yu Zhao <yu.zhao@intel.com>
---
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
next prev parent reply other threads:[~2008-12-02 5:38 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-21 18:36 [PATCH 0/13 v7] PCI: Linux kernel SR-IOV support Yu Zhao
2008-11-21 18:38 ` [PATCH 1/13 v7] PCI: enhance pci_ari_enabled() Yu Zhao
2008-11-21 18:38 ` [PATCH 2/13 v7] PCI: remove unnecessary arg of pci_update_resource() Yu Zhao
2008-11-21 18:39 ` [PATCH 3/13 v7] PCI: define PCI resource names in an 'enum' Yu Zhao
2008-11-21 18:40 ` [PATCH 4/13 v7] PCI: remove unnecessary condition check in pci_restore_bars() Yu Zhao
2008-11-21 18:40 ` [PATCH 5/13 v7] PCI: export __pci_read_base() Yu Zhao
2008-11-21 18:41 ` [PATCH 6/13 v7] PCI: make pci_alloc_child_bus() be able to handle NULL bridge Yu Zhao
2008-11-21 18:41 ` [PATCH 7/13 v7] PCI: add a new function to map BAR offset Yu Zhao
2008-11-21 18:41 ` [PATCH 8/13 v7] PCI: cleanup pci_bus_add_devices() Yu Zhao
2008-11-21 18:42 ` [PATCH 9/13 v7] PCI: split a new function from pci_bus_add_devices() Yu Zhao
2008-11-21 18:42 ` [PATCH 10/13 v7] PCI: support the SR-IOV capability Yu Zhao
2008-11-21 18:43 ` [PATCH 11/13 v7] PCI: reserve bus range for SR-IOV device Yu Zhao
2008-11-21 18:43 ` [PATCH 12/13 v7] PCI: document the SR-IOV sysfs entries Yu Zhao
2008-11-21 18:44 ` [PATCH 13/13 v7] PCI: document for SR-IOV user and developer Yu Zhao
2008-11-21 20:57 ` [PATCH 0/13 v7] PCI: Linux kernel SR-IOV support Greg KH
2008-11-22 7:03 ` Zhao, Yu
2008-11-26 14:03 ` [SR-IOV driver example 0/3] introduction Yu Zhao
2008-11-26 14:11 ` [SR-IOV driver example 1/3] PF driver: allocate hardware specific resource Yu Zhao
2008-11-26 14:21 ` [SR-IOV driver example 2/3] PF driver: integrate with SR-IOV core Yu Zhao
2008-11-26 16:58 ` Greg KH
2008-11-26 17:54 ` Chris Wright
2008-12-01 16:46 ` Yu Zhao
2008-11-26 19:27 ` Nakajima, Jun
2008-11-26 19:55 ` Greg KH
2008-12-01 16:44 ` Yu Zhao
2008-11-26 14:40 ` [SR-IOV driver example 3/3] VF driver tar ball Yu Zhao
2008-11-26 17:00 ` Greg KH
2008-11-26 16:59 ` [SR-IOV driver example 0/3] introduction Greg KH
2008-12-01 16:54 ` Yu Zhao
2008-11-26 20:14 ` Jeff Garzik
2008-12-01 16:39 ` Yu Zhao
2008-12-02 9:27 ` [SR-IOV driver example 0/3 resend] introduction Yu Zhao
2008-12-02 9:40 ` [SR-IOV driver example 1/3 resend] PF driver: hardware specific operations Yu Zhao
2008-12-02 9:42 ` Yu Zhao [this message]
2008-12-03 3:12 ` [SR-IOV driver example 0/3 resend] introduction Jeff Kirsher
2008-12-16 23:23 ` [PATCH 0/13 v7] PCI: Linux kernel SR-IOV support Jesse Barnes
2008-12-17 2:37 ` Jike Song
2008-12-17 6:06 ` Greg KH
2008-12-17 7:07 ` Zhao, Yu
2008-12-17 7:21 ` Greg KH
2008-12-17 16:44 ` Rose, Gregory V
2008-12-17 17:51 ` Greg KH
2008-12-17 18:51 ` Jesse Barnes
2008-12-17 19:05 ` Rose, Gregory V
2008-12-17 19:34 ` Jeremy Fitzhardinge
2008-12-17 19:42 ` Rose, Gregory V
2008-12-17 19:42 ` Jesse Barnes
2008-12-17 19:51 ` Greg KH
2008-12-17 20:07 ` Jesse Barnes
2008-12-18 2:39 ` Zhao, Yu
2008-12-18 22:42 ` Rose, Gregory V
2008-12-17 11:42 ` Fischer, Anna
2008-12-17 18:59 ` Jesse Barnes
2008-12-18 2:13 ` Zhao, Yu
2008-12-18 6:37 ` Fischer, Anna
2008-12-17 14:15 ` Matthew Wilcox
2008-12-17 17:27 ` Jesse Barnes
2008-12-18 2:26 ` Zhao, Yu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20081202094251.GB1974@yzhao12-linux.sh.intel.com \
--to=yu.zhao@intel.com \
--cc=greg@kroah.com \
--cc=gregory.v.rose@intel.com \
--cc=jun.nakajima@intel.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=matthew@wil.cx \
--cc=netdev@vger.kernel.org \
--cc=virtualization@lists.linux-foundation.org \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®