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 1C24CA0032; Sat, 2 Oct 2021 15:57:20 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8CAEB411A0; Sat, 2 Oct 2021 15:57:19 +0200 (CEST) Received: from mail-io1-f47.google.com (mail-io1-f47.google.com [209.85.166.47]) by mails.dpdk.org (Postfix) with ESMTP id 856864067B for ; Sat, 2 Oct 2021 15:57:18 +0200 (CEST) Received: by mail-io1-f47.google.com with SMTP id z184so1768015iof.5 for ; Sat, 02 Oct 2021 06:57:18 -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=3ZmobVCTXxFqJwwotvT8ThXOjo8yQyJkqio7iyraS5U=; b=eiMOVM4D/T4J/6dasHGUhv70mK5iLMBtbHSE7Fsq1H19YoW7FMyCX9WzoIXxtbM0BU XEIrodutocsKG1SOAoaQlZ2apJ03Jzoz+Pa88mRD5tuQUcS519qsNABqSY/c0n/afqTh hRvcii5/0PqAx3e+2Bx9bJLJriQq/GUEbt20GC1w9YQwKthDduGKMY1TkS8q8ZbbqDHP d/f+XJlWjSJbz3CrMtTFYguJdGBSDSJkANmHRtdOVTyBxWNRvfU4GYTkGDoYwgQ4XH6p QwUOvoSv2EbzGx7QQzM2yz09dyPxFwSOwGj96cCDxIeOHADXLduEIwoyVLDrjcEteU/g CkYg== 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=3ZmobVCTXxFqJwwotvT8ThXOjo8yQyJkqio7iyraS5U=; b=rTL42W0Owod4Osdu2yA3mg63fKswRt7lO2D8Qes2IHLjP5mIngHgv9/mcmQcrg7dwg BeR1aHFJlJfGUloU/u37sNfS5sF6ztb210mzWaAT2Z5ozVl/8QDKwYt8ex5Qnm0qwREB LXYzJTwL+/opquQee9b5tYIw8Y0dUyCbdCTdDAoAwgUN4lSwE/O85wAJTfrkFWmjTfPb orU6GFJWlh2prsQPFsyDNo0P6HNdrK3c139EfmYnjjY7LHiYL5H8OQFaY3Es3zaV27kB AlorxcLv5F7gbAktKQ1N/TBiCeMUCaxo/BF6+3Zp7OJJnA0OwSkweFfH7PpmbRlCo4bb qf/A== X-Gm-Message-State: AOAM530pSR7BiAzVO0IHSpdpa9IziFocStW6xyuTF0218IhGKXrvUNF2 A8jViZlCDuG1nlcNmxcLNYLyplzHJ+sxC9wOgII= X-Google-Smtp-Source: ABdhPJwM3xrtaWjKFH/HnijSL7p5trcNvEal75mlayXsuH7CxRFpt+lUNROcDosKT57x7J0VH78O7dhzfAVKywakA0k= X-Received: by 2002:a05:6602:208f:: with SMTP id a15mr2439510ioa.123.1633183037788; Sat, 02 Oct 2021 06:57:17 -0700 (PDT) MIME-Version: 1.0 References: <20210927082223.757436-1-skori@marvell.com> <20210930090844.1059326-1-skori@marvell.com> In-Reply-To: From: Jerin Jacob Date: Sat, 2 Oct 2021 19:26:51 +0530 Message-ID: To: "Kinsella, Ray" Cc: Sunil Kumar Kori , Nithin Dabilpuram , Kiran Kumar K , Satha Rao , dpdk-dev Content-Type: text/plain; charset="UTF-8" Subject: Re: [dpdk-dev] [PATCH v3 01/27] common/cnxk: update policer MBOX APIs and HW definitions 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 Sender: "dev" On Thu, Sep 30, 2021 at 3:31 PM Kinsella, Ray wrote: > > > > On 30/09/2021 10:08, skori@marvell.com wrote: > > From: Sunil Kumar Kori > > > > To support ingress policer on CN10K, MBOX interfaces and HW > > definitions are synced. > > > > Signed-off-by: Sunil Kumar Kori # Please add cover letter # Please update the release notes for this feature # Please rebase to next-net-mrvl and fix following issues [for-next-net]dell[dpdk-next-net-mrvl] $ git pw series apply 19286 && rm -rf /tmp/k/* && git format-patch HEAD~27 -o /tmp/k/ && git reset --hard HEAD~27 Applying: common/cnxk: update policer MBOX APIs and HW definitions Applying: common/cnxk: support RoC API to get level to index Using index info to reconstruct a base tree... M drivers/common/cnxk/meson.build M drivers/common/cnxk/roc_nix.h M drivers/common/cnxk/roc_nix_priv.h M drivers/common/cnxk/roc_utils.c M drivers/common/cnxk/version.map Falling back to patching base and 3-way merge... Auto-merging drivers/common/cnxk/version.map Auto-merging drivers/common/cnxk/roc_utils.c Auto-merging drivers/common/cnxk/roc_nix_priv.h Auto-merging drivers/common/cnxk/roc_nix.h CONFLICT (content): Merge conflict in drivers/common/cnxk/roc_nix.h Auto-merging drivers/common/cnxk/meson.build error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0002 common/cnxk: support RoC API to get level to index 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". > > --- > > v3: > > - Rebase support on latest DPDK > > - Handled multilevel chaining for tree hierarchy > > - Fix naming convention > > v2: > > - Rebase support on latest DPDK > > - Handled multilevel chaining for linear hierarchy > > - Review comments incorporated > > > > drivers/common/cnxk/hw/nix.h | 13 ++++++++++--- > > drivers/common/cnxk/roc_mbox.h | 34 +++++++++++++++++++++++++++++++++- > > 2 files changed, 43 insertions(+), 4 deletions(-) > > > Acked-by: Ray Kinsella > (for the series).