Skip to content

Commit 16cc398

Browse files
committed
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>
2 parents e9191aa + 760b8ee commit 16cc398

4 files changed

Lines changed: 10 additions & 7 deletions

File tree

.mailmap

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,9 @@ Christian Brauner <brauner@kernel.org> <christian@brauner.io>
185185
Christian Brauner <brauner@kernel.org> <christian.brauner@canonical.com>
186186
Christian Brauner <brauner@kernel.org> <christian.brauner@ubuntu.com>
187187
Christian Marangi <ansuelsmth@gmail.com>
188+
Christophe Leroy <chleroy@kernel.org> <christophe.leroy@c-s.fr>
189+
Christophe Leroy <chleroy@kernel.org> <christophe.leroy@csgroup.eu>
190+
Christophe Leroy <chleroy@kernel.org> <christophe.leroy2@cs-soprasteria.com>
188191
Christophe Ricard <christophe.ricard@gmail.com>
189192
Christopher Obbard <christopher.obbard@linaro.org> <chris.obbard@collabora.com>
190193
Christoph Hellwig <hch@lst.de>

MAINTAINERS

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4538,7 +4538,7 @@ F: drivers/net/ethernet/netronome/nfp/bpf/
45384538

45394539
BPF JIT for POWERPC (32-BIT AND 64-BIT)
45404540
M: Hari Bathini <hbathini@linux.ibm.com>
4541-
M: Christophe Leroy <christophe.leroy@csgroup.eu>
4541+
M: Christophe Leroy (CS GROUP) <chleroy@kernel.org>
45424542
R: Naveen N Rao <naveen@kernel.org>
45434543
L: bpf@vger.kernel.org
45444544
S: Supported
@@ -10012,7 +10012,7 @@ F: drivers/spi/spi-fsl-qspi.c
1001210012

1001310013
FREESCALE QUICC ENGINE LIBRARY
1001410014
M: Qiang Zhao <qiang.zhao@nxp.com>
10015-
M: Christophe Leroy <christophe.leroy@csgroup.eu>
10015+
M: Christophe Leroy (CS GROUP) <chleroy@kernel.org>
1001610016
L: linuxppc-dev@lists.ozlabs.org
1001710017
S: Maintained
1001810018
F: drivers/soc/fsl/qe/
@@ -10065,7 +10065,7 @@ S: Maintained
1006510065
F: drivers/tty/serial/ucc_uart.c
1006610066

1006710067
FREESCALE SOC DRIVERS
10068-
M: Christophe Leroy <christophe.leroy@csgroup.eu>
10068+
M: Christophe Leroy (CS GROUP) <chleroy@kernel.org>
1006910069
L: linuxppc-dev@lists.ozlabs.org
1007010070
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1007110071
S: Maintained
@@ -14315,7 +14315,7 @@ LINUX FOR POWERPC (32-BIT AND 64-BIT)
1431514315
M: Madhavan Srinivasan <maddy@linux.ibm.com>
1431614316
M: Michael Ellerman <mpe@ellerman.id.au>
1431714317
R: Nicholas Piggin <npiggin@gmail.com>
14318-
R: Christophe Leroy <christophe.leroy@csgroup.eu>
14318+
R: Christophe Leroy (CS GROUP) <chleroy@kernel.org>
1431914319
L: linuxppc-dev@lists.ozlabs.org
1432014320
S: Supported
1432114321
W: https://github.com/linuxppc/wiki/wiki
@@ -14371,7 +14371,7 @@ F: Documentation/devicetree/bindings/powerpc/fsl/
1437114371
F: arch/powerpc/platforms/85xx/
1437214372

1437314373
LINUX FOR POWERPC EMBEDDED PPC8XX AND PPC83XX
14374-
M: Christophe Leroy <christophe.leroy@csgroup.eu>
14374+
M: Christophe Leroy (CS GROUP) <chleroy@kernel.org>
1437514375
L: linuxppc-dev@lists.ozlabs.org
1437614376
S: Maintained
1437714377
F: arch/powerpc/platforms/8xx/

drivers/soc/fsl/qbman/qman.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1073,7 +1073,7 @@ EXPORT_SYMBOL(qman_portal_set_iperiod);
10731073

10741074
int qman_wq_alloc(void)
10751075
{
1076-
qm_portal_wq = alloc_workqueue("qman_portal_wq", 0, 1);
1076+
qm_portal_wq = alloc_workqueue("qman_portal_wq", WQ_PERCPU, 1);
10771077
if (!qm_portal_wq)
10781078
return -ENOMEM;
10791079
return 0;

drivers/soc/fsl/qbman/qman_test_stash.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ static int allocate_frame_data(void)
219219

220220
pcfg = qman_get_qm_portal_config(qman_dma_portal);
221221

222-
__frame_ptr = kmalloc(4 * HP_NUM_WORDS, GFP_KERNEL);
222+
__frame_ptr = kmalloc_array(4, HP_NUM_WORDS, GFP_KERNEL);
223223
if (!__frame_ptr)
224224
return -ENOMEM;
225225

0 commit comments

Comments
 (0)