From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tejun Heo Subject: [PATCH] libata: fallback to the other IDENTIFY on device error Date: Mon, 07 May 2007 18:42:26 +0200 Message-ID: <463F56F2.3010106@gmail.com> References: <20070427175205.GD7809@electro-mechanical.com> <4635C35D.1020807@gmail.com> <20070430202107.GF5942@electro-mechanical.com> <4636C2C7.8090206@gmail.com> <20070501121703.GH5942@electro-mechanical.com> <46373AEE.6070908@rtr.ca> <20070501131818.GA18521@electro-mechanical.com> <46374354.7040307@gmail.com> <20070501172117.GA20328@electro-mechanical.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: Received: from py-out-1112.google.com ([64.233.166.183]:60579 "EHLO py-out-1112.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965839AbXEGQmi (ORCPT ); Mon, 7 May 2007 12:42:38 -0400 Received: by py-out-1112.google.com with SMTP id a29so1239976pyi for ; Mon, 07 May 2007 09:42:37 -0700 (PDT) In-Reply-To: <20070501172117.GA20328@electro-mechanical.com> Sender: linux-ide-owner@vger.kernel.org List-Id: linux-ide@vger.kernel.org To: William Thompson , Jeff Garzik Cc: Mark Lord , linux-kernel@vger.kernel.org, IDE/ATA development list , albertcc@tw.ibm.com It seems the world isn't as frank as we thought and some devices lie about who they are. Fallback to the other IDENTIFY if IDENTIFY fails with device error. As this is the strategy used by IDE for a long time, it shouldn't cause too much problem. Signed-off-by: Tejun Heo Cc: William Thompson --- Willam, please verify this fixes your problem. Jeff, after all, we seem to need this. :-( diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index ca67484..f543109 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -1652,7 +1652,7 @@ int ata_dev_read_id(struct ata_device *d struct ata_taskfile tf; unsigned int err_mask = 0; const char *reason; - int tried_spinup = 0; + int may_fallback = 1, tried_spinup = 0; int rc; if (ata_msg_ctl(ap)) @@ -1696,11 +1696,30 @@ int ata_dev_read_id(struct ata_device *d return -ENOENT; } + if (may_fallback && (err_mask == AC_ERR_DEV)) { + may_fallback = 0; + + /* Device or controller might have reported + * the wrong device class. Give a shot at then + * other IDENTIFY + */ + if (class == ATA_DEV_ATA) + class = ATA_DEV_ATAPI; + else + class = ATA_DEV_ATA; + goto retry; + } + rc = -EIO; reason = "I/O error"; goto err_out; } + /* Falling back doesn't make sense if ID data was read + * successfully at least once. + */ + may_fallback = 0; + swap_buf_le16(id, ATA_ID_WORDS); /* sanity check */