From patchwork Tue Dec 6 09:44:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Quadros X-Patchwork-Id: 2656 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2725746wrr; Tue, 6 Dec 2022 01:48:00 -0800 (PST) X-Google-Smtp-Source: AA0mqf7KaBK40szBPtoEBDRYFVqXzgBM00MLVKYZdnzcZLTF8UCW5hQZH63dSRAm/8BChdjzOD/Z X-Received: by 2002:a05:6a00:4488:b0:577:599d:b2b7 with SMTP id cu8-20020a056a00448800b00577599db2b7mr31023pfb.25.1670320080295; Tue, 06 Dec 2022 01:48:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670320080; cv=none; d=google.com; s=arc-20160816; b=nlq8UiJEeA68mlvQuDrTLt57DaeYOl6H300HL6cpeEpGJuzU5k5OFutOnfH5W6AQ/c Hx3OSFBKGKxVJv/a/aMWOp695xFLnMmim6LeY5tK2isWboRM8o9/pkyzOCUxc8JehM1q LOd1vYktXwp7zDhMIYLx+JyAYpvuTXeIi1tgYTdropRPmj+NUO72MhuzR9b+yA7mcipW DX6gDxy8kJmo6p6/fmynkV+J24MSDsPglkbKqUfvlphzVOdMQ4Ha19CKvu+aSGQGanNE A9GQm0d/thrFwPXgA8GjIJMICl2P/7i64r/WQgHLggt4/VwTm1Dn1Nwr33anLH67rd1V lKVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from :dkim-signature; bh=upkEQLLxiwYxgN2whGsZrBKaHF/sxAkedQvGizl9MIQ=; b=zM6L2lHcAljjevCcOPfM40FjsIfM2a3eYny2KcQEM0G8L5cYC00FPEnWuF3usPTilk UYJzfKx1miqQjkzRC3uHx9J2sBnBLvPtXkbhnwcFnjrLpC+/8vjT9uaJoLhTcS1RX33R o7+iCZEJbjmE+MY1W+5SDpz8c2Yi8nfm1unfETEX7MhiZNILKH3KwJLni1NlC2WgHTOq mK0BRdHxZEtDLvEzyp9forRIthDfxUCOFFCT+zyBqHFE+UlZi2pFK8z9yxG272KoL2wr pY1cEQDbu3LxTaO89LgbRVLZ9uTsgJEafRAWUK7dyL+4MEZFts6M4XMdWTmFTvGtEhM6 s9BA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=SoNRpwQ6; 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=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o3-20020a170902d4c300b00186e9ff4edcsi16476065plg.408.2022.12.06.01.47.46; Tue, 06 Dec 2022 01:48:00 -0800 (PST) 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=@kernel.org header.s=k20201202 header.b=SoNRpwQ6; 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=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234292AbiLFJo5 (ORCPT + 99 others); Tue, 6 Dec 2022 04:44:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234545AbiLFJob (ORCPT ); Tue, 6 Dec 2022 04:44:31 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 540861E3EE; Tue, 6 Dec 2022 01:44:27 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E287A615F0; Tue, 6 Dec 2022 09:44:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 96443C433D6; Tue, 6 Dec 2022 09:44:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1670319866; bh=rZuclQ68hbui/6ywtw7DI39V+iqIo04bBQ4w4jumsEg=; h=From:To:Cc:Subject:Date:From; b=SoNRpwQ6d+HRrVKCRigYh8WEkEVXLIyBRXT4CbRyOUs/DihBKr6zJQyr4w4WsI/NJ KDuGQvYdpshhCfqhbW0Ei+dbUhQnQInLMYdlPvPCg9fxbeFlhO30hOGMXKQDnv3eee JDolcMSkifc/nExoxbJMhHfvXmXLN1ppw1QPtzW5FmY2sjIMbmV1+1OecEJ+i9A3G9 qDlVwOsxiaBHJH5tqTr3FeBBHDqrbOG1AM71ePcJdTvkGSWRl0z+xqUZ/ZAwqsf4N7 YSrZyZ1vphQoM6ho/sWRuc+vKznct5sC7sNqmDc3Qc3Y0oSZuSGQWlzMyRYAX2wQtm cZT6v0u3qJfyA== From: Roger Quadros To: davem@davemloft.net, maciej.fijalkowski@intel.com, kuba@kernel.org Cc: andrew@lunn.ch, edumazet@google.com, pabeni@redhat.com, vigneshr@ti.com, linux-omap@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Roger Quadros Subject: [PATCH v5 net-next 0/6] net: ethernet: ti: am65-cpsw: Fix set channel operation Date: Tue, 6 Dec 2022 11:44:13 +0200 Message-Id: <20221206094419.19478-1-rogerq@kernel.org> X-Mailer: git-send-email 2.17.1 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham 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?1751457548217072016?= X-GMAIL-MSGID: =?utf-8?q?1751457548217072016?= Hi, This contains a critical bug fix for the recently merged suspend/resume support [1] that broke set channel operation. (ethtool -L eth0 tx ) As there were 2 dependent patches on top of the offending commit [1] first revert them and then apply them back after the correct fix. [1] fd23df72f2be ("net: ethernet: ti: am65-cpsw: Add suspend/resume support") cheers, -roger Changelog: v5: - Change reset failure error code from -EBUSY to -ETIMEDOUT v4: - move am65_cpsw_nuss_ndev_add_tx_napi() earlier to avoid declaration. - print error and error out if soft RESET failed in am65_cpsw_nuss_ndo_slave_open() - move struct 'am65_cpsw_host *host' where 'common' is defined. v3: - revert offending commit before applying the updated patch. - drop optimization patch to be sent separately. v2: - Fix build warning drivers/net/ethernet/ti/am65-cpsw-nuss.c:562:13: warning: variable 'tmo' set but not used [-Wunused-but-set-variable] Roger Quadros (6): Revert "net: ethernet: ti: am65-cpsw: Fix hardware switch mode on suspend/resume" Revert "net: ethernet: ti: am65-cpsw: retain PORT_VLAN_REG after suspend/resume" Revert "net: ethernet: ti: am65-cpsw: Add suspend/resume support" net: ethernet: ti: am65-cpsw: Add suspend/resume support net: ethernet: ti: am65-cpsw: retain PORT_VLAN_REG after suspend/resume net: ethernet: ti: am65-cpsw: Fix hardware switch mode on suspend/resume drivers/net/ethernet/ti/am65-cpsw-nuss.c | 197 ++++++++++++----------- 1 file changed, 105 insertions(+), 92 deletions(-)