From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A7F4CC433B4 for ; Fri, 16 Apr 2021 08:47:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8575B6117A for ; Fri, 16 Apr 2021 08:47:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240836AbhDPIri (ORCPT ); Fri, 16 Apr 2021 04:47:38 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:58984 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240762AbhDPIrh (ORCPT ); Fri, 16 Apr 2021 04:47:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618562832; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=wRo3dX7HZBf9pYjFq5ETZzrsfm6Cv5K3vSoaAXFlhHU=; b=AlTZvOYzuse1HJIwnulTluWzGoh5eqwuS1YUiwVQU6MNh32Cnluj4ocC5p7R4SA/5jeZbs 9CQoTNf0FPX+MkcD5rOHOluT39hit3VO2hhXRZToyf90De/F/Y+ck8nc/P5M+J7iHwejy9 LgO7C8HD74hh7YzCJo76Dsx6f3FoMdc= Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-474-145cCV4rPw6XvsbfNaoN4Q-1; Fri, 16 Apr 2021 04:47:11 -0400 X-MC-Unique: 145cCV4rPw6XvsbfNaoN4Q-1 Received: by mail-ej1-f69.google.com with SMTP id f15-20020a170906738fb029037c94426fffso1804780ejl.22 for ; Fri, 16 Apr 2021 01:47:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=wRo3dX7HZBf9pYjFq5ETZzrsfm6Cv5K3vSoaAXFlhHU=; b=YVHP58alY6ZWQg4ObAHeD7eadQDUm1tD8W0mXugki4+E7DUN/D0frhjknqir7gXBJp vhZRq3BjJbPzYC4VFsVPztRyK+6k2ACVTG5FZzHa5XFy5Bh6NPK8VEyRZ2hBxxkkDlFv vxgf0uJkKI0JaHcBjxyqKU8/dzJbWwI12fmY2I3AjX0hIVXqpMQ7Kk08AMOzekEGj/YW 2n9lKK9Z+Ak7aFtYbQojR7LlcKgte9hn1GXdg0r/Sa3Hrd0HclNDEHfIjuXW21WU1cKm L/sBgI93MU7nvp9BLIfjHZ/Zjewl+n1XLd01Gek1oNvSv8JOSbh5gC8QWuj8w0Xt2e19 Dzyg== X-Gm-Message-State: AOAM531yzu8mHMopFqExC4m6LbMeiz2X3Qhua8wIW1aZ6TS0CQ+5Kee3 3NTxHdaOnsYVMQjsGGUzwrQYZqT7eCkXgrHo5rBi0n1BOXRjM5IT0dlAp0jQqvzArozAe+CqgTJ Vd+nr8xrptJ7BcfHpGltJPhMH X-Received: by 2002:a50:8fe6:: with SMTP id y93mr8637331edy.224.1618562830126; Fri, 16 Apr 2021 01:47:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwh1Zl2ub3jfnrnRMGdIeGAkIGOzcVmqwkMtbMOyGQ3+DRwPr4tDakxV4LySH2DCPUs/c6RYw== X-Received: by 2002:a50:8fe6:: with SMTP id y93mr8637313edy.224.1618562829919; Fri, 16 Apr 2021 01:47:09 -0700 (PDT) Received: from steredhat (host-79-34-249-199.business.telecomitalia.it. [79.34.249.199]) by smtp.gmail.com with ESMTPSA id k9sm3617309eje.102.2021.04.16.01.47.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Apr 2021 01:47:09 -0700 (PDT) Date: Fri, 16 Apr 2021 10:47:07 +0200 From: Stefano Garzarella To: Zhu Lingshan Cc: jasowang@redhat.com, mst@redhat.com, lulu@redhat.com, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH V3 2/3] vDPA/ifcvf: enable Intel C5000X-PL virtio-block for vDPA Message-ID: <20210416084707.ruqzvg4airzkkc2t@steredhat> References: <20210416071628.4984-1-lingshan.zhu@intel.com> <20210416071628.4984-3-lingshan.zhu@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <20210416071628.4984-3-lingshan.zhu@intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Apr 16, 2021 at 03:16:27PM +0800, Zhu Lingshan wrote: >This commit enabled Intel FPGA SmartNIC C5000X-PL virtio-block >for vDPA. > >Signed-off-by: Zhu Lingshan >--- > drivers/vdpa/ifcvf/ifcvf_base.h | 8 +++++++- > drivers/vdpa/ifcvf/ifcvf_main.c | 19 ++++++++++++++++++- > 2 files changed, 25 insertions(+), 2 deletions(-) Reviewed-by: Stefano Garzarella > >diff --git a/drivers/vdpa/ifcvf/ifcvf_base.h b/drivers/vdpa/ifcvf/ifcvf_base.h >index 1c04cd256fa7..0111bfdeb342 100644 >--- a/drivers/vdpa/ifcvf/ifcvf_base.h >+++ b/drivers/vdpa/ifcvf/ifcvf_base.h >@@ -15,6 +15,7 @@ > #include > #include > #include >+#include > #include > #include > >@@ -28,7 +29,12 @@ > #define C5000X_PL_SUBSYS_VENDOR_ID 0x8086 > #define C5000X_PL_SUBSYS_DEVICE_ID 0x0001 > >-#define IFCVF_SUPPORTED_FEATURES \ >+#define C5000X_PL_BLK_VENDOR_ID 0x1AF4 >+#define C5000X_PL_BLK_DEVICE_ID 0x1001 >+#define C5000X_PL_BLK_SUBSYS_VENDOR_ID 0x8086 >+#define C5000X_PL_BLK_SUBSYS_DEVICE_ID 0x0002 >+ >+#define IFCVF_NET_SUPPORTED_FEATURES \ > ((1ULL << VIRTIO_NET_F_MAC) | \ > (1ULL << VIRTIO_F_ANY_LAYOUT) | \ > (1ULL << VIRTIO_F_VERSION_1) | \ >diff --git a/drivers/vdpa/ifcvf/ifcvf_main.c b/drivers/vdpa/ifcvf/ifcvf_main.c >index 469a9b5737b7..376b2014916a 100644 >--- a/drivers/vdpa/ifcvf/ifcvf_main.c >+++ b/drivers/vdpa/ifcvf/ifcvf_main.c >@@ -168,10 +168,23 @@ static struct ifcvf_hw *vdpa_to_vf(struct vdpa_device *vdpa_dev) > > static u64 ifcvf_vdpa_get_features(struct vdpa_device *vdpa_dev) > { >+ struct ifcvf_adapter *adapter = vdpa_to_adapter(vdpa_dev); > struct ifcvf_hw *vf = vdpa_to_vf(vdpa_dev); >+ struct pci_dev *pdev = adapter->pdev; >+ > u64 features; > >- features = ifcvf_get_features(vf) & IFCVF_SUPPORTED_FEATURES; >+ switch (vf->dev_type) { >+ case VIRTIO_ID_NET: >+ features = ifcvf_get_features(vf) & IFCVF_NET_SUPPORTED_FEATURES; >+ break; >+ case VIRTIO_ID_BLOCK: >+ features = ifcvf_get_features(vf); >+ break; >+ default: >+ features = 0; >+ IFCVF_ERR(pdev, "VIRTIO ID %u not supported\n", vf->dev_type); >+ } > > return features; > } >@@ -517,6 +530,10 @@ static struct pci_device_id ifcvf_pci_ids[] = { > C5000X_PL_DEVICE_ID, > C5000X_PL_SUBSYS_VENDOR_ID, > C5000X_PL_SUBSYS_DEVICE_ID) }, >+ { PCI_DEVICE_SUB(C5000X_PL_BLK_VENDOR_ID, >+ C5000X_PL_BLK_DEVICE_ID, >+ C5000X_PL_BLK_SUBSYS_VENDOR_ID, >+ C5000X_PL_BLK_SUBSYS_DEVICE_ID) }, > > { 0 }, > }; >-- >2.27.0 >