From nobody Thu Jun 09 13:19:05 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 F250585118C; Thu, 9 Jun 2022 13:19:06 +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 4LJl6f2xzWz3hFp; Thu, 9 Jun 2022 13:19:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654780746; 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=ttHpthtyFlPb1zk4SdKXsUgtRIlbs8Ax92eM1M4jdLE=; b=ftuytvrwZcpC1D0wDPDvHqz/lQTAnJyRreTCASD/vnDKpX6Zn+Fm9eh5JYO96082BQXZBF LAFaJ+FwkZX8++Qng0HhO/oqy2+7FcR/ERqgqyFk6zw8JCXpUvVaRaNZR2twYD94tkg+HX 8pSF0sU/tiVJ05y94p4MIj2+I+WIVzkBMBBXFvcXb0zKo+mr9RDUyAvuh6fiRQopKQ/U/a 3wzOtiVOfPatQf6Xg53A5Xlb4hAAT4wjYVI683Le0brNQFsE4A75OMYWAynL4YvYRrTTwJ I6gRonh5Td4/rnDv5dDAqbQ5O40qx8NODbRNEjOd69tT4TpxqEV6gCj4PUA5qw== 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 1630E24A9F; Thu, 9 Jun 2022 13:19:06 +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 259DJ5t2029123; Thu, 9 Jun 2022 13:19:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 259DJ5hZ029122; Thu, 9 Jun 2022 13:19:05 GMT (envelope-from git) Date: Thu, 9 Jun 2022 13:19:05 GMT Message-Id: <202206091319.259DJ5hZ029122@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Hans Petter Selasky Subject: git: bc2e447338b7 - main - upgt(4): Adjust all pause calls to use milliseconds instead of ticks. 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: hselasky X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bc2e447338b7ade8d800d1f24913bb3873c65f99 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654780746; 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=ttHpthtyFlPb1zk4SdKXsUgtRIlbs8Ax92eM1M4jdLE=; b=pOTZLM0JT323VIt20uALgEcYG/MOlm8YBQej4/OvdkhituUZeMsrvKwB8NiEh8AqAirZ5u FuNhOM9kPnSC2EWSJdgk9m+19imYclvgkKhzzADPNQWFQ3s+jJNNz4//XEUecdnKwuJ/0y 5Wq1zI8bqlbtD3S3OQSOO/TRrf+MIC+F60V9fP+nUeKPCwLqJxol7ma2HGp2pf/JX5nC8/ dhpfp5z0T2jwLO7o4jb5xNHqlzwxB7w1PbhFQ5sr3kf62a0oh+JoP8SNbq8XNctzgxRnVM n0QwOPtaYEAbBQWVmN3HRHmEUbcbR5/70Vl7xkU6KltEivKqzWcKnFH+W+ZSOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654780746; a=rsa-sha256; cv=none; b=C/BnS/Xb8V6AX1EvecoflMgJl2RSuWAYOBJzv8hK4QBAd267lxy5Hw4V8MsDamLBK7EmL5 DmjAc0iNfKygAMy+LKf447HCcOv/86eQ2cCBZO8lQUCkuSYcMA1mmAZLBmDXEX05g1eDoB q416P4Gi0NitMMJQm6XrXqNEQhsKgZNwvhlMFnNYTCQjMBvSf0XV3ZbuYJeQRjNzzLwQoC hUHqRHR+9BJTYjZxcoZfxPmyKfTc2p9G61+FowKHCZOloARGCWa/7/84xLXMfLLMMDnyxT LbF4qD1fo+MbwJfqUqF1JG5iBn9Vq2Ry/g/T8W6jciZO4mobTtdM08TPL1QJTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=bc2e447338b7ade8d800d1f24913bb3873c65f99 commit bc2e447338b7ade8d800d1f24913bb3873c65f99 Author: Hans Petter Selasky AuthorDate: 2022-06-09 13:14:17 +0000 Commit: Hans Petter Selasky CommitDate: 2022-06-09 13:18:02 +0000 upgt(4): Adjust all pause calls to use milliseconds instead of ticks. MFC after: 1 week Sponsored by: NVIDIA Networking --- sys/dev/usb/wlan/if_upgt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/usb/wlan/if_upgt.c b/sys/dev/usb/wlan/if_upgt.c index 4adbea4fbaaf..190a4b8e0252 100644 --- a/sys/dev/usb/wlan/if_upgt.c +++ b/sys/dev/usb/wlan/if_upgt.c @@ -1270,7 +1270,7 @@ upgt_eeprom_read(struct upgt_softc *sc) int block, error, offset; UPGT_LOCK(sc); - usb_pause_mtx(&sc->sc_mtx, 100); + usb_pause_mtx(&sc->sc_mtx, USB_MS_TO_TICKS(100)); offset = 0; block = UPGT_EEPROM_BLOCK_SIZE; @@ -1883,7 +1883,7 @@ upgt_device_reset(struct upgt_softc *sc) memcpy(data->buf, init_cmd, sizeof(init_cmd)); data->buflen = sizeof(init_cmd); upgt_bulk_tx(sc, data); - usb_pause_mtx(&sc->sc_mtx, 100); + usb_pause_mtx(&sc->sc_mtx, USB_MS_TO_TICKS(100)); UPGT_UNLOCK(sc); DPRINTF(sc, UPGT_DEBUG_FW, "%s: device initialized\n", __func__);