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

Commit 76fbf96f authored by Ed Lin's avatar Ed Lin Committed by James Bottomley
Browse files

[SCSI] stex: change wait loop code 



The original wait loop may be much longer than intended time.
Use more accurate timer_after for it. Also adjust wait value to
avoid unnecessary long waiting.

Signed-off-by: default avatarEd Lin <ed.lin@promise.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 94e9108b

drivers/scsi/stex.c

+20 −21
Original line number Diff line number Diff line
@@ -76,9 +76,10 @@ enum { 
	MU_STATE_STARTED			= 4,

	MU_STATE_RESETTING			= 5,



	MU_MAX_DELAY_TIME			= 240000,

	MU_MAX_DELAY				= 120,

	MU_HANDSHAKE_SIGNATURE			= 0x55aaaa55,

	MU_HANDSHAKE_SIGNATURE_HALF		= 0x5a5a0000,

	MU_HARD_RESET_WAIT			= 30000,

	HMU_PARTNER_TYPE			= 2,



	/* firmware returned values */
@@ -910,23 +911,22 @@ static int stex_handshake(struct st_hba *hba) 
	struct handshake_frame *h;

	dma_addr_t status_phys;

	u32 data;

	int i;

	unsigned long before;



	if (readl(base + OMR0) != MU_HANDSHAKE_SIGNATURE) {

		writel(MU_INBOUND_DOORBELL_HANDSHAKE, base + IDBL);

		readl(base + IDBL);

		for (i = 0; readl(base + OMR0) != MU_HANDSHAKE_SIGNATURE

			&& i < MU_MAX_DELAY_TIME; i++) {

			rmb();

			msleep(1);

		}



		if (i == MU_MAX_DELAY_TIME) {

		before = jiffies;

		while (readl(base + OMR0) != MU_HANDSHAKE_SIGNATURE) {

			if (time_after(jiffies, before + MU_MAX_DELAY * HZ)) {

				printk(KERN_ERR DRV_NAME

					"(%s): no handshake signature\n",

					pci_name(hba->pdev));

				return -1;

			}

			rmb();

			msleep(1);

		}

	}



	udelay(10);
@@ -965,18 +965,17 @@ static int stex_handshake(struct st_hba *hba) 
	readl(base + IDBL); /* flush */



	udelay(10);

	for (i = 0; readl(base + OMR0) != MU_HANDSHAKE_SIGNATURE

		&& i < MU_MAX_DELAY_TIME; i++) {

		rmb();

		msleep(1);

	}



	if (i == MU_MAX_DELAY_TIME) {

	before = jiffies;

	while (readl(base + OMR0) != MU_HANDSHAKE_SIGNATURE) {

		if (time_after(jiffies, before + MU_MAX_DELAY * HZ)) {

			printk(KERN_ERR DRV_NAME

				"(%s): no signature after handshake frame\n",

				pci_name(hba->pdev));

			return -1;

		}

		rmb();

		msleep(1);

	}



	writel(0, base + IMR0);

	readl(base + IMR0);
@@ -1059,7 +1058,7 @@ static void stex_hard_reset(struct st_hba *hba) 
	pci_bctl &= ~PCI_BRIDGE_CTL_BUS_RESET;

	pci_write_config_byte(bus->self, PCI_BRIDGE_CONTROL, pci_bctl);



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

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

		pci_read_config_word(hba->pdev, PCI_COMMAND, &pci_cmd);

		if (pci_cmd != 0xffff && (pci_cmd & PCI_COMMAND_MASTER))

			break;