asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

This is the 4.19.294 stable release

Browse source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmTy4kYACgkQONu9yGCS
 aT5oxBAAqID5YrorxdYV8fhDEdmVhy2vKVj5ppKr/O7L4YM5HqpJJhz8ropr/br1
 Z5Nzot4lMS8uO26LTwfWP7BYeFvtjposoCEtHFubuX6TAug/MsGgdX5b8Hlk0D4O
 CCwtMLNzxKqkvN4TR/SN6xnY2kBoRbuAWLM6si4ZCv3gdFrjWFzS8OETLAap/ggn
 Jjc7w5Td/Ek36w8sBeQbV9Czi3c7g0YQig3QLJbuAus+PrDng1PsIuy8EZdRIfsS
 yOdf+Rry2IuSaJbn50YSZ11D3rIt2/bxRxyu5kQs5RI5xk0h7HjHSF8iIAsrup9J
 +XQIy7IhMqeBgIUY4cKKmdwE3mNwsSBuNNPAUVvYHOBPBsJDCkKIBIpAJ63RSGQM
 6OhP9K9m4Bqj2JQxVVrwa/cgcNapT5Fjnye2k1yvvuEA2qPbZ6XodwW9jHnTHRb/
 EeQsGDBGl8KfsagF14vSVbmTDcSjwlkgbXD9iR3tgpVdi57RdwUxLEs2hZv4enkF
 khSeX9a/p3+WJ16Qi/lQ281KOx++MVk/bbYyaoiaGHGrRuT0HCIm/xZFjgW6F2Zr
 HxSN3q8N7EEyyDA5IwvN3rZo+RtmcaJxuwLZFcyXh4QnxEHvt7gw88h6ZdYe4MIq
 tYQqhBh/1pudJk/SqJKM8maTvzNmJut64ebhiIxopoW8GOGWIhs=
 =DcWJ
 -----END PGP SIGNATURE-----

Merge 4.19.294 into android-4.19-stable

Changes in 4.19.294
	Revert "MIPS: Alchemy: fix dbdma2"
	Revert "ARM: ep93xx: fix missing-prototype warnings"
	Linux 4.19.294

Change-Id: I4a60fbb6a97e56ad3836dae4ff789973608e2104
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2023-09-02 10:33:13 +00:00
commit eb5bf2c8af
3 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
VERSION = 4 VERSION = 4
PATCHLEVEL = 19 PATCHLEVEL = 19
SUBLEVEL = 293 SUBLEVEL = 294
EXTRAVERSION = EXTRAVERSION =
NAME = "People's Front" NAME = "People's Front"

3
arch/arm/mach-ep93xx/timer-ep93xx.c
View file

@ -9,7 +9,6 @@
#include <linux/io.h> #include <linux/io.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include "soc.h" #include "soc.h"
#include "platform.h"
/************************************************************************* /*************************************************************************
* Timer handling for EP93xx * Timer handling for EP93xx
@ -61,7 +60,7 @@ static u64 notrace ep93xx_read_sched_clock(void)
return ret; return ret;
} }
static u64 ep93xx_clocksource_read(struct clocksource *c) u64 ep93xx_clocksource_read(struct clocksource *c)
{ {
u64 ret; u64 ret;

27
arch/mips/alchemy/common/dbdma.c
View file

@ -30,7 +30,6 @@
* *
*/ */
#include <linux/dma-map-ops.h> /* for dma_default_coherent */
#include <linux/init.h> #include <linux/init.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/slab.h> #include <linux/slab.h>
@ -624,18 +623,17 @@ u32 au1xxx_dbdma_put_source(u32 chanid, dma_addr_t buf, int nbytes, u32 flags)
dp->dscr_cmd0 &= ~DSCR_CMD0_IE; dp->dscr_cmd0 &= ~DSCR_CMD0_IE;
/* /*
* There is an erratum on certain Au1200/Au1550 revisions that could * There is an errata on the Au1200/Au1550 parts that could result
* result in "stale" data being DMA'ed. It has to do with the snoop * in "stale" data being DMA'ed. It has to do with the snoop logic on
* logic on the cache eviction buffer. dma_default_coherent is set * the cache eviction buffer. DMA_NONCOHERENT is on by default for
* to false on these parts. * these parts. If it is fixed in the future, these dma_cache_inv will
* just be nothing more than empty macros. See io.h.
*/ */
if (!dma_default_coherent) dma_cache_wback_inv((unsigned long)buf, nbytes);
dma_cache_wback_inv(KSEG0ADDR(buf), nbytes);
dp->dscr_cmd0 |= DSCR_CMD0_V; /* Let it rip */ dp->dscr_cmd0 |= DSCR_CMD0_V; /* Let it rip */
wmb(); /* drain writebuffer */ wmb(); /* drain writebuffer */
dma_cache_wback_inv((unsigned long)dp, sizeof(*dp)); dma_cache_wback_inv((unsigned long)dp, sizeof(*dp));
ctp->chan_ptr->ddma_dbell = 0; ctp->chan_ptr->ddma_dbell = 0;
wmb(); /* force doorbell write out to dma engine */
/* Get next descriptor pointer. */ /* Get next descriptor pointer. */
ctp->put_ptr = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr)); ctp->put_ptr = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr));
@ -687,18 +685,17 @@ u32 au1xxx_dbdma_put_dest(u32 chanid, dma_addr_t buf, int nbytes, u32 flags)
dp->dscr_source1, dp->dscr_dest0, dp->dscr_dest1); dp->dscr_source1, dp->dscr_dest0, dp->dscr_dest1);
#endif #endif
/* /*
* There is an erratum on certain Au1200/Au1550 revisions that could * There is an errata on the Au1200/Au1550 parts that could result in
* result in "stale" data being DMA'ed. It has to do with the snoop * "stale" data being DMA'ed. It has to do with the snoop logic on the
* logic on the cache eviction buffer. dma_default_coherent is set * cache eviction buffer. DMA_NONCOHERENT is on by default for these
* to false on these parts. * parts. If it is fixed in the future, these dma_cache_inv will just
* be nothing more than empty macros. See io.h.
*/ */
if (!dma_default_coherent) dma_cache_inv((unsigned long)buf, nbytes);
dma_cache_inv(KSEG0ADDR(buf), nbytes);
dp->dscr_cmd0 |= DSCR_CMD0_V; /* Let it rip */ dp->dscr_cmd0 |= DSCR_CMD0_V; /* Let it rip */
wmb(); /* drain writebuffer */ wmb(); /* drain writebuffer */
dma_cache_wback_inv((unsigned long)dp, sizeof(*dp)); dma_cache_wback_inv((unsigned long)dp, sizeof(*dp));
ctp->chan_ptr->ddma_dbell = 0; ctp->chan_ptr->ddma_dbell = 0;
wmb(); /* force doorbell write out to dma engine */
/* Get next descriptor pointer. */ /* Get next descriptor pointer. */
ctp->put_ptr = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr)); ctp->put_ptr = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr));