From patchwork Thu Oct 5 19:24:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ondrej Zary X-Patchwork-Id: 149004 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2016:b0:403:3b70:6f57 with SMTP id fe22csp518468vqb; Thu, 5 Oct 2023 12:25:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEXmVjB/ZFxtMvACq2mozsSK6rkefQbheZ8HcQXFYd+TB4roRK8f7qJjmHwLrOrZ5rNOF6h X-Received: by 2002:a17:902:d50f:b0:1c3:bc2a:f6b4 with SMTP id b15-20020a170902d50f00b001c3bc2af6b4mr7207309plg.42.1696533911394; Thu, 05 Oct 2023 12:25:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696533911; cv=none; d=google.com; s=arc-20160816; b=C+JTFWgUIWoK1RAZc69ypj2xt7mRAbtuy/sI4gssTyKXwwAfkf04gSXF2rp5N0C44b i3jWedCRCmT3NnwSfDgb+l0ftQ4yCdTvOD3wnhsCm6EsukfQarc2hsgb2yQnnxHhcCus QHp8Zs9R+iVK3TO4YRnQk50voXrepgIp1P8h77MsBUVC53ZdpSDCAOj+A43JF4Klr0Uz dJMYU1b00sJbpeqJpzEezuW5fZ18DmJ+Z2t88pCrDPNmb2PPNHfPToS+QvpmhQ7kbqZN B2StZwxLvarsWQInDzo+NC9qMLNeGJ6LKOxObJVQK/ZriP/9DE/PnR3gWm184ouKRB2W rEsw== 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=579Ly2bCLSQdrJMawcPBuKt/YBIINTdlbd9kbA3w4pE=; fh=0Kn3fvtcnx6vVXAlmep6T/Q5RzgM4nGjbgzeaq8HuW4=; b=C+zyqp2FaCt2i3caY/fcoGav40SUxWEIMDn8IzqPnL6I1zid3xfhfiLzAARTE4P27+ DSoi1Cd7oe4IIDfG5atM9/FgKH0RwJynNCa0hy/74uaN1NhHyWuXepT9o+z/X8V4NSRf Y3mgrLLvOfeldmcm/SWx3+XmPUecIhqH4Xw+xW0ZluIaXL8CM8alQHE9JKIbGgYhw6Xr E/q8BO7eANUSVtDrZvdrVoQf1cqGedq2tdOoXqvIQ6tdODaiI7Qm9b0R0e/wNFdwLL+F vS5HiRdbaRzmjBABZxiIp4Dq9R1Xw6k+kgjIVHWIsD24xkB3Hy+dEWI82TQVLwwEPjvX NJQQ== 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 p20-20020a170902e35400b001c0ab540e62si2002969plc.277.2023.10.05.12.25.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 12:25:11 -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 B058B835D82F; Thu, 5 Oct 2023 12:25:10 -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 S231494AbjJETZC (ORCPT + 18 others); Thu, 5 Oct 2023 15:25:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33896 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231314AbjJETY4 (ORCPT ); Thu, 5 Oct 2023 15:24:56 -0400 Received: from hosting.gsystem.sk (hosting.gsystem.sk [212.5.213.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 2CE6CE4; Thu, 5 Oct 2023 12:24:50 -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 018EE7A062F; Thu, 5 Oct 2023 21:24:48 +0200 (CEST) From: Ondrej Zary To: Damien Le Moal , Sudip Mukherjee Cc: Christoph Hellwig , Sergey Shtylyov , Tim Waugh , linux-parport@lists.infradead.org, linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/4] ata: pata_parport: add custom version of wait_after_reset Date: Thu, 5 Oct 2023 21:24:39 +0200 Message-Id: <20231005192440.4047-4-linux@zary.sk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20231005192440.4047-1-linux@zary.sk> References: <20231005192440.4047-1-linux@zary.sk> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,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]); Thu, 05 Oct 2023 12:25:10 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778944742315702123 X-GMAIL-MSGID: 1778944742315702123 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 Reviewed-by: Sergey Shtylyov --- drivers/ata/pata_parport/pata_parport.c | 67 ++++++++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-) diff --git a/drivers/ata/pata_parport/pata_parport.c b/drivers/ata/pata_parport/pata_parport.c index cf87bbb52f1f..318b2ce2d8d1 100644 --- a/drivers/ata/pata_parport/pata_parport.c +++ b/drivers/ata/pata_parport/pata_parport.c @@ -80,6 +80,71 @@ 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); + if (rc) { + /* + * some adapters return bogus values if master device is not + * present, so don't abort now if a slave device is present + */ + 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; + /* give drive a breather */ + ata_msleep(ap, 50); + } + + rc = ata_sff_wait_ready(link, deadline); + if (rc) { + if (rc != -ENODEV) + return rc; + ret = rc; + } + } + + 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 +159,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,