From: Jason Wang <jasowang@redhat.com>
To: Zhu Lingshan <lingshan.zhu@intel.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
Subject: Re: [PATCH V4 5/7] vDPA/ifcvf: fetch device feature bits when probe
Date: Wed, 17 Mar 2021 11:57:39 +0800 [thread overview]
Message-ID: <9ab3f888-2201-54de-1390-6bc181316453@redhat.com> (raw)
In-Reply-To: <20210315074501.15868-6-lingshan.zhu@intel.com>
在 2021/3/15 下午3:44, Zhu Lingshan 写道:
> This commit would read and store device feature
> bits when probe.
>
> rename ifcvf_get_features() to ifcvf_get_hw_features(),
> it reads and stores features of the probed device.
>
> new ifcvf_get_features() simply returns stored
> feature bits.
>
> Signed-off-by: Zhu Lingshan <lingshan.zhu@intel.com>
Acked-by: Jason Wang <jasowang@redhat.com>
> ---
> drivers/vdpa/ifcvf/ifcvf_base.c | 12 ++++++++++--
> drivers/vdpa/ifcvf/ifcvf_base.h | 2 ++
> drivers/vdpa/ifcvf/ifcvf_main.c | 2 ++
> 3 files changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/vdpa/ifcvf/ifcvf_base.c b/drivers/vdpa/ifcvf/ifcvf_base.c
> index f2a128e56de5..ea6a78791c9b 100644
> --- a/drivers/vdpa/ifcvf/ifcvf_base.c
> +++ b/drivers/vdpa/ifcvf/ifcvf_base.c
> @@ -202,10 +202,11 @@ static void ifcvf_add_status(struct ifcvf_hw *hw, u8 status)
> ifcvf_get_status(hw);
> }
>
> -u64 ifcvf_get_features(struct ifcvf_hw *hw)
> +u64 ifcvf_get_hw_features(struct ifcvf_hw *hw)
> {
> struct virtio_pci_common_cfg __iomem *cfg = hw->common_cfg;
> u32 features_lo, features_hi;
> + u64 features;
>
> ifc_iowrite32(0, &cfg->device_feature_select);
> features_lo = ifc_ioread32(&cfg->device_feature);
> @@ -213,7 +214,14 @@ u64 ifcvf_get_features(struct ifcvf_hw *hw)
> ifc_iowrite32(1, &cfg->device_feature_select);
> features_hi = ifc_ioread32(&cfg->device_feature);
>
> - return ((u64)features_hi << 32) | features_lo;
> + features = ((u64)features_hi << 32) | features_lo;
> +
> + return features;
> +}
> +
> +u64 ifcvf_get_features(struct ifcvf_hw *hw)
> +{
> + return hw->hw_features;
> }
>
> void ifcvf_read_net_config(struct ifcvf_hw *hw, u64 offset,
> diff --git a/drivers/vdpa/ifcvf/ifcvf_base.h b/drivers/vdpa/ifcvf/ifcvf_base.h
> index 794d1505d857..dbb8c10aa3b1 100644
> --- a/drivers/vdpa/ifcvf/ifcvf_base.h
> +++ b/drivers/vdpa/ifcvf/ifcvf_base.h
> @@ -83,6 +83,7 @@ struct ifcvf_hw {
> void __iomem *notify_base;
> u32 notify_off_multiplier;
> u64 req_features;
> + u64 hw_features;
> struct virtio_pci_common_cfg __iomem *common_cfg;
> void __iomem *net_cfg;
> struct vring_info vring[IFCVF_MAX_QUEUE_PAIRS * 2];
> @@ -121,6 +122,7 @@ void ifcvf_set_status(struct ifcvf_hw *hw, u8 status);
> void io_write64_twopart(u64 val, u32 *lo, u32 *hi);
> void ifcvf_reset(struct ifcvf_hw *hw);
> u64 ifcvf_get_features(struct ifcvf_hw *hw);
> +u64 ifcvf_get_hw_features(struct ifcvf_hw *hw);
> 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);
> diff --git a/drivers/vdpa/ifcvf/ifcvf_main.c b/drivers/vdpa/ifcvf/ifcvf_main.c
> index c34e1eec6b6c..25fb9dfe23f0 100644
> --- a/drivers/vdpa/ifcvf/ifcvf_main.c
> +++ b/drivers/vdpa/ifcvf/ifcvf_main.c
> @@ -458,6 +458,8 @@ static int ifcvf_probe(struct pci_dev *pdev, const struct pci_device_id *id)
> for (i = 0; i < IFCVF_MAX_QUEUE_PAIRS * 2; i++)
> vf->vring[i].irq = -EINVAL;
>
> + vf->hw_features = ifcvf_get_hw_features(vf);
> +
> ret = vdpa_register_device(&adapter->vdpa);
> if (ret) {
> IFCVF_ERR(pdev, "Failed to register ifcvf to vdpa bus");
next prev parent reply other threads:[~2021-03-17 3:59 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-15 7:44 [PATCH V4 0/7] vDPA/ifcvf: enables Intel C5000X-PL virtio-net Zhu Lingshan
2021-03-15 7:44 ` [PATCH V4 1/7] vDPA/ifcvf: get_vendor_id returns a device specific vendor id Zhu Lingshan
2021-03-16 6:09 ` Jason Wang
2021-03-15 7:44 ` [PATCH V4 2/7] vDPA/ifcvf: enable Intel C5000X-PL virtio-net for vDPA Zhu Lingshan
2021-03-16 6:09 ` Jason Wang
2021-03-15 7:44 ` [PATCH V4 3/7] vDPA/ifcvf: rename original IFCVF dev ids to N3000 ids Zhu Lingshan
2021-03-16 6:10 ` Jason Wang
2021-03-15 7:44 ` [PATCH V4 4/7] vDPA/ifcvf: remove the version number string Zhu Lingshan
2021-03-16 6:11 ` Jason Wang
2021-03-15 7:44 ` [PATCH V4 5/7] vDPA/ifcvf: fetch device feature bits when probe Zhu Lingshan
2021-03-17 3:57 ` Jason Wang [this message]
2021-03-15 7:45 ` [PATCH V4 6/7] vDPA/ifcvf: verify mandatory feature bits for vDPA Zhu Lingshan
2021-03-17 3:58 ` Jason Wang
2021-03-15 7:45 ` [PATCH V4 7/7] vDPA/ifcvf: deduce VIRTIO device ID from pdev ids Zhu Lingshan
2021-03-17 4:07 ` Jason Wang
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=9ab3f888-2201-54de-1390-6bc181316453@redhat.com \
--to=jasowang@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=leonro@nvidia.com \
--cc=lingshan.zhu@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lulu@redhat.com \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=virtualization@lists.linux-foundation.org \
/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;
as well as URLs for NNTP newsgroup(s).