kernel: bump 5.4 to 5.4.106

[openwrt/openwrt.git] / target / linux / layerscape / patches-5.4 / 701-net-0231-enetc-Use-DT-protocol-information-to-set-up-the-port.patch

diff --git a/target/linux/layerscape/patches-5.4/701-net-0231-enetc-Use-DT-protocol-information-to-set-up-the-port.patch b/target/linux/layerscape/patches-5.4/701-net-0231-enetc-Use-DT-protocol-information-to-set-up-the-port.patch
index 0e9a659f09a59f4a806b1cfcede8f061118c508b..8c3ea7fbbe146981ed21f1453c8101f993363ae4 100644 (file)
--- a/target/linux/layerscape/patches-5.4/701-net-0231-enetc-Use-DT-protocol-information-to-set-up-the-port.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0231-enetc-Use-DT-protocol-information-to-set-up-the-port.patch
@@ -125,7 +125,7 @@ Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
  }
  
  /* Initialize the entire shared memory for the flow steering entries
-@@ -933,6 +936,10 @@ static int enetc_pf_probe(struct pci_dev
+@@ -955,6 +958,10 @@ static int enetc_pf_probe(struct pci_dev
        pf->si = si;
        pf->total_vfs = pci_sriov_get_totalvfs(pdev);
  
@@ -136,7 +136,7 @@ Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
        enetc_configure_port(pf);
  
        enetc_get_si_caps(si);
-@@ -947,6 +954,8 @@ static int enetc_pf_probe(struct pci_dev
+@@ -969,6 +976,8 @@ static int enetc_pf_probe(struct pci_dev
        enetc_pf_netdev_setup(si, ndev, &enetc_ndev_ops);
  
        priv = netdev_priv(ndev);
@@ -145,7 +145,7 @@ Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
  
        enetc_init_si_rings_params(priv);
  
-@@ -974,10 +983,6 @@ static int enetc_pf_probe(struct pci_dev
+@@ -1002,10 +1011,6 @@ static int enetc_pf_probe(struct pci_dev
                goto err_alloc_msix;
        }
  
@@ -156,23 +156,23 @@ Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
        err = enetc_configure_serdes(priv);
        if (err)
                dev_warn(&pdev->dev, "Attempted serdes config but failed\n");
-@@ -995,7 +1000,6 @@ static int enetc_pf_probe(struct pci_dev
+@@ -1023,7 +1028,6 @@ static int enetc_pf_probe(struct pci_dev
  
  err_reg_netdev:
        enetc_mdio_remove(pf);
 -      enetc_of_put_phy(priv);
        enetc_free_msix(priv);
+ err_config_si:
  err_init_port_rss:
- err_init_port_rfs:
-@@ -1005,6 +1009,7 @@ err_alloc_si_res:
+@@ -1034,6 +1038,7 @@ err_alloc_si_res:
        si->ndev = NULL;
        free_netdev(ndev);
  err_alloc_netdev:
 +      enetc_of_put_phy(pf);
+ err_device_disabled:
  err_map_pf_space:
        enetc_pci_remove(pdev);
- 
-@@ -1027,7 +1032,7 @@ static void enetc_pf_remove(struct pci_d
+@@ -1057,7 +1062,7 @@ static void enetc_pf_remove(struct pci_d
        unregister_netdev(si->ndev);
  
        enetc_mdio_remove(pf);