Re: [linux-yocto] [kernel-source][PATCH 1/1] LIN1021-3841 [PATCH] firmware: stratix10-svc: fix a conflict caused by introducing upstream commit

2022-07-12 Thread Paul Gortmaker
[[linux-yocto] [kernel-source][PATCH 1/1] LIN1021-3841 [PATCH] firmware: 
stratix10-svc: fix a conflict caused by introducing upstream commit] On 
12/07/2022 (Tue 12:01) Carlos Dominguez wrote:

> This building issue is caused by introducing upstream commit
> 5a0793ac66ac("firmware: stratix10-svc: fix a missing check on list iterator")
> that conflicts with sdk patch. So, adjust code to merge sdk patch and
>  upstream commit together.

This doesn't specify what version it is meant for (v5.10, v5.15 ??) and
it doesn't specify which branch(es) on that version it should be applied
to.  Also "conflicts with sdk patch" is vague.  Please list the SDK
commit in standard format - 12 char of commit SHA followed by the
shortlog or subject.

If you don't specify that information clearly, then the maintainer has
no idea what to do with it.  It isn't fair to ask them to play detective
and try and figure out what you had in mind.  They have hundreds of
other submissions to merge.

Also don't include company specific internal information in external
submissions.  The "LIN1021-3841" means nothing to linux-yocto readers.

Please fix and resend.

Thanks,
Paul.
--

> 
> Signed-off-by: Meng Li 
> Signed-off-by: Carlos Dominguez 
> ---
>  drivers/firmware/stratix10-svc.c | 6 ++
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/firmware/stratix10-svc.c 
> b/drivers/firmware/stratix10-svc.c
> index 6e24649aa9bf..d9d1e00367ea 100644
> --- a/drivers/firmware/stratix10-svc.c
> +++ b/drivers/firmware/stratix10-svc.c
> @@ -1505,6 +1505,7 @@ void stratix10_svc_free_memory(struct 
> stratix10_svc_chan *chan, void *kaddr)
>  
>   list_for_each_entry(pmem, _data_mem, node)
>   if (pmem->vaddr == kaddr) {
> + memset(kaddr, 0, pmem->size);
>   gen_pool_free(chan->ctrl->genpool,
>  (unsigned long)kaddr, pmem->size);
>   pmem->vaddr = NULL;
> @@ -1512,10 +1513,7 @@ void stratix10_svc_free_memory(struct 
> stratix10_svc_chan *chan, void *kaddr)
>   return;
>   }
>  
> - memset(kaddr, 0, size);
> - gen_pool_free(chan->ctrl->genpool, (unsigned long)kaddr, size);
> - pmem->vaddr = NULL;
> - list_del(>node);
> + list_del(_data_mem);
>  }
>  EXPORT_SYMBOL_GPL(stratix10_svc_free_memory);
>  
> -- 
> 2.34.1
> 

> 
> 
> 


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#11458): 
https://lists.yoctoproject.org/g/linux-yocto/message/11458
Mute This Topic: https://lists.yoctoproject.org/mt/92329221/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[linux-yocto] [kernel-source][PATCH 1/1] LIN1021-3841 [PATCH] firmware: stratix10-svc: fix a conflict caused by introducing upstream commit

2022-07-12 Thread Carlos Dominguez
This building issue is caused by introducing upstream commit
5a0793ac66ac("firmware: stratix10-svc: fix a missing check on list iterator")
that conflicts with sdk patch. So, adjust code to merge sdk patch and
 upstream commit together.

Signed-off-by: Meng Li 
Signed-off-by: Carlos Dominguez 
---
 drivers/firmware/stratix10-svc.c | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/firmware/stratix10-svc.c b/drivers/firmware/stratix10-svc.c
index 6e24649aa9bf..d9d1e00367ea 100644
--- a/drivers/firmware/stratix10-svc.c
+++ b/drivers/firmware/stratix10-svc.c
@@ -1505,6 +1505,7 @@ void stratix10_svc_free_memory(struct stratix10_svc_chan 
*chan, void *kaddr)
 
list_for_each_entry(pmem, _data_mem, node)
if (pmem->vaddr == kaddr) {
+   memset(kaddr, 0, pmem->size);
gen_pool_free(chan->ctrl->genpool,
   (unsigned long)kaddr, pmem->size);
pmem->vaddr = NULL;
@@ -1512,10 +1513,7 @@ void stratix10_svc_free_memory(struct stratix10_svc_chan 
*chan, void *kaddr)
return;
}
 
-   memset(kaddr, 0, size);
-   gen_pool_free(chan->ctrl->genpool, (unsigned long)kaddr, size);
-   pmem->vaddr = NULL;
-   list_del(>node);
+   list_del(_data_mem);
 }
 EXPORT_SYMBOL_GPL(stratix10_svc_free_memory);
 
-- 
2.34.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#11457): 
https://lists.yoctoproject.org/g/linux-yocto/message/11457
Mute This Topic: https://lists.yoctoproject.org/mt/92329221/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-