From patchwork Thu Mar 29 10:13:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 892693 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=synaptics.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Synaptics.onmicrosoft.com header.i=@Synaptics.onmicrosoft.com header.b="uIqJG/MY"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Bgb80g5yz9ry1 for ; Thu, 29 Mar 2018 21:14:28 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752563AbeC2KOQ (ORCPT ); Thu, 29 Mar 2018 06:14:16 -0400 Received: from mail-bn3nam01on0040.outbound.protection.outlook.com ([104.47.33.40]:51840 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750716AbeC2KOO (ORCPT ); Thu, 29 Mar 2018 06:14:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Synaptics.onmicrosoft.com; s=selector1-synaptics-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=q/xJkYfwqBtcyBN0faKAoYe23hVisUiUJF7C/bFShnE=; b=uIqJG/MYAjupLJoGoPremI8GkjeKSB9ovqMGGxxx8qQcRLS+zbpQze47FAQJeHFFQ8goEIDO1aF9N6Rng9HD2HfXr5lxBQAU9MCQg82ZP8QWl5jmMTkQsRGa/7VawjqC11N8al3ySBcI0XP+fqZyqkflR6KoTszm9cQEstDbDR0= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Jisheng.Zhang@synaptics.com; Received: from xhacker.debian (124.74.246.114) by DM5PR03MB2635.namprd03.prod.outlook.com (2603:10b6:3:43::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.631.10; Thu, 29 Mar 2018 10:14:10 +0000 Date: Thu, 29 Mar 2018 18:13:56 +0800 From: Jisheng Zhang To: David Miller , Thomas Petazzoni Cc: netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] net: mvneta: split rxq/txq init into SW and HW parts Message-ID: <20180329181356.6489ee2e@xhacker.debian> In-Reply-To: <20180329181220.61d63c92@xhacker.debian> References: <20180329181220.61d63c92@xhacker.debian> X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-Originating-IP: [124.74.246.114] X-ClientProxiedBy: TY2PR01CA0015.jpnprd01.prod.outlook.com (2603:1096:404:a::27) To DM5PR03MB2635.namprd03.prod.outlook.com (2603:10b6:3:43::9) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0ad48005-a4aa-4848-dfab-08d5955dd151 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM5PR03MB2635; X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2635; 3:hwrJg4Z1Qqa9TW1nm7xWYWa47t5h+K81ByZ9giOo2chtYWBo3CZsGH638LU1eQh4YtltEJtjWZZoaltpLGuDuFsrfYzEGHB7y9GxOVbNEOlWsHcHB1s7T+GvdDoHA28mg6yFu+N6DKCs5dMWEP55LV0E001ffMnAt0WoCSrLRLE4HOZq9yDo3Nq9+Wo0nFY7n2FyVfn0ZDpemeBUKwTJBUO0p6WeqHmdIYiSp3sjBHdNX82KQA6olLbcWWEUR9cq; 25:7FtHpEbMbsc/sLCQdtXz+m4uL+KKBeBjlVaYRkp4h6fD37TC5r+tfGx8nCcyansb7u33wq1tEyuACzZLCxVY4Np90GQECJHj3V1HeVV8p1HMvokPevUznyS029/5tb25F7OlWduxXrbqaBOXax6KxvtMl65GWCGy3TtvI61VAEKkfwWqbPnEimpaOt7l261s/z2I6/Aq2X6nwjyuOCYki/k/WpFrqDHG2XVOWciWP7IjyIFGHUpBqr6Fm+nq3B0KHIdsZ5NYceHtgkdiedGrPR0U1U3HaPWtA14ri/FC/tgMaNBXuSDIjgGuKVgYSR4Zf32qMms6oJDJ4u1tsoPOmQ==; 31:fFJIYVC8YaexHzGBu09KbD6AQ0U8Qz8oZTmRq5QA46KTe3PJwiejZWBh9hs9eJsSy4C5wDiFFdW+ttXc+1M4x+4xPgYUpBvzmC8b06zdEMLjSU+QyXiDlv/W7qHcs1Ply6MWK0+x+sfZyR5KxKqLQcP90AtcFf8UWLALHKsq/z+YfsF8gA7JWouz4ciYBfu3su40Q1w0Jj5A3ZCrx0BQ86D8Eh5hwd4wz3L14zSQf44= X-MS-TrafficTypeDiagnostic: DM5PR03MB2635: X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2635; 20:7+Gcw7xCBbIgyA1oJEyAQ73CJZKTDbX4VOf4nWGT7ck41NsGu42GPMpUfHUBwK/A6RDyWy1ZKMiXVzYD4AG0DkFcCfJjXm4mu3TZU6orLbZiOD4wJNaNVNzCbH3P78RMLaaYhRzXyHGJEeJd728Tv9fCReyzamVAXMI74P4iDOXSZ6mB8DgBDF5x7EOQPZ5Z60S6MqCq0O4acGu5VC6axjrADrAKHR4znvKyKCNV9Rz4bEqNTzTpkQCDo5wikpXxXdSEt8aKGgfOBu7Anof2gjhSMfcW+4dZvfB2oFEUVcnHXOvhJRGxUOgVS+WBi7uXa+W5vd9KN78nrlfqCmCxoB1ZsPmgHzYIken2lZysYOw9+QAAW7O/4OpaCUE/Vy55igbHGzoVx66eoeulHawR+yXfSuV1AS9pyo6Nfe8rvCic1uapO20cW66T6yWbeWRyR1EBZI3yoWmbQgTAC4vsyjqxps1uRZoWcZjBlRgSO7wchnfQO0sQ9LbkE9p7OqrJ; 4:+B/doKsRK62NAbDfctQKf2xsZBApNQRg0FZPA21IpcoxwmMGK6aW4wd3DeLp7nQoSXpdF1XdWOWfEYbu8fp0RoJqn9PE1NEkQEUSAzViWIsqooAi/XRg5VRtGUzzjm0GtFsTz/IPo6llaF2wUIBToXBTvqsArQNqxc/WeXVapN5KHJbXFtSMHlGHagDKCbv/bk681+pcvalf1mEUI5ofE1CvywVhkjjCWu8w+VG3DIpBF5GVwi4Bc+c8I15VX2TvRNsVS/NY72d8LFzGB3Ay3g== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3002001)(3231221)(944501327)(52105095)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:DM5PR03MB2635; BCL:0; PCL:0; RULEID:; SRVR:DM5PR03MB2635; X-Forefront-PRVS: 0626C21B10 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(376002)(39860400002)(346002)(396003)(366004)(199004)(189003)(47776003)(66066001)(105586002)(55016002)(3846002)(9686003)(5660300001)(305945005)(23726003)(7736002)(97736004)(6116002)(72206003)(110136005)(6666003)(7696005)(50466002)(52116002)(33896004)(59450400001)(386003)(6506007)(76176011)(478600001)(68736007)(8936002)(81166006)(50226002)(81156014)(8676002)(316002)(25786009)(4326008)(53936002)(86362001)(26005)(1076002)(956004)(446003)(11346002)(476003)(486005)(486005)(230700001)(2906002)(186003)(16526019)(106356001)(39210200001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR03MB2635; H:xhacker.debian; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: synaptics.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2635; 23:weCzo+g2eQjxtYOiWNNe0/v2nA9bZFWoi+tmdHFqrzIlw11eyJqnFInAyxBNL5z2qR900ZYHT1ILxhreWT2KRh3/T3mcG110E0oEAjOQome8pU5xNXhqRtcrWeRbUeppXy4UeN8nLP+/2/l2lVYMJjZvuwcAap6eINI+vV4w9rAfTpr8V038EvsgBaq/PCIbDPsXBXsbVk6j61F3NmHQskNrpiAdaL1TQuJiD/bbMqmzkU6cjebQbyrm+7AOMhB6A3nQ2aahlE3nne5emWVksTlfgCVWSlNPtCz3UJsF48/DUPKtVtfFSP+0digvQB6A5jhquYFuRAQ9DNxc/l6rSw9Ua0qRS7o20oTlqY0ENIVAnzhCCkvQauLKoleZDzCOHwJYmMgDzW5la6JwB9hDy0X7rHaP/ghmrBDyg2SJdoB98MBaPOdzaB+bcV66zpDQ1bPz6the87qJzi4Ik0UOhbNzJ0Hwa0dGT02Hv+aZgbsozS+4l2dEMtuWTrekI11a0ve3S/rKIqvV82lxYSamvmAn/BvP1qsH+9yafNry0H6iKNRpE3Gp6dxOVDrCKRcIHvmmNQmJC51sk/BURrsvjEbzFlarhMEA3nCTIHehUXBcQP+JfG57ULCv4NsJAgwxEUKGL6KZZrOcfh7LRl7wUENQlW9lXVKE/xHfsZNFWtQxa8q8Vo8OVylKzKUFQagJg/Kh9tGGXMJ3n1qEbmgwN9JEEhMrdA+sE0aQnwufPZCA2gmyC6rG3iy9Ircoclfah9QbcZvd05aEpBppTJizOMOBP4lUIGLhTnnb1eaUzfvpny1bcqRGcb+byL+hAzc3OQC38BHd/h02T/Lg8Qe0U8a5S8c3VF6i8y99ThqjC8wPvbzgelLYSCb/VGshBQtOua6PsIXvw0FOXNf1CaD3exETxLy6OAIuC1+9WQIpvPCV4ekndq3z4YR49ZyReUI86pcYjj22ZwLbTMeKzwXEo/wT27Bijf9B8p6vkexvpUH2DQkOdAbI8nDmRT/psI4DLaTjccnGiYSmE6vty94ozoEdD6DU4FXLmPbyL1VDiEGa3Q4guRYVNVv6OvpsictUVLEKJyv/Ke2bc8ry1wtiqihLwk8boyFPIE6G4kBroDikZ0bgGu6Fa8GUvk0/VTI4vDE+hT7U6w1Y1pyWQ8zVlwCBvdTawOm9YilRjkHQtDWd2J7QRvGw6Wohk4pAAbpARJd6V+g8gpmrg/SPyXKK/O6aC+qyqWeSDE+rMrzpWqZUSCk7xY29F6mMAfaTqnlA X-Microsoft-Antispam-Message-Info: vMF8jHot1NuNgfjKmYNeW5LbWpnSi5Pu2Sd28xV2O04RFm4HxLWJ3dPwFa0GkJNDhCeq/f1knEpMsfuO0qscgsvJ1Wx3hsJO0ksWGi49XisLTVSjsqlGUO0ONLn7/EFD5iL4bIzmqjszC/fRUBFQI1n3JTyFXZ+7Wj4wtLVaryoWETlzT4/LOqlxOcz9WnkC X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2635; 6:mopg7FLAeb04b3L6J4Eg4pQAXItMzVv6o68vwGomyZJ8/QrLvCTjljDAjtoo5+keNdIc1ZLDYqrBbpb2eJ9rU1NkfVxIur061n3MLIJQyoYt/CgbWgR67kE89X7xWDHEfhE9XKznARry70vcaE7a/sUQcCPzPQ9mHjvDZUIEtkCbZbkzTCi4aVeRaEeIDe/ltrvYQjdMl1cy7pEU3W0ob1B6z9BMuhX4wRpMpSNOgY8LCQT48r6LwZhrDKkxjCKxmwzgi941GpEfOp024t0ssIsAdVEzFfK2i8ltF0z61VE+NCC0xwfOr8Mm1YloLUbF5qflwBPIjfUo71EZTXFIlpNWNa24efvPGwbFPXUthe9XU5DHx4nS0sVdntCA/B/NW+lBmnzwHna5nXU2zpDdsXdSWX1WULlphRq9fOxsqBET7zMCYWsqbh//DUGBlSiOU5HheHIrJhvwq3qOIm/Biw==; 5:UvVQpFuPyh9VwjNSSTSREGG8rz5EL5ccTKg3HeIi/5OgFW9iLohJ70lw5LLxwq5cbSHBO1myjnN0u7+PxIyYzNB0mAJstuxjK1Mf/PipRf6Rc2p5t97GFdNZfkggUFX4YEWlT0ALbddwwpInWZ6ewO9jtxwdtTgXM9ye8ChKVUU=; 24:99gAIUzMIyflTRo3QJjJKweT/oW+6ZJNGJ8moaMxUGxVO7h+/341j3RgbHF4QvoTlE3ZiF0pqrPHZ6LPpCUWrT+Af1F7V/DU3DYmJNdZb38= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2635; 7:iPQ/ToXUDAQvFi1iTtXE5GflZYOe15q0dEENacAC4oZfdQXaS2rf015RMFQgPkgrZEmjKe0/yFwxYEv6I4ArIkQiEXh9f/GMzf8ry1wH4HKP+/h9z8JZTGI6Am0e2X+kZDr0b56iA2nJfTmBq2TNtwb1Lixv3KOSt71IOkHjQfOhUxQgtLAwRxhK/bOTKAQmcbTJCN1bD+F8xI/hj8HqL41lBGkR9X34Hd2TNPQCp+dadiLqyfEp/qm/+jkbYqrQ X-OriginatorOrg: synaptics.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Mar 2018 10:14:10.3625 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0ad48005-a4aa-4848-dfab-08d5955dd151 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335d1fbc-2124-4173-9863-17e7051a2a0e X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR03MB2635 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This is to prepare the suspend/resume improvement in next patch. The SW parts can be optimized out during resume. Signed-off-by: Jisheng Zhang Acked-by: Thomas Petazzoni --- drivers/net/ethernet/marvell/mvneta.c | 70 ++++++++++++++++++++++++++--------- 1 file changed, 53 insertions(+), 17 deletions(-) diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c index 30aab9bf77cc..4ec69bbd1eb4 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -2796,10 +2796,8 @@ static void mvneta_rx_reset(struct mvneta_port *pp) /* Rx/Tx queue initialization/cleanup methods */ -/* Create a specified RX queue */ -static int mvneta_rxq_init(struct mvneta_port *pp, - struct mvneta_rx_queue *rxq) - +static int mvneta_rxq_sw_init(struct mvneta_port *pp, + struct mvneta_rx_queue *rxq) { rxq->size = pp->rx_ring_size; @@ -2812,6 +2810,12 @@ static int mvneta_rxq_init(struct mvneta_port *pp, rxq->last_desc = rxq->size - 1; + return 0; +} + +static void mvneta_rxq_hw_init(struct mvneta_port *pp, + struct mvneta_rx_queue *rxq) +{ /* Set Rx descriptors queue starting address */ mvreg_write(pp, MVNETA_RXQ_BASE_ADDR_REG(rxq->id), rxq->descs_phys); mvreg_write(pp, MVNETA_RXQ_SIZE_REG(rxq->id), rxq->size); @@ -2835,6 +2839,20 @@ static int mvneta_rxq_init(struct mvneta_port *pp, mvneta_rxq_short_pool_set(pp, rxq); mvneta_rxq_non_occup_desc_add(pp, rxq, rxq->size); } +} + +/* Create a specified RX queue */ +static int mvneta_rxq_init(struct mvneta_port *pp, + struct mvneta_rx_queue *rxq) + +{ + int ret; + + ret = mvneta_rxq_sw_init(pp, rxq); + if (ret) + return ret; + + mvneta_rxq_hw_init(pp, rxq); return 0; } @@ -2857,9 +2875,8 @@ static void mvneta_rxq_deinit(struct mvneta_port *pp, rxq->descs_phys = 0; } -/* Create and initialize a tx queue */ -static int mvneta_txq_init(struct mvneta_port *pp, - struct mvneta_tx_queue *txq) +static int mvneta_txq_sw_init(struct mvneta_port *pp, + struct mvneta_tx_queue *txq) { int cpu; @@ -2872,7 +2889,6 @@ static int mvneta_txq_init(struct mvneta_port *pp, txq->tx_stop_threshold = txq->size - MVNETA_MAX_SKB_DESCS; txq->tx_wake_threshold = txq->tx_stop_threshold / 2; - /* Allocate memory for TX descriptors */ txq->descs = dma_alloc_coherent(pp->dev->dev.parent, txq->size * MVNETA_DESC_ALIGNED_SIZE, @@ -2882,14 +2898,6 @@ static int mvneta_txq_init(struct mvneta_port *pp, txq->last_desc = txq->size - 1; - /* Set maximum bandwidth for enabled TXQs */ - mvreg_write(pp, MVETH_TXQ_TOKEN_CFG_REG(txq->id), 0x03ffffff); - mvreg_write(pp, MVETH_TXQ_TOKEN_COUNT_REG(txq->id), 0x3fffffff); - - /* Set Tx descriptors queue starting address */ - mvreg_write(pp, MVNETA_TXQ_BASE_ADDR_REG(txq->id), txq->descs_phys); - mvreg_write(pp, MVNETA_TXQ_SIZE_REG(txq->id), txq->size); - txq->tx_skb = kmalloc_array(txq->size, sizeof(*txq->tx_skb), GFP_KERNEL); if (!txq->tx_skb) { @@ -2910,7 +2918,6 @@ static int mvneta_txq_init(struct mvneta_port *pp, txq->descs, txq->descs_phys); return -ENOMEM; } - mvneta_tx_done_pkts_coal_set(pp, txq, txq->done_pkts_coal); /* Setup XPS mapping */ if (txq_number > 1) @@ -2923,6 +2930,35 @@ static int mvneta_txq_init(struct mvneta_port *pp, return 0; } +static void mvneta_txq_hw_init(struct mvneta_port *pp, + struct mvneta_tx_queue *txq) +{ + /* Set maximum bandwidth for enabled TXQs */ + mvreg_write(pp, MVETH_TXQ_TOKEN_CFG_REG(txq->id), 0x03ffffff); + mvreg_write(pp, MVETH_TXQ_TOKEN_COUNT_REG(txq->id), 0x3fffffff); + + /* Set Tx descriptors queue starting address */ + mvreg_write(pp, MVNETA_TXQ_BASE_ADDR_REG(txq->id), txq->descs_phys); + mvreg_write(pp, MVNETA_TXQ_SIZE_REG(txq->id), txq->size); + + mvneta_tx_done_pkts_coal_set(pp, txq, txq->done_pkts_coal); +} + +/* Create and initialize a tx queue */ +static int mvneta_txq_init(struct mvneta_port *pp, + struct mvneta_tx_queue *txq) +{ + int ret; + + ret = mvneta_txq_sw_init(pp, txq); + if (ret < 0) + return ret; + + mvneta_txq_hw_init(pp, txq); + + return 0; +} + /* Free allocated resources when mvneta_txq_init() fails to allocate memory*/ static void mvneta_txq_deinit(struct mvneta_port *pp, struct mvneta_tx_queue *txq) From patchwork Thu Mar 29 10:15:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 892695 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=synaptics.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Synaptics.onmicrosoft.com header.i=@Synaptics.onmicrosoft.com header.b="QtwTn5rR"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Bgd52mv3z9ry1 for ; Thu, 29 Mar 2018 21:16:09 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752227AbeC2KP4 (ORCPT ); Thu, 29 Mar 2018 06:15:56 -0400 Received: from mail-co1nam03on0051.outbound.protection.outlook.com ([104.47.40.51]:27032 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751195AbeC2KPy (ORCPT ); Thu, 29 Mar 2018 06:15:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Synaptics.onmicrosoft.com; s=selector1-synaptics-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=2QoD0lBdjSsm0sQG6mjUwqgyyY2zWAaZsvgpo4uvM7Q=; b=QtwTn5rRcWbmcHOB6UZLec5ZUuoLwAxoVgROzh0NjpdhayWOGfng4uaxRF1JkxowsrGKWBcbYiznFgmrmr6Ki8Yr9y+Upv5+BjIEGsKY98zYNWmmJMpb25OCIqz6O47Wz5VN0WYCztWrB9vdPVziyc2VbMYpWMBvrEUa/Z+Oato= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Jisheng.Zhang@synaptics.com; Received: from xhacker.debian (124.74.246.114) by CY4PR03MB2630.namprd03.prod.outlook.com (2603:10b6:903:75::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.609.10; Thu, 29 Mar 2018 10:15:51 +0000 Date: Thu, 29 Mar 2018 18:15:36 +0800 From: Jisheng Zhang To: David Miller , Thomas Petazzoni Cc: netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] net: mvneta: improve suspend/resume Message-ID: <20180329181536.46e065d2@xhacker.debian> In-Reply-To: <20180329181220.61d63c92@xhacker.debian> References: <20180329181220.61d63c92@xhacker.debian> X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-Originating-IP: [124.74.246.114] X-ClientProxiedBy: TY1PR01CA0193.jpnprd01.prod.outlook.com (2603:1096:403::23) To CY4PR03MB2630.namprd03.prod.outlook.com (2603:10b6:903:75::9) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7359915d-8cc9-4302-72c9-08d5955e0d79 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:CY4PR03MB2630; X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2630; 3:YX1n4j95tSl6aIiebBVf5t8qLxrQ46b/SWu2JukzrE7QZn7W99vodPNK0Nx0UPb6Wgqa6c5uyCwoCJFs1WckrcLE/0JrAUSyoVXk/R9FqzNu/vCXCE1uf3agKh8ACmYK07CqmmCCKm3vzOZHC5VFFyH75kDFi40TfTJjwoufZSWeBj1YBNMhNL73P3XKJIDfQJ+DqDxZHUK8AwElZnsHu1UB/xkg4Tk55P3RlrIopwpmOoZp82wzNjbb5lFf1QaL; 25:UKco2QealuoAFqn0lPylEtq1lHUqgBFUjiJcwtzmCJPsmhR+7jBk+TYZmzj3+ufvP4BL0C+h/D76koXKnIrUvpRGCVy6h9WnbTYK2nfxlM4g9mMiaFMj+Vm89Okt7rHjhrEwOT1hcoXraA801A+VGuFpll/lkvMw2Jj+TVC86w9jaUiceboR6nhExseLsxJtILyql9+WHMmDV1BQrJkX0eLsdgrlv1lbRDF5a14l6vUxhH+47MT4Xtxa6vcscZ+aE2TVR10MKzGJh7VXmno56HXwz1fMTFpLBRmADfeMITJF4/qCc/djF1uQx0Ran45CkbFGfR38jApiVsETh8+Pwg==; 31:Z8Qx0LzMg0T0pAugwz9B0FJZws2yFPQm11FAQUZ4Bywg4pfCT09uA79e+wYUpMwyBjSKtT14uxsaDqVY08qlP5X3iMTyspd4ScNbI3W7VUpACLzljTnFnk/T2wW6y4AL6aefvFWiOhEGn9GO/lC91WPyWk8eGfz/m6LkSHrbK7NurMf5ntrJVp+kmg4poAzxjqvd6QfF4osOSHgwqyz5c1M4pns2n+tue1+JBUtE0jg= X-MS-TrafficTypeDiagnostic: CY4PR03MB2630: X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2630; 20:nfSjjE99DB0HgERWRSZheZdEv195HoDRsgvzH98eW6IUxYazG3MjnMmsdEmCMH8KEilgEYaZPZw//yazXAmHDaA3Lyh/yq5qLWdGS1oVLdVTiUl99gTf9tVJZxMIVK6lDV0G8u6mUnNjsAisr6DWaf0E0r0HP+Fj9V/KEnjH8pV0z1YqC2C4DoveGleYYELY5GxmlXiiBy5rouO1DkFyeXcB6AYlJ3cR45qwuO3dv+LEzKtfpcKxYKuVpaN4REOnnJPln+r9/Cq4+yR+eE3gcfj575PEbRThikXaabZ0BCz+taL8xByplJXTlkRgor2ydzL/Dh5h/E4WmQfMl6ORe04mkQvR+HZDazx8KEGeGwGrcVM2/e6ouzybpJRZe9H2Qpq+QB1gng30LlQXb/fWHTwZDMKMku4eAueD+WBTxL5IAbJ4JdHhpuwEiNtBJZt6y1Szmlh4NYN0SgQvNMYcUOwpbcp3reHZxR4DQvRjRmSjJYlmDFeo1Ov8YSyTwumf; 4:Cr8JKVrkJ0qEvoeId70PbyiR5QyL1IJgNP9Nh59Algh3snC8bDzORehHS5ZS21RBTQS4n0aeCoAbYDdQUZ2Ed/uFSGe7+UYjoRDkxuUHax3EMBzJ51+wKMG+AO4ph1kX6rXam/UzhJ2LzOXYA+kxis7RihVUy/aj0PK5PCS47dzgGNPUZgPvIvamov1VvHvadYJDL6fKMNK35wIUnzw5AIuY6mOn2I0mo6WByJmIjNd2AwjptyHjDwpILXzDxWd9T9u3066J+8nFJMXcqwxIvA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(8121501046)(5005006)(3231221)(944501327)(52105095)(3002001)(93006095)(93001095)(10201501046)(6041310)(20161123562045)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:CY4PR03MB2630; BCL:0; PCL:0; RULEID:; SRVR:CY4PR03MB2630; X-Forefront-PRVS: 0626C21B10 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(39380400002)(396003)(346002)(366004)(376002)(199004)(189003)(68736007)(105586002)(81166006)(52116002)(97736004)(5890100001)(6116002)(110136005)(7696005)(230700001)(3846002)(23726003)(476003)(6506007)(7736002)(81156014)(386003)(305945005)(50466002)(6666003)(956004)(11346002)(446003)(53936002)(1076002)(33896004)(16526019)(2906002)(9686003)(76176011)(59450400001)(4326008)(5660300001)(86362001)(106356001)(26005)(8676002)(8936002)(486005)(478600001)(486005)(47776003)(316002)(15650500001)(25786009)(50226002)(72206003)(66066001)(186003)(55016002)(39210200001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR03MB2630; H:xhacker.debian; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: synaptics.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2630; 23:6zbpkW1XWsb1dN16e5zr9q3stTW8dWLMztlA1NK4/asEpqiVkyKwtJXP0y0AUeAJ3ouOfgBQqfttllN0QXCySsoGsrqeCwolha2eDcHKHkZcOE1Ioow1JSN49Rsgvnq59T6KSXpL20fWX6hh5tMFt0puMsbZhktev9SwhdYHiSKQ1emozf0gA3xgfeh4uGUatgukYSmdTOw83gm82OA5GBn59I1X3f5zyt7VBKJ4FhTLHqJ+BOUuwXBQLgXAEndR8XnW5uLt8GW0QEHLz9DS0GJYnUT2bMQrpA1Bd+i04rR8nUM40R+zWqRmXOB0P4kXfz8vOBVKbb2oipV8TWcuPGtZkDPrMJ6bKjRYmwFP/PA1dVc9F4EVOoqnmmsv3rfyzWM41kqEs+5NcKIQ5i7IzpAiM+MnmsOGpR2+MbaH7d0aHjU+sAE9HjcHQgF7tj9w3MU2yJtsGg+dUJFUtdcxMkWmrFJJE2Bpws60M3yjWoyYxtiiXVUEZP1+hamy83NZ0nOpjYvMIL2e6cU80MROIZP9lCGgStdQ0bqN8nA66KRvq0K3EEaJzsPl2YXjSb6m44p4E2tK2ntww8JuBb5T6KR1ofXSc6mfziyX9MRwfWucIAmFOQaJFcHSs2QdeM7M4fl0oFXpPpn1tp8bU5/eM6Y4d4NG3sgz8MzrH7XMfJNAS47dBMGsKpsg7Ha/F9Kjn4iv7HGGiEXvOPvFdqeJHzemhCEg6qtbzDslgUIG9Xwjt4fbvjGMMHIDajWH49R7cuR4BKCzD7/5ftoZzGB4rVOXcWIaVJemltsxIxemAna2Xop/atOllLWpkZKMmPXPYv7hL/ylEp0UmchZ9LyJ+WIyS4XW4Br7XR2sqOD596tM36epLJThV/JcLMZIBvEkKT6uQK8IAkLhBiCPUakQ7y9SBjKi+Bxj+Kea4SM/e/bCyeoC+uoKt2rJXnzFm38wbqfuWBOIAw0YIx55ifr4IRXoLcDx88nhKUDC2QcodavFgE+Mw2Qf9ad+qX0kwiRmbjYd2Xzynx7mUROYnLqAtclEab5GatntoGf6Oy1nPRaSw1Q2yPS4VVZeP5e7DwHc/y9rshgcKMwQcnSgqYLVf8RvYgNXwakfPERXaTgDCw3Blg4tIldy2WyQPuVAK1tLv2GKBZ2M61HIoHBjIWNfgNEHlrVB/y+taYJrrZnrfCVd4evyTVNitCdggk7O91BBsq3fqk7HjZXlNJh6c1iRHwB/XV355PAUwqc7Dpj+jz6sAhilErFcazNvf369HMBLGYevmtxynGY4oXowLfcwxPJDzT+pDWcRzsF1nPsL/PmpFdokQMzB6wgnDNNKONts X-Microsoft-Antispam-Message-Info: KS6oDTaCtM6+ApcsV+FNuq7F8FL2ssbjWARUY5ZzT7gm4dizfrM6xFu3mCvtWkvrzUfNuZ0eYY3MrU/Jk72QLxQk9/smqhKj5HAmdCxQddd2WX+JXM4P543mmgc8esa3D+fbfv4vKIXU3hyz6f28X3NwUZ0jqgrKakU5+2QWCjGfRvEm7EkJzgVHEgZAiTnA X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2630; 6:cAC7IpQ9CwT33an8gGrGMKKPB/zBEmg6MqYGDRZG56/3gmGBvtyK0XRfX5MgN2C4nfG0e4uN9u1RhfCOteqBg9om1AqbTJmlE8BjDP5i3CF7CemfwYTA7w8VqdVGGvSKpgaqiZfy8cA94hV6gtqmghqDjuJjL2hT7EF7FNJroB5gDsgzVM97AoOwRkYVOGhx2v4VQju7qG60CAWmQHP580YtWR1OUMGxa9gVaH436qxUkwiKHyV66Yo404XfsGSEkfSL57uZzfRzs91nB9u9o38i55iseYlyDXSFa3b8ARr5B8tmIXyOakH9w/z9ApfpS3zYTfbr1kJ2B3wZ2VJsZpDktjIL4fNmoCIBVaAjBlFgMWZJ/XdgOO33vqXUScKUxCxQfETW115HhdfbpsK+LQwBX+uUWBRVxsWVXA/uYp6+mp4SnktAeVBYC6xJWMoz8xDr0j3+0Y9p9RbYpbsNXw==; 5:LYQ1mtK1blCURKNnCKVzmqOFxeoNGKrmhdfPKBD4m/mx488Tc2dN/bGX92owjN3aVS+KM2jpo0z8bZZeR/rumUwxxUJVdlf4V+Umbt8cebN/ZHLpOxktKmwT3hPWx37ItNBq7qLykJo5zTK7UdXiOb7wxqIyKfIpbNvsB9WIZuE=; 24:Xxp3+DSVOSNRqPrJtRFO15NXTOy/q8ZPr54T+cTwrj5qWmHY3peQoecKBKhnxxm28mo0TUlfWRtk6a6zVFjB8OCbod9aRu2OU5Tr1hLu5FM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2630; 7:/9vHh3rel8X0eeE9FuTat4QXblirWc+s7nMHCaFNRYw3rnR9JABsKQNA01Pweas/gULF56AJ12tEdRrlvopVvIpAC6udsLeiUVTuLik3RVyWRW/wVMPR2OprLR48tY6VXjwbFXoiY2l08LkTICVYV1f17bAjcyJOe4+nLkLjs9EIgKOl8XC1koNeJTH5JgmGTVWLUjd9NZcYji3ZYpt7eSOL8iNw4pUss27rW0DJWjDSAB/zdKxJfOLJ8Lg5K62m X-OriginatorOrg: synaptics.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Mar 2018 10:15:51.1601 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7359915d-8cc9-4302-72c9-08d5955e0d79 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335d1fbc-2124-4173-9863-17e7051a2a0e X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR03MB2630 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Current suspend/resume implementation reuses the mvneta_open() and mvneta_close(), but it could be optimized to take only necessary actions during suspend/resume. One obvious problem of current implementation is: after hundreds of system suspend/resume cycles, the resume of mvneta could fail due to fragmented dma coherent memory. After this patch, the non-necessary memory alloc/free is optimized out. Signed-off-by: Jisheng Zhang --- drivers/net/ethernet/marvell/mvneta.c | 76 ++++++++++++++++++++++++++++++----- 1 file changed, 66 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c index 4ec69bbd1eb4..1870f1dd7093 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -4575,14 +4575,46 @@ static int mvneta_remove(struct platform_device *pdev) #ifdef CONFIG_PM_SLEEP static int mvneta_suspend(struct device *device) { + int queue; struct net_device *dev = dev_get_drvdata(device); struct mvneta_port *pp = netdev_priv(dev); - rtnl_lock(); - if (netif_running(dev)) - mvneta_stop(dev); - rtnl_unlock(); + if (!netif_running(dev)) + return 0; + netif_device_detach(dev); + + mvneta_stop_dev(pp); + + if (!pp->neta_armada3700) { + spin_lock(&pp->lock); + pp->is_stopped = true; + spin_unlock(&pp->lock); + + cpuhp_state_remove_instance_nocalls(online_hpstate, + &pp->node_online); + cpuhp_state_remove_instance_nocalls(CPUHP_NET_MVNETA_DEAD, + &pp->node_dead); + } + + for (queue = 0; queue < rxq_number; queue++) { + struct mvneta_rx_queue *rxq = &pp->rxqs[queue]; + + mvneta_rxq_drop_pkts(pp, rxq); + } + + for (queue = 0; queue < txq_number; queue++) { + struct mvneta_tx_queue *txq = &pp->txqs[queue]; + + /* Set minimum bandwidth for disabled TXQs */ + mvreg_write(pp, MVETH_TXQ_TOKEN_CFG_REG(txq->id), 0); + mvreg_write(pp, MVETH_TXQ_TOKEN_COUNT_REG(txq->id), 0); + + /* Set Tx descriptors queue starting address and size */ + mvreg_write(pp, MVNETA_TXQ_BASE_ADDR_REG(txq->id), 0); + mvreg_write(pp, MVNETA_TXQ_SIZE_REG(txq->id), 0); + } + clk_disable_unprepare(pp->clk_bus); clk_disable_unprepare(pp->clk); return 0; @@ -4593,7 +4625,7 @@ static int mvneta_resume(struct device *device) struct platform_device *pdev = to_platform_device(device); struct net_device *dev = dev_get_drvdata(device); struct mvneta_port *pp = netdev_priv(dev); - int err; + int err, queue; clk_prepare_enable(pp->clk); if (!IS_ERR(pp->clk_bus)) @@ -4614,13 +4646,37 @@ static int mvneta_resume(struct device *device) return err; } + if (!netif_running(dev)) + return 0; + netif_device_attach(dev); - rtnl_lock(); - if (netif_running(dev)) { - mvneta_open(dev); - mvneta_set_rx_mode(dev); + + for (queue = 0; queue < rxq_number; queue++) { + struct mvneta_rx_queue *rxq = &pp->rxqs[queue]; + + rxq->next_desc_to_proc = 0; + mvneta_rxq_hw_init(pp, rxq); } - rtnl_unlock(); + + for (queue = 0; queue < txq_number; queue++) { + struct mvneta_tx_queue *txq = &pp->txqs[queue]; + + txq->next_desc_to_proc = 0; + mvneta_txq_hw_init(pp, txq); + } + + if (!pp->neta_armada3700) { + spin_lock(&pp->lock); + pp->is_stopped = false; + spin_unlock(&pp->lock); + cpuhp_state_add_instance_nocalls(online_hpstate, + &pp->node_online); + cpuhp_state_add_instance_nocalls(CPUHP_NET_MVNETA_DEAD, + &pp->node_dead); + } + + mvneta_set_rx_mode(dev); + mvneta_start_dev(pp); return 0; }