From patchwork Sat Sep 30 19:15:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ondrej Zary X-Patchwork-Id: 146964 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp543644vqb; Sat, 30 Sep 2023 12:16:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE6Ibec8PeaEQiccjFz3x+ztUc4BphLtotnBIFDWKKTBa+QEodZii9e5m41X9pSkyC2eR+D X-Received: by 2002:a05:6a21:66c5:b0:154:e7e6:85c8 with SMTP id ze5-20020a056a2166c500b00154e7e685c8mr7504708pzb.31.1696101405068; Sat, 30 Sep 2023 12:16:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696101405; cv=none; d=google.com; s=arc-20160816; b=jBTJAk5f4dLUFk/KHOaS4+gZDJRzYXW3vGrC8IyXEsgdwq2WLQ8iitKlqLQx6+ns+b K/VRoKT7Ss2fGgBHGJch5vcoXIEuyTPDHk6TFdU2dBguJO/cBpzDDeauq7BquRTAAUHE XNgQzj5er98ZhuuD6HJhDdWTzU+Zzu6plYIvtAvDGs3uyWMCEd1UpmgG+1C4SVWXaF5J 0jdYBwUupry0ygjzNVRakGX4Nv6bwvVJW3zeQJ8V/ZcCRTPypO55ZvMAJEl9Cskhkz/I QTkfeO6B2DbzyKW2b9T0MAluFppS6rAeRW/TlOIcHbsrY13MdfqbMau3B2Y6gIIR3qxO 6Fyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=uEGwm1gu9BypWNEYQ5UW+A6PBfFm0x9wxQyKLCc/IdM=; fh=HCzElfjdAw79VJwTPuLT/8QZsv7MtPddOgpBiXtV6sA=; b=y61fG9piAWm9W2fwvYo8ez1RHYzMV+MRfGTypVCkG7PG28Cv1goBIja3PTSJufU6BO LhkC3GFbE7/3XXeyCgy6E4Jysr/kTl9l4PQJ2XKpCFhP8DNpxI9tkwHsEVxSbAHLGGWC cdAF4Sqr3nz9x8lltICmu9iqVX2pUiKKOsUd9trNN2nic3GW9qHdkvqaRV+EFNr/2tbs 4iCh9krW8mgVSaXAoz/VkNrfBBM9KFYdIt4Q5exuCYaU5Gw+n9twifW3qtqiFds/A7hh b1EWyVhsedFjkDmgqUmeh2r1j9yBJV8VqMWGC9g7c/NvBb9/oyR19pSgahP2ZIpn3s7z qe7g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id f11-20020a170902ce8b00b001c604fdbb14si19664702plg.81.2023.09.30.12.16.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Sep 2023 12:16:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 3D6E880CCD28; Sat, 30 Sep 2023 12:16:14 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234756AbjI3TPg (ORCPT + 20 others); Sat, 30 Sep 2023 15:15:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40480 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234695AbjI3TPd (ORCPT ); Sat, 30 Sep 2023 15:15:33 -0400 Received: from hosting.gsystem.sk (hosting.gsystem.sk [212.5.213.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 81732E3 for ; Sat, 30 Sep 2023 12:15:30 -0700 (PDT) Received: from gsql.ggedos.sk (off-20.infotel.telecom.sk [212.5.213.20]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by hosting.gsystem.sk (Postfix) with ESMTPSA id CC42D7A00BF; Sat, 30 Sep 2023 21:15:27 +0200 (CEST) From: Ondrej Zary To: Damien Le Moal , Sudip Mukherjee Cc: Christoph Hellwig , Sergey Shtylyov , Jens Axboe , Tim Waugh , linux-block@vger.kernel.org, linux-parport@lists.infradead.org, linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/4] pata_parport: fix pata_parport_devchk Date: Sat, 30 Sep 2023 21:15:08 +0200 Message-Id: <20230930191511.24994-2-linux@zary.sk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230930191511.24994-1-linux@zary.sk> References: <20230930191511.24994-1-linux@zary.sk> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Sat, 30 Sep 2023 12:16:14 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778491226966461613 X-GMAIL-MSGID: 1778491226966461613 There's a 'x' missing in 0x55 in pata_parport_devchk(), causing the detection to always fail. Fix it. Signed-off-by: Ondrej Zary --- drivers/ata/pata_parport/pata_parport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/ata/pata_parport/pata_parport.c b/drivers/ata/pata_parport/pata_parport.c index 1af64d435d3c..258d189f42e5 100644 --- a/drivers/ata/pata_parport/pata_parport.c +++ b/drivers/ata/pata_parport/pata_parport.c @@ -64,7 +64,7 @@ static bool pata_parport_devchk(struct ata_port *ap, unsigned int device) pi->proto->write_regr(pi, 0, ATA_REG_NSECT, 0xaa); pi->proto->write_regr(pi, 0, ATA_REG_LBAL, 0x55); - pi->proto->write_regr(pi, 0, ATA_REG_NSECT, 055); + pi->proto->write_regr(pi, 0, ATA_REG_NSECT, 0x55); pi->proto->write_regr(pi, 0, ATA_REG_LBAL, 0xaa); nsect = pi->proto->read_regr(pi, 0, ATA_REG_NSECT); From patchwork Sat Sep 30 19:15:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ondrej Zary X-Patchwork-Id: 146965 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp544215vqb; Sat, 30 Sep 2023 12:18:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEM1ORQfdp4WoM+SerNitn8PEr9NYxI+kSmxyg1Qt5UDK8EeFhX19SZOtlAlE6pzTr/4K7h X-Received: by 2002:a05:6a00:428f:b0:68f:cdb8:ae33 with SMTP id bx15-20020a056a00428f00b0068fcdb8ae33mr12432502pfb.10.1696101499546; Sat, 30 Sep 2023 12:18:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696101499; cv=none; d=google.com; s=arc-20160816; b=XXD1CDZfdd96Qvq4Qv9VzxYHZHm7ZvDguRg6tprgTZELiFzQIYmM74iFPa7rVIGunL 3OXd6Mbso4WWSWu/KotJVsjBr/44nweuMS10AtOxgSKRH5O0Y9u2wKmmFIIzBjfGhWOG 6cGaG4s8VedkNlluz+PHVJR0bL7agSka/iSJS7CCFc59m6YVaP6cDcnDb5P9PD2tbc8T 9vqh3+jM9Sor2cwYU4plzTjwDbC1ky0ydy+FWzhR+0Ti8IDhYeQFT8vuB7Mu5POaG3mV QEKJA/csZHyWm0KXs2zwoF0BV7ftktNpyPVo15FU4oGMMZZc/ym5Qv/eCCdlFgEXj5c9 X/qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=6VL/uVbb1MYeGZ4I2z/rsdUvh0HFuEu+FMj/oJYWyoo=; fh=HCzElfjdAw79VJwTPuLT/8QZsv7MtPddOgpBiXtV6sA=; b=kOH/Q4FHp3Sh3V7+EAHrLarEoDdtW9VMkumY/+3ZxE4HUplTpdhMyn0bJcWh9ZxtrP SeXy5XgMRO4MkTl/G6ShTe/7JLXMDvjqbCiFeayB+iK2oMUeliwL8KMRfsJBOwojkTy3 WV47r4XgoVRDEIrVmRhOLmLGjhBOFewnjmIZouThtwi9bnBgMXbWaHo7ZhZQ39Q5NS7f TAzdMxu8/FwFEFqh6Qjx1HD7W2TP1rUsi1L5zThZcwaBAB5KgCmMnAOW+qgOTpAM58UT 63/wvLh5jDFH6YDjgA4PA5BM42XQ/J3Oy4ORXCQ8AO6aBg1o58yOYYnV8QSY8CXABf2j fX+Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id f20-20020a637554000000b00565dd3fbfdfsi23527843pgn.214.2023.09.30.12.18.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Sep 2023 12:18:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id D2AB38025737; Sat, 30 Sep 2023 12:15:55 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234751AbjI3TPf (ORCPT + 20 others); Sat, 30 Sep 2023 15:15:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40478 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231603AbjI3TPd (ORCPT ); Sat, 30 Sep 2023 15:15:33 -0400 Received: from hosting.gsystem.sk (hosting.gsystem.sk [212.5.213.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 2CA15D3 for ; Sat, 30 Sep 2023 12:15:30 -0700 (PDT) Received: from gsql.ggedos.sk (off-20.infotel.telecom.sk [212.5.213.20]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by hosting.gsystem.sk (Postfix) with ESMTPSA id 03CF57A01C5; Sat, 30 Sep 2023 21:15:28 +0200 (CEST) From: Ondrej Zary To: Damien Le Moal , Sudip Mukherjee Cc: Christoph Hellwig , Sergey Shtylyov , Jens Axboe , Tim Waugh , linux-block@vger.kernel.org, linux-parport@lists.infradead.org, linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/4] pata_parport: implement set_devctl Date: Sat, 30 Sep 2023 21:15:09 +0200 Message-Id: <20230930191511.24994-3-linux@zary.sk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230930191511.24994-1-linux@zary.sk> References: <20230930191511.24994-1-linux@zary.sk> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Sat, 30 Sep 2023 12:15:55 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778491326348778620 X-GMAIL-MSGID: 1778491326348778620 Add missing ops->sff_set_devctl implementation. Signed-off-by: Ondrej Zary Reviewed-by: Sergey Shtylyov --- drivers/ata/pata_parport/pata_parport.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/ata/pata_parport/pata_parport.c b/drivers/ata/pata_parport/pata_parport.c index 258d189f42e5..cf87bbb52f1f 100644 --- a/drivers/ata/pata_parport/pata_parport.c +++ b/drivers/ata/pata_parport/pata_parport.c @@ -51,6 +51,13 @@ static void pata_parport_dev_select(struct ata_port *ap, unsigned int device) ata_sff_pause(ap); } +static void pata_parport_set_devctl(struct ata_port *ap, u8 ctl) +{ + struct pi_adapter *pi = ap->host->private_data; + + pi->proto->write_regr(pi, 1, 6, ctl); +} + static bool pata_parport_devchk(struct ata_port *ap, unsigned int device) { struct pi_adapter *pi = ap->host->private_data; @@ -252,6 +259,7 @@ static struct ata_port_operations pata_parport_port_ops = { .hardreset = NULL, .sff_dev_select = pata_parport_dev_select, + .sff_set_devctl = pata_parport_set_devctl, .sff_check_status = pata_parport_check_status, .sff_check_altstatus = pata_parport_check_altstatus, .sff_tf_load = pata_parport_tf_load, From patchwork Sat Sep 30 19:15:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ondrej Zary X-Patchwork-Id: 146967 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp544246vqb; Sat, 30 Sep 2023 12:18:24 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGfh/oLgpAARGantEc4p6gW/t9rBFZ5SEqXAY1K7n/FOiakcaIGZb6Pd8Q1UoHPdDz1zLLO X-Received: by 2002:a05:6a00:130b:b0:690:c887:8cd8 with SMTP id j11-20020a056a00130b00b00690c8878cd8mr7101644pfu.32.1696101504029; Sat, 30 Sep 2023 12:18:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696101504; cv=none; d=google.com; s=arc-20160816; b=NPedcT2bJrTlV8n5pm1rmz0AH3etkQy6qSJvUksoTqx0C1IrlDlIQhz8LqcEocUTMD 58TPDSnzpQ3tVvPU1N40MCcAbZKidzT1ZE6DXHea+z44QxlQ4uoJ1XR0cmz2tnpRJnhY xKKmUgQN4huwkIqcJURxVwV3WumT3n3UjpNIOY8L5a6Oi1z0Tf8bCQJUMr1jQ6qieHob 8TAC+ic+iunpsGnYAZr/J1qpQukPKur53R3OkONURdj31QmdYQzT3t2s6X3oA0jWhj7U 7GeK8AiQVwldKc1cjz9Gx4hs6DExdNtOAy/46TWBC6jZi9/0iIgdGXqq50jU4msK2xwb uW5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=jl1VuwsOZKgG9rAlDOQOuKziy7+hLW+O4PVhySclixM=; fh=HCzElfjdAw79VJwTPuLT/8QZsv7MtPddOgpBiXtV6sA=; b=J4w0e9heqqJXOoypLsVh3HQfBzfWEITDQB95rcd40PARcIzs4q/shgSN1yOWFaBCln pg+eFZn3VwQIS/61Xi/Buzay9OTPEgbDrz8AQslzb1/j04FLMtDGMEA+qB4mq27sX62A im9GTyOH4f6u19j15oS+6BsFOw3Jx4sPs+NofBMV1apUkCm3B0e6mtG7ONKkvo0XVLiS r1iM9H2bGEyekqY71ebV9Sq+ORfAOYDrq2CbQdsSca3dSyhAS/QwgQISiuuQCSaQFuPE gDWpgRSt46ccZCXhbqhWtDpmodjslXggZu2CVKKhgS3e2936LauUIUZEkjAfCRkRB6hA UsWQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id cj18-20020a056a00299200b0068fe12b361dsi23866154pfb.249.2023.09.30.12.18.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Sep 2023 12:18:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 17E4580236F1; Sat, 30 Sep 2023 12:16:27 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234767AbjI3TPk (ORCPT + 20 others); Sat, 30 Sep 2023 15:15:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40486 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234738AbjI3TPe (ORCPT ); Sat, 30 Sep 2023 15:15:34 -0400 Received: from hosting.gsystem.sk (hosting.gsystem.sk [212.5.213.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 81683E1 for ; Sat, 30 Sep 2023 12:15:30 -0700 (PDT) Received: from gsql.ggedos.sk (off-20.infotel.telecom.sk [212.5.213.20]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by hosting.gsystem.sk (Postfix) with ESMTPSA id 59A087A03B4; Sat, 30 Sep 2023 21:15:28 +0200 (CEST) From: Ondrej Zary To: Damien Le Moal , Sudip Mukherjee Cc: Christoph Hellwig , Sergey Shtylyov , Jens Axboe , Tim Waugh , linux-block@vger.kernel.org, linux-parport@lists.infradead.org, linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/4] pata_parport: add custom version of wait_after_reset Date: Sat, 30 Sep 2023 21:15:10 +0200 Message-Id: <20230930191511.24994-4-linux@zary.sk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230930191511.24994-1-linux@zary.sk> References: <20230930191511.24994-1-linux@zary.sk> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Sat, 30 Sep 2023 12:16:27 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778491330849450492 X-GMAIL-MSGID: 1778491330849450492 Some parallel adapters (e.g. EXP Computer MC-1285B EPP Cable) return bogus values when there's no master device present. This can cause reset to fail, preventing the lone slave device (such as EXP Computer CD-865) from working. Add custom version of wait_after_reset that ignores master failure when a slave device is present. The custom version is also needed because the generic ata_sff_wait_after_reset uses direct port I/O for slave device detection. Signed-off-by: Ondrej Zary --- drivers/ata/pata_parport/pata_parport.c | 65 ++++++++++++++++++++++++- 1 file changed, 64 insertions(+), 1 deletion(-) diff --git a/drivers/ata/pata_parport/pata_parport.c b/drivers/ata/pata_parport/pata_parport.c index cf87bbb52f1f..b3db953e615a 100644 --- a/drivers/ata/pata_parport/pata_parport.c +++ b/drivers/ata/pata_parport/pata_parport.c @@ -80,6 +80,69 @@ static bool pata_parport_devchk(struct ata_port *ap, unsigned int device) return (nsect == 0x55) && (lbal == 0xaa); } +static int pata_parport_wait_after_reset(struct ata_link *link, + unsigned int devmask, + unsigned long deadline) +{ + struct ata_port *ap = link->ap; + struct pi_adapter *pi = ap->host->private_data; + unsigned int dev0 = devmask & (1 << 0); + unsigned int dev1 = devmask & (1 << 1); + int rc, ret = 0; + + ata_msleep(ap, ATA_WAIT_AFTER_RESET); + + /* always check readiness of the master device */ + rc = ata_sff_wait_ready(link, deadline); + /* some adapters return bogus values if master device is not present, + * so don't abort now if a slave device is present + */ + if (rc) { + if (!dev1) + return rc; + ret = -ENODEV; + } + + /* if device 1 was found in ata_devchk, wait for register + * access briefly, then wait for BSY to clear. + */ + if (dev1) { + int i; + + pata_parport_dev_select(ap, 1); + + /* Wait for register access. Some ATAPI devices fail + * to set nsect/lbal after reset, so don't waste too + * much time on it. We're gonna wait for !BSY anyway. + */ + for (i = 0; i < 2; i++) { + u8 nsect, lbal; + + nsect = pi->proto->read_regr(pi, 0, ATA_REG_NSECT); + lbal = pi->proto->read_regr(pi, 0, ATA_REG_LBAL); + if ((nsect == 1) && (lbal == 1)) + break; + ata_msleep(ap, 50); /* give drive a breather */ + } + + rc = ata_sff_wait_ready(link, deadline); + if (rc) { + if (rc != -ENODEV) + return rc; + ret = rc; + } + } + + /* is all this really necessary? */ + pata_parport_dev_select(ap, 0); + if (dev1) + pata_parport_dev_select(ap, 1); + if (dev0) + pata_parport_dev_select(ap, 0); + + return ret; +} + static int pata_parport_bus_softreset(struct ata_port *ap, unsigned int devmask, unsigned long deadline) { @@ -94,7 +157,7 @@ static int pata_parport_bus_softreset(struct ata_port *ap, unsigned int devmask, ap->last_ctl = ap->ctl; /* wait the port to become ready */ - return ata_sff_wait_after_reset(&ap->link, devmask, deadline); + return pata_parport_wait_after_reset(&ap->link, devmask, deadline); } static int pata_parport_softreset(struct ata_link *link, unsigned int *classes, From patchwork Sat Sep 30 19:15:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ondrej Zary X-Patchwork-Id: 146966 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp544227vqb; Sat, 30 Sep 2023 12:18:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEX2bioozmQTnIBJuUQPxwpMVOCd7gytF1R6zJX4Xuwimb8pbtviJxzNbMJq2OW7oZT/kCO X-Received: by 2002:a17:90a:7525:b0:26b:219f:3399 with SMTP id q34-20020a17090a752500b0026b219f3399mr5797527pjk.35.1696101501011; Sat, 30 Sep 2023 12:18:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696101500; cv=none; d=google.com; s=arc-20160816; b=Q6Qd1MAznHrRgFw0CWWchbHfiUELo5OBteMYAT529zG/dXBoknevd2MbcH599IEbxQ AkvroluCUikivlIeG4hAFDxKht4gcKbUdJq+6c+ZiHANwHtanutm+fJQuOm8PlinpKZp tQ8LrdKPtYEiFp5uVxVupan+eP5s+zEvzn7sPGSgBZLjKuGrKH8AduSoc2UaPP8bKF7o kiRFBLc0+Kg+OKTvA84MfgSE+84ednEBUJ4yYioaGblQPWM03Ru25Oq0BL9IU1RIQY8W hpX6xa1IVEef9t9/m4NG0u4vGIf1897bBMs0NywM7v4sonzmcrZRlEet+fVp8PTYJ6/L Cs6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=A8i6FxU4v8ee1Z5Jxk7YJR5B/PSdUwv7Xe5XAhP7brM=; fh=HCzElfjdAw79VJwTPuLT/8QZsv7MtPddOgpBiXtV6sA=; b=OTti1uYzL9e1Ga5kG1YANp+w8kjfCtYsVKr2vheZ4vGVjzJF77c2eKb8jM7FJBJzT5 fENNw8jfQrxVIXILjSVqIlLgdY6PqqZo1+DdeP0nFwUT7wDUDBOeuAvWdkVbtAJFdeX4 WpRqBrmD1nrqvqyiixYF9nqB+M2dpDAGYa2UeJRfMPl4Y8a+UYFOKkYffL9YaqaGrIvm Xd9H8QhQ/2I5wfWDMe16bIMe8YhS0VDDxZPLYcYLaFUfob1TkSuy+9s1brwJ8gElnRoZ DgqVP3tbBUO+7eQdXIRc1cnnZ2vJTSI4v32MTJ0+JAAOc/HRnuaRtXzwoVnPzhoDOU38 BFTQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id mh12-20020a17090b4acc00b0027728f01512si4574038pjb.167.2023.09.30.12.18.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Sep 2023 12:18:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 4D08680236C6; Sat, 30 Sep 2023 12:16:06 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234762AbjI3TPi (ORCPT + 20 others); Sat, 30 Sep 2023 15:15:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40484 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234735AbjI3TPd (ORCPT ); Sat, 30 Sep 2023 15:15:33 -0400 Received: from hosting.gsystem.sk (hosting.gsystem.sk [212.5.213.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 8AC9EE6 for ; Sat, 30 Sep 2023 12:15:30 -0700 (PDT) Received: from gsql.ggedos.sk (off-20.infotel.telecom.sk [212.5.213.20]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by hosting.gsystem.sk (Postfix) with ESMTPSA id 895A57A03C3; Sat, 30 Sep 2023 21:15:28 +0200 (CEST) From: Ondrej Zary To: Damien Le Moal , Sudip Mukherjee Cc: Christoph Hellwig , Sergey Shtylyov , Jens Axboe , Tim Waugh , linux-block@vger.kernel.org, linux-parport@lists.infradead.org, linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/4] pata_parport-fit3: implement IDE command set registers Date: Sat, 30 Sep 2023 21:15:11 +0200 Message-Id: <20230930191511.24994-5-linux@zary.sk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230930191511.24994-1-linux@zary.sk> References: <20230930191511.24994-1-linux@zary.sk> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Sat, 30 Sep 2023 12:16:06 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778491327568961880 X-GMAIL-MSGID: 1778491327568961880 fit3 protocol driver does not support accessing IDE control registers (device control/altstatus). The DOS driver does not use these registers either (as observed from DOSEMU trace). But the HW seems to be capable of accessing these registers - I simply tried bit 3 and it works! The control register is required to properly reset ATAPI devices or they will be detected only once (after a power cycle). Tested with EXP Computer CD-865 with MC-1285B EPP cable and TransDisk 3000. Signed-off-by: Ondrej Zary --- drivers/ata/pata_parport/fit3.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/drivers/ata/pata_parport/fit3.c b/drivers/ata/pata_parport/fit3.c index bad7aa920cdc..86b39966755b 100644 --- a/drivers/ata/pata_parport/fit3.c +++ b/drivers/ata/pata_parport/fit3.c @@ -9,11 +9,6 @@ * * The TD-2000 and certain older devices use a different protocol. * Try the fit2 protocol module with them. - * - * NB: The FIT adapters do not appear to support the control - * registers. So, we map ALT_STATUS to STATUS and NO-OP writes - * to the device control register - this means that IDE reset - * will not work on these devices. */ #include @@ -35,10 +30,11 @@ * cont = 1 - access the IDE command set */ +static int cont_map[] = { 0x00, 0x08 }; + static void fit3_write_regr(struct pi_adapter *pi, int cont, int regr, int val) { - if (cont == 1) - return; + regr += cont_map[cont]; switch (pi->mode) { case 0: @@ -59,11 +55,7 @@ static int fit3_read_regr(struct pi_adapter *pi, int cont, int regr) { int a, b; - if (cont) { - if (regr != 6) - return 0xff; - regr = 7; - } + regr += cont_map[cont]; switch (pi->mode) { case 0: