On Sat, 2013-07-06 at 17:45 +0900, Jonghwan Choi wrote:
> From: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
>
> This patch looks like it should be in the 3.9-stable tree, should we apply
> it?
My original email had a
CC: <stable@xxxxxxxxxxxxxxx> [v3.6+]
Grant, any reason why you stripped it ?
Cheers,
Ben.
> ------------------
>
> From: "Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>"
>
> commit 6dd18e4684f3d188277bbbc27545248487472108 upstream
>
> Commit:
>
> e38c0a1fbc5803cbacdaac0557c70ac8ca5152e7
> of/address: Handle #address-cells > 2 specially
>
> broke real time clock access on Bimini, js2x, and similar powerpc
> machines using the "maple" platform. That code was indirectly relying
> on the old (broken) behaviour of the translation for the hypertransport
> to ISA bridge.
>
> This fixes it by treating hypertransport as a PCI bus
>
> Signed-off-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
> Acked-by: Rob Herring <rob.herring@xxxxxxxxxxx>
> Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxx>
> Signed-off-by: Jonghwan Choi <jhbird.choi@xxxxxxxxxxx>
> ---
> drivers/of/address.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/of/address.c b/drivers/of/address.c
> index 04da786..7c8221d 100644
> --- a/drivers/of/address.c
> +++ b/drivers/of/address.c
> @@ -106,8 +106,12 @@ static unsigned int of_bus_default_get_flags(const __be32 *addr)
>
> static int of_bus_pci_match(struct device_node *np)
> {
> - /* "vci" is for the /chaos bridge on 1st-gen PCI powermacs */
> - return !strcmp(np->type, "pci") || !strcmp(np->type, "vci");
> + /*
> + * "vci" is for the /chaos bridge on 1st-gen PCI powermacs
> + * "ht" is hypertransport
> + */
> + return !strcmp(np->type, "pci") || !strcmp(np->type, "vci") ||
> + !strcmp(np->type, "ht");
> }
>
> static void of_bus_pci_count_cells(struct device_node *np,
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html