diff mbox series

[11/32] parport_pc: add 16-bit and 8-bit fast EPP transfer flags

Message ID 20230307224627.28011-12-linux@zary.sk
State New
Headers
Series pata_parport-bpck6: rework bpck6 protocol driver |

Commit Message

Ondrej Zary March 7, 2023, 10:46 p.m. UTC 
  PARPORT_EPP_FAST flag currently uses 32-bit I/O port access for data
read/write (insl/outsl).
Add PARPORT_EPP_FAST_16 and PARPORT_EPP_FAST_8 that use insw/outsw
and insb/outsb (and PARPORT_EPP_FAST_32 as alias for PARPORT_EPP_FAST).

Signed-off-by: Ondrej Zary <linux@zary.sk>
---
 drivers/parport/parport_pc.c | 20 ++++++++++++++++----
 include/uapi/linux/parport.h |  3 +++
 2 files changed, 19 insertions(+), 4 deletions(-)

Comments

Sergey Shtylyov March 11, 2023, 8:09 p.m. UTC | #1 
On 3/8/23 1:46 AM, Ondrej Zary wrote:

> PARPORT_EPP_FAST flag currently uses 32-bit I/O port access for data
> read/write (insl/outsl).
> Add PARPORT_EPP_FAST_16 and PARPORT_EPP_FAST_8 that use insw/outsw
> and insb/outsb (and PARPORT_EPP_FAST_32 as alias for PARPORT_EPP_FAST).
> 
> Signed-off-by: Ondrej Zary <linux@zary.sk>
> ---
>  drivers/parport/parport_pc.c | 20 ++++++++++++++++----
>  include/uapi/linux/parport.h |  3 +++
>  2 files changed, 19 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
> index 5784dc20fb38..eda4e4e6d4e8 100644
> --- a/drivers/parport/parport_pc.c
> +++ b/drivers/parport/parport_pc.c
> @@ -298,9 +298,15 @@ static size_t parport_pc_epp_read_data(struct parport *port, void *buf,
>  		}
>  		return got;
>  	}
> -	if ((flags & PARPORT_EPP_FAST) && (length > 1)) {
> -		if (!(((long)buf | length) & 0x03))
> +	if ((length > 1) && ((flags & PARPORT_EPP_FAST_32)
> +			   || flags & PARPORT_EPP_FAST_16
> +			   || flags & PARPORT_EPP_FAST_8)) {

   Why not:

> +		if ((flags & PARPORT_EPP_FAST_32)
> +		    && !(((long)buf | length) & 0x03))
>  			insl(EPPDATA(port), buf, (length >> 2));
> +		else if ((flags & PARPORT_EPP_FAST_16)
> +			 && !(((long)buf | length) & 0x01))
> +			insw(EPPDATA(port), buf, length >> 1);
>  		else
>  			insb(EPPDATA(port), buf, length);
>  		if (inb(STATUS(port)) & 0x01) {
> @@ -327,9 +333,15 @@ static size_t parport_pc_epp_write_data(struct parport *port, const void *buf,
>  {
>  	size_t written = 0;
>  
> -	if ((flags & PARPORT_EPP_FAST) && (length > 1)) {
> -		if (!(((long)buf | length) & 0x03))
> +	if ((length > 1) && ((flags & PARPORT_EPP_FAST_32)
> +			   || flags & PARPORT_EPP_FAST_16

   I think it's preferred that an operator is left at the end of a broken up line...

> +			   || flags & PARPORT_EPP_FAST_8)) {

	if (length > 1 && (flags & (PARPORT_EPP_FAST_32 |
				    PARPORT_EPP_FAST_16 |
			   	    PARPORT_EPP_FAST_8)) {

> +		if ((flags & PARPORT_EPP_FAST_32)
> +		    && !(((long)buf | length) & 0x03))

  Again, leave && on the higher line...

>  			outsl(EPPDATA(port), buf, (length >> 2));
> +		else if ((flags & PARPORT_EPP_FAST_16)
> +			 && !(((long)buf | length) & 0x01))
> +			outsw(EPPDATA(port), buf, length >> 1);
>  		else
>  			outsb(EPPDATA(port), buf, length);
>  		if (inb(STATUS(port)) & 0x01) {
[...]

MBR, Sergey
Sergey Shtylyov March 11, 2023, 8:31 p.m. UTC | #2 
On 3/11/23 11:09 PM, Sergey Shtylyov wrote:

>> PARPORT_EPP_FAST flag currently uses 32-bit I/O port access for data
>> read/write (insl/outsl).
>> Add PARPORT_EPP_FAST_16 and PARPORT_EPP_FAST_8 that use insw/outsw
>> and insb/outsb (and PARPORT_EPP_FAST_32 as alias for PARPORT_EPP_FAST).
>>
>> Signed-off-by: Ondrej Zary <linux@zary.sk>
>> ---
>>  drivers/parport/parport_pc.c | 20 ++++++++++++++++----
>>  include/uapi/linux/parport.h |  3 +++
>>  2 files changed, 19 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
>> index 5784dc20fb38..eda4e4e6d4e8 100644
>> --- a/drivers/parport/parport_pc.c
>> +++ b/drivers/parport/parport_pc.c
>> @@ -298,9 +298,15 @@ static size_t parport_pc_epp_read_data(struct parport *port, void *buf,
>>  		}
>>  		return got;
>>  	}
>> -	if ((flags & PARPORT_EPP_FAST) && (length > 1)) {
>> -		if (!(((long)buf | length) & 0x03))
>> +	if ((length > 1) && ((flags & PARPORT_EPP_FAST_32)
>> +			   || flags & PARPORT_EPP_FAST_16
>> +			   || flags & PARPORT_EPP_FAST_8)) {
> 
>    Why not:
> 
>> +		if ((flags & PARPORT_EPP_FAST_32)
>> +		    && !(((long)buf | length) & 0x03))
>>  			insl(EPPDATA(port), buf, (length >> 2));
>> +		else if ((flags & PARPORT_EPP_FAST_16)
>> +			 && !(((long)buf | length) & 0x01))
>> +			insw(EPPDATA(port), buf, length >> 1);
>>  		else
>>  			insb(EPPDATA(port), buf, length);
>

   Oopsie, s/th went wrong while editing... :-/

[...]

MBR, Sergey
diff mbox series

Patch

diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
index 5784dc20fb38..eda4e4e6d4e8 100644
--- a/drivers/parport/parport_pc.c
+++ b/drivers/parport/parport_pc.c
@@ -298,9 +298,15 @@  static size_t parport_pc_epp_read_data(struct parport *port, void *buf,
 		}
 		return got;
 	}
-	if ((flags & PARPORT_EPP_FAST) && (length > 1)) {
-		if (!(((long)buf | length) & 0x03))
+	if ((length > 1) && ((flags & PARPORT_EPP_FAST_32)
+			   || flags & PARPORT_EPP_FAST_16
+			   || flags & PARPORT_EPP_FAST_8)) {
+		if ((flags & PARPORT_EPP_FAST_32)
+		    && !(((long)buf | length) & 0x03))
 			insl(EPPDATA(port), buf, (length >> 2));
+		else if ((flags & PARPORT_EPP_FAST_16)
+			 && !(((long)buf | length) & 0x01))
+			insw(EPPDATA(port), buf, length >> 1);
 		else
 			insb(EPPDATA(port), buf, length);
 		if (inb(STATUS(port)) & 0x01) {
@@ -327,9 +333,15 @@  static size_t parport_pc_epp_write_data(struct parport *port, const void *buf,
 {
 	size_t written = 0;
 
-	if ((flags & PARPORT_EPP_FAST) && (length > 1)) {
-		if (!(((long)buf | length) & 0x03))
+	if ((length > 1) && ((flags & PARPORT_EPP_FAST_32)
+			   || flags & PARPORT_EPP_FAST_16
+			   || flags & PARPORT_EPP_FAST_8)) {
+		if ((flags & PARPORT_EPP_FAST_32)
+		    && !(((long)buf | length) & 0x03))
 			outsl(EPPDATA(port), buf, (length >> 2));
+		else if ((flags & PARPORT_EPP_FAST_16)
+			 && !(((long)buf | length) & 0x01))
+			outsw(EPPDATA(port), buf, length >> 1);
 		else
 			outsb(EPPDATA(port), buf, length);
 		if (inb(STATUS(port)) & 0x01) {
diff --git a/include/uapi/linux/parport.h b/include/uapi/linux/parport.h
index f41388f88dc3..fe93e41fc205 100644
--- a/include/uapi/linux/parport.h
+++ b/include/uapi/linux/parport.h
@@ -90,6 +90,9 @@  typedef enum {
 /* Flags for block transfer operations. */
 #define PARPORT_EPP_FAST		(1<<0) /* Unreliable counts. */
 #define PARPORT_W91284PIC		(1<<1) /* have a Warp9 w91284pic in the device */
+#define PARPORT_EPP_FAST_32		PARPORT_EPP_FAST /* 32-bit EPP transfers */
+#define PARPORT_EPP_FAST_16		(1<<2) /* 16-bit EPP transfers */
+#define PARPORT_EPP_FAST_8		(1<<3) /* 8-bit EPP transfers */
 
 /* The rest is for the kernel only */
 #endif /* _UAPI_PARPORT_H_ */