From patchwork Mon Feb 20 10:12:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roopa Prabhu X-Patchwork-Id: 142102 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 7BA65B6FA7 for ; Mon, 20 Feb 2012 13:18:17 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753548Ab2BTCSN (ORCPT ); Sun, 19 Feb 2012 21:18:13 -0500 Received: from mtv-iport-1.cisco.com ([173.36.130.12]:42850 "EHLO mtv-iport-1.cisco.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753525Ab2BTCSM (ORCPT ); Sun, 19 Feb 2012 21:18:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cisco.com; i=roprabhu@cisco.com; l=1761; q=dns/txt; s=iport; t=1329704291; x=1330913891; h=subject:to:from:cc:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=J6mEV6DXSOTb+Sv2KGIeRHHWJh8PCev4iDMbCxjdlK8=; b=ibx76a7hSma25OHUMXbl6vdWUBSIOISuhGDXHR3ZC3aiOvXvHlMQyNUi Uqh4DQYv3Qe8OgcESi04bp5jbCJ/98xpexhkzYUgp2dBnOGRDFiQ6gtCE PHhSZbZf1Ayv/fKBrM/EerVdgrKp75gH3JN6jL7/nObEGtkQWTFcG31Zl Q=; X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AigRAMOsQU+rRDoJ/2dsb2JhbABDHoR4rReBB4FzAQEBBBIBEARSECAFAiYCAkcQGSKnPgGMZYkWgS+KahYBAQMCBgMFDQYHAQwDAoN4CAEOHA+CCIEWBIhOjGgBkw4 X-IronPort-AV: E=Sophos;i="4.73,448,1325462400"; d="scan'208";a="29551456" Received: from mtv-core-4.cisco.com ([171.68.58.9]) by mtv-iport-1.cisco.com with ESMTP; 20 Feb 2012 02:18:09 +0000 Received: from rhel6.1 (savbu-dhcp-10-193-164-238.cisco.com [10.193.164.238]) by mtv-core-4.cisco.com (8.14.3/8.14.3) with ESMTP id q1K2I9mW024783; Mon, 20 Feb 2012 02:18:09 GMT Subject: [net-next-2.6 PATCH 4/4] enic: Add support for fw init command on sriov vf's To: davem@davemloft.net From: Roopa Prabhu Cc: netdev@vger.kernel.org Date: Mon, 20 Feb 2012 02:12:04 -0800 Message-ID: <20120220101203.5794.32375.stgit@rhel6.1> In-Reply-To: <20120220101140.5794.60233.stgit@rhel6.1> References: <20120220101140.5794.60233.stgit@rhel6.1> User-Agent: StGit/0.15 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Roopa Prabhu This patch fixes enic_probe to do a fw init devcmd for sriov vfs. This enables vf driver in the guest to get into adapter init state without having to explicitly issue an init fw cmd with portprofile info. But a successful init on the vf will require the port profile information to be pre-provisioned by the hypervisor via the pf Signed-off-by: Roopa Prabhu Signed-off-by: Christian Benvenuti Signed-off-by: Sujith Sankar --- drivers/net/ethernet/cisco/enic/enic.h | 2 +- drivers/net/ethernet/cisco/enic/enic_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/ethernet/cisco/enic/enic.h b/drivers/net/ethernet/cisco/enic/enic.h index 922b646..99998c6 100644 --- a/drivers/net/ethernet/cisco/enic/enic.h +++ b/drivers/net/ethernet/cisco/enic/enic.h @@ -32,7 +32,7 @@ #define DRV_NAME "enic" #define DRV_DESCRIPTION "Cisco VIC Ethernet NIC Driver" -#define DRV_VERSION "2.1.1.37" +#define DRV_VERSION "2.1.1.38" #define DRV_COPYRIGHT "Copyright 2008-2011 Cisco Systems, Inc" #define ENIC_BARS_MAX 6 diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c index 2278c43..e27ec1d 100644 --- a/drivers/net/ethernet/cisco/enic/enic_main.c +++ b/drivers/net/ethernet/cisco/enic/enic_main.c @@ -2452,7 +2452,7 @@ static int __devinit enic_probe(struct pci_dev *pdev, * called later by an upper layer. */ - if (!enic_is_dynamic(enic) && !enic_is_sriov_vf(enic)) { + if (!enic_is_dynamic(enic)) { err = vnic_dev_init(enic->vdev, 0); if (err) { dev_err(dev, "vNIC dev init failed, aborting\n");