Re: Patch "ice: Remove useless DMA-32 fallback configuration" has been added to the 5.15-stable tree

Re: Patch "ice: Remove useless DMA-32 fallback configuration" has been added to the 5.15-stable tree

[Marion & Christophe JAILLET]

Le 21/10/2023 à 02:23, Sasha Levin a écrit :
> This is a note to let you know that I've just added the patch titled
>
>      ice: Remove useless DMA-32 fallback configuration
>
> to the 5.15-stable tree which can be found at:
>      http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
>
> The filename of the patch is:
>       ice-remove-useless-dma-32-fallback-configuration.patch
> and it can be found in the queue-5.15 subdirectory.
>
> If you, or anyone else, feels it should not be added to the stable tree,
> please let <stable@vger.kernel.org> know about it.

Why is it needed for backport, it is only dead code.

Another patch depends on it?

Looking *quickly* in other patches at [1], I've not seen anything that 
conflicts.

CJ


[1]: 
https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/commit/?id=ea20ae5ac61b1af9c12d4cb5292920136a683199

>
>
> commit 6f77725babf0559f90f19df76ff71f7807dff67f
> Author: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> Date:   Sun Jan 9 19:25:05 2022 +0100
>
>      ice: Remove useless DMA-32 fallback configuration
>      
>      [ Upstream commit 9c3e54a632637f27d98fb0ec0c44f7039925809d ]
>      
>      As stated in [1], dma_set_mask() with a 64-bit mask never fails if
>      dev->dma_mask is non-NULL.
>      So, if it fails, the 32 bits case will also fail for the same reason.
>      
>      Simplify code and remove some dead code accordingly.
>      
>      [1]: https://lkml.org/lkml/2021/6/7/398
>      
>      Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
>      Reviewed-by: Christoph Hellwig <hch@lst.de>
>      Reviewed-by: Alexander Lobakin <alexandr.lobakin@intel.com>
>      Tested-by: Gurucharan G <gurucharanx.g@intel.com>
>      Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
>      Stable-dep-of: 0288c3e709e5 ("ice: reset first in crash dump kernels")
>      Signed-off-by: Sasha Levin <sashal@kernel.org>
>
> diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
> index 691c4320b6b1d..4aad089ea1f5d 100644
> --- a/drivers/net/ethernet/intel/ice/ice_main.c
> +++ b/drivers/net/ethernet/intel/ice/ice_main.c
> @@ -4292,8 +4292,6 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent)
>   
>   	/* set up for high or low DMA */
>   	err = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64));
> -	if (err)
> -		err = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));
>   	if (err) {
>   		dev_err(dev, "DMA configuration failed: 0x%x\n", err);
>   		return err;

Re: Patch "ice: Remove useless DMA-32 fallback configuration" has been added to the 5.15-stable tree

[Greg KH]

On Sat, Oct 21, 2023 at 10:52:13AM +0200, Marion & Christophe JAILLET wrote:
> 
> Le 21/10/2023 à 02:23, Sasha Levin a écrit :
> > This is a note to let you know that I've just added the patch titled
> > 
> >      ice: Remove useless DMA-32 fallback configuration
> > 
> > to the 5.15-stable tree which can be found at:
> >      http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
> > 
> > The filename of the patch is:
> >       ice-remove-useless-dma-32-fallback-configuration.patch
> > and it can be found in the queue-5.15 subdirectory.
> > 
> > If you, or anyone else, feels it should not be added to the stable tree,
> > please let <stable@vger.kernel.org> know about it.
> 
> Why is it needed for backport, it is only dead code.
> 
> Another patch depends on it?
> 
> Looking *quickly* in other patches at [1], I've not seen anything that
> conflicts.

Agreed, it seems the dependancy bot got things backwards, I'll go drop
these now, thanks.

greg k-h