All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] pci: pci_mvebu: Use global MBUS_PCI_MEM_SIZE macro
@ 2021-11-06 11:16 Pali Rohár
  2021-11-10  5:51 ` Stefan Roese
  2021-11-10 13:52 ` Stefan Roese
  0 siblings, 2 replies; 3+ messages in thread
From: Pali Rohár @ 2021-11-06 11:16 UTC (permalink / raw)
  To: Stefan Roese; +Cc: u-boot

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@kernel.org>
---
 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,
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH] pci: pci_mvebu: Use global MBUS_PCI_MEM_SIZE macro
  2021-11-06 11:16 [PATCH] pci: pci_mvebu: Use global MBUS_PCI_MEM_SIZE macro Pali Rohár
@ 2021-11-10  5:51 ` Stefan Roese
  2021-11-10 13:52 ` Stefan Roese
  1 sibling, 0 replies; 3+ messages in thread
From: Stefan Roese @ 2021-11-10  5:51 UTC (permalink / raw)
  To: Pali Rohár; +Cc: u-boot

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@kernel.org>

Reviewed-by: Stefan Roese <sr@denx.de>

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@denx.de

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PATCH] pci: pci_mvebu: Use global MBUS_PCI_MEM_SIZE macro
  2021-11-06 11:16 [PATCH] pci: pci_mvebu: Use global MBUS_PCI_MEM_SIZE macro Pali Rohár
  2021-11-10  5:51 ` Stefan Roese
@ 2021-11-10 13:52 ` Stefan Roese
  1 sibling, 0 replies; 3+ messages in thread
From: Stefan Roese @ 2021-11-10 13:52 UTC (permalink / raw)
  To: Pali Rohár; +Cc: u-boot

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@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@denx.de

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-11-10 13:52 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-06 11:16 [PATCH] pci: pci_mvebu: Use global MBUS_PCI_MEM_SIZE macro Pali Rohár
2021-11-10  5:51 ` Stefan Roese
2021-11-10 13:52 ` Stefan Roese

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.