Message ID | 1491909188-8971-4-git-send-email-fugang.duan@nxp.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show
Return-Path: <netdev-owner@vger.kernel.org> X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3w2PcF0bQPz9sCZ for <patchwork-incoming@ozlabs.org>; Tue, 11 Apr 2017 21:15:41 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754716AbdDKLPj (ORCPT <rfc822;patchwork-incoming@ozlabs.org>); Tue, 11 Apr 2017 07:15:39 -0400 Received: from mail-bn3nam01on0041.outbound.protection.outlook.com ([104.47.33.41]:61643 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754637AbdDKLPe (ORCPT <rfc822;netdev@vger.kernel.org>); Tue, 11 Apr 2017 07:15:34 -0400 Received: from BN3PR0301CA0079.namprd03.prod.outlook.com (10.160.152.175) by CO2PR03MB2277.namprd03.prod.outlook.com (10.166.92.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1019.17; Tue, 11 Apr 2017 11:15:20 +0000 Received: from BL2FFO11FD045.protection.gbl (2a01:111:f400:7c09::123) by BN3PR0301CA0079.outlook.office365.com (2a01:111:e400:401e::47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1019.17 via Frontend Transport; Tue, 11 Apr 2017 11:15:20 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BL2FFO11FD045.mail.protection.outlook.com (10.173.161.207) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1019.14 via Frontend Transport; Tue, 11 Apr 2017 11:15:20 +0000 Received: from b54642-OptiPlex-3020.ap.freescale.net (b54642-OptiPlex-3020.ap.freescale.net [10.192.242.47]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id v3BBF8NE001129; Tue, 11 Apr 2017 04:15:18 -0700 From: Fugang Duan <fugang.duan@nxp.com> To: <davem@davemloft.net> CC: <netdev@vger.kernel.org>, <bhutchings@solarflare.com>, <stephen@networkplumber.org>, <fugang.duan@nxp.com> Subject: [PATCH net-next 3/6] net: fec: pass ->dev to dma_alloc__coherent() API Date: Tue, 11 Apr 2017 19:13:05 +0800 Message-ID: <1491909188-8971-4-git-send-email-fugang.duan@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1491909188-8971-1-git-send-email-fugang.duan@nxp.com> References: <1491909188-8971-1-git-send-email-fugang.duan@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131363829206165191; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(39840400002)(39860400002)(39850400002)(39380400002)(39410400002)(39450400003)(39400400002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(9170700003)(8936002)(356003)(8656002)(8676002)(5660300001)(189998001)(6666003)(6916009)(110136004)(53936002)(38730400002)(47776003)(2950100002)(50226002)(85426001)(54906002)(97736004)(81166006)(86362001)(2351001)(76176999)(50986999)(105606002)(36756003)(106466001)(305945005)(104016004)(4326008)(2906002)(77096006)(48376002)(50466002)(5003940100001)(33646002); DIR:OUT; SFP:1101; SCL:1; SRVR:CO2PR03MB2277; H:az84smr01.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; A:1; MX:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD045; 1:bNhfxfp5zeFv8MKkxCnQb9s/nWdW9o8zIZ72MYkZgo06xkWw6pJ+sIY+OgGvN5REj/uhvo3S/V37tj1YseZepgT11ZylH144U4Oe+Vnc2NF3pmmK7VKRk2T6sqh32NJEaQIbETabTgrtrfJIyFi8As4bQ5dXBVilf/4X0AkymLoPFaqsB46TLEznWeupZHzntKURX93y9DFBSCvPlF/mQSicLs+DqdZJggyWZ509FrM7fPMsE/7wh4S/geRof2CK0Sk+LmwLTVZdTMv2I90paGrtLkvzFSlkyQZ2O/wq/LjbdPkkAqNe+y67d6kyVF+BPnA3vJ69ABCYNQ/tYfG+g6w1XjTIBsGZVcghM8gIJzIhV3pkpElJW4TI/jaRKTphLZVpmz0lT5uCXu/jDfgycDX2m8UpFWEyy7en+zIEVcXdcwk/3pVo76SDVeWl84YwBdpkTnjF7Td5OqYx2CA1vdgh++1+bDocvBA+zyNbuVr2je7cnVJ1s9MxLEncPnBsGb2/4eTO2P3Jnpz5ieCnetCLBhrBsdCg9ARwk0CdZhtD8LMqP6BuhvNfRImPDLUbA6XW/N13l611jbkjv5ad96/dYsiXqIhxtjHtyCMkA3rgCROxkq9Nb2JomLxC6oNwU7A3xPdnDYZjxM329UaD/DBXBieai2aDd82esn4GIZCvK3V9mVluU6C+I1nuBOb/PegBR24409kVr40NbuTPL8X5kD7ik7dfmdhjzcUce6E= MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: d3f5d819-3f5e-4193-c569-08d480cc0a9f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030255120)(201703131430075)(201703131517081); SRVR:CO2PR03MB2277; X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2277; 3:1Bh8liP3HAhOyBZsnOHv3pudlAocZS4QBDDMAJ7+Q4oTlePmWxsxgywF5OIgqfF4vwPQpV8eNLCAb9MzheKQNBYZc6e/yCncP31xgMbtdx2XAq+Fozt2sa3nxvzZFzrP/4C4KMsH8BlYXb+IakmaMwgqP/Pt49EYiOgqGyRU57oPfylDHknTr8/W8/6cgf9UViwCPpR9u19yZvD7QrF2DmJKr2MdJQbaR1CcOaRBgoFLlLJ6HQqDfeJmYIpX+xD4GU/n9WWzZww/O9LPK2m1XFJ8MbjmJiXPpwbQ8CPcCRhVdLFBxNyPXO+muncE+z9NLxLpq8duMA93vOjdhHskXg62bBIBU5N5pZCpwLgxZapZg1KiZZa/TzfzTSs6mlIgY9UUvZjb5NcCO53JU6N+fBVVCE1qeOaiD0mdtzmDZPXlbTQbeDoFc8RtI0p1ONe6sQ3WbV9C5u3IsJ2hn9xblw==; 25:0h+IPN0xG8oDrOF2wm7MQ89jqC7h77BAbgN4C4ziSqJ0IG+gIsGRttCAGnNc5YUMcTUKvd2qhTMKSOH52JN+4qOOw/H9m5QsGrtbU4tf70u/XH5xYk2qIi3U+PU7aKyTpdh43CIRRdCoT4IuhxgPWe1uLJOY/TKkcXa9vjUbWU9+/4y5gG9nTpgR78sqyk+Rxz5Ke/sCzQhjsIwg/zzllMGRChSFTBg8ivK1j7CDJiYfAHnp2iwij62b8qSqe4owfkhmMaQIM7GoqNq9PTu1E8Y4k+Q974N1l8GIGXjc1PWR7cza/0fyv1qrmYLkG4U6V1wLOd96i868EtwIlsVtS6H4hjsS9fqlbRc0u059tMmzcz1VGb4R40rTGumL0xKSrPuWN03AEzFQ26CVw6W9gy7cnGa+1zMpxkC6SO2Rrh/fVcmVgCTrhFEudNkMP3CILeQoZLW0GdwIS2fNq6jszw== X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2277; 31:3QLL8a0ByzhPIbL3uXjBFntS/Swr65KIwPNae1SU8dlaaZG7JSJz0CKsRe63kQ5CgsZHNh9Uqm+CrnSzmuR3+GYlqcYRwZzBKjX2elQ/XnC3SyQyCa31m7oP0at2RZ/OXGBFSzncSgP+rlkuFT8v7xxCRr1QIXRLW1TgshjIwIOntI4GKfR5rAt9gYeH/lCSChXNLfIs+1tlcX9TfBoCPI75MdhOuLuwIuA9vzZP4vtgsGcoxoG5FQQA/YntDjNsdjEQQKGgJ/t04XVyzB3dQQ== X-Microsoft-Antispam-PRVS: <CO2PR03MB2277E6040324B16AEAE419EFFF000@CO2PR03MB2277.namprd03.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(601004)(2401047)(13017025)(13018025)(13024025)(13023025)(13015025)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3002001)(6055026)(6096035)(20161123565025)(20161123561025)(20161123556025)(20161123563025)(201703131430075)(201703131448075)(201703131433075)(201703161259108); SRVR:CO2PR03MB2277; BCL:0; PCL:0; RULEID:(400006); SRVR:CO2PR03MB2277; X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2277; 4:8Dpv8t4O5YNNZVPTUAqCCEK8NYnKSJo6Ga624UwxuemPyIJomBvrvRmRfMoiBbgVCPPoQbY+bvHkep/PtFoP69AO4GmEicdBjGAGv5WHW4IMKpK9bhnWU9p7vON0u2LdkNZjkjuVVse1BpVfeBknicrwOjEhCF9Gq9wOdm1tgtvC4kIhlE25a7PwgkHx72TTnEU4LZr8qdiW71uYyrI1n+RKsqFNLETPDqUv4+YinzwWJXFX6vcjgMl8oU/SU84n2ZZFIum5EKU3aLjbRg4eYTn8+38nPh1AjaNy7CeKO34Infpxae1F6LvCSlP3p24fc6ytiTMNiUehWE40FUvNWrRc2by3tJ/ko8rAQOrWPaAWZB4UT8JNzogfx7+B5MFgXsHoNK1t/wPVbDKehlQIfAECuJjp6yiOHXDQ9XJF3rL3/kbYUn0J3iSMlPllSk1llnDqxG/tfJtNByLSAB1t+PTrpZIArXtNHHMY+b9QPLozr3LDFzVavYNvqdIuik/CsAJ+UdpnqEY+RzFfKD6Y5DPl5Viy+MqzRBg56T4dIqTNux/3FSAU3zGBhOGR4rix8i8V3kItdQfysPa537+lidPpbQlpMRHVH/oM0pSBOejG4uTM1Hlhkra+Dsctoylw0PX7p054qypSUbnGWRj6zjqayIJVIjamtIXRbxKiB0otHLVucxYKo3Mhi4ju5j+7NxXHzSHPC6ocsZmh3aKlGD92g8h7mTfAyTpsb/52ONquyAZ7VQn+oEvtwO+XrB+G4UYcxd18uOjJXDs3Wvr++KAGeW2fHgXZ4BQ0UIAdEQFgPqVKEfc/M1oNPd1PAxVZ8ktVq5rt7d+TtGfGWJaRj4fApuciIs5vWnpR83fv0fh/B0JqtVDz/sG0MednBsZkmYLRIzbzF6cUx0qAunrtWA== X-Forefront-PRVS: 0274272F87 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CO2PR03MB2277; 23:5kntyFxonVm8uzlHeCocbqx1JX9LqtsZg6wrVqUrP?= =?us-ascii?Q?r+3cOeCXOpKufnW3jJ0WPBOFV3574G/vY++gua0KzFmprPK/MDuys5guOzsE?= =?us-ascii?Q?35RIRxo+5a1sl6IuAgJQPlyIMMBpA7N0A75dJLaqEPaQzkoxw0V9EC1PPV+y?= =?us-ascii?Q?aPj3awkcp+LcBaEpi2+tiODzYFgwYHSc5Q2A1ZGy7Y0pjus9WEGCRiUACajQ?= =?us-ascii?Q?i1N5lv92/dJYQnIbSILMQXaw4fvbHylEyC1tqyM375vLqtYzR/z4Kdk1XeJz?= =?us-ascii?Q?LCkt8WQR96lbVOyf72FxA/z7TBFOSp4dTYwp/nDM82Y3CngaSXEtG8sAnc7H?= =?us-ascii?Q?1kMDq0rXBa+9KV5WnNra8Q76Dr+lezkvO2kpB2TstoeveZ7eFBi44o/J3izj?= =?us-ascii?Q?bt4KvJp0XKFvzRLmG1E0R3GMI7c/GRwsZborwNK6YjL2kzPyFzAGZ7HOLm/H?= =?us-ascii?Q?EuwkbYREvWmiFtHlH4q+jUuuqNonuanuQZWbI6X+DSAiRj6aCjvNegwPho/N?= =?us-ascii?Q?BRukl7ze5LNY+5tqNTkNyJH+P1a+BWbyCpaO0n6vF7l5Q381l3T80s+cRXCO?= =?us-ascii?Q?vTru6KQHGk4iBll3MLJjupsoQ6V36OXBTgj2f8g+cW9HAveZOb8VrJlvLO/3?= =?us-ascii?Q?lMSyIsNdfijPJoN4qVmlhYPIRnNdT+3k4CMtRgqKGzM/46HPtPkgSdEYAU73?= =?us-ascii?Q?Lw0g22XNhxqML0dVXq9HFqx73LCDGgorbx857IV1NwagrKwdoKR2/RhzD7TF?= =?us-ascii?Q?L+R5Yn0UnYzr73eOv7zSKIckzcDRDKXAMPr0ilbEOg78pHzgVYVEfjW3vfuw?= =?us-ascii?Q?DDSpNsfh1QUJX/5e5Wyc4UZB4UN49DEtKyJeRjO5OOg5BokL8iSEWydBJHRt?= =?us-ascii?Q?W0sCekRWlVsCHMtsJTvapEh5pPrXzHERggN+MyTlHGBEMTh2Lfry7c357GO6?= =?us-ascii?Q?87RcDeB5gKsAxqJ3IpPGd455ppOmW1SFDOkw6LSEHU54AU3tB+V36dM45LGi?= =?us-ascii?Q?fv8UiElumKf8jaHcFBOiazlFeOkmTnt5R8YPJnoIDon3HJmCOvnQCwpxaf0e?= =?us-ascii?Q?q/8XaWyg2erzvj3s8Iq1wpZjG9w3RGUb6dZPkpr5kDKum3ivzsHhYXBPUWyq?= =?us-ascii?Q?yU9fjSIlAaRTM1g+gChcjDsqX5qg2MWu3j4NuqplpwkY+gHE6caQrc1SzivV?= =?us-ascii?Q?aPOgql7aIapRubUuIHmby/OZznSCPna479VMuStltEif3yW5QpXs4/+BA=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2277; 6:R8owdrZ4b6bNmPfTEEa/u3jRzznFAq5W8lAyM/oyIM4MEYG3Uowsxkgu/s8gs79/TS250soj8smOOSiGTL77aSN6hY30QhsKfDDV2F6/VZ7dPVU8Ct1XfE69pP9yib7eUUoCNders56P+9cT3W8HBHVGtXNPGFRiz1X0QLHGmdwg9naYvCgKzp/SGmOy0mD84fJwyqfoq5OYfqiGs4DvACVrny/RPFp/6Pxj1LoLd7UwTeZIH1pD/Y9AWjVkHFGIq3PIljsM4LmxF1Ad3NCo9ziafiA6MbmmKmjspnuxvMBkBl915pDT+VinVoqyEHa8iP0ev03ySbCspnPAglSKsFRVizcxyoMYwB9F2xkG7wo4Mu4pQstoCvR94qzFsP/OidSi3XLRGQLDwoIUd9anD4MAiqIUbFOsBop5J0J9Rcyao7WkwAjWGSnu6abOCkwkgk4nVETSzf7xjFt3qMx8+w==; 5:0s12h69L2doQ4FuKpljlePDTLIPgC4N0HkPJddYmkhckcKLLQrLVUFlNlya7XWrT3fjm4EQ+Sx4vIK+u0ShIGs9CIYs/3ViPBjDORqKU6Rfw/48x9lO7r1Ut6R/v1yR60bS5OoqtnWCpbQnvYAurP9U3m1rUd5/1F+3c4i8o1BvR/TQgh6xWGyG+yjx8fHd/; 24:G+6qJrHl4NMMsCI1/3OUaMl+KyMBy2Q4MLOWdVqfc5VXpp0ts9sM/46bgoya83bxlNHV4jQJ1BvqYE5oR/q24vVT70O6vHAAw6PFeM3eLWs= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2277; 7:QySzIneh3nCN9CJ2LHYXP0loAexGzJazOrrSCMwTsQENHMNmiJW0R+vuSFrTLt9+LkKDcJOoGuVtQ8GzMv5xTVTuxxLxJ3F63x/RXkP5As9hC+SOKu8hDAU7wMyTyRbxNedvyCkmjQH+56rlKZoQyKridf4Oe+YaIy1yRTo6jOrLTGuIk6qVZBnF0U+tKm9FJtV4Vc+C8wjIykNiCgzLGfClO362R1rHKjvGyBPBX1CgYhRDdXDQSmuADwzVOtLmv1zwvGSvp5ufJpaXxn3+yz1v2/QTR94wSWHVHTFqmdtJY0nFoduKc1OhONrSLspTqFFBPCt3fJkf1e01CvmV3g== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Apr 2017 11:15:20.3825 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO2PR03MB2277 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: <netdev.vger.kernel.org> X-Mailing-List: netdev@vger.kernel.org |
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index 172624c..bcf8675 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -2651,7 +2651,7 @@ static void fec_enet_free_queue(struct net_device *ndev) for (i = 0; i < fep->num_tx_queues; i++) if (fep->tx_queue[i] && fep->tx_queue[i]->tso_hdrs) { txq = fep->tx_queue[i]; - dma_free_coherent(NULL, + dma_free_coherent(&fep->pdev->dev, txq->bd.ring_size * TSO_HEADER_SIZE, txq->tso_hdrs, txq->tso_hdrs_dma); @@ -2685,7 +2685,7 @@ static int fec_enet_alloc_queue(struct net_device *ndev) txq->tx_wake_threshold = (txq->bd.ring_size - txq->tx_stop_threshold) / 2; - txq->tso_hdrs = dma_alloc_coherent(NULL, + txq->tso_hdrs = dma_alloc_coherent(&fep->pdev->dev, txq->bd.ring_size * TSO_HEADER_SIZE, &txq->tso_hdrs_dma, GFP_KERNEL);
In aarch64 system, it requires to trasfer ->dev to dma_alloc_coherent() API, otherwise allocate failed and print kernel warning. Signed-off-by: Fugang Duan <B38611@freescale.com> --- drivers/net/ethernet/freescale/fec_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)