Message ID | 1470373318-34516-1-git-send-email-harinik@xilinx.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 3s5F6s3sVJz9t1G for <patchwork-incoming@ozlabs.org>; Fri, 5 Aug 2016 15:02:45 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752002AbcHEFCl (ORCPT <rfc822;patchwork-incoming@ozlabs.org>); Fri, 5 Aug 2016 01:02:41 -0400 Received: from mail-cys01nam02on0050.outbound.protection.outlook.com ([104.47.37.50]:13275 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751707AbcHEFCb (ORCPT <rfc822;netdev@vger.kernel.org>); Fri, 5 Aug 2016 01:02:31 -0400 Received: from BL2NAM02FT061.eop-nam02.prod.protection.outlook.com (10.152.76.57) by BL2NAM02HT038.eop-nam02.prod.protection.outlook.com (10.152.76.180) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.567.7; Fri, 5 Aug 2016 05:02:29 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=xilinx.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.83 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.83; helo=xsj-pvapsmtpgw01; Received: from xsj-pvapsmtpgw01 (149.199.60.83) by BL2NAM02FT061.mail.protection.outlook.com (10.152.77.7) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.567.7 via Frontend Transport; Fri, 5 Aug 2016 05:02:27 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66] helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from <harini.katakam@xilinx.com>) id 1bVXGy-0000l3-PB; Thu, 04 Aug 2016 22:02:16 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from <harini.katakam@xilinx.com>) id 1bVXGy-0004O4-J2; Thu, 04 Aug 2016 22:02:16 -0700 Received: from xsj-pvapsmtp01 (smtp3.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id u75525un021663; Thu, 4 Aug 2016 22:02:05 -0700 Received: from [172.23.146.171] (helo=xhdl3763.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from <harinik@xilinx.com>) id 1bVXGm-0004Az-Oa; Thu, 04 Aug 2016 22:02:05 -0700 From: Harini Katakam <harini.katakam@xilinx.com> To: <nicolas.ferre@atmel.com>, <davem@davemloft.net>, <harinikatakamlinux@gmail.com> CC: <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <harinik@xilinx.com>, <punnaia@xilinx.com>, <michals@xilinx.com>, <stable@vger.kernel.org> Subject: [PATCH] net: macb: Correct CAPS mask Date: Fri, 5 Aug 2016 10:31:58 +0530 Message-ID: <1470373318-34516-1-git-send-email-harinik@xilinx.com> X-Mailer: git-send-email 2.1.1 X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.0.0.1202-22492.005 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.83; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(2980300002)(438002)(199003)(189002)(586003)(63266004)(36386004)(356003)(7696003)(4001450100002)(48376002)(7846002)(305945005)(47776003)(50466002)(19580405001)(19580395003)(5003940100001)(77096005)(8936002)(92566002)(50986999)(50226002)(189998001)(229853001)(86362001)(9786002)(33646002)(2201001)(8676002)(4326007)(2906002)(87936001)(106466001)(81156014)(36756003)(81166006)(11100500001)(5001770100001)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:BL2NAM02HT038; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT061; 1:dguPAlDfzbbCzddHH+Tle1Ymx5JFkPYB3/3jv7Ywt4cez0BJ7zL8TvixxpswFvuP80r6AwF4OKGrRfrFz2bNhCG+bBFLhGnhVqTOivgotfgCnjH5d1fuT1GWnl0gNj5TBY09wP4amGZvZbX2DbmAJjU+ZKu5r+xAuJslx7e42zP1LRn764OQi5zrJZs203bF4fZcixae0C5XcDRyg1ya37xbd5SV0MVWmqJHA7PjDsD2d0Ty5Jk72s9kVsBCEqnSki7O/A4SF8BKYpeWBwVjmgWQbj1nawywRjOvgCyxaQG1kYQox66nkdRRvmJhxtg5RtNu52/3sV8eJ2ve/ftEB6txE1GMIfKD+vRdDPNthnvvwWCbKwZ3L+48pJznOyRgpXK0qSuxNyvlCnDTPIdidznq2dy0WhsQV95o0Bn+lUDIFy8jvH1ttXDBddtvVYDzT17m1ttQiJLWkjrM9PnxgaXPEdGcHkqk2GsZoJ0a8fPPZeguLdoa+YLbXpXUy95LEiKQkreB082+Ku1EmNXhdcdodpKzxl8fglWOVFL4CayUMx7BolmhsT8QkLvGmPv2zcLgTINr0vUdW7mXwnmizYFdsuO2kVe10r/5PUnEEuk= MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: e791ae90-b981-4152-1ba8-08d3bcedb316 X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02HT038; 2:iVWjVkIgAY1ckBMTdjM0Z37fZ3YmfoMrYlgN6M6XF68899La6+wjb1vqaOdCTe5LPf2tegXyVp1rRyZlLIh+QKVJEi+Tem8eTj1fB+Eov4yHd+7QWZxhBSl0TPb3A12M4RiIs4EhH86DLKvANa9gO4Q9DBxFS2s7rltnhiopfDKCQ6mIClNxe9MYio6lPrg4; 3:9CgKh1D2Iu1NQCV+33Su2FoKrBSbErOMsywE2ZgwKsuIltXCS6qCP2mvcjZg6lJ443iMZDPWbMmXPTXVN2LM9izAeuIeqjzNFww0MX2jvNVZpyS6EuDcr3wFjBb9GGsEIBIsGIH5XYNNBlM44i+9dhx1lj/7pWLIvpiko1zSoyQVq8/BosXKdCEJ06i8BhoZLu2FSYh8gcw3lpwZP4Ohzeym/yO49fnt8+2xJfFsqdYJU9GuTRfoEdQX31CaFpiKmpeXM++IdczStjauoH0psw== X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(8251501002); SRVR:BL2NAM02HT038; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02HT038; 25:Ldd2DOVCCBScN9Uq9H9m2ovsqTlcmVzg14gwEDpSEbqDCPZTF7bDVp75zUWkN0lfYQlEskzjLa2f6ylyRJ5uaWpWAZhgWP1BxqCYYZSPf2/MmtL0INB/psAw24uTEY3D3z1Sdfoopjc2hupl0kwG4vxBUZCRtJ/AN/8PyqCgv2vJA4n/j9NIa/gMDBa5dlN6ohsWGesn20gH6o6G2/eoUrnAjnBn7yHAwsf2bdLMlFDc6u3GygZEuK23OSFftk0gxKxrTUbHVN54U8lHu4dB+V8qkStzpZziR6Bcdke4I2zSFwz1vxyGeQ6TDq/R9AtP4GPZJB0t7qTN0Zx8AAr2DaLq1oC3qDqPibDmFkrHw1xunWdXXWyVmNCMROZLp9jRx3JeA8wJ+T0Vs3drYHY5BTFE24j5J94RFka6fiKriFdUTMOsgXxmH6VkpcLF8CywSQN6O3pYtxk7Hh1kDRH4sC2J/3PPIJ7LKEIfLgNv6afDo8saXKnGkAHXDl88otSlckZo65DWcd/3Pij9ZNdnT/9RP2M3HlFQqqzANHBW3ZKGILH8kIFvwFFybta8wdBLC/CMixIJa6vw0jjpNJRRy6j1Mw2LPM2mAp0rtvqI+71KG2UzzUBAggKtSvAtNxGAMmyiZcyTuFQTzYl0OPtYifMCtNhrz9yPIYkDgIY7L6yzch1c1RMTlThuuk+fgY9UAX9aQqYJGSMazAfgcexJLqNKjEbZeWo9BjRsF7nhO/3Nh4/aRtrI6+T+SpYD8eFcyA9G1VykwYEQibEvkIuMKg== X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02HT038; 31:xYr0OpNbBaRNVTBZucjowms6xfP/9G/5IR+d/FuCFFMrATyxcUUYG5O9Qp4hXWcV6W3REYcflpZBMc/bKPwqMqwQQA0qses3avT0x0+aVU6ss3Ip37xFHpmAOTXP1r6sUNVQkhB0KpPzyKiYwadiUii4/zGw4SLjPcJCgeo4qjSwBTYH6VeqQr/0lgoehjBfeqoDnTUKZaQ2sLlqvd7GCCMATKI+jjQfFxPwiGql/Pw=; 20:nGohjhlk6C9SENKCQSZiBn1wK/wXNYSBRC2P+KpxExT0hAoIEP6QLu6ldEBBw3P8bq29y3qWcguvyjxzwWbPIj+8Mxc1kzFNRYG5FhfF9jQ8HhpzTRN1c90exMeh42YDBeU5tHE1eO0iAG4ekU0WSjbZMRQmEqJPFlic5nuK66Yg8llQbIvcGTT/mjfuXcsGWmebMlHx8ZSCFYAGM1CiF1ojbhpLePzNxQN3YkA/5omi55wtYDoG39N3J+NDarRPr4i2FcjKKPz7GpedVjsQOTRpZ15ll3z6nnfzXD4C2XOPHtvcqLer1HT22XVw3zJa+OQG2GYqMz2XTW8GVPgG/B2y+x2FxPmADMK0yvJ163/FMR/mtwH0etOTPSmBaPRsC/UB/Enk6rtub9Tgq2lwoWAnox/Wwz/k6lvfwY4OJfMMd4dbjSowXslxJ12p7WKeepcP3qJWRAl3cXt3KkWGmdEUksQPJHIZKTNFFMljyh6vY6jTvly/tuxwbHkM7dqt X-Microsoft-Antispam-PRVS: <4cf32d0dddaa44d9b5d7fa5f72b7cc19@BL2NAM02HT038.eop-nam02.prod.protection.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(9452136761055)(192813158149592); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040154)(601004)(2401047)(13023025)(13024025)(13015025)(13018025)(13017025)(8121501046)(5005006)(3002001)(10201501046)(6055026); SRVR:BL2NAM02HT038; BCL:0; PCL:0; RULEID:; SRVR:BL2NAM02HT038; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02HT038; 4:9RYs8cysZjPqM0v8iHS8t9M+b6znkBDSsbGOZ5D5czhQx6pmJn7rIJX/1vMXuCGMwdltJVasSwMCAL6ulIS4jpRV/IDW7gVd5+05jkPyWQbO824Alc0ewUiJrYlTs7aPmRIAD1T3vHcYHB5y3e8DG9NjPZMO0cLvEZUC8/i9Uf7VVGg7EwvBxnXpoBohPXgZsUJqHMiOtQNz9becpq2Bzryt7V3n0YA9h+lpdInJUvtYPkrGo6emzWqeCdnDJCgAceEijZiDsaYTOgEJsAt00NaiLHk+MSgoAfT31tXm9UlpC1y/Sdw+f4BgzsBjP3xJmb635aWYLCufpKFpZ3qL5NX05q4Vr6sClFrZy5gmz+UK8x7uEpWsN41kYK1Gt1x7rtOeMsMcmds/M4et2AzoFSzj1FmLMbya2AvngOAXqGlV0GaI6aS93Y1/IEYH8yT1/kwyJo7ZNhdba563HPTAIn7AYbCSjoER+xesy/+MZ7nZ0UoP76drd96WNEecOCi3s/JusQ5OL9G81EHZrekdPz8fBs+IBnuji2BZUmHJ2DlHcUhld/ZpqGt980dpiinh X-Forefront-PRVS: 0025434D2D X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BL2NAM02HT038; 23:TcMDRP07Yf0+sSvtOybvfW4Ne2Hzt1UmOLQV0Rw7Z?= =?us-ascii?Q?GiKL2ZGOtQY0ZDKd++rkPGjRhhSr+5M+HMi9tqPHkjuoTLTxTxpGe7HlZged?= =?us-ascii?Q?pdKDH5DkkCsfot6I4KcN7ZRuNSY0XPVubPnIAjdR50Jd9wlwctFI2cHVBORx?= =?us-ascii?Q?23BdvxF7XeVBThvRKEYDe0ZczfoDATgcA0Rya7J0yRmSkqBB1bIr7RdUdHMA?= =?us-ascii?Q?nLazK8bz5g6ghMQIMbCn6tvuVO51FZkir6ob/ysHdCHgH4mmm3gztc8kAiO9?= =?us-ascii?Q?MEEwrptHgZ0gzB2ENbq58up2DgsDQq1akg88g9pVzJ6JPY8uckPh7YGTplI8?= =?us-ascii?Q?Mrm0syDv/NROhrLXT3u2manmp549rWLCFwwfdNASycO5WcWljqkQFemFDp4p?= =?us-ascii?Q?USgHQzND4a0KXR/sor23qd4oS3SGTA64fh01v0eYsJA0Mr1SAql5BFQanKO9?= =?us-ascii?Q?Qty4SCU//5FPNGHP7QfbV04ETLZAHIDM6spryQ5y8c5PibwuC72n/+h/B/c6?= =?us-ascii?Q?cj7hJxOZUdPPwsSYQbTdPjyA1UseOthdIUjsbnz32q22GlM3hAKgL05jUXWb?= =?us-ascii?Q?lgED7LA8rMYf4iK1dKoFTU4t/r4Xd+otujzvG5GZtJSSjW1XrsA4eMpzPDZO?= =?us-ascii?Q?Bt0kPidYRiUZo2LwAH0jAAcmzLib+7X5zOdxJw8cKe3ZJp7wiZ19K3/SDt+w?= =?us-ascii?Q?7cqti/55OYPW5Ha9DSLUQZt9MIEA8KN0tIQDJMTgze3Boh2XjZTTa5tOjKX7?= =?us-ascii?Q?vza3ytqzN8ZoJpL7AQqpXP3nBeiAJeoKkJXxVk/MpwNQwYrIXNHC1gVE9rn4?= =?us-ascii?Q?A5a2Ua8LhtITIBfbGRdM1dIo+X3bFfs0tH2bHrpelNBPjsnOe49COHXqWVu1?= =?us-ascii?Q?p4Fi7W5zG9sGe7bawP0o8p3Bt3w4xseybll/X+M5q7PgJPfRx/AkN7tglK6N?= =?us-ascii?Q?tnubC7O5A/mC5RnsEFYETri7urpieVt3MriAdvut02/m78Arh3gJppwpPu8J?= =?us-ascii?Q?1B76bJDHfdqBCVmhvDYx+wN7KsX52dKvnpW/dgZZFUNpBX1i5RDucKKr0RW/?= =?us-ascii?Q?t1FXmTZADNCOzuqLC/7BkqKvqqB?= X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02HT038; 6:0+9X9E8+lxR1yQIq05pPDE3LEzytSxz+zYdDwKSE+FNByjmLDXAlCHhhAJsXmF7uBqKtgZ4y6ydZso9gMS+r7FaUrF3/Iv47v5wPQbfJL+vrF5qpmIXym83sv2Wm5cu8Rp+xiVAarC6s3pwFdIccpUKytvD90P/xHctN3PkMqE1QAKikCHntpsd551AoQ3dLjqJxK6zWxNHuXJeRVKAIIqqKvQHFDT8bY+rP5yb69dwHIlQz+LZ4VtwBsPnVmjKfdM2RQLEWzEeW0Pc7nYqvpJymSInveCiuY3ga2g+/XiwToZBgGP1E2kgVKNdr8mU2f7BjPKJiF3o8BcHUve1x+Q==; 5:EIsupFQvA0wIN84Ta33G62gXCarb69ZcbN4T6tVmztMEKRo9pdZM3UlPiBPVD67ByLEBDCXXAYKLLDW+ADlxk2TCJxXzLJEMToV3iBTr6pG9YsNV6jSOWS+TQuzjC8TpTNjhlancvnw4D3/2mUySrg==; 24:puJpWVmmktfwmbY6qSQWTUPJ15mrZVxF4sIFEOclfzLCQapi+v+1Ca/+h5dFTzuZie6bTZWZ86BE6ZFWdF2jdl3q3ijIuMQv3LV2zrgCK1M=; 7:4tv4m2CElunditBab4HeubWvJeweqw5OHVgFEUn+qdf1r4FmZSwgVqLz8tQ2laZQLKO38t/wz4KRymay7tb9F1bBb+P8wW3q5jo5gGovcGEAgrFdcQi4ZZDOvJMtWXJUN06jL01iVGRA/9m8MlFsfzVLwZ1QuZjUTsGy5v8QK9oQQEUpVhLCGo7WnMNLDNptSoZYAlbx1v18lQOuHz2K4WD4Y/MvWEW6fgUfahScchrD0oOR8wdDwi36LVY4f/jM SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Aug 2016 05:02:27.1431 (UTC) X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.83]; Helo=[xsj-pvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL2NAM02HT038 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: <netdev.vger.kernel.org> X-Mailing-List: netdev@vger.kernel.org |
From: Harini Katakam <harini.katakam@xilinx.com> Date: Fri, 5 Aug 2016 10:31:58 +0530 > USRIO and JUMBO CAPS have the same mask. > Fix the same. > > Fixes: ce721a702197 ("net: ethernet: cadence-macb: Add disabled usrio caps") > Cc: stable@vger.kernel.org # v4.5+ > Signed-off-by: Harini Katakam <harinik@xilinx.com> > Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Applied.
diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h index 36893d8..b6fcf10 100644 --- a/drivers/net/ethernet/cadence/macb.h +++ b/drivers/net/ethernet/cadence/macb.h @@ -403,11 +403,11 @@ #define MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII 0x00000004 #define MACB_CAPS_NO_GIGABIT_HALF 0x00000008 #define MACB_CAPS_USRIO_DISABLED 0x00000010 +#define MACB_CAPS_JUMBO 0x00000020 #define MACB_CAPS_FIFO_MODE 0x10000000 #define MACB_CAPS_GIGABIT_MODE_AVAILABLE 0x20000000 #define MACB_CAPS_SG_DISABLED 0x40000000 #define MACB_CAPS_MACB_IS_GEM 0x80000000 -#define MACB_CAPS_JUMBO 0x00000010 /* Bit manipulation macros */ #define MACB_BIT(name) \