From 57293f51c48f1f7c4e8f1ab6fe2220761487bd65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Mon, 31 Jan 2022 11:52:40 +0100 Subject: kernel: bump 4.14 to 4.14.264 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit All patches refreshed automagically without conflicts. Run tested on ipq40xx/glinet-b1300 and mvebu/turris-omnia. Signed-off-by: Petr Štetiar --- .../707-dpaa-ethernet-support-layerscape.patch | 48 +++++++++++----------- 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'target/linux/layerscape') diff --git a/target/linux/layerscape/patches-4.14/707-dpaa-ethernet-support-layerscape.patch b/target/linux/layerscape/patches-4.14/707-dpaa-ethernet-support-layerscape.patch index f4893afb7a..96ab448a86 100644 --- a/target/linux/layerscape/patches-4.14/707-dpaa-ethernet-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/707-dpaa-ethernet-support-layerscape.patch @@ -2131,8 +2131,8 @@ Signed-off-by: Zhao Qiang struct device_node *internal_phy_node; /* List of multicast addresses */ struct list_head mc_addr_list; -@@ -106,7 +104,7 @@ static void set_fman_mac_params(struct m - resource_size(mac_dev->res)); +@@ -109,7 +107,7 @@ static int set_fman_mac_params(struct ma + memcpy(¶ms->addr, mac_dev->addr, sizeof(mac_dev->addr)); params->max_speed = priv->max_speed; - params->phy_if = priv->phy_if; @@ -2140,7 +2140,7 @@ Signed-off-by: Zhao Qiang params->basex_if = false; params->mac_id = priv->cell_index; params->fm = (void *)priv->fman; -@@ -419,15 +417,12 @@ void fman_get_pause_cfg(struct mac_devic +@@ -430,15 +428,12 @@ void fman_get_pause_cfg(struct mac_devic } EXPORT_SYMBOL(fman_get_pause_cfg); @@ -2158,7 +2158,7 @@ Signed-off-by: Zhao Qiang struct phy_device *phy_dev = mac_dev->phy_dev; struct fman_mac *fman_mac; bool rx_pause, tx_pause; -@@ -444,14 +439,12 @@ static void adjust_link_dtsec(struct net +@@ -455,14 +450,12 @@ static void adjust_link_dtsec(struct net fman_get_pause_cfg(mac_dev, &rx_pause, &tx_pause); err = fman_set_mac_active_pause(mac_dev, rx_pause, tx_pause); if (err < 0) @@ -2176,7 +2176,7 @@ Signed-off-by: Zhao Qiang struct phy_device *phy_dev = mac_dev->phy_dev; struct fman_mac *fman_mac; bool rx_pause, tx_pause; -@@ -463,60 +456,12 @@ static void adjust_link_memac(struct net +@@ -474,60 +467,12 @@ static void adjust_link_memac(struct net fman_get_pause_cfg(mac_dev, &rx_pause, &tx_pause); err = fman_set_mac_active_pause(mac_dev, rx_pause, tx_pause); if (err < 0) @@ -2239,7 +2239,7 @@ Signed-off-by: Zhao Qiang mac_dev->init = dtsec_initialization; mac_dev->set_promisc = dtsec_set_promiscuous; mac_dev->change_addr = dtsec_modify_mac_address; -@@ -525,17 +470,18 @@ static void setup_dtsec(struct mac_devic +@@ -536,17 +481,18 @@ static void setup_dtsec(struct mac_devic mac_dev->set_tx_pause = dtsec_set_tx_pause_frames; mac_dev->set_rx_pause = dtsec_accept_rx_pause_frames; mac_dev->set_exception = dtsec_set_exception; @@ -2260,7 +2260,7 @@ Signed-off-by: Zhao Qiang mac_dev->init = tgec_initialization; mac_dev->set_promisc = tgec_set_promiscuous; mac_dev->change_addr = tgec_modify_mac_address; -@@ -544,17 +490,18 @@ static void setup_tgec(struct mac_device +@@ -555,17 +501,18 @@ static void setup_tgec(struct mac_device mac_dev->set_tx_pause = tgec_set_tx_pause_frames; mac_dev->set_rx_pause = tgec_accept_rx_pause_frames; mac_dev->set_exception = tgec_set_exception; @@ -2281,7 +2281,7 @@ Signed-off-by: Zhao Qiang mac_dev->init = memac_initialization; mac_dev->set_promisc = memac_set_promiscuous; mac_dev->change_addr = memac_modify_mac_address; -@@ -563,10 +510,12 @@ static void setup_memac(struct mac_devic +@@ -574,10 +521,12 @@ static void setup_memac(struct mac_devic mac_dev->set_tx_pause = memac_set_tx_pause_frames; mac_dev->set_rx_pause = memac_accept_rx_pause_frames; mac_dev->set_exception = memac_set_exception; @@ -2295,7 +2295,7 @@ Signed-off-by: Zhao Qiang mac_dev->priv->enable = memac_enable; mac_dev->priv->disable = memac_disable; } -@@ -599,8 +548,7 @@ static const u16 phy2speed[] = { +@@ -610,8 +559,7 @@ static const u16 phy2speed[] = { }; static struct platform_device *dpaa_eth_add_device(int fman_id, @@ -2305,7 +2305,7 @@ Signed-off-by: Zhao Qiang { struct platform_device *pdev; struct dpaa_eth_data data; -@@ -613,19 +561,15 @@ static struct platform_device *dpaa_eth_ +@@ -624,19 +572,15 @@ static struct platform_device *dpaa_eth_ data.mac_dev = mac_dev; data.mac_hw_id = priv->cell_index; data.fman_hw_id = fman_id; @@ -2325,7 +2325,7 @@ Signed-off-by: Zhao Qiang ret = platform_device_add_data(pdev, &data, sizeof(data)); if (ret) -@@ -676,7 +620,6 @@ static int mac_probe(struct platform_dev +@@ -687,7 +631,6 @@ static int mac_probe(struct platform_dev mac_dev = devm_kzalloc(dev, sizeof(*mac_dev), GFP_KERNEL); if (!mac_dev) { err = -ENOMEM; @@ -2333,7 +2333,7 @@ Signed-off-by: Zhao Qiang goto _return; } priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); -@@ -706,9 +649,6 @@ static int mac_probe(struct platform_dev +@@ -717,9 +660,6 @@ static int mac_probe(struct platform_dev goto _return; } @@ -2343,7 +2343,7 @@ Signed-off-by: Zhao Qiang INIT_LIST_HEAD(&priv->mc_addr_list); /* Get the FM node */ -@@ -717,7 +657,7 @@ static int mac_probe(struct platform_dev +@@ -728,7 +668,7 @@ static int mac_probe(struct platform_dev dev_err(dev, "of_get_parent(%pOF) failed\n", mac_node); err = -EINVAL; @@ -2352,7 +2352,7 @@ Signed-off-by: Zhao Qiang } of_dev = of_find_device_by_node(dev_node); -@@ -751,7 +691,7 @@ static int mac_probe(struct platform_dev +@@ -762,7 +702,7 @@ static int mac_probe(struct platform_dev if (err < 0) { dev_err(dev, "of_address_to_resource(%pOF) = %d\n", mac_node, err); @@ -2361,7 +2361,7 @@ Signed-off-by: Zhao Qiang } mac_dev->res = __devm_request_region(dev, -@@ -761,7 +701,7 @@ static int mac_probe(struct platform_dev +@@ -772,7 +712,7 @@ static int mac_probe(struct platform_dev if (!mac_dev->res) { dev_err(dev, "__devm_request_mem_region(mac) failed\n"); err = -EBUSY; @@ -2370,7 +2370,7 @@ Signed-off-by: Zhao Qiang } priv->vaddr = devm_ioremap(dev, mac_dev->res->start, -@@ -769,16 +709,12 @@ static int mac_probe(struct platform_dev +@@ -780,16 +720,12 @@ static int mac_probe(struct platform_dev if (!priv->vaddr) { dev_err(dev, "devm_ioremap() failed\n"); err = -EIO; @@ -2390,7 +2390,7 @@ Signed-off-by: Zhao Qiang } /* Get the cell-index */ -@@ -786,7 +722,7 @@ static int mac_probe(struct platform_dev +@@ -797,7 +733,7 @@ static int mac_probe(struct platform_dev if (err) { dev_err(dev, "failed to read cell-index for %pOF\n", mac_node); err = -EINVAL; @@ -2399,7 +2399,7 @@ Signed-off-by: Zhao Qiang } priv->cell_index = (u8)val; -@@ -795,7 +731,7 @@ static int mac_probe(struct platform_dev +@@ -806,7 +742,7 @@ static int mac_probe(struct platform_dev if (!mac_addr) { dev_err(dev, "of_get_mac_address(%pOF) failed\n", mac_node); err = -EINVAL; @@ -2408,7 +2408,7 @@ Signed-off-by: Zhao Qiang } memcpy(mac_dev->addr, mac_addr, sizeof(mac_dev->addr)); -@@ -805,14 +741,14 @@ static int mac_probe(struct platform_dev +@@ -816,14 +752,14 @@ static int mac_probe(struct platform_dev dev_err(dev, "of_count_phandle_with_args(%pOF, fsl,fman-ports) failed\n", mac_node); err = nph; @@ -2425,7 +2425,7 @@ Signed-off-by: Zhao Qiang } for (i = 0; i < ARRAY_SIZE(mac_dev->port); i++) { -@@ -851,13 +787,13 @@ static int mac_probe(struct platform_dev +@@ -862,13 +798,13 @@ static int mac_probe(struct platform_dev mac_node); phy_if = PHY_INTERFACE_MODE_SGMII; } @@ -2442,7 +2442,7 @@ Signed-off-by: Zhao Qiang mac_dev->if_support &= ~(SUPPORTED_10baseT_Half | SUPPORTED_100baseT_Half); -@@ -866,30 +802,31 @@ static int mac_probe(struct platform_dev +@@ -877,30 +813,31 @@ static int mac_probe(struct platform_dev mac_dev->if_support |= SUPPORTED_1000baseT_Full; /* The 10G interface only supports one mode */ @@ -2482,7 +2482,7 @@ Signed-off-by: Zhao Qiang } priv->fixed_link->link = phy->link; -@@ -904,8 +841,8 @@ static int mac_probe(struct platform_dev +@@ -915,8 +852,8 @@ static int mac_probe(struct platform_dev err = mac_dev->init(mac_dev); if (err < 0) { dev_err(dev, "mac_dev->init() = %d\n", err); @@ -2493,7 +2493,7 @@ Signed-off-by: Zhao Qiang } /* pause frame autonegotiation enabled */ -@@ -926,7 +863,7 @@ static int mac_probe(struct platform_dev +@@ -937,7 +874,7 @@ static int mac_probe(struct platform_dev mac_dev->addr[0], mac_dev->addr[1], mac_dev->addr[2], mac_dev->addr[3], mac_dev->addr[4], mac_dev->addr[5]); @@ -2502,7 +2502,7 @@ Signed-off-by: Zhao Qiang if (IS_ERR(priv->eth_dev)) { dev_err(dev, "failed to add Ethernet platform device for MAC %d\n", priv->cell_index); -@@ -937,9 +874,8 @@ static int mac_probe(struct platform_dev +@@ -948,9 +885,8 @@ static int mac_probe(struct platform_dev _return_of_node_put: of_node_put(dev_node); -- cgit v1.2.3