diff options
| author | Jason Liu <jason.hui.liu@nxp.com> | 2022-07-04 13:15:20 -0500 |
|---|---|---|
| committer | Jason Liu <jason.hui.liu@nxp.com> | 2022-07-04 13:15:20 -0500 |
| commit | 7027a6de68aa51a11bf378eddb6c692b10fccbe2 (patch) | |
| tree | e2efbc7c25c71cddb2806c5b7baf3257b094d684 /drivers/net/ethernet/mscc | |
| parent | c73354f14ef3777cdc53d7000318e10bc57e9623 (diff) | |
| parent | 545aecd229613138d6db54fb2b5221faca10137f (diff) | |
Merge tag 'v5.15.52' into lf-5.15.y
This is the 5.15.52 stable release
* tag 'v5.15.52': (28 commits)
Linux 5.15.52
io_uring: fix not locked access to fixed buf table
net: mscc: ocelot: allow unregistered IP multicast flooding to CPU
...
Signed-off-by: Jason Liu <jason.hui.liu@nxp.com>
Diffstat (limited to 'drivers/net/ethernet/mscc')
| -rw-r--r-- | drivers/net/ethernet/mscc/ocelot.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c index 930d0b692a42..545c8b1359b4 100644 --- a/drivers/net/ethernet/mscc/ocelot.c +++ b/drivers/net/ethernet/mscc/ocelot.c @@ -3361,9 +3361,13 @@ int ocelot_init(struct ocelot *ocelot) ANA_PGID_PGID, PGID_MC); ocelot_rmw_rix(ocelot, ANA_PGID_PGID_PGID(BIT(ocelot->num_phys_ports)), ANA_PGID_PGID_PGID(BIT(ocelot->num_phys_ports)), + ANA_PGID_PGID, PGID_MCIPV4); + ocelot_rmw_rix(ocelot, ANA_PGID_PGID_PGID(BIT(ocelot->num_phys_ports)), + ANA_PGID_PGID_PGID(BIT(ocelot->num_phys_ports)), + ANA_PGID_PGID, PGID_MCIPV6); + ocelot_rmw_rix(ocelot, ANA_PGID_PGID_PGID(BIT(ocelot->num_phys_ports)), + ANA_PGID_PGID_PGID(BIT(ocelot->num_phys_ports)), ANA_PGID_PGID, PGID_BC); - ocelot_write_rix(ocelot, 0, ANA_PGID_PGID, PGID_MCIPV4); - ocelot_write_rix(ocelot, 0, ANA_PGID_PGID, PGID_MCIPV6); /* Allow manual injection via DEVCPU_QS registers, and byte swap these * registers endianness. |