A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-14 16:46:15 -04:00
Code Issues Projects Releases Packages Wiki Activity

ANDROID: scsi: ufs: fix collision between CRYPTO and RPM_AUTOSUSPEND bits

Browse source 
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 <ebiggers@google.com>
This commit is contained in:
Eric Biggers 2020-01-31 14:34:50 -08:00 • committed by Alistair Delva
commit f7eefc38b8
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
drivers/scsi/ufs/ufshcd.h
View file

@ -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;