From nobody Thu Aug 11 14:53:13 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 4M3VD953W3z4Y7Nr; Thu, 11 Aug 2022 14:53:13 +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 4M3VD94YF5z3TDp; Thu, 11 Aug 2022 14:53:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660229593; 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=bTfKOrG3UuEenX7uybyaYoag+GOihY9oJUNCyEzLhQ8=; b=Wxe7/H870DCwWlflWc2a2R+qXiGjWFDonp6jHE8uHrGd5zsicRHLhL9Kqnfekb5oc8YqtM 345VDCw7JN0SsBDx9n0Sp3CJBXRqMeLynXT07UQSQZeBFvpsGDAYh9Y1g4NDGrko/4WA4z Ek4RqrnYbzPYNBZvRByGrU66JNUzN+basZnzHePFM52FBmvGKapVERU7hhtYVZBfXyO+nm mKurcE1kCEI0uPjS0WMJ9ZIqYrPOTHJCil1wPyMfqL9K5rpInUuIYHfGNmSN7WeeVRkLY6 K0VJQkLUVXlu+yCWJUoWy+6Ds9RfmuzwS2+vnzvXjM7/N3sOjn4HF9ZfjlTsQA== 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 4M3VD93cgYzw97; Thu, 11 Aug 2022 14:53:13 +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 27BErDXg032401; Thu, 11 Aug 2022 14:53:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27BErDuu032400; Thu, 11 Aug 2022 14:53:13 GMT (envelope-from git) Date: Thu, 11 Aug 2022 14:53:13 GMT Message-Id: <202208111453.27BErDuu032400@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: b786acdc131d - stable/12 - if_dwc: Use dwc_enable_mac in dwc_stop_locked 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: b786acdc131dde9c777141f373805686f40a15d5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660229593; 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=bTfKOrG3UuEenX7uybyaYoag+GOihY9oJUNCyEzLhQ8=; b=g9k8UdxlLtCAfhTfSvdlgg2YKRCmJqPIzOIT5/WcOuvCfC9Or8Dso/IWRKwdmuKdVrhzig +Xuf3OqT7D1JL+lY0UyQJsTg5W8j+jAunKO6eFqI46GpMNM3L8jtCiCQr9RxWXv7cZjW6t A+oO8FFC49cSqT9BdJsWxe44IEIccoUWVP+WZRoyUOJKTyGn0f4RjBX5mv+QbwMOpGRNXM GQvM1OqBbhrvoQWT5uye8AX/rMaoOG+dvJqdURTZ6YLTqxDg+eUXYciYi5YxC9E9afYePL JSFQ0Toxi1rMRydxmbbf/41hnHc2yw0NkcUMjZd+pX0W9w0qeT6Xzq1w7hGgRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660229593; a=rsa-sha256; cv=none; b=tyV9lnhwWsAW5NfB0tr+VQ+mbrcr5HwuTyyqCPHR0GflUfwkXvCQ7gHTq9iU+T6FRfahd1 YTxVlIFLIh7H4Jsa6/rjXInFL2GfWGXI50eB+6JlJIoDZjOlDxQZEHlAZdyuAC8mBs6VYT gHVV9HbmhVLzTIDNLaaVaPgpul7DbLpP5OKMhB/yepzJvy2ViBqbtGVkNLS1gDRAxgs5Jq rNuNtfQs7/0vs7RUf0mgWK8rkBStCw9F4v6TTnTMRIcByvGftCleIknXcnrOrgUXyhMYWB DrUW7F3vqVeGCulM3lzQcw/0ML/huhZ0C/VP5LMJtCu/AxRTUu0ZLHZKpnZNHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=b786acdc131dde9c777141f373805686f40a15d5 commit b786acdc131dde9c777141f373805686f40a15d5 Author: Emmanuel Vadot AuthorDate: 2020-11-20 11:28:06 +0000 Commit: Mitchell Horne CommitDate: 2022-08-11 14:52:02 +0000 if_dwc: Use dwc_enable_mac in dwc_stop_locked No functional changes intended (cherry picked from commit 86c7bc68ed20446600c5cc98f53c75cd90468a5a) --- sys/dev/dwc/if_dwc.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/dev/dwc/if_dwc.c b/sys/dev/dwc/if_dwc.c index 74e5922ff828..aa8fbc9a12b3 100644 --- a/sys/dev/dwc/if_dwc.c +++ b/sys/dev/dwc/if_dwc.c @@ -380,10 +380,7 @@ dwc_stop_locked(struct dwc_softc *sc) reg |= (MODE_FTF); WRITE4(sc, OPERATION_MODE, reg); - /* Stop transmitters */ - reg = READ4(sc, MAC_CONFIGURATION); - reg &= ~(CONF_TE | CONF_RE); - WRITE4(sc, MAC_CONFIGURATION, reg); + dwc_enable_mac(sc, false); /* Stop DMA RX */ reg = READ4(sc, OPERATION_MODE);