evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scsi: ufs-debugfs: remove unnecessary error scenario use-cases

Browse source 
This change removes error scenario use-cases that have not been
implemented yet, and one error scenario (ERR_INJECT_LINK_STARTUP)
that anyway is not recoverable.

Change-Id: I78948f64ee3868333ec27e17695980b642248dcf
Signed-off-by: Yaniv Gardi <ygardi@codeaurora.org>
This commit is contained in:
Yaniv Gardi 2015-08-17 15:47:14 +03:00 • committed by David Keitel
parent 2a1a416bc8
commit 43ba62d81c
3 changed files with 0 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
drivers/scsi/ufs/ufs-debugfs.c
View file

@ -85,11 +85,6 @@ static const int err_inject_pwr_change_err_codes[] = {
PWR_FATAL_ERROR, PWR_FATAL_ERROR,
}; };
static const int err_inject_link_startup_err_codes[] = {
-EIO,
-ETIMEDOUT,
};
static const int err_inject_uic_err_codes[] = { static const int err_inject_uic_err_codes[] = {
-EIO, -EIO,
-ETIMEDOUT, -ETIMEDOUT,
@ -126,11 +121,6 @@ static struct ufsdbg_err_scenario err_scen_arr[] = {
err_inject_pwr_change_err_codes, err_inject_pwr_change_err_codes,
ARRAY_SIZE(err_inject_pwr_change_err_codes), ARRAY_SIZE(err_inject_pwr_change_err_codes),
}, },
{
"ERR_INJECT_LINK_STARTUP",
err_inject_link_startup_err_codes,
ARRAY_SIZE(err_inject_link_startup_err_codes),
},
{ {
"ERR_INJECT_UIC", "ERR_INJECT_UIC",
err_inject_uic_err_codes, err_inject_uic_err_codes,
@ -146,26 +136,6 @@ static struct ufsdbg_err_scenario err_scen_arr[] = {
err_inject_query_err_codes, err_inject_query_err_codes,
ARRAY_SIZE(err_inject_query_err_codes), ARRAY_SIZE(err_inject_query_err_codes),
}, },
{
"ERR_INJECT_RUNTIME_PM",
NULL,
0,
},
{
"ERR_INJECT_SYSTEM_PM",
NULL,
0,
},
{
"ERR_INJECT_CLOCK_GATING_SCALING",
NULL,
0,
},
{
"ERR_INJECT_PHY_POWER_UP_SEQ",
NULL,
0,
},
}; };
static bool inject_fatal_err_tr(struct ufs_hba *hba, u8 ocs_err) static bool inject_fatal_err_tr(struct ufs_hba *hba, u8 ocs_err)
@ -320,14 +290,9 @@ void ufsdbg_error_inject_dispatcher(struct ufs_hba *hba,
case ERR_INJECT_HIBERN8_ENTER: case ERR_INJECT_HIBERN8_ENTER:
case ERR_INJECT_HIBERN8_EXIT: case ERR_INJECT_HIBERN8_EXIT:
case ERR_INJECT_PWR_CHANGE: case ERR_INJECT_PWR_CHANGE:
case ERR_INJECT_LINK_STARTUP:
case ERR_INJECT_UIC: case ERR_INJECT_UIC:
case ERR_INJECT_DME_ATTR: case ERR_INJECT_DME_ATTR:
case ERR_INJECT_QUERY: case ERR_INJECT_QUERY:
case ERR_INJECT_RUNTIME_PM:
case ERR_INJECT_SYSTEM_PM:
case ERR_INJECT_CLOCK_GATING_SCALING:
case ERR_INJECT_PHY_POWER_UP_SEQ:
goto should_fail; goto should_fail;
default: default:
dev_err(hba->dev, "%s: unsupported error scenario\n", dev_err(hba->dev, "%s: unsupported error scenario\n",

5
drivers/scsi/ufs/ufs-debugfs.h
View file

@ -28,14 +28,9 @@ enum ufsdbg_err_inject_scenario {
ERR_INJECT_HIBERN8_ENTER, ERR_INJECT_HIBERN8_ENTER,
ERR_INJECT_HIBERN8_EXIT, ERR_INJECT_HIBERN8_EXIT,
ERR_INJECT_PWR_CHANGE, ERR_INJECT_PWR_CHANGE,
ERR_INJECT_LINK_STARTUP,
ERR_INJECT_UIC, ERR_INJECT_UIC,
ERR_INJECT_DME_ATTR, ERR_INJECT_DME_ATTR,
ERR_INJECT_QUERY, ERR_INJECT_QUERY,
ERR_INJECT_RUNTIME_PM,
ERR_INJECT_SYSTEM_PM,
ERR_INJECT_CLOCK_GATING_SCALING,
ERR_INJECT_PHY_POWER_UP_SEQ,
ERR_INJECT_MAX_ERR_SCENARIOS, ERR_INJECT_MAX_ERR_SCENARIOS,
}; };

3
drivers/scsi/ufs/ufshcd.c
View file

@ -4433,9 +4433,6 @@ static int ufshcd_link_startup(struct ufs_hba *hba)
ret = ufshcd_make_hba_operational(hba); ret = ufshcd_make_hba_operational(hba);
out: out:
ufsdbg_error_inject_dispatcher(hba,
ERR_INJECT_LINK_STARTUP, 0, &ret);
if (ret) if (ret)
dev_err(hba->dev, "link startup failed %d\n", ret); dev_err(hba->dev, "link startup failed %d\n", ret);
return ret; return ret;