From nobody Thu Jun 16 02:56:12 2022 X-Original-To: dev-commits-src-branches@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 2B4A2855A97; Thu, 16 Jun 2022 02:56: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 4LNmyj0hMxz3vfg; Thu, 16 Jun 2022 02:56:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655348173; 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=grWIyvbTJm3j8aZra0USsY1srvijWM2ns1uQ/D/u39g=; b=u2YmUfGSYMPt6Z0tcXgBSm3nxLkTSS2DvmeFafDtouqb+QzHX2EquqEi0UaBPHZv4IzdEG Gn04g5sphtL+sqkyyeDABUqvWcmkcl3gq7SLDVELdiT4X+rC2XRU+TAO5XKFZbjUh1+6K6 mj6fhhpHOndvVjzYC7w0RbTp9tLWLWkSHLfEB9wuC6eoKkNMbGKRn2ohOIeWIVGMrnka4z XEPPL1ScHDGRG0Mbs/R5re3cknk3Qty8OwE0o4qpc+wPvTrLnyGvoQ83GQKewzDo3VQLeV Gok1ORJfAbQCD/iI2Dn8Icg8+VeDojTdYBoQE1/IKe9teCeK/8Du05jbrUhXqA== 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 EC2CA2ABD7; Thu, 16 Jun 2022 02:56:12 +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 25G2uC1B003248; Thu, 16 Jun 2022 02:56:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25G2uCYW003247; Thu, 16 Jun 2022 02:56:12 GMT (envelope-from git) Date: Thu, 16 Jun 2022 02:56:12 GMT Message-Id: <202206160256.25G2uCYW003247@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Hans Petter Selasky Subject: git: 1c5c1e44862a - stable/13 - upgt(4): Adjust all pause calls to use milliseconds instead of ticks. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 1c5c1e44862a6b7fd6b10b99a65002c82fc15ba4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655348173; 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=grWIyvbTJm3j8aZra0USsY1srvijWM2ns1uQ/D/u39g=; b=b04FAoRmS85PuBN0htvKW6XYPXnlkKAugzHw2WxjypXYqDiBBPqsHMlzSHTZY72kMuMCaC PnN2lCAXLd7T9RfCq+jLutUVF/cx03QzdY4hV3+fsVT6buRnEjIscmQZcb8bB9saFDs7Cp udyCWwTKVHcHXoqZw/36WPC6aRgjFRqyZuCzjBk9LG0xhDFFBAmZFGMarV+AZyD1fQgCZm siANoq+oczTv2iANCPEo30/Ly7AA0UPa+r1sMdpsJ438U7Ed/Q+AhViC7+Zfn20aN/Qh+Y 2uARvxxVwYYQkpAg89+ssrxezC83zOpZrLiIM6Mjcp8njyAe5UzpQPWywjPKdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655348173; a=rsa-sha256; cv=none; b=sCb4dg/RQEPrFeaGXlIVtrPub3qvf6Xf1/hxGDW8cU2zf3SDOqPz/EF2fDdIs2GBifJTmk ZvGr/B7gx3sR7qPDZDmrgNsKjuF0eEXyVmZoJwE/xUNT6P2k1IKL3IroYLG5fhpCpO36Pr rHqcPlbdZpqBDu1rbAdDS60aLsp7a19pYeu+2WwSMMe9HhHYbetNPk5tjjNPqX3FVwlLzO MTz5GODYnsNCscnSNp1ojfFgplRNdqkdUWno8QoVQvxmPY9hBVb08bfMKCQnnAa/O4IsEp Mj+MkckmgXaTNsvvvLO+gkBagao5TrILmCB9F9zjkDRIRNBbl4iyqxo9eOpEXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=1c5c1e44862a6b7fd6b10b99a65002c82fc15ba4 commit 1c5c1e44862a6b7fd6b10b99a65002c82fc15ba4 Author: Hans Petter Selasky AuthorDate: 2022-06-09 13:14:17 +0000 Commit: Hans Petter Selasky CommitDate: 2022-06-16 02:55:52 +0000 upgt(4): Adjust all pause calls to use milliseconds instead of ticks. Sponsored by: NVIDIA Networking (cherry picked from commit bc2e447338b7ade8d800d1f24913bb3873c65f99) --- 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 26c57d7944f5..b8ae41418695 100644 --- a/sys/dev/usb/wlan/if_upgt.c +++ b/sys/dev/usb/wlan/if_upgt.c @@ -1274,7 +1274,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; @@ -1887,7 +1887,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__);