qlge:Fix sparse warnings.
Subsystems (2)
cover qlge:Fix sparse warnings.
Dave,
The attached patches fix sparse warnings as requested by Christoph Hellwig.
I will get rid of the volatile usage per your request in my next series.
Thanks,
Ron
PATCH 1/5 qlge: Fix sparse warnings for byte swapping in qlge_ethool.c
drivers/net/qlge/qlge_ethtool.c:59:23: warning: cast to restricted type drivers/net/qlge/qlge_ethtool.c:59:21: warning: incorrect type in assignment (different base types)drivers/net/qlge/qlge_ethtool.c:59:21: expected restricted unsigned short [usertype] irq_delaydrivers/net/qlge/qlge_ethtool.c:59:21: got unsigned short [unsigned] [usertype] <noident>drivers/net/qlge/qlge_ethtool.c:61:8: warning: cast to restricted type drivers/net/qlge/qlge_ethtool.c:60:21: warning: incorrect type in assignment (different base types)drivers/net/qlge/qlge_ethtool.c:60:21: expected restricted unsigned short [usertype] pkt_delaydrivers/net/qlge/qlge_ethtool.c:60:21: got unsigned short [unsigned] [usertype] <noident>drivers/net/qlge/qlge_ethtool.c:82:23: warning: cast to restricted type drivers/net/qlge/qlge_ethtool.c:82:21: warning: incorrect type in assignment (different base types)drivers/net/qlge/qlge_ethtool.c:82:21: expected restricted unsigned short [usertype] irq_delaydrivers/net/qlge/qlge_ethtool.c:82:21: got unsigned short [unsigned] [usertype] <noident>drivers/net/qlge/qlge_ethtool.c:84:8: warning: cast to restricted type drivers/net/qlge/qlge_ethtool.c:83:21: warning: incorrect type in assignment (different base types)drivers/net/qlge/qlge_ethtool.c:83:21: expected restricted unsigned short [usertype] pkt_delaydrivers/net/qlge/qlge_ethtool.c:83:21: got unsigned short [unsigned] [usertype] <noident>
--- drivers/net/qlge/qlge_ethtool.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/net/qlge/qlge_ethtool.c +4 -4
@@ -56,9 +56,9 @@ static int ql_update_ring_coalescing(struct ql_adapter *qdev)for (i =1 ; i < qdev->rss_ring_first_cq_id; i++, rx_ring++) { rx_ring = &qdev->rx_ring[i]; cqicb = (struct cqicb *)rx_ring; - cqicb->irq_delay =le16_to_cpu (qdev->tx_coalesce_usecs); + cqicb->irq_delay =cpu_to_le16 (qdev->tx_coalesce_usecs); cqicb->pkt_delay = -le16_to_cpu (qdev->tx_max_coalesced_frames); +cpu_to_le16 (qdev->tx_max_coalesced_frames); cqicb->flags =FLAGS_LI ; status =ql_write_cfg (qdev, cqicb,sizeof (cqicb),CFG_LCQ , rx_ring->cq_id);
@@ -79,9 +79,9 @@ static int ql_update_ring_coalescing(struct ql_adapter *qdev) i++) { rx_ring = &qdev->rx_ring[i]; cqicb = (struct cqicb *)rx_ring; - cqicb->irq_delay =le16_to_cpu (qdev->rx_coalesce_usecs); + cqicb->irq_delay =cpu_to_le16 (qdev->rx_coalesce_usecs); cqicb->pkt_delay = -le16_to_cpu (qdev->rx_max_coalesced_frames); +cpu_to_le16 (qdev->rx_max_coalesced_frames); cqicb->flags =FLAGS_LI ; status =ql_write_cfg (qdev, cqicb,sizeof (cqicb),CFG_LCQ , rx_ring->cq_id);
Signature · 1 line
1.6.0
Re: [PATCH 1/5] qlge: Fix sparse warnings for byte swapping in qlge_ethool.c
From: Ron Mercer <[email protected]>
Date: Mon, 5 Jan 2009 14:27:28 -0800
...
Quoted 1 line
Signed-off-by Ron Mercer <[email protected]>
Applied.
PATCH 2/5 qlge: Fix sparse endian warning for inbound packet control block flags.
In reply to Ron MercerChanged flags element from __le32 to 3 reserved bytes and one byte of flags. Changed flags bit definitions to reflect byte width instead of __le32 width.
Warnings:drivers/net/qlge/qlge_main.c:1206:16: warning: restricted degrades to integer drivers/net/qlge/qlge_main.c:1207:16: warning: restricted degrades to integer drivers/net/qlge/qlge_main.c:1233:17: warning: restricted degrades to integer drivers/net/qlge/qlge_main.c:1276:17: warning: restricted degrades to integer drivers/net/qlge/qlge_main.c:1349:19: warning: restricted degrades to integer
--- drivers/net/qlge/qlge.h | 9 +++++---- drivers/net/qlge/qlge_dbg.c | 13 +++++-------- 2 files changed, 10 insertions(+), 12 deletions(-)
drivers/net/qlge/qlge.h +5 -4
@@ -979,10 +979,11 @@ struct ib_mac_iocb_rsp {__le16 reserved1;__le32 reserved2[6 ]; -__le32 flags4; -#define IB_MAC_IOCB_RSP_HV 0x20000000/* */ -#define IB_MAC_IOCB_RSP_HS 0x40000000/* */ -#define IB_MAC_IOCB_RSP_HL 0x80000000/* */ +u8 reserved3[3 ]; +u8 flags4; +#define IB_MAC_IOCB_RSP_HV 0x20 +#define IB_MAC_IOCB_RSP_HS 0x40 +#define IB_MAC_IOCB_RSP_HL 0x80__le32 hdr_len;/* */ __le32 hdr_addr_lo;/* */ __le32 hdr_addr_hi;/* */
drivers/net/qlge/qlge_dbg.c +5 -8
@@ -821,14 +821,11 @@ void ql_dump_ib_mac_rsp(struct ib_mac_iocb_rsp *ib_mac_rsp) le16_to_cpu(ib_mac_rsp->vlan_id)); printk(KERN_ERR PFX "flags4 = %s%s%s.\n", -le32_to_cpu (ib_mac_rsp-> - flags4) &IB_MAC_IOCB_RSP_HV ?"HV " :"" , -le32_to_cpu (ib_mac_rsp-> - flags4) &IB_MAC_IOCB_RSP_HS ?"HS " :"" , -le32_to_cpu (ib_mac_rsp-> - flags4) & IB_MAC_IOCB_RSP_HL ? "HL " : ""); - -if (le32_to_cpu (ib_mac_rsp->flags4) &IB_MAC_IOCB_RSP_HV ) { + ib_mac_rsp->flags4 &IB_MAC_IOCB_RSP_HV ?"HV " :"" , + ib_mac_rsp->flags4 &IB_MAC_IOCB_RSP_HS ?"HS " :"" , + ib_mac_rsp->flags4 & IB_MAC_IOCB_RSP_HL ? "HL " : ""); + +if (ib_mac_rsp->flags4 &IB_MAC_IOCB_RSP_HV ) { printk(KERN_ERR PFX "hdr length = %d.\n", le32_to_cpu(ib_mac_rsp->hdr_len)); printk(KERN_ERR PFX "hdr addr_hi = 0x%x.\n",
Signature · 1 line
1.6.0
Re: [PATCH 2/5] qlge: Fix sparse endian warning for inbound packet control block flags.
From: Ron Mercer <[email protected]>
Date: Mon, 5 Jan 2009 14:27:29 -0800
Quoted 4 lines
Changed flags element from
__le32to 3 reserved bytes and one byte of flags. Changed flags bit definitions to reflect byte width instead of__le32width.
Quoted 8 lines
Warnings:
drivers/net/qlge/qlge_main.c:1206:16: warning: restricted degrades to integerdrivers/net/qlge/qlge_main.c:1207:16: warning: restricted degrades to integerdrivers/net/qlge/qlge_main.c:1233:17: warning: restricted degrades to integerdrivers/net/qlge/qlge_main.c:1276:17: warning: restricted degrades to integerdrivers/net/qlge/qlge_main.c:1349:19: warning: restricted degrades to integerSigned-off-by Ron Mercer <[email protected]>
Applied.
PATCH 3/5 qlge: Fix sparse endian warning in ql_hw_csum_setup().
In reply to Ron MercerChanged u16 to __sum16 usage.
Warnings:drivers/net/qlge/qlge_main.c:1897:9: warning: incorrect type in assignment (different base types)drivers/net/qlge/qlge_main.c:1897:9: expected unsigned short [usertype] *checkdrivers/net/qlge/qlge_main.c:1897:9: got restricted unsigned short *<noident>drivers/net/qlge/qlge_main.c:1903:9: warning: incorrect type in assignment (different base types)drivers/net/qlge/qlge_main.c:1903:9: expected unsigned short [usertype] *checkdrivers/net/qlge/qlge_main.c:1903:9: got restricted unsigned short *<noident>drivers/net/qlge/qlge_main.c:1909:9: warning: incorrect type in assignment (different base types)drivers/net/qlge/qlge_main.c:1909:9: expected unsigned short [unsigned] [short] [usertype] <noident>
--- drivers/net/qlge/qlge_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/qlge/qlge_main.c +1 -1
@@ -1884,7 +1884,7 @@ static void ql_hw_csum_setup(struct sk_buff *skb, {int len;struct iphdr *iph =ip_hdr (skb); -u16 *check; +__sum16 *check; mac_iocb_ptr->opcode =OPCODE_OB_MAC_TSO_IOCB ; mac_iocb_ptr->frame_len =cpu_to_le32 ((u32 ) skb->len); mac_iocb_ptr->net_trans_offset =
Signature · 1 line
1.6.0
Re: [PATCH 3/5] qlge: Fix sparse endian warning in ql_hw_csum_setup().
From: Ron Mercer <[email protected]>
Date: Mon, 5 Jan 2009 14:27:30 -0800
Quoted 3 lines
Changed u16 to
__sum16usage.Warnings:
...
Quoted 1 line
Signed-off-by Ron Mercer <[email protected]>
Applied.
PATCH 4/5 qlge: Fix sparse warning regarding rx buffer queues.
In reply to Ron MercerWarnings:drivers/net/qlge/qlge_main.c:909:17: warning: incorrect type in assignment (different base types)drivers/net/qlge/qlge_main.c:909:17: expected unsigned int [unsigned] [usertype] addr_lodrivers/net/qlge/qlge_main.c:909:17: got restricted unsigned int [usertype] <noident>drivers/net/qlge/qlge_main.c:911:17: warning: incorrect type in assignment (different base types)drivers/net/qlge/qlge_main.c:911:17: expected unsigned int [unsigned] [usertype] addr_hidrivers/net/qlge/qlge_main.c:911:17: got restricted unsigned int [usertype] <noident>drivers/net/qlge/qlge_main.c:974:17: warning: incorrect type in assignment (different base types)drivers/net/qlge/qlge_main.c:974:17: expected unsigned int [unsigned] [usertype] addr_lodrivers/net/qlge/qlge_main.c:974:17: got restricted unsigned int [usertype] <noident>drivers/net/qlge/qlge_main.c:975:17: warning: incorrect type in assignment (different base types)drivers/net/qlge/qlge_main.c:975:17: expected unsigned int [unsigned] [usertype] addr_hidrivers/net/qlge/qlge_main.c:975:17: got restricted unsigned int [usertype] <noident>drivers/net/qlge/qlge_main.c:2132:16: warning: incorrect type in assignment (different base types)drivers/net/qlge/qlge_main.c:2132:16: expected unsigned int [unsigned] [usertype] addr_lodrivers/net/qlge/qlge_main.c:2132:16: got restricted unsigned int [usertype] <noident>drivers/net/qlge/qlge_main.c:2133:16: warning: incorrect type in assignment (different base types)drivers/net/qlge/qlge_main.c:2133:16: expected unsigned int [unsigned] [usertype] addr_hidrivers/net/qlge/qlge_main.c:2133:16: got restricted unsigned int [usertype] <noident>drivers/net/qlge/qlge_main.c:2212:15: warning: incorrect type in assignment (different base types)drivers/net/qlge/qlge_main.c:2212:15: expected unsigned int [unsigned] [usertype] addr_lodrivers/net/qlge/qlge_main.c:2212:15: got restricted unsigned int [usertype] <noident>drivers/net/qlge/qlge_main.c:2214:15: warning: incorrect type in assignment (different base types)drivers/net/qlge/qlge_main.c:2214:15: expected unsigned int [unsigned] [usertype] addr_hidrivers/net/qlge/qlge_main.c:2214:15: got restricted unsigned int [usertype] <noident>
--- drivers/net/qlge/qlge.h | 11 +------- drivers/net/qlge/qlge_main.c | 55 ++++++++++------------------------------- 2 files changed, 15 insertions(+), 51 deletions(-)
drivers/net/qlge/qlge.h +1 -10
@@ -818,15 +818,6 @@ struct tx_doorbell_context { };/* DATA STRUCTURES SHARED WITH HARDWARE. */ - -struct bq_element { -u32 addr_lo; -#define BQ_END 0x00000001 -#define BQ_CONT 0x00000002 -#define BQ_MASK 0x00000003 -u32 addr_hi; -} __attribute((packed)); -struct tx_buf_desc {__le64 addr;__le32 len;
@@ -1139,7 +1130,7 @@ struct bq_desc {struct page *lbq_page;struct sk_buff *skb; } p; -struct bq_element *bq; +__le64 *addr;int index;DECLARE_PCI_UNMAP_ADDR (mapaddr);DECLARE_PCI_UNMAP_LEN (maplen);
drivers/net/qlge/qlge_main.c +14 -41
169 lines not on this page · raw message
Signature · 1 line
1.6.0
Re: [PATCH 4/5] qlge: Fix sparse warning regarding rx buffer queues.
From: Ron Mercer <[email protected]>
Date: Mon, 5 Jan 2009 14:27:31 -0800
Quoted 1 line
Warnings:
...
Quoted 2 lines
Signed-off-by Ron Mercer <[email protected]>
Applied.
PATCH 5/5 qlge: Fix sparse warnings for tx ring indexes.
In reply to Ron MercerWarnings:drivers/net/qlge/qlge_main.c:1474:34: warning: restricted degrades to integer drivers/net/qlge/qlge_main.c:1475:36: warning: restricted degrades to integer drivers/net/qlge/qlge_main.c:1592:51: warning: restricted degrades to integer drivers/net/qlge/qlge_main.c:1941:20: warning: incorrect type in assignment (different base types)drivers/net/qlge/qlge_main.c:1941:20: expected restricted unsigned int [usertype] tiddrivers/net/qlge/qlge_main.c:1941:20: got int [signed] indexdrivers/net/qlge/qlge_main.c:1945:24: warning: incorrect type in assignment (different base types)drivers/net/qlge/qlge_main.c:1945:24: expected restricted unsigned int [usertype] txq_idxdrivers/net/qlge/qlge_main.c:1945:24: got unsigned int [unsigned] [usertype] tx_ring_idx
--- drivers/net/qlge/qlge.h | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-)
drivers/net/qlge/qlge.h +10 -10
@@ -851,8 +851,8 @@ struct ob_mac_iocb_req {__le16 frame_len;#define OB_MAC_IOCB_LEN_MASK 0x3ffff__le16 reserved2; -__le32 tid; -__le32 txq_idx; +u32 tid; +u32 txq_idx;__le32 reserved3;__le16 vlan_tci;__le16 reserved4;
@@ -871,8 +871,8 @@ struct ob_mac_iocb_rsp {u8 flags2;/* */ u8 flags3;/* */ #define OB_MAC_IOCB_RSP_B 0x80/* */ -__le32 tid; -__le32 txq_idx; +u32 tid; +u32 txq_idx;__le32 reserved[13 ]; } __attribute((packed));
@@ -894,8 +894,8 @@ struct ob_mac_tso_iocb_req {#define OB_MAC_TSO_IOCB_V 0x04__le32 reserved1[2 ];__le32 frame_len; -__le32 tid; -__le32 txq_idx; +u32 tid; +u32 txq_idx;__le16 total_hdrs_len;__le16 net_trans_offset;#define OB_MAC_TRANSPORT_HDR_SHIFT 6
@@ -916,8 +916,8 @@ struct ob_mac_tso_iocb_rsp {u8 flags2;/* */ u8 flags3;/* */ #define OB_MAC_TSO_IOCB_RSP_B 0x8000 -__le32 tid; -__le32 txq_idx; +u32 tid; +u32 txq_idx;__le32 reserved2[13 ]; } __attribute((packed));
@@ -1118,7 +1118,7 @@ struct map_list {struct tx_ring_desc {struct sk_buff *skb;struct ob_mac_iocb_req *queue_entry; -int index; +u32 index;struct oal oal;struct map_list map[MAX_SKB_FRAGS +1 ];int map_cnt;
@@ -1131,7 +1131,7 @@ struct bq_desc {struct sk_buff *skb; } p;__le64 *addr; -int index; +u32 index;DECLARE_PCI_UNMAP_ADDR (mapaddr);DECLARE_PCI_UNMAP_LEN (maplen); };
Signature · 1 line
1.6.0
David Miller
maintainerRe: [PATCH 5/5] qlge: Fix sparse warnings for tx ring indexes.
From: Ron Mercer <[email protected]>
Date: Mon, 5 Jan 2009 14:27:32 -0800
Quoted 1 line
Warnings:
...
Quoted 1 line
Signed-off-by Ron Mercer <[email protected]>
Also applied, thanks Ron.