Skip to content

net: dsa: microchip: common spi probe for the ksz series switches - part 1

Arun Ramadoss lkml netdev 1 version 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

  1. v1 Latest11 patches 2 repliesApplied 11/11

Changes in v1 from the cover letter

- Splitted the patch series into two.
- Replaced all occurrence of REG_PORT_STATUS_0 and PORT_FIBER_MODE to KSZ8_PORT_STATUS_0 and KSZ8_PORT_FIBER_MODE.
- Separated the tag protocol and phy read/write patch into two.
- Assigned the DSA_TAG_PROTO_NONE as the default value for get_tag_protocol hook.
- Reduced the indentation level by using the if(!dev->dev_ops->mirror_add).
- Added the stp_ctrl_reg as a member in ksz_chip_data and removed the member in ksz_dev_ops.
- Removed the r_dyn_mac_table, r_sta_mac_table and w_sta_mac_table from the ksz_dev_ops since it is used only in the ksz8795.c.

Patches in v1 All 11 applied

#Subject and filesSizeRepliesApplied
1/11net: dsa: microchip: ksz9477: cleanup the ksz9477_switch_detectdrivers/net/dsa/microchip/ksz9477.c+22 -260 repliesApplied
2/11net: dsa: microchip: move switch chip_id detection to ksz_commondrivers/net/dsa/microchip/ksz8795.c drivers/net/dsa/microchip/ksz8795_reg.h drivers/net/dsa/microchip/ksz9477.c +3 more+93 -900 repliesApplied
3/11net: dsa: microchip: move tag_protocol to ksz_commondrivers/net/dsa/microchip/ksz8795.c drivers/net/dsa/microchip/ksz9477.c drivers/net/dsa/microchip/ksz_common.c +1 more+28 -250 repliesApplied
4/11net: dsa: microchip: ksz9477: use ksz_read_phy16 & ksz_write_phy16drivers/net/dsa/microchip/ksz9477.c+10 -130 repliesApplied
5/11net: dsa: microchip: move vlan functionality to ksz_commondrivers/net/dsa/microchip/ksz8795.c drivers/net/dsa/microchip/ksz9477.c drivers/net/dsa/microchip/ksz_common.c +1 more+69 -200 repliesApplied
6/11net: dsa: microchip: move the port mirror to ksz_commondrivers/net/dsa/microchip/ksz8795.c drivers/net/dsa/microchip/ksz9477.c drivers/net/dsa/microchip/ksz_common.c +1 more+45 -131 replyApplied
7/11net: dsa: microchip: get P_STP_CTRL in ksz_port_stp_state by ksz_dev_opsdrivers/net/dsa/microchip/ksz8795.c drivers/net/dsa/microchip/ksz9477.c drivers/net/dsa/microchip/ksz_common.c +1 more+24 -220 repliesApplied
8/11net: dsa: microchip: update the ksz_phylink_get_capsdrivers/net/dsa/microchip/ksz8795.c drivers/net/dsa/microchip/ksz9477.c drivers/net/dsa/microchip/ksz_common.c +1 more+11 -100 repliesApplied
9/11net: dsa: microchip: update the ksz_port_mdb_add/deldrivers/net/dsa/microchip/ksz8795.c drivers/net/dsa/microchip/ksz9477.c drivers/net/dsa/microchip/ksz_common.c +1 more+98 -680 repliesApplied
10/11net: dsa: microchip: update fdb add/del/dump in ksz_commondrivers/net/dsa/microchip/ksz8795.c drivers/net/dsa/microchip/ksz9477.c drivers/net/dsa/microchip/ksz_common.c +1 more+85 -510 repliesApplied
11/11net: dsa: microchip: move get_phy_flags & mtu to ksz_commondrivers/net/dsa/microchip/ksz8795.c drivers/net/dsa/microchip/ksz9477.c drivers/net/dsa/microchip/ksz_common.c +1 more+52 -180 repliesApplied

Reviews trailers per patch

5 of 11 patches have a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchVladimir OlteanFlorian Fainelli
SeriesR-b
1/11R-b
2/11
3/11
4/11
5/11R-b
6/11R-b R-b
7/11
8/11R-b
9/11R-b
10/11
11/11

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [Patch net-next 00/11] net: dsa: microchip: common spi probe for the ksz series switches - part 1

This patch series aims to refactor the ksz_switch_register routine to have the common flow for the ksz series switch. At present ksz8795.c & ksz9477.c have its own dsa_switch_ops and switch detect functionality.
In ksz_switch_register, ksz_dev_ops is assigned based on the function parameter passed by the individual ksz8/ksz9477 switch register function. And then switch detect is performed based on the ksz_dev_ops.detect hook. This patch modifies the ksz_switch_register such a way that switch detect is performed first, based on the chip ksz_dev_ops is assigned to ksz_device structure. It ensures the common flow for the existing as well as LAN937x switches.
In the next series of patch, it will move ksz_dsa_ops and dsa_switch_ops from ksz8795.c and ksz9477.c to ksz_common.c and have the common spi probe all the ksz based switches.

Changes in v1
- Splitted the patch series into two.
- Replaced all occurrence of REG_PORT_STATUS_0 and PORT_FIBER_MODE to KSZ8_PORT_STATUS_0 and KSZ8_PORT_FIBER_MODE.
- Separated the tag protocol and phy read/write patch into two.
- Assigned the DSA_TAG_PROTO_NONE as the default value for get_tag_protocol hook.
- Reduced the indentation level by using the if(!dev->dev_ops->mirror_add).
- Added the stp_ctrl_reg as a member in ksz_chip_data and removed the member in ksz_dev_ops.
- Removed the r_dyn_mac_table, r_sta_mac_table and w_sta_mac_table from the ksz_dev_ops since it is used only in the ksz8795.c.

Changes in RFC v2
- Fixed the compilation issue.
- Reduced the patch set to 15.

Arun Ramadoss (11):
net: dsa: microchip: ksz9477: cleanup the ksz9477_switch_detect
net: dsa: microchip: move switch chip_id detection to ksz_common
net: dsa: microchip: move tag_protocol to ksz_common
net: dsa: microchip: ksz9477: use ksz_read_phy16 & ksz_write_phy16
net: dsa: microchip: move vlan functionality to ksz_common
net: dsa: microchip: move the port mirror to ksz_common
net: dsa: microchip: get P_STP_CTRL in ksz_port_stp_state by
ksz_dev_ops
net: dsa: microchip: update the ksz_phylink_get_caps
net: dsa: microchip: update the ksz_port_mdb_add/del
net: dsa: microchip: update fdb add/del/dump in ksz_common
net: dsa: microchip: move get_phy_flags & mtu to ksz_common

 drivers/net/dsa/microchip/ksz8795.c     | 233 ++++++++--------
 drivers/net/dsa/microchip/ksz8795_reg.h |  16 --
 drivers/net/dsa/microchip/ksz9477.c     | 181 +++++--------
 drivers/net/dsa/microchip/ksz9477_reg.h |   1 -
 drivers/net/dsa/microchip/ksz_common.c  | 342 ++++++++++++++++++------
 drivers/net/dsa/microchip/ksz_common.h  |  80 +++++-
 6 files changed, 517 insertions(+), 336 deletions(-)

base-commit: e8b03391b6a7353368d0d2d6ed2b5f03e0c6112f

Signature · 1 line
2.36.1