diff mbox series

[u-boot-marvell,04/10] pci: pci_mvebu: Replace MBUS_PCI_*_SIZE by resource_size()

Message ID 20211111153549.29111-5-kabel@kernel.org
State Accepted
Commit e1cee89e2831b278275b95868dd335c3f43e500e
Delegated to: Stefan Roese
Headers show
Series PCI mvebu and aardvark changes | expand

Commit Message

Marek Behún Nov. 11, 2021, 3:35 p.m. UTC 
From: Pali Rohár <pali@kernel.org>

Use more appropriate resource_size() function when working with data in
struct resource.

Signed-off-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
 drivers/pci/pci_mvebu.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Comments

Stefan Roese Nov. 12, 2021, 2:03 p.m. UTC | #1 
On 11/11/21 16:35, Marek Behún wrote:
> From: Pali Rohár <pali@kernel.org>
> 
> Use more appropriate resource_size() function when working with data in
> struct resource.
> 
> Signed-off-by: Pali Rohár <pali@kernel.org>
> Signed-off-by: Marek Behún <marek.behun@nic.cz>

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

Thanks,
Stefan

> ---
>   drivers/pci/pci_mvebu.c | 12 ++++++------
>   1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/pci/pci_mvebu.c b/drivers/pci/pci_mvebu.c
> index 97c7b5604f..fde52ec99d 100644
> --- a/drivers/pci/pci_mvebu.c
> +++ b/drivers/pci/pci_mvebu.c
> @@ -477,9 +477,9 @@ static int mvebu_pcie_probe(struct udevice *dev)
>   
>   	if (mvebu_mbus_add_window_by_id(pcie->mem_target, pcie->mem_attr,
>   					(phys_addr_t)pcie->mem.start,
> -					MBUS_PCI_MEM_SIZE)) {
> +					resource_size(&pcie->mem))) {
>   		printf("PCIe unable to add mbus window for mem at %08x+%08x\n",
> -		       (u32)pcie->mem.start, MBUS_PCI_MEM_SIZE);
> +		       (u32)pcie->mem.start, (unsigned)resource_size(&pcie->mem));
>   	}
>   
>   	pcie->io.start = (u32)mvebu_pcie_iobase;
> @@ -488,9 +488,9 @@ static int mvebu_pcie_probe(struct udevice *dev)
>   
>   	if (mvebu_mbus_add_window_by_id(pcie->io_target, pcie->io_attr,
>   					(phys_addr_t)pcie->io.start,
> -					MBUS_PCI_IO_SIZE)) {
> +					resource_size(&pcie->io))) {
>   		printf("PCIe unable to add mbus window for IO at %08x+%08x\n",
> -		       (u32)pcie->io.start, MBUS_PCI_IO_SIZE);
> +		       (u32)pcie->io.start, (unsigned)resource_size(&pcie->io));
>   	}
>   
>   	/* Setup windows and configure host bridge */
> @@ -498,13 +498,13 @@ static int mvebu_pcie_probe(struct udevice *dev)
>   
>   	/* PCI memory space */
>   	pci_set_region(hose->regions + 0, pcie->mem.start,
> -		       pcie->mem.start, MBUS_PCI_MEM_SIZE, PCI_REGION_MEM);
> +		       pcie->mem.start, resource_size(&pcie->mem), PCI_REGION_MEM);
>   	pci_set_region(hose->regions + 1,
>   		       0, 0,
>   		       gd->ram_size,
>   		       PCI_REGION_MEM | PCI_REGION_SYS_MEMORY);
>   	pci_set_region(hose->regions + 2, pcie->io.start,
> -		       pcie->io.start, MBUS_PCI_IO_SIZE, PCI_REGION_IO);
> +		       pcie->io.start, resource_size(&pcie->io), PCI_REGION_IO);
>   	hose->region_count = 3;
>   
>   	/* PCI Bridge support 32-bit I/O and 64-bit prefetch mem addressing */
> 

Viele Grüße,
Stefan Roese
Stefan Roese Dec. 21, 2021, 8:23 a.m. UTC | #2 
On 11/11/21 16:35, Marek Behún wrote:
> From: Pali Rohár <pali@kernel.org>
> 
> Use more appropriate resource_size() function when working with data in
> struct resource.
> 
> Signed-off-by: Pali Rohár <pali@kernel.org>
> Signed-off-by: Marek Behún <marek.behun@nic.cz>

Applied to u-boot-marvell/next

Thanks,
Stefan

> ---
>   drivers/pci/pci_mvebu.c | 12 ++++++------
>   1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/pci/pci_mvebu.c b/drivers/pci/pci_mvebu.c
> index 97c7b5604f..fde52ec99d 100644
> --- a/drivers/pci/pci_mvebu.c
> +++ b/drivers/pci/pci_mvebu.c
> @@ -477,9 +477,9 @@ static int mvebu_pcie_probe(struct udevice *dev)
>   
>   	if (mvebu_mbus_add_window_by_id(pcie->mem_target, pcie->mem_attr,
>   					(phys_addr_t)pcie->mem.start,
> -					MBUS_PCI_MEM_SIZE)) {
> +					resource_size(&pcie->mem))) {
>   		printf("PCIe unable to add mbus window for mem at %08x+%08x\n",
> -		       (u32)pcie->mem.start, MBUS_PCI_MEM_SIZE);
> +		       (u32)pcie->mem.start, (unsigned)resource_size(&pcie->mem));
>   	}
>   
>   	pcie->io.start = (u32)mvebu_pcie_iobase;
> @@ -488,9 +488,9 @@ static int mvebu_pcie_probe(struct udevice *dev)
>   
>   	if (mvebu_mbus_add_window_by_id(pcie->io_target, pcie->io_attr,
>   					(phys_addr_t)pcie->io.start,
> -					MBUS_PCI_IO_SIZE)) {
> +					resource_size(&pcie->io))) {
>   		printf("PCIe unable to add mbus window for IO at %08x+%08x\n",
> -		       (u32)pcie->io.start, MBUS_PCI_IO_SIZE);
> +		       (u32)pcie->io.start, (unsigned)resource_size(&pcie->io));
>   	}
>   
>   	/* Setup windows and configure host bridge */
> @@ -498,13 +498,13 @@ static int mvebu_pcie_probe(struct udevice *dev)
>   
>   	/* PCI memory space */
>   	pci_set_region(hose->regions + 0, pcie->mem.start,
> -		       pcie->mem.start, MBUS_PCI_MEM_SIZE, PCI_REGION_MEM);
> +		       pcie->mem.start, resource_size(&pcie->mem), PCI_REGION_MEM);
>   	pci_set_region(hose->regions + 1,
>   		       0, 0,
>   		       gd->ram_size,
>   		       PCI_REGION_MEM | PCI_REGION_SYS_MEMORY);
>   	pci_set_region(hose->regions + 2, pcie->io.start,
> -		       pcie->io.start, MBUS_PCI_IO_SIZE, PCI_REGION_IO);
> +		       pcie->io.start, resource_size(&pcie->io), PCI_REGION_IO);
>   	hose->region_count = 3;
>   
>   	/* PCI Bridge support 32-bit I/O and 64-bit prefetch mem addressing */
> 

Viele Grüße,
Stefan Roese
diff mbox series

Patch

diff --git a/drivers/pci/pci_mvebu.c b/drivers/pci/pci_mvebu.c
index 97c7b5604f..fde52ec99d 100644
--- a/drivers/pci/pci_mvebu.c
+++ b/drivers/pci/pci_mvebu.c
@@ -477,9 +477,9 @@  static int mvebu_pcie_probe(struct udevice *dev)
 
 	if (mvebu_mbus_add_window_by_id(pcie->mem_target, pcie->mem_attr,
 					(phys_addr_t)pcie->mem.start,
-					MBUS_PCI_MEM_SIZE)) {
+					resource_size(&pcie->mem))) {
 		printf("PCIe unable to add mbus window for mem at %08x+%08x\n",
-		       (u32)pcie->mem.start, MBUS_PCI_MEM_SIZE);
+		       (u32)pcie->mem.start, (unsigned)resource_size(&pcie->mem));
 	}
 
 	pcie->io.start = (u32)mvebu_pcie_iobase;
@@ -488,9 +488,9 @@  static int mvebu_pcie_probe(struct udevice *dev)
 
 	if (mvebu_mbus_add_window_by_id(pcie->io_target, pcie->io_attr,
 					(phys_addr_t)pcie->io.start,
-					MBUS_PCI_IO_SIZE)) {
+					resource_size(&pcie->io))) {
 		printf("PCIe unable to add mbus window for IO at %08x+%08x\n",
-		       (u32)pcie->io.start, MBUS_PCI_IO_SIZE);
+		       (u32)pcie->io.start, (unsigned)resource_size(&pcie->io));
 	}
 
 	/* Setup windows and configure host bridge */
@@ -498,13 +498,13 @@  static int mvebu_pcie_probe(struct udevice *dev)
 
 	/* PCI memory space */
 	pci_set_region(hose->regions + 0, pcie->mem.start,
-		       pcie->mem.start, MBUS_PCI_MEM_SIZE, PCI_REGION_MEM);
+		       pcie->mem.start, resource_size(&pcie->mem), PCI_REGION_MEM);
 	pci_set_region(hose->regions + 1,
 		       0, 0,
 		       gd->ram_size,
 		       PCI_REGION_MEM | PCI_REGION_SYS_MEMORY);
 	pci_set_region(hose->regions + 2, pcie->io.start,
-		       pcie->io.start, MBUS_PCI_IO_SIZE, PCI_REGION_IO);
+		       pcie->io.start, resource_size(&pcie->io), PCI_REGION_IO);
 	hose->region_count = 3;
 
 	/* PCI Bridge support 32-bit I/O and 64-bit prefetch mem addressing */