From patchwork Thu Nov 7 06:42:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 11231923 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E3C151575 for ; Thu, 7 Nov 2019 06:43:02 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B4839218AE for ; Thu, 7 Nov 2019 06:43:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="UV/XOoFf"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="k5dSx3sX" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B4839218AE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=mV2wGrLd7ZYDyGiZ28S6U/l78sATvFVZST8qCLg42Kk=; b=UV/XOoFftjWN4e sijEqmRpd4VaXjLgBYv0vI9Bp4mneO6TfXyBque9qvM9O4yyvgm8aSiLvZ7NDEfqhq/jWS5OiPUb2 8AGqaVPTx/tTFnj34kmWnw9HBRMBhFHOmw37qQ7sVKi16GsFXtYHJRuEb0q9378Pr8qp5LQ2nzczo kERjWbOT08uubxl5MSpI6QY4n7VPiNxqVrkvcc3hB90PPRkV8/f+LPONtC5iuaKas5YcqtKlgGlvc OD0unFjktBu5D0KdqzUf4g8qg03pfsvljQWYUt4KdA5VgYbBlzjt6wYY8KWlFip+3FFRSCw1BXi4/ jU5Pr6a4rUo65rLmEpUQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iSbVV-00065w-3W; Thu, 07 Nov 2019 06:43:01 +0000 Received: from mail-eopbgr130054.outbound.protection.outlook.com ([40.107.13.54] helo=EUR01-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iSbVS-00065B-Gt for linux-arm-kernel@lists.infradead.org; Thu, 07 Nov 2019 06:42:59 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XA2v9zxEKh/rlQ8CmPk+mH7eFSI/p4dCcMH77v88vBb5o5iaympjSAkIr4wOGUQOjFmdKQoEIlAo+CrTJRiDFkwriAPEraXU+tdxgOBie7yLINifzdJzNe23CkvAoUHACCWWUlansPmYBPQwCzNdBNgpt0o/tbuCDVIQ/CrwwFLMXyc7/a8zqyBLEKwrootdALAGgLmGBGmsQjaWUmBkUKvLXZ09SdhmDftpGqYxejUR0+P+7WogFDRDTlHTeeyBergaD6dQqPQzwNj1y3ODbNIN2JD1iwzw1iIRxfYGEYuwoX9Sj9x8DnRlQlXZE+T7LXkjp0sMWCux5P6pGexyPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EsO+SdgsQJ0vwcXoJVGCZfTI5XlTpf1HLFWL+goIKJ0=; b=VUJgtEyMHSqEYqchqMSKf7EdrKjEQ4nToJWveAxmsC5gGe0zUJLI19qmIniDjjuZ+l0yx0PRwXJbzA60dYjEKoWQRtKO/dDUgvI1wmFMHCw5q3VIlEQVb7ybaFHdjyQ7Q6iHrKBaaD/NCM7epnDsmnvnx6IZVB3Cr1Zpepelkf/vf74nsLxNOrglNGLSe5Q0pCwxc0eBPC6OGV8ce9XHaFTTpbDejsjUlKKksgDjg1cvswjHrPg/ZgOfAdCtXMlHHwpJLytZWf4D9NEfzxfFIeYmRhlc6rSl6a1eLWB7tAmCQTnKuAK7BTDd+9d2gEUyqGb96hHdgrGar91/LHGBsQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EsO+SdgsQJ0vwcXoJVGCZfTI5XlTpf1HLFWL+goIKJ0=; b=k5dSx3sXyCarXVjFTx7te3yIHomfbfTsR6AQBS7XtZIf5JD79rsIsCVBO9ncl6fk0CbY/3WPb9RLNx1y4WezFi5roghTTwy/b2wXFCf6r4uL/zd6tpU0Sq9tFuhUb9N78bUgZf2MKApJwL99m7LpOyZUgKpF3G22L6chMXykxHY= Received: from AM0PR04MB4481.eurprd04.prod.outlook.com (52.135.147.15) by AM0PR04MB6596.eurprd04.prod.outlook.com (20.179.254.141) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2430.22; Thu, 7 Nov 2019 06:42:53 +0000 Received: from AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::f16d:a26a:840:f97c]) by AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::f16d:a26a:840:f97c%4]) with mapi id 15.20.2430.023; Thu, 7 Nov 2019 06:42:53 +0000 From: Peng Fan To: "gregkh@linuxfoundation.org" , "jslaby@suse.com" , "shawnguo@kernel.org" , "festevam@gmail.com" Subject: [PATCH V2] tty: serial: imx: use the sg count from dma_map_sg Thread-Topic: [PATCH V2] tty: serial: imx: use the sg count from dma_map_sg Thread-Index: AQHVlTaUfY6m2IkKwUycHbunFPNYCw== Date: Thu, 7 Nov 2019 06:42:53 +0000 Message-ID: <1573108875-26530-1-git-send-email-peng.fan@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.7.4 x-clientproxiedby: HK2PR04CA0080.apcprd04.prod.outlook.com (2603:1096:202:15::24) To AM0PR04MB4481.eurprd04.prod.outlook.com (2603:10a6:208:70::15) authentication-results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.66] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 0ef5c962-c809-4412-60e8-08d7634db71a x-ms-traffictypediagnostic: AM0PR04MB6596:|AM0PR04MB6596: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:568; x-forefront-prvs: 0214EB3F68 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(366004)(346002)(376002)(39860400002)(396003)(136003)(189003)(199004)(66556008)(66066001)(66446008)(2616005)(71190400001)(71200400001)(6512007)(6116002)(478600001)(66946007)(66476007)(50226002)(6486002)(64756008)(386003)(6436002)(6506007)(54906003)(3846002)(14454004)(110136005)(305945005)(36756003)(7736002)(2501003)(8936002)(14444005)(2906002)(186003)(102836004)(81156014)(81166006)(5660300002)(99286004)(2201001)(4744005)(25786009)(52116002)(44832011)(476003)(486006)(316002)(4326008)(86362001)(26005)(8676002)(256004); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB6596; H:AM0PR04MB4481.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: uh6TNZI9/LOoedT31UHjdlCLIk5xzcIwMzDsCU3sDZbUpaOji/SVdNfcS2YOHS+l3c4qaNafudB/aUbOUReInROeg9SA+y8quTKsz3xVfXrT3hRul5MqIjboacOk2PM1qtcixmnN4BT9kGN44D3xsxGlvImVN6M4tyD2yZRxwVPBEEkR+50/R2jb7el3hJjXAwekeRmoPF0eQam1q3r2aAYrrxAVfZTBXc7Wgd777Wj5VWhUq0Kw//Hc8D1OlRKjdgfOF1Rd7RoZWyQsiRnFPAodZrPKHnbtT6+WAArEfxh/R0HE1PVshkBlBx84BnnJoJjS7bYTbmd/SfzRg+mQx/PYagUFXV2KbNpHRxPAPOb9n/jE7BgX8jmwpKBlVDWoZmUyWLzBk2FFnWMQV94HR00MeKxYD9euFELlg9dgJ4fLhiRwxP5wHZde0NP42pXK MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0ef5c962-c809-4412-60e8-08d7634db71a X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Nov 2019 06:42:53.7112 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: DPeBOibxEGQVitDnHknaati+64s+e4AXKPZvkVE5JDbe95tDvPGag2lsx1ZYd+5a7Zll7XZURkPlDOLSS+Z52g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6596 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191106_224258_562335_F0896E18 X-CRM114-Status: GOOD ( 11.26 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [40.107.13.54 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peng Fan , Andy Duan , "linux-serial@vger.kernel.org" , "linux-kernel@vger.kernel.org" , dl-linux-imx , "kernel@pengutronix.de" , "linux-arm-kernel@lists.infradead.org" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Peng Fan The dmaengine_prep_slave_sg needs to use sg count returned by dma_map_sg, not use sport->dma_tx_nents, because the return value of dma_map_sg is not always same with "nents". Fixes: b4cdc8f61beb("serial: imx: add DMA support for imx6q") Signed-off-by: Peng Fan --- V2: Update commit log Drop assigning ret to sport->dma_tx_nents, it is wrong. drivers/tty/serial/imx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index 87c58f9f6390..f1ddb2cae31e 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c @@ -619,7 +619,7 @@ static void imx_uart_dma_tx(struct imx_port *sport) dev_err(dev, "DMA mapping error for TX.\n"); return; } - desc = dmaengine_prep_slave_sg(chan, sgl, sport->dma_tx_nents, + desc = dmaengine_prep_slave_sg(chan, sgl, ret, DMA_MEM_TO_DEV, DMA_PREP_INTERRUPT); if (!desc) { dma_unmap_sg(dev, sgl, sport->dma_tx_nents,