From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AB8JxZokgSwQxbrh6dBbkp3e1I/EpKZ3h9OOKLosgHLiv3LbzmkfCrXWdEmRQG1VxY8ZS2M5N1IA ARC-Seal: i=1; a=rsa-sha256; t=1525116234; cv=none; d=google.com; s=arc-20160816; b=fICPiwdhAEOs1uaR9W39JkaBqTgac+sBVSJ+2ALe9UOmkOdTBMEY380SJiP7Xuiseu 4porCSO43r4+T7cqR90eRjH6Q0NaSLTcMwrTz/+UgpUml+HtEkmW8/ey5YYLxWIQRyUF 3yUCTotEEcPsUEn9iDTW03NTqhXSA6itw94dpNxFMtvwwJz2gpdpW8dcJ78xR2mEUEVh McIXPWnOXXRMCWdPjEk2XbXrWyyEqjSinAf2kiHsAbran/HFWwDjws5k1ABteIAPSQ0P CBFUUPB3Dw1RQmpao8B0aiLJ2+sDHVCKFmP6u46VYYezJ/ieVJogeA4PP8qasRTQIMaA tIKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:dmarc-filter:arc-authentication-results; bh=gJ2r4hrxy9ngqQkG5/obK7+GoidcUxTVLoiRRuttS1U=; b=csuxs+ASgkCenoDixCME6ItmiG9yJ6IhphnPS9hpOzRq/eZdBFJ/BUOxg+dt7+VMyc eA2fjoh3yeyxonDJmwDm28HqF95E3BRVYQRjcecvj1hM6wvhUQH4D4rsLiO9qx/n/OKP 5LOX9Uk84xV2pcXEXVMJjEIRFEWz8k8KqyAJ2sCDh62bnjYAqlb+yfXPr8hVWokK8N3v HtjwHdXrXxlN1VA3Ww0K0UDFaY2Dv8clI3u4TGV4UX3KN2ZB3B7EetChyxIJJovcJXv+ 8saWWuOA39jTPkaw2XePacsjtDQS/Jxu+hj4nxRCr/jiT1MuUdhmWOTUe28MZFvRdnxI A01w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of srs0=k66p=ht=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=K66P=HT=linuxfoundation.org=gregkh@kernel.org Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of srs0=k66p=ht=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=K66P=HT=linuxfoundation.org=gregkh@kernel.org DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6D93622DC0 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=fail smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, linux-serial@vger.kernel.org, Alan Cox , Dan Williams , Jiri Prchal , Jiri Slaby , Marcel Partap , Merlijn Wajer , Michael Nazzareno Trimarchi , Michael Scott , Pavel Machek , Peter Hurley , Russ Gorby , Sascha Hauer , Sebastian Reichel , Tony Lindgren Subject: [PATCH 3.18 14/25] tty: n_gsm: Fix DLCI handling for ADM mode if debug & 2 is not set Date: Mon, 30 Apr 2018 12:23:21 -0700 Message-Id: <20180430183911.402736694@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180430183910.801976983@linuxfoundation.org> References: <20180430183910.801976983@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1599200279987877864?= X-GMAIL-MSGID: =?utf-8?q?1599200279987877864?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tony Lindgren commit b2d89ad9c9682e795ed6eeb9ed455789ad6cedf1 upstream. At least on droid 4 with control channel in ADM mode, there is no response to Modem Status Command (MSC). Currently gsmtty_modem_update() expects to have data in dlci->modem_rx unless debug & 2 is set. This means that on droid 4, things only work if debug & 2 is set. Let's fix the issue by ignoring empty dlci->modem_rx for ADM mode. In the AMD mode, CMD_MSC will never respond and gsm_process_modem() won't get called to set dlci->modem_rx. And according to ts_127010v140000p.pdf, MSC is only relevant if basic option is chosen, so let's test for that too. Fixes: ea3d8465ab9b ("tty: n_gsm: Allow ADM response in addition to UA for control dlci") Cc: linux-serial@vger.kernel.org Cc: Alan Cox Cc: Dan Williams Cc: Jiri Prchal Cc: Jiri Slaby Cc: Marcel Partap Cc: Merlijn Wajer Cc: Michael Nazzareno Trimarchi Cc: Michael Scott Cc: Pavel Machek Cc: Peter Hurley Cc: Russ Gorby Cc: Sascha Hauer Cc: Sebastian Reichel Signed-off-by: Tony Lindgren Cc: stable Signed-off-by: Greg Kroah-Hartman --- drivers/tty/n_gsm.c | 11 +++++++++++ 1 file changed, 11 insertions(+) --- a/drivers/tty/n_gsm.c +++ b/drivers/tty/n_gsm.c @@ -2892,11 +2892,22 @@ static int gsmtty_modem_update(struct gs static int gsm_carrier_raised(struct tty_port *port) { struct gsm_dlci *dlci = container_of(port, struct gsm_dlci, port); + struct gsm_mux *gsm = dlci->gsm; + /* Not yet open so no carrier info */ if (dlci->state != DLCI_OPEN) return 0; if (debug & 2) return 1; + + /* + * Basic mode with control channel in ADM mode may not respond + * to CMD_MSC at all and modem_rx is empty. + */ + if (gsm->encoding == 0 && gsm->dlci[0]->mode == DLCI_MODE_ADM && + !dlci->modem_rx) + return 1; + return dlci->modem_rx & TIOCM_CD; }