sieni
/
linux
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FSL SOC Fixes for 7.0 

- Fix a race condition in Freescale Queue and Buffer Manager.
 - Fix a trivial error verification in CPM1
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYKAB0WIQTH/wu6mIr0ZW+Vui/dkHAmvKvPUwUCaZ2dtgAKCRDdkHAmvKvP
 U3nPAQCHRJOZjeXHprs7b91TwvdGcOycEoqV9LdMShidoimWEQD8DmgIyUMtDDxX
 D8OxoHAgUkONHiFZKred/tEUYxLTfQo=
 =rHsu
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmmomKMACgkQmmx57+YA
 GNlBTQ/+J/vNwy6SxdC0JreY7t75dj3QFBW0dcQCsUHZ/NkXuyTjmn3mubsACe3N
 ppvFHIzRLML0Jqq7xJrB/yCBM+XPEp79ufd+vUI4USPcbTp3/Gr6jNWolmVBWg3D
 4EW2lGzGcglJMdH/P50wjMszcLfeabxZp42yAV2l5m03WcjW+shpUEKVXgeeR/hG
 eTH7Xwsu+Q5a5BkaeKKxIGIrBpYgZxIxIqqni34kmXTROV1pSEOvgLX9n8+OPsUD
 lAamHqBBEdqPaArfmQjvPRK1JxX7N91Jmo507qDbtyMz1awl2hugWMs74TxLwCJk
 QeKSRbnKR3SAnVOL7QR8cd+BUNVvwJmGoum83isUM5lemKLGEjb8YEAVKIqUgNhw
 OTaMBqEQ5oBwfYoWCNNObL6UcnixIgfFiWO3CMdzyfAhhsksf46lgqBfqnf1tCt4
 sMAaAECRQpOKRTTKUdPr9OhyqxRsVnJ3Q6ywlTK2hK3kFkme9cawdR0tdQeQkdMD
 NB1GbRxTmkjQ41n7Q9/rlfHzkvl2k2t12Dy2qc8UKAyvwY95GXkNnE3t6Wa6Ubbx
 CLhBd3AvDtdHLryuwuXkPpGcZZyQXUctCHEt7dIHGNsSRgOtdoPV6a1QU7FDMLwZ
 wR7Z8dQHV18dDX7oSdNdGX7Zn03yUSMk6OT3eRC6onAJmoyWRyo=
 =kJ73
 -----END PGP SIGNATURE-----

Merge tag 'soc_fsl-7.0-2' of https://git.kernel.org/pub/scm/linux/kernel/git/chleroy/linux into arm/fixes

FSL SOC Fixes for 7.0

- Fix a race condition in Freescale Queue and Buffer Manager.
- Fix a trivial error verification in CPM1

* tag 'soc_fsl-7.0-2' of https://git.kernel.org/pub/scm/linux/kernel/git/chleroy/linux:
  soc: fsl: cpm1: qmc: Fix error check for devm_ioremap_resource() in qmc_qe_init_resources()
  soc: fsl: qbman: fix race condition in qman_destroy_fq

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2026-03-04 21:39:09 +01:00
parent b69d48137e 3f4e403304
commit 4bc732b00a
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/soc/fsl/qbman/qman.c
View File

@ -1827,6 +1827,8 @@ EXPORT_SYMBOL(qman_create_fq);
void qman_destroy_fq(struct qman_fq *fq)
{
int leaked;
/*
* We don't need to lock the FQ as it is a pre-condition that the FQ be
* quiesced. Instead, run some checks.
@ -1834,11 +1836,29 @@ void qman_destroy_fq(struct qman_fq *fq)
switch (fq->state) {
case qman_fq_state_parked:
case qman_fq_state_oos:
if (fq_isset(fq, QMAN_FQ_FLAG_DYNAMIC_FQID))
qman_release_fqid(fq->fqid);
/*
* There's a race condition here on releasing the fqid,
* setting the fq_table to NULL, and freeing the fqid.
* To prevent it, this order should be respected:
*/
if (fq_isset(fq, QMAN_FQ_FLAG_DYNAMIC_FQID)) {
leaked = qman_shutdown_fq(fq->fqid);
if (leaked)
pr_debug("FQID %d leaked\n", fq->fqid);
}
DPAA_ASSERT(fq_table[fq->idx]);
fq_table[fq->idx] = NULL;
if (fq_isset(fq, QMAN_FQ_FLAG_DYNAMIC_FQID) && !leaked) {
/*
* fq_table[fq->idx] should be set to null before
* freeing fq->fqid otherwise it could by allocated by
* qman_alloc_fqid() while still being !NULL
*/
smp_wmb();
gen_pool_free(qm_fqalloc, fq->fqid | DPAA_GENALLOC_OFF, 1);
}
return;
default:
break;

4
drivers/soc/fsl/qe/qmc.c
View File

@ -1790,8 +1790,8 @@ static int qmc_qe_init_resources(struct qmc *qmc, struct platform_device *pdev)
return -EINVAL;
qmc->dpram_offset = res->start - qe_muram_dma(qe_muram_addr(0));
qmc->dpram = devm_ioremap_resource(qmc->dev, res);
if (IS_ERR(qmc->scc_pram))
return PTR_ERR(qmc->scc_pram);
if (IS_ERR(qmc->dpram))
return PTR_ERR(qmc->dpram);
return 0;
}