Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4600d69 authored by huangdaode's avatar huangdaode Committed by David S. Miller
Browse files

net: Fix Hisilicon Network Subsystem Support Compilation 



This patch fixes the compilation error with arm allmodconfig, this error
generated due to unavailability of readq() on 32-bit platform which was
found during net-next daily compilation. In the same time, fix all the
hns drivers compilation warnings.

Signed-off-by: default avatarhuangdaode <huangdaode@hisilicon.com>
Signed-off-by: default avatarzhaungyuzeng <Yisen.zhuang@huawei.com>
Signed-off-by: default avatarkenneth Lee <liguozhu@hisilicon.com>
Signed-off-by: default avataryankejian <yankejian@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1273bc57

drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ int hns_mac_get_sfp_prsnt(struct hns_mac_cb *mac_cb, int *sfp_prsnt) 
	if (!mac_cb->cpld_vaddr)

		return -ENODEV;



	*sfp_prsnt = !dsaf_read_b((u64)mac_cb->cpld_vaddr

	*sfp_prsnt = !dsaf_read_b((u8 *)mac_cb->cpld_vaddr

					+ MAC_SFP_PORT_OFFSET);



	return 0;

drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ struct hns_mac_cb; 
#define DSAF_DUMP_REGS_NUM 504

#define DSAF_STATIC_NUM 28



#define DSAF_STATS_READ(p, offset) (*((u64 *)((u64)(p) + (offset))))

#define DSAF_STATS_READ(p, offset) (*((u64 *)((u8 *)(p) + (offset))))



enum hal_dsaf_mode {

	HRD_DSAF_NO_DSAF_MODE	= 0x0,
@@ -302,7 +302,7 @@ struct dsaf_device { 


static inline void *hns_dsaf_dev_priv(const struct dsaf_device *dsaf_dev)

{

	return (void *)((u64)dsaf_dev + sizeof(*dsaf_dev));

	return (void *)((u8 *)dsaf_dev + sizeof(*dsaf_dev));

}



struct dsaf_drv_tbl_tcam_key {

drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c

+2 −4
Original line number Diff line number Diff line
@@ -192,8 +192,7 @@ static void hns_rcb_ring_init(struct ring_pair_cb *ring_pair, int ring_type) 
		dsaf_write_dev(q, RCB_RING_RX_RING_BASEADDR_L_REG,

			       (u32)dma);

		dsaf_write_dev(q, RCB_RING_RX_RING_BASEADDR_H_REG,

			       (u32)(dma >> 32));



			       (u32)((dma >> 31) >> 1));

		dsaf_write_dev(q, RCB_RING_RX_RING_BD_LEN_REG,

			       bd_size_type);

		dsaf_write_dev(q, RCB_RING_RX_RING_BD_NUM_REG,
@@ -204,8 +203,7 @@ static void hns_rcb_ring_init(struct ring_pair_cb *ring_pair, int ring_type) 
		dsaf_write_dev(q, RCB_RING_TX_RING_BASEADDR_L_REG,

			       (u32)dma);

		dsaf_write_dev(q, RCB_RING_TX_RING_BASEADDR_H_REG,

			       (u32)(dma >> 32));



			       (u32)((dma >> 31) >> 1));

		dsaf_write_dev(q, RCB_RING_TX_RING_BD_LEN_REG,

			       bd_size_type);

		dsaf_write_dev(q, RCB_RING_TX_RING_BD_NUM_REG,

drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h

+1 −1
Original line number Diff line number Diff line
@@ -967,6 +967,6 @@ static inline u32 dsaf_get_reg_field(void *base, u32 reg, u32 mask, u32 shift) 
	readb((__iomem unsigned char *)(addr))



#define hns_mac_reg_read64(drv, offset) \

	readq((__iomem void *)(((u64)(drv)->io_base + 0xc00 + (offset))))

	readq((__iomem void *)(((u8 *)(drv)->io_base + 0xc00 + (offset))))



#endif	/* _DSAF_REG_H */

drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 * (at your option) any later version.

 */



#include <asm-generic/io-64-nonatomic-hi-lo.h>

#include <linux/of_mdio.h>

#include "hns_dsaf_main.h"

#include "hns_dsaf_mac.h"