Merge tag 'soc_fsl-6.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/chleroy/linux into soc/drivers-late
FSL SOC Changes for 6.19 - A couple misc changes to fsl/qbman - Update email address for Christophe Leroy in MAINTAINERS * tag 'soc_fsl-6.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/chleroy/linux: soc: fsl: qbman: use kmalloc_array() instead of kmalloc() soc: fsl: qbman: add WQ_PERCPU to alloc_workqueue users MAINTAINERS: Update email address for Christophe Leroy Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
3
.mailmap
3
.mailmap
@@ -185,6 +185,9 @@ Christian Brauner <brauner@kernel.org> <christian@brauner.io>
|
|||||||
Christian Brauner <brauner@kernel.org> <christian.brauner@canonical.com>
|
Christian Brauner <brauner@kernel.org> <christian.brauner@canonical.com>
|
||||||
Christian Brauner <brauner@kernel.org> <christian.brauner@ubuntu.com>
|
Christian Brauner <brauner@kernel.org> <christian.brauner@ubuntu.com>
|
||||||
Christian Marangi <ansuelsmth@gmail.com>
|
Christian Marangi <ansuelsmth@gmail.com>
|
||||||
|
Christophe Leroy <chleroy@kernel.org> <christophe.leroy@c-s.fr>
|
||||||
|
Christophe Leroy <chleroy@kernel.org> <christophe.leroy@csgroup.eu>
|
||||||
|
Christophe Leroy <chleroy@kernel.org> <christophe.leroy2@cs-soprasteria.com>
|
||||||
Christophe Ricard <christophe.ricard@gmail.com>
|
Christophe Ricard <christophe.ricard@gmail.com>
|
||||||
Christopher Obbard <christopher.obbard@linaro.org> <chris.obbard@collabora.com>
|
Christopher Obbard <christopher.obbard@linaro.org> <chris.obbard@collabora.com>
|
||||||
Christoph Hellwig <hch@lst.de>
|
Christoph Hellwig <hch@lst.de>
|
||||||
|
|||||||
10
MAINTAINERS
10
MAINTAINERS
@@ -4538,7 +4538,7 @@ F: drivers/net/ethernet/netronome/nfp/bpf/
|
|||||||
|
|
||||||
BPF JIT for POWERPC (32-BIT AND 64-BIT)
|
BPF JIT for POWERPC (32-BIT AND 64-BIT)
|
||||||
M: Hari Bathini <hbathini@linux.ibm.com>
|
M: Hari Bathini <hbathini@linux.ibm.com>
|
||||||
M: Christophe Leroy <christophe.leroy@csgroup.eu>
|
M: Christophe Leroy (CS GROUP) <chleroy@kernel.org>
|
||||||
R: Naveen N Rao <naveen@kernel.org>
|
R: Naveen N Rao <naveen@kernel.org>
|
||||||
L: bpf@vger.kernel.org
|
L: bpf@vger.kernel.org
|
||||||
S: Supported
|
S: Supported
|
||||||
@@ -10012,7 +10012,7 @@ F: drivers/spi/spi-fsl-qspi.c
|
|||||||
|
|
||||||
FREESCALE QUICC ENGINE LIBRARY
|
FREESCALE QUICC ENGINE LIBRARY
|
||||||
M: Qiang Zhao <qiang.zhao@nxp.com>
|
M: Qiang Zhao <qiang.zhao@nxp.com>
|
||||||
M: Christophe Leroy <christophe.leroy@csgroup.eu>
|
M: Christophe Leroy (CS GROUP) <chleroy@kernel.org>
|
||||||
L: linuxppc-dev@lists.ozlabs.org
|
L: linuxppc-dev@lists.ozlabs.org
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: drivers/soc/fsl/qe/
|
F: drivers/soc/fsl/qe/
|
||||||
@@ -10065,7 +10065,7 @@ S: Maintained
|
|||||||
F: drivers/tty/serial/ucc_uart.c
|
F: drivers/tty/serial/ucc_uart.c
|
||||||
|
|
||||||
FREESCALE SOC DRIVERS
|
FREESCALE SOC DRIVERS
|
||||||
M: Christophe Leroy <christophe.leroy@csgroup.eu>
|
M: Christophe Leroy (CS GROUP) <chleroy@kernel.org>
|
||||||
L: linuxppc-dev@lists.ozlabs.org
|
L: linuxppc-dev@lists.ozlabs.org
|
||||||
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
||||||
S: Maintained
|
S: Maintained
|
||||||
@@ -14315,7 +14315,7 @@ LINUX FOR POWERPC (32-BIT AND 64-BIT)
|
|||||||
M: Madhavan Srinivasan <maddy@linux.ibm.com>
|
M: Madhavan Srinivasan <maddy@linux.ibm.com>
|
||||||
M: Michael Ellerman <mpe@ellerman.id.au>
|
M: Michael Ellerman <mpe@ellerman.id.au>
|
||||||
R: Nicholas Piggin <npiggin@gmail.com>
|
R: Nicholas Piggin <npiggin@gmail.com>
|
||||||
R: Christophe Leroy <christophe.leroy@csgroup.eu>
|
R: Christophe Leroy (CS GROUP) <chleroy@kernel.org>
|
||||||
L: linuxppc-dev@lists.ozlabs.org
|
L: linuxppc-dev@lists.ozlabs.org
|
||||||
S: Supported
|
S: Supported
|
||||||
W: https://github.com/linuxppc/wiki/wiki
|
W: https://github.com/linuxppc/wiki/wiki
|
||||||
@@ -14371,7 +14371,7 @@ F: Documentation/devicetree/bindings/powerpc/fsl/
|
|||||||
F: arch/powerpc/platforms/85xx/
|
F: arch/powerpc/platforms/85xx/
|
||||||
|
|
||||||
LINUX FOR POWERPC EMBEDDED PPC8XX AND PPC83XX
|
LINUX FOR POWERPC EMBEDDED PPC8XX AND PPC83XX
|
||||||
M: Christophe Leroy <christophe.leroy@csgroup.eu>
|
M: Christophe Leroy (CS GROUP) <chleroy@kernel.org>
|
||||||
L: linuxppc-dev@lists.ozlabs.org
|
L: linuxppc-dev@lists.ozlabs.org
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: arch/powerpc/platforms/8xx/
|
F: arch/powerpc/platforms/8xx/
|
||||||
|
|||||||
@@ -1073,7 +1073,7 @@ EXPORT_SYMBOL(qman_portal_set_iperiod);
|
|||||||
|
|
||||||
int qman_wq_alloc(void)
|
int qman_wq_alloc(void)
|
||||||
{
|
{
|
||||||
qm_portal_wq = alloc_workqueue("qman_portal_wq", 0, 1);
|
qm_portal_wq = alloc_workqueue("qman_portal_wq", WQ_PERCPU, 1);
|
||||||
if (!qm_portal_wq)
|
if (!qm_portal_wq)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
return 0;
|
return 0;
|
||||||
|
|||||||
@@ -219,7 +219,7 @@ static int allocate_frame_data(void)
|
|||||||
|
|
||||||
pcfg = qman_get_qm_portal_config(qman_dma_portal);
|
pcfg = qman_get_qm_portal_config(qman_dma_portal);
|
||||||
|
|
||||||
__frame_ptr = kmalloc(4 * HP_NUM_WORDS, GFP_KERNEL);
|
__frame_ptr = kmalloc_array(4, HP_NUM_WORDS, GFP_KERNEL);
|
||||||
if (!__frame_ptr)
|
if (!__frame_ptr)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user