Commit 47f8dc09 authored by Li Zetao's avatar Li Zetao Committed by Jakub Kicinski

octeontx2-af: Remove redundant functions rvu_npc_exact_mac2u64()

The rvu_npc_exact_mac2u64() is used to convert an Ethernet MAC address
into a u64 value, as this is exactly what ether_addr_to_u64() does.
Use ether_addr_to_u64() to replace the rvu_npc_exact_mac2u64().
Signed-off-by: default avatarLi Zetao <lizetao1@huawei.com>
Acked-by: default avatarGeethasowjanya Akula <gakula@marvell.com>
Link: https://lore.kernel.org/r/20230808114504.4036008-4-lizetao1@huawei.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent e62c7adf
...@@ -390,22 +390,6 @@ int rvu_mbox_handler_npc_get_field_hash_info(struct rvu *rvu, ...@@ -390,22 +390,6 @@ int rvu_mbox_handler_npc_get_field_hash_info(struct rvu *rvu,
return 0; return 0;
} }
/**
* rvu_npc_exact_mac2u64 - utility function to convert mac address to u64.
* @mac_addr: MAC address.
* Return: mdata for exact match table.
*/
static u64 rvu_npc_exact_mac2u64(u8 *mac_addr)
{
u64 mac = 0;
int index;
for (index = ETH_ALEN - 1; index >= 0; index--)
mac |= ((u64)*mac_addr++) << (8 * index);
return mac;
}
/** /**
* rvu_exact_prepare_mdata - Make mdata for mcam entry * rvu_exact_prepare_mdata - Make mdata for mcam entry
* @mac: MAC address * @mac: MAC address
...@@ -416,7 +400,7 @@ static u64 rvu_npc_exact_mac2u64(u8 *mac_addr) ...@@ -416,7 +400,7 @@ static u64 rvu_npc_exact_mac2u64(u8 *mac_addr)
*/ */
static u64 rvu_exact_prepare_mdata(u8 *mac, u16 chan, u16 ctype, u64 mask) static u64 rvu_exact_prepare_mdata(u8 *mac, u16 chan, u16 ctype, u64 mask)
{ {
u64 ldata = rvu_npc_exact_mac2u64(mac); u64 ldata = ether_addr_to_u64(mac);
/* Please note that mask is 48bit which excludes chan and ctype. /* Please note that mask is 48bit which excludes chan and ctype.
* Increase mask bits if we need to include them as well. * Increase mask bits if we need to include them as well.
...@@ -604,7 +588,7 @@ static u64 rvu_exact_prepare_table_entry(struct rvu *rvu, bool enable, ...@@ -604,7 +588,7 @@ static u64 rvu_exact_prepare_table_entry(struct rvu *rvu, bool enable,
u8 ctype, u16 chan, u8 *mac_addr) u8 ctype, u16 chan, u8 *mac_addr)
{ {
u64 ldata = rvu_npc_exact_mac2u64(mac_addr); u64 ldata = ether_addr_to_u64(mac_addr);
/* Enable or disable */ /* Enable or disable */
u64 mdata = FIELD_PREP(GENMASK_ULL(63, 63), enable ? 1 : 0); u64 mdata = FIELD_PREP(GENMASK_ULL(63, 63), enable ? 1 : 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment