*** SUBJECT HERE ***
Subsystems (7)
v3 cover *** SUBJECT HERE ***
From: Noam Camus <[email protected]>
v3:
1) irqchip: use MACROS instead of structures to decribe
registers.
2) clocksource: use 32bit counter and avoid 2 halfs read
of 64bit dance.
v2:
1) Remove out of tree platform include path
2) Move atomic/bitop/cmpxchg for platform to end.
Remove macro duplication.
Fix some bad implementation.
3) define cpu_relax_lowlatency() for platform.
4) rename init_irq_cpu() to init_per_cpu()
reorder call to init_per_cpu() for secondary use it instead of init_cpu_smp().
5) set res_service to call stext
6) fix build failure for CTOP_AUX_BASE at assembly code
7) Use ilog2 for mtm_init_nat()
8) Add CLKSRC_NPS option to Kconfig
change nps_clksrc_read() to be more readable.
General summay:
This set introduce new platform to ARC architecture. Platform name called "eznps" for working with EZchip NPS400 Network Proccessor.
NPS400 is targeted to service "fast path" network applications.
NPS400 got mesh of 256 extended ARC cores (AKA CTOP), each core got 16 HW threads. This is basically SMT core where at any point of time only one HW thread is active.
Each core have HW scheduler that round robin between eligible HW threads. Totaly, kernel sees 4096 CPUs which I belive is a high record. There is no cache coherency between cores so generic user applications and kernel do not use D$.
Cores got special memory mappings for huge pages (8MB). Mapping is static and should provide application enough memory without any "TLB miss". This mapping is on top of TLB mapping.
This is a basic set that will later be followed with additional set of patches with all advanced features.
Many thanks to all people helping to make this happen.
Regards,
Noam Camus
Noam Camus (17):
Documentation: Add EZchip vendor to binding list
ARC: [plat-eznps] define IPI_IRQ
clocksource: Add NPS400 timers driver
irqchip: add nps Internal and external irqchips
ARC: Set vmalloc size from configuration
ARC: rwlock: disable interrupts in !LLSC variant
ARC: rename smp operation init_irq_cpu() to init_per_cpu()
ARC: Mark secondary cpu online only after all HW setup is done
ARC: add CONFIG_CLKSRC_OF support to time_init()
ARC: [plat-eznps] Add eznps board defconfig and dts
ARC: [plat-eznps] Add eznps platform
ARC: [plat-eznps] Use dedicated user stack top
ARC: [plat-eznps] Use dedicated atomic/bitops/cmpxchg
ARC: [plat-eznps] Use dedicated SMP barriers
ARC: [plat-eznps] Use dedicated identity auxiliary register.
ARC: [plat-eznps] Use dedicated COMMAND_LINE_SIZE
ARC: Add eznps platform to Kconfig and Makefile
Tal Zilcer (1):
ARC: [plat-eznps] Use dedicated cpu_relax()
Documentation/devicetree/bindings/arc/eznps.txt | 7 + .../interrupt-controller/ezchip,nps400-ic.txt | 17 ++ .../bindings/timer/ezchip,nps400-timer.txt | 11 + .../devicetree/bindings/vendor-prefixes.txt | 1 + MAINTAINERS | 6 + arch/arc/Kconfig | 9 + arch/arc/Makefile | 5 + arch/arc/boot/dts/eznps.dts | 76 ++++++ arch/arc/configs/nps_defconfig | 85 +++++++ arch/arc/include/asm/atomic.h | 79 ++++++- arch/arc/include/asm/barrier.h | 8 + arch/arc/include/asm/bitops.h | 54 +++++ arch/arc/include/asm/cmpxchg.h | 87 ++++++-- arch/arc/include/asm/entry-compact.h | 8 + arch/arc/include/asm/irq.h | 4 + arch/arc/include/asm/pgtable.h | 2 +- arch/arc/include/asm/processor.h | 36 +++- arch/arc/include/asm/setup.h | 4 + arch/arc/include/asm/smp.h | 4 +- arch/arc/include/asm/spinlock.h | 14 + arch/arc/kernel/ctx_sw.c | 13 + arch/arc/kernel/irq.c | 4 +- arch/arc/kernel/mcip.c | 2 +- arch/arc/kernel/smp.c | 14 +- arch/arc/kernel/time.c | 4 + arch/arc/mm/tlb.c | 12 + arch/arc/plat-eznps/Kconfig | 34 +++ arch/arc/plat-eznps/Makefile | 7 + arch/arc/plat-eznps/entry.S | 75 ++++++ arch/arc/plat-eznps/include/plat/ctop.h | 250 ++++++++++++++++++++ arch/arc/plat-eznps/include/plat/mtm.h | 60 +++++ arch/arc/plat-eznps/include/plat/smp.h | 26 ++ arch/arc/plat-eznps/mtm.c | 133 +++++++++++ arch/arc/plat-eznps/platform.c | 27 ++ arch/arc/plat-eznps/smp.c | 149 ++++++++++++ drivers/clocksource/Kconfig | 7 + drivers/clocksource/Makefile | 1 + drivers/clocksource/timer-nps.c | 63 +++++ drivers/irqchip/Makefile | 1 + drivers/irqchip/irq-eznps.c | 213 +++++++++++++++++ 40 files changed, 1576 insertions(+), 36 deletions(-) create mode 100644 Documentation/devicetree/bindings/arc/eznps.txt create mode 100644 Documentation/devicetree/bindings/interrupt-controller/ezchip,nps400-ic.txt create mode 100644 Documentation/devicetree/bindings/timer/ezchip,nps400-timer.txt create mode 100644 arch/arc/boot/dts/eznps.dts create mode 100644 arch/arc/configs/nps_defconfig create mode 100644 arch/arc/plat-eznps/Kconfig create mode 100644 arch/arc/plat-eznps/Makefile create mode 100644 arch/arc/plat-eznps/entry.S create mode 100644 arch/arc/plat-eznps/include/plat/ctop.h create mode 100644 arch/arc/plat-eznps/include/plat/mtm.h create mode 100644 arch/arc/plat-eznps/include/plat/smp.h create mode 100644 arch/arc/plat-eznps/mtm.c create mode 100644 arch/arc/plat-eznps/platform.c create mode 100644 arch/arc/plat-eznps/smp.c create mode 100644 drivers/clocksource/timer-nps.c create mode 100644 drivers/irqchip/irq-eznps.c
PATCH v3 1/18 Documentation: Add EZchip vendor to binding list
From: Noam Camus <[email protected]>
Add EZchip to vendor prefixes list.
EZchip introduce the NPS platform for the ARC architecture.
--- Documentation/devicetree/bindings/arc/eznps.txt | 7 +++++++ .../devicetree/bindings/vendor-prefixes.txt | 1 + 2 files changed, 8 insertions(+), 0 deletions(-) create mode 100644 Documentation/devicetree/bindings/arc/eznps.txt
Documentation/devicetree/bindings/arc/eznps.txt new file +7 -0
@@ -0,0 +1,7 @@ +EZchip NPS Network Proccessor Platforms Device Tree Bindings +--------------------------------------------------------------------------- + +Appliance main board with NPS400 ASIC. + +Required root node properties: + - compatible = "ezchip,arc-nps";
Documentation/devicetree/bindings/vendor-prefixes.txt +1 -0
@@ -82,6 +82,7 @@ eukrea Eukr??a Electromatique everest Everest Semiconductor Co. Ltd. everspin Everspin Technologies, Inc. excito Excito +ezchip EZchip Semiconductor fcs Fairchild Semiconductor firefly Firefly focaltech FocalTech Systems Co.,Ltd
Signature · 1 line
1.7.1
Re: [PATCH v3 01/18] Documentation: Add EZchip vendor to binding list
Quoted 20 lines · Noam Camus
From: Noam Camus <noamc at ezchip.com>
Add EZchip to vendor prefixes list.
EZchip introduce the NPS platform for the ARC architecture.Signed-off-by Noam Camus <noamc at ezchip.com>Acked-by Rob Herring <robh+dt at kernel.org>Cc Pawel Moll <pawel.moll at arm.com>--- Documentation/devicetree/bindings/arc/eznps.txt | 7 +++++++ .../devicetree/bindings/vendor-prefixes.txt | 1 + 2 files changed, 8 insertions(+), 0 deletions(-)create mode 100644
Documentation/devicetree/bindings/arc/eznps.txtDocumentation/devicetree/bindings/arc/eznps.txt new file +0
-0
Documentation/devicetree/bindings/arc/eznps.txt line 1
Quoted 1 line
Documentation/devicetree/bindings/arc/eznps.txt new file +1
-0@@ -0,0 +1,7 @@ +EZchip NPS Network Proccessor Platforms Device Tree Bindings
Processor
Signature · 5 lines
<http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
Re: [PATCH v3 01/18] Documentation: Add EZchip vendor to binding list
Quoted 12 lines
From: Daniel Lezcano <daniel.lezcano at linaro.org>
Sent: Friday, December 4, 2015 10:07 AMDocumentation/devicetree/bindings/arc/eznps.txt line 1
Quoted 8 lines
Documentation/devicetree/bindings/arc/eznps.txt new file +1
-0@@ -0,0 +1,7 @@ +EZchip NPS Network Proccessor Platforms Device Tree BindingsProcessor
Thanks
--
<http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
PATCH v3 2/18 ARC: [plat-eznps] define IPI_IRQ
In reply to Noam CamusFrom: Noam Camus <[email protected]>
We add IPI irq definition to be used later by any
irqchip such NPS400 IC.
--- arch/arc/include/asm/irq.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
arch/arc/include/asm/irq.h +4 -0
@@ -16,7 +16,11 @@#ifdef CONFIG_ISA_ARCOMPACT #define TIMER0_IRQ 3#define TIMER1_IRQ 4 +#if defined(CONFIG_SMP ) && defined(CONFIG_ARC_PLAT_EZNPS ) +#define IPI_IRQ 5 +#else #define IPI_IRQ (NR_CPU_IRQS-1)/* dummy to enable SMP build for up hardware */ +#endif #else #define TIMER0_IRQ 16#define TIMER1_IRQ 17
Signature · 1 line
1.7.1
PATCH v3 3/18 clocksource: Add NPS400 timers driver
In reply to Noam CamusFrom: Noam Camus <[email protected]>
Add internal tick generator which is shared by all cores. Each cluster of cores view it through dedicated address. This is used for SMP system where all CPUs synced by same clock source.
--- .../bindings/timer/ezchip,nps400-timer.txt | 11 ++++ drivers/clocksource/Kconfig | 7 ++ drivers/clocksource/Makefile | 1 + drivers/clocksource/timer-nps.c | 63 ++++++++++++++++++++ 4 files changed, 82 insertions(+), 0 deletions(-) create mode 100644 Documentation/devicetree/bindings/timer/ezchip,nps400-timer.txt create mode 100644 drivers/clocksource/timer-nps.c
Documentation/devicetree/bindings/timer/ezchip,nps400-timer.txt new file +11 -0
@@ -0,0 +1,11 @@ +NPS Network Processor + +Required properties: + +- compatible : should be "ezchip,nps400-timer" + +Example: + +timer { + compatible = "ezchip,nps400-timer"; +};
drivers/clocksource/Kconfig +7 -0
@@ -131,6 +131,13 @@ config CLKSRC_TI_32K This option enables support for Texas Instruments 32.768 Hz clocksource available on many OMAP-like platforms. +config CLKSRC_NPS + bool "NPS400 clocksource driver" if COMPILE_TEST + select CLKSRC_OF if OF + help + NPS400 clocksource support. + Got 64 bit counter with update rate up to 1000MHz. + config CLKSRC_STM32 bool "Clocksource for STM32 SoCs" if !ARCH_STM32 depends on OF && ARM && (ARCH_STM32 || COMPILE_TEST)
drivers/clocksource/Makefile +1 -0
@@ -46,6 +46,7 @@ obj-$(CONFIG_CLKSRC_QCOM) += qcom-timer.o obj-$(CONFIG_MTK_TIMER) += mtk_timer.o obj-$(CONFIG_CLKSRC_PISTACHIO) += time-pistachio.o obj-$(CONFIG_CLKSRC_TI_32K) += timer-ti-32k.o +obj-$(CONFIG_ARC_PLAT_EZNPS) += timer-nps.o obj-$(CONFIG_ARM_ARCH_TIMER) += arm_arch_timer.o obj-$(CONFIG_ARM_GLOBAL_TIMER) += arm_global_timer.o
drivers/clocksource/timer-nps.c new file +63 -0
63 lines not on this page · raw message
Signature · 1 line
1.7.1
Re: [PATCH v3 03/18] clocksource: Add NPS400 timers driver
Quoted 13 lines · Noam Camus
From: Noam Camus <noamc at ezchip.com>
Add internal tick generator which is shared by all cores. Each cluster of cores view it through dedicated address. This is used for SMP system where all CPUs synced by same clock source.
Signed-off-by Noam Camus <noamc at ezchip.com>Cc Daniel Lezcano <daniel.lezcano at linaro.org>Cc Rob Herring <robh+dt at kernel.org>Cc Thomas Gleixner <tglx at linutronix.de>Cc John Stultz <john.stultz at linaro.org>Acked-by Vineet Gupta <vgupta at synopsys.com>
[ ... ]
drivers/clocksource/Makefile obj-$(CONFIG_CLKSRC_QCOM) += qcom-timer.o · line 49
Quoted 9 lines
drivers/clocksource/Makefile +1
-0@@ -46,6 +46,7 @@ obj-$(CONFIG_CLKSRC_QCOM) += qcom-timer.o obj-$(CONFIG_MTK_TIMER) += mtk_timer.o obj-$(CONFIG_CLKSRC_PISTACHIO) += time-pistachio.o obj-$(CONFIG_CLKSRC_TI_32K) += timer-ti-32k.o +obj-$(CONFIG_ARC_PLAT_EZNPS) += timer-nps.o
CONFIG_CLKSRC_NPS
Quoted 19 lines
drivers/clocksource/Makefile +0
-0obj-$(CONFIG_ARM_ARCH_TIMER) += arm_arch_timer.o obj-$(CONFIG_ARM_GLOBAL_TIMER) += arm_global_timer.odrivers/clocksource/timer-nps.c new file +10
-0@@ -0,0 +1,63 @@ +/* +* Copyright(c) 2015 EZchip Technologies. +* +* This program is free software; you can redistribute it and/or modify it +* under the terms and conditions of the GNU General Public License, +* version 2, as published by the Free Software Foundation. +* +* This program is distributed in the hope 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
drivers/clocksource/timer-nps.c line 20
Quoted 10 lines
drivers/clocksource/timer-nps.c new file +10
-0+* more details. +* +* The full GNU General Public License is included in this distribution in +* the file called "COPYING". +*/ + +#include <linux/clocksource.h> +#include <linux/of.h> +#include <linux/of_fdt.h> +#include <plat/ctop.h>
Why do you need this header ? nps_host_reg ?
We prevent to include headers from <plat> in the drivers directory. You should find a way to get rid of it.
drivers/clocksource/timer-nps.c line 26
Quoted 5 lines
drivers/clocksource/timer-nps.c new file +5
-0+#define NPS_MSU_TICK_LOW 0xC8 +#define NPS_CLUSTER_OFFSET 8 +#define NPS_CLUSTER_NUM 16 + +static void *nps_msu_reg_low_addr[NPS_CLUSTER_NUM ]__read_mostly ;
Perhaps a small optimization...
static DEFINE_PER_CPU_READ_MOSTLY(void __iomem *, baseaddr);
static cycle_t nps_clksrc_read(struct clocksource *clksrc)
{
void __iomem *base = per_cpu(baseaddr, raw_smp_processor_id());
return (cycle_t)ioread32be(base);
}and in the init function:
for_each_cpu(cpu) {
per_cpu(baseaddr, cpu) = nps_host_reg(cpu,
NPS_MSU_BLKID, NPS_MSU_TICK_LOW
}
drivers/clocksource/timer-nps.c line 32
Quoted 5 lines
drivers/clocksource/timer-nps.c new file +5
-0+static cycle_t nps_clksrc_read (struct clocksource *clksrc) +{ +int cluster =raw_smp_processor_id () >>NPS_CLUSTER_OFFSET ; + +return (cycle_t )ioread32be (nps_msu_reg_low_addr[cluster]);
AFAICT, there is a memory barrier with ioread32be, are you really sure we have to use it in this code path ?
Quoted 14 lines
drivers/clocksource/timer-nps.c new file +14
-0+} + +static struct clocksource nps_counter = { + .name ="EZnps-tick" , + .rating =301 , + .read = nps_clksrc_read, + .mask =CLOCKSOURCE_MASK (32 ), + .flags =CLOCK_SOURCE_IS_CONTINUOUS , +}; + +static void __init nps_setup_clocksource (struct device_node *node) +{ +struct clocksource *clksrc = &nps_counter; +unsigned long rate, dt_root;
drivers/clocksource/timer-nps.c line 55
Quoted 10 lines
drivers/clocksource/timer-nps.c new file +9
-0+int ret, cluster; + +for (cluster =0 ; cluster <NPS_CLUSTER_NUM ; cluster++) + nps_msu_reg_low_addr[cluster] = +nps_host_reg ((cluster <<NPS_CLUSTER_OFFSET ), +NPS_MSU_BLKID ,NPS_MSU_TICK_LOW ); + + dt_root =of_get_flat_dt_root (); + rate = (u32 )of_get_flat_dt_prop (dt_root,"clock-frequency" ,NULL );
I don't get why this is done this way. The Kconfig option help says the clocksource rate is 1GHz but in the DT the clock is 88MHz.
It would be cleaner to define a fixed clock and then add a phandle in the DT.
timer_clk: timer_clk {
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <123456789>;
};
timer {
compatible = "ezchip,nps400-timer";
clocks = <&timer_clk>;
}That will result in the same code than the other drivers.
clk = of_clk_get(np, 0);
if (IS_ERR(clk)) {
pr_err("%s: invalid clock\n", np->full_name);
return;
}rate = clk_get_rate(clk);
Quoted 8 lines
drivers/clocksource/timer-nps.c new file +7
-0+ ret =clocksource_register_hz (clksrc, rate); +if (ret) +pr_err ("Couldn't register clock source.\n" ); +} + +CLOCKSOURCE_OF_DECLARE (nps_400,"ezchip,nps400-timer" , + nps_setup_clocksource);
Signature · 5 lines
<http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
Re: [PATCH v3 03/18] clocksource: Add NPS400 timers driver
Quoted 5 lines
From: Daniel Lezcano <daniel.lezcano at linaro.org>
Sent: Friday, December 4, 2015 11:13 AMQuoted 1 line
+obj-$(CONFIG_ARC_PLAT_EZNPS) += timer-nps.o
CONFIG_CLKSRC_NPS
I wish this driver to be build only for this specific ARC platform. This clock source is embedded in our SoC.
It is not meant to be built for any other architecture.
This is why below I include header from our ARC platform to avoid code duplicity.
Quoted 3 lines
Quoted 1 line
+#include <
plat/ctop.h>Why do you need this header ?
nps_host_reg?
Correct we use common code from our platform.
Quoted 2 lines
We prevent to include headers from <plat> in the drivers directory. You should find a way to get rid of it.
The Only way I can think of is code duplicity and I prefer not to. I see some include to asm/mach headers in clocksource, what is the difference? Could you suggest a better place for me to place my header file.
Quoted 3 lines
Quoted 1 line
+static void *nps_msu_reg_low_addr[NPS_CLUSTER_NUM]
__read_mostly;Perhaps a small optimization...
Thanks
Quoted 9 lines
static
DEFINE_PER_CPU_READ_MOSTLY(void __iomem *, baseaddr);static
cycle_tnps_clksrc_read(struct clocksource *clksrc){ void __iomem *base = per_cpu(baseaddr, raw_smp_processor_id()); return (cycle_t)ioread32be(base); }
Quoted 7 lines
and in the init function:
for_each_cpu(cpu){
per_cpu(baseaddr, cpu)= nps_host_reg(cpu,
NPS_MSU_BLKID,
NPS_MSU_TICK_LOW
}
Thanks again
Quoted 8 lines
drivers/clocksource/timer-nps.c line 32
Quoted 5 lines
drivers/clocksource/timer-nps.c new file +5
-0+static cycle_t nps_clksrc_read (struct clocksource *clksrc) +{ +int cluster =raw_smp_processor_id () >>NPS_CLUSTER_OFFSET ; + +return (cycle_t )ioread32be (nps_msu_reg_low_addr[cluster]);,AFAICT, there is a memory barrier with ioread32be, are you really sure we have to use it in this code path ?
Are you saying to remove use of ioread32be?
What should I use instead?
Quoted 6 lines
drivers/clocksource/timer-nps.c line 55
Quoted 3 lines
drivers/clocksource/timer-nps.c new file +3
-0+ + dt_root =of_get_flat_dt_root (); + rate = (u32 )of_get_flat_dt_prop (dt_root,"clock-frequency" ,NULL );I don't get why this is done this way. The
Kconfigoption help says the clocksource rate is 1GHz but in the DT the clock is 88MHz.
It says that clock source is up to 1GHz
Quoted 16 lines
It would be cleaner to define a fixed clock and then add a phandle in the DT.
timer_clk: timer_clk { #clock-cells = <0>; compatible = "fixed-clock"; clock-frequency = <123456789>; }; timer { compatible = "ezchip,nps400-timer"; clocks = <&timer_clk>; }That will result in the same code than the other drivers.
Quoted 7 lines
clk = of_clk_get(np, 0);
if (IS_ERR(clk)) {
pr_err("%s: invalid clock\n", np->full_name);
return;
}
rate = clk_get_rate(clk);Once again thanks I will fix this.
-Noam
Re: [PATCH v3 03/18] clocksource: Add NPS400 timers driver
Quoted 7 lines · Noam Camus
Quoted 5 lines
From: Daniel Lezcano <daniel.lezcano at linaro.org>
Sent: Friday, December 4, 2015 11:13 AMQuoted 1 line
+obj-$(CONFIG_ARC_PLAT_EZNPS) += timer-nps.o
CONFIG_CLKSRC_NPSI wish this driver to be build only for this specific ARC platform. This clock source is embedded in our SoC.
I understand but we are removing all platform specific Kconfig options from the drivers. If CONFIG_CLKSRC_NPS is selected by CONFIG_ARC_PLAT_EZNPS only, the result is the same.
By the way, it is probable the "if COMPILE_TEST" option is added later to the option. We are trying to have the drivers to be compilable on different platforms in order to increase the compilation test coverage. It is useful for instance when we touch a common code which impact all the drivers, we don't need the specific platform to compile on it and we minimize a cross compile toolchain usage. Hence compilation failure on ARC will be detected sooner, before the next merge window happens.
For this reason, having common code in the driver is important and including a platform breaks the current effort.
Quoted 5 lines
It is not meant to be built for any other architecture.
This is why below I include header from our ARC platform to avoid code duplicity.Quoted 1 line
Quoted 1 line
+#include <
plat/ctop.h>
Quoted 8 lines
Quoted 1 line
Why do you need this header ?
nps_host_reg?Correct we use common code from our platform.
Quoted 2 lines
We prevent to include headers from <plat> in the drivers directory. You should find a way to get rid of it.
The Only way I can think of is code duplicity and I prefer not to. I see some include to asm/mach headers in clocksource, what is the difference?
The difference is <asm> includes are architecture dependent and could be acceptable if there is no choice (all arm timers use the same functionality from these headers), while <plat> includes are platform specific, so restricted to a specific platform.
Quoted 1 line
Could you suggest a better place for me to place my header file.
Yes, perhaps:
include/soc/npsdrivers/soc/nps
Quoted 32 lines
Quoted 3 lines
Quoted 1 line
+static void *nps_msu_reg_low_addr[NPS_CLUSTER_NUM]
__read_mostly;Perhaps a small optimization...
Thanks
Quoted 9 lines
static
DEFINE_PER_CPU_READ_MOSTLY(void __iomem *, baseaddr);static
cycle_tnps_clksrc_read(struct clocksource *clksrc){ void __iomem *base = per_cpu(baseaddr, raw_smp_processor_id()); return (cycle_t)ioread32be(base); }Quoted 7 lines
and in the init function:
for_each_cpu(cpu){
per_cpu(baseaddr, cpu)= nps_host_reg(cpu,
NPS_MSU_BLKID,
NPS_MSU_TICK_LOW
}Thanks again
Quoted 8 lines
drivers/clocksource/timer-nps.c line 32
Quoted 5 lines
drivers/clocksource/timer-nps.c new file +5
-0+static cycle_t nps_clksrc_read (struct clocksource *clksrc) +{ +int cluster =raw_smp_processor_id () >>NPS_CLUSTER_OFFSET ; + +return (cycle_t )ioread32be (nps_msu_reg_low_addr[cluster]);,AFAICT, there is a memory barrier with ioread32be, are you really sure we have to use it in this code path ?
Quoted 2 lines
Are you saying to remove use of ioread32be?
What should I use instead?
Never mind, I looked at the arm's ioread32be definition where there is a memory barrier. With this architecture ioread32be uses the generic one without the memory barrier (well, yes it uses one in the raw_readl asm implementation but we can't do anything).
Quoted 7 lines
Quoted 6 lines
drivers/clocksource/timer-nps.c line 55
Quoted 3 lines
drivers/clocksource/timer-nps.c new file +3
-0+ + dt_root =of_get_flat_dt_root (); + rate = (u32 )of_get_flat_dt_prop (dt_root,"clock-frequency" ,NULL );I don't get why this is done this way. The
Kconfigoption help says the clocksource rate is 1GHz but in the DT the clock is 88MHz.It says that clock source is up to 1GHz
ah ok.
Quoted 27 lines
Quoted 16 lines
It would be cleaner to define a fixed clock and then add a phandle in the DT.
timer_clk: timer_clk { #clock-cells = <0>; compatible = "fixed-clock"; clock-frequency = <123456789>; }; timer { compatible = "ezchip,nps400-timer"; clocks = <&timer_clk>; }That will result in the same code than the other drivers.
Quoted 7 lines
clk = of_clk_get(np, 0); if (IS_ERR(clk)) { pr_err("%s: invalid clock\n", np->full_name); return; } rate = clk_get_rate(clk);Once again thanks I will fix this.
-Noam
Signature · 5 lines
<http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
RE: [PATCH v3 03/18] clocksource: Add NPS400 timers driver
In reply to Daniel LezcanoFrom: Daniel Lezcano [mailto:[email protected]]
Sent: Friday, December 04, 2015 11:13 AM
Quoted 15 lines
It would be cleaner to define a fixed clock and then add a phandle in the DT.
timer_clk: timer_clk { #clock-cells = <0>; compatible = "fixed-clock"; clock-frequency = <123456789>; }; timer { compatible = "ezchip,nps400-timer"; clocks = <&timer_clk>; }That will result in the same code than the other drivers.
Quoted 7 lines
clk = of_clk_get(np, 0); if (IS_ERR(clk)) { pr_err("%s: invalid clock\n", np->full_name); return; }rate =
clk_get_rate(clk);
Seem like my driver comes before "fixed-clock" driver so I failed since I got no clocksource provider. How can this be solved?
-Noam
PATCH v3 4/18 irqchip: add nps Internal and external irqchips
In reply to Noam CamusFrom: Noam Camus <[email protected]>
Adding EZchip NPS400 support.
NPS internal interrupts are internally handled at Multi Thread Manager (MTM) that is signaled for deactivating an interrupt.
External interrupts is handled also at Global Interrupt Controller (GIC) e.g. serial and network devices.
--- .../interrupt-controller/ezchip,nps400-ic.txt | 17 ++ drivers/irqchip/Makefile | 1 + drivers/irqchip/irq-eznps.c | 213 ++++++++++++++++++++ 3 files changed, 231 insertions(+), 0 deletions(-) create mode 100644 Documentation/devicetree/bindings/interrupt-controller/ezchip,nps400-ic.txt create mode 100644 drivers/irqchip/irq-eznps.c
Documentation/devicetree/bindings/interrupt-controller/ezchip,nps400-ic.txt new file +17 -0
@@ -0,0 +1,17 @@ +EZchip NPS Interrupt Controller + +Required properties: + +- compatible : should be "ezchip,nps400-ic" +- interrupt-controller : Identifies the node as an interrupt controller +- #interrupt-cells : Specifies the number of cells needed to encode an + interrupt source. The value shall be 1. + + +Example: + +intc: interrupt-controller { + compatible = "ezchip,nps400-ic"; + interrupt-controller; + #interrupt-cells = <1>; +};
drivers/irqchip/Makefile +1 -0
@@ -55,3 +55,4 @@ obj-$(CONFIG_RENESAS_H8S_INTC) += irq-renesas-h8s.o obj-$(CONFIG_ARCH_SA1100) += irq-sa11x0.o obj-$(CONFIG_INGENIC_IRQ) += irq-ingenic.o obj-$(CONFIG_IMX_GPCV2) += irq-imx-gpcv2.o +obj-$(CONFIG_ARC_PLAT_EZNPS) += irq-eznps.o
drivers/irqchip/irq-eznps.c new file +213 -0
213 lines not on this page · raw message
Signature · 1 line
1.7.1
Re: [PATCH v3 04/18] irqchip: add nps Internal and external irqchips
Quoted 27 lines · Noam Camus
From: Noam Camus <noamc at ezchip.com>
Adding EZchip NPS400 support.
NPS internal interrupts are internally handled at Multi Thread Manager (MTM) that is signaled for deactivating an interrupt.
External interrupts is handled also at Global Interrupt Controller (GIC) e.g. serial and network devices.Signed-off-by Noam Camus <noamc at ezchip.com>Cc Thomas Gleixner <tglx at linutronix.de>Cc Jason Cooper <jason at lakedaemon.net>Cc Marc Zyngier <marc.zyngier at arm.com>--- .../interrupt-controller/ezchip,nps400-ic.txt | 17 ++ drivers/irqchip/Makefile | 1 + drivers/irqchip/irq-eznps.c | 213 ++++++++++++++++++++ 3 files changed, 231 insertions(+), 0 deletions(-) create mode 100644 Documentation/devicetree/bindings/interrupt-controller/ezchip,nps400-ic.txt create mode 100644 drivers/irqchip/irq-eznps.cDocumentation/devicetree/bindings/interrupt-controller/ezchip,nps400-ic.txt new file +0
-0
Documentation/devicetree/bindings/interrupt-controller/ezchip,nps400-ic.txt line 8
Quoted 8 lines
Documentation/devicetree/bindings/interrupt-controller/ezchip,nps400-ic.txt new file +8
-0@@ -0,0 +1,17 @@ +EZchip NPS Interrupt Controller + +Required properties: + +- compatible : should be "ezchip,nps400-ic" +- interrupt-controller : Identifies the node as an interrupt controller +- #interrupt-cells : Specifies the number of cells needed to encode an + interrupt source. The value shall be 1.
So you never have to encode the interrupt trigger type? Do you only support edge or level?
Quoted 59 lines
Documentation/devicetree/bindings/interrupt-controller/ezchip,nps400-ic.txt new file +9
-0+ + +Example: + +intc: interrupt-controller { + compatible = "ezchip,nps400-ic"; + interrupt-controller; + #interrupt-cells = <1>; +};drivers/irqchip/Makefile +1
-0@@ -55,3 +55,4 @@ obj-$(CONFIG_RENESAS_H8S_INTC) += irq-renesas-h8s.o obj-$(CONFIG_ARCH_SA1100) += irq-sa11x0.o obj-$(CONFIG_INGENIC_IRQ) += irq-ingenic.o obj-$(CONFIG_IMX_GPCV2) += irq-imx-gpcv2.o +obj-$(CONFIG_ARC_PLAT_EZNPS) += irq-eznps.odrivers/irqchip/irq-eznps.c new file +35
-0@@ -0,0 +1,213 @@ +/* +* Copyright(c) 2015 EZchip Technologies. +* +* This program is free software; you can redistribute it and/or modify it +* under the terms and conditions of the GNU General Public License, +* version 2, as published by the Free Software Foundation. +* +* This program is distributed in the hope 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. +* +* The full GNU General Public License is included in this distribution in +* the file called "COPYING". +*/ + +#include <linux/interrupt.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/irqdomain.h> +#include <linux/irqchip.h> +#include <asm/irq.h> +#include <plat/mtm.h> + +#define NPS_MSU_EN_CFG 0x80/* MSU Enable Configuration Register */ +#define MSU_EN BIT(0)/* MSU block enable */ +#define IPI_EN BIT(16)/* Enable service of incoming IPI Messages */ +#define GIM0_EN BIT(17)/* Enable service of incoming GIM 0 messages */ +#define GIM1_EN BIT(18)/* Enable service of incoming GIM 1 messages */ + +#define NPS_GIM_P_POL 0x110/* Peripheral interrupts source polarity */ +#define NPS_GIM_P_SENS 0x114/* Peripheral interrupts sensitivity */ +#define GIM_UART BIT(7) +#define GIM_LAN_TX (BIT(10) | BIT(25)) +#define GIM_LAN_RX (BIT(11) | BIT(26))
drivers/irqchip/irq-eznps.c line 45
Quoted 10 lines
drivers/irqchip/irq-eznps.c new file +10
-0+#define GIM_PERIPH_ALL (GIM_UART | GIM_LAN_TX | GIM_LAN_RX) + +#define NPS_GIM_P_DST10 0x13A/* Peripheral Interrupt Destination (LAN RX) */ +#define NPS_GIM_P_DST11 0x13B/* Peripheral Interrupt Destination (LAN TX) */ +#define NPS_GIM_P_DST25 0x149/* Peripheral Interrupt Destination (LAN RX) */ +#define NPS_GIM_P_DST26 0x14A/* Peripheral Interrupt Destination (LAN TX) */ +#define DST_IS BIT(26)/* Interrupt select for line 7 */ + +#define NPS_GIM_P_EN 0x100/* Peripheral interrupts source enable */ +#define NPS_GIM_P_BLK 0x118/* Peripheral interrupts blocking for sources */
Are these the interrupts the peripherals are using? If yes, they really have nothing to do here...
Quoted 88 lines
drivers/irqchip/irq-eznps.c new file +88
-0+ +/* Messaging and Scheduling Unit: +* Provides message management for a CPU cluster. +*/ +static void __init eznps_configure_msu (void ) +{ +int cpu; +u32 value =MSU_EN |IPI_EN |GIM0_EN |GIM1_EN ; + +/* Enable IPI and GIM messages on all clusters */ +for (cpu =0 ; cpu < eznps_max_cpus; cpu += eznps_cpus_per_cluster) +iowrite32be (value, +nps_host_reg (cpu,NPS_MSU_BLKID ,NPS_MSU_EN_CFG )); +} + +/* Global Interrupt Manager: +* Configures and manages up to 64 interrupts from peripherals, +* 16 interrupts from CPUs (virtual interrupts) and ECC interrupts. +* Receives the interrupts and transmits them to relevant CPU. +*/ +static void __init eznps_configure_gim (void ) +{ +u32 reg_addr, reg_val; + +/* IRQ polarity, low or high level, negative or positive edge */ + reg_addr =nps_host_reg_non_cl (NPS_GIM_BLKID ,NPS_GIM_P_POL ); + reg_val =ioread32be (reg_addr); + reg_val &= ~GIM_PERIPH_ALL ; +iowrite32be (reg_val, reg_addr); + +/* IRQ type level or edge */ + reg_addr =nps_host_reg_non_cl (NPS_GIM_BLKID ,NPS_GIM_P_SENS ); + reg_val =ioread32be (reg_addr); + reg_val |=GIM_LAN_TX ; +iowrite32be (reg_val, reg_addr); + +/* GIM interrupt select type for debug LAN interrupts (both sides) */ + reg_val =DST_IS ; + reg_addr =nps_host_reg_non_cl (NPS_GIM_BLKID ,NPS_GIM_P_DST10 ); +iowrite32be (reg_val, reg_addr); + reg_addr =nps_host_reg_non_cl (NPS_GIM_BLKID ,NPS_GIM_P_DST11 ); +iowrite32be (reg_val, reg_addr); + reg_addr =nps_host_reg_non_cl (NPS_GIM_BLKID ,NPS_GIM_P_DST25 ); +iowrite32be (reg_val, reg_addr); + reg_addr =nps_host_reg_non_cl (NPS_GIM_BLKID ,NPS_GIM_P_DST26 ); +iowrite32be (reg_val, reg_addr); + +/* CTOP IRQ lines should be defined as blocking in GIM */ +iowrite32be (GIM_PERIPH_ALL , +nps_host_reg_non_cl (NPS_GIM_BLKID ,NPS_GIM_P_BLK )); + +/* Enable CTOP IRQ lines in GIM */ +iowrite32be (GIM_PERIPH_ALL , +nps_host_reg_non_cl (NPS_GIM_BLKID ,NPS_GIM_P_EN )); +} + +/* +* NPS400 core includes a Interrupt Controller (IC) support. +* All cores can deactivate level irqs at first level control +* at cores mesh layer called MTM. +* For devices out side chip e.g. uart, network there is another +* level called Global Interrupt Manager (GIM). +* This second level can control level and edge interrupt. +* +* NOTE: AUX_IENABLE and CTOP_AUX_IACK are auxiliary registers +* with private HW copy per CPU. +*/ + +static void nps400_irq_mask (struct irq_data *data) +{ +unsigned int ienb; + + ienb =read_aux_reg (AUX_IENABLE ); + ienb &= ~(1 << data->hwirq); +write_aux_reg (AUX_IENABLE , ienb); +} + +static void nps400_irq_unmask (struct irq_data *data) +{ +unsigned int ienb; + + ienb =read_aux_reg (AUX_IENABLE ); + ienb |= (1 << data->hwirq); +write_aux_reg (AUX_IENABLE , ienb); +} + +static void nps400_irq_eoi_global (struct irq_data *data) +{
drivers/irqchip/irq-eznps.c line 143
Quoted 10 lines
drivers/irqchip/irq-eznps.c new file +10
-0+write_aux_reg (CTOP_AUX_IACK ,1 << data->hwirq); + +/* Don't ack before all device access is done */ +mb (); + + __asm__ __volatile__ ( +" .word %0\n" + : + :"i" (CTOP_INST_RSPI_GIC_0_R12 ) + :"memory" );
Silly question: why cannot you just write the actual instruction instead of shoving the instruction like this? Also, .inst would be more appropriate...
Quoted 28 lines
drivers/irqchip/irq-eznps.c new file +28
-0+} + +static void nps400_irq_eoi (struct irq_data *data) +{ +write_aux_reg (CTOP_AUX_IACK ,1 << data->hwirq); +} + + +static struct irq_chip nps400_irq_chip_fasteoi = { + .name ="NPS400 IC Global" , + .irq_mask = nps400_irq_mask, + .irq_unmask = nps400_irq_unmask, + .irq_eoi = nps400_irq_eoi_global, +}; + +static struct irq_chip nps400_irq_chip_percpu = { + .name ="NPS400 IC" , + .irq_mask = nps400_irq_mask, + .irq_unmask = nps400_irq_unmask, + .irq_eoi = nps400_irq_eoi, +}; + +static int nps400_irq_map (struct irq_domain *d,unsigned int irq, +irq_hw_number_t hw) +{ +switch (irq) { +case TIMER0_IRQ : +#if defined(CONFIG_SMP )
drivers/irqchip/irq-eznps.c line 181
Quoted 10 lines
drivers/irqchip/irq-eznps.c new file +10
-0+case IPI_IRQ : +#endif +irq_set_chip_and_handler (irq, &nps400_irq_chip_percpu, + handle_percpu_irq); +break ; +default : +irq_set_chip_and_handler (irq, &nps400_irq_chip_fasteoi, + handle_fasteoi_irq); +break ; + }
No. This is just wrong. Either you get per interrupt information from the device tree to configure the interrupt the right way, or you have different interrupt controllers for each device.
But using the Linux irq number is always wrong. You should only consider the hwirq.
Quoted 12 lines
drivers/irqchip/irq-eznps.c new file +12
-0+ +return 0 ; +} + +static const struct irq_domain_ops nps400_irq_ops = { + .xlate = irq_domain_xlate_onecell, + .map = nps400_irq_map, +}; + +static struct irq_domain *nps400_root_domain; + +static int __init nps400_of_init(struct device_node *node,
drivers/irqchip/irq-eznps.c line 203
Quoted 10 lines
drivers/irqchip/irq-eznps.c new file +10
-0+ struct device_node *parent) +{ +if (parent) +panic ("DeviceTree incore ic not a root irq controller\n" ); + +eznps_configure_msu (); +eznps_configure_gim (); + + nps400_root_domain =irq_domain_add_legacy (node,NR_CPU_IRQS ,0 ,0 , + &nps400_irq_ops,NULL );
And that's why you can get away with the above horror. Don't use legacy domains. This stuff is by no mean legacy.
drivers/irqchip/irq-eznps.c line 213
Quoted 11 lines
drivers/irqchip/irq-eznps.c new file +10
-0+ +if (!nps400_root_domain) +panic ("nps400 root irq domain not avail\n" ); + +/* with this we don't need to export nps400_root_domain */ +irq_set_default_host (nps400_root_domain); + +return 0 ; +} +IRQCHIP_DECLARE (ezchip_nps400_ic,"ezchip,nps400-ic" , nps400_of_init);
Thanks,
M.
Signature · 1 line
Jazz is not dead. It just smells funny...
RE: [PATCH v3 04/18] irqchip: add nps Internal and external irqchips
Quoted 6 lines
From: Marc Zyngier [mailto:marc.zyngier at arm.com]
Sent: Tuesday, December 01, 2015 3:29 PM+ interrupt source. The value shall be 1.
So you never have to encode the interrupt trigger type? Do you only support edge or level?
I Always use level sensitive.
Quoted 5 lines
drivers/irqchip/irq-eznps.c new file +3
-0+ +#define NPS_GIM_P_EN 0x100/* Peripheral interrupts source enable */ +#define NPS_GIM_P_BLK 0x118/* Peripheral interrupts blocking for sources */ Quoted 2 lines
Are these the interrupts the peripherals are using? If yes, they really have nothing to do here...
I will move this from here
Quoted 7 lines
drivers/irqchip/irq-eznps.c line 143
Quoted 5 lines
drivers/irqchip/irq-eznps.c new file +5
-0+ __asm__ __volatile__ ( +" .word %0\n" + : + :"i" (CTOP_INST_RSPI_GIC_0_R12 ) + :"memory" );Silly question: why cannot you just write the actual instruction instead of shoving the instruction like this? Also, .inst would be more appropriate...
[Noam Camus] Since this is instruction that yet is not part of up-streamed binutils of ARC. Now ARC maintainer can build our kernel with generic ARC toolchain.
Quoted 10 lines
Quoted 10 lines
drivers/irqchip/irq-eznps.c new file +10
-0+static int nps400_irq_map (struct irq_domain *d,unsigned int irq, +irq_hw_number_t hw) +{ +switch (irq) { +case TIMER0_IRQ : +#if defined(CONFIG_SMP ) +case IPI_IRQ : +#endif +irq_set_chip_and_handler (irq, &nps400_irq_chip_percpu, + handle_percpu_irq);
Quoted 8 lines
drivers/irqchip/irq-eznps.c line 181
Quoted 6 lines
drivers/irqchip/irq-eznps.c new file +6
-0+break ; +default : +irq_set_chip_and_handler (irq, &nps400_irq_chip_fasteoi, + handle_fasteoi_irq); +break ; + }No. This is just wrong. Either you get per interrupt information from the device tree to configure the interrupt the right way, or you have different interrupt controllers for each device.
I am not sure how you want me to get it from DTB? Please refer to some reference.
Quoted 1 line
But using the Linux irq number is always wrong. You should only consider the hwirq.
I will change
Quoted 5 lines
drivers/irqchip/irq-eznps.c new file +3
-0+ + nps400_root_domain =irq_domain_add_legacy (node,NR_CPU_IRQS ,0 ,0 , + &nps400_irq_ops,NULL );And that's why you can get away with the above horror. Don't use legacy domains. This stuff is by no mean legacy.
So what is my alternative here?
-Noam
Re: [PATCH v3 04/18] irqchip: add nps Internal and external irqchips
Hi Noam,
Quoted 23 lines · Noam Camus
Quoted 6 lines
From: Marc Zyngier [mailto:marc.zyngier at arm.com]
Sent: Tuesday, December 01, 2015 3:29 PM+ interrupt source. The value shall be 1.
So you never have to encode the interrupt trigger type? Do you only support edge or level?
I Always use level sensitive.
Quoted 5 lines
drivers/irqchip/irq-eznps.c new file +3
-0+ +#define NPS_GIM_P_EN 0x100/* Peripheral interrupts source enable */ +#define NPS_GIM_P_BLK 0x118/* Peripheral interrupts blocking for sources */ Quoted 2 lines
Are these the interrupts the peripherals are using? If yes, they really have nothing to do here...
I will move this from here
Quoted 9 lines
drivers/irqchip/irq-eznps.c line 143
Quoted 5 lines
drivers/irqchip/irq-eznps.c new file +5
-0+ __asm__ __volatile__ ( +" .word %0\n" + : + :"i" (CTOP_INST_RSPI_GIC_0_R12 ) + :"memory" );Silly question: why cannot you just write the actual instruction instead of shoving the instruction like this? Also, .inst would be more appropriate...
Quoted 3 lines
[Noam Camus] Since this is instruction that yet is not part of up-streamed binutils of ARC. Now ARC maintainer can build our kernel with generic ARC toolchain.
OK. If you decide to carry on using this, I'd still recommend using .inst instead of .word, so that you can get a proper disassembly.
Quoted 20 lines
Quoted 12 lines
Quoted 12 lines
drivers/irqchip/irq-eznps.c new file +12
-0+static int nps400_irq_map (struct irq_domain *d,unsigned int irq, +irq_hw_number_t hw) +{ +switch (irq) { +case TIMER0_IRQ : +#if defined(CONFIG_SMP ) +case IPI_IRQ : +#endif +irq_set_chip_and_handler (irq, &nps400_irq_chip_percpu, + handle_percpu_irq); +break ; +default :Quoted 8 lines
drivers/irqchip/irq-eznps.c line 181
Quoted 4 lines
drivers/irqchip/irq-eznps.c new file +4
-0+irq_set_chip_and_handler (irq, &nps400_irq_chip_fasteoi, + handle_fasteoi_irq); +break ; + }No. This is just wrong. Either you get per interrupt information from the device tree to configure the interrupt the right way, or you have different interrupt controllers for each device.
Quoted 2 lines
I am not sure how you want me to get it from DTB? Please refer to some reference.
Here, you are assuming that 'irq' is a hardware number, while there is no reason why it should be (it only works because you are using legacy domains, more on that later).
Your switch/case statement should be based on the 'hw' parameter, because that is your HW IRQ number. the irq parameter can be completely random, and will eventually be once you fix the rest of the driver.
Also, can you always tell the per-cpu property of your interrupt based on its number? If you can, then it is fine.
Quoted 10 lines
Quoted 1 line
But using the Linux irq number is always wrong. You should only consider the hwirq.
I will change
Quoted 6 lines
drivers/irqchip/irq-eznps.c new file +3
-0+ + nps400_root_domain =irq_domain_add_legacy (node,NR_CPU_IRQS ,0 ,0 , + &nps400_irq_ops,NULL );And that's why you can get away with the above horror. Don't use legacy domains. This stuff is by no mean legacy.
So what is my alternative here?
Your alternative is to use irq_domain_add_linear, for example, and to make sure that you always refer to the hw number when manipulating the HW. You will quickly notice that the Linux IRQ number has nothing to do with the HW one, and you'll be able to quickly iron out the bugs.
Looking forward to reviewing your next version.
Thanks,
M.
Signature · 1 line
Jazz is not dead. It just smells funny...
RE: [PATCH v3 04/18] irqchip: add nps Internal and external irqchips
From: Marc Zyngier [mailto:[email protected]]
Sent: Thursday, December 03, 2015 8:34 PM
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
Silly question: why cannot you just write the actual instruction instead of shoving the instruction like this? Also, .inst would be more appropriate...
[Noam Camus] Since this is instruction that yet is not part of up-streamed binutils of ARC. Now ARC maintainer can build our kernel with generic ARC toolchain.
OK. If you decide to carry on using this, I'd still recommend using .inst instead of .word, so that you can get a proper disassembly.
Seem to me that ".inst" is ARM Machine directive.
Quoted 1 line
Also, can you always tell the per-cpu property of your interrupt based on its number? If you can, then it is fine.
Yes I can, and I am using this knowledge.
Quoted 1 line
Your alternative is to use
irq_domain_add_linear, for example, and to make sure that you always refer to the hw number when manipulating the HW. You will quickly notice that the Linux IRQ number has nothing to do with the HW one, and you'll be able to quickly iron out the bugs.
Indeed when I moved from legacy to linear map I had to call irq_create_mapping() for my percpu IRQs and that's it. Thanks
-Noam
Re: [PATCH v3 04/18] irqchip: add nps Internal and external irqchips
In reply to Marc ZyngierQuoted 20 lines · Marc Zyngier
Quoted 16 lines
+static int nps400_irq_map(struct
irq_domain*d, unsigned int irq,Quoted 5 lines
drivers/irqchip/irq-eznps.c new file +5
-0+ irq_hw_number_t hw) +{ +switch (irq) { +case TIMER0_IRQ : +#if defined(CONFIG_SMP )drivers/irqchip/irq-eznps.c line 181
Quoted 10 lines
drivers/irqchip/irq-eznps.c new file +10
-0+case IPI_IRQ : +#endif +irq_set_chip_and_handler (irq, &nps400_irq_chip_percpu, + handle_percpu_irq); +break ; +default : +irq_set_chip_and_handler (irq, &nps400_irq_chip_fasteoi, + handle_fasteoi_irq); +break ; + }No. This is just wrong. Either you get per interrupt information from the device tree to configure the interrupt the right way, or you have different interrupt controllers for each device.
Quoted 2 lines
But using the Linux irq number is always wrong. You should only consider the hwirq.
The source is this incorrectness is ARC core intc code which also does the same thing and we get away with it because of the legacy domain usage.
I'll fix that up.
Thx,
-Vineet
PATCH v3 5/18 ARC: Set vmalloc size from configuration
In reply to Noam CamusFrom: Noam Camus <[email protected]>
User space use lower 2G of the virtual address space. However kernel steals upper 512M of this space.
This stolen space is used partially for vmalloc and the rest serves as gutter between kernel and user space.
The vmalloc size is depend on NR_CPUS since "per cpu" mechanism use vmalloc to allocate chunks for its use.
Historically vmalloc size was 256M however it is not enough in case of many CPUs e.g. 4K CPUs. For such case an extra 192M is allocated.
We are setting default vmalloc size to be 256M, any addtional space will be taken from kernel/user gutter.
This introduce build error since PGDIR_SIZE() cannot use "1UL" ibecause it is called from mm/tlbex.S by VMALLOC_START. Using _BITUL() solves this build error.
--- arch/arc/Kconfig | 8 ++++++++ arch/arc/include/asm/pgtable.h | 2 +- arch/arc/include/asm/processor.h | 10 +++++----- arch/arc/mm/tlb.c | 6 ++++++ 4 files changed, 20 insertions(+), 6 deletions(-)
arch/arc/Kconfig +8 -0
@@ -468,6 +468,14 @@ config ARCH_PHYS_ADDR_T_64BIT config ARCH_DMA_ADDR_T_64BIT bool +config ARC_VMALLOC_SIZE + hex "Vmalloc size (MB)" + range 0 512 + default "256" + help + By default equals to 256MB and the rest of 512MB is + left for gutter between kernel and user space. + config ARC_CURR_IN_REG bool "Dedicate Register r25 for current_task pointer" default y
arch/arc/include/asm/pgtable.h +1 -1
@@ -210,7 +210,7 @@#define BITS_FOR_PGD (32 - BITS_FOR_PTE - BITS_IN_PAGE)#define PGDIR_SHIFT (32 - BITS_FOR_PGD) -#define PGDIR_SIZE (1UL << PGDIR_SHIFT)/* vaddr span, not PDG sz */ +#define PGDIR_SIZE _BITUL(PGDIR_SHIFT)/* vaddr span, not PDG sz */ #define PGDIR_MASK (~(PGDIR_SIZE-1))#define PTRS_PER_PTE _BITUL(BITS_FOR_PTE)
arch/arc/include/asm/processor.h +5 -5
@@ -109,18 +109,18 @@ extern unsigned int get_wchan(struct task_struct *p);* 0xC000_0000 0xFFFF_FFFF (peripheral uncached space) * ----------------------------------------------------------------------------- */ -#define VMALLOC_START 0x70000000/* * 1 PGDIR_SIZE each for fixmap/pkmap, 2 PGDIR_SIZE gutter * See asm/highmem.h for details */ -#define VMALLOC_SIZE (PAGE_OFFSET - VMALLOC_START - PGDIR_SIZE * 4) -#define VMALLOC_END (VMALLOC_START + VMALLOC_SIZE) +#define VMALLOC_END (PAGE_OFFSET - PGDIR_SIZE * 4) +#define VMALLOC_SIZE (CONFIG_ARC_VMALLOC_SIZE << 20) +#define VMALLOC_START (VMALLOC_END - VMALLOC_SIZE) -#define USER_KERNEL_GUTTER 0x10000000 +#define TASK_SIZE 0x60000000 -#define TASK_SIZE (VMALLOC_START - USER_KERNEL_GUTTER) +#define USER_KERNEL_GUTTER (VMALLOC_START - TASK_SIZE)#define STACK_TOP TASK_SIZE#define STACK_TOP_MAX STACK_TOP
arch/arc/mm/tlb.c +6 -0
@@ -814,6 +814,12 @@ void arc_mmu_init(void)printk (arc_mmu_mumbojumbo (0 , str,sizeof (str))); +/* +* vmalloc size (in MB) sanity check, +* Can't be done in processor.h due to header include depenedencies +*/ +BUILD_BUG_ON (!IS_ALIGNED ((CONFIG_ARC_VMALLOC_SIZE <<20 ),PMD_SIZE )); +/* For efficiency sake, kernel is compile time built for a MMU ver * This must match the hardware it is running on. * Linux built for MMU V2, if run on MMU V1 will break down because V1
Signature · 1 line
1.7.1
PATCH v3 6/18 ARC: rwlock: disable interrupts in !LLSC variant
In reply to Noam CamusFrom: Noam Camus <[email protected]>
If we hold rwlock and interrupt occures we may end up spinning on it for ever during softirq. Note that this lock is an internal lock
and since the lock is free to be used from any context, the lock needs to be IRQ-safe.
Below you may see an example for interrupt we get while nl_table_lock is holding its rw->lock_mutex and we spinned on it for ever.
The concept for the fix was taken from SPARC.
[2015-05-12 19:16:12] Stack Trace:
[2015-05-12 19:16:12] arc_unwind_core+0xb8/0x11c [2015-05-12 19:16:12] dump_stack+0x68/0xac [2015-05-12 19:16:12] _raw_read_lock+0xa8/0xac [2015-05-12 19:16:12] netlink_broadcast_filtered+0x56/0x35c [2015-05-12 19:16:12] nlmsg_notify+0x42/0xa4 [2015-05-12 19:16:13] neigh_update+0x1fe/0x44c [2015-05-12 19:16:13] neigh_event_ns+0x40/0xa4 [2015-05-12 19:16:13] arp_process+0x46e/0x5a8 [2015-05-12 19:16:13] __netif_receive_skb_core+0x358/0x500 [2015-05-12 19:16:13] process_backlog+0x92/0x154 [2015-05-12 19:16:13] net_rx_action+0xb8/0x188 [2015-05-12 19:16:13] __do_softirq+0xda/0x1d8 [2015-05-12 19:16:14] irq_exit+0x8a/0x8c [2015-05-12 19:16:14] arch_do_IRQ+0x6c/0xa8 [2015-05-12 19:16:14] handle_interrupt_level1+0xe4/0xf0
--- arch/arc/include/asm/spinlock.h | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-)
arch/arc/include/asm/spinlock.h +14 -0
@@ -610,7 +610,9 @@ static inline void arch_spin_unlock(arch_spinlock_t *lock)static inline int arch_read_trylock (arch_rwlock_t *rw) {int ret =0 ; +unsigned long flags; +local_irq_save (flags);arch_spin_lock (&(rw->lock_mutex));/*
@@ -623,6 +625,7 @@ static inline int arch_read_trylock(arch_rwlock_t *rw) }arch_spin_unlock (&(rw->lock_mutex)); +local_irq_restore (flags);smp_mb ();return ret;
@@ -632,7 +635,9 @@ static inline int arch_read_trylock(arch_rwlock_t *rw)static inline int arch_write_trylock (arch_rwlock_t *rw) {int ret =0 ; +unsigned long flags; +local_irq_save (flags);arch_spin_lock (&(rw->lock_mutex));/*
@@ -646,6 +651,7 @@ static inline int arch_write_trylock(arch_rwlock_t *rw) ret =1 ; }arch_spin_unlock (&(rw->lock_mutex)); +local_irq_restore (flags);return ret; }
@@ -664,16 +670,24 @@ static inline void arch_write_lock(arch_rwlock_t *rw)static inline void arch_read_unlock (arch_rwlock_t *rw) { +unsigned long flags; + +local_irq_save (flags);arch_spin_lock (&(rw->lock_mutex)); rw->counter++;arch_spin_unlock (&(rw->lock_mutex)); +local_irq_restore (flags); }static inline void arch_write_unlock (arch_rwlock_t *rw) { +unsigned long flags; + +local_irq_save (flags);arch_spin_lock (&(rw->lock_mutex)); rw->counter = __ARCH_RW_LOCK_UNLOCKED__;arch_spin_unlock (&(rw->lock_mutex)); +local_irq_restore (flags); }#endif
Signature · 1 line
1.7.1
PATCH v3 7/18 ARC: rename smp operation init_irq_cpu() to init_per_cpu()
In reply to Noam CamusFrom: Noam Camus <[email protected]>
This will better reflect its description i.e. "any needed setup..." and not just do an "IPI request".
--- arch/arc/include/asm/smp.h | 4 ++-- arch/arc/kernel/irq.c | 4 ++-- arch/arc/kernel/mcip.c | 2 +- arch/arc/kernel/smp.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-)
arch/arc/include/asm/smp.h +2 -2
@@ -48,7 +48,7 @@ extern int smp_ipi_irq_setup(int cpu, int irq);* @init_early_smp: A SMP specific h/w block can init itself * Could be common across platforms so not covered by * mach_desc->init_early() -* @init_irq_cpu: Called for each core so SMP h/w block driver can do +* @init_per_cpu: Called for each core so SMP h/w block driver can do * any needed setup per cpu (e.g. IPI request) * @cpu_kick: For Master to kickstart a cpu (optionally at a PC) * @ipi_send: To send IPI to a @cpu
@@ -57,7 +57,7 @@ extern int smp_ipi_irq_setup(int cpu, int irq);struct plat_smp_ops {const char *info;void (*init_early_smp)(void ); -void (*init_irq_cpu)(int cpu); +void (*init_per_cpu)(int cpu);void (*cpu_kick)(int cpu,unsigned long pc);void (*ipi_send)(int cpu);void (*ipi_clear)(int irq);
arch/arc/kernel/irq.c +2 -2
@@ -29,8 +29,8 @@ void __init init_IRQ(void)#ifdef CONFIG_SMP /* a SMP H/w block could do IPI IRQ request here */ -if (plat_smp_ops.init_irq_cpu) - plat_smp_ops.init_irq_cpu (smp_processor_id ()); +if (plat_smp_ops.init_per_cpu) + plat_smp_ops.init_per_cpu (smp_processor_id ());if (machine_desc->init_cpu_smp) machine_desc->init_cpu_smp (smp_processor_id ());
arch/arc/kernel/mcip.c +1 -1
@@ -132,7 +132,7 @@ static void mcip_probe_n_setup(void)struct plat_smp_ops plat_smp_ops = { .info = smp_cpuinfo_buf, .init_early_smp = mcip_probe_n_setup, - .init_irq_cpu = mcip_setup_per_cpu, + .init_per_cpu = mcip_setup_per_cpu, .ipi_send = mcip_ipi_send, .ipi_clear = mcip_ipi_clear, };
arch/arc/kernel/smp.c +2 -2
@@ -132,8 +132,8 @@ void start_kernel_secondary(void)pr_info ("## CPU%u LIVE ##: Executing Code...\n" , cpu);/* Some SMP H/w setup - for each cpu */ -if (plat_smp_ops.init_irq_cpu) - plat_smp_ops.init_irq_cpu (cpu); +if (plat_smp_ops.init_per_cpu) + plat_smp_ops.init_per_cpu (cpu);if (machine_desc->init_cpu_smp) machine_desc->init_cpu_smp (cpu);
Signature · 1 line
1.7.1
PATCH v3 8/18 ARC: Mark secondary cpu online only after all HW setup is done
In reply to Noam CamusFrom: Noam Camus <[email protected]>
In SMP setup, master loops for each_present_cpu calling cpu_up(). For ARC it returns as soon as new cpu's status becomes online, However secondary may still do HW initializing,
machine or platform hook level.
So turn secondary online only after all HW setup is done.
Signed-off-by: Noam Camus <noamc at ezchip.com>
Acked-by: Vineet Gupta <vgupta at synopsys.com>
--- arch/arc/kernel/smp.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
arch/arc/kernel/smp.c +5 -5
@@ -126,11 +126,6 @@ void start_kernel_secondary(void) current->active_mm = mm;cpumask_set_cpu (cpu,mm_cpumask (mm)); -notify_cpu_starting (cpu); -set_cpu_online (cpu, true); - -pr_info ("## CPU%u LIVE ##: Executing Code...\n" , cpu); -/* Some SMP H/w setup - for each cpu */ if (plat_smp_ops.init_per_cpu) plat_smp_ops.init_per_cpu (cpu);
@@ -138,6 +133,11 @@ void start_kernel_secondary(void)if (machine_desc->init_cpu_smp) machine_desc->init_cpu_smp (cpu); +notify_cpu_starting (cpu); +set_cpu_online (cpu, true); + +pr_info ("## CPU%u LIVE ##: Executing Code...\n" , cpu); +arc_local_timer_setup ();local_irq_enable ();
Signature · 1 line
1.7.1
PATCH v3 9/18 ARC: add CONFIG_CLKSRC_OF support to time_init()
In reply to Noam CamusFrom: Noam Camus <[email protected]>
External clock source can be used if included by one of DTS file of a chosen platform.
--- arch/arc/kernel/time.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
arch/arc/kernel/time.c +4 -0
@@ -283,6 +283,10 @@ void __init time_init(void)*/ clocksource_register_hz (&arc_counter,arc_get_core_freq ()); +#ifdef CONFIG_CLKSRC_OF +clocksource_probe (); +#endif +/* sets up the periodic event timer */ arc_local_timer_setup (); }
Signature · 1 line
1.7.1
PATCH v3 10/18 ARC: [plat-eznps] Add eznps board defconfig and dts
In reply to Noam CamusFrom: Noam Camus <[email protected]>
Adding default configuration file and DTS file
--- arch/arc/boot/dts/eznps.dts | 76 +++++++++++++++++++++++++++++++++++ arch/arc/configs/nps_defconfig | 85 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 161 insertions(+), 0 deletions(-) create mode 100644 arch/arc/boot/dts/eznps.dts create mode 100644 arch/arc/configs/nps_defconfig
arch/arc/boot/dts/eznps.dts new file +76 -0
@@ -0,0 +1,76 @@ +/* + * Copyright(c) 2015 EZchip Technologies. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope 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. + * + * The full GNU General Public License is included in this distribution in + * the file called "COPYING". + */ + +/dts-v1/; + +/include/ "skeleton.dtsi" + +/ { + compatible = "ezchip,arc-nps"; + clock-frequency = <83333333>; /* 83.333333 MHZ */ + #address-cells = <1>; + #size-cells = <1>; + interrupt-parent = <&intc>; + present-cpus = "0-1,16-17"; + possible-cpus = "0-4095"; + + chosen { + bootargs = "earlycon=uart8250,mmio32be,0xf7209000,115200n8 console=ttyS0,115200n8"; + }; + + memory { + device_type = "memory"; + reg = <0x00000000 0x20000000>; /* 512M */ + }; + + fpga { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + + /* child and parent address space 1:1 mapped */ + ranges; + + intc: interrupt-controller { + compatible = "ezchip,nps400-ic"; + interrupt-controller; + #interrupt-cells = <1>; + }; + + timer { + compatible = "ezchip,nps400-timer"; + }; + + uart at f7209000 { + compatible = "snps,dw-apb-uart"; + device_type = "serial"; + reg = <0xf7209000 0x100>; + interrupts = <6>; + clock-frequency = <83333333>; + baud = <115200>; + reg-shift = <2>; + reg-io-width = <4>; + native-endian; + }; + + ethernet at f7470000 { + compatible = "ezchip,nps-mgt-enet"; + reg = <0xf7470000 0x1940>; + interrupts = <7>; + mac-address = [ 00 C0 00 F0 04 03 ]; + }; + }; +};
arch/arc/configs/nps_defconfig new file +85 -0
85 lines not on this page · raw message
Signature · 1 line
1.7.1
PATCH v3 11/18 ARC: [plat-eznps] Add eznps platform
In reply to Noam CamusFrom: Noam Camus <[email protected]>
This platform include boards:
Hardware Emulator (HE)
Simulator based upon nSIM.
--- MAINTAINERS | 6 + arch/arc/plat-eznps/Kconfig | 34 ++++ arch/arc/plat-eznps/Makefile | 7 + arch/arc/plat-eznps/entry.S | 75 +++++++++ arch/arc/plat-eznps/include/plat/ctop.h | 250 +++++++++++++++++++++++++++++++ arch/arc/plat-eznps/include/plat/mtm.h | 60 ++++++++ arch/arc/plat-eznps/include/plat/smp.h | 26 ++++ arch/arc/plat-eznps/mtm.c | 133 ++++++++++++++++ arch/arc/plat-eznps/platform.c | 27 ++++ arch/arc/plat-eznps/smp.c | 149 ++++++++++++++++++ 10 files changed, 767 insertions(+), 0 deletions(-) create mode 100644 arch/arc/plat-eznps/Kconfig create mode 100644 arch/arc/plat-eznps/Makefile create mode 100644 arch/arc/plat-eznps/entry.S create mode 100644 arch/arc/plat-eznps/include/plat/ctop.h create mode 100644 arch/arc/plat-eznps/include/plat/mtm.h create mode 100644 arch/arc/plat-eznps/include/plat/smp.h create mode 100644 arch/arc/plat-eznps/mtm.c create mode 100644 arch/arc/plat-eznps/platform.c create mode 100644 arch/arc/plat-eznps/smp.c
MAINTAINERS +6 -0
@@ -4257,6 +4257,12 @@ S: Maintained F: drivers/video/fbdev/exynos/exynos_mipi* F: include/video/exynos_mipi* +EZchip NPS platform support +M: Noam Camus <noamc at ezchip.com> +S: Supported +F: arch/arc/plat-eznps +F: arch/arc/boot/dts/eznps.dts + F71805F HARDWARE MONITORING DRIVER M: Jean Delvare <jdelvare at suse.com> L: lm-sensors at lm-sensors.org
arch/arc/plat-eznps/Kconfig new file +34 -0
@@ -0,0 +1,34 @@ +# +# For a description of the syntax of this configuration file, +# see Documentation/kbuild/kconfig-language.txt. +# + +menuconfig ARC_PLAT_EZNPS + bool "\"EZchip\" ARC dev platform" + select ARC_HAS_COH_CACHES if SMP + select CPU_BIG_ENDIAN + select CLKSRC_NPS + select EZCHIP_NPS_MANAGEMENT_ENET if ETHERNET + help + Support for EZchip development platforms, + based on ARC700 cores. + We handle few flavours: + - Hardware Emulator AKA HE which is FPGA based chasis + - Simulator based on MetaWare nSIM + - NPS400 chip based on ASIC + +config EZNPS_MTM_EXT + bool "ARC-EZchip MTM Extensions" + select CPUMASK_OFFSTACK + depends on ARC_PLAT_EZNPS && SMP + default y + help + Here we add new hierarchy for CPUs topology. + We got: + Core + Thread + At the new thread level each CPU represent one HW thread. + At highest hierarchy each core contain 16 threads, + any of them seem like CPU from Linux point of view. + All threads within same core share the execution unit of the + core and HW scheduler round robin between them.
arch/arc/plat-eznps/Makefile new file +7 -0
@@ -0,0 +1,7 @@ +# +# Makefile for the linux kernel. +# + +obj-y := entry.o platform.o +obj-$(CONFIG_SMP) += smp.o +obj-$(CONFIG_EZNPS_MTM_EXT) += mtm.o
arch/arc/plat-eznps/entry.S new file +75 -0
75 lines not on this page · raw message
arch/arc/plat-eznps/include/plat/ctop.h new file +250 -0
250 lines not on this page · raw message
arch/arc/plat-eznps/include/plat/mtm.h new file +60 -0
60 lines not on this page · raw message
arch/arc/plat-eznps/include/plat/smp.h new file +26 -0
@@ -0,0 +1,26 @@ +/* +* Copyright(c) 2015 EZchip Technologies. +* +* This program is free software; you can redistribute it and/or modify it +* under the terms and conditions of the GNU General Public License, +* version 2, as published by the Free Software Foundation. +* +* This program is distributed in the hope 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. +* +* The full GNU General Public License is included in this distribution in +* the file called "COPYING". +*/ + +#ifndef __PLAT_EZNPS_SMP_H +#define __PLAT_EZNPS_SMP_H + +#ifdef CONFIG_SMP + +extern void res_service (void ); + +#endif /* CONFIG_SMP */ + +#endif
arch/arc/plat-eznps/mtm.c new file +133 -0
133 lines not on this page · raw message
arch/arc/plat-eznps/platform.c new file +27 -0
@@ -0,0 +1,27 @@ +/* +* Copyright(c) 2015 EZchip Technologies. +* +* This program is free software; you can redistribute it and/or modify it +* under the terms and conditions of the GNU General Public License, +* version 2, as published by the Free Software Foundation. +* +* This program is distributed in the hope 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. +* +* The full GNU General Public License is included in this distribution in +* the file called "COPYING". +*/ + +#include <linux/init.h> +#include <asm/mach_desc.h> + +static const char *eznps_compat[]__initconst = { +"ezchip,arc-nps" , +NULL , +}; + +MACHINE_START (NPS ,"nps" ) + .dt_compat = eznps_compat, +MACHINE_END
arch/arc/plat-eznps/smp.c new file +149 -0
149 lines not on this page · raw message
Signature · 1 line
1.7.1
PATCH v3 12/18 ARC: [plat-eznps] Use dedicated user stack top
In reply to Noam CamusFrom: Noam Camus <[email protected]>
NPS use special mapping right below TASK_SIZE. Hence we need to lower STACK_TOP so that user stack won't overlap NPS special mapping.
--- arch/arc/include/asm/processor.h | 17 +++++++++++++++++ arch/arc/mm/tlb.c | 6 ++++++ 2 files changed, 23 insertions(+), 0 deletions(-)
arch/arc/include/asm/processor.h +17 -0
@@ -122,7 +122,24 @@ extern unsigned int get_wchan(struct task_struct *p);#define USER_KERNEL_GUTTER (VMALLOC_START - TASK_SIZE) +#ifdef CONFIG_ARC_PLAT_EZNPS +/* NPS architecture defines special window of 129M in user address space for +* special memory areas, when accessing this window the MMU do not use TLB. +* Instead MMU direct the access to: +* 0x57f00000:0x57ffffff -- 1M of closely coupled memory (aka CMEM) +* 0x58000000:0x5fffffff -- 16 huge pages, 8M each, with fixed map (aka FMTs) +* +* CMEM - is the fastest memory we got and its size is 16K. +* FMT - is used to map either to internal/external memory. +* Internal memory is the second fast memory and its size is 16M +* External memory is the biggest memory (16G) and also the slowest. +* +* STACK_TOP need to be PMD align (21bit) that is why we supply 0x57e00000. +*/ +#define STACK_TOP 0x57e00000 +#else /* CONFIG_ARC_PLAT_EZNPS */ #define STACK_TOP TASK_SIZE +#endif /* CONFIG_ARC_PLAT_EZNPS */ #define STACK_TOP_MAX STACK_TOP/* This decides where the kernel will search for a free chunk of vm
arch/arc/mm/tlb.c +6 -0
@@ -820,6 +820,12 @@ void arc_mmu_init(void)*/ BUILD_BUG_ON (!IS_ALIGNED ((CONFIG_ARC_VMALLOC_SIZE <<20 ),PMD_SIZE )); +/* +* stack top size sanity check, +* Can't be done in processor.h due to header include depenedencies +*/ +BUILD_BUG_ON (!IS_ALIGNED (STACK_TOP ,PMD_SIZE )); +/* For efficiency sake, kernel is compile time built for a MMU ver * This must match the hardware it is running on. * Linux built for MMU V2, if run on MMU V1 will break down because V1
Signature · 1 line
1.7.1
PATCH v3 13/18 ARC: [plat-eznps] Use dedicated atomic/bitops/cmpxchg
In reply to Noam CamusFrom: Noam Camus <[email protected]>
We need our own implementaions since we lack LLSC support. Our extended ISA provided with optimized solution for all 32bit operations we see in these three headers.
Signed-off-by: Noam Camus <noamc at ezchip.com>
--- arch/arc/include/asm/atomic.h | 79 +++++++++++++++++++++++++++++++++++- arch/arc/include/asm/bitops.h | 54 +++++++++++++++++++++++++ arch/arc/include/asm/cmpxchg.h | 87 +++++++++++++++++++++++++++++++++------- 3 files changed, 202 insertions(+), 18 deletions(-)
arch/arc/include/asm/atomic.h +76 -3
@@ -17,6 +17,7 @@#include <asm/barrier.h> #include <asm/smp.h> +#ifndef CONFIG_ARC_PLAT_EZNPS #define atomic_read (v) READ_ONCE((v)->counter)#ifdef CONFIG_ARC_HAS_LLSC
@@ -180,12 +181,84 @@ ATOMIC_OP(andnot, &= ~, bic) ATOMIC_OP(or, |=, or) ATOMIC_OP(xor, ^=, xor) -#undef ATOMIC_OPS -#undef ATOMIC_OP_RETURN -#undef ATOMIC_OP#undef SCOND_FAIL_RETRY_VAR_DEF#undef SCOND_FAIL_RETRY_ASM#undef SCOND_FAIL_RETRY_VARS +#else /* CONFIG_ARC_PLAT_EZNPS */ +static inline int atomic_read (const atomic_t *v) +{ +int temp; + + __asm__ __volatile__( +" ld.di %0, [%1]" + :"=r" (temp) + :"r" (&v->counter) + :"memory" ); +return temp; +} + +static inline void atomic_set (atomic_t *v,int i) +{ + __asm__ __volatile__( +" st.di %0,[%1]" + : + :"r" (i),"r" (&v->counter) + :"memory" ); +} + +#define ATOMIC_OP (op, c_op, asm_op) \ +static inline void atomic_##op(int i, atomic_t *v) \ +{ \ + __asm__ __volatile__( \ + " mov r2, %0\n" \ + " mov r3, %1\n" \ + " .word %2\n" \ + : \ + : "r"(i), "r"(&v->counter), "i"(asm_op) \ + : "r2", "r3", "memory"); \ +} \ + +#define ATOMIC_OP_RETURN (op, c_op, asm_op) \ +static inline int atomic_##op##_return(int i, atomic_t *v) \ +{ \ + unsigned int temp = i; \ + \ +/* Explicit full memory barrier needed before/after */ \ +smp_mb (); \ + \ + __asm__ __volatile__( \ +" mov r2, %0\n" \ +" mov r3, %1\n" \ +" .word %2\n" \ +" mov %0, r2" \ + :"+r" (temp) \ + :"r" (&v->counter),"i" (asm_op) \ + :"r2" ,"r3" ,"memory" ); \ + \ +smp_mb (); \ + \ + temp c_op i; \ + \ +return temp; \ +} + +#define ATOMIC_OPS (op, c_op, asm_op) \ + ATOMIC_OP(op, c_op, asm_op) \ + ATOMIC_OP_RETURN(op, c_op, asm_op) + +ATOMIC_OPS(add, +=, CTOP_INST_AADD_DI_R2_R2_R3) +#define atomic_sub (i, v) atomic_add(-(i), (v)) +#define atomic_sub_return (i, v) atomic_add_return(-(i), (v)) + +ATOMIC_OP(and, &=, CTOP_INST_AAND_DI_R2_R2_R3) +#define atomic_andnot (mask, v) atomic_and(~(mask), (v)) +ATOMIC_OP(or, |=, CTOP_INST_AOR_DI_R2_R2_R3) +ATOMIC_OP(xor, ^=, CTOP_INST_AXOR_DI_R2_R2_R3) +#endif /* CONFIG_ARC_PLAT_EZNPS */ + +#undef ATOMIC_OPS +#undef ATOMIC_OP_RETURN +#undef ATOMIC_OP/** * __atomic_add_unless - add unless the number is a given value
arch/arc/include/asm/bitops.h +54 -0
75 lines not on this page · raw message
arch/arc/include/asm/cmpxchg.h +72 -15
109 lines not on this page · raw message
Signature · 1 line
1.7.1
PATCH v3 14/18 ARC: [plat-eznps] Use dedicated SMP barriers
In reply to Noam CamusFrom: Noam Camus <[email protected]>
NPS device got 256 cores and each got 16 HW threads (SMT). We use EZchip dedicated ISA to trigger HW scheduler of the core that current HW thread belongs to.
This scheduling makes sure that data beyond barrier is available to all HW threads in core and by that to all in device (4K).
--- arch/arc/include/asm/barrier.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)
arch/arc/include/asm/barrier.h +8 -0
@@ -34,6 +34,7 @@#ifdef CONFIG_ISA_ARCOMPACT +#ifndef CONFIG_ARC_PLAT_EZNPS /* * ARCompact based cores (ARC700) only have SYNC instruction which is super * heavy weight as it flushes the pipeline as well.
@@ -41,6 +42,13 @@*/ #define mb () asm volatile("sync\n" : : : "memory") +#else /* CONFIG_ARC_PLAT_EZNPS */ + +#include <plat/ctop.h> +#define mb () asm volatile (".word %0" : : "i"(CTOP_INST_SCHD_RW) : "memory") +#define rmb () asm volatile (".word %0" : : "i"(CTOP_INST_SCHD_RD) : "memory") +#endif /* CONFIG_ARC_PLAT_EZNPS */ +#endif #include <asm-generic/barrier.h>
Signature · 1 line
1.7.1
PATCH v3 15/18 ARC: [plat-eznps] Use dedicated identity auxiliary register.
In reply to Noam CamusFrom: Noam Camus <[email protected]>
With generic "identity" num of CPUs is limited to 256 (8 bit). We use our alternative AUX register GLOBAL_ID (12 bit). Now we can support up to 4096 CPUs.
--- arch/arc/include/asm/entry-compact.h | 8 ++++++++ arch/arc/kernel/ctx_sw.c | 13 +++++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-)
arch/arc/include/asm/entry-compact.h +8 -0
@@ -35,6 +35,7 @@#include <asm/asm-offsets.h> #include <asm/irqflags-compact.h> #include <asm/thread_info.h> /* For THREAD_SIZE */ +#include <plat/ctop.h> /*-------------------------------------------------------------- * Switch to Kernel Mode stack if SP points to User Mode stack
@@ -298,9 +299,16 @@ /* Get CPU-ID of this core */ .macro GET_CPU_ID reg +#ifdef CONFIG_ARC_PLAT_EZNPS + lr \reg, [CTOP_AUX_LOGIC_GLOBAL_ID] +#ifndef CONFIG_EZNPS_MTM_EXT + lsr \reg, \reg, 4 +#endif +#else lr \reg, [identity] lsr \reg, \reg, 8 bmsk \reg, \reg, 7 +#endif .endm #endif /* __ASM_ARC_ENTRY_COMPACT_H */
arch/arc/kernel/ctx_sw.c +13 -0
@@ -16,6 +16,9 @@#include <asm/asm-offsets.h> #include <linux/sched.h> +#ifdef CONFIG_ARC_PLAT_EZNPS +#include <plat/ctop.h> +#endif #define KSP_WORD_OFF ((TASK_THREAD + THREAD_KSP) / 4)
@@ -67,9 +70,16 @@ __switch_to(struct task_struct *prev_task, struct task_struct *next_task)#ifndef CONFIG_SMP "st %2, [@_current_task] \n\t"#else +#ifdef CONFIG_ARC_PLAT_EZNPS +"lr r24, [%4] \n\t" +#ifndef CONFIG_EZNPS_MTM_EXT + "lsr r24, r24, 4 \n\t" +#endif +#else "lr r24, [identity] \n\t" "lsr r24, r24, 8 \n\t" "bmsk r24, r24, 7 \n\t" +#endif "add2 r24, @_current_task, r24 \n\t" "st %2, [r24] \n\t" #endif
@@ -107,6 +117,9 @@ __switch_to(struct task_struct *prev_task, struct task_struct *next_task) : "=r"(tmp) : "n"(KSP_WORD_OFF), "r"(next), "r"(prev) +#ifdef CONFIG_ARC_PLAT_EZNPS + , "i"(CTOP_AUX_LOGIC_GLOBAL_ID) +#endif : "blink" );
Signature · 1 line
1.7.1
PATCH v3 16/18 ARC: [plat-eznps] Use dedicated cpu_relax()
In reply to Noam CamusFrom: Tal Zilcer <[email protected]>
Since the CTOP is SMT hardware multi-threaded, we need to hint the HW that now will be a very good time to do a hardware thread context switching. This is done by issuing the schd.rw instruction (binary coded here so as to not require specific revision of GCC to build the kernel).
sched.rw means that Thread becomes eligible for execution by the threads scheduler after all pending read/write transactions were completed.
Implementing cpu_relax_lowlatency() with barrier() Since with current semantics of cpu_relax() it may take a while till yielded CPU will get back.
--- arch/arc/include/asm/processor.h | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-)
arch/arc/include/asm/processor.h +9 -0
@@ -57,9 +57,18 @@ struct task_struct;* A lot of busy-wait loops in SMP are based off of non-volatile data otherwise * get optimised away by gcc */ +#ifndef CONFIG_EZNPS_MTM_EXT #define cpu_relax () __asm__ __volatile__ ("" : : : "memory") +#else +#define cpu_relax () \ + __asm__ __volatile__ (".word %0" : : "i"(CTOP_INST_SCHD_RW) : "memory") +#endif +#ifndef CONFIG_EZNPS_MTM_EXT #define cpu_relax_lowlatency () cpu_relax() +#else +#define cpu_relax_lowlatency () barrier() +#endif #define copy_segments (tsk, mm) do { } while (0)#define release_segments (mm) do { } while (0)
Signature · 1 line
1.7.1
PATCH v3 17/18 ARC: [plat-eznps] Use dedicated COMMAND_LINE_SIZE
In reply to Noam CamusFrom: Noam Camus <[email protected]>
The default 256 bytes sometimes is just not enough. We usually provide earlycon=... and console=... and ip=... All this and more may need more room.
--- arch/arc/include/asm/setup.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
arch/arc/include/asm/setup.h +4 -0
@@ -12,7 +12,11 @@#include <linux/types.h> #include <uapi/asm/setup.h> +#ifdef CONFIG_ARC_PLAT_EZNPS +#define COMMAND_LINE_SIZE 2048 +#else #define COMMAND_LINE_SIZE 256 +#endif /* * Data structure to map a ID to string
Signature · 1 line
1.7.1
PATCH v3 18/18 ARC: Add eznps platform to Kconfig and Makefile
In reply to Noam CamusFrom: Noam Camus <[email protected]>
This commit should be left last since only now eznps platform is in state which one can actually use.
Signed-off-by: Noam Camus <noamc at ezchip.com>
--- arch/arc/Kconfig | 1 + arch/arc/Makefile | 5 +++++ 2 files changed, 6 insertions(+), 0 deletions(-)
arch/arc/Kconfig +1 -0
@@ -91,6 +91,7 @@ source "arch/arc/plat-sim/Kconfig" source "arch/arc/plat-tb10x/Kconfig" source "arch/arc/plat-axs10x/Kconfig" #New platform adds here +source "arch/arc/plat-eznps/Kconfig" endmenu
arch/arc/Makefile +5 -0
@@ -99,6 +99,11 @@ core-y += arch/arc/boot/dts/ core-$(CONFIG_ARC_PLAT_SIM) += arch/arc/plat-sim/ core-$(CONFIG_ARC_PLAT_TB10X) += arch/arc/plat-tb10x/ core-$(CONFIG_ARC_PLAT_AXS10X) += arch/arc/plat-axs10x/ +core-$(CONFIG_ARC_PLAT_EZNPS) += arch/arc/plat-eznps/ + +ifdef CONFIG_ARC_PLAT_EZNPS +KBUILD_CPPFLAGS += -I$(srctree)/arch/arc/plat-eznps/include +endif drivers-$(CONFIG_OPROFILE) += arch/arc/oprofile/
Signature · 1 line
1.7.1