Received: by 2002:a05:6500:1b45:b0:1f5:f2ab:c469 with SMTP id cz5csp381141lqb; Tue, 16 Apr 2024 21:10:51 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUa19PRVonELqWOK9Z1GmLMmWN+u6+Yf7IIxi2H8tkLfNnjRlXwnWeflwt4/EmKVp1epA6LreZDFrhmFCaYsPc0bLTF94NuI8c68KZI9A== X-Google-Smtp-Source: AGHT+IFa6PSrD0DjG1MZ9ZYlCVLOr16yxMPWLIVoxan3g98NvljpAsL8x+dqExfOCefMXPe79keW X-Received: by 2002:a0c:fd22:0:b0:69c:1cf9:1924 with SMTP id i2-20020a0cfd22000000b0069c1cf91924mr7428978qvs.28.1713327050987; Tue, 16 Apr 2024 21:10:50 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1713327050; cv=pass; d=google.com; s=arc-20160816; b=QqF40VEQLD9wg8rv4R2eNRw4VATmCUFK5vQojvBwe8wYpEEWP5RAli10akfky5nxkv m/lL3GkIEfrLNJeUnjJIxl9G52Xk+AkiZxGmXDxblMQpx3ZEXmnGe/mP+JoKF5OP2vxG vyX69TnGezOBDSfshRdPYkr6Fh//WOr0lg0tCzlWcNm842KP6XIjwOukjJp/aAqZJuwV GVEvBTzVQAKdRTKhs6QYu9zIZZkLu9HSgjXelwwUEZrCwxVLy4/q/Ba+FXPLJmtiYGlk i44h2ATK1JGm2Fi5YuwNuzvuEeNIsQMLR79mfqyc6w26kM8FviLsZ5eybtT5BAAMJkBZ prew== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:list-unsubscribe:list-subscribe:list-id:precedence :dkim-signature; bh=vC7vN7KzErhcyhq2m+o4PvDY7oR2KY/Jt1Pq6YSk/ps=; fh=8vcpzTTDB4F/CzoojSeZDbJ9hAR4/PEx9AX+SfAw+dk=; b=DdrchRBqJgGs1xLVLV5geD4K98SAT7dlCCf5AGdzrWmONmU5C/eUQjKuSK2vwOq5nO WTynjvW/RMesztupEUrN+rs4U10uivmF+UjDvQN3YFvayL5v+RkR0xhAGhlpBIZ2R8dL 5JcthOD8U9O0CoXSDEJ2hQP5MFPWd0JH3i+PcCBpOa1Uou6l5LYMxnb6bLIrx/fUGKK8 MZ6v6aByNk4MsDap0Tj6SjQI2FHDG04BQY3g9LYIFdVzp8lLEUIjFlw1QfU4zg6aky4s 0e+lof9mnBTJZqFsDNZamE3adFtmSajnvn0heuznrGb60cFPJA20pPboaj9rwpaIbOnO wCvQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@broadcom.com header.s=google header.b=JXVb8gHx; arc=pass (i=1 dkim=pass dkdomain=broadcom.com dmarc=pass fromdomain=broadcom.com); spf=pass (google.com: domain of linux-kernel+bounces-147914-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-147914-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=broadcom.com Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id t10-20020a05621405ca00b0069b40717220si13551816qvz.526.2024.04.16.21.10.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Apr 2024 21:10:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-147914-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@broadcom.com header.s=google header.b=JXVb8gHx; arc=pass (i=1 dkim=pass dkdomain=broadcom.com dmarc=pass fromdomain=broadcom.com); spf=pass (google.com: domain of linux-kernel+bounces-147914-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-147914-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=broadcom.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id A3A451C215CA for ; Wed, 17 Apr 2024 04:10:50 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 715BD42AB5; Wed, 17 Apr 2024 04:10:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="JXVb8gHx" Received: from mail-lj1-f177.google.com (mail-lj1-f177.google.com [209.85.208.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0D1138494 for ; Wed, 17 Apr 2024 04:10:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.177 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713327038; cv=none; b=QqL+4+N3bD9sawIxQn3tOZ5fPA76HpQLD8Qd6TGmOHoZc6IEQPIo5qvhMuOm5U2rxExL+qrhX5lspAswDnUspI7TMwtw3NMwedLk4KGY/mbeceNE87N05RZVEjN8Iow4qJFQPLDPJ4GvjxMGLqP9EDBkHZKiIJWyvemlZOPJ49g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713327038; c=relaxed/simple; bh=VfcLi4cQ3UYVc80SapFMYWmrOxSsRKHFv1rfwdwAsEU=; h=MIME-Version:References:In-Reply-To:From:Date:Message-ID:Subject: To:Cc:Content-Type; b=nIR+//Byk8LDKe17irXR2Rq2eSx6MZKIWZaa+bSkEtj/aVOtcEJ1JYUEYrz5tW6CJ+XvgVA2CpBKmSWy9/eC2662YR8fIaOvRTDJm5benmizylwa6WEsvLzckYR1ii6+9xjc/3/lh4jbjcvkB6hj2Biql9ZiCiEVgw35eHmJH3E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=JXVb8gHx; arc=none smtp.client-ip=209.85.208.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Received: by mail-lj1-f177.google.com with SMTP id 38308e7fff4ca-2da0b3f7ad2so63716531fa.2 for ; Tue, 16 Apr 2024 21:10:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1713327034; x=1713931834; darn=vger.kernel.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=vC7vN7KzErhcyhq2m+o4PvDY7oR2KY/Jt1Pq6YSk/ps=; b=JXVb8gHxkeODEbRUNXHfP8hZmvtmxQ/MRiqCF7R84x4S1De8WYB0qbnZMan59k7KHO qoPwQVcRJ6ablQnfu6KAz6qFhSAFPun079J55FzVhyetwmndtzBwigXySY3kTcF1IAdi gb2sFA2wCCL0FlFGhshet1fTOCwVgZtekM/08= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713327034; x=1713931834; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=vC7vN7KzErhcyhq2m+o4PvDY7oR2KY/Jt1Pq6YSk/ps=; b=lqNNFvPZaepXV7v9HlPtyYjIxtWdheMm5Dq+Qx6Wwj2IOwZXGDNhOFHNkNV26fgtOf kyOtzNauufTdohvxKTFzdHaKbLIkkx+hFCLG1jcbdMB6DpBOH2ek1Xztv63h2Z9jDjZ0 ASGl/cYmXUg7cTgnl8l7XAtq23DX08y/2vP+qiIDhTGKBiaHWrCG39aFKPgKSX+rMlW7 RVsw414NIApmEiH8dc/+C+8oprLbDKUTKG6Qc/3Qb2tC2+HRUUqIWdTIX3q+8SsPu/hj Z3uKuQZ+zwQBEswX0t134sCQqQ13iNJz/33509dQ66rIEhNdfxr9vFRXIRSglhMtDXzp zdsQ== X-Forwarded-Encrypted: i=1; AJvYcCXojO0WeSHmcxsIH8gYMf7FETRzWEyo6q2+7fxOKFxsBl950lnQOVlLJu4AAJllDqsKo4Ztn7s1LIRNlJUdpj/9q9pn2BUmJ0UG4VXh X-Gm-Message-State: AOJu0YzavCbL3CkJE4URDY8v/UsgI1niZam0gxvEWUwnteaJOlcprOFg FnySD9AxZS8v9gxJgIYFW7rwCF6kugpGkAcAsmUtlOsvueCFVx4pk0HGJ6hBGVJrOtNMUITA9Q6 xAHwEr0weKNDr3OF0q40x1Ltn4CUyYiNzC+Eq X-Received: by 2002:a2e:b0d5:0:b0:2d3:9b4:4363 with SMTP id g21-20020a2eb0d5000000b002d309b44363mr9121600ljl.23.1713327033946; Tue, 16 Apr 2024 21:10:33 -0700 (PDT) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 References: <20240416050616.6056-1-gakula@marvell.com> <20240416050616.6056-6-gakula@marvell.com> In-Reply-To: <20240416050616.6056-6-gakula@marvell.com> From: Kalesh Anakkur Purayil Date: Wed, 17 Apr 2024 09:40:22 +0530 Message-ID: Subject: Re: [net-next PATCH 5/9] octeontx2-af: Add packet path between representor and VF To: Geetha sowjanya Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kuba@kernel.org, davem@davemloft.net, pabeni@redhat.com, edumazet@google.com, sgoutham@marvell.com, sbhatta@marvell.com, hkelam@marvell.com Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-256; boundary="000000000000464b86061643098a" --000000000000464b86061643098a Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, Apr 16, 2024 at 10:38=E2=80=AFAM Geetha sowjanya wrote: > > This patch installs tcam rules to stree traffic representors > and VF when swicthdev mode is set. To support this a HW loopback > channel is reserved. Through this channel packet are routed > between representor and VFs. "ESW_CFG" mbox is defined to > notify AF for installing rules. > > Signed-off-by: Geetha sowjanya > --- > .../net/ethernet/marvell/octeontx2/af/mbox.h | 7 + > .../net/ethernet/marvell/octeontx2/af/rvu.h | 7 +- > .../marvell/octeontx2/af/rvu_devlink.c | 6 + > .../ethernet/marvell/octeontx2/af/rvu_nix.c | 7 +- > .../ethernet/marvell/octeontx2/af/rvu_rep.c | 241 +++++++++++++++++- > .../marvell/octeontx2/af/rvu_switch.c | 18 +- > .../net/ethernet/marvell/octeontx2/nic/rep.c | 19 ++ > 7 files changed, 297 insertions(+), 8 deletions(-) > > diff --git a/drivers/net/ethernet/marvell/octeontx2/af/mbox.h b/drivers/n= et/ethernet/marvell/octeontx2/af/mbox.h > index c77c02730cf9..3b36da28a8f4 100644 > --- a/drivers/net/ethernet/marvell/octeontx2/af/mbox.h > +++ b/drivers/net/ethernet/marvell/octeontx2/af/mbox.h > @@ -144,6 +144,7 @@ M(LMTST_TBL_SETUP, 0x00a, lmtst_tbl_setup, lmtst_tbl= _setup_req, \ > M(SET_VF_PERM, 0x00b, set_vf_perm, set_vf_perm, msg_rsp) \ > M(PTP_GET_CAP, 0x00c, ptp_get_cap, msg_req, ptp_get_cap_rsp) \ > M(GET_REP_CNT, 0x00d, get_rep_cnt, msg_req, get_rep_cnt_rsp) \ > +M(ESW_CFG, 0x00e, esw_cfg, esw_cfg_req, msg_rsp) \ > /* CGX mbox IDs (range 0x200 - 0x3FF) */ \ > M(CGX_START_RXTX, 0x200, cgx_start_rxtx, msg_req, msg_rsp) \ > M(CGX_STOP_RXTX, 0x201, cgx_stop_rxtx, msg_req, msg_rsp) \ > @@ -1532,6 +1533,12 @@ struct get_rep_cnt_rsp { > u64 rsvd; > }; > > +struct esw_cfg_req { > + struct mbox_msghdr hdr; > + u8 ena; > + u64 rsvd; > +}; > + > struct flow_msg { > unsigned char dmac[6]; > unsigned char smac[6]; > diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu.h b/drivers/ne= t/ethernet/marvell/octeontx2/af/rvu.h > index 1d76d52d7a5d..c8572d79a968 100644 > --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu.h > +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu.h > @@ -596,6 +596,7 @@ struct rvu { > u16 rep_pcifunc; > int rep_cnt; > u16 *rep2pfvf_map; > + u8 rep_mode; > }; > > static inline void rvu_write64(struct rvu *rvu, u64 block, u64 offset, u= 64 val) > @@ -1025,7 +1026,7 @@ int rvu_ndc_fix_locked_cacheline(struct rvu *rvu, i= nt blkaddr); > /* RVU Switch */ > void rvu_switch_enable(struct rvu *rvu); > void rvu_switch_disable(struct rvu *rvu); > -void rvu_switch_update_rules(struct rvu *rvu, u16 pcifunc); > +void rvu_switch_update_rules(struct rvu *rvu, u16 pcifunc, bool ena); > void rvu_switch_enable_lbk_link(struct rvu *rvu, u16 pcifunc, bool ena); > > int rvu_npc_set_parse_mode(struct rvu *rvu, u16 pcifunc, u64 mode, u8 di= r, > @@ -1039,4 +1040,8 @@ int rvu_mcs_flr_handler(struct rvu *rvu, u16 pcifun= c); > void rvu_mcs_ptp_cfg(struct rvu *rvu, u8 rpm_id, u8 lmac_id, bool ena); > void rvu_mcs_exit(struct rvu *rvu); > > +/* Representor APIs */ > +int rvu_rep_pf_init(struct rvu *rvu); > +int rvu_rep_install_mcam_rules(struct rvu *rvu); > +void rvu_rep_update_rules(struct rvu *rvu, u16 pcifunc, bool ena); > #endif /* RVU_H */ > diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_devlink.c b/dr= ivers/net/ethernet/marvell/octeontx2/af/rvu_devlink.c > index 96c04f7d93f8..8a3b7fb61883 100644 > --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_devlink.c > +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_devlink.c > @@ -1464,6 +1464,9 @@ static int rvu_devlink_eswitch_mode_get(struct devl= ink *devlink, u16 *mode) > struct rvu *rvu =3D rvu_dl->rvu; > struct rvu_switch *rswitch; > > + if (rvu->rep_mode) > + return -EOPNOTSUPP; > + > rswitch =3D &rvu->rswitch; > *mode =3D rswitch->mode; > > @@ -1477,6 +1480,9 @@ static int rvu_devlink_eswitch_mode_set(struct devl= ink *devlink, u16 mode, > struct rvu *rvu =3D rvu_dl->rvu; > struct rvu_switch *rswitch; > > + if (rvu->rep_mode) > + return -EOPNOTSUPP; > + > rswitch =3D &rvu->rswitch; > switch (mode) { > case DEVLINK_ESWITCH_MODE_LEGACY: > diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c b/driver= s/net/ethernet/marvell/octeontx2/af/rvu_nix.c > index 4ef5bb7b337f..75d5c1bc00e1 100644 > --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c > +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c > @@ -2738,7 +2738,7 @@ void rvu_nix_tx_tl2_cfg(struct rvu *rvu, int blkadd= r, u16 pcifunc, > int schq; > u64 cfg; > > - if (!is_pf_cgxmapped(rvu, pf)) > + if (!is_pf_cgxmapped(rvu, pf) && !is_rep_dev(rvu, pcifunc)) > return; > > cfg =3D enable ? (BIT_ULL(12) | RVU_SWITCH_LBK_CHAN) : 0; > @@ -4368,8 +4368,6 @@ int rvu_mbox_handler_nix_set_mac_addr(struct rvu *r= vu, > if (test_bit(PF_SET_VF_TRUSTED, &pfvf->flags) && from_vf) > ether_addr_copy(pfvf->default_mac, req->mac_addr); > > - rvu_switch_update_rules(rvu, pcifunc); > - > return 0; > } > > @@ -5159,7 +5157,7 @@ int rvu_mbox_handler_nix_lf_start_rx(struct rvu *rv= u, struct msg_req *req, > pfvf =3D rvu_get_pfvf(rvu, pcifunc); > set_bit(NIXLF_INITIALIZED, &pfvf->flags); > > - rvu_switch_update_rules(rvu, pcifunc); > + rvu_switch_update_rules(rvu, pcifunc, true); > > return rvu_cgx_start_stop_io(rvu, pcifunc, true); > } > @@ -5187,6 +5185,7 @@ int rvu_mbox_handler_nix_lf_stop_rx(struct rvu *rvu= , struct msg_req *req, > if (err) > return err; > > + rvu_switch_update_rules(rvu, pcifunc, false); > rvu_cgx_tx_enable(rvu, pcifunc, true); > > return 0; > diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_rep.c b/driver= s/net/ethernet/marvell/octeontx2/af/rvu_rep.c > index d07cb356d3d6..5c015e8dfbbe 100644 > --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_rep.c > +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_rep.c > @@ -13,6 +13,246 @@ > #include "rvu.h" > #include "rvu_reg.h" > > +static u16 rvu_rep_get_vlan_id(struct rvu *rvu, u16 pcifunc) > +{ > + int id; > + > + for (id =3D 0; id < rvu->rep_cnt; id++) > + if (rvu->rep2pfvf_map[id] =3D=3D pcifunc) > + return id; > + return -ENODEV; > +} > + > +static int rvu_rep_tx_vlan_cfg(struct rvu *rvu, u16 pcifunc, > + u16 vlan_tci, int *vidx) > +{ > + struct nix_vtag_config req =3D {0}; > + struct nix_vtag_config_rsp rsp =3D {0}; > + u64 etype =3D ETH_P_8021Q; > + int err; > + > + /* Insert vlan tag */ > + req.hdr.pcifunc =3D pcifunc; > + req.vtag_size =3D VTAGSIZE_T4; > + req.cfg_type =3D 0; /* tx vlan cfg */ > + req.tx.cfg_vtag0 =3D true; > + req.tx.vtag0 =3D etype << 48 | ntohs(vlan_tci); > + > + err =3D rvu_mbox_handler_nix_vtag_cfg(rvu, &req, &rsp); > + if (err) { > + dev_err(rvu->dev, "Tx vlan config failed\n"); > + return err; > + } > + *vidx =3D rsp.vtag0_idx; > + return 0; > +} > + > +static int rvu_rep_rx_vlan_cfg(struct rvu *rvu, u16 pcifunc) > +{ > + struct nix_vtag_config req =3D {0}; > + struct nix_vtag_config_rsp rsp; > + > + /* config strip, capture and size */ > + req.hdr.pcifunc =3D pcifunc; > + req.vtag_size =3D VTAGSIZE_T4; > + req.cfg_type =3D 1; /* rx vlan cfg */ > + req.rx.vtag_type =3D NIX_AF_LFX_RX_VTAG_TYPE0; > + req.rx.strip_vtag =3D true; > + req.rx.capture_vtag =3D false; > + > + return rvu_mbox_handler_nix_vtag_cfg(rvu, &req, &rsp); > +} > + > +static int rvu_rep_install_rx_rule(struct rvu *rvu, u16 pcifunc, > + u16 entry, bool rte) > +{ > + struct npc_install_flow_req req =3D { 0 }; > + struct npc_install_flow_rsp rsp =3D { 0 }; > + struct rvu_pfvf *pfvf; > + u16 vlan_tci, rep_id; > + > + pfvf =3D rvu_get_pfvf(rvu, pcifunc); > + > + /* To stree the traffic from Representee to Representor */ > + rep_id =3D (u16)rvu_rep_get_vlan_id(rvu, pcifunc); > + if (rte) { > + vlan_tci =3D rep_id | 0x1ull << 8; > + req.vf =3D rvu->rep_pcifunc; > + req.op =3D NIX_RX_ACTIONOP_UCAST; > + req.index =3D rep_id; > + } else { > + vlan_tci =3D rep_id; > + req.vf =3D pcifunc; > + req.op =3D NIX_RX_ACTION_DEFAULT; > + } > + > + rvu_rep_rx_vlan_cfg(rvu, req.vf); > + req.entry =3D entry; > + req.hdr.pcifunc =3D 0; /* AF is requester */ > + req.features =3D BIT_ULL(NPC_OUTER_VID) | BIT_ULL(NPC_VLAN_ETYPE_= CTAG); > + req.vtag0_valid =3D true; > + req.vtag0_type =3D NIX_AF_LFX_RX_VTAG_TYPE0; > + req.packet.vlan_etype =3D ETH_P_8021Q; > + req.mask.vlan_etype =3D ETH_P_8021Q; > + req.packet.vlan_tci =3D vlan_tci; > + req.mask.vlan_tci =3D 0xffff; > + > + req.channel =3D RVU_SWITCH_LBK_CHAN; > + req.chan_mask =3D 0xffff; > + req.intf =3D pfvf->nix_rx_intf; > + > + return rvu_mbox_handler_npc_install_flow(rvu, &req, &rsp); > +} > + > +static int rvu_rep_install_tx_rule(struct rvu *rvu, u16 pcifunc, u16 ent= ry, > + bool rte) > +{ > + struct npc_install_flow_req req =3D { 0 }; > + struct npc_install_flow_rsp rsp =3D { 0 }; > + struct rvu_pfvf *pfvf; > + int vidx, err; > + u16 vlan_tci; > + u8 lbkid; > + > + pfvf =3D rvu_get_pfvf(rvu, pcifunc); > + vlan_tci =3D rvu_rep_get_vlan_id(rvu, pcifunc); > + if (rte) > + vlan_tci |=3D 0x1ull << 8; > + > + err =3D rvu_rep_tx_vlan_cfg(rvu, pcifunc, vlan_tci, &vidx); > + if (err) > + return err; > + > + lbkid =3D pfvf->nix_blkaddr =3D=3D BLKADDR_NIX0 ? 0 : 1; > + req.hdr.pcifunc =3D 0; /* AF is requester */ > + if (rte) { > + req.vf =3D pcifunc; > + } else { > + req.vf =3D rvu->rep_pcifunc; > + req.packet.sq_id =3D vlan_tci; > + req.mask.sq_id =3D 0xffff; > + } > + > + req.entry =3D entry; > + req.intf =3D pfvf->nix_tx_intf; > + req.op =3D NIX_TX_ACTIONOP_UCAST_CHAN; > + req.index =3D (lbkid << 8) | RVU_SWITCH_LBK_CHAN; > + req.set_cntr =3D 1; > + req.vtag0_def =3D vidx; > + req.vtag0_op =3D 1; > + return rvu_mbox_handler_npc_install_flow(rvu, &req, &rsp); > +} > + > +int rvu_rep_install_mcam_rules(struct rvu *rvu) > +{ > + struct rvu_switch *rswitch =3D &rvu->rswitch; > + u16 start =3D rswitch->start_entry; > + struct rvu_hwinfo *hw =3D rvu->hw; > + u16 pcifunc, entry =3D 0; > + int pf, vf, numvfs; > + int err, nixlf, i; > + u8 rep; > + > + for (pf =3D 1; pf < hw->total_pfs; pf++) { > + if (!is_pf_cgxmapped(rvu, pf)) > + continue; > + > + pcifunc =3D pf << RVU_PFVF_PF_SHIFT; > + rvu_get_nix_blkaddr(rvu, pcifunc); > + rep =3D true; > + for (i =3D 0; i < 2; i++) { > + err =3D rvu_rep_install_rx_rule(rvu, pcifunc, sta= rt + entry, rep); > + if (err) > + return err; > + rswitch->entry2pcifunc[entry++] =3D pcifunc; > + > + err =3D rvu_rep_install_tx_rule(rvu, pcifunc, sta= rt + entry, rep); > + if (err) > + return err; > + rswitch->entry2pcifunc[entry++] =3D pcifunc; > + rep =3D false; > + } > + > + rvu_get_pf_numvfs(rvu, pf, &numvfs, NULL); > + for (vf =3D 0; vf < numvfs; vf++) { > + pcifunc =3D pf << RVU_PFVF_PF_SHIFT | > + ((vf + 1) & RVU_PFVF_FUNC_MASK); > + rvu_get_nix_blkaddr(rvu, pcifunc); > + > + /* Skip installimg rules if nixlf is not attached= */ > + err =3D nix_get_nixlf(rvu, pcifunc, &nixlf, NULL)= ; > + if (err) > + continue; > + rep =3D true; > + for (i =3D 0; i < 2; i++) { > + err =3D rvu_rep_install_rx_rule(rvu, pcif= unc, start + entry, rep); > + if (err) > + return err; > + rswitch->entry2pcifunc[entry++] =3D pcifu= nc; > + > + err =3D rvu_rep_install_tx_rule(rvu, pcif= unc, start + entry, rep); > + if (err) > + return err; > + rswitch->entry2pcifunc[entry++] =3D pcifu= nc; > + rep =3D false; > + } > + } > + } > + return 0; > +} > + > +void rvu_rep_update_rules(struct rvu *rvu, u16 pcifunc, bool ena) > +{ > + struct rvu_switch *rswitch =3D &rvu->rswitch; > + struct npc_mcam *mcam =3D &rvu->hw->mcam; > + u32 max =3D rswitch->used_entries; > + int blkaddr; > + u16 entry; > + > + if (!rswitch->used_entries) > + return; > + > + blkaddr =3D rvu_get_blkaddr(rvu, BLKTYPE_NPC, 0); > + > + if (blkaddr < 0) > + return; > + > + rvu_switch_enable_lbk_link(rvu, pcifunc, ena); > + mutex_lock(&mcam->lock); > + for (entry =3D 0; entry < max; entry++) { > + if (rswitch->entry2pcifunc[entry] =3D=3D pcifunc) > + npc_enable_mcam_entry(rvu, mcam, blkaddr, entry, = ena); > + } > + mutex_unlock(&mcam->lock); > +} > + > +int rvu_rep_pf_init(struct rvu *rvu) > +{ > + u16 pcifunc =3D rvu->rep_pcifunc; > + struct rvu_pfvf *pfvf =3D rvu_get_pfvf(rvu, pcifunc); > + > + set_bit(NIXLF_INITIALIZED, &pfvf->flags); > + rvu_switch_enable_lbk_link(rvu, pcifunc, true); > + rvu_rep_rx_vlan_cfg(rvu, pcifunc); > + return 0; > +} > + > +int rvu_mbox_handler_esw_cfg(struct rvu *rvu, struct esw_cfg_req *req, > + struct msg_rsp *rsp) > +{ > + if (req->hdr.pcifunc !=3D rvu->rep_pcifunc) > + return 0; > + > + rvu->rep_mode =3D req->ena; > + > + if (req->ena) > + rvu_switch_enable(rvu); > + else > + rvu_switch_disable(rvu); > + > + return 0; > +} > + > int rvu_mbox_handler_get_rep_cnt(struct rvu *rvu, struct msg_req *req, > struct get_rep_cnt_rsp *rsp) > { > @@ -45,4 +285,3 @@ int rvu_mbox_handler_get_rep_cnt(struct rvu *rvu, stru= ct msg_req *req, > } > return 0; > } > - > diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_switch.c b/dri= vers/net/ethernet/marvell/octeontx2/af/rvu_switch.c > index ceb81eebf65e..268efb7c1c15 100644 > --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_switch.c > +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_switch.c > @@ -166,6 +166,8 @@ void rvu_switch_enable(struct rvu *rvu) > > alloc_req.contig =3D true; > alloc_req.count =3D rvu->cgx_mapped_pfs + rvu->cgx_mapped_vfs; > + if (rvu->rep_mode) > + alloc_req.count =3D alloc_req.count * 4; > ret =3D rvu_mbox_handler_npc_mcam_alloc_entry(rvu, &alloc_req, > &alloc_rsp); > if (ret) { > @@ -189,7 +191,12 @@ void rvu_switch_enable(struct rvu *rvu) > rswitch->used_entries =3D alloc_rsp.count; > rswitch->start_entry =3D alloc_rsp.entry; > > - ret =3D rvu_switch_install_rules(rvu); > + if (rvu->rep_mode) { > + rvu_rep_pf_init(rvu); > + ret =3D rvu_rep_install_mcam_rules(rvu); > + } else { > + ret =3D rvu_switch_install_rules(rvu); > + } > if (ret) > goto uninstall_rules; > > @@ -222,6 +229,9 @@ void rvu_switch_disable(struct rvu *rvu) > if (!rswitch->used_entries) > return; > > + if (rvu->rep_mode) > + goto free_ents; > + > for (pf =3D 1; pf < hw->total_pfs; pf++) { > if (!is_pf_cgxmapped(rvu, pf)) > continue; > @@ -249,6 +259,7 @@ void rvu_switch_disable(struct rvu *rvu) > } > } > > +free_ents: > uninstall_req.start =3D rswitch->start_entry; > uninstall_req.end =3D rswitch->start_entry + rswitch->used_entri= es - 1; > free_req.all =3D 1; > @@ -258,12 +269,15 @@ void rvu_switch_disable(struct rvu *rvu) > kfree(rswitch->entry2pcifunc); > } > > -void rvu_switch_update_rules(struct rvu *rvu, u16 pcifunc) > +void rvu_switch_update_rules(struct rvu *rvu, u16 pcifunc, bool ena) > { > struct rvu_switch *rswitch =3D &rvu->rswitch; > u32 max =3D rswitch->used_entries; > u16 entry; > > + if (rvu->rep_mode) > + return rvu_rep_update_rules(rvu, pcifunc, ena); > + > if (!rswitch->used_entries) > return; > > diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/rep.c b/drivers/n= et/ethernet/marvell/octeontx2/nic/rep.c > index 187b00156bcd..1329617f8d6f 100644 > --- a/drivers/net/ethernet/marvell/octeontx2/nic/rep.c > +++ b/drivers/net/ethernet/marvell/octeontx2/nic/rep.c > @@ -28,6 +28,22 @@ MODULE_DESCRIPTION(DRV_STRING); > MODULE_LICENSE("GPL"); > MODULE_DEVICE_TABLE(pci, rvu_rep_id_table); > > +static int rvu_eswitch_config(struct otx2_nic *priv, u8 ena) > +{ > + struct esw_cfg_req *req; > + > + mutex_lock(&priv->mbox.lock); > + req =3D otx2_mbox_alloc_msg_esw_cfg(&priv->mbox); > + if (!req) { > + mutex_unlock(&priv->mbox.lock); > + return -ENOMEM; > + } > + req->ena =3D ena; > + otx2_sync_mbox_msg(&priv->mbox); > + mutex_unlock(&priv->mbox.lock); > + return 0; > +} > + > static netdev_tx_t rvu_rep_xmit(struct sk_buff *skb, struct net_device *= dev) > { > struct rep_dev *rep =3D netdev_priv(dev); > @@ -170,6 +186,8 @@ static void rvu_rep_free_netdev(struct otx2_nic *priv= ) > > void rvu_rep_destroy(struct otx2_nic *priv) > { > + /* Remove mcam rules */ > + rvu_eswitch_config(priv, false); > rvu_rep_free_cq_rsrc(priv); > rvu_rep_free_netdev(priv); > } > @@ -221,6 +239,7 @@ int rvu_rep_create(struct otx2_nic *priv) > if (err) > goto exit; > > + rvu_eswitch_config(priv, true); > return 0; > exit: > rvu_rep_free_netdev(priv); > -- > 2.25.1 > > --=20 Regards, Kalesh A P --000000000000464b86061643098a Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature 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 riBJ/K1AFUjRAjFhGV64l++td7dkmnq/X8ET75ti+w1s4FRpFqkD2m7pg5NxdsZphYIXAgMBAAGj QjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSP8Et/qC5FJK5N UPpjmove4t0bvDANBgkqhkiG9w0BAQsFAAOCAQEAS0DbwFCq/sgM7/eWVEVJu5YACUGssxOGhigH M8pr5nS5ugAtrqQK0/Xx8Q+Kv3NnSoPHRHt44K9ubG8DKY4zOUXDjuS5V2yq/BKW7FPGLeQkbLmU Y/vcU2hnVj6DuM81IcPJaP7O2sJTqsyQiunwXUaMld16WCgaLx3ezQA3QY/tRG3XUyiXfvNnBB4V 14qWtNPeTCekTBtzc3b0F5nCH3oO4y0IrQocLP88q1UOD5F+NuvDV0m+4S4tfGCLw0FREyOdzvcy a5QBqJnnLDMfOjsl0oZAzjsshnjJYS8Uuu7bVW/fhO4FCU29KNhyztNiUGUe65KXgzHZs7XKR1g/ XzCCBWowggRSoAMCAQICDDfBRQmwNSI92mit0zANBgkqhkiG9w0BAQsFADBbMQswCQYDVQQGEwJC RTEZMBcGA1UEChMQR2xvYmFsU2lnbiBudi1zYTExMC8GA1UEAxMoR2xvYmFsU2lnbiBHQ0MgUjMg UGVyc29uYWxTaWduIDIgQ0EgMjAyMDAeFw0yMjA5MTAwODI5NTZaFw0yNTA5MTAwODI5NTZaMIGi MQswCQYDVQQGEwJJTjESMBAGA1UECBMJS2FybmF0YWthMRIwEAYDVQQHEwlCYW5nYWxvcmUxFjAU BgNVBAoTDUJyb2FkY29tIEluYy4xHzAdBgNVBAMTFkthbGVzaCBBbmFra3VyIFB1cmF5aWwxMjAw BgkqhkiG9w0BCQEWI2thbGVzaC1hbmFra3VyLnB1cmF5aWxAYnJvYWRjb20uY29tMIIBIjANBgkq hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxnv1Reaeezfr6NEmg3xZlh4cz9m7QCN13+j4z1scrX+b JfnV8xITT5yvwdQv3R3p7nzD/t29lTRWK3wjodUd2nImo6vBaH3JbDwleIjIWhDXLNZ4u7WIXYwx aQ8lYCdKXRsHXgGPY0+zSx9ddpqHZJlHwcvas3oKnQN9WgzZtsM7A8SJefWkNvkcOtef6bL8Ew+3 FBfXmtsPL9I2vita8gkYzunj9Nu2IM+MnsP7V/+Coy/yZDtFJHp30hDnYGzuOhJchDF9/eASvE8T T1xqJODKM9xn5xXB1qezadfdgUs8k8QAYyP/oVBafF9uqDudL6otcBnziyDBQdFCuAQN7wIDAQAB o4IB5DCCAeAwDgYDVR0PAQH/BAQDAgWgMIGjBggrBgEFBQcBAQSBljCBkzBOBggrBgEFBQcwAoZC aHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLmNvbS9jYWNlcnQvZ3NnY2NyM3BlcnNvbmFsc2lnbjJj YTIwMjAuY3J0MEEGCCsGAQUFBzABhjVodHRwOi8vb2NzcC5nbG9iYWxzaWduLmNvbS9nc2djY3Iz cGVyc29uYWxzaWduMmNhMjAyMDBNBgNVHSAERjBEMEIGCisGAQQBoDIBKAowNDAyBggrBgEFBQcC ARYmaHR0cHM6Ly93d3cuZ2xvYmFsc2lnbi5jb20vcmVwb3NpdG9yeS8wCQYDVR0TBAIwADBJBgNV HR8EQjBAMD6gPKA6hjhodHRwOi8vY3JsLmdsb2JhbHNpZ24uY29tL2dzZ2NjcjNwZXJzb25hbHNp Z24yY2EyMDIwLmNybDAuBgNVHREEJzAlgSNrYWxlc2gtYW5ha2t1ci5wdXJheWlsQGJyb2FkY29t LmNvbTATBgNVHSUEDDAKBggrBgEFBQcDBDAfBgNVHSMEGDAWgBSWM9HmWBdbNHWKgVZk1b5I3qGP zzAdBgNVHQ4EFgQUI3+tdStI+ABRGSqksMsiCmO9uDAwDQYJKoZIhvcNAQELBQADggEBAGfe1o9b 4wUud0FMjb/FNdc433meL15npjdYWUeioHdlCGB5UvEaMGu71QysfoDOfUNeyO9YKp0h0fm7clvo cBqeWe4CPv9TQbmLEtXKdEpj5kFZBGmav69mGTlu1A9KDQW3y0CDzCPG2Fdm4s73PnkwvemRk9E2 u9/kcZ8KWVeS+xq+XZ78kGTKQ6Wii3dMK/EHQhnDfidadoN/n+x2ySC8yyDNvy81BocnblQzvbuB a30CvRuhokNO6Jzh7ZFtjKVMzYas3oo6HXgA+slRszMu4pc+fRPO41FHjeDM76e6P5OnthhnD+NY x6xokUN65DN1bn2MkeNs0nQpizDqd0QxggJtMIICaQIBATBrMFsxCzAJBgNVBAYTAkJFMRkwFwYD VQQKExBHbG9iYWxTaWduIG52LXNhMTEwLwYDVQQDEyhHbG9iYWxTaWduIEdDQyBSMyBQZXJzb25h bFNpZ24gMiBDQSAyMDIwAgw3wUUJsDUiPdpordMwDQYJYIZIAWUDBAIBBQCggdQwLwYJKoZIhvcN AQkEMSIEII57ymveNrEK55Ueh61rdpKbloDSn0IpGPYhuk8++2VZMBgGCSqGSIb3DQEJAzELBgkq hkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTI0MDQxNzA0MTAzNFowaQYJKoZIhvcNAQkPMVwwWjAL BglghkgBZQMEASowCwYJYIZIAWUDBAEWMAsGCWCGSAFlAwQBAjAKBggqhkiG9w0DBzALBgkqhkiG 9w0BAQowCwYJKoZIhvcNAQEHMAsGCWCGSAFlAwQCATANBgkqhkiG9w0BAQEFAASCAQBIe5fx4IDu YLJJbKQDo3YSVZ/tDEhsAhFyrA/XfyznkgiXmdteE0R5iq8K3W/BhdU2uBT3ertvkiuWYXRJR5ni ll1EJWZ8nRmGKIy7JwyNmfYGrPhvvq7sbq3/najOvlUWB5mYF99PwZhWmIH3FE32JmCa7sHbGtnV LT6PkDx1+kzJSSNrb7S7qcVMnzoBY/0JQAYjIgBXjYGOM3pkCWulxhKkApB4VPPDakdxlFANhHlP ctN7rW8BoUrlFGr4z5WN2w0huoBPXgaR5WSFVHrrUSKHC0ANN4qLOAguvivukK26A10Lm/4Qb83j m2dVgQBG1ZaDvsAAEoWdZJEqd9l6 --000000000000464b86061643098a--