diff mbox

of/PCI: Add IORESOURCE_MEM_64 for 64-bit resource

Message ID 1428452680-24861-1-git-send-email-yinghai@kernel.org
State Not Applicable
Headers show

Commit Message

Yinghai Lu April 8, 2015, 12:24 a.m. UTC
For device resource PREF bit setting under bridge 64-bit pref resource,
we need to make sure only set PREF for 64bit resource, so 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: Grant Likely <grant.likely@linaro.org>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: devicetree@vger.kernel.org 

---
 drivers/of/address.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Rob Herring April 8, 2015, 1:30 a.m. UTC | #1
On Tue, Apr 7, 2015 at 7:24 PM, Yinghai Lu <yinghai@kernel.org> wrote:
> For device resource PREF bit setting under bridge 64-bit pref resource,
> we need to make sure only set PREF for 64bit resource, so 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: Grant Likely <grant.likely@linaro.org>
> Cc: Rob Herring <robh+dt@kernel.org>
> Cc: devicetree@vger.kernel.org

Acked-by: Rob Herring <robh@kernel.org>

Bjorn, are you collecting these or should I apply?

Rob

> ---
>  drivers/of/address.c |    4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> Index: linux-2.6/drivers/of/address.c
> ===================================================================
> --- linux-2.6.orig/drivers/of/address.c
> +++ linux-2.6/drivers/of/address.c
> @@ -128,9 +128,11 @@ static unsigned int of_bus_pci_get_flags
>                 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;
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Bjorn Helgaas April 8, 2015, 3:33 p.m. UTC | #2
On Tue, Apr 07, 2015 at 08:30:58PM -0500, Rob Herring wrote:
> On Tue, Apr 7, 2015 at 7:24 PM, Yinghai Lu <yinghai@kernel.org> wrote:
> > For device resource PREF bit setting under bridge 64-bit pref resource,
> > we need to make sure only set PREF for 64bit resource, so 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: Grant Likely <grant.likely@linaro.org>
> > Cc: Rob Herring <robh+dt@kernel.org>
> > Cc: devicetree@vger.kernel.org
> 
> Acked-by: Rob Herring <robh@kernel.org>
> 
> Bjorn, are you collecting these or should I apply?

I am not collecting them, at least not yet.  These seem a little more on
the OF side of the fence than PCI.  They are a little intertwingled with
the sparc PCI bridge window issue, and Ben has some concerns, so maybe
we'll have to figure out what makes the most sense when that gets sorted
out.

I'm still curious whether all these functions can be consolidated.  If
that's possible, it would be much nicer than having to fix all the copies.

Bjorn

> > ---
> >  drivers/of/address.c |    4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > Index: linux-2.6/drivers/of/address.c
> > ===================================================================
> > --- linux-2.6.orig/drivers/of/address.c
> > +++ linux-2.6/drivers/of/address.c
> > @@ -128,9 +128,11 @@ static unsigned int of_bus_pci_get_flags
> >                 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;
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

Index: linux-2.6/drivers/of/address.c
===================================================================
--- linux-2.6.orig/drivers/of/address.c
+++ linux-2.6/drivers/of/address.c
@@ -128,9 +128,11 @@  static unsigned int of_bus_pci_get_flags
 		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;