libata: kill ata_ehi_schedule_probe()
ata_ehi_schedule_probe() was created to hide details of link-resuming reset magic. Now that all the softreset workarounds are gone, scheduling probe is very simple - set probe_mask and request RESET. Kill ata_ehi_schedule_probe() and open code it. This also increases consistency as ata_ehi_schedule_probe() couldn't cover individual device probings so they were open-coded even when the helper existed. While at it, define ATA_ALL_DEVICES as mask of all possible devices on a link and always use it when requesting probe on link level for simplicity and consistency. Setting extra bits in the probe_mask doesn't hurt anybody. Signed-off-by: Tejun Heo <htejun@gmail.com>
This commit is contained in:
parent
8cebf274dd
commit
b558edddb1
|
@ -7156,8 +7156,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
|
||||||
/* kick EH for boot probing */
|
/* kick EH for boot probing */
|
||||||
spin_lock_irqsave(ap->lock, flags);
|
spin_lock_irqsave(ap->lock, flags);
|
||||||
|
|
||||||
ehi->probe_mask =
|
ehi->probe_mask |= ATA_ALL_DEVICES;
|
||||||
(1 << ata_link_max_devices(&ap->link)) - 1;
|
|
||||||
ehi->action |= ATA_EH_RESET;
|
ehi->action |= ATA_EH_RESET;
|
||||||
ehi->flags |= ATA_EHI_NO_AUTOPSY | ATA_EHI_QUIET;
|
ehi->flags |= ATA_EHI_NO_AUTOPSY | ATA_EHI_QUIET;
|
||||||
|
|
||||||
|
|
|
@ -1746,7 +1746,7 @@ static void ata_eh_link_autopsy(struct ata_link *link)
|
||||||
ata_eh_analyze_serror(link);
|
ata_eh_analyze_serror(link);
|
||||||
} else if (rc != -EOPNOTSUPP) {
|
} else if (rc != -EOPNOTSUPP) {
|
||||||
/* SError read failed, force reset and probing */
|
/* SError read failed, force reset and probing */
|
||||||
ata_ehi_schedule_probe(&ehc->i);
|
ehc->i.probe_mask |= ATA_ALL_DEVICES;
|
||||||
ehc->i.action |= ATA_EH_RESET;
|
ehc->i.action |= ATA_EH_RESET;
|
||||||
ehc->i.err_mask |= AC_ERR_OTHER;
|
ehc->i.err_mask |= AC_ERR_OTHER;
|
||||||
}
|
}
|
||||||
|
|
|
@ -435,7 +435,7 @@ static int sata_pmp_init_links(struct ata_port *ap, int nr_ports)
|
||||||
struct ata_eh_context *ehc = &link->eh_context;
|
struct ata_eh_context *ehc = &link->eh_context;
|
||||||
|
|
||||||
link->flags = 0;
|
link->flags = 0;
|
||||||
ehc->i.probe_mask |= 1;
|
ehc->i.probe_mask |= ATA_ALL_DEVICES;
|
||||||
ehc->i.action |= ATA_EH_RESET;
|
ehc->i.action |= ATA_EH_RESET;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -831,8 +831,12 @@ static int sata_pmp_eh_recover_pmp(struct ata_port *ap,
|
||||||
ata_eh_thaw_port(ap);
|
ata_eh_thaw_port(ap);
|
||||||
|
|
||||||
/* PMP is reset, SErrors cannot be trusted, scan all */
|
/* PMP is reset, SErrors cannot be trusted, scan all */
|
||||||
ata_port_for_each_link(tlink, ap)
|
ata_port_for_each_link(tlink, ap) {
|
||||||
ata_ehi_schedule_probe(&tlink->eh_context.i);
|
struct ata_eh_context *ehc = &tlink->eh_context;
|
||||||
|
|
||||||
|
ehc->i.probe_mask |= ATA_ALL_DEVICES;
|
||||||
|
ehc->i.action |= ATA_EH_RESET;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* If revalidation is requested, revalidate and reconfigure;
|
/* If revalidation is requested, revalidate and reconfigure;
|
||||||
|
@ -847,7 +851,7 @@ static int sata_pmp_eh_recover_pmp(struct ata_port *ap,
|
||||||
tries--;
|
tries--;
|
||||||
|
|
||||||
if (rc == -ENODEV) {
|
if (rc == -ENODEV) {
|
||||||
ehc->i.probe_mask |= 1;
|
ehc->i.probe_mask |= ATA_ALL_DEVICES;
|
||||||
detach = 1;
|
detach = 1;
|
||||||
/* give it just two more chances */
|
/* give it just two more chances */
|
||||||
tries = min(tries, 2);
|
tries = min(tries, 2);
|
||||||
|
|
|
@ -3507,7 +3507,7 @@ static int ata_scsi_user_scan(struct Scsi_Host *shost, unsigned int channel,
|
||||||
|
|
||||||
ata_port_for_each_link(link, ap) {
|
ata_port_for_each_link(link, ap) {
|
||||||
struct ata_eh_info *ehi = &link->eh_info;
|
struct ata_eh_info *ehi = &link->eh_info;
|
||||||
ehi->probe_mask |= (1 << ata_link_max_devices(link)) - 1;
|
ehi->probe_mask |= ATA_ALL_DEVICES;
|
||||||
ehi->action |= ATA_EH_RESET;
|
ehi->action |= ATA_EH_RESET;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -122,6 +122,8 @@ enum {
|
||||||
|
|
||||||
ATAPI_MAX_DRAIN = 16 << 10,
|
ATAPI_MAX_DRAIN = 16 << 10,
|
||||||
|
|
||||||
|
ATA_ALL_DEVICES = (1 << ATA_MAX_DEVICES) - 1,
|
||||||
|
|
||||||
ATA_SHT_EMULATED = 1,
|
ATA_SHT_EMULATED = 1,
|
||||||
ATA_SHT_CMD_PER_LUN = 1,
|
ATA_SHT_CMD_PER_LUN = 1,
|
||||||
ATA_SHT_THIS_ID = -1,
|
ATA_SHT_THIS_ID = -1,
|
||||||
|
@ -1089,17 +1091,11 @@ extern void ata_ehi_push_desc(struct ata_eh_info *ehi, const char *fmt, ...)
|
||||||
__attribute__ ((format (printf, 2, 3)));
|
__attribute__ ((format (printf, 2, 3)));
|
||||||
extern void ata_ehi_clear_desc(struct ata_eh_info *ehi);
|
extern void ata_ehi_clear_desc(struct ata_eh_info *ehi);
|
||||||
|
|
||||||
static inline void ata_ehi_schedule_probe(struct ata_eh_info *ehi)
|
|
||||||
{
|
|
||||||
ehi->action |= ATA_EH_RESET;
|
|
||||||
ehi->probe_mask |= (1 << ATA_MAX_DEVICES) - 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void ata_ehi_hotplugged(struct ata_eh_info *ehi)
|
static inline void ata_ehi_hotplugged(struct ata_eh_info *ehi)
|
||||||
{
|
{
|
||||||
ata_ehi_schedule_probe(ehi);
|
ehi->probe_mask |= (1 << ATA_MAX_DEVICES) - 1;
|
||||||
ehi->flags |= ATA_EHI_HOTPLUGGED;
|
ehi->flags |= ATA_EHI_HOTPLUGGED;
|
||||||
ehi->action |= ATA_EH_ENABLE_LINK;
|
ehi->action |= ATA_EH_RESET | ATA_EH_ENABLE_LINK;
|
||||||
ehi->err_mask |= AC_ERR_ATA_BUS;
|
ehi->err_mask |= AC_ERR_ATA_BUS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue