From patchwork Wed Oct 4 18:52:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ondrej Zary X-Patchwork-Id: 148467 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:254a:b0:403:3b70:6f57 with SMTP id hf10csp338825vqb; Wed, 4 Oct 2023 11:53:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHVdhkJzSalXtGhqR0QLzsRe707hMF5ZEv4HAAsGmq2awhpDmaDKD5Dd1iJaFd6k2uduPdX X-Received: by 2002:a05:6e02:12e3:b0:350:f442:9a4d with SMTP id l3-20020a056e0212e300b00350f4429a4dmr3547866iln.28.1696445610403; Wed, 04 Oct 2023 11:53:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696445610; cv=none; d=google.com; s=arc-20160816; b=P8jhD6r2mZn0AwgNTyJ/ulsjSvI2X8GhfwpZXLvZcexiXj9zpcMFYkWA/7/i/E8LfD mME8DGxTbNVbwFiYD0WFKoyds3G0JPpD0LOtJRVDVZY85Gbx1GZGyGYTRM+jN45fRClj X12m1RXlpg3iOQctbzhtYQJ6kVkbB0tRKWtNkhZ3hagszz8A256eTqKmTYMCqF8igaeH XtmGZi5R4RORYEuekv5zwXVZU+5BuOjfxm0IhCIJb+16dHJT9Ajaa8lp8XZdteSwqeI8 oIm5/H8ZJ6WjyNf6C/HLY+cSiUw+bccqBRqeVU0REt5EP/1xZAm4RQcrHTDAEtPTtexb 8WIQ== 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=ya1DQzsTCRPItoC1SxpEqyu8g285dVwNlEbYUYINxCo=; fh=0Kn3fvtcnx6vVXAlmep6T/Q5RzgM4nGjbgzeaq8HuW4=; b=BoS90dgGdiXEcJwcIVP07PKgPplIcm2le5uEEU9KG2q2gi4XbXyqeYX6x8odWBoUKS IZVzr7mbLeQ8ki6miV6bVjWMj6g1UTAmFAZGdZbvYycrabf8gyR4h95Imft0rhqTNy+X Su/+4HoFrFvgYwOpdPMShyPL6z3XwBc1q39Y4ScyI2qzJyhZni1MXn9JEYtmPb4BePBN +FdL4dGdfiCvO2LJyHOKtKu6XOwTZpKSC2cEzNh0uRVZrdtFNZ/tKIPIcbwVO+PdSaHF igNvsgagS1ryeek4hXvs80eY7UYZFIRHZkXmrXEGcPg8M9VqULyUTimuJPJobNjnqm/1 OOcQ== 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 b19-20020a6567d3000000b0056a1a149034si4420439pgs.650.2023.10.04.11.53.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 11:53:30 -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 9247F81352A0; Wed, 4 Oct 2023 11:53:29 -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 S244635AbjJDSxT (ORCPT + 19 others); Wed, 4 Oct 2023 14:53:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244503AbjJDSxM (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 369C1EE; 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 657617A062F; 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 1/4] ata: pata_parport: fix pata_parport_devchk Date: Wed, 4 Oct 2023 20:52:32 +0200 Message-Id: <20231004185235.27417-2-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:29 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778852152024373544 X-GMAIL-MSGID: 1778852152024373544 There's a 'x' missing in 0x55 in pata_parport_devchk(), causing the detection to always fail. Fix it. Fixes: 246a1c4c6b7f ("ata: pata_parport: add driver (PARIDE replacement)") 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 Wed Oct 4 18:52:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ondrej Zary X-Patchwork-Id: 148468 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:254a:b0:403:3b70:6f57 with SMTP id hf10csp338857vqb; Wed, 4 Oct 2023 11:53:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHLguDXo2ElPpk8Ubm3u0UCNuP2hZgjvj/Jyb0IKgqCeVmuZ4sgzsO/eSQHAmLjv3QWpxJF X-Received: by 2002:a05:6a20:7d98:b0:161:28e0:9abf with SMTP id v24-20020a056a207d9800b0016128e09abfmr3533084pzj.19.1696445614286; Wed, 04 Oct 2023 11:53:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696445614; cv=none; d=google.com; s=arc-20160816; b=rpazgSdMsA3SDXbY0VlbvVqcE2OOok8BIzE8go8VADKykMKaLI89aZJQiQviSi2kJB +rJrqOLdGCWSUP0HNfsaXMHBMZpuKmHAUxvZ3D6kTJi2XcxpgGnzjjzhN6SLJAvAGeGN CozT7nmcxIuEwNnPv8ex2rCSQdLj788BPqD5wUF15wpRcSlfRKrJnpayius8evsd8GXr WfGPdZM1i9aLW7i7pDohh4D/Oxxj4cEbZc+yAjzRiNH0R3wpwO9GsmxVq47dwd/T8hUJ tXQys9J8etpluG+/LYZ/HIRBj1mKprZzQdS3dcup7uo5PiiCzlFzfgiC0CrNzeCVM4D+ 1bbg== 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=4lqZ8PHjbkjq1dLhJLmf4HFUK26YsM51zmaiDBjQJHY=; fh=0Kn3fvtcnx6vVXAlmep6T/Q5RzgM4nGjbgzeaq8HuW4=; b=zTWX6LU+x0OE1t4IOc1LT0y1cLy4gaVGhuieR2mIlxJelbxODAYsYlF7YT9qWI9deK qgG36EihNrLWj3C0Re2IBWxj21xGGjOm6UhtHSdfCpnE07DAuo7uEB7o4W0vgWWaJViO mpCqILTUlXCQFqGQCLlBPIUq3mFBZdSi9OcJ1Q3AzKNFrdikYjhXUrd0Ysif9YAH8Sgh wEoKKT9F+EHp8ZUyh3OThh1+xv4DlZw2EJgSsSIn9yZ2JJ+Lv00wOjk6tqL9LYNM3mYP A5WhLLXUTgbI7GBn+vE8kqmk8XNbAe8rzgZJYrrhJd+bKywG9rb/BZv9W/RM1eMzAoyO qqCQ== 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 p10-20020a056a000a0a00b0068feb1cf986si4474353pfh.241.2023.10.04.11.53.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 11:53:34 -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 8BF5B81A3349; Wed, 4 Oct 2023 11:53:33 -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 S244501AbjJDSxX (ORCPT + 19 others); Wed, 4 Oct 2023 14:53:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46872 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244502AbjJDSxM (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 360EEEC; 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 76F507A0648; 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 2/4] ata: pata_parport: implement set_devctl Date: Wed, 4 Oct 2023 20:52:33 +0200 Message-Id: <20231004185235.27417-3-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:33 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778852156623711233 X-GMAIL-MSGID: 1778852156623711233 Add missing ops->sff_set_devctl implementation. Fixes: 246a1c4c6b7f ("ata: pata_parport: add driver (PARIDE replacement)") Reviewed-by: Sergey Shtylyov Signed-off-by: Ondrej Zary --- 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 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, From patchwork Wed Oct 4 18:52:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ondrej Zary X-Patchwork-Id: 148466 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:254a:b0:403:3b70:6f57 with SMTP id hf10csp338776vqb; Wed, 4 Oct 2023 11:53:23 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG2Bf6lYNXlkpGTUU03BjusrCr5wNmML8QgX+l6UvjcP71QZ4LABPbJ26Nfpb/2y1X2pc8P X-Received: by 2002:a17:90a:6be6:b0:277:66be:f3ad with SMTP id w93-20020a17090a6be600b0027766bef3admr673445pjj.11.1696445603492; Wed, 04 Oct 2023 11:53:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696445603; cv=none; d=google.com; s=arc-20160816; b=tfPDvkp6a9GVlVnkjxoWsUSUsWeY7l35QYbL/VxdzmwwiLX6y4jJaXuIw2X0t47Wle 3kzDEHI4a/Lke/XMaPLGNx/w+ohcjxuQGkcSvaxO4iLFxe9dK1e2mPnILFfbWlN6GPOl Vc4F5oFIZv1fBh7F81Oqh9ZXpUl6k5TE7akK9182TCQ5krOeQKnG3J1z6iV+oO40s5C4 ZzqMvyq3vXs1BngUKAho034ZqNSivv7eAFhLrDUiXnEGtcXRpg/t40Ty88vTduMYx0Os jBfe9QDX9J9xdZzBOBYmbKyXZvCsczkBgZtH6B+LbzYmCR4KC4vRB7p4zBrbc8373YPj T1jA== 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=0Kn3fvtcnx6vVXAlmep6T/Q5RzgM4nGjbgzeaq8HuW4=; b=CH5zoXXnD5V5QENSOO2dxC8q43WVKW+JjkG0rn1PCFc/OJTcvEOPzdNSfTE+gs/SdT H8fsqX+IzNu4TJiCGTAS7t0nvFQQHEgKesOHOWN0zR/xYKOHcACLma7W3/xeh+Cyzd05 RyNHeaeczzHCsMllcgRS7mS6iYOz7ch+w+Ur2htyk+CBQEXy9aMfuFIcaTzuT/ZRawWx iobfmuJsOw7H6yz+6YtDB+wA4W2M93YcpI0mSB2PJAoh3cPO4wmxmp1OSQ94ML6WnE+5 YTrPRcCJjC4PeS1gQek5owQStF0Qcjs47ueHjSA+Uvm1C/sHh50sS+KwPzPqvUZM0rY2 I0kA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id ga15-20020a17090b038f00b00279020d1fb0si1938589pjb.129.2023.10.04.11.53.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 11:53:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (Postfix) with ESMTP id C569C83B6BE8; Wed, 4 Oct 2023 11:53:22 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244504AbjJDSxQ (ORCPT + 19 others); Wed, 4 Oct 2023 14:53:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46896 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244550AbjJDSxM (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 27FF5EB; 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 BCC0B7A073C; 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 4/4] ata: pata_parport: fit3: implement IDE command set registers Date: Wed, 4 Oct 2023 20:52:35 +0200 Message-Id: <20231004185235.27417-5-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 (howler.vger.email [0.0.0.0]); Wed, 04 Oct 2023 11:53:22 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778852145417710272 X-GMAIL-MSGID: 1778852145417710272 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: