summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorManish Pandey <manish.pandey2@arm.com>2026-09-07 21:33:45 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2026-09-07 21:33:45 +0000
commit38269bb73d34b4a31100adf208a27e4c28e7d611 (patch)
tree0d383dafca63c22ef6cc475ce347a76c641cca50 /drivers
parent58f4fe3a0b8b97fd097aff2ec884cc77ac535650 (diff)
parentd7135a7214e49c6364ba518cdac343aa595a8db8 (diff)
downloadarm-trusted-firmware-master.tar.gz
arm-trusted-firmware-master.zip
Merge changes I716e0539,I6c327584,I38509b94,I5ff3c402,I44591e4b, ... into integrationHEADmaster
* changes: feat(st): enable some warning flags feat(build): enable -Wundef for C files if W >= 1 refactor(zlib): move zlib to a lib refactor(compiler-rt): move compiler_rt to a lib feat(build): introduce BL_FLAGS fix(st-usb): staticize dwc3_dev_init fix(st): staticize verify_signature fix(stm32mp1): manage all flags for PKA algos refactor(st-clock): remove STM32MP_M33_TDCID flag fix(xlat): check definition of PLAT_XLAT_TABLES_DYNAMIC flag fix(el3-runtime): add some missing prototypes fix(scmi): remove scmi_msg_get_voltage_handler fix(io): correct SIZE_MAX management fix(libc): define __BSD_VISIBLE to 0 fix(build): move FIRME_SUPPORT flags to Makefile
Diffstat (limited to 'drivers')
-rw-r--r--drivers/io/io_block.c3
-rw-r--r--drivers/io/io_fip.c8
-rw-r--r--drivers/io/io_mtd.c3
-rw-r--r--drivers/scmi-msg/entry.c6
-rw-r--r--drivers/st/clk/clk-stm32mp2.c4
-rw-r--r--drivers/st/usb_dwc3/usb_dwc3.c4
6 files changed, 14 insertions, 14 deletions
diff --git a/drivers/io/io_block.c b/drivers/io/io_block.c
index ea7512272..db8eaba9a 100644
--- a/drivers/io/io_block.c
+++ b/drivers/io/io_block.c
@@ -196,9 +196,12 @@ static int block_len(io_entity_t *entity, size_t *length)
assert(length != NULL);
cur = (block_dev_state_t *)entity->info;
+
+#ifndef __aarch64__
if (cur->size > (unsigned long long)SIZE_MAX) {
return -EINVAL;
}
+#endif
*length = (size_t)cur->size;
return 0;
diff --git a/drivers/io/io_fip.c b/drivers/io/io_fip.c
index f06e98a2f..c70d435c1 100644
--- a/drivers/io/io_fip.c
+++ b/drivers/io/io_fip.c
@@ -405,11 +405,15 @@ static int fip_file_open(io_dev_info_t *dev_info, const uintptr_t spec,
if ((size == 0U) ||
(offset >= fip_size64) ||
(size > fip_size64) ||
- (offset + size < offset) ||
(offset + size > fip_size64) ||
+#ifdef __aarch64__
+ check_u64_overflow(offset, size)
+#else
(offset > (uint64_t)SIZE_MAX) ||
(size > (uint64_t)SIZE_MAX) ||
- (offset + size > (uint64_t)SIZE_MAX)) {
+ (offset + size > (uint64_t)SIZE_MAX)
+#endif
+ ) {
ERROR("FIP entry bounds invalid\n");
result = -EINVAL;
goto fip_file_open_close;
diff --git a/drivers/io/io_mtd.c b/drivers/io/io_mtd.c
index abf0d3498..73418fe92 100644
--- a/drivers/io/io_mtd.c
+++ b/drivers/io/io_mtd.c
@@ -211,9 +211,12 @@ static int mtd_len(io_entity_t *entity, size_t *length)
assert(length != NULL);
cur = (mtd_dev_state_t *)entity->info;
+
+#ifndef __aarch64__
if (cur->size > (unsigned long long)SIZE_MAX) {
return -EINVAL;
}
+#endif
*length = (size_t)cur->size;
return 0;
diff --git a/drivers/scmi-msg/entry.c b/drivers/scmi-msg/entry.c
index 5ac68e1e6..14db61c54 100644
--- a/drivers/scmi-msg/entry.c
+++ b/drivers/scmi-msg/entry.c
@@ -14,7 +14,6 @@
#pragma weak scmi_msg_get_clock_handler
#pragma weak scmi_msg_get_rstd_handler
#pragma weak scmi_msg_get_pd_handler
-#pragma weak scmi_msg_get_voltage_handler
#pragma weak scmi_msg_get_sensor_handler
scmi_msg_handler_t scmi_msg_get_clock_handler(struct scmi_msg *msg __unused)
@@ -32,11 +31,6 @@ scmi_msg_handler_t scmi_msg_get_pd_handler(struct scmi_msg *msg __unused)
return NULL;
}
-scmi_msg_handler_t scmi_msg_get_voltage_handler(struct scmi_msg *msg __unused)
-{
- return NULL;
-}
-
scmi_msg_handler_t scmi_msg_get_sensor_handler(struct scmi_msg *msg __unused)
{
return NULL;
diff --git a/drivers/st/clk/clk-stm32mp2.c b/drivers/st/clk/clk-stm32mp2.c
index f34739ae9..a91389b21 100644
--- a/drivers/st/clk/clk-stm32mp2.c
+++ b/drivers/st/clk/clk-stm32mp2.c
@@ -711,7 +711,6 @@ static const char *clk_stm32_get_oscillator_name(enum stm32_osc id)
return NULL;
}
-#if !STM32MP_M33_TDCID
static void clk_oscillator_set_bypass(struct stm32_clk_priv *priv, int id,
bool digbyp, bool bypass)
{
@@ -801,7 +800,6 @@ static int clk_oscillator_wait_ready_on(struct stm32_clk_priv *priv, int id)
{
return clk_oscillator_wait_ready(priv, id, true);
}
-#endif /* !STM32MP_M33_TDCID */
#endif /* IMAGE_BL2 */
static unsigned long clk_stm32_osc_recalc_rate(struct stm32_clk_priv *priv,
@@ -910,10 +908,8 @@ static void clk_stm32_osc_init(struct stm32_clk_priv *priv, int id)
static struct stm32_clk_ops clk_stm32_osc_ops = {
.recalc_rate = clk_stm32_osc_recalc_rate,
.is_enabled = clk_stm32_osc_gate_is_enabled,
-#if !STM32MP_M33_TDCID
.enable = clk_stm32_osc_gate_enable,
.disable = clk_stm32_osc_gate_disable,
-#endif
.init = clk_stm32_osc_init,
};
diff --git a/drivers/st/usb_dwc3/usb_dwc3.c b/drivers/st/usb_dwc3/usb_dwc3.c
index d6f2bbcac..110e34bfa 100644
--- a/drivers/st/usb_dwc3/usb_dwc3.c
+++ b/drivers/st/usb_dwc3/usb_dwc3.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015-2025, STMicroelectronics - All Rights Reserved
+ * Copyright (c) 2015-2026, STMicroelectronics - All Rights Reserved
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -2173,7 +2173,7 @@ static enum usb_status dwc3_set_dev_speed(dwc3_handle_t *dwc3_handle, uint8_t sp
* the configuration information for the specified USBx peripheral.
* @retval HAL status
*/
-enum usb_status dwc3_dev_init(dwc3_handle_t *dwc3_handle, uint8_t speed, uint8_t intr_dev)
+static enum usb_status dwc3_dev_init(dwc3_handle_t *dwc3_handle, uint8_t speed, uint8_t intr_dev)
{
uint32_t reg;
uint8_t i;