Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp193021pxf; Wed, 17 Mar 2021 02:57:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzavngy/A93OPHBjaydqg0ARO2xVruemZEnenbrTphYMWHaDSlwJNTvYVqQ8u+cm6tSYY4V X-Received: by 2002:a17:906:b2cd:: with SMTP id cf13mr34245678ejb.181.1615975056400; Wed, 17 Mar 2021 02:57:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615975056; cv=none; d=google.com; s=arc-20160816; b=x1efVdrAWuYKFKilm9ASZRF2Qx/P6ZnWKy5SxCX4CB7VZvXnKjfZKMTrW1VATdzaqj Jkt0ZRdpzYdgZI5gVygj7ySfXavc2h9KNydpV9haGQPxFtXzLCqIYzczxym2wjLqLMrr 3+1rX69OUbwiOa5dw8rIwpMwWB1Hn3NlBCXO6JLs/lZrtVbMF8NRBz7V3FG+CrYq3HHK wAwuyFuyPV6Y2OnLzDq9kSy6eGprswzXaeTbPKG2h0At6nxXKu8LfhSK4amaXnrtO2CZ PaL4ezkh2PggM/mX9nfw1uQO9MfxC6wCvikCKT3s4g8q2xm5S4xMWd6dr2XV3boyQpmA bB8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :ironport-sdr:ironport-sdr; bh=qmC8tSfjIeovhiO3lpwAxDXa6z+TVdwgS7sXf0Cxq+o=; b=TrTVPa6sLrEcK7v5+XjUYE/xRAQqARyCZmBJ0D4lzZG1fzlxviFcdWt7qTZM0n3ncr x2Ds+DeMsoAYUW56MkK6NoPIj9vuHHqnOdTWW971xlcDalMSwlBwY+XpUZGfOYI9Gibe nS+yVbRPenLZ41gMbyeZXAYGJ3wpCmvXgyH6teLtDuWvb6v7p8agrMB8ytiJfyIRRRaD AewlgRKRpNtH9/bJSUGk7WkZZavcsarbmd/D1fcWIBpVI5nkDNK/zTCxHrid82INx7qr E0AfmAoqlbzPOIUrY376OfZMuv9Q/GL1piR2MtfMXsVqBsWoW68WF3ikDCEiQ3EnsB3L bBWg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a6si945710ejs.736.2021.03.17.02.57.14; Wed, 17 Mar 2021 02:57:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230256AbhCQJzc (ORCPT + 99 others); Wed, 17 Mar 2021 05:55:32 -0400 Received: from mga04.intel.com ([192.55.52.120]:59767 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230114AbhCQJzA (ORCPT ); Wed, 17 Mar 2021 05:55:00 -0400 IronPort-SDR: fR03KbjV13NNCytzBp8PFgiMglJRMi18ZhbG8pJF2p59rLD0qK2Rtl8W1Mj4p5uMiuhQwzOXAl CEK1M/eX3XUQ== X-IronPort-AV: E=McAfee;i="6000,8403,9925"; a="187058688" X-IronPort-AV: E=Sophos;i="5.81,255,1610438400"; d="scan'208";a="187058688" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2021 02:55:00 -0700 IronPort-SDR: Vmg6AY6wcKfV0IP8X/tKaUCRiI5QvL5En6PUE7mhrFwzJ4SCIf0nbIezjQndaH42xvwzLxYryT R0h7yv8ejGCw== X-IronPort-AV: E=Sophos;i="5.81,255,1610438400"; d="scan'208";a="405873255" Received: from unknown (HELO localhost.localdomain.bj.intel.com) ([10.240.193.73]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2021 02:54:57 -0700 From: Zhu Lingshan To: jasowang@redhat.com, mst@redhat.com, lulu@redhat.com, leonro@nvidia.com Cc: virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Zhu Lingshan Subject: [PATCH V5 7/7] vDPA/ifcvf: deduce VIRTIO device ID from pdev ids Date: Wed, 17 Mar 2021 17:49:33 +0800 Message-Id: <20210317094933.16417-8-lingshan.zhu@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210317094933.16417-1-lingshan.zhu@intel.com> References: <20210317094933.16417-1-lingshan.zhu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This commit deduces the VIRTIO device ID of a probed device from its pdev device ids. Signed-off-by: Zhu Lingshan --- drivers/vdpa/ifcvf/ifcvf_base.h | 1 + drivers/vdpa/ifcvf/ifcvf_main.c | 14 +++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/vdpa/ifcvf/ifcvf_base.h b/drivers/vdpa/ifcvf/ifcvf_base.h index f77239fc1644..b2eeb16b9c2c 100644 --- a/drivers/vdpa/ifcvf/ifcvf_base.h +++ b/drivers/vdpa/ifcvf/ifcvf_base.h @@ -127,4 +127,5 @@ int ifcvf_verify_min_features(struct ifcvf_hw *hw, u64 features); u16 ifcvf_get_vq_state(struct ifcvf_hw *hw, u16 qid); int ifcvf_set_vq_state(struct ifcvf_hw *hw, u16 qid, u16 num); struct ifcvf_adapter *vf_to_adapter(struct ifcvf_hw *hw); +int ifcvf_probed_virtio_net(struct ifcvf_hw *hw); #endif /* _IFCVF_H_ */ diff --git a/drivers/vdpa/ifcvf/ifcvf_main.c b/drivers/vdpa/ifcvf/ifcvf_main.c index ea93ea7fd5df..9fade400b5a4 100644 --- a/drivers/vdpa/ifcvf/ifcvf_main.c +++ b/drivers/vdpa/ifcvf/ifcvf_main.c @@ -323,7 +323,19 @@ static u32 ifcvf_vdpa_get_generation(struct vdpa_device *vdpa_dev) static u32 ifcvf_vdpa_get_device_id(struct vdpa_device *vdpa_dev) { - return VIRTIO_ID_NET; + struct ifcvf_adapter *adapter = vdpa_to_adapter(vdpa_dev); + struct pci_dev *pdev = adapter->pdev; + u32 ret = -ENODEV; + + if (pdev->device < 0x1000 || pdev->device > 0x107f) + return ret; + + if (pdev->device < 0x1040) + ret = pdev->subsystem_device; + else + ret = pdev->device - 0x1040; + + return ret; } static u32 ifcvf_vdpa_get_vendor_id(struct vdpa_device *vdpa_dev) -- 2.27.0