From patchwork Wed Mar 9 17:27:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ioana Ciornei X-Patchwork-Id: 549842 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 25C2CC433F5 for ; Wed, 9 Mar 2022 17:28:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237152AbiCIR30 (ORCPT ); Wed, 9 Mar 2022 12:29:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38914 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237115AbiCIR3P (ORCPT ); Wed, 9 Mar 2022 12:29:15 -0500 Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-eopbgr10078.outbound.protection.outlook.com [40.107.1.78]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C52385677; Wed, 9 Mar 2022 09:28:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ibPECsVUCTr/kXi9Y6I1IGfmVpikg7+ARDCIqVIhJ2RXTGNuH9tBoOiw4Js8Ura+ilRm9KyxbG4xF1tAEl/5rgU0S1UIy314Ky+PkMR0JKvMOQ+y10tGAnB34oHlugE+yi9uXXqX1rpmcVfkt2qtBOpMaImh9AV9M1rZdFa0PXoZ3HHWDwBDH1n6URL57ghlAfyeDEEmX3Z4BtoFbjDjPwCNKe+ktz2jiG8Zo6xQs7OW/bIHI5gT8DbMJ2vjCwxATq7QbCj52FNOcEU3KwE4FOdnacs6NaCeviKJUtjhD2yvT9qm81otRyxmluj9RgEtGUrMtxMNEmziPOByWN6epg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=FucX9JaTRUg9FLv9x1Deve101OdcvTTWCjSRueZfDTQ=; b=FCssuogeOLH/sKNpVbcvOzVCNXM2OEAYhpKjzgFFa0zAsM1FDlQA3fp2Yq8Tv1ZzN9FHVpHbEO0xEjCbyeU+q098Fxf0RYfhcF/JZaasclaRJqQTOpiIQxq671uFXT1afFar5JXADBd8cBJMdzjoMIm48VcfnbX8qNgCIDiEh6eZUDvuUUs3TvJBXzFeKvCqHxnxtEZRpruuS44+69rj4BfJH4aibOMB1MxpL3tgRz06fTu73nhXHm23BdCaWbQ1CqC908YFU0nBBzCPLaYM2Yj5BswLNgd4yKMo6Fa0NLl/T/Fri2U53jKWxPvaWFj7Syx6gieURYBmM8YremGsIg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=FucX9JaTRUg9FLv9x1Deve101OdcvTTWCjSRueZfDTQ=; b=gJSnbuGOjovjNT+UPXPCDg6KcEER/Rfbzuyb88+JQTAIcULvBWiGBgrUeJZrjtZOaoWm/MC4s2R5SnZkHpVCodP1PWQoYpTQFcGoP5GjIcpoPj1q1QNwl9ab3riUUEop+WWZrL6Vjm6rbhdhSGm2rt9YVdoHSaTcKX2mfBQQZlQ= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM9PR04MB8555.eurprd04.prod.outlook.com (2603:10a6:20b:436::16) by PAXPR04MB9422.eurprd04.prod.outlook.com (2603:10a6:102:2b4::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.19; Wed, 9 Mar 2022 17:28:08 +0000 Received: from AM9PR04MB8555.eurprd04.prod.outlook.com ([fe80::c58c:4cac:5bf9:5579]) by AM9PR04MB8555.eurprd04.prod.outlook.com ([fe80::c58c:4cac:5bf9:5579%7]) with mapi id 15.20.5038.027; Wed, 9 Mar 2022 17:28:08 +0000 From: Ioana Ciornei To: davem@davemloft.net, kuba@kernel.org, netdev@vger.kernel.org Cc: kishon@ti.com, vkoul@kernel.org, robh+dt@kernel.org, leoyang.li@nxp.com, linux-phy@lists.infradead.org, devicetree@vger.kernel.org, linux@armlinux.org.uk, shawnguo@kernel.org, hongxing.zhu@nxp.com, Ioana Ciornei Subject: [PATCH net-next v2 2/8] dt-bindings: phy: add the "fsl,lynx-28g" compatible Date: Wed, 9 Mar 2022 19:27:42 +0200 Message-Id: <20220309172748.3460862-3-ioana.ciornei@nxp.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220309172748.3460862-1-ioana.ciornei@nxp.com> References: <20220309172748.3460862-1-ioana.ciornei@nxp.com> X-ClientProxiedBy: AM4PR07CA0014.eurprd07.prod.outlook.com (2603:10a6:205:1::27) To AM9PR04MB8555.eurprd04.prod.outlook.com (2603:10a6:20b:436::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9c935750-eace-4061-3cb0-08da01f22d85 X-MS-TrafficTypeDiagnostic: PAXPR04MB9422:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0fvu32VT0HmqRQGvoJ24r/ARdQqV8psybu+7Zn5WGvcavRS023FxsxbyisFNrmNG7aQL9JiFjUu3Nmj2gJI4E/MMVd8NAdvaqgiBUNc2E6DCdeR583dpexkd2vgg6nd0ThQRhrlQe7la2kQSIypiSIVb2W2WRKm3b3tKKZdWVOT5iKzhbfSZM9YiP9vDW2KSb+1lMO0y/WcfsEp6XPMzl4wVo1qWAxSX7DZ+yZ+sZuGn8R6YjJ6Bn3O+30ZGr6Mmd5UXjWxp0f4j6rUIbhnD9JC+h7eH0t4ZeQPCHN29soiFOtZ0BqPYksLRREJgz+8l+4+i+xvMdq/CwjncFoU9V9I0sEdQ27rwTXNBLfwP1Z18ZeV41Ceza4XizzfBBWxqashEki1aJcHnbN0GYVAp6lY80++Qxkp8UgtmLGD+aDM1IYwTXiliUkTCrZUEP0vhtcjiWqjiKUeNdjj9UbcBaZoDRGMun8cOiuokWe+ytp3ET66mY1nrZ1Oedvab5zGz7tHE62l5RjvzxTgjHREbsivo7D+8ARKP2UnwNY6uwdSV3DqpUWGSxvYf4FEhmMT87TZisg5rS7i8WvIdnSYlajmJuHz8KEl0H/QpqxFzsSxg/NJ3f1lHW8wLBVF4a2cEDI5IIi0NO1MTCPu3wLyuwEQ5Bz4PMpt2EkMsI2gwlw0O9jlSitiUi1FXRBCtLOtOfSyBF/eS52erabxkNs6WFIhR+OP031Vrxlx+5xOFeaRycEZqWG9eIHvyDdLh21goHBQGJpuqmc0bsXox3aMgqbq23kHiRJXG7mY1ahx/igTMDfm2wRHecdmjW24SmxOqxEb2scWlmRRTjUlTZiodrw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM9PR04MB8555.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(6486002)(8936002)(52116002)(2616005)(966005)(6666004)(6512007)(498600001)(6506007)(5660300002)(66946007)(7416002)(36756003)(86362001)(38350700002)(38100700002)(2906002)(1076003)(44832011)(66476007)(66556008)(4326008)(8676002)(186003)(26005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rzh86WKoqczlG9PJKg2z1CRFQPWuiVe39OfXrg890mXpekDIhIVhxVW4MZCjYd+0UE38/+n6tPSrnTV960ImFtLyCmazIDDvgGEo5WsLF0l2tx2Hoe8YdBepUlnZU+Wh0kJfmoO91ciaksfAmUzJDCiUWpHZOaRvSx19xjFf9PO7klDeIY7JN6jJBY8o8E9daBgitGS7bH+93ln5mFfJbmH4RSY1TD6fGdG8MSpvG409DRxi4VwOOmH6xY9nGqT7btkj/mQGXmwZxjKL/CjqGT0og/9wIcjDbaFvIQFFkqXsOE4Dv3T0G1dwbyp6zrdKw5V/W+KdkvuH0rq6xufOYqKCwHzDL95j8oTKthCB0Yx7X3ERHyYShLAsfy87C22ZXKggW2sk3Nf64GlFY9VvqB4nm6KntXQpKbcTvCK64e5C1X6GqMFWVZ9Znk1Ac0oD0DVmk2GEb43smcJcxmPqJIkHEidYY0CnUB/3uhEotGFlYu1tpNQL6eKzuBMylr8l44w0SWhtumOVpes5QmHB/XOlvLdJijp1/XEmT+fTStmUN2wNKWWi2rQo/uVfiVKflo/c3BKq7OwcziCcQ/M0b32a0BKBSkfXes+hYlKjh+/hknYbE5W/tDA9Jyu68rMpq1TcL3zLTQRWKzhYaz/saSsUEkZBUrflP762mVU6w9s+V6pXS2NNG6c8O1mfABsidV+anrRRwGhx76RcsZrgWe82ylLMLd1iSeYw/opljoYrIq8VtSEXo59BTA/UJbd0awrhNapMeV4b95EIXBr2uuEuGgHh5kXf+ueMV1Mip9i0Trb8nDZPbeiKkgoYj+5wz/vmIJE0B+3516CHsNCFIPDOr99zAuq4kz9+BJdG9Zqa5VP53BwzKoti8fgUtZNw19+uvQWvzlNsD85HlQ7UpTsNzU+QjVolPDtLyCS7JiMEsRezV2L0VXaD91ypeo21gQjFePDmL9bBBe72mMsH6MVWQh7l2DE9GikQM0+4pe/7QDMj7eElw/oYkNLdPMUoTIMPwYvZKxv0GieBIqfqf6We4MqzMNHZxwzFDh8ix5E0zGDCbMdqLHGXobyK4FDI2K3lXDOfUX0bSQrHDHeA7L+YQ/5A8w26DVgnBaH2DEsQ4+HAnxhAMqpi0H6I4TIBg2dEKxg9y1Cb3N0nF5X9pMMitNKnhy6JJsnQHZ3zme1NQ0jn5XZ6DxdyOK2Gix9n2F9WrPiSe4PbUlRX0UlAAIWQb8Sj1JNFYPFagkgTYKKg3TcsAV6RBjoDKEAQyp1mlvfF8u2N624VHgWY0LejIA8cwQkSQuT/J3YH4/kEPpsJKsFCU8ggJgvXKfuDWMPoGhvH9AVyUVg5uOkN7+rvsCLgANwp2nI/39hC2T6rZ00fbYvMqTlNBVYjEDEOtv6IyvpU4z1fqJRujbxfMn6PanQjMglzWKuHYkhE/ATeWGoHFaibPQZ3LsP8vWCzPJrY7mDxN2uTQfYg7pQNMtyeHMdqkCoEXUh3Qpn8eTVJ1PYSt/0z323B3fGdXTpMPV/owCdiIvazqrdJGMJ6j9eFSH2J5f+ZyQwf0CeqKKNZUgyG7ItQc1Kc3fT9W7Poht1aoBgDQGcDfWUp/O0dDHLyGfW70oOQfJcYwTCuqVfmQ4I= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9c935750-eace-4061-3cb0-08da01f22d85 X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB8555.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Mar 2022 17:28:08.5641 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: tDJduhZ5lI3lImqoQtuR5enT4V9L355y2s4arg/OanOUyGjgsBLImRDoi55V3N62ERYeVnhnAXeIHdJ1VqKgEg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9422 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Describe the "fsl,lynx-28g" compatible used by the Lynx 28G SerDes PHY driver on Layerscape based SoCs. Signed-off-by: Ioana Ciornei --- Changes in v2: - none .../devicetree/bindings/phy/fsl,lynx-28g.yaml | 71 +++++++++++++++++++ MAINTAINERS | 1 + 2 files changed, 72 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/fsl,lynx-28g.yaml diff --git a/Documentation/devicetree/bindings/phy/fsl,lynx-28g.yaml b/Documentation/devicetree/bindings/phy/fsl,lynx-28g.yaml new file mode 100644 index 000000000000..03e7ba99301f --- /dev/null +++ b/Documentation/devicetree/bindings/phy/fsl,lynx-28g.yaml @@ -0,0 +1,71 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/phy/fsl,lynx-28g.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Freescale Lynx 28G SerDes PHY binding + +maintainers: + - Ioana Ciornei + +properties: + compatible: + enum: + - fsl,lynx-28g + + reg: + maxItems: 1 + + "#phy-cells": + const: 0 + +required: + - compatible + - reg + - "#phy-cells" + +additionalProperties: false + +examples: + - | + serdes_1: serdes_phy@1ea0000 { + compatible = "fsl,lynx-28g"; + reg = <0x00 0x1ea0000 0x0 0x1e30>; + #address-cells = <1>; + #size-cells = <0>; + #phy-cells = <1>; + + serdes1_lane_a: phy@0 { + reg = <0>; + #phy-cells = <0>; + }; + serdes1_lane_b: phy@1 { + reg = <1>; + #phy-cells = <0>; + }; + serdes1_lane_c: phy@2 { + reg = <2>; + #phy-cells = <0>; + }; + serdes1_lane_d: phy@3 { + reg = <3>; + #phy-cells = <0>; + }; + serdes1_lane_e: phy@4 { + reg = <4>; + #phy-cells = <0>; + }; + serdes1_lane_f: phy@5 { + reg = <5>; + #phy-cells = <0>; + }; + serdes1_lane_g: phy@6 { + reg = <6>; + #phy-cells = <0>; + }; + serdes1_lane_h: phy@7 { + reg = <7>; + #phy-cells = <0>; + }; + }; diff --git a/MAINTAINERS b/MAINTAINERS index dd42305b050c..888d07ddc128 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11340,6 +11340,7 @@ LYNX 28G SERDES PHY DRIVER M: Ioana Ciornei L: netdev@vger.kernel.org S: Supported +F: Documentation/devicetree/bindings/phy/fsl,lynx-28g.yaml F: drivers/phy/freescale/phy-fsl-lynx-28g.c LYNX PCS MODULE From patchwork Wed Mar 9 17:27:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ioana Ciornei X-Patchwork-Id: 549843 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 49023C433F5 for ; Wed, 9 Mar 2022 17:28:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237094AbiCIR3O (ORCPT ); Wed, 9 Mar 2022 12:29:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38834 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237071AbiCIR3O (ORCPT ); Wed, 9 Mar 2022 12:29:14 -0500 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2054.outbound.protection.outlook.com [40.107.21.54]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20E0E888F7; Wed, 9 Mar 2022 09:28:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Xb5+w0gmKgbWt6ykmcjcbJi/LkmAhrroMxKcBAOn3nVWJ4MxkbhiebOq1hAjQJbCxR1058XqlhVPlErgkVSEB5yQEm4HtZeUniesxJE42relzZLcrAkz7ZEUNg2k8MeMg3I0v7Bo17InFWMhVewrswRHlB1FIQHrgpwKgVcKWQshNtmsYKBEFPFawTQwc2vgrXLZpARDpPQ4ytHeO5nsCjDgPH9aOjX9Xcewa78rV5St/QGDoosr335K3KgbiJn6alRdj+UwB7W0oYvTGGrA564IaLbG3PWkypCfiZ5j5sakSuoRt13RMZDO3nvQRuXreF4wcEXE/MJPlusJuiUGCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Iw3Ycsma/+sJBmXhQFSTxXI/+6xRXp42ASo7U6HEBVo=; b=iK80OesHo/uxPHA8aK+9F8MM77SxYIQypHkkulobOHPT3AyjxCDot7Yr5kjTaGGXE053+uFitQkvTqp76YQM1ORdqmbD85JRYHhtTLg31i5O7Epie4AjJr4zFzwT0QPMWY8kAsMmPMrvCU1sjxh5fPsV+GvR8fw3aBVj2JPhK5sGSdiWweRuuPIaLsG3gbEP3z6CwoQYmpgslsK0Menep3lsvruLFApSe+QlNJQTz8ibBEEE7OFHkBIsrC21+mPnVGQHGGQKHIeSW1Szvx5GT8FI1+3sRsjvmU2+H18/QzE91GstsO8LtYx1W+EjgnmtK98+6vkrCt99aHogYCquBQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Iw3Ycsma/+sJBmXhQFSTxXI/+6xRXp42ASo7U6HEBVo=; b=fvLJ7NLHJY1FBE6g4txRd3np8VGBPP9vvnPV/lC8krK5ERxmHXOl2RwizZVV4hRvE4BX3Gib1U9S6jIvICFe5H5d7knvAu7JXdHSFhFiPa7W0/gxjgthYCNHGvUZ6mpBGmqmDaOyse/Eqo/tHbw9oj5LMx1i6HzgX45/WupEFzk= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM9PR04MB8555.eurprd04.prod.outlook.com (2603:10a6:20b:436::16) by GV1PR04MB9101.eurprd04.prod.outlook.com (2603:10a6:150:20::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.25; Wed, 9 Mar 2022 17:28:11 +0000 Received: from AM9PR04MB8555.eurprd04.prod.outlook.com ([fe80::c58c:4cac:5bf9:5579]) by AM9PR04MB8555.eurprd04.prod.outlook.com ([fe80::c58c:4cac:5bf9:5579%7]) with mapi id 15.20.5038.027; Wed, 9 Mar 2022 17:28:11 +0000 From: Ioana Ciornei To: davem@davemloft.net, kuba@kernel.org, netdev@vger.kernel.org Cc: kishon@ti.com, vkoul@kernel.org, robh+dt@kernel.org, leoyang.li@nxp.com, linux-phy@lists.infradead.org, devicetree@vger.kernel.org, linux@armlinux.org.uk, shawnguo@kernel.org, hongxing.zhu@nxp.com, Ioana Ciornei Subject: [PATCH net-next v2 4/8] dpaa2-mac: add the MC API for reconfiguring the protocol Date: Wed, 9 Mar 2022 19:27:44 +0200 Message-Id: <20220309172748.3460862-5-ioana.ciornei@nxp.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220309172748.3460862-1-ioana.ciornei@nxp.com> References: <20220309172748.3460862-1-ioana.ciornei@nxp.com> X-ClientProxiedBy: AM4PR07CA0014.eurprd07.prod.outlook.com (2603:10a6:205:1::27) To AM9PR04MB8555.eurprd04.prod.outlook.com (2603:10a6:20b:436::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e7812c74-0139-480b-2519-08da01f22ef2 X-MS-TrafficTypeDiagnostic: GV1PR04MB9101:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DvTdfCbA52HEFF7Oxviey9AW85F6k7bq4HjqX4Dug1EYziDR6ZGCi0UMqIb2bvxg16zGu6I37cgTiLUnfm0OXUG4h1pKX4YszbPJEAKXyPn2UDwKbHjh0emZQjo6rxfVie2bgt4Hp8+XfURdx6Hmc17Ricss57M6YBblAbT58aUWMrt5qPmZsM6Ig3Jk8QtKF5FeGt8wzHW2vPlcle1rXwW0yz9ujErIBMFV1cBasm7TbrRVmBNa441sSwtglweKZv086+fpfymtb5QpgR+X9pHO4HGcp7UBus9OgxxmyyzvN3HfXmnFnFVvEph6jZjqUYM5pTtZ2BDy3qDObnm/JpblBSD1tF1nXt6gW5NWTObnQBVJSIDNFmTlVu4jQAdVEnX2Lpm+s+G6BfCSVjZHlXC3qTP7+powjkQ+SVCm5/+9Bv+l6Jc/5KGbQ8KayNjVaZt/LxsnB3Bd8ag+H5r3rsz+hUw3EzS5rDsh8X4AWFEF+28t6ty6zPTzjgnVnuLuBmgjLsFFHJLCFtrn9kgK377F4ciV/vb4NjM8sXYetpOuP4jiv3yg+uma9P3x/DKLiulvNsW+oS8gjlnILCtKyZjF9GQVcNVoqzzG5lbiLI2mGRZuQr3uvbYBW5T76BAHWdjBZzhS7GZmPgAdcfDIxslvBpxtymQ3Fbo1Ff9YXQcQITh3U9NpMQt73+BKtODKiL1VfJzZyE+wGtx0WoT8vQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM9PR04MB8555.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(6506007)(5660300002)(36756003)(6512007)(52116002)(8936002)(498600001)(83380400001)(44832011)(2906002)(6486002)(7416002)(38350700002)(38100700002)(1076003)(4326008)(66556008)(8676002)(26005)(66476007)(186003)(2616005)(6666004)(86362001)(66946007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HbIBGgbn4MqqJiUD+u+fG9hxxdqtjeXf+Rayj+wvH0GRRmePjPptBnXDsWV0oZ57HYM3W+2Dgz+cOD/PipjVHrCGlAM4/l8xXyvc+/C5/SUlFL9r75pClcw0jIq8qQg5GxJ1/dF3Y/pushQzUleR/fxuAAJCje7DVG41UFE1z7QY6cigxPJxDYOaZvQxlfXxLs+HEvcSIwj4g8S6YF0SGuwksx9vA5f/mpSzycWD7UE9fJnu2KVa2DaBSuXI0Eq2nupTz3rIzaAKX8G/Pa8XYyxLsdbbE3oKJXC/Qs7wME2Wfcb3ntmuK7dZw7NCYiaOhV5GutFY7W6Z2Q4Ccw5q13F0kWUwVu1LPUTuUPv1yoec0P+8SPeNVHyNPGjYg/hRuLgsOPAAZ2oxQW+uGbYOP50PBOLJELfXMB3yh82NrQzPYSXi+Q8GnHdDR3Rr1sCbycnSwfTnIxHy9J6jZ74XCQCTYqN6dmwz5B/RpJxCPArwQklXa1ut+PFfH6Tf+TluZIgjmg0WdrSB5anpTal7XloQL6zF6VuGFPW6IBSNi7XTWXZZyVhuqM5jewUF/iSFw3TJnezXU3FIgeEZOCbvTbnn5kb18I/XhYGB0CKhd2vxfxxCcL7Moz1a1WSvr9dKIolwX6YfSU+ddJaVt1HnNnSJSVGyv0Usg6v3YwUhDZVrRHTwYBK1/yiVEdTN9f+2F1z4K548ISiMPjm65JBovFJL1bkjX6nuUbcgLRYFzZqka9di/X2KRpXgOW+BLQIdVhOE/GMc+MxIRK0nTWYNt8B7yP/iNdkf/B1O0iOs18ufkdoC//Xz/JU9VvSRC6D+SgBQiOup5G874kDNI7lfxArIGiz2UbkXueYEhKdArQ/YwA+Hzeoy6feogUusPMluu/i4YuUTk3VRxSPS7x2l9coX1LsvMKb08gSgC32aNfh9Y1p4cagLOFVaroHbkgkqNHxr2nMD+QuaHpb3AXYD/BoDAhTqPOvbevMszvtV856ZOEUbzT5MN7PsMpG5RcL/u7K/4eKEn7qauGOPHnV4h89/lLoFoCStcAbj/hQEL860609ftUmYxly5SB/4DHoCm+RlnYbv6T9MJjmj3zDdShOShwLNs0RoDcWs0+O1ej907GAjf+3D3LA4vLn4MOzjVR2Th2+ItDqmJEshxHR6EMlga4WoCnG2WcXBXVPrtZfJ0VvAlTL7TSCPG5+5i3oi6zBKxzIE82134uSQPIEaC1JADN0OVKQ6Ex6fZ5CyKtqIb1SDVPssT5diqb6Ywn/yLP5JgCPAl/NyjnkdgUBibQzCtexaT2YcYuvZG8tC1miE2K95tivXiUcgBM5k5mNRRIcDRswBteERR8t/H7E1JekEtprdEUEAK8IyJFurBiOd5kqHzVxWHrPdKWXLnjAaRuBJOHEDT2s5xaq2YTEbzEPIjR9vD60Q7eGOTmYmd9nEK3x6gfXZOf7FVMoWC3yY7b5+XKkNIaYQP+h3Rn/ortHZkXHD5FRwH/zwEJqBFUYQh6wEQhDXmD1tgE5UP4zl35gpJyErk0Ve7LgIWPhPgZAbCR+WRwlaN6qZdITFXDWOineK2FeHNL3K9LWWUcnAzZqnt9gWTzx7LUSI1Y/sdAq4cEInYkk0I4+yLX8CygE= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: e7812c74-0139-480b-2519-08da01f22ef2 X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB8555.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Mar 2022 17:28:11.2055 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 2v2mP5gMogmNg4OaewRwh/Q9YbS9W1sopZxL1ac5saFua4ncbpGoBtOUk8g8b/d2SWwUf+o/u0uEFtFE6PfP2w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR04MB9101 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The MC firmware gained recently a new command which can reconfigure the running protocol on the underlying MAC. Add this new command which will be used in the next patches in order to do a major reconfig on the interface. Signed-off-by: Ioana Ciornei --- Changes in v2: - none .../net/ethernet/freescale/dpaa2/dpmac-cmd.h | 5 ++++ drivers/net/ethernet/freescale/dpaa2/dpmac.c | 23 +++++++++++++++++++ drivers/net/ethernet/freescale/dpaa2/dpmac.h | 3 +++ 3 files changed, 31 insertions(+) diff --git a/drivers/net/ethernet/freescale/dpaa2/dpmac-cmd.h b/drivers/net/ethernet/freescale/dpaa2/dpmac-cmd.h index e1e06b21110d..e9ac2ecef3be 100644 --- a/drivers/net/ethernet/freescale/dpaa2/dpmac-cmd.h +++ b/drivers/net/ethernet/freescale/dpaa2/dpmac-cmd.h @@ -26,6 +26,8 @@ #define DPMAC_CMDID_GET_COUNTER DPMAC_CMD(0x0c4) +#define DPMAC_CMDID_SET_PROTOCOL DPMAC_CMD(0x0c7) + /* Macros for accessing command fields smaller than 1byte */ #define DPMAC_MASK(field) \ GENMASK(DPMAC_##field##_SHIFT + DPMAC_##field##_SIZE - 1, \ @@ -77,4 +79,7 @@ struct dpmac_rsp_get_api_version { __le16 minor; }; +struct dpmac_cmd_set_protocol { + u8 eth_if; +}; #endif /* _FSL_DPMAC_CMD_H */ diff --git a/drivers/net/ethernet/freescale/dpaa2/dpmac.c b/drivers/net/ethernet/freescale/dpaa2/dpmac.c index d348a7567d87..f440a4c3b70c 100644 --- a/drivers/net/ethernet/freescale/dpaa2/dpmac.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpmac.c @@ -212,3 +212,26 @@ int dpmac_get_api_version(struct fsl_mc_io *mc_io, u32 cmd_flags, return 0; } + +/** + * dpmac_set_protocol() - Reconfigure the DPMAC protocol + * @mc_io: Pointer to opaque I/O object + * @cmd_flags: Command flags; one or more of 'MC_CMD_FLAG_' + * @token: Token of DPMAC object + * @protocol: New protocol for the DPMAC to be reconfigured in. + * + * Return: '0' on Success; Error code otherwise. + */ +int dpmac_set_protocol(struct fsl_mc_io *mc_io, u32 cmd_flags, u16 token, + enum dpmac_eth_if protocol) +{ + struct dpmac_cmd_set_protocol *cmd_params; + struct fsl_mc_command cmd = { 0 }; + + cmd.header = mc_encode_cmd_header(DPMAC_CMDID_SET_PROTOCOL, + cmd_flags, token); + cmd_params = (struct dpmac_cmd_set_protocol *)cmd.params; + cmd_params->eth_if = protocol; + + return mc_send_command(mc_io, &cmd); +} diff --git a/drivers/net/ethernet/freescale/dpaa2/dpmac.h b/drivers/net/ethernet/freescale/dpaa2/dpmac.h index b580fb4164b5..17488819ef68 100644 --- a/drivers/net/ethernet/freescale/dpaa2/dpmac.h +++ b/drivers/net/ethernet/freescale/dpaa2/dpmac.h @@ -207,4 +207,7 @@ int dpmac_get_counter(struct fsl_mc_io *mc_io, u32 cmd_flags, u16 token, int dpmac_get_api_version(struct fsl_mc_io *mc_io, u32 cmd_flags, u16 *major_ver, u16 *minor_ver); + +int dpmac_set_protocol(struct fsl_mc_io *mc_io, u32 cmd_flags, u16 token, + enum dpmac_eth_if protocol); #endif /* __FSL_DPMAC_H */ From patchwork Wed Mar 9 17:27:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ioana Ciornei X-Patchwork-Id: 549841 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9052FC4332F for ; Wed, 9 Mar 2022 17:28:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235512AbiCIR31 (ORCPT ); Wed, 9 Mar 2022 12:29:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39504 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237140AbiCIR30 (ORCPT ); Wed, 9 Mar 2022 12:29:26 -0500 Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-eopbgr10078.outbound.protection.outlook.com [40.107.1.78]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9C0B18BF69; Wed, 9 Mar 2022 09:28:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eko9n25adjvGxGegNeSxz1kxLZArUD0CWw8zL2r5JKuzTmwPYJ/1H8Eva0eiXICbXEdJ5dVaRflnSqjk1hwKlj7lATl/JIsoaGuTmojYu/V/Vn5zdhIODwj+nt9K6r9rn5e/aC+cGOXXEZoGIlG1XWhmnZ2Jbb88PTyf40C3DH+wanMGhQ/1K6XcV3J0db8X1msfKnWffknLuz9ucpYMLs97iPZX1G/g8y9pA4yseFsqND8juq3RgllW87xXi5T+q19uZhZBFE8+QxipdeUnBPUcAsMqWuzOWuuvxnMAfhFx6Lecj42wikfcngi6a7PK3FaO0Wwgdnd3N5865rddBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=CjzYIQLdKTdgyHM+oE25auI3Au1YkRyHQ8i+TqxPTRU=; b=ViHwxvw6a/LW9oV3qtopshWqrLp3Y2OXudg6gfpF1ATVcy+aTl6BHp3seEd6mxnb6lXENC+kb8gw4e8NRmdWXAi14pe64ig6WHbgJOpE1j1BGEarWHldBTIh0NmESkUTdPxRo4FixzxOfnHnTN2qrhZg/LUKhSXd3X6bXcpPfn/NCBjEWnSb5zte6VpqxaRiMQvMKYKWMQ4sKMXUtdmKicZ9DUqyHXLKEXWfGNCVFzwUPs8Fc2r4OEmeoyKPjcGdQ5HTiMF690rSxni4bLBmXT9vDc23ijdh0Gj64JFhq/2MWSHNDi/5+DmswOOSQmTgbOaLPjK16Kmy4O68xWEZ5Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CjzYIQLdKTdgyHM+oE25auI3Au1YkRyHQ8i+TqxPTRU=; b=awHXOf7lIHUeQaNsdIY2jC9EsHKD0VP8cTVCHx6oHr2gOugRJTX38TnbI4V6R2DYmR3oUmNnafXcygAaS7MVd9wjw78Jfn+Et2neWQwZnScbvVGuKa6ZFusepg7YHbUMlu3r2dmZaFCj+Eg7Im3o8Nj5Oyz+FIoqwyfmJXHUXiA= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM9PR04MB8555.eurprd04.prod.outlook.com (2603:10a6:20b:436::16) by PAXPR04MB9422.eurprd04.prod.outlook.com (2603:10a6:102:2b4::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.19; Wed, 9 Mar 2022 17:28:13 +0000 Received: from AM9PR04MB8555.eurprd04.prod.outlook.com ([fe80::c58c:4cac:5bf9:5579]) by AM9PR04MB8555.eurprd04.prod.outlook.com ([fe80::c58c:4cac:5bf9:5579%7]) with mapi id 15.20.5038.027; Wed, 9 Mar 2022 17:28:13 +0000 From: Ioana Ciornei To: davem@davemloft.net, kuba@kernel.org, netdev@vger.kernel.org Cc: kishon@ti.com, vkoul@kernel.org, robh+dt@kernel.org, leoyang.li@nxp.com, linux-phy@lists.infradead.org, devicetree@vger.kernel.org, linux@armlinux.org.uk, shawnguo@kernel.org, hongxing.zhu@nxp.com, Ioana Ciornei Subject: [PATCH net-next v2 6/8] dpaa2-mac: move setting up supported_interfaces into a function Date: Wed, 9 Mar 2022 19:27:46 +0200 Message-Id: <20220309172748.3460862-7-ioana.ciornei@nxp.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220309172748.3460862-1-ioana.ciornei@nxp.com> References: <20220309172748.3460862-1-ioana.ciornei@nxp.com> X-ClientProxiedBy: AM4PR07CA0014.eurprd07.prod.outlook.com (2603:10a6:205:1::27) To AM9PR04MB8555.eurprd04.prod.outlook.com (2603:10a6:20b:436::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: eea7f833-a1cc-4073-3953-08da01f230a4 X-MS-TrafficTypeDiagnostic: PAXPR04MB9422:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SYL7gz/j9N6KsiA/COt1Q+nAWl6YO9kqPxVrfLBmN0pn8rtH+e5LWk/Pm26CF4a5sXbUpXpc8Gn2hsJJFgVqRIELWw6AlsxbHwwXCGGH8ABm45F5rGqF6OGgI06G8w5GLZnJwE55g2UlO0o+jwL3hilg8Z7EFP1i69M78D2ReYqasxcBTnmypdZvH+CWC94P/lH4I5FWnQQ1RFZFG3oCl2OZDV79EhO3gBC+qLAni+tkfCJbRCKuW/iGoM3KN0yO23zD8D57YrQ31BWirSO+cYm/rItnTkt4bbXaDX6ygsf+RmEhCL9z8Jx36bSN9BDK+zIY8cm90VJVeNV/ro7F5HBEZSPWhCGkfK5lHR7hJ7ND1kaiO1Y6s95/wx0tbtJ467ggiyeyCAviQb5cZmIGqiNJzZRW9vye3SYR619vLgG5RbR7z3RknuTqcga93mFkam4JqS1toBaVKTkBvlwkaeW4pXPpBwusXRIWl1iRkAovZRoWsNE0reBPkyicQ4mpzhWtQ4qexVjUk3KVAniQE5UU6ZlEnPcC7sCZpw0yDxDIuoxJw1LK6OGzXan5fGzLogB6eVMia9tX87o2+sMJMY3NsTN37XadhSIBGFjLwJlLIgfxnbDnYkdKCUVbjtCe+l37Z6jUqx2u8wXF/VsCfW+hUAywzFvsIMkLBDInDwnAj3RJUePjieb14IJVJcibTYa2LkLNCAAgIbEe2lY2/g== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM9PR04MB8555.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(6486002)(8936002)(52116002)(2616005)(6666004)(6512007)(498600001)(6506007)(5660300002)(66946007)(7416002)(36756003)(86362001)(38350700002)(38100700002)(2906002)(1076003)(44832011)(66476007)(66556008)(4326008)(83380400001)(8676002)(186003)(26005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: sBN2jM6/1srNL7zhS0OhVO8CKOtQkLZ+S4buU/KiO1XT6rG3Jv6TaJ8MFXgtQTZpQ7I0BA8Fza6qUsC/W2hvUfZk+xXGGkdseIusW9Y1eXvwngL5qSIhmn4Tb5zfVYGMwNH3HRfHBRpZlsvIeX8V7KAtAa5tZCPaK0veUuU3M7SnRyHSS5kRRkpDc3GPJhdzn/eiM3uNer+Vj+nCvgnDJjaS4n3/g80RQvFLdANKAzjOVoD6fId+8BTDc4ouhmCGvc0kPB5fa7eCWNhAtBX3Tje28/iDk2iYHFH3bwDBrAuQEegQaKO3dsd0xcqsmr6DFtbWFwWw6suWQpUaTcpazKPQFKU8HFfkCLuOKCWf19dQ8eNpM661OnyA8fmfpG7+HiXeqjwinx0ikWdRO4MDvJNQ9FYUPGuN5thEBZ4kDHVTCaIkyVjo7Q424UYs5J4e3JDOU/6PB2EUn7SvrMg69f39ID67YWNOCgpbIQXSHPmRyrMoEXg0KUrrOqApwZhK/uwDyoxTIGdnJjcRedoaP5D+ibN0NLYApgkZ2LFNHTLjNDqvLdQYmsOtD3EreVbnwsZPm1MeHdWNClFqOsiTIzGV79TU4xvdkw8qUpPCmAi7eLMY3jUfVjUBIvRhlUHkuZtwU0F4eqT9loj6KSrY6VPSmzwU20pQ88SEpU3TdfArHwgfhFqUv7CiL4ESks223Jf5Km8PsYvs6p52vh4d6wDc1yITW9B7/65q9TwZY26Alm4yG5o3z7FUhiMeYmZCbbUTDqgSRotl6ZFJHTf0+igJxuB2CvqZnawncoy9kRBo0G8KBgXNRCoF13Op7/X3xUfd74jjNxmXpFksAj0UGBHCpkTXk7mDLuC0JTRK0z9z31V0fU03/Eg7D3J0vy2J46Q9qCFPgmAYRoPzXu++Pyha7ZPjAmEor6mpSbgAhjXWJQj2J2hKTUjft2PRNpDg81zhg7k6OxZ9hzMIdqwcNq8oDEH9cGOi+75Oev3KtXHDu2InETsQdYETL4cWQa/HnMrHwLDOdj9UAX6XzH4EQlounObkvPgw4k6octoDhfzcx23p56POwD9Z2eDZJhUunnMt+CT5T0z7CqyFPtyU026dxjRMhJrqWt5QupItVwrS2fbiH4ODA2yT2yDgkateB3FpUZQZAriSS8Qk1k/PTQL8OkvYKc91gOzijfHU/7k44J1ohMjbGtbk9BcL4CwA5pUi9l+dYRlQTasNCeTtoL0oLgNRdXZX2ylGzs6WvN0szCtZPWu6LMkdyQB0XevPlQ2mHu1XQRtcLb7b/UF8ZFRbxZy6t4+8rGrWg4neFi4j+paHK+DDFBwRao2SomJoxCmlMMaeDlC6Gg3JI86XDVYyp/1q3z/IRPx00RftLBL4Wc18i0HwREBYpYOx6E6qo+uBOPCZA8JY4sjEZogkKqtyN6dxIfOuFtzFrnXW887fn4SVMx1UCb0N9gj+2ZA2bV9ny+tuvV502XAtzHyldQJu8OlzMMiWADjDj5bsENTQfXNaBk9u0uvfxaIJZUB01Qa/eAW6WUJbrPXm1ph2H8r2XSo2wXgZBSPUJ2WzB4XZZ0i8ODVjzKfqXbA6OhPOtGwxPJv+JG+94sFFwUuztXOO75RaKV3chEUluA6JYTo= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: eea7f833-a1cc-4073-3953-08da01f230a4 X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB8555.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Mar 2022 17:28:13.7391 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Ta01wLUu1fHK1CmHekj9jsxz0+bRIcYV/d9AYLGVmQUYy338uG8xA3txvdG1YCk7taZO5aZnDJMbZjoREQBcEA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9422 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The logic to setup the supported interfaces will get annotated based on what the configuration of the SerDes PLLs supports. Move the current setup into a separate function just to try to keep it clean. Signed-off-by: Ioana Ciornei --- Changes in v2: - none .../net/ethernet/freescale/dpaa2/dpaa2-mac.c | 43 +++++++++++-------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c index c4a49bf10156..e6e758eaafea 100644 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c @@ -257,6 +257,29 @@ static void dpaa2_pcs_destroy(struct dpaa2_mac *mac) } } +static void dpaa2_mac_set_supported_interfaces(struct dpaa2_mac *mac) +{ + /* We support the current interface mode, and if we have a PCS + * similar interface modes that do not require the SerDes lane to be + * reconfigured. + */ + __set_bit(mac->if_mode, mac->phylink_config.supported_interfaces); + if (mac->pcs) { + switch (mac->if_mode) { + case PHY_INTERFACE_MODE_1000BASEX: + case PHY_INTERFACE_MODE_SGMII: + __set_bit(PHY_INTERFACE_MODE_1000BASEX, + mac->phylink_config.supported_interfaces); + __set_bit(PHY_INTERFACE_MODE_SGMII, + mac->phylink_config.supported_interfaces); + break; + + default: + break; + } + } +} + int dpaa2_mac_connect(struct dpaa2_mac *mac) { struct net_device *net_dev = mac->net_dev; @@ -305,25 +328,7 @@ int dpaa2_mac_connect(struct dpaa2_mac *mac) MAC_10FD | MAC_100FD | MAC_1000FD | MAC_2500FD | MAC_5000FD | MAC_10000FD; - /* We support the current interface mode, and if we have a PCS - * similar interface modes that do not require the PLLs to be - * reconfigured. - */ - __set_bit(mac->if_mode, mac->phylink_config.supported_interfaces); - if (mac->pcs) { - switch (mac->if_mode) { - case PHY_INTERFACE_MODE_1000BASEX: - case PHY_INTERFACE_MODE_SGMII: - __set_bit(PHY_INTERFACE_MODE_1000BASEX, - mac->phylink_config.supported_interfaces); - __set_bit(PHY_INTERFACE_MODE_SGMII, - mac->phylink_config.supported_interfaces); - break; - - default: - break; - } - } + dpaa2_mac_set_supported_interfaces(mac); phylink = phylink_create(&mac->phylink_config, dpmac_node, mac->if_mode, From patchwork Wed Mar 9 17:27:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ioana Ciornei X-Patchwork-Id: 549840 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A4CD1C433F5 for ; Wed, 9 Mar 2022 17:28:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237149AbiCIR32 (ORCPT ); Wed, 9 Mar 2022 12:29:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39506 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237145AbiCIR30 (ORCPT ); Wed, 9 Mar 2022 12:29:26 -0500 Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-eopbgr10078.outbound.protection.outlook.com [40.107.1.78]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA82F8D686; Wed, 9 Mar 2022 09:28:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LjEQ2WsYgmCgi7zVI6ocANBXNM45gbci1AiuTZ2FzhsZqXi0Kfgh7JCvzJ5WYeadyIXMC/4l6+V5O5hNY30Qf5PBQipL7no/GWaXjuxQnGEknO6Wi7HFU5/f/qoQz093suYGO8lf7HbPZCzDkEWMtlRFVYGpQNvg/FxgRpmdqoceW7ZCWcg+FUuNWevQuUraMPzeeexusFsC2fgQ8lBcB3mgoUMuo1+wfd/NQOwmr2A0MSP6cLWtxa4GmOyNl7Uf0pLyhOB8VMOzRhv5CfKJqPZ9CAaiSxmZEBVgcIbSApPdFa4mia6YCmttQ4GeknuMabJgrkFkQxVUslBfchlvBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Ih2CxV3JM80cHwJ1F2PADtx8v6tK/2R7JJLjD5unI5U=; b=cn3DQVCo9EyHa/iakhtysy79oS7xzTiG0Zdbw5e7+fy74gFtltwnS/m36ADBq+zwnvqtJv1EbQOPNz2RhuZFvlzzsQm+qSWiAWLzrPELVJ16sbDznhSmW4EM4IhLqfuIFIZDI6jd+YJWCB25ouKBu9o9wUEcQgvWOR9MwjeClrlUHHdxFazVdwCH9VAyzEaQC+7GIQgewKpzTvVNrhhgqI0XiO7uIUnU4L6XJPXHvJ5v4YR9anAa7LbCADX5Z3jWG+BZ/G1VbJkZyuBUbsEcFUIrCT/X6jefqSPBg6fXnFWdhXgHO2PyDHDPxdjIfJFq2BLUqTgBm3ndszk0UgjG0Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Ih2CxV3JM80cHwJ1F2PADtx8v6tK/2R7JJLjD5unI5U=; b=Kg9cay4dkToBgd8g9h0aG0cjfV+zbXhIbJ6s6AJ73IP5uicn8eghyb5T/sgLu4otm7nVnAYr59V1S4jrK2AvEM1r8T552XO52prsy+Q3Y2ixD45yR/SK7bFofC/bq8VlXkrDhPFMRdnxCQbS4J5TmumJ+6bvCx+tgxwRP1iIJDg= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM9PR04MB8555.eurprd04.prod.outlook.com (2603:10a6:20b:436::16) by PAXPR04MB9422.eurprd04.prod.outlook.com (2603:10a6:102:2b4::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.19; Wed, 9 Mar 2022 17:28:15 +0000 Received: from AM9PR04MB8555.eurprd04.prod.outlook.com ([fe80::c58c:4cac:5bf9:5579]) by AM9PR04MB8555.eurprd04.prod.outlook.com ([fe80::c58c:4cac:5bf9:5579%7]) with mapi id 15.20.5038.027; Wed, 9 Mar 2022 17:28:15 +0000 From: Ioana Ciornei To: davem@davemloft.net, kuba@kernel.org, netdev@vger.kernel.org Cc: kishon@ti.com, vkoul@kernel.org, robh+dt@kernel.org, leoyang.li@nxp.com, linux-phy@lists.infradead.org, devicetree@vger.kernel.org, linux@armlinux.org.uk, shawnguo@kernel.org, hongxing.zhu@nxp.com, Ioana Ciornei Subject: [PATCH net-next v2 7/8] dpaa2-mac: configure the SerDes phy on a protocol change Date: Wed, 9 Mar 2022 19:27:47 +0200 Message-Id: <20220309172748.3460862-8-ioana.ciornei@nxp.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220309172748.3460862-1-ioana.ciornei@nxp.com> References: <20220309172748.3460862-1-ioana.ciornei@nxp.com> X-ClientProxiedBy: AM4PR07CA0014.eurprd07.prod.outlook.com (2603:10a6:205:1::27) To AM9PR04MB8555.eurprd04.prod.outlook.com (2603:10a6:20b:436::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3a8b5b00-65b5-46f1-583c-08da01f2315e X-MS-TrafficTypeDiagnostic: PAXPR04MB9422:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: U9AH86yzIN5OEhE3DayIkEUsqxrUSFX0ptKPWNq/Mqd0+juQpAy9wrXKeCO11TsFw08fbchwWQ1crpstN3DOzfqY5PDUCTOllU5dDnRbCKN2f1MoMGC42H2ljDSVronTjikpU/nbXJxlRuMmhkRU25SZi36leVFB69+AZdKjRXTWrojufanHNgreGCjf7RW/OcNiqUWje1qMbaMtCZPb1aU1IdxcEStwDkZ1Be3q7TI2TlgtC7qp7EpxUV7BHEbf2cKgtoU3B1FdbQQi/jdCOEj/HfpNSDv2U3xJFXTGascCx2Zp80pWAh7lc5mDo4OWkCbYYetB8/pWFkW0JGGPbInRsznWMykgUHv0TQymY18lx2wf5Cc3lzYmSr+53nzB6mWvf0aHTEgHYjS1zm80ctafiy97lavQL0PccFUYaBe3H9QRgXifFGdfXzfx5I6eNw2WMtBBkbIfVGmgIQsGw9ImgrOIhht2WEI6vD+ZyhYXhQnylHRUb82XD/vdKt/NFoMN4N3noCiQdUM5uo4d/pyBCRUfSvCeywV2xaFn3oqaj9yz9j1UIb6yuPaeYi3m2T9PQBfI6fy4dHMac1IYZipMbGYH/h8HA8OesLpFyXxemMlTREUMHaNTAQMf6/se8C2OgXJDgfoI1nB4WqjdJWRvBMsxOFghcvwFpZy4oJp6yLEvy/LSAhkoWAydY+uJqMFcojm0PDhU6ZJt7P9w6Q== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM9PR04MB8555.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(6486002)(8936002)(52116002)(2616005)(6666004)(6512007)(498600001)(6506007)(5660300002)(66946007)(7416002)(36756003)(86362001)(38350700002)(38100700002)(2906002)(1076003)(44832011)(66476007)(66556008)(4326008)(83380400001)(8676002)(186003)(26005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ePLj+rl6ceOd/O3akbNPDHuSqTTtWKi2rIqkDvTAZy5LAqudRUW7wdLjiU4ni4tyKbRhf3yzQUScHGh1aEWOYb5/EUK05nXqCDJbjA277Sx1Et44OpWD8LHHUhLVUrmUzj1YMmkmgc7ILZDkcUmN7SHOEA8Lf2B3Nt8okTnlM/YbDAfydbSmpP8q6fVLWk+TFvllsZWThPqoOSfrHw9Zxt0KL3ZyXR2/ws65EGj/21dIor4HnPmETUDtKIsAuCyIwCfy+80G8GBP373xn46FIR3K3H66KObn+NvbcEUQmwCjK3BCu0u3gkdwIELtk+qTFrNnORmsU6zCXw6L1hpST96l4UByC7CYW5HHaMEeCI4VH4XBiQ00Dyi7nM8KXkCqRaAwG1X+7NWy3dKNnWCLeTlMKZ3CWPxqqXjKFfH9I7vLzGD20ycq2PmcgTTQ2OpxgVVe4vxLlxSazHbPh+Bu5t7iRyTJqf8+Z4jUAUlLkyQsb7Ndfg//Z+h28TaPez6+ZtUsQChwlrer4PAb5VSSeVvVvpDUrFwnS3Oz8KBkRhK3e1pg6kaaYCuw2EDVRVaL1UDW6BSBgihv8wXpaEtIlW2zPvINq2txZdL4A/tHJQaUPFE+p9xvzJQhJ3BlcFmYD7KnX0fUN5jtjpT+084Agbh2lUGKm33DSLjYl24P53L1HzkqQPqqE/H7wbLiyfxMMnNPzT6ONw1jM1TGgvvMmQMy6Z6QYiZJVjvIaZP6Ij4+/9V/gg5RYEuvRY53XS3NdpVdTg75h0BCuXD7l0hIBpcHkCw2c2NT+Sx1zw/OBbH8Ma/oT2DXbCfiyTWORf9COXY//MpIv8UW4d6N0E5Juq+JVKTj6HSC74RC4YjuQR/TljnImltTe6ZjI4Y0oOQ5DszaBKf9+GJyQzpmi3OoRxCHCj2PCoX7IE87xoE2Ahnc3bCubMywZIn3qKb6iPsMkfBDUa+L/23aV3dE+1WSt13g/1c9YE3uYh+lYwjHvlwjay5waCTZEPCfshoIA0Ogexs2T5pWcvjZYqjWg1O6QzMLKigeV0j9mTpRabJBEMcjsi0B8/stkFaZI4nx2nxOBR2e00T5e3p6/1RtTLRJHW1mbiMXiQR1/u443u47hqtIO1a4oQY5zGBBZqBlpq6w1QwumWPBbAPwYrGCLMXdNwGLGD2k4rvpHZviYzs+eEcfH0KuqVKl2j5JEG2bkg6hZFKHfYtdzzA9y5sGxs5e/ekpHD99BHVE6gW3tMgoTZgf1qI/I4nC1KWeTdFlWPTm2kTFnZROuhLPfaFwuzJJuM0AmDd4vTy9ykewKss9B7UbIsrfX5d4U3aNDJer/f9cwMLrbMDVeAw7YS1sAUwQlusyeB8hLj7P+9HZaZ0lzS49XhJO+FXhlINwNZkL25Y8NnLPQOmvjKOBzSB3ddo1uV3oD4+z2P2EDueYUP/YM9Y89z70gsXugYcVN02FtDapQ3/FJV89XFSYZRnp4DFX462Z0ycpM8gj95Fb3nYD9yPG+9zfsrTjAMxD2YMilFtQxVh85LqpRCqdQBwUY/ZXePsSEg5ll8UVJHdaCXZmJEDmEDfbVSUgwuho0wvtoK5m62wUdY0szAT6DvYZODh+AL2EhqorCtDSEsGea7gmFQE= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3a8b5b00-65b5-46f1-583c-08da01f2315e X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB8555.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Mar 2022 17:28:14.9420 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: eL2Pe109YDgCxsC8RZIgptt51koZTd2EDAkJAbxczmePdidNinFsD7/x4W9vG4mN4NMLL3I3oh3jIpyZ8Ig6cQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9422 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org This patch integrates the dpaa2-eth driver with the generic PHY infrastructure in order to search, find and reconfigure the SerDes lanes in case of a protocol change. On the .mac_config() callback, the phy_set_mode_ext() API is called so that the Lynx 28G SerDes PHY driver can change the lane's configuration. In the same phylink callback the MC firmware is called so that it reconfigures the MAC side to run using the new protocol. The consumer drivers - dpaa2-eth and dpaa2-switch - are updated to call the dpaa2_mac_start/stop functions newly added which will power_on/power_off the associated SerDes lane. Signed-off-by: Ioana Ciornei --- Changes in v2: - none .../net/ethernet/freescale/dpaa2/dpaa2-eth.c | 5 +- .../net/ethernet/freescale/dpaa2/dpaa2-mac.c | 91 +++++++++++++++++++ .../net/ethernet/freescale/dpaa2/dpaa2-mac.h | 6 ++ .../ethernet/freescale/dpaa2/dpaa2-switch.c | 5 +- 4 files changed, 105 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c index 939fa9db6a2e..b87369f0605f 100644 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c @@ -2077,8 +2077,10 @@ static int dpaa2_eth_open(struct net_device *net_dev) goto enable_err; } - if (dpaa2_eth_is_type_phy(priv)) + if (dpaa2_eth_is_type_phy(priv)) { phylink_start(priv->mac->phylink); + dpaa2_mac_start(priv->mac); + } return 0; @@ -2153,6 +2155,7 @@ static int dpaa2_eth_stop(struct net_device *net_dev) if (dpaa2_eth_is_type_phy(priv)) { phylink_stop(priv->mac->phylink); + dpaa2_mac_stop(priv->mac); } else { netif_tx_stop_all_queues(net_dev); netif_carrier_off(net_dev); diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c index e6e758eaafea..bd90acc49cdb 100644 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c @@ -3,6 +3,7 @@ #include #include +#include #include #include "dpaa2-eth.h" @@ -60,6 +61,26 @@ static int phy_mode(enum dpmac_eth_if eth_if, phy_interface_t *if_mode) return 0; } +static enum dpmac_eth_if dpmac_eth_if_mode(phy_interface_t if_mode) +{ + switch (if_mode) { + case PHY_INTERFACE_MODE_RGMII: + return DPMAC_ETH_IF_RGMII; + case PHY_INTERFACE_MODE_USXGMII: + return DPMAC_ETH_IF_USXGMII; + case PHY_INTERFACE_MODE_QSGMII: + return DPMAC_ETH_IF_QSGMII; + case PHY_INTERFACE_MODE_SGMII: + return DPMAC_ETH_IF_SGMII; + case PHY_INTERFACE_MODE_10GBASER: + return DPMAC_ETH_IF_XFI; + case PHY_INTERFACE_MODE_1000BASEX: + return DPMAC_ETH_IF_1000BASEX; + default: + return DPMAC_ETH_IF_MII; + } +} + static struct fwnode_handle *dpaa2_mac_get_node(struct device *dev, u16 dpmac_id) { @@ -147,6 +168,19 @@ static void dpaa2_mac_config(struct phylink_config *config, unsigned int mode, if (err) netdev_err(mac->net_dev, "%s: dpmac_set_link_state() = %d\n", __func__, err); + + if (!mac->serdes_phy) + return; + + /* This happens only if we support changing of protocol at runtime */ + err = dpmac_set_protocol(mac->mc_io, 0, mac->mc_dev->mc_handle, + dpmac_eth_if_mode(state->interface)); + if (err) + netdev_err(mac->net_dev, "dpmac_set_protocol() = %d\n", err); + + err = phy_set_mode_ext(mac->serdes_phy, PHY_MODE_ETHERNET, state->interface); + if (err) + netdev_err(mac->net_dev, "phy_set_mode_ext() = %d\n", err); } static void dpaa2_mac_link_up(struct phylink_config *config, @@ -200,12 +234,21 @@ static void dpaa2_mac_link_down(struct phylink_config *config, netdev_err(mac->net_dev, "dpmac_set_link_state() = %d\n", err); } +static int dpaa2_mac_prepare(struct phylink_config *config, unsigned int mode, + phy_interface_t interface) +{ + dpaa2_mac_link_down(config, mode, interface); + + return 0; +} + static const struct phylink_mac_ops dpaa2_mac_phylink_ops = { .validate = phylink_generic_validate, .mac_select_pcs = dpaa2_mac_select_pcs, .mac_config = dpaa2_mac_config, .mac_link_up = dpaa2_mac_link_up, .mac_link_down = dpaa2_mac_link_down, + .mac_prepare = dpaa2_mac_prepare, }; static int dpaa2_pcs_create(struct dpaa2_mac *mac, @@ -259,6 +302,8 @@ static void dpaa2_pcs_destroy(struct dpaa2_mac *mac) static void dpaa2_mac_set_supported_interfaces(struct dpaa2_mac *mac) { + int intf, err; + /* We support the current interface mode, and if we have a PCS * similar interface modes that do not require the SerDes lane to be * reconfigured. @@ -278,12 +323,40 @@ static void dpaa2_mac_set_supported_interfaces(struct dpaa2_mac *mac) break; } } + + if (!mac->serdes_phy) + return; + + /* In case we have access to the SerDes phy/lane, then ask the SerDes + * driver what interfaces are supported based on the current PLL + * configuration. + */ + for (intf = 0; intf < PHY_INTERFACE_MODE_MAX; intf++) { + err = phy_validate(mac->serdes_phy, PHY_MODE_ETHERNET, intf, NULL); + if (err) + continue; + + __set_bit(intf, mac->phylink_config.supported_interfaces); + } +} + +void dpaa2_mac_start(struct dpaa2_mac *mac) +{ + if (mac->serdes_phy) + phy_power_on(mac->serdes_phy); +} + +void dpaa2_mac_stop(struct dpaa2_mac *mac) +{ + if (mac->serdes_phy) + phy_power_off(mac->serdes_phy); } int dpaa2_mac_connect(struct dpaa2_mac *mac) { struct net_device *net_dev = mac->net_dev; struct fwnode_handle *dpmac_node; + struct phy *serdes_phy = NULL; struct phylink *phylink; int err; @@ -300,6 +373,22 @@ int dpaa2_mac_connect(struct dpaa2_mac *mac) return -EINVAL; mac->if_mode = err; + if (mac->features & DPAA2_MAC_FEATURE_PROTOCOL_CHANGE && + !phy_interface_mode_is_rgmii(mac->if_mode) && + is_of_node(dpmac_node)) { + serdes_phy = of_phy_get(to_of_node(dpmac_node), NULL); + + if (IS_ERR(serdes_phy)) { + if (PTR_ERR(serdes_phy) == -ENODEV) + serdes_phy = NULL; + else + return PTR_ERR(serdes_phy); + } else { + phy_init(serdes_phy); + } + } + mac->serdes_phy = serdes_phy; + /* The MAC does not have the capability to add RGMII delays so * error out if the interface mode requests them and there is no PHY * to act upon them @@ -363,6 +452,8 @@ void dpaa2_mac_disconnect(struct dpaa2_mac *mac) phylink_disconnect_phy(mac->phylink); phylink_destroy(mac->phylink); dpaa2_pcs_destroy(mac); + of_phy_put(mac->serdes_phy); + mac->serdes_phy = NULL; } int dpaa2_mac_open(struct dpaa2_mac *mac) diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h index d2e51d21c80c..a58cab188a99 100644 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h @@ -26,6 +26,8 @@ struct dpaa2_mac { enum dpmac_link_type if_link_type; struct phylink_pcs *pcs; struct fwnode_handle *fw_node; + + struct phy *serdes_phy; }; bool dpaa2_mac_is_type_fixed(struct fsl_mc_device *dpmac_dev, @@ -45,4 +47,8 @@ void dpaa2_mac_get_strings(u8 *data); void dpaa2_mac_get_ethtool_stats(struct dpaa2_mac *mac, u64 *data); +void dpaa2_mac_start(struct dpaa2_mac *mac); + +void dpaa2_mac_stop(struct dpaa2_mac *mac); + #endif /* DPAA2_MAC_H */ diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c index 9a561072aa4a..e4f8f927e223 100644 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c @@ -703,8 +703,10 @@ static int dpaa2_switch_port_open(struct net_device *netdev) dpaa2_switch_enable_ctrl_if_napi(ethsw); - if (dpaa2_switch_port_is_type_phy(port_priv)) + if (dpaa2_switch_port_is_type_phy(port_priv)) { phylink_start(port_priv->mac->phylink); + dpaa2_mac_start(port_priv->mac); + } return 0; } @@ -717,6 +719,7 @@ static int dpaa2_switch_port_stop(struct net_device *netdev) if (dpaa2_switch_port_is_type_phy(port_priv)) { phylink_stop(port_priv->mac->phylink); + dpaa2_mac_stop(port_priv->mac); } else { netif_tx_stop_all_queues(netdev); netif_carrier_off(netdev);