From bd33b6ab9fde904dd8a532ce20e8a6331ba8dafb Mon Sep 17 00:00:00 2001 From: Shuo Liu Date: Sun, 5 May 2024 07:30:19 +0800 Subject: 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/82192 Reviewed-by: Angel Pons Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans --- src/include/device/device.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/include/device') 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); } -- cgit v1.2.3