evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

net: thunderx: rework mac address handling

Browse source 
This fixes sparse message:

drivers/net/ethernet/cavium/thunder/nicvf_main.c:385:40: sparse: cast to
restricted __le64

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Aleksey Makarov <aleksey.makarov@caviumnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Aleksey Makarov 2015-06-02 11:00:21 -07:00 • committed by David S. Miller
parent 2cd2a196af
commit e610cb32b4
5 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/net/ethernet/cavium/thunder/nic.h
View file

@ -301,7 +301,7 @@ struct nic_cfg_msg {
u8 vf_id; u8 vf_id;
u8 tns_mode; u8 tns_mode;
u8 node_id; u8 node_id;
u64 mac_addr; u8 mac_addr[ETH_ALEN];
}; };
/* Qset configuration */ /* Qset configuration */
@ -331,7 +331,7 @@ struct sq_cfg_msg {
struct set_mac_msg { struct set_mac_msg {
u8 msg; u8 msg;
u8 vf_id; u8 vf_id;
u64 addr; u8 mac_addr[ETH_ALEN];
}; };
/* Set Maximum frame size */ /* Set Maximum frame size */

8
drivers/net/ethernet/cavium/thunder/nic_main.c
View file

@ -492,7 +492,6 @@ static void nic_handle_mbx_intr(struct nicpf *nic, int vf)
u64 *mbx_data; u64 *mbx_data;
u64 mbx_addr; u64 mbx_addr;
u64 reg_addr; u64 reg_addr;
u64 mac_addr;
int bgx, lmac; int bgx, lmac;
int i; int i;
int ret = 0; int ret = 0;
@ -555,12 +554,7 @@ static void nic_handle_mbx_intr(struct nicpf *nic, int vf)
lmac = mbx.mac.vf_id; lmac = mbx.mac.vf_id;
bgx = NIC_GET_BGX_FROM_VF_LMAC_MAP(nic->vf_lmac_map[lmac]); bgx = NIC_GET_BGX_FROM_VF_LMAC_MAP(nic->vf_lmac_map[lmac]);
lmac = NIC_GET_LMAC_FROM_VF_LMAC_MAP(nic->vf_lmac_map[lmac]); lmac = NIC_GET_LMAC_FROM_VF_LMAC_MAP(nic->vf_lmac_map[lmac]);
#ifdef __BIG_ENDIAN bgx_set_lmac_mac(nic->node, bgx, lmac, mbx.mac.mac_addr);
mac_addr = cpu_to_be64(mbx.nic_cfg.mac_addr) << 16;
#else
mac_addr = cpu_to_be64(mbx.nic_cfg.mac_addr) >> 16;
#endif
bgx_set_lmac_mac(nic->node, bgx, lmac, (u8 *)&mac_addr);
break; break;
case NIC_MBOX_MSG_SET_MAX_FRS: case NIC_MBOX_MSG_SET_MAX_FRS:
ret = nic_update_hw_frs(nic, mbx.frs.max_frs, ret = nic_update_hw_frs(nic, mbx.frs.max_frs,

8
drivers/net/ethernet/cavium/thunder/nicvf_main.c
View file

@ -197,8 +197,7 @@ static void nicvf_handle_mbx_intr(struct nicvf *nic)
nic->vf_id = mbx.nic_cfg.vf_id & 0x7F; nic->vf_id = mbx.nic_cfg.vf_id & 0x7F;
nic->tns_mode = mbx.nic_cfg.tns_mode & 0x7F; nic->tns_mode = mbx.nic_cfg.tns_mode & 0x7F;
nic->node = mbx.nic_cfg.node_id; nic->node = mbx.nic_cfg.node_id;
ether_addr_copy(nic->netdev->dev_addr, ether_addr_copy(nic->netdev->dev_addr, mbx.nic_cfg.mac_addr);
(u8 *)&mbx.nic_cfg.mac_addr);
nic->link_up = false; nic->link_up = false;
nic->duplex = 0; nic->duplex = 0;
nic->speed = 0; nic->speed = 0;
@ -248,13 +247,10 @@ static void nicvf_handle_mbx_intr(struct nicvf *nic)
static int nicvf_hw_set_mac_addr(struct nicvf *nic, struct net_device *netdev) static int nicvf_hw_set_mac_addr(struct nicvf *nic, struct net_device *netdev)
{ {
union nic_mbx mbx = {}; union nic_mbx mbx = {};
int i;
mbx.mac.msg = NIC_MBOX_MSG_SET_MAC; mbx.mac.msg = NIC_MBOX_MSG_SET_MAC;
mbx.mac.vf_id = nic->vf_id; mbx.mac.vf_id = nic->vf_id;
for (i = 0; i < ETH_ALEN; i++) ether_addr_copy(mbx.mac.mac_addr, netdev->dev_addr);
mbx.mac.addr = (mbx.mac.addr << 8) |
netdev->dev_addr[i];
return nicvf_send_msg_to_pf(nic, &mbx); return nicvf_send_msg_to_pf(nic, &mbx);
} }

4
drivers/net/ethernet/cavium/thunder/thunder_bgx.c
View file

@ -163,7 +163,7 @@ void bgx_get_lmac_link_state(int node, int bgx_idx, int lmacid, void *status)
} }
EXPORT_SYMBOL(bgx_get_lmac_link_state); EXPORT_SYMBOL(bgx_get_lmac_link_state);
const char *bgx_get_lmac_mac(int node, int bgx_idx, int lmacid) const u8 *bgx_get_lmac_mac(int node, int bgx_idx, int lmacid)
{ {
struct bgx *bgx = bgx_vnic[(node * MAX_BGX_PER_CN88XX) + bgx_idx]; struct bgx *bgx = bgx_vnic[(node * MAX_BGX_PER_CN88XX) + bgx_idx];
@ -174,7 +174,7 @@ const char *bgx_get_lmac_mac(int node, int bgx_idx, int lmacid)
} }
EXPORT_SYMBOL(bgx_get_lmac_mac); EXPORT_SYMBOL(bgx_get_lmac_mac);
void bgx_set_lmac_mac(int node, int bgx_idx, int lmacid, const char *mac) void bgx_set_lmac_mac(int node, int bgx_idx, int lmacid, const u8 *mac)
{ {
struct bgx *bgx = bgx_vnic[(node * MAX_BGX_PER_CN88XX) + bgx_idx]; struct bgx *bgx = bgx_vnic[(node * MAX_BGX_PER_CN88XX) + bgx_idx];

4
drivers/net/ethernet/cavium/thunder/thunder_bgx.h
View file

@ -183,8 +183,8 @@ enum MCAST_MODE {
void bgx_add_dmac_addr(u64 dmac, int node, int bgx_idx, int lmac); void bgx_add_dmac_addr(u64 dmac, int node, int bgx_idx, int lmac);
unsigned bgx_get_map(int node); unsigned bgx_get_map(int node);
int bgx_get_lmac_count(int node, int bgx); int bgx_get_lmac_count(int node, int bgx);
const char *bgx_get_lmac_mac(int node, int bgx_idx, int lmacid); const u8 *bgx_get_lmac_mac(int node, int bgx_idx, int lmacid);
void bgx_set_lmac_mac(int node, int bgx_idx, int lmacid, const char *mac); void bgx_set_lmac_mac(int node, int bgx_idx, int lmacid, const u8 *mac);
void bgx_get_lmac_link_state(int node, int bgx_idx, int lmacid, void *status); void bgx_get_lmac_link_state(int node, int bgx_idx, int lmacid, void *status);
u64 bgx_get_rx_stats(int node, int bgx_idx, int lmac, int idx); u64 bgx_get_rx_stats(int node, int bgx_idx, int lmac, int idx);
u64 bgx_get_tx_stats(int node, int bgx_idx, int lmac, int idx); u64 bgx_get_tx_stats(int node, int bgx_idx, int lmac, int idx);