2009-01-09 08:46:40 +08:00
|
|
|
/*
|
|
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
|
|
* License. See the file "COPYING" in the main directory of this archive
|
|
|
|
* for more details.
|
|
|
|
*
|
2012-07-06 00:12:39 +08:00
|
|
|
* Copyright (C) 2004-2012 Cavium, Inc.
|
2009-01-09 08:46:40 +08:00
|
|
|
*/
|
2011-03-26 03:38:51 +08:00
|
|
|
|
2009-01-09 08:46:40 +08:00
|
|
|
#include <linux/interrupt.h>
|
2012-07-06 00:12:39 +08:00
|
|
|
#include <linux/irqdomain.h>
|
2011-03-26 03:38:51 +08:00
|
|
|
#include <linux/bitops.h>
|
|
|
|
#include <linux/percpu.h>
|
2012-07-06 00:12:39 +08:00
|
|
|
#include <linux/slab.h>
|
2011-03-26 03:38:51 +08:00
|
|
|
#include <linux/irq.h>
|
2009-06-19 21:05:26 +08:00
|
|
|
#include <linux/smp.h>
|
2012-07-06 00:12:39 +08:00
|
|
|
#include <linux/of.h>
|
2009-01-09 08:46:40 +08:00
|
|
|
|
|
|
|
#include <asm/octeon/octeon.h>
|
2012-04-05 06:34:41 +08:00
|
|
|
#include <asm/octeon/cvmx-ciu2-defs.h>
|
2009-01-09 08:46:40 +08:00
|
|
|
|
2011-03-26 03:38:51 +08:00
|
|
|
static DEFINE_PER_CPU(unsigned long, octeon_irq_ciu0_en_mirror);
|
|
|
|
static DEFINE_PER_CPU(unsigned long, octeon_irq_ciu1_en_mirror);
|
2012-04-06 01:24:25 +08:00
|
|
|
static DEFINE_PER_CPU(raw_spinlock_t, octeon_irq_ciu_spinlock);
|
2011-03-26 03:38:51 +08:00
|
|
|
|
|
|
|
static __read_mostly u8 octeon_irq_ciu_to_irq[8][64];
|
|
|
|
|
|
|
|
union octeon_ciu_chip_data {
|
|
|
|
void *p;
|
|
|
|
unsigned long l;
|
|
|
|
struct {
|
2012-04-05 06:34:41 +08:00
|
|
|
unsigned long line:6;
|
|
|
|
unsigned long bit:6;
|
|
|
|
unsigned long gpio_line:6;
|
2011-03-26 03:38:51 +08:00
|
|
|
} s;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct octeon_core_chip_data {
|
|
|
|
struct mutex core_irq_mutex;
|
|
|
|
bool current_en;
|
|
|
|
bool desired_en;
|
|
|
|
u8 bit;
|
|
|
|
};
|
|
|
|
|
|
|
|
#define MIPS_CORE_IRQ_LINES 8
|
|
|
|
|
|
|
|
static struct octeon_core_chip_data octeon_irq_core_chip_data[MIPS_CORE_IRQ_LINES];
|
|
|
|
|
2012-04-05 06:34:41 +08:00
|
|
|
static void octeon_irq_set_ciu_mapping(int irq, int line, int bit, int gpio_line,
|
2012-07-06 00:12:39 +08:00
|
|
|
struct irq_chip *chip,
|
|
|
|
irq_flow_handler_t handler)
|
2011-03-26 03:38:51 +08:00
|
|
|
{
|
|
|
|
union octeon_ciu_chip_data cd;
|
|
|
|
|
|
|
|
irq_set_chip_and_handler(irq, chip, handler);
|
|
|
|
|
|
|
|
cd.l = 0;
|
|
|
|
cd.s.line = line;
|
|
|
|
cd.s.bit = bit;
|
2012-04-05 06:34:41 +08:00
|
|
|
cd.s.gpio_line = gpio_line;
|
2011-03-26 03:38:51 +08:00
|
|
|
|
|
|
|
irq_set_chip_data(irq, cd.p);
|
|
|
|
octeon_irq_ciu_to_irq[line][bit] = irq;
|
|
|
|
}
|
|
|
|
|
2012-08-11 07:00:31 +08:00
|
|
|
static void octeon_irq_force_ciu_mapping(struct irq_domain *domain,
|
|
|
|
int irq, int line, int bit)
|
|
|
|
{
|
|
|
|
irq_domain_associate(domain, irq, line << 6 | bit);
|
|
|
|
}
|
|
|
|
|
2009-10-14 02:26:03 +08:00
|
|
|
static int octeon_coreid_for_cpu(int cpu)
|
|
|
|
{
|
|
|
|
#ifdef CONFIG_SMP
|
|
|
|
return cpu_logical_map(cpu);
|
|
|
|
#else
|
|
|
|
return cvmx_get_core_num();
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2011-03-26 03:38:51 +08:00
|
|
|
static int octeon_cpu_for_coreid(int coreid)
|
|
|
|
{
|
|
|
|
#ifdef CONFIG_SMP
|
|
|
|
return cpu_number_map(coreid);
|
|
|
|
#else
|
|
|
|
return smp_processor_id();
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
static void octeon_irq_core_ack(struct irq_data *data)
|
2009-01-09 08:46:40 +08:00
|
|
|
{
|
2011-03-26 03:38:51 +08:00
|
|
|
struct octeon_core_chip_data *cd = irq_data_get_irq_chip_data(data);
|
|
|
|
unsigned int bit = cd->bit;
|
|
|
|
|
2009-01-09 08:46:40 +08:00
|
|
|
/*
|
|
|
|
* We don't need to disable IRQs to make these atomic since
|
|
|
|
* they are already disabled earlier in the low level
|
|
|
|
* interrupt code.
|
|
|
|
*/
|
|
|
|
clear_c0_status(0x100 << bit);
|
|
|
|
/* The two user interrupts must be cleared manually. */
|
|
|
|
if (bit < 2)
|
|
|
|
clear_c0_cause(0x100 << bit);
|
|
|
|
}
|
|
|
|
|
2011-03-26 03:38:51 +08:00
|
|
|
static void octeon_irq_core_eoi(struct irq_data *data)
|
2009-01-09 08:46:40 +08:00
|
|
|
{
|
2011-03-26 03:38:51 +08:00
|
|
|
struct octeon_core_chip_data *cd = irq_data_get_irq_chip_data(data);
|
|
|
|
|
2009-01-09 08:46:40 +08:00
|
|
|
/*
|
|
|
|
* We don't need to disable IRQs to make these atomic since
|
|
|
|
* they are already disabled earlier in the low level
|
|
|
|
* interrupt code.
|
|
|
|
*/
|
2011-03-26 03:38:51 +08:00
|
|
|
set_c0_status(0x100 << cd->bit);
|
2009-01-09 08:46:40 +08:00
|
|
|
}
|
|
|
|
|
2011-03-26 03:38:51 +08:00
|
|
|
static void octeon_irq_core_set_enable_local(void *arg)
|
2009-01-09 08:46:40 +08:00
|
|
|
{
|
2011-03-26 03:38:51 +08:00
|
|
|
struct irq_data *data = arg;
|
|
|
|
struct octeon_core_chip_data *cd = irq_data_get_irq_chip_data(data);
|
|
|
|
unsigned int mask = 0x100 << cd->bit;
|
2009-01-09 08:46:40 +08:00
|
|
|
|
|
|
|
/*
|
2011-03-26 03:38:51 +08:00
|
|
|
* Interrupts are already disabled, so these are atomic.
|
2009-01-09 08:46:40 +08:00
|
|
|
*/
|
2011-03-26 03:38:51 +08:00
|
|
|
if (cd->desired_en)
|
|
|
|
set_c0_status(mask);
|
|
|
|
else
|
|
|
|
clear_c0_status(mask);
|
|
|
|
|
2009-01-09 08:46:40 +08:00
|
|
|
}
|
|
|
|
|
2011-03-26 03:38:51 +08:00
|
|
|
static void octeon_irq_core_disable(struct irq_data *data)
|
2009-01-09 08:46:40 +08:00
|
|
|
{
|
2011-03-26 03:38:51 +08:00
|
|
|
struct octeon_core_chip_data *cd = irq_data_get_irq_chip_data(data);
|
|
|
|
cd->desired_en = false;
|
2009-01-09 08:46:40 +08:00
|
|
|
}
|
|
|
|
|
2011-03-26 03:38:51 +08:00
|
|
|
static void octeon_irq_core_enable(struct irq_data *data)
|
2009-01-09 08:46:40 +08:00
|
|
|
{
|
2011-03-26 03:38:51 +08:00
|
|
|
struct octeon_core_chip_data *cd = irq_data_get_irq_chip_data(data);
|
|
|
|
cd->desired_en = true;
|
2009-01-09 08:46:40 +08:00
|
|
|
}
|
|
|
|
|
2011-03-26 03:38:51 +08:00
|
|
|
static void octeon_irq_core_bus_lock(struct irq_data *data)
|
|
|
|
{
|
|
|
|
struct octeon_core_chip_data *cd = irq_data_get_irq_chip_data(data);
|
2009-01-09 08:46:40 +08:00
|
|
|
|
2011-03-26 03:38:51 +08:00
|
|
|
mutex_lock(&cd->core_irq_mutex);
|
|
|
|
}
|
2009-01-09 08:46:40 +08:00
|
|
|
|
2011-03-26 03:38:51 +08:00
|
|
|
static void octeon_irq_core_bus_sync_unlock(struct irq_data *data)
|
2009-01-09 08:46:40 +08:00
|
|
|
{
|
2011-03-26 03:38:51 +08:00
|
|
|
struct octeon_core_chip_data *cd = irq_data_get_irq_chip_data(data);
|
|
|
|
|
|
|
|
if (cd->desired_en != cd->current_en) {
|
|
|
|
on_each_cpu(octeon_irq_core_set_enable_local, data, 1);
|
|
|
|
|
|
|
|
cd->current_en = cd->desired_en;
|
2010-07-24 01:43:46 +08:00
|
|
|
}
|
|
|
|
|
2011-03-26 03:38:51 +08:00
|
|
|
mutex_unlock(&cd->core_irq_mutex);
|
2009-01-09 08:46:40 +08:00
|
|
|
}
|
|
|
|
|
2011-03-26 03:38:51 +08:00
|
|
|
static struct irq_chip octeon_irq_chip_core = {
|
|
|
|
.name = "Core",
|
|
|
|
.irq_enable = octeon_irq_core_enable,
|
|
|
|
.irq_disable = octeon_irq_core_disable,
|
|
|
|
.irq_ack = octeon_irq_core_ack,
|
|
|
|
.irq_eoi = octeon_irq_core_eoi,
|
|
|
|
.irq_bus_lock = octeon_irq_core_bus_lock,
|
|
|
|
.irq_bus_sync_unlock = octeon_irq_core_bus_sync_unlock,
|
|
|
|
|
2011-03-27 22:04:30 +08:00
|
|
|
.irq_cpu_online = octeon_irq_core_eoi,
|
|
|
|
.irq_cpu_offline = octeon_irq_core_ack,
|
|
|
|
.flags = IRQCHIP_ONOFFLINE_ENABLED,
|
2011-03-26 03:38:51 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
static void __init octeon_irq_init_core(void)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
int irq;
|
|
|
|
struct octeon_core_chip_data *cd;
|
|
|
|
|
|
|
|
for (i = 0; i < MIPS_CORE_IRQ_LINES; i++) {
|
|
|
|
cd = &octeon_irq_core_chip_data[i];
|
|
|
|
cd->current_en = false;
|
|
|
|
cd->desired_en = false;
|
|
|
|
cd->bit = i;
|
|
|
|
mutex_init(&cd->core_irq_mutex);
|
|
|
|
|
|
|
|
irq = OCTEON_IRQ_SW0 + i;
|
2012-08-11 07:00:31 +08:00
|
|
|
irq_set_chip_data(irq, cd);
|
|
|
|
irq_set_chip_and_handler(irq, &octeon_irq_chip_core,
|
|
|
|
handle_percpu_irq);
|
2011-03-26 03:38:51 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int next_cpu_for_irq(struct irq_data *data)
|
2010-07-24 01:43:46 +08:00
|
|
|
{
|
|
|
|
|
|
|
|
#ifdef CONFIG_SMP
|
2011-03-26 03:38:51 +08:00
|
|
|
int cpu;
|
|
|
|
int weight = cpumask_weight(data->affinity);
|
2010-07-24 01:43:46 +08:00
|
|
|
|
|
|
|
if (weight > 1) {
|
2011-03-26 03:38:51 +08:00
|
|
|
cpu = smp_processor_id();
|
2010-07-24 01:43:46 +08:00
|
|
|
for (;;) {
|
2011-03-26 03:38:51 +08:00
|
|
|
cpu = cpumask_next(cpu, data->affinity);
|
2010-07-24 01:43:46 +08:00
|
|
|
if (cpu >= nr_cpu_ids) {
|
|
|
|
cpu = -1;
|
|
|
|
continue;
|
|
|
|
} else if (cpumask_test_cpu(cpu, cpu_online_mask)) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else if (weight == 1) {
|
2011-03-26 03:38:51 +08:00
|
|
|
cpu = cpumask_first(data->affinity);
|
2010-07-24 01:43:46 +08:00
|
|
|
} else {
|
2011-03-26 03:38:51 +08:00
|
|
|
cpu = smp_processor_id();
|
2010-07-24 01:43:46 +08:00
|
|
|
}
|
2011-03-26 03:38:51 +08:00
|
|
|
return cpu;
|
2010-07-24 01:43:46 +08:00
|
|
|
#else
|
2011-03-26 03:38:51 +08:00
|
|
|
return smp_processor_id();
|
2010-07-24 01:43:46 +08:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2011-03-26 03:38:51 +08:00
|
|
|
static void octeon_irq_ciu_enable(struct irq_data *data)
|
2010-07-24 01:43:46 +08:00
|
|
|
{
|
2011-03-26 03:38:51 +08:00
|
|
|
int cpu = next_cpu_for_irq(data);
|
|
|
|
int coreid = octeon_coreid_for_cpu(cpu);
|
|
|
|
unsigned long *pen;
|
2010-07-24 01:43:46 +08:00
|
|
|
unsigned long flags;
|
2011-03-26 03:38:51 +08:00
|
|
|
union octeon_ciu_chip_data cd;
|
2012-04-06 01:24:25 +08:00
|
|
|
raw_spinlock_t *lock = &per_cpu(octeon_irq_ciu_spinlock, cpu);
|
2011-03-26 03:38:51 +08:00
|
|
|
|
|
|
|
cd.p = irq_data_get_irq_chip_data(data);
|
2010-07-24 01:43:46 +08:00
|
|
|
|
2012-04-06 01:24:25 +08:00
|
|
|
raw_spin_lock_irqsave(lock, flags);
|
2011-03-26 03:38:51 +08:00
|
|
|
if (cd.s.line == 0) {
|
|
|
|
pen = &per_cpu(octeon_irq_ciu0_en_mirror, cpu);
|
2012-04-06 01:24:25 +08:00
|
|
|
__set_bit(cd.s.bit, pen);
|
|
|
|
/*
|
|
|
|
* Must be visible to octeon_irq_ip{2,3}_ciu() before
|
|
|
|
* enabling the irq.
|
|
|
|
*/
|
|
|
|
wmb();
|
2011-03-26 03:38:51 +08:00
|
|
|
cvmx_write_csr(CVMX_CIU_INTX_EN0(coreid * 2), *pen);
|
|
|
|
} else {
|
|
|
|
pen = &per_cpu(octeon_irq_ciu1_en_mirror, cpu);
|
2012-04-06 01:24:25 +08:00
|
|
|
__set_bit(cd.s.bit, pen);
|
|
|
|
/*
|
|
|
|
* Must be visible to octeon_irq_ip{2,3}_ciu() before
|
|
|
|
* enabling the irq.
|
|
|
|
*/
|
|
|
|
wmb();
|
2011-03-26 03:38:51 +08:00
|
|
|
cvmx_write_csr(CVMX_CIU_INTX_EN1(coreid * 2 + 1), *pen);
|
|
|
|
}
|
2012-04-06 01:24:25 +08:00
|
|
|
raw_spin_unlock_irqrestore(lock, flags);
|
2010-07-24 01:43:46 +08:00
|
|
|
}
|
|
|
|
|
2011-03-26 03:38:51 +08:00
|
|
|
static void octeon_irq_ciu_enable_local(struct irq_data *data)
|
|
|
|
{
|
|
|
|
unsigned long *pen;
|
|
|
|
unsigned long flags;
|
|
|
|
union octeon_ciu_chip_data cd;
|
mips: Replace __get_cpu_var uses
__get_cpu_var() is used for multiple purposes in the kernel source. One of
them is address calculation via the form &__get_cpu_var(x). This calculates
the address for the instance of the percpu variable of the current processor
based on an offset.
Other use cases are for storing and retrieving data from the current
processors percpu area. __get_cpu_var() can be used as an lvalue when
writing data or on the right side of an assignment.
__get_cpu_var() is defined as :
#define __get_cpu_var(var) (*this_cpu_ptr(&(var)))
__get_cpu_var() always only does an address determination. However, store
and retrieve operations could use a segment prefix (or global register on
other platforms) to avoid the address calculation.
this_cpu_write() and this_cpu_read() can directly take an offset into a
percpu area and use optimized assembly code to read and write per cpu
variables.
This patch converts __get_cpu_var into either an explicit address
calculation using this_cpu_ptr() or into a use of this_cpu operations that
use the offset. Thereby address calculations are avoided and less registers
are used when code is generated.
At the end of the patch set all uses of __get_cpu_var have been removed so
the macro is removed too.
The patch set includes passes over all arches as well. Once these operations
are used throughout then specialized macros can be defined in non -x86
arches as well in order to optimize per cpu access by f.e. using a global
register that may be set to the per cpu base.
Transformations done to __get_cpu_var()
1. Determine the address of the percpu instance of the current processor.
DEFINE_PER_CPU(int, y);
int *x = &__get_cpu_var(y);
Converts to
int *x = this_cpu_ptr(&y);
2. Same as #1 but this time an array structure is involved.
DEFINE_PER_CPU(int, y[20]);
int *x = __get_cpu_var(y);
Converts to
int *x = this_cpu_ptr(y);
3. Retrieve the content of the current processors instance of a per cpu
variable.
DEFINE_PER_CPU(int, y);
int x = __get_cpu_var(y)
Converts to
int x = __this_cpu_read(y);
4. Retrieve the content of a percpu struct
DEFINE_PER_CPU(struct mystruct, y);
struct mystruct x = __get_cpu_var(y);
Converts to
memcpy(&x, this_cpu_ptr(&y), sizeof(x));
5. Assignment to a per cpu variable
DEFINE_PER_CPU(int, y)
__get_cpu_var(y) = x;
Converts to
__this_cpu_write(y, x);
6. Increment/Decrement etc of a per cpu variable
DEFINE_PER_CPU(int, y);
__get_cpu_var(y)++
Converts to
__this_cpu_inc(y)
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
2014-08-18 01:30:44 +08:00
|
|
|
raw_spinlock_t *lock = this_cpu_ptr(&octeon_irq_ciu_spinlock);
|
2011-03-26 03:38:51 +08:00
|
|
|
|
|
|
|
cd.p = irq_data_get_irq_chip_data(data);
|
|
|
|
|
2012-04-06 01:24:25 +08:00
|
|
|
raw_spin_lock_irqsave(lock, flags);
|
2011-03-26 03:38:51 +08:00
|
|
|
if (cd.s.line == 0) {
|
mips: Replace __get_cpu_var uses
__get_cpu_var() is used for multiple purposes in the kernel source. One of
them is address calculation via the form &__get_cpu_var(x). This calculates
the address for the instance of the percpu variable of the current processor
based on an offset.
Other use cases are for storing and retrieving data from the current
processors percpu area. __get_cpu_var() can be used as an lvalue when
writing data or on the right side of an assignment.
__get_cpu_var() is defined as :
#define __get_cpu_var(var) (*this_cpu_ptr(&(var)))
__get_cpu_var() always only does an address determination. However, store
and retrieve operations could use a segment prefix (or global register on
other platforms) to avoid the address calculation.
this_cpu_write() and this_cpu_read() can directly take an offset into a
percpu area and use optimized assembly code to read and write per cpu
variables.
This patch converts __get_cpu_var into either an explicit address
calculation using this_cpu_ptr() or into a use of this_cpu operations that
use the offset. Thereby address calculations are avoided and less registers
are used when code is generated.
At the end of the patch set all uses of __get_cpu_var have been removed so
the macro is removed too.
The patch set includes passes over all arches as well. Once these operations
are used throughout then specialized macros can be defined in non -x86
arches as well in order to optimize per cpu access by f.e. using a global
register that may be set to the per cpu base.
Transformations done to __get_cpu_var()
1. Determine the address of the percpu instance of the current processor.
DEFINE_PER_CPU(int, y);
int *x = &__get_cpu_var(y);
Converts to
int *x = this_cpu_ptr(&y);
2. Same as #1 but this time an array structure is involved.
DEFINE_PER_CPU(int, y[20]);
int *x = __get_cpu_var(y);
Converts to
int *x = this_cpu_ptr(y);
3. Retrieve the content of the current processors instance of a per cpu
variable.
DEFINE_PER_CPU(int, y);
int x = __get_cpu_var(y)
Converts to
int x = __this_cpu_read(y);
4. Retrieve the content of a percpu struct
DEFINE_PER_CPU(struct mystruct, y);
struct mystruct x = __get_cpu_var(y);
Converts to
memcpy(&x, this_cpu_ptr(&y), sizeof(x));
5. Assignment to a per cpu variable
DEFINE_PER_CPU(int, y)
__get_cpu_var(y) = x;
Converts to
__this_cpu_write(y, x);
6. Increment/Decrement etc of a per cpu variable
DEFINE_PER_CPU(int, y);
__get_cpu_var(y)++
Converts to
__this_cpu_inc(y)
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
2014-08-18 01:30:44 +08:00
|
|
|
pen = this_cpu_ptr(&octeon_irq_ciu0_en_mirror);
|
2012-04-06 01:24:25 +08:00
|
|
|
__set_bit(cd.s.bit, pen);
|
|
|
|
/*
|
|
|
|
* Must be visible to octeon_irq_ip{2,3}_ciu() before
|
|
|
|
* enabling the irq.
|
|
|
|
*/
|
|
|
|
wmb();
|
2011-03-26 03:38:51 +08:00
|
|
|
cvmx_write_csr(CVMX_CIU_INTX_EN0(cvmx_get_core_num() * 2), *pen);
|
|
|
|
} else {
|
mips: Replace __get_cpu_var uses
__get_cpu_var() is used for multiple purposes in the kernel source. One of
them is address calculation via the form &__get_cpu_var(x). This calculates
the address for the instance of the percpu variable of the current processor
based on an offset.
Other use cases are for storing and retrieving data from the current
processors percpu area. __get_cpu_var() can be used as an lvalue when
writing data or on the right side of an assignment.
__get_cpu_var() is defined as :
#define __get_cpu_var(var) (*this_cpu_ptr(&(var)))
__get_cpu_var() always only does an address determination. However, store
and retrieve operations could use a segment prefix (or global register on
other platforms) to avoid the address calculation.
this_cpu_write() and this_cpu_read() can directly take an offset into a
percpu area and use optimized assembly code to read and write per cpu
variables.
This patch converts __get_cpu_var into either an explicit address
calculation using this_cpu_ptr() or into a use of this_cpu operations that
use the offset. Thereby address calculations are avoided and less registers
are used when code is generated.
At the end of the patch set all uses of __get_cpu_var have been removed so
the macro is removed too.
The patch set includes passes over all arches as well. Once these operations
are used throughout then specialized macros can be defined in non -x86
arches as well in order to optimize per cpu access by f.e. using a global
register that may be set to the per cpu base.
Transformations done to __get_cpu_var()
1. Determine the address of the percpu instance of the current processor.
DEFINE_PER_CPU(int, y);
int *x = &__get_cpu_var(y);
Converts to
int *x = this_cpu_ptr(&y);
2. Same as #1 but this time an array structure is involved.
DEFINE_PER_CPU(int, y[20]);
int *x = __get_cpu_var(y);
Converts to
int *x = this_cpu_ptr(y);
3. Retrieve the content of the current processors instance of a per cpu
variable.
DEFINE_PER_CPU(int, y);
int x = __get_cpu_var(y)
Converts to
int x = __this_cpu_read(y);
4. Retrieve the content of a percpu struct
DEFINE_PER_CPU(struct mystruct, y);
struct mystruct x = __get_cpu_var(y);
Converts to
memcpy(&x, this_cpu_ptr(&y), sizeof(x));
5. Assignment to a per cpu variable
DEFINE_PER_CPU(int, y)
__get_cpu_var(y) = x;
Converts to
__this_cpu_write(y, x);
6. Increment/Decrement etc of a per cpu variable
DEFINE_PER_CPU(int, y);
__get_cpu_var(y)++
Converts to
__this_cpu_inc(y)
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
2014-08-18 01:30:44 +08:00
|
|
|
pen = this_cpu_ptr(&octeon_irq_ciu1_en_mirror);
|
2012-04-06 01:24:25 +08:00
|
|
|
__set_bit(cd.s.bit, pen);
|
|
|
|
/*
|
|
|
|
* Must be visible to octeon_irq_ip{2,3}_ciu() before
|
|
|
|
* enabling the irq.
|
|
|
|
*/
|
|
|
|
wmb();
|
2011-03-26 03:38:51 +08:00
|
|
|
cvmx_write_csr(CVMX_CIU_INTX_EN1(cvmx_get_core_num() * 2 + 1), *pen);
|
|
|
|
}
|
2012-04-06 01:24:25 +08:00
|
|
|
raw_spin_unlock_irqrestore(lock, flags);
|
2011-03-26 03:38:51 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void octeon_irq_ciu_disable_local(struct irq_data *data)
|
|
|
|
{
|
|
|
|
unsigned long *pen;
|
|
|
|
unsigned long flags;
|
|
|
|
union octeon_ciu_chip_data cd;
|
mips: Replace __get_cpu_var uses
__get_cpu_var() is used for multiple purposes in the kernel source. One of
them is address calculation via the form &__get_cpu_var(x). This calculates
the address for the instance of the percpu variable of the current processor
based on an offset.
Other use cases are for storing and retrieving data from the current
processors percpu area. __get_cpu_var() can be used as an lvalue when
writing data or on the right side of an assignment.
__get_cpu_var() is defined as :
#define __get_cpu_var(var) (*this_cpu_ptr(&(var)))
__get_cpu_var() always only does an address determination. However, store
and retrieve operations could use a segment prefix (or global register on
other platforms) to avoid the address calculation.
this_cpu_write() and this_cpu_read() can directly take an offset into a
percpu area and use optimized assembly code to read and write per cpu
variables.
This patch converts __get_cpu_var into either an explicit address
calculation using this_cpu_ptr() or into a use of this_cpu operations that
use the offset. Thereby address calculations are avoided and less registers
are used when code is generated.
At the end of the patch set all uses of __get_cpu_var have been removed so
the macro is removed too.
The patch set includes passes over all arches as well. Once these operations
are used throughout then specialized macros can be defined in non -x86
arches as well in order to optimize per cpu access by f.e. using a global
register that may be set to the per cpu base.
Transformations done to __get_cpu_var()
1. Determine the address of the percpu instance of the current processor.
DEFINE_PER_CPU(int, y);
int *x = &__get_cpu_var(y);
Converts to
int *x = this_cpu_ptr(&y);
2. Same as #1 but this time an array structure is involved.
DEFINE_PER_CPU(int, y[20]);
int *x = __get_cpu_var(y);
Converts to
int *x = this_cpu_ptr(y);
3. Retrieve the content of the current processors instance of a per cpu
variable.
DEFINE_PER_CPU(int, y);
int x = __get_cpu_var(y)
Converts to
int x = __this_cpu_read(y);
4. Retrieve the content of a percpu struct
DEFINE_PER_CPU(struct mystruct, y);
struct mystruct x = __get_cpu_var(y);
Converts to
memcpy(&x, this_cpu_ptr(&y), sizeof(x));
5. Assignment to a per cpu variable
DEFINE_PER_CPU(int, y)
__get_cpu_var(y) = x;
Converts to
__this_cpu_write(y, x);
6. Increment/Decrement etc of a per cpu variable
DEFINE_PER_CPU(int, y);
__get_cpu_var(y)++
Converts to
__this_cpu_inc(y)
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
2014-08-18 01:30:44 +08:00
|
|
|
raw_spinlock_t *lock = this_cpu_ptr(&octeon_irq_ciu_spinlock);
|
2011-03-26 03:38:51 +08:00
|
|
|
|
|
|
|
cd.p = irq_data_get_irq_chip_data(data);
|
|
|
|
|
2012-04-06 01:24:25 +08:00
|
|
|
raw_spin_lock_irqsave(lock, flags);
|
2011-03-26 03:38:51 +08:00
|
|
|
if (cd.s.line == 0) {
|
mips: Replace __get_cpu_var uses
__get_cpu_var() is used for multiple purposes in the kernel source. One of
them is address calculation via the form &__get_cpu_var(x). This calculates
the address for the instance of the percpu variable of the current processor
based on an offset.
Other use cases are for storing and retrieving data from the current
processors percpu area. __get_cpu_var() can be used as an lvalue when
writing data or on the right side of an assignment.
__get_cpu_var() is defined as :
#define __get_cpu_var(var) (*this_cpu_ptr(&(var)))
__get_cpu_var() always only does an address determination. However, store
and retrieve operations could use a segment prefix (or global register on
other platforms) to avoid the address calculation.
this_cpu_write() and this_cpu_read() can directly take an offset into a
percpu area and use optimized assembly code to read and write per cpu
variables.
This patch converts __get_cpu_var into either an explicit address
calculation using this_cpu_ptr() or into a use of this_cpu operations that
use the offset. Thereby address calculations are avoided and less registers
are used when code is generated.
At the end of the patch set all uses of __get_cpu_var have been removed so
the macro is removed too.
The patch set includes passes over all arches as well. Once these operations
are used throughout then specialized macros can be defined in non -x86
arches as well in order to optimize per cpu access by f.e. using a global
register that may be set to the per cpu base.
Transformations done to __get_cpu_var()
1. Determine the address of the percpu instance of the current processor.
DEFINE_PER_CPU(int, y);
int *x = &__get_cpu_var(y);
Converts to
int *x = this_cpu_ptr(&y);
2. Same as #1 but this time an array structure is involved.
DEFINE_PER_CPU(int, y[20]);
int *x = __get_cpu_var(y);
Converts to
int *x = this_cpu_ptr(y);
3. Retrieve the content of the current processors instance of a per cpu
variable.
DEFINE_PER_CPU(int, y);
int x = __get_cpu_var(y)
Converts to
int x = __this_cpu_read(y);
4. Retrieve the content of a percpu struct
DEFINE_PER_CPU(struct mystruct, y);
struct mystruct x = __get_cpu_var(y);
Converts to
memcpy(&x, this_cpu_ptr(&y), sizeof(x));
5. Assignment to a per cpu variable
DEFINE_PER_CPU(int, y)
__get_cpu_var(y) = x;
Converts to
__this_cpu_write(y, x);
6. Increment/Decrement etc of a per cpu variable
DEFINE_PER_CPU(int, y);
__get_cpu_var(y)++
Converts to
__this_cpu_inc(y)
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
2014-08-18 01:30:44 +08:00
|
|
|
pen = this_cpu_ptr(&octeon_irq_ciu0_en_mirror);
|
2012-04-06 01:24:25 +08:00
|
|
|
__clear_bit(cd.s.bit, pen);
|
|
|
|
/*
|
|
|
|
* Must be visible to octeon_irq_ip{2,3}_ciu() before
|
|
|
|
* enabling the irq.
|
|
|
|
*/
|
|
|
|
wmb();
|
2011-03-26 03:38:51 +08:00
|
|
|
cvmx_write_csr(CVMX_CIU_INTX_EN0(cvmx_get_core_num() * 2), *pen);
|
|
|
|
} else {
|
mips: Replace __get_cpu_var uses
__get_cpu_var() is used for multiple purposes in the kernel source. One of
them is address calculation via the form &__get_cpu_var(x). This calculates
the address for the instance of the percpu variable of the current processor
based on an offset.
Other use cases are for storing and retrieving data from the current
processors percpu area. __get_cpu_var() can be used as an lvalue when
writing data or on the right side of an assignment.
__get_cpu_var() is defined as :
#define __get_cpu_var(var) (*this_cpu_ptr(&(var)))
__get_cpu_var() always only does an address determination. However, store
and retrieve operations could use a segment prefix (or global register on
other platforms) to avoid the address calculation.
this_cpu_write() and this_cpu_read() can directly take an offset into a
percpu area and use optimized assembly code to read and write per cpu
variables.
This patch converts __get_cpu_var into either an explicit address
calculation using this_cpu_ptr() or into a use of this_cpu operations that
use the offset. Thereby address calculations are avoided and less registers
are used when code is generated.
At the end of the patch set all uses of __get_cpu_var have been removed so
the macro is removed too.
The patch set includes passes over all arches as well. Once these operations
are used throughout then specialized macros can be defined in non -x86
arches as well in order to optimize per cpu access by f.e. using a global
register that may be set to the per cpu base.
Transformations done to __get_cpu_var()
1. Determine the address of the percpu instance of the current processor.
DEFINE_PER_CPU(int, y);
int *x = &__get_cpu_var(y);
Converts to
int *x = this_cpu_ptr(&y);
2. Same as #1 but this time an array structure is involved.
DEFINE_PER_CPU(int, y[20]);
int *x = __get_cpu_var(y);
Converts to
int *x = this_cpu_ptr(y);
3. Retrieve the content of the current processors instance of a per cpu
variable.
DEFINE_PER_CPU(int, y);
int x = __get_cpu_var(y)
Converts to
int x = __this_cpu_read(y);
4. Retrieve the content of a percpu struct
DEFINE_PER_CPU(struct mystruct, y);
struct mystruct x = __get_cpu_var(y);
Converts to
memcpy(&x, this_cpu_ptr(&y), sizeof(x));
5. Assignment to a per cpu variable
DEFINE_PER_CPU(int, y)
__get_cpu_var(y) = x;
Converts to
__this_cpu_write(y, x);
6. Increment/Decrement etc of a per cpu variable
DEFINE_PER_CPU(int, y);
__get_cpu_var(y)++
Converts to
__this_cpu_inc(y)
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
2014-08-18 01:30:44 +08:00
|
|
|
pen = this_cpu_ptr(&octeon_irq_ciu1_en_mirror);
|
2012-04-06 01:24:25 +08:00
|
|
|
__clear_bit(cd.s.bit, pen);
|
|
|
|
/*
|
|
|
|
* Must be visible to octeon_irq_ip{2,3}_ciu() before
|
|
|
|
* enabling the irq.
|
|
|
|
*/
|
|
|
|
wmb();
|
2011-03-26 03:38:51 +08:00
|
|
|
cvmx_write_csr(CVMX_CIU_INTX_EN1(cvmx_get_core_num() * 2 + 1), *pen);
|
|
|
|
}
|
2012-04-06 01:24:25 +08:00
|
|
|
raw_spin_unlock_irqrestore(lock, flags);
|
2011-03-26 03:38:51 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void octeon_irq_ciu_disable_all(struct irq_data *data)
|
2009-01-09 08:46:40 +08:00
|
|
|
{
|
|
|
|
unsigned long flags;
|
2011-03-26 03:38:51 +08:00
|
|
|
unsigned long *pen;
|
|
|
|
int cpu;
|
|
|
|
union octeon_ciu_chip_data cd;
|
2012-04-06 01:24:25 +08:00
|
|
|
raw_spinlock_t *lock;
|
2009-01-09 08:46:40 +08:00
|
|
|
|
2011-03-26 03:38:51 +08:00
|
|
|
cd.p = irq_data_get_irq_chip_data(data);
|
|
|
|
|
2012-04-06 01:24:25 +08:00
|
|
|
for_each_online_cpu(cpu) {
|
|
|
|
int coreid = octeon_coreid_for_cpu(cpu);
|
|
|
|
lock = &per_cpu(octeon_irq_ciu_spinlock, cpu);
|
|
|
|
if (cd.s.line == 0)
|
2011-03-26 03:38:51 +08:00
|
|
|
pen = &per_cpu(octeon_irq_ciu0_en_mirror, cpu);
|
2012-04-06 01:24:25 +08:00
|
|
|
else
|
2011-03-26 03:38:51 +08:00
|
|
|
pen = &per_cpu(octeon_irq_ciu1_en_mirror, cpu);
|
2012-04-06 01:24:25 +08:00
|
|
|
|
|
|
|
raw_spin_lock_irqsave(lock, flags);
|
|
|
|
__clear_bit(cd.s.bit, pen);
|
|
|
|
/*
|
|
|
|
* Must be visible to octeon_irq_ip{2,3}_ciu() before
|
|
|
|
* enabling the irq.
|
|
|
|
*/
|
|
|
|
wmb();
|
|
|
|
if (cd.s.line == 0)
|
|
|
|
cvmx_write_csr(CVMX_CIU_INTX_EN0(coreid * 2), *pen);
|
|
|
|
else
|
2011-03-26 03:38:51 +08:00
|
|
|
cvmx_write_csr(CVMX_CIU_INTX_EN1(coreid * 2 + 1), *pen);
|
2012-04-06 01:24:25 +08:00
|
|
|
raw_spin_unlock_irqrestore(lock, flags);
|
2011-03-26 03:38:51 +08:00
|
|
|
}
|
2009-01-09 08:46:40 +08:00
|
|
|
}
|
|
|
|
|
2011-03-26 03:38:51 +08:00
|
|
|
static void octeon_irq_ciu_enable_all(struct irq_data *data)
|
2009-01-09 08:46:40 +08:00
|
|
|
{
|
|
|
|
unsigned long flags;
|
2011-03-26 03:38:51 +08:00
|
|
|
unsigned long *pen;
|
2009-01-09 08:46:40 +08:00
|
|
|
int cpu;
|
2011-03-26 03:38:51 +08:00
|
|
|
union octeon_ciu_chip_data cd;
|
2012-04-06 01:24:25 +08:00
|
|
|
raw_spinlock_t *lock;
|
2011-03-26 03:38:51 +08:00
|
|
|
|
|
|
|
cd.p = irq_data_get_irq_chip_data(data);
|
|
|
|
|
2012-04-06 01:24:25 +08:00
|
|
|
for_each_online_cpu(cpu) {
|
|
|
|
int coreid = octeon_coreid_for_cpu(cpu);
|
|
|
|
lock = &per_cpu(octeon_irq_ciu_spinlock, cpu);
|
|
|
|
if (cd.s.line == 0)
|
2011-03-26 03:38:51 +08:00
|
|
|
pen = &per_cpu(octeon_irq_ciu0_en_mirror, cpu);
|
2012-04-06 01:24:25 +08:00
|
|
|
else
|
2011-03-26 03:38:51 +08:00
|
|
|
pen = &per_cpu(octeon_irq_ciu1_en_mirror, cpu);
|
2012-04-06 01:24:25 +08:00
|
|
|
|
|
|
|
raw_spin_lock_irqsave(lock, flags);
|
|
|
|
__set_bit(cd.s.bit, pen);
|
|
|
|
/*
|
|
|
|
* Must be visible to octeon_irq_ip{2,3}_ciu() before
|
|
|
|
* enabling the irq.
|
|
|
|
*/
|
|
|
|
wmb();
|
|
|
|
if (cd.s.line == 0)
|
|
|
|
cvmx_write_csr(CVMX_CIU_INTX_EN0(coreid * 2), *pen);
|
|
|
|
else
|
2011-03-26 03:38:51 +08:00
|
|
|
cvmx_write_csr(CVMX_CIU_INTX_EN1(coreid * 2 + 1), *pen);
|
2012-04-06 01:24:25 +08:00
|
|
|
raw_spin_unlock_irqrestore(lock, flags);
|
2009-01-09 08:46:40 +08:00
|
|
|
}
|
2009-10-14 02:26:03 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2010-07-24 01:43:46 +08:00
|
|
|
* Enable the irq on the next core in the affinity set for chips that
|
|
|
|
* have the EN*_W1{S,C} registers.
|
2009-10-14 02:26:03 +08:00
|
|
|
*/
|
2011-03-26 03:38:51 +08:00
|
|
|
static void octeon_irq_ciu_enable_v2(struct irq_data *data)
|
2009-10-14 02:26:03 +08:00
|
|
|
{
|
2011-03-26 03:38:51 +08:00
|
|
|
u64 mask;
|
|
|
|
int cpu = next_cpu_for_irq(data);
|
|
|
|
union octeon_ciu_chip_data cd;
|
2009-10-14 02:26:03 +08:00
|
|
|
|
2011-03-26 03:38:51 +08:00
|
|
|
cd.p = irq_data_get_irq_chip_data(data);
|
|
|
|
mask = 1ull << (cd.s.bit);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Called under the desc lock, so these should never get out
|
|
|
|
* of sync.
|
|
|
|
*/
|
|
|
|
if (cd.s.line == 0) {
|
|
|
|
int index = octeon_coreid_for_cpu(cpu) * 2;
|
|
|
|
set_bit(cd.s.bit, &per_cpu(octeon_irq_ciu0_en_mirror, cpu));
|
2010-07-24 01:43:46 +08:00
|
|
|
cvmx_write_csr(CVMX_CIU_INTX_EN0_W1S(index), mask);
|
2011-03-26 03:38:51 +08:00
|
|
|
} else {
|
|
|
|
int index = octeon_coreid_for_cpu(cpu) * 2 + 1;
|
|
|
|
set_bit(cd.s.bit, &per_cpu(octeon_irq_ciu1_en_mirror, cpu));
|
|
|
|
cvmx_write_csr(CVMX_CIU_INTX_EN1_W1S(index), mask);
|
2010-07-24 01:43:46 +08:00
|
|
|
}
|
2009-10-14 02:26:03 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2010-07-24 01:43:46 +08:00
|
|
|
* Enable the irq on the current CPU for chips that
|
|
|
|
* have the EN*_W1{S,C} registers.
|
2009-10-14 02:26:03 +08:00
|
|
|
*/
|
2011-03-26 03:38:51 +08:00
|
|
|
static void octeon_irq_ciu_enable_local_v2(struct irq_data *data)
|
2009-10-14 02:26:03 +08:00
|
|
|
{
|
2011-03-26 03:38:51 +08:00
|
|
|
u64 mask;
|
|
|
|
union octeon_ciu_chip_data cd;
|
|
|
|
|
|
|
|
cd.p = irq_data_get_irq_chip_data(data);
|
|
|
|
mask = 1ull << (cd.s.bit);
|
2009-10-14 02:26:03 +08:00
|
|
|
|
2011-03-26 03:38:51 +08:00
|
|
|
if (cd.s.line == 0) {
|
|
|
|
int index = cvmx_get_core_num() * 2;
|
mips: Replace __get_cpu_var uses
__get_cpu_var() is used for multiple purposes in the kernel source. One of
them is address calculation via the form &__get_cpu_var(x). This calculates
the address for the instance of the percpu variable of the current processor
based on an offset.
Other use cases are for storing and retrieving data from the current
processors percpu area. __get_cpu_var() can be used as an lvalue when
writing data or on the right side of an assignment.
__get_cpu_var() is defined as :
#define __get_cpu_var(var) (*this_cpu_ptr(&(var)))
__get_cpu_var() always only does an address determination. However, store
and retrieve operations could use a segment prefix (or global register on
other platforms) to avoid the address calculation.
this_cpu_write() and this_cpu_read() can directly take an offset into a
percpu area and use optimized assembly code to read and write per cpu
variables.
This patch converts __get_cpu_var into either an explicit address
calculation using this_cpu_ptr() or into a use of this_cpu operations that
use the offset. Thereby address calculations are avoided and less registers
are used when code is generated.
At the end of the patch set all uses of __get_cpu_var have been removed so
the macro is removed too.
The patch set includes passes over all arches as well. Once these operations
are used throughout then specialized macros can be defined in non -x86
arches as well in order to optimize per cpu access by f.e. using a global
register that may be set to the per cpu base.
Transformations done to __get_cpu_var()
1. Determine the address of the percpu instance of the current processor.
DEFINE_PER_CPU(int, y);
int *x = &__get_cpu_var(y);
Converts to
int *x = this_cpu_ptr(&y);
2. Same as #1 but this time an array structure is involved.
DEFINE_PER_CPU(int, y[20]);
int *x = __get_cpu_var(y);
Converts to
int *x = this_cpu_ptr(y);
3. Retrieve the content of the current processors instance of a per cpu
variable.
DEFINE_PER_CPU(int, y);
int x = __get_cpu_var(y)
Converts to
int x = __this_cpu_read(y);
4. Retrieve the content of a percpu struct
DEFINE_PER_CPU(struct mystruct, y);
struct mystruct x = __get_cpu_var(y);
Converts to
memcpy(&x, this_cpu_ptr(&y), sizeof(x));
5. Assignment to a per cpu variable
DEFINE_PER_CPU(int, y)
__get_cpu_var(y) = x;
Converts to
__this_cpu_write(y, x);
6. Increment/Decrement etc of a per cpu variable
DEFINE_PER_CPU(int, y);
__get_cpu_var(y)++
Converts to
__this_cpu_inc(y)
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
2014-08-18 01:30:44 +08:00
|
|
|
set_bit(cd.s.bit, this_cpu_ptr(&octeon_irq_ciu0_en_mirror));
|
2011-03-26 03:38:51 +08:00
|
|
|
cvmx_write_csr(CVMX_CIU_INTX_EN0_W1S(index), mask);
|
|
|
|
} else {
|
|
|
|
int index = cvmx_get_core_num() * 2 + 1;
|
mips: Replace __get_cpu_var uses
__get_cpu_var() is used for multiple purposes in the kernel source. One of
them is address calculation via the form &__get_cpu_var(x). This calculates
the address for the instance of the percpu variable of the current processor
based on an offset.
Other use cases are for storing and retrieving data from the current
processors percpu area. __get_cpu_var() can be used as an lvalue when
writing data or on the right side of an assignment.
__get_cpu_var() is defined as :
#define __get_cpu_var(var) (*this_cpu_ptr(&(var)))
__get_cpu_var() always only does an address determination. However, store
and retrieve operations could use a segment prefix (or global register on
other platforms) to avoid the address calculation.
this_cpu_write() and this_cpu_read() can directly take an offset into a
percpu area and use optimized assembly code to read and write per cpu
variables.
This patch converts __get_cpu_var into either an explicit address
calculation using this_cpu_ptr() or into a use of this_cpu operations that
use the offset. Thereby address calculations are avoided and less registers
are used when code is generated.
At the end of the patch set all uses of __get_cpu_var have been removed so
the macro is removed too.
The patch set includes passes over all arches as well. Once these operations
are used throughout then specialized macros can be defined in non -x86
arches as well in order to optimize per cpu access by f.e. using a global
register that may be set to the per cpu base.
Transformations done to __get_cpu_var()
1. Determine the address of the percpu instance of the current processor.
DEFINE_PER_CPU(int, y);
int *x = &__get_cpu_var(y);
Converts to
int *x = this_cpu_ptr(&y);
2. Same as #1 but this time an array structure is involved.
DEFINE_PER_CPU(int, y[20]);
int *x = __get_cpu_var(y);
Converts to
int *x = this_cpu_ptr(y);
3. Retrieve the content of the current processors instance of a per cpu
variable.
DEFINE_PER_CPU(int, y);
int x = __get_cpu_var(y)
Converts to
int x = __this_cpu_read(y);
4. Retrieve the content of a percpu struct
DEFINE_PER_CPU(struct mystruct, y);
struct mystruct x = __get_cpu_var(y);
Converts to
memcpy(&x, this_cpu_ptr(&y), sizeof(x));
5. Assignment to a per cpu variable
DEFINE_PER_CPU(int, y)
__get_cpu_var(y) = x;
Converts to
__this_cpu_write(y, x);
6. Increment/Decrement etc of a per cpu variable
DEFINE_PER_CPU(int, y);
__get_cpu_var(y)++
Converts to
__this_cpu_inc(y)
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
2014-08-18 01:30:44 +08:00
|
|
|
set_bit(cd.s.bit, this_cpu_ptr(&octeon_irq_ciu1_en_mirror));
|
2011-03-26 03:38:51 +08:00
|
|
|
cvmx_write_csr(CVMX_CIU_INTX_EN1_W1S(index), mask);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void octeon_irq_ciu_disable_local_v2(struct irq_data *data)
|
|
|
|
{
|
|
|
|
u64 mask;
|
|
|
|
union octeon_ciu_chip_data cd;
|
|
|
|
|
|
|
|
cd.p = irq_data_get_irq_chip_data(data);
|
|
|
|
mask = 1ull << (cd.s.bit);
|
|
|
|
|
|
|
|
if (cd.s.line == 0) {
|
|
|
|
int index = cvmx_get_core_num() * 2;
|
mips: Replace __get_cpu_var uses
__get_cpu_var() is used for multiple purposes in the kernel source. One of
them is address calculation via the form &__get_cpu_var(x). This calculates
the address for the instance of the percpu variable of the current processor
based on an offset.
Other use cases are for storing and retrieving data from the current
processors percpu area. __get_cpu_var() can be used as an lvalue when
writing data or on the right side of an assignment.
__get_cpu_var() is defined as :
#define __get_cpu_var(var) (*this_cpu_ptr(&(var)))
__get_cpu_var() always only does an address determination. However, store
and retrieve operations could use a segment prefix (or global register on
other platforms) to avoid the address calculation.
this_cpu_write() and this_cpu_read() can directly take an offset into a
percpu area and use optimized assembly code to read and write per cpu
variables.
This patch converts __get_cpu_var into either an explicit address
calculation using this_cpu_ptr() or into a use of this_cpu operations that
use the offset. Thereby address calculations are avoided and less registers
are used when code is generated.
At the end of the patch set all uses of __get_cpu_var have been removed so
the macro is removed too.
The patch set includes passes over all arches as well. Once these operations
are used throughout then specialized macros can be defined in non -x86
arches as well in order to optimize per cpu access by f.e. using a global
register that may be set to the per cpu base.
Transformations done to __get_cpu_var()
1. Determine the address of the percpu instance of the current processor.
DEFINE_PER_CPU(int, y);
int *x = &__get_cpu_var(y);
Converts to
int *x = this_cpu_ptr(&y);
2. Same as #1 but this time an array structure is involved.
DEFINE_PER_CPU(int, y[20]);
int *x = __get_cpu_var(y);
Converts to
int *x = this_cpu_ptr(y);
3. Retrieve the content of the current processors instance of a per cpu
variable.
DEFINE_PER_CPU(int, y);
int x = __get_cpu_var(y)
Converts to
int x = __this_cpu_read(y);
4. Retrieve the content of a percpu struct
DEFINE_PER_CPU(struct mystruct, y);
struct mystruct x = __get_cpu_var(y);
Converts to
memcpy(&x, this_cpu_ptr(&y), sizeof(x));
5. Assignment to a per cpu variable
DEFINE_PER_CPU(int, y)
__get_cpu_var(y) = x;
Converts to
__this_cpu_write(y, x);
6. Increment/Decrement etc of a per cpu variable
DEFINE_PER_CPU(int, y);
__get_cpu_var(y)++
Converts to
__this_cpu_inc(y)
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
2014-08-18 01:30:44 +08:00
|
|
|
clear_bit(cd.s.bit, this_cpu_ptr(&octeon_irq_ciu0_en_mirror));
|
2011-03-26 03:38:51 +08:00
|
|
|
cvmx_write_csr(CVMX_CIU_INTX_EN0_W1C(index), mask);
|
|
|
|
} else {
|
|
|
|
int index = cvmx_get_core_num() * 2 + 1;
|
mips: Replace __get_cpu_var uses
__get_cpu_var() is used for multiple purposes in the kernel source. One of
them is address calculation via the form &__get_cpu_var(x). This calculates
the address for the instance of the percpu variable of the current processor
based on an offset.
Other use cases are for storing and retrieving data from the current
processors percpu area. __get_cpu_var() can be used as an lvalue when
writing data or on the right side of an assignment.
__get_cpu_var() is defined as :
#define __get_cpu_var(var) (*this_cpu_ptr(&(var)))
__get_cpu_var() always only does an address determination. However, store
and retrieve operations could use a segment prefix (or global register on
other platforms) to avoid the address calculation.
this_cpu_write() and this_cpu_read() can directly take an offset into a
percpu area and use optimized assembly code to read and write per cpu
variables.
This patch converts __get_cpu_var into either an explicit address
calculation using this_cpu_ptr() or into a use of this_cpu operations that
use the offset. Thereby address calculations are avoided and less registers
are used when code is generated.
At the end of the patch set all uses of __get_cpu_var have been removed so
the macro is removed too.
The patch set includes passes over all arches as well. Once these operations
are used throughout then specialized macros can be defined in non -x86
arches as well in order to optimize per cpu access by f.e. using a global
register that may be set to the per cpu base.
Transformations done to __get_cpu_var()
1. Determine the address of the percpu instance of the current processor.
DEFINE_PER_CPU(int, y);
int *x = &__get_cpu_var(y);
Converts to
int *x = this_cpu_ptr(&y);
2. Same as #1 but this time an array structure is involved.
DEFINE_PER_CPU(int, y[20]);
int *x = __get_cpu_var(y);
Converts to
int *x = this_cpu_ptr(y);
3. Retrieve the content of the current processors instance of a per cpu
variable.
DEFINE_PER_CPU(int, y);
int x = __get_cpu_var(y)
Converts to
int x = __this_cpu_read(y);
4. Retrieve the content of a percpu struct
DEFINE_PER_CPU(struct mystruct, y);
struct mystruct x = __get_cpu_var(y);
Converts to
memcpy(&x, this_cpu_ptr(&y), sizeof(x));
5. Assignment to a per cpu variable
DEFINE_PER_CPU(int, y)
__get_cpu_var(y) = x;
Converts to
__this_cpu_write(y, x);
6. Increment/Decrement etc of a per cpu variable
DEFINE_PER_CPU(int, y);
__get_cpu_var(y)++
Converts to
__this_cpu_inc(y)
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
2014-08-18 01:30:44 +08:00
|
|
|
clear_bit(cd.s.bit, this_cpu_ptr(&octeon_irq_ciu1_en_mirror));
|
2011-03-26 03:38:51 +08:00
|
|
|
cvmx_write_csr(CVMX_CIU_INTX_EN1_W1C(index), mask);
|
|
|
|
}
|
2009-10-14 02:26:03 +08:00
|
|
|
}
|
|
|
|
|
2010-02-16 04:13:18 +08:00
|
|
|
/*
|
2011-03-26 03:38:51 +08:00
|
|
|
* Write to the W1C bit in CVMX_CIU_INTX_SUM0 to clear the irq.
|
2010-02-16 04:13:18 +08:00
|
|
|
*/
|
2011-03-26 03:38:51 +08:00
|
|
|
static void octeon_irq_ciu_ack(struct irq_data *data)
|
|
|
|
{
|
|
|
|
u64 mask;
|
|
|
|
union octeon_ciu_chip_data cd;
|
|
|
|
|
2012-04-05 06:34:41 +08:00
|
|
|
cd.p = irq_data_get_irq_chip_data(data);
|
2011-03-26 03:38:51 +08:00
|
|
|
mask = 1ull << (cd.s.bit);
|
|
|
|
|
|
|
|
if (cd.s.line == 0) {
|
|
|
|
int index = cvmx_get_core_num() * 2;
|
2010-07-24 01:43:46 +08:00
|
|
|
cvmx_write_csr(CVMX_CIU_INTX_SUM0(index), mask);
|
2011-03-26 03:38:51 +08:00
|
|
|
} else {
|
|
|
|
cvmx_write_csr(CVMX_CIU_INT_SUM1, mask);
|
2010-07-24 01:43:46 +08:00
|
|
|
}
|
2010-02-16 04:13:18 +08:00
|
|
|
}
|
|
|
|
|
2010-01-08 03:05:00 +08:00
|
|
|
/*
|
2011-03-26 03:38:51 +08:00
|
|
|
* Disable the irq on the all cores for chips that have the EN*_W1{S,C}
|
2010-01-08 03:05:00 +08:00
|
|
|
* registers.
|
|
|
|
*/
|
2011-03-26 03:38:51 +08:00
|
|
|
static void octeon_irq_ciu_disable_all_v2(struct irq_data *data)
|
2010-01-08 03:05:00 +08:00
|
|
|
{
|
2011-03-26 03:38:51 +08:00
|
|
|
int cpu;
|
|
|
|
u64 mask;
|
|
|
|
union octeon_ciu_chip_data cd;
|
2010-01-08 03:05:00 +08:00
|
|
|
|
2012-04-05 06:34:41 +08:00
|
|
|
cd.p = irq_data_get_irq_chip_data(data);
|
2011-03-26 03:38:51 +08:00
|
|
|
mask = 1ull << (cd.s.bit);
|
|
|
|
|
|
|
|
if (cd.s.line == 0) {
|
|
|
|
for_each_online_cpu(cpu) {
|
|
|
|
int index = octeon_coreid_for_cpu(cpu) * 2;
|
|
|
|
clear_bit(cd.s.bit, &per_cpu(octeon_irq_ciu0_en_mirror, cpu));
|
|
|
|
cvmx_write_csr(CVMX_CIU_INTX_EN0_W1C(index), mask);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
for_each_online_cpu(cpu) {
|
|
|
|
int index = octeon_coreid_for_cpu(cpu) * 2 + 1;
|
|
|
|
clear_bit(cd.s.bit, &per_cpu(octeon_irq_ciu1_en_mirror, cpu));
|
|
|
|
cvmx_write_csr(CVMX_CIU_INTX_EN1_W1C(index), mask);
|
|
|
|
}
|
|
|
|
}
|
2010-01-08 03:05:00 +08:00
|
|
|
}
|
|
|
|
|
2009-10-14 02:26:03 +08:00
|
|
|
/*
|
2011-03-26 03:38:51 +08:00
|
|
|
* Enable the irq on the all cores for chips that have the EN*_W1{S,C}
|
2009-10-14 02:26:03 +08:00
|
|
|
* registers.
|
|
|
|
*/
|
2011-03-26 03:38:51 +08:00
|
|
|
static void octeon_irq_ciu_enable_all_v2(struct irq_data *data)
|
2009-10-14 02:26:03 +08:00
|
|
|
{
|
|
|
|
int cpu;
|
2011-03-26 03:38:51 +08:00
|
|
|
u64 mask;
|
|
|
|
union octeon_ciu_chip_data cd;
|
|
|
|
|
2012-04-05 06:34:41 +08:00
|
|
|
cd.p = irq_data_get_irq_chip_data(data);
|
2011-03-26 03:38:51 +08:00
|
|
|
mask = 1ull << (cd.s.bit);
|
|
|
|
|
|
|
|
if (cd.s.line == 0) {
|
|
|
|
for_each_online_cpu(cpu) {
|
|
|
|
int index = octeon_coreid_for_cpu(cpu) * 2;
|
|
|
|
set_bit(cd.s.bit, &per_cpu(octeon_irq_ciu0_en_mirror, cpu));
|
|
|
|
cvmx_write_csr(CVMX_CIU_INTX_EN0_W1S(index), mask);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
for_each_online_cpu(cpu) {
|
|
|
|
int index = octeon_coreid_for_cpu(cpu) * 2 + 1;
|
|
|
|
set_bit(cd.s.bit, &per_cpu(octeon_irq_ciu1_en_mirror, cpu));
|
|
|
|
cvmx_write_csr(CVMX_CIU_INTX_EN1_W1S(index), mask);
|
|
|
|
}
|
2009-10-14 02:26:03 +08:00
|
|
|
}
|
2009-01-09 08:46:40 +08:00
|
|
|
}
|
|
|
|
|
2012-07-06 00:12:37 +08:00
|
|
|
static void octeon_irq_gpio_setup(struct irq_data *data)
|
|
|
|
{
|
|
|
|
union cvmx_gpio_bit_cfgx cfg;
|
|
|
|
union octeon_ciu_chip_data cd;
|
|
|
|
u32 t = irqd_get_trigger_type(data);
|
|
|
|
|
|
|
|
cd.p = irq_data_get_irq_chip_data(data);
|
|
|
|
|
|
|
|
cfg.u64 = 0;
|
|
|
|
cfg.s.int_en = 1;
|
|
|
|
cfg.s.int_type = (t & IRQ_TYPE_EDGE_BOTH) != 0;
|
|
|
|
cfg.s.rx_xor = (t & (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_EDGE_FALLING)) != 0;
|
|
|
|
|
|
|
|
/* 140 nS glitch filter*/
|
|
|
|
cfg.s.fil_cnt = 7;
|
|
|
|
cfg.s.fil_sel = 3;
|
|
|
|
|
2012-04-05 06:34:41 +08:00
|
|
|
cvmx_write_csr(CVMX_GPIO_BIT_CFGX(cd.s.gpio_line), cfg.u64);
|
2012-07-06 00:12:37 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void octeon_irq_ciu_enable_gpio_v2(struct irq_data *data)
|
|
|
|
{
|
|
|
|
octeon_irq_gpio_setup(data);
|
|
|
|
octeon_irq_ciu_enable_v2(data);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void octeon_irq_ciu_enable_gpio(struct irq_data *data)
|
|
|
|
{
|
|
|
|
octeon_irq_gpio_setup(data);
|
|
|
|
octeon_irq_ciu_enable(data);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int octeon_irq_ciu_gpio_set_type(struct irq_data *data, unsigned int t)
|
|
|
|
{
|
|
|
|
irqd_set_trigger_type(data, t);
|
|
|
|
octeon_irq_gpio_setup(data);
|
|
|
|
|
|
|
|
return IRQ_SET_MASK_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void octeon_irq_ciu_disable_gpio_v2(struct irq_data *data)
|
|
|
|
{
|
|
|
|
union octeon_ciu_chip_data cd;
|
|
|
|
|
|
|
|
cd.p = irq_data_get_irq_chip_data(data);
|
2012-04-05 06:34:41 +08:00
|
|
|
cvmx_write_csr(CVMX_GPIO_BIT_CFGX(cd.s.gpio_line), 0);
|
2012-07-06 00:12:37 +08:00
|
|
|
|
|
|
|
octeon_irq_ciu_disable_all_v2(data);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void octeon_irq_ciu_disable_gpio(struct irq_data *data)
|
|
|
|
{
|
|
|
|
union octeon_ciu_chip_data cd;
|
|
|
|
|
|
|
|
cd.p = irq_data_get_irq_chip_data(data);
|
2012-04-05 06:34:41 +08:00
|
|
|
cvmx_write_csr(CVMX_GPIO_BIT_CFGX(cd.s.gpio_line), 0);
|
2012-07-06 00:12:37 +08:00
|
|
|
|
|
|
|
octeon_irq_ciu_disable_all(data);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void octeon_irq_ciu_gpio_ack(struct irq_data *data)
|
|
|
|
{
|
|
|
|
union octeon_ciu_chip_data cd;
|
|
|
|
u64 mask;
|
|
|
|
|
|
|
|
cd.p = irq_data_get_irq_chip_data(data);
|
2012-04-05 06:34:41 +08:00
|
|
|
mask = 1ull << (cd.s.gpio_line);
|
2012-07-06 00:12:37 +08:00
|
|
|
|
|
|
|
cvmx_write_csr(CVMX_GPIO_INT_CLR, mask);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void octeon_irq_handle_gpio(unsigned int irq, struct irq_desc *desc)
|
|
|
|
{
|
2013-06-15 00:40:48 +08:00
|
|
|
if (irq_get_trigger_type(irq) & IRQ_TYPE_EDGE_BOTH)
|
2012-07-06 00:12:37 +08:00
|
|
|
handle_edge_irq(irq, desc);
|
|
|
|
else
|
|
|
|
handle_level_irq(irq, desc);
|
|
|
|
}
|
|
|
|
|
2009-01-09 08:46:40 +08:00
|
|
|
#ifdef CONFIG_SMP
|
2011-03-26 03:38:51 +08:00
|
|
|
|
|
|
|
static void octeon_irq_cpu_offline_ciu(struct irq_data *data)
|
|
|
|
{
|
|
|
|
int cpu = smp_processor_id();
|
|
|
|
cpumask_t new_affinity;
|
|
|
|
|
|
|
|
if (!cpumask_test_cpu(cpu, data->affinity))
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (cpumask_weight(data->affinity) > 1) {
|
|
|
|
/*
|
|
|
|
* It has multi CPU affinity, just remove this CPU
|
|
|
|
* from the affinity set.
|
|
|
|
*/
|
|
|
|
cpumask_copy(&new_affinity, data->affinity);
|
|
|
|
cpumask_clear_cpu(cpu, &new_affinity);
|
|
|
|
} else {
|
|
|
|
/* Otherwise, put it on lowest numbered online CPU. */
|
|
|
|
cpumask_clear(&new_affinity);
|
|
|
|
cpumask_set_cpu(cpumask_first(cpu_online_mask), &new_affinity);
|
|
|
|
}
|
2014-04-16 22:36:44 +08:00
|
|
|
irq_set_affinity_locked(data, &new_affinity, false);
|
2011-03-26 03:38:51 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static int octeon_irq_ciu_set_affinity(struct irq_data *data,
|
|
|
|
const struct cpumask *dest, bool force)
|
2009-01-09 08:46:40 +08:00
|
|
|
{
|
|
|
|
int cpu;
|
2011-03-27 22:04:30 +08:00
|
|
|
bool enable_one = !irqd_irq_disabled(data) && !irqd_irq_masked(data);
|
2009-10-13 23:52:28 +08:00
|
|
|
unsigned long flags;
|
2011-03-26 03:38:51 +08:00
|
|
|
union octeon_ciu_chip_data cd;
|
2012-04-06 01:24:25 +08:00
|
|
|
unsigned long *pen;
|
|
|
|
raw_spinlock_t *lock;
|
2011-03-26 03:38:51 +08:00
|
|
|
|
2012-04-05 06:34:41 +08:00
|
|
|
cd.p = irq_data_get_irq_chip_data(data);
|
2009-01-09 08:46:40 +08:00
|
|
|
|
2010-07-24 01:43:46 +08:00
|
|
|
/*
|
|
|
|
* For non-v2 CIU, we will allow only single CPU affinity.
|
|
|
|
* This removes the need to do locking in the .ack/.eoi
|
|
|
|
* functions.
|
|
|
|
*/
|
|
|
|
if (cpumask_weight(dest) != 1)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2011-03-27 22:04:30 +08:00
|
|
|
if (!enable_one)
|
2011-03-26 03:38:51 +08:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
2012-04-06 01:24:25 +08:00
|
|
|
for_each_online_cpu(cpu) {
|
|
|
|
int coreid = octeon_coreid_for_cpu(cpu);
|
|
|
|
|
|
|
|
lock = &per_cpu(octeon_irq_ciu_spinlock, cpu);
|
|
|
|
raw_spin_lock_irqsave(lock, flags);
|
|
|
|
|
|
|
|
if (cd.s.line == 0)
|
|
|
|
pen = &per_cpu(octeon_irq_ciu0_en_mirror, cpu);
|
|
|
|
else
|
|
|
|
pen = &per_cpu(octeon_irq_ciu1_en_mirror, cpu);
|
|
|
|
|
|
|
|
if (cpumask_test_cpu(cpu, dest) && enable_one) {
|
|
|
|
enable_one = 0;
|
|
|
|
__set_bit(cd.s.bit, pen);
|
|
|
|
} else {
|
|
|
|
__clear_bit(cd.s.bit, pen);
|
2011-03-26 03:38:51 +08:00
|
|
|
}
|
2012-04-06 01:24:25 +08:00
|
|
|
/*
|
|
|
|
* Must be visible to octeon_irq_ip{2,3}_ciu() before
|
|
|
|
* enabling the irq.
|
|
|
|
*/
|
|
|
|
wmb();
|
2011-03-26 03:38:51 +08:00
|
|
|
|
2012-04-06 01:24:25 +08:00
|
|
|
if (cd.s.line == 0)
|
|
|
|
cvmx_write_csr(CVMX_CIU_INTX_EN0(coreid * 2), *pen);
|
|
|
|
else
|
2011-03-26 03:38:51 +08:00
|
|
|
cvmx_write_csr(CVMX_CIU_INTX_EN1(coreid * 2 + 1), *pen);
|
2012-04-06 01:24:25 +08:00
|
|
|
|
|
|
|
raw_spin_unlock_irqrestore(lock, flags);
|
2009-01-09 08:46:40 +08:00
|
|
|
}
|
2009-04-28 08:59:21 +08:00
|
|
|
return 0;
|
2009-01-09 08:46:40 +08:00
|
|
|
}
|
2009-10-14 02:26:03 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Set affinity for the irq for chips that have the EN*_W1{S,C}
|
|
|
|
* registers.
|
|
|
|
*/
|
2011-03-26 03:38:51 +08:00
|
|
|
static int octeon_irq_ciu_set_affinity_v2(struct irq_data *data,
|
|
|
|
const struct cpumask *dest,
|
|
|
|
bool force)
|
2009-10-14 02:26:03 +08:00
|
|
|
{
|
|
|
|
int cpu;
|
2011-03-27 22:04:30 +08:00
|
|
|
bool enable_one = !irqd_irq_disabled(data) && !irqd_irq_masked(data);
|
2011-03-26 03:38:51 +08:00
|
|
|
u64 mask;
|
|
|
|
union octeon_ciu_chip_data cd;
|
|
|
|
|
2011-03-27 22:04:30 +08:00
|
|
|
if (!enable_one)
|
2011-03-26 03:38:51 +08:00
|
|
|
return 0;
|
|
|
|
|
2012-04-05 06:34:41 +08:00
|
|
|
cd.p = irq_data_get_irq_chip_data(data);
|
2011-03-26 03:38:51 +08:00
|
|
|
mask = 1ull << cd.s.bit;
|
|
|
|
|
|
|
|
if (cd.s.line == 0) {
|
|
|
|
for_each_online_cpu(cpu) {
|
|
|
|
unsigned long *pen = &per_cpu(octeon_irq_ciu0_en_mirror, cpu);
|
|
|
|
int index = octeon_coreid_for_cpu(cpu) * 2;
|
|
|
|
if (cpumask_test_cpu(cpu, dest) && enable_one) {
|
2011-03-27 22:04:30 +08:00
|
|
|
enable_one = false;
|
2011-03-26 03:38:51 +08:00
|
|
|
set_bit(cd.s.bit, pen);
|
|
|
|
cvmx_write_csr(CVMX_CIU_INTX_EN0_W1S(index), mask);
|
|
|
|
} else {
|
|
|
|
clear_bit(cd.s.bit, pen);
|
|
|
|
cvmx_write_csr(CVMX_CIU_INTX_EN0_W1C(index), mask);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
for_each_online_cpu(cpu) {
|
|
|
|
unsigned long *pen = &per_cpu(octeon_irq_ciu1_en_mirror, cpu);
|
|
|
|
int index = octeon_coreid_for_cpu(cpu) * 2 + 1;
|
|
|
|
if (cpumask_test_cpu(cpu, dest) && enable_one) {
|
2011-03-27 22:04:30 +08:00
|
|
|
enable_one = false;
|
2011-03-26 03:38:51 +08:00
|
|
|
set_bit(cd.s.bit, pen);
|
|
|
|
cvmx_write_csr(CVMX_CIU_INTX_EN1_W1S(index), mask);
|
|
|
|
} else {
|
|
|
|
clear_bit(cd.s.bit, pen);
|
|
|
|
cvmx_write_csr(CVMX_CIU_INTX_EN1_W1C(index), mask);
|
|
|
|
}
|
2010-07-24 01:43:46 +08:00
|
|
|
}
|
2009-10-14 02:26:03 +08:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
2009-01-09 08:46:40 +08:00
|
|
|
#endif
|
|
|
|
|
2009-10-14 02:26:03 +08:00
|
|
|
/*
|
|
|
|
* Newer octeon chips have support for lockless CIU operation.
|
|
|
|
*/
|
2011-03-26 03:38:51 +08:00
|
|
|
static struct irq_chip octeon_irq_chip_ciu_v2 = {
|
|
|
|
.name = "CIU",
|
|
|
|
.irq_enable = octeon_irq_ciu_enable_v2,
|
|
|
|
.irq_disable = octeon_irq_ciu_disable_all_v2,
|
|
|
|
.irq_ack = octeon_irq_ciu_ack,
|
|
|
|
.irq_mask = octeon_irq_ciu_disable_local_v2,
|
|
|
|
.irq_unmask = octeon_irq_ciu_enable_v2,
|
2009-01-09 08:46:40 +08:00
|
|
|
#ifdef CONFIG_SMP
|
2011-03-26 03:38:51 +08:00
|
|
|
.irq_set_affinity = octeon_irq_ciu_set_affinity_v2,
|
|
|
|
.irq_cpu_offline = octeon_irq_cpu_offline_ciu,
|
2009-01-09 08:46:40 +08:00
|
|
|
#endif
|
|
|
|
};
|
|
|
|
|
2011-03-26 03:38:51 +08:00
|
|
|
static struct irq_chip octeon_irq_chip_ciu = {
|
|
|
|
.name = "CIU",
|
|
|
|
.irq_enable = octeon_irq_ciu_enable,
|
|
|
|
.irq_disable = octeon_irq_ciu_disable_all,
|
|
|
|
.irq_ack = octeon_irq_ciu_ack,
|
2012-04-06 01:24:25 +08:00
|
|
|
.irq_mask = octeon_irq_ciu_disable_local,
|
|
|
|
.irq_unmask = octeon_irq_ciu_enable,
|
2011-03-26 03:38:51 +08:00
|
|
|
#ifdef CONFIG_SMP
|
|
|
|
.irq_set_affinity = octeon_irq_ciu_set_affinity,
|
|
|
|
.irq_cpu_offline = octeon_irq_cpu_offline_ciu,
|
|
|
|
#endif
|
2010-02-16 04:13:18 +08:00
|
|
|
};
|
|
|
|
|
2011-03-26 03:38:51 +08:00
|
|
|
/* The mbox versions don't do any affinity or round-robin. */
|
|
|
|
static struct irq_chip octeon_irq_chip_ciu_mbox_v2 = {
|
|
|
|
.name = "CIU-M",
|
|
|
|
.irq_enable = octeon_irq_ciu_enable_all_v2,
|
|
|
|
.irq_disable = octeon_irq_ciu_disable_all_v2,
|
|
|
|
.irq_ack = octeon_irq_ciu_disable_local_v2,
|
|
|
|
.irq_eoi = octeon_irq_ciu_enable_local_v2,
|
|
|
|
|
2011-03-27 22:04:30 +08:00
|
|
|
.irq_cpu_online = octeon_irq_ciu_enable_local_v2,
|
|
|
|
.irq_cpu_offline = octeon_irq_ciu_disable_local_v2,
|
|
|
|
.flags = IRQCHIP_ONOFFLINE_ENABLED,
|
2011-03-26 03:38:51 +08:00
|
|
|
};
|
2009-01-09 08:46:40 +08:00
|
|
|
|
2011-03-26 03:38:51 +08:00
|
|
|
static struct irq_chip octeon_irq_chip_ciu_mbox = {
|
|
|
|
.name = "CIU-M",
|
|
|
|
.irq_enable = octeon_irq_ciu_enable_all,
|
|
|
|
.irq_disable = octeon_irq_ciu_disable_all,
|
2012-04-06 01:24:25 +08:00
|
|
|
.irq_ack = octeon_irq_ciu_disable_local,
|
|
|
|
.irq_eoi = octeon_irq_ciu_enable_local,
|
2009-01-09 08:46:40 +08:00
|
|
|
|
2011-03-27 22:04:30 +08:00
|
|
|
.irq_cpu_online = octeon_irq_ciu_enable_local,
|
|
|
|
.irq_cpu_offline = octeon_irq_ciu_disable_local,
|
|
|
|
.flags = IRQCHIP_ONOFFLINE_ENABLED,
|
2011-03-26 03:38:51 +08:00
|
|
|
};
|
|
|
|
|
2012-07-06 00:12:37 +08:00
|
|
|
static struct irq_chip octeon_irq_chip_ciu_gpio_v2 = {
|
|
|
|
.name = "CIU-GPIO",
|
|
|
|
.irq_enable = octeon_irq_ciu_enable_gpio_v2,
|
|
|
|
.irq_disable = octeon_irq_ciu_disable_gpio_v2,
|
|
|
|
.irq_ack = octeon_irq_ciu_gpio_ack,
|
|
|
|
.irq_mask = octeon_irq_ciu_disable_local_v2,
|
|
|
|
.irq_unmask = octeon_irq_ciu_enable_v2,
|
|
|
|
.irq_set_type = octeon_irq_ciu_gpio_set_type,
|
|
|
|
#ifdef CONFIG_SMP
|
|
|
|
.irq_set_affinity = octeon_irq_ciu_set_affinity_v2,
|
2014-10-23 21:55:04 +08:00
|
|
|
.irq_cpu_offline = octeon_irq_cpu_offline_ciu,
|
2012-07-06 00:12:37 +08:00
|
|
|
#endif
|
|
|
|
.flags = IRQCHIP_SET_TYPE_MASKED,
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct irq_chip octeon_irq_chip_ciu_gpio = {
|
|
|
|
.name = "CIU-GPIO",
|
|
|
|
.irq_enable = octeon_irq_ciu_enable_gpio,
|
|
|
|
.irq_disable = octeon_irq_ciu_disable_gpio,
|
2012-04-06 01:24:25 +08:00
|
|
|
.irq_mask = octeon_irq_ciu_disable_local,
|
|
|
|
.irq_unmask = octeon_irq_ciu_enable,
|
2012-07-06 00:12:37 +08:00
|
|
|
.irq_ack = octeon_irq_ciu_gpio_ack,
|
|
|
|
.irq_set_type = octeon_irq_ciu_gpio_set_type,
|
|
|
|
#ifdef CONFIG_SMP
|
|
|
|
.irq_set_affinity = octeon_irq_ciu_set_affinity,
|
2014-10-23 21:55:04 +08:00
|
|
|
.irq_cpu_offline = octeon_irq_cpu_offline_ciu,
|
2012-07-06 00:12:37 +08:00
|
|
|
#endif
|
|
|
|
.flags = IRQCHIP_SET_TYPE_MASKED,
|
|
|
|
};
|
|
|
|
|
2011-03-26 03:38:51 +08:00
|
|
|
/*
|
|
|
|
* Watchdog interrupts are special. They are associated with a single
|
|
|
|
* core, so we hardwire the affinity to that core.
|
|
|
|
*/
|
|
|
|
static void octeon_irq_ciu_wd_enable(struct irq_data *data)
|
2009-01-09 08:46:40 +08:00
|
|
|
{
|
|
|
|
unsigned long flags;
|
2011-03-26 03:38:51 +08:00
|
|
|
unsigned long *pen;
|
|
|
|
int coreid = data->irq - OCTEON_IRQ_WDOG0; /* Bit 0-63 of EN1 */
|
|
|
|
int cpu = octeon_cpu_for_coreid(coreid);
|
2012-04-06 01:24:25 +08:00
|
|
|
raw_spinlock_t *lock = &per_cpu(octeon_irq_ciu_spinlock, cpu);
|
2009-01-09 08:46:40 +08:00
|
|
|
|
2012-04-06 01:24:25 +08:00
|
|
|
raw_spin_lock_irqsave(lock, flags);
|
2011-03-26 03:38:51 +08:00
|
|
|
pen = &per_cpu(octeon_irq_ciu1_en_mirror, cpu);
|
2012-04-06 01:24:25 +08:00
|
|
|
__set_bit(coreid, pen);
|
|
|
|
/*
|
|
|
|
* Must be visible to octeon_irq_ip{2,3}_ciu() before enabling
|
|
|
|
* the irq.
|
|
|
|
*/
|
|
|
|
wmb();
|
2011-03-26 03:38:51 +08:00
|
|
|
cvmx_write_csr(CVMX_CIU_INTX_EN1(coreid * 2 + 1), *pen);
|
2012-04-06 01:24:25 +08:00
|
|
|
raw_spin_unlock_irqrestore(lock, flags);
|
2009-01-09 08:46:40 +08:00
|
|
|
}
|
|
|
|
|
2010-07-24 01:43:46 +08:00
|
|
|
/*
|
|
|
|
* Watchdog interrupts are special. They are associated with a single
|
|
|
|
* core, so we hardwire the affinity to that core.
|
|
|
|
*/
|
2011-03-26 03:38:51 +08:00
|
|
|
static void octeon_irq_ciu1_wd_enable_v2(struct irq_data *data)
|
2010-07-24 01:43:46 +08:00
|
|
|
{
|
2011-03-26 03:38:51 +08:00
|
|
|
int coreid = data->irq - OCTEON_IRQ_WDOG0;
|
|
|
|
int cpu = octeon_cpu_for_coreid(coreid);
|
2010-07-24 01:43:46 +08:00
|
|
|
|
2011-03-26 03:38:51 +08:00
|
|
|
set_bit(coreid, &per_cpu(octeon_irq_ciu1_en_mirror, cpu));
|
|
|
|
cvmx_write_csr(CVMX_CIU_INTX_EN1_W1S(coreid * 2 + 1), 1ull << coreid);
|
2010-07-24 01:43:46 +08:00
|
|
|
}
|
|
|
|
|
2011-03-26 03:38:51 +08:00
|
|
|
|
|
|
|
static struct irq_chip octeon_irq_chip_ciu_wd_v2 = {
|
|
|
|
.name = "CIU-W",
|
|
|
|
.irq_enable = octeon_irq_ciu1_wd_enable_v2,
|
|
|
|
.irq_disable = octeon_irq_ciu_disable_all_v2,
|
|
|
|
.irq_mask = octeon_irq_ciu_disable_local_v2,
|
|
|
|
.irq_unmask = octeon_irq_ciu_enable_local_v2,
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct irq_chip octeon_irq_chip_ciu_wd = {
|
|
|
|
.name = "CIU-W",
|
|
|
|
.irq_enable = octeon_irq_ciu_wd_enable,
|
|
|
|
.irq_disable = octeon_irq_ciu_disable_all,
|
2012-04-06 01:24:25 +08:00
|
|
|
.irq_mask = octeon_irq_ciu_disable_local,
|
|
|
|
.irq_unmask = octeon_irq_ciu_enable_local,
|
2011-03-26 03:38:51 +08:00
|
|
|
};
|
|
|
|
|
2012-07-06 00:12:39 +08:00
|
|
|
static bool octeon_irq_ciu_is_edge(unsigned int line, unsigned int bit)
|
|
|
|
{
|
|
|
|
bool edge = false;
|
|
|
|
|
|
|
|
if (line == 0)
|
|
|
|
switch (bit) {
|
|
|
|
case 48 ... 49: /* GMX DRP */
|
|
|
|
case 50: /* IPD_DRP */
|
|
|
|
case 52 ... 55: /* Timers */
|
|
|
|
case 58: /* MPI */
|
|
|
|
edge = true;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else /* line == 1 */
|
|
|
|
switch (bit) {
|
|
|
|
case 47: /* PTP */
|
|
|
|
edge = true;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return edge;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct octeon_irq_gpio_domain_data {
|
|
|
|
unsigned int base_hwirq;
|
|
|
|
};
|
|
|
|
|
|
|
|
static int octeon_irq_gpio_xlat(struct irq_domain *d,
|
|
|
|
struct device_node *node,
|
|
|
|
const u32 *intspec,
|
|
|
|
unsigned int intsize,
|
|
|
|
unsigned long *out_hwirq,
|
|
|
|
unsigned int *out_type)
|
|
|
|
{
|
|
|
|
unsigned int type;
|
|
|
|
unsigned int pin;
|
|
|
|
unsigned int trigger;
|
|
|
|
|
|
|
|
if (d->of_node != node)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
if (intsize < 2)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
pin = intspec[0];
|
|
|
|
if (pin >= 16)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
trigger = intspec[1];
|
|
|
|
|
|
|
|
switch (trigger) {
|
|
|
|
case 1:
|
|
|
|
type = IRQ_TYPE_EDGE_RISING;
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
type = IRQ_TYPE_EDGE_FALLING;
|
|
|
|
break;
|
|
|
|
case 4:
|
|
|
|
type = IRQ_TYPE_LEVEL_HIGH;
|
|
|
|
break;
|
|
|
|
case 8:
|
|
|
|
type = IRQ_TYPE_LEVEL_LOW;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
pr_err("Error: (%s) Invalid irq trigger specification: %x\n",
|
|
|
|
node->name,
|
|
|
|
trigger);
|
|
|
|
type = IRQ_TYPE_LEVEL_LOW;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
*out_type = type;
|
2012-08-11 07:00:31 +08:00
|
|
|
*out_hwirq = pin;
|
2012-07-06 00:12:39 +08:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int octeon_irq_ciu_xlat(struct irq_domain *d,
|
|
|
|
struct device_node *node,
|
|
|
|
const u32 *intspec,
|
|
|
|
unsigned int intsize,
|
|
|
|
unsigned long *out_hwirq,
|
|
|
|
unsigned int *out_type)
|
|
|
|
{
|
|
|
|
unsigned int ciu, bit;
|
|
|
|
|
|
|
|
ciu = intspec[0];
|
|
|
|
bit = intspec[1];
|
|
|
|
|
|
|
|
if (ciu > 1 || bit > 63)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
*out_hwirq = (ciu << 6) | bit;
|
|
|
|
*out_type = 0;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct irq_chip *octeon_irq_ciu_chip;
|
|
|
|
static struct irq_chip *octeon_irq_gpio_chip;
|
|
|
|
|
|
|
|
static bool octeon_irq_virq_in_range(unsigned int virq)
|
|
|
|
{
|
|
|
|
/* We cannot let it overflow the mapping array. */
|
|
|
|
if (virq < (1ul << 8 * sizeof(octeon_irq_ciu_to_irq[0][0])))
|
|
|
|
return true;
|
|
|
|
|
|
|
|
WARN_ONCE(true, "virq out of range %u.\n", virq);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int octeon_irq_ciu_map(struct irq_domain *d,
|
|
|
|
unsigned int virq, irq_hw_number_t hw)
|
|
|
|
{
|
|
|
|
unsigned int line = hw >> 6;
|
|
|
|
unsigned int bit = hw & 63;
|
|
|
|
|
|
|
|
if (!octeon_irq_virq_in_range(virq))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2014-03-20 06:03:30 +08:00
|
|
|
/* Don't map irq if it is reserved for GPIO. */
|
|
|
|
if (line == 0 && bit >= 16 && bit <32)
|
|
|
|
return 0;
|
|
|
|
|
2012-07-06 00:12:39 +08:00
|
|
|
if (line > 1 || octeon_irq_ciu_to_irq[line][bit] != 0)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
if (octeon_irq_ciu_is_edge(line, bit))
|
2012-04-05 06:34:41 +08:00
|
|
|
octeon_irq_set_ciu_mapping(virq, line, bit, 0,
|
2012-07-06 00:12:39 +08:00
|
|
|
octeon_irq_ciu_chip,
|
|
|
|
handle_edge_irq);
|
|
|
|
else
|
2012-04-05 06:34:41 +08:00
|
|
|
octeon_irq_set_ciu_mapping(virq, line, bit, 0,
|
2012-07-06 00:12:39 +08:00
|
|
|
octeon_irq_ciu_chip,
|
|
|
|
handle_level_irq);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-04-05 06:34:41 +08:00
|
|
|
static int octeon_irq_gpio_map_common(struct irq_domain *d,
|
|
|
|
unsigned int virq, irq_hw_number_t hw,
|
|
|
|
int line_limit, struct irq_chip *chip)
|
2012-07-06 00:12:39 +08:00
|
|
|
{
|
2012-08-11 07:00:31 +08:00
|
|
|
struct octeon_irq_gpio_domain_data *gpiod = d->host_data;
|
|
|
|
unsigned int line, bit;
|
2012-07-06 00:12:39 +08:00
|
|
|
|
|
|
|
if (!octeon_irq_virq_in_range(virq))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2013-04-11 23:29:39 +08:00
|
|
|
line = (hw + gpiod->base_hwirq) >> 6;
|
|
|
|
bit = (hw + gpiod->base_hwirq) & 63;
|
2012-04-05 06:34:41 +08:00
|
|
|
if (line > line_limit || octeon_irq_ciu_to_irq[line][bit] != 0)
|
2012-07-06 00:12:39 +08:00
|
|
|
return -EINVAL;
|
|
|
|
|
2012-04-05 06:34:41 +08:00
|
|
|
octeon_irq_set_ciu_mapping(virq, line, bit, hw,
|
|
|
|
chip, octeon_irq_handle_gpio);
|
2012-07-06 00:12:39 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-04-05 06:34:41 +08:00
|
|
|
static int octeon_irq_gpio_map(struct irq_domain *d,
|
|
|
|
unsigned int virq, irq_hw_number_t hw)
|
|
|
|
{
|
|
|
|
return octeon_irq_gpio_map_common(d, virq, hw, 1, octeon_irq_gpio_chip);
|
|
|
|
}
|
|
|
|
|
2012-07-06 00:12:39 +08:00
|
|
|
static struct irq_domain_ops octeon_irq_domain_ciu_ops = {
|
|
|
|
.map = octeon_irq_ciu_map,
|
|
|
|
.xlate = octeon_irq_ciu_xlat,
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct irq_domain_ops octeon_irq_domain_gpio_ops = {
|
|
|
|
.map = octeon_irq_gpio_map,
|
|
|
|
.xlate = octeon_irq_gpio_xlat,
|
|
|
|
};
|
|
|
|
|
2012-04-06 01:24:25 +08:00
|
|
|
static void octeon_irq_ip2_ciu(void)
|
2009-10-14 02:26:03 +08:00
|
|
|
{
|
2011-03-26 03:38:51 +08:00
|
|
|
const unsigned long core_id = cvmx_get_core_num();
|
|
|
|
u64 ciu_sum = cvmx_read_csr(CVMX_CIU_INTX_SUM0(core_id * 2));
|
|
|
|
|
mips: Replace __get_cpu_var uses
__get_cpu_var() is used for multiple purposes in the kernel source. One of
them is address calculation via the form &__get_cpu_var(x). This calculates
the address for the instance of the percpu variable of the current processor
based on an offset.
Other use cases are for storing and retrieving data from the current
processors percpu area. __get_cpu_var() can be used as an lvalue when
writing data or on the right side of an assignment.
__get_cpu_var() is defined as :
#define __get_cpu_var(var) (*this_cpu_ptr(&(var)))
__get_cpu_var() always only does an address determination. However, store
and retrieve operations could use a segment prefix (or global register on
other platforms) to avoid the address calculation.
this_cpu_write() and this_cpu_read() can directly take an offset into a
percpu area and use optimized assembly code to read and write per cpu
variables.
This patch converts __get_cpu_var into either an explicit address
calculation using this_cpu_ptr() or into a use of this_cpu operations that
use the offset. Thereby address calculations are avoided and less registers
are used when code is generated.
At the end of the patch set all uses of __get_cpu_var have been removed so
the macro is removed too.
The patch set includes passes over all arches as well. Once these operations
are used throughout then specialized macros can be defined in non -x86
arches as well in order to optimize per cpu access by f.e. using a global
register that may be set to the per cpu base.
Transformations done to __get_cpu_var()
1. Determine the address of the percpu instance of the current processor.
DEFINE_PER_CPU(int, y);
int *x = &__get_cpu_var(y);
Converts to
int *x = this_cpu_ptr(&y);
2. Same as #1 but this time an array structure is involved.
DEFINE_PER_CPU(int, y[20]);
int *x = __get_cpu_var(y);
Converts to
int *x = this_cpu_ptr(y);
3. Retrieve the content of the current processors instance of a per cpu
variable.
DEFINE_PER_CPU(int, y);
int x = __get_cpu_var(y)
Converts to
int x = __this_cpu_read(y);
4. Retrieve the content of a percpu struct
DEFINE_PER_CPU(struct mystruct, y);
struct mystruct x = __get_cpu_var(y);
Converts to
memcpy(&x, this_cpu_ptr(&y), sizeof(x));
5. Assignment to a per cpu variable
DEFINE_PER_CPU(int, y)
__get_cpu_var(y) = x;
Converts to
__this_cpu_write(y, x);
6. Increment/Decrement etc of a per cpu variable
DEFINE_PER_CPU(int, y);
__get_cpu_var(y)++
Converts to
__this_cpu_inc(y)
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
2014-08-18 01:30:44 +08:00
|
|
|
ciu_sum &= __this_cpu_read(octeon_irq_ciu0_en_mirror);
|
2011-03-26 03:38:51 +08:00
|
|
|
if (likely(ciu_sum)) {
|
|
|
|
int bit = fls64(ciu_sum) - 1;
|
|
|
|
int irq = octeon_irq_ciu_to_irq[0][bit];
|
|
|
|
if (likely(irq))
|
|
|
|
do_IRQ(irq);
|
|
|
|
else
|
|
|
|
spurious_interrupt();
|
|
|
|
} else {
|
|
|
|
spurious_interrupt();
|
2010-07-24 01:43:46 +08:00
|
|
|
}
|
2009-10-14 02:26:03 +08:00
|
|
|
}
|
|
|
|
|
2012-04-06 01:24:25 +08:00
|
|
|
static void octeon_irq_ip3_ciu(void)
|
2010-01-08 03:05:00 +08:00
|
|
|
{
|
2011-03-26 03:38:51 +08:00
|
|
|
u64 ciu_sum = cvmx_read_csr(CVMX_CIU_INT_SUM1);
|
|
|
|
|
mips: Replace __get_cpu_var uses
__get_cpu_var() is used for multiple purposes in the kernel source. One of
them is address calculation via the form &__get_cpu_var(x). This calculates
the address for the instance of the percpu variable of the current processor
based on an offset.
Other use cases are for storing and retrieving data from the current
processors percpu area. __get_cpu_var() can be used as an lvalue when
writing data or on the right side of an assignment.
__get_cpu_var() is defined as :
#define __get_cpu_var(var) (*this_cpu_ptr(&(var)))
__get_cpu_var() always only does an address determination. However, store
and retrieve operations could use a segment prefix (or global register on
other platforms) to avoid the address calculation.
this_cpu_write() and this_cpu_read() can directly take an offset into a
percpu area and use optimized assembly code to read and write per cpu
variables.
This patch converts __get_cpu_var into either an explicit address
calculation using this_cpu_ptr() or into a use of this_cpu operations that
use the offset. Thereby address calculations are avoided and less registers
are used when code is generated.
At the end of the patch set all uses of __get_cpu_var have been removed so
the macro is removed too.
The patch set includes passes over all arches as well. Once these operations
are used throughout then specialized macros can be defined in non -x86
arches as well in order to optimize per cpu access by f.e. using a global
register that may be set to the per cpu base.
Transformations done to __get_cpu_var()
1. Determine the address of the percpu instance of the current processor.
DEFINE_PER_CPU(int, y);
int *x = &__get_cpu_var(y);
Converts to
int *x = this_cpu_ptr(&y);
2. Same as #1 but this time an array structure is involved.
DEFINE_PER_CPU(int, y[20]);
int *x = __get_cpu_var(y);
Converts to
int *x = this_cpu_ptr(y);
3. Retrieve the content of the current processors instance of a per cpu
variable.
DEFINE_PER_CPU(int, y);
int x = __get_cpu_var(y)
Converts to
int x = __this_cpu_read(y);
4. Retrieve the content of a percpu struct
DEFINE_PER_CPU(struct mystruct, y);
struct mystruct x = __get_cpu_var(y);
Converts to
memcpy(&x, this_cpu_ptr(&y), sizeof(x));
5. Assignment to a per cpu variable
DEFINE_PER_CPU(int, y)
__get_cpu_var(y) = x;
Converts to
__this_cpu_write(y, x);
6. Increment/Decrement etc of a per cpu variable
DEFINE_PER_CPU(int, y);
__get_cpu_var(y)++
Converts to
__this_cpu_inc(y)
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
2014-08-18 01:30:44 +08:00
|
|
|
ciu_sum &= __this_cpu_read(octeon_irq_ciu1_en_mirror);
|
2011-03-26 03:38:51 +08:00
|
|
|
if (likely(ciu_sum)) {
|
|
|
|
int bit = fls64(ciu_sum) - 1;
|
|
|
|
int irq = octeon_irq_ciu_to_irq[1][bit];
|
|
|
|
if (likely(irq))
|
|
|
|
do_IRQ(irq);
|
|
|
|
else
|
|
|
|
spurious_interrupt();
|
|
|
|
} else {
|
|
|
|
spurious_interrupt();
|
|
|
|
}
|
2010-01-08 03:05:00 +08:00
|
|
|
}
|
|
|
|
|
2012-04-05 06:34:41 +08:00
|
|
|
static bool octeon_irq_use_ip4;
|
|
|
|
|
MIPS: Delete __cpuinit/__CPUINIT usage from MIPS code
commit 3747069b25e419f6b51395f48127e9812abc3596 upstream.
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
and are flagged as __cpuinit -- so if we remove the __cpuinit from
the arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
related content into no-ops as early as possible, since that will get
rid of these warnings. In any case, they are temporary and harmless.
Here, we remove all the MIPS __cpuinit from C code and __CPUINIT
from asm files. MIPS is interesting in this respect, because there
are also uasm users hiding behind their own renamed versions of the
__cpuinit macros.
[1] https://lkml.org/lkml/2013/5/20/589
[ralf@linux-mips.org: Folded in Paul's followup fix.]
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/5494/
Patchwork: https://patchwork.linux-mips.org/patch/5495/
Patchwork: https://patchwork.linux-mips.org/patch/5509/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2013-06-18 21:38:59 +08:00
|
|
|
static void octeon_irq_local_enable_ip4(void *arg)
|
2012-04-05 06:34:41 +08:00
|
|
|
{
|
|
|
|
set_c0_status(STATUSF_IP4);
|
|
|
|
}
|
|
|
|
|
2011-03-26 03:38:51 +08:00
|
|
|
static void octeon_irq_ip4_mask(void)
|
2009-10-14 02:26:03 +08:00
|
|
|
{
|
2011-03-26 03:38:51 +08:00
|
|
|
clear_c0_status(STATUSF_IP4);
|
|
|
|
spurious_interrupt();
|
2009-01-09 08:46:40 +08:00
|
|
|
}
|
|
|
|
|
2011-03-26 03:38:51 +08:00
|
|
|
static void (*octeon_irq_ip2)(void);
|
|
|
|
static void (*octeon_irq_ip3)(void);
|
|
|
|
static void (*octeon_irq_ip4)(void);
|
2009-01-09 08:46:40 +08:00
|
|
|
|
MIPS: Delete __cpuinit/__CPUINIT usage from MIPS code
commit 3747069b25e419f6b51395f48127e9812abc3596 upstream.
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
and are flagged as __cpuinit -- so if we remove the __cpuinit from
the arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
related content into no-ops as early as possible, since that will get
rid of these warnings. In any case, they are temporary and harmless.
Here, we remove all the MIPS __cpuinit from C code and __CPUINIT
from asm files. MIPS is interesting in this respect, because there
are also uasm users hiding behind their own renamed versions of the
__cpuinit macros.
[1] https://lkml.org/lkml/2013/5/20/589
[ralf@linux-mips.org: Folded in Paul's followup fix.]
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/5494/
Patchwork: https://patchwork.linux-mips.org/patch/5495/
Patchwork: https://patchwork.linux-mips.org/patch/5509/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2013-06-18 21:38:59 +08:00
|
|
|
void (*octeon_irq_setup_secondary)(void);
|
2010-07-24 01:43:46 +08:00
|
|
|
|
MIPS: Delete __cpuinit/__CPUINIT usage from MIPS code
commit 3747069b25e419f6b51395f48127e9812abc3596 upstream.
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
and are flagged as __cpuinit -- so if we remove the __cpuinit from
the arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
related content into no-ops as early as possible, since that will get
rid of these warnings. In any case, they are temporary and harmless.
Here, we remove all the MIPS __cpuinit from C code and __CPUINIT
from asm files. MIPS is interesting in this respect, because there
are also uasm users hiding behind their own renamed versions of the
__cpuinit macros.
[1] https://lkml.org/lkml/2013/5/20/589
[ralf@linux-mips.org: Folded in Paul's followup fix.]
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/5494/
Patchwork: https://patchwork.linux-mips.org/patch/5495/
Patchwork: https://patchwork.linux-mips.org/patch/5509/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2013-06-18 21:38:59 +08:00
|
|
|
void octeon_irq_set_ip4_handler(octeon_irq_ip4_handler_t h)
|
2012-04-05 06:34:41 +08:00
|
|
|
{
|
|
|
|
octeon_irq_ip4 = h;
|
|
|
|
octeon_irq_use_ip4 = true;
|
|
|
|
on_each_cpu(octeon_irq_local_enable_ip4, NULL, 1);
|
|
|
|
}
|
|
|
|
|
MIPS: Delete __cpuinit/__CPUINIT usage from MIPS code
commit 3747069b25e419f6b51395f48127e9812abc3596 upstream.
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
and are flagged as __cpuinit -- so if we remove the __cpuinit from
the arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
related content into no-ops as early as possible, since that will get
rid of these warnings. In any case, they are temporary and harmless.
Here, we remove all the MIPS __cpuinit from C code and __CPUINIT
from asm files. MIPS is interesting in this respect, because there
are also uasm users hiding behind their own renamed versions of the
__cpuinit macros.
[1] https://lkml.org/lkml/2013/5/20/589
[ralf@linux-mips.org: Folded in Paul's followup fix.]
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/5494/
Patchwork: https://patchwork.linux-mips.org/patch/5495/
Patchwork: https://patchwork.linux-mips.org/patch/5509/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2013-06-18 21:38:59 +08:00
|
|
|
static void octeon_irq_percpu_enable(void)
|
2011-03-26 03:38:51 +08:00
|
|
|
{
|
|
|
|
irq_cpu_online();
|
|
|
|
}
|
|
|
|
|
MIPS: Delete __cpuinit/__CPUINIT usage from MIPS code
commit 3747069b25e419f6b51395f48127e9812abc3596 upstream.
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
and are flagged as __cpuinit -- so if we remove the __cpuinit from
the arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
related content into no-ops as early as possible, since that will get
rid of these warnings. In any case, they are temporary and harmless.
Here, we remove all the MIPS __cpuinit from C code and __CPUINIT
from asm files. MIPS is interesting in this respect, because there
are also uasm users hiding behind their own renamed versions of the
__cpuinit macros.
[1] https://lkml.org/lkml/2013/5/20/589
[ralf@linux-mips.org: Folded in Paul's followup fix.]
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/5494/
Patchwork: https://patchwork.linux-mips.org/patch/5495/
Patchwork: https://patchwork.linux-mips.org/patch/5509/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2013-06-18 21:38:59 +08:00
|
|
|
static void octeon_irq_init_ciu_percpu(void)
|
2011-03-26 03:38:51 +08:00
|
|
|
{
|
|
|
|
int coreid = cvmx_get_core_num();
|
2012-04-06 01:24:25 +08:00
|
|
|
|
|
|
|
|
mips: Replace __get_cpu_var uses
__get_cpu_var() is used for multiple purposes in the kernel source. One of
them is address calculation via the form &__get_cpu_var(x). This calculates
the address for the instance of the percpu variable of the current processor
based on an offset.
Other use cases are for storing and retrieving data from the current
processors percpu area. __get_cpu_var() can be used as an lvalue when
writing data or on the right side of an assignment.
__get_cpu_var() is defined as :
#define __get_cpu_var(var) (*this_cpu_ptr(&(var)))
__get_cpu_var() always only does an address determination. However, store
and retrieve operations could use a segment prefix (or global register on
other platforms) to avoid the address calculation.
this_cpu_write() and this_cpu_read() can directly take an offset into a
percpu area and use optimized assembly code to read and write per cpu
variables.
This patch converts __get_cpu_var into either an explicit address
calculation using this_cpu_ptr() or into a use of this_cpu operations that
use the offset. Thereby address calculations are avoided and less registers
are used when code is generated.
At the end of the patch set all uses of __get_cpu_var have been removed so
the macro is removed too.
The patch set includes passes over all arches as well. Once these operations
are used throughout then specialized macros can be defined in non -x86
arches as well in order to optimize per cpu access by f.e. using a global
register that may be set to the per cpu base.
Transformations done to __get_cpu_var()
1. Determine the address of the percpu instance of the current processor.
DEFINE_PER_CPU(int, y);
int *x = &__get_cpu_var(y);
Converts to
int *x = this_cpu_ptr(&y);
2. Same as #1 but this time an array structure is involved.
DEFINE_PER_CPU(int, y[20]);
int *x = __get_cpu_var(y);
Converts to
int *x = this_cpu_ptr(y);
3. Retrieve the content of the current processors instance of a per cpu
variable.
DEFINE_PER_CPU(int, y);
int x = __get_cpu_var(y)
Converts to
int x = __this_cpu_read(y);
4. Retrieve the content of a percpu struct
DEFINE_PER_CPU(struct mystruct, y);
struct mystruct x = __get_cpu_var(y);
Converts to
memcpy(&x, this_cpu_ptr(&y), sizeof(x));
5. Assignment to a per cpu variable
DEFINE_PER_CPU(int, y)
__get_cpu_var(y) = x;
Converts to
__this_cpu_write(y, x);
6. Increment/Decrement etc of a per cpu variable
DEFINE_PER_CPU(int, y);
__get_cpu_var(y)++
Converts to
__this_cpu_inc(y)
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
2014-08-18 01:30:44 +08:00
|
|
|
__this_cpu_write(octeon_irq_ciu0_en_mirror, 0);
|
|
|
|
__this_cpu_write(octeon_irq_ciu1_en_mirror, 0);
|
2012-04-06 01:24:25 +08:00
|
|
|
wmb();
|
mips: Replace __get_cpu_var uses
__get_cpu_var() is used for multiple purposes in the kernel source. One of
them is address calculation via the form &__get_cpu_var(x). This calculates
the address for the instance of the percpu variable of the current processor
based on an offset.
Other use cases are for storing and retrieving data from the current
processors percpu area. __get_cpu_var() can be used as an lvalue when
writing data or on the right side of an assignment.
__get_cpu_var() is defined as :
#define __get_cpu_var(var) (*this_cpu_ptr(&(var)))
__get_cpu_var() always only does an address determination. However, store
and retrieve operations could use a segment prefix (or global register on
other platforms) to avoid the address calculation.
this_cpu_write() and this_cpu_read() can directly take an offset into a
percpu area and use optimized assembly code to read and write per cpu
variables.
This patch converts __get_cpu_var into either an explicit address
calculation using this_cpu_ptr() or into a use of this_cpu operations that
use the offset. Thereby address calculations are avoided and less registers
are used when code is generated.
At the end of the patch set all uses of __get_cpu_var have been removed so
the macro is removed too.
The patch set includes passes over all arches as well. Once these operations
are used throughout then specialized macros can be defined in non -x86
arches as well in order to optimize per cpu access by f.e. using a global
register that may be set to the per cpu base.
Transformations done to __get_cpu_var()
1. Determine the address of the percpu instance of the current processor.
DEFINE_PER_CPU(int, y);
int *x = &__get_cpu_var(y);
Converts to
int *x = this_cpu_ptr(&y);
2. Same as #1 but this time an array structure is involved.
DEFINE_PER_CPU(int, y[20]);
int *x = __get_cpu_var(y);
Converts to
int *x = this_cpu_ptr(y);
3. Retrieve the content of the current processors instance of a per cpu
variable.
DEFINE_PER_CPU(int, y);
int x = __get_cpu_var(y)
Converts to
int x = __this_cpu_read(y);
4. Retrieve the content of a percpu struct
DEFINE_PER_CPU(struct mystruct, y);
struct mystruct x = __get_cpu_var(y);
Converts to
memcpy(&x, this_cpu_ptr(&y), sizeof(x));
5. Assignment to a per cpu variable
DEFINE_PER_CPU(int, y)
__get_cpu_var(y) = x;
Converts to
__this_cpu_write(y, x);
6. Increment/Decrement etc of a per cpu variable
DEFINE_PER_CPU(int, y);
__get_cpu_var(y)++
Converts to
__this_cpu_inc(y)
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
2014-08-18 01:30:44 +08:00
|
|
|
raw_spin_lock_init(this_cpu_ptr(&octeon_irq_ciu_spinlock));
|
2009-01-09 08:46:40 +08:00
|
|
|
/*
|
2011-03-26 03:38:51 +08:00
|
|
|
* Disable All CIU Interrupts. The ones we need will be
|
|
|
|
* enabled later. Read the SUM register so we know the write
|
|
|
|
* completed.
|
2009-01-09 08:46:40 +08:00
|
|
|
*/
|
2011-03-26 03:38:51 +08:00
|
|
|
cvmx_write_csr(CVMX_CIU_INTX_EN0((coreid * 2)), 0);
|
|
|
|
cvmx_write_csr(CVMX_CIU_INTX_EN0((coreid * 2 + 1)), 0);
|
|
|
|
cvmx_write_csr(CVMX_CIU_INTX_EN1((coreid * 2)), 0);
|
|
|
|
cvmx_write_csr(CVMX_CIU_INTX_EN1((coreid * 2 + 1)), 0);
|
|
|
|
cvmx_read_csr(CVMX_CIU_INTX_SUM0((coreid * 2)));
|
2009-01-09 08:46:40 +08:00
|
|
|
}
|
2009-10-14 02:26:03 +08:00
|
|
|
|
2012-04-05 06:34:41 +08:00
|
|
|
static void octeon_irq_init_ciu2_percpu(void)
|
|
|
|
{
|
|
|
|
u64 regx, ipx;
|
|
|
|
int coreid = cvmx_get_core_num();
|
|
|
|
u64 base = CVMX_CIU2_EN_PPX_IP2_WRKQ(coreid);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Disable All CIU2 Interrupts. The ones we need will be
|
|
|
|
* enabled later. Read the SUM register so we know the write
|
|
|
|
* completed.
|
|
|
|
*
|
|
|
|
* There are 9 registers and 3 IPX levels with strides 0x1000
|
|
|
|
* and 0x200 respectivly. Use loops to clear them.
|
|
|
|
*/
|
|
|
|
for (regx = 0; regx <= 0x8000; regx += 0x1000) {
|
|
|
|
for (ipx = 0; ipx <= 0x400; ipx += 0x200)
|
|
|
|
cvmx_write_csr(base + regx + ipx, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
cvmx_read_csr(CVMX_CIU2_SUM_PPX_IP2(coreid));
|
|
|
|
}
|
|
|
|
|
MIPS: Delete __cpuinit/__CPUINIT usage from MIPS code
commit 3747069b25e419f6b51395f48127e9812abc3596 upstream.
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
and are flagged as __cpuinit -- so if we remove the __cpuinit from
the arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
related content into no-ops as early as possible, since that will get
rid of these warnings. In any case, they are temporary and harmless.
Here, we remove all the MIPS __cpuinit from C code and __CPUINIT
from asm files. MIPS is interesting in this respect, because there
are also uasm users hiding behind their own renamed versions of the
__cpuinit macros.
[1] https://lkml.org/lkml/2013/5/20/589
[ralf@linux-mips.org: Folded in Paul's followup fix.]
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/5494/
Patchwork: https://patchwork.linux-mips.org/patch/5495/
Patchwork: https://patchwork.linux-mips.org/patch/5509/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2013-06-18 21:38:59 +08:00
|
|
|
static void octeon_irq_setup_secondary_ciu(void)
|
2009-10-14 02:26:03 +08:00
|
|
|
{
|
2011-03-26 03:38:51 +08:00
|
|
|
octeon_irq_init_ciu_percpu();
|
|
|
|
octeon_irq_percpu_enable();
|
2009-01-09 08:46:40 +08:00
|
|
|
|
2011-03-26 03:38:51 +08:00
|
|
|
/* Enable the CIU lines */
|
|
|
|
set_c0_status(STATUSF_IP3 | STATUSF_IP2);
|
|
|
|
clear_c0_status(STATUSF_IP4);
|
|
|
|
}
|
2010-07-24 01:43:46 +08:00
|
|
|
|
2012-04-05 06:34:41 +08:00
|
|
|
static void octeon_irq_setup_secondary_ciu2(void)
|
|
|
|
{
|
|
|
|
octeon_irq_init_ciu2_percpu();
|
|
|
|
octeon_irq_percpu_enable();
|
|
|
|
|
|
|
|
/* Enable the CIU lines */
|
|
|
|
set_c0_status(STATUSF_IP3 | STATUSF_IP2);
|
|
|
|
if (octeon_irq_use_ip4)
|
|
|
|
set_c0_status(STATUSF_IP4);
|
|
|
|
else
|
|
|
|
clear_c0_status(STATUSF_IP4);
|
|
|
|
}
|
|
|
|
|
2011-03-26 03:38:51 +08:00
|
|
|
static void __init octeon_irq_init_ciu(void)
|
|
|
|
{
|
|
|
|
unsigned int i;
|
|
|
|
struct irq_chip *chip;
|
|
|
|
struct irq_chip *chip_mbox;
|
|
|
|
struct irq_chip *chip_wd;
|
2012-07-06 00:12:39 +08:00
|
|
|
struct device_node *gpio_node;
|
|
|
|
struct device_node *ciu_node;
|
2012-08-11 07:00:31 +08:00
|
|
|
struct irq_domain *ciu_domain = NULL;
|
2011-03-26 03:38:51 +08:00
|
|
|
|
|
|
|
octeon_irq_init_ciu_percpu();
|
|
|
|
octeon_irq_setup_secondary = octeon_irq_setup_secondary_ciu;
|
2010-07-24 01:43:46 +08:00
|
|
|
|
2012-04-06 01:24:25 +08:00
|
|
|
octeon_irq_ip2 = octeon_irq_ip2_ciu;
|
|
|
|
octeon_irq_ip3 = octeon_irq_ip3_ciu;
|
2011-03-26 03:38:51 +08:00
|
|
|
if (OCTEON_IS_MODEL(OCTEON_CN58XX_PASS2_X) ||
|
|
|
|
OCTEON_IS_MODEL(OCTEON_CN56XX_PASS2_X) ||
|
|
|
|
OCTEON_IS_MODEL(OCTEON_CN52XX_PASS2_X) ||
|
|
|
|
OCTEON_IS_MODEL(OCTEON_CN6XXX)) {
|
|
|
|
chip = &octeon_irq_chip_ciu_v2;
|
|
|
|
chip_mbox = &octeon_irq_chip_ciu_mbox_v2;
|
|
|
|
chip_wd = &octeon_irq_chip_ciu_wd_v2;
|
2012-07-06 00:12:39 +08:00
|
|
|
octeon_irq_gpio_chip = &octeon_irq_chip_ciu_gpio_v2;
|
2011-03-26 03:38:51 +08:00
|
|
|
} else {
|
|
|
|
chip = &octeon_irq_chip_ciu;
|
|
|
|
chip_mbox = &octeon_irq_chip_ciu_mbox;
|
|
|
|
chip_wd = &octeon_irq_chip_ciu_wd;
|
2012-07-06 00:12:39 +08:00
|
|
|
octeon_irq_gpio_chip = &octeon_irq_chip_ciu_gpio;
|
2011-03-26 03:38:51 +08:00
|
|
|
}
|
2012-07-06 00:12:39 +08:00
|
|
|
octeon_irq_ciu_chip = chip;
|
2011-03-26 03:38:51 +08:00
|
|
|
octeon_irq_ip4 = octeon_irq_ip4_mask;
|
|
|
|
|
|
|
|
/* Mips internal */
|
|
|
|
octeon_irq_init_core();
|
|
|
|
|
2012-07-06 00:12:39 +08:00
|
|
|
gpio_node = of_find_compatible_node(NULL, NULL, "cavium,octeon-3860-gpio");
|
|
|
|
if (gpio_node) {
|
|
|
|
struct octeon_irq_gpio_domain_data *gpiod;
|
|
|
|
|
|
|
|
gpiod = kzalloc(sizeof(*gpiod), GFP_KERNEL);
|
|
|
|
if (gpiod) {
|
|
|
|
/* gpio domain host_data is the base hwirq number. */
|
|
|
|
gpiod->base_hwirq = 16;
|
|
|
|
irq_domain_add_linear(gpio_node, 16, &octeon_irq_domain_gpio_ops, gpiod);
|
|
|
|
of_node_put(gpio_node);
|
|
|
|
} else
|
|
|
|
pr_warn("Cannot allocate memory for GPIO irq_domain.\n");
|
|
|
|
} else
|
|
|
|
pr_warn("Cannot find device node for cavium,octeon-3860-gpio.\n");
|
|
|
|
|
|
|
|
ciu_node = of_find_compatible_node(NULL, NULL, "cavium,octeon-3860-ciu");
|
|
|
|
if (ciu_node) {
|
2012-08-11 07:00:31 +08:00
|
|
|
ciu_domain = irq_domain_add_tree(ciu_node, &octeon_irq_domain_ciu_ops, NULL);
|
2012-08-30 07:09:22 +08:00
|
|
|
irq_set_default_host(ciu_domain);
|
2012-07-06 00:12:39 +08:00
|
|
|
of_node_put(ciu_node);
|
|
|
|
} else
|
2012-08-11 07:00:31 +08:00
|
|
|
panic("Cannot find device node for cavium,octeon-3860-ciu.");
|
|
|
|
|
|
|
|
/* CIU_0 */
|
|
|
|
for (i = 0; i < 16; i++)
|
|
|
|
octeon_irq_force_ciu_mapping(ciu_domain, i + OCTEON_IRQ_WORKQ0, 0, i + 0);
|
|
|
|
|
2012-04-05 06:34:41 +08:00
|
|
|
octeon_irq_set_ciu_mapping(OCTEON_IRQ_MBOX0, 0, 32, 0, chip_mbox, handle_percpu_irq);
|
|
|
|
octeon_irq_set_ciu_mapping(OCTEON_IRQ_MBOX1, 0, 33, 0, chip_mbox, handle_percpu_irq);
|
2012-08-11 07:00:31 +08:00
|
|
|
|
|
|
|
for (i = 0; i < 4; i++)
|
|
|
|
octeon_irq_force_ciu_mapping(ciu_domain, i + OCTEON_IRQ_PCI_INT0, 0, i + 36);
|
|
|
|
for (i = 0; i < 4; i++)
|
|
|
|
octeon_irq_force_ciu_mapping(ciu_domain, i + OCTEON_IRQ_PCI_MSI0, 0, i + 40);
|
|
|
|
|
2014-04-22 14:16:15 +08:00
|
|
|
octeon_irq_force_ciu_mapping(ciu_domain, OCTEON_IRQ_TWSI, 0, 45);
|
2012-08-11 07:00:31 +08:00
|
|
|
octeon_irq_force_ciu_mapping(ciu_domain, OCTEON_IRQ_RML, 0, 46);
|
|
|
|
for (i = 0; i < 4; i++)
|
|
|
|
octeon_irq_force_ciu_mapping(ciu_domain, i + OCTEON_IRQ_TIMER0, 0, i + 52);
|
|
|
|
|
|
|
|
octeon_irq_force_ciu_mapping(ciu_domain, OCTEON_IRQ_USB0, 0, 56);
|
2014-04-22 14:16:15 +08:00
|
|
|
octeon_irq_force_ciu_mapping(ciu_domain, OCTEON_IRQ_TWSI2, 0, 59);
|
2012-08-11 07:00:31 +08:00
|
|
|
|
|
|
|
/* CIU_1 */
|
|
|
|
for (i = 0; i < 16; i++)
|
2012-04-05 06:34:41 +08:00
|
|
|
octeon_irq_set_ciu_mapping(i + OCTEON_IRQ_WDOG0, 1, i + 0, 0, chip_wd, handle_level_irq);
|
2012-08-11 07:00:31 +08:00
|
|
|
|
|
|
|
octeon_irq_force_ciu_mapping(ciu_domain, OCTEON_IRQ_USB1, 1, 17);
|
2012-07-06 00:12:39 +08:00
|
|
|
|
2011-03-26 03:38:51 +08:00
|
|
|
/* Enable the CIU lines */
|
|
|
|
set_c0_status(STATUSF_IP3 | STATUSF_IP2);
|
|
|
|
clear_c0_status(STATUSF_IP4);
|
|
|
|
}
|
2010-07-24 01:43:46 +08:00
|
|
|
|
2012-04-05 06:34:41 +08:00
|
|
|
/*
|
|
|
|
* Watchdog interrupts are special. They are associated with a single
|
|
|
|
* core, so we hardwire the affinity to that core.
|
|
|
|
*/
|
|
|
|
static void octeon_irq_ciu2_wd_enable(struct irq_data *data)
|
|
|
|
{
|
|
|
|
u64 mask;
|
|
|
|
u64 en_addr;
|
|
|
|
int coreid = data->irq - OCTEON_IRQ_WDOG0;
|
|
|
|
union octeon_ciu_chip_data cd;
|
|
|
|
|
|
|
|
cd.p = irq_data_get_irq_chip_data(data);
|
|
|
|
mask = 1ull << (cd.s.bit);
|
|
|
|
|
|
|
|
en_addr = CVMX_CIU2_EN_PPX_IP2_WRKQ_W1S(coreid) + (0x1000ull * cd.s.line);
|
|
|
|
cvmx_write_csr(en_addr, mask);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
static void octeon_irq_ciu2_enable(struct irq_data *data)
|
|
|
|
{
|
|
|
|
u64 mask;
|
|
|
|
u64 en_addr;
|
|
|
|
int cpu = next_cpu_for_irq(data);
|
|
|
|
int coreid = octeon_coreid_for_cpu(cpu);
|
|
|
|
union octeon_ciu_chip_data cd;
|
|
|
|
|
|
|
|
cd.p = irq_data_get_irq_chip_data(data);
|
|
|
|
mask = 1ull << (cd.s.bit);
|
|
|
|
|
|
|
|
en_addr = CVMX_CIU2_EN_PPX_IP2_WRKQ_W1S(coreid) + (0x1000ull * cd.s.line);
|
|
|
|
cvmx_write_csr(en_addr, mask);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void octeon_irq_ciu2_enable_local(struct irq_data *data)
|
|
|
|
{
|
|
|
|
u64 mask;
|
|
|
|
u64 en_addr;
|
|
|
|
int coreid = cvmx_get_core_num();
|
|
|
|
union octeon_ciu_chip_data cd;
|
|
|
|
|
|
|
|
cd.p = irq_data_get_irq_chip_data(data);
|
|
|
|
mask = 1ull << (cd.s.bit);
|
|
|
|
|
|
|
|
en_addr = CVMX_CIU2_EN_PPX_IP2_WRKQ_W1S(coreid) + (0x1000ull * cd.s.line);
|
|
|
|
cvmx_write_csr(en_addr, mask);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
static void octeon_irq_ciu2_disable_local(struct irq_data *data)
|
|
|
|
{
|
|
|
|
u64 mask;
|
|
|
|
u64 en_addr;
|
|
|
|
int coreid = cvmx_get_core_num();
|
|
|
|
union octeon_ciu_chip_data cd;
|
|
|
|
|
|
|
|
cd.p = irq_data_get_irq_chip_data(data);
|
|
|
|
mask = 1ull << (cd.s.bit);
|
|
|
|
|
|
|
|
en_addr = CVMX_CIU2_EN_PPX_IP2_WRKQ_W1C(coreid) + (0x1000ull * cd.s.line);
|
|
|
|
cvmx_write_csr(en_addr, mask);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
static void octeon_irq_ciu2_ack(struct irq_data *data)
|
|
|
|
{
|
|
|
|
u64 mask;
|
|
|
|
u64 en_addr;
|
|
|
|
int coreid = cvmx_get_core_num();
|
|
|
|
union octeon_ciu_chip_data cd;
|
|
|
|
|
|
|
|
cd.p = irq_data_get_irq_chip_data(data);
|
|
|
|
mask = 1ull << (cd.s.bit);
|
|
|
|
|
|
|
|
en_addr = CVMX_CIU2_RAW_PPX_IP2_WRKQ(coreid) + (0x1000ull * cd.s.line);
|
|
|
|
cvmx_write_csr(en_addr, mask);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
static void octeon_irq_ciu2_disable_all(struct irq_data *data)
|
|
|
|
{
|
|
|
|
int cpu;
|
|
|
|
u64 mask;
|
|
|
|
union octeon_ciu_chip_data cd;
|
|
|
|
|
|
|
|
cd.p = irq_data_get_irq_chip_data(data);
|
|
|
|
mask = 1ull << (cd.s.bit);
|
|
|
|
|
|
|
|
for_each_online_cpu(cpu) {
|
|
|
|
u64 en_addr = CVMX_CIU2_EN_PPX_IP2_WRKQ_W1C(octeon_coreid_for_cpu(cpu)) + (0x1000ull * cd.s.line);
|
|
|
|
cvmx_write_csr(en_addr, mask);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void octeon_irq_ciu2_mbox_enable_all(struct irq_data *data)
|
|
|
|
{
|
|
|
|
int cpu;
|
|
|
|
u64 mask;
|
|
|
|
|
|
|
|
mask = 1ull << (data->irq - OCTEON_IRQ_MBOX0);
|
|
|
|
|
|
|
|
for_each_online_cpu(cpu) {
|
|
|
|
u64 en_addr = CVMX_CIU2_EN_PPX_IP3_MBOX_W1S(octeon_coreid_for_cpu(cpu));
|
|
|
|
cvmx_write_csr(en_addr, mask);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void octeon_irq_ciu2_mbox_disable_all(struct irq_data *data)
|
|
|
|
{
|
|
|
|
int cpu;
|
|
|
|
u64 mask;
|
|
|
|
|
|
|
|
mask = 1ull << (data->irq - OCTEON_IRQ_MBOX0);
|
|
|
|
|
|
|
|
for_each_online_cpu(cpu) {
|
|
|
|
u64 en_addr = CVMX_CIU2_EN_PPX_IP3_MBOX_W1C(octeon_coreid_for_cpu(cpu));
|
|
|
|
cvmx_write_csr(en_addr, mask);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void octeon_irq_ciu2_mbox_enable_local(struct irq_data *data)
|
|
|
|
{
|
|
|
|
u64 mask;
|
|
|
|
u64 en_addr;
|
|
|
|
int coreid = cvmx_get_core_num();
|
|
|
|
|
|
|
|
mask = 1ull << (data->irq - OCTEON_IRQ_MBOX0);
|
|
|
|
en_addr = CVMX_CIU2_EN_PPX_IP3_MBOX_W1S(coreid);
|
|
|
|
cvmx_write_csr(en_addr, mask);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void octeon_irq_ciu2_mbox_disable_local(struct irq_data *data)
|
|
|
|
{
|
|
|
|
u64 mask;
|
|
|
|
u64 en_addr;
|
|
|
|
int coreid = cvmx_get_core_num();
|
|
|
|
|
|
|
|
mask = 1ull << (data->irq - OCTEON_IRQ_MBOX0);
|
|
|
|
en_addr = CVMX_CIU2_EN_PPX_IP3_MBOX_W1C(coreid);
|
|
|
|
cvmx_write_csr(en_addr, mask);
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef CONFIG_SMP
|
|
|
|
static int octeon_irq_ciu2_set_affinity(struct irq_data *data,
|
|
|
|
const struct cpumask *dest, bool force)
|
|
|
|
{
|
|
|
|
int cpu;
|
|
|
|
bool enable_one = !irqd_irq_disabled(data) && !irqd_irq_masked(data);
|
|
|
|
u64 mask;
|
|
|
|
union octeon_ciu_chip_data cd;
|
|
|
|
|
|
|
|
if (!enable_one)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
cd.p = irq_data_get_irq_chip_data(data);
|
|
|
|
mask = 1ull << cd.s.bit;
|
|
|
|
|
|
|
|
for_each_online_cpu(cpu) {
|
|
|
|
u64 en_addr;
|
|
|
|
if (cpumask_test_cpu(cpu, dest) && enable_one) {
|
|
|
|
enable_one = false;
|
|
|
|
en_addr = CVMX_CIU2_EN_PPX_IP2_WRKQ_W1S(octeon_coreid_for_cpu(cpu)) + (0x1000ull * cd.s.line);
|
|
|
|
} else {
|
|
|
|
en_addr = CVMX_CIU2_EN_PPX_IP2_WRKQ_W1C(octeon_coreid_for_cpu(cpu)) + (0x1000ull * cd.s.line);
|
|
|
|
}
|
|
|
|
cvmx_write_csr(en_addr, mask);
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
static void octeon_irq_ciu2_enable_gpio(struct irq_data *data)
|
|
|
|
{
|
|
|
|
octeon_irq_gpio_setup(data);
|
|
|
|
octeon_irq_ciu2_enable(data);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void octeon_irq_ciu2_disable_gpio(struct irq_data *data)
|
|
|
|
{
|
|
|
|
union octeon_ciu_chip_data cd;
|
|
|
|
cd.p = irq_data_get_irq_chip_data(data);
|
|
|
|
|
|
|
|
cvmx_write_csr(CVMX_GPIO_BIT_CFGX(cd.s.gpio_line), 0);
|
|
|
|
|
|
|
|
octeon_irq_ciu2_disable_all(data);
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct irq_chip octeon_irq_chip_ciu2 = {
|
|
|
|
.name = "CIU2-E",
|
|
|
|
.irq_enable = octeon_irq_ciu2_enable,
|
|
|
|
.irq_disable = octeon_irq_ciu2_disable_all,
|
|
|
|
.irq_ack = octeon_irq_ciu2_ack,
|
|
|
|
.irq_mask = octeon_irq_ciu2_disable_local,
|
|
|
|
.irq_unmask = octeon_irq_ciu2_enable,
|
|
|
|
#ifdef CONFIG_SMP
|
|
|
|
.irq_set_affinity = octeon_irq_ciu2_set_affinity,
|
|
|
|
.irq_cpu_offline = octeon_irq_cpu_offline_ciu,
|
|
|
|
#endif
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct irq_chip octeon_irq_chip_ciu2_mbox = {
|
|
|
|
.name = "CIU2-M",
|
|
|
|
.irq_enable = octeon_irq_ciu2_mbox_enable_all,
|
|
|
|
.irq_disable = octeon_irq_ciu2_mbox_disable_all,
|
|
|
|
.irq_ack = octeon_irq_ciu2_mbox_disable_local,
|
|
|
|
.irq_eoi = octeon_irq_ciu2_mbox_enable_local,
|
|
|
|
|
|
|
|
.irq_cpu_online = octeon_irq_ciu2_mbox_enable_local,
|
|
|
|
.irq_cpu_offline = octeon_irq_ciu2_mbox_disable_local,
|
|
|
|
.flags = IRQCHIP_ONOFFLINE_ENABLED,
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct irq_chip octeon_irq_chip_ciu2_wd = {
|
|
|
|
.name = "CIU2-W",
|
|
|
|
.irq_enable = octeon_irq_ciu2_wd_enable,
|
|
|
|
.irq_disable = octeon_irq_ciu2_disable_all,
|
|
|
|
.irq_mask = octeon_irq_ciu2_disable_local,
|
|
|
|
.irq_unmask = octeon_irq_ciu2_enable_local,
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct irq_chip octeon_irq_chip_ciu2_gpio = {
|
|
|
|
.name = "CIU-GPIO",
|
|
|
|
.irq_enable = octeon_irq_ciu2_enable_gpio,
|
|
|
|
.irq_disable = octeon_irq_ciu2_disable_gpio,
|
|
|
|
.irq_ack = octeon_irq_ciu_gpio_ack,
|
|
|
|
.irq_mask = octeon_irq_ciu2_disable_local,
|
|
|
|
.irq_unmask = octeon_irq_ciu2_enable,
|
|
|
|
.irq_set_type = octeon_irq_ciu_gpio_set_type,
|
|
|
|
#ifdef CONFIG_SMP
|
|
|
|
.irq_set_affinity = octeon_irq_ciu2_set_affinity,
|
|
|
|
.irq_cpu_offline = octeon_irq_cpu_offline_ciu,
|
|
|
|
#endif
|
|
|
|
.flags = IRQCHIP_SET_TYPE_MASKED,
|
|
|
|
};
|
|
|
|
|
|
|
|
static int octeon_irq_ciu2_xlat(struct irq_domain *d,
|
|
|
|
struct device_node *node,
|
|
|
|
const u32 *intspec,
|
|
|
|
unsigned int intsize,
|
|
|
|
unsigned long *out_hwirq,
|
|
|
|
unsigned int *out_type)
|
|
|
|
{
|
|
|
|
unsigned int ciu, bit;
|
|
|
|
|
|
|
|
ciu = intspec[0];
|
|
|
|
bit = intspec[1];
|
|
|
|
|
|
|
|
*out_hwirq = (ciu << 6) | bit;
|
|
|
|
*out_type = 0;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool octeon_irq_ciu2_is_edge(unsigned int line, unsigned int bit)
|
|
|
|
{
|
|
|
|
bool edge = false;
|
|
|
|
|
|
|
|
if (line == 3) /* MIO */
|
|
|
|
switch (bit) {
|
2013-01-22 19:59:30 +08:00
|
|
|
case 2: /* IPD_DRP */
|
2012-04-05 06:34:41 +08:00
|
|
|
case 8 ... 11: /* Timers */
|
|
|
|
case 48: /* PTP */
|
|
|
|
edge = true;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else if (line == 6) /* PKT */
|
|
|
|
switch (bit) {
|
|
|
|
case 52 ... 53: /* ILK_DRP */
|
2013-01-22 19:59:30 +08:00
|
|
|
case 8 ... 12: /* GMX_DRP */
|
2012-04-05 06:34:41 +08:00
|
|
|
edge = true;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return edge;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int octeon_irq_ciu2_map(struct irq_domain *d,
|
|
|
|
unsigned int virq, irq_hw_number_t hw)
|
|
|
|
{
|
|
|
|
unsigned int line = hw >> 6;
|
|
|
|
unsigned int bit = hw & 63;
|
|
|
|
|
|
|
|
if (!octeon_irq_virq_in_range(virq))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2014-03-20 06:03:30 +08:00
|
|
|
/*
|
|
|
|
* Don't map irq if it is reserved for GPIO.
|
|
|
|
* (Line 7 are the GPIO lines.)
|
|
|
|
*/
|
|
|
|
if (line == 7)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (line > 7 || octeon_irq_ciu_to_irq[line][bit] != 0)
|
2012-04-05 06:34:41 +08:00
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
if (octeon_irq_ciu2_is_edge(line, bit))
|
|
|
|
octeon_irq_set_ciu_mapping(virq, line, bit, 0,
|
|
|
|
&octeon_irq_chip_ciu2,
|
|
|
|
handle_edge_irq);
|
|
|
|
else
|
|
|
|
octeon_irq_set_ciu_mapping(virq, line, bit, 0,
|
|
|
|
&octeon_irq_chip_ciu2,
|
|
|
|
handle_level_irq);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
static int octeon_irq_ciu2_gpio_map(struct irq_domain *d,
|
|
|
|
unsigned int virq, irq_hw_number_t hw)
|
|
|
|
{
|
|
|
|
return octeon_irq_gpio_map_common(d, virq, hw, 7, &octeon_irq_chip_ciu2_gpio);
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct irq_domain_ops octeon_irq_domain_ciu2_ops = {
|
|
|
|
.map = octeon_irq_ciu2_map,
|
|
|
|
.xlate = octeon_irq_ciu2_xlat,
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct irq_domain_ops octeon_irq_domain_ciu2_gpio_ops = {
|
|
|
|
.map = octeon_irq_ciu2_gpio_map,
|
|
|
|
.xlate = octeon_irq_gpio_xlat,
|
|
|
|
};
|
|
|
|
|
|
|
|
static void octeon_irq_ciu2(void)
|
|
|
|
{
|
|
|
|
int line;
|
|
|
|
int bit;
|
|
|
|
int irq;
|
|
|
|
u64 src_reg, src, sum;
|
|
|
|
const unsigned long core_id = cvmx_get_core_num();
|
|
|
|
|
|
|
|
sum = cvmx_read_csr(CVMX_CIU2_SUM_PPX_IP2(core_id)) & 0xfful;
|
|
|
|
|
|
|
|
if (unlikely(!sum))
|
|
|
|
goto spurious;
|
|
|
|
|
|
|
|
line = fls64(sum) - 1;
|
|
|
|
src_reg = CVMX_CIU2_SRC_PPX_IP2_WRKQ(core_id) + (0x1000 * line);
|
|
|
|
src = cvmx_read_csr(src_reg);
|
|
|
|
|
|
|
|
if (unlikely(!src))
|
|
|
|
goto spurious;
|
|
|
|
|
|
|
|
bit = fls64(src) - 1;
|
|
|
|
irq = octeon_irq_ciu_to_irq[line][bit];
|
|
|
|
if (unlikely(!irq))
|
|
|
|
goto spurious;
|
|
|
|
|
|
|
|
do_IRQ(irq);
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
spurious:
|
|
|
|
spurious_interrupt();
|
|
|
|
out:
|
|
|
|
/* CN68XX pass 1.x has an errata that accessing the ACK registers
|
|
|
|
can stop interrupts from propagating */
|
|
|
|
if (OCTEON_IS_MODEL(OCTEON_CN68XX))
|
|
|
|
cvmx_read_csr(CVMX_CIU2_INTR_CIU_READY);
|
|
|
|
else
|
|
|
|
cvmx_read_csr(CVMX_CIU2_ACK_PPX_IP2(core_id));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void octeon_irq_ciu2_mbox(void)
|
|
|
|
{
|
|
|
|
int line;
|
|
|
|
|
|
|
|
const unsigned long core_id = cvmx_get_core_num();
|
|
|
|
u64 sum = cvmx_read_csr(CVMX_CIU2_SUM_PPX_IP3(core_id)) >> 60;
|
|
|
|
|
|
|
|
if (unlikely(!sum))
|
|
|
|
goto spurious;
|
|
|
|
|
|
|
|
line = fls64(sum) - 1;
|
|
|
|
|
|
|
|
do_IRQ(OCTEON_IRQ_MBOX0 + line);
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
spurious:
|
|
|
|
spurious_interrupt();
|
|
|
|
out:
|
|
|
|
/* CN68XX pass 1.x has an errata that accessing the ACK registers
|
|
|
|
can stop interrupts from propagating */
|
|
|
|
if (OCTEON_IS_MODEL(OCTEON_CN68XX))
|
|
|
|
cvmx_read_csr(CVMX_CIU2_INTR_CIU_READY);
|
|
|
|
else
|
|
|
|
cvmx_read_csr(CVMX_CIU2_ACK_PPX_IP3(core_id));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void __init octeon_irq_init_ciu2(void)
|
|
|
|
{
|
|
|
|
unsigned int i;
|
|
|
|
struct device_node *gpio_node;
|
|
|
|
struct device_node *ciu_node;
|
|
|
|
struct irq_domain *ciu_domain = NULL;
|
|
|
|
|
|
|
|
octeon_irq_init_ciu2_percpu();
|
|
|
|
octeon_irq_setup_secondary = octeon_irq_setup_secondary_ciu2;
|
|
|
|
|
|
|
|
octeon_irq_ip2 = octeon_irq_ciu2;
|
|
|
|
octeon_irq_ip3 = octeon_irq_ciu2_mbox;
|
|
|
|
octeon_irq_ip4 = octeon_irq_ip4_mask;
|
|
|
|
|
|
|
|
/* Mips internal */
|
|
|
|
octeon_irq_init_core();
|
|
|
|
|
|
|
|
gpio_node = of_find_compatible_node(NULL, NULL, "cavium,octeon-3860-gpio");
|
|
|
|
if (gpio_node) {
|
|
|
|
struct octeon_irq_gpio_domain_data *gpiod;
|
|
|
|
|
|
|
|
gpiod = kzalloc(sizeof(*gpiod), GFP_KERNEL);
|
|
|
|
if (gpiod) {
|
|
|
|
/* gpio domain host_data is the base hwirq number. */
|
|
|
|
gpiod->base_hwirq = 7 << 6;
|
|
|
|
irq_domain_add_linear(gpio_node, 16, &octeon_irq_domain_ciu2_gpio_ops, gpiod);
|
|
|
|
of_node_put(gpio_node);
|
|
|
|
} else
|
|
|
|
pr_warn("Cannot allocate memory for GPIO irq_domain.\n");
|
|
|
|
} else
|
|
|
|
pr_warn("Cannot find device node for cavium,octeon-3860-gpio.\n");
|
|
|
|
|
|
|
|
ciu_node = of_find_compatible_node(NULL, NULL, "cavium,octeon-6880-ciu2");
|
|
|
|
if (ciu_node) {
|
|
|
|
ciu_domain = irq_domain_add_tree(ciu_node, &octeon_irq_domain_ciu2_ops, NULL);
|
2012-08-30 07:09:22 +08:00
|
|
|
irq_set_default_host(ciu_domain);
|
2012-04-05 06:34:41 +08:00
|
|
|
of_node_put(ciu_node);
|
|
|
|
} else
|
|
|
|
panic("Cannot find device node for cavium,octeon-6880-ciu2.");
|
|
|
|
|
|
|
|
/* CUI2 */
|
|
|
|
for (i = 0; i < 64; i++)
|
|
|
|
octeon_irq_force_ciu_mapping(ciu_domain, i + OCTEON_IRQ_WORKQ0, 0, i);
|
|
|
|
|
|
|
|
for (i = 0; i < 32; i++)
|
|
|
|
octeon_irq_set_ciu_mapping(i + OCTEON_IRQ_WDOG0, 1, i, 0,
|
|
|
|
&octeon_irq_chip_ciu2_wd, handle_level_irq);
|
|
|
|
|
|
|
|
for (i = 0; i < 4; i++)
|
|
|
|
octeon_irq_force_ciu_mapping(ciu_domain, i + OCTEON_IRQ_TIMER0, 3, i + 8);
|
|
|
|
|
|
|
|
octeon_irq_force_ciu_mapping(ciu_domain, OCTEON_IRQ_USB0, 3, 44);
|
|
|
|
|
|
|
|
for (i = 0; i < 4; i++)
|
|
|
|
octeon_irq_force_ciu_mapping(ciu_domain, i + OCTEON_IRQ_PCI_INT0, 4, i);
|
|
|
|
|
|
|
|
for (i = 0; i < 4; i++)
|
|
|
|
octeon_irq_force_ciu_mapping(ciu_domain, i + OCTEON_IRQ_PCI_MSI0, 4, i + 8);
|
|
|
|
|
|
|
|
irq_set_chip_and_handler(OCTEON_IRQ_MBOX0, &octeon_irq_chip_ciu2_mbox, handle_percpu_irq);
|
|
|
|
irq_set_chip_and_handler(OCTEON_IRQ_MBOX1, &octeon_irq_chip_ciu2_mbox, handle_percpu_irq);
|
|
|
|
irq_set_chip_and_handler(OCTEON_IRQ_MBOX2, &octeon_irq_chip_ciu2_mbox, handle_percpu_irq);
|
|
|
|
irq_set_chip_and_handler(OCTEON_IRQ_MBOX3, &octeon_irq_chip_ciu2_mbox, handle_percpu_irq);
|
|
|
|
|
|
|
|
/* Enable the CIU lines */
|
|
|
|
set_c0_status(STATUSF_IP3 | STATUSF_IP2);
|
|
|
|
clear_c0_status(STATUSF_IP4);
|
|
|
|
}
|
|
|
|
|
2009-01-09 08:46:40 +08:00
|
|
|
void __init arch_init_irq(void)
|
|
|
|
{
|
|
|
|
#ifdef CONFIG_SMP
|
|
|
|
/* Set the default affinity to the boot cpu. */
|
|
|
|
cpumask_clear(irq_default_affinity);
|
|
|
|
cpumask_set_cpu(smp_processor_id(), irq_default_affinity);
|
|
|
|
#endif
|
2012-04-05 06:34:41 +08:00
|
|
|
if (OCTEON_IS_MODEL(OCTEON_CN68XX))
|
|
|
|
octeon_irq_init_ciu2();
|
|
|
|
else
|
|
|
|
octeon_irq_init_ciu();
|
2009-01-09 08:46:40 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
asmlinkage void plat_irq_dispatch(void)
|
|
|
|
{
|
|
|
|
unsigned long cop0_cause;
|
|
|
|
unsigned long cop0_status;
|
|
|
|
|
|
|
|
while (1) {
|
|
|
|
cop0_cause = read_c0_cause();
|
|
|
|
cop0_status = read_c0_status();
|
|
|
|
cop0_cause &= cop0_status;
|
|
|
|
cop0_cause &= ST0_IM;
|
|
|
|
|
2011-03-26 03:38:51 +08:00
|
|
|
if (unlikely(cop0_cause & STATUSF_IP2))
|
|
|
|
octeon_irq_ip2();
|
|
|
|
else if (unlikely(cop0_cause & STATUSF_IP3))
|
|
|
|
octeon_irq_ip3();
|
|
|
|
else if (unlikely(cop0_cause & STATUSF_IP4))
|
|
|
|
octeon_irq_ip4();
|
|
|
|
else if (likely(cop0_cause))
|
2009-01-09 08:46:40 +08:00
|
|
|
do_IRQ(fls(cop0_cause) - 9 + MIPS_CPU_IRQ_BASE);
|
2011-03-26 03:38:51 +08:00
|
|
|
else
|
2009-01-09 08:46:40 +08:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2009-06-23 17:36:38 +08:00
|
|
|
|
|
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
|
|
|
2013-09-04 00:19:28 +08:00
|
|
|
void octeon_fixup_irqs(void)
|
2009-06-23 17:36:38 +08:00
|
|
|
{
|
2011-03-26 03:38:51 +08:00
|
|
|
irq_cpu_offline();
|
2009-06-23 17:36:38 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* CONFIG_HOTPLUG_CPU */
|