From nobody Thu May 11 20:06:51 2023 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 4QHNG40rFBz49xCM; Thu, 11 May 2023 20:06:52 +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 4QHNG36fbDz3nsN; Thu, 11 May 2023 20:06:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683835611; 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=fhv1VlDcwGJOsJEThz4Uu8iMlwPvu3Kb1s70fsOJ2bQ=; b=AH+SE5/vNC/cmwoQbxO9b8MIbal4vqxKc4nO5VjQORipK9c9sBJiB0PIrfTvVz31H2Z7Nq hKizwYzvdBbMGvV3HtglPg8LEkptMaTcNsCKYfeJ1ndbNNbZ2wQ5a9eDQrhJye3FxcYUO1 rl1JYfcrLDaOXXsncWqWz0M/vVH33byGXvBX5JxxmZFYstgJW4FZHquJwFNWlaSrwIoV+L G1WDIbWCPK/STQZI65ux2OASCDLuXJmi6ZmBwXyE2nEQA5qNGLGztnDtLWwztBa47C9H1o FCKEHStbcdBSCavxCfsCYoikgSV+UN2DXt1ul18t+a0kmL5ZHGGWkjioiIBLmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683835611; 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=fhv1VlDcwGJOsJEThz4Uu8iMlwPvu3Kb1s70fsOJ2bQ=; b=VnFSBhjp64isHwX2RCpd8YYvlRMWSHKO+Se4hBFOmSa3U4kkCifxwDzOSfFkcT08ZAYKYr oWERVB3yZnL9ivpZdLvN/0lP5zrrcOqvBAROqjxBs3uIrApugndlgpb+t/g6hupgIkvJsC 1uazAnxFDICUNmwmGCmxgJNaJY8dMG2VYr8AXvXJpQVueJkzuEfdkbg6wSxTQMx77PcDvA SrLXMDQ+nz9IzMx4WxlWNiht7mvH/8xIA5upau6i7+zD0A5ssV7PNYyiCME7XAv2CLgTcH f9dIevcydPERbtmJeTkcW3ok/rY++ZHQ9cb1ntvhH+y4OESg2J2tUZFoRT1Oug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683835611; a=rsa-sha256; cv=none; b=mURTLONHtEaQnMgLkHdMWxaE1NH54QQBQUlDTomiGggPlgE8wbPz+4rmsxYTyiPQVHDmVX KmUvBXKDsYcRnWVOm4iOlKDhV4AswTZm0o+ZouAZc7TSMaYkIcmArxcUsVtaQXEYk01MHE +fCwh1cwqOWSEyIxGo2Jj3nmO7fzNahGZndt/VxkWfn7bX7vUkqHvFKAEYpn2BlobfIU2O B2r0RONM9xW3zv5GBKElncB9xiHUQcJh1p++4xgb1v6haeBL1NJsfMUPPNwqekMpCkWa1W g9ra4EnCWtudvlAOG1decsMJNRGoCwc6YrNnHD76aZsDVgpiQn4xlEAsqnLOqg== 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 4QHNG35YcVz15rK; Thu, 11 May 2023 20:06:51 +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 34BK6p3G019601; Thu, 11 May 2023 20:06:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34BK6ps6019600; Thu, 11 May 2023 20:06:51 GMT (envelope-from git) Date: Thu, 11 May 2023 20:06:51 GMT Message-Id: <202305112006.34BK6ps6019600@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: cb2da74905c1 - main - stand: eficom: Don't preemtively assume flow control 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cb2da74905c1cf6e0cc1d91f347030fa1e12cc81 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=cb2da74905c1cf6e0cc1d91f347030fa1e12cc81 commit cb2da74905c1cf6e0cc1d91f347030fa1e12cc81 Author: Warner Losh AuthorDate: 2023-05-11 20:03:51 +0000 Commit: Warner Losh CommitDate: 2023-05-11 20:06:03 +0000 stand: eficom: Don't preemtively assume flow control Remove rtsdtr_off. It's basically unused. Expand its meaning, but put changing flow control to under an ifdef. We shouldn't set it unless we're sure we need to do so. UEFI normally initializes the device correctly, and we should avoid needless changes that aren't user requested. Sponsored by: Netflix Reviewed by: tsoome Differential Revision: https://reviews.freebsd.org/D40009 --- stand/efi/libefi/eficom.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/stand/efi/libefi/eficom.c b/stand/efi/libefi/eficom.c index 8d14209f8484..b0fc0d8fbf6a 100644 --- a/stand/efi/libefi/eficom.c +++ b/stand/efi/libefi/eficom.c @@ -47,7 +47,6 @@ struct serial { uint32_t databits; EFI_PARITY_TYPE parity; EFI_STOP_BITS_TYPE stopbits; - uint32_t rtsdtr_off; /* boolean */ int ioaddr; /* index in handles array */ EFI_HANDLE currdev; /* current serial device */ EFI_HANDLE condev; /* EFI Console device */ @@ -275,7 +274,6 @@ comc_probe(struct console *sc) comc_port->databits = 8; comc_port->parity = DefaultParity; comc_port->stopbits = DefaultStopBits; - comc_port->rtsdtr_off = 0; /* rts-dtr is on */ handle = NULL; env = getenv("efi_com_port"); @@ -515,7 +513,6 @@ static bool comc_setup(void) { EFI_STATUS status; - UINT32 control; char *ev; /* port is not usable */ @@ -544,18 +541,17 @@ comc_setup(void) return (false); } +#ifdef EFI_FORCE_RTS if (comc_port->sio->GetControl != NULL && comc_port->sio->SetControl != NULL) { + UINT32 control; + status = comc_port->sio->GetControl(comc_port->sio, &control); if (EFI_ERROR(status)) return (false); - if (comc_port->rtsdtr_off) { - control &= ~(EFI_SERIAL_REQUEST_TO_SEND | - EFI_SERIAL_DATA_TERMINAL_READY); - } else { - control |= EFI_SERIAL_REQUEST_TO_SEND; - } + control |= EFI_SERIAL_REQUEST_TO_SEND; (void) comc_port->sio->SetControl(comc_port->sio, control); } +#endif /* Mark this port usable. */ eficom.c_flags |= (C_PRESENTIN | C_PRESENTOUT); return (true);