[PATCH] mmc: host: sdhci-msm: Fix the wrapped key handling

[PATCH] mmc: host: sdhci-msm: Fix the wrapped key handling

[Neeraj Soni]

This change was originally intended to land with the patch series:
"mmc: host: sdhci-msm: Add support for wrapped keys". The fix was present
till v4 but was accidentally dropped in v5 while rebasing.

Signed-off-by: Neeraj Soni <neeraj.soni@oss.qualcomm.com>

---
The patch serirs "mmc: host: sdhci-msm: Add support for wrapped keys"
was originally discussed here: https://lore.kernel.org/all/CAPDyKFqRG1_1aYavfrA0Ss85B0kcTnjVBeqLgq8PUJUcSx5LUg@mail.gmail.com/
---
 drivers/mmc/host/sdhci-msm.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c
index da356627d9de..df0a038269d4 100644
--- a/drivers/mmc/host/sdhci-msm.c
+++ b/drivers/mmc/host/sdhci-msm.c
@@ -1926,11 +1926,6 @@ static int sdhci_msm_ice_init(struct sdhci_msm_host *msm_host,
 	if (IS_ERR_OR_NULL(ice))
 		return PTR_ERR_OR_ZERO(ice);
 
-	if (qcom_ice_get_supported_key_type(ice) != BLK_CRYPTO_KEY_TYPE_RAW) {
-		dev_warn(dev, "Wrapped keys not supported. Disabling inline encryption support.\n");
-		return 0;
-	}
-
 	msm_host->ice = ice;
 
 	/* Initialize the blk_crypto_profile */
-- 
2.34.1

Re: [PATCH] mmc: host: sdhci-msm: Fix the wrapped key handling

[Kuldeep Singh]

On 4/3/2026 4:29 PM, Neeraj Soni wrote:
> This change was originally intended to land with the patch series:
> "mmc: host: sdhci-msm: Add support for wrapped keys". The fix was present
> till v4 but was accidentally dropped in v5 while rebasing.
> 

Seems you need Fixes: tag to address the fix on the merged change.

-- 
Regards
Kuldeep

Re: [PATCH] mmc: host: sdhci-msm: Fix the wrapped key handling

[Dmitry Baryshkov]

On Fri, Apr 03, 2026 at 04:29:49PM +0530, Neeraj Soni wrote:
> This change was originally intended to land with the patch series:
> "mmc: host: sdhci-msm: Add support for wrapped keys". The fix was present
> till v4 but was accidentally dropped in v5 while rebasing.

Don't describe what is being changed or what was intended. Please
describe, why you are performing the change. I.e. what is broken.

Also, likely you missed the Fixes tag.

> 
> Signed-off-by: Neeraj Soni <neeraj.soni@oss.qualcomm.com>
> 
> ---
> The patch serirs "mmc: host: sdhci-msm: Add support for wrapped keys"
> was originally discussed here: https://lore.kernel.org/all/CAPDyKFqRG1_1aYavfrA0Ss85B0kcTnjVBeqLgq8PUJUcSx5LUg@mail.gmail.com/
> ---
>  drivers/mmc/host/sdhci-msm.c | 5 -----
>  1 file changed, 5 deletions(-)
> 
> diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c
> index da356627d9de..df0a038269d4 100644
> --- a/drivers/mmc/host/sdhci-msm.c
> +++ b/drivers/mmc/host/sdhci-msm.c
> @@ -1926,11 +1926,6 @@ static int sdhci_msm_ice_init(struct sdhci_msm_host *msm_host,
>  	if (IS_ERR_OR_NULL(ice))
>  		return PTR_ERR_OR_ZERO(ice);
>  
> -	if (qcom_ice_get_supported_key_type(ice) != BLK_CRYPTO_KEY_TYPE_RAW) {
> -		dev_warn(dev, "Wrapped keys not supported. Disabling inline encryption support.\n");
> -		return 0;
> -	}
> -
>  	msm_host->ice = ice;
>  
>  	/* Initialize the blk_crypto_profile */
> -- 
> 2.34.1
> 

-- 
With best wishes
Dmitry

Re: [PATCH] mmc: host: sdhci-msm: Fix the wrapped key handling

[Neeraj Soni]

On 4/4/2026 1:30 AM, Dmitry Baryshkov wrote:
> On Fri, Apr 03, 2026 at 04:29:49PM +0530, Neeraj Soni wrote:
>> This change was originally intended to land with the patch series:
>> "mmc: host: sdhci-msm: Add support for wrapped keys". The fix was present
>> till v4 but was accidentally dropped in v5 while rebasing.
> 
> Don't describe what is being changed or what was intended. Please
> describe, why you are performing the change. I.e. what is broken.
> 
Ack.

> Also, likely you missed the Fixes tag.
>
The SHA-1 ID for "mmc: host: sdhci-msm: Add support for wrapped keys"
is not yet available in tree so i did not add the "Fixes:" tag:
https://www.kernel.org/doc/html/latest/process/submitting-patches.html#describe-changes

>>
>> Signed-off-by: Neeraj Soni <neeraj.soni@oss.qualcomm.com>
>>
>> ---
>> The patch serirs "mmc: host: sdhci-msm: Add support for wrapped keys"
>> was originally discussed here: https://lore.kernel.org/all/CAPDyKFqRG1_1aYavfrA0Ss85B0kcTnjVBeqLgq8PUJUcSx5LUg@mail.gmail.com/
>> ---
>>  drivers/mmc/host/sdhci-msm.c | 5 -----
>>  1 file changed, 5 deletions(-)
>>
>> diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c
>> index da356627d9de..df0a038269d4 100644
>> --- a/drivers/mmc/host/sdhci-msm.c
>> +++ b/drivers/mmc/host/sdhci-msm.c
>> @@ -1926,11 +1926,6 @@ static int sdhci_msm_ice_init(struct sdhci_msm_host *msm_host,
>>  	if (IS_ERR_OR_NULL(ice))
>>  		return PTR_ERR_OR_ZERO(ice);
>>  
>> -	if (qcom_ice_get_supported_key_type(ice) != BLK_CRYPTO_KEY_TYPE_RAW) {
>> -		dev_warn(dev, "Wrapped keys not supported. Disabling inline encryption support.\n");
>> -		return 0;
>> -	}
>> -
>>  	msm_host->ice = ice;
>>  
>>  	/* Initialize the blk_crypto_profile */
>> -- 
>> 2.34.1
>>
> 
Regards,
Neeraj

Re: [PATCH] mmc: host: sdhci-msm: Fix the wrapped key handling

[Ulf Hansson]

On Mon, 6 Apr 2026 at 09:29, Neeraj Soni <neeraj.soni@oss.qualcomm.com> wrote:
>
>
>
> On 4/4/2026 1:30 AM, Dmitry Baryshkov wrote:
> > On Fri, Apr 03, 2026 at 04:29:49PM +0530, Neeraj Soni wrote:
> >> This change was originally intended to land with the patch series:
> >> "mmc: host: sdhci-msm: Add support for wrapped keys". The fix was present
> >> till v4 but was accidentally dropped in v5 while rebasing.
> >
> > Don't describe what is being changed or what was intended. Please
> > describe, why you are performing the change. I.e. what is broken.
> >
> Ack.
>
> > Also, likely you missed the Fixes tag.
> >
> The SHA-1 ID for "mmc: host: sdhci-msm: Add support for wrapped keys"
> is not yet available in tree so i did not add the "Fixes:" tag:
> https://www.kernel.org/doc/html/latest/process/submitting-patches.html#describe-changes

The commit should be available on the next branch in my mmc tree
git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git next

commit fd78e2b582a0 ("mmc: sdhci-msm: Add support for wrapped keys")

[...]

Kind regards
Uffe

Re: [PATCH] mmc: host: sdhci-msm: Fix the wrapped key handling

[Neeraj Soni]

On 4/6/2026 7:17 PM, Ulf Hansson wrote:
> On Mon, 6 Apr 2026 at 09:29, Neeraj Soni <neeraj.soni@oss.qualcomm.com> wrote:
>>
>>
>>
>> On 4/4/2026 1:30 AM, Dmitry Baryshkov wrote:
>>> On Fri, Apr 03, 2026 at 04:29:49PM +0530, Neeraj Soni wrote:
>>>> This change was originally intended to land with the patch series:
>>>> "mmc: host: sdhci-msm: Add support for wrapped keys". The fix was present
>>>> till v4 but was accidentally dropped in v5 while rebasing.
>>>
>>> Don't describe what is being changed or what was intended. Please
>>> describe, why you are performing the change. I.e. what is broken.
>>>
>> Ack.
>>
>>> Also, likely you missed the Fixes tag.
>>>
>> The SHA-1 ID for "mmc: host: sdhci-msm: Add support for wrapped keys"
>> is not yet available in tree so i did not add the "Fixes:" tag:
>> https://www.kernel.org/doc/html/latest/process/submitting-patches.html#describe-changes
> 
> The commit should be available on the next branch in my mmc tree
> git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git next
> 
> commit fd78e2b582a0 ("mmc: sdhci-msm: Add support for wrapped keys")
> 
Ack. I will post v2 with "Fixes:" updated.

> [...]
> 
> Kind regards
> Uffe
> 
Regards
Neeraj