From: loberman@redhat.com (Laurence Oberman)
Subject: [PATCH v2] lpfc: Fix panic on BFS configuration.
Date: Wed, 26 Apr 2017 17:39:19 -0400 (EDT) [thread overview]
Message-ID: <394171697.2551628.1493242759141.JavaMail.zimbra@redhat.com> (raw)
In-Reply-To: <20170426191926.6061-1-jsmart2021@gmail.com>
----- Original Message -----
> From: jsmart2021 at gmail.com
> To: linux-scsi at vger.kernel.org, stable at vger.kernel.org
> Cc: jthumshirn at suse.de, linux-nvme at lists.infradead.org, emilne at redhat.com, "James Smart" <jsmart2021 at gmail.com>,
> "Dick Kennedy" <dick.kennedy at broadcom.com>, "James Smart" <james.smart at broadcom.com>
> Sent: Wednesday, April 26, 2017 3:19:26 PM
> Subject: [PATCH v2] lpfc: Fix panic on BFS configuration.
>
> From: James Smart <jsmart2021 at gmail.com>
>
> To select the appropriate shost template, the driver is issuing
> a mailbox command to retrieve the wwn. Turns out the sending of
> the command precedes the reset of the function. On SLI-4 adapters,
> this is inconsequential as the mailbox command location is specified
> by dma via the BMBX register. However, on SLI-3 adapters, the
> location of the mailbox command submission area changes. When the
> function is first powered on or reset, the cmd is submitted via PCI
> bar memory. Later the driver changes the function config to use
> host memory and DMA. The request to start a mailbox command is the
> same, a simple doorbell write, regardless of submission area.
> So.. if there has not been a boot driver run against the adapter,
> the mailbox command works as defaults are ok. But, if the boot
> driver has configured the card and, and if no platform pci
> function/slot reset occurs as the os starts, the mailbox command
> will fail. The SLI-3 device will use the stale boot driver dma
> location. This can cause PCI eeh errors.
>
> Fix is to reset the sli-3 function before sending the
> mailbox command, thus synchronizing the function/driver on mailbox
> location.
>
> This issue was introduced by this patch:
> http://www.spinics.net/lists/linux-scsi/msg105908.html
> which is in the stable pools with commit id:
> 96418b5e2c8867da3279d877f5d1ffabfe460c3d
>
> This patch was cut against the scsi.git tree, misc branch and should
> be pulled in via the scsi tree.
>
> This patch needs to be applied to the stable trees where ever the
> introducing patch exists.
>
> Signed-off-by: Dick Kennedy <dick.kennedy at broadcom.com>
> Signed-off-by: James Smart <james.smart at broadcom.com>
> Cc: stable at vger.kernel.org
> ---
> drivers/scsi/lpfc/lpfc_crtn.h | 1 +
> drivers/scsi/lpfc/lpfc_init.c | 7 +++++++
> drivers/scsi/lpfc/lpfc_sli.c | 19 ++++++++++++-------
> 3 files changed, 20 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/scsi/lpfc/lpfc_crtn.h b/drivers/scsi/lpfc/lpfc_crtn.h
> index 843dd73..4295ef1 100644
> --- a/drivers/scsi/lpfc/lpfc_crtn.h
> +++ b/drivers/scsi/lpfc/lpfc_crtn.h
> @@ -289,6 +289,7 @@ int lpfc_selective_reset(struct lpfc_hba *);
> void lpfc_reset_barrier(struct lpfc_hba *);
> int lpfc_sli_brdready(struct lpfc_hba *, uint32_t);
> int lpfc_sli_brdkill(struct lpfc_hba *);
> +int lpfc_sli_chipset_init(struct lpfc_hba *);
> int lpfc_sli_brdreset(struct lpfc_hba *);
> int lpfc_sli_brdrestart(struct lpfc_hba *);
> int lpfc_sli_hba_setup(struct lpfc_hba *);
> diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
> index 0ee429d..4b47708 100644
> --- a/drivers/scsi/lpfc/lpfc_init.c
> +++ b/drivers/scsi/lpfc/lpfc_init.c
> @@ -1422,6 +1422,13 @@ lpfc_handle_deferred_eratt(struct lpfc_hba *phba)
> psli->sli_flag &= ~LPFC_SLI_ACTIVE;
> spin_unlock_irq(&phba->hbalock);
>
> + if (phba->sli_rev < LPFC_SLI_REV4) {
> + /* Reset the port first */
> + lpfc_sli_brdrestart(phba);
> + rc = lpfc_sli_chipset_init(phba);
> + if (rc)
> + return (uint64_t)-1;
> + }
>
> /*
> * Firmware stops when it triggred erratt. That could cause the I/Os
> diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
> index e43e5e2..0296c47 100644
> --- a/drivers/scsi/lpfc/lpfc_sli.c
> +++ b/drivers/scsi/lpfc/lpfc_sli.c
> @@ -4203,13 +4203,16 @@ lpfc_sli_brdreset(struct lpfc_hba *phba)
> /* Reset HBA */
> lpfc_printf_log(phba, KERN_INFO, LOG_SLI,
> "0325 Reset HBA Data: x%x x%x\n",
> - phba->pport->port_state, psli->sli_flag);
> + (phba->pport) ? phba->pport->port_state : 0,
> + psli->sli_flag);
>
> /* perform board reset */
> phba->fc_eventTag = 0;
> phba->link_events = 0;
> - phba->pport->fc_myDID = 0;
> - phba->pport->fc_prevDID = 0;
> + if (phba->pport) {
> + phba->pport->fc_myDID = 0;
> + phba->pport->fc_prevDID = 0;
> + }
>
> /* Turn off parity checking and serr during the physical reset */
> pci_read_config_word(phba->pcidev, PCI_COMMAND, &cfg_value);
> @@ -4335,7 +4338,8 @@ lpfc_sli_brdrestart_s3(struct lpfc_hba *phba)
> /* Restart HBA */
> lpfc_printf_log(phba, KERN_INFO, LOG_SLI,
> "0337 Restart HBA Data: x%x x%x\n",
> - phba->pport->port_state, psli->sli_flag);
> + (phba->pport) ? phba->pport->port_state : 0,
> + psli->sli_flag);
>
> word0 = 0;
> mb = (MAILBOX_t *) &word0;
> @@ -4349,7 +4353,7 @@ lpfc_sli_brdrestart_s3(struct lpfc_hba *phba)
> readl(to_slim); /* flush */
>
> /* Only skip post after fc_ffinit is completed */
> - if (phba->pport->port_state)
> + if (phba->pport && phba->pport->port_state)
> word0 = 1; /* This is really setting up word1 */
> else
> word0 = 0; /* This is really setting up word1 */
> @@ -4358,7 +4362,8 @@ lpfc_sli_brdrestart_s3(struct lpfc_hba *phba)
> readl(to_slim); /* flush */
>
> lpfc_sli_brdreset(phba);
> - phba->pport->stopped = 0;
> + if (phba->pport)
> + phba->pport->stopped = 0;
> phba->link_state = LPFC_INIT_START;
> phba->hba_flag = 0;
> spin_unlock_irq(&phba->hbalock);
> @@ -4445,7 +4450,7 @@ lpfc_sli_brdrestart(struct lpfc_hba *phba)
> * iteration, the function will restart the HBA again. The function returns
> * zero if HBA successfully restarted else returns negative error code.
> **/
> -static int
> +int
> lpfc_sli_chipset_init(struct lpfc_hba *phba)
> {
> uint32_t status, i = 0;
> --
> 2.9.3
>
>
Many Thanks James and Dick
Much Obliged
Laurence
WARNING: multiple messages have this Message-ID (diff)
From: Laurence Oberman <loberman@redhat.com>
To: jsmart2021@gmail.com
Cc: linux-scsi@vger.kernel.org, stable@vger.kernel.org,
jthumshirn@suse.de, linux-nvme@lists.infradead.org,
emilne@redhat.com, Dick Kennedy <dick.kennedy@broadcom.com>,
James Smart <james.smart@broadcom.com>
Subject: Re: [PATCH v2] lpfc: Fix panic on BFS configuration.
Date: Wed, 26 Apr 2017 17:39:19 -0400 (EDT) [thread overview]
Message-ID: <394171697.2551628.1493242759141.JavaMail.zimbra@redhat.com> (raw)
In-Reply-To: <20170426191926.6061-1-jsmart2021@gmail.com>
----- Original Message -----
> From: jsmart2021@gmail.com
> To: linux-scsi@vger.kernel.org, stable@vger.kernel.org
> Cc: jthumshirn@suse.de, linux-nvme@lists.infradead.org, emilne@redhat.com, "James Smart" <jsmart2021@gmail.com>,
> "Dick Kennedy" <dick.kennedy@broadcom.com>, "James Smart" <james.smart@broadcom.com>
> Sent: Wednesday, April 26, 2017 3:19:26 PM
> Subject: [PATCH v2] lpfc: Fix panic on BFS configuration.
>
> From: James Smart <jsmart2021@gmail.com>
>
> To select the appropriate shost template, the driver is issuing
> a mailbox command to retrieve the wwn. Turns out the sending of
> the command precedes the reset of the function. On SLI-4 adapters,
> this is inconsequential as the mailbox command location is specified
> by dma via the BMBX register. However, on SLI-3 adapters, the
> location of the mailbox command submission area changes. When the
> function is first powered on or reset, the cmd is submitted via PCI
> bar memory. Later the driver changes the function config to use
> host memory and DMA. The request to start a mailbox command is the
> same, a simple doorbell write, regardless of submission area.
> So.. if there has not been a boot driver run against the adapter,
> the mailbox command works as defaults are ok. But, if the boot
> driver has configured the card and, and if no platform pci
> function/slot reset occurs as the os starts, the mailbox command
> will fail. The SLI-3 device will use the stale boot driver dma
> location. This can cause PCI eeh errors.
>
> Fix is to reset the sli-3 function before sending the
> mailbox command, thus synchronizing the function/driver on mailbox
> location.
>
> This issue was introduced by this patch:
> http://www.spinics.net/lists/linux-scsi/msg105908.html
> which is in the stable pools with commit id:
> 96418b5e2c8867da3279d877f5d1ffabfe460c3d
>
> This patch was cut against the scsi.git tree, misc branch and should
> be pulled in via the scsi tree.
>
> This patch needs to be applied to the stable trees where ever the
> introducing patch exists.
>
> Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com>
> Signed-off-by: James Smart <james.smart@broadcom.com>
> Cc: stable@vger.kernel.org
> ---
> drivers/scsi/lpfc/lpfc_crtn.h | 1 +
> drivers/scsi/lpfc/lpfc_init.c | 7 +++++++
> drivers/scsi/lpfc/lpfc_sli.c | 19 ++++++++++++-------
> 3 files changed, 20 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/scsi/lpfc/lpfc_crtn.h b/drivers/scsi/lpfc/lpfc_crtn.h
> index 843dd73..4295ef1 100644
> --- a/drivers/scsi/lpfc/lpfc_crtn.h
> +++ b/drivers/scsi/lpfc/lpfc_crtn.h
> @@ -289,6 +289,7 @@ int lpfc_selective_reset(struct lpfc_hba *);
> void lpfc_reset_barrier(struct lpfc_hba *);
> int lpfc_sli_brdready(struct lpfc_hba *, uint32_t);
> int lpfc_sli_brdkill(struct lpfc_hba *);
> +int lpfc_sli_chipset_init(struct lpfc_hba *);
> int lpfc_sli_brdreset(struct lpfc_hba *);
> int lpfc_sli_brdrestart(struct lpfc_hba *);
> int lpfc_sli_hba_setup(struct lpfc_hba *);
> diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
> index 0ee429d..4b47708 100644
> --- a/drivers/scsi/lpfc/lpfc_init.c
> +++ b/drivers/scsi/lpfc/lpfc_init.c
> @@ -1422,6 +1422,13 @@ lpfc_handle_deferred_eratt(struct lpfc_hba *phba)
> psli->sli_flag &= ~LPFC_SLI_ACTIVE;
> spin_unlock_irq(&phba->hbalock);
>
> + if (phba->sli_rev < LPFC_SLI_REV4) {
> + /* Reset the port first */
> + lpfc_sli_brdrestart(phba);
> + rc = lpfc_sli_chipset_init(phba);
> + if (rc)
> + return (uint64_t)-1;
> + }
>
> /*
> * Firmware stops when it triggred erratt. That could cause the I/Os
> diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
> index e43e5e2..0296c47 100644
> --- a/drivers/scsi/lpfc/lpfc_sli.c
> +++ b/drivers/scsi/lpfc/lpfc_sli.c
> @@ -4203,13 +4203,16 @@ lpfc_sli_brdreset(struct lpfc_hba *phba)
> /* Reset HBA */
> lpfc_printf_log(phba, KERN_INFO, LOG_SLI,
> "0325 Reset HBA Data: x%x x%x\n",
> - phba->pport->port_state, psli->sli_flag);
> + (phba->pport) ? phba->pport->port_state : 0,
> + psli->sli_flag);
>
> /* perform board reset */
> phba->fc_eventTag = 0;
> phba->link_events = 0;
> - phba->pport->fc_myDID = 0;
> - phba->pport->fc_prevDID = 0;
> + if (phba->pport) {
> + phba->pport->fc_myDID = 0;
> + phba->pport->fc_prevDID = 0;
> + }
>
> /* Turn off parity checking and serr during the physical reset */
> pci_read_config_word(phba->pcidev, PCI_COMMAND, &cfg_value);
> @@ -4335,7 +4338,8 @@ lpfc_sli_brdrestart_s3(struct lpfc_hba *phba)
> /* Restart HBA */
> lpfc_printf_log(phba, KERN_INFO, LOG_SLI,
> "0337 Restart HBA Data: x%x x%x\n",
> - phba->pport->port_state, psli->sli_flag);
> + (phba->pport) ? phba->pport->port_state : 0,
> + psli->sli_flag);
>
> word0 = 0;
> mb = (MAILBOX_t *) &word0;
> @@ -4349,7 +4353,7 @@ lpfc_sli_brdrestart_s3(struct lpfc_hba *phba)
> readl(to_slim); /* flush */
>
> /* Only skip post after fc_ffinit is completed */
> - if (phba->pport->port_state)
> + if (phba->pport && phba->pport->port_state)
> word0 = 1; /* This is really setting up word1 */
> else
> word0 = 0; /* This is really setting up word1 */
> @@ -4358,7 +4362,8 @@ lpfc_sli_brdrestart_s3(struct lpfc_hba *phba)
> readl(to_slim); /* flush */
>
> lpfc_sli_brdreset(phba);
> - phba->pport->stopped = 0;
> + if (phba->pport)
> + phba->pport->stopped = 0;
> phba->link_state = LPFC_INIT_START;
> phba->hba_flag = 0;
> spin_unlock_irq(&phba->hbalock);
> @@ -4445,7 +4450,7 @@ lpfc_sli_brdrestart(struct lpfc_hba *phba)
> * iteration, the function will restart the HBA again. The function returns
> * zero if HBA successfully restarted else returns negative error code.
> **/
> -static int
> +int
> lpfc_sli_chipset_init(struct lpfc_hba *phba)
> {
> uint32_t status, i = 0;
> --
> 2.9.3
>
>
Many Thanks James and Dick
Much Obliged
Laurence
next prev parent reply other threads:[~2017-04-26 21:39 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-26 19:19 [PATCH v2] lpfc: Fix panic on BFS configuration jsmart2021
2017-04-26 19:19 ` jsmart2021
2017-04-26 21:39 ` Laurence Oberman [this message]
2017-04-26 21:39 ` Laurence Oberman
2017-04-27 13:18 ` Ewan D. Milne
2017-04-27 13:18 ` Ewan D. Milne
2017-04-27 16:14 ` Ewan D. Milne
2017-04-27 16:14 ` Ewan D. Milne
2017-04-27 16:27 ` James Smart
2017-04-27 16:27 ` James Smart
2017-04-27 16:22 ` Martin K. Petersen
2017-04-27 16:22 ` Martin K. Petersen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=394171697.2551628.1493242759141.JavaMail.zimbra@redhat.com \
--to=loberman@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.