From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 623364582D8 for ; Fri, 24 Jul 2026 19:08:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784920112; cv=none; b=HHBPDENkzMi4JWaOIIQWdhoHfhwgdm/O7xcGeSOd/M0/vey2nAQ0BtsabsLDCtwTD5xNnxTLtHQRyXlFeMNpEzDTate4inuc/V3muqomV+xYkPK4iqye54lA2MFVgS7zAieJf3XYOuIi1fjEtWaSjrgWPvBHnNummTAj9XhKp+4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784920112; c=relaxed/simple; bh=B5uc98kBFmHZM+0OVEG0J+KLShSMzWz6KTFb8Kw6SWE=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ar8hf6KcgD0vWRP4/085azt7tpcVTGfqiUx2cS5/8SznDM60sAnESq4ctnoeTlYsmV9RP4pmmQH6MEWDFJmi4cB2CBcIAoMPpqByEefvD9uVCmXzV1Ppp5ZzA0nSw6c+kaw87tPEgsRH8xzGrkyNjaMCf2aT2NypdeoWf5Zqabw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=BElNSxzX; arc=none smtp.client-ip=209.85.128.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BElNSxzX" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-4954afac04bso8862395e9.0 for ; Fri, 24 Jul 2026 12:08:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784920108; x=1785524908; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to:content-type; bh=j4Ic8NabspzFl1YQzO0CBvVxP+4q7RfeLVihZdCAEtA=; b=BElNSxzXIDuUHYriZaPvxufWgNeD5lJCJHHPnOErybPhoodqlqqTEj1F8xiKFMc/DN u0xt+dEW5tYvHxJxXPMK4SnDjUroa79+m/5YQLC3tVMh1o4ntCyjuH57NQIgxBh07f8J kZ5nDSvGOs7afI6CLJ51KoCquFrkrnvABV4wF07pgdOLNnr6eXApDs+Aeq4ywEFeFYAa Y6kx87dGlhZ6ZXy/NV5FvdOp4OOIs4QWpYrbjwfU+KEjyYIsCrQ1Ievra3ZOGkmx6sCu UGYkxLCXh9zdqIDUT5XatG3gSXzdWDunP5DHd5ENis1vaxiYNSx8vz6W5s790gwcFWxA 2/hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784920108; x=1785524908; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to:content-type; bh=j4Ic8NabspzFl1YQzO0CBvVxP+4q7RfeLVihZdCAEtA=; b=bLM2rLYLcZzbZmf1WPray6yn3Jp19qNCcrKlKZX52RiTys9sFpPh/4xxs+q44b9wyA mwT1f2T+jGYjrN0nY0wwwDDSsZV36oI3dUifEzJzX/YY3ucUp4tZS+WXLV68QZpfJxrs XPwskEBIYAngt9UwS2xGHidBWD3tAmOJZdu0Gc/2+a0eZ75JECE+KCT0+nVumQTRyVEQ NrfLoW2vn5Yc72eBAzKmMWzFtx0OLK+bWiegvw52PsNqSXR/pd1+8lEkFcmuZ/cjz7rQ 7Lnjd2TzNzuuRKZOziTSMLpV6OoCyDrcNxknDifh31Nvr4e8UVtm9oeyidmlkKxWYT+w ppwg== X-Forwarded-Encrypted: i=1; AHgh+Royj1LgNCSXU9AGGZK+IPLLUqhqJ37qzTgF2QUV7L/prKfyuA8tXYAcRz2WoTjQL9kX9CzLKWxF/5Ckds4=@vger.kernel.org X-Gm-Message-State: AOJu0Yx0sKLYxsxdW5WdWjovKL1b6hUBZFhXY3FHAQE/SEiax2Y5hlbh FxXc/OsjiueOXCKYP5qPG85fMUSd1PJkgSeXJEH/vdc5jJf4LeHeAfEy X-Gm-Gg: AR+sD11auiBaGUou84Dr6SGeYRxx1xbXwIZG+6llOM+yvRzUthbosVQ0qeTDjjcYN2a IbafB2D4tkf2Fiqyr8vWPBkowM4kCKnBv9oxM9Q6Ad5l+H0orZE6+3VHOgU1GThr5SHra9tCGeu jV4b4euG4YvMH6gMVVxKk6E++yaDkAZjLsJ3K4/ltEG+9Sos0b3T0FanehtwHTnF5Nuy71rmikz ifEwZ0PN6eTeupYz5LRnBBjtq+bNen2ySWwTToTNOsSk+dM/9J3rq9XpICTgdkOb7aCGMdCPUhb 7wHUWkf9LCZuZ8MpipnyW4SG0BEasnO4Rl6D32L0sKl88vxWbEIfSIBFd0goO1aL7mmkWyIiUA/ keJGK0dC8YY/Svo5BbsUk/JraW3+32TMFbh6Oi5jZXtgfpAGLoWBFAoxJi2qjaCUk4ROgLzG7JQ lBpqiZHeQM9glS4eKFlgR3O3ZIp8qV+R1v8+oHFKYABStA/O7hFfetze5vHXDAws4Y X-Received: by 2002:a05:600c:1d23:b0:495:77e3:88ba with SMTP id 5b1f17b1804b1-49577e388c0mr81039295e9.27.1784920108360; Fri, 24 Jul 2026 12:08:28 -0700 (PDT) Received: from Ansuel-XPS24.localdomain (host-87-3-249-180.retail.telecomitalia.it. [87.3.249.180]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-496b4c8d6b5sm5893755e9.2.2026.07.24.12.08.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2026 12:08:27 -0700 (PDT) From: Christian Marangi To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Christian Marangi , Daniel Golle , Qingfang Deng , SkyLake Huang , Matthias Brugger , AngeloGioacchino Del Regno , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: [PATCH net-next v2 3/6] net: phy: mediatek: generalize cal_cycle function for GE SoC Date: Fri, 24 Jul 2026 21:08:06 +0200 Message-ID: <20260724190811.198339-4-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260724190811.198339-1-ansuelsmth@gmail.com> References: <20260724190811.198339-1-ansuelsmth@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit In preparation for support of special Software Calibration for Airoha PHY, it's needed to generalize the cal_cycle function as Airoha needs only part of its logic (the wait logic) to complete a calibration cycle. Signed-off-by: Christian Marangi --- drivers/net/phy/mediatek/mtk-ge-soc.c | 32 ++++++++++++++++++--------- drivers/net/phy/mediatek/mtk-ge-soc.h | 3 +++ 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/drivers/net/phy/mediatek/mtk-ge-soc.c b/drivers/net/phy/mediatek/mtk-ge-soc.c index c25292f7178a..b4d73954072e 100644 --- a/drivers/net/phy/mediatek/mtk-ge-soc.c +++ b/drivers/net/phy/mediatek/mtk-ge-soc.c @@ -39,20 +39,11 @@ struct mtk_socphy_shared { struct mtk_socphy_priv priv[4]; }; -/* One calibration cycle consists of: - * 1.Set DA_CALIN_FLAG high to start calibration. Keep it high - * until AD_CAL_COMP is ready to output calibration result. - * 2.Wait until DA_CAL_CLK is available. - * 3.Fetch AD_CAL_COMP_OUT. - */ -static int cal_cycle(struct phy_device *phydev, int devad, - u32 regnum, u16 mask, u16 cal_val) +int mtk_cal_cycle_wait(struct phy_device *phydev) { int reg_val; int ret; - phy_modify_mmd(phydev, devad, regnum, - mask, cal_val); phy_set_bits_mmd(phydev, MDIO_MMD_VEND1, MTK_PHY_RG_AD_CALIN, MTK_PHY_DA_CALIN_FLAG); @@ -71,7 +62,26 @@ static int cal_cycle(struct phy_device *phydev, int devad, ret = phy_read_mmd(phydev, MDIO_MMD_VEND1, MTK_PHY_RG_AD_CAL_COMP); if (ret < 0) return ret; - ret = FIELD_GET(MTK_PHY_AD_CAL_COMP_OUT_MASK, ret); + + return FIELD_GET(MTK_PHY_AD_CAL_COMP_OUT_MASK, ret); +} +EXPORT_SYMBOL_GPL(mtk_cal_cycle_wait); + +/* One calibration cycle consists of: + * 1.Set DA_CALIN_FLAG high to start calibration. Keep it high + * until AD_CAL_COMP is ready to output calibration result. + * 2.Wait until DA_CAL_CLK is available. + * 3.Fetch AD_CAL_COMP_OUT. + */ +static int cal_cycle(struct phy_device *phydev, int devad, + u32 regnum, u16 mask, u16 cal_val) +{ + int ret; + + phy_modify_mmd(phydev, devad, regnum, + mask, cal_val); + + ret = mtk_cal_cycle_wait(phydev); phydev_dbg(phydev, "cal_val: 0x%x, ret: %d\n", cal_val, ret); return ret; diff --git a/drivers/net/phy/mediatek/mtk-ge-soc.h b/drivers/net/phy/mediatek/mtk-ge-soc.h index 349dfbdff1fa..9aaa7e3caa41 100644 --- a/drivers/net/phy/mediatek/mtk-ge-soc.h +++ b/drivers/net/phy/mediatek/mtk-ge-soc.h @@ -345,4 +345,7 @@ enum CAL_MODE { SW_M }; +/* MTK GE SoC common functions */ +int mtk_cal_cycle_wait(struct phy_device *phydev); + #endif /* _MTK_GE_SOC_H_ */ -- 2.53.0