2023-05-27 00:57:29

by Pranav Prasad

Subject: [PATCH v2] scsi: pm80xx: Add fatal error checks

From: Changyuan Lyu <[email protected]>

This patch adds a fatal error check for the pm8001_phy_control()
and pm8001_lu_reset() functions.

Changes compared to v1:
- Changed the patch series to a single patch.
- Added empty "/*" line to the comments as requested
by Damien Le Moal.
- Aligned function arguments in pm8001_dbg() as
requested by Damien Le Moal.

Signed-off-by: Changyuan Lyu <[email protected]>
Signed-off-by: Pranav Prasad <[email protected]>
---
drivers/scsi/pm8001/pm8001_sas.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)

diff --git a/drivers/scsi/pm8001/pm8001_sas.c b/drivers/scsi/pm8001/pm8001_sas.c
index e5673c774f66..a5a31dfa4512 100644
--- a/drivers/scsi/pm8001/pm8001_sas.c
+++ b/drivers/scsi/pm8001/pm8001_sas.c
@@ -167,6 +167,17 @@ int pm8001_phy_control(struct asd_sas_phy *sas_phy, enum phy_func func,
pm8001_ha = sas_phy->ha->lldd_ha;
phy = &pm8001_ha->phy[phy_id];
pm8001_ha->phy[phy_id].enable_completion = &completion;
+
+ if (PM8001_CHIP_DISP->fatal_errors(pm8001_ha)) {
+ /*
+ * If the controller is in fatal error state,
+ * we will not get a response from the controller
+ */
+ pm8001_dbg(pm8001_ha, FAIL,
+ "Phy control failed due to fatal errors\n");
+ return -EFAULT;
+ }
+
switch (func) {
case PHY_FUNC_SET_LINK_RATE:
rates = funcdata;
@@ -908,6 +919,17 @@ int pm8001_lu_reset(struct domain_device *dev, u8 *lun)
struct pm8001_device *pm8001_dev = dev->lldd_dev;
struct pm8001_hba_info *pm8001_ha = pm8001_find_ha_by_dev(dev);
DECLARE_COMPLETION_ONSTACK(completion_setstate);
+
+ if (PM8001_CHIP_DISP->fatal_errors(pm8001_ha)) {
+ /*
+ * If the controller is in fatal error state,
+ * we will not get a response from the controller
+ */
+ pm8001_dbg(pm8001_ha, FAIL,
+ "LUN reset failed due to fatal errors\n");
+ return rc;
+ }
+
if (dev_is_sata(dev)) {
struct sas_phy *phy = sas_get_local_phy(dev);
sas_execute_internal_abort_dev(dev, 0, NULL);
--
2.40.1.698.g37aff9b760-goog

2023-06-01 00:17:15

by Martin K. Petersen

Subject: Re: [PATCH v2] scsi: pm80xx: Add fatal error checks

Pranav,

> This patch adds a fatal error check for the pm8001_phy_control() and
> pm8001_lu_reset() functions.

Applied to 6.5/scsi-staging, thanks!

--
Martin K. Petersen Oracle Linux Engineering

2023-06-08 01:45:46

by Martin K. Petersen

Subject: Re: [PATCH v2] scsi: pm80xx: Add fatal error checks

On Fri, 26 May 2023 23:51:55 +0000, Pranav Prasad wrote:

> This patch adds a fatal error check for the pm8001_phy_control()
> and pm8001_lu_reset() functions.
>
> Changes compared to v1:
> - Changed the patch series to a single patch.
> - Added empty "/*" line to the comments as requested
> by Damien Le Moal.
> - Aligned function arguments in pm8001_dbg() as
> requested by Damien Le Moal.
>
> [...]

Applied to 6.5/scsi-queue, thanks!

[1/1] scsi: pm80xx: Add fatal error checks
https://git.kernel.org/mkp/scsi/c/4851c39aae3a

--
Martin K. Petersen Oracle Linux Engineering