From patchwork Wed Oct 21 16:37:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "lan,Tianyu" X-Patchwork-Id: 7459061 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 12C209F30B for ; Wed, 21 Oct 2015 16:54:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 268102089E for ; Wed, 21 Oct 2015 16:54:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3B9712087D for ; Wed, 21 Oct 2015 16:54:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755993AbbJUQta (ORCPT ); Wed, 21 Oct 2015 12:49:30 -0400 Received: from mga09.intel.com ([134.134.136.24]:41210 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755977AbbJUQt1 (ORCPT ); Wed, 21 Oct 2015 12:49:27 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 21 Oct 2015 09:49:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,712,1437462000"; d="scan'208";a="799293220" Received: from lantianyu-ws.sh.intel.com (HELO localhost) ([10.239.159.159]) by orsmga001.jf.intel.com with ESMTP; 21 Oct 2015 09:49:24 -0700 From: Lan Tianyu To: bhelgaas@google.com, carolyn.wyborny@intel.com, donald.c.skidmore@intel.com, eddie.dong@intel.com, nrupal.jani@intel.com, yang.z.zhang@intel.com, agraf@suse.de, kvm@vger.kernel.org, pbonzini@redhat.com, qemu-devel@nongnu.org, emil.s.tantilov@intel.com, intel-wired-lan@lists.osuosl.org, jeffrey.t.kirsher@intel.com, jesse.brandeburg@intel.com, john.ronciak@intel.com, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, matthew.vick@intel.com, mitch.a.williams@intel.com, netdev@vger.kernel.org, shannon.nelson@intel.com Cc: Lan Tianyu Subject: [RFC Patch 05/12] IXGBE: Add new sysfs interface of "notify_vf" Date: Thu, 22 Oct 2015 00:37:37 +0800 Message-Id: <1445445464-5056-6-git-send-email-tianyu.lan@intel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1445445464-5056-1-git-send-email-tianyu.lan@intel.com> References: <1445445464-5056-1-git-send-email-tianyu.lan@intel.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch is to add new sysfs interface of "notify_vf" under sysfs directory of VF PCI device for Qemu to notify VF when migration status is changed. Signed-off-by: Lan Tianyu --- drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 30 ++++++++++++++++++++++++++ drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 4 ++++ 2 files changed, 34 insertions(+) diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c index e247d67..5cc7817 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c @@ -217,10 +217,37 @@ static ssize_t ixgbe_store_state_in_pf(struct device *dev, return count; } +static ssize_t ixgbe_store_notify_vf(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + struct ixgbe_adapter *adapter = to_adapter(dev); + struct ixgbe_hw *hw = &adapter->hw; + struct pci_dev *vf_pdev = to_pci_dev(dev); + int vfn = vf_pdev->virtfn_index; + u32 ivar; + + /* Enable VF mailbox irq first */ + IXGBE_WRITE_REG(hw, IXGBE_PVTEIMS(vfn), 0x4); + IXGBE_WRITE_REG(hw, IXGBE_PVTEIAM(vfn), 0x4); + IXGBE_WRITE_REG(hw, IXGBE_PVTEIAC(vfn), 0x4); + + ivar = IXGBE_READ_REG(hw, IXGBE_PVTIVAR_MISC(vfn)); + ivar &= ~0xFF; + ivar |= 0x2 | IXGBE_IVAR_ALLOC_VAL; + IXGBE_WRITE_REG(hw, IXGBE_PVTIVAR_MISC(vfn), ivar); + + ixgbe_ping_vf(adapter, vfn); + return count; +} + static struct device_attribute ixgbe_per_state_in_pf_attribute = __ATTR(state_in_pf, S_IRUGO | S_IWUSR, ixgbe_show_state_in_pf, ixgbe_store_state_in_pf); +static struct device_attribute ixgbe_per_notify_vf_attribute = + __ATTR(notify_vf, S_IWUSR, NULL, ixgbe_store_notify_vf); + void ixgbe_add_vf_attrib(struct ixgbe_adapter *adapter) { struct pci_dev *pdev = adapter->pdev; @@ -241,6 +268,8 @@ void ixgbe_add_vf_attrib(struct ixgbe_adapter *adapter) if (vfdev->is_virtfn) { ret = device_create_file(&vfdev->dev, &ixgbe_per_state_in_pf_attribute); + ret |= device_create_file(&vfdev->dev, + &ixgbe_per_notify_vf_attribute); if (ret) pr_warn("Unable to add VF attribute for dev %s,\n", dev_name(&vfdev->dev)); @@ -269,6 +298,7 @@ void ixgbe_remove_vf_attrib(struct ixgbe_adapter *adapter) while (vfdev) { if (vfdev->is_virtfn) { device_remove_file(&vfdev->dev, &ixgbe_per_state_in_pf_attribute); + device_remove_file(&vfdev->dev, &ixgbe_per_notify_vf_attribute); } vfdev = pci_get_device(pdev->vendor, vf_id, vfdev); diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h index dd6ba59..c6ddb66 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h @@ -2302,6 +2302,10 @@ enum { #define IXGBE_PVFTDT(P) (0x06018 + (0x40 * (P))) #define IXGBE_PVFTDWBAL(P) (0x06038 + (0x40 * (P))) #define IXGBE_PVFTDWBAH(P) (0x0603C + (0x40 * (P))) +#define IXGBE_PVTEIMS(P) (0x00D00 + (4 * (P))) +#define IXGBE_PVTIVAR_MISC(P) (0x04E00 + (4 * (P))) +#define IXGBE_PVTEIAC(P) (0x00F00 + (4 * P)) +#define IXGBE_PVTEIAM(P) (0x04D00 + (4 * P)) #define IXGBE_PVFTDWBALn(q_per_pool, vf_number, vf_q_index) \ (IXGBE_PVFTDWBAL((q_per_pool)*(vf_number) + (vf_q_index)))