Merge branch 'ti-linux-5.4.y' of git://git.ti.com/ti-linux-kernel/ti-linux-kernel into android-feature-ti-linux-5.4.yandroid-feature-ti-linux-5.4.y

* 'ti-linux-5.4.y' of git://git.ti.com/ti-linux-kernel/ti-linux-kernel:
  net: ethernet: ti: icssg_prueth: use ERR_PTR check for mac address
  arm64: dts: ti: k3-j7200-common-proc-board: Add I2C IO expanders
  arm64: dts: ti: j7200: Add I2C nodes
  net: ti: prueth_switch: Dump multicast filter table in switch mode
  net: ti: prueth_switch: Offload multicast filtering for host port
  net: ti: prueth_core: Make prueth_init_timer() static
  ARM: dts: keystone-k2g: Add PRUSS eCAP nodes
  ARM: dts: am57xx: Add PRUSS eCAP nodes
  ARM: dts: am437x: Add PRUSS eCAP node
  ARM: dts: am335x: Add PRUSS eCAP node
  dt-bindings: soc: ti: pruss: Add eCAP documentation
  dt-bindings: net: pruss_ecap: Add dt binding documentation

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>

13 files changed, 341 insertions, 16 deletions

diff --git a/Documentation/devicetree/bindings/net/ti,pruss-ecap.yaml b/Documentation/devicetree/bindings/net/ti,pruss-ecap.yaml
new file mode 100644
index 000000000000..998fa293fbf8
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/ti,pruss-ecap.yaml
@@ -0,0 +1,30 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/net/ti,pruss-ecap.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Texas Instruments PRU-ICSS Enhanced Capture (eCAP) event module
+
+maintainers:
+  - Murali Karicheri <m-karicheri2@ti.com>
+
+properties:
+  compatible:
+    const: ti,pruss-ecap
+
+  reg:
+    maxItems: 1
+
+required:
+  - compatible
+  - reg
+
+additionalProperties: false
+
+examples:
+  - |
+    pruss0_ecap: ecap@30000 {
+        compatible = "ti,pruss-ecap";
+        reg = <0x30000 0x60>;
+    };
diff --git a/Documentation/devicetree/bindings/soc/ti/ti,pruss.txt b/Documentation/devicetree/bindings/soc/ti/ti,pruss.txt
index 6617c68b064f..6bc8d6a06d2a 100644
--- a/Documentation/devicetree/bindings/soc/ti/ti,pruss.txt
+++ b/Documentation/devicetree/bindings/soc/ti/ti,pruss.txt
@@ -157,6 +157,15 @@ MDIO module used within the PRU-ICSS is an instance of the MDIO Controller
 used in TI Davinci SoCs. Please refer to the corresponding binding document,
 Documentation/devicetree/bindings/net/davinci-mdio.txt for details.
 
+eCAP Node
+=========
+Each PRUSS includes an Enhanced Capture (eCAP) module that can provide some
+time-stamp features using its capture input. The eCAP module used within the
+PRU-ICSS is similar to other instances used within the PWM subsystems. This
+is typically used for providing interrupt pacing for host traffic on various
+PRU Ethernet usecases such as Dual-EMAC, HSR or PRP. Please refer to the
+corresponding binding document,
+Documentation/devicetree/bindings/net/ti,pruss-ecap.yaml
 
 Example:
 ========
@@ -213,6 +222,11 @@ Example:
                                 clocks = <&pruss_iepclk_mux>;
                         };
 
+                        pruss_ecap: ecap@30000 {
+                                compatible = "ti,pruss-ecap";
+                                reg = <0x30000 0x60>;
+                        };
+
                         pruss_mii_rt: mii-rt@32000 {
                                 compatible = "syscon";
                                 reg = <0x32000 0x58>;
@@ -314,6 +328,11 @@ Example:
                                 clocks = <&pruss1_iepclk_mux>;
                         };
 
+                        pruss1_ecap: ecap@30000 {
+                                compatible = "ti,pruss-ecap";
+                                reg = <0x30000 0x60>;
+                        };
+
                         pruss1_mii_rt: mii-rt@32000 {
                                 compatible = "syscon";
                                 reg = <0x32000 0x58>;
diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi
index fc533bcc7542..54605e1bd164 100644
--- a/arch/arm/boot/dts/am33xx-l4.dtsi
+++ b/arch/arm/boot/dts/am33xx-l4.dtsi
@@ -812,6 +812,11 @@
                                         clocks = <&pruss_iepclk_mux>;
                                 };
 
+                                pruss_ecap: ecap@30000 {
+                                        compatible = "ti,pruss-ecap";
+                                        reg = <0x30000 0x60>;
+                                };
+
                                 pruss_uart: serial@28000 {
                                         compatible = "ti,pruss-uart";
                                         reg = <0x28000 0x38>;
diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
index 6fc8984fda3a..3f105a75940a 100644
--- a/arch/arm/boot/dts/am4372.dtsi
+++ b/arch/arm/boot/dts/am4372.dtsi
@@ -352,6 +352,11 @@
                                         clocks = <&pruss1_iepclk_mux>;
                                 };
 
+                                pruss1_ecap: ecap@30000 {
+                                        compatible = "ti,pruss-ecap";
+                                        reg = <0x30000 0x60>;
+                                };
+
                                 pruss1_mii_rt: mii-rt@32000 {
                                         compatible = "syscon";
                                         reg = <0x32000 0x58>;
diff --git a/arch/arm/boot/dts/dra7-pruss.dtsi b/arch/arm/boot/dts/dra7-pruss.dtsi
index 5b33830ac40b..5d9d5fd9a7b3 100644
--- a/arch/arm/boot/dts/dra7-pruss.dtsi
+++ b/arch/arm/boot/dts/dra7-pruss.dtsi
@@ -59,6 +59,11 @@
                                 clocks = <&pruss1_iepclk_mux>;
                         };
 
+                        pruss1_ecap: ecap@30000 {
+                                compatible = "ti,pruss-ecap";
+                                reg = <0x30000 0x60>;
+                        };
+
                         pruss1_mii_rt: mii-rt@32000 {
                                 compatible = "syscon";
                                 reg = <0x32000 0x58>;
@@ -174,6 +179,11 @@
                                 clocks = <&pruss2_iepclk_mux>;
                         };
 
+                        pruss2_ecap: ecap@30000 {
+                                compatible = "ti,pruss-ecap";
+                                reg = <0x30000 0x60>;
+                        };
+
                         pruss2_mii_rt: mii-rt@32000 {
                                 compatible = "syscon";
                                 reg = <0x32000 0x58>;
diff --git a/arch/arm/boot/dts/keystone-k2g.dtsi b/arch/arm/boot/dts/keystone-k2g.dtsi
index 9dcbd9bd0804..b54c833013c8 100644
--- a/arch/arm/boot/dts/keystone-k2g.dtsi
+++ b/arch/arm/boot/dts/keystone-k2g.dtsi
@@ -697,6 +697,11 @@
                                 clocks = <&pruss0_iepclk_mux>;
                         };
 
+                        pruss0_ecap: ecap@30000 {
+                                compatible = "ti,pruss-ecap";
+                                reg = <0x30000 0x60>;
+                        };
+
                         pruss0_mii_rt: mii-rt@32000 {
                                 compatible = "syscon";
                                 reg = <0x32000 0x70>;
@@ -792,6 +797,11 @@
                                 clocks = <&pruss1_iepclk_mux>;
                         };
 
+                        pruss1_ecap: ecap@30000 {
+                                compatible = "ti,pruss-ecap";
+                                reg = <0x30000 0x60>;
+                        };
+
                         pruss1_mii_rt: mii-rt@32000 {
                                 compatible = "syscon";
                                 reg = <0x32000 0x70>;
diff --git a/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts
index 12c800b187f1..f9269bb2a2c4 100644
--- a/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts
@@ -41,6 +41,22 @@
         };
 };
 
+&main_pmx0 {
+        main_i2c0_pins_default: main-i2c0-pins-default {
+                pinctrl-single,pins = <
+                        J721E_IOPAD(0xd4, PIN_INPUT_PULLUP, 0) /* (V3) I2C0_SCL */
+                        J721E_IOPAD(0xd8, PIN_INPUT_PULLUP, 0) /* (W2) I2C0_SDA */
+                >;
+        };
+
+        main_i2c1_pins_default: main-i2c1-pins-default {
+                pinctrl-single,pins = <
+                        J721E_IOPAD(0xdc, PIN_INPUT_PULLUP, 3) /* (U3) ECAP0_IN_APWM_OUT.I2C1_SCL */
+                        J721E_IOPAD(0xe0, PIN_INPUT_PULLUP, 3) /* (T3) EXT_REFCLK1.I2C1_SDA */
+                >;
+        };
+};
+
 &wkup_uart0 {
         /* Wakeup UART is used by System firmware */
         status = "disabled";
@@ -90,6 +106,39 @@
         status = "disabled";
 };
 
+&main_i2c0 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&main_i2c0_pins_default>;
+        clock-frequency = <400000>;
+
+        exp1: gpio@20 {
+                compatible = "ti,tca6416";
+                reg = <0x20>;
+                gpio-controller;
+                #gpio-cells = <2>;
+        };
+
+        exp2: gpio@22 {
+                compatible = "ti,tca6424";
+                reg = <0x22>;
+                gpio-controller;
+                #gpio-cells = <2>;
+        };
+};
+
+&main_i2c1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&main_i2c1_pins_default>;
+        clock-frequency = <400000>;
+
+        exp4: gpio@20 {
+                compatible = "ti,tca6408";
+                reg = <0x20>;
+                gpio-controller;
+                #gpio-cells = <2>;
+        };
+};
+
 &mcu_cpsw {
         pinctrl-names = "default";
         pinctrl-0 = <&mcu_cpsw_pins_default &mcu_mdio_pins_default>;
diff --git a/arch/arm64/boot/dts/ti/k3-j7200-main.dtsi b/arch/arm64/boot/dts/ti/k3-j7200-main.dtsi
index 0109f5cad461..a70a04db7c5b 100644
--- a/arch/arm64/boot/dts/ti/k3-j7200-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j7200-main.dtsi
@@ -270,6 +270,83 @@
                 clock-names = "fclk";
         };
 
+        main_i2c0: i2c@2000000 {
+                compatible = "ti,j721e-i2c", "ti,omap4-i2c";
+                reg = <0x0 0x2000000 0x0 0x100>;
+                interrupts = <GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                clock-names = "fck";
+                clocks = <&k3_clks 187 1>;
+                power-domains = <&k3_pds 187 TI_SCI_PD_SHARED>;
+        };
+
+        main_i2c1: i2c@2010000 {
+                compatible = "ti,j721e-i2c", "ti,omap4-i2c";
+                reg = <0x0 0x2010000 0x0 0x100>;
+                interrupts = <GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                clock-names = "fck";
+                clocks = <&k3_clks 188 1>;
+                power-domains = <&k3_pds 188 TI_SCI_PD_EXCLUSIVE>;
+        };
+
+        main_i2c2: i2c@2020000 {
+                compatible = "ti,j721e-i2c", "ti,omap4-i2c";
+                reg = <0x0 0x2020000 0x0 0x100>;
+                interrupts = <GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                clock-names = "fck";
+                clocks = <&k3_clks 189 1>;
+                power-domains = <&k3_pds 189 TI_SCI_PD_EXCLUSIVE>;
+        };
+
+        main_i2c3: i2c@2030000 {
+                compatible = "ti,j721e-i2c", "ti,omap4-i2c";
+                reg = <0x0 0x2030000 0x0 0x100>;
+                interrupts = <GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                clock-names = "fck";
+                clocks = <&k3_clks 190 1>;
+                power-domains = <&k3_pds 190 TI_SCI_PD_EXCLUSIVE>;
+        };
+
+        main_i2c4: i2c@2040000 {
+                compatible = "ti,j721e-i2c", "ti,omap4-i2c";
+                reg = <0x0 0x2040000 0x0 0x100>;
+                interrupts = <GIC_SPI 204 IRQ_TYPE_LEVEL_HIGH>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                clock-names = "fck";
+                clocks = <&k3_clks 191 1>;
+                power-domains = <&k3_pds 191 TI_SCI_PD_EXCLUSIVE>;
+        };
+
+        main_i2c5: i2c@2050000 {
+                compatible = "ti,j721e-i2c", "ti,omap4-i2c";
+                reg = <0x0 0x2050000 0x0 0x100>;
+                interrupts = <GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                clock-names = "fck";
+                clocks = <&k3_clks 192 1>;
+                power-domains = <&k3_pds 192 TI_SCI_PD_EXCLUSIVE>;
+        };
+
+        main_i2c6: i2c@2060000 {
+                compatible = "ti,j721e-i2c", "ti,omap4-i2c";
+                reg = <0x0 0x2060000 0x0 0x100>;
+                interrupts = <GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                clock-names = "fck";
+                clocks = <&k3_clks 193 1>;
+                power-domains = <&k3_pds 193 TI_SCI_PD_EXCLUSIVE>;
+        };
+
         timesync_router: timesync_router@a40000 {
                 compatible = "pinctrl-single";
                 reg = <0x0 0xa40000 0x0 0x800>;
diff --git a/arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi
index 9b6d2ac98edb..c98797010976 100644
--- a/arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi
@@ -96,6 +96,39 @@
                 clock-names = "fclk";
         };
 
+        mcu_i2c0: i2c@40b00000 {
+                compatible = "ti,j721e-i2c", "ti,omap4-i2c";
+                reg = <0x0 0x40b00000 0x0 0x100>;
+                interrupts = <GIC_SPI 852 IRQ_TYPE_LEVEL_HIGH>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                clock-names = "fck";
+                clocks = <&k3_clks 194 1>;
+                power-domains = <&k3_pds 194 TI_SCI_PD_EXCLUSIVE>;
+        };
+
+        mcu_i2c1: i2c@40b10000 {
+                compatible = "ti,j721e-i2c", "ti,omap4-i2c";
+                reg = <0x0 0x40b10000 0x0 0x100>;
+                interrupts = <GIC_SPI 853 IRQ_TYPE_LEVEL_HIGH>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                clock-names = "fck";
+                clocks = <&k3_clks 195 1>;
+                power-domains = <&k3_pds 195 TI_SCI_PD_EXCLUSIVE>;
+        };
+
+        wkup_i2c0: i2c@42120000 {
+                compatible = "ti,j721e-i2c", "ti,omap4-i2c";
+                reg = <0x0 0x42120000 0x0 0x100>;
+                interrupts = <GIC_SPI 896 IRQ_TYPE_LEVEL_HIGH>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                clock-names = "fck";
+                clocks = <&k3_clks 197 1>;
+                power-domains = <&k3_pds 197 TI_SCI_PD_SHARED>;
+        };
+
         cbass_mcu_navss: navss@28380000 {
                 compatible = "simple-mfd";
                 #address-cells = <2>;
diff --git a/drivers/net/ethernet/ti/icssg_prueth.c b/drivers/net/ethernet/ti/icssg_prueth.c
index 5c440493fcf0..9537b029509c 100644
--- a/drivers/net/ethernet/ti/icssg_prueth.c
+++ b/drivers/net/ethernet/ti/icssg_prueth.c
@@ -1939,7 +1939,7 @@ skip_iep:
 
         /* get mac address from DT and set private and netdev addr */
         mac_addr = of_get_mac_address(eth_node);
-        if (mac_addr)
+        if (!IS_ERR(mac_addr))
                 ether_addr_copy(ndev->dev_addr, mac_addr);
         if (!is_valid_ether_addr(ndev->dev_addr)) {
                 eth_hw_addr_random(ndev);
diff --git a/drivers/net/ethernet/ti/prueth.h b/drivers/net/ethernet/ti/prueth.h
index ab6fcfe769cb..6720b25a4751 100644
--- a/drivers/net/ethernet/ti/prueth.h
+++ b/drivers/net/ethernet/ti/prueth.h
@@ -505,4 +505,7 @@ static inline void emac_finish_napi(struct prueth_emac *emac,
         enable_irq(irq);
 }
 
+void emac_mc_filter_bin_allow(struct prueth_emac *emac, u8 hash);
+void emac_mc_filter_bin_disallow(struct prueth_emac *emac, u8 hash);
+u8 emac_get_mc_hash(u8 *mac, u8 *mask);
 #endif /* __NET_TI_PRUETH_H */
diff --git a/drivers/net/ethernet/ti/prueth_core.c b/drivers/net/ethernet/ti/prueth_core.c
index 2a0176ea6101..e0b71d2ff2c5 100644
--- a/drivers/net/ethernet/ti/prueth_core.c
+++ b/drivers/net/ethernet/ti/prueth_core.c
@@ -349,7 +349,7 @@ static enum hrtimer_restart prueth_timer(struct hrtimer *timer)
         return ret;
 }
 
-void prueth_init_timer(struct prueth *prueth)
+static void prueth_init_timer(struct prueth *prueth)
 {
         hrtimer_init(&prueth->tbl_check_timer, CLOCK_MONOTONIC,
                      HRTIMER_MODE_REL);
@@ -2072,7 +2072,7 @@ static void emac_mc_filter_hashmask(struct prueth_emac *emac,
                     ICSS_EMAC_FW_MULTICAST_FILTER_MASK_SIZE_BYTES);
 }
 
-static void emac_mc_filter_bin_allow(struct prueth_emac *emac, u8 hash)
+static void emac_mc_filter_bin_update(struct prueth_emac *emac, u8 hash, u8 val)
 {
         struct prueth *prueth = emac->prueth;
         u32 mc_filter_tbl_base = prueth->fw_offsets->mc_filter_tbl;
@@ -2083,11 +2083,20 @@ static void emac_mc_filter_bin_allow(struct prueth_emac *emac, u8 hash)
                 ram = prueth->mem[PRUETH_MEM_DRAM1].va;
 
         mc_filter_tbl = ram + mc_filter_tbl_base;
-        writeb(ICSS_EMAC_FW_MULTICAST_FILTER_HOST_RCV_ALLOWED,
-               mc_filter_tbl + hash);
+        writeb(val, mc_filter_tbl + hash);
 }
 
-static u8 emac_get_mc_hash(u8 *mac, u8 *mask)
+void emac_mc_filter_bin_allow(struct prueth_emac *emac, u8 hash)
+{
+        emac_mc_filter_bin_update(emac, hash, ICSS_EMAC_FW_MULTICAST_FILTER_HOST_RCV_ALLOWED);
+}
+
+void emac_mc_filter_bin_disallow(struct prueth_emac *emac, u8 hash)
+{
+        emac_mc_filter_bin_update(emac, hash, ICSS_EMAC_FW_MULTICAST_FILTER_HOST_RCV_NOT_ALLOWED);
+}
+
+u8 emac_get_mc_hash(u8 *mac, u8 *mask)
 {
         int j;
         u8 hash;
@@ -2117,13 +2126,6 @@ static void emac_ndo_set_rx_mode(struct net_device *ndev)
         u32 mask;
         u8 hash;
 
-        if (PRUETH_IS_SWITCH(prueth)) {
-                netdev_dbg(ndev,
-                           "%s: promisc/mc filtering not supported for switch\n",
-                           __func__);
-                return;
-        }
-
         if (promisc && PRUETH_IS_LRE(prueth)) {
                 netdev_dbg(ndev,
                            "%s: promisc mode not supported for LRE\n",
@@ -2166,7 +2168,7 @@ static void emac_ndo_set_rx_mode(struct net_device *ndev)
                         goto unlock;
         }
 
-        if (ndev->flags & IFF_ALLMULTI)
+        if (ndev->flags & IFF_ALLMULTI && !PRUETH_IS_SWITCH(prueth))
                 goto unlock;
 
         emac_mc_filter_ctrl(emac, true);        /* all multicast blocked */
@@ -2178,6 +2180,14 @@ static void emac_ndo_set_rx_mode(struct net_device *ndev)
                 hash = emac_get_mc_hash(ha->addr, emac->mc_filter_mask);
                 emac_mc_filter_bin_allow(emac, hash);
         }
+
+        /* Add bridge device's MC addresses as well */
+        if (prueth->hw_bridge_dev) {
+                netdev_for_each_mc_addr(ha, prueth->hw_bridge_dev) {
+                        hash = emac_get_mc_hash(ha->addr, emac->mc_filter_mask);
+                        emac_mc_filter_bin_allow(emac, hash);
+                }
+        }
 unlock:
         spin_unlock_irqrestore(&emac->addr_lock, flags);
 }
@@ -2598,7 +2608,7 @@ static int emac_get_regs_len(struct net_device *ndev)
          * size will give the entire size of reg dump in case of
          * Dual-EMAC firmware.
          */
-        if (PRUETH_IS_EMAC(prueth)) {
+        if (PRUETH_IS_EMAC(prueth) || PRUETH_IS_SWITCH(prueth)) {
                 return ICSS_EMAC_FW_VLAN_FLTR_TBL_BASE_ADDR +
                        ICSS_EMAC_FW_VLAN_FILTER_TABLE_SIZE_BYTES;
         }
@@ -2628,7 +2638,7 @@ static void emac_get_regs(struct net_device *ndev, struct ethtool_regs *regs,
         regs->version = PRUETH_REG_DUMP_GET_VER(prueth);
 
         /* Dump firmware's VLAN and MC tables */
-        if (PRUETH_IS_EMAC(prueth)) {
+        if (PRUETH_IS_EMAC(prueth) || PRUETH_IS_SWITCH(prueth)) {
                 ram = prueth->mem[emac->dram].va;
                 memcpy_fromio(reg, ram, emac_get_regs_len(ndev));
                 return;
diff --git a/drivers/net/ethernet/ti/prueth_switch.c b/drivers/net/ethernet/ti/prueth_switch.c
index f5891306baad..edb9473928b7 100644
--- a/drivers/net/ethernet/ti/prueth_switch.c
+++ b/drivers/net/ethernet/ti/prueth_switch.c
@@ -1075,6 +1075,68 @@ static int prueth_switchdev_attr_set(struct net_device *ndev,
         return err;
 }
 
+static int prueth_switchdev_obj_add(struct net_device *ndev,
+                                    const struct switchdev_obj *obj,
+                                    struct switchdev_trans *trans,
+                                    struct netlink_ext_ack *extack)
+{
+        struct prueth_emac *emac = netdev_priv(ndev);
+        struct prueth *prueth = emac->prueth;
+        struct switchdev_obj_port_mdb *mdb;
+        int ret = 0;
+        u8 hash;
+
+        if (switchdev_trans_ph_prepare(trans))
+                return 0;
+
+        switch (obj->id) {
+        case SWITCHDEV_OBJ_ID_HOST_MDB:
+                mdb = SWITCHDEV_OBJ_PORT_MDB(obj);
+                dev_dbg(prueth->dev, "MDB add: %s: vid %u:%pM  port: %x\n",
+                        ndev->name, mdb->vid, mdb->addr, emac->port_id);
+                hash = emac_get_mc_hash(mdb->addr, emac->mc_filter_mask);
+                emac_mc_filter_bin_allow(emac, hash);
+                break;
+        default:
+                ret = -EOPNOTSUPP;
+                break;
+        }
+
+        return ret;
+}
+
+static int prueth_switchdev_obj_del(struct net_device *ndev,
+                                    const struct switchdev_obj *obj)
+{
+        struct prueth_emac *emac = netdev_priv(ndev);
+        struct prueth *prueth = emac->prueth;
+        struct switchdev_obj_port_mdb *mdb;
+        struct netdev_hw_addr *ha;
+        u8 hash, tmp_hash;
+        int ret = 0;
+
+        switch (obj->id) {
+        case SWITCHDEV_OBJ_ID_HOST_MDB:
+                mdb = SWITCHDEV_OBJ_PORT_MDB(obj);
+                dev_dbg(prueth->dev, "MDB del: %s: vid %u:%pM  port: %x\n",
+                        ndev->name, mdb->vid, mdb->addr, emac->port_id);
+                hash = emac_get_mc_hash(mdb->addr, emac->mc_filter_mask);
+                netdev_for_each_mc_addr(ha, prueth->hw_bridge_dev) {
+                        tmp_hash = emac_get_mc_hash(ha->addr, emac->mc_filter_mask);
+                        /* Another MC address is in the bin. Don't disable. */
+                        if (tmp_hash == hash)
+                                return 0;
+                }
+                emac_mc_filter_bin_disallow(emac, hash);
+                break;
+        default:
+                ret = -EOPNOTSUPP;
+                break;
+        }
+
+        return ret;
+}
+
 /* switchdev notifiers */
 static int prueth_sw_switchdev_blocking_event(struct notifier_block *unused,
                                               unsigned long event, void *ptr)
@@ -1093,6 +1155,18 @@ static int prueth_sw_switchdev_blocking_event(struct notifier_block *unused,
                                                      prueth_sw_port_dev_check,
                                                      prueth_switchdev_attr_set);
                 return notifier_from_errno(err);
+
+        case SWITCHDEV_PORT_OBJ_ADD:
+                err = switchdev_handle_port_obj_add(ndev, ptr,
+                                                    prueth_sw_port_dev_check,
+                                                    prueth_switchdev_obj_add);
+                return notifier_from_errno(err);
+
+        case SWITCHDEV_PORT_OBJ_DEL:
+                err = switchdev_handle_port_obj_del(ndev, ptr,
+                                                    prueth_sw_port_dev_check,
+                                                    prueth_switchdev_obj_del);
+                return notifier_from_errno(err);
         default:
                 break;
         }