libata: reorganize ata_eh_reset() no reset method path (932648b0) · Commits · 戴 / test

drivers/ata/libata-eh.c

+52 −50

Original line number	Diff line number	Diff line
		@@ -2098,7 +2098,9 @@ int ata_eh_reset(struct ata_link *link, int classify,
		u32 sstatus;
		int rc;

		/* about to reset */
		/*
		* Prepare to reset
		*/
		spin_lock_irqsave(ap->lock, flags);
		ap->pflags \|= ATA_PFLAG_RESETTING;
		spin_unlock_irqrestore(ap->lock, flags);
		@@ -2124,16 +2126,8 @@ int ata_eh_reset(struct ata_link *link, int classify,
		ap->ops->set_piomode(ap, dev);
		}

		if (!softreset && !hardreset) {
		if (verbose)
		ata_link_printk(link, KERN_INFO, "no reset method "
		"available, skipping reset\n");
		if (!(lflags & ATA_LFLAG_ASSUME_CLASS))
		lflags \|= ATA_LFLAG_ASSUME_ATA;
		goto done;
		}

		/* prefer hardreset */
		reset = NULL;
		ehc->i.action &= ~ATA_EH_RESET;
		if (hardreset) {
		reset = hardreset;
		@@ -2141,11 +2135,6 @@ int ata_eh_reset(struct ata_link *link, int classify,
		} else if (softreset) {
		reset = softreset;
		ehc->i.action = ATA_EH_SOFTRESET;
		} else {
		ata_link_printk(link, KERN_ERR, "BUG: no reset method, "
		"please report to linux-ide@vger.kernel.org\n");
		dump_stack();
		return -EINVAL;
		}

		if (prereset) {
		@@ -2165,21 +2154,25 @@ int ata_eh_reset(struct ata_link *link, int classify,
		"prereset failed (errno=%d)\n", rc);
		goto out;
		}
		}

		/* prereset() might have cleared ATA_EH_RESET */
		if (!(ehc->i.action & ATA_EH_RESET)) {
		/* prereset told us not to reset, bang classes and return */
		/* prereset() might have cleared ATA_EH_RESET. If so,
		* bang classes and return.
		*/
		if (reset && !(ehc->i.action & ATA_EH_RESET)) {
		ata_link_for_each_dev(dev, link)
		classes[dev->devno] = ATA_DEV_NONE;
		rc = 0;
		goto out;
		}
		}

		retry:
		/*
		* Perform reset
		*/
		deadline = jiffies + ata_eh_reset_timeouts[try++];

		/* shut up during boot probing */
		if (reset) {
		if (verbose)
		ata_link_printk(link, KERN_INFO, "%s resetting link\n",
		reset == softreset ? "soft" : "hard");
		@@ -2212,8 +2205,17 @@ int ata_eh_reset(struct ata_link *link, int classify,
		/* -EAGAIN can happen if we skipped followup SRST */
		if (rc && rc != -EAGAIN)
		goto fail;
		} else {
		if (verbose)
		ata_link_printk(link, KERN_INFO, "no reset method "
		"available, skipping reset\n");
		if (!(lflags & ATA_LFLAG_ASSUME_CLASS))
		lflags \|= ATA_LFLAG_ASSUME_ATA;
		}

		done:
		/*
		* Post-reset processing
		*/
		ata_link_for_each_dev(dev, link) {
		/* After the reset, the device state is PIO 0 and the
		* controller state is undefined. Reset also wakes up

Admin message