From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EF9BAC61DA4 for ; Sat, 11 Mar 2023 20:09:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229469AbjCKUJz (ORCPT ); Sat, 11 Mar 2023 15:09:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51552 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229450AbjCKUJy (ORCPT ); Sat, 11 Mar 2023 15:09:54 -0500 Received: from mx01.omp.ru (mx01.omp.ru [90.154.21.10]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 613AC26597; Sat, 11 Mar 2023 12:09:52 -0800 (PST) Received: from [192.168.1.103] (31.173.84.174) by msexch01.omp.ru (10.188.4.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.986.14; Sat, 11 Mar 2023 23:09:44 +0300 Subject: Re: [PATCH 11/32] parport_pc: add 16-bit and 8-bit fast EPP transfer flags To: Ondrej Zary , Damien Le Moal , Sudip Mukherjee CC: Christoph Hellwig , Jens Axboe , Tim Waugh , , , , References: <20230307224627.28011-1-linux@zary.sk> <20230307224627.28011-12-linux@zary.sk> From: Sergey Shtylyov Organization: Open Mobile Platform Message-ID: <460ae7d7-a12d-cef3-4343-ac633e15016f@omp.ru> Date: Sat, 11 Mar 2023 23:09:44 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: <20230307224627.28011-12-linux@zary.sk> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [31.173.84.174] X-ClientProxiedBy: msexch01.omp.ru (10.188.4.12) To msexch01.omp.ru (10.188.4.12) X-KSE-ServerInfo: msexch01.omp.ru, 9 X-KSE-AntiSpam-Interceptor-Info: scan successful X-KSE-AntiSpam-Version: 5.9.59, Database issued on: 03/11/2023 19:45:10 X-KSE-AntiSpam-Status: KAS_STATUS_NOT_DETECTED X-KSE-AntiSpam-Method: none X-KSE-AntiSpam-Rate: 59 X-KSE-AntiSpam-Info: Lua profiles 176022 [Mar 10 2023] X-KSE-AntiSpam-Info: Version: 5.9.59.0 X-KSE-AntiSpam-Info: Envelope from: s.shtylyov@omp.ru X-KSE-AntiSpam-Info: LuaCore: 507 507 08d345461d9bcca7095738422a5279ab257bb65a X-KSE-AntiSpam-Info: {rep_avail} X-KSE-AntiSpam-Info: {Tracking_from_domain_doesnt_match_to} X-KSE-AntiSpam-Info: {relay has no DNS name} X-KSE-AntiSpam-Info: {SMTP from is not routable} X-KSE-AntiSpam-Info: {Found in DNSBL: 31.173.84.174 in (user) b.barracudacentral.org} X-KSE-AntiSpam-Info: {Found in DNSBL: 31.173.84.174 in (user) dbl.spamhaus.org} X-KSE-AntiSpam-Info: 31.173.84.174:7.7.3,7.4.1;omp.ru:7.1.1;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;127.0.0.199:7.1.2 X-KSE-AntiSpam-Info: {iprep_blacklist} X-KSE-AntiSpam-Info: ApMailHostAddress: 31.173.84.174 X-KSE-AntiSpam-Info: {DNS response errors} X-KSE-AntiSpam-Info: Rate: 59 X-KSE-AntiSpam-Info: Status: not_detected X-KSE-AntiSpam-Info: Method: none X-KSE-AntiSpam-Info: Auth:dmarc=temperror header.from=omp.ru;spf=temperror smtp.mailfrom=omp.ru;dkim=none X-KSE-Antiphishing-Info: Clean X-KSE-Antiphishing-ScanningType: Heuristic X-KSE-Antiphishing-Method: None X-KSE-Antiphishing-Bases: 03/11/2023 19:49:00 X-KSE-AttachmentFiltering-Interceptor-Info: protection disabled X-KSE-Antivirus-Interceptor-Info: scan successful X-KSE-Antivirus-Info: Clean, bases: 3/11/2023 6:14:00 PM X-KSE-BulkMessagesFiltering-Scan-Result: InTheLimit Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org 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 > --- > 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