From nobody Fri Oct 6 17:06:02 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S2FF63RxKz4x6CD; Fri, 6 Oct 2023 17:06:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S2FF62ttBz4WK4; Fri, 6 Oct 2023 17:06:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696611962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gryxDZJtkT+LSBZdVNfxUjmZB7kEBIYK5ZeKzGXivZI=; b=mISUTfFo+X5d3CSJOs9WVjLjWDd6ntFP5A8R2johw+hz58nLg/3eSmd2LzHvQj909bH67w P6/EdBF60xcGb/q516LE62J8H/CsAKFwuAtCnysoqMRFJ+PVKFEKoqoNxAfEh6WELi5pmc c/UQ1VwU3/32jorOnGrFAC63HDMRv7UNZGIDeNXeK4q2K9L3Sqmel3SQHfibEUJadrtSEJ wNaivbudRcAyk8nGkRljn7EL2qYUe38Pg5VbLkGXLX362DkQ1ZJLQSAF5dgCYirQwuMdI4 2rqQflAAMbPeil4nxJXGBoQbNannUZouaMkGQcTIjZ/dLMQBDac/2UXa6qtpvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696611962; a=rsa-sha256; cv=none; b=BuEzdHk+ORTA9IhUde53S+CgmaBKFNhV04S58n3uSMWw2aDdPDt4geqUPTrk1i9nsa+aPk h7yiBp/0kFhb2T+LitXinSiQjp9oT/7TwEOyh5WiSLvFTzLELQ2ZKt/i+bc+mjlaVtPJeT Hl35ADs2Bqlfi9k+P9GzQfANpFd56C+uHBzXYxMMDyHBCDTc0+fK0c7Hd10JTjV3zfngj4 w7A4PpaNH++rxtXuBOWiawiHJpFloVBURCvsFHxNvgQEIGFs4fz853TomQEAqnhsadVEnw Bw7lT5UgqfUEq4oy2SgR0LPvZ1olF5yxXh+y92vvUEEVZPtfRpAIFlROVv6tLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696611962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gryxDZJtkT+LSBZdVNfxUjmZB7kEBIYK5ZeKzGXivZI=; b=TYFiT2OUwNE/DaZT36hWS5qZYjXfO771d1Bclu7LSp08ORgt0Fb2XJPqvRzgDQHW33ORGW TxwWuEsGKLwE2CdV0InVCYbiRPO88zIXddDaxR2zT90UPGqvMXEIqEzjy6taAcfzrN2OOT 1X+HCUjU6gzUuN3JoV+eWLrVjUlEJZpu6zJ09IN0Q/Uujr/CdWpMPweE1/aVLHV3cdno4l weP2ZrObiTkEyaVz6I46/Iq1V+g+rlyGHetYpyz+IAxX8Vo392UZoxkY//BcvyBQgxiiEn UDoRs7w3R/veBNLFRxM7EllPs+72a3beFQ6Jc6kgim//afg2Q44e6/xKp8K2hQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S2FF61swWzx0q; Fri, 6 Oct 2023 17:06:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 396H62pj060766; Fri, 6 Oct 2023 17:06:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 396H62a5060763; Fri, 6 Oct 2023 17:06:02 GMT (envelope-from git) Date: Fri, 6 Oct 2023 17:06:02 GMT Message-Id: <202310061706.396H62a5060763@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: cf037a17c7c8 - main - dwc: rockchip: Properly calculate mii clock based on pclk_mac List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cf037a17c7c81e8a2e73c89eb90877f2625749d7 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=cf037a17c7c81e8a2e73c89eb90877f2625749d7 commit cf037a17c7c81e8a2e73c89eb90877f2625749d7 Author: Emmanuel Vadot AuthorDate: 2023-10-06 15:44:00 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-06 17:05:43 +0000 dwc: rockchip: Properly calculate mii clock based on pclk_mac --- sys/dev/dwc/if_dwc_rk.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/sys/dev/dwc/if_dwc_rk.c b/sys/dev/dwc/if_dwc_rk.c index 43d4e4847c62..257d80bd1e59 100644 --- a/sys/dev/dwc/if_dwc_rk.c +++ b/sys/dev/dwc/if_dwc_rk.c @@ -581,9 +581,29 @@ if_dwc_rk_init(device_t dev) static int if_dwc_rk_mii_clk(device_t dev) { + struct if_dwc_rk_softc *sc; + uint64_t freq; + int rv; - /* Should be calculated from the clock */ - return (GMAC_MII_CLK_150_250M_DIV102); + sc = device_get_softc(dev); + if ((rv = clk_get_freq(sc->pclk_mac, &freq)) != 0) + return (-rv); + freq = freq / 1000 / 1000; + + if (freq >= 60 && freq <= 100) + return (GMAC_MII_CLK_60_100M_DIV42); + else if (freq >= 100 && freq <= 150) + return (GMAC_MII_CLK_100_150M_DIV62); + else if (freq >= 20 && freq <= 35) + return (GMAC_MII_CLK_25_35M_DIV16); + else if (freq >= 35 && freq <= 60) + return (GMAC_MII_CLK_35_60M_DIV26); + else if (freq >= 150 && freq <= 250) + return (GMAC_MII_CLK_150_250M_DIV102); + else if (freq >= 250 && freq <= 300) + return (GMAC_MII_CLK_250_300M_DIV124); + + return (-ERANGE); } static int