From f7eefc38b845a776489c2e8796b50a0c388b68ac Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Fri, 31 Jan 2020 14:34:50 -0800 Subject: [PATCH] ANDROID: scsi: ufs: fix collision between CRYPTO and RPM_AUTOSUSPEND bits On android-5.4, UFSHCD_CAP_CRYPTO was assigned bit (1 << 6), then a patch was backported from upstream which added UFSHCD_CAP_RPM_AUTOSUSPEND, also as (1 << 6). This bug is not present in android-4.19 or android-mainline, where UFSHCD_CAP_CRYPTO is bit (1 << 7) instead. Fix android-5.4 to do that too. Bug: 137270441 Change-Id: I18de69e9b2bb4ea06dd54851031c2d6e057d32ab Signed-off-by: Eric Biggers --- drivers/scsi/ufs/ufshcd.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h index 6d90fb1c2787..94311bb1dd2c 100644 --- a/drivers/scsi/ufs/ufshcd.h +++ b/drivers/scsi/ufs/ufshcd.h @@ -752,17 +752,17 @@ struct ufs_hba { * the performance of ongoing read/write operations. */ #define UFSHCD_CAP_KEEP_AUTO_BKOPS_ENABLED_EXCEPT_SUSPEND (1 << 5) - /* - * This capability allows the host controller driver to use the - * inline crypto engine, if it is present - */ -#define UFSHCD_CAP_CRYPTO (1 << 6) /* * This capability allows host controller driver to automatically * enable runtime power management by itself instead of waiting * for userspace to control the power management. */ #define UFSHCD_CAP_RPM_AUTOSUSPEND (1 << 6) + /* + * This capability allows the host controller driver to use the + * inline crypto engine, if it is present + */ +#define UFSHCD_CAP_CRYPTO (1 << 7) struct devfreq *devfreq; struct ufs_clk_scaling clk_scaling;