[Skiboot] [PATCH 1/6] phb4: Remove stable retries

Michael Neuling mikey at neuling.org
Tue Sep 12 14:56:14 AEST 2017


This code was never used (since retries is set to 0), it's not very
useful and it makes the code harder to read. So lets just remove it.

Signed-off-by: Michael Neuling <mikey at neuling.org>
---
 hw/phb4.c          | 7 -------
 include/pci-slot.h | 1 -
 include/phb4.h     | 1 -
 3 files changed, 9 deletions(-)

diff --git a/hw/phb4.c b/hw/phb4.c
index 1e148e0b5f..a40db68d2e 100644
--- a/hw/phb4.c
+++ b/hw/phb4.c
@@ -2455,7 +2455,6 @@ static int64_t phb4_poll_link(struct pci_slot *slot)
 			PHBDBG(p, "LINK: Link is up\n");
 			phb4_prepare_link_change(slot, true);
 			pci_slot_set_state(slot, PHB4_SLOT_LINK_STABLE);
-			slot->stable_retries = PHB4_LINK_STABLE_RETRIES;
 			return pci_slot_set_sm_timeout(slot, secs_to_tb(1));
 		}
 
@@ -2479,12 +2478,6 @@ static int64_t phb4_poll_link(struct pci_slot *slot)
 		}
 		if (reg & PHB_PCIE_DLP_TL_LINKACT) {
 			PHBDBG(p, "LINK: Link is stable\n");
-			if (slot->stable_retries--) {
-				PHBDBG(p, "LINK: Doing retry: %lli\n",
-				       slot->stable_retries);
-				return pci_slot_set_sm_timeout(slot, secs_to_tb(1));
-			}
-
 			pci_slot_set_state(slot, PHB4_SLOT_NORMAL);
 			return OPAL_SUCCESS;
 		}
diff --git a/include/pci-slot.h b/include/pci-slot.h
index 5cc54f8371..479bc08cc0 100644
--- a/include/pci-slot.h
+++ b/include/pci-slot.h
@@ -185,7 +185,6 @@ struct pci_slot {
 	uint64_t		delay_tgt_tb;
 	uint64_t		retries;
 	uint64_t		link_retries;
-	uint64_t		stable_retries;
 	struct pci_slot_ops	ops;
 	void			*data;
 };
diff --git a/include/phb4.h b/include/phb4.h
index eb292cde16..503d3f1467 100644
--- a/include/phb4.h
+++ b/include/phb4.h
@@ -217,7 +217,6 @@ struct phb4_err {
 /* Link timeouts, increments of 10ms */
 #define PHB4_LINK_ELECTRICAL_RETRIES	100
 #define PHB4_LINK_WAIT_RETRIES		200
-#define PHB4_LINK_STABLE_RETRIES	0
 
 /* PHB4 flags */
 #define PHB4_AIB_FENCED		0x00000001
-- 
2.11.0



More information about the Skiboot mailing list