This is a note to let you know that I've just added the patch titled of: Fix address decoding on Bimini and js2x machines to the 3.10-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: of-fix-address-decoding-on-bimini-and-js2x-machines.patch and it can be found in the queue-3.10 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 6dd18e4684f3d188277bbbc27545248487472108 Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> Date: Wed, 3 Jul 2013 16:01:10 +1000 Subject: of: Fix address decoding on Bimini and js2x machines 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> Cc: Jonghwan Choi <jhbird.choi@xxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/of/address.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -106,8 +106,12 @@ static unsigned int of_bus_default_get_f 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, Patches currently in stable-queue which might be from benh@xxxxxxxxxxxxxxxxxxx are queue-3.10/powerpc-tm-fix-writing-top-half-of-msr-on-32-bit-signals.patch queue-3.10/powerpc-tm-fix-return-of-active-64bit-signals.patch queue-3.10/powerpc-tm-fix-return-of-32bit-rt-signals-to-active-transactions.patch queue-3.10/powerpc-perf-don-t-enable-if-we-have-zero-events.patch queue-3.10/powerpc-rename-and-flesh-out-the-facility-unavailable-exception-handler.patch queue-3.10/powerpc-perf-check-that-events-only-include-valid-bits-on-power8.patch queue-3.10/of-fix-address-decoding-on-bimini-and-js2x-machines.patch queue-3.10/powerpc-wire-up-the-hv-facility-unavailable-exception.patch queue-3.10/powerpc-remove-kvmtest-from-relon-exception-handlers.patch queue-3.10/powerpc-numa-do-not-update-sysfs-cpu-registration-from-invalid-context.patch queue-3.10/powerpc-tm-fix-restoration-of-msr-on-32bit-signal-return.patch queue-3.10/powerpc-smp-section-mismatch-from-smp_release_cpus-to-__initdata-spinning_secondaries.patch queue-3.10/powerpc-perf-rework-disable-logic-in-pmu_disable.patch queue-3.10/powerpc-powernv-fix-iommu-initialization-again.patch queue-3.10/powerpc-hw_brk-fix-clearing-of-extraneous-irq.patch queue-3.10/powerpc-hw_brk-fix-off-by-one-error-when-validating-dawr-region-end.patch queue-3.10/powerpc-remove-unreachable-relocation-on-exception-handlers.patch queue-3.10/powerpc-hw_brk-fix-setting-of-length-for-exact-mode-breakpoints.patch queue-3.10/powerpc-perf-freeze-pmc5-6-if-we-re-not-using-them.patch queue-3.10/powerpc-perf-use-existing-out-label-in-power_pmu_enable.patch queue-3.10/powerpc-tm-fix-32-bit-non-rt-signals.patch -- 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