averello/linux-stable-mirror
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2026-09-17 09:41:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
drivers/soc/fsl/qbman/qman.c
+22 -2
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;
drivers/soc/fsl/qe/qmc.c
+2 -2
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;
}