kernel: bump 5.10 to 5.10.127
authorJohn Audia <therealgraysky@proton.me>
Wed, 29 Jun 2022 08:22:49 +0000 (04:22 -0400)
committerHauke Mehrtens <hauke@hauke-m.de>
Wed, 29 Jun 2022 21:38:47 +0000 (23:38 +0200)
All patches automatically rebased.

Signed-off-by: John Audia <therealgraysky@proton.me>
include/kernel-5.10
target/linux/apm821xx/patches-5.10/802-usb-xhci-force-msi-renesas-xhci.patch
target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch
target/linux/generic/hack-5.10/720-net-phy-add-aqr-phys.patch
target/linux/generic/hack-5.10/722-net-phy-aquantia-enable-AQR112-and-AQR412.patch
target/linux/generic/hack-5.10/723-net-phy-aquantia-fix-system-side-protocol-mi.patch
target/linux/generic/hack-5.10/724-net-phy-aquantia-Add-AQR113-driver-support.patch
target/linux/generic/hack-5.10/725-net-phy-aquantia-add-PHY_IDs-for-AQR112-variants.patch
target/linux/generic/hack-5.10/780-usb-net-MeigLink_modem_support.patch

index da4b92296629fd5472a2bee188feca5168a8a117..658767af331fe3f53d516b3f593e6d8e1be188a7 100644 (file)
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.10 = .126
-LINUX_KERNEL_HASH-5.10.126 = 91054369e893ffc5ddab5c9e2470f31631924eab1a8faff56a3d04bc7b2d4f63
+LINUX_VERSION-5.10 = .127
+LINUX_KERNEL_HASH-5.10.127 = 419233ee0b1ee1dc2be8abf1b241545d10dad19d95f237180d6ccdc0cd221580
index bdf484c4e4241a6334d8f9fb8bf16bcf447866ee..e2b864df99890a2dac7d940cf3de3ad74f60d619 100644 (file)
@@ -13,7 +13,7 @@ produce a noisy warning.
 
 --- a/drivers/usb/host/xhci-pci.c
 +++ b/drivers/usb/host/xhci-pci.c
-@@ -283,6 +283,7 @@ static void xhci_pci_quirks(struct devic
+@@ -287,6 +287,7 @@ static void xhci_pci_quirks(struct devic
            pdev->device == 0x0015) {
                xhci->quirks |= XHCI_RESET_ON_RESUME;
                xhci->quirks |= XHCI_ZERO_64B_REGS;
index 9a42cb12d34d53c54baf66d953ae6cdaaea532f4..e32bcfa4a77fa6b05109e74339c0e16964b686ed 100644 (file)
@@ -70,7 +70,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
        nft_trans_table_update(trans) = true;
        list_add_tail(&trans->list, &ctx->net->nft.commit_list);
        return 0;
-@@ -7910,11 +7914,10 @@ static int nf_tables_commit(struct net *
+@@ -7916,11 +7920,10 @@ static int nf_tables_commit(struct net *
                switch (trans->msg_type) {
                case NFT_MSG_NEWTABLE:
                        if (nft_trans_table_update(trans)) {
@@ -86,7 +86,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
                        } else {
                                nft_clear(net, trans->ctx.table);
                        }
-@@ -8127,11 +8130,9 @@ static int __nf_tables_abort(struct net
+@@ -8133,11 +8136,9 @@ static int __nf_tables_abort(struct net
                switch (trans->msg_type) {
                case NFT_MSG_NEWTABLE:
                        if (nft_trans_table_update(trans)) {
index 4d4420aa2f0bfde1ec99ef721fc7ec8cbf56d341..f7dd2f7187eac0daad44f42cb509518dfe3a31f8 100644 (file)
@@ -20,7 +20,7 @@ Signed-off-by: Birger Koblitz <git@birger-koblitz.de>
  
  #define MDIO_PHYXS_VEND_IF_STATUS             0xe812
  #define MDIO_PHYXS_VEND_IF_STATUS_TYPE_MASK   GENMASK(7, 3)
-@@ -330,6 +332,49 @@ static int aqr107_read_rate(struct phy_d
+@@ -343,6 +345,49 @@ static int aqr107_read_rate(struct phy_d
        return 0;
  }
  
@@ -70,7 +70,7 @@ Signed-off-by: Birger Koblitz <git@birger-koblitz.de>
  static int aqr107_read_status(struct phy_device *phydev)
  {
        int val, ret;
-@@ -460,7 +505,7 @@ static void aqr107_chip_info(struct phy_
+@@ -473,7 +518,7 @@ static void aqr107_chip_info(struct phy_
        build_id = FIELD_GET(VEND1_GLOBAL_RSVD_STAT1_FW_BUILD_ID, val);
        prov_id = FIELD_GET(VEND1_GLOBAL_RSVD_STAT1_PROV_ID, val);
  
@@ -79,7 +79,7 @@ Signed-off-by: Birger Koblitz <git@birger-koblitz.de>
                   fw_major, fw_minor, build_id, prov_id);
  }
  
-@@ -632,6 +677,24 @@ static struct phy_driver aqr_driver[] =
+@@ -645,6 +690,24 @@ static struct phy_driver aqr_driver[] =
        .link_change_notify = aqr107_link_change_notify,
  },
  {
@@ -104,7 +104,7 @@ Signed-off-by: Birger Koblitz <git@birger-koblitz.de>
        PHY_ID_MATCH_MODEL(PHY_ID_AQCS109),
        .name           = "Aquantia AQCS109",
        .probe          = aqr107_probe,
-@@ -657,6 +720,24 @@ static struct phy_driver aqr_driver[] =
+@@ -670,6 +733,24 @@ static struct phy_driver aqr_driver[] =
        .ack_interrupt  = aqr_ack_interrupt,
        .read_status    = aqr_read_status,
  },
@@ -129,7 +129,7 @@ Signed-off-by: Birger Koblitz <git@birger-koblitz.de>
  };
  
  module_phy_driver(aqr_driver);
-@@ -667,8 +748,10 @@ static struct mdio_device_id __maybe_unu
+@@ -680,8 +761,10 @@ static struct mdio_device_id __maybe_unu
        { PHY_ID_MATCH_MODEL(PHY_ID_AQR105) },
        { PHY_ID_MATCH_MODEL(PHY_ID_AQR106) },
        { PHY_ID_MATCH_MODEL(PHY_ID_AQR107) },
index e3541400d7e56bd8b4b3a43af04229b2dfdf0e2e..ae85a21f9768ae31cc7f74ee21b37f4eb0f5c078 100644 (file)
@@ -27,7 +27,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
  #define PHY_ID_AQR813 0x31c31cb2
  
  #define MDIO_PHYXS_VEND_IF_STATUS             0xe812
-@@ -123,6 +125,29 @@
+@@ -125,6 +127,29 @@
  #define VEND1_GLOBAL_INT_VEND_MASK_GLOBAL2    BIT(1)
  #define VEND1_GLOBAL_INT_VEND_MASK_GLOBAL3    BIT(0)
  
@@ -57,7 +57,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
  struct aqr107_hw_stat {
        const char *name;
        int reg;
-@@ -243,6 +268,51 @@ static int aqr_config_aneg(struct phy_de
+@@ -256,6 +281,51 @@ static int aqr_config_aneg(struct phy_de
        return genphy_c45_check_and_restart_aneg(phydev, changed);
  }
  
@@ -109,7 +109,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
  static int aqr_config_intr(struct phy_device *phydev)
  {
        bool en = phydev->interrupts == PHY_INTERRUPT_ENABLED;
-@@ -738,6 +808,30 @@ static struct phy_driver aqr_driver[] =
+@@ -751,6 +821,30 @@ static struct phy_driver aqr_driver[] =
        .get_stats      = aqr107_get_stats,
        .link_change_notify = aqr107_link_change_notify,
  },
@@ -140,7 +140,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
  };
  
  module_phy_driver(aqr_driver);
-@@ -748,9 +842,11 @@ static struct mdio_device_id __maybe_unu
+@@ -761,9 +855,11 @@ static struct mdio_device_id __maybe_unu
        { PHY_ID_MATCH_MODEL(PHY_ID_AQR105) },
        { PHY_ID_MATCH_MODEL(PHY_ID_AQR106) },
        { PHY_ID_MATCH_MODEL(PHY_ID_AQR107) },
index 9c5df905bb25aa659638e05301a885f0c391b005..5ce07c9aa4b6c8ae9d23146f0d3ea8d860e5fe0e 100644 (file)
@@ -14,7 +14,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
 
 --- a/drivers/net/phy/aquantia_main.c
 +++ b/drivers/net/phy/aquantia_main.c
-@@ -301,10 +301,16 @@ static int aqr_config_aneg_set_prot(stru
+@@ -314,10 +314,16 @@ static int aqr_config_aneg_set_prot(stru
        phy_write_mmd(phydev, MDIO_MMD_VEND1, AQUANTIA_VND1_GSTART_RATE,
                      aquantia_syscfg[if_type].start_rate);
  
index 7a661309f946572878e3663708dc0e8e21a2d692..5d7213957e1b5be98d47b542e23a88aca23d491a 100644 (file)
@@ -18,7 +18,7 @@ Add a new entry for AQR113 PHY_ID
  #define PHY_ID_AQR113C        0x31c31c12
  #define PHY_ID_AQCS109        0x03a1b5c2
  #define PHY_ID_AQR405 0x03a1b4b0
-@@ -827,6 +828,14 @@ static struct phy_driver aqr_driver[] =
+@@ -840,6 +841,14 @@ static struct phy_driver aqr_driver[] =
        .get_stats      = aqr107_get_stats,
  },
  {
@@ -33,7 +33,7 @@ Add a new entry for AQR113 PHY_ID
        PHY_ID_MATCH_MODEL(PHY_ID_AQR412),
        .name           = "Aquantia AQR412",
        .probe          = aqr107_probe,
-@@ -849,6 +858,7 @@ static struct mdio_device_id __maybe_unu
+@@ -862,6 +871,7 @@ static struct mdio_device_id __maybe_unu
        { PHY_ID_MATCH_MODEL(PHY_ID_AQR106) },
        { PHY_ID_MATCH_MODEL(PHY_ID_AQR107) },
        { PHY_ID_MATCH_MODEL(PHY_ID_AQR112) },
index 40ad0ff58310b9be94d7e2d642aeb3283714f5bc..a307a8f399136e037b0039721346fae7e8856cb9 100644 (file)
@@ -21,7 +21,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  #define PHY_ID_AQR113 0x31c31c40
  #define PHY_ID_AQR113C        0x31c31c12
  #define PHY_ID_AQCS109        0x03a1b5c2
-@@ -828,6 +830,30 @@ static struct phy_driver aqr_driver[] =
+@@ -841,6 +843,30 @@ static struct phy_driver aqr_driver[] =
        .get_stats      = aqr107_get_stats,
  },
  {
@@ -52,7 +52,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
        PHY_ID_MATCH_MODEL(PHY_ID_AQR113),
        .name           = "Aquantia AQR113",
        .config_aneg    = aqr_config_aneg,
-@@ -858,6 +884,8 @@ static struct mdio_device_id __maybe_unu
+@@ -871,6 +897,8 @@ static struct mdio_device_id __maybe_unu
        { PHY_ID_MATCH_MODEL(PHY_ID_AQR106) },
        { PHY_ID_MATCH_MODEL(PHY_ID_AQR107) },
        { PHY_ID_MATCH_MODEL(PHY_ID_AQR112) },
index bdbab68ee18d086f2b54c59a54d049f0a42da20e..344ba809a91b53abf1dfbaaca6c4758fc35ef551 100644 (file)
@@ -19,7 +19,7 @@
  
  #define QUECTEL_VENDOR_ID                     0x2c7c
  /* These Quectel products use Quectel's vendor ID */
-@@ -1131,6 +1133,11 @@ static const struct usb_device_id option
+@@ -1133,6 +1135,11 @@ static const struct usb_device_id option
        { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG95, 0xff, 0, 0) },
        { USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
          .driver_info = RSVD(4) },