rpms/kernel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert patch breaking mustang boot

Browse Source
This commit is contained in:
Laura Abbott 2017-07-27 13:54:08 -07:00
parent 567b85d2c3
commit 10aaea10b2
2 changed files with 55 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
0001-Revert-xgene-Don-t-fail-probe-if-there-is-no-clk-res.patch Normal file
View File

@ -0,0 +1,49 @@
From 8bfbdce4d7da6353d1039148a4c90dd463f1fb8f Mon Sep 17 00:00:00 2001
From: Laura Abbott <labbott@redhat.com>
Date: Thu, 27 Jul 2017 13:52:17 -0700
Subject: [PATCH] Revert "xgene: Don't fail probe, if there is no clk resource
for SGMII interfaces"
This reverts commit 0db01097cabd97897d123b4c5d805d1a7b061d82.
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
index 86058a9f3417..d3906f6b01bd 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
@@ -1785,18 +1785,16 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata)
xgene_enet_gpiod_get(pdata);
- if (pdata->phy_mode != PHY_INTERFACE_MODE_SGMII) {
- pdata->clk = devm_clk_get(&pdev->dev, NULL);
- if (IS_ERR(pdata->clk)) {
- /* Abort if the clock is defined but couldn't be
- * retrived. Always abort if the clock is missing on
- * DT system as the driver can't cope with this case.
- */
- if (PTR_ERR(pdata->clk) != -ENOENT || dev->of_node)
- return PTR_ERR(pdata->clk);
- /* Firmware may have set up the clock already. */
- dev_info(dev, "clocks have been setup already\n");
- }
+ pdata->clk = devm_clk_get(&pdev->dev, NULL);
+ if (IS_ERR(pdata->clk)) {
+ /* Abort if the clock is defined but couldn't be retrived.
+ * Always abort if the clock is missing on DT system as
+ * the driver can't cope with this case.
+ */
+ if (PTR_ERR(pdata->clk) != -ENOENT || dev->of_node)
+ return PTR_ERR(pdata->clk);
+ /* Firmware may have set up the clock already. */
+ dev_info(dev, "clocks have been setup already\n");
}
if (pdata->phy_mode != PHY_INTERFACE_MODE_XGMII)
--
2.13.0

6
kernel.spec
View File

@ -621,6 +621,9 @@ Patch320: bcm283x-vc4-Fix-OOPSes-from-trying-to-cache-a-partially-constructed-BO
# Revert it while I engage upstream to work out what's going on # Revert it while I engage upstream to work out what's going on
Patch322: Revert-ARM-dts-bcm2835-Add-the-DSI-module-nodes-and-.patch Patch322: Revert-ARM-dts-bcm2835-Add-the-DSI-module-nodes-and-.patch
# Breaking mustang booting
Patch323: 0001-Revert-xgene-Don-t-fail-probe-if-there-is-no-clk-res.patch
# 400 - IBM (ppc/s390x) patches # 400 - IBM (ppc/s390x) patches
# 500 - Temp fixes/CVEs etc # 500 - Temp fixes/CVEs etc
@ -2192,6 +2195,9 @@ fi
# #
# #
%changelog %changelog
* Thu Jul 27 2017 Laura Abbott <labbott@fedoraproject.org>
- Revert patch breaking mustang boot
* Thu Jul 27 2017 Laura Abbott <labbott@fedoraproject.org> - 4.13.0-0.rc2.git2.1 * Thu Jul 27 2017 Laura Abbott <labbott@fedoraproject.org> - 4.13.0-0.rc2.git2.1
- Linux v4.13-rc2-27-gda08f35b0f82 - Linux v4.13-rc2-27-gda08f35b0f82