From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Garzik Subject: Re: [PATCH] sata_promise: fix missing PATA cable detection Date: Thu, 08 Feb 2007 08:50:09 -0500 Message-ID: <45CB2A91.6050208@garzik.org> References: <200702072129.l17LTujt012924@alkaid.it.uu.se> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from srv5.dvmed.net ([207.36.208.214]:45307 "EHLO mail.dvmed.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751947AbXBHNuM (ORCPT ); Thu, 8 Feb 2007 08:50:12 -0500 In-Reply-To: <200702072129.l17LTujt012924@alkaid.it.uu.se> Sender: linux-ide-owner@vger.kernel.org List-Id: linux-ide@vger.kernel.org To: Mikael Pettersson Cc: linux-ide@vger.kernel.org Mikael Pettersson wrote: > This patch fixes an oversight which caused sata_promise to > not perform cable detection on the TX2plus chips' PATA ports. > > Signed-off-by: Mikael Pettersson > > --- > > This patch adds yet another is-PATA-or-SATA? check, but it's in a > cold path so shouldn't matter much. This will be cleaned up if/when > PATA ports and SATA ports start using different ops structures. > > --- linux-2.6.20/drivers/ata/sata_promise.c.~1~ 2007-02-07 20:30:20.000000000 +0100 > +++ linux-2.6.20/drivers/ata/sata_promise.c 2007-02-07 20:57:34.000000000 +0100 > @@ -601,6 +601,13 @@ static void pdc_thaw(struct ata_port *ap > readl(mmio + PDC_CTLSTAT); /* flush */ > } > > +static int pdc_pre_reset(struct ata_port *ap) > +{ > + if (!sata_scr_valid(ap)) > + pdc_pata_cbl_detect(ap); > + return ata_std_prereset(ap); > +} > + Since it was a bug in the original patch, I just dropped it, waiting for you to resend the whole thing. That keeps the git history much more clean. I agree with your comment above -- SATA and PATA ports should use different ops structures Jeff