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

Commit 3e28601f authored by Stephen M. Cameron's avatar Stephen M. Cameron Committed by Jens Axboe
Browse files

cciss: increase timeouts for post-reset no-ops 



Just to reduce the messages about timeouts that appear.

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

drivers/block/cciss.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -4353,7 +4353,7 @@ static __devinit int cciss_message(struct pci_dev *pdev, unsigned char opcode, u 
		tag = readl(vaddr + SA5_REPLY_PORT_OFFSET);

		tag = readl(vaddr + SA5_REPLY_PORT_OFFSET);

		if ((tag & ~3) == paddr32)

		if ((tag & ~3) == paddr32)

			break;

			break;

		schedule_timeout_uninterruptible(HZ);

		msleep(CCISS_POST_RESET_NOOP_TIMEOUT_MSECS);

	}

	}





	iounmap(vaddr);

	iounmap(vaddr);

drivers/block/cciss.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -209,8 +209,9 @@ struct ctlr_info 
	((CCISS_BOARD_NOT_READY_WAIT_SECS * 1000) / \

	((CCISS_BOARD_NOT_READY_WAIT_SECS * 1000) / \

		CCISS_BOARD_READY_POLL_INTERVAL_MSECS)

		CCISS_BOARD_READY_POLL_INTERVAL_MSECS)

#define CCISS_POST_RESET_PAUSE_MSECS (3000)

#define CCISS_POST_RESET_PAUSE_MSECS (3000)

#define CCISS_POST_RESET_NOOP_INTERVAL_MSECS (1000)

#define CCISS_POST_RESET_NOOP_INTERVAL_MSECS (4000)

#define CCISS_POST_RESET_NOOP_RETRIES (12)

#define CCISS_POST_RESET_NOOP_RETRIES (12)

#define CCISS_POST_RESET_NOOP_TIMEOUT_MSECS (10000)





/* 

/* 

	Send the command to the hardware 

	Send the command to the hardware