diff mbox series

[6/8] pm80xx: Simultaneous poll for all FW readiness.

Message ID 20201230045743.14694-7-Viswas.G@microchip.com.com
State New
Headers show
Series pm80xx updates. | expand

Commit Message

Viswas G Dec. 30, 2020, 4:57 a.m. UTC 
From: Bhavesh Jashnani <bjashnani@google.com>

In check_fw_ready() we first wait for ILA to come up and then we
wait for RAAE to come up and IOPs and so on. This is a sequential check.
Because of this ILA image seems to be not ready in the allocated time
and so the driver marks it as "not ready" and then move on to other FW
images. But ILA does become ready eventually, but is not checked again.
In this way driver concludes that FW is not ready, when it actually is.

Fix: Instead of sequentially polling each image, we keep polling for all
images to be ready. The timeout for the polling has been set to the sum
of what was used for each individual image.

Signed-off-by: Bhavesh Jashnani <bjashnani@google.com>
Signed-off-by: Viswas G <Viswas.G@microchip.com>
Signed-off-by: Ruksar Devadi <Ruksar.devadi@microchip.com>
Signed-off-by: Ashokkumar N <Ashokkumar.N@microchip.com>
Signed-off-by: Radha Ramachandran <radha@google.com>
---
 drivers/scsi/pm8001/pm80xx_hwi.c | 80 ++++++++++++----------------------------
 1 file changed, 23 insertions(+), 57 deletions(-)

Comments

Jinpu Wang Jan. 5, 2021, 1:31 p.m. UTC | #1 
On Wed, Dec 30, 2020 at 5:47 AM Viswas G <Viswas.G@microchip.com.com> wrote:
>

> From: Bhavesh Jashnani <bjashnani@google.com>

>

> In check_fw_ready() we first wait for ILA to come up and then we

> wait for RAAE to come up and IOPs and so on. This is a sequential check.

> Because of this ILA image seems to be not ready in the allocated time

> and so the driver marks it as "not ready" and then move on to other FW

> images. But ILA does become ready eventually, but is not checked again.

> In this way driver concludes that FW is not ready, when it actually is.

>

> Fix: Instead of sequentially polling each image, we keep polling for all

> images to be ready. The timeout for the polling has been set to the sum

> of what was used for each individual image.

>

> Signed-off-by: Bhavesh Jashnani <bjashnani@google.com>

> Signed-off-by: Viswas G <Viswas.G@microchip.com>

> Signed-off-by: Ruksar Devadi <Ruksar.devadi@microchip.com>

> Signed-off-by: Ashokkumar N <Ashokkumar.N@microchip.com>

> Signed-off-by: Radha Ramachandran <radha@google.com>

Acked-by: Jack Wang <jinpu.wang@cloud.ionos.com>

Thx
> ---

>  drivers/scsi/pm8001/pm80xx_hwi.c | 80 ++++++++++++----------------------------

>  1 file changed, 23 insertions(+), 57 deletions(-)

>

> diff --git a/drivers/scsi/pm8001/pm80xx_hwi.c b/drivers/scsi/pm8001/pm80xx_hwi.c

> index 407c0cf6ab5f..df679e36954a 100644

> --- a/drivers/scsi/pm8001/pm80xx_hwi.c

> +++ b/drivers/scsi/pm8001/pm80xx_hwi.c

> @@ -1043,6 +1043,7 @@ static int check_fw_ready(struct pm8001_hba_info *pm8001_ha)

>         u32 value;

>         u32 max_wait_count;

>         u32 max_wait_time;

> +       u32 expected_mask;

>         int ret = 0;

>

>         /* reset / PCIe ready */

> @@ -1052,70 +1053,35 @@ static int check_fw_ready(struct pm8001_hba_info *pm8001_ha)

>                 value = pm8001_cr32(pm8001_ha, 0, MSGU_SCRATCH_PAD_1);

>         } while ((value == 0xFFFFFFFF) && (--max_wait_count));

>

> -       /* check ila status */

> -       max_wait_time = max_wait_count = 50;    /* 1000 milli sec */

> -       do {

> -               msleep(FW_READY_INTERVAL);

> -               value = pm8001_cr32(pm8001_ha, 0, MSGU_SCRATCH_PAD_1);

> -       } while (((value & SCRATCH_PAD_ILA_READY) !=

> -                       SCRATCH_PAD_ILA_READY) && (--max_wait_count));

> -       if (!max_wait_count)

> -               ret = -1;

> -       else {

> -               pm8001_dbg(pm8001_ha, MSG,

> -                          " ila ready status in %d millisec\n",

> -                          (max_wait_time - max_wait_count));

> -       }

> -

> -       /* check RAAE status */

> -       max_wait_time = max_wait_count = 90;    /* 1800 milli sec */

> -       do {

> -               msleep(FW_READY_INTERVAL);

> -               value = pm8001_cr32(pm8001_ha, 0, MSGU_SCRATCH_PAD_1);

> -       } while (((value & SCRATCH_PAD_RAAE_READY) !=

> -                               SCRATCH_PAD_RAAE_READY) && (--max_wait_count));

> -       if (!max_wait_count)

> -               ret = -1;

> -       else {

> -               pm8001_dbg(pm8001_ha, MSG,

> -                          " raae ready status in %d millisec\n",

> -                          (max_wait_time - max_wait_count));

> +       /* check ila, RAAE and iops status */

> +       if ((pm8001_ha->chip_id != chip_8008) &&

> +                       (pm8001_ha->chip_id != chip_8009)) {

> +               max_wait_time = max_wait_count = 180;   /* 3600 milli sec */

> +               expected_mask = SCRATCH_PAD_ILA_READY |

> +                       SCRATCH_PAD_RAAE_READY |

> +                       SCRATCH_PAD_IOP0_READY |

> +                       SCRATCH_PAD_IOP1_READY;

> +       } else {

> +               max_wait_time = max_wait_count = 170;   /* 3400 milli sec */

> +               expected_mask = SCRATCH_PAD_ILA_READY |

> +                       SCRATCH_PAD_RAAE_READY |

> +                       SCRATCH_PAD_IOP0_READY;

>         }

> -

> -       /* check iop0 status */

> -       max_wait_time = max_wait_count = 30;    /* 600 milli sec */

>         do {

>                 msleep(FW_READY_INTERVAL);

>                 value = pm8001_cr32(pm8001_ha, 0, MSGU_SCRATCH_PAD_1);

> -       } while (((value & SCRATCH_PAD_IOP0_READY) != SCRATCH_PAD_IOP0_READY) &&

> -                       (--max_wait_count));

> -       if (!max_wait_count)

> +       } while (((value & expected_mask) !=

> +                                expected_mask) && (--max_wait_count));

> +       if (!max_wait_count) {

> +               pm8001_dbg(pm8001_ha, INIT,

> +               "At least one FW component failed to load within %d millisec: Scratchpad1: 0x%x\n",

> +                       max_wait_time * FW_READY_INTERVAL, value);

>                 ret = -1;

> -       else {

> +       } else {

>                 pm8001_dbg(pm8001_ha, MSG,

> -                          " iop0 ready status in %d millisec\n",

> -                          (max_wait_time - max_wait_count));

> +                       "All FW components ready by %d ms\n",

> +                       (max_wait_time - max_wait_count) * FW_READY_INTERVAL);

>         }

> -

> -       /* check iop1 status only for 16 port controllers */

> -       if ((pm8001_ha->chip_id != chip_8008) &&

> -                       (pm8001_ha->chip_id != chip_8009)) {

> -               /* 200 milli sec */

> -               max_wait_time = max_wait_count = 10;

> -               do {

> -                       msleep(FW_READY_INTERVAL);

> -                       value = pm8001_cr32(pm8001_ha, 0, MSGU_SCRATCH_PAD_1);

> -               } while (((value & SCRATCH_PAD_IOP1_READY) !=

> -                               SCRATCH_PAD_IOP1_READY) && (--max_wait_count));

> -               if (!max_wait_count)

> -                       ret = -1;

> -               else {

> -                       pm8001_dbg(pm8001_ha, MSG,

> -                                  "iop1 ready status in %d millisec\n",

> -                                  (max_wait_time - max_wait_count));

> -               }

> -       }

> -

>         return ret;

>  }

>

> --

> 2.16.3

>
diff mbox series

Patch

diff --git a/drivers/scsi/pm8001/pm80xx_hwi.c b/drivers/scsi/pm8001/pm80xx_hwi.c
index 407c0cf6ab5f..df679e36954a 100644
--- a/drivers/scsi/pm8001/pm80xx_hwi.c
+++ b/drivers/scsi/pm8001/pm80xx_hwi.c
@@ -1043,6 +1043,7 @@  static int check_fw_ready(struct pm8001_hba_info *pm8001_ha)
 	u32 value;
 	u32 max_wait_count;
 	u32 max_wait_time;
+	u32 expected_mask;
 	int ret = 0;
 
 	/* reset / PCIe ready */
@@ -1052,70 +1053,35 @@  static int check_fw_ready(struct pm8001_hba_info *pm8001_ha)
 		value = pm8001_cr32(pm8001_ha, 0, MSGU_SCRATCH_PAD_1);
 	} while ((value == 0xFFFFFFFF) && (--max_wait_count));
 
-	/* check ila status */
-	max_wait_time = max_wait_count = 50;	/* 1000 milli sec */
-	do {
-		msleep(FW_READY_INTERVAL);
-		value = pm8001_cr32(pm8001_ha, 0, MSGU_SCRATCH_PAD_1);
-	} while (((value & SCRATCH_PAD_ILA_READY) !=
-			SCRATCH_PAD_ILA_READY) && (--max_wait_count));
-	if (!max_wait_count)
-		ret = -1;
-	else {
-		pm8001_dbg(pm8001_ha, MSG,
-			   " ila ready status in %d millisec\n",
-			   (max_wait_time - max_wait_count));
-	}
-
-	/* check RAAE status */
-	max_wait_time = max_wait_count = 90;	/* 1800 milli sec */
-	do {
-		msleep(FW_READY_INTERVAL);
-		value = pm8001_cr32(pm8001_ha, 0, MSGU_SCRATCH_PAD_1);
-	} while (((value & SCRATCH_PAD_RAAE_READY) !=
-				SCRATCH_PAD_RAAE_READY) && (--max_wait_count));
-	if (!max_wait_count)
-		ret = -1;
-	else {
-		pm8001_dbg(pm8001_ha, MSG,
-			   " raae ready status in %d millisec\n",
-			   (max_wait_time - max_wait_count));
+	/* check ila, RAAE and iops status */
+	if ((pm8001_ha->chip_id != chip_8008) &&
+			(pm8001_ha->chip_id != chip_8009)) {
+		max_wait_time = max_wait_count = 180;   /* 3600 milli sec */
+		expected_mask = SCRATCH_PAD_ILA_READY |
+			SCRATCH_PAD_RAAE_READY |
+			SCRATCH_PAD_IOP0_READY |
+			SCRATCH_PAD_IOP1_READY;
+	} else {
+		max_wait_time = max_wait_count = 170;   /* 3400 milli sec */
+		expected_mask = SCRATCH_PAD_ILA_READY |
+			SCRATCH_PAD_RAAE_READY |
+			SCRATCH_PAD_IOP0_READY;
 	}
-
-	/* check iop0 status */
-	max_wait_time = max_wait_count = 30;	/* 600 milli sec */
 	do {
 		msleep(FW_READY_INTERVAL);
 		value = pm8001_cr32(pm8001_ha, 0, MSGU_SCRATCH_PAD_1);
-	} while (((value & SCRATCH_PAD_IOP0_READY) != SCRATCH_PAD_IOP0_READY) &&
-			(--max_wait_count));
-	if (!max_wait_count)
+	} while (((value & expected_mask) !=
+				 expected_mask) && (--max_wait_count));
+	if (!max_wait_count) {
+		pm8001_dbg(pm8001_ha, INIT,
+		"At least one FW component failed to load within %d millisec: Scratchpad1: 0x%x\n",
+			max_wait_time * FW_READY_INTERVAL, value);
 		ret = -1;
-	else {
+	} else {
 		pm8001_dbg(pm8001_ha, MSG,
-			   " iop0 ready status in %d millisec\n",
-			   (max_wait_time - max_wait_count));
+			"All FW components ready by %d ms\n",
+			(max_wait_time - max_wait_count) * FW_READY_INTERVAL);
 	}
-
-	/* check iop1 status only for 16 port controllers */
-	if ((pm8001_ha->chip_id != chip_8008) &&
-			(pm8001_ha->chip_id != chip_8009)) {
-		/* 200 milli sec */
-		max_wait_time = max_wait_count = 10;
-		do {
-			msleep(FW_READY_INTERVAL);
-			value = pm8001_cr32(pm8001_ha, 0, MSGU_SCRATCH_PAD_1);
-		} while (((value & SCRATCH_PAD_IOP1_READY) !=
-				SCRATCH_PAD_IOP1_READY) && (--max_wait_count));
-		if (!max_wait_count)
-			ret = -1;
-		else {
-			pm8001_dbg(pm8001_ha, MSG,
-				   "iop1 ready status in %d millisec\n",
-				   (max_wait_time - max_wait_count));
-		}
-	}
-
 	return ret;
 }