From patchwork Wed May 20 20:34:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robin Gong X-Patchwork-Id: 11560191 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 6A4F6159A for ; Wed, 20 May 2020 12:34:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4C771207D4 for ; Wed, 20 May 2020 12:34:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="ssYgpRhQ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726560AbgETMeW (ORCPT ); Wed, 20 May 2020 08:34:22 -0400 Received: from mail-eopbgr50046.outbound.protection.outlook.com ([40.107.5.46]:58020 "EHLO EUR03-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727027AbgETMeR (ORCPT ); Wed, 20 May 2020 08:34:17 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IY28Tn8hsjOg15bpmVdNBvZ9OkECDM3QxzBtN07zzQ9Q7G9IsC962XaUjZunS5BwdZHkwwdQLF5BjKBrHfMNTswMtMR5ZtoqzhXcHJjWk5AJqgN62O3jE3cQBPTWu2kHh3sv1dj/u41zrhL+/DtYYOba73fL/gj87C+P+9UKwzqnYMHmHJDhzhVJGWyTbjs4H8J+ZGm2JexM0dRhhAR5XvhwlIdsNc8x35G2mqC9zepXabxW7OplvSdWrjooUwhzKxUCAtKYyAdLcnsIGQk13W+UmCd+hy8KExyHeNpFjr0XDNRLJPZqvZ6/T0KTmywlcSd4FRu+CDWsOR2sxjYxPA== 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=cQ4lfqZg9UPDMmfJntdJXdbDbaidbZdpuDadirfZLDQ=; b=F6AHeBOS1W3v/Dz5VN3U88JuHtnASf+mQxlRqPn0iLvlktP9i2O8XEFFrJhXg4U0pHW+9IBZT/yTEHVFGIZoizFHKm69vb0ZaCO7bEMDaa9U8Sot5re9L93jplQh6EqdwWh4J3rLaVy8PctrMFlmxFpwQAaPYVaLjt5c78JMncpqDavH8Eu7oYfkPg88lYvQWeL8N9q8GP478SgQf7Qt+1Wmw6kPtGgw2FShopSWHiG+YaSx+mSApvXbxMF0YK7KvNs8BaLE7A+aXpRA7eDpeFmUKQLLGk8sB8q9FKou6HpOkCMXNwtCO5tnxYKaF0xXHCCMgrRx7mgFJnqObsEZyQ== 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=cQ4lfqZg9UPDMmfJntdJXdbDbaidbZdpuDadirfZLDQ=; b=ssYgpRhQ6yAAeNMs0wa0dFrcoZ3nzlB7qqA9hn/xjWtc6AJ96xBsLUw8qPM/QDZBoI5UPVliZVxLNQbrtYPjmvQ+ehAwzDE+L1WP7kzJmsJijNFXSTN/ihqkjY14d70x/Jhz4f8tNPVkaC9eAoemI0NVF3APEhCeEqxpO1rEMOc= Authentication-Results: arm.com; dkim=none (message not signed) header.d=none;arm.com; dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB6630.eurprd04.prod.outlook.com (2603:10a6:20b:f4::33) by AM6PR04MB4279.eurprd04.prod.outlook.com (2603:10a6:209:4a::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3000.26; Wed, 20 May 2020 12:34:12 +0000 Received: from AM6PR04MB6630.eurprd04.prod.outlook.com ([fe80::bdbc:dab3:70f7:d5fa]) by AM6PR04MB6630.eurprd04.prod.outlook.com ([fe80::bdbc:dab3:70f7:d5fa%6]) with mapi id 15.20.3000.034; Wed, 20 May 2020 12:34:12 +0000 From: Robin Gong To: mark.rutland@arm.com, broonie@kernel.org, robh+dt@kernel.org, catalin.marinas@arm.com, vkoul@kernel.org, will.deacon@arm.com, shawnguo@kernel.org, festevam@gmail.com, s.hauer@pengutronix.de, martin.fuzzey@flowbird.group, u.kleine-koenig@pengutronix.de, dan.j.williams@intel.com Cc: linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel@pengutronix.de, linux-imx@nxp.com Subject: [PATCH v8 03/13] Revert "dmaengine: imx-sdma: refine to load context only once" Date: Thu, 21 May 2020 04:34:15 +0800 Message-Id: <1590006865-20900-4-git-send-email-yibin.gong@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1590006865-20900-1-git-send-email-yibin.gong@nxp.com> References: <1590006865-20900-1-git-send-email-yibin.gong@nxp.com> X-ClientProxiedBy: SG2PR03CA0103.apcprd03.prod.outlook.com (2603:1096:4:7c::31) To AM6PR04MB6630.eurprd04.prod.outlook.com (2603:10a6:20b:f4::33) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from robin-OptiPlex-790.ap.freescale.net (119.31.174.66) by SG2PR03CA0103.apcprd03.prod.outlook.com (2603:1096:4:7c::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.3021.12 via Frontend Transport; Wed, 20 May 2020 12:34:07 +0000 X-Mailer: git-send-email 2.7.4 X-Originating-IP: [119.31.174.66] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 2f366cb2-27b3-4cf1-0d04-08d7fcba199a X-MS-TrafficTypeDiagnostic: AM6PR04MB4279: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:119; X-Forefront-PRVS: 04097B7F7F X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2b0PzXCJdeIdLTgxxsMwtN9p/OV4Dkvjy3tXoUJOomh30fXUzznM9a+aJ/BUDWo/9V0/te4ZffACHUOgJd/+kZ2kSh0a1WNF648bZH7ZFtnpw0BE3NTSWh5/jdwFQgbASgEn+WkkTlNCPFA0Qyav3JVQvULhQ69M5nfwJrpULEqe+cECs2ZyiBCwiB1rBMHWP6IAptO4tilDj/E9cxTUnaIH+D/Lsl4/5LeJ5gfirsrNhmfeu+abYHv8tWCOnxlXzlsUTJbWNHTbTn1653MAXZ+Wq6MkXc9Vaw3PXvIYU/nJ5xMhE2A7lUx3OeZzS1lEyTCmf8tdZUdjpCdTg51lG28D5XDL+NZRCPTlqDj6e96OtVFX+QWSxRkyWWkfZVC3OETWLetInPMkGKggg71BzR8VCXjuQ26cGgznKXfg0YUcNJixaeNgJWVKQ0O0XXmRMYwTyR/IexY65Jow0VHgWJXza5IxLfUQkYLnvU5pcGo= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB6630.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(346002)(366004)(376002)(136003)(396003)(39860400002)(6512007)(36756003)(8676002)(6666004)(52116002)(66946007)(66556008)(7416002)(8936002)(66476007)(86362001)(5660300002)(186003)(478600001)(316002)(26005)(6506007)(6486002)(956004)(2616005)(4326008)(2906002)(16526019)(921003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: Rhd2iRiAY+qEE80f3fDBHYBWrvNXFPhVFIlWbD/FRqYlIghFvW61TQd2DRkSY3wv2dvwUU7r73cP9BU54ui0vy2cQxW3wlRp75jXisbfsNofUsPfzDFRQR+H/t2sdkwrAL7+4ljTPKWepH56AfP1kmUZfxyBJdl8LHh1oQV+iRACVSldTVSYJufXErHn4T4xFLyRufw3rwQl9q6NXZMxgQOF8/mTDtcsDokgF9ASDiC6xYQukJERYlkrTC8RPJGvu7fTdoNwMU8qFkHXGel+50qLa/EpRkUiv9Mbpk1OHVwLjZnNv+HVPTjk74U3uSIV8QIE3ocb246tmowujp2PQyAVRavgaXb9e6p/Fd2c1gP6PsJGtJyRdnOfkmU6fjWgpVydUKqQQZaFswIsHF2pMrdA69ocwaBixfmJsWkz7DwWqDnrIOL3Zf/AwNb3D39SJE+6OdCO0H+UyFytUHpOZx659tXa7UY/7GSqU2xeNcM= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2f366cb2-27b3-4cf1-0d04-08d7fcba199a X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2020 12:34:12.6563 (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: 4y3lpuhtsGl4F9abJzdbuQv/PfwkTn1zGD4wFV05j9mJNxsuJ4dP1/ugS3/xnH3p5HeHgls4pTS9Ub7kMGXcsw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4279 Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org This reverts commit ad0d92d7ba6aecbe2705907c38ff8d8be4da1e9c, because in spi-imx case, burst length may be changed dynamically. Signed-off-by: Robin Gong --- drivers/dma/imx-sdma.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 9177403..b1f61eb 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -377,7 +377,6 @@ struct sdma_channel { unsigned long watermark_level; u32 shp_addr, per_addr; enum dma_status status; - bool context_loaded; struct imx_dma_data data; struct work_struct terminate_worker; }; @@ -984,9 +983,6 @@ static int sdma_load_context(struct sdma_channel *sdmac) int ret; unsigned long flags; - if (sdmac->context_loaded) - return 0; - if (sdmac->direction == DMA_DEV_TO_MEM) load_address = sdmac->pc_from_device; else if (sdmac->direction == DMA_DEV_TO_DEV) @@ -1029,8 +1025,6 @@ static int sdma_load_context(struct sdma_channel *sdmac) spin_unlock_irqrestore(&sdma->channel_0_lock, flags); - sdmac->context_loaded = true; - return ret; } @@ -1069,7 +1063,6 @@ static void sdma_channel_terminate_work(struct work_struct *work) vchan_get_all_descriptors(&sdmac->vc, &head); spin_unlock_irqrestore(&sdmac->vc.lock, flags); vchan_dma_desc_free_list(&sdmac->vc, &head); - sdmac->context_loaded = false; } static int sdma_terminate_all(struct dma_chan *chan) @@ -1338,7 +1331,6 @@ static void sdma_free_chan_resources(struct dma_chan *chan) sdmac->event_id0 = 0; sdmac->event_id1 = 0; - sdmac->context_loaded = false; sdma_set_channel_priority(sdmac, 0);