* [PATCH v6 0/5] Krait L1/L2 EDAC driver @ 2014-04-04 19:57 ` Stephen Boyd 0 siblings, 0 replies; 44+ messages in thread From: Stephen Boyd @ 2014-04-04 19:57 UTC (permalink / raw) To: Borislav Petkov Cc: linux-kernel, linux-arm-msm, linux-arm-kernel, linux-edac, Mark Rutland, Russell King, Courtney Cavin, Lorenzo Pieralisi, Kumar Gala, devicetree, Stepan Moskovchenko This patchset adds support for the Krait L1/L2 cache error detection hardware. The second patch adds the Krait L2 indirection register code. This patch is in need of an ACK from ARM folks. The next two patches add the driver and the binding and the final patch fixes up the DT nodes to match the binding (this last one should go through the arm-soc tree). NOTE: the DT binding patches rely on Lorenzo's cache DT binding document[1] Changes since v5: * Don't rely on platform device being created from cpus node * Get interrupts from L1 cache node * Rework binding to be in cache document Changes since v4: * Prefixed l2 accessors functions with krait_ * Dropped first two patches as Boris says he picked them up Changes since v3: * Fixed l1_irq handler to properly dereference dev_id Changes since v2: * Picked up acks * s/an/a/ in DT binding Stephen Boyd (5): genirq: export percpu irq functions for module usage ARM: Add Krait L2 register accessor functions devicetree: bindings: Document Krait cache error interrupts edac: Add support for Krait CPU cache error detection ARM: dts: msm: Fix Krait CPU/L2 nodes Documentation/devicetree/bindings/arm/cache.txt | 48 ++- arch/arm/boot/dts/qcom-msm8960.dtsi | 29 +- arch/arm/boot/dts/qcom-msm8974.dtsi | 49 +++- arch/arm/common/Kconfig | 3 + arch/arm/common/Makefile | 1 + arch/arm/common/krait-l2-accessors.c | 58 ++++ arch/arm/include/asm/krait-l2-accessors.h | 20 ++ drivers/edac/Kconfig | 8 + drivers/edac/Makefile | 2 + drivers/edac/krait_edac.c | 370 ++++++++++++++++++++++++ kernel/irq/manage.c | 2 + 11 files changed, 568 insertions(+), 22 deletions(-) create mode 100644 arch/arm/common/krait-l2-accessors.c create mode 100644 arch/arm/include/asm/krait-l2-accessors.h create mode 100644 drivers/edac/krait_edac.c [1] http://www.spinics.net/lists/arm-kernel/msg308540.html -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation ^ permalink raw reply [flat|nested] 44+ messages in thread
* [PATCH v6 0/5] Krait L1/L2 EDAC driver @ 2014-04-04 19:57 ` Stephen Boyd 0 siblings, 0 replies; 44+ messages in thread From: Stephen Boyd @ 2014-04-04 19:57 UTC (permalink / raw) To: linux-arm-kernel This patchset adds support for the Krait L1/L2 cache error detection hardware. The second patch adds the Krait L2 indirection register code. This patch is in need of an ACK from ARM folks. The next two patches add the driver and the binding and the final patch fixes up the DT nodes to match the binding (this last one should go through the arm-soc tree). NOTE: the DT binding patches rely on Lorenzo's cache DT binding document[1] Changes since v5: * Don't rely on platform device being created from cpus node * Get interrupts from L1 cache node * Rework binding to be in cache document Changes since v4: * Prefixed l2 accessors functions with krait_ * Dropped first two patches as Boris says he picked them up Changes since v3: * Fixed l1_irq handler to properly dereference dev_id Changes since v2: * Picked up acks * s/an/a/ in DT binding Stephen Boyd (5): genirq: export percpu irq functions for module usage ARM: Add Krait L2 register accessor functions devicetree: bindings: Document Krait cache error interrupts edac: Add support for Krait CPU cache error detection ARM: dts: msm: Fix Krait CPU/L2 nodes Documentation/devicetree/bindings/arm/cache.txt | 48 ++- arch/arm/boot/dts/qcom-msm8960.dtsi | 29 +- arch/arm/boot/dts/qcom-msm8974.dtsi | 49 +++- arch/arm/common/Kconfig | 3 + arch/arm/common/Makefile | 1 + arch/arm/common/krait-l2-accessors.c | 58 ++++ arch/arm/include/asm/krait-l2-accessors.h | 20 ++ drivers/edac/Kconfig | 8 + drivers/edac/Makefile | 2 + drivers/edac/krait_edac.c | 370 ++++++++++++++++++++++++ kernel/irq/manage.c | 2 + 11 files changed, 568 insertions(+), 22 deletions(-) create mode 100644 arch/arm/common/krait-l2-accessors.c create mode 100644 arch/arm/include/asm/krait-l2-accessors.h create mode 100644 drivers/edac/krait_edac.c [1] http://www.spinics.net/lists/arm-kernel/msg308540.html -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation ^ permalink raw reply [flat|nested] 44+ messages in thread
* [PATCH v6 1/5] genirq: export percpu irq functions for module usage 2014-04-04 19:57 ` Stephen Boyd (?) @ 2014-04-04 19:57 ` Stephen Boyd -1 siblings, 0 replies; 44+ messages in thread From: Stephen Boyd @ 2014-04-04 19:57 UTC (permalink / raw) To: Borislav Petkov; +Cc: linux-arm-msm, linux-kernel, linux-arm-kernel, linux-edac In the near future we're going to use these percpu irq functions in the Krait CPU EDAC driver. Export them so that the EDAC driver can be compiled as a module. Acked-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> --- kernel/irq/manage.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 2486a4c1a710..7955580e634f 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -1705,6 +1705,7 @@ void free_percpu_irq(unsigned int irq, void __percpu *dev_id) kfree(__free_percpu_irq(irq, dev_id)); chip_bus_sync_unlock(desc); } +EXPORT_SYMBOL_GPL(free_percpu_irq); /** * setup_percpu_irq - setup a per-cpu interrupt @@ -1775,3 +1776,4 @@ int request_percpu_irq(unsigned int irq, irq_handler_t handler, return retval; } +EXPORT_SYMBOL_GPL(request_percpu_irq); -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation ^ permalink raw reply related [flat|nested] 44+ messages in thread
* [PATCH v6 1/5] genirq: export percpu irq functions for module usage @ 2014-04-04 19:57 ` Stephen Boyd 0 siblings, 0 replies; 44+ messages in thread From: Stephen Boyd @ 2014-04-04 19:57 UTC (permalink / raw) To: linux-arm-kernel In the near future we're going to use these percpu irq functions in the Krait CPU EDAC driver. Export them so that the EDAC driver can be compiled as a module. Acked-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> --- kernel/irq/manage.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 2486a4c1a710..7955580e634f 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -1705,6 +1705,7 @@ void free_percpu_irq(unsigned int irq, void __percpu *dev_id) kfree(__free_percpu_irq(irq, dev_id)); chip_bus_sync_unlock(desc); } +EXPORT_SYMBOL_GPL(free_percpu_irq); /** * setup_percpu_irq - setup a per-cpu interrupt @@ -1775,3 +1776,4 @@ int request_percpu_irq(unsigned int irq, irq_handler_t handler, return retval; } +EXPORT_SYMBOL_GPL(request_percpu_irq); -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation ^ permalink raw reply related [flat|nested] 44+ messages in thread
* [PATCH v6 1/5] genirq: export percpu irq functions for module usage @ 2014-04-04 19:57 ` Stephen Boyd 0 siblings, 0 replies; 44+ messages in thread From: Stephen Boyd @ 2014-04-04 19:57 UTC (permalink / raw) To: Borislav Petkov; +Cc: linux-kernel, linux-arm-msm, linux-arm-kernel, linux-edac In the near future we're going to use these percpu irq functions in the Krait CPU EDAC driver. Export them so that the EDAC driver can be compiled as a module. Acked-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> --- kernel/irq/manage.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 2486a4c1a710..7955580e634f 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -1705,6 +1705,7 @@ void free_percpu_irq(unsigned int irq, void __percpu *dev_id) kfree(__free_percpu_irq(irq, dev_id)); chip_bus_sync_unlock(desc); } +EXPORT_SYMBOL_GPL(free_percpu_irq); /** * setup_percpu_irq - setup a per-cpu interrupt @@ -1775,3 +1776,4 @@ int request_percpu_irq(unsigned int irq, irq_handler_t handler, return retval; } +EXPORT_SYMBOL_GPL(request_percpu_irq); -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation ^ permalink raw reply related [flat|nested] 44+ messages in thread
* [PATCH v6 2/5] ARM: Add Krait L2 register accessor functions 2014-04-04 19:57 ` Stephen Boyd @ 2014-04-04 19:57 ` Stephen Boyd -1 siblings, 0 replies; 44+ messages in thread From: Stephen Boyd @ 2014-04-04 19:57 UTC (permalink / raw) To: Borislav Petkov Cc: linux-kernel, linux-arm-msm, linux-arm-kernel, linux-edac, Mark Rutland, Russell King, Courtney Cavin Krait CPUs have a handful of L2 cache controller registers that live behind a cp15 based indirection register. First you program the indirection register (l2cpselr) to point the L2 'window' register (l2cpdr) at what you want to read/write. Then you read/write the 'window' register to do what you want. The l2cpselr register is not banked per-cpu so we must lock around accesses to it to prevent other CPUs from re-pointing l2cpdr underneath us. Cc: Mark Rutland <mark.rutland@arm.com> Cc: Russell King <linux@arm.linux.org.uk> Cc: Courtney Cavin <courtney.cavin@sonymobile.com> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> --- arch/arm/common/Kconfig | 3 ++ arch/arm/common/Makefile | 1 + arch/arm/common/krait-l2-accessors.c | 58 +++++++++++++++++++++++++++++++ arch/arm/include/asm/krait-l2-accessors.h | 20 +++++++++++ 4 files changed, 82 insertions(+) create mode 100644 arch/arm/common/krait-l2-accessors.c create mode 100644 arch/arm/include/asm/krait-l2-accessors.h diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig index c3a4e9ceba34..9da52dc6260b 100644 --- a/arch/arm/common/Kconfig +++ b/arch/arm/common/Kconfig @@ -9,6 +9,9 @@ config DMABOUNCE bool select ZONE_DMA +config KRAIT_L2_ACCESSORS + bool + config SHARP_LOCOMO bool diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile index 70b1eff477b3..6b2cddf6e8d0 100644 --- a/arch/arm/common/Makefile +++ b/arch/arm/common/Makefile @@ -7,6 +7,7 @@ obj-y += firmware.o obj-$(CONFIG_ICST) += icst.o obj-$(CONFIG_SA1111) += sa1111.o obj-$(CONFIG_DMABOUNCE) += dmabounce.o +obj-$(CONFIG_KRAIT_L2_ACCESSORS) += krait-l2-accessors.o obj-$(CONFIG_SHARP_LOCOMO) += locomo.o obj-$(CONFIG_SHARP_PARAM) += sharpsl_param.o obj-$(CONFIG_SHARP_SCOOP) += scoop.o diff --git a/arch/arm/common/krait-l2-accessors.c b/arch/arm/common/krait-l2-accessors.c new file mode 100644 index 000000000000..5d514bbc88a6 --- /dev/null +++ b/arch/arm/common/krait-l2-accessors.c @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2011-2013, The Linux Foundation. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 and + * only version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <linux/spinlock.h> +#include <linux/export.h> + +#include <asm/barrier.h> +#include <asm/krait-l2-accessors.h> + +static DEFINE_RAW_SPINLOCK(krait_l2_lock); + +void krait_set_l2_indirect_reg(u32 addr, u32 val) +{ + unsigned long flags; + + raw_spin_lock_irqsave(&krait_l2_lock, flags); + /* + * Select the L2 window by poking l2cpselr, then write to the window + * via l2cpdr. + */ + asm volatile ("mcr p15, 3, %0, c15, c0, 6 @ l2cpselr" : : "r" (addr)); + isb(); + asm volatile ("mcr p15, 3, %0, c15, c0, 7 @ l2cpdr" : : "r" (val)); + isb(); + + raw_spin_unlock_irqrestore(&krait_l2_lock, flags); +} +EXPORT_SYMBOL(krait_set_l2_indirect_reg); + +u32 krait_get_l2_indirect_reg(u32 addr) +{ + u32 val; + unsigned long flags; + + raw_spin_lock_irqsave(&krait_l2_lock, flags); + /* + * Select the L2 window by poking l2cpselr, then read from the window + * via l2cpdr. + */ + asm volatile ("mcr p15, 3, %0, c15, c0, 6 @ l2cpselr" : : "r" (addr)); + isb(); + asm volatile ("mrc p15, 3, %0, c15, c0, 7 @ l2cpdr" : "=r" (val)); + + raw_spin_unlock_irqrestore(&krait_l2_lock, flags); + + return val; +} +EXPORT_SYMBOL(krait_get_l2_indirect_reg); diff --git a/arch/arm/include/asm/krait-l2-accessors.h b/arch/arm/include/asm/krait-l2-accessors.h new file mode 100644 index 000000000000..48fe5527bc01 --- /dev/null +++ b/arch/arm/include/asm/krait-l2-accessors.h @@ -0,0 +1,20 @@ +/* + * Copyright (c) 2011-2013, The Linux Foundation. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 and + * only version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef __ASMARM_KRAIT_L2_ACCESSORS_H +#define __ASMARM_KRAIT_L2_ACCESSORS_H + +extern void krait_set_l2_indirect_reg(u32 addr, u32 val); +extern u32 krait_get_l2_indirect_reg(u32 addr); + +#endif -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation ^ permalink raw reply related [flat|nested] 44+ messages in thread
* [PATCH v6 2/5] ARM: Add Krait L2 register accessor functions @ 2014-04-04 19:57 ` Stephen Boyd 0 siblings, 0 replies; 44+ messages in thread From: Stephen Boyd @ 2014-04-04 19:57 UTC (permalink / raw) To: linux-arm-kernel Krait CPUs have a handful of L2 cache controller registers that live behind a cp15 based indirection register. First you program the indirection register (l2cpselr) to point the L2 'window' register (l2cpdr) at what you want to read/write. Then you read/write the 'window' register to do what you want. The l2cpselr register is not banked per-cpu so we must lock around accesses to it to prevent other CPUs from re-pointing l2cpdr underneath us. Cc: Mark Rutland <mark.rutland@arm.com> Cc: Russell King <linux@arm.linux.org.uk> Cc: Courtney Cavin <courtney.cavin@sonymobile.com> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> --- arch/arm/common/Kconfig | 3 ++ arch/arm/common/Makefile | 1 + arch/arm/common/krait-l2-accessors.c | 58 +++++++++++++++++++++++++++++++ arch/arm/include/asm/krait-l2-accessors.h | 20 +++++++++++ 4 files changed, 82 insertions(+) create mode 100644 arch/arm/common/krait-l2-accessors.c create mode 100644 arch/arm/include/asm/krait-l2-accessors.h diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig index c3a4e9ceba34..9da52dc6260b 100644 --- a/arch/arm/common/Kconfig +++ b/arch/arm/common/Kconfig @@ -9,6 +9,9 @@ config DMABOUNCE bool select ZONE_DMA +config KRAIT_L2_ACCESSORS + bool + config SHARP_LOCOMO bool diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile index 70b1eff477b3..6b2cddf6e8d0 100644 --- a/arch/arm/common/Makefile +++ b/arch/arm/common/Makefile @@ -7,6 +7,7 @@ obj-y += firmware.o obj-$(CONFIG_ICST) += icst.o obj-$(CONFIG_SA1111) += sa1111.o obj-$(CONFIG_DMABOUNCE) += dmabounce.o +obj-$(CONFIG_KRAIT_L2_ACCESSORS) += krait-l2-accessors.o obj-$(CONFIG_SHARP_LOCOMO) += locomo.o obj-$(CONFIG_SHARP_PARAM) += sharpsl_param.o obj-$(CONFIG_SHARP_SCOOP) += scoop.o diff --git a/arch/arm/common/krait-l2-accessors.c b/arch/arm/common/krait-l2-accessors.c new file mode 100644 index 000000000000..5d514bbc88a6 --- /dev/null +++ b/arch/arm/common/krait-l2-accessors.c @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2011-2013, The Linux Foundation. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 and + * only version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <linux/spinlock.h> +#include <linux/export.h> + +#include <asm/barrier.h> +#include <asm/krait-l2-accessors.h> + +static DEFINE_RAW_SPINLOCK(krait_l2_lock); + +void krait_set_l2_indirect_reg(u32 addr, u32 val) +{ + unsigned long flags; + + raw_spin_lock_irqsave(&krait_l2_lock, flags); + /* + * Select the L2 window by poking l2cpselr, then write to the window + * via l2cpdr. + */ + asm volatile ("mcr p15, 3, %0, c15, c0, 6 @ l2cpselr" : : "r" (addr)); + isb(); + asm volatile ("mcr p15, 3, %0, c15, c0, 7 @ l2cpdr" : : "r" (val)); + isb(); + + raw_spin_unlock_irqrestore(&krait_l2_lock, flags); +} +EXPORT_SYMBOL(krait_set_l2_indirect_reg); + +u32 krait_get_l2_indirect_reg(u32 addr) +{ + u32 val; + unsigned long flags; + + raw_spin_lock_irqsave(&krait_l2_lock, flags); + /* + * Select the L2 window by poking l2cpselr, then read from the window + * via l2cpdr. + */ + asm volatile ("mcr p15, 3, %0, c15, c0, 6 @ l2cpselr" : : "r" (addr)); + isb(); + asm volatile ("mrc p15, 3, %0, c15, c0, 7 @ l2cpdr" : "=r" (val)); + + raw_spin_unlock_irqrestore(&krait_l2_lock, flags); + + return val; +} +EXPORT_SYMBOL(krait_get_l2_indirect_reg); diff --git a/arch/arm/include/asm/krait-l2-accessors.h b/arch/arm/include/asm/krait-l2-accessors.h new file mode 100644 index 000000000000..48fe5527bc01 --- /dev/null +++ b/arch/arm/include/asm/krait-l2-accessors.h @@ -0,0 +1,20 @@ +/* + * Copyright (c) 2011-2013, The Linux Foundation. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 and + * only version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef __ASMARM_KRAIT_L2_ACCESSORS_H +#define __ASMARM_KRAIT_L2_ACCESSORS_H + +extern void krait_set_l2_indirect_reg(u32 addr, u32 val); +extern u32 krait_get_l2_indirect_reg(u32 addr); + +#endif -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation ^ permalink raw reply related [flat|nested] 44+ messages in thread
* Re: [PATCH v6 2/5] ARM: Add Krait L2 register accessor functions 2014-04-04 19:57 ` Stephen Boyd @ 2014-04-07 20:18 ` Borislav Petkov -1 siblings, 0 replies; 44+ messages in thread From: Borislav Petkov @ 2014-04-07 20:18 UTC (permalink / raw) To: Stephen Boyd Cc: linux-kernel, linux-arm-msm, linux-arm-kernel, linux-edac, Mark Rutland, Russell King, Courtney Cavin On Fri, Apr 04, 2014 at 12:57:27PM -0700, Stephen Boyd wrote: > Krait CPUs have a handful of L2 cache controller registers that > live behind a cp15 based indirection register. First you program > the indirection register (l2cpselr) to point the L2 'window' > register (l2cpdr) at what you want to read/write. Then you > read/write the 'window' register to do what you want. The > l2cpselr register is not banked per-cpu so we must lock around > accesses to it to prevent other CPUs from re-pointing l2cpdr > underneath us. > > Cc: Mark Rutland <mark.rutland@arm.com> > Cc: Russell King <linux@arm.linux.org.uk> > Cc: Courtney Cavin <courtney.cavin@sonymobile.com> > Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> > --- > arch/arm/common/Kconfig | 3 ++ > arch/arm/common/Makefile | 1 + > arch/arm/common/krait-l2-accessors.c | 58 +++++++++++++++++++++++++++++++ > arch/arm/include/asm/krait-l2-accessors.h | 20 +++++++++++ > 4 files changed, 82 insertions(+) > create mode 100644 arch/arm/common/krait-l2-accessors.c > create mode 100644 arch/arm/include/asm/krait-l2-accessors.h > > diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig > index c3a4e9ceba34..9da52dc6260b 100644 > --- a/arch/arm/common/Kconfig > +++ b/arch/arm/common/Kconfig > @@ -9,6 +9,9 @@ config DMABOUNCE > bool > select ZONE_DMA > > +config KRAIT_L2_ACCESSORS > + bool > + > config SHARP_LOCOMO > bool > > diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile > index 70b1eff477b3..6b2cddf6e8d0 100644 > --- a/arch/arm/common/Makefile > +++ b/arch/arm/common/Makefile > @@ -7,6 +7,7 @@ obj-y += firmware.o > obj-$(CONFIG_ICST) += icst.o > obj-$(CONFIG_SA1111) += sa1111.o > obj-$(CONFIG_DMABOUNCE) += dmabounce.o > +obj-$(CONFIG_KRAIT_L2_ACCESSORS) += krait-l2-accessors.o > obj-$(CONFIG_SHARP_LOCOMO) += locomo.o > obj-$(CONFIG_SHARP_PARAM) += sharpsl_param.o > obj-$(CONFIG_SHARP_SCOOP) += scoop.o > diff --git a/arch/arm/common/krait-l2-accessors.c b/arch/arm/common/krait-l2-accessors.c > new file mode 100644 > index 000000000000..5d514bbc88a6 > --- /dev/null > +++ b/arch/arm/common/krait-l2-accessors.c > @@ -0,0 +1,58 @@ > +/* > + * Copyright (c) 2011-2013, The Linux Foundation. All rights reserved. > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 and > + * only version 2 as published by the Free Software Foundation. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. Can we refer to COPYING here instead of adding that boilerplate to every file? > + */ > + > +#include <linux/spinlock.h> > +#include <linux/export.h> > + > +#include <asm/barrier.h> > +#include <asm/krait-l2-accessors.h> > + > +static DEFINE_RAW_SPINLOCK(krait_l2_lock); > + > +void krait_set_l2_indirect_reg(u32 addr, u32 val) > +{ > + unsigned long flags; > + > + raw_spin_lock_irqsave(&krait_l2_lock, flags); > + /* > + * Select the L2 window by poking l2cpselr, then write to the window > + * via l2cpdr. > + */ > + asm volatile ("mcr p15, 3, %0, c15, c0, 6 @ l2cpselr" : : "r" (addr)); > + isb(); > + asm volatile ("mcr p15, 3, %0, c15, c0, 7 @ l2cpdr" : : "r" (val)); > + isb(); > + > + raw_spin_unlock_irqrestore(&krait_l2_lock, flags); > +} > +EXPORT_SYMBOL(krait_set_l2_indirect_reg); > + > +u32 krait_get_l2_indirect_reg(u32 addr) > +{ > + u32 val; > + unsigned long flags; > + > + raw_spin_lock_irqsave(&krait_l2_lock, flags); > + /* > + * Select the L2 window by poking l2cpselr, then read from the window > + * via l2cpdr. > + */ > + asm volatile ("mcr p15, 3, %0, c15, c0, 6 @ l2cpselr" : : "r" (addr)); > + isb(); > + asm volatile ("mrc p15, 3, %0, c15, c0, 7 @ l2cpdr" : "=r" (val)); > + > + raw_spin_unlock_irqrestore(&krait_l2_lock, flags); > + > + return val; > +} > +EXPORT_SYMBOL(krait_get_l2_indirect_reg); > diff --git a/arch/arm/include/asm/krait-l2-accessors.h b/arch/arm/include/asm/krait-l2-accessors.h > new file mode 100644 > index 000000000000..48fe5527bc01 > --- /dev/null > +++ b/arch/arm/include/asm/krait-l2-accessors.h > @@ -0,0 +1,20 @@ > +/* > + * Copyright (c) 2011-2013, The Linux Foundation. All rights reserved. > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 and > + * only version 2 as published by the Free Software Foundation. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. Ditto. Thanks. -- Regards/Gruss, Boris. Sent from a fat crate under my desk. Formatting is fine. -- ^ permalink raw reply [flat|nested] 44+ messages in thread
* [PATCH v6 2/5] ARM: Add Krait L2 register accessor functions @ 2014-04-07 20:18 ` Borislav Petkov 0 siblings, 0 replies; 44+ messages in thread From: Borislav Petkov @ 2014-04-07 20:18 UTC (permalink / raw) To: linux-arm-kernel On Fri, Apr 04, 2014 at 12:57:27PM -0700, Stephen Boyd wrote: > Krait CPUs have a handful of L2 cache controller registers that > live behind a cp15 based indirection register. First you program > the indirection register (l2cpselr) to point the L2 'window' > register (l2cpdr) at what you want to read/write. Then you > read/write the 'window' register to do what you want. The > l2cpselr register is not banked per-cpu so we must lock around > accesses to it to prevent other CPUs from re-pointing l2cpdr > underneath us. > > Cc: Mark Rutland <mark.rutland@arm.com> > Cc: Russell King <linux@arm.linux.org.uk> > Cc: Courtney Cavin <courtney.cavin@sonymobile.com> > Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> > --- > arch/arm/common/Kconfig | 3 ++ > arch/arm/common/Makefile | 1 + > arch/arm/common/krait-l2-accessors.c | 58 +++++++++++++++++++++++++++++++ > arch/arm/include/asm/krait-l2-accessors.h | 20 +++++++++++ > 4 files changed, 82 insertions(+) > create mode 100644 arch/arm/common/krait-l2-accessors.c > create mode 100644 arch/arm/include/asm/krait-l2-accessors.h > > diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig > index c3a4e9ceba34..9da52dc6260b 100644 > --- a/arch/arm/common/Kconfig > +++ b/arch/arm/common/Kconfig > @@ -9,6 +9,9 @@ config DMABOUNCE > bool > select ZONE_DMA > > +config KRAIT_L2_ACCESSORS > + bool > + > config SHARP_LOCOMO > bool > > diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile > index 70b1eff477b3..6b2cddf6e8d0 100644 > --- a/arch/arm/common/Makefile > +++ b/arch/arm/common/Makefile > @@ -7,6 +7,7 @@ obj-y += firmware.o > obj-$(CONFIG_ICST) += icst.o > obj-$(CONFIG_SA1111) += sa1111.o > obj-$(CONFIG_DMABOUNCE) += dmabounce.o > +obj-$(CONFIG_KRAIT_L2_ACCESSORS) += krait-l2-accessors.o > obj-$(CONFIG_SHARP_LOCOMO) += locomo.o > obj-$(CONFIG_SHARP_PARAM) += sharpsl_param.o > obj-$(CONFIG_SHARP_SCOOP) += scoop.o > diff --git a/arch/arm/common/krait-l2-accessors.c b/arch/arm/common/krait-l2-accessors.c > new file mode 100644 > index 000000000000..5d514bbc88a6 > --- /dev/null > +++ b/arch/arm/common/krait-l2-accessors.c > @@ -0,0 +1,58 @@ > +/* > + * Copyright (c) 2011-2013, The Linux Foundation. All rights reserved. > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 and > + * only version 2 as published by the Free Software Foundation. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. Can we refer to COPYING here instead of adding that boilerplate to every file? > + */ > + > +#include <linux/spinlock.h> > +#include <linux/export.h> > + > +#include <asm/barrier.h> > +#include <asm/krait-l2-accessors.h> > + > +static DEFINE_RAW_SPINLOCK(krait_l2_lock); > + > +void krait_set_l2_indirect_reg(u32 addr, u32 val) > +{ > + unsigned long flags; > + > + raw_spin_lock_irqsave(&krait_l2_lock, flags); > + /* > + * Select the L2 window by poking l2cpselr, then write to the window > + * via l2cpdr. > + */ > + asm volatile ("mcr p15, 3, %0, c15, c0, 6 @ l2cpselr" : : "r" (addr)); > + isb(); > + asm volatile ("mcr p15, 3, %0, c15, c0, 7 @ l2cpdr" : : "r" (val)); > + isb(); > + > + raw_spin_unlock_irqrestore(&krait_l2_lock, flags); > +} > +EXPORT_SYMBOL(krait_set_l2_indirect_reg); > + > +u32 krait_get_l2_indirect_reg(u32 addr) > +{ > + u32 val; > + unsigned long flags; > + > + raw_spin_lock_irqsave(&krait_l2_lock, flags); > + /* > + * Select the L2 window by poking l2cpselr, then read from the window > + * via l2cpdr. > + */ > + asm volatile ("mcr p15, 3, %0, c15, c0, 6 @ l2cpselr" : : "r" (addr)); > + isb(); > + asm volatile ("mrc p15, 3, %0, c15, c0, 7 @ l2cpdr" : "=r" (val)); > + > + raw_spin_unlock_irqrestore(&krait_l2_lock, flags); > + > + return val; > +} > +EXPORT_SYMBOL(krait_get_l2_indirect_reg); > diff --git a/arch/arm/include/asm/krait-l2-accessors.h b/arch/arm/include/asm/krait-l2-accessors.h > new file mode 100644 > index 000000000000..48fe5527bc01 > --- /dev/null > +++ b/arch/arm/include/asm/krait-l2-accessors.h > @@ -0,0 +1,20 @@ > +/* > + * Copyright (c) 2011-2013, The Linux Foundation. All rights reserved. > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 and > + * only version 2 as published by the Free Software Foundation. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. Ditto. Thanks. -- Regards/Gruss, Boris. Sent from a fat crate under my desk. Formatting is fine. -- ^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH v6 2/5] ARM: Add Krait L2 register accessor functions 2014-04-07 20:18 ` Borislav Petkov @ 2014-04-07 21:56 ` Stephen Boyd -1 siblings, 0 replies; 44+ messages in thread From: Stephen Boyd @ 2014-04-07 21:56 UTC (permalink / raw) To: Borislav Petkov Cc: linux-kernel, linux-arm-msm, linux-arm-kernel, linux-edac, Mark Rutland, Russell King, Courtney Cavin On 04/07, Borislav Petkov wrote: > On Fri, Apr 04, 2014 at 12:57:27PM -0700, Stephen Boyd wrote: > > diff --git a/arch/arm/common/krait-l2-accessors.c b/arch/arm/common/krait-l2-accessors.c > > new file mode 100644 > > index 000000000000..5d514bbc88a6 > > --- /dev/null > > +++ b/arch/arm/common/krait-l2-accessors.c > > @@ -0,0 +1,58 @@ > > +/* > > + * Copyright (c) 2011-2013, The Linux Foundation. All rights reserved. > > + * > > + * This program is free software; you can redistribute it and/or modify > > + * it under the terms of the GNU General Public License version 2 and > > + * only version 2 as published by the Free Software Foundation. > > + * > > + * This program is distributed in the hope that it will be useful, > > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > > + * GNU General Public License for more details. > > Can we refer to COPYING here instead of adding that boilerplate to every > file? No. This is the template I'm told to use. -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation ^ permalink raw reply [flat|nested] 44+ messages in thread
* [PATCH v6 2/5] ARM: Add Krait L2 register accessor functions @ 2014-04-07 21:56 ` Stephen Boyd 0 siblings, 0 replies; 44+ messages in thread From: Stephen Boyd @ 2014-04-07 21:56 UTC (permalink / raw) To: linux-arm-kernel On 04/07, Borislav Petkov wrote: > On Fri, Apr 04, 2014 at 12:57:27PM -0700, Stephen Boyd wrote: > > diff --git a/arch/arm/common/krait-l2-accessors.c b/arch/arm/common/krait-l2-accessors.c > > new file mode 100644 > > index 000000000000..5d514bbc88a6 > > --- /dev/null > > +++ b/arch/arm/common/krait-l2-accessors.c > > @@ -0,0 +1,58 @@ > > +/* > > + * Copyright (c) 2011-2013, The Linux Foundation. All rights reserved. > > + * > > + * This program is free software; you can redistribute it and/or modify > > + * it under the terms of the GNU General Public License version 2 and > > + * only version 2 as published by the Free Software Foundation. > > + * > > + * This program is distributed in the hope that it will be useful, > > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > > + * GNU General Public License for more details. > > Can we refer to COPYING here instead of adding that boilerplate to every > file? No. This is the template I'm told to use. -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation ^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH v6 2/5] ARM: Add Krait L2 register accessor functions 2014-04-07 21:56 ` Stephen Boyd @ 2014-04-08 6:43 ` Borislav Petkov -1 siblings, 0 replies; 44+ messages in thread From: Borislav Petkov @ 2014-04-08 6:43 UTC (permalink / raw) To: Stephen Boyd Cc: linux-kernel, linux-arm-msm, linux-arm-kernel, linux-edac, Mark Rutland, Russell King, Courtney Cavin On Mon, Apr 07, 2014 at 02:56:49PM -0700, Stephen Boyd wrote: > No. This is the template I'm told to use. By whom? And why? -- Regards/Gruss, Boris. Sent from a fat crate under my desk. Formatting is fine. -- ^ permalink raw reply [flat|nested] 44+ messages in thread
* [PATCH v6 2/5] ARM: Add Krait L2 register accessor functions @ 2014-04-08 6:43 ` Borislav Petkov 0 siblings, 0 replies; 44+ messages in thread From: Borislav Petkov @ 2014-04-08 6:43 UTC (permalink / raw) To: linux-arm-kernel On Mon, Apr 07, 2014 at 02:56:49PM -0700, Stephen Boyd wrote: > No. This is the template I'm told to use. By whom? And why? -- Regards/Gruss, Boris. Sent from a fat crate under my desk. Formatting is fine. -- ^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH v6 2/5] ARM: Add Krait L2 register accessor functions 2014-04-08 6:43 ` Borislav Petkov @ 2014-04-08 14:25 ` Christopher Covington -1 siblings, 0 replies; 44+ messages in thread From: Christopher Covington @ 2014-04-08 14:25 UTC (permalink / raw) To: Borislav Petkov Cc: Stephen Boyd, linux-kernel, linux-arm-msm, linux-arm-kernel, linux-edac, Mark Rutland, Russell King, Courtney Cavin Hi Borislav, On 04/08/2014 02:43 AM, Borislav Petkov wrote: > On Mon, Apr 07, 2014 at 02:56:49PM -0700, Stephen Boyd wrote: >> No. This is the template I'm told to use. > > By whom? And why? As I understand it, the license authors. They find it important to maintain clarity even when files get copied into other projects. http://www.gnu.org/licenses/gpl-howto.html http://www.gnu.org/licenses/gpl-faq.html#NoticeInSourceFile Regards, Christopher -- Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by the Linux Foundation. ^ permalink raw reply [flat|nested] 44+ messages in thread
* [PATCH v6 2/5] ARM: Add Krait L2 register accessor functions @ 2014-04-08 14:25 ` Christopher Covington 0 siblings, 0 replies; 44+ messages in thread From: Christopher Covington @ 2014-04-08 14:25 UTC (permalink / raw) To: linux-arm-kernel Hi Borislav, On 04/08/2014 02:43 AM, Borislav Petkov wrote: > On Mon, Apr 07, 2014 at 02:56:49PM -0700, Stephen Boyd wrote: >> No. This is the template I'm told to use. > > By whom? And why? As I understand it, the license authors. They find it important to maintain clarity even when files get copied into other projects. http://www.gnu.org/licenses/gpl-howto.html http://www.gnu.org/licenses/gpl-faq.html#NoticeInSourceFile Regards, Christopher -- Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by the Linux Foundation. ^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH v6 2/5] ARM: Add Krait L2 register accessor functions 2014-04-08 14:25 ` Christopher Covington @ 2014-04-08 15:10 ` Borislav Petkov -1 siblings, 0 replies; 44+ messages in thread From: Borislav Petkov @ 2014-04-08 15:10 UTC (permalink / raw) To: Christopher Covington Cc: Stephen Boyd, linux-kernel, linux-arm-msm, linux-arm-kernel, linux-edac, Mark Rutland, Russell King, Courtney Cavin On Tue, Apr 08, 2014 at 10:25:01AM -0400, Christopher Covington wrote: > As I understand it, the license authors. They find it important to maintain > clarity even when files get copied into other projects. > > http://www.gnu.org/licenses/gpl-howto.html > > http://www.gnu.org/licenses/gpl-faq.html#NoticeInSourceFile Right, so what is wrong with stating the same thing in two lines: "Copyright (c) 2011-2013, The Linux Foundation. All rights reserved. This file is licensed under GNU GPLv2. See COPYING for full license text." -- Regards/Gruss, Boris. Sent from a fat crate under my desk. Formatting is fine. -- ^ permalink raw reply [flat|nested] 44+ messages in thread
* [PATCH v6 2/5] ARM: Add Krait L2 register accessor functions @ 2014-04-08 15:10 ` Borislav Petkov 0 siblings, 0 replies; 44+ messages in thread From: Borislav Petkov @ 2014-04-08 15:10 UTC (permalink / raw) To: linux-arm-kernel On Tue, Apr 08, 2014 at 10:25:01AM -0400, Christopher Covington wrote: > As I understand it, the license authors. They find it important to maintain > clarity even when files get copied into other projects. > > http://www.gnu.org/licenses/gpl-howto.html > > http://www.gnu.org/licenses/gpl-faq.html#NoticeInSourceFile Right, so what is wrong with stating the same thing in two lines: "Copyright (c) 2011-2013, The Linux Foundation. All rights reserved. This file is licensed under GNU GPLv2. See COPYING for full license text." -- Regards/Gruss, Boris. Sent from a fat crate under my desk. Formatting is fine. -- ^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH v6 2/5] ARM: Add Krait L2 register accessor functions 2014-04-08 15:10 ` Borislav Petkov @ 2014-04-08 16:19 ` One Thousand Gnomes -1 siblings, 0 replies; 44+ messages in thread From: One Thousand Gnomes @ 2014-04-08 16:19 UTC (permalink / raw) To: Borislav Petkov Cc: Christopher Covington, Stephen Boyd, linux-kernel, linux-arm-msm, linux-arm-kernel, linux-edac, Mark Rutland, Russell King, Courtney Cavin On Tue, 8 Apr 2014 17:10:56 +0200 Borislav Petkov <bp@alien8.de> wrote: > On Tue, Apr 08, 2014 at 10:25:01AM -0400, Christopher Covington wrote: > > As I understand it, the license authors. They find it important to maintain > > clarity even when files get copied into other projects. > > > > http://www.gnu.org/licenses/gpl-howto.html > > > > http://www.gnu.org/licenses/gpl-faq.html#NoticeInSourceFile > > Right, so what is wrong with stating the same thing in two lines: > > "Copyright (c) 2011-2013, The Linux Foundation. All rights reserved. > > This file is licensed under GNU GPLv2. See COPYING for full license text. The COPYING file may not be present. There may be cases where the absence of the warranty statement in the header is problematic etc etc. Corporate legals have their own policies on this and there is no point fighting them because - they are the ones qualified to make the decision - the corporate legal angle is often "do this or don't release it" - we have huge numbers of files using that same no warranty in every file, and major companies who specify it must be present in their code releases Including the without warranty is standard practice at a lot of companies. It's not even wasting space - it'll compress beautifully as there are already lots of similar headers all over the tree. Alan ^ permalink raw reply [flat|nested] 44+ messages in thread
* [PATCH v6 2/5] ARM: Add Krait L2 register accessor functions @ 2014-04-08 16:19 ` One Thousand Gnomes 0 siblings, 0 replies; 44+ messages in thread From: One Thousand Gnomes @ 2014-04-08 16:19 UTC (permalink / raw) To: linux-arm-kernel On Tue, 8 Apr 2014 17:10:56 +0200 Borislav Petkov <bp@alien8.de> wrote: > On Tue, Apr 08, 2014 at 10:25:01AM -0400, Christopher Covington wrote: > > As I understand it, the license authors. They find it important to maintain > > clarity even when files get copied into other projects. > > > > http://www.gnu.org/licenses/gpl-howto.html > > > > http://www.gnu.org/licenses/gpl-faq.html#NoticeInSourceFile > > Right, so what is wrong with stating the same thing in two lines: > > "Copyright (c) 2011-2013, The Linux Foundation. All rights reserved. > > This file is licensed under GNU GPLv2. See COPYING for full license text. The COPYING file may not be present. There may be cases where the absence of the warranty statement in the header is problematic etc etc. Corporate legals have their own policies on this and there is no point fighting them because - they are the ones qualified to make the decision - the corporate legal angle is often "do this or don't release it" - we have huge numbers of files using that same no warranty in every file, and major companies who specify it must be present in their code releases Including the without warranty is standard practice at a lot of companies. It's not even wasting space - it'll compress beautifully as there are already lots of similar headers all over the tree. Alan ^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH v6 2/5] ARM: Add Krait L2 register accessor functions 2014-04-08 16:19 ` One Thousand Gnomes @ 2014-04-08 16:42 ` Borislav Petkov -1 siblings, 0 replies; 44+ messages in thread From: Borislav Petkov @ 2014-04-08 16:42 UTC (permalink / raw) To: One Thousand Gnomes Cc: Christopher Covington, Stephen Boyd, linux-kernel, linux-arm-msm, linux-arm-kernel, linux-edac, Mark Rutland, Russell King, Courtney Cavin On Tue, Apr 08, 2014 at 05:19:29PM +0100, One Thousand Gnomes wrote: > Including the without warranty is standard practice at a lot of > companies. It's not even wasting space - it'll compress beautifully as > there are already lots of similar headers all over the tree. Right, I was just trying to find out from Stephen/Christopher whether they're actually really required by legal to slap the boilerplate or they can get by with a smaller chunk. That's all. But thanks for this Alan, I was hoping someone would school me on the legal practice wrt license boilerplates in the kernel, and there you are. :-) Thanks. -- Regards/Gruss, Boris. Sent from a fat crate under my desk. Formatting is fine. -- ^ permalink raw reply [flat|nested] 44+ messages in thread
* [PATCH v6 2/5] ARM: Add Krait L2 register accessor functions @ 2014-04-08 16:42 ` Borislav Petkov 0 siblings, 0 replies; 44+ messages in thread From: Borislav Petkov @ 2014-04-08 16:42 UTC (permalink / raw) To: linux-arm-kernel On Tue, Apr 08, 2014 at 05:19:29PM +0100, One Thousand Gnomes wrote: > Including the without warranty is standard practice at a lot of > companies. It's not even wasting space - it'll compress beautifully as > there are already lots of similar headers all over the tree. Right, I was just trying to find out from Stephen/Christopher whether they're actually really required by legal to slap the boilerplate or they can get by with a smaller chunk. That's all. But thanks for this Alan, I was hoping someone would school me on the legal practice wrt license boilerplates in the kernel, and there you are. :-) Thanks. -- Regards/Gruss, Boris. Sent from a fat crate under my desk. Formatting is fine. -- ^ permalink raw reply [flat|nested] 44+ messages in thread
* [PATCH v6 3/5] devicetree: bindings: Document Krait cache error interrupts 2014-04-04 19:57 ` Stephen Boyd (?) @ 2014-04-04 19:57 ` Stephen Boyd -1 siblings, 0 replies; 44+ messages in thread From: Stephen Boyd @ 2014-04-04 19:57 UTC (permalink / raw) To: Borislav Petkov Cc: linux-kernel, linux-arm-msm, linux-arm-kernel, linux-edac, Lorenzo Pieralisi, Mark Rutland, Kumar Gala, devicetree The Krait L1/L2 error reporting hardware is made up a per-CPU interrupt for the L1 cache and a SPI interrupt for the L2. Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Kumar Gala <galak@codeaurora.org> Cc: <devicetree@vger.kernel.org> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> --- Documentation/devicetree/bindings/arm/cache.txt | 48 ++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/arm/cache.txt b/Documentation/devicetree/bindings/arm/cache.txt index b90fcc7c53cf..d7357e777399 100644 --- a/Documentation/devicetree/bindings/arm/cache.txt +++ b/Documentation/devicetree/bindings/arm/cache.txt @@ -37,7 +37,9 @@ This document provides the device tree bindings for ARM architected caches. - compatible Usage: Required Value type: <string> - Definition: value shall be "arm,arch-cache". + Definition: shall be one of: + "arm,arch-cache" + "qcom,arch-cache" - power-domain Usage: Optional @@ -45,6 +47,12 @@ This document provides the device tree bindings for ARM architected caches. Definition: A phandle and power domain specifier as defined by bindings of power domain specified by [3]. + - interrupts + Usage: Optional for caches with compatible of "qcom,arch-cache" + Value type: <prop-encoded-array> + Definition: Error interrupt associated with this cache. + + Example(dual-cluster big.LITTLE system 32-bit) cpus { @@ -156,6 +164,44 @@ Example(dual-cluster big.LITTLE system 32-bit) }; }; +Example (Krait 32-bit system): + + cpus { + #address-cells = <1>; + #size-cells = <0>; + + cpu@0 { + compatible = "qcom,krait"; + device_type = "cpu"; + reg = <0>; + next-level-cache = <&L1_0>; + + L1_0: l1-cache { + compatible = "qcom,arch-cache"; + interrupts = <1 14 0x104>; + next-level-cache = <&L2>; + }; + + L2: l2-cache { + compatible = "qcom,arch-cache"; + interrupts = <0 2 0x4>; + }; + }; + + cpu@1 { + compatible = "qcom,krait"; + device_type = "cpu"; + reg = <1>; + next-level-cache = <&L1_1>; + + L1_1: l1-cache { + compatible = "qcom,arch-cache"; + interrupts = <1 14 0x204>; + next-level-cache = <&L2>; + }; + }; + }; + [1] ARM Architecture Reference Manuals http://infocenter.arm.com/help/index.jsp -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation ^ permalink raw reply related [flat|nested] 44+ messages in thread
* [PATCH v6 3/5] devicetree: bindings: Document Krait cache error interrupts @ 2014-04-04 19:57 ` Stephen Boyd 0 siblings, 0 replies; 44+ messages in thread From: Stephen Boyd @ 2014-04-04 19:57 UTC (permalink / raw) To: linux-arm-kernel The Krait L1/L2 error reporting hardware is made up a per-CPU interrupt for the L1 cache and a SPI interrupt for the L2. Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Kumar Gala <galak@codeaurora.org> Cc: <devicetree@vger.kernel.org> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> --- Documentation/devicetree/bindings/arm/cache.txt | 48 ++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/arm/cache.txt b/Documentation/devicetree/bindings/arm/cache.txt index b90fcc7c53cf..d7357e777399 100644 --- a/Documentation/devicetree/bindings/arm/cache.txt +++ b/Documentation/devicetree/bindings/arm/cache.txt @@ -37,7 +37,9 @@ This document provides the device tree bindings for ARM architected caches. - compatible Usage: Required Value type: <string> - Definition: value shall be "arm,arch-cache". + Definition: shall be one of: + "arm,arch-cache" + "qcom,arch-cache" - power-domain Usage: Optional @@ -45,6 +47,12 @@ This document provides the device tree bindings for ARM architected caches. Definition: A phandle and power domain specifier as defined by bindings of power domain specified by [3]. + - interrupts + Usage: Optional for caches with compatible of "qcom,arch-cache" + Value type: <prop-encoded-array> + Definition: Error interrupt associated with this cache. + + Example(dual-cluster big.LITTLE system 32-bit) cpus { @@ -156,6 +164,44 @@ Example(dual-cluster big.LITTLE system 32-bit) }; }; +Example (Krait 32-bit system): + + cpus { + #address-cells = <1>; + #size-cells = <0>; + + cpu at 0 { + compatible = "qcom,krait"; + device_type = "cpu"; + reg = <0>; + next-level-cache = <&L1_0>; + + L1_0: l1-cache { + compatible = "qcom,arch-cache"; + interrupts = <1 14 0x104>; + next-level-cache = <&L2>; + }; + + L2: l2-cache { + compatible = "qcom,arch-cache"; + interrupts = <0 2 0x4>; + }; + }; + + cpu at 1 { + compatible = "qcom,krait"; + device_type = "cpu"; + reg = <1>; + next-level-cache = <&L1_1>; + + L1_1: l1-cache { + compatible = "qcom,arch-cache"; + interrupts = <1 14 0x204>; + next-level-cache = <&L2>; + }; + }; + }; + [1] ARM Architecture Reference Manuals http://infocenter.arm.com/help/index.jsp -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation ^ permalink raw reply related [flat|nested] 44+ messages in thread
* [PATCH v6 3/5] devicetree: bindings: Document Krait cache error interrupts @ 2014-04-04 19:57 ` Stephen Boyd 0 siblings, 0 replies; 44+ messages in thread From: Stephen Boyd @ 2014-04-04 19:57 UTC (permalink / raw) To: Borislav Petkov Cc: linux-kernel, linux-arm-msm, linux-arm-kernel, linux-edac, Lorenzo Pieralisi, Mark Rutland, Kumar Gala, devicetree The Krait L1/L2 error reporting hardware is made up a per-CPU interrupt for the L1 cache and a SPI interrupt for the L2. Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Kumar Gala <galak@codeaurora.org> Cc: <devicetree@vger.kernel.org> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> --- Documentation/devicetree/bindings/arm/cache.txt | 48 ++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/arm/cache.txt b/Documentation/devicetree/bindings/arm/cache.txt index b90fcc7c53cf..d7357e777399 100644 --- a/Documentation/devicetree/bindings/arm/cache.txt +++ b/Documentation/devicetree/bindings/arm/cache.txt @@ -37,7 +37,9 @@ This document provides the device tree bindings for ARM architected caches. - compatible Usage: Required Value type: <string> - Definition: value shall be "arm,arch-cache". + Definition: shall be one of: + "arm,arch-cache" + "qcom,arch-cache" - power-domain Usage: Optional @@ -45,6 +47,12 @@ This document provides the device tree bindings for ARM architected caches. Definition: A phandle and power domain specifier as defined by bindings of power domain specified by [3]. + - interrupts + Usage: Optional for caches with compatible of "qcom,arch-cache" + Value type: <prop-encoded-array> + Definition: Error interrupt associated with this cache. + + Example(dual-cluster big.LITTLE system 32-bit) cpus { @@ -156,6 +164,44 @@ Example(dual-cluster big.LITTLE system 32-bit) }; }; +Example (Krait 32-bit system): + + cpus { + #address-cells = <1>; + #size-cells = <0>; + + cpu@0 { + compatible = "qcom,krait"; + device_type = "cpu"; + reg = <0>; + next-level-cache = <&L1_0>; + + L1_0: l1-cache { + compatible = "qcom,arch-cache"; + interrupts = <1 14 0x104>; + next-level-cache = <&L2>; + }; + + L2: l2-cache { + compatible = "qcom,arch-cache"; + interrupts = <0 2 0x4>; + }; + }; + + cpu@1 { + compatible = "qcom,krait"; + device_type = "cpu"; + reg = <1>; + next-level-cache = <&L1_1>; + + L1_1: l1-cache { + compatible = "qcom,arch-cache"; + interrupts = <1 14 0x204>; + next-level-cache = <&L2>; + }; + }; + }; + [1] ARM Architecture Reference Manuals http://infocenter.arm.com/help/index.jsp -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation ^ permalink raw reply related [flat|nested] 44+ messages in thread
* Re: [PATCH v6 3/5] devicetree: bindings: Document Krait cache error interrupts 2014-04-04 19:57 ` Stephen Boyd @ 2014-04-08 15:39 ` Borislav Petkov -1 siblings, 0 replies; 44+ messages in thread From: Borislav Petkov @ 2014-04-08 15:39 UTC (permalink / raw) To: Stephen Boyd Cc: linux-kernel, linux-arm-msm, linux-arm-kernel, linux-edac, Lorenzo Pieralisi, Mark Rutland, Kumar Gala, devicetree On Fri, Apr 04, 2014 at 12:57:28PM -0700, Stephen Boyd wrote: > The Krait L1/L2 error reporting hardware is made up a per-CPU > interrupt for the L1 cache and a SPI interrupt for the L2. > > Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> > Cc: Mark Rutland <mark.rutland@arm.com> > Cc: Kumar Gala <galak@codeaurora.org> > Cc: <devicetree@vger.kernel.org> > Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> > --- > Documentation/devicetree/bindings/arm/cache.txt | 48 ++++++++++++++++++++++++- > 1 file changed, 47 insertions(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/arm/cache.txt b/Documentation/devicetree/bindings/arm/cache.txt > index b90fcc7c53cf..d7357e777399 100644 > --- a/Documentation/devicetree/bindings/arm/cache.txt > +++ b/Documentation/devicetree/bindings/arm/cache.txt Right, that's http://www.spinics.net/lists/arm-kernel/msg308540.html So whoever picks those patches up, Lorenzo's doc needs to be in his tree first too. How about I review the EDAC part and an arm maintainer picks the whole series up? Would that be easier, logistically? -- Regards/Gruss, Boris. Sent from a fat crate under my desk. Formatting is fine. -- ^ permalink raw reply [flat|nested] 44+ messages in thread
* [PATCH v6 3/5] devicetree: bindings: Document Krait cache error interrupts @ 2014-04-08 15:39 ` Borislav Petkov 0 siblings, 0 replies; 44+ messages in thread From: Borislav Petkov @ 2014-04-08 15:39 UTC (permalink / raw) To: linux-arm-kernel On Fri, Apr 04, 2014 at 12:57:28PM -0700, Stephen Boyd wrote: > The Krait L1/L2 error reporting hardware is made up a per-CPU > interrupt for the L1 cache and a SPI interrupt for the L2. > > Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> > Cc: Mark Rutland <mark.rutland@arm.com> > Cc: Kumar Gala <galak@codeaurora.org> > Cc: <devicetree@vger.kernel.org> > Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> > --- > Documentation/devicetree/bindings/arm/cache.txt | 48 ++++++++++++++++++++++++- > 1 file changed, 47 insertions(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/arm/cache.txt b/Documentation/devicetree/bindings/arm/cache.txt > index b90fcc7c53cf..d7357e777399 100644 > --- a/Documentation/devicetree/bindings/arm/cache.txt > +++ b/Documentation/devicetree/bindings/arm/cache.txt Right, that's http://www.spinics.net/lists/arm-kernel/msg308540.html So whoever picks those patches up, Lorenzo's doc needs to be in his tree first too. How about I review the EDAC part and an arm maintainer picks the whole series up? Would that be easier, logistically? -- Regards/Gruss, Boris. Sent from a fat crate under my desk. Formatting is fine. -- ^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH v6 3/5] devicetree: bindings: Document Krait cache error interrupts 2014-04-08 15:39 ` Borislav Petkov @ 2014-04-08 19:55 ` Stephen Boyd -1 siblings, 0 replies; 44+ messages in thread From: Stephen Boyd @ 2014-04-08 19:55 UTC (permalink / raw) To: Borislav Petkov Cc: linux-kernel, linux-arm-msm, linux-arm-kernel, linux-edac, Lorenzo Pieralisi, Mark Rutland, Kumar Gala, devicetree On 04/08/14 08:39, Borislav Petkov wrote: > On Fri, Apr 04, 2014 at 12:57:28PM -0700, Stephen Boyd wrote: >> The Krait L1/L2 error reporting hardware is made up a per-CPU >> interrupt for the L1 cache and a SPI interrupt for the L2. >> >> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> >> Cc: Mark Rutland <mark.rutland@arm.com> >> Cc: Kumar Gala <galak@codeaurora.org> >> Cc: <devicetree@vger.kernel.org> >> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> >> --- >> Documentation/devicetree/bindings/arm/cache.txt | 48 ++++++++++++++++++++++++- >> 1 file changed, 47 insertions(+), 1 deletion(-) >> >> diff --git a/Documentation/devicetree/bindings/arm/cache.txt b/Documentation/devicetree/bindings/arm/cache.txt >> index b90fcc7c53cf..d7357e777399 100644 >> --- a/Documentation/devicetree/bindings/arm/cache.txt >> +++ b/Documentation/devicetree/bindings/arm/cache.txt > Right, that's http://www.spinics.net/lists/arm-kernel/msg308540.html > > So whoever picks those patches up, Lorenzo's doc needs to be in his tree > first too. > > How about I review the EDAC part and an arm maintainer picks the whole > series up? Would that be easier, logistically? > That sounds fine if you want to give an ack on the edac changes. I can route it through arm-soc. -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation ^ permalink raw reply [flat|nested] 44+ messages in thread
* [PATCH v6 3/5] devicetree: bindings: Document Krait cache error interrupts @ 2014-04-08 19:55 ` Stephen Boyd 0 siblings, 0 replies; 44+ messages in thread From: Stephen Boyd @ 2014-04-08 19:55 UTC (permalink / raw) To: linux-arm-kernel On 04/08/14 08:39, Borislav Petkov wrote: > On Fri, Apr 04, 2014 at 12:57:28PM -0700, Stephen Boyd wrote: >> The Krait L1/L2 error reporting hardware is made up a per-CPU >> interrupt for the L1 cache and a SPI interrupt for the L2. >> >> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> >> Cc: Mark Rutland <mark.rutland@arm.com> >> Cc: Kumar Gala <galak@codeaurora.org> >> Cc: <devicetree@vger.kernel.org> >> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> >> --- >> Documentation/devicetree/bindings/arm/cache.txt | 48 ++++++++++++++++++++++++- >> 1 file changed, 47 insertions(+), 1 deletion(-) >> >> diff --git a/Documentation/devicetree/bindings/arm/cache.txt b/Documentation/devicetree/bindings/arm/cache.txt >> index b90fcc7c53cf..d7357e777399 100644 >> --- a/Documentation/devicetree/bindings/arm/cache.txt >> +++ b/Documentation/devicetree/bindings/arm/cache.txt > Right, that's http://www.spinics.net/lists/arm-kernel/msg308540.html > > So whoever picks those patches up, Lorenzo's doc needs to be in his tree > first too. > > How about I review the EDAC part and an arm maintainer picks the whole > series up? Would that be easier, logistically? > That sounds fine if you want to give an ack on the edac changes. I can route it through arm-soc. -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation ^ permalink raw reply [flat|nested] 44+ messages in thread
[parent not found: <20140408153925.GJ30077-fF5Pk5pvG8Y@public.gmane.org>]
* Re: [PATCH v6 3/5] devicetree: bindings: Document Krait cache error interrupts 2014-04-08 15:39 ` Borislav Petkov (?) @ 2014-04-29 10:34 ` Lorenzo Pieralisi -1 siblings, 0 replies; 44+ messages in thread From: Lorenzo Pieralisi @ 2014-04-29 10:34 UTC (permalink / raw) To: Borislav Petkov Cc: Stephen Boyd, linux-kernel-u79uwXL29TY76Z2rM5mHXA, linux-arm-msm-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-edac-u79uwXL29TY76Z2rM5mHXA, Mark Rutland, Kumar Gala, devicetree-u79uwXL29TY76Z2rM5mHXA On Tue, Apr 08, 2014 at 04:39:25PM +0100, Borislav Petkov wrote: > On Fri, Apr 04, 2014 at 12:57:28PM -0700, Stephen Boyd wrote: > > The Krait L1/L2 error reporting hardware is made up a per-CPU > > interrupt for the L1 cache and a SPI interrupt for the L2. > > > > Cc: Lorenzo Pieralisi <lorenzo.pieralisi-5wv7dgnIgG8@public.gmane.org> > > Cc: Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org> > > Cc: Kumar Gala <galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> > > Cc: <devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> > > Signed-off-by: Stephen Boyd <sboyd-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> > > --- > > Documentation/devicetree/bindings/arm/cache.txt | 48 ++++++++++++++++++++++++- > > 1 file changed, 47 insertions(+), 1 deletion(-) > > > > diff --git a/Documentation/devicetree/bindings/arm/cache.txt b/Documentation/devicetree/bindings/arm/cache.txt > > index b90fcc7c53cf..d7357e777399 100644 > > --- a/Documentation/devicetree/bindings/arm/cache.txt > > +++ b/Documentation/devicetree/bindings/arm/cache.txt > > Right, that's http://www.spinics.net/lists/arm-kernel/msg308540.html > > So whoever picks those patches up, Lorenzo's doc needs to be in his tree > first too. Sorry for the delay in replying. Those cache bindings need an ACK to get merged, and were introduced so that idle states can retrieve power domain information for caches. I am going to revive the idle bindings thread to see what we can/should merge of these bindings as things stand, I really hope this won't block the series any further, otherwise we can rework the patches so that this series can get in first, or simplify my series to allow both to get merged as soon as possible without compromising future requirements. Thanks, Lorenzo -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 44+ messages in thread
* [PATCH v6 3/5] devicetree: bindings: Document Krait cache error interrupts @ 2014-04-29 10:34 ` Lorenzo Pieralisi 0 siblings, 0 replies; 44+ messages in thread From: Lorenzo Pieralisi @ 2014-04-29 10:34 UTC (permalink / raw) To: linux-arm-kernel On Tue, Apr 08, 2014 at 04:39:25PM +0100, Borislav Petkov wrote: > On Fri, Apr 04, 2014 at 12:57:28PM -0700, Stephen Boyd wrote: > > The Krait L1/L2 error reporting hardware is made up a per-CPU > > interrupt for the L1 cache and a SPI interrupt for the L2. > > > > Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> > > Cc: Mark Rutland <mark.rutland@arm.com> > > Cc: Kumar Gala <galak@codeaurora.org> > > Cc: <devicetree@vger.kernel.org> > > Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> > > --- > > Documentation/devicetree/bindings/arm/cache.txt | 48 ++++++++++++++++++++++++- > > 1 file changed, 47 insertions(+), 1 deletion(-) > > > > diff --git a/Documentation/devicetree/bindings/arm/cache.txt b/Documentation/devicetree/bindings/arm/cache.txt > > index b90fcc7c53cf..d7357e777399 100644 > > --- a/Documentation/devicetree/bindings/arm/cache.txt > > +++ b/Documentation/devicetree/bindings/arm/cache.txt > > Right, that's http://www.spinics.net/lists/arm-kernel/msg308540.html > > So whoever picks those patches up, Lorenzo's doc needs to be in his tree > first too. Sorry for the delay in replying. Those cache bindings need an ACK to get merged, and were introduced so that idle states can retrieve power domain information for caches. I am going to revive the idle bindings thread to see what we can/should merge of these bindings as things stand, I really hope this won't block the series any further, otherwise we can rework the patches so that this series can get in first, or simplify my series to allow both to get merged as soon as possible without compromising future requirements. Thanks, Lorenzo ^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH v6 3/5] devicetree: bindings: Document Krait cache error interrupts @ 2014-04-29 10:34 ` Lorenzo Pieralisi 0 siblings, 0 replies; 44+ messages in thread From: Lorenzo Pieralisi @ 2014-04-29 10:34 UTC (permalink / raw) To: Borislav Petkov Cc: Stephen Boyd, linux-kernel, linux-arm-msm, linux-arm-kernel, linux-edac, Mark Rutland, Kumar Gala, devicetree On Tue, Apr 08, 2014 at 04:39:25PM +0100, Borislav Petkov wrote: > On Fri, Apr 04, 2014 at 12:57:28PM -0700, Stephen Boyd wrote: > > The Krait L1/L2 error reporting hardware is made up a per-CPU > > interrupt for the L1 cache and a SPI interrupt for the L2. > > > > Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> > > Cc: Mark Rutland <mark.rutland@arm.com> > > Cc: Kumar Gala <galak@codeaurora.org> > > Cc: <devicetree@vger.kernel.org> > > Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> > > --- > > Documentation/devicetree/bindings/arm/cache.txt | 48 ++++++++++++++++++++++++- > > 1 file changed, 47 insertions(+), 1 deletion(-) > > > > diff --git a/Documentation/devicetree/bindings/arm/cache.txt b/Documentation/devicetree/bindings/arm/cache.txt > > index b90fcc7c53cf..d7357e777399 100644 > > --- a/Documentation/devicetree/bindings/arm/cache.txt > > +++ b/Documentation/devicetree/bindings/arm/cache.txt > > Right, that's http://www.spinics.net/lists/arm-kernel/msg308540.html > > So whoever picks those patches up, Lorenzo's doc needs to be in his tree > first too. Sorry for the delay in replying. Those cache bindings need an ACK to get merged, and were introduced so that idle states can retrieve power domain information for caches. I am going to revive the idle bindings thread to see what we can/should merge of these bindings as things stand, I really hope this won't block the series any further, otherwise we can rework the patches so that this series can get in first, or simplify my series to allow both to get merged as soon as possible without compromising future requirements. Thanks, Lorenzo ^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH v6 3/5] devicetree: bindings: Document Krait cache error interrupts 2014-04-29 10:34 ` Lorenzo Pieralisi (?) @ 2014-04-29 19:02 ` Borislav Petkov -1 siblings, 0 replies; 44+ messages in thread From: Borislav Petkov @ 2014-04-29 19:02 UTC (permalink / raw) To: Lorenzo Pieralisi Cc: Stephen Boyd, linux-kernel, linux-arm-msm, linux-arm-kernel, linux-edac, Mark Rutland, Kumar Gala, devicetree On Tue, Apr 29, 2014 at 11:34:00AM +0100, Lorenzo Pieralisi wrote: > Sorry for the delay in replying. Those cache bindings need an ACK > to get merged, and were introduced so that idle states can retrieve > power domain information for caches. I am going to revive the idle > bindings thread to see what we can/should merge of these bindings as > things stand, I really hope this won't block the series any further, > otherwise we can rework the patches so that this series can get in > first, or simplify my series to allow both to get merged as soon as > possible without compromising future requirements. Right, I think this is Stephen's call. AFAIR, the current state of affairs is for a followup patchset to come up which I can ack for the EDAC bits and then another maintainer picks the whole thing up. -- Regards/Gruss, Boris. Sent from a fat crate under my desk. Formatting is fine. -- ^ permalink raw reply [flat|nested] 44+ messages in thread
* [PATCH v6 3/5] devicetree: bindings: Document Krait cache error interrupts @ 2014-04-29 19:02 ` Borislav Petkov 0 siblings, 0 replies; 44+ messages in thread From: Borislav Petkov @ 2014-04-29 19:02 UTC (permalink / raw) To: linux-arm-kernel On Tue, Apr 29, 2014 at 11:34:00AM +0100, Lorenzo Pieralisi wrote: > Sorry for the delay in replying. Those cache bindings need an ACK > to get merged, and were introduced so that idle states can retrieve > power domain information for caches. I am going to revive the idle > bindings thread to see what we can/should merge of these bindings as > things stand, I really hope this won't block the series any further, > otherwise we can rework the patches so that this series can get in > first, or simplify my series to allow both to get merged as soon as > possible without compromising future requirements. Right, I think this is Stephen's call. AFAIR, the current state of affairs is for a followup patchset to come up which I can ack for the EDAC bits and then another maintainer picks the whole thing up. -- Regards/Gruss, Boris. Sent from a fat crate under my desk. Formatting is fine. -- ^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH v6 3/5] devicetree: bindings: Document Krait cache error interrupts @ 2014-04-29 19:02 ` Borislav Petkov 0 siblings, 0 replies; 44+ messages in thread From: Borislav Petkov @ 2014-04-29 19:02 UTC (permalink / raw) To: Lorenzo Pieralisi Cc: Stephen Boyd, linux-kernel, linux-arm-msm, linux-arm-kernel, linux-edac, Mark Rutland, Kumar Gala, devicetree On Tue, Apr 29, 2014 at 11:34:00AM +0100, Lorenzo Pieralisi wrote: > Sorry for the delay in replying. Those cache bindings need an ACK > to get merged, and were introduced so that idle states can retrieve > power domain information for caches. I am going to revive the idle > bindings thread to see what we can/should merge of these bindings as > things stand, I really hope this won't block the series any further, > otherwise we can rework the patches so that this series can get in > first, or simplify my series to allow both to get merged as soon as > possible without compromising future requirements. Right, I think this is Stephen's call. AFAIR, the current state of affairs is for a followup patchset to come up which I can ack for the EDAC bits and then another maintainer picks the whole thing up. -- Regards/Gruss, Boris. Sent from a fat crate under my desk. Formatting is fine. -- ^ permalink raw reply [flat|nested] 44+ messages in thread
* [PATCH v6 4/5] edac: Add support for Krait CPU cache error detection 2014-04-04 19:57 ` Stephen Boyd @ 2014-04-04 19:57 ` Stephen Boyd -1 siblings, 0 replies; 44+ messages in thread From: Stephen Boyd @ 2014-04-04 19:57 UTC (permalink / raw) To: Borislav Petkov Cc: linux-kernel, linux-arm-msm, linux-arm-kernel, linux-edac, Stepan Moskovchenko Add support for the Krait CPU cache error detection. This is a simplified version of the code originally written by Stepan Moskovchenko[1] ported to the EDAC device framework. [1] https://www.codeaurora.org/cgit/quic/la/kernel/msm/tree/arch/arm/mach-msm/cache_erp.c?h=msm-3.4 Cc: Stepan Moskovchenko <stepanm@codeaurora.org> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> --- drivers/edac/Kconfig | 8 + drivers/edac/Makefile | 2 + drivers/edac/krait_edac.c | 370 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 380 insertions(+) create mode 100644 drivers/edac/krait_edac.c diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig index 878f09005fad..4dae3d353ea9 100644 --- a/drivers/edac/Kconfig +++ b/drivers/edac/Kconfig @@ -368,4 +368,12 @@ config EDAC_OCTEON_PCI Support for error detection and correction on the Cavium Octeon family of SOCs. +config EDAC_KRAIT_CACHE + tristate "Krait L1/L2 Cache" + depends on EDAC_MM_EDAC && ARM && OF + select KRAIT_L2_ACCESSORS + help + Support for error detection and correction on the + Krait L1/L2 cache controller. + endif # EDAC diff --git a/drivers/edac/Makefile b/drivers/edac/Makefile index 4154ed6a02c6..b6ea50564223 100644 --- a/drivers/edac/Makefile +++ b/drivers/edac/Makefile @@ -64,3 +64,5 @@ obj-$(CONFIG_EDAC_OCTEON_PC) += octeon_edac-pc.o obj-$(CONFIG_EDAC_OCTEON_L2C) += octeon_edac-l2c.o obj-$(CONFIG_EDAC_OCTEON_LMC) += octeon_edac-lmc.o obj-$(CONFIG_EDAC_OCTEON_PCI) += octeon_edac-pci.o + +obj-$(CONFIG_EDAC_KRAIT_CACHE) += krait_edac.o diff --git a/drivers/edac/krait_edac.c b/drivers/edac/krait_edac.c new file mode 100644 index 000000000000..90ec0e982927 --- /dev/null +++ b/drivers/edac/krait_edac.c @@ -0,0 +1,370 @@ +/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 and + * only version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <linux/interrupt.h> +#include <linux/irq.h> +#include <linux/platform_device.h> +#include <linux/module.h> +#include <linux/err.h> +#include <linux/cpu.h> +#include <linux/io.h> +#include <linux/of.h> +#include <linux/of_irq.h> +#include <linux/of_platform.h> + +#include <asm/krait-l2-accessors.h> + +#include "edac_core.h" + +#define CESR_DCTPE BIT(0) +#define CESR_DCDPE BIT(1) +#define CESR_ICTPE BIT(2) +#define CESR_ICDPE BIT(3) +#define CESR_DCTE (BIT(4) | BIT(5)) +#define CESR_ICTE (BIT(6) | BIT(7)) +#define CESR_TLBMH BIT(16) +#define CESR_I_MASK 0x000000cc +/* Print a message for everything but TLB MH events */ +#define CESR_PRINT_MASK 0x000000ff + +#define L2ESR 0x204 +#define L2ESR_MPDCD BIT(0) +#define L2ESR_MPSLV BIT(1) +#define L2ESR_TSESB BIT(2) +#define L2ESR_TSEDB BIT(3) +#define L2ESR_DSESB BIT(4) +#define L2ESR_DSEDB BIT(5) +#define L2ESR_MSE BIT(6) +#define L2ESR_MPLDREXNOK BIT(8) +#define L2ESR_CPU_MASK 0xf +#define L2ESR_CPU_SHIFT 16 +#define L2ESR_SP BIT(20) + +#define L2ESYNR0 0x208 +#define L2ESYNR1 0x209 +#define L2EAR0 0x20c +#define L2EAR1 0x20d + +struct krait_edac { + int l1_irq; + struct edac_device_ctl_info * __percpu *edev; + struct notifier_block notifier; +}; + +struct krait_edac_error { + const char * const msg; + void (*func)(struct edac_device_ctl_info *edac_dev, + int inst_nr, int block_nr, const char *msg); +}; + +static unsigned int read_cesr(void) +{ + unsigned int cesr; + + asm volatile ("mrc p15, 7, %0, c15, c0, 1 @ cesr" : "=r" (cesr)); + return cesr; +} + +static void write_cesr(unsigned int cesr) +{ + asm volatile ("mcr p15, 7, %0, c15, c0, 1 @ cesr" : : "r" (cesr)); +} + +static unsigned int read_cesynr(void) +{ + unsigned int cesynr; + + asm volatile ("mrc p15, 7, %0, c15, c0, 3 @ cesynr" : "=r" (cesynr)); + return cesynr; +} + +static irqreturn_t krait_l1_irq(int irq, void *dev_id) +{ + struct edac_device_ctl_info **edac_p = dev_id; + struct edac_device_ctl_info *edac = *edac_p; + unsigned int cesr = read_cesr(); + unsigned int i_cesynr, d_cesynr; + unsigned int cpu = smp_processor_id(); + int print_regs = cesr & CESR_PRINT_MASK; + int i; + static const struct krait_edac_error errors[] = { + { "D-cache tag parity error", edac_device_handle_ue }, + { "D-cache data parity error", edac_device_handle_ue }, + { "I-cache tag parity error", edac_device_handle_ce }, + { "I-cache data parity error", edac_device_handle_ce }, + { "D-cache tag timing error", edac_device_handle_ue }, + { "D-cache data timing error", edac_device_handle_ue }, + { "I-cache tag timing error", edac_device_handle_ce }, + { "I-cache data timing error", edac_device_handle_ce } + }; + + if (print_regs) { + pr_alert("L1 / TLB Error detected on CPU %d!\n", cpu); + pr_alert("CESR = 0x%08x\n", cesr); + } + + for (i = 0; i < ARRAY_SIZE(errors); i++) + if (BIT(i) & cesr) + errors[i].func(edac, cpu, 0, errors[i].msg); + + if (cesr & CESR_TLBMH) { + asm ("mcr p15, 0, r0, c8, c7, 0"); + edac_device_handle_ce(edac, cpu, 0, "TLB Multi-Hit error"); + } + + if (cesr & (CESR_ICTPE | CESR_ICDPE | CESR_ICTE)) { + i_cesynr = read_cesynr(); + pr_alert("I-side CESYNR = 0x%08x\n", i_cesynr); + write_cesr(CESR_I_MASK); + + /* + * Clear the I-side bits from the captured CESR value so that we + * don't accidentally clear any new I-side errors when we do + * the CESR write-clear operation. + */ + cesr &= ~CESR_I_MASK; + } + + if (cesr & (CESR_DCTPE | CESR_DCDPE | CESR_DCTE)) { + d_cesynr = read_cesynr(); + pr_alert("D-side CESYNR = 0x%08x\n", d_cesynr); + } + + /* Clear the interrupt bits we processed */ + write_cesr(cesr); + + return IRQ_HANDLED; +} + +static irqreturn_t krait_l2_irq(int irq, void *dev_id) +{ + struct edac_device_ctl_info *edac = dev_id; + unsigned int l2esr; + unsigned int l2esynr0; + unsigned int l2esynr1; + unsigned int l2ear0; + unsigned int l2ear1; + unsigned long cpu; + int i; + static const struct krait_edac_error errors[] = { + { "master port decode error", edac_device_handle_ce }, + { "master port slave error", edac_device_handle_ce }, + { "tag soft error, single-bit", edac_device_handle_ce }, + { "tag soft error, double-bit", edac_device_handle_ue }, + { "data soft error, single-bit", edac_device_handle_ce }, + { "data soft error, double-bit", edac_device_handle_ue }, + { "modified soft error", edac_device_handle_ce }, + { "slave port exclusive monitor not available", + edac_device_handle_ue}, + { "master port LDREX received Normal OK response", + edac_device_handle_ce }, + }; + + l2esr = krait_get_l2_indirect_reg(L2ESR); + pr_alert("Error detected!\n"); + pr_alert("L2ESR = 0x%08x\n", l2esr); + + if (l2esr & (L2ESR_TSESB | L2ESR_TSEDB | L2ESR_MSE | L2ESR_SP)) { + l2esynr0 = krait_get_l2_indirect_reg(L2ESYNR0); + l2esynr1 = krait_get_l2_indirect_reg(L2ESYNR1); + l2ear0 = krait_get_l2_indirect_reg(L2EAR0); + l2ear1 = krait_get_l2_indirect_reg(L2EAR1); + + pr_alert("L2ESYNR0 = 0x%08x\n", l2esynr0); + pr_alert("L2ESYNR1 = 0x%08x\n", l2esynr1); + pr_alert("L2EAR0 = 0x%08x\n", l2ear0); + pr_alert("L2EAR1 = 0x%08x\n", l2ear1); + } + + cpu = (l2esr >> L2ESR_CPU_SHIFT) & L2ESR_CPU_MASK; + cpu = __ffs(cpu); + if (cpu) + cpu--; + for (i = 0; i < ARRAY_SIZE(errors); i++) + if (BIT(i) & l2esr) + errors[i].func(edac, cpu, 1, errors[i].msg); + + krait_set_l2_indirect_reg(L2ESR, l2esr); + + return IRQ_HANDLED; +} + +static void enable_l1_irq(void *info) +{ + const struct krait_edac *k = info; + + enable_percpu_irq(k->l1_irq, IRQ_TYPE_LEVEL_HIGH); +} + +static void disable_l1_irq(void *info) +{ + const struct krait_edac *k = info; + + disable_percpu_irq(k->l1_irq); +} + +static int +krait_edac_notify(struct notifier_block *nfb, unsigned long action, void *hcpu) +{ + struct krait_edac *p = container_of(nfb, struct krait_edac, notifier); + + switch (action & ~CPU_TASKS_FROZEN) { + case CPU_STARTING: + enable_l1_irq(p); + break; + + case CPU_DYING: + disable_l1_irq(p); + break; + } + return NOTIFY_OK; +} + +static int krait_edac_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct edac_device_ctl_info *edev; + struct krait_edac *p; + int l1_irq, l2_irq; + int ret, cpu; + struct device_node *cpunode, *l1node, *l2node; + + cpunode = of_get_cpu_node(0, NULL); + if (!cpunode) + return -ENODEV; + + l1node = of_parse_phandle(cpunode, "next-level-cache", 0); + of_node_put(cpunode); + if (!l1node) + return -ENODEV; + + l1_irq = irq_of_parse_and_map(l1node, 0); + l2node = of_parse_phandle(l1node, "next-level-cache", 0); + of_node_put(l1node); + if (!l2node) + return -ENODEV; + + l2_irq = irq_of_parse_and_map(l2node, 0); + of_node_put(l2node); + + if (l1_irq < 0) + return l1_irq; + if (l2_irq < 0) + return l2_irq; + + p = devm_kzalloc(dev, sizeof(*p), GFP_KERNEL); + if (!p) + return -ENOMEM; + platform_set_drvdata(pdev, p); + p->l1_irq = l1_irq; + + p->edev = alloc_percpu(struct edac_device_ctl_info *); + if (!p->edev) + return -ENOMEM; + + edev = edac_device_alloc_ctl_info(0, "cpu", num_possible_cpus(), + "L", 2, 1, NULL, 0, + edac_device_alloc_index()); + if (!edev) { + ret = -ENOMEM; + goto err_alloc; + } + + edev->dev = dev; + edev->mod_name = dev_name(dev); + edev->dev_name = dev_name(dev); + edev->ctl_name = "cache"; + + for_each_possible_cpu(cpu) + *per_cpu_ptr(p->edev, cpu) = edev; + + ret = edac_device_add_device(edev); + if (ret) + goto err_add; + + ret = request_percpu_irq(l1_irq, krait_l1_irq, "L1 err", + p->edev); + if (ret) + goto err_l1_irq; + + ret = devm_request_irq(dev, l2_irq, krait_l2_irq, 0, "L2 err", + edev); + if (ret) + goto err_l2_irq; + + p->notifier.notifier_call = krait_edac_notify; + register_hotcpu_notifier(&p->notifier); + on_each_cpu(enable_l1_irq, p, true); + + return 0; +err_l2_irq: + free_percpu_irq(p->l1_irq, p->edev); +err_l1_irq: + edac_device_del_device(dev); +err_add: + edac_device_free_ctl_info(edev); +err_alloc: + free_percpu(p->edev); + return ret; +} + +static int krait_edac_remove(struct platform_device *pdev) +{ + struct krait_edac *p = platform_get_drvdata(pdev); + + unregister_hotcpu_notifier(&p->notifier); + on_each_cpu(disable_l1_irq, p, true); + free_percpu_irq(p->l1_irq, p->edev); + edac_device_del_device(&pdev->dev); + edac_device_free_ctl_info(*__this_cpu_ptr(p->edev)); + free_percpu(p->edev); + + return 0; +} + +static struct platform_driver krait_edac_driver = { + .probe = krait_edac_probe, + .remove = krait_edac_remove, + .driver = { + .name = "krait_edac", + .owner = THIS_MODULE, + }, +}; + +static struct platform_device *krait_edacp; + +static int __init krait_edac_driver_init(void) +{ + struct device_node *np; + + np = of_get_cpu_node(0, NULL); + if (!np) + return 0; + + if (!krait_edacp && of_device_is_compatible(np, "qcom,krait")) + krait_edacp = of_platform_device_create(np, "krait_edac", NULL); + of_node_put(np); + + return platform_driver_register(&krait_edac_driver); +} +module_init(krait_edac_driver_init); + +static void __exit krait_edac_driver_exit(void) +{ + platform_driver_unregister(&krait_edac_driver); + platform_device_unregister(krait_edacp); +} +module_exit(krait_edac_driver_exit); + +MODULE_LICENSE("GPL v2"); +MODULE_DESCRIPTION("Krait CPU cache error reporting driver"); +MODULE_ALIAS("platform:krait_edac"); -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation ^ permalink raw reply related [flat|nested] 44+ messages in thread
* [PATCH v6 4/5] edac: Add support for Krait CPU cache error detection @ 2014-04-04 19:57 ` Stephen Boyd 0 siblings, 0 replies; 44+ messages in thread From: Stephen Boyd @ 2014-04-04 19:57 UTC (permalink / raw) To: linux-arm-kernel Add support for the Krait CPU cache error detection. This is a simplified version of the code originally written by Stepan Moskovchenko[1] ported to the EDAC device framework. [1] https://www.codeaurora.org/cgit/quic/la/kernel/msm/tree/arch/arm/mach-msm/cache_erp.c?h=msm-3.4 Cc: Stepan Moskovchenko <stepanm@codeaurora.org> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> --- drivers/edac/Kconfig | 8 + drivers/edac/Makefile | 2 + drivers/edac/krait_edac.c | 370 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 380 insertions(+) create mode 100644 drivers/edac/krait_edac.c diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig index 878f09005fad..4dae3d353ea9 100644 --- a/drivers/edac/Kconfig +++ b/drivers/edac/Kconfig @@ -368,4 +368,12 @@ config EDAC_OCTEON_PCI Support for error detection and correction on the Cavium Octeon family of SOCs. +config EDAC_KRAIT_CACHE + tristate "Krait L1/L2 Cache" + depends on EDAC_MM_EDAC && ARM && OF + select KRAIT_L2_ACCESSORS + help + Support for error detection and correction on the + Krait L1/L2 cache controller. + endif # EDAC diff --git a/drivers/edac/Makefile b/drivers/edac/Makefile index 4154ed6a02c6..b6ea50564223 100644 --- a/drivers/edac/Makefile +++ b/drivers/edac/Makefile @@ -64,3 +64,5 @@ obj-$(CONFIG_EDAC_OCTEON_PC) += octeon_edac-pc.o obj-$(CONFIG_EDAC_OCTEON_L2C) += octeon_edac-l2c.o obj-$(CONFIG_EDAC_OCTEON_LMC) += octeon_edac-lmc.o obj-$(CONFIG_EDAC_OCTEON_PCI) += octeon_edac-pci.o + +obj-$(CONFIG_EDAC_KRAIT_CACHE) += krait_edac.o diff --git a/drivers/edac/krait_edac.c b/drivers/edac/krait_edac.c new file mode 100644 index 000000000000..90ec0e982927 --- /dev/null +++ b/drivers/edac/krait_edac.c @@ -0,0 +1,370 @@ +/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 and + * only version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <linux/interrupt.h> +#include <linux/irq.h> +#include <linux/platform_device.h> +#include <linux/module.h> +#include <linux/err.h> +#include <linux/cpu.h> +#include <linux/io.h> +#include <linux/of.h> +#include <linux/of_irq.h> +#include <linux/of_platform.h> + +#include <asm/krait-l2-accessors.h> + +#include "edac_core.h" + +#define CESR_DCTPE BIT(0) +#define CESR_DCDPE BIT(1) +#define CESR_ICTPE BIT(2) +#define CESR_ICDPE BIT(3) +#define CESR_DCTE (BIT(4) | BIT(5)) +#define CESR_ICTE (BIT(6) | BIT(7)) +#define CESR_TLBMH BIT(16) +#define CESR_I_MASK 0x000000cc +/* Print a message for everything but TLB MH events */ +#define CESR_PRINT_MASK 0x000000ff + +#define L2ESR 0x204 +#define L2ESR_MPDCD BIT(0) +#define L2ESR_MPSLV BIT(1) +#define L2ESR_TSESB BIT(2) +#define L2ESR_TSEDB BIT(3) +#define L2ESR_DSESB BIT(4) +#define L2ESR_DSEDB BIT(5) +#define L2ESR_MSE BIT(6) +#define L2ESR_MPLDREXNOK BIT(8) +#define L2ESR_CPU_MASK 0xf +#define L2ESR_CPU_SHIFT 16 +#define L2ESR_SP BIT(20) + +#define L2ESYNR0 0x208 +#define L2ESYNR1 0x209 +#define L2EAR0 0x20c +#define L2EAR1 0x20d + +struct krait_edac { + int l1_irq; + struct edac_device_ctl_info * __percpu *edev; + struct notifier_block notifier; +}; + +struct krait_edac_error { + const char * const msg; + void (*func)(struct edac_device_ctl_info *edac_dev, + int inst_nr, int block_nr, const char *msg); +}; + +static unsigned int read_cesr(void) +{ + unsigned int cesr; + + asm volatile ("mrc p15, 7, %0, c15, c0, 1 @ cesr" : "=r" (cesr)); + return cesr; +} + +static void write_cesr(unsigned int cesr) +{ + asm volatile ("mcr p15, 7, %0, c15, c0, 1 @ cesr" : : "r" (cesr)); +} + +static unsigned int read_cesynr(void) +{ + unsigned int cesynr; + + asm volatile ("mrc p15, 7, %0, c15, c0, 3 @ cesynr" : "=r" (cesynr)); + return cesynr; +} + +static irqreturn_t krait_l1_irq(int irq, void *dev_id) +{ + struct edac_device_ctl_info **edac_p = dev_id; + struct edac_device_ctl_info *edac = *edac_p; + unsigned int cesr = read_cesr(); + unsigned int i_cesynr, d_cesynr; + unsigned int cpu = smp_processor_id(); + int print_regs = cesr & CESR_PRINT_MASK; + int i; + static const struct krait_edac_error errors[] = { + { "D-cache tag parity error", edac_device_handle_ue }, + { "D-cache data parity error", edac_device_handle_ue }, + { "I-cache tag parity error", edac_device_handle_ce }, + { "I-cache data parity error", edac_device_handle_ce }, + { "D-cache tag timing error", edac_device_handle_ue }, + { "D-cache data timing error", edac_device_handle_ue }, + { "I-cache tag timing error", edac_device_handle_ce }, + { "I-cache data timing error", edac_device_handle_ce } + }; + + if (print_regs) { + pr_alert("L1 / TLB Error detected on CPU %d!\n", cpu); + pr_alert("CESR = 0x%08x\n", cesr); + } + + for (i = 0; i < ARRAY_SIZE(errors); i++) + if (BIT(i) & cesr) + errors[i].func(edac, cpu, 0, errors[i].msg); + + if (cesr & CESR_TLBMH) { + asm ("mcr p15, 0, r0, c8, c7, 0"); + edac_device_handle_ce(edac, cpu, 0, "TLB Multi-Hit error"); + } + + if (cesr & (CESR_ICTPE | CESR_ICDPE | CESR_ICTE)) { + i_cesynr = read_cesynr(); + pr_alert("I-side CESYNR = 0x%08x\n", i_cesynr); + write_cesr(CESR_I_MASK); + + /* + * Clear the I-side bits from the captured CESR value so that we + * don't accidentally clear any new I-side errors when we do + * the CESR write-clear operation. + */ + cesr &= ~CESR_I_MASK; + } + + if (cesr & (CESR_DCTPE | CESR_DCDPE | CESR_DCTE)) { + d_cesynr = read_cesynr(); + pr_alert("D-side CESYNR = 0x%08x\n", d_cesynr); + } + + /* Clear the interrupt bits we processed */ + write_cesr(cesr); + + return IRQ_HANDLED; +} + +static irqreturn_t krait_l2_irq(int irq, void *dev_id) +{ + struct edac_device_ctl_info *edac = dev_id; + unsigned int l2esr; + unsigned int l2esynr0; + unsigned int l2esynr1; + unsigned int l2ear0; + unsigned int l2ear1; + unsigned long cpu; + int i; + static const struct krait_edac_error errors[] = { + { "master port decode error", edac_device_handle_ce }, + { "master port slave error", edac_device_handle_ce }, + { "tag soft error, single-bit", edac_device_handle_ce }, + { "tag soft error, double-bit", edac_device_handle_ue }, + { "data soft error, single-bit", edac_device_handle_ce }, + { "data soft error, double-bit", edac_device_handle_ue }, + { "modified soft error", edac_device_handle_ce }, + { "slave port exclusive monitor not available", + edac_device_handle_ue}, + { "master port LDREX received Normal OK response", + edac_device_handle_ce }, + }; + + l2esr = krait_get_l2_indirect_reg(L2ESR); + pr_alert("Error detected!\n"); + pr_alert("L2ESR = 0x%08x\n", l2esr); + + if (l2esr & (L2ESR_TSESB | L2ESR_TSEDB | L2ESR_MSE | L2ESR_SP)) { + l2esynr0 = krait_get_l2_indirect_reg(L2ESYNR0); + l2esynr1 = krait_get_l2_indirect_reg(L2ESYNR1); + l2ear0 = krait_get_l2_indirect_reg(L2EAR0); + l2ear1 = krait_get_l2_indirect_reg(L2EAR1); + + pr_alert("L2ESYNR0 = 0x%08x\n", l2esynr0); + pr_alert("L2ESYNR1 = 0x%08x\n", l2esynr1); + pr_alert("L2EAR0 = 0x%08x\n", l2ear0); + pr_alert("L2EAR1 = 0x%08x\n", l2ear1); + } + + cpu = (l2esr >> L2ESR_CPU_SHIFT) & L2ESR_CPU_MASK; + cpu = __ffs(cpu); + if (cpu) + cpu--; + for (i = 0; i < ARRAY_SIZE(errors); i++) + if (BIT(i) & l2esr) + errors[i].func(edac, cpu, 1, errors[i].msg); + + krait_set_l2_indirect_reg(L2ESR, l2esr); + + return IRQ_HANDLED; +} + +static void enable_l1_irq(void *info) +{ + const struct krait_edac *k = info; + + enable_percpu_irq(k->l1_irq, IRQ_TYPE_LEVEL_HIGH); +} + +static void disable_l1_irq(void *info) +{ + const struct krait_edac *k = info; + + disable_percpu_irq(k->l1_irq); +} + +static int +krait_edac_notify(struct notifier_block *nfb, unsigned long action, void *hcpu) +{ + struct krait_edac *p = container_of(nfb, struct krait_edac, notifier); + + switch (action & ~CPU_TASKS_FROZEN) { + case CPU_STARTING: + enable_l1_irq(p); + break; + + case CPU_DYING: + disable_l1_irq(p); + break; + } + return NOTIFY_OK; +} + +static int krait_edac_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct edac_device_ctl_info *edev; + struct krait_edac *p; + int l1_irq, l2_irq; + int ret, cpu; + struct device_node *cpunode, *l1node, *l2node; + + cpunode = of_get_cpu_node(0, NULL); + if (!cpunode) + return -ENODEV; + + l1node = of_parse_phandle(cpunode, "next-level-cache", 0); + of_node_put(cpunode); + if (!l1node) + return -ENODEV; + + l1_irq = irq_of_parse_and_map(l1node, 0); + l2node = of_parse_phandle(l1node, "next-level-cache", 0); + of_node_put(l1node); + if (!l2node) + return -ENODEV; + + l2_irq = irq_of_parse_and_map(l2node, 0); + of_node_put(l2node); + + if (l1_irq < 0) + return l1_irq; + if (l2_irq < 0) + return l2_irq; + + p = devm_kzalloc(dev, sizeof(*p), GFP_KERNEL); + if (!p) + return -ENOMEM; + platform_set_drvdata(pdev, p); + p->l1_irq = l1_irq; + + p->edev = alloc_percpu(struct edac_device_ctl_info *); + if (!p->edev) + return -ENOMEM; + + edev = edac_device_alloc_ctl_info(0, "cpu", num_possible_cpus(), + "L", 2, 1, NULL, 0, + edac_device_alloc_index()); + if (!edev) { + ret = -ENOMEM; + goto err_alloc; + } + + edev->dev = dev; + edev->mod_name = dev_name(dev); + edev->dev_name = dev_name(dev); + edev->ctl_name = "cache"; + + for_each_possible_cpu(cpu) + *per_cpu_ptr(p->edev, cpu) = edev; + + ret = edac_device_add_device(edev); + if (ret) + goto err_add; + + ret = request_percpu_irq(l1_irq, krait_l1_irq, "L1 err", + p->edev); + if (ret) + goto err_l1_irq; + + ret = devm_request_irq(dev, l2_irq, krait_l2_irq, 0, "L2 err", + edev); + if (ret) + goto err_l2_irq; + + p->notifier.notifier_call = krait_edac_notify; + register_hotcpu_notifier(&p->notifier); + on_each_cpu(enable_l1_irq, p, true); + + return 0; +err_l2_irq: + free_percpu_irq(p->l1_irq, p->edev); +err_l1_irq: + edac_device_del_device(dev); +err_add: + edac_device_free_ctl_info(edev); +err_alloc: + free_percpu(p->edev); + return ret; +} + +static int krait_edac_remove(struct platform_device *pdev) +{ + struct krait_edac *p = platform_get_drvdata(pdev); + + unregister_hotcpu_notifier(&p->notifier); + on_each_cpu(disable_l1_irq, p, true); + free_percpu_irq(p->l1_irq, p->edev); + edac_device_del_device(&pdev->dev); + edac_device_free_ctl_info(*__this_cpu_ptr(p->edev)); + free_percpu(p->edev); + + return 0; +} + +static struct platform_driver krait_edac_driver = { + .probe = krait_edac_probe, + .remove = krait_edac_remove, + .driver = { + .name = "krait_edac", + .owner = THIS_MODULE, + }, +}; + +static struct platform_device *krait_edacp; + +static int __init krait_edac_driver_init(void) +{ + struct device_node *np; + + np = of_get_cpu_node(0, NULL); + if (!np) + return 0; + + if (!krait_edacp && of_device_is_compatible(np, "qcom,krait")) + krait_edacp = of_platform_device_create(np, "krait_edac", NULL); + of_node_put(np); + + return platform_driver_register(&krait_edac_driver); +} +module_init(krait_edac_driver_init); + +static void __exit krait_edac_driver_exit(void) +{ + platform_driver_unregister(&krait_edac_driver); + platform_device_unregister(krait_edacp); +} +module_exit(krait_edac_driver_exit); + +MODULE_LICENSE("GPL v2"); +MODULE_DESCRIPTION("Krait CPU cache error reporting driver"); +MODULE_ALIAS("platform:krait_edac"); -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation ^ permalink raw reply related [flat|nested] 44+ messages in thread
* Re: [PATCH v6 4/5] edac: Add support for Krait CPU cache error detection 2014-04-04 19:57 ` Stephen Boyd @ 2014-04-08 17:35 ` Borislav Petkov -1 siblings, 0 replies; 44+ messages in thread From: Borislav Petkov @ 2014-04-08 17:35 UTC (permalink / raw) To: Stephen Boyd Cc: linux-kernel, linux-arm-msm, linux-arm-kernel, linux-edac, Stepan Moskovchenko On Fri, Apr 04, 2014 at 12:57:29PM -0700, Stephen Boyd wrote: > Add support for the Krait CPU cache error detection. This is a > simplified version of the code originally written by Stepan > Moskovchenko[1] ported to the EDAC device framework. > > [1] https://www.codeaurora.org/cgit/quic/la/kernel/msm/tree/arch/arm/mach-msm/cache_erp.c?h=msm-3.4 > > Cc: Stepan Moskovchenko <stepanm@codeaurora.org> > Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> > --- > drivers/edac/Kconfig | 8 + > drivers/edac/Makefile | 2 + > drivers/edac/krait_edac.c | 370 ++++++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 380 insertions(+) > create mode 100644 drivers/edac/krait_edac.c > > diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig > index 878f09005fad..4dae3d353ea9 100644 > --- a/drivers/edac/Kconfig > +++ b/drivers/edac/Kconfig > @@ -368,4 +368,12 @@ config EDAC_OCTEON_PCI > Support for error detection and correction on the > Cavium Octeon family of SOCs. > > +config EDAC_KRAIT_CACHE > + tristate "Krait L1/L2 Cache" > + depends on EDAC_MM_EDAC && ARM && OF > + select KRAIT_L2_ACCESSORS > + help > + Support for error detection and correction on the > + Krait L1/L2 cache controller. > + > endif # EDAC > diff --git a/drivers/edac/Makefile b/drivers/edac/Makefile > index 4154ed6a02c6..b6ea50564223 100644 > --- a/drivers/edac/Makefile > +++ b/drivers/edac/Makefile > @@ -64,3 +64,5 @@ obj-$(CONFIG_EDAC_OCTEON_PC) += octeon_edac-pc.o > obj-$(CONFIG_EDAC_OCTEON_L2C) += octeon_edac-l2c.o > obj-$(CONFIG_EDAC_OCTEON_LMC) += octeon_edac-lmc.o > obj-$(CONFIG_EDAC_OCTEON_PCI) += octeon_edac-pci.o > + > +obj-$(CONFIG_EDAC_KRAIT_CACHE) += krait_edac.o > diff --git a/drivers/edac/krait_edac.c b/drivers/edac/krait_edac.c > new file mode 100644 > index 000000000000..90ec0e982927 > --- /dev/null > +++ b/drivers/edac/krait_edac.c > @@ -0,0 +1,370 @@ > +/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved. > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 and > + * only version 2 as published by the Free Software Foundation. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + */ > + > +#include <linux/interrupt.h> > +#include <linux/irq.h> > +#include <linux/platform_device.h> > +#include <linux/module.h> > +#include <linux/err.h> > +#include <linux/cpu.h> > +#include <linux/io.h> > +#include <linux/of.h> > +#include <linux/of_irq.h> > +#include <linux/of_platform.h> > + > +#include <asm/krait-l2-accessors.h> > + > +#include "edac_core.h" > + > +#define CESR_DCTPE BIT(0) > +#define CESR_DCDPE BIT(1) > +#define CESR_ICTPE BIT(2) > +#define CESR_ICDPE BIT(3) > +#define CESR_DCTE (BIT(4) | BIT(5)) > +#define CESR_ICTE (BIT(6) | BIT(7)) > +#define CESR_TLBMH BIT(16) > +#define CESR_I_MASK 0x000000cc > +/* Print a message for everything but TLB MH events */ > +#define CESR_PRINT_MASK 0x000000ff > + > +#define L2ESR 0x204 > +#define L2ESR_MPDCD BIT(0) > +#define L2ESR_MPSLV BIT(1) > +#define L2ESR_TSESB BIT(2) > +#define L2ESR_TSEDB BIT(3) > +#define L2ESR_DSESB BIT(4) > +#define L2ESR_DSEDB BIT(5) > +#define L2ESR_MSE BIT(6) > +#define L2ESR_MPLDREXNOK BIT(8) > +#define L2ESR_CPU_MASK 0xf > +#define L2ESR_CPU_SHIFT 16 > +#define L2ESR_SP BIT(20) > + > +#define L2ESYNR0 0x208 > +#define L2ESYNR1 0x209 > +#define L2EAR0 0x20c > +#define L2EAR1 0x20d > + > +struct krait_edac { > + int l1_irq; > + struct edac_device_ctl_info * __percpu *edev; > + struct notifier_block notifier; > +}; > + > +struct krait_edac_error { > + const char * const msg; > + void (*func)(struct edac_device_ctl_info *edac_dev, > + int inst_nr, int block_nr, const char *msg); arg alignment (please start new line at the opening brace). > +}; > + > +static unsigned int read_cesr(void) > +{ > + unsigned int cesr; > + > + asm volatile ("mrc p15, 7, %0, c15, c0, 1 @ cesr" : "=r" (cesr)); > + return cesr; > +} > + > +static void write_cesr(unsigned int cesr) > +{ > + asm volatile ("mcr p15, 7, %0, c15, c0, 1 @ cesr" : : "r" (cesr)); > +} > + > +static unsigned int read_cesynr(void) > +{ > + unsigned int cesynr; > + > + asm volatile ("mrc p15, 7, %0, c15, c0, 3 @ cesynr" : "=r" (cesynr)); > + return cesynr; > +} > + > +static irqreturn_t krait_l1_irq(int irq, void *dev_id) > +{ > + struct edac_device_ctl_info **edac_p = dev_id; > + struct edac_device_ctl_info *edac = *edac_p; > + unsigned int cesr = read_cesr(); > + unsigned int i_cesynr, d_cesynr; > + unsigned int cpu = smp_processor_id(); > + int print_regs = cesr & CESR_PRINT_MASK; > + int i; > + static const struct krait_edac_error errors[] = { > + { "D-cache tag parity error", edac_device_handle_ue }, > + { "D-cache data parity error", edac_device_handle_ue }, > + { "I-cache tag parity error", edac_device_handle_ce }, > + { "I-cache data parity error", edac_device_handle_ce }, > + { "D-cache tag timing error", edac_device_handle_ue }, > + { "D-cache data timing error", edac_device_handle_ue }, > + { "I-cache tag timing error", edac_device_handle_ce }, > + { "I-cache data timing error", edac_device_handle_ce } > + }; > + > + if (print_regs) { This variable is used only once here, you can simply do the binary and test then and drop it: if (cesr & CESR_PRINT_MASK) > + pr_alert("L1 / TLB Error detected on CPU %d!\n", cpu); > + pr_alert("CESR = 0x%08x\n", cesr); You can use the edac_*_printk with KERN_ALERT as level which adds proper prefixes. > + } > + > + for (i = 0; i < ARRAY_SIZE(errors); i++) > + if (BIT(i) & cesr) > + errors[i].func(edac, cpu, 0, errors[i].msg); Nice! Func ptr per error type :) > + > + if (cesr & CESR_TLBMH) { > + asm ("mcr p15, 0, r0, c8, c7, 0"); > + edac_device_handle_ce(edac, cpu, 0, "TLB Multi-Hit error"); > + } > + > + if (cesr & (CESR_ICTPE | CESR_ICDPE | CESR_ICTE)) { > + i_cesynr = read_cesynr(); > + pr_alert("I-side CESYNR = 0x%08x\n", i_cesynr); edac_printk and also, this message looks a bit cryptic for issuing it at ALERT level. I'm ssuming people won't come to you and ask you what it means...? :) > + write_cesr(CESR_I_MASK); > + > + /* > + * Clear the I-side bits from the captured CESR value so that we > + * don't accidentally clear any new I-side errors when we do > + * the CESR write-clear operation. > + */ > + cesr &= ~CESR_I_MASK; > + } > + > + if (cesr & (CESR_DCTPE | CESR_DCDPE | CESR_DCTE)) { > + d_cesynr = read_cesynr(); > + pr_alert("D-side CESYNR = 0x%08x\n", d_cesynr); Ditto. > + } > + > + /* Clear the interrupt bits we processed */ > + write_cesr(cesr); > + > + return IRQ_HANDLED; > +} > + > +static irqreturn_t krait_l2_irq(int irq, void *dev_id) > +{ > + struct edac_device_ctl_info *edac = dev_id; > + unsigned int l2esr; > + unsigned int l2esynr0; > + unsigned int l2esynr1; > + unsigned int l2ear0; > + unsigned int l2ear1; > + unsigned long cpu; > + int i; > + static const struct krait_edac_error errors[] = { > + { "master port decode error", edac_device_handle_ce }, > + { "master port slave error", edac_device_handle_ce }, > + { "tag soft error, single-bit", edac_device_handle_ce }, > + { "tag soft error, double-bit", edac_device_handle_ue }, > + { "data soft error, single-bit", edac_device_handle_ce }, > + { "data soft error, double-bit", edac_device_handle_ue }, > + { "modified soft error", edac_device_handle_ce }, > + { "slave port exclusive monitor not available", > + edac_device_handle_ue}, > + { "master port LDREX received Normal OK response", > + edac_device_handle_ce }, > + }; > + > + l2esr = krait_get_l2_indirect_reg(L2ESR); > + pr_alert("Error detected!\n"); Why print this not very telling message here if errors[i].func() will get the proper .msg later? > + pr_alert("L2ESR = 0x%08x\n", l2esr); > + > + if (l2esr & (L2ESR_TSESB | L2ESR_TSEDB | L2ESR_MSE | L2ESR_SP)) { > + l2esynr0 = krait_get_l2_indirect_reg(L2ESYNR0); > + l2esynr1 = krait_get_l2_indirect_reg(L2ESYNR1); > + l2ear0 = krait_get_l2_indirect_reg(L2EAR0); > + l2ear1 = krait_get_l2_indirect_reg(L2EAR1); > + > + pr_alert("L2ESYNR0 = 0x%08x\n", l2esynr0); > + pr_alert("L2ESYNR1 = 0x%08x\n", l2esynr1); > + pr_alert("L2EAR0 = 0x%08x\n", l2ear0); > + pr_alert("L2EAR1 = 0x%08x\n", l2ear1); Also, please use edac_printk and consider making those messages human-readable, otherwise it only confuses users. > + } > + > + cpu = (l2esr >> L2ESR_CPU_SHIFT) & L2ESR_CPU_MASK; > + cpu = __ffs(cpu); > + if (cpu) > + cpu--; ... -- Regards/Gruss, Boris. Sent from a fat crate under my desk. Formatting is fine. -- ^ permalink raw reply [flat|nested] 44+ messages in thread
* [PATCH v6 4/5] edac: Add support for Krait CPU cache error detection @ 2014-04-08 17:35 ` Borislav Petkov 0 siblings, 0 replies; 44+ messages in thread From: Borislav Petkov @ 2014-04-08 17:35 UTC (permalink / raw) To: linux-arm-kernel On Fri, Apr 04, 2014 at 12:57:29PM -0700, Stephen Boyd wrote: > Add support for the Krait CPU cache error detection. This is a > simplified version of the code originally written by Stepan > Moskovchenko[1] ported to the EDAC device framework. > > [1] https://www.codeaurora.org/cgit/quic/la/kernel/msm/tree/arch/arm/mach-msm/cache_erp.c?h=msm-3.4 > > Cc: Stepan Moskovchenko <stepanm@codeaurora.org> > Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> > --- > drivers/edac/Kconfig | 8 + > drivers/edac/Makefile | 2 + > drivers/edac/krait_edac.c | 370 ++++++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 380 insertions(+) > create mode 100644 drivers/edac/krait_edac.c > > diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig > index 878f09005fad..4dae3d353ea9 100644 > --- a/drivers/edac/Kconfig > +++ b/drivers/edac/Kconfig > @@ -368,4 +368,12 @@ config EDAC_OCTEON_PCI > Support for error detection and correction on the > Cavium Octeon family of SOCs. > > +config EDAC_KRAIT_CACHE > + tristate "Krait L1/L2 Cache" > + depends on EDAC_MM_EDAC && ARM && OF > + select KRAIT_L2_ACCESSORS > + help > + Support for error detection and correction on the > + Krait L1/L2 cache controller. > + > endif # EDAC > diff --git a/drivers/edac/Makefile b/drivers/edac/Makefile > index 4154ed6a02c6..b6ea50564223 100644 > --- a/drivers/edac/Makefile > +++ b/drivers/edac/Makefile > @@ -64,3 +64,5 @@ obj-$(CONFIG_EDAC_OCTEON_PC) += octeon_edac-pc.o > obj-$(CONFIG_EDAC_OCTEON_L2C) += octeon_edac-l2c.o > obj-$(CONFIG_EDAC_OCTEON_LMC) += octeon_edac-lmc.o > obj-$(CONFIG_EDAC_OCTEON_PCI) += octeon_edac-pci.o > + > +obj-$(CONFIG_EDAC_KRAIT_CACHE) += krait_edac.o > diff --git a/drivers/edac/krait_edac.c b/drivers/edac/krait_edac.c > new file mode 100644 > index 000000000000..90ec0e982927 > --- /dev/null > +++ b/drivers/edac/krait_edac.c > @@ -0,0 +1,370 @@ > +/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved. > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 and > + * only version 2 as published by the Free Software Foundation. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + */ > + > +#include <linux/interrupt.h> > +#include <linux/irq.h> > +#include <linux/platform_device.h> > +#include <linux/module.h> > +#include <linux/err.h> > +#include <linux/cpu.h> > +#include <linux/io.h> > +#include <linux/of.h> > +#include <linux/of_irq.h> > +#include <linux/of_platform.h> > + > +#include <asm/krait-l2-accessors.h> > + > +#include "edac_core.h" > + > +#define CESR_DCTPE BIT(0) > +#define CESR_DCDPE BIT(1) > +#define CESR_ICTPE BIT(2) > +#define CESR_ICDPE BIT(3) > +#define CESR_DCTE (BIT(4) | BIT(5)) > +#define CESR_ICTE (BIT(6) | BIT(7)) > +#define CESR_TLBMH BIT(16) > +#define CESR_I_MASK 0x000000cc > +/* Print a message for everything but TLB MH events */ > +#define CESR_PRINT_MASK 0x000000ff > + > +#define L2ESR 0x204 > +#define L2ESR_MPDCD BIT(0) > +#define L2ESR_MPSLV BIT(1) > +#define L2ESR_TSESB BIT(2) > +#define L2ESR_TSEDB BIT(3) > +#define L2ESR_DSESB BIT(4) > +#define L2ESR_DSEDB BIT(5) > +#define L2ESR_MSE BIT(6) > +#define L2ESR_MPLDREXNOK BIT(8) > +#define L2ESR_CPU_MASK 0xf > +#define L2ESR_CPU_SHIFT 16 > +#define L2ESR_SP BIT(20) > + > +#define L2ESYNR0 0x208 > +#define L2ESYNR1 0x209 > +#define L2EAR0 0x20c > +#define L2EAR1 0x20d > + > +struct krait_edac { > + int l1_irq; > + struct edac_device_ctl_info * __percpu *edev; > + struct notifier_block notifier; > +}; > + > +struct krait_edac_error { > + const char * const msg; > + void (*func)(struct edac_device_ctl_info *edac_dev, > + int inst_nr, int block_nr, const char *msg); arg alignment (please start new line at the opening brace). > +}; > + > +static unsigned int read_cesr(void) > +{ > + unsigned int cesr; > + > + asm volatile ("mrc p15, 7, %0, c15, c0, 1 @ cesr" : "=r" (cesr)); > + return cesr; > +} > + > +static void write_cesr(unsigned int cesr) > +{ > + asm volatile ("mcr p15, 7, %0, c15, c0, 1 @ cesr" : : "r" (cesr)); > +} > + > +static unsigned int read_cesynr(void) > +{ > + unsigned int cesynr; > + > + asm volatile ("mrc p15, 7, %0, c15, c0, 3 @ cesynr" : "=r" (cesynr)); > + return cesynr; > +} > + > +static irqreturn_t krait_l1_irq(int irq, void *dev_id) > +{ > + struct edac_device_ctl_info **edac_p = dev_id; > + struct edac_device_ctl_info *edac = *edac_p; > + unsigned int cesr = read_cesr(); > + unsigned int i_cesynr, d_cesynr; > + unsigned int cpu = smp_processor_id(); > + int print_regs = cesr & CESR_PRINT_MASK; > + int i; > + static const struct krait_edac_error errors[] = { > + { "D-cache tag parity error", edac_device_handle_ue }, > + { "D-cache data parity error", edac_device_handle_ue }, > + { "I-cache tag parity error", edac_device_handle_ce }, > + { "I-cache data parity error", edac_device_handle_ce }, > + { "D-cache tag timing error", edac_device_handle_ue }, > + { "D-cache data timing error", edac_device_handle_ue }, > + { "I-cache tag timing error", edac_device_handle_ce }, > + { "I-cache data timing error", edac_device_handle_ce } > + }; > + > + if (print_regs) { This variable is used only once here, you can simply do the binary and test then and drop it: if (cesr & CESR_PRINT_MASK) > + pr_alert("L1 / TLB Error detected on CPU %d!\n", cpu); > + pr_alert("CESR = 0x%08x\n", cesr); You can use the edac_*_printk with KERN_ALERT as level which adds proper prefixes. > + } > + > + for (i = 0; i < ARRAY_SIZE(errors); i++) > + if (BIT(i) & cesr) > + errors[i].func(edac, cpu, 0, errors[i].msg); Nice! Func ptr per error type :) > + > + if (cesr & CESR_TLBMH) { > + asm ("mcr p15, 0, r0, c8, c7, 0"); > + edac_device_handle_ce(edac, cpu, 0, "TLB Multi-Hit error"); > + } > + > + if (cesr & (CESR_ICTPE | CESR_ICDPE | CESR_ICTE)) { > + i_cesynr = read_cesynr(); > + pr_alert("I-side CESYNR = 0x%08x\n", i_cesynr); edac_printk and also, this message looks a bit cryptic for issuing it at ALERT level. I'm ssuming people won't come to you and ask you what it means...? :) > + write_cesr(CESR_I_MASK); > + > + /* > + * Clear the I-side bits from the captured CESR value so that we > + * don't accidentally clear any new I-side errors when we do > + * the CESR write-clear operation. > + */ > + cesr &= ~CESR_I_MASK; > + } > + > + if (cesr & (CESR_DCTPE | CESR_DCDPE | CESR_DCTE)) { > + d_cesynr = read_cesynr(); > + pr_alert("D-side CESYNR = 0x%08x\n", d_cesynr); Ditto. > + } > + > + /* Clear the interrupt bits we processed */ > + write_cesr(cesr); > + > + return IRQ_HANDLED; > +} > + > +static irqreturn_t krait_l2_irq(int irq, void *dev_id) > +{ > + struct edac_device_ctl_info *edac = dev_id; > + unsigned int l2esr; > + unsigned int l2esynr0; > + unsigned int l2esynr1; > + unsigned int l2ear0; > + unsigned int l2ear1; > + unsigned long cpu; > + int i; > + static const struct krait_edac_error errors[] = { > + { "master port decode error", edac_device_handle_ce }, > + { "master port slave error", edac_device_handle_ce }, > + { "tag soft error, single-bit", edac_device_handle_ce }, > + { "tag soft error, double-bit", edac_device_handle_ue }, > + { "data soft error, single-bit", edac_device_handle_ce }, > + { "data soft error, double-bit", edac_device_handle_ue }, > + { "modified soft error", edac_device_handle_ce }, > + { "slave port exclusive monitor not available", > + edac_device_handle_ue}, > + { "master port LDREX received Normal OK response", > + edac_device_handle_ce }, > + }; > + > + l2esr = krait_get_l2_indirect_reg(L2ESR); > + pr_alert("Error detected!\n"); Why print this not very telling message here if errors[i].func() will get the proper .msg later? > + pr_alert("L2ESR = 0x%08x\n", l2esr); > + > + if (l2esr & (L2ESR_TSESB | L2ESR_TSEDB | L2ESR_MSE | L2ESR_SP)) { > + l2esynr0 = krait_get_l2_indirect_reg(L2ESYNR0); > + l2esynr1 = krait_get_l2_indirect_reg(L2ESYNR1); > + l2ear0 = krait_get_l2_indirect_reg(L2EAR0); > + l2ear1 = krait_get_l2_indirect_reg(L2EAR1); > + > + pr_alert("L2ESYNR0 = 0x%08x\n", l2esynr0); > + pr_alert("L2ESYNR1 = 0x%08x\n", l2esynr1); > + pr_alert("L2EAR0 = 0x%08x\n", l2ear0); > + pr_alert("L2EAR1 = 0x%08x\n", l2ear1); Also, please use edac_printk and consider making those messages human-readable, otherwise it only confuses users. > + } > + > + cpu = (l2esr >> L2ESR_CPU_SHIFT) & L2ESR_CPU_MASK; > + cpu = __ffs(cpu); > + if (cpu) > + cpu--; ... -- Regards/Gruss, Boris. Sent from a fat crate under my desk. Formatting is fine. -- ^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH v6 4/5] edac: Add support for Krait CPU cache error detection 2014-04-08 17:35 ` Borislav Petkov @ 2014-04-08 19:54 ` Stephen Boyd -1 siblings, 0 replies; 44+ messages in thread From: Stephen Boyd @ 2014-04-08 19:54 UTC (permalink / raw) To: Borislav Petkov Cc: linux-kernel, linux-arm-msm, linux-arm-kernel, linux-edac, Stepan Moskovchenko On 04/08/14 10:35, Borislav Petkov wrote: > On Fri, Apr 04, 2014 at 12:57:29PM -0700, Stephen Boyd wrote: >> + >> +struct krait_edac_error { >> + const char * const msg; >> + void (*func)(struct edac_device_ctl_info *edac_dev, >> + int inst_nr, int block_nr, const char *msg); > arg alignment (please start new line at the opening brace). Done. >> + int print_regs = cesr & CESR_PRINT_MASK; >> + int i; >> + static const struct krait_edac_error errors[] = { >> + { "D-cache tag parity error", edac_device_handle_ue }, >> + { "D-cache data parity error", edac_device_handle_ue }, >> + { "I-cache tag parity error", edac_device_handle_ce }, >> + { "I-cache data parity error", edac_device_handle_ce }, >> + { "D-cache tag timing error", edac_device_handle_ue }, >> + { "D-cache data timing error", edac_device_handle_ue }, >> + { "I-cache tag timing error", edac_device_handle_ce }, >> + { "I-cache data timing error", edac_device_handle_ce } >> + }; >> + >> + if (print_regs) { > This variable is used only once here, you can simply do the binary and > test then and drop it: > > if (cesr & CESR_PRINT_MASK) Done. > >> + pr_alert("L1 / TLB Error detected on CPU %d!\n", cpu); >> + pr_alert("CESR = 0x%08x\n", cesr); > You can use the edac_*_printk with KERN_ALERT as level which adds proper > prefixes. Done. > > >> + >> + if (cesr & CESR_TLBMH) { >> + asm ("mcr p15, 0, r0, c8, c7, 0"); >> + edac_device_handle_ce(edac, cpu, 0, "TLB Multi-Hit error"); >> + } >> + >> + if (cesr & (CESR_ICTPE | CESR_ICDPE | CESR_ICTE)) { >> + i_cesynr = read_cesynr(); >> + pr_alert("I-side CESYNR = 0x%08x\n", i_cesynr); > edac_printk > > and also, this message looks a bit cryptic for issuing it at ALERT > level. I'm ssuming people won't come to you and ask you what it > means...? :) Ok. I can lower it to error level? > >> + write_cesr(CESR_I_MASK); >> + >> + /* >> + * Clear the I-side bits from the captured CESR value so that we >> + * don't accidentally clear any new I-side errors when we do >> + * the CESR write-clear operation. >> + */ >> + cesr &= ~CESR_I_MASK; >> + } >> + >> + if (cesr & (CESR_DCTPE | CESR_DCDPE | CESR_DCTE)) { >> + d_cesynr = read_cesynr(); >> + pr_alert("D-side CESYNR = 0x%08x\n", d_cesynr); > Ditto. > >> + } >> + >> + /* Clear the interrupt bits we processed */ >> + write_cesr(cesr); >> + >> + return IRQ_HANDLED; >> +} >> + >> +static irqreturn_t krait_l2_irq(int irq, void *dev_id) >> +{ >> + struct edac_device_ctl_info *edac = dev_id; >> + unsigned int l2esr; >> + unsigned int l2esynr0; >> + unsigned int l2esynr1; >> + unsigned int l2ear0; >> + unsigned int l2ear1; >> + unsigned long cpu; >> + int i; >> + static const struct krait_edac_error errors[] = { >> + { "master port decode error", edac_device_handle_ce }, >> + { "master port slave error", edac_device_handle_ce }, >> + { "tag soft error, single-bit", edac_device_handle_ce }, >> + { "tag soft error, double-bit", edac_device_handle_ue }, >> + { "data soft error, single-bit", edac_device_handle_ce }, >> + { "data soft error, double-bit", edac_device_handle_ue }, >> + { "modified soft error", edac_device_handle_ce }, >> + { "slave port exclusive monitor not available", >> + edac_device_handle_ue}, >> + { "master port LDREX received Normal OK response", >> + edac_device_handle_ce }, >> + }; >> + >> + l2esr = krait_get_l2_indirect_reg(L2ESR); >> + pr_alert("Error detected!\n"); > Why print this not very telling message here if errors[i].func() will > get the proper .msg later? Sure I can drop it. > >> + pr_alert("L2ESR = 0x%08x\n", l2esr); >> + >> + if (l2esr & (L2ESR_TSESB | L2ESR_TSEDB | L2ESR_MSE | L2ESR_SP)) { >> + l2esynr0 = krait_get_l2_indirect_reg(L2ESYNR0); >> + l2esynr1 = krait_get_l2_indirect_reg(L2ESYNR1); >> + l2ear0 = krait_get_l2_indirect_reg(L2EAR0); >> + l2ear1 = krait_get_l2_indirect_reg(L2EAR1); >> + >> + pr_alert("L2ESYNR0 = 0x%08x\n", l2esynr0); >> + pr_alert("L2ESYNR1 = 0x%08x\n", l2esynr1); >> + pr_alert("L2EAR0 = 0x%08x\n", l2ear0); >> + pr_alert("L2EAR1 = 0x%08x\n", l2ear1); > Also, please use edac_printk and consider making those messages > human-readable, otherwise it only confuses users. Ok. -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation ^ permalink raw reply [flat|nested] 44+ messages in thread
* [PATCH v6 4/5] edac: Add support for Krait CPU cache error detection @ 2014-04-08 19:54 ` Stephen Boyd 0 siblings, 0 replies; 44+ messages in thread From: Stephen Boyd @ 2014-04-08 19:54 UTC (permalink / raw) To: linux-arm-kernel On 04/08/14 10:35, Borislav Petkov wrote: > On Fri, Apr 04, 2014 at 12:57:29PM -0700, Stephen Boyd wrote: >> + >> +struct krait_edac_error { >> + const char * const msg; >> + void (*func)(struct edac_device_ctl_info *edac_dev, >> + int inst_nr, int block_nr, const char *msg); > arg alignment (please start new line at the opening brace). Done. >> + int print_regs = cesr & CESR_PRINT_MASK; >> + int i; >> + static const struct krait_edac_error errors[] = { >> + { "D-cache tag parity error", edac_device_handle_ue }, >> + { "D-cache data parity error", edac_device_handle_ue }, >> + { "I-cache tag parity error", edac_device_handle_ce }, >> + { "I-cache data parity error", edac_device_handle_ce }, >> + { "D-cache tag timing error", edac_device_handle_ue }, >> + { "D-cache data timing error", edac_device_handle_ue }, >> + { "I-cache tag timing error", edac_device_handle_ce }, >> + { "I-cache data timing error", edac_device_handle_ce } >> + }; >> + >> + if (print_regs) { > This variable is used only once here, you can simply do the binary and > test then and drop it: > > if (cesr & CESR_PRINT_MASK) Done. > >> + pr_alert("L1 / TLB Error detected on CPU %d!\n", cpu); >> + pr_alert("CESR = 0x%08x\n", cesr); > You can use the edac_*_printk with KERN_ALERT as level which adds proper > prefixes. Done. > > >> + >> + if (cesr & CESR_TLBMH) { >> + asm ("mcr p15, 0, r0, c8, c7, 0"); >> + edac_device_handle_ce(edac, cpu, 0, "TLB Multi-Hit error"); >> + } >> + >> + if (cesr & (CESR_ICTPE | CESR_ICDPE | CESR_ICTE)) { >> + i_cesynr = read_cesynr(); >> + pr_alert("I-side CESYNR = 0x%08x\n", i_cesynr); > edac_printk > > and also, this message looks a bit cryptic for issuing it at ALERT > level. I'm ssuming people won't come to you and ask you what it > means...? :) Ok. I can lower it to error level? > >> + write_cesr(CESR_I_MASK); >> + >> + /* >> + * Clear the I-side bits from the captured CESR value so that we >> + * don't accidentally clear any new I-side errors when we do >> + * the CESR write-clear operation. >> + */ >> + cesr &= ~CESR_I_MASK; >> + } >> + >> + if (cesr & (CESR_DCTPE | CESR_DCDPE | CESR_DCTE)) { >> + d_cesynr = read_cesynr(); >> + pr_alert("D-side CESYNR = 0x%08x\n", d_cesynr); > Ditto. > >> + } >> + >> + /* Clear the interrupt bits we processed */ >> + write_cesr(cesr); >> + >> + return IRQ_HANDLED; >> +} >> + >> +static irqreturn_t krait_l2_irq(int irq, void *dev_id) >> +{ >> + struct edac_device_ctl_info *edac = dev_id; >> + unsigned int l2esr; >> + unsigned int l2esynr0; >> + unsigned int l2esynr1; >> + unsigned int l2ear0; >> + unsigned int l2ear1; >> + unsigned long cpu; >> + int i; >> + static const struct krait_edac_error errors[] = { >> + { "master port decode error", edac_device_handle_ce }, >> + { "master port slave error", edac_device_handle_ce }, >> + { "tag soft error, single-bit", edac_device_handle_ce }, >> + { "tag soft error, double-bit", edac_device_handle_ue }, >> + { "data soft error, single-bit", edac_device_handle_ce }, >> + { "data soft error, double-bit", edac_device_handle_ue }, >> + { "modified soft error", edac_device_handle_ce }, >> + { "slave port exclusive monitor not available", >> + edac_device_handle_ue}, >> + { "master port LDREX received Normal OK response", >> + edac_device_handle_ce }, >> + }; >> + >> + l2esr = krait_get_l2_indirect_reg(L2ESR); >> + pr_alert("Error detected!\n"); > Why print this not very telling message here if errors[i].func() will > get the proper .msg later? Sure I can drop it. > >> + pr_alert("L2ESR = 0x%08x\n", l2esr); >> + >> + if (l2esr & (L2ESR_TSESB | L2ESR_TSEDB | L2ESR_MSE | L2ESR_SP)) { >> + l2esynr0 = krait_get_l2_indirect_reg(L2ESYNR0); >> + l2esynr1 = krait_get_l2_indirect_reg(L2ESYNR1); >> + l2ear0 = krait_get_l2_indirect_reg(L2EAR0); >> + l2ear1 = krait_get_l2_indirect_reg(L2EAR1); >> + >> + pr_alert("L2ESYNR0 = 0x%08x\n", l2esynr0); >> + pr_alert("L2ESYNR1 = 0x%08x\n", l2esynr1); >> + pr_alert("L2EAR0 = 0x%08x\n", l2ear0); >> + pr_alert("L2EAR1 = 0x%08x\n", l2ear1); > Also, please use edac_printk and consider making those messages > human-readable, otherwise it only confuses users. Ok. -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation ^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH v6 4/5] edac: Add support for Krait CPU cache error detection 2014-04-08 19:54 ` Stephen Boyd @ 2014-04-09 15:24 ` Borislav Petkov -1 siblings, 0 replies; 44+ messages in thread From: Borislav Petkov @ 2014-04-09 15:24 UTC (permalink / raw) To: Stephen Boyd Cc: linux-kernel, linux-arm-msm, linux-arm-kernel, linux-edac, Stepan Moskovchenko On Tue, Apr 08, 2014 at 12:54:47PM -0700, Stephen Boyd wrote: > > and also, this message looks a bit cryptic for issuing it at ALERT > > level. I'm ssuming people won't come to you and ask you what it > > means...? :) > > Ok. I can lower it to error level? I'm just trying to put you in the user's shoes and make you take a critical look at your error messages and ask yourself whether people seeing this would know what's going on or not? We've had the experience on x86 where people would have the *whole* error message which would say, "error corrected, bla" and they still would come and ask whether their hw is b0rked. We had to add stuff like: "Corrected error, no action required." to let them know there was no affect on execution. And they'd still come and ask. Even other kernel people! :-) So please make sure your error messages are as understandable as possible. :-) Thanks. -- Regards/Gruss, Boris. Sent from a fat crate under my desk. Formatting is fine. -- ^ permalink raw reply [flat|nested] 44+ messages in thread
* [PATCH v6 4/5] edac: Add support for Krait CPU cache error detection @ 2014-04-09 15:24 ` Borislav Petkov 0 siblings, 0 replies; 44+ messages in thread From: Borislav Petkov @ 2014-04-09 15:24 UTC (permalink / raw) To: linux-arm-kernel On Tue, Apr 08, 2014 at 12:54:47PM -0700, Stephen Boyd wrote: > > and also, this message looks a bit cryptic for issuing it at ALERT > > level. I'm ssuming people won't come to you and ask you what it > > means...? :) > > Ok. I can lower it to error level? I'm just trying to put you in the user's shoes and make you take a critical look at your error messages and ask yourself whether people seeing this would know what's going on or not? We've had the experience on x86 where people would have the *whole* error message which would say, "error corrected, bla" and they still would come and ask whether their hw is b0rked. We had to add stuff like: "Corrected error, no action required." to let them know there was no affect on execution. And they'd still come and ask. Even other kernel people! :-) So please make sure your error messages are as understandable as possible. :-) Thanks. -- Regards/Gruss, Boris. Sent from a fat crate under my desk. Formatting is fine. -- ^ permalink raw reply [flat|nested] 44+ messages in thread
* [PATCH v6 5/5] ARM: dts: msm: Fix Krait CPU/L2 nodes 2014-04-04 19:57 ` Stephen Boyd @ 2014-04-04 19:57 ` Stephen Boyd -1 siblings, 0 replies; 44+ messages in thread From: Stephen Boyd @ 2014-04-04 19:57 UTC (permalink / raw) To: Kumar Gala Cc: linux-kernel, linux-arm-msm, linux-arm-kernel, linux-edac, Borislav Petkov The error interrupt binding wasn't properly accepted when this was originally written. Fix the dts to match the binding. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> --- arch/arm/boot/dts/qcom-msm8960.dtsi | 29 +++++++++++++++------- arch/arm/boot/dts/qcom-msm8974.dtsi | 49 ++++++++++++++++++++++++++++--------- 2 files changed, 57 insertions(+), 21 deletions(-) diff --git a/arch/arm/boot/dts/qcom-msm8960.dtsi b/arch/arm/boot/dts/qcom-msm8960.dtsi index 997b7b94e117..66a6e8c4fdcf 100644 --- a/arch/arm/boot/dts/qcom-msm8960.dtsi +++ b/arch/arm/boot/dts/qcom-msm8960.dtsi @@ -12,30 +12,41 @@ cpus { #address-cells = <1>; #size-cells = <0>; - interrupts = <1 14 0x304>; - compatible = "qcom,krait"; enable-method = "qcom,kpss-acc-v1"; cpu@0 { + compatible = "qcom,krait"; device_type = "cpu"; reg = <0>; - next-level-cache = <&L2>; + next-level-cache = <&L1_0>; qcom,acc = <&acc0>; qcom,saw = <&saw0>; + + L1_0: l1-cache { + compatible = "qcom,arch-cache"; + interrupts = <1 14 0x104>; + next-level-cache = <&L2>; + }; + + L2: l2-cache { + compatible = "qcom,arch-cache"; + interrupts = <0 2 0x4>; + }; }; cpu@1 { + compatible = "qcom,krait"; device_type = "cpu"; reg = <1>; - next-level-cache = <&L2>; + next-level-cache = <&L1_1>; qcom,acc = <&acc1>; qcom,saw = <&saw1>; - }; - L2: l2-cache { - compatible = "cache"; - cache-level = <2>; - interrupts = <0 2 0x4>; + L1_1: l1-cache { + compatible = "qcom,arch-cache"; + interrupts = <1 14 0x104>; + next-level-cache = <&L2>; + }; }; }; diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi index f68723918b3f..b4ac497b7d76 100644 --- a/arch/arm/boot/dts/qcom-msm8974.dtsi +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi @@ -12,43 +12,68 @@ cpus { #address-cells = <1>; #size-cells = <0>; - interrupts = <1 9 0xf04>; - compatible = "qcom,krait"; enable-method = "qcom,kpss-acc-v2"; cpu@0 { + compatible = "qcom,krait"; device_type = "cpu"; reg = <0>; - next-level-cache = <&L2>; + next-level-cache = <&L1_0>; qcom,acc = <&acc0>; + + L1_0: l1-cache { + compatible = "qcom,arch-cache"; + interrupts = <1 9 0x104>; + next-level-cache = <&L2>; + }; + + L2: l2-cache { + compatible = "qcom,arch-cache"; + interrupts = <0 2 0x4>; + qcom,saw = <&saw_l2>; + }; }; cpu@1 { + compatible = "qcom,krait"; device_type = "cpu"; reg = <1>; - next-level-cache = <&L2>; + next-level-cache = <&L1_1>; qcom,acc = <&acc1>; + + L1_1: l1-cache { + compatible = "qcom,arch-cache"; + interrupts = <1 9 0x204>; + next-level-cache = <&L2>; + }; }; cpu@2 { + compatible = "qcom,krait"; device_type = "cpu"; reg = <2>; - next-level-cache = <&L2>; + next-level-cache = <&L1_2>; qcom,acc = <&acc2>; + + L1_2: l1-cache { + compatible = "qcom,arch-cache"; + interrupts = <1 9 0x404>; + next-level-cache = <&L2>; + }; }; cpu@3 { + compatible = "qcom,krait"; device_type = "cpu"; reg = <3>; - next-level-cache = <&L2>; + next-level-cache = <&L1_3>; qcom,acc = <&acc3>; - }; - L2: l2-cache { - compatible = "cache"; - cache-level = <2>; - interrupts = <0 2 0x4>; - qcom,saw = <&saw_l2>; + L1_3: l1-cache { + compatible = "qcom,arch-cache"; + interrupts = <1 9 0x804>; + next-level-cache = <&L2>; + }; }; }; -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation ^ permalink raw reply related [flat|nested] 44+ messages in thread
* [PATCH v6 5/5] ARM: dts: msm: Fix Krait CPU/L2 nodes @ 2014-04-04 19:57 ` Stephen Boyd 0 siblings, 0 replies; 44+ messages in thread From: Stephen Boyd @ 2014-04-04 19:57 UTC (permalink / raw) To: linux-arm-kernel The error interrupt binding wasn't properly accepted when this was originally written. Fix the dts to match the binding. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> --- arch/arm/boot/dts/qcom-msm8960.dtsi | 29 +++++++++++++++------- arch/arm/boot/dts/qcom-msm8974.dtsi | 49 ++++++++++++++++++++++++++++--------- 2 files changed, 57 insertions(+), 21 deletions(-) diff --git a/arch/arm/boot/dts/qcom-msm8960.dtsi b/arch/arm/boot/dts/qcom-msm8960.dtsi index 997b7b94e117..66a6e8c4fdcf 100644 --- a/arch/arm/boot/dts/qcom-msm8960.dtsi +++ b/arch/arm/boot/dts/qcom-msm8960.dtsi @@ -12,30 +12,41 @@ cpus { #address-cells = <1>; #size-cells = <0>; - interrupts = <1 14 0x304>; - compatible = "qcom,krait"; enable-method = "qcom,kpss-acc-v1"; cpu at 0 { + compatible = "qcom,krait"; device_type = "cpu"; reg = <0>; - next-level-cache = <&L2>; + next-level-cache = <&L1_0>; qcom,acc = <&acc0>; qcom,saw = <&saw0>; + + L1_0: l1-cache { + compatible = "qcom,arch-cache"; + interrupts = <1 14 0x104>; + next-level-cache = <&L2>; + }; + + L2: l2-cache { + compatible = "qcom,arch-cache"; + interrupts = <0 2 0x4>; + }; }; cpu at 1 { + compatible = "qcom,krait"; device_type = "cpu"; reg = <1>; - next-level-cache = <&L2>; + next-level-cache = <&L1_1>; qcom,acc = <&acc1>; qcom,saw = <&saw1>; - }; - L2: l2-cache { - compatible = "cache"; - cache-level = <2>; - interrupts = <0 2 0x4>; + L1_1: l1-cache { + compatible = "qcom,arch-cache"; + interrupts = <1 14 0x104>; + next-level-cache = <&L2>; + }; }; }; diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi index f68723918b3f..b4ac497b7d76 100644 --- a/arch/arm/boot/dts/qcom-msm8974.dtsi +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi @@ -12,43 +12,68 @@ cpus { #address-cells = <1>; #size-cells = <0>; - interrupts = <1 9 0xf04>; - compatible = "qcom,krait"; enable-method = "qcom,kpss-acc-v2"; cpu at 0 { + compatible = "qcom,krait"; device_type = "cpu"; reg = <0>; - next-level-cache = <&L2>; + next-level-cache = <&L1_0>; qcom,acc = <&acc0>; + + L1_0: l1-cache { + compatible = "qcom,arch-cache"; + interrupts = <1 9 0x104>; + next-level-cache = <&L2>; + }; + + L2: l2-cache { + compatible = "qcom,arch-cache"; + interrupts = <0 2 0x4>; + qcom,saw = <&saw_l2>; + }; }; cpu at 1 { + compatible = "qcom,krait"; device_type = "cpu"; reg = <1>; - next-level-cache = <&L2>; + next-level-cache = <&L1_1>; qcom,acc = <&acc1>; + + L1_1: l1-cache { + compatible = "qcom,arch-cache"; + interrupts = <1 9 0x204>; + next-level-cache = <&L2>; + }; }; cpu at 2 { + compatible = "qcom,krait"; device_type = "cpu"; reg = <2>; - next-level-cache = <&L2>; + next-level-cache = <&L1_2>; qcom,acc = <&acc2>; + + L1_2: l1-cache { + compatible = "qcom,arch-cache"; + interrupts = <1 9 0x404>; + next-level-cache = <&L2>; + }; }; cpu at 3 { + compatible = "qcom,krait"; device_type = "cpu"; reg = <3>; - next-level-cache = <&L2>; + next-level-cache = <&L1_3>; qcom,acc = <&acc3>; - }; - L2: l2-cache { - compatible = "cache"; - cache-level = <2>; - interrupts = <0 2 0x4>; - qcom,saw = <&saw_l2>; + L1_3: l1-cache { + compatible = "qcom,arch-cache"; + interrupts = <1 9 0x804>; + next-level-cache = <&L2>; + }; }; }; -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation ^ permalink raw reply related [flat|nested] 44+ messages in thread
end of thread, other threads:[~2014-04-29 19:02 UTC | newest]
Thread overview: 44+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-04-04 19:57 [PATCH v6 0/5] Krait L1/L2 EDAC driver Stephen Boyd
2014-04-04 19:57 ` Stephen Boyd
2014-04-04 19:57 ` [PATCH v6 1/5] genirq: export percpu irq functions for module usage Stephen Boyd
2014-04-04 19:57 ` Stephen Boyd
2014-04-04 19:57 ` Stephen Boyd
2014-04-04 19:57 ` [PATCH v6 2/5] ARM: Add Krait L2 register accessor functions Stephen Boyd
2014-04-04 19:57 ` Stephen Boyd
2014-04-07 20:18 ` Borislav Petkov
2014-04-07 20:18 ` Borislav Petkov
2014-04-07 21:56 ` Stephen Boyd
2014-04-07 21:56 ` Stephen Boyd
2014-04-08 6:43 ` Borislav Petkov
2014-04-08 6:43 ` Borislav Petkov
2014-04-08 14:25 ` Christopher Covington
2014-04-08 14:25 ` Christopher Covington
2014-04-08 15:10 ` Borislav Petkov
2014-04-08 15:10 ` Borislav Petkov
2014-04-08 16:19 ` One Thousand Gnomes
2014-04-08 16:19 ` One Thousand Gnomes
2014-04-08 16:42 ` Borislav Petkov
2014-04-08 16:42 ` Borislav Petkov
2014-04-04 19:57 ` [PATCH v6 3/5] devicetree: bindings: Document Krait cache error interrupts Stephen Boyd
2014-04-04 19:57 ` Stephen Boyd
2014-04-04 19:57 ` Stephen Boyd
2014-04-08 15:39 ` Borislav Petkov
2014-04-08 15:39 ` Borislav Petkov
2014-04-08 19:55 ` Stephen Boyd
2014-04-08 19:55 ` Stephen Boyd
[not found] ` <20140408153925.GJ30077-fF5Pk5pvG8Y@public.gmane.org>
2014-04-29 10:34 ` Lorenzo Pieralisi
2014-04-29 10:34 ` Lorenzo Pieralisi
2014-04-29 10:34 ` Lorenzo Pieralisi
2014-04-29 19:02 ` Borislav Petkov
2014-04-29 19:02 ` Borislav Petkov
2014-04-29 19:02 ` Borislav Petkov
2014-04-04 19:57 ` [PATCH v6 4/5] edac: Add support for Krait CPU cache error detection Stephen Boyd
2014-04-04 19:57 ` Stephen Boyd
2014-04-08 17:35 ` Borislav Petkov
2014-04-08 17:35 ` Borislav Petkov
2014-04-08 19:54 ` Stephen Boyd
2014-04-08 19:54 ` Stephen Boyd
2014-04-09 15:24 ` Borislav Petkov
2014-04-09 15:24 ` Borislav Petkov
2014-04-04 19:57 ` [PATCH v6 5/5] ARM: dts: msm: Fix Krait CPU/L2 nodes Stephen Boyd
2014-04-04 19:57 ` Stephen Boyd
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.