Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33;
Message-ID: <88a80eca-62c0-8398-323e-d1c1cd7adc8f@quicinc.com>
Date:   Tue, 12 Sep 2023 14:39:34 +0530
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101
 Thunderbird/102.13.0
Subject: Re: [REBASE PATCH v5 15/17] firmware: scm: Modify only the download
 bits in TCSR register
Content-Language: en-US
To:     Kathiravan Thirumoorthy <quic_kathirav@quicinc.com>,
        <corbet@lwn.net>, <agross@kernel.org>, <andersson@kernel.org>,
        <konrad.dybcio@linaro.org>, <robh+dt@kernel.org>,
        <krzysztof.kozlowski+dt@linaro.org>, <conor+dt@kernel.org>,
        <keescook@chromium.org>, <tony.luck@intel.com>,
        <gpiccoli@igalia.com>, <mathieu.poirier@linaro.org>,
        <catalin.marinas@arm.com>, <will@kernel.org>,
        <linus.walleij@linaro.org>, <andy.shevchenko@gmail.com>,
        <vigneshr@ti.com>, <nm@ti.com>, <matthias.bgg@gmail.com>,
        <kgene@kernel.org>, <alim.akhtar@samsung.com>,
        <bmasney@redhat.com>, <quic_tsoni@quicinc.com>
CC:     <linux-doc@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
        <linux-arm-msm@vger.kernel.org>, <linux-hardening@vger.kernel.org>,
        <linux-remoteproc@vger.kernel.org>,
        <linux-arm-kernel@lists.infradead.org>,
        <linux-gpio@vger.kernel.org>, <linux-mediatek@lists.infradead.org>,
        <linux-samsung-soc@vger.kernel.org>, <kernel@quicinc.com>,
        "Poovendhan Selvaraj" <quic_poovendh@quicinc.com>
References: <1694429639-21484-1-git-send-email-quic_mojha@quicinc.com>
 <1694429639-21484-16-git-send-email-quic_mojha@quicinc.com>
 <9da888dc-401a-4cbb-b616-b4654fa79e35@quicinc.com>
From:   Mukesh Ojha <quic_mojha@quicinc.com>
In-Reply-To: <9da888dc-401a-4cbb-b616-b4654fa79e35@quicinc.com>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 8bit
Precedence: bulk


On 9/11/2023 8:37 PM, Kathiravan Thirumoorthy wrote:
> 
> On 9/11/2023 4:23 PM, Mukesh Ojha wrote:
>> Crashdump collection is based on the DLOAD bit of TCSR register.
>> To retain other bits, we read the register and modify only the
>> DLOAD bit as the other bits have their own significance.
>>
>> Co-developed-by: Poovendhan Selvaraj <quic_poovendh@quicinc.com>
>> Signed-off-by: Poovendhan Selvaraj <quic_poovendh@quicinc.com>
>> Signed-off-by: Mukesh Ojha <quic_mojha@quicinc.com>
>> Tested-by: Kathiravan Thirumoorthy <quic_kathirav@quicinc.com> # 
>> IPQ9574 and IPQ5332
>> ---
>>   drivers/firmware/qcom_scm.c | 16 ++++++++++++++--
>>   1 file changed, 14 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c
>> index 321133f0950d..5cacae63ee2a 100644
>> --- a/drivers/firmware/qcom_scm.c
>> +++ b/drivers/firmware/qcom_scm.c
>> @@ -5,6 +5,8 @@
>>   #include <linux/platform_device.h>
>>   #include <linux/init.h>
>>   #include <linux/interrupt.h>
>> +#include <linux/bitfield.h>
>> +#include <linux/bits.h>
>>   #include <linux/completion.h>
>>   #include <linux/cpumask.h>
>>   #include <linux/export.h>
>> @@ -26,6 +28,14 @@
>>   static bool download_mode = 
>> IS_ENABLED(CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT);
>>   module_param(download_mode, bool, 0);
>> +#define SCM_HAS_CORE_CLK    BIT(0)
>> +#define SCM_HAS_IFACE_CLK    BIT(1)
>> +#define SCM_HAS_BUS_CLK        BIT(2)
> 
> 
> Is this intentional to add these macros back again?

This is a mistake, thanks for letting me know.

-Mukesh
> 
> 
>> +
>> +#define QCOM_DLOAD_MASK        GENMASK(5, 4)
>> +#define QCOM_DLOAD_FULLDUMP    0x1
>> +#define QCOM_DLOAD_NODUMP    0x0
>> +
>>   struct qcom_scm {
>>       struct device *dev;
>>       struct clk *core_clk;
>> @@ -440,6 +450,7 @@ static int __qcom_scm_set_dload_mode(struct device 
>> *dev, bool enable)
>>   static void qcom_scm_set_download_mode(bool enable)
>>   {
>> +    u32 val = enable ? QCOM_DLOAD_FULLDUMP : QCOM_DLOAD_NODUMP;
>>       bool avail;
>>       int ret = 0;
>> @@ -449,8 +460,9 @@ static void qcom_scm_set_download_mode(bool enable)
>>       if (avail) {
>>           ret = __qcom_scm_set_dload_mode(__scm->dev, enable);
>>       } else if (__scm->dload_mode_addr) {
>> -        ret = qcom_scm_io_writel(__scm->dload_mode_addr,
>> -                enable ? QCOM_SCM_BOOT_SET_DLOAD_MODE : 0);
>> +        ret = qcom_scm_io_update_field(__scm->dload_mode_addr,
>> +                           QCOM_DLOAD_MASK,
>> +                           FIELD_PREP(QCOM_DLOAD_MASK, val));
>>       } else {
>>           dev_err(__scm->dev,
>>               "No available mechanism for setting download mode\n");