From patchwork Thu Oct 5 19:24:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ondrej Zary X-Patchwork-Id: 149002 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2016:b0:403:3b70:6f57 with SMTP id fe22csp518387vqb; Thu, 5 Oct 2023 12:25:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IELuNSoSiDywXV6RxouPhyJKbRTJolQ7YhxWinxixlh0Q230JHcViciMoTMz2VOlfaN50Sy X-Received: by 2002:a17:902:da83:b0:1c6:e1d:8be0 with SMTP id j3-20020a170902da8300b001c60e1d8be0mr6184686plx.2.1696533901756; Thu, 05 Oct 2023 12:25:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696533901; cv=none; d=google.com; s=arc-20160816; b=rvcFo0V/wP63lbaBHqdgjFO0vV/gPHBgqeJh2Y5aVsoDvy4+l1VKaLj2lTW8YT3B7r jA6e8UdQ+5XIbORhuAfe7OHKo5nCydOk0c1stMFWXaP2snZvJckdZXuDVTo631m7I1GK 8OpKwCRVU5/4xesGBEeqaf75rNr652uavJA4q3gSgzNoYJhCZzYHvDWQeaw2Q0VifZKF 92gjOj2R9lUlbt4AfB7yBpQhPuX0lBHTgeeXvY21G/hAvKYxgCjVr0OF3oIAPcq2yZAx y6CwCtOYKIFXzjonsdOtjrDKkeCFaBJmOtQBBelnorfvWKurnek8Ar6KMO+Tq2bkqX7m Gpsw== 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=Eh6I++W8dr2E/fFHjBPO19b3/O+RIh9dC9Qrk5i3ZhM=; fh=0Kn3fvtcnx6vVXAlmep6T/Q5RzgM4nGjbgzeaq8HuW4=; b=AH6sqjxlbPCWSo2b87jaq9YyAUTQtn7xoJ99Li35YTNqAuaeXnaAkwr9t2LMFgAFTf xx73ciOBKqxwmvFESDCEVIBxwg4v7MZH/OwUYiguaAvWRyFoCvtBqZl4u+77CpB/hUn6 VhRUjlI4AfJrJizDUlRRWhjyig2hl3/No17m+rRUhIUpOAwLASHRuxzgn48YXQxWd3NI 60yK/ofWXsCVkF8ZGh2Fh7n6bnjQHj/znGFzQLWameD3H45mUd30FzCZqv23LkhjdMS9 Iyg7xDQkRRBhVdwM485nCO4Rf4319RixPSTHdDa0COKD4VzMnDz9MQ/YbbjGUv2FusJn kDOw== 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 kz7-20020a170902f9c700b001b89fd6bec4si1972314plb.144.2023.10.05.12.25.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 12:25:01 -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 F08B082E750B; Thu, 5 Oct 2023 12:25:00 -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 S231268AbjJETY6 (ORCPT + 18 others); Thu, 5 Oct 2023 15:24:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231224AbjJETY4 (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 2D08AE5; 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 BA0347A0319; Thu, 5 Oct 2023 21:24:47 +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: Thu, 5 Oct 2023 21:24:37 +0200 Message-Id: <20231005192440.4047-2-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:01 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778944732309723275 X-GMAIL-MSGID: 1778944732309723275 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)") Cc: stable@vger.kernel.org Signed-off-by: Ondrej Zary Reviewed-by: Sergey Shtylyov --- 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 Thu Oct 5 19:24:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ondrej Zary X-Patchwork-Id: 149003 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2016:b0:403:3b70:6f57 with SMTP id fe22csp518435vqb; Thu, 5 Oct 2023 12:25:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG/gPDu7GsfTT6D/oBl8jeHytzMxKm/OHz4aSjDrascIo8fXb4SUOGX53wLfgyHB8DptE4N X-Received: by 2002:a05:6a00:1143:b0:68b:e29c:b69 with SMTP id b3-20020a056a00114300b0068be29c0b69mr5231635pfm.9.1696533906895; Thu, 05 Oct 2023 12:25:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696533906; cv=none; d=google.com; s=arc-20160816; b=W3fkJCTwDRYmdVn6O3byJDttw3MTwJl2lOdwWcNRMGmGRq+hY0BIMUAeo6xfPQgavE uV587pNbk+t5MoL6TTjUNwE3rs/OSyD/eJrLOycsfOzh7KDpsOmznTqiH9ai2ewlliDB T26aYDygBHrzszCwDsweI73Vhwr1Lktmz2LjxN1v9G/41zOAFZlFYlIZIDWUBbyU7Vzf d2DvuKodss4CvbwieGOys683lAnkUsj6jUe2Fvn9KqXfXunn9X1D0yeBjysWIik2myve Tu9QpVZ9p78/nG4X3V11+i1Wk5WDZnxjDt6GSoOr/3rscoq7QsUceiIOyPCRf5mb7itf fW8w== 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=grUvpBwYDT8m4Aw6ftqD5vHCRUwZ5ebMRcgc8wGnAns=; fh=0Kn3fvtcnx6vVXAlmep6T/Q5RzgM4nGjbgzeaq8HuW4=; b=r7Nnk39PkRBiD1k7NrbU0I7svlzEUP9woxNU5wDMDANLQtH1anFXMV5PyiVAruHWsz aBQYjYuD9SKErXOnzcB7kj1FpLf6yJkJSAByVvqn624kuIqdVSw4S4PyrytZfgVMm/BP kLHlEYuFJ/weHiY+xk5RPZIVZ3/FNKfy6yx5Jdc8Ck5bXcJ/RbKZMTpuogmEv/owawWe 0pu1MbY/I9NyKbACO/N9PcKfjY6ozAMu9MNox2lonhnzzbHVDHPgoWrXz5v+qAPZ967x qPc0vuuK3foWi7c2Y4+usfp+t1fnArQgbqCALn/2QNdaRwXvWLmyubIUM5bwivJ2lOub hy0Q== 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 t20-20020a639554000000b00564bdf6958fsi2017315pgn.649.2023.10.05.12.25.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 12:25:06 -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 5271D82F9275; Thu, 5 Oct 2023 12:25:06 -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 S231439AbjJETZA (ORCPT + 18 others); Thu, 5 Oct 2023 15:25:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33850 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231219AbjJETY4 (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 2BAFDDB; 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 CE82C7A0430; Thu, 5 Oct 2023 21:24:47 +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: Thu, 5 Oct 2023 21:24:38 +0200 Message-Id: <20231005192440.4047-3-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:06 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778944737509272963 X-GMAIL-MSGID: 1778944737509272963 Add missing ops->sff_set_devctl implementation. Fixes: 246a1c4c6b7f ("ata: pata_parport: add driver (PARIDE replacement)") Cc: stable@vger.kernel.org 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 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, From patchwork Thu Oct 5 19:24:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ondrej Zary X-Patchwork-Id: 149005 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2016:b0:403:3b70:6f57 with SMTP id fe22csp518487vqb; Thu, 5 Oct 2023 12:25:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFZdoFa9Jg4Da/mHGVXaJfAv+O1iYwdVGT2CWc/X+QYcuh0W+WrHaQV0R+i3dgpeuM+Z4TX X-Received: by 2002:a05:6a00:179a:b0:68e:4587:3da8 with SMTP id s26-20020a056a00179a00b0068e45873da8mr7571989pfg.21.1696533912359; Thu, 05 Oct 2023 12:25:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696533912; cv=none; d=google.com; s=arc-20160816; b=jlL/zr3U+zlBxoXe71IiA0ikVOtqwhYUwv9ai8P3YkVuCPSrhxZ2keHvPFzf920Q7u r5JnfxkKcfn+PiKpH562wOZWRqHERFRj80I2JZNg0M0rLJvJq6stOtmoUIPaIuyy8iIS yv0ExizhAmxjVC7RhqFthLpQCWXfkhMXn2fcp7NAhHEoWA4qe0dzALtvrigFwBRMyh8c C+fjFdMeJ8nILuS+jMI1kRuDki2gfDzMLIL3ItcqM3T+9lKQ4NFlBAwbhIobq+iGJlWj 9jh0LtNGaLemY5bu63PQuSa/mqEVTQtQ9V2l3hHmvRZh7EZ568Xz/drVlQGgckLdr0P6 AkSA== 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=+SJ+sDzE2h3C6HNLv4oyIZVFwOdhXgOsifYvtwSslCk=; fh=0Kn3fvtcnx6vVXAlmep6T/Q5RzgM4nGjbgzeaq8HuW4=; b=GLASbEgCQFbINwgjbv+L7Pq3mDjnC4C9DRwdw2LPAllEUASWEiF0xubAoG60CjqA2N 6vLI4/jTvK85gL4H0kXOXsXXn939JPDjSm7JjIdK+s/Qxrk765FHREm8H1GcJyzJF04V qxUhoBOu01iCljQxp0Of4ueb8PvaJcTRISc5FmSEtqN9+k4mo6xxur/ipgaH/tG7k8ws EGDnq9ou+MFSYfOD9NvweGiqbesiu0dcu+vf5+ki0d6Fv7aO4zo/NbOFR5OjJiBIrJYK W9Z2GQU53OiU2hawFON1+3nYvsNaKZ3B7Bz5Q3yR3v6hw/v4+McD3SlZopn8+iirhpQg dWIg== 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 fd11-20020a056a002e8b00b0068fef323e54si2129374pfb.296.2023.10.05.12.25.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 12:25:12 -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 6BE61835D836; Thu, 5 Oct 2023 12:25:11 -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 S231614AbjJETZI (ORCPT + 18 others); Thu, 5 Oct 2023 15:25:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231272AbjJETY4 (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 2CD68DE; 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 2D0C87A072E; 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 4/4] ata: pata_parport: fit3: implement IDE command set registers Date: Thu, 5 Oct 2023 21:24:40 +0200 Message-Id: <20231005192440.4047-5-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:11 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778944743571802995 X-GMAIL-MSGID: 1778944743571802995 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 Reviewed-by: Sergey Shtylyov --- drivers/ata/pata_parport/fit3.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/drivers/ata/pata_parport/fit3.c b/drivers/ata/pata_parport/fit3.c index bad7aa920cdc..d2b81cf2e16d 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 @@ -37,8 +32,7 @@ static void fit3_write_regr(struct pi_adapter *pi, int cont, int regr, int val) { - if (cont == 1) - return; + regr += cont << 3; switch (pi->mode) { case 0: @@ -59,11 +53,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 << 3; switch (pi->mode) { case 0: