kernel: bump 5.4 to 5.4.99

[openwrt/openwrt.git] / target / linux / layerscape / patches-5.4 / 701-net-0337-enetc-add-support-tsn-capabilities-qbv-qci-qbu-cbs.patch

diff --git a/target/linux/layerscape/patches-5.4/701-net-0337-enetc-add-support-tsn-capabilities-qbv-qci-qbu-cbs.patch b/target/linux/layerscape/patches-5.4/701-net-0337-enetc-add-support-tsn-capabilities-qbv-qci-qbu-cbs.patch
index ba71805275c985f977d74433a0190b49d635cd2d..2e264aba089e0b2031eb0fb50eafab982ae89701 100644 (file)
--- a/target/linux/layerscape/patches-5.4/701-net-0337-enetc-add-support-tsn-capabilities-qbv-qci-qbu-cbs.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0337-enetc-add-support-tsn-capabilities-qbv-qci-qbu-cbs.patch
@@ -296,7 +296,7 @@ Signed-off-by: Po Liu <Po.Liu@nxp.com>
  #define ENETC_SIPCAPR0_RSS    BIT(8)
  #define ENETC_SIPCAPR1        0x24
  #define ENETC_SITGTGR 0x30
-@@ -241,10 +242,20 @@ enum enetc_bdr_type {TX, RX};
+@@ -243,10 +244,20 @@ enum enetc_bdr_type {TX, RX};
  #define ENETC_PCS_IF_MODE_SGMII_AN    0x0003
  
  #define ENETC_PM0_IF_MODE     0x8300
@@ -317,7 +317,7 @@ Signed-off-by: Po Liu <Po.Liu@nxp.com>
  
  /* MAC counters */
  #define ENETC_PM0_REOCT               0x8100
-@@ -298,6 +309,15 @@ enum enetc_bdr_type {TX, RX};
+@@ -300,6 +311,15 @@ enum enetc_bdr_type {TX, RX};
  #define ENETC_PM0_TSCOL               0x82E0
  #define ENETC_PM0_TLCOL               0x82E8
  #define ENETC_PM0_TECOL               0x82F0
@@ -333,7 +333,7 @@ Signed-off-by: Po Liu <Po.Liu@nxp.com>
  
  /* Port counters */
  #define ENETC_PICDR(n)                (0x0700 + (n) * 8) /* n = [0..3] */
-@@ -456,6 +476,7 @@ union enetc_tx_bd {
+@@ -458,6 +478,7 @@ union enetc_tx_bd {
  #define ENETC_TXBD_FLAGS_CSUM BIT(3)
  #define ENETC_TXBD_FLAGS_EX   BIT(6)
  #define ENETC_TXBD_FLAGS_F    BIT(7)
@@ -341,7 +341,7 @@ Signed-off-by: Po Liu <Po.Liu@nxp.com>
  
  static inline void enetc_clear_tx_bd(union enetc_tx_bd *txbd)
  {
-@@ -483,6 +504,8 @@ static inline __le16 enetc_txbd_l3_csoff
+@@ -485,6 +506,8 @@ static inline __le16 enetc_txbd_l3_csoff
  #define ENETC_TXBD_L4_UDP     BIT(5)
  #define ENETC_TXBD_L4_TCP     BIT(6)
  
@@ -350,7 +350,7 @@ Signed-off-by: Po Liu <Po.Liu@nxp.com>
  union enetc_rx_bd {
        struct {
                __le64 addr;
-@@ -629,21 +652,307 @@ enum bdcr_cmd_class {
+@@ -631,21 +654,307 @@ enum bdcr_cmd_class {
        BDCR_CMD_RFS,
        BDCR_CMD_PORT_GCL,
        BDCR_CMD_RECV_CLASSIFIER,
@@ -662,7 +662,7 @@ Signed-off-by: Po Liu <Po.Liu@nxp.com>
  /* gate control list entry */
  struct gce {
        __le32  period;
-@@ -660,13 +969,55 @@ struct tgs_gcl_data {
+@@ -662,13 +971,55 @@ struct tgs_gcl_data {
        struct gce      entry[0];
  };
  
@@ -719,7 +719,7 @@ Signed-off-by: Po Liu <Po.Liu@nxp.com>
                        };
                };      /* Long format */
                __le32 data[6];
-@@ -681,11 +1032,88 @@ struct enetc_cbd {
+@@ -683,11 +1034,88 @@ struct enetc_cbd {
  
  #define ENETC_CLK  400000000ULL
  
@@ -839,7 +839,7 @@ Signed-off-by: Po Liu <Po.Liu@nxp.com>
        /* pick up primary MAC address from SI */
        enetc_get_primary_mac_addr(&si->hw, ndev->dev_addr);
  }
-@@ -942,6 +949,8 @@ static int enetc_pf_probe(struct pci_dev
+@@ -999,6 +1006,8 @@ static int enetc_pf_probe(struct pci_dev
        netif_info(priv, probe, ndev, "%s v%s\n",
                   enetc_drv_name, enetc_drv_ver);
  
@@ -848,7 +848,7 @@ Signed-off-by: Po Liu <Po.Liu@nxp.com>
        return 0;
  
  err_reg_netdev:
-@@ -974,6 +983,8 @@ static void enetc_pf_remove(struct pci_d
+@@ -1033,6 +1042,8 @@ static void enetc_pf_remove(struct pci_d
        netif_info(priv, drv, si->ndev, "%s v%s remove\n",
                   enetc_drv_name, enetc_drv_ver);