From patchwork Mon Apr 3 11:01:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siddharth Vadapalli X-Patchwork-Id: 78500 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2223687vqo; Mon, 3 Apr 2023 04:22:10 -0700 (PDT) X-Google-Smtp-Source: AKy350bNTkODm3exmGYvoOd0PlTwVbkZCNzkadm7D3JND9y4/YJUbCuI8rSOqIpe3aY3fx0dTKhF X-Received: by 2002:a05:6a20:b29a:b0:dc:925f:62f1 with SMTP id ei26-20020a056a20b29a00b000dc925f62f1mr17615727pzb.6.1680520930650; Mon, 03 Apr 2023 04:22:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680520930; cv=none; d=google.com; s=arc-20160816; b=CnzE+jLoXwJIg8wXzQAANKK1fbmoxW25kb/pCWlg075cEKASaHLSEDxGqRX0O5EXU6 grqLctZy1z+oHvTosIWETeVCcGRnjfKpuRSqB81W0ssnEU6vUxPENx7KilOfMNMEQyI8 6sX+QoohgA6Te/D5HyQrpo50T3ka6E6B9FJ+6apabqijJKHrTRVH9rycNG1E5wRNsJnN s6Ytr7uIsqP3FEw6EIpV+rbTDiEQtjqq3c5AxBfV4YG1KiyAWIBocUVRxNQH6VKvi3Gq iGGa4ZJIp6T2BfHVoMcVmgGKvitTqDigsc/m5pUx8S2eDCulnZcWZQSlmR77KFoFNirK Rewg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Wnf4BjVfhzbMQx2Bis6Iz0+bTqMXHMv/UcZGWxk0XQ0=; b=sGKZ0HH8XbgMVbF8ZuYintpszkS8Z62sCzHqtRRBDN6+SLzMiKmKz/o4x3gzixkl7i I/AL8AjMjk0FXaOWyn0nCzDLGEIoZQbhgrF0IyeG1mAgcPFE2zqlFsCA1IUHIBgH5DAG BWoBJsRF+usgsksxIuhun90HlvKc+hNMgAMn+i0VFSwGbtbD/0fE50DRf2gPIPLjwZ1X F7e5sz8rFQpJF8XFk9ihYacYPri42hpP8UFMfTNPdTDx2j6mNTjbNyLBpElx0yprCQAv mgfqhmSszljxm6rQmKe1jMHO8lz3F5GCbUbl1WD5q2GnsJW0PGZJBZvdW9paEp493asG 1Heg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=YCpD36VB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 145-20020a621997000000b0062dbafd7a3esi8279040pfz.100.2023.04.03.04.21.58; Mon, 03 Apr 2023 04:22:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=YCpD36VB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231707AbjDCLBu (ORCPT + 99 others); Mon, 3 Apr 2023 07:01:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50320 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231401AbjDCLBd (ORCPT ); Mon, 3 Apr 2023 07:01:33 -0400 Received: from fllv0016.ext.ti.com (fllv0016.ext.ti.com [198.47.19.142]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EDD44113FD; Mon, 3 Apr 2023 04:01:31 -0700 (PDT) Received: from lelv0265.itg.ti.com ([10.180.67.224]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 333B1Emq016885; Mon, 3 Apr 2023 06:01:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1680519674; bh=Wnf4BjVfhzbMQx2Bis6Iz0+bTqMXHMv/UcZGWxk0XQ0=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=YCpD36VBHwThu6tgBvSpMF3m37xY+cfpGoSQTQwU8L/Arm9aOF7pii3e7bUk8JbwO EfLeyly1P/0gK10kGsuM1Sr+sdyM8/jsXe//6w9WyPcZBQK5XU2qdf+8XWjpGV2jVz xT2PUlQd9Fb+BDNQzbgI6Jsj62ipif6oNgfiOFMc= Received: from DLEE107.ent.ti.com (dlee107.ent.ti.com [157.170.170.37]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 333B1E6T013295 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 3 Apr 2023 06:01:14 -0500 Received: from DLEE105.ent.ti.com (157.170.170.35) by DLEE107.ent.ti.com (157.170.170.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Mon, 3 Apr 2023 06:01:13 -0500 Received: from lelv0327.itg.ti.com (10.180.67.183) by DLEE105.ent.ti.com (157.170.170.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16 via Frontend Transport; Mon, 3 Apr 2023 06:01:13 -0500 Received: from uda0492258.dhcp.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by lelv0327.itg.ti.com (8.15.2/8.15.2) with ESMTP id 333B17wp101591; Mon, 3 Apr 2023 06:01:11 -0500 From: Siddharth Vadapalli To: , , , , , CC: , , , , Subject: [PATCH net-next v2 1/3] net: ethernet: ti: am65-cpsw: Move mode specific config to mac_config() Date: Mon, 3 Apr 2023 16:31:04 +0530 Message-ID: <20230403110106.983994-2-s-vadapalli@ti.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230403110106.983994-1-s-vadapalli@ti.com> References: <20230403110106.983994-1-s-vadapalli@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-Spam-Status: No, score=-2.5 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_PASS, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762153286092031579?= X-GMAIL-MSGID: =?utf-8?q?1762153915332053411?= Move the interface mode specific configuration to the mac_config() callback am65_cpsw_nuss_mac_config(). Signed-off-by: Siddharth Vadapalli --- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c index d17757ecbf42..74e099828978 100644 --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c @@ -1504,12 +1504,17 @@ static void am65_cpsw_nuss_mac_config(struct phylink_config *config, unsigned in phylink_config); struct am65_cpsw_port *port = container_of(slave, struct am65_cpsw_port, slave); struct am65_cpsw_common *common = port->common; + u32 mac_control = 0; if (common->pdata.extra_modes & BIT(state->interface)) { - if (state->interface == PHY_INTERFACE_MODE_SGMII) + if (state->interface == PHY_INTERFACE_MODE_SGMII) { + mac_control |= CPSW_SL_CTL_EXT_EN; writel(ADVERTISE_SGMII, port->sgmii_base + AM65_CPSW_SGMII_MR_ADV_ABILITY_REG); + } + if (mac_control) + cpsw_sl_ctl_set(port->slave.mac_sl, mac_control); writel(AM65_CPSW_SGMII_CONTROL_MR_AN_ENABLE, port->sgmii_base + AM65_CPSW_SGMII_CONTROL_REG); } @@ -1553,8 +1558,7 @@ static void am65_cpsw_nuss_mac_link_up(struct phylink_config *config, struct phy if (speed == SPEED_1000) mac_control |= CPSW_SL_CTL_GIG; - if (interface == PHY_INTERFACE_MODE_SGMII) - mac_control |= CPSW_SL_CTL_EXT_EN; + /* TODO: Verify whether in-band is necessary for 10 Mbps RGMII */ if (speed == SPEED_10 && phy_interface_mode_is_rgmii(interface)) /* Can be used with in band mode only */ mac_control |= CPSW_SL_CTL_EXT_EN; From patchwork Mon Apr 3 11:01:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siddharth Vadapalli X-Patchwork-Id: 78505 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2225087vqo; Mon, 3 Apr 2023 04:24:41 -0700 (PDT) X-Google-Smtp-Source: AKy350YQJ2WXtC+VwJRaosegU7nDriIz6nlbBRo1eZpP4W/wRzCf6i8HHuR1YPE4vyX6F2S+Qkrx X-Received: by 2002:a17:90a:e7cf:b0:23c:8ee2:bc14 with SMTP id kb15-20020a17090ae7cf00b0023c8ee2bc14mr43379352pjb.24.1680521081573; Mon, 03 Apr 2023 04:24:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680521081; cv=none; d=google.com; s=arc-20160816; b=lcWcTAvoyZAb5JWIPX0tEsSQ/H2D5sP8eBtmVkMw3sRuExf7NegfTr61LU+FHc2d6Y S6JSXaSsXFan476XH6TxFUZZta7TY6iQ2r1lh4bDX2aA2SPx1tizYl9QRc7fKCISWHeo GDYxrz1dkdpa4Qb8J0qRne1aNoeLYI0xC9SZMK4U+Wt3xBmjjB+uslExcpBDr8wieGzo 55cULDD33ymmN7kVdhSi1sfBS1b/HyQJTPZTyHE6NyAbpgc2sBv56fku+YANFvhumti7 7ZCeqU9ltbMMcjtIdULMu7hPv1HzHeQBRfJNbmNaq+pz+bbLhZeaFuFrCjm1MpsXQGdd /8hA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=k9V1lSwbZhwxw2ZyRU7l9HZE28rX40IS6pfm2TGDZJk=; b=su9vCUbZTuVuFaQNufcJK0T4Mxz6IfKItOSDUxjBZMOcHhqZgJs5Ol8KGns2VDDRkU LuHpSn3K9BrNij2MadaZo7s5w1Tqg3wuZ20giM3ZtaG9NSzTNKbS43lp699btzQXG3du tszuDJiwZaqthSnTjZ/CVAyk2iuyEfw5d4WIWotso7hEjoDSdjvinQDXT/0/GmXAv8uZ rOw1myQUeiW2+8K3bjJZ7ByQJLBcqErSySwsHnKAnVxLWyBL9ePbhk9rbH6Q5mZD84N9 Lk4W85nIBsay2F08nxw6Y2KPLSM+nqz5mFA026eall9YuErtUkEdU8gOOR8QTj2zPu4A ++7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=Byz0OkTz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gl3-20020a17090b120300b002307345bf7bsi10183387pjb.23.2023.04.03.04.24.29; Mon, 03 Apr 2023 04:24:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=Byz0OkTz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232018AbjDCLBk (ORCPT + 99 others); Mon, 3 Apr 2023 07:01:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50310 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230269AbjDCLBc (ORCPT ); Mon, 3 Apr 2023 07:01:32 -0400 Received: from lelv0143.ext.ti.com (lelv0143.ext.ti.com [198.47.23.248]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 548FE113EA; Mon, 3 Apr 2023 04:01:30 -0700 (PDT) Received: from fllv0034.itg.ti.com ([10.64.40.246]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 333B1Hs5074100; Mon, 3 Apr 2023 06:01:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1680519677; bh=k9V1lSwbZhwxw2ZyRU7l9HZE28rX40IS6pfm2TGDZJk=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=Byz0OkTzY08vvUKJ7fI/lHxUdXVv4oVF4RSI0mlcwpN8dUJlmq1WhVJvqvZti5SsL XsZiAsxLUmiIyL79eyrykLY/2DqPlTK9rb1ONs3m0PILuzJqa9R4yj3PG9ayFx2Xxj dplhOVxhjk0ibHfYfBU8loe3aA0DfOZsj9s0QyqE= Received: from DFLE115.ent.ti.com (dfle115.ent.ti.com [10.64.6.36]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 333B1HvM069561 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 3 Apr 2023 06:01:17 -0500 Received: from DFLE100.ent.ti.com (10.64.6.21) by DFLE115.ent.ti.com (10.64.6.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Mon, 3 Apr 2023 06:01:16 -0500 Received: from lelv0327.itg.ti.com (10.180.67.183) by DFLE100.ent.ti.com (10.64.6.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16 via Frontend Transport; Mon, 3 Apr 2023 06:01:16 -0500 Received: from uda0492258.dhcp.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by lelv0327.itg.ti.com (8.15.2/8.15.2) with ESMTP id 333B17wq101591; Mon, 3 Apr 2023 06:01:14 -0500 From: Siddharth Vadapalli To: , , , , , CC: , , , , Subject: [PATCH net-next v2 2/3] net: ethernet: ti: am65-cpsw: Enable QSGMII for J784S4 CPSW9G Date: Mon, 3 Apr 2023 16:31:05 +0530 Message-ID: <20230403110106.983994-3-s-vadapalli@ti.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230403110106.983994-1-s-vadapalli@ti.com> References: <20230403110106.983994-1-s-vadapalli@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-Spam-Status: No, score=-2.5 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_PASS, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762154073485287773?= X-GMAIL-MSGID: =?utf-8?q?1762154073485287773?= TI's J784S4 SoC supports QSGMII mode with the CPSW9G instance of the CPSW Ethernet Switch. Add a new compatible for J784S4 SoC and enable QSGMII support for it by adding QSGMII mode to the extra_modes member of the "j784s4_cpswxg_pdata" SoC data. Signed-off-by: Siddharth Vadapalli --- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c index 74e099828978..6c118a9abb2f 100644 --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c @@ -2800,12 +2800,20 @@ static const struct am65_cpsw_pdata j721e_cpswxg_pdata = { .extra_modes = BIT(PHY_INTERFACE_MODE_QSGMII) | BIT(PHY_INTERFACE_MODE_SGMII), }; +static const struct am65_cpsw_pdata j784s4_cpswxg_pdata = { + .quirks = 0, + .ale_dev_id = "am64-cpswxg", + .fdqring_mode = K3_RINGACC_RING_MODE_MESSAGE, + .extra_modes = BIT(PHY_INTERFACE_MODE_QSGMII), +}; + static const struct of_device_id am65_cpsw_nuss_of_mtable[] = { { .compatible = "ti,am654-cpsw-nuss", .data = &am65x_sr1_0}, { .compatible = "ti,j721e-cpsw-nuss", .data = &j721e_pdata}, { .compatible = "ti,am642-cpsw-nuss", .data = &am64x_cpswxg_pdata}, { .compatible = "ti,j7200-cpswxg-nuss", .data = &j7200_cpswxg_pdata}, { .compatible = "ti,j721e-cpswxg-nuss", .data = &j721e_cpswxg_pdata}, + { .compatible = "ti,j784s4-cpswxg-nuss", .data = &j784s4_cpswxg_pdata}, { /* sentinel */ }, }; MODULE_DEVICE_TABLE(of, am65_cpsw_nuss_of_mtable); From patchwork Mon Apr 3 11:01:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siddharth Vadapalli X-Patchwork-Id: 78497 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2215262vqo; Mon, 3 Apr 2023 04:07:57 -0700 (PDT) X-Google-Smtp-Source: AKy350aJBpEQiklcn33U4cmW7TT6mgRuJTxO2P4a+ZZdAB97hJu0GaGORZ2oYGFjR4QYYRLf6Kca X-Received: by 2002:aa7:cd58:0:b0:502:7d3f:bdbe with SMTP id v24-20020aa7cd58000000b005027d3fbdbemr10139671edw.15.1680520077032; Mon, 03 Apr 2023 04:07:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680520077; cv=none; d=google.com; s=arc-20160816; b=DlcsMpUkz6mXUVtgQGP9XThs1hU6VocFyuSTQcOGK8m8smJblpGmgx0+a86CMy0ymO haaJlRW5CLBJQZyL5vsXc5D2Ad6+VFbe9L1V+NK1BK9fQ9cLoAzs2rccpa/3H6eKes0H YwM7GTcKAx3axNcKEMSiOjO+69mnnQxEnh3Klq+9fmrICzJuPFAPoq49xpi8WxDShagy SzLvgW4OfTgHGDTV/rEXdYjbC+qacOO1pVxXgHAMzTzyxzE90iolsbvVxzaWUEcgU4Fi H85HEx7cozoa4uzim6YwN3ReS+jB/ijQRjwYSCduSwWKwRGdiulw1WO0CVCGSSSCA0FL WMBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Gq892BO5Nd7eJ/TYJ42yvxXpfOxGBtiDTJO8KV3Uvx8=; b=EJatL995zVqS+/XzXjcAQzs5skEzryT2AypMEgaPcZeivg3eMDmFrTErgr/IZGoAc3 PKcmx3fXcl6r4UJATiYm1PwHZhAtDCIm/3G+3OfXUa/C2moeJyxFLw1bE9mcwdJpLN/n +b5MgjBGKbYwj5HShUO81HfgOtFug0zgI//cw6qXbVp9cawjjhLUsnoYYib9aKGCCKA9 ewCt3ChW+viQHl9VtUSPia7ilvMaeg6JcdDhVyvsC6KTvafiQnyVzqc+G/EzMEz6JEM2 dLiivxA2F/FI9/F/0JddB2TwGRF439qvGdzHmcNEW24q4Dh0G1nI2twTUvJrWrcmKBnw a4iQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b="vJ/PpNoI"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s15-20020aa7c54f000000b00501dbb1760esi6245081edr.49.2023.04.03.04.07.33; Mon, 03 Apr 2023 04:07:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b="vJ/PpNoI"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232077AbjDCLBy (ORCPT + 99 others); Mon, 3 Apr 2023 07:01:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231893AbjDCLBf (ORCPT ); Mon, 3 Apr 2023 07:01:35 -0400 Received: from fllv0015.ext.ti.com (fllv0015.ext.ti.com [198.47.19.141]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 451F9EB7C; Mon, 3 Apr 2023 04:01:34 -0700 (PDT) Received: from lelv0265.itg.ti.com ([10.180.67.224]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 333B1Kow089198; Mon, 3 Apr 2023 06:01:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1680519680; bh=Gq892BO5Nd7eJ/TYJ42yvxXpfOxGBtiDTJO8KV3Uvx8=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=vJ/PpNoIJ53PoED8WuQjupEHSNVgKjhXzoURaqpo90MKSSFFE3MCKNNveY90UB40Z lPW1l4RaCxd9f+yqbkjH9JqiuTTyxkeMbx1P9j6ygtvHq6J8zl9UMa7pHjUeFnUpcV qKQspohs5dKlMNT2NIWDbjp7zZbl2UkN/1byjFRw= Received: from DFLE105.ent.ti.com (dfle105.ent.ti.com [10.64.6.26]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 333B1Kcx013344 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 3 Apr 2023 06:01:20 -0500 Received: from DFLE100.ent.ti.com (10.64.6.21) by DFLE105.ent.ti.com (10.64.6.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Mon, 3 Apr 2023 06:01:20 -0500 Received: from lelv0327.itg.ti.com (10.180.67.183) by DFLE100.ent.ti.com (10.64.6.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16 via Frontend Transport; Mon, 3 Apr 2023 06:01:20 -0500 Received: from uda0492258.dhcp.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by lelv0327.itg.ti.com (8.15.2/8.15.2) with ESMTP id 333B17wr101591; Mon, 3 Apr 2023 06:01:17 -0500 From: Siddharth Vadapalli To: , , , , , CC: , , , , Subject: [PATCH net-next v2 3/3] net: ethernet: ti: am65-cpsw: Enable USXGMII mode for J784S4 CPSW9G Date: Mon, 3 Apr 2023 16:31:06 +0530 Message-ID: <20230403110106.983994-4-s-vadapalli@ti.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230403110106.983994-1-s-vadapalli@ti.com> References: <20230403110106.983994-1-s-vadapalli@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-Spam-Status: No, score=-2.5 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_PASS, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762153020175355835?= X-GMAIL-MSGID: =?utf-8?q?1762153020175355835?= TI's J784S4 SoC supports USXGMII mode. Add USXGMII mode to the extra_modes member of the J784S4 SoC data. Additionally, convert the IF statement in am65_cpsw_nuss_mac_config() to SWITCH statement to scale for new modes. Configure MAC control register for supporting USXGMII mode and add MAC_5000FD in the "mac_capabilities" member of struct "phylink_config". Signed-off-by: Siddharth Vadapalli --- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c index 6c118a9abb2f..f4d4f987563c 100644 --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c @@ -1507,10 +1507,20 @@ static void am65_cpsw_nuss_mac_config(struct phylink_config *config, unsigned in u32 mac_control = 0; if (common->pdata.extra_modes & BIT(state->interface)) { - if (state->interface == PHY_INTERFACE_MODE_SGMII) { + switch (state->interface) { + case PHY_INTERFACE_MODE_SGMII: mac_control |= CPSW_SL_CTL_EXT_EN; writel(ADVERTISE_SGMII, port->sgmii_base + AM65_CPSW_SGMII_MR_ADV_ABILITY_REG); + break; + + case PHY_INTERFACE_MODE_USXGMII: + mac_control |= CPSW_SL_CTL_XGIG | CPSW_SL_CTL_XGMII_EN; + break; + + default: + /* No special configuration is required for other modes */ + break; } if (mac_control) @@ -2161,7 +2171,8 @@ am65_cpsw_nuss_init_port_ndev(struct am65_cpsw_common *common, u32 port_idx) /* Configuring Phylink */ port->slave.phylink_config.dev = &port->ndev->dev; port->slave.phylink_config.type = PHYLINK_NETDEV; - port->slave.phylink_config.mac_capabilities = MAC_SYM_PAUSE | MAC_10 | MAC_100 | MAC_1000FD; + port->slave.phylink_config.mac_capabilities = MAC_SYM_PAUSE | MAC_10 | MAC_100 | + MAC_1000FD | MAC_5000FD; port->slave.phylink_config.mac_managed_pm = true; /* MAC does PM */ switch (port->slave.phy_if) { @@ -2179,6 +2190,7 @@ am65_cpsw_nuss_init_port_ndev(struct am65_cpsw_common *common, u32 port_idx) case PHY_INTERFACE_MODE_QSGMII: case PHY_INTERFACE_MODE_SGMII: + case PHY_INTERFACE_MODE_USXGMII: if (common->pdata.extra_modes & BIT(port->slave.phy_if)) { __set_bit(port->slave.phy_if, port->slave.phylink_config.supported_interfaces); @@ -2804,7 +2816,7 @@ static const struct am65_cpsw_pdata j784s4_cpswxg_pdata = { .quirks = 0, .ale_dev_id = "am64-cpswxg", .fdqring_mode = K3_RINGACC_RING_MODE_MESSAGE, - .extra_modes = BIT(PHY_INTERFACE_MODE_QSGMII), + .extra_modes = BIT(PHY_INTERFACE_MODE_QSGMII) | BIT(PHY_INTERFACE_MODE_USXGMII), }; static const struct of_device_id am65_cpsw_nuss_of_mtable[] = {