From patchwork Wed Oct 4 18:52:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ondrej Zary X-Patchwork-Id: 148469 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:254a:b0:403:3b70:6f57 with SMTP id hf10csp338867vqb; Wed, 4 Oct 2023 11:53:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGa/bvhna6AT7vVEz3SvNkw/ro1medAftQP01kqI0OmGrqMnmv47HpB9l0BzUGDCV+NpJfo X-Received: by 2002:a05:6a00:1788:b0:68b:e6e0:5047 with SMTP id s8-20020a056a00178800b0068be6e05047mr4060945pfg.14.1696445615557; Wed, 04 Oct 2023 11:53:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696445615; cv=none; d=google.com; s=arc-20160816; b=OEecrVLN9h/pvYd52lErPSx1I3DUeurgDksg/vm4hRlfSNxXswIGZsDYKzcyXC2M8p GS9Yp01L8QOyXmPqMdevEsj3D9U93xpepwi8JDZPrLtnbtCFSslCzukqZSLgBaKJBf4x Z1rkP4H/oLyIyYX2Osjty3x0rBqJADunU+F1djkT9wiSAB6RSDIZk5bMhnZzGAMFUzyt FfHRdJ2wtHDovPo588VQIC8MUXcaqU/VhA3aa8TIEpc7CqBTb5Vu1qPFzzquKyTwwI7b n7fjrH080+hEwegSekIi2IbkkyvOCS2yDhZd12V+bTD3SIvkLibDWgZ6zagkkpJ3xY96 hTaA== 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=hzqp4AETnQHo+zdcILBDmY/DaRxcbmCgH6FzDF2p+0DPIkf+oqFxyxgop/i/WxmY4m XdTmobnn4JUB4swuYKmM1q0R0X9Hccd/RKnaED3as14tjO6WfTF95r1iyrG0a4oXAQF9 focUutJIZHU2MbOh8knmL4Z9cpGpNAGpXlJT9Oz/6BSmDulIsl85oSP9Vp+47ohFJJ0o zHLkYCvGM8RHlJdpSF2ZUnyOYL3XlNc9l6/gzOMnDH9IyhcS7j7UQptq0/Qu3u/kaQWv qiYgwetf1xYSkoGWmvpAigjHzj+XeZvbscHpuhHNX6u046FoVYWH5KH6tZEK218b94Z7 QEGw== 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 b26-20020a6567da000000b00573f7ef60aesi1967755pgs.154.2023.10.04.11.53.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 11:53:35 -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 E8D598197EB1; Wed, 4 Oct 2023 11:53:34 -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 S244557AbjJDSxa (ORCPT + 19 others); Wed, 4 Oct 2023 14:53:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244549AbjJDSxM (ORCPT ); Wed, 4 Oct 2023 14:53:12 -0400 Received: from hosting.gsystem.sk (hosting.gsystem.sk [212.5.213.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 1260DCE; Wed, 4 Oct 2023 11:52:46 -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 997887A0739; Wed, 4 Oct 2023 20:52:45 +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: Wed, 4 Oct 2023 20:52:34 +0200 Message-Id: <20231004185235.27417-4-linux@zary.sk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20231004185235.27417-1-linux@zary.sk> References: <20231004185235.27417-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]); Wed, 04 Oct 2023 11:53:34 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778852157816488574 X-GMAIL-MSGID: 1778852157816488574 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 | 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,