Skip to content

net: ethernet: ti: am65-cpsw: Fix set channel operation

Roger Quadros linux-omap lkml netdev 5 versions – Applied

Status from this message: This series was applied to netdev/net-next.git (master)

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v5 Latest6 patches 5 repliesApplied 6/6
  2. v46 patches 4 repliesSuperseded
  3. v36 patches 5 repliesSuperseded
Earlier versions · 2
VersionPostedPatchesRepliesStatus
v24 patches8 repliesSuperseded
v14 patches1 replySuperseded

Changes in v5 from the cover letter

- Change reset failure error code from -EBUSY to -ETIMEDOUT

Patches in v5 All 6 applied

#Subject and filesSizeRepliesApplied
1/6Revert "net: ethernet: ti: am65-cpsw: Fix hardware switch mode on suspend/resume"drivers/net/ethernet/ti/am65-cpsw-nuss.c drivers/net/ethernet/ti/am65-cpsw-nuss.h+0 -90 repliesApplied
2/6Revert "net: ethernet: ti: am65-cpsw: retain PORT_VLAN_REG after suspend/resume"drivers/net/ethernet/ti/am65-cpsw-nuss.c drivers/net/ethernet/ti/am65-cpsw-nuss.h+0 -110 repliesApplied
3/6Revert "net: ethernet: ti: am65-cpsw: Add suspend/resume support"drivers/net/ethernet/ti/am65-cpsw-nuss.c+55 -1660 repliesApplied
4/6net: ethernet: ti: am65-cpsw: Add suspend/resume supportdrivers/net/ethernet/ti/am65-cpsw-nuss.c+173 -492 repliesApplied
5/6net: ethernet: ti: am65-cpsw: retain PORT_VLAN_REG after suspend/resumedrivers/net/ethernet/ti/am65-cpsw-nuss.c drivers/net/ethernet/ti/am65-cpsw-nuss.h+11 -00 repliesApplied
6/6net: ethernet: ti: am65-cpsw: Fix hardware switch mode on suspend/resumedrivers/net/ethernet/ti/am65-cpsw-nuss.c drivers/net/ethernet/ti/am65-cpsw-nuss.h+9 -00 repliesApplied

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v5 yet.

Read the v5 thread

Cover letter [PATCH v5 net-next 0/6] net: ethernet: ti: am65-cpsw: Fix set channel operation

Hi,

This contains a critical bug fix for the recently merged suspend/resume support [1] that broke set channel operation. (ethtool -L eth0 tx <n>)

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(-)
Signature · 1 line
2.17.1