From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031095AbdEWPxn (ORCPT ); Tue, 23 May 2017 11:53:43 -0400 Received: from mail-bl2nam02on0071.outbound.protection.outlook.com ([104.47.38.71]:45672 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965761AbdEWPx0 (ORCPT ); Tue, 23 May 2017 11:53:26 -0400 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=fail action=none header.from=nxp.com; From: Bogdan Purcareata To: , , , Subject: [PATCH 1/2] net: phy: Update get_phy_c45_ids for Cortina PHYs Date: Tue, 23 May 2017 15:53:18 +0000 Message-ID: <1495554799-23060-2-git-send-email-bogdan.purcareata@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1495554799-23060-1-git-send-email-bogdan.purcareata@nxp.com> References: <1495554799-23060-1-git-send-email-bogdan.purcareata@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131400284040830549;(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)(39410400002)(39400400002)(39850400002)(39840400002)(39450400003)(39380400002)(39860400002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(9170700003)(5660300001)(8936002)(305945005)(86362001)(49486002)(50226002)(2950100002)(6666003)(33646002)(81166006)(498600001)(85426001)(2906002)(356003)(8676002)(189998001)(5003940100001)(50986999)(76176999)(48376002)(106466001)(53936002)(36756003)(105606002)(2201001)(104016004)(50466002)(77096006)(47776003)(38730400002)(39060400002);DIR:OUT;SFP:1101;SCL:1;SRVR:CY1PR0301MB0908;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;MLV:ovrnspm;MX:1;A:1;PTR:InfoDomainNonexistent;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BL2FFO11FD048;1:Z4YK6zucNxlIVaFQQvbO28fv0R9IbiM7PmuPQ+7E+F7xyhT1JeS4+caB02fZerwklKwdvFnE4S66tVMoyVzAKrzSVQWfPNovP8+ghwrrWK2dr0PoX78KxCkP36hmb1NP6FobgnCxZWRR6vYTWUAnmAXvlkfACQ3bWSCWumHvoaX1QsyCCqQWV8mXxutPG3o0wdC0EY72TrJ1KuUnYMyH2Cn2eHUZcTWWCLdEwquiWKm4pGGJFx4f7+3/0cCCVjLk4SqS78LQGEr91iVZGJ3daTzZ3gFgRxn4DGFfpaLustmXXDxuNLO08+f47tdtDZUCKNJ7NjAx4qC9ZTXsfciZmlWEf2V7kyVXlDTF7gtQEPN7ZKd7qiCcoHXUAz3IjyZ4JZcBwguhvSXdf8jLPnPFf40fwpsDZHbc7RS3XPYFJIjx1E1yGf0eYFst2zBCgloBfRQmsGJVDS58z82kncsF1S8gMIfVynSlz3rTBj5KTeIphzVhd/OY/xERKdACc8B7Q/NxKY5WiaXS7gndLn0fhZMI7K3GURsczOnPTRb6ofuRxTp0zJDOZ2mLnzOjbL6NqSc2BFhyGBPQ4SV4K8ywnCYz7rE5ATUDoIz3oh6jVPLlszOjGMemrsmoqhrBKE6O MIME-Version: 1.0 Content-Type: text/plain X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY1PR0301MB0908: X-MS-Office365-Filtering-Correlation-Id: 0026b7f1-228e-4184-9e55-08d4a1f3d81a X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(201703131430075)(201703131517081);SRVR:CY1PR0301MB0908; X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB0908;3:9I9CX6cf0WOrAchDMHJVOfCtTKby8iqX9RNNbj+wr5+deRV/oBjV+hidjiUI/hbCDOqEJlMzFaioUaHW7btgT5+ytRu5/l+/O6EDOl9zQcDkO+hkHfBsOB2n52CGj2CS/1ntuy89+HPacMVciuhQ1uArA9zI7wnvkhJO85kfCEABEi9bzsnL3F3qSd0BaWnJ7QZh4UUKM44XlusCvgo++2ih+JZ6vBqsHD2xe4d9iFBJBthb61YiQ/4ocVmNc+Ek8oL0iB7w+ut12EaiBJoZCD6YvQFK7IhfWuuL1DHNn40W0Zchz0u9NxdwDZxu/NvPfCDZnzVhx99Lulh4LtFi73NqfNm8zGRqtH79o/OpvWHyF3qdAokudlwpTzFqciusCiQzhaheJwKgKQNgjXYgV1rQSW9MpHCvJgb6DKUKvxEQCYCzDEMwaY8aPRXC8LDh;25:91LawUG+DIChshFIMVgxdGSkaBKuMFtWyNKcviK1RQKCjdqw2wTw3IjfOmB8Da2AAUo0d+HCMbA6pRChUZDrYkpu6vEAzpjbo+e3G6lZWXefJgK06r0k1uWptMNGPJy+Bu94aJFkMn2jjRBHojTEaYFHOEGX2yDMv5P6XWBGu37k7GaH+n23HoDWPdv0nma1FgK4E887mVv/6f4i7H/k86TEalF1d6We6oEW0RTFKx7czsMBVIvEhAA4cRSLJedhEDnq145+8rwI73DJcrOHraqXatgX4SM4ygzP/HBEKB8T/dlj5WRES5S1A0Tr+LRLfxnqeP1gNchXloTjLs0zfGt4s+zX3tgvUFqanigOPxheohW+EXY1dD6isI7njqk8/royDwdFPv3XsLfRmWFnGUy+6fL3ySNIA7WyCUr/zUBImdWWOmbBxKgXyGeCWnL7mdZPJqYIaIb0KzyLsCj48+ioEWBJovun0MWf/q/BKwA= X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB0908;31:S6fRDUgPISW6cO2/hpWQEaWp2GraU9V7YMgtxS6DWFcPSzboPAXYxeBZ6W37S6cKancFiqvDLvWY+8AHRbqTcjZKcwOf1J2EoI0036RzUmzScClEJVcKHQeWZglyL/Ac4WOzxIjcu6GPK5u4DxFB6ygWORfU/ndtIjia3CNYMg5JZyEnaA0rHELhVaBcj8Fnn1UhSRkld1eCq4criLroTF0SUbuKBC6Ou0XAEfpswvt98udWm0AHwwJJEN/0lcrCuwdVvqTSRo+WGkujAlyCzQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6095135)(601004)(2401047)(13015025)(13018025)(8121501046)(13017025)(13023025)(13024025)(5005006)(93006095)(93001095)(10201501046)(3002001)(6055026)(6096035)(20161123565025)(20161123561025)(201703131430075)(201703131433075)(201703131448075)(201703161259150)(201703151042153)(20161123559100)(20161123556025)(20161123563025);SRVR:CY1PR0301MB0908;BCL:0;PCL:0;RULEID:(400006);SRVR:CY1PR0301MB0908; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CY1PR0301MB0908;4:inJ8Wn11TH55GlZHwl3evgk92bb4oXz4ubrdQL3f?= =?us-ascii?Q?oXeD3c08PRUQH/fgQcNhGlqkZUFQ1WO9IkonqCOMCfC4aqeEUr2rfnZEsEAg?= =?us-ascii?Q?OBFVL1EkQEnqKrieIWTpUUPhY9MBbsfdjuAANJ73PpIFc7aHMlmjxR00LHCA?= =?us-ascii?Q?Eu4EpZ933PkSmTM1fEbNSqzJsSYJJO2MwU+bXe5YFQZF9L6osVkQSrisANs4?= =?us-ascii?Q?SYt79O1bCsX/Qjxqc1DgyHZvG1i0YEECTRQPq3wpV9rjtWGqrVi+cE+zbx9O?= =?us-ascii?Q?2YsAiWhmSP38y9mldfSMaZekHyxplDhcWKeg31IksHQRHUJp44q1KIuvF+Dy?= =?us-ascii?Q?b3rVVSI020AoWBQrE4/SbjVc0+Z5dsk1R4+HG1Kgnd0YsngUQPGL0HrBU9A5?= =?us-ascii?Q?qXGKFU0597f05afMmaIWancppNsNcrnxx3ayKZk894jiAcFeHBwEgqzO3qFU?= =?us-ascii?Q?+0M6YfHZEDrSZDxK8T6MUg+zBPZLvKxzMK+3zJOQSoV3OMFfjjOz+Wk/0Kgb?= =?us-ascii?Q?q+XI99ZyGfzTTazPD1pk2Y+gx3I/fZqr1go6fckTESvdT8IPbzf+gzVrIJwu?= =?us-ascii?Q?NJP29Kwm+DY1w9OUVQ2G8kwfJb2xOYWd1ksWCsw/pWHtUfWEJKBV2rrpe/yw?= =?us-ascii?Q?en8mhqcCEk/2CrzX1ZItEXwGiNo4SLdUccl+6JF7JJZKQO7UsVeuDUItvIXW?= =?us-ascii?Q?dKy033APqjsp8UwNpJKCFXbA4Dd7pOXeFvOSKTPnOHmWw1ykVp6stbiv7kdg?= =?us-ascii?Q?oPxmJjCyrKG3TaAXJDTEJxmZ2HPRZ98rq2El63b3uKA/YclewuH4dX3KB2Kw?= =?us-ascii?Q?ZVTrqO7uhUJe2fJRRdaQmN+RzmGSb1YP8dfSBGzjZy9P8KmDsmCHLFg/HEJZ?= =?us-ascii?Q?pBM2b3+wq0QZKBhR5VAXszZfmPJCcJzLO5iwdZgotmdODTifpGOcDy0Ple3P?= =?us-ascii?Q?OpeIvE0x37dEygMRbOS54Yhll5ZTnSu2EaGqETE78Q=3D=3D?= X-Forefront-PRVS: 0316567485 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CY1PR0301MB0908;23:wrAFDJIQqDFLt1imwh7QvG02vd9jeG1idzmGWG3?= =?us-ascii?Q?Hg4Nt1dEP8mLwU3HSqVcPuDcqLCeS/4XoYggZ4Fbjq3cVegZSabzMTuGvzae?= =?us-ascii?Q?6iQ/HQCfegR9oPggYKK20W8chymkvkmfZ0hQg8rZ2XF97nLsVohNRf6bHzG/?= =?us-ascii?Q?lWCPdxF4ocxkft1cALpTDuNLEb8OAooqi/WF6IiTqOx59EcqhsA1h5YoQuNb?= =?us-ascii?Q?e+Q0VfnlIWxsSLbeAjwospujf46OxMDEqT1oMjOp1E2XBdq3cR/DvKqap+3x?= =?us-ascii?Q?Nm2u87hUjg4MfRd1dni8+goR37A0lybhw5alFb3TZXhvZd3riONHy6b6JL2C?= =?us-ascii?Q?R1uxHXOlzHFKNCuoT3CikvO+dKgAZ+8MinXOayUoO8LKaLDIEKhVgjLKunVL?= =?us-ascii?Q?r40dI90EQcFL0eHhs0hERROcVtg0xC7spC3tx/GHn4okKCCo60C5ibptqFCP?= =?us-ascii?Q?1gIpwIdJ3ebfqzS0eBs4WDF1BwZuddyf/i5heNTFllo1k3RXGJpdIPBSYw5a?= =?us-ascii?Q?9gEIouoZeEUHFaqBARTZmCfQ+nn9h38zYEkf/45B/drPBRjW829NdsM6bJ6i?= =?us-ascii?Q?TFlktarM3irmKuE1rZfvG3471u0ZX2GoXZaDr3Uuv5JWOpdWtVb1UTVbbNzV?= =?us-ascii?Q?jZqVPTM66tYSsDqY0BqRK/3SJBpUHbuW7fzAMa53NTC44x3XFOHxTgonUkSB?= =?us-ascii?Q?YByAB4H/yX0XvPr8ZfYZqDY9CajHCutEHVuvoEzeuewn8Yvul7jhqgtRt5pG?= =?us-ascii?Q?WgP33yk3WWMNRAdi5cQSL2wDL3aNusA1riQOHFU7d5nrpWCFkNxWsCahgGZL?= =?us-ascii?Q?Kln462uwpmQ9mupOfFWGZcXh6Nbs5Nz1hRdDnLw0wdIpY5uMAwZhBtpSR6SX?= =?us-ascii?Q?7Qr3wAXb5Svxg8fyK3gJzDBAvF5gW8v/ueJ8lzwiozoVD1rRwESsoX5YNZUh?= =?us-ascii?Q?CZFv+8AZEU9pkUVTwlv4R6gRU29JKoxbIrGFiDWnrZfsKJgO4eCSYfUBBnNY?= =?us-ascii?Q?buuwECysgbdEiuDIJOVnjgQU2S/0BTLPNo9O/neIPx+BINT4Zkb3Az1S7RS9?= =?us-ascii?Q?JGahnvgfxuX0T1RVuOHwFCH1/dQMWJ3mgNs18S7fOIaQOwrcdBoouMmKxo3L?= =?us-ascii?Q?ISKxoLIDt3zsMtKsrYPAqWelj/0eXGmeAW+gPCf0bZzPfMPj21jAi6Vnx58p?= =?us-ascii?Q?CKZW61aQLNs8ZL0o=3D?= X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB0908;6:v/qxXSvzbdx73x37HRd3/hhd9WUFo58w5GwYgQlS0mPSisRHLZpXVIBW1xAGm6PqeD87aZAYXcKNFmLyOrahk8MhLsTmMXkimueZd6/suBMPE3L/0MIqEYdvqIIQ7LxxUTj6Tk5VFcJk9FFH6TKbY3KF7BtdYMJ5E4C+ZH4O9oMreHw2W2GuB/QDWOEekBe4tGVmGAN2JstJd2BOqI9zXHMhZsjqsSJBOGEAQsKBLy0OtcTnRaaqwT6L1HH1nMzYNMhhABt4g/utJpxKPxtbkCgciy9QRn+0rfngrD0k0sT9VoB+d53Wl5z+8GR312LpyAGQE1eviuMV7xJUY2+ysGSaW3Gup7dwxI123fGe+y07kpGWOyQ7fNdP/hAkkg5RheHKM9lETFuvKPylJhwjBh91JbEwVFR9Wjc+C6nKMK10mLhlc3i2R0pyZgN4PhLumJpCKQhLEzcBC8O1VUFBS4bNDvW02LEIHJmgqmzk3x1cwkO/1jVvIE5Coi6rr9UF3yfmrBkgCdgS0DAkOTHfgg==;5:Ir++G+3J2tpArB96iAKCuYQBdkD7CRZKn+PWaRQKzqtbdqnJihXD54uI7jzcbIsvD/EUM6LM7H2ingOD9J2N885s/hmlejeF1G9NEYbaq5V5co1zhTup/HsqSQeTVWjzG0n5YnzHWoOw8dEwhNPq4BXEDa/p4/kTmw5vIvD1M8Lu6vjUOdYL3JXsxK3YVJiQ;24:8JDNfyk/NPoyCWxb2x6vL1pNG14HO5rQEslf/6w9pDQaGMLZkeAWj6Xnhe/Gip5xEoBtw65qhPakc5n5W+EujYgo/yW5iWpDdTLRPjF7kGc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB0908;7:9bndm8ZeusPWPlxsEwUZSVRRwlgPWYuY4Tr9ymZEOlNLrBvXni5qq6tmeTYyWZBEB47qPttaks23BsQS7XLIDzcQpD/VTBwYGCa3tfadtLh+Q5/f9OOBkglT0qBMi8tfYjV3HYQt1wO5U62pk59fn8VTvKDi22Pae4YQKckabxaHAJlJyxuZrGekZSLtpNjwJdwZy95F49v0ECFpEYM7Iyt0EsNlnNT2P84NNkOysSPQ8rOKT7oSiiQLNt8BP7UEm6u7VPiIN/XcZ5UQ8R5770hNSzo7lR25nqtEWz//W8P3/Cw+DaJJgybBwqqjMh5l0b5RoHH0Y5nSYLljbQA1/Q== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2017 15:53:23.9270 (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.168.50];Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0301MB0908 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Complete the work started by the following patches 5f6c99e0 net: phy: fix a bug in get_phy_c45_ids da1da284 net/phy: tune get_phy_c45_ids to support more c45 phy in order to properly get non-standard C45 10G PHY IDs (e.g. Cortina CS4340). Signed-off-by: Bogdan Purcareata --- drivers/net/phy/phy_device.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 1219eea..fef5627 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -335,7 +335,7 @@ static int phy_bus_match(struct device *dev, struct device_driver *drv) return phydrv->match_phy_device(phydev); if (phydev->is_c45) { - for (i = 1; i < num_ids; i++) { + for (i = 0; i < num_ids; i++) { if (!(phydev->c45_ids.devices_in_package & (1 << i))) continue; @@ -488,28 +488,30 @@ static int get_phy_c45_ids(struct mii_bus *bus, int addr, u32 *phy_id, *phy_id = 0xffffffff; return 0; } else { + c45_ids->devices_in_package |= 1; break; } } } /* Now probe Device Identifiers for each device present. */ - for (i = 1; i < num_ids; i++) { + for (i = 0; i < num_ids; i++) { if (!(c45_ids->devices_in_package & (1 << i))) continue; - reg_addr = MII_ADDR_C45 | i << 16 | MII_PHYSID1; + reg_addr = MII_ADDR_C45 | i << 16 | (i ? MII_PHYSID1 : 0); phy_reg = mdiobus_read(bus, addr, reg_addr); if (phy_reg < 0) return -EIO; c45_ids->device_ids[i] = (phy_reg & 0xffff) << 16; - reg_addr = MII_ADDR_C45 | i << 16 | MII_PHYSID2; + reg_addr = MII_ADDR_C45 | i << 16 | (i ? MII_PHYSID2 : 1); phy_reg = mdiobus_read(bus, addr, reg_addr); if (phy_reg < 0) return -EIO; c45_ids->device_ids[i] |= (phy_reg & 0xffff); } + *phy_id = 0; return 0; } -- 1.9.1