vrx518_tc: fix compilation error with kernel 6.1

[openwrt/openwrt.git] / package / kernel / lantiq / vrx518_tc / patches / 201-desc-length.patch

diff --git a/package/kernel/lantiq/vrx518_tc/patches/201-desc-length.patch b/package/kernel/lantiq/vrx518_tc/patches/201-desc-length.patch
index 8b30914df9647c2da1576fb2657c200611f88ac3..134f119f3c05fd07bf44a6cf4945f2b40362d29f 100644 (file)
--- a/package/kernel/lantiq/vrx518_tc/patches/201-desc-length.patch
+++ b/package/kernel/lantiq/vrx518_tc/patches/201-desc-length.patch
@@ -54,7 +54,7 @@ significantly lower latencies when the line is saturated.
  struct cdma {
 --- a/dcdp/ptm_tc.c
 +++ b/dcdp/ptm_tc.c
-@@ -75,7 +75,11 @@ static const u32 tx_kvec[] = {
+@@ -78,7 +78,11 @@ static const u32 tx_kvec[] = {
        0x30B1B233, 0xB43536B7, 0xB8393ABB, 0x3CBDBE3F,
        0xC04142C3, 0x44C5C647, 0x48C9CA4B, 0xCC4D4ECF
  };
@@ -66,7 +66,7 @@ significantly lower latencies when the line is saturated.
  static const char ptm_drv_name[] = "PTM SL";
  static const char ptm_bond_name[][IFNAMSIZ] = {"PTM US BOND", "PTM DS BOND"};
  
-@@ -1005,6 +1009,10 @@ static void us_fp_desq_cfg_ctxt_init(str
+@@ -1018,6 +1022,10 @@ static void us_fp_desq_cfg_ctxt_init(str
        int i;
        u32 desc_addr;
        rx_descriptor_t desc;
@@ -77,7 +77,7 @@ significantly lower latencies when the line is saturated.
  
        memset(&desq_cfg, 0, sizeof(desq_cfg));
        /* Initialize US Fast-Path Descriptor Queue Config/Context */
-@@ -1012,7 +1020,11 @@ static void us_fp_desq_cfg_ctxt_init(str
+@@ -1025,7 +1033,11 @@ static void us_fp_desq_cfg_ctxt_init(str
        desq_cfg.fast_path      = 1;
        desq_cfg.mbox_int_en    = 0;
        desq_cfg.des_sync_needed = 0;
@@ -89,7 +89,7 @@ significantly lower latencies when the line is saturated.
        desq_cfg.des_base_addr  = __US_FAST_PATH_DES_LIST_BASE;
  
        tc_mem_write(priv, fpi_addr(__US_FP_INQ_DES_CFG_CTXT),
-@@ -1036,12 +1048,20 @@ static void us_qos_desq_cfg_ctxt_init(st
+@@ -1049,12 +1061,20 @@ static void us_qos_desq_cfg_ctxt_init(st
        int offset, i;
        rx_descriptor_t desc;
        u32 phy_addr;
@@ -110,7 +110,7 @@ significantly lower latencies when the line is saturated.
  
        offset = 0;
        for (i = 0; i < QOSQ_NUM; i++) {
-@@ -1080,6 +1100,10 @@ static void us_outq_desq_cfg_ctxt_init(s
+@@ -1093,6 +1113,10 @@ static void us_outq_desq_cfg_ctxt_init(s
        u32 phy_addr;
        int i;
        u32 offset;
@@ -121,7 +121,7 @@ significantly lower latencies when the line is saturated.
  
        /* Setup OUTQ_QoS_CFG_CTXT */
        /* NOTE: By default, Shaping & WFQ both are DISABLED!! */
-@@ -1108,7 +1132,11 @@ static void us_outq_desq_cfg_ctxt_init(s
+@@ -1121,7 +1145,11 @@ static void us_outq_desq_cfg_ctxt_init(s
        desq_cfg.des_in_own_val = US_OUTQ_DES_OWN;
        desq_cfg.mbox_int_en    = 0;
        desq_cfg.des_sync_needed = 0;
@@ -134,7 +134,7 @@ significantly lower latencies when the line is saturated.
        /**
        * Only BC0 is used in VRX518
        */
-@@ -1174,7 +1202,11 @@ static void us_qos_cfg_init(struct ptm_e
+@@ -1187,7 +1215,11 @@ static void us_qos_cfg_init(struct ptm_e
        /* Set QoS NO DROP */
        sb_w32(1, __QOSQ_NO_DROP);
        /* Enable Preemption function/Disable QoS by default */
@@ -146,7 +146,7 @@ significantly lower latencies when the line is saturated.
        /* By default, all qid mappint to non-preemption queue */
        sb_w32(0x0, _QID2PREEMP_MAP);
  
-@@ -1376,6 +1408,11 @@ static void ptm_local_desq_cfg_ctxt_init
+@@ -1389,6 +1421,11 @@ static void ptm_local_desq_cfg_ctxt_init
        u32 dcnt, addr, pdbram_base;
        unsigned int us_des_alloc[] = {
                __US_TC_LOCAL_Q0_DES_LIST_NUM, __US_TC_LOCAL_Q1_DES_LIST_NUM};
@@ -158,7 +158,7 @@ significantly lower latencies when the line is saturated.
  
        /* Setup the Local DESQ Configuration/Context for UpStream Queues */
        memset(&desq_cfg, 0, sizeof(desq_cfg));
-@@ -2321,6 +2358,10 @@ static void ptm_aca_init(struct ptm_ep_p
+@@ -2334,6 +2371,10 @@ static void ptm_aca_init(struct ptm_ep_p
        u32 phybase = priv->ep->phy_membase;
        u32 start;
        u32 type;
@@ -169,7 +169,7 @@ significantly lower latencies when the line is saturated.
  
        priv->tc_priv->tc_ops.soc_cfg_get(&priv->tc_priv->cfg, ptm_id(priv));
        memset(&param, 0, sizeof(param));
-@@ -2334,7 +2375,11 @@ static void ptm_aca_init(struct ptm_ep_p
+@@ -2347,7 +2388,11 @@ static void ptm_aca_init(struct ptm_ep_p
  #endif
        txin->hd_size_in_dw = cfg->txin.soc_desc_dwsz;
        txin->pd_desc_base = SB_XBAR_ADDR(__ACA_TX_IN_PD_LIST_BASE);
@@ -198,7 +198,7 @@ significantly lower latencies when the line is saturated.
  
 --- a/dcdp/tc_proc.c
 +++ b/dcdp/tc_proc.c
-@@ -1114,6 +1114,9 @@ static int proc_read_ver(struct seq_file
+@@ -1118,6 +1118,9 @@ static int proc_read_ver(struct seq_file
                (date >> 16) & 0xff,
                (date & 0xffff));
  
@@ -208,7 +208,7 @@ significantly lower latencies when the line is saturated.
  #ifdef FEATURE_POWER_DOWN
        seq_puts(seq, " + Support Power Down enhancement feature\n");
  #endif
-@@ -1166,6 +1169,113 @@ static const struct proc_ops tc_soc_proc
+@@ -1170,6 +1173,113 @@ static const struct proc_ops tc_soc_proc
        .proc_release   = single_release,
  };
  
@@ -322,7 +322,7 @@ significantly lower latencies when the line is saturated.
  static struct tc_proc_list tc_procs[] = {
        {TC_PROC_DIR,   0,      NULL,                   1},
        {"cfg",         0644, &tc_cfg_proc_fops,        0},
-@@ -1174,6 +1284,9 @@ static struct tc_proc_list tc_procs[] =
+@@ -1178,6 +1288,9 @@ static struct tc_proc_list tc_procs[] =
        {"showtime",    0200, &tc_show_time_proc_fops,  0},
        {"ver",         0644, &tc_ver_proc_fops,        0},
        {"soc",         0644, &tc_soc_proc_fops,        0},
@@ -332,7 +332,7 @@ significantly lower latencies when the line is saturated.
  };
  
  int tc_proc_init(struct tc_priv *priv)
-@@ -1333,7 +1446,6 @@ proc_ptm_cfg_help:
+@@ -1337,7 +1450,6 @@ proc_ptm_cfg_help:
        return count;
  }