Merge tag 'fsl-qoriq-next-2025-08-27' of https://source.denx.de/u-boot/custodians/u-boot-fsl-qoriq into next

CI: https://source.denx.de/u-boot/custodians/u-boot-fsl-qoriq/-/pipelines/27490

- Various patches from Andrew to address issues found by Smatch
- Reinitialize job ring in crypto fsl rng
- Set scaler values for fsl dspi CS-SCK and SCK-CS

9 files changed, 50 insertions, 23 deletions

diff --git a/drivers/crypto/fsl/rng.c b/drivers/crypto/fsl/rng.c
index 786a710f5fb..06f37a8b4de 100644
--- a/drivers/crypto/fsl/rng.c
+++ b/drivers/crypto/fsl/rng.c
@@ -23,11 +23,26 @@ struct caam_rng_priv {
 	u8 data[CAAM_RNG_MAX_FIFO_STORE_SIZE] __aligned(ARCH_DMA_MINALIGN);
 };
 
+static int caam_init_desc(struct caam_rng_priv *priv)
+{
+	ulong size = ALIGN(CAAM_RNG_DESC_LEN, ARCH_DMA_MINALIGN);
+
+	inline_cnstr_jobdesc_rng(priv->desc, priv->data,
+				 CAAM_RNG_MAX_FIFO_STORE_SIZE);
+
+	flush_dcache_range((unsigned long)priv->desc,
+			   (unsigned long)priv->desc + size);
+
+	return 0;
+}
+
 static int caam_rng_read_one(struct caam_rng_priv *priv)
 {
 	int size = ALIGN(CAAM_RNG_MAX_FIFO_STORE_SIZE, ARCH_DMA_MINALIGN);
 	int ret;
 
+	caam_init_desc(priv);
+
 	ret = run_descriptor_jr(priv->desc);
 	if (ret < 0)
 		return -EIO;
@@ -63,12 +78,8 @@ static int caam_rng_read(struct udevice *dev, void *data, size_t len)
 static int caam_rng_probe(struct udevice *dev)
 {
 	struct caam_rng_priv *priv = dev_get_priv(dev);
-	ulong size = ALIGN(CAAM_RNG_DESC_LEN, ARCH_DMA_MINALIGN);
 
-	inline_cnstr_jobdesc_rng(priv->desc, priv->data,
-				 CAAM_RNG_MAX_FIFO_STORE_SIZE);
-	flush_dcache_range((unsigned long)priv->desc,
-			   (unsigned long)priv->desc + size);
+	caam_init_desc(priv);
 
 	return 0;
 }
diff --git a/drivers/ddr/fsl/ctrl_regs.c b/drivers/ddr/fsl/ctrl_regs.c
index 9a25192c079..fea08c9000f 100644
--- a/drivers/ddr/fsl/ctrl_regs.c
+++ b/drivers/ddr/fsl/ctrl_regs.c
@@ -2173,7 +2173,7 @@ static void set_ddr_zq_cntl(fsl_ddr_cfg_regs_t *ddr, unsigned int zq_en)
 	/* Normal Operation Short Calibration Time (tZQCS) */
 	unsigned int zqcs = 0;
 #ifdef CONFIG_SYS_FSL_DDR4
-	unsigned int zqcs_init;
+	unsigned int zqcs_init = 0;
 #endif
 
 	if (zq_en) {
diff --git a/drivers/net/fm/eth.c b/drivers/net/fm/eth.c
index 63fe4b2d33c..f0e7c0eca42 100644
--- a/drivers/net/fm/eth.c
+++ b/drivers/net/fm/eth.c
@@ -169,7 +169,7 @@ static void bmi_rx_port_disable(struct fm_bmi_rx_port *rx_port)
 	/* wait until the rx port is not busy */
 	while ((in_be32(&rx_port->fmbm_rst) & FMBM_RST_BSY) && timeout--)
 		;
-	if (!timeout)
+	if (timeout == -1)
 		printf("%s - timeout\n", __func__);
 }
 
@@ -199,7 +199,7 @@ static void bmi_tx_port_disable(struct fm_bmi_tx_port *tx_port)
 	/* wait until the tx port is not busy */
 	while ((in_be32(&tx_port->fmbm_tst) & FMBM_TST_BSY) && timeout--)
 		;
-	if (!timeout)
+	if (timeout == -1)
 		printf("%s - timeout\n", __func__);
 }
 
@@ -727,12 +727,15 @@ static int fm_eth_bind(struct udevice *dev)
 	char mac_name[11];
 	u32 fm, num;
 
+	if (!dev)
+		return -EINVAL;
+
 	if (ofnode_read_u32(ofnode_get_parent(dev_ofnode(dev)), "cell-index", &fm)) {
 		printf("FMan node property cell-index missing\n");
 		return -EINVAL;
 	}
 
-	if (dev && dev_read_u32(dev, "cell-index", &num)) {
+	if (dev_read_u32(dev, "cell-index", &num)) {
 		printf("FMan MAC node property cell-index missing\n");
 		return -EINVAL;
 	}
diff --git a/drivers/net/fm/memac_phy.c b/drivers/net/fm/memac_phy.c
index 26425d94ae5..1ad3c053593 100644
--- a/drivers/net/fm/memac_phy.c
+++ b/drivers/net/fm/memac_phy.c
@@ -46,7 +46,7 @@ static int memac_wait_until_free(struct memac_mdio_controller *regs)
 	while ((memac_in_32(&regs->mdio_stat) & MDIO_STAT_BSY) && timeout--)
 		;
 
-	if (!timeout) {
+	if (timeout == -1) {
 		printf("timeout waiting for MDIO bus to be free\n");
 		return -ETIMEDOUT;
 	}
@@ -64,7 +64,7 @@ static int memac_wait_until_done(struct memac_mdio_controller *regs)
 	while ((memac_in_32(&regs->mdio_stat) & MDIO_STAT_BSY) && timeout--)
 		;
 
-	if (!timeout) {
+	if (timeout == -1) {
 		printf("timeout waiting for MDIO operation to complete\n");
 		return -ETIMEDOUT;
 	}
diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c
index 86daf0fb2bb..c8ed702f50a 100644
--- a/drivers/net/fsl-mc/mc.c
+++ b/drivers/net/fsl-mc/mc.c
@@ -366,8 +366,8 @@ static int mc_fixup_dpc_mac_addr(void *blob, int dpmac_id,
 		noff = fdt_add_subnode(blob, nodeoffset, mac_name);
 		if (noff < 0) {
 			printf("fdt_add_subnode: err=%s\n",
-			       fdt_strerror(err));
-			return err;
+			       fdt_strerror(noff));
+			return noff;
 		}
 
 		/* add default property of fixed link */
@@ -1178,6 +1178,7 @@ err_get_api_ver:
 		     dflt_dpio->dpio_id);
 err_create:
 	free(dflt_dpio);
+	dflt_dpio = NULL;
 err_calloc:
 	return err;
 }
@@ -1186,6 +1187,9 @@ static int dpio_exit(void)
 {
 	int err;
 
+	if (!dflt_dpio)
+		return -ENODEV;
+
 	err = dpio_disable(dflt_mc_io, MC_CMD_NO_FLAGS, dflt_dpio->dpio_handle);
 	if (err < 0) {
 		printf("dpio_disable() failed: %d\n", err);
@@ -1211,8 +1215,8 @@ static int dpio_exit(void)
 	printf("Exit: DPIO.%d\n", dflt_dpio->dpio_id);
 #endif
 
-	if (dflt_dpio)
-		free(dflt_dpio);
+	free(dflt_dpio);
+	dflt_dpio = NULL;
 
 	return 0;
 err:
@@ -1434,6 +1438,7 @@ err_close:
 err_open:
 err_create:
 	free(dflt_dpbp);
+	dflt_dpbp = NULL;
 err_calloc:
 	return err;
 }
@@ -1442,6 +1447,9 @@ static int dpbp_exit(void)
 {
 	int err;
 
+	if (!dflt_dpbp)
+		return -ENODEV;
+
 	err = dpbp_destroy(dflt_mc_io, dflt_dprc_handle, MC_CMD_NO_FLAGS,
 			   dflt_dpbp->dpbp_id);
 	if (err < 0) {
@@ -1453,8 +1461,8 @@ static int dpbp_exit(void)
 	printf("Exit: DPBP.%d\n", dflt_dpbp->dpbp_attr.id);
 #endif
 
-	if (dflt_dpbp)
-		free(dflt_dpbp);
+	free(dflt_dpbp);
+	dflt_dpbp = NULL;
 	return 0;
 
 err:
@@ -1531,6 +1539,7 @@ err_get_version:
 		     dflt_dpni->dpni_id);
 err_create:
 	free(dflt_dpni);
+	dflt_dpni = NULL;
 err_calloc:
 	return err;
 }
@@ -1539,6 +1548,9 @@ static int dpni_exit(void)
 {
 	int err;
 
+	if (!dflt_dpni)
+		return -ENODEV;
+
 	err = dpni_destroy(dflt_mc_io, dflt_dprc_handle, MC_CMD_NO_FLAGS,
 			   dflt_dpni->dpni_id);
 	if (err < 0) {
@@ -1550,8 +1562,8 @@ static int dpni_exit(void)
 	printf("Exit: DPNI.%d\n", dflt_dpni->dpni_id);
 #endif
 
-	if (dflt_dpni)
-		free(dflt_dpni);
+	free(dflt_dpni);
+	dflt_dpni = NULL;
 	return 0;
 
 err:
diff --git a/drivers/net/fsl_enetc_netc_blk_ctrl.c b/drivers/net/fsl_enetc_netc_blk_ctrl.c
index 46b68d3d8a4..fecd66eb15a 100644
--- a/drivers/net/fsl_enetc_netc_blk_ctrl.c
+++ b/drivers/net/fsl_enetc_netc_blk_ctrl.c
@@ -293,7 +293,7 @@ static int netc_blk_ctrl_probe(struct udevice *dev)
 	err = clk_prepare_enable(ipg_clk);
 	if (err) {
 		dev_err(dev, "Enable ipg clock failed\n");
-		return PTR_ERR(ipg_clk);
+		return err;
 	}
 
 	regs = dev_read_addr_name(dev, "ierb");
diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c
index 69b7de084e5..25880db37cf 100644
--- a/drivers/qe/qe.c
+++ b/drivers/qe/qe.c
@@ -255,7 +255,6 @@ void u_qe_init(void)
 		struct mmc *mmc = find_mmc_device(CONFIG_ENV_MMC_DEVICE_INDEX);
 
 		if (!mmc) {
-			free(addr);
 			printf("\nMMC cannot find device for ucode\n");
 		} else {
 			printf("\nMMC read: dev # %u, block # %u, count %u ...\n",
diff --git a/drivers/serial/serial_lpuart.c b/drivers/serial/serial_lpuart.c
index 93602797b83..9fdb6503085 100644
--- a/drivers/serial/serial_lpuart.c
+++ b/drivers/serial/serial_lpuart.c
@@ -129,7 +129,7 @@ static int get_lpuart_clk_rate(struct udevice *dev, u32 *clk_rate)
 	rate = clk_get_rate(&clk);
 	if ((long)rate <= 0) {
 		dev_err(dev, "Failed to get clk rate: %ld\n", (long)rate);
-		return ret;
+		return rate;
 	}
 	*clk_rate = rate;
 	return 0;
diff --git a/drivers/spi/fsl_dspi.c b/drivers/spi/fsl_dspi.c
index 545561ad116..412993ad377 100644
--- a/drivers/spi/fsl_dspi.c
+++ b/drivers/spi/fsl_dspi.c
@@ -473,7 +473,9 @@ static int fsl_dspi_child_pre_probe(struct udevice *dev)
 
 	priv->ctar_val[slave_plat->cs[0]] = DSPI_CTAR_DEFAULT_VALUE |
 					 DSPI_CTAR_PCSSCK(pcssck) |
-					 DSPI_CTAR_PASC(pasc);
+					 DSPI_CTAR_CSSCK(cssck) |
+					 DSPI_CTAR_PASC(pasc) |
+					 DSPI_CTAR_ASC(asc);
 
 	debug("DSPI pre_probe slave device on CS %u, max_hz %u, mode 0x%x.\n",
 	      slave_plat->cs[0], slave_plat->max_hz, slave_plat->mode);