From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751751AbdJ0OMH (ORCPT ); Fri, 27 Oct 2017 10:12:07 -0400 Received: from mail-bl2nam02on0083.outbound.protection.outlook.com ([104.47.38.83]:10942 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751393AbdJ0OMB (ORCPT ); Fri, 27 Oct 2017 10:12:01 -0400 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; driverdev.osuosl.org; dkim=none (message not signed) header.d=none;driverdev.osuosl.org; dmarc=fail action=none header.from=nxp.com; From: Bogdan Purcareata To: , , , Subject: [PATCH 2/5] staging: fsl-dpaa2/eth: Split function Date: Fri, 27 Oct 2017 14:11:33 +0000 Message-ID: <1509113496-10810-3-git-send-email-bogdan.purcareata@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1509113496-10810-1-git-send-email-bogdan.purcareata@nxp.com> References: <1509113496-10810-1-git-send-email-bogdan.purcareata@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131535871193361092;(91ab9b29-cfa4-454e-5278-08d120cd25b8);() X-Forefront-Antispam-Report: CIP:192.88.168.50;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(336005)(7966004)(346002)(39380400002)(39860400002)(376002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(81166006)(356003)(8676002)(81156014)(8936002)(305945005)(76176999)(104016004)(2906002)(5003940100001)(36756003)(50986999)(53936002)(50466002)(189998001)(48376002)(16586007)(50226002)(106466001)(6666003)(105606002)(2201001)(316002)(86362001)(97736004)(68736007)(33646002)(2950100002)(49486002)(498600001)(110136005)(5660300001)(77096006)(85426001)(47776003)(8656006);DIR:OUT;SFP:1101;SCL:1;SRVR:DM5PR03MB2699;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11FD024;1:t7wpsLk9eE3+H/vJOJgDPh+UfQtKNLbUumTxntaZVD72T5/vOnVtfth5zg6dE0MUNRMI81fyEFD8DQhYUwRScmaplB3H+1fVSMos1zd7bxSJPGIsKTiVpqEiRRv5Ttf8 MIME-Version: 1.0 Content-Type: text/plain X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6ccc6511-669a-4838-4963-08d51d44b028 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(4534020)(4628075)(201703131517081)(2017052603199);SRVR:DM5PR03MB2699; X-Microsoft-Exchange-Diagnostics: 1;DM5PR03MB2699;3:v7nPR1d6Q3Se9D53EoTgyAc5CXbhB9FfUh19ZcjwnjBbFTU4EDiL69THdrR9X0CsjWwgJ/P952czyiiXQ+8OV8w3DSdtngvRlJQKxZ1CS/uoscAUUgeBZMC8DjozQrPRdQw52ELRrDG0kDToWnEZQZR29IM+JMjMv2v60kLhgvf1jrVs9zfDCC0mcpWZh1eeaWljyBRRSo0Tgm/EScDP8dANYuBBtoTZlOEzOKHNo++W+jYAHNwg2OnvUnW+cQIk4ocgPg2ySCZydFe6CKu7dgcFTcvT9sn7Q1IfT2Zv8UvV46YLfjI9E6Ml++AlLbZ2D6+gTkJbtBuIsToksMFqmj3shpi1rK1iBQ6Nb9cqlSw=;25:pjtJbS3NztSgiREmb8hjnEbCHh3/MR1QEqfgBeGHFGGbjyVuYRPrVJz2dRVph/tO+lbCkfHREAPe4aMsdzFhB/9TO75cnsO9cKLstj3C/bmMZuU3aQvxdiMvYdk0hXTS6yQPGjGeVF8uAp+iiU2DsETK0a1JCENsgdvNfJmQAPvVDnFpCfr99FPBsclTug63GuIgZ2DJOXqjxooqJl1RYCkYj2ifoyHhNl9JnIPO3LcCxb8nKfess9v3PMqPuI90WTEFDRlNIz9j/Fa2bHEXPXfXedHUyApWRaUgI+XoCZBUH77Rvs2qg6DFyYO+2IUcC1JapogOIFarRY8EhupKRQ== X-MS-TrafficTypeDiagnostic: DM5PR03MB2699: X-Microsoft-Exchange-Diagnostics: 1;DM5PR03MB2699;31:u7W7nKM+x4q6mXBE/rOqC/yzjjIo07M2s6wrYcjE+QK8AH3qe6ZuSncwk9zTmXhvjJjb4nkPFHsRrfQYdT1ZqzyOP51nUePp9Z/TycY4ZxVOD70eMJajvFLPasJcZY2fzWt6eQlHopxxLVL4HRux1Tb5IMyKqR2Cef67OiTmMrj27FNRKmJ+jD6U/0a4SnQoHHB6GZAIFBZuZ2/I6DqaLHqp8wCuIK5WRlaB8TiSrHw=;4:tywZ3rq63LgwYjZ7rTHEGaw8zALgXgj828TQRmcznH46dsxt/PbQqrjIRiHv1Xni9zPZKINLYMT3Po3Pd9ONly7JgePVw9T3EEZRGtQVvtBc/wOPpu1MypktmYCYjgdMN7GU7HK3GW38KgzZHFfQsqQ4sTZd7C52XCMQ5vDz5ZktqVyJlBob7gSUYOm39u7d2r4/aCGpObtqrhGS0gMOFApl6dSoecsh6OM9x1hruDRWNsf2+iwBf/zbGYZfePq54YWvnBzXL+e4MbmQ+ejdFh8vdWEYnwem302JtixM9lE= X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(100000703101)(100105400095)(3231020)(10201501046)(6055026)(6096035)(201703131430075)(201703131433075)(201703131441075)(201703131448075)(201703161259150)(20161123559100)(20161123563025)(20161123556025)(20161123561025)(20161123565025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:DM5PR03MB2699;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:DM5PR03MB2699; X-Forefront-PRVS: 0473A03F3F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DM5PR03MB2699;23:kLBHFt6a1eJdAjlZWfsWM4K+ItagfCYedMFs5Nw1e?= =?us-ascii?Q?V8pHrocydeXii09wHyP1y3GpYbl+6mrNiecOVB7HuFPQRfgEwOuPDNldoiV2?= =?us-ascii?Q?tnW8AuDSxWOe4JgS/xjB/YpTqvKJNURyAD9Pc4OLSQztoAbulQV975rkG22k?= =?us-ascii?Q?lmf/WYYwencU++C7pnZuESkCVlrlvmhbCzXmvhqpJwugR6uTe5VYhNRG6mb5?= =?us-ascii?Q?HbT7pic8CeOTQcnHFcLsCEuW97MHdWOHrIbo+tvMuazitpQhviG+ha3hN63x?= =?us-ascii?Q?JBMA1VsZegqp+0msYmS5XJLsf0MerNV60zusHcgS0g+Ing2eUoVc1w9j2emY?= =?us-ascii?Q?NmKluUw+7Y+cMhtRxfsIRBWWhmJ792Uja5S7Le4yB6idAC3CRlOu3dDln6m9?= =?us-ascii?Q?q5oM13IT3B6INLsKgwHpSIg7GLMh23O7ajwaDwTuqW/DI5mans/SKoz/zkg1?= =?us-ascii?Q?hGnSQhvnw0lOiv2I/rJ+muhmdHzoBPaPDwbyTHuchMy0zgFhr86C6FIQPw6B?= =?us-ascii?Q?V0UYVebSARnBC0pG/Dd+EI5v9IZa00+ihGvNncp4/qqxVAk0KRqYo6GKWHsj?= =?us-ascii?Q?Iz+WH+zQPYBy0oSmLWxVeNtoaAJpDdVf5YwKm0/6SzpSXCop9ObgBQyCUWAV?= =?us-ascii?Q?kMKm5NjZSBZJUbNsXwlNR0hZPjcGu+Qr2nz/ByZeywmjIR9x588zl3eie2k5?= =?us-ascii?Q?sBgY/SBG4HSJqZ/xI9pC+H2T/kotsTSf8sjnCKhgYD0rEEzuBSBvD3v4o/3L?= =?us-ascii?Q?ED2oBVyulE+zxHFkHiiaQpAr+lBeKLb8bgJW8Gf5WURFsJmDe8Y1GBTAAhjB?= =?us-ascii?Q?IOx/Z2WGWQJHLV847hjVMTWEZTKe3w823FdpCFJFc/0EtFq/whRIoPmGP7W1?= =?us-ascii?Q?quZbXGtau4ahnUQLdppVXGg0vFrW4R0xZv7bhxY0ERvbr9MZC/Zf/Da1HFS7?= =?us-ascii?Q?HTj944azwCXY/tGELY9kYVl/0rJ7A2UfLLYKk2GMDJddkv8QrLhJY4I8t7hS?= =?us-ascii?Q?ywAuF1Vm03LRw8SAQl62IQD+j6BVpg9oQaMOtJw5uqW9F2OVgCVogelZ9k8X?= =?us-ascii?Q?z+10NQtyaIzv3MNx8HmNhi/WnVQrqmIogPedXM25gdAjeUaWQ5+WN6PT3/ii?= =?us-ascii?Q?iwt4JR4XKspGJgKwIFInT7atKEatzJeHa597xM/AgCYZc9/OcuvPQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;DM5PR03MB2699;6:frH3z4U7gLQJHIocTVvVRIIBpP9VW7y6Mi7rkIOmmr4bJfexGxc5tCLc21xOrULxVuYPwswCC6ppVhV6L+wE6gBNoQZvNlibAbtQTZMKzA1GfXQ/dqup+p0h1piaq+2zgsKUdX6p/VeDooKlZXhieDUBzw8tU9qV/wFh4raNwVPkjmL2SfSr4g0a7Ety2ekH/ENefUZ24/VpwXMHcQYtVmaL8um44pEXbLgRaVVzRWrjXYf/rsTRciGVlGYTEvbdSYO+w0ax5e88xm9N4Me9y1z40kYlpbjiCliDxkzhReRffGzRHMpgjElDZtkEhw2zGsZtEIlXeCnklfyG8F4wZw==;5:NMi0uAlsc7c3sSzDWZ/NGb5/AhQcjiOiNprmHh8q2EcseMGUoriw92MH89C7pJoXtwdipo6WNg7u87SwkVG3ioq/pnJ1UriZq96jpRYH+3Jq+3OFtAV8LnsxpI2Er4g2jee/vlcvAhxxje61hm5AIg==;24:AK8PmYvzkIQHluaVgsTsdXSJYREo3oJR9CHsu/l9WveQT9F2aIguYTzb1t2l4p9Izt+hLyK80J4PEoRG0WHVtWsb94U37Yvl9utN0npFrL8=;7:icAFl/CcHH6LGST27HfCoa69C7RjvUQadgV204N+b8j23Kh57kDc8Js6tlWOaDsmeknLWN6dBscvgvGrmFQCkoqo4X41P+Tzz1mWEVJd6j4LuY5kFgwMdLVL+XW4BHWMnOdR8U//kfgfxuUCkI3umRPjgehacC4A+x/Ne9a39Yf/K83C2BaqEX0MnPb2vrcQjBDy+u7ScEHt2jkhCX3W7oIPEyfqeC6RtFVLwXLnR6s= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Oct 2017 14:11:59.1333 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6ccc6511-669a-4838-4963-08d51d44b028 X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e;Ip=[192.88.168.50];Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR03MB2699 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ioana Radulescu Since setup_dpni() became a bit too long, move the buffer layout configuration to a separate function. Signed-off-by: Ioana Radulescu Signed-off-by: Bogdan Purcareata --- drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c | 79 +++++++++++++++----------- 1 file changed, 45 insertions(+), 34 deletions(-) diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c index 5d2bd18..92faaaf 100644 --- a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c +++ b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c @@ -1776,42 +1776,12 @@ static void free_dpbp(struct dpaa2_eth_priv *priv) fsl_mc_object_free(priv->dpbp_dev); } -/* Configure the DPNI object this interface is associated with */ -static int setup_dpni(struct fsl_mc_device *ls_dev) +static int set_buffer_layout(struct dpaa2_eth_priv *priv) { - struct device *dev = &ls_dev->dev; - struct dpaa2_eth_priv *priv; - struct net_device *net_dev; + struct device *dev = priv->net_dev->dev.parent; struct dpni_buffer_layout buf_layout = {0}; int err; - net_dev = dev_get_drvdata(dev); - priv = netdev_priv(net_dev); - - /* get a handle for the DPNI object */ - err = dpni_open(priv->mc_io, 0, ls_dev->obj_desc.id, &priv->mc_token); - if (err) { - dev_err(dev, "dpni_open() failed\n"); - return err; - } - - ls_dev->mc_io = priv->mc_io; - ls_dev->mc_handle = priv->mc_token; - - err = dpni_reset(priv->mc_io, 0, priv->mc_token); - if (err) { - dev_err(dev, "dpni_reset() failed\n"); - goto close; - } - - err = dpni_get_attributes(priv->mc_io, 0, priv->mc_token, - &priv->dpni_attrs); - if (err) { - dev_err(dev, "dpni_get_attributes() failed (err=%d)\n", err); - goto close; - } - - /* Configure buffer layouts */ /* rx buffer */ buf_layout.pass_parser_result = true; buf_layout.pass_frame_status = true; @@ -1825,7 +1795,7 @@ static int setup_dpni(struct fsl_mc_device *ls_dev) DPNI_QUEUE_RX, &buf_layout); if (err) { dev_err(dev, "dpni_set_buffer_layout(RX) failed\n"); - goto close; + return err; } /* tx buffer */ @@ -1835,7 +1805,7 @@ static int setup_dpni(struct fsl_mc_device *ls_dev) DPNI_QUEUE_TX, &buf_layout); if (err) { dev_err(dev, "dpni_set_buffer_layout(TX) failed\n"); - goto close; + return err; } /* tx-confirm buffer */ @@ -1844,9 +1814,50 @@ static int setup_dpni(struct fsl_mc_device *ls_dev) DPNI_QUEUE_TX_CONFIRM, &buf_layout); if (err) { dev_err(dev, "dpni_set_buffer_layout(TX_CONF) failed\n"); + return err; + } + + return 0; +} + +/* Configure the DPNI object this interface is associated with */ +static int setup_dpni(struct fsl_mc_device *ls_dev) +{ + struct device *dev = &ls_dev->dev; + struct dpaa2_eth_priv *priv; + struct net_device *net_dev; + int err; + + net_dev = dev_get_drvdata(dev); + priv = netdev_priv(net_dev); + + /* get a handle for the DPNI object */ + err = dpni_open(priv->mc_io, 0, ls_dev->obj_desc.id, &priv->mc_token); + if (err) { + dev_err(dev, "dpni_open() failed\n"); + return err; + } + + ls_dev->mc_io = priv->mc_io; + ls_dev->mc_handle = priv->mc_token; + + err = dpni_reset(priv->mc_io, 0, priv->mc_token); + if (err) { + dev_err(dev, "dpni_reset() failed\n"); goto close; } + err = dpni_get_attributes(priv->mc_io, 0, priv->mc_token, + &priv->dpni_attrs); + if (err) { + dev_err(dev, "dpni_get_attributes() failed (err=%d)\n", err); + goto close; + } + + err = set_buffer_layout(priv); + if (err) + goto close; + /* Now that we've set our tx buffer layout, retrieve the minimum * required tx data offset. */ -- 2.7.4