summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShuo Liu <shuo.liu@intel.com>2024-05-05 07:30:19 +0800
committerLean Sheng Tan <sheng.tan@9elements.com>2024-05-28 09:46:08 +0000
commitbd33b6ab9fde904dd8a532ce20e8a6331ba8dafb (patch)
tree159199dc28cd25df7d532d695e53e678cc53efe1
parent6c708d8a467e7027cd841896b8f5cbc8555fb254 (diff)
include/device: Fix IO resource handling covering 0xFFFF
IO resource creation utils taking 'from' and 'to' as parameters use uint16_t for them, where 'to' equals the resource limit plus 1. When a resource is with a limit of 0xFFFF, the value of 'to' will be clipped to 0x0000 by uint16_t. Fix this problem by use uint32_t and checks the effective range to make sure it no larger than UINT16_MAX + 1. TEST=Build and boot on intel/archercity CRB TEST=Build on intel/avenuecity CRB Change-Id: Ie83045683094d6330c1676809f83acf30175cc90 Signed-off-by: Shuo Liu <shuo.liu@intel.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/82192 Reviewed-by: Angel Pons <th3fanbus@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
-rw-r--r--src/include/device/device.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/include/device/device.h b/src/include/device/device.h
index 367635a952..1b2e097772 100644
--- a/src/include/device/device.h
+++ b/src/include/device/device.h
@@ -369,10 +369,12 @@ const struct resource *fixed_io_range_flags(struct device *dev, unsigned long in
static inline
const struct resource *fixed_io_from_to_flags(struct device *dev, unsigned long index,
- uint16_t base, uint16_t end, unsigned long flags)
+ uint16_t base, uint32_t end, unsigned long flags)
{
if (end <= base)
return NULL;
+ if (end > UINT16_MAX + 1)
+ return NULL;
return fixed_io_range_flags(dev, index, base, end - base, flags);
}
@@ -393,10 +395,12 @@ const struct resource *domain_io_window_range(struct device *dev, unsigned long
static inline
const struct resource *domain_io_window_from_to(struct device *dev, unsigned long index,
- uint16_t base, uint16_t end)
+ uint16_t base, uint32_t end)
{
if (end <= base)
return NULL;
+ if (end > UINT16_MAX + 1)
+ return NULL;
return domain_io_window_range(dev, index, base, end - base);
}