net: enetc: don't depend on system endianness in enetc_set_mac_ht_flt

When enetc runs out of exact match entries for unicast address
filtering, it switches to an approach based on hash tables, where
multiple MAC addresses might end up in the same bucket.

However, the enetc_set_mac_ht_flt function currently depends on the
system endianness, because it interprets the 64-bit hash value as an
array of two u32 elements. Modify this to use lower_32_bits and
upper_32_bits.

Tested by forcing enetc to go into hash table mode by creating two
macvlan upper interfaces:

ip link add link eno0 address 00:01:02:03:00:00 eno0.0 type macvlan && ip link set eno0.0 up
ip link add link eno0 address 00:01:02:03:00:01 eno0.1 type macvlan && ip link set eno0.1 up

and verified that the same bit values are written to the registers
before and after:

enetc_sync_mac_filters: addr 00:00:80:00:40:10 exact match 0
enetc_sync_mac_filters: addr 00:00:00:00:80:00 exact match 0
enetc_set_mac_ht_flt: hash 0x80008000000000 UMHFR0 0x0 UMHFR1 0x800080

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Claudiu Manoil <claudiu.manoil@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/freescale/enetc/enetc_pf.c b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
index 9c69ca5..5e95afd 100644 (file)
--- a/drivers/net/ethernet/freescale/enetc/enetc_pf.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
@@ -129,16 +129,20 @@ static void enetc_clear_mac_ht_flt(struct enetc_si *si, int si_idx, int type)
 }
 
 static void enetc_set_mac_ht_flt(struct enetc_si *si, int si_idx, int type,
-                                u32 *hash)
+                                unsigned long hash)
 {
        bool err = si->errata & ENETC_ERR_UCMCSWP;
 
        if (type == UC) {
-               enetc_port_wr(&si->hw, ENETC_PSIUMHFR0(si_idx, err), *hash);
-               enetc_port_wr(&si->hw, ENETC_PSIUMHFR1(si_idx), *(hash + 1));
+               enetc_port_wr(&si->hw, ENETC_PSIUMHFR0(si_idx, err),
+                             lower_32_bits(hash));
+               enetc_port_wr(&si->hw, ENETC_PSIUMHFR1(si_idx),
+                             upper_32_bits(hash));
        } else { /* MC */
-               enetc_port_wr(&si->hw, ENETC_PSIMMHFR0(si_idx, err), *hash);
-               enetc_port_wr(&si->hw, ENETC_PSIMMHFR1(si_idx), *(hash + 1));
+               enetc_port_wr(&si->hw, ENETC_PSIMMHFR0(si_idx, err),
+                             lower_32_bits(hash));
+               enetc_port_wr(&si->hw, ENETC_PSIMMHFR1(si_idx),
+                             upper_32_bits(hash));
        }
 }
 
@@ -182,7 +186,7 @@ static void enetc_sync_mac_filters(struct enetc_pf *pf)
                if (i == UC)
                        enetc_clear_mac_flt_entry(si, pos);
 
-               enetc_set_mac_ht_flt(si, 0, i, (u32 *)f->mac_hash_table);
+               enetc_set_mac_ht_flt(si, 0, i, *f->mac_hash_table);
        }
 }