Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965472Ab2JCRw2 (ORCPT ); Wed, 3 Oct 2012 13:52:28 -0400 Received: from acsinet15.oracle.com ([141.146.126.227]:34534 "EHLO acsinet15.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965462Ab2JCRwY (ORCPT ); Wed, 3 Oct 2012 13:52:24 -0400 From: Yinghai Lu To: Bjorn Helgaas , Greg Kroah-Hartman Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Don Dutile , yuvalmin@broadcom.com, bhutchings@solarflare.com, gregory.v.rose@intel.com, davem@davemloft.net--no-chain-reply-to, Yinghai Lu , Jeff Kirsher , Jesse Brandeburg , "David S. Miller" , John Fastabend , e1000-devel@lists.sourceforge.net, netdev@vger.kernel.org Subject: [PATCH 5/5] ixgbe: add driver set_max_vfs support Date: Wed, 3 Oct 2012 10:51:35 -0700 Message-Id: <1349286695-26713-6-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1349286695-26713-1-git-send-email-yinghai@kernel.org> References: <506C3B11.9010009@redhat.com> <1349286695-26713-1-git-send-email-yinghai@kernel.org> X-Source-IP: acsinet21.oracle.com [141.146.126.237] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3763 Lines: 119 Need ixgbe guys to close the loop to use set_max_vfs instead kernel parameters. Signed-off-by: Yinghai Lu Cc: Jeff Kirsher Cc: Jesse Brandeburg Cc: Greg Rose Cc: "David S. Miller" Cc: John Fastabend Cc: e1000-devel@lists.sourceforge.net Cc: netdev@vger.kernel.org --- drivers/net/ethernet/intel/ixgbe/ixgbe.h | 2 + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 44 +++++++++++++++++++----- 2 files changed, 37 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h index b9623e9..d39d975 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h @@ -558,6 +558,8 @@ struct ixgbe_adapter { u32 interrupt_event; u32 led_reg; + struct ixgbe_info *ixgbe_info; + #ifdef CONFIG_IXGBE_PTP struct ptp_clock *ptp_clock; struct ptp_clock_info ptp_caps; diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index ee61819..1c097c7 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -129,13 +129,6 @@ static struct notifier_block dca_notifier = { }; #endif -#ifdef CONFIG_PCI_IOV -static unsigned int max_vfs; -module_param(max_vfs, uint, 0); -MODULE_PARM_DESC(max_vfs, - "Maximum number of virtual functions to allocate per physical function - default is zero and maximum value is 63"); -#endif /* CONFIG_PCI_IOV */ - static unsigned int allow_unsupported_sfp; module_param(allow_unsupported_sfp, uint, 0); MODULE_PARM_DESC(allow_unsupported_sfp, @@ -4496,7 +4489,7 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter) #ifdef CONFIG_PCI_IOV /* assign number of SR-IOV VFs */ if (hw->mac.type != ixgbe_mac_82598EB) - adapter->num_vfs = (max_vfs > 63) ? 0 : max_vfs; + adapter->num_vfs = min_t(int, pdev->max_vfs, 63); #endif /* enable itr by default in dynamic mode */ @@ -7220,8 +7213,9 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, #ifdef CONFIG_PCI_IOV ixgbe_enable_sriov(adapter, ii); - #endif + adapter->ixgbe_info = ii; + netdev->features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | @@ -7683,11 +7677,43 @@ static const struct pci_error_handlers ixgbe_err_handler = { .resume = ixgbe_io_resume, }; +static void ixgbe_set_max_vfs(struct pci_dev *pdev) +{ +#ifdef CONFIG_PCI_IOV + struct ixgbe_adapter *adapter = pci_get_drvdata(pdev); + struct ixgbe_hw *hw = &adapter->hw; + int num_vfs = 0; + + /* assign number of SR-IOV VFs */ + if (hw->mac.type != ixgbe_mac_82598EB) + num_vfs = min_t(int, pdev->max_vfs, 63); + + /* no change */ + if (adapter->num_vfs == num_vfs) + return; + + if (!num_vfs) { + /* disable sriov */ + ixgbe_disable_sriov(adapter); + adapter->num_vfs = 0; + } else if (!adapter->num_vfs && num_vfs) { + /* enable sriov */ + adapter->num_vfs = num_vfs; + ixgbe_enable_sriov(adapter, adapter->ixgbe_info); + } else { + /* increase or decrease */ + } + + pdev->max_vfs = adapter->num_vfs; +#endif +} + static struct pci_driver ixgbe_driver = { .name = ixgbe_driver_name, .id_table = ixgbe_pci_tbl, .probe = ixgbe_probe, .remove = __devexit_p(ixgbe_remove), + .set_max_vfs = ixgbe_set_max_vfs, #ifdef CONFIG_PM .suspend = ixgbe_suspend, .resume = ixgbe_resume, -- 1.7.7 -- 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/