From: Jeff Garzik <jeff@garzik.org>
To: Mikael Pettersson <mikpe@it.uu.se>
Cc: linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2.6.20-rc4 1/2] sata_promise: TX2plus PATA support
Date: Tue, 09 Jan 2007 05:16:08 -0500 [thread overview]
Message-ID: <45A36B68.1080204@garzik.org> (raw)
In-Reply-To: <200701090950.l099oRPU011573@harpo.it.uu.se>
Mikael Pettersson wrote:
> @@ -271,6 +272,11 @@ static int pdc_port_start(struct ata_por
> struct pdc_port_priv *pp;
> int rc;
>
> + /* fix up port flags and cable type for SATA+PATA chips */
> + ap->flags |= hp->port_flags[ap->port_no];
> + if (ap->flags & ATA_FLAG_SATA)
> + ap->cbl = ATA_CBL_SATA;
> +
> rc = ata_port_start(ap);
> if (rc)
> return rc;
> @@ -377,7 +383,7 @@ static void pdc_pata_phy_reset(struct at
>
> static u32 pdc_sata_scr_read (struct ata_port *ap, unsigned int sc_reg)
> {
> - if (sc_reg > SCR_CONTROL)
> + if (sc_reg > SCR_CONTROL || ap->cbl != ATA_CBL_SATA)
> return 0xffffffffU;
> return readl((void __iomem *) ap->ioaddr.scr_addr + (sc_reg * 4));
> }
> @@ -386,7 +392,7 @@ static u32 pdc_sata_scr_read (struct ata
> static void pdc_sata_scr_write (struct ata_port *ap, unsigned int sc_reg,
> u32 val)
> {
> - if (sc_reg > SCR_CONTROL)
> + if (sc_reg > SCR_CONTROL || ap->cbl != ATA_CBL_SATA)
> return;
> writel(val, (void __iomem *) ap->ioaddr.scr_addr + (sc_reg * 4));
> }
It would be nice to see a [tested] follow-up patch that separates SATA
and PATA into two separate sets of ata_port_operations hooks. That
should eliminate these 'ap->cbl' tests, and some other tests.
You should be able to set ap->ops in the same manner as you are setting
the flags now.
Jeff
prev parent reply other threads:[~2007-01-09 10:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-09 9:50 [PATCH 2.6.20-rc4 1/2] sata_promise: TX2plus PATA support Mikael Pettersson
2007-01-09 10:12 ` Jeff Garzik
2007-01-09 10:16 ` Jeff Garzik [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=45A36B68.1080204@garzik.org \
--to=jeff@garzik.org \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mikpe@it.uu.se \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).