From nobody Tue Feb 22 09:02:09 2022 X-Original-To: dev-commits-src-all@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 4D11419D9FA9; Tue, 22 Feb 2022 09:02:10 +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 4K2tTZ0R0qz3rdp; Tue, 22 Feb 2022 09:02:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645520530; 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=SDWXpwWz6XQXX2hwTVrvKQMqvyQaVieBa/1x3cZWKNk=; b=rXVCEJ6P6qk2PVASjpaAXqfp/ytM+/5utaFab72XKZsqWI5Eq7rpGc8TSXPn9ExAQgURIF gA/bM1ALYJjDWCoUzArEE3CLiHisscrORwC7Bh/NwEaFebqvYu6QSF8K8cYYiyXYXAtVcW 47nV5r1pM5QcwAgIW0i9ajUxVhjoFENhjKzsnDPNqSZDcAMC2X2025ZzAP7l4qVeVj8mOE 74LAy+VnZQueW6mocBOm/phx4ViqcrE16au2zOKUQhJlK4LKlWTKGxIKrNn5CXmuElKnd7 jYJYf/QK5veaXzo6oTLNKHPGGY6RfaVE4k5Xgag7cRA9+OUBAz2OecaJgfT/Vg== 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 C8D78210E4; Tue, 22 Feb 2022 09:02:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21M929p3051694; Tue, 22 Feb 2022 09:02:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21M929Xx051693; Tue, 22 Feb 2022 09:02:09 GMT (envelope-from git) Date: Tue, 22 Feb 2022 09:02:09 GMT Message-Id: <202202220902.21M929Xx051693@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: da6252a6a099 - main - dwc: Support phy mode MII List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: da6252a6a099e6253207b69960e6762ce3cca0f8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645520530; 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=SDWXpwWz6XQXX2hwTVrvKQMqvyQaVieBa/1x3cZWKNk=; b=Kddl6ZbHlkNtQBgLNZKx5suB9gC9rodK+8uTX3fUHRbQ+uqn4ewuAjTfA8Lo7hwSK+AzeO KDfiHqNboQS1VH98FUG8FcHa43yQi+t6PPGszUTyahi/GtzbLd/CQGfWkyGcjW5pZui8G2 U12PdG3oPhT8Snpofnes5JLP2Nye3yWJNNdpZCZ8ZlRjmkXSK3m773W15MR0LKGfIfo/g3 B+EVWHLFC/1R/aId97f2nRgQ22xQGl5xNxjB/ERKOp0dBQMdToufr07j7bOgX+VIUHMUwL TpI1zfCKRHBqzkvDtEemreDapfxJ0oKOrsKvqWFDrBIripABbc1kyaxb3qf0YA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645520530; a=rsa-sha256; cv=none; b=pZA0TjG3boZENn3o6lqWP60s8n6QgzKRhB3WmTTbEFW1PrUjRUxUUN81yUoF/nYK6Yha3i J3cBqjy9dk0N1+ToNO7WQJQeDQe2Re1sF100/87nxltbbdZscdzh9cRb6Afb9Ufevipd0U aRMKT9b6mGrJ161m0tkJO1USqOSJf3Q4RISdy6PwOMZj5lqDAqP1GNcrfuTpF8hdf+2IMS i5oY9U9Ru/UmBPlNOihiS6z3d8dzuowJnfIXN5QSzi5KcCQAHdTnHLoc1TC0bA2rlsasMW UOG9mVsNcRk7KyGBfLydF4Skkzaf6siQT0AzG/wGaOxCxPmNbygCak+T/eJC0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=da6252a6a099e6253207b69960e6762ce3cca0f8 commit da6252a6a099e6253207b69960e6762ce3cca0f8 Author: Emmanuel Vadot AuthorDate: 2022-02-22 08:58:36 +0000 Commit: Emmanuel Vadot CommitDate: 2022-02-22 09:01:56 +0000 dwc: Support phy mode MII Some board use dwc phy in MII mode, so do not fail to attach if this is the case. Only rockchip code uses the phy mode to program some custom syscon register. PR: 260848 MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG --- sys/dev/dwc/if_dwc.c | 11 +++++++---- sys/dev/dwc/if_dwc.h | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sys/dev/dwc/if_dwc.c b/sys/dev/dwc/if_dwc.c index 8bc0c0e7b6c3..e2bdf9965f84 100644 --- a/sys/dev/dwc/if_dwc.c +++ b/sys/dev/dwc/if_dwc.c @@ -1573,11 +1573,14 @@ dwc_attach(device_t dev) case MII_CONTYPE_RGMII_ID: case MII_CONTYPE_RGMII_RXID: case MII_CONTYPE_RGMII_TXID: - sc->phy_mode = PHY_MODE_RGMII; - break; + sc->phy_mode = PHY_MODE_RGMII; + break; case MII_CONTYPE_RMII: - sc->phy_mode = PHY_MODE_RMII; - break; + sc->phy_mode = PHY_MODE_RMII; + break; + case MII_CONTYPE_MII: + sc->phy_mode = PHY_MODE_MII; + break; default: device_printf(dev, "Unsupported MII type\n"); return (ENXIO); diff --git a/sys/dev/dwc/if_dwc.h b/sys/dev/dwc/if_dwc.h index d475974fcff9..d8c10258388a 100644 --- a/sys/dev/dwc/if_dwc.h +++ b/sys/dev/dwc/if_dwc.h @@ -40,6 +40,7 @@ #define PHY_MODE_UNKNOWN 0x0 #define PHY_MODE_RMII 0x1 #define PHY_MODE_RGMII 0x2 +#define PHY_MODE_MII 0x3 #define MAC_CONFIGURATION 0x0 #define CONF_JD (1 << 22) /* jabber timer disable */