From 8a14ce43cc57fbb7c078cf36791a6109dcb62b6e Mon Sep 17 00:00:00 2001
From: rt-labs bot <rtlbot@rt-labs.com>
Date: Fri, 10 Nov 2023 10:37:53 +0100
Subject: [PATCH] Automatic catchup to commit
 ea5e5540b2be55c4dfadffda39b948632c104daa

ea5e554 Update vcap syntax
41ae6e7 Change recommended startup timing
b7e9216 Bugfix RPi gpio export
ecd17af Clarify error message about RPC buffer size.

Based-On-Commit: ea5e5540b2be55c4dfadffda39b948632c104daa
Change-Id: I3b8b5daad3c691a6aa04519781a24976e6dec595
---
 src/device/pf_cmrpc.c                         |  3 ++-
 src/drivers/lan9662/add_inbound_vcap_rule.sh  | 10 +++++-----
 src/drivers/lan9662/add_outbound_vcap_rule.sh | 16 ++++++++--------
 src/drivers/lan9662/del_vcap_rule.sh          |  2 +-
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/device/pf_cmrpc.c b/src/device/pf_cmrpc.c
index 937d249c..92acdaf0 100644
--- a/src/device/pf_cmrpc.c
+++ b/src/device/pf_cmrpc.c
@@ -4422,7 +4422,8 @@ static int pf_cmrpc_dce_packet (
          {
             LOG_ERROR (
                PF_RPC_LOG,
-               "CMRPC(%d): Incoming fragments exceed max buffer\n",
+               "CMRPC(%d): Incoming RPC message exceeds buffer size."
+               " If possible, increase PNET_MAX_SESSION_BUFFER_SIZE.\n",
                __LINE__);
             pf_set_error (
                &p_sess->rpc_result,
diff --git a/src/drivers/lan9662/add_inbound_vcap_rule.sh b/src/drivers/lan9662/add_inbound_vcap_rule.sh
index b33febcf..8890e03c 100755
--- a/src/drivers/lan9662/add_inbound_vcap_rule.sh
+++ b/src/drivers/lan9662/add_inbound_vcap_rule.sh
@@ -26,11 +26,11 @@ RTP_ID=$6
 RTP_SUBID=0
 RTE_INB_UPD=1
 
-COMMAND="vcap add is1 $PRIORITY $VCAM_HANDLE \
-s1_rt first 0 l2_mac $DMAC ff:ff:ff:ff:ff:ff \
-rt_vlan_idx $RT_VLAN_IDX 0x7 rt_frmid $RT_FRMID 0xffff \
-s1_rt rtp_id $RTP_ID rtp_subid $RTP_SUBID \
-rte_inb_upd $RTE_INB_UPD fwd_ena 1 fwd_mask 0x10"
+COMMAND="vcap add $VCAM_HANDLE is1 $PRIORITY 0 \
+VCAP_KFS_RT L2_MAC $DMAC ff:ff:ff:ff:ff:ff \
+RT_VLAN_IDX $RT_VLAN_IDX 0x7 RT_FRMID $RT_FRMID 0xffff \
+VCAP_AFS_S1_RT RTP_ID $RTP_ID RTP_SUBID $RTP_SUBID \
+RTE_INB_UPD $RTE_INB_UPD FWD_ENA 1 FWD_MASK 0x10"
 
 echo "$COMMAND"
 if ! $COMMAND; then
diff --git a/src/drivers/lan9662/add_outbound_vcap_rule.sh b/src/drivers/lan9662/add_outbound_vcap_rule.sh
index 4d2ee826..fb4ba7ed 100755
--- a/src/drivers/lan9662/add_outbound_vcap_rule.sh
+++ b/src/drivers/lan9662/add_outbound_vcap_rule.sh
@@ -29,14 +29,14 @@ symreg ana_rt_vlan_pcp[$RT_VLAN_IDX].pcp_mask 0xff     # Wildcard on pcp value
 symreg ana_rt_vlan_pcp[$RT_VLAN_IDX].vlan_id $VLAN_ID  # Actual vid
 symreg ana_rt_vlan_pcp[$RT_VLAN_IDX].vlan_pcp_ena 1    # Enable entry
 
-COMMAND="vcap add is1 $PRIORITY $VCAM_HANDLE \
-s1_rt first 0 \
-rt_vlan_idx $RT_VLAN_IDX 0x7 \
-l2_mac $DMAC ff:ff:ff:ff:ff:ff \
-rt_type 1 0x3 \
-rt_frmid $RT_FRMID 0xffff \
-s1_rt rtp_id $RTP_ID \
-fwd_ena 1 fwd_mask 0x10"
+COMMAND="vcap add $VCAM_HANDLE is1 $PRIORITY 0 \
+VCAP_KFS_RT \
+RT_VLAN_IDX $RT_VLAN_IDX 0x7 \
+L2_MAC $DMAC ff:ff:ff:ff:ff:ff \
+RT_TYPE 1 0x3 \
+RT_FRMID $RT_FRMID 0xffff \
+VCAP_AFS_S1_RT RTP_ID $RTP_ID \
+FWD_ENA 1 FWD_MASK 0x10"
 
 echo "$COMMAND"
 if ! $COMMAND; then
diff --git a/src/drivers/lan9662/del_vcap_rule.sh b/src/drivers/lan9662/del_vcap_rule.sh
index a972d616..8e54a95e 100755
--- a/src/drivers/lan9662/del_vcap_rule.sh
+++ b/src/drivers/lan9662/del_vcap_rule.sh
@@ -9,7 +9,7 @@
 PRIORITY=10
 VCAM_HANDLE=$1
 
-COMMAND="vcap del is1 $PRIORITY $VCAM_HANDLE"
+COMMAND="vcap del $VCAM_HANDLE"
 
 echo "$COMMAND"
 if ! $COMMAND; then