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 29C9AA0567 for ; Mon, 8 Mar 2021 14:34:22 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 18B9A22A385; Mon, 8 Mar 2021 14:34:22 +0100 (CET) Received: from mail-il1-f173.google.com (mail-il1-f173.google.com [209.85.166.173]) by mails.dpdk.org (Postfix) with ESMTP id 3B98E4068A; Mon, 8 Mar 2021 14:34:19 +0100 (CET) Received: by mail-il1-f173.google.com with SMTP id p10so8796110ils.9; Mon, 08 Mar 2021 05:34:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=QOzNbdgOAkpHVixxiWRZA++D59U9HKD1eaoK3FYbG2E=; b=e5CEvFbzewBjyqAbDIHpXCP6hyB0tYsZBqzCNDfouUmLuRCYFwPrB4sgIsKIBtsm5S V3H3Fd5IUG+CGXL2Sb54UCuQjb8XtJUEVIQ1kvkd26BOwpTk3OebyKzwJpsQ5+SevXPo p9Ihb/eDcO1vQ3bU1mQTcEXPrea7qYiLi02CblYKr/mIbwdJ8wkg4zp0aYuzd6Vx/MRk e6LbkCbbmTNbDr3o8l3EgahYVgQWD08RF3QZu5/GPmHRP6yl7zgbAV32NF9QkR6lxEUc VL0nFneLhBrWPSthFkCDcV4Z1Q8UyvB4rIKa+NjmD6UQS5lGUcAHj/vBTSFUO0/HCReH gz/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=QOzNbdgOAkpHVixxiWRZA++D59U9HKD1eaoK3FYbG2E=; b=ukv9rEFBjdLndiLfm69ulOwPuQp0pVsq/nXPDxLM8JWtvFJtg6kJwAXslzTOeD13CE tKEH/yR7X0/juLO3oYv42h0IYWSJ8lh9eR4jJH2j2WuM26dighFOQrEFBI3U0zTrd7uG xOd+awc23yuCxLw8U21jQHKYQN81HQ7CFDHODE72LuzoUxYljnzLckcKmuxSm/D0bxvQ pyEC3Klv1pgmgBR8ryyNNELpdnSMv6GMDBZXOSZlN4mMKpQ91G2R+g7Eh0XWOPL70I1E gJhemCLSTvQxoVaRWwBkip3PPkJ2rG68thTF1FHXgHApmBm1l2jSDHTaCiq2EOFltu4m Kr2w== X-Gm-Message-State: AOAM533gDCWj1U+XueJI2RTIsHop03k/yRdvbHW+nnFtT1dZT/4SWKgq YdoERZXBHfFffOrbwTsDBoUdNihF4iOXXvnuQAY= X-Google-Smtp-Source: ABdhPJzJ1latydZBOjZFk8/qCQlPKPEQF3CbtnyMwz8CiZuGGc7vLGhvGkEDaHmm+/FfqO2JAR04CyeSDdUClYTFzzE= X-Received: by 2002:a92:d18e:: with SMTP id z14mr20711120ilz.130.1615210458545; Mon, 08 Mar 2021 05:34:18 -0800 (PST) MIME-Version: 1.0 References: <20210209100113.2493325-1-psatheesh@marvell.com> In-Reply-To: <20210209100113.2493325-1-psatheesh@marvell.com> From: Jerin Jacob Date: Mon, 8 Mar 2021 19:04:02 +0530 Message-ID: To: Satheesh Paul Cc: Jerin Jacob , Nithin Dabilpuram , Kiran Kumar K , dpdk-dev , dpdk stable , Ferruh Yigit Content-Type: text/plain; charset="UTF-8" Subject: Re: [dpdk-stable] [dpdk-dev] [PATCH] net/octeontx2: fix vlan filter on port X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" On Tue, Feb 9, 2021 at 3:31 PM wrote: > > From: Satheesh Paul > > This patch fixes incorrect MCAM key preparation when creating > MCAM entry to allow VLAN IDs after vlan filtering is enabled on port. > > Fixes: ba1b3b081e ("net/octeontx2: support VLAN offloads") > Cc: stable@dpdk.org > Changed vlan to VLAN in the subject. Acked-by: Jerin Jacob Applied to dpdk-next-net-mrvl/for-main. Thanks > Signed-off-by: Satheesh Paul > --- > drivers/net/octeontx2/otx2_vlan.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/octeontx2/otx2_vlan.c b/drivers/net/octeontx2/otx2_vlan.c > index 7357b0669..f5161e17a 100644 > --- a/drivers/net/octeontx2/otx2_vlan.c > +++ b/drivers/net/octeontx2/otx2_vlan.c > @@ -306,12 +306,12 @@ nix_vlan_mcam_config(struct rte_eth_dev *eth_dev, > (0xF & ~(NPC_LT_LB_CTAG ^ NPC_LT_LB_STAG_QINQ)) > << mkex->lb_lt_offset; > > - mcam_data = ((uint32_t)vlan_id << 16); > - mcam_mask = (BIT_ULL(16) - 1) << 16; > + mcam_data = (uint16_t)vlan_id; > + mcam_mask = (BIT_ULL(16) - 1); > otx2_mbox_memcpy(key_data + mkex->lb_xtract.key_off, > - &mcam_data, mkex->lb_xtract.len + 1); > + &mcam_data, mkex->lb_xtract.len); > otx2_mbox_memcpy(key_mask + mkex->lb_xtract.key_off, > - &mcam_mask, mkex->lb_xtract.len + 1); > + &mcam_mask, mkex->lb_xtract.len); > } > > /* Adds LB STAG flag to MCAM KW */ > -- > 2.25.4 >