Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59ec86bb authored by Stephen M. Cameron's avatar Stephen M. Cameron Committed by Jens Axboe
Browse files

cciss: clarify messages around reset behavior 



When waiting for the board to become "not ready"
don't print a message saying "waiting for board to
become ready" (possibly followed by a message saying
"failed waiting for board to become not ready".  Instead,
it should be "waiting for board to reset" and "failed
waiting for board to reset."

Signed-off-by: default avatarStephen M. Cameron <scameron@beardog.cce.hp.com>
"
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent 19adbb92

drivers/block/cciss.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -4586,11 +4586,11 @@ static __devinit int cciss_kdump_hard_reset_controller(struct pci_dev *pdev) 
	msleep(CCISS_POST_RESET_PAUSE_MSECS);

	msleep(CCISS_POST_RESET_PAUSE_MSECS);





	/* Wait for board to become not ready, then ready. */

	/* Wait for board to become not ready, then ready. */

	dev_info(&pdev->dev, "Waiting for board to become ready.\n");

	dev_info(&pdev->dev, "Waiting for board to reset.\n");

	rc = cciss_wait_for_board_state(pdev, vaddr, BOARD_NOT_READY);

	rc = cciss_wait_for_board_state(pdev, vaddr, BOARD_NOT_READY);

	if (rc) /* Don't bail, might be E500, etc. which can't be reset */

	if (rc) /* Don't bail, might be E500, etc. which can't be reset */

		dev_warn(&pdev->dev,

		dev_warn(&pdev->dev,

			"failed waiting for board to become not ready\n");

			"failed waiting for board to reset\n");

	rc = cciss_wait_for_board_state(pdev, vaddr, BOARD_READY);

	rc = cciss_wait_for_board_state(pdev, vaddr, BOARD_READY);

	if (rc) {

	if (rc) {

		dev_warn(&pdev->dev,

		dev_warn(&pdev->dev,
@@ -4641,6 +4641,7 @@ static __devinit int cciss_init_reset_devices(struct pci_dev *pdev) 
		return -ENODEV;

		return -ENODEV;





	/* Now try to get the controller to respond to a no-op */

	/* Now try to get the controller to respond to a no-op */

	dev_warn(&pdev->dev, "Waiting for controller to respond to no-op\n");

	for (i = 0; i < CCISS_POST_RESET_NOOP_RETRIES; i++) {

	for (i = 0; i < CCISS_POST_RESET_NOOP_RETRIES; i++) {

		if (cciss_noop(pdev) == 0)

		if (cciss_noop(pdev) == 0)

			break;

			break;