From nobody Mon Oct 14 22:17:37 2024 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 4XSBS16bT2z5ZG0H; Mon, 14 Oct 2024 22:17:37 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XSBS14zsJz3xbB; Mon, 14 Oct 2024 22:17:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728944257; 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=FC2sWayuuYOseX9jF9Jr54lvMhS1p5JTKV+WrvzC0+M=; b=R+1ZyHtRUJLHMvbmmkQjJJK+XKHOz/EuSvh9Pbjl+THjHAY37ZUHvUF+M0E2p3ywPnIQ+A y1zyMVHyat2j22NfxrdIFzTOyToSDVUwE6XbktLB2bF9tJQZkvHMC0kL2dYCkmEtpWG4gu I3q7UJXSoygP0fV6nxYlb7wI4vHUiSDeGDStJD85m6D+iWzphfLbL5zDPLC3D/bLDrO+1R vrgpaXyhZsJcS5ZKMnKLCVzomN4w6cBaDSACOfZHUbvxhleZEGyMuUBUTEVo/9cAmtbWCW pHC09ernlJb8b737x4hnwDIJMzhCvGf6W3JrfN9AfgA0dIeopzTKD5Pcneq9Fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728944257; 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=FC2sWayuuYOseX9jF9Jr54lvMhS1p5JTKV+WrvzC0+M=; b=kvnfME41fIIx9jYoQOZQxmasH9LiaROHCyV99V10yLHadcIGrWbP0WxJErDqmmFx+3OX9J MzPaQ3leykQznhF1rOjlRX3dVdiYRsgi17GObXtKtSjRXJjxBHGN7lpcvIf5kTmfhUhFwg U0Ly6lYS9cwS1h/Sp1J2+98Ae4Vi2sQfak6PjpMH0SLRlwJsXRyntAHscaQxJmlHpN0gH+ wKweWBwwOZzEFf9L0kwG2qpPTyepYQPOhTKqQKKmXVSygAID3LxtrkLvUFjUFUVB3fVptf MgX2pC/KtL0QYfatBi1fo61fG5HZxsgopP+g59SkGlyREab9ctnTOuV8rLhybA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728944257; a=rsa-sha256; cv=none; b=sEqjWFWKc7kjxvXi3DibU3rLAVWT4rSjh4etMkytM8y+Z/OaqhvIJ9BScceVWadiayeQid nfde3BqmH0d5MXCZl2u1mxVo25++1aI6QBDe4zXgoFH8SLR2Tjv1g5t6I2LnkO6CvMXMit fvkMxYW4HGOF9i7ZaMtrEBMaZu7iFbAaai0xX3JTM/8yeCMz3oiUn+ColOXjg+SakHp/DZ RKFVjGpbzVX5QLh6Iyh3LLOTT/zKxkgmjmC59NbTkBc5/D6ecvZwJFEVpbDrkJAqdWtERe i3sCmIS82SqqL/HUM3bFHwDmDN25NBpCt6blQSsjcYlDhzcINRPs9xFqNNcTKA== 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 4XSBS14bvyzwK3; Mon, 14 Oct 2024 22:17:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49EMHbTw074912; Mon, 14 Oct 2024 22:17:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49EMHbG7074909; Mon, 14 Oct 2024 22:17:37 GMT (envelope-from git) Date: Mon, 14 Oct 2024 22:17:37 GMT Message-Id: <202410142217.49EMHbG7074909@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 56139f727f6d - main - uart/ns8250: Disable interrupts sooner 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 56139f727f6d0d0a6d2f120b67f8c1d70e8c18d4 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=56139f727f6d0d0a6d2f120b67f8c1d70e8c18d4 commit 56139f727f6d0d0a6d2f120b67f8c1d70e8c18d4 Author: Warner Losh AuthorDate: 2024-10-14 21:57:54 +0000 Commit: Warner Losh CommitDate: 2024-10-14 22:03:58 +0000 uart/ns8250: Disable interrupts sooner Disable interrupts before we set the parameters for the UART. Usually, it makes no difference, but it's possible that setting the baud rate, etc could create problems if there's data pending, so move the interrupt disabling ealier. Sponsored by: Netflix Reviewed by: andrew Differential Revision: https://reviews.freebsd.org/D47075 --- sys/dev/uart/uart_dev_ns8250.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/uart/uart_dev_ns8250.c b/sys/dev/uart/uart_dev_ns8250.c index d43a48f319e4..f59f5fa80e9c 100644 --- a/sys/dev/uart/uart_dev_ns8250.c +++ b/sys/dev/uart/uart_dev_ns8250.c @@ -359,10 +359,6 @@ ns8250_init(struct uart_bas *bas, int baudrate, int databits, int stopbits, { u_char ier; - if (bas->rclk == 0) - bas->rclk = DEFAULT_RCLK; - ns8250_param(bas, baudrate, databits, stopbits, parity); - /* Disable all interrupt sources. */ /* * We use 0xe0 instead of 0xf0 as the mask because the XScale PXA @@ -373,6 +369,10 @@ ns8250_init(struct uart_bas *bas, int baudrate, int databits, int stopbits, uart_setreg(bas, REG_IER, ier); uart_barrier(bas); + if (bas->rclk == 0) + bas->rclk = DEFAULT_RCLK; + ns8250_param(bas, baudrate, databits, stopbits, parity); + /* Disable the FIFO (if present). */ uart_setreg(bas, REG_FCR, 0); uart_barrier(bas);