[PATCH 1/2] bus: mvebu-mbus: Fix incorrect size for PCI aperture resources

[Bjorn Helgaas]

On Wed, Feb 12, 2014 at 03:57:07PM -0700, Jason Gunthorpe wrote:
> reg[0] is the DT base, reg[1] is the DT length in bytes,
> struct resource.end is the inclusive end address, so a -1 is
> required.
> 
> Tested on kirkwood.
> 
> Signed-off-by: Jason Gunthorpe <jgunthorpe at obsidianresearch.com>

Do these two patches need to go together?  I don't maintain
drivers/bus/mvebu-mbus.c, but if these should be kept together, I'd be
happy to merge them both, given the appropriate ack from Jason C or Thomas.

> ---
>  drivers/bus/mvebu-mbus.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c
> index 2394e97..7fd54e9 100644
> --- a/drivers/bus/mvebu-mbus.c
> +++ b/drivers/bus/mvebu-mbus.c
> @@ -876,14 +876,14 @@ static void __init mvebu_mbus_get_pcie_resources(struct device_node *np,
>  	ret = of_property_read_u32_array(np, "pcie-mem-aperture", reg, ARRAY_SIZE(reg));
>  	if (!ret) {
>  		mem->start = reg[0];
> -		mem->end = mem->start + reg[1];
> +		mem->end = mem->start + reg[1] - 1;
>  		mem->flags = IORESOURCE_MEM;
>  	}
>  
>  	ret = of_property_read_u32_array(np, "pcie-io-aperture", reg, ARRAY_SIZE(reg));
>  	if (!ret) {
>  		io->start = reg[0];
> -		io->end = io->start + reg[1];
> +		io->end = io->start + reg[1] - 1;
>  		io->flags = IORESOURCE_IO;
>  	}
>  }
> -- 
> 1.8.1.2
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html