refactor Perla clock ID workaround

Author: vitus133

pkg/hardwareconfig/utils.go

@@ -212,6 +212,32 @@ func GetClockIDFromInterface(iface string, hwDefPath string) (uint64, error) {
 	return GetClockIDFromInterfaceWithCache(iface, hwDefPath, nil)
 }
 
+func getPERLAClockIDFromPinCache(cache *PinCache) (uint64, error) {
+	if cache == nil {
+		var cacheErr error
+		cache, cacheErr = GetDpllPins()
+		if cacheErr != nil {
+			glog.Warningf("PERLA workaround: failed to get pin cache: %v, falling back to serial number approach", cacheErr)
+			cache = nil
+		}
+	}
+
+	if cache != nil {
+		// Look for first pin with moduleName == "zl3073x"
+		for clockID, pins := range cache.Pins {
+			for _, pin := range pins {
+				if pin.ModuleName == "zl3073x" {
+					glog.Infof("PERLA workaround: Found zl3073x DPLL with clock ID %#x", clockID)
+					return clockID, nil
+				}
+			}
+		}
+		glog.Warningf("PERLA workaround: No zl3073x DPLL found in pin cache, falling back to serial number approach")
+	}
+
+	return 0, fmt.Errorf("no zl3073x DPLL found in pin cache")
+}
+
 // GetClockIDFromInterfaceWithCache resolves clock ID with an optional pre-loaded pin cache.
 // This avoids repeatedly fetching the pin cache for PERLA workaround.
 func GetClockIDFromInterfaceWithCache(iface string, hwDefPath string, pinCache *PinCache) (uint64, error) {
@@ -239,31 +265,14 @@ func GetClockIDFromInterfaceWithCache(iface string, hwDefPath string, pinCache *
 	if err != nil {
 		return 0, fmt.Errorf("failed to run lspci -s %s, output: %s, err: %w", busAddr, lspciOutput, err)
 	}
+
 	if strings.Contains(lspciOutput, "E825") {
 		glog.Infof("Detected E825 device on %s (interface %s), using PERLA workaround", busAddr, iface)
-		// Use provided cache or fetch new one
-		cache := pinCache
-		if cache == nil {
-			var cacheErr error
-			cache, cacheErr = GetDpllPins()
-			if cacheErr != nil {
-				glog.Warningf("PERLA workaround: failed to get pin cache: %v, falling back to serial number approach", cacheErr)
-				cache = nil
-			}
-		}
-
-		if cache != nil {
-			// Look for first pin with moduleName == "zl3073x"
-			for clockID, pins := range cache.Pins {
-				for _, pin := range pins {
-					if pin.ModuleName == "zl3073x" {
-						glog.Infof("PERLA workaround: Found zl3073x DPLL with clock ID %#x, associating with E825 interface %s", clockID, iface)
-						return clockID, nil
-					}
-				}
-			}
-			glog.Warningf("PERLA workaround: No zl3073x DPLL found in pin cache, falling back to serial number approach")
+		clockID, err := getPERLAClockIDFromPinCache(pinCache)
+		if err != nil {
+			return 0, fmt.Errorf("PERLA workaround: failed to get clock ID from pin cache: %v, falling back to serial number approach", err)
 		}
+		return clockID, nil
 	}
 
 	// Step 3: Standard approach - Get serial number using devlink