Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 684f4a4c4a69f7226d8c7559c0cdfc7bd388335a

Authored by Roel Kluin
Committed by David S. Miller
1 parent 18cc42a3a1
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

EtherExpress16: fix printing timed out status 

in drivers/net/eexpress.c:558, function unstick_cu()

while (!SCB_complete(rsst=scb_status(dev))) {
	...
	if (...)
		printk(KERN_WARNING "%s: Reset timed out status %04x, retrying...\n",
                                                       dev->name,rsst);
}

but this will become

while (!((rsst = scb_status(dev) & 0x8000) != 0) ...

because of the macro:

#define SCB_complete(s) ((s&0x8000)!=0)

so rsst can only become either 0x8000 or 0, but in the latter case the
loop ends, I think the wrong timed out status is printed. This also
cleans up similar macros.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 28 additions and 28 deletions Side-by-side Diff

drivers/net/eexpress.h
Diff comments   View file @ 684f4a4
... ... @@ -68,17 +68,17 @@
68 68 */
69 69  
70 70 /* these functions take the SCB status word and test the relevant status bit */
71   -#define SCB_complete(s) ((s&0x8000)!=0)
72   -#define SCB_rxdframe(s) ((s&0x4000)!=0)
73   -#define SCB_CUdead(s) ((s&0x2000)!=0)
74   -#define SCB_RUdead(s) ((s&0x1000)!=0)
75   -#define SCB_ack(s) (s & 0xf000)
  71 +#define SCB_complete(s) (((s) & 0x8000) != 0)
  72 +#define SCB_rxdframe(s) (((s) & 0x4000) != 0)
  73 +#define SCB_CUdead(s) (((s) & 0x2000) != 0)
  74 +#define SCB_RUdead(s) (((s) & 0x1000) != 0)
  75 +#define SCB_ack(s) ((s) & 0xf000)
76 76  
77 77 /* Command unit status: 0=idle, 1=suspended, 2=active */
78   -#define SCB_CUstat(s) ((s&0x0300)>>8)
  78 +#define SCB_CUstat(s) (((s)&0x0300)>>8)
79 79  
80 80 /* Receive unit status: 0=idle, 1=suspended, 2=out of resources, 4=ready */
81   -#define SCB_RUstat(s) ((s&0x0070)>>4)
  81 +#define SCB_RUstat(s) (((s)&0x0070)>>4)
82 82  
83 83 /* SCB commands */
84 84 #define SCB_CUnop 0x0000
... ... @@ -98,18 +98,18 @@
98 98 * Command block defines
99 99 */
100 100  
101   -#define Stat_Done(s) ((s&0x8000)!=0)
102   -#define Stat_Busy(s) ((s&0x4000)!=0)
103   -#define Stat_OK(s) ((s&0x2000)!=0)
104   -#define Stat_Abort(s) ((s&0x1000)!=0)
105   -#define Stat_STFail ((s&0x0800)!=0)
106   -#define Stat_TNoCar(s) ((s&0x0400)!=0)
107   -#define Stat_TNoCTS(s) ((s&0x0200)!=0)
108   -#define Stat_TNoDMA(s) ((s&0x0100)!=0)
109   -#define Stat_TDefer(s) ((s&0x0080)!=0)
110   -#define Stat_TColl(s) ((s&0x0040)!=0)
111   -#define Stat_TXColl(s) ((s&0x0020)!=0)
112   -#define Stat_NoColl(s) (s&0x000f)
  101 +#define Stat_Done(s) (((s) & 0x8000) != 0)
  102 +#define Stat_Busy(s) (((s) & 0x4000) != 0)
  103 +#define Stat_OK(s) (((s) & 0x2000) != 0)
  104 +#define Stat_Abort(s) (((s) & 0x1000) != 0)
  105 +#define Stat_STFail (((s) & 0x0800) != 0)
  106 +#define Stat_TNoCar(s) (((s) & 0x0400) != 0)
  107 +#define Stat_TNoCTS(s) (((s) & 0x0200) != 0)
  108 +#define Stat_TNoDMA(s) (((s) & 0x0100) != 0)
  109 +#define Stat_TDefer(s) (((s) & 0x0080) != 0)
  110 +#define Stat_TColl(s) (((s) & 0x0040) != 0)
  111 +#define Stat_TXColl(s) (((s) & 0x0020) != 0)
  112 +#define Stat_NoColl(s) ((s) & 0x000f)
113 113  
114 114 /* Cmd_END will end AFTER the command if this is the first
115 115 * command block after an SCB_CUstart, but BEFORE the command
116 116  
... ... @@ -136,16 +136,16 @@
136 136 * Frame Descriptor (Receive block) defines
137 137 */
138 138  
139   -#define FD_Done(s) ((s&0x8000)!=0)
140   -#define FD_Busy(s) ((s&0x4000)!=0)
141   -#define FD_OK(s) ((s&0x2000)!=0)
  139 +#define FD_Done(s) (((s) & 0x8000) != 0)
  140 +#define FD_Busy(s) (((s) & 0x4000) != 0)
  141 +#define FD_OK(s) (((s) & 0x2000) != 0)
142 142  
143   -#define FD_CRC(s) ((s&0x0800)!=0)
144   -#define FD_Align(s) ((s&0x0400)!=0)
145   -#define FD_Resrc(s) ((s&0x0200)!=0)
146   -#define FD_DMA(s) ((s&0x0100)!=0)
147   -#define FD_Short(s) ((s&0x0080)!=0)
148   -#define FD_NoEOF(s) ((s&0x0040)!=0)
  143 +#define FD_CRC(s) (((s) & 0x0800) != 0)
  144 +#define FD_Align(s) (((s) & 0x0400) != 0)
  145 +#define FD_Resrc(s) (((s) & 0x0200) != 0)
  146 +#define FD_DMA(s) (((s) & 0x0100) != 0)
  147 +#define FD_Short(s) (((s) & 0x0080) != 0)
  148 +#define FD_NoEOF(s) (((s) & 0x0040) != 0)
149 149  
150 150 struct rfd_header {
151 151 volatile unsigned long flags;