From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A2D47A0543; Mon, 13 Jun 2022 09:33:28 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8151C40222; Mon, 13 Jun 2022 09:33:28 +0200 (CEST) Received: from mail-qt1-f176.google.com (mail-qt1-f176.google.com [209.85.160.176]) by mails.dpdk.org (Postfix) with ESMTP id 43F8740150 for ; Mon, 13 Jun 2022 09:33:27 +0200 (CEST) Received: by mail-qt1-f176.google.com with SMTP id k18so3326854qtm.9 for ; Mon, 13 Jun 2022 00:33:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=ijFB8Olp+OtY9g/YmZqlMs3SbJLp6CMMA3+ZPybz5fg=; b=X51rA2PQqimV/BK8YvkgVS7KfFzQBHyu8SqioN6mOteqH5bSJwLTwBOv4gcip5cSRB kbMWrk6jpoHB8jheCaKpMDxGsbNBQHCDiyZMQxTfsmV6JvHLD5JolWoq7gyYTAomBP+I 54XJ6Z0iXo85FqHhvTu4PUDO/HwdLuqWOG6yZoeZ9UKoV7Q3MNeYYZpjo67b9SfgGvpQ Hn2VQAl96al9rtQbhnfzERKuXe16gBfuUtfPilEdV44oKSZE4OrTyZFYjIS+Fb2t0NbV Ofp/qfMlHj5rUHPLCCxqlsiGJFIMDppHb4XQZsR33t2A2PbJ5zg0KGAIufcovkaoeQiC ZFGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=ijFB8Olp+OtY9g/YmZqlMs3SbJLp6CMMA3+ZPybz5fg=; b=vSZHG6k1tKGa0mZ5kqD4fW0S6BWgJlTKBvAdchwEB58bGOLwGVNT6j5lNULH2Vnfop +bVR61QYHUTkdBkqQ9cZRrv2iXfAYX8KmnokS59ftThv3jDBmqIwfejnkq3wgxyf5snc 6OfhiMHETF1H7b/7gARsgzBdaKgdVpvlDsF3MLW7Fn0aW7bsFOhAIT8BdNpH1XvZx+f5 Vam6XkC5sGnWJBbUw1EhxWHiQDfp46ue2ISxzK85ISlftqqzie4Rc6vz0qIA2PyNCEWE 3oOM6Xe1CKbqp5sVFlqlVJ4qNRR5D2PcP3G5DHsZjpKU4LYn01yenInxmUgU8ZERjBg/ ybhg== X-Gm-Message-State: AOAM533pd3ey0Dv+AGkpIwbiyxI6cxJgfIOiRtK68Wy2E52Om7SVGOBK h2yPHUD8fdJnxSVwVnANL/dnGoyLXOLMhOEZkIcUXy8YjzQ= X-Google-Smtp-Source: ABdhPJzlmsY0swxuvww+KUmtKcUY6r11+I9HOjKF/2KSR2P6sh9XGWPOgjksa1rZNZKFNlvRpho2a9+McMWQV7LEeP4= X-Received: by 2002:a05:622a:1824:b0:2f3:c196:10d with SMTP id t36-20020a05622a182400b002f3c196010dmr45886988qtc.74.1655105606637; Mon, 13 Jun 2022 00:33:26 -0700 (PDT) MIME-Version: 1.0 References: <20220511090645.141156-1-hkalra@marvell.com> In-Reply-To: <20220511090645.141156-1-hkalra@marvell.com> From: Jerin Jacob Date: Mon, 13 Jun 2022 13:03:00 +0530 Message-ID: Subject: Re: [PATCH] common/cnxk: add cnf10kb support To: Harman Kalra Cc: dpdk-dev , Nithin Dabilpuram , Kiran Kumar K , Sunil Kumar Kori , Satha Rao , Pavan Nikhilesh , Shijith Thotton , Ashwin Sekhar T K Content-Type: text/plain; charset="UTF-8" X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org On Wed, May 11, 2022 at 2:37 PM Harman Kalra wrote: > > Support for cnf10kb soc by adding its PCI device ID > > Signed-off-by: Harman Kalra Please rebase [for-next-net]dell[dpdk-next-net-mrvl] $ git pw series apply 22888 Failed to apply patch: Applying: common/cnxk: add cnf10kb support Using index info to reconstruct a base tree... M drivers/common/cnxk/roc_constants.h M drivers/event/cnxk/cn10k_eventdev.c M drivers/mempool/cnxk/cnxk_mempool.c M drivers/net/cnxk/cn10k_ethdev.c Falling back to patching base and 3-way merge... Auto-merging drivers/net/cnxk/cn10k_ethdev.c CONFLICT (content): Merge conflict in drivers/net/cnxk/cn10k_ethdev.c Auto-merging drivers/mempool/cnxk/cnxk_mempool.c CONFLICT (content): Merge conflict in drivers/mempool/cnxk/cnxk_mempool.c Auto-merging drivers/event/cnxk/cn10k_eventdev.c CONFLICT (content): Merge conflict in drivers/event/cnxk/cn10k_eventdev.c Auto-merging drivers/common/cnxk/roc_constants.h CONFLICT (content): Merge conflict in drivers/common/cnxk/roc_constants.h error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 common/cnxk: add cnf10kb support When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". > --- > drivers/common/cnxk/roc_constants.h | 1 + > drivers/event/cnxk/cn10k_eventdev.c | 2 ++ > drivers/mempool/cnxk/cnxk_mempool.c | 2 ++ > drivers/net/cnxk/cn10k_ethdev.c | 3 +++ > 4 files changed, 8 insertions(+) > > diff --git a/drivers/common/cnxk/roc_constants.h b/drivers/common/cnxk/roc_constants.h > index 38e2087a26..e9248667bf 100644 > --- a/drivers/common/cnxk/roc_constants.h > +++ b/drivers/common/cnxk/roc_constants.h > @@ -52,6 +52,7 @@ > #define PCI_SUBSYSTEM_DEVID_CN10KA 0xB900 > #define PCI_SUBSYSTEM_DEVID_CN10KAS 0xB900 > #define PCI_SUBSYSTEM_DEVID_CNF10KA 0xBA00 > +#define PCI_SUBSYSTEM_DEVID_CNF10KB 0xBC00 > > #define PCI_SUBSYSTEM_DEVID_CN9KA 0x0000 > #define PCI_SUBSYSTEM_DEVID_CN9KB 0xb400 > diff --git a/drivers/event/cnxk/cn10k_eventdev.c b/drivers/event/cnxk/cn10k_eventdev.c > index 9b4d2895ec..f0709ebfe2 100644 > --- a/drivers/event/cnxk/cn10k_eventdev.c > +++ b/drivers/event/cnxk/cn10k_eventdev.c > @@ -935,9 +935,11 @@ static const struct rte_pci_id cn10k_pci_sso_map[] = { > CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KA, PCI_DEVID_CNXK_RVU_SSO_TIM_PF), > CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KAS, PCI_DEVID_CNXK_RVU_SSO_TIM_PF), > CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CNF10KA, PCI_DEVID_CNXK_RVU_SSO_TIM_PF), > + CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CNF10KB, PCI_DEVID_CNXK_RVU_SSO_TIM_PF), > CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KA, PCI_DEVID_CNXK_RVU_SSO_TIM_VF), > CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KAS, PCI_DEVID_CNXK_RVU_SSO_TIM_VF), > CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CNF10KA, PCI_DEVID_CNXK_RVU_SSO_TIM_VF), > + CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CNF10KB, PCI_DEVID_CNXK_RVU_SSO_TIM_VF), > { > .vendor_id = 0, > }, > diff --git a/drivers/mempool/cnxk/cnxk_mempool.c b/drivers/mempool/cnxk/cnxk_mempool.c > index ea473552dd..6d03aea1fd 100644 > --- a/drivers/mempool/cnxk/cnxk_mempool.c > +++ b/drivers/mempool/cnxk/cnxk_mempool.c > @@ -163,6 +163,7 @@ npa_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev) > static const struct rte_pci_id npa_pci_map[] = { > CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KA, PCI_DEVID_CNXK_RVU_NPA_PF), > CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KAS, PCI_DEVID_CNXK_RVU_NPA_PF), > + CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CNF10KB, PCI_DEVID_CNXK_RVU_NPA_PF), > CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KA, PCI_DEVID_CNXK_RVU_NPA_PF), > CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KB, PCI_DEVID_CNXK_RVU_NPA_PF), > CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KC, PCI_DEVID_CNXK_RVU_NPA_PF), > @@ -170,6 +171,7 @@ static const struct rte_pci_id npa_pci_map[] = { > CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KE, PCI_DEVID_CNXK_RVU_NPA_PF), > CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KA, PCI_DEVID_CNXK_RVU_NPA_VF), > CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KAS, PCI_DEVID_CNXK_RVU_NPA_VF), > + CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CNF10KB, PCI_DEVID_CNXK_RVU_NPA_VF), > CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KA, PCI_DEVID_CNXK_RVU_NPA_VF), > CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KB, PCI_DEVID_CNXK_RVU_NPA_VF), > CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KC, PCI_DEVID_CNXK_RVU_NPA_VF), > diff --git a/drivers/net/cnxk/cn10k_ethdev.c b/drivers/net/cnxk/cn10k_ethdev.c > index 4cd82af7e5..fd8ef663fa 100644 > --- a/drivers/net/cnxk/cn10k_ethdev.c > +++ b/drivers/net/cnxk/cn10k_ethdev.c > @@ -817,12 +817,15 @@ static const struct rte_pci_id cn10k_pci_nix_map[] = { > CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KA, PCI_DEVID_CNXK_RVU_PF), > CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KAS, PCI_DEVID_CNXK_RVU_PF), > CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CNF10KA, PCI_DEVID_CNXK_RVU_PF), > + CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CNF10KB, PCI_DEVID_CNXK_RVU_PF), > CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KA, PCI_DEVID_CNXK_RVU_VF), > CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KAS, PCI_DEVID_CNXK_RVU_VF), > CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CNF10KA, PCI_DEVID_CNXK_RVU_VF), > + CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CNF10KB, PCI_DEVID_CNXK_RVU_VF), > CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KA, PCI_DEVID_CNXK_RVU_AF_VF), > CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KAS, PCI_DEVID_CNXK_RVU_AF_VF), > CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CNF10KA, PCI_DEVID_CNXK_RVU_AF_VF), > + CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CNF10KB, PCI_DEVID_CNXK_RVU_AF_VF), > { > .vendor_id = 0, > }, > -- > 2.18.0 >