[v3] firmware: qcom_scm: Clear download bit during reboot

Message ID 1678979666-551-1-git-send-email-quic_mojha@quicinc.com
State New
Headers
Series [v3] firmware: qcom_scm: Clear download bit during reboot |

Commit Message

Mukesh Ojha March 16, 2023, 3:14 p.m. UTC
  During normal restart of a system download bit should
be cleared irrespective of whether download mode is
set or not.

Fixes: 8c1b7dc9ba22 ("firmware: qcom: scm: Expose download-mode control")
Signed-off-by: Mukesh Ojha <quic_mojha@quicinc.com>
---
Changes in v3:
  - Added Fixes tag.
  - Removed it from below patch series, as it makes sense to go this independently.
    https://lore.kernel.org/lkml/1677664555-30191-1-git-send-email-quic_mojha@quicinc.com/

Changes in v2:
  - No change.

 drivers/firmware/qcom_scm.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
  

Comments

Bjorn Andersson March 22, 2023, 2:45 p.m. UTC | #1
On Thu, 16 Mar 2023 20:44:26 +0530, Mukesh Ojha wrote:
> During normal restart of a system download bit should
> be cleared irrespective of whether download mode is
> set or not.
> 
> 

Applied, thanks!

[1/1] firmware: qcom_scm: Clear download bit during reboot
      commit: 781d32d1c9709fd25655c4e3e3e15370ae4ae4db

Best regards,
  
Robert Marko May 18, 2023, 10:15 a.m. UTC | #2
On 16. 03. 2023. 16:14, Mukesh Ojha wrote:
> During normal restart of a system download bit should
> be cleared irrespective of whether download mode is
> set or not.
>
> Fixes: 8c1b7dc9ba22 ("firmware: qcom: scm: Expose download-mode control")
> Signed-off-by: Mukesh Ojha <quic_mojha@quicinc.com>

Hi, this has been backported to 5.15.111, however it seems to be 
breaking reboot
on IPQ4019 by causing the board to then hang in SBL with:
root@OpenWrt:/# reboot
root@OpenWrt:/# [   76.473541] device lan1 left promiscuous mode
[   76.474204] br-lan: port 1(lan1) entered disabled state
[   76.527975] device lan2 left promiscuous mode
[   76.530301] br-lan: port 2(lan2) entered disabled state
[   76.579376] device lan3 left promiscuous mode
[   76.581698] br-lan: port 3(lan3) entered disabled state
[   76.638434] device lan4 left promiscuous mode
[   76.638777] br-lan: port 4(lan4) entered disabled state
[   76.978489] qca8k-ipq4019 c000000.switch wan: Link is Down
[   76.978883] device eth0 left promiscuous mode
[   76.987077] ipqess-edma c080000.ethernet eth0: Link is Down
[
Format: Log Type - Time(microsec) - Message - Optional Info
Log Type: B - Since Boot(Power On Reset),  D - Delta,  S - Statistic
S - QC_IMAGE_VERSION_STRING=BOOT.BF.3.1.1-00123
S - IMAGE_VARIANT_STRING=DAABANAZA
S - OEM_IMAGE_VERSION_STRING=CRM
S - Boot Config, 0x00000021
S - Reset status Config, 0x00000010
S - Core 0 Frequency, 0 MHz
B -       261 - PBL, Start
B -      1339 - bootable_media_detect_entry, Start
B -      1679 - bootable_media_detect_success, Start
B -      1693 - elf_loader_entry, Start
B -      5076 - auth_hash_seg_entry, Start
B -      7223 - auth_hash_seg_exit, Start
B -    578349 - elf_segs_hash_verify_entry, Start
B -    696356 - PBL, End
B -    696380 - SBL1, Start
B -    787236 - pm_device_init, Start
D -         7 - pm_device_init, Delta
B -    788701 - boot_flash_init, Start
D -     52782 - boot_flash_init, Delta
B -    845625 - boot_config_data_table_init, Start
D -      3836 - boot_config_data_table_init, Delta - (419 Bytes)
B -    852841 - clock_init, Start
D -      7566 - clock_init, Delta
B -    864883 - CDT version:2,Platform ID:9,Major ID:0,Minor ID:0,Subtype:64
B -    868413 - sbl1_ddr_set_params, Start
B -    873402 - cpr_init, Start
D -         2 - cpr_init, Delta
B -    877842 - Pre_DDR_clock_init, Start
D -         4 - Pre_DDR_clock_init, Delta
D -     13234 - sbl1_ddr_set_params, Delta
B -    891155 - pm_driver_init, Start
D -         2 - pm_driver_init, Delta
B -    909105 - Image Load, Start
B -   1030210 - Boot error ocuured!. Error code: 303d

Reverting the commit fixes rebooting.

Regards,
Robert

> ---
> Changes in v3:
>    - Added Fixes tag.
>    - Removed it from below patch series, as it makes sense to go this independently.
>      https://lore.kernel.org/lkml/1677664555-30191-1-git-send-email-quic_mojha@quicinc.com/
>
> Changes in v2:
>    - No change.
>
>   drivers/firmware/qcom_scm.c | 3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c
> index 468d4d5..3e020d1 100644
> --- a/drivers/firmware/qcom_scm.c
> +++ b/drivers/firmware/qcom_scm.c
> @@ -1506,8 +1506,7 @@ static int qcom_scm_probe(struct platform_device *pdev)
>   static void qcom_scm_shutdown(struct platform_device *pdev)
>   {
>   	/* Clean shutdown, disable download mode to allow normal restart */
> -	if (download_mode)
> -		qcom_scm_set_download_mode(false);
> +	qcom_scm_set_download_mode(false);
>   }
>   
>   static const struct of_device_id qcom_scm_dt_match[] = {
  
Mukesh Ojha May 18, 2023, 10:43 a.m. UTC | #3
On 5/18/2023 3:45 PM, Robert Marko wrote:
> 
> On 16. 03. 2023. 16:14, Mukesh Ojha wrote:
>> During normal restart of a system download bit should
>> be cleared irrespective of whether download mode is
>> set or not.
>>
>> Fixes: 8c1b7dc9ba22 ("firmware: qcom: scm: Expose download-mode control")
>> Signed-off-by: Mukesh Ojha <quic_mojha@quicinc.com>
> 
> Hi, this has been backported to 5.15.111, however it seems to be 
> breaking reboot

Thanks for reporting the issue, by any chance enabling 
CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT + reboot works on
IPQ4019 ?

> on IPQ4019 by causing the board to then hang in SBL with:
> root@OpenWrt:/# reboot
> root@OpenWrt:/# [   76.473541] device lan1 left promiscuous mode
> [   76.474204] br-lan: port 1(lan1) entered disabled state
> [   76.527975] device lan2 left promiscuous mode
> [   76.530301] br-lan: port 2(lan2) entered disabled state
> [   76.579376] device lan3 left promiscuous mode
> [   76.581698] br-lan: port 3(lan3) entered disabled state
> [   76.638434] device lan4 left promiscuous mode
> [   76.638777] br-lan: port 4(lan4) entered disabled state
> [   76.978489] qca8k-ipq4019 c000000.switch wan: Link is Down
> [   76.978883] device eth0 left promiscuous mode
> [   76.987077] ipqess-edma c080000.ethernet eth0: Link is Down
> [
> Format: Log Type - Time(microsec) - Message - Optional Info
> Log Type: B - Since Boot(Power On Reset),  D - Delta,  S - Statistic
> S - QC_IMAGE_VERSION_STRING=BOOT.BF.3.1.1-00123
> S - IMAGE_VARIANT_STRING=DAABANAZA
> S - OEM_IMAGE_VERSION_STRING=CRM
> S - Boot Config, 0x00000021
> S - Reset status Config, 0x00000010
> S - Core 0 Frequency, 0 MHz
> B -       261 - PBL, Start
> B -      1339 - bootable_media_detect_entry, Start
> B -      1679 - bootable_media_detect_success, Start
> B -      1693 - elf_loader_entry, Start
> B -      5076 - auth_hash_seg_entry, Start
> B -      7223 - auth_hash_seg_exit, Start
> B -    578349 - elf_segs_hash_verify_entry, Start
> B -    696356 - PBL, End
> B -    696380 - SBL1, Start
> B -    787236 - pm_device_init, Start
> D -         7 - pm_device_init, Delta
> B -    788701 - boot_flash_init, Start
> D -     52782 - boot_flash_init, Delta
> B -    845625 - boot_config_data_table_init, Start
> D -      3836 - boot_config_data_table_init, Delta - (419 Bytes)
> B -    852841 - clock_init, Start
> D -      7566 - clock_init, Delta
> B -    864883 - CDT version:2,Platform ID:9,Major ID:0,Minor 
> ID:0,Subtype:64
> B -    868413 - sbl1_ddr_set_params, Start
> B -    873402 - cpr_init, Start
> D -         2 - cpr_init, Delta
> B -    877842 - Pre_DDR_clock_init, Start
> D -         4 - Pre_DDR_clock_init, Delta
> D -     13234 - sbl1_ddr_set_params, Delta
> B -    891155 - pm_driver_init, Start
> D -         2 - pm_driver_init, Delta
> B -    909105 - Image Load, Start
> B -   1030210 - Boot error ocuured!. Error code: 303d
> 
> Reverting the commit fixes rebooting.
> 
> Regards,
> Robert
> 
>> ---
>> Changes in v3:
>>    - Added Fixes tag.
>>    - Removed it from below patch series, as it makes sense to go this 
>> independently.
>>      
>> https://lore.kernel.org/lkml/1677664555-30191-1-git-send-email-quic_mojha@quicinc.com/
>>
>> Changes in v2:
>>    - No change.
>>
>>   drivers/firmware/qcom_scm.c | 3 +--
>>   1 file changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c
>> index 468d4d5..3e020d1 100644
>> --- a/drivers/firmware/qcom_scm.c
>> +++ b/drivers/firmware/qcom_scm.c
>> @@ -1506,8 +1506,7 @@ static int qcom_scm_probe(struct platform_device 
>> *pdev)
>>   static void qcom_scm_shutdown(struct platform_device *pdev)
>>   {
>>       /* Clean shutdown, disable download mode to allow normal restart */
>> -    if (download_mode)
>> -        qcom_scm_set_download_mode(false);
>> +    qcom_scm_set_download_mode(false);
>>   }
>>   static const struct of_device_id qcom_scm_dt_match[] = {
  
Robert Marko May 18, 2023, 11:01 a.m. UTC | #4
On Thu, 18 May 2023 at 12:44, Mukesh Ojha <quic_mojha@quicinc.com> wrote:
>
>
>
> On 5/18/2023 3:45 PM, Robert Marko wrote:
> >
> > On 16. 03. 2023. 16:14, Mukesh Ojha wrote:
> >> During normal restart of a system download bit should
> >> be cleared irrespective of whether download mode is
> >> set or not.
> >>
> >> Fixes: 8c1b7dc9ba22 ("firmware: qcom: scm: Expose download-mode control")
> >> Signed-off-by: Mukesh Ojha <quic_mojha@quicinc.com>
> >
> > Hi, this has been backported to 5.15.111, however it seems to be
> > breaking reboot
>
> Thanks for reporting the issue, by any chance enabling
> CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT + reboot works on
> IPQ4019 ?

Unfortunately not, the board still hangs in SBL.

Regards,
Robert

>
> > on IPQ4019 by causing the board to then hang in SBL with:
> > root@OpenWrt:/# reboot
> > root@OpenWrt:/# [   76.473541] device lan1 left promiscuous mode
> > [   76.474204] br-lan: port 1(lan1) entered disabled state
> > [   76.527975] device lan2 left promiscuous mode
> > [   76.530301] br-lan: port 2(lan2) entered disabled state
> > [   76.579376] device lan3 left promiscuous mode
> > [   76.581698] br-lan: port 3(lan3) entered disabled state
> > [   76.638434] device lan4 left promiscuous mode
> > [   76.638777] br-lan: port 4(lan4) entered disabled state
> > [   76.978489] qca8k-ipq4019 c000000.switch wan: Link is Down
> > [   76.978883] device eth0 left promiscuous mode
> > [   76.987077] ipqess-edma c080000.ethernet eth0: Link is Down
> > [
> > Format: Log Type - Time(microsec) - Message - Optional Info
> > Log Type: B - Since Boot(Power On Reset),  D - Delta,  S - Statistic
> > S - QC_IMAGE_VERSION_STRING=BOOT.BF.3.1.1-00123
> > S - IMAGE_VARIANT_STRING=DAABANAZA
> > S - OEM_IMAGE_VERSION_STRING=CRM
> > S - Boot Config, 0x00000021
> > S - Reset status Config, 0x00000010
> > S - Core 0 Frequency, 0 MHz
> > B -       261 - PBL, Start
> > B -      1339 - bootable_media_detect_entry, Start
> > B -      1679 - bootable_media_detect_success, Start
> > B -      1693 - elf_loader_entry, Start
> > B -      5076 - auth_hash_seg_entry, Start
> > B -      7223 - auth_hash_seg_exit, Start
> > B -    578349 - elf_segs_hash_verify_entry, Start
> > B -    696356 - PBL, End
> > B -    696380 - SBL1, Start
> > B -    787236 - pm_device_init, Start
> > D -         7 - pm_device_init, Delta
> > B -    788701 - boot_flash_init, Start
> > D -     52782 - boot_flash_init, Delta
> > B -    845625 - boot_config_data_table_init, Start
> > D -      3836 - boot_config_data_table_init, Delta - (419 Bytes)
> > B -    852841 - clock_init, Start
> > D -      7566 - clock_init, Delta
> > B -    864883 - CDT version:2,Platform ID:9,Major ID:0,Minor
> > ID:0,Subtype:64
> > B -    868413 - sbl1_ddr_set_params, Start
> > B -    873402 - cpr_init, Start
> > D -         2 - cpr_init, Delta
> > B -    877842 - Pre_DDR_clock_init, Start
> > D -         4 - Pre_DDR_clock_init, Delta
> > D -     13234 - sbl1_ddr_set_params, Delta
> > B -    891155 - pm_driver_init, Start
> > D -         2 - pm_driver_init, Delta
> > B -    909105 - Image Load, Start
> > B -   1030210 - Boot error ocuured!. Error code: 303d
> >
> > Reverting the commit fixes rebooting.
> >
> > Regards,
> > Robert
> >
> >> ---
> >> Changes in v3:
> >>    - Added Fixes tag.
> >>    - Removed it from below patch series, as it makes sense to go this
> >> independently.
> >>
> >> https://lore.kernel.org/lkml/1677664555-30191-1-git-send-email-quic_mojha@quicinc.com/
> >>
> >> Changes in v2:
> >>    - No change.
> >>
> >>   drivers/firmware/qcom_scm.c | 3 +--
> >>   1 file changed, 1 insertion(+), 2 deletions(-)
> >>
> >> diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c
> >> index 468d4d5..3e020d1 100644
> >> --- a/drivers/firmware/qcom_scm.c
> >> +++ b/drivers/firmware/qcom_scm.c
> >> @@ -1506,8 +1506,7 @@ static int qcom_scm_probe(struct platform_device
> >> *pdev)
> >>   static void qcom_scm_shutdown(struct platform_device *pdev)
> >>   {
> >>       /* Clean shutdown, disable download mode to allow normal restart */
> >> -    if (download_mode)
> >> -        qcom_scm_set_download_mode(false);
> >> +    qcom_scm_set_download_mode(false);
> >>   }
> >>   static const struct of_device_id qcom_scm_dt_match[] = {
  
Mukesh Ojha May 18, 2023, 11:28 a.m. UTC | #5
On 5/18/2023 4:31 PM, Robert Marko wrote:
> On Thu, 18 May 2023 at 12:44, Mukesh Ojha <quic_mojha@quicinc.com> wrote:
>>
>>
>>
>> On 5/18/2023 3:45 PM, Robert Marko wrote:
>>>
>>> On 16. 03. 2023. 16:14, Mukesh Ojha wrote:
>>>> During normal restart of a system download bit should
>>>> be cleared irrespective of whether download mode is
>>>> set or not.
>>>>
>>>> Fixes: 8c1b7dc9ba22 ("firmware: qcom: scm: Expose download-mode control")
>>>> Signed-off-by: Mukesh Ojha <quic_mojha@quicinc.com>
>>>
>>> Hi, this has been backported to 5.15.111, however it seems to be
>>> breaking reboot
>>
>> Thanks for reporting the issue, by any chance enabling
>> CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT + reboot works on
>> IPQ4019 ?
> 
> Unfortunately not, the board still hangs in SBL.

Sorry for the trouble, but looks like this change need to be
reverted.

I sent a patch for its revert.

-- Mukesh

> 
> Regards,
> Robert
> 
>>
>>> on IPQ4019 by causing the board to then hang in SBL with:
>>> root@OpenWrt:/# reboot
>>> root@OpenWrt:/# [   76.473541] device lan1 left promiscuous mode
>>> [   76.474204] br-lan: port 1(lan1) entered disabled state
>>> [   76.527975] device lan2 left promiscuous mode
>>> [   76.530301] br-lan: port 2(lan2) entered disabled state
>>> [   76.579376] device lan3 left promiscuous mode
>>> [   76.581698] br-lan: port 3(lan3) entered disabled state
>>> [   76.638434] device lan4 left promiscuous mode
>>> [   76.638777] br-lan: port 4(lan4) entered disabled state
>>> [   76.978489] qca8k-ipq4019 c000000.switch wan: Link is Down
>>> [   76.978883] device eth0 left promiscuous mode
>>> [   76.987077] ipqess-edma c080000.ethernet eth0: Link is Down
>>> [
>>> Format: Log Type - Time(microsec) - Message - Optional Info
>>> Log Type: B - Since Boot(Power On Reset),  D - Delta,  S - Statistic
>>> S - QC_IMAGE_VERSION_STRING=BOOT.BF.3.1.1-00123
>>> S - IMAGE_VARIANT_STRING=DAABANAZA
>>> S - OEM_IMAGE_VERSION_STRING=CRM
>>> S - Boot Config, 0x00000021
>>> S - Reset status Config, 0x00000010
>>> S - Core 0 Frequency, 0 MHz
>>> B -       261 - PBL, Start
>>> B -      1339 - bootable_media_detect_entry, Start
>>> B -      1679 - bootable_media_detect_success, Start
>>> B -      1693 - elf_loader_entry, Start
>>> B -      5076 - auth_hash_seg_entry, Start
>>> B -      7223 - auth_hash_seg_exit, Start
>>> B -    578349 - elf_segs_hash_verify_entry, Start
>>> B -    696356 - PBL, End
>>> B -    696380 - SBL1, Start
>>> B -    787236 - pm_device_init, Start
>>> D -         7 - pm_device_init, Delta
>>> B -    788701 - boot_flash_init, Start
>>> D -     52782 - boot_flash_init, Delta
>>> B -    845625 - boot_config_data_table_init, Start
>>> D -      3836 - boot_config_data_table_init, Delta - (419 Bytes)
>>> B -    852841 - clock_init, Start
>>> D -      7566 - clock_init, Delta
>>> B -    864883 - CDT version:2,Platform ID:9,Major ID:0,Minor
>>> ID:0,Subtype:64
>>> B -    868413 - sbl1_ddr_set_params, Start
>>> B -    873402 - cpr_init, Start
>>> D -         2 - cpr_init, Delta
>>> B -    877842 - Pre_DDR_clock_init, Start
>>> D -         4 - Pre_DDR_clock_init, Delta
>>> D -     13234 - sbl1_ddr_set_params, Delta
>>> B -    891155 - pm_driver_init, Start
>>> D -         2 - pm_driver_init, Delta
>>> B -    909105 - Image Load, Start
>>> B -   1030210 - Boot error ocuured!. Error code: 303d
>>>
>>> Reverting the commit fixes rebooting.
>>>
>>> Regards,
>>> Robert
>>>
>>>> ---
>>>> Changes in v3:
>>>>     - Added Fixes tag.
>>>>     - Removed it from below patch series, as it makes sense to go this
>>>> independently.
>>>>
>>>> https://lore.kernel.org/lkml/1677664555-30191-1-git-send-email-quic_mojha@quicinc.com/
>>>>
>>>> Changes in v2:
>>>>     - No change.
>>>>
>>>>    drivers/firmware/qcom_scm.c | 3 +--
>>>>    1 file changed, 1 insertion(+), 2 deletions(-)
>>>>
>>>> diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c
>>>> index 468d4d5..3e020d1 100644
>>>> --- a/drivers/firmware/qcom_scm.c
>>>> +++ b/drivers/firmware/qcom_scm.c
>>>> @@ -1506,8 +1506,7 @@ static int qcom_scm_probe(struct platform_device
>>>> *pdev)
>>>>    static void qcom_scm_shutdown(struct platform_device *pdev)
>>>>    {
>>>>        /* Clean shutdown, disable download mode to allow normal restart */
>>>> -    if (download_mode)
>>>> -        qcom_scm_set_download_mode(false);
>>>> +    qcom_scm_set_download_mode(false);
>>>>    }
>>>>    static const struct of_device_id qcom_scm_dt_match[] = {
  
Robert Marko May 18, 2023, 11:31 a.m. UTC | #6
On Thu, 18 May 2023 at 13:28, Mukesh Ojha <quic_mojha@quicinc.com> wrote:
>
>
>
> On 5/18/2023 4:31 PM, Robert Marko wrote:
> > On Thu, 18 May 2023 at 12:44, Mukesh Ojha <quic_mojha@quicinc.com> wrote:
> >>
> >>
> >>
> >> On 5/18/2023 3:45 PM, Robert Marko wrote:
> >>>
> >>> On 16. 03. 2023. 16:14, Mukesh Ojha wrote:
> >>>> During normal restart of a system download bit should
> >>>> be cleared irrespective of whether download mode is
> >>>> set or not.
> >>>>
> >>>> Fixes: 8c1b7dc9ba22 ("firmware: qcom: scm: Expose download-mode control")
> >>>> Signed-off-by: Mukesh Ojha <quic_mojha@quicinc.com>
> >>>
> >>> Hi, this has been backported to 5.15.111, however it seems to be
> >>> breaking reboot
> >>
> >> Thanks for reporting the issue, by any chance enabling
> >> CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT + reboot works on
> >> IPQ4019 ?
> >
> > Unfortunately not, the board still hangs in SBL.
>
> Sorry for the trouble, but looks like this change need to be
> reverted.
>
> I sent a patch for its revert.

Thanks for the quick action.

Regards,
Robert
>
> -- Mukesh
>
> >
> > Regards,
> > Robert
> >
> >>
> >>> on IPQ4019 by causing the board to then hang in SBL with:
> >>> root@OpenWrt:/# reboot
> >>> root@OpenWrt:/# [   76.473541] device lan1 left promiscuous mode
> >>> [   76.474204] br-lan: port 1(lan1) entered disabled state
> >>> [   76.527975] device lan2 left promiscuous mode
> >>> [   76.530301] br-lan: port 2(lan2) entered disabled state
> >>> [   76.579376] device lan3 left promiscuous mode
> >>> [   76.581698] br-lan: port 3(lan3) entered disabled state
> >>> [   76.638434] device lan4 left promiscuous mode
> >>> [   76.638777] br-lan: port 4(lan4) entered disabled state
> >>> [   76.978489] qca8k-ipq4019 c000000.switch wan: Link is Down
> >>> [   76.978883] device eth0 left promiscuous mode
> >>> [   76.987077] ipqess-edma c080000.ethernet eth0: Link is Down
> >>> [
> >>> Format: Log Type - Time(microsec) - Message - Optional Info
> >>> Log Type: B - Since Boot(Power On Reset),  D - Delta,  S - Statistic
> >>> S - QC_IMAGE_VERSION_STRING=BOOT.BF.3.1.1-00123
> >>> S - IMAGE_VARIANT_STRING=DAABANAZA
> >>> S - OEM_IMAGE_VERSION_STRING=CRM
> >>> S - Boot Config, 0x00000021
> >>> S - Reset status Config, 0x00000010
> >>> S - Core 0 Frequency, 0 MHz
> >>> B -       261 - PBL, Start
> >>> B -      1339 - bootable_media_detect_entry, Start
> >>> B -      1679 - bootable_media_detect_success, Start
> >>> B -      1693 - elf_loader_entry, Start
> >>> B -      5076 - auth_hash_seg_entry, Start
> >>> B -      7223 - auth_hash_seg_exit, Start
> >>> B -    578349 - elf_segs_hash_verify_entry, Start
> >>> B -    696356 - PBL, End
> >>> B -    696380 - SBL1, Start
> >>> B -    787236 - pm_device_init, Start
> >>> D -         7 - pm_device_init, Delta
> >>> B -    788701 - boot_flash_init, Start
> >>> D -     52782 - boot_flash_init, Delta
> >>> B -    845625 - boot_config_data_table_init, Start
> >>> D -      3836 - boot_config_data_table_init, Delta - (419 Bytes)
> >>> B -    852841 - clock_init, Start
> >>> D -      7566 - clock_init, Delta
> >>> B -    864883 - CDT version:2,Platform ID:9,Major ID:0,Minor
> >>> ID:0,Subtype:64
> >>> B -    868413 - sbl1_ddr_set_params, Start
> >>> B -    873402 - cpr_init, Start
> >>> D -         2 - cpr_init, Delta
> >>> B -    877842 - Pre_DDR_clock_init, Start
> >>> D -         4 - Pre_DDR_clock_init, Delta
> >>> D -     13234 - sbl1_ddr_set_params, Delta
> >>> B -    891155 - pm_driver_init, Start
> >>> D -         2 - pm_driver_init, Delta
> >>> B -    909105 - Image Load, Start
> >>> B -   1030210 - Boot error ocuured!. Error code: 303d
> >>>
> >>> Reverting the commit fixes rebooting.
> >>>
> >>> Regards,
> >>> Robert
> >>>
> >>>> ---
> >>>> Changes in v3:
> >>>>     - Added Fixes tag.
> >>>>     - Removed it from below patch series, as it makes sense to go this
> >>>> independently.
> >>>>
> >>>> https://lore.kernel.org/lkml/1677664555-30191-1-git-send-email-quic_mojha@quicinc.com/
> >>>>
> >>>> Changes in v2:
> >>>>     - No change.
> >>>>
> >>>>    drivers/firmware/qcom_scm.c | 3 +--
> >>>>    1 file changed, 1 insertion(+), 2 deletions(-)
> >>>>
> >>>> diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c
> >>>> index 468d4d5..3e020d1 100644
> >>>> --- a/drivers/firmware/qcom_scm.c
> >>>> +++ b/drivers/firmware/qcom_scm.c
> >>>> @@ -1506,8 +1506,7 @@ static int qcom_scm_probe(struct platform_device
> >>>> *pdev)
> >>>>    static void qcom_scm_shutdown(struct platform_device *pdev)
> >>>>    {
> >>>>        /* Clean shutdown, disable download mode to allow normal restart */
> >>>> -    if (download_mode)
> >>>> -        qcom_scm_set_download_mode(false);
> >>>> +    qcom_scm_set_download_mode(false);
> >>>>    }
> >>>>    static const struct of_device_id qcom_scm_dt_match[] = {
  
Mukesh Ojha May 22, 2023, 6:11 a.m. UTC | #7
On 5/18/2023 3:45 PM, Robert Marko wrote:
> 
> On 16. 03. 2023. 16:14, Mukesh Ojha wrote:
>> During normal restart of a system download bit should
>> be cleared irrespective of whether download mode is
>> set or not.
>>
>> Fixes: 8c1b7dc9ba22 ("firmware: qcom: scm: Expose download-mode control")
>> Signed-off-by: Mukesh Ojha <quic_mojha@quicinc.com>
> 
> Hi, this has been backported to 5.15.111, however it seems to be 
> breaking reboot
> on IPQ4019 by causing the board to then hang in SBL with:
> root@OpenWrt:/# reboot
> root@OpenWrt:/# [   76.473541] device lan1 left promiscuous mode
> [   76.474204] br-lan: port 1(lan1) entered disabled state
> [   76.527975] device lan2 left promiscuous mode
> [   76.530301] br-lan: port 2(lan2) entered disabled state
> [   76.579376] device lan3 left promiscuous mode
> [   76.581698] br-lan: port 3(lan3) entered disabled state
> [   76.638434] device lan4 left promiscuous mode
> [   76.638777] br-lan: port 4(lan4) entered disabled state
> [   76.978489] qca8k-ipq4019 c000000.switch wan: Link is Down
> [   76.978883] device eth0 left promiscuous mode
> [   76.987077] ipqess-edma c080000.ethernet eth0: Link is Down
> [
> Format: Log Type - Time(microsec) - Message - Optional Info
> Log Type: B - Since Boot(Power On Reset),  D - Delta,  S - Statistic
> S - QC_IMAGE_VERSION_STRING=BOOT.BF.3.1.1-00123
> S - IMAGE_VARIANT_STRING=DAABANAZA
> S - OEM_IMAGE_VERSION_STRING=CRM
> S - Boot Config, 0x00000021
> S - Reset status Config, 0x00000010
> S - Core 0 Frequency, 0 MHz
> B -       261 - PBL, Start
> B -      1339 - bootable_media_detect_entry, Start
> B -      1679 - bootable_media_detect_success, Start
> B -      1693 - elf_loader_entry, Start
> B -      5076 - auth_hash_seg_entry, Start
> B -      7223 - auth_hash_seg_exit, Start
> B -    578349 - elf_segs_hash_verify_entry, Start
> B -    696356 - PBL, End
> B -    696380 - SBL1, Start
> B -    787236 - pm_device_init, Start
> D -         7 - pm_device_init, Delta
> B -    788701 - boot_flash_init, Start
> D -     52782 - boot_flash_init, Delta
> B -    845625 - boot_config_data_table_init, Start
> D -      3836 - boot_config_data_table_init, Delta - (419 Bytes)
> B -    852841 - clock_init, Start
> D -      7566 - clock_init, Delta
> B -    864883 - CDT version:2,Platform ID:9,Major ID:0,Minor 
> ID:0,Subtype:64
> B -    868413 - sbl1_ddr_set_params, Start
> B -    873402 - cpr_init, Start
> D -         2 - cpr_init, Delta
> B -    877842 - Pre_DDR_clock_init, Start
> D -         4 - Pre_DDR_clock_init, Delta
> D -     13234 - sbl1_ddr_set_params, Delta
> B -    891155 - pm_driver_init, Start
> D -         2 - pm_driver_init, Delta
> B -    909105 - Image Load, Start
> B -   1030210 - Boot error ocuured!. Error code: 303d
> 
> Reverting the commit fixes rebooting.

Hi Robert,

Can you check if disable SDI [1] works with this issue

https://lore.kernel.org/linux-arm-msm/20230518140224.2248782-1-robimarko@gmail.com/

[1]


diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c
index fde33acd46b7..01496ceb7136 100644
--- a/drivers/firmware/qcom_scm.c
+++ b/drivers/firmware/qcom_scm.c
@@ -1508,6 +1508,7 @@ static int qcom_scm_probe(struct platform_device 
*pdev)
  static void qcom_scm_shutdown(struct platform_device *pdev)
  {
         /* Clean shutdown, disable download mode to allow normal restart */
+       qcom_scm_disable_sdi();
         qcom_scm_set_download_mode(false);
  }


-- Mukesh

> 
> Regards,
> Robert
> 
>> ---
>> Changes in v3:
>>    - Added Fixes tag.
>>    - Removed it from below patch series, as it makes sense to go this 
>> independently.
>>      
>> https://lore.kernel.org/lkml/1677664555-30191-1-git-send-email-quic_mojha@quicinc.com/
>>
>> Changes in v2:
>>    - No change.
>>
>>   drivers/firmware/qcom_scm.c | 3 +--
>>   1 file changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c
>> index 468d4d5..3e020d1 100644
>> --- a/drivers/firmware/qcom_scm.c
>> +++ b/drivers/firmware/qcom_scm.c
>> @@ -1506,8 +1506,7 @@ static int qcom_scm_probe(struct platform_device 
>> *pdev)
>>   static void qcom_scm_shutdown(struct platform_device *pdev)
>>   {
>>       /* Clean shutdown, disable download mode to allow normal restart */
>> -    if (download_mode)
>> -        qcom_scm_set_download_mode(false);
>> +    qcom_scm_set_download_mode(false);
>>   }
>>   static const struct of_device_id qcom_scm_dt_match[] = {
  
Robert Marko May 22, 2023, 8:59 a.m. UTC | #8
On Mon, 22 May 2023 at 08:11, Mukesh Ojha <quic_mojha@quicinc.com> wrote:
>
>
>
> On 5/18/2023 3:45 PM, Robert Marko wrote:
> >
> > On 16. 03. 2023. 16:14, Mukesh Ojha wrote:
> >> During normal restart of a system download bit should
> >> be cleared irrespective of whether download mode is
> >> set or not.
> >>
> >> Fixes: 8c1b7dc9ba22 ("firmware: qcom: scm: Expose download-mode control")
> >> Signed-off-by: Mukesh Ojha <quic_mojha@quicinc.com>
> >
> > Hi, this has been backported to 5.15.111, however it seems to be
> > breaking reboot
> > on IPQ4019 by causing the board to then hang in SBL with:
> > root@OpenWrt:/# reboot
> > root@OpenWrt:/# [   76.473541] device lan1 left promiscuous mode
> > [   76.474204] br-lan: port 1(lan1) entered disabled state
> > [   76.527975] device lan2 left promiscuous mode
> > [   76.530301] br-lan: port 2(lan2) entered disabled state
> > [   76.579376] device lan3 left promiscuous mode
> > [   76.581698] br-lan: port 3(lan3) entered disabled state
> > [   76.638434] device lan4 left promiscuous mode
> > [   76.638777] br-lan: port 4(lan4) entered disabled state
> > [   76.978489] qca8k-ipq4019 c000000.switch wan: Link is Down
> > [   76.978883] device eth0 left promiscuous mode
> > [   76.987077] ipqess-edma c080000.ethernet eth0: Link is Down
> > [
> > Format: Log Type - Time(microsec) - Message - Optional Info
> > Log Type: B - Since Boot(Power On Reset),  D - Delta,  S - Statistic
> > S - QC_IMAGE_VERSION_STRING=BOOT.BF.3.1.1-00123
> > S - IMAGE_VARIANT_STRING=DAABANAZA
> > S - OEM_IMAGE_VERSION_STRING=CRM
> > S - Boot Config, 0x00000021
> > S - Reset status Config, 0x00000010
> > S - Core 0 Frequency, 0 MHz
> > B -       261 - PBL, Start
> > B -      1339 - bootable_media_detect_entry, Start
> > B -      1679 - bootable_media_detect_success, Start
> > B -      1693 - elf_loader_entry, Start
> > B -      5076 - auth_hash_seg_entry, Start
> > B -      7223 - auth_hash_seg_exit, Start
> > B -    578349 - elf_segs_hash_verify_entry, Start
> > B -    696356 - PBL, End
> > B -    696380 - SBL1, Start
> > B -    787236 - pm_device_init, Start
> > D -         7 - pm_device_init, Delta
> > B -    788701 - boot_flash_init, Start
> > D -     52782 - boot_flash_init, Delta
> > B -    845625 - boot_config_data_table_init, Start
> > D -      3836 - boot_config_data_table_init, Delta - (419 Bytes)
> > B -    852841 - clock_init, Start
> > D -      7566 - clock_init, Delta
> > B -    864883 - CDT version:2,Platform ID:9,Major ID:0,Minor
> > ID:0,Subtype:64
> > B -    868413 - sbl1_ddr_set_params, Start
> > B -    873402 - cpr_init, Start
> > D -         2 - cpr_init, Delta
> > B -    877842 - Pre_DDR_clock_init, Start
> > D -         4 - Pre_DDR_clock_init, Delta
> > D -     13234 - sbl1_ddr_set_params, Delta
> > B -    891155 - pm_driver_init, Start
> > D -         2 - pm_driver_init, Delta
> > B -    909105 - Image Load, Start
> > B -   1030210 - Boot error ocuured!. Error code: 303d
> >
> > Reverting the commit fixes rebooting.
>
> Hi Robert,
>
> Can you check if disable SDI [1] works with this issue
>
> https://lore.kernel.org/linux-arm-msm/20230518140224.2248782-1-robimarko@gmail.com/
>
> [1]
>
>
> diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c
> index fde33acd46b7..01496ceb7136 100644
> --- a/drivers/firmware/qcom_scm.c
> +++ b/drivers/firmware/qcom_scm.c
> @@ -1508,6 +1508,7 @@ static int qcom_scm_probe(struct platform_device
> *pdev)
>   static void qcom_scm_shutdown(struct platform_device *pdev)
>   {
>          /* Clean shutdown, disable download mode to allow normal restart */
> +       qcom_scm_disable_sdi();
>          qcom_scm_set_download_mode(false);
>   }

Hi,
I can confirm reboot works this way as well.

Regards,
Robert
>
>
> -- Mukesh
>
> >
> > Regards,
> > Robert
> >
> >> ---
> >> Changes in v3:
> >>    - Added Fixes tag.
> >>    - Removed it from below patch series, as it makes sense to go this
> >> independently.
> >>
> >> https://lore.kernel.org/lkml/1677664555-30191-1-git-send-email-quic_mojha@quicinc.com/
> >>
> >> Changes in v2:
> >>    - No change.
> >>
> >>   drivers/firmware/qcom_scm.c | 3 +--
> >>   1 file changed, 1 insertion(+), 2 deletions(-)
> >>
> >> diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c
> >> index 468d4d5..3e020d1 100644
> >> --- a/drivers/firmware/qcom_scm.c
> >> +++ b/drivers/firmware/qcom_scm.c
> >> @@ -1506,8 +1506,7 @@ static int qcom_scm_probe(struct platform_device
> >> *pdev)
> >>   static void qcom_scm_shutdown(struct platform_device *pdev)
> >>   {
> >>       /* Clean shutdown, disable download mode to allow normal restart */
> >> -    if (download_mode)
> >> -        qcom_scm_set_download_mode(false);
> >> +    qcom_scm_set_download_mode(false);
> >>   }
> >>   static const struct of_device_id qcom_scm_dt_match[] = {
  
Mukesh Ojha May 22, 2023, 9:11 a.m. UTC | #9
On 5/22/2023 2:29 PM, Robert Marko wrote:
> On Mon, 22 May 2023 at 08:11, Mukesh Ojha <quic_mojha@quicinc.com> wrote:
>>
>>
>>
>> On 5/18/2023 3:45 PM, Robert Marko wrote:
>>>
>>> On 16. 03. 2023. 16:14, Mukesh Ojha wrote:
>>>> During normal restart of a system download bit should
>>>> be cleared irrespective of whether download mode is
>>>> set or not.
>>>>
>>>> Fixes: 8c1b7dc9ba22 ("firmware: qcom: scm: Expose download-mode control")
>>>> Signed-off-by: Mukesh Ojha <quic_mojha@quicinc.com>
>>>
>>> Hi, this has been backported to 5.15.111, however it seems to be
>>> breaking reboot
>>> on IPQ4019 by causing the board to then hang in SBL with:
>>> root@OpenWrt:/# reboot
>>> root@OpenWrt:/# [   76.473541] device lan1 left promiscuous mode
>>> [   76.474204] br-lan: port 1(lan1) entered disabled state
>>> [   76.527975] device lan2 left promiscuous mode
>>> [   76.530301] br-lan: port 2(lan2) entered disabled state
>>> [   76.579376] device lan3 left promiscuous mode
>>> [   76.581698] br-lan: port 3(lan3) entered disabled state
>>> [   76.638434] device lan4 left promiscuous mode
>>> [   76.638777] br-lan: port 4(lan4) entered disabled state
>>> [   76.978489] qca8k-ipq4019 c000000.switch wan: Link is Down
>>> [   76.978883] device eth0 left promiscuous mode
>>> [   76.987077] ipqess-edma c080000.ethernet eth0: Link is Down
>>> [
>>> Format: Log Type - Time(microsec) - Message - Optional Info
>>> Log Type: B - Since Boot(Power On Reset),  D - Delta,  S - Statistic
>>> S - QC_IMAGE_VERSION_STRING=BOOT.BF.3.1.1-00123
>>> S - IMAGE_VARIANT_STRING=DAABANAZA
>>> S - OEM_IMAGE_VERSION_STRING=CRM
>>> S - Boot Config, 0x00000021
>>> S - Reset status Config, 0x00000010
>>> S - Core 0 Frequency, 0 MHz
>>> B -       261 - PBL, Start
>>> B -      1339 - bootable_media_detect_entry, Start
>>> B -      1679 - bootable_media_detect_success, Start
>>> B -      1693 - elf_loader_entry, Start
>>> B -      5076 - auth_hash_seg_entry, Start
>>> B -      7223 - auth_hash_seg_exit, Start
>>> B -    578349 - elf_segs_hash_verify_entry, Start
>>> B -    696356 - PBL, End
>>> B -    696380 - SBL1, Start
>>> B -    787236 - pm_device_init, Start
>>> D -         7 - pm_device_init, Delta
>>> B -    788701 - boot_flash_init, Start
>>> D -     52782 - boot_flash_init, Delta
>>> B -    845625 - boot_config_data_table_init, Start
>>> D -      3836 - boot_config_data_table_init, Delta - (419 Bytes)
>>> B -    852841 - clock_init, Start
>>> D -      7566 - clock_init, Delta
>>> B -    864883 - CDT version:2,Platform ID:9,Major ID:0,Minor
>>> ID:0,Subtype:64
>>> B -    868413 - sbl1_ddr_set_params, Start
>>> B -    873402 - cpr_init, Start
>>> D -         2 - cpr_init, Delta
>>> B -    877842 - Pre_DDR_clock_init, Start
>>> D -         4 - Pre_DDR_clock_init, Delta
>>> D -     13234 - sbl1_ddr_set_params, Delta
>>> B -    891155 - pm_driver_init, Start
>>> D -         2 - pm_driver_init, Delta
>>> B -    909105 - Image Load, Start
>>> B -   1030210 - Boot error ocuured!. Error code: 303d
>>>
>>> Reverting the commit fixes rebooting.
>>
>> Hi Robert,
>>
>> Can you check if disable SDI [1] works with this issue
>>
>> https://lore.kernel.org/linux-arm-msm/20230518140224.2248782-1-robimarko@gmail.com/
>>
>> [1]
>>
>>
>> diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c
>> index fde33acd46b7..01496ceb7136 100644
>> --- a/drivers/firmware/qcom_scm.c
>> +++ b/drivers/firmware/qcom_scm.c
>> @@ -1508,6 +1508,7 @@ static int qcom_scm_probe(struct platform_device
>> *pdev)
>>    static void qcom_scm_shutdown(struct platform_device *pdev)
>>    {
>>           /* Clean shutdown, disable download mode to allow normal restart */
>> +       qcom_scm_disable_sdi();
>>           qcom_scm_set_download_mode(false);
>>    }
> 
> Hi,
> I can confirm reboot works this way as well.

That's great, So, i don't need to revert the patch and you can
add this in your patch without target specific check ?

-- Mukesh

> 
> Regards,
> Robert
>>
>>
>> -- Mukesh
>>
>>>
>>> Regards,
>>> Robert
>>>
>>>> ---
>>>> Changes in v3:
>>>>     - Added Fixes tag.
>>>>     - Removed it from below patch series, as it makes sense to go this
>>>> independently.
>>>>
>>>> https://lore.kernel.org/lkml/1677664555-30191-1-git-send-email-quic_mojha@quicinc.com/
>>>>
>>>> Changes in v2:
>>>>     - No change.
>>>>
>>>>    drivers/firmware/qcom_scm.c | 3 +--
>>>>    1 file changed, 1 insertion(+), 2 deletions(-)
>>>>
>>>> diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c
>>>> index 468d4d5..3e020d1 100644
>>>> --- a/drivers/firmware/qcom_scm.c
>>>> +++ b/drivers/firmware/qcom_scm.c
>>>> @@ -1506,8 +1506,7 @@ static int qcom_scm_probe(struct platform_device
>>>> *pdev)
>>>>    static void qcom_scm_shutdown(struct platform_device *pdev)
>>>>    {
>>>>        /* Clean shutdown, disable download mode to allow normal restart */
>>>> -    if (download_mode)
>>>> -        qcom_scm_set_download_mode(false);
>>>> +    qcom_scm_set_download_mode(false);
>>>>    }
>>>>    static const struct of_device_id qcom_scm_dt_match[] = {
  
Robert Marko May 22, 2023, 9:26 a.m. UTC | #10
On Mon, 22 May 2023 at 11:11, Mukesh Ojha <quic_mojha@quicinc.com> wrote:
>
>
>
> On 5/22/2023 2:29 PM, Robert Marko wrote:
> > On Mon, 22 May 2023 at 08:11, Mukesh Ojha <quic_mojha@quicinc.com> wrote:
> >>
> >>
> >>
> >> On 5/18/2023 3:45 PM, Robert Marko wrote:
> >>>
> >>> On 16. 03. 2023. 16:14, Mukesh Ojha wrote:
> >>>> During normal restart of a system download bit should
> >>>> be cleared irrespective of whether download mode is
> >>>> set or not.
> >>>>
> >>>> Fixes: 8c1b7dc9ba22 ("firmware: qcom: scm: Expose download-mode control")
> >>>> Signed-off-by: Mukesh Ojha <quic_mojha@quicinc.com>
> >>>
> >>> Hi, this has been backported to 5.15.111, however it seems to be
> >>> breaking reboot
> >>> on IPQ4019 by causing the board to then hang in SBL with:
> >>> root@OpenWrt:/# reboot
> >>> root@OpenWrt:/# [   76.473541] device lan1 left promiscuous mode
> >>> [   76.474204] br-lan: port 1(lan1) entered disabled state
> >>> [   76.527975] device lan2 left promiscuous mode
> >>> [   76.530301] br-lan: port 2(lan2) entered disabled state
> >>> [   76.579376] device lan3 left promiscuous mode
> >>> [   76.581698] br-lan: port 3(lan3) entered disabled state
> >>> [   76.638434] device lan4 left promiscuous mode
> >>> [   76.638777] br-lan: port 4(lan4) entered disabled state
> >>> [   76.978489] qca8k-ipq4019 c000000.switch wan: Link is Down
> >>> [   76.978883] device eth0 left promiscuous mode
> >>> [   76.987077] ipqess-edma c080000.ethernet eth0: Link is Down
> >>> [
> >>> Format: Log Type - Time(microsec) - Message - Optional Info
> >>> Log Type: B - Since Boot(Power On Reset),  D - Delta,  S - Statistic
> >>> S - QC_IMAGE_VERSION_STRING=BOOT.BF.3.1.1-00123
> >>> S - IMAGE_VARIANT_STRING=DAABANAZA
> >>> S - OEM_IMAGE_VERSION_STRING=CRM
> >>> S - Boot Config, 0x00000021
> >>> S - Reset status Config, 0x00000010
> >>> S - Core 0 Frequency, 0 MHz
> >>> B -       261 - PBL, Start
> >>> B -      1339 - bootable_media_detect_entry, Start
> >>> B -      1679 - bootable_media_detect_success, Start
> >>> B -      1693 - elf_loader_entry, Start
> >>> B -      5076 - auth_hash_seg_entry, Start
> >>> B -      7223 - auth_hash_seg_exit, Start
> >>> B -    578349 - elf_segs_hash_verify_entry, Start
> >>> B -    696356 - PBL, End
> >>> B -    696380 - SBL1, Start
> >>> B -    787236 - pm_device_init, Start
> >>> D -         7 - pm_device_init, Delta
> >>> B -    788701 - boot_flash_init, Start
> >>> D -     52782 - boot_flash_init, Delta
> >>> B -    845625 - boot_config_data_table_init, Start
> >>> D -      3836 - boot_config_data_table_init, Delta - (419 Bytes)
> >>> B -    852841 - clock_init, Start
> >>> D -      7566 - clock_init, Delta
> >>> B -    864883 - CDT version:2,Platform ID:9,Major ID:0,Minor
> >>> ID:0,Subtype:64
> >>> B -    868413 - sbl1_ddr_set_params, Start
> >>> B -    873402 - cpr_init, Start
> >>> D -         2 - cpr_init, Delta
> >>> B -    877842 - Pre_DDR_clock_init, Start
> >>> D -         4 - Pre_DDR_clock_init, Delta
> >>> D -     13234 - sbl1_ddr_set_params, Delta
> >>> B -    891155 - pm_driver_init, Start
> >>> D -         2 - pm_driver_init, Delta
> >>> B -    909105 - Image Load, Start
> >>> B -   1030210 - Boot error ocuured!. Error code: 303d
> >>>
> >>> Reverting the commit fixes rebooting.
> >>
> >> Hi Robert,
> >>
> >> Can you check if disable SDI [1] works with this issue
> >>
> >> https://lore.kernel.org/linux-arm-msm/20230518140224.2248782-1-robimarko@gmail.com/
> >>
> >> [1]
> >>
> >>
> >> diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c
> >> index fde33acd46b7..01496ceb7136 100644
> >> --- a/drivers/firmware/qcom_scm.c
> >> +++ b/drivers/firmware/qcom_scm.c
> >> @@ -1508,6 +1508,7 @@ static int qcom_scm_probe(struct platform_device
> >> *pdev)
> >>    static void qcom_scm_shutdown(struct platform_device *pdev)
> >>    {
> >>           /* Clean shutdown, disable download mode to allow normal restart */
> >> +       qcom_scm_disable_sdi();
> >>           qcom_scm_set_download_mode(false);
> >>    }
> >
> > Hi,
> > I can confirm reboot works this way as well.
>
> That's great, So, i don't need to revert the patch and you can
> add this in your patch without target specific check ?

Oh, you mean IPQ4019 not rebooting?
I haven't tested that, give me couple of minutes to try that out.
Cause, the link was just back to the SDI patchset.

Regards,
Robert
>
> -- Mukesh
>
> >
> > Regards,
> > Robert
> >>
> >>
> >> -- Mukesh
> >>
> >>>
> >>> Regards,
> >>> Robert
> >>>
> >>>> ---
> >>>> Changes in v3:
> >>>>     - Added Fixes tag.
> >>>>     - Removed it from below patch series, as it makes sense to go this
> >>>> independently.
> >>>>
> >>>> https://lore.kernel.org/lkml/1677664555-30191-1-git-send-email-quic_mojha@quicinc.com/
> >>>>
> >>>> Changes in v2:
> >>>>     - No change.
> >>>>
> >>>>    drivers/firmware/qcom_scm.c | 3 +--
> >>>>    1 file changed, 1 insertion(+), 2 deletions(-)
> >>>>
> >>>> diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c
> >>>> index 468d4d5..3e020d1 100644
> >>>> --- a/drivers/firmware/qcom_scm.c
> >>>> +++ b/drivers/firmware/qcom_scm.c
> >>>> @@ -1506,8 +1506,7 @@ static int qcom_scm_probe(struct platform_device
> >>>> *pdev)
> >>>>    static void qcom_scm_shutdown(struct platform_device *pdev)
> >>>>    {
> >>>>        /* Clean shutdown, disable download mode to allow normal restart */
> >>>> -    if (download_mode)
> >>>> -        qcom_scm_set_download_mode(false);
> >>>> +    qcom_scm_set_download_mode(false);
> >>>>    }
> >>>>    static const struct of_device_id qcom_scm_dt_match[] = {
  
Robert Marko May 22, 2023, 10:04 a.m. UTC | #11
On Mon, 22 May 2023 at 11:26, Robert Marko <robimarko@gmail.com> wrote:
>
> On Mon, 22 May 2023 at 11:11, Mukesh Ojha <quic_mojha@quicinc.com> wrote:
> >
> >
> >
> > On 5/22/2023 2:29 PM, Robert Marko wrote:
> > > On Mon, 22 May 2023 at 08:11, Mukesh Ojha <quic_mojha@quicinc.com> wrote:
> > >>
> > >>
> > >>
> > >> On 5/18/2023 3:45 PM, Robert Marko wrote:
> > >>>
> > >>> On 16. 03. 2023. 16:14, Mukesh Ojha wrote:
> > >>>> During normal restart of a system download bit should
> > >>>> be cleared irrespective of whether download mode is
> > >>>> set or not.
> > >>>>
> > >>>> Fixes: 8c1b7dc9ba22 ("firmware: qcom: scm: Expose download-mode control")
> > >>>> Signed-off-by: Mukesh Ojha <quic_mojha@quicinc.com>
> > >>>
> > >>> Hi, this has been backported to 5.15.111, however it seems to be
> > >>> breaking reboot
> > >>> on IPQ4019 by causing the board to then hang in SBL with:
> > >>> root@OpenWrt:/# reboot
> > >>> root@OpenWrt:/# [   76.473541] device lan1 left promiscuous mode
> > >>> [   76.474204] br-lan: port 1(lan1) entered disabled state
> > >>> [   76.527975] device lan2 left promiscuous mode
> > >>> [   76.530301] br-lan: port 2(lan2) entered disabled state
> > >>> [   76.579376] device lan3 left promiscuous mode
> > >>> [   76.581698] br-lan: port 3(lan3) entered disabled state
> > >>> [   76.638434] device lan4 left promiscuous mode
> > >>> [   76.638777] br-lan: port 4(lan4) entered disabled state
> > >>> [   76.978489] qca8k-ipq4019 c000000.switch wan: Link is Down
> > >>> [   76.978883] device eth0 left promiscuous mode
> > >>> [   76.987077] ipqess-edma c080000.ethernet eth0: Link is Down
> > >>> [
> > >>> Format: Log Type - Time(microsec) - Message - Optional Info
> > >>> Log Type: B - Since Boot(Power On Reset),  D - Delta,  S - Statistic
> > >>> S - QC_IMAGE_VERSION_STRING=BOOT.BF.3.1.1-00123
> > >>> S - IMAGE_VARIANT_STRING=DAABANAZA
> > >>> S - OEM_IMAGE_VERSION_STRING=CRM
> > >>> S - Boot Config, 0x00000021
> > >>> S - Reset status Config, 0x00000010
> > >>> S - Core 0 Frequency, 0 MHz
> > >>> B -       261 - PBL, Start
> > >>> B -      1339 - bootable_media_detect_entry, Start
> > >>> B -      1679 - bootable_media_detect_success, Start
> > >>> B -      1693 - elf_loader_entry, Start
> > >>> B -      5076 - auth_hash_seg_entry, Start
> > >>> B -      7223 - auth_hash_seg_exit, Start
> > >>> B -    578349 - elf_segs_hash_verify_entry, Start
> > >>> B -    696356 - PBL, End
> > >>> B -    696380 - SBL1, Start
> > >>> B -    787236 - pm_device_init, Start
> > >>> D -         7 - pm_device_init, Delta
> > >>> B -    788701 - boot_flash_init, Start
> > >>> D -     52782 - boot_flash_init, Delta
> > >>> B -    845625 - boot_config_data_table_init, Start
> > >>> D -      3836 - boot_config_data_table_init, Delta - (419 Bytes)
> > >>> B -    852841 - clock_init, Start
> > >>> D -      7566 - clock_init, Delta
> > >>> B -    864883 - CDT version:2,Platform ID:9,Major ID:0,Minor
> > >>> ID:0,Subtype:64
> > >>> B -    868413 - sbl1_ddr_set_params, Start
> > >>> B -    873402 - cpr_init, Start
> > >>> D -         2 - cpr_init, Delta
> > >>> B -    877842 - Pre_DDR_clock_init, Start
> > >>> D -         4 - Pre_DDR_clock_init, Delta
> > >>> D -     13234 - sbl1_ddr_set_params, Delta
> > >>> B -    891155 - pm_driver_init, Start
> > >>> D -         2 - pm_driver_init, Delta
> > >>> B -    909105 - Image Load, Start
> > >>> B -   1030210 - Boot error ocuured!. Error code: 303d
> > >>>
> > >>> Reverting the commit fixes rebooting.
> > >>
> > >> Hi Robert,
> > >>
> > >> Can you check if disable SDI [1] works with this issue
> > >>
> > >> https://lore.kernel.org/linux-arm-msm/20230518140224.2248782-1-robimarko@gmail.com/
> > >>
> > >> [1]
> > >>
> > >>
> > >> diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c
> > >> index fde33acd46b7..01496ceb7136 100644
> > >> --- a/drivers/firmware/qcom_scm.c
> > >> +++ b/drivers/firmware/qcom_scm.c
> > >> @@ -1508,6 +1508,7 @@ static int qcom_scm_probe(struct platform_device
> > >> *pdev)
> > >>    static void qcom_scm_shutdown(struct platform_device *pdev)
> > >>    {
> > >>           /* Clean shutdown, disable download mode to allow normal restart */
> > >> +       qcom_scm_disable_sdi();
> > >>           qcom_scm_set_download_mode(false);
> > >>    }
> > >
> > > Hi,
> > > I can confirm reboot works this way as well.
> >
> > That's great, So, i don't need to revert the patch and you can
> > add this in your patch without target specific check ?
>
> Oh, you mean IPQ4019 not rebooting?
> I haven't tested that, give me couple of minutes to try that out.
> Cause, the link was just back to the SDI patchset.

And, I can confirm that IPQ4019 does not reboot even with SDI disabled if dload
mode was set so it still needs a revert.

Regards,
Robert
>
> Regards,
> Robert
> >
> > -- Mukesh
> >
> > >
> > > Regards,
> > > Robert
> > >>
> > >>
> > >> -- Mukesh
> > >>
> > >>>
> > >>> Regards,
> > >>> Robert
> > >>>
> > >>>> ---
> > >>>> Changes in v3:
> > >>>>     - Added Fixes tag.
> > >>>>     - Removed it from below patch series, as it makes sense to go this
> > >>>> independently.
> > >>>>
> > >>>> https://lore.kernel.org/lkml/1677664555-30191-1-git-send-email-quic_mojha@quicinc.com/
> > >>>>
> > >>>> Changes in v2:
> > >>>>     - No change.
> > >>>>
> > >>>>    drivers/firmware/qcom_scm.c | 3 +--
> > >>>>    1 file changed, 1 insertion(+), 2 deletions(-)
> > >>>>
> > >>>> diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c
> > >>>> index 468d4d5..3e020d1 100644
> > >>>> --- a/drivers/firmware/qcom_scm.c
> > >>>> +++ b/drivers/firmware/qcom_scm.c
> > >>>> @@ -1506,8 +1506,7 @@ static int qcom_scm_probe(struct platform_device
> > >>>> *pdev)
> > >>>>    static void qcom_scm_shutdown(struct platform_device *pdev)
> > >>>>    {
> > >>>>        /* Clean shutdown, disable download mode to allow normal restart */
> > >>>> -    if (download_mode)
> > >>>> -        qcom_scm_set_download_mode(false);
> > >>>> +    qcom_scm_set_download_mode(false);
> > >>>>    }
> > >>>>    static const struct of_device_id qcom_scm_dt_match[] = {
  
Mukesh Ojha May 23, 2023, 9:42 a.m. UTC | #12
On 5/22/2023 3:34 PM, Robert Marko wrote:
> On Mon, 22 May 2023 at 11:26, Robert Marko <robimarko@gmail.com> wrote:
>>
>> On Mon, 22 May 2023 at 11:11, Mukesh Ojha <quic_mojha@quicinc.com> wrote:
>>>
>>>
>>>
>>> On 5/22/2023 2:29 PM, Robert Marko wrote:
>>>> On Mon, 22 May 2023 at 08:11, Mukesh Ojha <quic_mojha@quicinc.com> wrote:
>>>>>
>>>>>
>>>>>
>>>>> On 5/18/2023 3:45 PM, Robert Marko wrote:
>>>>>>
>>>>>> On 16. 03. 2023. 16:14, Mukesh Ojha wrote:
>>>>>>> During normal restart of a system download bit should
>>>>>>> be cleared irrespective of whether download mode is
>>>>>>> set or not.
>>>>>>>
>>>>>>> Fixes: 8c1b7dc9ba22 ("firmware: qcom: scm: Expose download-mode control")
>>>>>>> Signed-off-by: Mukesh Ojha <quic_mojha@quicinc.com>
>>>>>>
>>>>>> Hi, this has been backported to 5.15.111, however it seems to be
>>>>>> breaking reboot
>>>>>> on IPQ4019 by causing the board to then hang in SBL with:
>>>>>> root@OpenWrt:/# reboot
>>>>>> root@OpenWrt:/# [   76.473541] device lan1 left promiscuous mode
>>>>>> [   76.474204] br-lan: port 1(lan1) entered disabled state
>>>>>> [   76.527975] device lan2 left promiscuous mode
>>>>>> [   76.530301] br-lan: port 2(lan2) entered disabled state
>>>>>> [   76.579376] device lan3 left promiscuous mode
>>>>>> [   76.581698] br-lan: port 3(lan3) entered disabled state
>>>>>> [   76.638434] device lan4 left promiscuous mode
>>>>>> [   76.638777] br-lan: port 4(lan4) entered disabled state
>>>>>> [   76.978489] qca8k-ipq4019 c000000.switch wan: Link is Down
>>>>>> [   76.978883] device eth0 left promiscuous mode
>>>>>> [   76.987077] ipqess-edma c080000.ethernet eth0: Link is Down
>>>>>> [
>>>>>> Format: Log Type - Time(microsec) - Message - Optional Info
>>>>>> Log Type: B - Since Boot(Power On Reset),  D - Delta,  S - Statistic
>>>>>> S - QC_IMAGE_VERSION_STRING=BOOT.BF.3.1.1-00123
>>>>>> S - IMAGE_VARIANT_STRING=DAABANAZA
>>>>>> S - OEM_IMAGE_VERSION_STRING=CRM
>>>>>> S - Boot Config, 0x00000021
>>>>>> S - Reset status Config, 0x00000010
>>>>>> S - Core 0 Frequency, 0 MHz
>>>>>> B -       261 - PBL, Start
>>>>>> B -      1339 - bootable_media_detect_entry, Start
>>>>>> B -      1679 - bootable_media_detect_success, Start
>>>>>> B -      1693 - elf_loader_entry, Start
>>>>>> B -      5076 - auth_hash_seg_entry, Start
>>>>>> B -      7223 - auth_hash_seg_exit, Start
>>>>>> B -    578349 - elf_segs_hash_verify_entry, Start
>>>>>> B -    696356 - PBL, End
>>>>>> B -    696380 - SBL1, Start
>>>>>> B -    787236 - pm_device_init, Start
>>>>>> D -         7 - pm_device_init, Delta
>>>>>> B -    788701 - boot_flash_init, Start
>>>>>> D -     52782 - boot_flash_init, Delta
>>>>>> B -    845625 - boot_config_data_table_init, Start
>>>>>> D -      3836 - boot_config_data_table_init, Delta - (419 Bytes)
>>>>>> B -    852841 - clock_init, Start
>>>>>> D -      7566 - clock_init, Delta
>>>>>> B -    864883 - CDT version:2,Platform ID:9,Major ID:0,Minor
>>>>>> ID:0,Subtype:64
>>>>>> B -    868413 - sbl1_ddr_set_params, Start
>>>>>> B -    873402 - cpr_init, Start
>>>>>> D -         2 - cpr_init, Delta
>>>>>> B -    877842 - Pre_DDR_clock_init, Start
>>>>>> D -         4 - Pre_DDR_clock_init, Delta
>>>>>> D -     13234 - sbl1_ddr_set_params, Delta
>>>>>> B -    891155 - pm_driver_init, Start
>>>>>> D -         2 - pm_driver_init, Delta
>>>>>> B -    909105 - Image Load, Start
>>>>>> B -   1030210 - Boot error ocuured!. Error code: 303d
>>>>>>
>>>>>> Reverting the commit fixes rebooting.
>>>>>
>>>>> Hi Robert,
>>>>>
>>>>> Can you check if disable SDI [1] works with this issue
>>>>>
>>>>> https://lore.kernel.org/linux-arm-msm/20230518140224.2248782-1-robimarko@gmail.com/
>>>>>
>>>>> [1]
>>>>>
>>>>>
>>>>> diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c
>>>>> index fde33acd46b7..01496ceb7136 100644
>>>>> --- a/drivers/firmware/qcom_scm.c
>>>>> +++ b/drivers/firmware/qcom_scm.c
>>>>> @@ -1508,6 +1508,7 @@ static int qcom_scm_probe(struct platform_device
>>>>> *pdev)
>>>>>     static void qcom_scm_shutdown(struct platform_device *pdev)
>>>>>     {
>>>>>            /* Clean shutdown, disable download mode to allow normal restart */
>>>>> +       qcom_scm_disable_sdi();
>>>>>            qcom_scm_set_download_mode(false);
>>>>>     }
>>>>
>>>> Hi,
>>>> I can confirm reboot works this way as well.
>>>
>>> That's great, So, i don't need to revert the patch and you can
>>> add this in your patch without target specific check ?
>>
>> Oh, you mean IPQ4019 not rebooting?
>> I haven't tested that, give me couple of minutes to try that out.
>> Cause, the link was just back to the SDI patchset.
> 
> And, I can confirm that IPQ4019 does not reboot even with SDI disabled if dload
> mode was set so it still needs a revert.

Ok, So, before we go for revert of the change.

- How do you generally collect the ram dump on your device on crash ?
   did you check if you get any error when qcom_scm_set_download_mode()
   get called.


-- Mukesh

> 
> Regards,
> Robert
>>
>> Regards,
>> Robert
>>>
>>> -- Mukesh
>>>
>>>>
>>>> Regards,
>>>> Robert
>>>>>
>>>>>
>>>>> -- Mukesh
>>>>>
>>>>>>
>>>>>> Regards,
>>>>>> Robert
>>>>>>
>>>>>>> ---
>>>>>>> Changes in v3:
>>>>>>>      - Added Fixes tag.
>>>>>>>      - Removed it from below patch series, as it makes sense to go this
>>>>>>> independently.
>>>>>>>
>>>>>>> https://lore.kernel.org/lkml/1677664555-30191-1-git-send-email-quic_mojha@quicinc.com/
>>>>>>>
>>>>>>> Changes in v2:
>>>>>>>      - No change.
>>>>>>>
>>>>>>>     drivers/firmware/qcom_scm.c | 3 +--
>>>>>>>     1 file changed, 1 insertion(+), 2 deletions(-)
>>>>>>>
>>>>>>> diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c
>>>>>>> index 468d4d5..3e020d1 100644
>>>>>>> --- a/drivers/firmware/qcom_scm.c
>>>>>>> +++ b/drivers/firmware/qcom_scm.c
>>>>>>> @@ -1506,8 +1506,7 @@ static int qcom_scm_probe(struct platform_device
>>>>>>> *pdev)
>>>>>>>     static void qcom_scm_shutdown(struct platform_device *pdev)
>>>>>>>     {
>>>>>>>         /* Clean shutdown, disable download mode to allow normal restart */
>>>>>>> -    if (download_mode)
>>>>>>> -        qcom_scm_set_download_mode(false);
>>>>>>> +    qcom_scm_set_download_mode(false);
>>>>>>>     }
>>>>>>>     static const struct of_device_id qcom_scm_dt_match[] = {
  
Robert Marko May 25, 2023, 9:43 p.m. UTC | #13
On Tue, 23 May 2023 at 11:42, Mukesh Ojha <quic_mojha@quicinc.com> wrote:
>
>
>
> On 5/22/2023 3:34 PM, Robert Marko wrote:
> > On Mon, 22 May 2023 at 11:26, Robert Marko <robimarko@gmail.com> wrote:
> >>
> >> On Mon, 22 May 2023 at 11:11, Mukesh Ojha <quic_mojha@quicinc.com> wrote:
> >>>
> >>>
> >>>
> >>> On 5/22/2023 2:29 PM, Robert Marko wrote:
> >>>> On Mon, 22 May 2023 at 08:11, Mukesh Ojha <quic_mojha@quicinc.com> wrote:
> >>>>>
> >>>>>
> >>>>>
> >>>>> On 5/18/2023 3:45 PM, Robert Marko wrote:
> >>>>>>
> >>>>>> On 16. 03. 2023. 16:14, Mukesh Ojha wrote:
> >>>>>>> During normal restart of a system download bit should
> >>>>>>> be cleared irrespective of whether download mode is
> >>>>>>> set or not.
> >>>>>>>
> >>>>>>> Fixes: 8c1b7dc9ba22 ("firmware: qcom: scm: Expose download-mode control")
> >>>>>>> Signed-off-by: Mukesh Ojha <quic_mojha@quicinc.com>
> >>>>>>
> >>>>>> Hi, this has been backported to 5.15.111, however it seems to be
> >>>>>> breaking reboot
> >>>>>> on IPQ4019 by causing the board to then hang in SBL with:
> >>>>>> root@OpenWrt:/# reboot
> >>>>>> root@OpenWrt:/# [   76.473541] device lan1 left promiscuous mode
> >>>>>> [   76.474204] br-lan: port 1(lan1) entered disabled state
> >>>>>> [   76.527975] device lan2 left promiscuous mode
> >>>>>> [   76.530301] br-lan: port 2(lan2) entered disabled state
> >>>>>> [   76.579376] device lan3 left promiscuous mode
> >>>>>> [   76.581698] br-lan: port 3(lan3) entered disabled state
> >>>>>> [   76.638434] device lan4 left promiscuous mode
> >>>>>> [   76.638777] br-lan: port 4(lan4) entered disabled state
> >>>>>> [   76.978489] qca8k-ipq4019 c000000.switch wan: Link is Down
> >>>>>> [   76.978883] device eth0 left promiscuous mode
> >>>>>> [   76.987077] ipqess-edma c080000.ethernet eth0: Link is Down
> >>>>>> [
> >>>>>> Format: Log Type - Time(microsec) - Message - Optional Info
> >>>>>> Log Type: B - Since Boot(Power On Reset),  D - Delta,  S - Statistic
> >>>>>> S - QC_IMAGE_VERSION_STRING=BOOT.BF.3.1.1-00123
> >>>>>> S - IMAGE_VARIANT_STRING=DAABANAZA
> >>>>>> S - OEM_IMAGE_VERSION_STRING=CRM
> >>>>>> S - Boot Config, 0x00000021
> >>>>>> S - Reset status Config, 0x00000010
> >>>>>> S - Core 0 Frequency, 0 MHz
> >>>>>> B -       261 - PBL, Start
> >>>>>> B -      1339 - bootable_media_detect_entry, Start
> >>>>>> B -      1679 - bootable_media_detect_success, Start
> >>>>>> B -      1693 - elf_loader_entry, Start
> >>>>>> B -      5076 - auth_hash_seg_entry, Start
> >>>>>> B -      7223 - auth_hash_seg_exit, Start
> >>>>>> B -    578349 - elf_segs_hash_verify_entry, Start
> >>>>>> B -    696356 - PBL, End
> >>>>>> B -    696380 - SBL1, Start
> >>>>>> B -    787236 - pm_device_init, Start
> >>>>>> D -         7 - pm_device_init, Delta
> >>>>>> B -    788701 - boot_flash_init, Start
> >>>>>> D -     52782 - boot_flash_init, Delta
> >>>>>> B -    845625 - boot_config_data_table_init, Start
> >>>>>> D -      3836 - boot_config_data_table_init, Delta - (419 Bytes)
> >>>>>> B -    852841 - clock_init, Start
> >>>>>> D -      7566 - clock_init, Delta
> >>>>>> B -    864883 - CDT version:2,Platform ID:9,Major ID:0,Minor
> >>>>>> ID:0,Subtype:64
> >>>>>> B -    868413 - sbl1_ddr_set_params, Start
> >>>>>> B -    873402 - cpr_init, Start
> >>>>>> D -         2 - cpr_init, Delta
> >>>>>> B -    877842 - Pre_DDR_clock_init, Start
> >>>>>> D -         4 - Pre_DDR_clock_init, Delta
> >>>>>> D -     13234 - sbl1_ddr_set_params, Delta
> >>>>>> B -    891155 - pm_driver_init, Start
> >>>>>> D -         2 - pm_driver_init, Delta
> >>>>>> B -    909105 - Image Load, Start
> >>>>>> B -   1030210 - Boot error ocuured!. Error code: 303d
> >>>>>>
> >>>>>> Reverting the commit fixes rebooting.
> >>>>>
> >>>>> Hi Robert,
> >>>>>
> >>>>> Can you check if disable SDI [1] works with this issue
> >>>>>
> >>>>> https://lore.kernel.org/linux-arm-msm/20230518140224.2248782-1-robimarko@gmail.com/
> >>>>>
> >>>>> [1]
> >>>>>
> >>>>>
> >>>>> diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c
> >>>>> index fde33acd46b7..01496ceb7136 100644
> >>>>> --- a/drivers/firmware/qcom_scm.c
> >>>>> +++ b/drivers/firmware/qcom_scm.c
> >>>>> @@ -1508,6 +1508,7 @@ static int qcom_scm_probe(struct platform_device
> >>>>> *pdev)
> >>>>>     static void qcom_scm_shutdown(struct platform_device *pdev)
> >>>>>     {
> >>>>>            /* Clean shutdown, disable download mode to allow normal restart */
> >>>>> +       qcom_scm_disable_sdi();
> >>>>>            qcom_scm_set_download_mode(false);
> >>>>>     }
> >>>>
> >>>> Hi,
> >>>> I can confirm reboot works this way as well.
> >>>
> >>> That's great, So, i don't need to revert the patch and you can
> >>> add this in your patch without target specific check ?
> >>
> >> Oh, you mean IPQ4019 not rebooting?
> >> I haven't tested that, give me couple of minutes to try that out.
> >> Cause, the link was just back to the SDI patchset.
> >
> > And, I can confirm that IPQ4019 does not reboot even with SDI disabled if dload
> > mode was set so it still needs a revert.
>
> Ok, So, before we go for revert of the change.
>
> - How do you generally collect the ram dump on your device on crash ?
>    did you check if you get any error when qcom_scm_set_download_mode()
>    get called.

Hi,
Unfortunately, I dont have a way to collect the RAM dump in this case.

I checked and __qcom_scm_set_dload_mode returns 0 and there are no
errors.

Regards,
Robert
>
>
> -- Mukesh
>
> >
> > Regards,
> > Robert
> >>
> >> Regards,
> >> Robert
> >>>
> >>> -- Mukesh
> >>>
> >>>>
> >>>> Regards,
> >>>> Robert
> >>>>>
> >>>>>
> >>>>> -- Mukesh
> >>>>>
> >>>>>>
> >>>>>> Regards,
> >>>>>> Robert
> >>>>>>
> >>>>>>> ---
> >>>>>>> Changes in v3:
> >>>>>>>      - Added Fixes tag.
> >>>>>>>      - Removed it from below patch series, as it makes sense to go this
> >>>>>>> independently.
> >>>>>>>
> >>>>>>> https://lore.kernel.org/lkml/1677664555-30191-1-git-send-email-quic_mojha@quicinc.com/
> >>>>>>>
> >>>>>>> Changes in v2:
> >>>>>>>      - No change.
> >>>>>>>
> >>>>>>>     drivers/firmware/qcom_scm.c | 3 +--
> >>>>>>>     1 file changed, 1 insertion(+), 2 deletions(-)
> >>>>>>>
> >>>>>>> diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c
> >>>>>>> index 468d4d5..3e020d1 100644
> >>>>>>> --- a/drivers/firmware/qcom_scm.c
> >>>>>>> +++ b/drivers/firmware/qcom_scm.c
> >>>>>>> @@ -1506,8 +1506,7 @@ static int qcom_scm_probe(struct platform_device
> >>>>>>> *pdev)
> >>>>>>>     static void qcom_scm_shutdown(struct platform_device *pdev)
> >>>>>>>     {
> >>>>>>>         /* Clean shutdown, disable download mode to allow normal restart */
> >>>>>>> -    if (download_mode)
> >>>>>>> -        qcom_scm_set_download_mode(false);
> >>>>>>> +    qcom_scm_set_download_mode(false);
> >>>>>>>     }
> >>>>>>>     static const struct of_device_id qcom_scm_dt_match[] = {
  
Mukesh Ojha Oct. 26, 2023, 3:15 p.m. UTC | #14
Hey Robert,

Just remembered this thread again,

is this issue got fixed with

https://lore.kernel.org/lkml/20230816164641.3371878-1-robimarko@gmail.com/


-Mukesh

On 5/26/2023 3:13 AM, Robert Marko wrote:
> On Tue, 23 May 2023 at 11:42, Mukesh Ojha <quic_mojha@quicinc.com> wrote:
>>
>>
>>
>> On 5/22/2023 3:34 PM, Robert Marko wrote:
>>> On Mon, 22 May 2023 at 11:26, Robert Marko <robimarko@gmail.com> wrote:
>>>>
>>>> On Mon, 22 May 2023 at 11:11, Mukesh Ojha <quic_mojha@quicinc.com> wrote:
>>>>>
>>>>>
>>>>>
>>>>> On 5/22/2023 2:29 PM, Robert Marko wrote:
>>>>>> On Mon, 22 May 2023 at 08:11, Mukesh Ojha <quic_mojha@quicinc.com> wrote:
>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>> On 5/18/2023 3:45 PM, Robert Marko wrote:
>>>>>>>>
>>>>>>>> On 16. 03. 2023. 16:14, Mukesh Ojha wrote:
>>>>>>>>> During normal restart of a system download bit should
>>>>>>>>> be cleared irrespective of whether download mode is
>>>>>>>>> set or not.
>>>>>>>>>
>>>>>>>>> Fixes: 8c1b7dc9ba22 ("firmware: qcom: scm: Expose download-mode control")
>>>>>>>>> Signed-off-by: Mukesh Ojha <quic_mojha@quicinc.com>
>>>>>>>>
>>>>>>>> Hi, this has been backported to 5.15.111, however it seems to be
>>>>>>>> breaking reboot
>>>>>>>> on IPQ4019 by causing the board to then hang in SBL with:
>>>>>>>> root@OpenWrt:/# reboot
>>>>>>>> root@OpenWrt:/# [   76.473541] device lan1 left promiscuous mode
>>>>>>>> [   76.474204] br-lan: port 1(lan1) entered disabled state
>>>>>>>> [   76.527975] device lan2 left promiscuous mode
>>>>>>>> [   76.530301] br-lan: port 2(lan2) entered disabled state
>>>>>>>> [   76.579376] device lan3 left promiscuous mode
>>>>>>>> [   76.581698] br-lan: port 3(lan3) entered disabled state
>>>>>>>> [   76.638434] device lan4 left promiscuous mode
>>>>>>>> [   76.638777] br-lan: port 4(lan4) entered disabled state
>>>>>>>> [   76.978489] qca8k-ipq4019 c000000.switch wan: Link is Down
>>>>>>>> [   76.978883] device eth0 left promiscuous mode
>>>>>>>> [   76.987077] ipqess-edma c080000.ethernet eth0: Link is Down
>>>>>>>> [
>>>>>>>> Format: Log Type - Time(microsec) - Message - Optional Info
>>>>>>>> Log Type: B - Since Boot(Power On Reset),  D - Delta,  S - Statistic
>>>>>>>> S - QC_IMAGE_VERSION_STRING=BOOT.BF.3.1.1-00123
>>>>>>>> S - IMAGE_VARIANT_STRING=DAABANAZA
>>>>>>>> S - OEM_IMAGE_VERSION_STRING=CRM
>>>>>>>> S - Boot Config, 0x00000021
>>>>>>>> S - Reset status Config, 0x00000010
>>>>>>>> S - Core 0 Frequency, 0 MHz
>>>>>>>> B -       261 - PBL, Start
>>>>>>>> B -      1339 - bootable_media_detect_entry, Start
>>>>>>>> B -      1679 - bootable_media_detect_success, Start
>>>>>>>> B -      1693 - elf_loader_entry, Start
>>>>>>>> B -      5076 - auth_hash_seg_entry, Start
>>>>>>>> B -      7223 - auth_hash_seg_exit, Start
>>>>>>>> B -    578349 - elf_segs_hash_verify_entry, Start
>>>>>>>> B -    696356 - PBL, End
>>>>>>>> B -    696380 - SBL1, Start
>>>>>>>> B -    787236 - pm_device_init, Start
>>>>>>>> D -         7 - pm_device_init, Delta
>>>>>>>> B -    788701 - boot_flash_init, Start
>>>>>>>> D -     52782 - boot_flash_init, Delta
>>>>>>>> B -    845625 - boot_config_data_table_init, Start
>>>>>>>> D -      3836 - boot_config_data_table_init, Delta - (419 Bytes)
>>>>>>>> B -    852841 - clock_init, Start
>>>>>>>> D -      7566 - clock_init, Delta
>>>>>>>> B -    864883 - CDT version:2,Platform ID:9,Major ID:0,Minor
>>>>>>>> ID:0,Subtype:64
>>>>>>>> B -    868413 - sbl1_ddr_set_params, Start
>>>>>>>> B -    873402 - cpr_init, Start
>>>>>>>> D -         2 - cpr_init, Delta
>>>>>>>> B -    877842 - Pre_DDR_clock_init, Start
>>>>>>>> D -         4 - Pre_DDR_clock_init, Delta
>>>>>>>> D -     13234 - sbl1_ddr_set_params, Delta
>>>>>>>> B -    891155 - pm_driver_init, Start
>>>>>>>> D -         2 - pm_driver_init, Delta
>>>>>>>> B -    909105 - Image Load, Start
>>>>>>>> B -   1030210 - Boot error ocuured!. Error code: 303d
>>>>>>>>
>>>>>>>> Reverting the commit fixes rebooting.
>>>>>>>
>>>>>>> Hi Robert,
>>>>>>>
>>>>>>> Can you check if disable SDI [1] works with this issue
>>>>>>>
>>>>>>> https://lore.kernel.org/linux-arm-msm/20230518140224.2248782-1-robimarko@gmail.com/
>>>>>>>
>>>>>>> [1]
>>>>>>>
>>>>>>>
>>>>>>> diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c
>>>>>>> index fde33acd46b7..01496ceb7136 100644
>>>>>>> --- a/drivers/firmware/qcom_scm.c
>>>>>>> +++ b/drivers/firmware/qcom_scm.c
>>>>>>> @@ -1508,6 +1508,7 @@ static int qcom_scm_probe(struct platform_device
>>>>>>> *pdev)
>>>>>>>      static void qcom_scm_shutdown(struct platform_device *pdev)
>>>>>>>      {
>>>>>>>             /* Clean shutdown, disable download mode to allow normal restart */
>>>>>>> +       qcom_scm_disable_sdi();
>>>>>>>             qcom_scm_set_download_mode(false);
>>>>>>>      }
>>>>>>
>>>>>> Hi,
>>>>>> I can confirm reboot works this way as well.
>>>>>
>>>>> That's great, So, i don't need to revert the patch and you can
>>>>> add this in your patch without target specific check ?
>>>>
>>>> Oh, you mean IPQ4019 not rebooting?
>>>> I haven't tested that, give me couple of minutes to try that out.
>>>> Cause, the link was just back to the SDI patchset.
>>>
>>> And, I can confirm that IPQ4019 does not reboot even with SDI disabled if dload
>>> mode was set so it still needs a revert.
>>
>> Ok, So, before we go for revert of the change.
>>
>> - How do you generally collect the ram dump on your device on crash ?
>>     did you check if you get any error when qcom_scm_set_download_mode()
>>     get called.
> 
> Hi,
> Unfortunately, I dont have a way to collect the RAM dump in this case.
> 
> I checked and __qcom_scm_set_dload_mode returns 0 and there are no
> errors.
> 
> Regards,
> Robert
>>
>>
>> -- Mukesh
>>
>>>
>>> Regards,
>>> Robert
>>>>
>>>> Regards,
>>>> Robert
>>>>>
>>>>> -- Mukesh
>>>>>
>>>>>>
>>>>>> Regards,
>>>>>> Robert
>>>>>>>
>>>>>>>
>>>>>>> -- Mukesh
>>>>>>>
>>>>>>>>
>>>>>>>> Regards,
>>>>>>>> Robert
>>>>>>>>
>>>>>>>>> ---
>>>>>>>>> Changes in v3:
>>>>>>>>>       - Added Fixes tag.
>>>>>>>>>       - Removed it from below patch series, as it makes sense to go this
>>>>>>>>> independently.
>>>>>>>>>
>>>>>>>>> https://lore.kernel.org/lkml/1677664555-30191-1-git-send-email-quic_mojha@quicinc.com/
>>>>>>>>>
>>>>>>>>> Changes in v2:
>>>>>>>>>       - No change.
>>>>>>>>>
>>>>>>>>>      drivers/firmware/qcom_scm.c | 3 +--
>>>>>>>>>      1 file changed, 1 insertion(+), 2 deletions(-)
>>>>>>>>>
>>>>>>>>> diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c
>>>>>>>>> index 468d4d5..3e020d1 100644
>>>>>>>>> --- a/drivers/firmware/qcom_scm.c
>>>>>>>>> +++ b/drivers/firmware/qcom_scm.c
>>>>>>>>> @@ -1506,8 +1506,7 @@ static int qcom_scm_probe(struct platform_device
>>>>>>>>> *pdev)
>>>>>>>>>      static void qcom_scm_shutdown(struct platform_device *pdev)
>>>>>>>>>      {
>>>>>>>>>          /* Clean shutdown, disable download mode to allow normal restart */
>>>>>>>>> -    if (download_mode)
>>>>>>>>> -        qcom_scm_set_download_mode(false);
>>>>>>>>> +    qcom_scm_set_download_mode(false);
>>>>>>>>>      }
>>>>>>>>>      static const struct of_device_id qcom_scm_dt_match[] = {
  
Robert Marko Nov. 1, 2023, 9:51 a.m. UTC | #15
On Thu, 26 Oct 2023 at 17:16, Mukesh Ojha <quic_mojha@quicinc.com> wrote:
>
> Hey Robert,
>
> Just remembered this thread again,
>
> is this issue got fixed with
>
> https://lore.kernel.org/lkml/20230816164641.3371878-1-robimarko@gmail.com/

Sadly no, as this issue is affecting all IPQ4019 boards and not just
the ones that have SDI enabled.

Regards,
Robert
>
>
> -Mukesh
>
> On 5/26/2023 3:13 AM, Robert Marko wrote:
> > On Tue, 23 May 2023 at 11:42, Mukesh Ojha <quic_mojha@quicinc.com> wrote:
> >>
> >>
> >>
> >> On 5/22/2023 3:34 PM, Robert Marko wrote:
> >>> On Mon, 22 May 2023 at 11:26, Robert Marko <robimarko@gmail.com> wrote:
> >>>>
> >>>> On Mon, 22 May 2023 at 11:11, Mukesh Ojha <quic_mojha@quicinc.com> wrote:
> >>>>>
> >>>>>
> >>>>>
> >>>>> On 5/22/2023 2:29 PM, Robert Marko wrote:
> >>>>>> On Mon, 22 May 2023 at 08:11, Mukesh Ojha <quic_mojha@quicinc.com> wrote:
> >>>>>>>
> >>>>>>>
> >>>>>>>
> >>>>>>> On 5/18/2023 3:45 PM, Robert Marko wrote:
> >>>>>>>>
> >>>>>>>> On 16. 03. 2023. 16:14, Mukesh Ojha wrote:
> >>>>>>>>> During normal restart of a system download bit should
> >>>>>>>>> be cleared irrespective of whether download mode is
> >>>>>>>>> set or not.
> >>>>>>>>>
> >>>>>>>>> Fixes: 8c1b7dc9ba22 ("firmware: qcom: scm: Expose download-mode control")
> >>>>>>>>> Signed-off-by: Mukesh Ojha <quic_mojha@quicinc.com>
> >>>>>>>>
> >>>>>>>> Hi, this has been backported to 5.15.111, however it seems to be
> >>>>>>>> breaking reboot
> >>>>>>>> on IPQ4019 by causing the board to then hang in SBL with:
> >>>>>>>> root@OpenWrt:/# reboot
> >>>>>>>> root@OpenWrt:/# [   76.473541] device lan1 left promiscuous mode
> >>>>>>>> [   76.474204] br-lan: port 1(lan1) entered disabled state
> >>>>>>>> [   76.527975] device lan2 left promiscuous mode
> >>>>>>>> [   76.530301] br-lan: port 2(lan2) entered disabled state
> >>>>>>>> [   76.579376] device lan3 left promiscuous mode
> >>>>>>>> [   76.581698] br-lan: port 3(lan3) entered disabled state
> >>>>>>>> [   76.638434] device lan4 left promiscuous mode
> >>>>>>>> [   76.638777] br-lan: port 4(lan4) entered disabled state
> >>>>>>>> [   76.978489] qca8k-ipq4019 c000000.switch wan: Link is Down
> >>>>>>>> [   76.978883] device eth0 left promiscuous mode
> >>>>>>>> [   76.987077] ipqess-edma c080000.ethernet eth0: Link is Down
> >>>>>>>> [
> >>>>>>>> Format: Log Type - Time(microsec) - Message - Optional Info
> >>>>>>>> Log Type: B - Since Boot(Power On Reset),  D - Delta,  S - Statistic
> >>>>>>>> S - QC_IMAGE_VERSION_STRING=BOOT.BF.3.1.1-00123
> >>>>>>>> S - IMAGE_VARIANT_STRING=DAABANAZA
> >>>>>>>> S - OEM_IMAGE_VERSION_STRING=CRM
> >>>>>>>> S - Boot Config, 0x00000021
> >>>>>>>> S - Reset status Config, 0x00000010
> >>>>>>>> S - Core 0 Frequency, 0 MHz
> >>>>>>>> B -       261 - PBL, Start
> >>>>>>>> B -      1339 - bootable_media_detect_entry, Start
> >>>>>>>> B -      1679 - bootable_media_detect_success, Start
> >>>>>>>> B -      1693 - elf_loader_entry, Start
> >>>>>>>> B -      5076 - auth_hash_seg_entry, Start
> >>>>>>>> B -      7223 - auth_hash_seg_exit, Start
> >>>>>>>> B -    578349 - elf_segs_hash_verify_entry, Start
> >>>>>>>> B -    696356 - PBL, End
> >>>>>>>> B -    696380 - SBL1, Start
> >>>>>>>> B -    787236 - pm_device_init, Start
> >>>>>>>> D -         7 - pm_device_init, Delta
> >>>>>>>> B -    788701 - boot_flash_init, Start
> >>>>>>>> D -     52782 - boot_flash_init, Delta
> >>>>>>>> B -    845625 - boot_config_data_table_init, Start
> >>>>>>>> D -      3836 - boot_config_data_table_init, Delta - (419 Bytes)
> >>>>>>>> B -    852841 - clock_init, Start
> >>>>>>>> D -      7566 - clock_init, Delta
> >>>>>>>> B -    864883 - CDT version:2,Platform ID:9,Major ID:0,Minor
> >>>>>>>> ID:0,Subtype:64
> >>>>>>>> B -    868413 - sbl1_ddr_set_params, Start
> >>>>>>>> B -    873402 - cpr_init, Start
> >>>>>>>> D -         2 - cpr_init, Delta
> >>>>>>>> B -    877842 - Pre_DDR_clock_init, Start
> >>>>>>>> D -         4 - Pre_DDR_clock_init, Delta
> >>>>>>>> D -     13234 - sbl1_ddr_set_params, Delta
> >>>>>>>> B -    891155 - pm_driver_init, Start
> >>>>>>>> D -         2 - pm_driver_init, Delta
> >>>>>>>> B -    909105 - Image Load, Start
> >>>>>>>> B -   1030210 - Boot error ocuured!. Error code: 303d
> >>>>>>>>
> >>>>>>>> Reverting the commit fixes rebooting.
> >>>>>>>
> >>>>>>> Hi Robert,
> >>>>>>>
> >>>>>>> Can you check if disable SDI [1] works with this issue
> >>>>>>>
> >>>>>>> https://lore.kernel.org/linux-arm-msm/20230518140224.2248782-1-robimarko@gmail.com/
> >>>>>>>
> >>>>>>> [1]
> >>>>>>>
> >>>>>>>
> >>>>>>> diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c
> >>>>>>> index fde33acd46b7..01496ceb7136 100644
> >>>>>>> --- a/drivers/firmware/qcom_scm.c
> >>>>>>> +++ b/drivers/firmware/qcom_scm.c
> >>>>>>> @@ -1508,6 +1508,7 @@ static int qcom_scm_probe(struct platform_device
> >>>>>>> *pdev)
> >>>>>>>      static void qcom_scm_shutdown(struct platform_device *pdev)
> >>>>>>>      {
> >>>>>>>             /* Clean shutdown, disable download mode to allow normal restart */
> >>>>>>> +       qcom_scm_disable_sdi();
> >>>>>>>             qcom_scm_set_download_mode(false);
> >>>>>>>      }
> >>>>>>
> >>>>>> Hi,
> >>>>>> I can confirm reboot works this way as well.
> >>>>>
> >>>>> That's great, So, i don't need to revert the patch and you can
> >>>>> add this in your patch without target specific check ?
> >>>>
> >>>> Oh, you mean IPQ4019 not rebooting?
> >>>> I haven't tested that, give me couple of minutes to try that out.
> >>>> Cause, the link was just back to the SDI patchset.
> >>>
> >>> And, I can confirm that IPQ4019 does not reboot even with SDI disabled if dload
> >>> mode was set so it still needs a revert.
> >>
> >> Ok, So, before we go for revert of the change.
> >>
> >> - How do you generally collect the ram dump on your device on crash ?
> >>     did you check if you get any error when qcom_scm_set_download_mode()
> >>     get called.
> >
> > Hi,
> > Unfortunately, I dont have a way to collect the RAM dump in this case.
> >
> > I checked and __qcom_scm_set_dload_mode returns 0 and there are no
> > errors.
> >
> > Regards,
> > Robert
> >>
> >>
> >> -- Mukesh
> >>
> >>>
> >>> Regards,
> >>> Robert
> >>>>
> >>>> Regards,
> >>>> Robert
> >>>>>
> >>>>> -- Mukesh
> >>>>>
> >>>>>>
> >>>>>> Regards,
> >>>>>> Robert
> >>>>>>>
> >>>>>>>
> >>>>>>> -- Mukesh
> >>>>>>>
> >>>>>>>>
> >>>>>>>> Regards,
> >>>>>>>> Robert
> >>>>>>>>
> >>>>>>>>> ---
> >>>>>>>>> Changes in v3:
> >>>>>>>>>       - Added Fixes tag.
> >>>>>>>>>       - Removed it from below patch series, as it makes sense to go this
> >>>>>>>>> independently.
> >>>>>>>>>
> >>>>>>>>> https://lore.kernel.org/lkml/1677664555-30191-1-git-send-email-quic_mojha@quicinc.com/
> >>>>>>>>>
> >>>>>>>>> Changes in v2:
> >>>>>>>>>       - No change.
> >>>>>>>>>
> >>>>>>>>>      drivers/firmware/qcom_scm.c | 3 +--
> >>>>>>>>>      1 file changed, 1 insertion(+), 2 deletions(-)
> >>>>>>>>>
> >>>>>>>>> diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c
> >>>>>>>>> index 468d4d5..3e020d1 100644
> >>>>>>>>> --- a/drivers/firmware/qcom_scm.c
> >>>>>>>>> +++ b/drivers/firmware/qcom_scm.c
> >>>>>>>>> @@ -1506,8 +1506,7 @@ static int qcom_scm_probe(struct platform_device
> >>>>>>>>> *pdev)
> >>>>>>>>>      static void qcom_scm_shutdown(struct platform_device *pdev)
> >>>>>>>>>      {
> >>>>>>>>>          /* Clean shutdown, disable download mode to allow normal restart */
> >>>>>>>>> -    if (download_mode)
> >>>>>>>>> -        qcom_scm_set_download_mode(false);
> >>>>>>>>> +    qcom_scm_set_download_mode(false);
> >>>>>>>>>      }
> >>>>>>>>>      static const struct of_device_id qcom_scm_dt_match[] = {
  
Mukesh Ojha Nov. 1, 2023, 10:41 a.m. UTC | #16
+@Sricharan

On 11/1/2023 3:21 PM, Robert Marko wrote:
> On Thu, 26 Oct 2023 at 17:16, Mukesh Ojha <quic_mojha@quicinc.com> wrote:
>>
>> Hey Robert,
>>
>> Just remembered this thread again,
>>
>> is this issue got fixed with
>>
>> https://lore.kernel.org/lkml/20230816164641.3371878-1-robimarko@gmail.com/
> 
> Sadly no, as this issue is affecting all IPQ4019 boards and not just
> the ones that have SDI enabled.

unless, enabling CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT has problem in 
your SoC, i don't think why current patch can cause issue in your
board.

Can you please help with some debug as i don't have this target but
interested in fixing this issue if it is indeed due to kernel.

whether, CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT works on your target 
basically if qcom_scm_set_download_mode(true); return success and
reboot works with that.

Or may be only writing qcom_scm_set_download_mode(false); has some
unknown affect in the firmware and later causing a problem in reboot.


-Mukesh
  

Patch

diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c
index 468d4d5..3e020d1 100644
--- a/drivers/firmware/qcom_scm.c
+++ b/drivers/firmware/qcom_scm.c
@@ -1506,8 +1506,7 @@  static int qcom_scm_probe(struct platform_device *pdev)
 static void qcom_scm_shutdown(struct platform_device *pdev)
 {
 	/* Clean shutdown, disable download mode to allow normal restart */
-	if (download_mode)
-		qcom_scm_set_download_mode(false);
+	qcom_scm_set_download_mode(false);
 }
 
 static const struct of_device_id qcom_scm_dt_match[] = {