| Message ID | 1308307158-1796-1-git-send-email-yuanlmm@gmail.com |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
Hello. On 17-06-2011 14:39, Yuan-Hsin Chen wrote: > From: Yuan-Hsin Chen<yhchen@faraday-tech.com> > ahci_sb600_softreset was in ahci.c. This function is used > to fix soft reset failure and renames as ahci_pmp_softreset > in libahci.c. > Signed-off-by: Yuan-Hsin Chen<yhchen@faraday-tech.com> > --- > v3: > Move ahci_sb600_softreset to libahci.c and rename it. > Add ahci_pmp_ops to libahci.c > Add following stuff in your platform dependent code to use ahci_pmp_ops > #include <linux/ahci_platform.h> > #include<../../../drivers/ata/ahci.h> > > static struct ata_port_info ftsata100_pi = > .flags = AHCI_FLAG_COMMON, > .pio_mask = ATA_PIO4, > .udma_mask = ATA_UDMA6, > .port_ops = &ahci_pmp_ops, > }; > > static struct ahci_platform_data ftsata100_pdata = { > .ata_port_info =&ftsata100_pi, > }; > > static struct platform_device ftsata100_device = { > ... > .dev = { > ... > .platform_data =&ftsata100_pdata, > }, > }; > drivers/ata/ahci.c | 55 +-------------------------------------------- > drivers/ata/ahci.h | 1 + > drivers/ata/libahci.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 62 insertions(+), 53 deletions(-) > diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c > index 71afe03..c67f621 100644 > --- a/drivers/ata/ahci.c > +++ b/drivers/ata/ahci.c [...] > @@ -106,8 +104,8 @@ static struct ata_port_operations ahci_p5wdh_ops = { > > static struct ata_port_operations ahci_sb600_ops = { > .inherits =&ahci_ops, > - .softreset = ahci_sb600_softreset, > - .pmp_softreset = ahci_sb600_softreset, > + .softreset = ahci_pmp_softreset, > + .pmp_softreset = ahci_pmp_softreset, > }; > > #define AHCI_HFLAGS(flags) .private_data = (void *)(flags) [...] > diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c > index d38c40f..c4cbee9 100644 > --- a/drivers/ata/libahci.c > +++ b/drivers/ata/libahci.c > @@ -82,6 +82,8 @@ static void ahci_pmp_attach(struct ata_port *ap); > static void ahci_pmp_detach(struct ata_port *ap); > static int ahci_softreset(struct ata_link *link, unsigned int *class, > unsigned long deadline); > +static int ahci_pmp_softreset(struct ata_link *link, unsigned int *class, > + unsigned long deadline); How come it's 'static' when you use it in ahci.c? > static int ahci_hardreset(struct ata_link *link, unsigned int *class, > unsigned long deadline); > static void ahci_postreset(struct ata_link *link, unsigned int *class); [...] > @@ -1329,6 +1338,56 @@ static int ahci_softreset(struct ata_link *link, unsigned int *class, > } > EXPORT_SYMBOL_GPL(ahci_do_softreset); > > +static int ahci_pmp_check_ready(struct ata_link *link) > +{ > + void __iomem *port_mmio = ahci_port_base(link->ap); > + u8 status = readl(port_mmio + PORT_TFDATA)& 0xFF; > + u32 irq_status = readl(port_mmio + PORT_IRQ_STAT); > + > + /* > + * There is no need to check TFDATA if BAD PMP is found due to HW bug, > + * which can save timeout delay. > + */ > + if (irq_status& PORT_IRQ_BAD_PMP) > + return -EIO; > + > + printk("%s:TFT 0x%x\n", __func__, status); printk() should have a logging facility. Here you should have probably used pr_debug()... WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hello, Yuan-Hsin. Yeap, we're getting almost there. :) On Fri, Jun 17, 2011 at 06:39:18PM +0800, Yuan-Hsin Chen wrote: > diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h > index 12c5282..e20f8d7 100644 > --- a/drivers/ata/ahci.h > +++ b/drivers/ata/ahci.h > @@ -312,6 +312,7 @@ extern struct device_attribute *ahci_sdev_attrs[]; > .sdev_attrs = ahci_sdev_attrs > > extern struct ata_port_operations ahci_ops; > +extern struct ata_port_operations ahci_pmp_ops; But I don't like ahci_pmp_ops name. ahci_ops works just fine for pmp. It's a workaround ops. Maybe something like ahci_pmp_retry_srst_ops? > +static int ahci_pmp_softreset(struct ata_link *link, unsigned int *class, > + unsigned long deadline); Similarly, ahci_pmp_retry_srst_softreset() > +struct ata_port_operations ahci_pmp_ops = { > + .inherits = &ahci_ops, > + .softreset = ahci_pmp_softreset, > + .pmp_softreset = ahci_pmp_softreset, > +}; Isn't overriding .softreset enough? .pmp_softreset is used only for downstream links. > +static int ahci_pmp_check_ready(struct ata_link *link) > +{ > + void __iomem *port_mmio = ahci_port_base(link->ap); > + u8 status = readl(port_mmio + PORT_TFDATA) & 0xFF; > + u32 irq_status = readl(port_mmio + PORT_IRQ_STAT); > + > + /* > + * There is no need to check TFDATA if BAD PMP is found due to HW bug, > + * which can save timeout delay. > + */ > + if (irq_status & PORT_IRQ_BAD_PMP) > + return -EIO; > + > + printk("%s:TFT 0x%x\n", __func__, status); You probably want ata_link_printk(link, KERN_DEBUG, ...); Thanks.
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 71afe03..c67f621 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -79,8 +79,6 @@ enum board_ids { }; static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent); -static int ahci_sb600_softreset(struct ata_link *link, unsigned int *class, - unsigned long deadline); static int ahci_vt8251_hardreset(struct ata_link *link, unsigned int *class, unsigned long deadline); static int ahci_p5wdh_hardreset(struct ata_link *link, unsigned int *class, @@ -106,8 +104,8 @@ static struct ata_port_operations ahci_p5wdh_ops = { static struct ata_port_operations ahci_sb600_ops = { .inherits = &ahci_ops, - .softreset = ahci_sb600_softreset, - .pmp_softreset = ahci_sb600_softreset, + .softreset = ahci_pmp_softreset, + .pmp_softreset = ahci_pmp_softreset, }; #define AHCI_HFLAGS(flags) .private_data = (void *)(flags) @@ -502,55 +500,6 @@ static void ahci_pci_init_controller(struct ata_host *host) ahci_init_controller(host); } -static int ahci_sb600_check_ready(struct ata_link *link) -{ - void __iomem *port_mmio = ahci_port_base(link->ap); - u8 status = readl(port_mmio + PORT_TFDATA) & 0xFF; - u32 irq_status = readl(port_mmio + PORT_IRQ_STAT); - - /* - * There is no need to check TFDATA if BAD PMP is found due to HW bug, - * which can save timeout delay. - */ - if (irq_status & PORT_IRQ_BAD_PMP) - return -EIO; - - return ata_check_ready(status); -} - -static int ahci_sb600_softreset(struct ata_link *link, unsigned int *class, - unsigned long deadline) -{ - struct ata_port *ap = link->ap; - void __iomem *port_mmio = ahci_port_base(ap); - int pmp = sata_srst_pmp(link); - int rc; - u32 irq_sts; - - DPRINTK("ENTER\n"); - - rc = ahci_do_softreset(link, class, pmp, deadline, - ahci_sb600_check_ready); - - /* - * Soft reset fails on some ATI chips with IPMS set when PMP - * is enabled but SATA HDD/ODD is connected to SATA port, - * do soft reset again to port 0. - */ - if (rc == -EIO) { - irq_sts = readl(port_mmio + PORT_IRQ_STAT); - if (irq_sts & PORT_IRQ_BAD_PMP) { - ata_link_printk(link, KERN_WARNING, - "applying SB600 PMP SRST workaround " - "and retrying\n"); - rc = ahci_do_softreset(link, class, 0, deadline, - ahci_check_ready); - } - } - - return rc; -} - static int ahci_vt8251_hardreset(struct ata_link *link, unsigned int *class, unsigned long deadline) { diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h index 12c5282..e20f8d7 100644 --- a/drivers/ata/ahci.h +++ b/drivers/ata/ahci.h @@ -312,6 +312,7 @@ extern struct device_attribute *ahci_sdev_attrs[]; .sdev_attrs = ahci_sdev_attrs extern struct ata_port_operations ahci_ops; +extern struct ata_port_operations ahci_pmp_ops; void ahci_fill_cmd_slot(struct ahci_port_priv *pp, unsigned int tag, u32 opts); diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c index d38c40f..c4cbee9 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -82,6 +82,8 @@ static void ahci_pmp_attach(struct ata_port *ap); static void ahci_pmp_detach(struct ata_port *ap); static int ahci_softreset(struct ata_link *link, unsigned int *class, unsigned long deadline); +static int ahci_pmp_softreset(struct ata_link *link, unsigned int *class, + unsigned long deadline); static int ahci_hardreset(struct ata_link *link, unsigned int *class, unsigned long deadline); static void ahci_postreset(struct ata_link *link, unsigned int *class); @@ -141,6 +143,13 @@ struct device_attribute *ahci_sdev_attrs[] = { }; EXPORT_SYMBOL_GPL(ahci_sdev_attrs); +struct ata_port_operations ahci_pmp_ops = { + .inherits = &ahci_ops, + .softreset = ahci_pmp_softreset, + .pmp_softreset = ahci_pmp_softreset, +}; +EXPORT_SYMBOL_GPL(ahci_pmp_ops); + struct ata_port_operations ahci_ops = { .inherits = &sata_pmp_port_ops, @@ -1329,6 +1338,56 @@ static int ahci_softreset(struct ata_link *link, unsigned int *class, } EXPORT_SYMBOL_GPL(ahci_do_softreset); +static int ahci_pmp_check_ready(struct ata_link *link) +{ + void __iomem *port_mmio = ahci_port_base(link->ap); + u8 status = readl(port_mmio + PORT_TFDATA) & 0xFF; + u32 irq_status = readl(port_mmio + PORT_IRQ_STAT); + + /* + * There is no need to check TFDATA if BAD PMP is found due to HW bug, + * which can save timeout delay. + */ + if (irq_status & PORT_IRQ_BAD_PMP) + return -EIO; + + printk("%s:TFT 0x%x\n", __func__, status); + return ata_check_ready(status); +} + +static int ahci_pmp_softreset(struct ata_link *link, unsigned int *class, + unsigned long deadline) +{ + struct ata_port *ap = link->ap; + void __iomem *port_mmio = ahci_port_base(ap); + int pmp = sata_srst_pmp(link); + int rc; + u32 irq_sts; + + DPRINTK("ENTER\n"); + + rc = ahci_do_softreset(link, class, pmp, deadline, + ahci_pmp_check_ready); + + /* + * Soft reset fails with IPMS set when PMP is enabled but + * SATA HDD/ODD is connected to SATA port, do soft reset + * again to port 0. + */ + if (rc == -EIO) { + irq_sts = readl(port_mmio + PORT_IRQ_STAT); + if (irq_sts & PORT_IRQ_BAD_PMP) { + ata_link_printk(link, KERN_WARNING, + "applying PMP SRST workaround " + "and retrying\n"); + rc = ahci_do_softreset(link, class, 0, deadline, + ahci_check_ready); + } + } + + return rc; +} + static int ahci_hardreset(struct ata_link *link, unsigned int *class, unsigned long deadline) {