[PATCH] ethernet: e1000e: define lat_ns as u64 instead of s64

[PATCH] ethernet: e1000e: define lat_ns as u64 instead of s64

[yanjiang.jin]

From: Yanjiang Jin <yanjiang.jin@windriver.com>

do_div() expects the type of "n" to be uint64_t, define "lat_ns" as u64 to
avoid the below warning, also update its correlative operations and data.

In file included from ./arch/powerpc/include/asm/div64.h:1:0,
                 from include/linux/kernel.h:124,
                 from include/linux/list.h:8,
                 from include/linux/timer.h:4,
                 from drivers/net/ethernet/intel/e1000e/e1000.h:29,
                 from drivers/net/ethernet/intel/e1000e/ich8lan.c:59:
drivers/net/ethernet/intel/e1000e/ich8lan.c: In function 'e1000_platform_pm_pch_lpt':
include/asm-generic/div64.h:43:28: warning: comparison of distinct pointer types lacks a cast [enabled by default]
  (void)(((typeof((n)) *)0) == ((uint64_t *)0)); \
                            ^
drivers/net/ethernet/intel/e1000e/ich8lan.c:1016:4: note: in expansion of macro 'do_div'
    do_div(lat_ns, speed);

Signed-off-by: Yanjiang Jin <yanjiang.jin@windriver.com>
---
 drivers/net/ethernet/intel/e1000e/ich8lan.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
index 48b74a5..baab58b 100644
--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
@@ -982,8 +982,8 @@ static s32 e1000_platform_pm_pch_lpt(struct e1000_hw *hw, bool link)
 		u16 speed, duplex, scale = 0;
 		u16 max_snoop, max_nosnoop;
 		u16 max_ltr_enc;	/* max LTR latency encoded */
-		s64 lat_ns;	/* latency (ns) */
-		s64 value;
+		u64 lat_ns;	/* latency (ns) */
+		u64 value;
 		u32 rxa;
 
 		if (!hw->adapter->max_frame_size) {
@@ -1008,8 +1008,8 @@ static s32 e1000_platform_pm_pch_lpt(struct e1000_hw *hw, bool link)
 		 * 2^25*(2^10-1) ns.  The scale is encoded as 0=2^0ns,
 		 * 1=2^5ns, 2=2^10ns,...5=2^25ns.
 		 */
-		lat_ns = ((s64)rxa * 1024 -
-			  (2 * (s64)hw->adapter->max_frame_size)) * 8 * 1000;
+		lat_ns = ((u64)rxa * 1024 -
+			  (2 * (u64)hw->adapter->max_frame_size)) * 8 * 1000;
 		if (lat_ns < 0)
 			lat_ns = 0;
 		else
-- 
1.9.1

Re: [PATCH] ethernet: e1000e: define lat_ns as u64 instead of s64

[Jeff Kirsher]

[-- Attachment #1: Type: text/plain, Size: 1740 bytes --]

On Fri, 2015-04-03 at 17:17 +0800, yanjiang.jin@windriver.com wrote:
> From: Yanjiang Jin <yanjiang.jin@windriver.com>
> 
> do_div() expects the type of "n" to be uint64_t, define "lat_ns" as
> u64 to
> avoid the below warning, also update its correlative operations and
> data.
> 
> In file included from ./arch/powerpc/include/asm/div64.h:1:0,
>                  from include/linux/kernel.h:124,
>                  from include/linux/list.h:8,
>                  from include/linux/timer.h:4,
>                  from drivers/net/ethernet/intel/e1000e/e1000.h:29,
>                  from drivers/net/ethernet/intel/e1000e/ich8lan.c:59:
> drivers/net/ethernet/intel/e1000e/ich8lan.c: In function
> 'e1000_platform_pm_pch_lpt':
> include/asm-generic/div64.h:43:28: warning: comparison of distinct
> pointer types lacks a cast [enabled by default]
>   (void)(((typeof((n)) *)0) == ((uint64_t *)0)); \
>                             ^
> drivers/net/ethernet/intel/e1000e/ich8lan.c:1016:4: note: in expansion
> of macro 'do_div'
>     do_div(lat_ns, speed);
> 
> Signed-off-by: Yanjiang Jin <yanjiang.jin@windriver.com>
> ---
>  drivers/net/ethernet/intel/e1000e/ich8lan.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)

Added intel-wired-lan mailing list (used for patches like this)
Removed LKML ... (wrong mailing list to be mailing for patches like
this)
Removed e1000-devel ... (no longer used for kernel patches)
Removed linux.nics ... (no longer used for kernel patches)

Also removed Intel developers with no interest in e1000e patches ...

Thanks Yanjiang, I will add your patch to my queue.

-- 
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue.git
dev-queue

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH] ethernet: e1000e: define lat_ns as u64 instead of s64

[yjin]

Hi Jeff,

Thanks for your reminder. I used linux/scripts/get_maintainer.pl to get 
the maintainer list before, next time I will do as you said.

Regards!
Yanjiang

On 2015年04月03日 17:42, Jeff Kirsher wrote:
> On Fri, 2015-04-03 at 17:17 +0800, yanjiang.jin@windriver.com wrote:
>> From: Yanjiang Jin <yanjiang.jin@windriver.com>
>>
>> do_div() expects the type of "n" to be uint64_t, define "lat_ns" as
>> u64 to
>> avoid the below warning, also update its correlative operations and
>> data.
>>
>> In file included from ./arch/powerpc/include/asm/div64.h:1:0,
>>                   from include/linux/kernel.h:124,
>>                   from include/linux/list.h:8,
>>                   from include/linux/timer.h:4,
>>                   from drivers/net/ethernet/intel/e1000e/e1000.h:29,
>>                   from drivers/net/ethernet/intel/e1000e/ich8lan.c:59:
>> drivers/net/ethernet/intel/e1000e/ich8lan.c: In function
>> 'e1000_platform_pm_pch_lpt':
>> include/asm-generic/div64.h:43:28: warning: comparison of distinct
>> pointer types lacks a cast [enabled by default]
>>    (void)(((typeof((n)) *)0) == ((uint64_t *)0)); \
>>                              ^
>> drivers/net/ethernet/intel/e1000e/ich8lan.c:1016:4: note: in expansion
>> of macro 'do_div'
>>      do_div(lat_ns, speed);
>>
>> Signed-off-by: Yanjiang Jin <yanjiang.jin@windriver.com>
>> ---
>>   drivers/net/ethernet/intel/e1000e/ich8lan.c | 8 ++++----
>>   1 file changed, 4 insertions(+), 4 deletions(-)
> Added intel-wired-lan mailing list (used for patches like this)
> Removed LKML ... (wrong mailing list to be mailing for patches like
> this)
> Removed e1000-devel ... (no longer used for kernel patches)
> Removed linux.nics ... (no longer used for kernel patches)
>
> Also removed Intel developers with no interest in e1000e patches ...
>
> Thanks Yanjiang, I will add your patch to my queue.
>

RE: [PATCH] ethernet: e1000e: define lat_ns as u64 instead of s64

[David Laight]

From: yanjiang.jin@windriver.com
> Sent: 03 April 2015 10:18
> From: Yanjiang Jin <yanjiang.jin@windriver.com>
> 
> do_div() expects the type of "n" to be uint64_t, define "lat_ns" as u64 to
> avoid the below warning, also update its correlative operations and data.
> 
> In file included from ./arch/powerpc/include/asm/div64.h:1:0,
>                  from include/linux/kernel.h:124,
>                  from include/linux/list.h:8,
>                  from include/linux/timer.h:4,
>                  from drivers/net/ethernet/intel/e1000e/e1000.h:29,
>                  from drivers/net/ethernet/intel/e1000e/ich8lan.c:59:
> drivers/net/ethernet/intel/e1000e/ich8lan.c: In function 'e1000_platform_pm_pch_lpt':
> include/asm-generic/div64.h:43:28: warning: comparison of distinct pointer types lacks a cast [enabled
> by default]
>   (void)(((typeof((n)) *)0) == ((uint64_t *)0)); \
>                             ^
> drivers/net/ethernet/intel/e1000e/ich8lan.c:1016:4: note: in expansion of macro 'do_div'
>     do_div(lat_ns, speed);
> 
> Signed-off-by: Yanjiang Jin <yanjiang.jin@windriver.com>
> ---
>  drivers/net/ethernet/intel/e1000e/ich8lan.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
> index 48b74a5..baab58b 100644
> --- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
> +++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
> @@ -982,8 +982,8 @@ static s32 e1000_platform_pm_pch_lpt(struct e1000_hw *hw, bool link)
>  		u16 speed, duplex, scale = 0;
>  		u16 max_snoop, max_nosnoop;
>  		u16 max_ltr_enc;	/* max LTR latency encoded */
> -		s64 lat_ns;	/* latency (ns) */
> -		s64 value;
> +		u64 lat_ns;	/* latency (ns) */
> +		u64 value;
>  		u32 rxa;
> 
>  		if (!hw->adapter->max_frame_size) {
> @@ -1008,8 +1008,8 @@ static s32 e1000_platform_pm_pch_lpt(struct e1000_hw *hw, bool link)
>  		 * 2^25*(2^10-1) ns.  The scale is encoded as 0=2^0ns,
>  		 * 1=2^5ns, 2=2^10ns,...5=2^25ns.
>  		 */
> -		lat_ns = ((s64)rxa * 1024 -
> -			  (2 * (s64)hw->adapter->max_frame_size)) * 8 * 1000;
> +		lat_ns = ((u64)rxa * 1024 -
> +			  (2 * (u64)hw->adapter->max_frame_size)) * 8 * 1000;
>  		if (lat_ns < 0)
>  			lat_ns = 0;

The above change cannot be correct.
You should be getting another error for testing an unsigned value be less than 0.

So I presume this wasn't even tested.

	David

Re: [PATCH] ethernet: e1000e: define lat_ns as u64 instead of s64

[Jeff Kirsher]

[-- Attachment #1: Type: text/plain, Size: 2752 bytes --]

On Wed, 2015-04-08 at 09:40 +0000, David Laight wrote:
> From: yanjiang.jin@windriver.com
> > Sent: 03 April 2015 10:18
> > From: Yanjiang Jin <yanjiang.jin@windriver.com>
> > 
> > do_div() expects the type of "n" to be uint64_t, define "lat_ns" as u64 to
> > avoid the below warning, also update its correlative operations and data.
> > 
> > In file included from ./arch/powerpc/include/asm/div64.h:1:0,
> >                  from include/linux/kernel.h:124,
> >                  from include/linux/list.h:8,
> >                  from include/linux/timer.h:4,
> >                  from drivers/net/ethernet/intel/e1000e/e1000.h:29,
> >                  from drivers/net/ethernet/intel/e1000e/ich8lan.c:59:
> > drivers/net/ethernet/intel/e1000e/ich8lan.c: In function 'e1000_platform_pm_pch_lpt':
> > include/asm-generic/div64.h:43:28: warning: comparison of distinct pointer types lacks a cast [enabled
> > by default]
> >   (void)(((typeof((n)) *)0) == ((uint64_t *)0)); \
> >                             ^
> > drivers/net/ethernet/intel/e1000e/ich8lan.c:1016:4: note: in expansion of macro 'do_div'
> >     do_div(lat_ns, speed);
> > 
> > Signed-off-by: Yanjiang Jin <yanjiang.jin@windriver.com>
> > ---
> >  drivers/net/ethernet/intel/e1000e/ich8lan.c | 8 ++++----
> >  1 file changed, 4 insertions(+), 4 deletions(-)
> > 
> > diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
> > index 48b74a5..baab58b 100644
> > --- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
> > +++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
> > @@ -982,8 +982,8 @@ static s32 e1000_platform_pm_pch_lpt(struct e1000_hw *hw, bool link)
> >  		u16 speed, duplex, scale = 0;
> >  		u16 max_snoop, max_nosnoop;
> >  		u16 max_ltr_enc;	/* max LTR latency encoded */
> > -		s64 lat_ns;	/* latency (ns) */
> > -		s64 value;
> > +		u64 lat_ns;	/* latency (ns) */
> > +		u64 value;
> >  		u32 rxa;
> > 
> >  		if (!hw->adapter->max_frame_size) {
> > @@ -1008,8 +1008,8 @@ static s32 e1000_platform_pm_pch_lpt(struct e1000_hw *hw, bool link)
> >  		 * 2^25*(2^10-1) ns.  The scale is encoded as 0=2^0ns,
> >  		 * 1=2^5ns, 2=2^10ns,...5=2^25ns.
> >  		 */
> > -		lat_ns = ((s64)rxa * 1024 -
> > -			  (2 * (s64)hw->adapter->max_frame_size)) * 8 * 1000;
> > +		lat_ns = ((u64)rxa * 1024 -
> > +			  (2 * (u64)hw->adapter->max_frame_size)) * 8 * 1000;
> >  		if (lat_ns < 0)
> >  			lat_ns = 0;
> 
> The above change cannot be correct.
> You should be getting another error for testing an unsigned value be less than 0.
> 
> So I presume this wasn't even tested.
> 

I found the same issue and I am putting together another patch to
resolve the issue that Yanjiang saw.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]