[PATCH] pci: pci_mvebu: Use global MBUS_PCI_MEM_SIZE macro

[Stefan Roese]

On 06.11.21 12:16, Pali Rohár wrote:
> Header file mach/cpu.h already defines MBUS_PCI_MEM_SIZE macro which
> defines size of MBUS_PCI_MEM_BASE window. So use global MBUS_PCI_MEM_SIZE
> macro instead of locally defined PCIE_MEM_SIZE macro. Both macros have same
> definition.
> 
> Signed-off-by: Pali Rohár <pali at kernel.org>

Applied to u-boot-marvell/master

Thanks,
Stefan

> ---
>   drivers/pci/pci_mvebu.c | 11 +++++------
>   1 file changed, 5 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/pci/pci_mvebu.c b/drivers/pci/pci_mvebu.c
> index c575e9412b2a..14cd82db6ff8 100644
> --- a/drivers/pci/pci_mvebu.c
> +++ b/drivers/pci/pci_mvebu.c
> @@ -97,7 +97,6 @@ struct mvebu_pcie {
>    * and 64K of I/O space when registered.
>    */
>   static void __iomem *mvebu_pcie_membase = (void __iomem *)MBUS_PCI_MEM_BASE;
> -#define PCIE_MEM_SIZE	(128 << 20)
>   static void __iomem *mvebu_pcie_iobase = (void __iomem *)MBUS_PCI_IO_BASE;
>   
>   static inline bool mvebu_pcie_link_up(struct mvebu_pcie *pcie)
> @@ -433,14 +432,14 @@ static int mvebu_pcie_probe(struct udevice *dev)
>   	mvebu_pcie_set_local_dev_nr(pcie, 1);
>   
>   	pcie->mem.start = (u32)mvebu_pcie_membase;
> -	pcie->mem.end = pcie->mem.start + PCIE_MEM_SIZE - 1;
> -	mvebu_pcie_membase += PCIE_MEM_SIZE;
> +	pcie->mem.end = pcie->mem.start + MBUS_PCI_MEM_SIZE - 1;
> +	mvebu_pcie_membase += MBUS_PCI_MEM_SIZE;
>   
>   	if (mvebu_mbus_add_window_by_id(pcie->mem_target, pcie->mem_attr,
>   					(phys_addr_t)pcie->mem.start,
> -					PCIE_MEM_SIZE)) {
> +					MBUS_PCI_MEM_SIZE)) {
>   		printf("PCIe unable to add mbus window for mem at %08x+%08x\n",
> -		       (u32)pcie->mem.start, PCIE_MEM_SIZE);
> +		       (u32)pcie->mem.start, MBUS_PCI_MEM_SIZE);
>   	}
>   
>   	pcie->io.start = (u32)mvebu_pcie_iobase;
> @@ -459,7 +458,7 @@ static int mvebu_pcie_probe(struct udevice *dev)
>   
>   	/* PCI memory space */
>   	pci_set_region(hose->regions + 0, pcie->mem.start,
> -		       pcie->mem.start, PCIE_MEM_SIZE, PCI_REGION_MEM);
> +		       pcie->mem.start, MBUS_PCI_MEM_SIZE, PCI_REGION_MEM);
>   	pci_set_region(hose->regions + 1,
>   		       0, 0,
>   		       gd->ram_size,
> 

Viele Grüße,
Stefan Roese

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de