ANDROID: gki_defconfig: enable CONFIG_MMC_CRYPTO

Enable inline encryption support in MMC core.

Leaf changes summary: 5 artifacts changed
Changed leaf types summary: 5 leaf types changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 0 Added function
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable

'struct hc_driver at hcd.h:255:1' changed:
  type size changed from 3136 to 3264 (in bits)
  1 data member insertion:
    'unsigned long int hc_driver::android_vendor_data[2]', at offset 2880 (in bits) at hcd.h:419:1
  there are data member changes:
    'u64 hc_driver::android_kabi_reserved1' offset changed from 2880 to 3008 (in bits) (by +128 bits)
    'u64 hc_driver::android_kabi_reserved2' offset changed from 2944 to 3072 (in bits) (by +128 bits)
    'u64 hc_driver::android_kabi_reserved3' offset changed from 3008 to 3136 (in bits) (by +128 bits)
    'u64 hc_driver::android_kabi_reserved4' offset changed from 3072 to 3200 (in bits) (by +128 bits)
  16 impacted interfaces

'struct mmc_host at host.h:271:1' changed:
  type size changed from 12288 to 13312 (in bits)
  2 data member insertions:
    'keyslot_manager* mmc_host::ksm', at offset 12288 (in bits) at host.h:467:1
    'void* mmc_host::crypto_DO_NOT_USE[7]', at offset 12352 (in bits) at host.h:468:1
  there are data member changes:
    'bool mmc_host::hsq_enabled' offset changed from 12272 to 12800 (in bits) (by +528 bits)
    'unsigned long int mmc_host::private[]' offset changed from 12288 to 13312 (in bits) (by +1024 bits)
  87 impacted interfaces

'struct mmc_request at core.h:147:1' changed:
  type size changed from 1024 to 1216 (in bits)
  3 data member insertions:
    'int mmc_request::crypto_key_slot', at offset 1024 (in bits) at core.h:169:1
    'u64 mmc_request::data_unit_num', at offset 1088 (in bits) at core.h:170:1
    'const blk_crypto_key* mmc_request::crypto_key', at offset 1152 (in bits) at core.h:171:1
  87 impacted interfaces

'struct ufs_hba at ufshcd.h:589:1' changed:
  type size changed from 29440 to 29952 (in bits)
  1 data member insertion:
    'void* ufs_hba::crypto_DO_NOT_USE[8]', at offset 29184 (in bits) at ufshcd.h:826:1
  there are data member changes:
    'u64 ufs_hba::android_kabi_reserved1' offset changed from 29184 to 29696 (in bits) (by +512 bits)
    'u64 ufs_hba::android_kabi_reserved2' offset changed from 29248 to 29760 (in bits) (by +512 bits)
    'u64 ufs_hba::android_kabi_reserved3' offset changed from 29312 to 29824 (in bits) (by +512 bits)
    'u64 ufs_hba::android_kabi_reserved4' offset changed from 29376 to 29888 (in bits) (by +512 bits)
  13 impacted interfaces

'struct ufs_hba_crypto_variant_ops at ufshcd.h:371:1' changed:
  type size changed from 1024 to 1536 (in bits)
  1 data member insertion:
    'void* ufs_hba_crypto_variant_ops::crypto_DO_NOT_USE[8]', at offset 768 (in bits) at ufshcd.h:391:1
  there are data member changes:
    'u64 ufs_hba_crypto_variant_ops::android_kabi_reserved1' offset changed from 768 to 1280 (in bits) (by +512 bits)
    'u64 ufs_hba_crypto_variant_ops::android_kabi_reserved2' offset changed from 832 to 1344 (in bits) (by +512 bits)
    'u64 ufs_hba_crypto_variant_ops::android_kabi_reserved3' offset changed from 896 to 1408 (in bits) (by +512 bits)
    'u64 ufs_hba_crypto_variant_ops::android_kabi_reserved4' offset changed from 960 to 1472 (in bits) (by +512 bits)
  13 impacted interfaces

Bug: 153512828
Bug: 144046242
Change-Id: I1bdf922c2373c0d756864df2c329d7a8179fe09e
Signed-off-by: Satya Tangirala <satyat@google.com>
This commit is contained in:
Satya Tangirala 2020-04-20 13:10:24 -07:00
commit 2c6b2164e6
3 changed files with 19429 additions and 19346 deletions

File diff suppressed because it is too large Load diff

View file

@ -360,6 +360,7 @@ CONFIG_TYPEC=y
CONFIG_MMC=y
# CONFIG_PWRSEQ_EMMC is not set
# CONFIG_PWRSEQ_SIMPLE is not set
CONFIG_MMC_CRYPTO=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_PLTFM=y
CONFIG_NEW_LEDS=y

View file

@ -313,6 +313,7 @@ CONFIG_USB_CONFIGFS_F_MIDI=y
CONFIG_MMC=y
# CONFIG_PWRSEQ_EMMC is not set
# CONFIG_PWRSEQ_SIMPLE is not set
CONFIG_MMC_CRYPTO=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_PLTFM=y
CONFIG_NEW_LEDS=y