* [PATCH v2] net: Fix Hisilicon Network Subsystem Support Compilation
@ 2015-09-25 6:47 ` huangdaode
0 siblings, 0 replies; 11+ messages in thread
From: huangdaode @ 2015-09-25 6:47 UTC (permalink / raw)
To: linux-arm-kernel
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: huangdaode <huangdaode@hisilicon.com>
Signed-off-by: zhaungyuzeng <Yisen.zhuang@huawei.com>
Signed-off-by: kenneth Lee <liguozhu@hisilicon.com>
Signed-off-by: yankejian <yankejian@huawei.com>
---
drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 2 +-
drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h | 4 ++--
drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c | 10 ++++++++--
drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h | 10 +++++++++-
drivers/net/ethernet/hisilicon/hns/hns_enet.c | 17 -----------------
5 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
index a8bd27b..95bf42a 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
@@ -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;
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h
index e0417c0..315b07e 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h
@@ -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 {
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c
index 50f3427..1e10f65 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c
@@ -191,9 +191,12 @@ static void hns_rcb_ring_init(struct ring_pair_cb *ring_pair, int ring_type)
if (ring_type == RX_RING) {
dsaf_write_dev(q, RCB_RING_RX_RING_BASEADDR_L_REG,
(u32)dma);
+#ifdef CONFIG_64BIT
dsaf_write_dev(q, RCB_RING_RX_RING_BASEADDR_H_REG,
(u32)(dma >> 32));
-
+#else
+ dsaf_write_dev(q, RCB_RING_RX_RING_BASEADDR_H_REG, 0);
+#endif
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,
@@ -203,9 +206,12 @@ static void hns_rcb_ring_init(struct ring_pair_cb *ring_pair, int ring_type)
} else {
dsaf_write_dev(q, RCB_RING_TX_RING_BASEADDR_L_REG,
(u32)dma);
+#ifdef CONFIG_64BIT
dsaf_write_dev(q, RCB_RING_TX_RING_BASEADDR_H_REG,
(u32)(dma >> 32));
-
+#else
+ dsaf_write_dev(q, RCB_RING_TX_RING_BASEADDR_H_REG, 0);
+#endif
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,
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
index 6fc58ba..8dcaf5f 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
@@ -966,7 +966,15 @@ static inline u32 dsaf_get_reg_field(void *base, u32 reg, u32 mask, u32 shift)
#define dsaf_read_b(addr)\
readb((__iomem unsigned char *)(addr))
+#ifndef readq
+static inline u64 readq(void __iomem *reg)
+{
+ return (((u64)readl(reg + 0x4UL) << 32) |
+ (u64)readl(reg));
+}
+#endif
+
#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 */
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_enet.c b/drivers/net/ethernet/hisilicon/hns/hns_enet.c
index 0713ced..ce7f2e0 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_enet.c
@@ -31,8 +31,6 @@
#define NIC_TX_CLEAN_MAX_NUM 256
#define NIC_RX_CLEAN_MAX_NUM 64
-#define RCB_ERR_PRINT_CYCLE 1000
-
#define RCB_IRQ_NOT_INITED 0
#define RCB_IRQ_INITED 1
@@ -434,21 +432,12 @@ out_bnum_err:
if (unlikely((!desc->rx.pkt_len) ||
hnae_get_bit(bnum_flag, HNS_RXD_DROP_B))) {
- if (!(ring->stats.err_pkt_len % RCB_ERR_PRINT_CYCLE))
- netdev_dbg(ndev,
- "pkt_len(%u),drop(%u),%#llx,%#llx\n",
- le16_to_cpu(desc->rx.pkt_len),
- hnae_get_bit(bnum_flag, HNS_RXD_DROP_B),
- ((u64 *)desc)[0], ((u64 *)desc)[1]);
ring->stats.err_pkt_len++;
dev_kfree_skb_any(skb);
return -EFAULT;
}
if (unlikely(hnae_get_bit(bnum_flag, HNS_RXD_L2E_B))) {
- if (!(ring->stats.l2_err % RCB_ERR_PRINT_CYCLE))
- netdev_dbg(ndev, "L2 check err,%#llx,%#llx\n",
- ((u64 *)desc)[0], ((u64 *)desc)[1]);
ring->stats.l2_err++;
dev_kfree_skb_any(skb);
return -EFAULT;
@@ -459,12 +448,6 @@ out_bnum_err:
if (unlikely(hnae_get_bit(bnum_flag, HNS_RXD_L3E_B) ||
hnae_get_bit(bnum_flag, HNS_RXD_L4E_B))) {
- if (!(ring->stats.l3l4_csum_err % RCB_ERR_PRINT_CYCLE))
- netdev_dbg(ndev,
- "check err(%#x),%#llx,%#llx\n",
- hnae_get_bit(bnum_flag, HNS_RXD_L3E_B) |
- hnae_get_bit(bnum_flag, HNS_RXD_L4E_B),
- ((u64 *)desc)[0], ((u64 *)desc)[1]);
ring->stats.l3l4_csum_err++;
return 0;
}
--
1.9.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v2] net: Fix Hisilicon Network Subsystem Support Compilation
@ 2015-09-25 6:47 ` huangdaode
0 siblings, 0 replies; 11+ messages in thread
From: huangdaode @ 2015-09-25 6:47 UTC (permalink / raw)
To: davem-fT/PcQaiUtIeIZ0/mPfg9Q
Cc: robh+dt-DgEjT+Ai2ygdnm+yROfE0A, pawel.moll-5wv7dgnIgG8,
mark.rutland-5wv7dgnIgG8, ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg,
galak-sgV2jX0FEOL9JmXXK+q4OQ, catalin.marinas-5wv7dgnIgG8,
will.deacon-5wv7dgnIgG8, liguozhu-C8/M+/jPZTeaMJb+Lgu22Q,
Yisen.Zhuang-hv44wF8Li93QT0dZR+AlfA,
paul.gortmaker-CWA4WttNNZF54TAoqtyWWQ,
dingtianhong-hv44wF8Li93QT0dZR+AlfA,
zhangfei.gao-QSEj5FYQhm4dnm+yROfE0A,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
netdev-u79uwXL29TY76Z2rM5mHXA, linuxarm-hv44wF8Li93QT0dZR+AlfA,
salil.mehta-hv44wF8Li93QT0dZR+AlfA,
huangdaode-C8/M+/jPZTeaMJb+Lgu22Q,
kenneth-lee-2012-H32Fclmsjq1BDgjK7y7TUQ,
xuwei5-C8/M+/jPZTeaMJb+Lgu22Q, lisheng011-hv44wF8Li93QT0dZR+AlfA
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: huangdaode <huangdaode-C8/M+/jPZTeaMJb+Lgu22Q@public.gmane.org>
Signed-off-by: zhaungyuzeng <Yisen.zhuang-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
Signed-off-by: kenneth Lee <liguozhu-C8/M+/jPZTeaMJb+Lgu22Q@public.gmane.org>
Signed-off-by: yankejian <yankejian-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
---
drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 2 +-
drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h | 4 ++--
drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c | 10 ++++++++--
drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h | 10 +++++++++-
drivers/net/ethernet/hisilicon/hns/hns_enet.c | 17 -----------------
5 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
index a8bd27b..95bf42a 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
@@ -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;
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h
index e0417c0..315b07e 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h
@@ -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 {
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c
index 50f3427..1e10f65 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c
@@ -191,9 +191,12 @@ static void hns_rcb_ring_init(struct ring_pair_cb *ring_pair, int ring_type)
if (ring_type == RX_RING) {
dsaf_write_dev(q, RCB_RING_RX_RING_BASEADDR_L_REG,
(u32)dma);
+#ifdef CONFIG_64BIT
dsaf_write_dev(q, RCB_RING_RX_RING_BASEADDR_H_REG,
(u32)(dma >> 32));
-
+#else
+ dsaf_write_dev(q, RCB_RING_RX_RING_BASEADDR_H_REG, 0);
+#endif
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,
@@ -203,9 +206,12 @@ static void hns_rcb_ring_init(struct ring_pair_cb *ring_pair, int ring_type)
} else {
dsaf_write_dev(q, RCB_RING_TX_RING_BASEADDR_L_REG,
(u32)dma);
+#ifdef CONFIG_64BIT
dsaf_write_dev(q, RCB_RING_TX_RING_BASEADDR_H_REG,
(u32)(dma >> 32));
-
+#else
+ dsaf_write_dev(q, RCB_RING_TX_RING_BASEADDR_H_REG, 0);
+#endif
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,
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
index 6fc58ba..8dcaf5f 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
@@ -966,7 +966,15 @@ static inline u32 dsaf_get_reg_field(void *base, u32 reg, u32 mask, u32 shift)
#define dsaf_read_b(addr)\
readb((__iomem unsigned char *)(addr))
+#ifndef readq
+static inline u64 readq(void __iomem *reg)
+{
+ return (((u64)readl(reg + 0x4UL) << 32) |
+ (u64)readl(reg));
+}
+#endif
+
#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 */
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_enet.c b/drivers/net/ethernet/hisilicon/hns/hns_enet.c
index 0713ced..ce7f2e0 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_enet.c
@@ -31,8 +31,6 @@
#define NIC_TX_CLEAN_MAX_NUM 256
#define NIC_RX_CLEAN_MAX_NUM 64
-#define RCB_ERR_PRINT_CYCLE 1000
-
#define RCB_IRQ_NOT_INITED 0
#define RCB_IRQ_INITED 1
@@ -434,21 +432,12 @@ out_bnum_err:
if (unlikely((!desc->rx.pkt_len) ||
hnae_get_bit(bnum_flag, HNS_RXD_DROP_B))) {
- if (!(ring->stats.err_pkt_len % RCB_ERR_PRINT_CYCLE))
- netdev_dbg(ndev,
- "pkt_len(%u),drop(%u),%#llx,%#llx\n",
- le16_to_cpu(desc->rx.pkt_len),
- hnae_get_bit(bnum_flag, HNS_RXD_DROP_B),
- ((u64 *)desc)[0], ((u64 *)desc)[1]);
ring->stats.err_pkt_len++;
dev_kfree_skb_any(skb);
return -EFAULT;
}
if (unlikely(hnae_get_bit(bnum_flag, HNS_RXD_L2E_B))) {
- if (!(ring->stats.l2_err % RCB_ERR_PRINT_CYCLE))
- netdev_dbg(ndev, "L2 check err,%#llx,%#llx\n",
- ((u64 *)desc)[0], ((u64 *)desc)[1]);
ring->stats.l2_err++;
dev_kfree_skb_any(skb);
return -EFAULT;
@@ -459,12 +448,6 @@ out_bnum_err:
if (unlikely(hnae_get_bit(bnum_flag, HNS_RXD_L3E_B) ||
hnae_get_bit(bnum_flag, HNS_RXD_L4E_B))) {
- if (!(ring->stats.l3l4_csum_err % RCB_ERR_PRINT_CYCLE))
- netdev_dbg(ndev,
- "check err(%#x),%#llx,%#llx\n",
- hnae_get_bit(bnum_flag, HNS_RXD_L3E_B) |
- hnae_get_bit(bnum_flag, HNS_RXD_L4E_B),
- ((u64 *)desc)[0], ((u64 *)desc)[1]);
ring->stats.l3l4_csum_err++;
return 0;
}
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v2] net: Fix Hisilicon Network Subsystem Support Compilation
@ 2015-09-25 6:47 ` huangdaode
0 siblings, 0 replies; 11+ messages in thread
From: huangdaode @ 2015-09-25 6:47 UTC (permalink / raw)
To: davem
Cc: robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak,
catalin.marinas, will.deacon, liguozhu, Yisen.Zhuang,
paul.gortmaker, dingtianhong, zhangfei.gao, devicetree,
linux-kernel, linux-arm-kernel, netdev, linuxarm, salil.mehta,
huangdaode, kenneth-lee-2012, xuwei5, lisheng011
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: huangdaode <huangdaode@hisilicon.com>
Signed-off-by: zhaungyuzeng <Yisen.zhuang@huawei.com>
Signed-off-by: kenneth Lee <liguozhu@hisilicon.com>
Signed-off-by: yankejian <yankejian@huawei.com>
---
drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 2 +-
drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h | 4 ++--
drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c | 10 ++++++++--
drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h | 10 +++++++++-
drivers/net/ethernet/hisilicon/hns/hns_enet.c | 17 -----------------
5 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
index a8bd27b..95bf42a 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
@@ -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;
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h
index e0417c0..315b07e 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h
@@ -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 {
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c
index 50f3427..1e10f65 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c
@@ -191,9 +191,12 @@ static void hns_rcb_ring_init(struct ring_pair_cb *ring_pair, int ring_type)
if (ring_type == RX_RING) {
dsaf_write_dev(q, RCB_RING_RX_RING_BASEADDR_L_REG,
(u32)dma);
+#ifdef CONFIG_64BIT
dsaf_write_dev(q, RCB_RING_RX_RING_BASEADDR_H_REG,
(u32)(dma >> 32));
-
+#else
+ dsaf_write_dev(q, RCB_RING_RX_RING_BASEADDR_H_REG, 0);
+#endif
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,
@@ -203,9 +206,12 @@ static void hns_rcb_ring_init(struct ring_pair_cb *ring_pair, int ring_type)
} else {
dsaf_write_dev(q, RCB_RING_TX_RING_BASEADDR_L_REG,
(u32)dma);
+#ifdef CONFIG_64BIT
dsaf_write_dev(q, RCB_RING_TX_RING_BASEADDR_H_REG,
(u32)(dma >> 32));
-
+#else
+ dsaf_write_dev(q, RCB_RING_TX_RING_BASEADDR_H_REG, 0);
+#endif
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,
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
index 6fc58ba..8dcaf5f 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
@@ -966,7 +966,15 @@ static inline u32 dsaf_get_reg_field(void *base, u32 reg, u32 mask, u32 shift)
#define dsaf_read_b(addr)\
readb((__iomem unsigned char *)(addr))
+#ifndef readq
+static inline u64 readq(void __iomem *reg)
+{
+ return (((u64)readl(reg + 0x4UL) << 32) |
+ (u64)readl(reg));
+}
+#endif
+
#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 */
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_enet.c b/drivers/net/ethernet/hisilicon/hns/hns_enet.c
index 0713ced..ce7f2e0 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_enet.c
@@ -31,8 +31,6 @@
#define NIC_TX_CLEAN_MAX_NUM 256
#define NIC_RX_CLEAN_MAX_NUM 64
-#define RCB_ERR_PRINT_CYCLE 1000
-
#define RCB_IRQ_NOT_INITED 0
#define RCB_IRQ_INITED 1
@@ -434,21 +432,12 @@ out_bnum_err:
if (unlikely((!desc->rx.pkt_len) ||
hnae_get_bit(bnum_flag, HNS_RXD_DROP_B))) {
- if (!(ring->stats.err_pkt_len % RCB_ERR_PRINT_CYCLE))
- netdev_dbg(ndev,
- "pkt_len(%u),drop(%u),%#llx,%#llx\n",
- le16_to_cpu(desc->rx.pkt_len),
- hnae_get_bit(bnum_flag, HNS_RXD_DROP_B),
- ((u64 *)desc)[0], ((u64 *)desc)[1]);
ring->stats.err_pkt_len++;
dev_kfree_skb_any(skb);
return -EFAULT;
}
if (unlikely(hnae_get_bit(bnum_flag, HNS_RXD_L2E_B))) {
- if (!(ring->stats.l2_err % RCB_ERR_PRINT_CYCLE))
- netdev_dbg(ndev, "L2 check err,%#llx,%#llx\n",
- ((u64 *)desc)[0], ((u64 *)desc)[1]);
ring->stats.l2_err++;
dev_kfree_skb_any(skb);
return -EFAULT;
@@ -459,12 +448,6 @@ out_bnum_err:
if (unlikely(hnae_get_bit(bnum_flag, HNS_RXD_L3E_B) ||
hnae_get_bit(bnum_flag, HNS_RXD_L4E_B))) {
- if (!(ring->stats.l3l4_csum_err % RCB_ERR_PRINT_CYCLE))
- netdev_dbg(ndev,
- "check err(%#x),%#llx,%#llx\n",
- hnae_get_bit(bnum_flag, HNS_RXD_L3E_B) |
- hnae_get_bit(bnum_flag, HNS_RXD_L4E_B),
- ((u64 *)desc)[0], ((u64 *)desc)[1]);
ring->stats.l3l4_csum_err++;
return 0;
}
--
1.9.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v2] net: Fix Hisilicon Network Subsystem Support Compilation
@ 2015-09-25 6:47 ` huangdaode
0 siblings, 0 replies; 11+ messages in thread
From: huangdaode @ 2015-09-25 6:47 UTC (permalink / raw)
To: davem-fT/PcQaiUtIeIZ0/mPfg9Q
Cc: robh+dt-DgEjT+Ai2ygdnm+yROfE0A, pawel.moll-5wv7dgnIgG8,
mark.rutland-5wv7dgnIgG8, ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg,
galak-sgV2jX0FEOL9JmXXK+q4OQ, catalin.marinas-5wv7dgnIgG8,
will.deacon-5wv7dgnIgG8, liguozhu-C8/M+/jPZTeaMJb+Lgu22Q,
Yisen.Zhuang-hv44wF8Li93QT0dZR+AlfA,
paul.gortmaker-CWA4WttNNZF54TAoqtyWWQ,
dingtianhong-hv44wF8Li93QT0dZR+AlfA,
zhangfei.gao-QSEj5FYQhm4dnm+yROfE0A,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
netdev-u79uwXL29TY76Z2rM5mHXA, linuxarm-hv44wF8Li93QT0dZR+AlfA,
salil.mehta-hv44wF8Li93QT0dZR+AlfA,
huangdaode-C8/M+/jPZTeaMJb+Lgu22Q,
kenneth-lee-2012-H32Fclmsjq1BDgjK7y7TUQ,
xuwei5-C8/M+/jPZTeaMJb+Lgu22Q, lisheng011-hv44wF8Li93QT0dZR+AlfA
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: huangdaode <huangdaode-C8/M+/jPZTeaMJb+Lgu22Q@public.gmane.org>
Signed-off-by: zhaungyuzeng <Yisen.zhuang-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
Signed-off-by: kenneth Lee <liguozhu-C8/M+/jPZTeaMJb+Lgu22Q@public.gmane.org>
Signed-off-by: yankejian <yankejian-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
---
drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 2 +-
drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h | 4 ++--
drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c | 10 ++++++++--
drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h | 10 +++++++++-
drivers/net/ethernet/hisilicon/hns/hns_enet.c | 17 -----------------
5 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
index a8bd27b..95bf42a 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
@@ -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;
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h
index e0417c0..315b07e 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h
@@ -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 {
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c
index 50f3427..1e10f65 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c
@@ -191,9 +191,12 @@ static void hns_rcb_ring_init(struct ring_pair_cb *ring_pair, int ring_type)
if (ring_type == RX_RING) {
dsaf_write_dev(q, RCB_RING_RX_RING_BASEADDR_L_REG,
(u32)dma);
+#ifdef CONFIG_64BIT
dsaf_write_dev(q, RCB_RING_RX_RING_BASEADDR_H_REG,
(u32)(dma >> 32));
-
+#else
+ dsaf_write_dev(q, RCB_RING_RX_RING_BASEADDR_H_REG, 0);
+#endif
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,
@@ -203,9 +206,12 @@ static void hns_rcb_ring_init(struct ring_pair_cb *ring_pair, int ring_type)
} else {
dsaf_write_dev(q, RCB_RING_TX_RING_BASEADDR_L_REG,
(u32)dma);
+#ifdef CONFIG_64BIT
dsaf_write_dev(q, RCB_RING_TX_RING_BASEADDR_H_REG,
(u32)(dma >> 32));
-
+#else
+ dsaf_write_dev(q, RCB_RING_TX_RING_BASEADDR_H_REG, 0);
+#endif
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,
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
index 6fc58ba..8dcaf5f 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
@@ -966,7 +966,15 @@ static inline u32 dsaf_get_reg_field(void *base, u32 reg, u32 mask, u32 shift)
#define dsaf_read_b(addr)\
readb((__iomem unsigned char *)(addr))
+#ifndef readq
+static inline u64 readq(void __iomem *reg)
+{
+ return (((u64)readl(reg + 0x4UL) << 32) |
+ (u64)readl(reg));
+}
+#endif
+
#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 */
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_enet.c b/drivers/net/ethernet/hisilicon/hns/hns_enet.c
index 0713ced..ce7f2e0 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_enet.c
@@ -31,8 +31,6 @@
#define NIC_TX_CLEAN_MAX_NUM 256
#define NIC_RX_CLEAN_MAX_NUM 64
-#define RCB_ERR_PRINT_CYCLE 1000
-
#define RCB_IRQ_NOT_INITED 0
#define RCB_IRQ_INITED 1
@@ -434,21 +432,12 @@ out_bnum_err:
if (unlikely((!desc->rx.pkt_len) ||
hnae_get_bit(bnum_flag, HNS_RXD_DROP_B))) {
- if (!(ring->stats.err_pkt_len % RCB_ERR_PRINT_CYCLE))
- netdev_dbg(ndev,
- "pkt_len(%u),drop(%u),%#llx,%#llx\n",
- le16_to_cpu(desc->rx.pkt_len),
- hnae_get_bit(bnum_flag, HNS_RXD_DROP_B),
- ((u64 *)desc)[0], ((u64 *)desc)[1]);
ring->stats.err_pkt_len++;
dev_kfree_skb_any(skb);
return -EFAULT;
}
if (unlikely(hnae_get_bit(bnum_flag, HNS_RXD_L2E_B))) {
- if (!(ring->stats.l2_err % RCB_ERR_PRINT_CYCLE))
- netdev_dbg(ndev, "L2 check err,%#llx,%#llx\n",
- ((u64 *)desc)[0], ((u64 *)desc)[1]);
ring->stats.l2_err++;
dev_kfree_skb_any(skb);
return -EFAULT;
@@ -459,12 +448,6 @@ out_bnum_err:
if (unlikely(hnae_get_bit(bnum_flag, HNS_RXD_L3E_B) ||
hnae_get_bit(bnum_flag, HNS_RXD_L4E_B))) {
- if (!(ring->stats.l3l4_csum_err % RCB_ERR_PRINT_CYCLE))
- netdev_dbg(ndev,
- "check err(%#x),%#llx,%#llx\n",
- hnae_get_bit(bnum_flag, HNS_RXD_L3E_B) |
- hnae_get_bit(bnum_flag, HNS_RXD_L4E_B),
- ((u64 *)desc)[0], ((u64 *)desc)[1]);
ring->stats.l3l4_csum_err++;
return 0;
}
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v2] net: Fix Hisilicon Network Subsystem Support Compilation
@ 2015-09-25 7:12 ` David Miller
0 siblings, 0 replies; 11+ messages in thread
From: David Miller @ 2015-09-25 7:12 UTC (permalink / raw)
To: linux-arm-kernel
From: huangdaode <huangdaode@hisilicon.com>
Date: Fri, 25 Sep 2015 14:47:23 +0800
> @@ -966,7 +966,15 @@ static inline u32 dsaf_get_reg_field(void *base, u32 reg, u32 mask, u32 shift)
> #define dsaf_read_b(addr)\
> readb((__iomem unsigned char *)(addr))
>
> +#ifndef readq
> +static inline u64 readq(void __iomem *reg)
> +{
Nope, try instead "#include <asm/io-64-nonatomic-lo-hi.h" or
"#include <asm/io-64-nonatomic-hi-lo.h".
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2] net: Fix Hisilicon Network Subsystem Support Compilation
@ 2015-09-25 7:12 ` David Miller
0 siblings, 0 replies; 11+ messages in thread
From: David Miller @ 2015-09-25 7:12 UTC (permalink / raw)
To: huangdaode-C8/M+/jPZTeaMJb+Lgu22Q
Cc: robh+dt-DgEjT+Ai2ygdnm+yROfE0A, pawel.moll-5wv7dgnIgG8,
mark.rutland-5wv7dgnIgG8, ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg,
galak-sgV2jX0FEOL9JmXXK+q4OQ, catalin.marinas-5wv7dgnIgG8,
will.deacon-5wv7dgnIgG8, liguozhu-C8/M+/jPZTeaMJb+Lgu22Q,
Yisen.Zhuang-hv44wF8Li93QT0dZR+AlfA,
paul.gortmaker-CWA4WttNNZF54TAoqtyWWQ,
dingtianhong-hv44wF8Li93QT0dZR+AlfA,
zhangfei.gao-QSEj5FYQhm4dnm+yROfE0A,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
netdev-u79uwXL29TY76Z2rM5mHXA, linuxarm-hv44wF8Li93QT0dZR+AlfA,
salil.mehta-hv44wF8Li93QT0dZR+AlfA,
kenneth-lee-2012-H32Fclmsjq1BDgjK7y7TUQ,
xuwei5-C8/M+/jPZTeaMJb+Lgu22Q, lisheng011-hv44wF8Li93QT0dZR+AlfA
From: huangdaode <huangdaode-C8/M+/jPZTeaMJb+Lgu22Q@public.gmane.org>
Date: Fri, 25 Sep 2015 14:47:23 +0800
> @@ -966,7 +966,15 @@ static inline u32 dsaf_get_reg_field(void *base, u32 reg, u32 mask, u32 shift)
> #define dsaf_read_b(addr)\
> readb((__iomem unsigned char *)(addr))
>
> +#ifndef readq
> +static inline u64 readq(void __iomem *reg)
> +{
Nope, try instead "#include <asm/io-64-nonatomic-lo-hi.h" or
"#include <asm/io-64-nonatomic-hi-lo.h".
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2] net: Fix Hisilicon Network Subsystem Support Compilation
@ 2015-09-25 7:12 ` David Miller
0 siblings, 0 replies; 11+ messages in thread
From: David Miller @ 2015-09-25 7:12 UTC (permalink / raw)
To: huangdaode
Cc: robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak,
catalin.marinas, will.deacon, liguozhu, Yisen.Zhuang,
paul.gortmaker, dingtianhong, zhangfei.gao, devicetree,
linux-kernel, linux-arm-kernel, netdev, linuxarm, salil.mehta,
kenneth-lee-2012, xuwei5, lisheng011
From: huangdaode <huangdaode@hisilicon.com>
Date: Fri, 25 Sep 2015 14:47:23 +0800
> @@ -966,7 +966,15 @@ static inline u32 dsaf_get_reg_field(void *base, u32 reg, u32 mask, u32 shift)
> #define dsaf_read_b(addr)\
> readb((__iomem unsigned char *)(addr))
>
> +#ifndef readq
> +static inline u64 readq(void __iomem *reg)
> +{
Nope, try instead "#include <asm/io-64-nonatomic-lo-hi.h" or
"#include <asm/io-64-nonatomic-hi-lo.h".
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v2] net: Fix Hisilicon Network Subsystem Support Compilation
2015-09-25 7:12 ` David Miller
(?)
@ 2015-09-25 7:55 ` huangdaode
-1 siblings, 0 replies; 11+ messages in thread
From: huangdaode @ 2015-09-25 7:55 UTC (permalink / raw)
To: linux-arm-kernel
On 2015/9/25 15:12, David Miller wrote:
> From: huangdaode <huangdaode@hisilicon.com>
> Date: Fri, 25 Sep 2015 14:47:23 +0800
>
>> @@ -966,7 +966,15 @@ static inline u32 dsaf_get_reg_field(void *base, u32 reg, u32 mask, u32 shift)
>> #define dsaf_read_b(addr)\
>> readb((__iomem unsigned char *)(addr))
>>
>> +#ifndef readq
>> +static inline u64 readq(void __iomem *reg)
>> +{
> Nope, try instead "#include <asm/io-64-nonatomic-lo-hi.h" or
> "#include <asm/io-64-nonatomic-hi-lo.h".
>
> .
>
yes, it's defined in #include <asm-generic/io-64-nonatomic-hi-lo.h>.
will fix in v3,
thanks
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2] net: Fix Hisilicon Network Subsystem Support Compilation
@ 2015-09-25 7:55 ` huangdaode
0 siblings, 0 replies; 11+ messages in thread
From: huangdaode @ 2015-09-25 7:55 UTC (permalink / raw)
To: David Miller
Cc: robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak,
catalin.marinas, will.deacon, liguozhu, Yisen.Zhuang,
paul.gortmaker, dingtianhong, zhangfei.gao, devicetree,
linux-kernel, linux-arm-kernel, netdev, linuxarm, salil.mehta,
kenneth-lee-2012, xuwei5, lisheng011
On 2015/9/25 15:12, David Miller wrote:
> From: huangdaode <huangdaode@hisilicon.com>
> Date: Fri, 25 Sep 2015 14:47:23 +0800
>
>> @@ -966,7 +966,15 @@ static inline u32 dsaf_get_reg_field(void *base, u32 reg, u32 mask, u32 shift)
>> #define dsaf_read_b(addr)\
>> readb((__iomem unsigned char *)(addr))
>>
>> +#ifndef readq
>> +static inline u64 readq(void __iomem *reg)
>> +{
> Nope, try instead "#include <asm/io-64-nonatomic-lo-hi.h" or
> "#include <asm/io-64-nonatomic-hi-lo.h".
>
> .
>
yes, it's defined in #include <asm-generic/io-64-nonatomic-hi-lo.h>.
will fix in v3,
thanks
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2] net: Fix Hisilicon Network Subsystem Support Compilation
@ 2015-09-25 7:55 ` huangdaode
0 siblings, 0 replies; 11+ messages in thread
From: huangdaode @ 2015-09-25 7:55 UTC (permalink / raw)
To: David Miller
Cc: robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak,
catalin.marinas, will.deacon, liguozhu, Yisen.Zhuang,
paul.gortmaker, dingtianhong, zhangfei.gao, devicetree,
linux-kernel, linux-arm-kernel, netdev, linuxarm, salil.mehta,
kenneth-lee-2012, xuwei5, lisheng011
On 2015/9/25 15:12, David Miller wrote:
> From: huangdaode <huangdaode@hisilicon.com>
> Date: Fri, 25 Sep 2015 14:47:23 +0800
>
>> @@ -966,7 +966,15 @@ static inline u32 dsaf_get_reg_field(void *base, u32 reg, u32 mask, u32 shift)
>> #define dsaf_read_b(addr)\
>> readb((__iomem unsigned char *)(addr))
>>
>> +#ifndef readq
>> +static inline u64 readq(void __iomem *reg)
>> +{
> Nope, try instead "#include <asm/io-64-nonatomic-lo-hi.h" or
> "#include <asm/io-64-nonatomic-hi-lo.h".
>
> .
>
yes, it's defined in #include <asm-generic/io-64-nonatomic-hi-lo.h>.
will fix in v3,
thanks
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2] net: Fix Hisilicon Network Subsystem Support Compilation
2015-09-25 7:12 ` David Miller
` (2 preceding siblings ...)
(?)
@ 2015-09-25 8:10 ` huangdaode
-1 siblings, 0 replies; 11+ messages in thread
From: huangdaode @ 2015-09-25 8:10 UTC (permalink / raw)
To: David Miller
Cc: robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak,
catalin.marinas, will.deacon, liguozhu, Yisen.Zhuang,
paul.gortmaker, dingtianhong, zhangfei.gao, devicetree,
linux-kernel, linux-arm-kernel, netdev, linuxarm, salil.mehta,
kenneth-lee-2012, xuwei5, lisheng011
[-- Attachment #1: Type: text/plain, Size: 592 bytes --]
On 2015/9/25 15:12, David Miller wrote:
> From: huangdaode <huangdaode@hisilicon.com>
> Date: Fri, 25 Sep 2015 14:47:23 +0800
>
>> @@ -966,7 +966,15 @@ static inline u32 dsaf_get_reg_field(void *base, u32 reg, u32 mask, u32 shift)
>> #define dsaf_read_b(addr)\
>> readb((__iomem unsigned char *)(addr))
>>
>> +#ifndef readq
>> +static inline u64 readq(void __iomem *reg)
>> +{
> Nope, try instead "#include <asm/io-64-nonatomic-lo-hi.h" or
> "#include <asm/io-64-nonatomic-hi-lo.h".
>
> .
>
>
>
sorry, I am floating the fix immediately and you can include it in the
current release.
[-- Attachment #2: Type: text/html, Size: 6148 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2015-09-25 8:10 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-25 6:47 [PATCH v2] net: Fix Hisilicon Network Subsystem Support Compilation huangdaode
2015-09-25 6:47 ` huangdaode
2015-09-25 6:47 ` huangdaode
2015-09-25 6:47 ` huangdaode
2015-09-25 7:12 ` David Miller
2015-09-25 7:12 ` David Miller
2015-09-25 7:12 ` David Miller
2015-09-25 7:55 ` huangdaode
2015-09-25 7:55 ` huangdaode
2015-09-25 7:55 ` huangdaode
2015-09-25 8:10 ` huangdaode
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.