From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758104AbcLONtq (ORCPT ); Thu, 15 Dec 2016 08:49:46 -0500 Received: from mail-co1nam03on0083.outbound.protection.outlook.com ([104.47.40.83]:16229 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752360AbcLONtn (ORCPT ); Thu, 15 Dec 2016 08:49:43 -0500 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; davemloft.net; dkim=none (message not signed) header.d=none;davemloft.net; dmarc=fail action=none header.from=nxp.com; X-IncomingTopHeaderMarker: OriginalChecksum:;UpperCasedChecksum:;SizeAsReceived:755;Count:11 From: Madalin Bucur To: CC: , , Subject: [PATCH net 1/3] dpaa_eth: use big endian accessors Date: Thu, 15 Dec 2016 15:13:04 +0200 Message-ID: <1481807586-4798-2-git-send-email-madalin.bucur@nxp.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1481807586-4798-1-git-send-email-madalin.bucur@nxp.com> References: <1481807586-4798-1-git-send-email-madalin.bucur@nxp.com> Reply-To: X-IncomingHeaderCount: 11 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131262811918504434;(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)(7916002)(39400400002)(39410400002)(39380400002)(39850400002)(39450400003)(39840400002)(39860400002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(104016004)(50986999)(43066003)(4326007)(53806999)(356003)(48376002)(38730400001)(2906002)(105606002)(50466002)(77096006)(106466001)(68736007)(305945005)(76176999)(3450700001)(2351001)(47776003)(85426001)(36756003)(81166006)(81156014)(33646002)(69596002)(8936002)(626004)(110136003)(575784001)(5660300001)(97736004)(86362001)(2950100002)(50226002)(6666003)(189998001)(8676002)(6916009)(5003940100001);DIR:OUT;SFP:1101;SCL:1;SRVR:CY4PR03MB2469;H:az84smr01.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11FD032;1:j4dyzIci++Na0ExBUgC3AgoIXbYhoi+C3VQDvLBxinyRPSIfm8wN6hooqdUP34xUsYtV1zaJpCH66Xfcm9q7uaBHmQiI8aw4ekU8roPyVnQF1afABwl0Fk9pCN/0R/n4afX0HMoP0Y1vRa7JxIYNWwITQQLjePe7gHgd8seSDda9l0zxtV0mf23nwUBEe/M0wkohrxc6+DyRLLe7s4uGu7WrgHe9D0jH7BA6BixuYroqehSvQrgH6x+Y3oEBvbDjJ/4oiQLvfM/p2uPNaQO6alk7QQR7KjPI/gEb9M2xUryliCOWvMJce6JSuh4n2AoJhSsEDOFqGZKp1r9lWJ74i47x8ho8dBSk91etWYHzOle5Y9M91TcAxLC1nSE6HerIpDhtDPCX1IzleFtKf3yhw7403NxHD97CPZleSkwiM71YFUE0b25FLRvPg8+PVpFQITgrWkHOScyPeYF5vdOHIqT6+adqQmiS1q+bz4MTsNli1UaKZhG+k3U4/q/wkB2IruPN8SWMRmd/O45xzFbFNTlqjX4fYld7Yxz+HcG/d/kliSFd0WV0rAURmMa756EiyTuBd7cwyR6V0R/8Kw08yqXyHr+HKDRGRDp/MP4cCC0= MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 2a19c897-886d-4657-b093-08d424ec1f13 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:CY4PR03MB2469; X-Microsoft-Exchange-Diagnostics: 1;CY4PR03MB2469;3:Mep7+ACFEvzeVzUn6NfjFBa8WHO7fgtmDK4xYeLA2X3AcUwdMPqyL3k28s95SgWH3cLd621TVsL/z3PforXpH5O0mw3s6OKLNpp6kmkiJOuYY+KegQIcqm9ozupf+2yOrRE3zACTB8fXePpke/BqPBwmfmBSyd/DLwUk4hJmnUDw77Vs+BJMgax0PBX3gwvf7iCcsiZY4vs+fN8KsA5W5IBTOe54e7JTB3SnG+K9iHj2QhugoYccMoi2HntylS5PFDsncZd0UVHm6rwF8Mj5W3t9f2hX1GP+f3wuVDLUMd07UHDrJKiceFZ05DNgw1zU/B9eT9Za/N52KNSFDGrEUSpDu19Dc2q6CugRqKGhBqY= X-Microsoft-Exchange-Diagnostics: 1;CY4PR03MB2469;25:qrZXkTMYrTuVe16uflWajePkY8tl/NEik2ZvANYgtyBO1/4PSfJZGcBNl5CVbsW4T08ed+ZwmAsX2BACau1GCVbwY+09sqt7q25a7i4O9IBVGQxdGoVdQN64bbA9vgVcARQYnbLmPviDjztuP0nCYuRxNnHx+27DB+kdY8e+3cBJXxbjRqIgWMzsS+LS9b6RdZPQPOaooHRiF5fKbTPNTDX5HrW9Agj7FnLIAFv6ia3vqzoaXVf48JaU2pNuKiaAmqxQzmB+Q40oaUxu9ow10aLi+UX/rtfFYSrFWQTHKCkxp18i+HdPqSVDcVhWAosYi5G8i42fcfwZePXGLI7sc/1LWfhJADys6r2P+kH06bnESuhyjNZNp4JMfA1Aho8lDzbLBd5g5KQc9z29/WhPRbggQk9UJSjEbDjYXKBxjSLvZPR4wNnFOjuPQ6TKMU0zsZbRGT8OAIW8j0jfImLkRXKJutwuzAY/SZXEj4GT+tc+Gk4M4e1yLiPig4TwW808SuyN67IaHpxhJy0w7223L47R23FnLtmw2t2VFBSSfY3L3LLSoS/2BQBEN18257HXJQqn0lqN6SCZay+bea8IqD1LSprJE+uBVUVydsICGZI3ZynB0OVtwdK4YP+rOicAYMSV/jfSatFT2qIVPerecR+Ll6TI6Bb23n9zKMSqSxsdNffSDLAgOpJ2M2BdWwTzHaNQRidAR4QxWp8S9vYw6KECe6TLuTX6RYNxKu8BruCjoaDzf8gWD5zZ9I+0krOUN4VgiAOHsZud/AK9tGz1KW3g0VFrSmoPpevS+5HRIp4= X-Microsoft-Exchange-Diagnostics: 1;CY4PR03MB2469;31:5vGDniWPSHuqRhCvLxDv7gCXazVurelMYYhrJ6SSMIjYFGCZ0C9756JOjJM0VycsA1fAneAY4NfRMaw6+eoaSurbpU6lJt8FYDExDXMWw17M7g9dqdYMRzUpybWpi3rZOvnJuiky1pQLCxlxLXVgeMcED/ZfGuABfn1L6SaF5qJ/b7Y4cqSFQlOx0gyY4+7WdgG5IQIb9ntKFz8ha5fF+tNHqfQi/i9bUUj7TmKuiLcjbo6tMb4z09DMqydMyQJ4bXD/T71qdqpp/addZ2ud8g== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(275809806118684)(17755550239193); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6095060)(601004)(2401047)(8121501046)(5005006)(13017025)(13024025)(13015025)(13018025)(13023025)(3002001)(10201501046)(6055026)(6096035)(20161123565025)(20161123563025)(20161123559025)(20161123556025)(20161123561025);SRVR:CY4PR03MB2469;BCL:0;PCL:0;RULEID:(400006);SRVR:CY4PR03MB2469; X-Microsoft-Exchange-Diagnostics: 1;CY4PR03MB2469;4:8G3bONcpFHAvK7IavlU/5qmdyzKuMct1OQTYdgY/ynhAj6cdcxJXIw3G1XA6465vK1EaNnRTA/d2HJm/V9R3ztaJ2wYq6LMDeRSl6lPAZ+2PGDYRiO6GhFKeofSGmMmLkTUXESqmUmfGWU1nzBIstuJOyMsMjWklRiomoAfbM9ht/YllBUSkSP4GSvtnKHPX5/CPcW40WdTxxsLhLpCBe8kfTDWNNh8V70CbMOx4mhFI9Mam07pTLAX8ucNGjy4+F3y3fp4CM+gW8kvkF/QHVweQLWRxMTHIopz7DmnB71qsRgdWXcPdOwZ5m9yRrIasyw7S7reOiVSV7/0uaaliRk6AchMfIYjbLRikSKQu5EKQmOrip4SBcwBSgylT8oLPNwwj8KEWMRg50wgWddXB+FC7AYF709hzk/4cx2ysOwDC8DsODTsEcDTd2zfCqK2Slq15e5TeVwSMC/uIdd3VAw9lu/LwqvKnbYeiWK1oH+RNaZgPTFMBvk8VuEBlbqMEt1/loi2OfRz6uhSYx04twrFlek5+I19cwlwEjASFh9kXPuNtexI5mK34fNgCMaTqSUmXxfBSC0zEzhKJxy1AXXgI6fsMtYjFb4dxmAqBi+GtjUTbi7/Rzw8gYqz0XJDlvLZZFc1MUx1S6ehijSCAQ+oa2TS1HpiyLpgF4wdUUzCoAwEJBv+qy1C8Hy207gJF2Ujz/8TGcTnW3KxhDRp9kuaIW4jq9mzm4BRbxEglB3gTvz3EsgJX7pBfLmQend/CoGUy5vgz5+wFz54L9mZBZbiOS5i5plJFESzPNcsUxuJRx2vtceTg+8pIJFUJKqFv X-Forefront-PRVS: 0157DEB61B X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CY4PR03MB2469;23:9/BEoCJAkFB57GMs6blvPpXK70NPi+QwO6YJ/TwIh?= =?us-ascii?Q?U6FP4j7jpQhva414zjQpxaEHhdhGW+HHl5dIbuNPvXU4bLWDkuQZfRW20jD+?= =?us-ascii?Q?BqZXWpiT4o9hX0BKHxs5rN5hgqhzPIqhC/491h1E+ybQqCV9arvl8C+hTORG?= =?us-ascii?Q?s785oWw+WDXZwcJV+KZWUKfEwkWxXBamcrT3HR7SPVNI83cEb0a2ycQTheA/?= =?us-ascii?Q?LPECzepWZRtlQ6cuW0L8fZbgSz9ZcC8FnSpsBsbl5quaq/Qzb+fqQ/xfLEZJ?= =?us-ascii?Q?dO/oM2+w8yaKcGJuyi8x4k1OFK7GSy7mxFLazWO9S5nLbhG8w7qCkBb/n1pF?= =?us-ascii?Q?PmqDMFJyUcphkoiktVnqn/Bl70UBkG4/JHT+eKj7WMDOxu66HgCONcpd/+qf?= =?us-ascii?Q?WeWO+hxoQgd8oHKmrk+vGsjKXyWO2ci9jki5eZFqNlQq7dY+Ywk7r9aKxJ9C?= =?us-ascii?Q?ApX3sjN49gyl9FRExB+pQ06L0jRV/IOqFBQ7zVC8UG5IX1KvjXg59YlTHiiX?= =?us-ascii?Q?16dIAcsjMp1v3PMrokVjVM1393l3B4NDogrqrdmyOgt0TZqea6y0FrQ16JMr?= =?us-ascii?Q?XaYI52HC4QgPG8zwBLHjmZbZK1piASweWKTHS60EsUEj91hDnw1/ajLX9GHK?= =?us-ascii?Q?ljB8rR/k04lydKe0kTQdM2hPs6HmQtfglAeIm4+Ajz1TdXk4e6jPWiLxWVZE?= =?us-ascii?Q?LqKN7D3fL/bLMJ0GaX/GwJcDZBNBKKKMrJx8FdBiCw+SzN0YqTi1mY4wFj8A?= =?us-ascii?Q?oGg8BddlEDcJM4NXfPrB2IiqABECuPSwg7hNuIQL4z/6UYEVfMNNAGKTsf/s?= =?us-ascii?Q?ptsyaNAXEKtO079X0re3LCCHzL2pv0RhZED9rYQwSCMamovHO1IJQJ/rIMVx?= =?us-ascii?Q?gcGvTQhs9rhjCX32jsuuW4G48lcYtboULY1lhaAJS3QC0l0EEYGplcKUR9bT?= =?us-ascii?Q?rDsZzEjANd0eHAlWoRvpAyniLe7amo4u8u5uo+wrKKTdTZN6K8ygAdRLxGu3?= =?us-ascii?Q?yyDBMw7o7DjxrRDFU/YnuC30i7AmrhG7Io3y2nyZT3aSz494xH4p1x8sH3Zw?= =?us-ascii?Q?rMSGppEyGGrRyD6pltoZXT5nouqfsUc3usnmjl2m08KBft+YQoo/28BzSlnR?= =?us-ascii?Q?iQ7Hy+sriS934xzQrg4d9VCL81GMT71TXuoMcxEe0AogqVOqwJlohaOK1HUW?= =?us-ascii?Q?KHZ/kHxVrJ3TEnqZwCEeaa3MPB1F3bPf68TuzAqL1mBLuEA7yjcaz0g+yWOV?= =?us-ascii?Q?ZlLKsNiikNNAQp4Q2+1I8HbV/2cGTCAlvUTy/23Qz6t5XZJ+A4Oac6qpxmG4?= =?us-ascii?Q?DkAMj4ksZ7zIoP8i7qejB9eOwhoo1NDxMcdqirCr3qD?= X-Microsoft-Exchange-Diagnostics: 1;CY4PR03MB2469;6:BnUrjXJ/qtWlDjhqZwvtNbfm4v22JnUDT/3NvgqdXAifDK33gY86l0I5y1yDqXA2o7XE/Fxp7qtmMAwncI3UTdkiUnTtdGaAAamG/LQjg0ZUsRNVv+cK4EmMD+gBCfGe+bqGqhLjcY17dTSyunGXndCrSWmgRmUAHmkuaL3ytG2VzZLM0OuhuTFkTFehAVjWYnzakI8ViOAJFRF4WUj55Xso99hsqQw9WmyeuLPq0rmhx7QrpKkPoeau4HbZ2oTDt98ntWloaz4ug8YjLjEtWxILw4mvgO0ooZB/W2KBCn63M5uLdMiCF5A/k+qDqJO+5H8k2qKBXeMxACxdEaojubM1HANiLyAQGx1nKS89tZsKpOevj0bZAEk5OHlS9/E/QRnk75XCVR6Qy+Iy4C+Uyg10Cy3uye9EhaEdI6XhMvUASPgmpSFFrTovhor+82cW;5:aLIbal8pcC7NYQRktQDDVqG/pWxwjuaJTXES13ugMoIVQQmSLKN3tcQCC0IT9x5Y0b/sccyOnKS6h95YpA+neDaLoiJFNA7+A9mROIaiELaiOg9s9fVlCRM1KOQJ8+Kj+9j/M+8MpMB6Uvq6tpS7g8AnVzwnkbEaePAJt+b6vvXPm7e6fk+CVaTJOMtkC7ss;24:2KNOtwhrSeYL+sfff8SEDHJy8nPsYWBxI6fs+OfXQnI2dg21KenGJIis8tcsxZv68BX1sQC1yVAXIVcXkKJeRU1GyiAB8c7EZbYNfMAikKY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;CY4PR03MB2469;7:TnXVCut7faxadGDDrnYgL6GNs26bFZm1rPJwSq5HYBLzgebLm4Kh9gL433xVMZnWO5C+7+7WGtdGRZ+4wyr0GCdS7F9BLFghOG5XSIqFb3wJyuhxY10hEoPoJK+S6GsmNXHo00V6Cp9cKqk2K2UD1SHNvO/we4tjABfUUOc9e62wX7aPo/d/cyG5l2ufJl9dv+U7E9mVGFdQ9jUjZ7yr3OUXR4wl2HVVoAZVWSLntzxbSUJwqsI5YG20tnSzpjopOiYpnFA4KseDuhZ41kAoFRXkzuywrfOLLYvzCt66uKxEq5FRBEE9FXPxi66JBsAFgb90Z4ZkfkVNNEZXcV6OyJBViR+PqK4EBlUvHvbE73B1mP7dZL+HnrBbRN234us+BIGrpZBqYh/UMH2z5yf2eo+mtNYBNrRBZ6vnh7brd8avzt+4ulaa+x3YPCMEKKqNtbOjHUvfVD4f0+jGvP6zEg== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2016 13:13:10.3528 (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: CY4PR03MB2469 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Claudiu Manoil Ensure correct access to the big endian QMan HW through proper accessors. Signed-off-by: Claudiu Manoil Signed-off-by: Madalin Bucur --- drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 71 ++++++++++++++------------ 1 file changed, 37 insertions(+), 34 deletions(-) diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c index 3c48a84..624ba90 100644 --- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c +++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c @@ -733,7 +733,7 @@ static int dpaa_eth_cgr_init(struct dpaa_priv *priv) priv->cgr_data.cgr.cb = dpaa_eth_cgscn; /* Enable Congestion State Change Notifications and CS taildrop */ - initcgr.we_mask = QM_CGR_WE_CSCN_EN | QM_CGR_WE_CS_THRES; + initcgr.we_mask = cpu_to_be16(QM_CGR_WE_CSCN_EN | QM_CGR_WE_CS_THRES); initcgr.cgr.cscn_en = QM_CGR_EN; /* Set different thresholds based on the MAC speed. @@ -747,7 +747,7 @@ static int dpaa_eth_cgr_init(struct dpaa_priv *priv) cs_th = DPAA_CS_THRESHOLD_1G; qm_cgr_cs_thres_set64(&initcgr.cgr.cs_thres, cs_th, 1); - initcgr.we_mask |= QM_CGR_WE_CSTD_EN; + initcgr.we_mask |= cpu_to_be16(QM_CGR_WE_CSTD_EN); initcgr.cgr.cstd_en = QM_CGR_EN; err = qman_create_cgr(&priv->cgr_data.cgr, QMAN_CGR_FLAG_USE_INIT, @@ -896,18 +896,18 @@ static int dpaa_fq_init(struct dpaa_fq *dpaa_fq, bool td_enable) if (dpaa_fq->init) { memset(&initfq, 0, sizeof(initfq)); - initfq.we_mask = QM_INITFQ_WE_FQCTRL; + initfq.we_mask = cpu_to_be16(QM_INITFQ_WE_FQCTRL); /* Note: we may get to keep an empty FQ in cache */ - initfq.fqd.fq_ctrl = QM_FQCTRL_PREFERINCACHE; + initfq.fqd.fq_ctrl = cpu_to_be16(QM_FQCTRL_PREFERINCACHE); /* Try to reduce the number of portal interrupts for * Tx Confirmation FQs. */ if (dpaa_fq->fq_type == FQ_TYPE_TX_CONFIRM) - initfq.fqd.fq_ctrl |= QM_FQCTRL_HOLDACTIVE; + initfq.fqd.fq_ctrl |= cpu_to_be16(QM_FQCTRL_HOLDACTIVE); /* FQ placement */ - initfq.we_mask |= QM_INITFQ_WE_DESTWQ; + initfq.we_mask |= cpu_to_be16(QM_INITFQ_WE_DESTWQ); qm_fqd_set_destwq(&initfq.fqd, dpaa_fq->channel, dpaa_fq->wq); @@ -920,8 +920,8 @@ static int dpaa_fq_init(struct dpaa_fq *dpaa_fq, bool td_enable) if (dpaa_fq->fq_type == FQ_TYPE_TX || dpaa_fq->fq_type == FQ_TYPE_TX_CONFIRM || dpaa_fq->fq_type == FQ_TYPE_TX_CONF_MQ) { - initfq.we_mask |= QM_INITFQ_WE_CGID; - initfq.fqd.fq_ctrl |= QM_FQCTRL_CGE; + initfq.we_mask |= cpu_to_be16(QM_INITFQ_WE_CGID); + initfq.fqd.fq_ctrl |= cpu_to_be16(QM_FQCTRL_CGE); initfq.fqd.cgid = (u8)priv->cgr_data.cgr.cgrid; /* Set a fixed overhead accounting, in an attempt to * reduce the impact of fixed-size skb shells and the @@ -932,7 +932,7 @@ static int dpaa_fq_init(struct dpaa_fq *dpaa_fq, bool td_enable) * insufficient value, but even that is better than * no overhead accounting at all. */ - initfq.we_mask |= QM_INITFQ_WE_OAC; + initfq.we_mask |= cpu_to_be16(QM_INITFQ_WE_OAC); qm_fqd_set_oac(&initfq.fqd, QM_OAC_CG); qm_fqd_set_oal(&initfq.fqd, min(sizeof(struct sk_buff) + @@ -941,9 +941,9 @@ static int dpaa_fq_init(struct dpaa_fq *dpaa_fq, bool td_enable) } if (td_enable) { - initfq.we_mask |= QM_INITFQ_WE_TDTHRESH; + initfq.we_mask |= cpu_to_be16(QM_INITFQ_WE_TDTHRESH); qm_fqd_set_taildrop(&initfq.fqd, DPAA_FQ_TD, 1); - initfq.fqd.fq_ctrl = QM_FQCTRL_TDE; + initfq.fqd.fq_ctrl = cpu_to_be16(QM_FQCTRL_TDE); } if (dpaa_fq->fq_type == FQ_TYPE_TX) { @@ -951,7 +951,8 @@ static int dpaa_fq_init(struct dpaa_fq *dpaa_fq, bool td_enable) if (queue_id >= 0) confq = priv->conf_fqs[queue_id]; if (confq) { - initfq.we_mask |= QM_INITFQ_WE_CONTEXTA; + initfq.we_mask |= + cpu_to_be16(QM_INITFQ_WE_CONTEXTA); /* ContextA: OVOM=1(use contextA2 bits instead of ICAD) * A2V=1 (contextA A2 field is valid) * A0V=1 (contextA A0 field is valid) @@ -959,8 +960,8 @@ static int dpaa_fq_init(struct dpaa_fq *dpaa_fq, bool td_enable) * ContextA A2: EBD=1 (deallocate buffers inside FMan) * ContextB B0(ASPID): 0 (absolute Virtual Storage ID) */ - initfq.fqd.context_a.hi = 0x1e000000; - initfq.fqd.context_a.lo = 0x80000000; + qm_fqd_context_a_set64(&initfq.fqd, + 0x1e00000080000000ULL); } } @@ -968,13 +969,13 @@ static int dpaa_fq_init(struct dpaa_fq *dpaa_fq, bool td_enable) if (priv->use_ingress_cgr && (dpaa_fq->fq_type == FQ_TYPE_RX_DEFAULT || dpaa_fq->fq_type == FQ_TYPE_RX_ERROR)) { - initfq.we_mask |= QM_INITFQ_WE_CGID; - initfq.fqd.fq_ctrl |= QM_FQCTRL_CGE; + initfq.we_mask |= cpu_to_be16(QM_INITFQ_WE_CGID); + initfq.fqd.fq_ctrl |= cpu_to_be16(QM_FQCTRL_CGE); initfq.fqd.cgid = (u8)priv->ingress_cgr.cgrid; /* Set a fixed overhead accounting, just like for the * egress CGR. */ - initfq.we_mask |= QM_INITFQ_WE_OAC; + initfq.we_mask |= cpu_to_be16(QM_INITFQ_WE_OAC); qm_fqd_set_oac(&initfq.fqd, QM_OAC_CG); qm_fqd_set_oal(&initfq.fqd, min(sizeof(struct sk_buff) + @@ -984,9 +985,8 @@ static int dpaa_fq_init(struct dpaa_fq *dpaa_fq, bool td_enable) /* Initialization common to all ingress queues */ if (dpaa_fq->flags & QMAN_FQ_FLAG_NO_ENQUEUE) { - initfq.we_mask |= QM_INITFQ_WE_CONTEXTA; - initfq.fqd.fq_ctrl |= - QM_FQCTRL_HOLDACTIVE; + initfq.we_mask |= cpu_to_be16(QM_INITFQ_WE_CONTEXTA); + initfq.fqd.fq_ctrl |= cpu_to_be16(QM_FQCTRL_HOLDACTIVE); initfq.fqd.context_a.stashing.exclusive = QM_STASHING_EXCL_DATA | QM_STASHING_EXCL_CTX | QM_STASHING_EXCL_ANNOTATION; @@ -1350,7 +1350,7 @@ static int dpaa_enable_tx_csum(struct dpaa_priv *priv, parse_result->l4_off = (u8)skb_transport_offset(skb); /* Enable L3 (and L4, if TCP or UDP) HW checksum. */ - fd->cmd |= FM_FD_CMD_RPD | FM_FD_CMD_DTC; + fd->cmd |= cpu_to_be32(FM_FD_CMD_RPD | FM_FD_CMD_DTC); /* On P1023 and similar platforms fd->cmd interpretation could * be disabled by setting CONTEXT_A bit ICMD; currently this bit @@ -1732,7 +1732,7 @@ static int skb_to_contig_fd(struct dpaa_priv *priv, /* Fill in the rest of the FD fields */ qm_fd_set_contig(fd, priv->tx_headroom, skb->len); - fd->cmd |= FM_FD_CMD_FCO; + fd->cmd |= cpu_to_be32(FM_FD_CMD_FCO); /* Map the entire buffer size that may be seen by FMan, but no more */ addr = dma_map_single(dev, skbh, @@ -1840,7 +1840,7 @@ static int skb_to_sg_fd(struct dpaa_priv *priv, } fd->bpid = FSL_DPAA_BPID_INV; - fd->cmd |= FM_FD_CMD_FCO; + fd->cmd |= cpu_to_be32(FM_FD_CMD_FCO); qm_fd_addr_set64(fd, addr); return 0; @@ -1867,7 +1867,7 @@ static inline int dpaa_xmit(struct dpaa_priv *priv, egress_fq = priv->egress_fqs[queue]; if (fd->bpid == FSL_DPAA_BPID_INV) - fd->cmd |= qman_fq_fqid(priv->conf_fqs[queue]); + fd->cmd |= cpu_to_be32(qman_fq_fqid(priv->conf_fqs[queue])); /* Trace this Tx fd */ trace_dpaa_tx_fd(priv->net_dev, egress_fq, fd); @@ -1960,17 +1960,17 @@ static void dpaa_rx_error(struct net_device *net_dev, { if (net_ratelimit()) netif_err(priv, hw, net_dev, "Err FD status = 0x%08x\n", - fd->status & FM_FD_STAT_RX_ERRORS); + be32_to_cpu(fd->status) & FM_FD_STAT_RX_ERRORS); percpu_priv->stats.rx_errors++; - if (fd->status & FM_FD_ERR_DMA) + if (be32_to_cpu(fd->status) & FM_FD_ERR_DMA) percpu_priv->rx_errors.dme++; - if (fd->status & FM_FD_ERR_PHYSICAL) + if (be32_to_cpu(fd->status) & FM_FD_ERR_PHYSICAL) percpu_priv->rx_errors.fpe++; - if (fd->status & FM_FD_ERR_SIZE) + if (be32_to_cpu(fd->status) & FM_FD_ERR_SIZE) percpu_priv->rx_errors.fse++; - if (fd->status & FM_FD_ERR_PRS_HDR_ERR) + if (be32_to_cpu(fd->status) & FM_FD_ERR_PRS_HDR_ERR) percpu_priv->rx_errors.phe++; dpaa_fd_release(net_dev, fd); @@ -1986,7 +1986,7 @@ static void dpaa_tx_error(struct net_device *net_dev, if (net_ratelimit()) netif_warn(priv, hw, net_dev, "FD status = 0x%08x\n", - fd->status & FM_FD_STAT_TX_ERRORS); + be32_to_cpu(fd->status) & FM_FD_STAT_TX_ERRORS); percpu_priv->stats.tx_errors++; @@ -2020,10 +2020,11 @@ static void dpaa_tx_conf(struct net_device *net_dev, { struct sk_buff *skb; - if (unlikely(fd->status & FM_FD_STAT_TX_ERRORS) != 0) { + if (unlikely(be32_to_cpu(fd->status) & FM_FD_STAT_TX_ERRORS)) { if (net_ratelimit()) netif_warn(priv, hw, net_dev, "FD status = 0x%08x\n", - fd->status & FM_FD_STAT_TX_ERRORS); + be32_to_cpu(fd->status) & + FM_FD_STAT_TX_ERRORS); percpu_priv->stats.tx_errors++; } @@ -2100,6 +2101,8 @@ static enum qman_cb_dqrr_result rx_default_dqrr(struct qman_portal *portal, struct sk_buff *skb; int *count_ptr; + fd_status = be32_to_cpu(fd->status); + fd_format = qm_fd_get_format(fd); net_dev = ((struct dpaa_fq *)fq)->net_dev; priv = netdev_priv(net_dev); dpaa_bp = dpaa_bpid2pool(dq->fd.bpid); @@ -2417,12 +2420,12 @@ static int dpaa_ingress_cgr_init(struct dpaa_priv *priv) } /* Enable CS TD, but disable Congestion State Change Notifications. */ - initcgr.we_mask = QM_CGR_WE_CS_THRES; + initcgr.we_mask = cpu_to_be16(QM_CGR_WE_CS_THRES); initcgr.cgr.cscn_en = QM_CGR_EN; cs_th = DPAA_INGRESS_CS_THRESHOLD; qm_cgr_cs_thres_set64(&initcgr.cgr.cs_thres, cs_th, 1); - initcgr.we_mask |= QM_CGR_WE_CSTD_EN; + initcgr.we_mask |= cpu_to_be16(QM_CGR_WE_CSTD_EN); initcgr.cgr.cstd_en = QM_CGR_EN; /* This CGR will be associated with the SWP affined to the current CPU. -- 2.1.0