Message ID | 1299470224-3399-1-git-send-email-prabhakar@freescale.com |
---|---|
State | Superseded |
Headers | show |
Hello. On 07.03.2011 6:57, Prabhakar Kushwaha wrote: > When a single device error is detected, the device under the error is indicated > by the error bit set in the DER. There is a one to one mapping between register > bit and devices on Port multiplier(PMP) i.e. bit 0 represents PMP device 0 and > bit 1 represents PMP device 1 etc. > Current implementation treats Device error register value as device number not > set of bits representing multiple device on PMP. It is changed to consider bit > level. > No need to check for each set bit as all command is going to be aborted. > Signed-off-by: Prabhakar Kushwaha<prabhakar@freescale.com> > Signed-off-by: Ashish Kalra<B00888@freescale.com> > --- > git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git (branch master) > This patch is already gone through review of linuxppc-dev mail list. > drivers/ata/sata_fsl.c | 6 ++++-- > 1 files changed, 4 insertions(+), 2 deletions(-) > diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c > index b0214d0..895771c 100644 > --- a/drivers/ata/sata_fsl.c > +++ b/drivers/ata/sata_fsl.c > @@ -1040,12 +1040,14 @@ static void sata_fsl_error_intr(struct ata_port *ap) > > /* find out the offending link and qc */ > if (ap->nr_pmp_links) { > + unsigned int dev_num; Empty line wouldn't hurt here. > dereg = ioread32(hcr_base + DE); > iowrite32(dereg, hcr_base + DE); > iowrite32(cereg, hcr_base + CE); > > - if (dereg< ap->nr_pmp_links) { > - link =&ap->pmp_link[dereg]; > + dev_num = ffs(dereg)-1; What if no bit is set and ffs() return 0? Put spaces around - to keep the style consistent. > + if (dev_num < ap->nr_pmp_links) { > + link =&ap->pmp_link[dev_num]; > ehi =&link->eh_info; > qc = ata_qc_from_tag(ap, link->active_tag); > /* 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
diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c index b0214d0..895771c 100644 --- a/drivers/ata/sata_fsl.c +++ b/drivers/ata/sata_fsl.c @@ -1040,12 +1040,14 @@ static void sata_fsl_error_intr(struct ata_port *ap) /* find out the offending link and qc */ if (ap->nr_pmp_links) { + unsigned int dev_num; dereg = ioread32(hcr_base + DE); iowrite32(dereg, hcr_base + DE); iowrite32(cereg, hcr_base + CE); - if (dereg < ap->nr_pmp_links) { - link = &ap->pmp_link[dereg]; + dev_num = ffs(dereg)-1; + if (dev_num < ap->nr_pmp_links) { + link = &ap->pmp_link[dev_num]; ehi = &link->eh_info; qc = ata_qc_from_tag(ap, link->active_tag); /*