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,