This patch vs 2.6.19, based on the not-actually-working-for-me
code lurking in libata-dev.git#promise-sata-pata, makes the PATA
ports on my promise sata card actually work. Since the plan as
checked into git, is to drive the PATA ports as if they were
SATA, we have to teach sata_scr_read() to lie for the PATA ports
which don't to that, lest the various places that call
ata_port_offline() and ata_port_online() should fail and leave
the ports offline and inaccessible.
This patch gets both SATA and PATA working for me with the
sata_promise driver on a PDC20375. Performace seems to be about
what I would expect, so this (or something very much like it)
should be applied upstream.
Signed-off-by: Erik Andersen <[email protected]>
-Erik
--
Erik B. Andersen http://codepoet-consulting.com/
--This message was written using 73% post-consumer electrons--
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 915a55a..d0ab733 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -5298,13 +5298,13 @@ void ata_port_init(struct ata_port *ap,
ap->pio_mask = ent->pinfo2->pio_mask;
ap->mwdma_mask = ent->pinfo2->mwdma_mask;
ap->udma_mask = ent->pinfo2->udma_mask;
- ap->flags |= ent->pinfo2->flags;
+ ap->flags |= ent->pinfo2->flags | ent->_port_flags[port_no];
ap->ops = ent->pinfo2->port_ops;
} else {
ap->pio_mask = ent->pio_mask;
ap->mwdma_mask = ent->mwdma_mask;
ap->udma_mask = ent->udma_mask;
- ap->flags |= ent->port_flags;
+ ap->flags |= ent->port_flags | ent->_port_flags[port_no];
ap->ops = ent->port_ops;
}
ap->hw_sata_spd_limit = UINT_MAX;
diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c
index 72eda51..543e6a4 100644
--- a/drivers/ata/sata_promise.c
+++ b/drivers/ata/sata_promise.c
@@ -175,7 +175,7 @@ static const struct ata_port_info pdc_po
/* board_2037x */
{
.sht = &pdc_ata_sht,
- .flags = PDC_COMMON_FLAGS | ATA_FLAG_SATA,
+ .flags = PDC_COMMON_FLAGS,
.pio_mask = 0x1f, /* pio0-4 */
.mwdma_mask = 0x07, /* mwdma0-2 */
.udma_mask = 0x7f, /* udma0-6 ; FIXME */
@@ -355,23 +355,27 @@ static void pdc_reset_port(struct ata_po
static void pdc_sata_phy_reset(struct ata_port *ap)
{
pdc_reset_port(ap);
- sata_phy_reset(ap);
+ if (ap->flags & ATA_FLAG_SATA)
+ sata_phy_reset(ap);
+ else
+ pdc_pata_phy_reset(ap);
}
static void pdc_pata_cbl_detect(struct ata_port *ap)
{
u8 tmp;
- void __iomem *mmio = (void __iomem *) ap->ioaddr.cmd_addr + PDC_CTLSTAT + 0x03;
+ void __iomem *mmio =
+ (void __iomem *) ap->ioaddr.cmd_addr + PDC_CTLSTAT + 0x03;
tmp = readb(mmio);
-
+
if (tmp & 0x01) {
ap->cbl = ATA_CBL_PATA40;
ap->udma_mask &= ATA_UDMA_MASK_40C;
} else
ap->cbl = ATA_CBL_PATA80;
}
-
+
static void pdc_pata_phy_reset(struct ata_port *ap)
{
pdc_pata_cbl_detect(ap);
@@ -384,6 +388,20 @@ static u32 pdc_sata_scr_read (struct ata
{
if (sc_reg > SCR_CONTROL)
return 0xffffffffU;
+ if (ap->flags & ATA_FLAG_SLAVE_POSS)
+ {
+ switch (sc_reg) {
+ case SCR_STATUS:
+ return 0x113;
+ case SCR_CONTROL:
+ return 0x300;
+ case SCR_ERROR:
+ case SCR_ACTIVE:
+ default:
+ return 0xffffffffU;
+ }
+ }
+
return readl((void __iomem *) ap->ioaddr.scr_addr + (sc_reg * 4));
}
@@ -391,7 +409,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->flags & ATA_FLAG_SLAVE_POSS))
return;
writel(val, (void __iomem *) ap->ioaddr.scr_addr + (sc_reg * 4));
}
@@ -679,6 +697,7 @@ static int pdc_ata_init_one (struct pci_
unsigned int board_idx = (unsigned int) ent->driver_data;
int pci_dev_busy = 0;
int rc;
+ u8 tmp;
if (!printed_version++)
dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
@@ -743,6 +762,9 @@ static int pdc_ata_init_one (struct pci_
probe_ent->port[0].scr_addr = base + 0x400;
probe_ent->port[1].scr_addr = base + 0x500;
+ probe_ent->_port_flags[0] = ATA_FLAG_SATA;
+ probe_ent->_port_flags[1] = ATA_FLAG_SATA;
+
/* notice 4-port boards */
switch (board_idx) {
case board_40518:
@@ -757,13 +779,27 @@ static int pdc_ata_init_one (struct pci_
probe_ent->port[2].scr_addr = base + 0x600;
probe_ent->port[3].scr_addr = base + 0x700;
+
+ probe_ent->_port_flags[2] = ATA_FLAG_SATA;
+ probe_ent->_port_flags[3] = ATA_FLAG_SATA;
break;
case board_2057x:
/* Override hotplug offset for SATAII150 */
hp->hotplug_offset = PDC2_SATA_PLUG_CSR;
/* Fall through */
case board_2037x:
+ /* Some boards have also PATA port */
probe_ent->n_ports = 2;
+ probe_ent->_port_flags[0] = ATA_FLAG_SATA;
+ probe_ent->_port_flags[1] = ATA_FLAG_SATA;
+ tmp = readb(mmio_base + PDC_FLASH_CTL+1);
+ if (!(tmp & 0x80))
+ {
+ probe_ent->n_ports = 3;
+ pdc_ata_setup_port(&probe_ent->port[2], base + 0x300);
+ probe_ent->_port_flags[2] = ATA_FLAG_SLAVE_POSS;
+ printk(KERN_INFO DRV_NAME " PATA port found\n");
+ }
break;
case board_20771:
probe_ent->n_ports = 2;
diff --git a/include/linux/libata.h b/include/linux/libata.h
index abd2deb..aa8c822 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -377,6 +377,7 @@ struct ata_probe_ent {
unsigned int irq_flags;
unsigned long port_flags;
unsigned long _host_flags;
+ unsigned long _port_flags[ATA_MAX_PORTS];
void __iomem *mmio_base;
void *private_data;
On Mon, 4 Dec 2006 12:47:37 -0700
Erik Andersen <[email protected]> wrote:
> This patch vs 2.6.19, based on the not-actually-working-for-me
> code lurking in libata-dev.git#promise-sata-pata, makes the PATA
> ports on my promise sata card actually work. Since the plan as
Nice, this is pretty much what is needed to polish up the other split
PATA/SATA cases.
Alan wrote:
> On Mon, 4 Dec 2006 12:47:37 -0700
> Erik Andersen <[email protected]> wrote:
>
>> This patch vs 2.6.19, based on the not-actually-working-for-me
>> code lurking in libata-dev.git#promise-sata-pata, makes the PATA
>> ports on my promise sata card actually work. Since the plan as
>
> Nice, this is pretty much what is needed to polish up the other split
> PATA/SATA cases.
Disagree. Internal libata is set up so that you can have different
ata_port::flags and ata_port::ops for each port, which is what enables
proper hardware sharing between SATA and PATA.
Two things need to happen:
1) probe_ent needs to permit a driver to supply multiple flags/ops
pairs, not just one for the whole driver, and pass that through to the
proper data structures during ata_port init.
2) a VERY FEW details like ->irq_clear() are really ata_host level
hooks, but they live in ata_port_operations because there is no
ata_host_operations. Fix these.
Once those issues are fixed, PATA+SATA can be easily support on the
combinations of hardware that have been desperately wanting it:
sata_promise, sata_sis, sata_via (sata_uli too?)
Jeff
On Mon, 4 Dec 2006 12:47:37 -0700, Erik Andersen wrote:
>This patch vs 2.6.19, based on the not-actually-working-for-me
>code lurking in libata-dev.git#promise-sata-pata, makes the PATA
>ports on my promise sata card actually work. Since the plan as
>checked into git, is to drive the PATA ports as if they were
>SATA, we have to teach sata_scr_read() to lie for the PATA ports
>which don't to that, lest the various places that call
>ata_port_offline() and ata_port_online() should fail and leave
>the ports offline and inaccessible.
>
>This patch gets both SATA and PATA working for me with the
>sata_promise driver on a PDC20375. Performace seems to be about
>what I would expect, so this (or something very much like it)
>should be applied upstream.
This description doesn't match my experience.
The patch in #promise-sata-pata should work for 2037x chips.
It doesn't work on 2057x chips because it doesn't remove
ATA_FLAG_SATA from board_2057x. That omission causes libata
to consider all ports on it as SATA, including the PATA port,
and that's why sata_scr_read() etc get invoked.
Applying the patch below on top of #promise-sata-pata fixes
this, and is all I had to do to get working PATA on my 20575.
/Mikael
--- linux-2.6.19/drivers/ata/sata_promise.c.~1~ 2006-12-05 20:42:18.000000000 +0100
+++ linux-2.6.19/drivers/ata/sata_promise.c 2006-12-05 21:01:26.000000000 +0100
@@ -213,7 +213,7 @@ static const struct ata_port_info pdc_po
/* board_2057x */
{
.sht = &pdc_ata_sht,
- .flags = PDC_COMMON_FLAGS | ATA_FLAG_SATA,
+ .flags = PDC_COMMON_FLAGS /* | ATA_FLAG_SATA*/,
.pio_mask = 0x1f, /* pio0-4 */
.mwdma_mask = 0x07, /* mwdma0-2 */
.udma_mask = 0x7f, /* udma0-6 ; FIXME */