Re: [PATCH] firmware: qcom: scm: fold tzmem into the qcom-scm module

From: Harshal Dev

Date: Tue Jul 21 2026 - 01:54:58 EST


Hi Sumit,

On 14-07-2026 09:08 pm, Konrad Dybcio wrote:
> On 7/14/26 8:25 AM, Harshal Dev wrote:
>> Hi,
>>
>> On 7/13/2026 5:05 PM, Sumit Garg wrote:
>>> On Mon, Jul 13, 2026 at 4:07 PM Konrad Dybcio
>>> <konrad.dybcio@xxxxxxxxxxxxxxxx> wrote:
>>>>
>>>> On 7/13/26 6:58 AM, Sumit Garg wrote:
>>>>> From: Sumit Garg <sumit.garg@xxxxxxxxxxxxxxxx>
>
> [...]
>
>>>>> --- a/drivers/firmware/qcom/Makefile
>>>>> +++ b/drivers/firmware/qcom/Makefile
>>>>> @@ -5,7 +5,7 @@
>>>>>
>>>>> obj-$(CONFIG_QCOM_SCM) += qcom-scm.o
>>>>> qcom-scm-objs += qcom_scm.o qcom_scm-smc.o qcom_scm-legacy.o
>>>>> -obj-$(CONFIG_QCOM_TZMEM) += qcom_tzmem.o
>>>>> +qcom-scm-$(CONFIG_QCOM_TZMEM) += qcom_tzmem.o
>>>>
>>>> Does it make sense to squash the kconfig entries too now?
>>>>
>>>
>>> Sounds reasonable to me, I can do that for v2.
>>
>> What kind of squash are we thinking about here? Moving the TZMEM_MODE* choice to
>> QCOM_SCM and removing QCOM_TZMEM? I think we should keep the QCOM_TZMEM Kconfig
>> around for when we boot with OPTEE and want to disable TZMEM since SHMBridge is
>> QTEE specific.
>
> Hmm, fair.

If you are aligned with not performing any Kconfig squashes for now feel free to
add my tag:

Reviewed-by: Harshal Dev <harshal.dev@xxxxxxxxxxxxxxxx>

Regards,
Harshal
>
> Konrad