Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7eefc38 authored by Eric Biggers's avatar Eric Biggers Committed by Alistair Delva
Browse files

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: default avatarEric Biggers <ebiggers@google.com>
parent 2081b666

drivers/scsi/ufs/ufshcd.h

+5 −5
Original line number Diff line number Diff line
@@ -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;