2007/4/10, Gilles Chanteperdrix <[EMAIL PROTECTED]>:
Gregory CLEMENT wrote:
> Hello,
>
> We port the adeos-ipipe-2.6.19-arm-1.6-05.patch for AT91SAM9261.
>
> This patch must be applied on vanilla 2.6.19 with at91 patch (
> http://maxim.org.za/AT91RM9200/2.6/2.6.19-at91.patch.gz ) applied for
> supporting AT91SAM9261.
> So first get vanilla kernel, then apply at91 patch then apply our
> patch instead of adeos-ipipe-2.6.19-arm-1.6-05.patch.
>
> For now it works with Xenomai on AT91SAM9261-EK, if someone is
> intersting we can send the benchmark result.
> As AT91SAM926x are pretty similar of AT91RM9200, there is a some
> duplicate code and some common code.
> In the future it could be also work on all AT91SAM926x, we can test
> it. But before going ahead we would like some comment on this patch.
>
> The better would be working on 2.6.20 which already have support for
> AT91SAM926x, but we didn't see any arm patch on this kernel nor any
> file modified on git.
>
> Hope this patch will be usefull.
It looks good. I will try and port the I-pipe patch for ARM to Linux
2.6.20. In the meantime, could you separate the AT91SAM9261 specific
code and the changes (if any) made to the rest of the I-pipe from the
rest of the I-pipe ? This would ease distribution and maintenance.
OK I made a diff between our patch and
adeos-ipipe-2.6.19-arm-1.6-05.patch. I had to reworked our patch for
removing fake difference.
As you will see there is not many difference between the 2 patchs and
we don't modify the rest of I-pipe.
There is also difference due to the fact that we made our patch on a
kernel patched with at91 whereas adeos patch was made on vanilla
kernel.
As this diff file isn't really readeable, I can say that the main file
we modified are:
* arch/arm/mach-at91rm9200/Kconfig
-> here we add support for AT91SAM9261
* arch/arm/mach-at91rm9200/at91sam9261.c
-> here we add support for TCB0 and modify interrupt priority in the
same way of AT91RM9200
* arch/arm/mach-at91rm9200/at91sam926x_time.c
-> and here we add the same code that was in
arch/arm/mach-at91rm9200/at91rm9200_time.c. As it is exactly the same
code added as we use the same peripheral, maybe we can add a common
file ( an at91_ipipe_time.c), instead of having duplicated code.
--
Gregory CLEMENT
Adeneo
2, chemin du Ruisseau - BP21
69136 Ecully Cedex
France
Tel : +33-4 72 18 08 40
--- adeos-ipipe-2.6.19-arm-1.6-05.patch 2007-04-10 11:50:07.000000000 +0200
+++ adeos-ipipe-2.6.19-arm-1.6-05-at91sam9261-reworked.patch 2007-04-11 10:34:46.000000000 +0200
@@ -1065,13 +1065,17 @@
#ifdef CONFIG_DEBUG_USER
if (user_debug & UDBG_UNDEFINED) {
printk(KERN_INFO "%s (%d): undefined instruction: pc=%p\n",
-diff -Naurdp -x .gitignore -x '*~' -x '*.orig' -x '*.rej' linux-2.6.19/arch/arm/mach-at91rm9200/Kconfig ipipe-2.6.19-arm/arch/arm/mach-at91rm9200/Kconfig
---- linux-2.6.19/arch/arm/mach-at91rm9200/Kconfig 2007-01-04 22:01:15.000000000 +0100
-+++ ipipe-2.6.19-arm/arch/arm/mach-at91rm9200/Kconfig 2007-03-02 18:41:52.000000000 +0100
-@@ -82,6 +82,24 @@ config MACH_KAFA
- help
- Select this if you are using Sperry-Sun's KAFA board.
+diff -NaurdpbB -X nodiff linux-2.6.19.at91/arch/arm/mach-at91rm9200/Kconfig linux-2.6.19.patched/arch/arm/mach-at91rm9200/Kconfig
+--- linux-2.6.19.at91/arch/arm/mach-at91rm9200/Kconfig 2007-04-10 08:04:00.000000000 +0200
++++ linux-2.6.19.patched/arch/arm/mach-at91rm9200/Kconfig 2007-04-10 15:20:34.000000000 +0200
+@@ -118,6 +118,34 @@ endif
+
+ # ----------------------------------------------------------
++if ARCH_AT91SAM9261 || ARCH_AT91RM9200
++
++comment "Ipipe dependent"
++
+config IPIPE_AT91_TC
+ depends on IPIPE
+ int "AT91 TC used as time base"
@@ -1084,19 +1088,25 @@
+config IPIPE_AT91_MCK
+ depends on IPIPE
+ int "AT91 Master clock Frequency"
-+ default 46080000
++ default 59904000 if MACH_AT91RM9200EK
++ default 99328000 if MACH_AT91SAM9261EK
++ default 53000000
+ help
+ When Adeos interrupt pipeline is enabled, AT91 timer is based on
+ the AT91 master clock, whose frequency need hence to be known at
+ compilation time.
+
- endif
++endif
++
++# ----------------------------------------------------------
++
+ comment "AT91 Board Options"
- # ----------------------------------------------------------
-diff -Naurdp -x .gitignore -x '*~' -x '*.orig' -x '*.rej' linux-2.6.19/arch/arm/mach-at91rm9200/at91rm9200.c ipipe-2.6.19-arm/arch/arm/mach-at91rm9200/at91rm9200.c
---- linux-2.6.19/arch/arm/mach-at91rm9200/at91rm9200.c 2007-03-20 20:32:02.000000000 +0100
-+++ ipipe-2.6.19-arm/arch/arm/mach-at91rm9200/at91rm9200.c 2007-03-02 18:41:52.000000000 +0100
-@@ -51,6 +51,13 @@ static struct map_desc at91rm9200_io_des
+ config MTD_AT91_DATAFLASH_CARD
+diff -NaurdpbB -X nodiff linux-2.6.19.at91/arch/arm/mach-at91rm9200/at91rm9200.c linux-2.6.19.patched/arch/arm/mach-at91rm9200/at91rm9200.c
+--- linux-2.6.19.at91/arch/arm/mach-at91rm9200/at91rm9200.c 2007-04-10 08:04:00.000000000 +0200
++++ linux-2.6.19.patched/arch/arm/mach-at91rm9200/at91rm9200.c 2007-04-04 11:52:05.000000000 +0200
+@@ -33,6 +33,13 @@ static struct map_desc at91rm9200_io_des
.length = SZ_16K,
.type = MT_DEVICE,
}, {
@@ -1107,10 +1117,10 @@
+ .type = MT_DEVICE,
+ }, {
+#endif /* CONFIG_IPIPE */
- .virtual = AT91_SRAM_VIRT_BASE,
+ .virtual = AT91_IO_VIRT_BASE - AT91RM9200_SRAM_SIZE,
.pfn = __phys_to_pfn(AT91RM9200_SRAM_BASE),
.length = AT91RM9200_SRAM_SIZE,
-@@ -249,6 +256,7 @@ void __init at91rm9200_initialize(unsign
+@@ -247,6 +254,7 @@ void __init at91rm9200_initialize(unsign
* The default interrupt priority levels (0 = lowest, 7 = highest).
*/
static unsigned int at91rm9200_default_irq_priority[NR_AIC_IRQS] __initdata = {
@@ -1118,7 +1128,7 @@
7, /* Advanced Interrupt Controller (FIQ) */
7, /* System Peripherals */
0, /* Parallel IO Controller A */
-@@ -281,6 +289,42 @@ static unsigned int at91rm9200_default_i
+@@ -279,6 +287,42 @@ static unsigned int at91rm9200_default_i
0, /* Advanced Interrupt Controller (IRQ4) */
0, /* Advanced Interrupt Controller (IRQ5) */
0 /* Advanced Interrupt Controller (IRQ6) */
@@ -1227,7 +1237,7 @@
/*
* The ST_CRTR is updated asynchronously to the master clock. It is therefore
* necessary to read it twice (with the same value) to ensure accuracy.
-@@ -39,14 +95,16 @@ static unsigned long last_crtr;
+@@ -41,14 +97,16 @@ static unsigned long last_crtr;
static inline unsigned long read_CRTR(void) {
unsigned long x1, x2;
@@ -1245,7 +1255,7 @@
/*
* Returns number of microseconds since last timer interrupt. Note that interrupts
* will have been disabled by do_gettimeofday()
-@@ -139,3 +197,209 @@ struct sys_timer at91rm9200_timer = {
+@@ -144,3 +202,209 @@ struct sys_timer at91rm9200_timer = {
.resume = at91rm9200_timer_reset,
};
@@ -1455,12 +1465,363 @@
+ .resume = NULL,
+};
+#endif /* CONFIG_IPIPE */
-diff -Naurdp -x .gitignore -x '*~' -x '*.orig' -x '*.rej' linux-2.6.19/arch/arm/mach-at91rm9200/gpio.c ipipe-2.6.19-arm/arch/arm/mach-at91rm9200/gpio.c
---- linux-2.6.19/arch/arm/mach-at91rm9200/gpio.c 2007-03-20 20:32:02.000000000 +0100
-+++ ipipe-2.6.19-arm/arch/arm/mach-at91rm9200/gpio.c 2007-03-02 18:41:52.000000000 +0100
-@@ -20,6 +20,11 @@
- #include <asm/io.h>
- #include <asm/hardware.h>
+diff -NaurdpbB -X nodiff linux-2.6.19.at91/arch/arm/mach-at91rm9200/at91sam9261.c linux-2.6.19.patched/arch/arm/mach-at91rm9200/at91sam9261.c
+--- linux-2.6.19.at91/arch/arm/mach-at91rm9200/at91sam9261.c 2007-04-10 08:04:00.000000000 +0200
++++ linux-2.6.19.patched/arch/arm/mach-at91rm9200/at91sam9261.c 2007-04-10 07:58:16.000000000 +0200
+@@ -27,6 +27,13 @@ static struct map_desc at91sam9261_io_de
+ .length = SZ_16K,
+ .type = MT_DEVICE,
+ }, {
++#ifdef CONFIG_IPIPE
++ .virtual = AT91_VA_BASE_TCB0,
++ .pfn = __phys_to_pfn(AT91SAM9261_BASE_TCB0),
++ .length = SZ_16K,
++ .type = MT_DEVICE,
++ }, {
++#endif /* CONFIG_IPIPE */
+ .virtual = AT91_IO_VIRT_BASE - AT91SAM9261_SRAM_SIZE,
+ .pfn = __phys_to_pfn(AT91SAM9261_SRAM_BASE),
+ .length = AT91SAM9261_SRAM_SIZE,
+@@ -242,6 +249,7 @@ void __init at91sam9261_initialize(unsig
+ * The default interrupt priority levels (0 = lowest, 7 = highest).
+ */
+ static unsigned int at91sam9261_default_irq_priority[NR_AIC_IRQS] __initdata = {
++#ifndef CONFIG_IPIPE
+ 7, /* Advanced Interrupt Controller */
+ 7, /* System Peripherals */
+ 0, /* Parallel IO Controller A */
+@@ -274,6 +282,42 @@ static unsigned int at91sam9261_default_
+ 0, /* Advanced Interrupt Controller */
+ 0, /* Advanced Interrupt Controller */
+ 0, /* Advanced Interrupt Controller */
++#else /* CONFIG_IPIPE */
++/* Give the highest priority to TC, since they are used as timer interrupt by
++ I-pipe. */
++ 7, /* Advanced Interrupt Controller */
++ 7, /* System Peripherals */
++ 0, /* Parallel IO Controller A */
++ 0, /* Parallel IO Controller B */
++ 0, /* Parallel IO Controller C */
++ 0,
++ 6, /* USART 0 */
++ 6, /* USART 1 */
++ 6, /* USART 2 */
++ 0, /* Multimedia Card Interface */
++ 4, /* USB Device Port */
++ 0, /* Two-Wire Interface */
++ 6, /* Serial Peripheral Interface 0 */
++ 6, /* Serial Peripheral Interface 1 */
++ 5, /* Serial Synchronous Controller 0 */
++ 5, /* Serial Synchronous Controller 1 */
++ 5, /* Serial Synchronous Controller 2 */
++ 7, /* Timer Counter 0 */
++ 7, /* Timer Counter 1 */
++ 7, /* Timer Counter 2 */
++ 3, /* USB Host port */
++ 3, /* LCD Controller */
++ 0,
++ 0,
++ 0,
++ 0,
++ 0,
++ 0,
++ 0,
++ 0, /* Advanced Interrupt Controller */
++ 0, /* Advanced Interrupt Controller */
++ 0, /* Advanced Interrupt Controller */
++#endif /*CONFIG_IPIPE */
+ };
+
+ void __init at91sam9261_init_interrupts(unsigned int priority[NR_AIC_IRQS])
+diff -NaurdpbB -X nodiff linux-2.6.19.at91/arch/arm/mach-at91rm9200/at91sam926x_time.c linux-2.6.19.patched/arch/arm/mach-at91rm9200/at91sam926x_time.c
+--- linux-2.6.19.at91/arch/arm/mach-at91rm9200/at91sam926x_time.c 2007-04-10 08:04:00.000000000 +0200
++++ linux-2.6.19.patched/arch/arm/mach-at91rm9200/at91sam926x_time.c 2007-04-04 11:52:05.000000000 +0200
+@@ -22,10 +22,69 @@
+
+ #include <asm/arch/at91_pit.h>
+
++static unsigned long last_crtr;
++
++#ifdef CONFIG_IPIPE
++#include <linux/clk.h>
++#include <linux/console.h>
++#include <linux/module.h>
++#include <asm/arch/at91sam9261.h>
++#include <asm/arch/at91_tc.h>
++#include "clock.h"
++
++#ifdef CONFIG_NO_IDLE_HZ
++#error "dynamic tick timer not yet supported with IPIPE"
++#endif /* CONFIG_NO_IDLE_HZ */
++
++#define TCNXCNS(timer,v) ((v) << ((timer)<<1))
++#define AT91_TC_REG_MASK (0xffff)
++
++#if (CONFIG_IPIPE_AT91_TC==0)
++# define KERNEL_TIMER_IRQ_NUM AT91SAM9261_ID_TC0
++#elif (CONFIG_IPIPE_AT91_TC==1)
++# define KERNEL_TIMER_IRQ_NUM AT91SAM9261_ID_TC1
++#elif (CONFIG_IPIPE_AT91_TC==2)
++# define KERNEL_TIMER_IRQ_NUM AT91SAM9261_ID_TC2
++#else
++#error IPIPE_AT91_TC must be 0, 1 or 2.
++#endif
++
++static inline unsigned int at91_tc_read(unsigned int reg_offset)
++{
++ unsigned long addr =
++ (AT91_VA_BASE_TCB0 + 0x40 * CONFIG_IPIPE_AT91_TC);
++
++ return readl((void __iomem *)(addr + reg_offset));
++}
++
++static inline void at91_tc_write(unsigned int reg_offset, unsigned long value)
++{
++ unsigned long addr =
++ (AT91_VA_BASE_TCB0 + 0x40 * CONFIG_IPIPE_AT91_TC);
++
++ writel(value, (void __iomem *)(addr + reg_offset));
++}
++
++#define read_CV() at91_tc_read(AT91_TC_CV)
++#define read_RC() at91_tc_read(AT91_TC_RC)
++#define write_RC(value) at91_tc_write(AT91_TC_RC, value)
++
++int __ipipe_mach_timerint = KERNEL_TIMER_IRQ_NUM;
++EXPORT_SYMBOL(__ipipe_mach_timerint);
++
++int __ipipe_mach_timerstolen = 0;
++EXPORT_SYMBOL(__ipipe_mach_timerstolen);
++
++unsigned int __ipipe_mach_ticks_per_jiffy = LATCH;
++EXPORT_SYMBOL(__ipipe_mach_ticks_per_jiffy);
++
++static int at91_timer_initialized;
++#endif /* CONFIG_IPIPE */
+
+ #define PIT_CPIV(x) ((x) & AT91_PIT_CPIV)
+ #define PIT_PICNT(x) (((x) & AT91_PIT_PICNT) >> 20)
+
++#ifndef CONFIG_IPIPE
+ /*
+ * Returns number of microseconds since last timer interrupt. Note that interrupts
+ * will have been disabled by do_gettimeofday()
+@@ -112,3 +171,209 @@ struct sys_timer at91sam926x_timer = {
+ .resume = at91sam926x_timer_reset,
+ };
+
++#else /* CONFIG_IPIPE */
++
++/*
++ * Returns number of microseconds since last timer interrupt. Note that interrupts
++ * will have been disabled by do_gettimeofday()
++ * 'LATCH' is hwclock ticks (see CLOCK_TICK_RATE in timex.h) per jiffy.
++* 'tick' is usecs per jiffy (linux/timex.h).
++ */
++static unsigned long at91sam926x_gettimeoffset(void)
++{
++ unsigned long elapsed;
++
++ elapsed = (read_CV() - last_crtr) & AT91_TC_REG_MASK;
++
++ return (unsigned long) (elapsed * (tick_nsec / 1000)) / LATCH;
++}
++
++void __ipipe_mach_acktimer(void)
++{
++ at91_tc_read(AT91_TC_SR);
++}
++
++/*
++ * IRQ handler for the timer.
++ */
++static irqreturn_t at91sam926x_timer_interrupt(int irq, void *dev_id)
++{
++ /*
++ * - if Linux is running under ipipe, but it still has the control over
++ * the timer (no Xenomai for example), then reprogram the timer (ipipe
++ * has already acked it)
++ * - if some other domain has taken over the timer, then do nothing
++ * (ipipe has acked it, and the other domain has reprogramed it)
++ */
++
++ write_seqlock(&xtime_lock);
++
++ if (__ipipe_mach_timerstolen) {
++ timer_tick();
++ last_crtr = (last_crtr + LATCH) & AT91_TC_REG_MASK;
++ } else {
++ while (((read_CV() - last_crtr) & AT91_TC_REG_MASK) >= LATCH) {
++ timer_tick();
++ last_crtr = (last_crtr + LATCH) & AT91_TC_REG_MASK;
++ }
++ write_RC((last_crtr + LATCH) & AT91_TC_REG_MASK);
++ }
++
++ write_sequnlock(&xtime_lock);
++
++ return IRQ_HANDLED;
++}
++
++static irqreturn_t at91sam926x_bad_freq(int irq, void *dev_id)
++{
++ static int ticks = 0;
++
++ if (++ticks != HZ * 120) {
++ if (!console_drivers || try_acquire_console_sem())
++ return at91sam926x_timer_interrupt(irq, dev_id);
++
++ release_console_sem();
++ }
++
++ panic("AT91 clock rate incorrectly set.\n"
++ "Please recompile with IPIPE_AT91_MCK set to %lu Hz.",
++ clk_get_rate(clk_get(NULL, "mck")));
++}
++
++notrace unsigned long long __ipipe_mach_get_tsc(void)
++{
++ if (likely(at91_timer_initialized)) {
++ static union {
++#ifdef __BIG_ENDIAN
++ struct {
++ unsigned long high;
++ unsigned short mid;
++ unsigned short low;
++ };
++#else /* __LITTLE_ENDIAN */
++ struct {
++ unsigned short low;
++ unsigned short mid;
++ unsigned long high;
++ };
++#endif /* __LITTLE_ENDIAN */
++ unsigned long long full;
++ } tsc[NR_CPUS], *local_tsc;
++ unsigned long long result;
++ unsigned short stamp;
++ unsigned long flags;
++
++ local_irq_save_hw(flags);
++ local_tsc = &tsc[ipipe_processor_id()];
++ stamp = read_CV();
++ if (unlikely(stamp < local_tsc->low)) {
++ if (unlikely(!++local_tsc->mid))
++ /* 32 bit counter wrapped, increment high word. */
++ local_tsc->high++;
++ }
++ local_tsc->low = stamp;
++ result = local_tsc->full;
++ local_irq_restore_hw(flags);
++
++ return result;
++ }
++
++ return 0;
++}
++EXPORT_SYMBOL(__ipipe_mach_get_tsc);
++
++/*
++ * Reprogram the timer
++ */
++
++void __ipipe_mach_set_dec(unsigned long delay)
++{
++ unsigned long flags;
++
++ if (delay > 2) {
++ local_irq_save_hw(flags);
++ write_RC((read_CV() + delay) & AT91_TC_REG_MASK);
++ local_irq_restore_hw(flags);
++ } else
++ ipipe_trigger_irq(KERNEL_TIMER_IRQ_NUM);
++}
++EXPORT_SYMBOL(__ipipe_mach_set_dec);
++
++void __ipipe_mach_release_timer(void)
++{
++ __ipipe_mach_set_dec(__ipipe_mach_ticks_per_jiffy);
++}
++EXPORT_SYMBOL(__ipipe_mach_release_timer);
++
++unsigned long __ipipe_mach_get_dec(void)
++{
++ return (read_RC() - read_CV()) & AT91_TC_REG_MASK;
++}
++
++static struct irqaction at91sam926x_timer_irq = {
++ .name = "at91_tick",
++ .flags = IRQF_DISABLED | IRQF_TIMER,
++ .handler = &at91sam926x_timer_interrupt
++};
++
++static char clk_name [] = "tc%";
++
++static struct clk tc = {
++ .name = (const char *) clk_name,
++ .users = 0,
++ .type = CLK_TYPE_PERIPHERAL,
++ .pmc_mask = 1 << (KERNEL_TIMER_IRQ_NUM),
++};
++
++void __init at91sam926x_timer_init(void)
++{
++ unsigned long v;
++
++ if (clk_get_rate(clk_get(NULL, "mck")) != CONFIG_IPIPE_AT91_MCK)
++ at91sam926x_timer_irq.handler = &at91sam926x_bad_freq;
++
++ snprintf(clk_name, sizeof(clk_name), "tc%d", CONFIG_IPIPE_AT91_TC);
++ clk_register(&tc);
++ clk_enable(&tc);
++
++ /* No Sync. */
++ at91_tc_write(AT91_TC_BCR, 0);
++
++ /* program NO signal on XCN */
++ v = readl((void __iomem *) (AT91_VA_BASE_TCB0 + AT91_TC_BMR));
++ v &= ~TCNXCNS(CONFIG_IPIPE_AT91_TC, 3);
++ v |= TCNXCNS(CONFIG_IPIPE_AT91_TC, 1); /* AT91_TC_TCNXCNS_NONE */
++ writel(v, (void __iomem *) (AT91_VA_BASE_TCB0 + AT91_TC_BMR));
++
++ /* Disable the channel */
++ at91_tc_write(AT91_TC_CCR, AT91_TC_CLKDIS);
++
++ /* Select TIMER_CLOCK3 (MCLK/32) as input frequency for TC. */
++ at91_tc_write(AT91_TC_CMR, AT91_TC_TIMER_CLOCK3);
++
++ /* Disable all interrupts. */
++ at91_tc_write(AT91_TC_IDR, ~0ul);
++
++ /* Load the TC register C. */
++ last_crtr = 0;
++ write_RC(LATCH);
++
++ /* Enable CPCS interrupt. */
++ at91_tc_write(AT91_TC_IER, AT91_TC_CPCS);
++
++ /* Set up the interrupt. */
++ setup_irq(KERNEL_TIMER_IRQ_NUM, &at91sam926x_timer_irq);
++
++ /* Enable the channel. */
++ at91_tc_write(AT91_TC_CCR, AT91_TC_CLKEN | AT91_TC_SWTRG);
++
++ at91_timer_initialized = 1;
++}
++
++struct sys_timer at91sam926x_timer = {
++ .init = at91sam926x_timer_init,
++ .offset = at91sam926x_gettimeoffset,
++ .suspend = NULL,
++ .resume = NULL,
++};
++#endif /* CONFIG_IPIPE */
+diff -NaurdpbB -X nodiff linux-2.6.19.at91/arch/arm/mach-at91rm9200/gpio.c linux-2.6.19.patched/arch/arm/mach-at91rm9200/gpio.c
+--- linux-2.6.19.at91/arch/arm/mach-at91rm9200/gpio.c 2007-04-10 08:04:00.000000000 +0200
++++ linux-2.6.19.patched/arch/arm/mach-at91rm9200/gpio.c 2007-04-04 11:52:05.000000000 +0200
+@@ -22,6 +22,11 @@
+ #include <asm/arch/at91_pio.h>
+ #include <asm/arch/at91_pmc.h>
#include <asm/arch/gpio.h>
+#ifdef CONFIG_IPIPE
+#include <asm/irq.h>
@@ -1470,7 +1831,7 @@
#include "generic.h"
-@@ -326,6 +331,9 @@ static int gpio_irq_type(unsigned pin, u
+@@ -328,6 +333,9 @@ static int gpio_irq_type(unsigned pin, u
static struct irq_chip gpio_irqchip = {
.name = "GPIO",
@@ -1480,7 +1841,7 @@
.mask = gpio_irq_mask,
.unmask = gpio_irq_unmask,
.set_type = gpio_irq_type,
-@@ -374,6 +382,50 @@ static void gpio_irq_handler(unsigned ir
+@@ -376,6 +384,50 @@ static void gpio_irq_handler(unsigned ir
/* now it may re-trigger */
}
@@ -1531,7 +1892,7 @@
/*--------------------------------------------------------------------------*/
/*
-@@ -422,4 +474,7 @@ void __init at91_gpio_init(struct at91_g
+@@ -424,4 +476,7 @@ void __init at91_gpio_init(struct at91_g
gpio = data;
gpio_banks = nr_banks;
@@ -2905,41 +3266,72 @@
struct ht_irq_cfg {
struct pci_dev *dev;
-diff -Naurdp -x .gitignore -x '*~' -x '*.orig' -x '*.rej' linux-2.6.19/include/asm-arm/arch-at91rm9200/hardware.h ipipe-2.6.19-arm/include/asm-arm/arch-at91rm9200/hardware.h
---- linux-2.6.19/include/asm-arm/arch-at91rm9200/hardware.h 2007-03-20 20:32:37.000000000 +0100
-+++ ipipe-2.6.19-arm/include/asm-arm/arch-at91rm9200/hardware.h 2007-03-02 18:41:52.000000000 +0100
-@@ -39,6 +39,9 @@
- #define AT91_VA_BASE_TWI AT91_IO_P2V(AT91RM9200_BASE_TWI)
- #define AT91_VA_BASE_MCI AT91_IO_P2V(AT91RM9200_BASE_MCI)
- #define AT91_VA_BASE_UDP AT91_IO_P2V(AT91RM9200_BASE_UDP)
+diff -NaurdpbB -X nodiff linux-2.6.19.at91/include/asm-arm/arch-at91rm9200/hardware.h linux-2.6.19.patched/include/asm-arm/arch-at91rm9200/hardware.h
+--- linux-2.6.19.at91/include/asm-arm/arch-at91rm9200/hardware.h 2007-04-10 08:04:00.000000000 +0200
++++ linux-2.6.19.patched/include/asm-arm/arch-at91rm9200/hardware.h 2007-04-04 11:52:06.000000000 +0200
+@@ -42,7 +42,28 @@
+ * Virtual to Physical Address mapping for IO devices.
+ */
+ #define AT91_VA_BASE_SYS AT91_IO_P2V(AT91_BASE_SYS)
+-#define AT91_VA_BASE_EMAC AT91_IO_P2V(AT91RM9200_BASE_EMAC)
++
++#if defined(CONFIG_ARCH_AT91RM9200)
++ #define AT91_VA_BASE_EMAC AT91_IO_P2V(AT91RM9200_BASE_EMAC)
++#elif defined(CONFIG_ARCH_AT91SAM9260)
++ #define AT91_VA_BASE_EMAC AT91_IO_P2V(AT91SAM9260_BASE_EMAC)
++#elif defined(CONFIG_ARCH_AT91SAM9261)
++ #define AT91_VA_BASE_EMAC AT91_IO_P2V(AT91SAM9261_BASE_EMAC)
++#else
++#error "Unsupported AT91 processor"
++#endif
++
+#ifdef CONFIG_IPIPE
++#if defined(CONFIG_ARCH_AT91RM9200)
+#define AT91_VA_BASE_TCB0 AT91_IO_P2V(AT91RM9200_BASE_TCB0)
++#elif defined(CONFIG_ARCH_AT91SAM9260)
++ #define AT91_VA_BASE_TCB0 AT91_IO_P2V(AT91SAM9260_BASE_TCB0)
++#elif defined(CONFIG_ARCH_AT91SAM9261)
++ #define AT91_VA_BASE_TCB0 AT91_IO_P2V(AT91SAM9261_BASE_TCB0)
++#else
++#error "Unsupported AT91 processor"
++#endif
+#endif /* CONFIG_IPIPE */
/* Internal SRAM is mapped below the IO devices */
- #define AT91_SRAM_VIRT_BASE (AT91_IO_VIRT_BASE - AT91RM9200_SRAM_SIZE)
-diff -Naurdp -x .gitignore -x '*~' -x '*.orig' -x '*.rej' linux-2.6.19/include/asm-arm/arch-at91rm9200/irqs.h ipipe-2.6.19-arm/include/asm-arm/arch-at91rm9200/irqs.h
---- linux-2.6.19/include/asm-arm/arch-at91rm9200/irqs.h 2007-03-20 20:32:37.000000000 +0100
-+++ ipipe-2.6.19-arm/include/asm-arm/arch-at91rm9200/irqs.h 2007-03-02 18:41:52.000000000 +0100
-@@ -39,4 +39,12 @@
+ #define AT91_SRAM_MAX SZ_1M
+diff -NaurdpbB -X nodiff linux-2.6.19.at91/include/asm-arm/arch-at91rm9200/irqs.h linux-2.6.19.patched/include/asm-arm/arch-at91rm9200/irqs.h
+--- linux-2.6.19.at91/include/asm-arm/arch-at91rm9200/irqs.h 2007-04-10 08:04:00.000000000 +0200
++++ linux-2.6.19.patched/include/asm-arm/arch-at91rm9200/irqs.h 2007-04-04 11:52:06.000000000 +0200
+@@ -41,4 +41,23 @@
*/
#define NR_IRQS (NR_AIC_IRQS + (4 * 32))
+#if defined(CONFIG_IPIPE) && !defined(__ASSEMBLY__)
+extern unsigned __ipipe_at91_gpio_banks;
+
++#if defined(CONFIG_ARCH_AT91RM9200)
+#define __ipipe_mach_irq_mux_p(irq) \
+ ((unsigned) (irq - AT91RM9200_ID_PIOA) < __ipipe_at91_gpio_banks)
++#elif defined(CONFIG_ARCH_AT91SAM9260)
++ #define __ipipe_mach_irq_mux_p(irq) \
++ ((unsigned) (irq - AT91SAM9260_ID_PIOA) < __ipipe_at91_gpio_banks)
++#elif defined(CONFIG_ARCH_AT91SAM9261)
++ #define __ipipe_mach_irq_mux_p(irq) \
++ ((unsigned) (irq - AT91SAM9261_ID_PIOA) < __ipipe_at91_gpio_banks)
++#else
++#error "Unsupported AT91 processor"
++#endif
++
+
+#endif /* CONFIG_IPIPE && !__ASSEMBLY__ */
+
#endif
-diff -Naurdp -x .gitignore -x '*~' -x '*.orig' -x '*.rej' linux-2.6.19/include/asm-arm/arch-at91rm9200/timex.h ipipe-2.6.19-arm/include/asm-arm/arch-at91rm9200/timex.h
---- linux-2.6.19/include/asm-arm/arch-at91rm9200/timex.h 2007-01-04 22:02:39.000000000 +0100
-+++ ipipe-2.6.19-arm/include/asm-arm/arch-at91rm9200/timex.h 2007-03-02 18:41:52.000000000 +0100
-@@ -23,6 +23,10 @@
+diff -NaurdpbB -X nodiff linux-2.6.19.at91/include/asm-arm/arch-at91rm9200/timex.h linux-2.6.19.patched/include/asm-arm/arch-at91rm9200/timex.h
+--- linux-2.6.19.at91/include/asm-arm/arch-at91rm9200/timex.h 2007-04-10 08:04:00.000000000 +0200
++++ linux-2.6.19.patched/include/asm-arm/arch-at91rm9200/timex.h 2007-04-04 11:52:06.000000000 +0200
+@@ -25,7 +25,11 @@
- #include <asm/hardware.h>
+ #if defined(CONFIG_ARCH_AT91RM9200)
+#ifndef CONFIG_IPIPE
#define CLOCK_TICK_RATE (AT91_SLOW_CLOCK)
@@ -2947,10 +3339,11 @@
+#define CLOCK_TICK_RATE (CONFIG_IPIPE_AT91_MCK / 32)
+#endif /* !CONFIG_IPIPE */
- #endif
-diff -Naurdp -x .gitignore -x '*~' -x '*.orig' -x '*.rej' linux-2.6.19/include/asm-arm/arch-integrator/entry-macro.S ipipe-2.6.19-arm/include/asm-arm/arch-integrator/entry-macro.S
---- linux-2.6.19/include/asm-arm/arch-integrator/entry-macro.S 2006-05-07 16:42:04.000000000 +0200
-+++ ipipe-2.6.19-arm/include/asm-arm/arch-integrator/entry-macro.S 2007-03-02 18:41:52.000000000 +0100
+ #elif defined(CONFIG_ARCH_AT91SAM9260) || defined(CONFIG_ARCH_AT91SAM9261)
+
+diff -NaurdpbB -X nodiff linux-2.6.19.at91/include/asm-arm/arch-integrator/entry-macro.S linux-2.6.19.patched/include/asm-arm/arch-integrator/entry-macro.S
+--- linux-2.6.19.at91/include/asm-arm/arch-integrator/entry-macro.S 2006-11-29 22:57:37.000000000 +0100
++++ linux-2.6.19.patched/include/asm-arm/arch-integrator/entry-macro.S 2007-04-04 11:52:06.000000000 +0200
@@ -22,7 +22,11 @@
teq \irqstat, #0
ldreq \irqstat, [\base, #(INTEGRATOR_HDR_IC_OFFSET+IRQ_STATUS)]
_______________________________________________
Adeos-main mailing list
[email protected]
https://mail.gna.org/listinfo/adeos-main
