From patchwork Tue Mar 7 16:44:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 65710 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2540786wrd; Tue, 7 Mar 2023 08:59:20 -0800 (PST) X-Google-Smtp-Source: AK7set+34jtEqkc2cA8elZrU9G0rKWYn9SEa29xcP3gTttOUbm/fEsynyrSecljE6dqBfjoO+Sq2 X-Received: by 2002:a05:6402:3448:b0:4be:c6b:7436 with SMTP id l8-20020a056402344800b004be0c6b7436mr12285859edc.30.1678208360172; Tue, 07 Mar 2023 08:59:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678208360; cv=none; d=google.com; s=arc-20160816; b=gKJzLq4yj/1vH7/fTSlLz8WOGFlzWh9gr5I0Kvy5YrQ4zolRxQ09UW5cAUTxMH2eyk xxQluHAsRWFec6O9zOmDdAT6Jdriy8v/PtjDXqqfIOU8xjtFT9xn0LJ23HZa0ze8934A TdtbcEKTMA9iUVbiSrLStG4TAjkfouRzZtJEA5l+Ek0TN9ZuDb5PbxR8/Q4h+0DWjta+ wAh52c2cwuhjbeyYTs5ztuDDkLIjpgtMrEyta1JzE0tStOzmIgyAZ2wbQE5IMtG6HKar ywMgPVhPOBMkpApi/ueZn+yucidGCalvpmuPnm56Qp1cxY/3SBvID4ABYU3PWs4pv2ye RI8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=xwyFu0k9MQVcdwy/jN6DGEPdkr8zW3JkNlhB71g2vo4=; b=cKY3kkxcY1VMkUFlGclf8AYTyrLvRcu1hsaYI8boDTu82XABmEOjw9Z2e/xozBFUlG HT4WG/+hLhKjUJAOWWyDpLrNJDrKuJ7/3oj/vyQyOnAhs4h2N0Na36UojJTjcCOLPdR9 D6XgiraZC3Y+P/fcgWVx+logTdPZlJVQMbSiv1XYDkUes7fVSFV2WmizagVnMOIsaw+i Bm/rJw9/K5csmxxqEJ/bqdpp56gRllU4xqTo/WgoAmXcOrkBJfMmDWIKd64IVqG+PmbE UMy2ukoFHhy6aaPE73NW9ADxsHjmauy8WoC7P8aWsbTEUMR09KGn3BloT447DKkVNB6X kMeQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=XhYOkPxM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o5-20020a056402038500b004ab4d3c234csi1529987edv.430.2023.03.07.08.58.56; Tue, 07 Mar 2023 08:59:20 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=XhYOkPxM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230180AbjCGQrJ (ORCPT + 99 others); Tue, 7 Mar 2023 11:47:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229875AbjCGQqh (ORCPT ); Tue, 7 Mar 2023 11:46:37 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A621096C3C; Tue, 7 Mar 2023 08:43:39 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 58EE9B81986; Tue, 7 Mar 2023 16:43:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 19355C433A0; Tue, 7 Mar 2023 16:43:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678207417; bh=Wq+5k8oC8/u0yNH/aD78uhUqCmSvOQM4I4ENgYqsEkU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XhYOkPxMndsBoqpJdPajozRgjCCsjGLj0y+V/ZVU/9aDc86ZemRCxx7mXr6pJeSJn ll9lZraCSfgs4jCVxyJ3CRZc5fDlbqo9yzMJqq3/Ys4wY7YFo+2PuZ7wasndQGUKPe FKk2LVMbG+sxgGjPq07K58XcVTDPqdh8Kc4PuSkZvtoEwmMJKrh9tXdkjalA6e70OZ Bqu1F+Jn/+t/lM2S1ZjI/nlVY78qvn/4QMCJNsb9HMKuIdjPOPbl16gKdJw7xU+1xm D2UjkyW4nofslpdcSIgxxnm9v5zPLoz8oKTa0yob8KPBL+qoVU6MWKTuzN9OWwSS/x dxeG21NqNDNHw== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1pZaQH-0003hs-0z; Tue, 07 Mar 2023 17:44:21 +0100 From: Johan Hovold To: Greg Kroah-Hartman Cc: Bjorn Andersson , Andy Gross , Konrad Dybcio , Jiri Slaby , Bartosz Golaszewski , Douglas Anderson , Daniel Thompson , linux-arm-msm@vger.kernel.org, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH 2/4] serial: qcom-geni: fix DMA mapping leak on shutdown Date: Tue, 7 Mar 2023 17:44:03 +0100 Message-Id: <20230307164405.14218-3-johan+linaro@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230307164405.14218-1-johan+linaro@kernel.org> References: <20230307164405.14218-1-johan+linaro@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759729009512912685?= X-GMAIL-MSGID: =?utf-8?q?1759729009512912685?= Fix what appears to be a copy-paste error that can lead to a leaked DMA mapping on close() and failure to restart TX after the port is reopened. Note that rx_dma_addr is generally NULL when qcom_geni_serial_stop_tx_dma() is called as part of shutdown() (but tx_dma_addr need not be). Fixes: 2aaa43c70778 ("tty: serial: qcom-geni-serial: add support for serial engine DMA") Cc: Bartosz Golaszewski Signed-off-by: Johan Hovold Reviewed-by: Douglas Anderson --- drivers/tty/serial/qcom_geni_serial.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c index 11da05d8f848..2aa3872e6283 100644 --- a/drivers/tty/serial/qcom_geni_serial.c +++ b/drivers/tty/serial/qcom_geni_serial.c @@ -596,7 +596,7 @@ static void qcom_geni_serial_stop_tx_dma(struct uart_port *uport) if (!qcom_geni_serial_main_active(uport)) return; - if (port->rx_dma_addr) { + if (port->tx_dma_addr) { geni_se_tx_dma_unprep(&port->se, port->tx_dma_addr, port->tx_remaining); port->tx_dma_addr = 0;