[04/13] sparc/PCI: Add IORESOURCE_MEM_64 for 64-bit resource in OF parsing

Message ID 20170421050500.13957-5-yinghai@kernel.org
State New
Headers show

Commit Message

Yinghai Lu April 21, 2017, 5:04 a.m.
For device resource with PREF bit setting under bridge 64-bit pref resource,
we need to make sure only set PREF for 64bit resource.

so this patch set IORESOUCE_MEM_64 for 64bit resource during OF device
resource flags parsing.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=96261
Link: https://bugzilla.kernel.org/show_bug.cgi?id=96241
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: sparclinux@vger.kernel.org
Tested-by: Khalid Aziz <khalid.aziz@oracle.com>
---
 arch/sparc/kernel/of_device_32.c | 5 +++--
 arch/sparc/kernel/of_device_64.c | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

Comments

Bjorn Helgaas May 5, 2017, 1:34 p.m. | #1
On Thu, Apr 20, 2017 at 10:04:51PM -0700, Yinghai Lu wrote:
> For device resource with PREF bit setting under bridge 64-bit pref resource,
> we need to make sure only set PREF for 64bit resource.
> 
> so this patch set IORESOUCE_MEM_64 for 64bit resource during OF device

s/IORESOUCE_MEM_64/IORESOURCE_MEM_64/

This misspelling occurs three times in the series; please fix them all.

> resource flags parsing.
> 
> Link: https://bugzilla.kernel.org/show_bug.cgi?id=96261
> Link: https://bugzilla.kernel.org/show_bug.cgi?id=96241
> Signed-off-by: Yinghai Lu <yinghai@kernel.org>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: sparclinux@vger.kernel.org
> Tested-by: Khalid Aziz <khalid.aziz@oracle.com>
> ---
>  arch/sparc/kernel/of_device_32.c | 5 +++--
>  arch/sparc/kernel/of_device_64.c | 5 +++--
>  2 files changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/sparc/kernel/of_device_32.c b/arch/sparc/kernel/of_device_32.c
> index 185aa96..3e9f273 100644
> --- a/arch/sparc/kernel/of_device_32.c
> +++ b/arch/sparc/kernel/of_device_32.c
> @@ -83,11 +83,12 @@ static unsigned long of_bus_pci_get_flags(const u32 *addr, unsigned long flags)
>  	case 0x01:
>  		flags |= IORESOURCE_IO;
>  		break;
> -
>  	case 0x02: /* 32 bits */
> -	case 0x03: /* 64 bits */
>  		flags |= IORESOURCE_MEM;
>  		break;
> +	case 0x03: /* 64 bits */
> +		flags |= IORESOURCE_MEM | IORESOURCE_MEM_64;
> +		break;
>  	}
>  	if (w & 0x40000000)
>  		flags |= IORESOURCE_PREFETCH;
> diff --git a/arch/sparc/kernel/of_device_64.c b/arch/sparc/kernel/of_device_64.c
> index 7bbdc26..defee61 100644
> --- a/arch/sparc/kernel/of_device_64.c
> +++ b/arch/sparc/kernel/of_device_64.c
> @@ -146,11 +146,12 @@ static unsigned long of_bus_pci_get_flags(const u32 *addr, unsigned long flags)
>  	case 0x01:
>  		flags |= IORESOURCE_IO;
>  		break;
> -
>  	case 0x02: /* 32 bits */
> -	case 0x03: /* 64 bits */
>  		flags |= IORESOURCE_MEM;
>  		break;
> +	case 0x03: /* 64 bits */
> +		flags |= IORESOURCE_MEM | IORESOURCE_MEM_64;
> +		break;
>  	}
>  	if (w & 0x40000000)
>  		flags |= IORESOURCE_PREFETCH;
> -- 
> 2.9.3
>

Patch

diff --git a/arch/sparc/kernel/of_device_32.c b/arch/sparc/kernel/of_device_32.c
index 185aa96..3e9f273 100644
--- a/arch/sparc/kernel/of_device_32.c
+++ b/arch/sparc/kernel/of_device_32.c
@@ -83,11 +83,12 @@  static unsigned long of_bus_pci_get_flags(const u32 *addr, unsigned long flags)
 	case 0x01:
 		flags |= IORESOURCE_IO;
 		break;
-
 	case 0x02: /* 32 bits */
-	case 0x03: /* 64 bits */
 		flags |= IORESOURCE_MEM;
 		break;
+	case 0x03: /* 64 bits */
+		flags |= IORESOURCE_MEM | IORESOURCE_MEM_64;
+		break;
 	}
 	if (w & 0x40000000)
 		flags |= IORESOURCE_PREFETCH;
diff --git a/arch/sparc/kernel/of_device_64.c b/arch/sparc/kernel/of_device_64.c
index 7bbdc26..defee61 100644
--- a/arch/sparc/kernel/of_device_64.c
+++ b/arch/sparc/kernel/of_device_64.c
@@ -146,11 +146,12 @@  static unsigned long of_bus_pci_get_flags(const u32 *addr, unsigned long flags)
 	case 0x01:
 		flags |= IORESOURCE_IO;
 		break;
-
 	case 0x02: /* 32 bits */
-	case 0x03: /* 64 bits */
 		flags |= IORESOURCE_MEM;
 		break;
+	case 0x03: /* 64 bits */
+		flags |= IORESOURCE_MEM | IORESOURCE_MEM_64;
+		break;
 	}
 	if (w & 0x40000000)
 		flags |= IORESOURCE_PREFETCH;