Skip to content

Fix error with PMP cards not reading correctly on boot #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Fix error with PMP cards not reading correctly on boot #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e86e8a0
Added delay to PMP read
Aug 17, 2015
dc59fe7
Update libata.h
Aug 17, 2015
ff2803c
Merge pull request #1 from mackeyja92/patch-2
Aug 17, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion drivers/ata/libata-pmp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,12 +145,23 @@ int sata_pmp_scr_read(struct ata_link *link, int reg, u32 *r_val)

if (reg > SATA_PMP_PSCR_CONTROL)
return -EINVAL;

/* For some PMP cards, we need to delay some time */
if (link>flags & ATA_LFLAG_DELAY) {
set_current_state(TASK_INTERRUPTIBLE);
/* sleep 50 msecond */
schedule_timeout(msecs_to_jiffies(50));
}

err_mask = sata_pmp_read(link, reg, r_val);
if (err_mask) {
ata_link_warn(link, "failed to read SCR %d (Emask=0x%x)\n",
reg, err_mask);
return -EIO;
} else if (vendor== 0x197b && devid == 0x0325) {
ata_for_each_link(link, ap, EDGE) {
link->flags |= ATA_LFLAG_DELAY;
}
}
return 0;
}
Expand All @@ -176,13 +187,15 @@ int sata_pmp_scr_write(struct ata_link *link, int reg, u32 val)

if (reg > SATA_PMP_PSCR_CONTROL)
return -EINVAL;



err_mask = sata_pmp_write(link, reg, val);
if (err_mask) {
ata_link_warn(link, "failed to write SCR %d (Emask=0x%x)\n",
reg, err_mask);
return -EIO;
}
}
return 0;
}

Expand Down
1 change: 1 addition & 0 deletions include/linux/libata.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ enum {
ATA_LFLAG_NO_LPM = (1 << 8), /* disable LPM on this link */
ATA_LFLAG_RST_ONCE = (1 << 9), /* limit recovery to one reset */
ATA_LFLAG_CHANGED = (1 << 10), /* LPM state changed on this link */
ATA_LFLAG_DELAY = (1 << 9), /* Delay some time for PMP */

/* struct ata_port flags */
ATA_FLAG_SLAVE_POSS = (1 << 0), /* host supports slave dev */
Expand Down