From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6A640C2C8; Wed, 29 Jul 2026 04:51:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=67.231.156.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785300702; cv=none; b=lMow3HM4OjvfTHFS1ntwHq5jOe1eyQY5aXrIlol3cYwYBay4AcrU9JZuIJuNiL701eWrbHMOgaHZ1l8SZ7oSdzSWeiWjslBk3u5xKaK7BRPOeEivoT9pZ8nyGz0tK2zLgX36xiMJSXa38y3BoyY7ZORTOquuapNSLS8Vihxu9B0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785300702; c=relaxed/simple; bh=lIYxCuIxs8kTQZdin/lfa4sCNABG1D0t/RJ9m24VKU4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=W65dgafEKBSOHgcCUea96DUQc2urfBJ47UnXtvvupN2GMlJEw8JIzDI/0yPbaqlz2Cmle4PEMSq8Jyp+c524WEQpa6LDROc7BxRF9SJfpnvPmei+X7jktmxaDk0X5TLLHurwrNEzStHdUQ8HorSDxMu+mieeGH7IP6RUcNnUl3U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=marvell.com; spf=pass smtp.mailfrom=marvell.com; dkim=pass (2048-bit key) header.d=marvell.com header.i=@marvell.com header.b=B5tZ0T+W; arc=none smtp.client-ip=67.231.156.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=marvell.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=marvell.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=marvell.com header.i=@marvell.com header.b="B5tZ0T+W" Received: from pps.filterd (m0431383.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66T4dgFp3415813; Tue, 28 Jul 2026 21:51:27 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pfpt0220; bh=V P4BrmslEGr8TYpL/BS5Sjhg/tLyxPTbSW+6SCypeFo=; b=B5tZ0T+WytdXVn9Sh yrsgO7GHuaU/dynAkq4LFz2TQaXmwMFE0/n6cGGsjfToY/EN+M72myD1P86hc86O f151Ixexd3lwUqI9AQ71e2Q8YHUGy0pQ7GtrDm5XqeBGTxZOBFkMpih2ZDFvQt54 Nid3KAUFKb00NgEQqMEfwgrQ37ymeZMBqOF2Lwg7SNeHBYHjeW4ebsR9floQu35T wmYUpVubsQAhlDVQPzNCCschWDB2z9xXFCzS0pzuHtQmM+b5hrBUaFFZyRBpljym ToSPeE04UllMaNrH9x4Fw/0aM2rmuTxvHGhfAzb/RKT3/ouqyj4YbxGfi5HJ5/8c dBJjA== Received: from dc6wp-exch02.marvell.com ([4.21.29.225]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 4fq64ggq91-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 28 Jul 2026 21:51:26 -0700 (PDT) Received: from DC6WP-EXCH02.marvell.com (10.76.176.209) by DC6WP-EXCH02.marvell.com (10.76.176.209) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.25; Tue, 28 Jul 2026 21:51:26 -0700 Received: from maili.marvell.com (10.69.176.80) by DC6WP-EXCH02.marvell.com (10.76.176.209) with Microsoft SMTP Server id 15.2.1544.25 via Frontend Transport; Tue, 28 Jul 2026 21:51:26 -0700 Received: from rkannoth-OptiPlex-7090.. (unknown [10.28.36.165]) by maili.marvell.com (Postfix) with ESMTP id EB3083F70A7; Tue, 28 Jul 2026 21:51:22 -0700 (PDT) From: Ratheesh Kannoth To: , CC: , , , , , , "Ratheesh Kannoth" Subject: [PATCH v6 net-next 4/9] octeontx2-af: switch: Representor for switch port Date: Wed, 29 Jul 2026 10:20:54 +0530 Message-ID: <20260729045100.2177958-5-rkannoth@marvell.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260729045100.2177958-1-rkannoth@marvell.com> References: <20260729045100.2177958-1-rkannoth@marvell.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzI5MDAzNiBTYWx0ZWRfX7KzF4fjpm34B AkkvqN0/fX8r1M77uKuWcaGTkBkoEd3BbWGryToBcO2ZhNxp4mB3J2+nN71Qc3AQFMtWwBe9Z8L C2t0+TwA72R6GTBBrVKRp0E8Gt0H2g46SyYpeFhAv4kFcLsv4Y3VOyt7befuSTuzgPp6vrdxqO8 c3w3euvb+VLfZrM6Ig5jmKXr8ZYjURQtz9K3wiFCenNO57o1a1ebnJekaLJeDBKATfRunMHezJt 0JjG/VbWNMSorMld+y1kNDA7xVHL6DsFYGWUzQhFnh5Lq5MLms/c6pAGi/WsDZVn2PcFWFWhiTR qZztK1vZDoY0UdpD2VdoQ8sj1p3sMzue7t+vHHFpAez9MnTkwKm+k0f8KOpQ6RyE+052eAX6oce bPVn8ml60V36tuqkSZBZ2r8DJsLXu1oFSwBp45txLeb+cgnGLz+ETCkXqJXLLmUZD7yg/GBfRJP KzW73+dnHzVj5vWyQ4A== X-Proofpoint-ORIG-GUID: nS3Cp1uwv0nU1nOtRLgsMO-iHp4Kmm9i X-Proofpoint-Spam-Info: AW1haW4tMjYwNzI5MDAzNiBTYWx0ZWRfX4LbjIDfWU9BM YJCyu0YrHZB1Mf2TxGgljB71IRza/kxaFu82s6eruyV3jXVFiaH2lF1Bez1IQS5vQk6aTDoIU8M RDhCHsGbw02sJDj0FiNsr81IMYYEETw= X-Authority-Analysis: v=2.4 cv=GM841ONK c=1 sm=1 tr=0 ts=6a6986ce cx=c_pps a=gIfcoYsirJbf48DBMSPrZA==:117 a=gIfcoYsirJbf48DBMSPrZA==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=l0iWHRpgs5sLHlkKQ1IR:22 a=qit2iCtTFQkLgVSMPQTB:22 a=M5GUcnROAAAA:8 a=QyM62yzxPVerMAYBTT0A:9 a=OBjm3rFKGHvpk9ecZwUJ:22 X-Proofpoint-GUID: nS3Cp1uwv0nU1nOtRLgsMO-iHp4Kmm9i X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-29_02,2026-07-28_02,2025-10-01_01 Extends esw_cfg with a devlink-derived switch id, copies it into rvu->rswitch on the AF, adds rvu_sw_port_id(), exports rvu_rep_get_vlan_id(). Signed-off-by: Ratheesh Kannoth --- .../net/ethernet/marvell/octeontx2/af/mbox.h | 1 + .../net/ethernet/marvell/octeontx2/af/rvu.h | 5 +++++ .../ethernet/marvell/octeontx2/af/rvu_rep.c | 20 ++++++++++++++++++- .../marvell/octeontx2/af/switch/rvu_sw.c | 19 ++++++++++++++++++ .../marvell/octeontx2/af/switch/rvu_sw.h | 5 +++++ .../net/ethernet/marvell/octeontx2/nic/rep.c | 4 ++++ 6 files changed, 53 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/marvell/octeontx2/af/mbox.h b/drivers/net/ethernet/marvell/octeontx2/af/mbox.h index 8d08ca504148..062b3e612c7b 100644 --- a/drivers/net/ethernet/marvell/octeontx2/af/mbox.h +++ b/drivers/net/ethernet/marvell/octeontx2/af/mbox.h @@ -1837,6 +1837,7 @@ struct esw_cfg_req { struct mbox_msghdr hdr; u8 ena; u64 rsvd; + unsigned char switch_id[MAX_PHYS_ITEM_ID_LEN]; }; struct rep_evt_data { diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu.h b/drivers/net/ethernet/marvell/octeontx2/af/rvu.h index 73d2329b5c26..8cf1ad9ec749 100644 --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu.h +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu.h @@ -576,6 +576,10 @@ struct rvu_switch { u16 *entry2pcifunc; u16 mode; u16 start_entry; + unsigned char switch_id[MAX_PHYS_ITEM_ID_LEN]; +#define RVU_SWITCH_FLAG_FW_READY BIT_ULL(0) + u64 flags; + u16 pcifunc; }; struct rep_evtq_ent { @@ -1197,4 +1201,5 @@ int rvu_rep_install_mcam_rules(struct rvu *rvu); void rvu_rep_update_rules(struct rvu *rvu, u16 pcifunc, bool ena); int rvu_rep_notify_pfvf_state(struct rvu *rvu, u16 pcifunc, bool enable); int npc_mcam_verify_entry(struct npc_mcam *mcam, u16 pcifunc, int entry); +u16 rvu_rep_get_vlan_id(struct rvu *rvu, u16 pcifunc); #endif /* RVU_H */ diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_rep.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_rep.c index a2781e0f504e..6f012f72ddc2 100644 --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_rep.c +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_rep.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include @@ -189,7 +190,7 @@ int rvu_mbox_handler_nix_lf_stats(struct rvu *rvu, return 0; } -static u16 rvu_rep_get_vlan_id(struct rvu *rvu, u16 pcifunc) +u16 rvu_rep_get_vlan_id(struct rvu *rvu, u16 pcifunc) { int id; @@ -429,6 +430,20 @@ int rvu_rep_pf_init(struct rvu *rvu) return 0; } +/* ESW_CFG is always sent as the sole message in a mailbox transaction + * (see rvu_eswitch_config()), so next_msgoff minus the mailbox header + * offset yields this message's size. The calculation is not valid if + * ESW_CFG were ever batched with other messages. + */ +static bool esw_cfg_req_has_switch_id(const struct esw_cfg_req *req) +{ + u16 msg_len = req->hdr.next_msgoff - + ALIGN(sizeof(struct mbox_hdr), MBOX_MSG_ALIGN); + + return msg_len >= offsetof(struct esw_cfg_req, switch_id) + + MAX_PHYS_ITEM_ID_LEN; +} + int rvu_mbox_handler_esw_cfg(struct rvu *rvu, struct esw_cfg_req *req, struct msg_rsp *rsp) { @@ -436,6 +451,9 @@ int rvu_mbox_handler_esw_cfg(struct rvu *rvu, struct esw_cfg_req *req, return 0; rvu->rep_mode = req->ena; + if (esw_cfg_req_has_switch_id(req)) + memcpy(rvu->rswitch.switch_id, req->switch_id, + MAX_PHYS_ITEM_ID_LEN); if (!rvu->rep_mode) rvu_npc_free_mcam_entries(rvu, req->hdr.pcifunc, -1); diff --git a/drivers/net/ethernet/marvell/octeontx2/af/switch/rvu_sw.c b/drivers/net/ethernet/marvell/octeontx2/af/switch/rvu_sw.c index fe143ad3f944..403d57870efe 100644 --- a/drivers/net/ethernet/marvell/octeontx2/af/switch/rvu_sw.c +++ b/drivers/net/ethernet/marvell/octeontx2/af/switch/rvu_sw.c @@ -5,7 +5,26 @@ * */ +#include + #include "rvu.h" +#include "rvu_sw.h" + +u32 rvu_sw_port_id(struct rvu *rvu, u16 pcifunc) +{ + u16 rep_id; + + if (!rvu->rep2pfvf_map || !rvu->rep_cnt) + return RVU_SW_INVALID_PORT_ID; + + rep_id = rvu_rep_get_vlan_id(rvu, pcifunc); + if (rep_id >= rvu->rep_cnt || + rvu->rep2pfvf_map[rep_id] != pcifunc) + return RVU_SW_INVALID_PORT_ID; + + return FIELD_PREP(GENMASK_ULL(31, 16), rep_id) | + FIELD_PREP(GENMASK_ULL(15, 0), pcifunc); +} int rvu_mbox_handler_swdev2af_notify(struct rvu *rvu, struct swdev2af_notify_req *req, diff --git a/drivers/net/ethernet/marvell/octeontx2/af/switch/rvu_sw.h b/drivers/net/ethernet/marvell/octeontx2/af/switch/rvu_sw.h index f28dba556d80..e9ad32c84576 100644 --- a/drivers/net/ethernet/marvell/octeontx2/af/switch/rvu_sw.h +++ b/drivers/net/ethernet/marvell/octeontx2/af/switch/rvu_sw.h @@ -8,4 +8,9 @@ #ifndef RVU_SWITCH_H #define RVU_SWITCH_H +/* RVU Switch */ +#define RVU_SW_INVALID_PORT_ID ((u32)~0U) + +u32 rvu_sw_port_id(struct rvu *rvu, u16 pcifunc); + #endif diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/rep.c b/drivers/net/ethernet/marvell/octeontx2/nic/rep.c index 0f5d5642d3f7..257a2ae6a53e 100644 --- a/drivers/net/ethernet/marvell/octeontx2/nic/rep.c +++ b/drivers/net/ethernet/marvell/octeontx2/nic/rep.c @@ -399,8 +399,11 @@ static void rvu_rep_get_stats64(struct net_device *dev, static int rvu_eswitch_config(struct otx2_nic *priv, u8 ena) { + struct devlink_port_attrs attrs = {}; struct esw_cfg_req *req; + rvu_rep_devlink_set_switch_id(priv, &attrs.switch_id); + mutex_lock(&priv->mbox.lock); req = otx2_mbox_alloc_msg_esw_cfg(&priv->mbox); if (!req) { @@ -408,6 +411,7 @@ static int rvu_eswitch_config(struct otx2_nic *priv, u8 ena) return -ENOMEM; } req->ena = ena; + memcpy(req->switch_id, attrs.switch_id.id, attrs.switch_id.id_len); otx2_sync_mbox_msg(&priv->mbox); mutex_unlock(&priv->mbox.lock); return 0; -- 2.43.0