linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2 10/17] input/joystick/analog: Switch from rdtscl() to native_read_tsc()
       [not found] <cover.1434152603.git.luto@kernel.org>
@ 2015-06-12 23:44 ` Andy Lutomirski
  2015-06-16 23:03   ` Dmitry Torokhov
  2015-06-12 23:44 ` [PATCH v2 11/17] drivers/input/gameport: Replace rdtscl() with native_read_tsc() Andy Lutomirski
  1 sibling, 1 reply; 6+ messages in thread
From: Andy Lutomirski @ 2015-06-12 23:44 UTC (permalink / raw)
  To: x86
  Cc: Borislav Petkov, Peter Zijlstra, John Stultz, linux-kernel,
	Len Brown, Huang Rui, Denys Vlasenko, Andy Lutomirski,
	Dmitry Torokhov, linux-input

This timing code is hideous, and this doesn't help.  It gets rid of
one of the last users of rdtscl, though.

Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: linux-input@vger.kernel.org
Signed-off-by: Andy Lutomirski <luto@kernel.org>
---
 drivers/input/joystick/analog.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/input/joystick/analog.c b/drivers/input/joystick/analog.c
index 4284080e481d..f871b4f00056 100644
--- a/drivers/input/joystick/analog.c
+++ b/drivers/input/joystick/analog.c
@@ -143,7 +143,7 @@ struct analog_port {
 
 #include <linux/i8253.h>
 
-#define GET_TIME(x)	do { if (cpu_has_tsc) rdtscl(x); else x = get_time_pit(); } while (0)
+#define GET_TIME(x)	do { if (cpu_has_tsc) x = (unsigned int)native_read_tsc(); else x = get_time_pit(); } while (0)
 #define DELTA(x,y)	(cpu_has_tsc ? ((y) - (x)) : ((x) - (y) + ((x) < (y) ? PIT_TICK_RATE / HZ : 0)))
 #define TIME_NAME	(cpu_has_tsc?"TSC":"PIT")
 static unsigned int get_time_pit(void)
@@ -160,7 +160,7 @@ static unsigned int get_time_pit(void)
         return count;
 }
 #elif defined(__x86_64__)
-#define GET_TIME(x)	rdtscl(x)
+#define GET_TIME(x)	do { x = (unsigned int)native_read_tsc(); } while (0)
 #define DELTA(x,y)	((y)-(x))
 #define TIME_NAME	"TSC"
 #elif defined(__alpha__) || defined(CONFIG_MN10300) || defined(CONFIG_ARM) || defined(CONFIG_ARM64) || defined(CONFIG_TILE)
-- 
2.4.2

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH v2 11/17] drivers/input/gameport: Replace rdtscl() with native_read_tsc()
       [not found] <cover.1434152603.git.luto@kernel.org>
  2015-06-12 23:44 ` [PATCH v2 10/17] input/joystick/analog: Switch from rdtscl() to native_read_tsc() Andy Lutomirski
@ 2015-06-12 23:44 ` Andy Lutomirski
  2015-06-16 23:04   ` Dmitry Torokhov
  1 sibling, 1 reply; 6+ messages in thread
From: Andy Lutomirski @ 2015-06-12 23:44 UTC (permalink / raw)
  To: x86
  Cc: Borislav Petkov, Peter Zijlstra, John Stultz, linux-kernel,
	Len Brown, Huang Rui, Denys Vlasenko, Andy Lutomirski,
	Dmitry Torokhov, linux-input

It's unclear to me why this code exists in the first place.

Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: linux-input@vger.kernel.org
Signed-off-by: Andy Lutomirski <luto@kernel.org>
---
 drivers/input/gameport/gameport.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
index e853a2134680..abc0cb22e750 100644
--- a/drivers/input/gameport/gameport.c
+++ b/drivers/input/gameport/gameport.c
@@ -149,9 +149,9 @@ static int old_gameport_measure_speed(struct gameport *gameport)
 
 	for(i = 0; i < 50; i++) {
 		local_irq_save(flags);
-		rdtscl(t1);
+		t1 = native_read_tsc();
 		for (t = 0; t < 50; t++) gameport_read(gameport);
-		rdtscl(t2);
+		t2 = native_read_tsc();
 		local_irq_restore(flags);
 		udelay(i * 10);
 		if (t2 - t1 < tx) tx = t2 - t1;
-- 
2.4.2


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH v2 10/17] input/joystick/analog: Switch from rdtscl() to native_read_tsc()
  2015-06-12 23:44 ` [PATCH v2 10/17] input/joystick/analog: Switch from rdtscl() to native_read_tsc() Andy Lutomirski
@ 2015-06-16 23:03   ` Dmitry Torokhov
  2015-06-16 23:09     ` Andy Lutomirski
  0 siblings, 1 reply; 6+ messages in thread
From: Dmitry Torokhov @ 2015-06-16 23:03 UTC (permalink / raw)
  To: Andy Lutomirski
  Cc: x86, Borislav Petkov, Peter Zijlstra, John Stultz, linux-kernel,
	Len Brown, Huang Rui, Denys Vlasenko, linux-input

On Fri, Jun 12, 2015 at 04:44:50PM -0700, Andy Lutomirski wrote:
> This timing code is hideous, and this doesn't help.  It gets rid of
> one of the last users of rdtscl, though.
> 
> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> Cc: linux-input@vger.kernel.org
> Signed-off-by: Andy Lutomirski <luto@kernel.org>

Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

> ---
>  drivers/input/joystick/analog.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/input/joystick/analog.c b/drivers/input/joystick/analog.c
> index 4284080e481d..f871b4f00056 100644
> --- a/drivers/input/joystick/analog.c
> +++ b/drivers/input/joystick/analog.c
> @@ -143,7 +143,7 @@ struct analog_port {
>  
>  #include <linux/i8253.h>
>  
> -#define GET_TIME(x)	do { if (cpu_has_tsc) rdtscl(x); else x = get_time_pit(); } while (0)
> +#define GET_TIME(x)	do { if (cpu_has_tsc) x = (unsigned int)native_read_tsc(); else x = get_time_pit(); } while (0)
>  #define DELTA(x,y)	(cpu_has_tsc ? ((y) - (x)) : ((x) - (y) + ((x) < (y) ? PIT_TICK_RATE / HZ : 0)))
>  #define TIME_NAME	(cpu_has_tsc?"TSC":"PIT")
>  static unsigned int get_time_pit(void)
> @@ -160,7 +160,7 @@ static unsigned int get_time_pit(void)
>          return count;
>  }
>  #elif defined(__x86_64__)
> -#define GET_TIME(x)	rdtscl(x)
> +#define GET_TIME(x)	do { x = (unsigned int)native_read_tsc(); } while (0)
>  #define DELTA(x,y)	((y)-(x))
>  #define TIME_NAME	"TSC"
>  #elif defined(__alpha__) || defined(CONFIG_MN10300) || defined(CONFIG_ARM) || defined(CONFIG_ARM64) || defined(CONFIG_TILE)
> -- 
> 2.4.2
> 

-- 
Dmitry

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v2 11/17] drivers/input/gameport: Replace rdtscl() with native_read_tsc()
  2015-06-12 23:44 ` [PATCH v2 11/17] drivers/input/gameport: Replace rdtscl() with native_read_tsc() Andy Lutomirski
@ 2015-06-16 23:04   ` Dmitry Torokhov
  0 siblings, 0 replies; 6+ messages in thread
From: Dmitry Torokhov @ 2015-06-16 23:04 UTC (permalink / raw)
  To: Andy Lutomirski
  Cc: x86, Borislav Petkov, Peter Zijlstra, John Stultz, linux-kernel,
	Len Brown, Huang Rui, Denys Vlasenko, linux-input

On Fri, Jun 12, 2015 at 04:44:51PM -0700, Andy Lutomirski wrote:
> It's unclear to me why this code exists in the first place.
> 
> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> Cc: linux-input@vger.kernel.org
> Signed-off-by: Andy Lutomirski <luto@kernel.org>

Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

> ---
>  drivers/input/gameport/gameport.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
> index e853a2134680..abc0cb22e750 100644
> --- a/drivers/input/gameport/gameport.c
> +++ b/drivers/input/gameport/gameport.c
> @@ -149,9 +149,9 @@ static int old_gameport_measure_speed(struct gameport *gameport)
>  
>  	for(i = 0; i < 50; i++) {
>  		local_irq_save(flags);
> -		rdtscl(t1);
> +		t1 = native_read_tsc();
>  		for (t = 0; t < 50; t++) gameport_read(gameport);
> -		rdtscl(t2);
> +		t2 = native_read_tsc();
>  		local_irq_restore(flags);
>  		udelay(i * 10);
>  		if (t2 - t1 < tx) tx = t2 - t1;
> -- 
> 2.4.2
> 

-- 
Dmitry

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v2 10/17] input/joystick/analog: Switch from rdtscl() to native_read_tsc()
  2015-06-16 23:03   ` Dmitry Torokhov
@ 2015-06-16 23:09     ` Andy Lutomirski
  2015-06-16 23:15       ` Dmitry Torokhov
  0 siblings, 1 reply; 6+ messages in thread
From: Andy Lutomirski @ 2015-06-16 23:09 UTC (permalink / raw)
  To: Dmitry Torokhov
  Cc: Andy Lutomirski, X86 ML, Borislav Petkov, Peter Zijlstra,
	John Stultz, linux-kernel@vger.kernel.org, Len Brown, Huang Rui,
	Denys Vlasenko, linux-input@vger.kernel.org

Is it okay for -tip to take this and the other one you just acked?

Thanks,
Andy

On Tue, Jun 16, 2015 at 4:03 PM, Dmitry Torokhov
<dmitry.torokhov@gmail.com> wrote:
> On Fri, Jun 12, 2015 at 04:44:50PM -0700, Andy Lutomirski wrote:
>> This timing code is hideous, and this doesn't help.  It gets rid of
>> one of the last users of rdtscl, though.
>>
>> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
>> Cc: linux-input@vger.kernel.org
>> Signed-off-by: Andy Lutomirski <luto@kernel.org>
>
> Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
>
>> ---
>>  drivers/input/joystick/analog.c | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/input/joystick/analog.c b/drivers/input/joystick/analog.c
>> index 4284080e481d..f871b4f00056 100644
>> --- a/drivers/input/joystick/analog.c
>> +++ b/drivers/input/joystick/analog.c
>> @@ -143,7 +143,7 @@ struct analog_port {
>>
>>  #include <linux/i8253.h>
>>
>> -#define GET_TIME(x)  do { if (cpu_has_tsc) rdtscl(x); else x = get_time_pit(); } while (0)
>> +#define GET_TIME(x)  do { if (cpu_has_tsc) x = (unsigned int)native_read_tsc(); else x = get_time_pit(); } while (0)
>>  #define DELTA(x,y)   (cpu_has_tsc ? ((y) - (x)) : ((x) - (y) + ((x) < (y) ? PIT_TICK_RATE / HZ : 0)))
>>  #define TIME_NAME    (cpu_has_tsc?"TSC":"PIT")
>>  static unsigned int get_time_pit(void)
>> @@ -160,7 +160,7 @@ static unsigned int get_time_pit(void)
>>          return count;
>>  }
>>  #elif defined(__x86_64__)
>> -#define GET_TIME(x)  rdtscl(x)
>> +#define GET_TIME(x)  do { x = (unsigned int)native_read_tsc(); } while (0)
>>  #define DELTA(x,y)   ((y)-(x))
>>  #define TIME_NAME    "TSC"
>>  #elif defined(__alpha__) || defined(CONFIG_MN10300) || defined(CONFIG_ARM) || defined(CONFIG_ARM64) || defined(CONFIG_TILE)
>> --
>> 2.4.2
>>
>
> --
> Dmitry



-- 
Andy Lutomirski
AMA Capital Management, LLC

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v2 10/17] input/joystick/analog: Switch from rdtscl() to native_read_tsc()
  2015-06-16 23:09     ` Andy Lutomirski
@ 2015-06-16 23:15       ` Dmitry Torokhov
  0 siblings, 0 replies; 6+ messages in thread
From: Dmitry Torokhov @ 2015-06-16 23:15 UTC (permalink / raw)
  To: Andy Lutomirski
  Cc: Andy Lutomirski, X86 ML, Borislav Petkov, Peter Zijlstra,
	John Stultz, linux-kernel@vger.kernel.org, Len Brown, Huang Rui,
	Denys Vlasenko, linux-input@vger.kernel.org

On June 16, 2015 4:09:06 PM PDT, Andy Lutomirski <luto@amacapital.net> wrote:
>Is it okay for -tip to take this and the other one you just acked?

Yeah, that's fine.


Thanks.

-- 
Dmitry

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2015-06-16 23:16 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <cover.1434152603.git.luto@kernel.org>
2015-06-12 23:44 ` [PATCH v2 10/17] input/joystick/analog: Switch from rdtscl() to native_read_tsc() Andy Lutomirski
2015-06-16 23:03   ` Dmitry Torokhov
2015-06-16 23:09     ` Andy Lutomirski
2015-06-16 23:15       ` Dmitry Torokhov
2015-06-12 23:44 ` [PATCH v2 11/17] drivers/input/gameport: Replace rdtscl() with native_read_tsc() Andy Lutomirski
2015-06-16 23:04   ` Dmitry Torokhov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).