From patchwork Thu Oct 5 20:55:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ondrej Zary X-Patchwork-Id: 149028 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2016:b0:403:3b70:6f57 with SMTP id fe22csp561752vqb; Thu, 5 Oct 2023 13:58:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHrpOtI48Gp6/ofVKcdLFUMZ+uDEis6DC5/ajclmNdYEDBqtxOLJOUPLq4lKfdvHTOpYb2q X-Received: by 2002:a05:6a20:938a:b0:15d:d73e:e398 with SMTP id x10-20020a056a20938a00b0015dd73ee398mr7584546pzh.16.1696539480888; Thu, 05 Oct 2023 13:58:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696539480; cv=none; d=google.com; s=arc-20160816; b=bRV4E3M4fiXLgQSDzRqVjhWWtUcF9jtvBCXX7yYkiLL8mWTAtAJK5kGsaPyvlN/2iH KB4CyKm4Gp78YSmIqqq03vhhBOOsrGBStK0g0stQbnEt4ferlEU2l4IIKFUR0sK0Y5qS 7P6qnTSNx4PlrtIg6m0Pc/lVcGp+j9I8JMXVvjGkfGlgWtX7aowV+TBdHu4npvTny8PK 1ng/W/VE621NPZic8ZRQuCv5Exrlon3eFtlp7f0u4DrQh9e+zmCzqTF5Ikeyxl4S6i4F oIQP5xKs68mAG5Cv9uDp7WO8ZekxdibTLtNHTeKIlQYxqVlaO2DnCs7+D4I0j1pNHrcN NQZw== 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=sqL3OwVvdpmSIOEHs2mQwzoUjW82238re+qlHC3sH00=; fh=0Kn3fvtcnx6vVXAlmep6T/Q5RzgM4nGjbgzeaq8HuW4=; b=KJTebjb5Twzr1p2TyHwP4m0hNMtCUW3cqODe/HvaYLwrREuNa8uyRuYeWbHU+e6WZ1 hh2/nXA7sLkBQBWYPW50GJvqCnmGB8XvRsdK7YVHn2G6IYYMeFC4isCCQh+UvfcB4AXx JPCc7qzLRDeykNlVlynhx7HilYAulvFTOYIg5F7MvJce0wLt4quI13V3IIKRGZcFHVJH e4wEaMXlfpTb7pQN9NPPbyHCq5GPnP3zjwiV9dzy+5SY5ziEzbunivZNRA8HFGEXTEBG fg/uE++/p2azhGrAtoBPr42cHQgHh6af//2NuxYaN5s04VQEzUdHEKB3QG8qRXUW1ne/ ys7Q== 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 u11-20020a6540cb000000b0056532a14f54si1680626pgp.900.2023.10.05.13.58.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 13:58:00 -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 C802D8083B00; Thu, 5 Oct 2023 13:56:40 -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 S231795AbjJEU4S (ORCPT + 18 others); Thu, 5 Oct 2023 16:56:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46916 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230480AbjJEU4K (ORCPT ); Thu, 5 Oct 2023 16:56:10 -0400 Received: from hosting.gsystem.sk (hosting.gsystem.sk [212.5.213.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id ED619B6; Thu, 5 Oct 2023 13:56:07 -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 DE9977A062F; Thu, 5 Oct 2023 22:56:06 +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 22:55:58 +0200 Message-Id: <20231005205559.6504-4-linux@zary.sk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20231005205559.6504-1-linux@zary.sk> References: <20231005205559.6504-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]); Thu, 05 Oct 2023 13:56:40 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778950582633216316 X-GMAIL-MSGID: 1778950582633216316 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 | 68 ++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-) diff --git a/drivers/ata/pata_parport/pata_parport.c b/drivers/ata/pata_parport/pata_parport.c index cf87bbb52f1f..a7adfdcb5e27 100644 --- a/drivers/ata/pata_parport/pata_parport.c +++ b/drivers/ata/pata_parport/pata_parport.c @@ -80,6 +80,72 @@ 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 +160,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,