2012-06-13 21:01:28 +04:00
/*
* Marvell Armada 370 and Armada XP SoC IRQ handling
*
* Copyright ( C ) 2012 Marvell
*
* Lior Amsalem < alior @ marvell . com >
* Gregory CLEMENT < gregory . clement @ free - electrons . com >
* Thomas Petazzoni < thomas . petazzoni @ free - electrons . com >
* Ben Dooks < ben . dooks @ codethink . co . uk >
*
* This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed " as is " without any
* warranty of any kind , whether express or implied .
*/
# include <linux/kernel.h>
# include <linux/module.h>
# include <linux/init.h>
# include <linux/irq.h>
# include <linux/interrupt.h>
2015-07-08 00:11:46 +03:00
# include <linux/irqchip.h>
2014-02-11 00:00:02 +04:00
# include <linux/irqchip/chained_irq.h>
2014-04-14 17:54:02 +04:00
# include <linux/cpu.h>
2012-06-13 21:01:28 +04:00
# include <linux/io.h>
# include <linux/of_address.h>
# include <linux/of_irq.h>
2013-08-10 00:27:11 +04:00
# include <linux/of_pci.h>
2012-06-13 21:01:28 +04:00
# include <linux/irqdomain.h>
2013-08-10 00:27:11 +04:00
# include <linux/slab.h>
2014-11-21 19:00:00 +03:00
# include <linux/syscore_ops.h>
2013-08-10 00:27:11 +04:00
# include <linux/msi.h>
2012-06-13 21:01:28 +04:00
# include <asm/mach/arch.h>
# include <asm/exception.h>
2012-08-02 12:19:12 +04:00
# include <asm/smp_plat.h>
2013-04-10 01:26:15 +04:00
# include <asm/mach/irq.h>
2012-06-13 21:01:28 +04:00
/* Interrupt Controller Registers Map */
# define ARMADA_370_XP_INT_SET_MASK_OFFS (0x48)
# define ARMADA_370_XP_INT_CLEAR_MASK_OFFS (0x4C)
2015-03-03 13:43:16 +03:00
# define ARMADA_370_XP_INT_FABRIC_MASK_OFFS (0x54)
# define ARMADA_370_XP_INT_CAUSE_PERF(cpu) (1 << cpu)
2012-06-13 21:01:28 +04:00
2012-06-04 20:50:12 +04:00
# define ARMADA_370_XP_INT_CONTROL (0x00)
2012-06-13 21:01:28 +04:00
# define ARMADA_370_XP_INT_SET_ENABLE_OFFS (0x30)
# define ARMADA_370_XP_INT_CLEAR_ENABLE_OFFS (0x34)
2012-12-06 00:43:23 +04:00
# define ARMADA_370_XP_INT_SOURCE_CTL(irq) (0x100 + irq*4)
2014-03-05 00:43:41 +04:00
# define ARMADA_370_XP_INT_SOURCE_CPU_MASK 0xF
2014-09-25 15:17:19 +04:00
# define ARMADA_370_XP_INT_IRQ_FIQ_MASK(cpuid) ((BIT(0) | BIT(8)) << cpuid)
2012-06-13 21:01:28 +04:00
# define ARMADA_370_XP_CPU_INTACK_OFFS (0x44)
2014-02-11 00:00:02 +04:00
# define ARMADA_375_PPI_CAUSE (0x10)
2012-06-13 21:01:28 +04:00
2012-08-02 12:19:12 +04:00
# define ARMADA_370_XP_SW_TRIG_INT_OFFS (0x4)
# define ARMADA_370_XP_IN_DRBEL_MSK_OFFS (0xc)
# define ARMADA_370_XP_IN_DRBEL_CAUSE_OFFS (0x8)
2012-12-06 00:43:23 +04:00
# define ARMADA_370_XP_MAX_PER_CPU_IRQS (28)
2013-03-20 19:09:35 +04:00
# define ARMADA_370_XP_TIMER0_PER_CPU_IRQ (5)
2015-03-03 13:43:16 +03:00
# define ARMADA_370_XP_FABRIC_IRQ (3)
2013-03-20 19:09:35 +04:00
2013-04-10 01:26:17 +04:00
# define IPI_DOORBELL_START (0)
# define IPI_DOORBELL_END (8)
# define IPI_DOORBELL_MASK 0xFF
2013-08-10 00:27:11 +04:00
# define PCI_MSI_DOORBELL_START (16)
# define PCI_MSI_DOORBELL_NR (16)
# define PCI_MSI_DOORBELL_END (32)
# define PCI_MSI_DOORBELL_MASK 0xFFFF0000
2012-08-02 12:19:12 +04:00
2012-06-13 21:01:28 +04:00
static void __iomem * per_cpu_int_base ;
static void __iomem * main_int_base ;
static struct irq_domain * armada_370_xp_mpic_domain ;
2014-11-21 19:00:00 +03:00
static u32 doorbell_mask_reg ;
irqchip: armada-370-xp: Fix chained per-cpu interrupts
On the Cortex-A9-based Armada SoCs, the MPIC is not the primary interrupt
controller. Yet, it still has to handle some per-cpu interrupt.
To do so, it is chained with the GIC using a per-cpu interrupt. However, the
current code only call irq_set_chained_handler, which is called and enable that
interrupt only on the boot CPU, which means that the parent per-CPU interrupt
is never unmasked on the secondary CPUs, preventing the per-CPU interrupt to
actually work as expected.
This was not seen until now since the only MPIC PPI users were the Marvell
timers that were not working, but not used either since the system use the ARM
TWD by default, and the ethernet controllers, that are faking there interrupts
as SPI, and don't really expect to have interrupts on the secondary cores
anyway.
Add a CPU notifier that will enable the PPI on the secondary cores when they
are brought up.
Cc: <stable@vger.kernel.org> # 3.15+
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Link: https://lkml.kernel.org/r/1425378443-28822-1-git-send-email-maxime.ripard@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2015-03-03 13:27:23 +03:00
static int parent_irq ;
2013-08-10 00:27:11 +04:00
# ifdef CONFIG_PCI_MSI
static struct irq_domain * armada_370_xp_msi_domain ;
static DECLARE_BITMAP ( msi_used , PCI_MSI_DOORBELL_NR ) ;
static DEFINE_MUTEX ( msi_used_lock ) ;
static phys_addr_t msi_doorbell_addr ;
# endif
2012-06-13 21:01:28 +04:00
2015-03-03 13:43:15 +03:00
static inline bool is_percpu_irq ( irq_hw_number_t irq )
{
switch ( irq ) {
case ARMADA_370_XP_TIMER0_PER_CPU_IRQ :
2015-03-03 13:43:16 +03:00
case ARMADA_370_XP_FABRIC_IRQ :
2015-03-03 13:43:15 +03:00
return true ;
default :
return false ;
}
}
2012-12-06 00:43:23 +04:00
/*
* In SMP mode :
* For shared global interrupts , mask / unmask global enable bit
2013-03-16 02:34:04 +04:00
* For CPU interrupts , mask / unmask the calling CPU ' s bit
2012-12-06 00:43:23 +04:00
*/
2012-06-13 21:01:28 +04:00
static void armada_370_xp_irq_mask ( struct irq_data * d )
{
2012-12-06 00:43:23 +04:00
irq_hw_number_t hwirq = irqd_to_hwirq ( d ) ;
2015-03-03 13:43:15 +03:00
if ( ! is_percpu_irq ( hwirq ) )
2012-12-06 00:43:23 +04:00
writel ( hwirq , main_int_base +
ARMADA_370_XP_INT_CLEAR_ENABLE_OFFS ) ;
else
writel ( hwirq , per_cpu_int_base +
ARMADA_370_XP_INT_SET_MASK_OFFS ) ;
2012-06-13 21:01:28 +04:00
}
static void armada_370_xp_irq_unmask ( struct irq_data * d )
{
2012-12-06 00:43:23 +04:00
irq_hw_number_t hwirq = irqd_to_hwirq ( d ) ;
2015-03-03 13:43:15 +03:00
if ( ! is_percpu_irq ( hwirq ) )
2012-12-06 00:43:23 +04:00
writel ( hwirq , main_int_base +
ARMADA_370_XP_INT_SET_ENABLE_OFFS ) ;
else
writel ( hwirq , per_cpu_int_base +
ARMADA_370_XP_INT_CLEAR_MASK_OFFS ) ;
2012-06-13 21:01:28 +04:00
}
2013-08-10 00:27:11 +04:00
# ifdef CONFIG_PCI_MSI
static int armada_370_xp_alloc_msi ( void )
{
int hwirq ;
mutex_lock ( & msi_used_lock ) ;
hwirq = find_first_zero_bit ( & msi_used , PCI_MSI_DOORBELL_NR ) ;
if ( hwirq > = PCI_MSI_DOORBELL_NR )
hwirq = - ENOSPC ;
else
set_bit ( hwirq , msi_used ) ;
mutex_unlock ( & msi_used_lock ) ;
return hwirq ;
}
static void armada_370_xp_free_msi ( int hwirq )
{
mutex_lock ( & msi_used_lock ) ;
if ( ! test_bit ( hwirq , msi_used ) )
pr_err ( " trying to free unused MSI#%d \n " , hwirq ) ;
else
clear_bit ( hwirq , msi_used ) ;
mutex_unlock ( & msi_used_lock ) ;
}
2014-11-12 03:45:45 +03:00
static int armada_370_xp_setup_msi_irq ( struct msi_controller * chip ,
2013-08-10 00:27:11 +04:00
struct pci_dev * pdev ,
struct msi_desc * desc )
{
struct msi_msg msg ;
2014-04-18 16:19:47 +04:00
int virq , hwirq ;
2013-08-10 00:27:11 +04:00
2014-09-07 22:57:54 +04:00
/* We support MSI, but not MSI-X */
if ( desc - > msi_attrib . is_msix )
return - EINVAL ;
2013-08-10 00:27:11 +04:00
hwirq = armada_370_xp_alloc_msi ( ) ;
if ( hwirq < 0 )
return hwirq ;
virq = irq_create_mapping ( armada_370_xp_msi_domain , hwirq ) ;
if ( ! virq ) {
armada_370_xp_free_msi ( hwirq ) ;
return - EINVAL ;
}
irq_set_msi_desc ( virq , desc ) ;
msg . address_lo = msi_doorbell_addr ;
msg . address_hi = 0 ;
msg . data = 0xf00 | ( hwirq + 16 ) ;
2014-11-09 18:10:34 +03:00
pci_write_msi_msg ( virq , & msg ) ;
2013-08-10 00:27:11 +04:00
return 0 ;
}
2014-11-12 03:45:45 +03:00
static void armada_370_xp_teardown_msi_irq ( struct msi_controller * chip ,
2013-08-10 00:27:11 +04:00
unsigned int irq )
{
struct irq_data * d = irq_get_irq_data ( irq ) ;
2014-04-18 16:19:49 +04:00
unsigned long hwirq = d - > hwirq ;
2013-08-10 00:27:11 +04:00
irq_dispose_mapping ( irq ) ;
2014-04-18 16:19:49 +04:00
armada_370_xp_free_msi ( hwirq ) ;
2013-08-10 00:27:11 +04:00
}
static struct irq_chip armada_370_xp_msi_irq_chip = {
. name = " armada_370_xp_msi_irq " ,
2014-11-23 14:23:20 +03:00
. irq_enable = pci_msi_unmask_irq ,
. irq_disable = pci_msi_mask_irq ,
. irq_mask = pci_msi_mask_irq ,
. irq_unmask = pci_msi_unmask_irq ,
2013-08-10 00:27:11 +04:00
} ;
static int armada_370_xp_msi_map ( struct irq_domain * domain , unsigned int virq ,
irq_hw_number_t hw )
{
irq_set_chip_and_handler ( virq , & armada_370_xp_msi_irq_chip ,
handle_simple_irq ) ;
return 0 ;
}
static const struct irq_domain_ops armada_370_xp_msi_irq_ops = {
. map = armada_370_xp_msi_map ,
} ;
static int armada_370_xp_msi_init ( struct device_node * node ,
phys_addr_t main_int_phys_base )
{
2014-11-12 03:45:45 +03:00
struct msi_controller * msi_chip ;
2013-08-10 00:27:11 +04:00
u32 reg ;
int ret ;
msi_doorbell_addr = main_int_phys_base +
ARMADA_370_XP_SW_TRIG_INT_OFFS ;
msi_chip = kzalloc ( sizeof ( * msi_chip ) , GFP_KERNEL ) ;
if ( ! msi_chip )
return - ENOMEM ;
msi_chip - > setup_irq = armada_370_xp_setup_msi_irq ;
msi_chip - > teardown_irq = armada_370_xp_teardown_msi_irq ;
msi_chip - > of_node = node ;
armada_370_xp_msi_domain =
irq_domain_add_linear ( NULL , PCI_MSI_DOORBELL_NR ,
& armada_370_xp_msi_irq_ops ,
NULL ) ;
if ( ! armada_370_xp_msi_domain ) {
kfree ( msi_chip ) ;
return - ENOMEM ;
}
ret = of_pci_msi_chip_add ( msi_chip ) ;
if ( ret < 0 ) {
irq_domain_remove ( armada_370_xp_msi_domain ) ;
kfree ( msi_chip ) ;
return ret ;
}
reg = readl ( per_cpu_int_base + ARMADA_370_XP_IN_DRBEL_MSK_OFFS )
| PCI_MSI_DOORBELL_MASK ;
writel ( reg , per_cpu_int_base +
ARMADA_370_XP_IN_DRBEL_MSK_OFFS ) ;
/* Unmask IPI interrupt */
writel ( 1 , per_cpu_int_base + ARMADA_370_XP_INT_CLEAR_MASK_OFFS ) ;
return 0 ;
}
# else
static inline int armada_370_xp_msi_init ( struct device_node * node ,
phys_addr_t main_int_phys_base )
{
return 0 ;
}
# endif
2012-08-02 12:19:12 +04:00
# ifdef CONFIG_SMP
2014-01-21 01:52:05 +04:00
static DEFINE_RAW_SPINLOCK ( irq_controller_lock ) ;
2012-08-02 12:19:12 +04:00
static int armada_xp_set_affinity ( struct irq_data * d ,
const struct cpumask * mask_val , bool force )
{
2012-12-06 00:43:23 +04:00
irq_hw_number_t hwirq = irqd_to_hwirq ( d ) ;
2014-03-05 00:43:41 +04:00
unsigned long reg , mask ;
2012-12-06 00:43:23 +04:00
int cpu ;
2014-03-05 00:43:41 +04:00
/* Select a single core from the affinity mask which is online */
cpu = cpumask_any_and ( mask_val , cpu_online_mask ) ;
mask = 1UL < < cpu_logical_map ( cpu ) ;
2012-12-06 00:43:23 +04:00
raw_spin_lock ( & irq_controller_lock ) ;
reg = readl ( main_int_base + ARMADA_370_XP_INT_SOURCE_CTL ( hwirq ) ) ;
2014-03-05 00:43:41 +04:00
reg = ( reg & ( ~ ARMADA_370_XP_INT_SOURCE_CPU_MASK ) ) | mask ;
2012-12-06 00:43:23 +04:00
writel ( reg , main_int_base + ARMADA_370_XP_INT_SOURCE_CTL ( hwirq ) ) ;
raw_spin_unlock ( & irq_controller_lock ) ;
2014-10-24 15:59:16 +04:00
return IRQ_SET_MASK_OK ;
2012-08-02 12:19:12 +04:00
}
# endif
2012-06-13 21:01:28 +04:00
static struct irq_chip armada_370_xp_irq_chip = {
. name = " armada_370_xp_irq " ,
. irq_mask = armada_370_xp_irq_mask ,
. irq_mask_ack = armada_370_xp_irq_mask ,
. irq_unmask = armada_370_xp_irq_unmask ,
2012-08-02 12:19:12 +04:00
# ifdef CONFIG_SMP
. irq_set_affinity = armada_xp_set_affinity ,
# endif
2015-03-30 17:04:37 +03:00
. flags = IRQCHIP_SKIP_SET_WAKE | IRQCHIP_MASK_ON_SUSPEND ,
2012-06-13 21:01:28 +04:00
} ;
static int armada_370_xp_mpic_irq_map ( struct irq_domain * h ,
unsigned int virq , irq_hw_number_t hw )
{
armada_370_xp_irq_mask ( irq_get_irq_data ( virq ) ) ;
2015-03-03 13:43:15 +03:00
if ( ! is_percpu_irq ( hw ) )
2013-04-05 16:32:52 +04:00
writel ( hw , per_cpu_int_base +
ARMADA_370_XP_INT_CLEAR_MASK_OFFS ) ;
else
writel ( hw , main_int_base + ARMADA_370_XP_INT_SET_ENABLE_OFFS ) ;
2012-06-13 21:01:28 +04:00
irq_set_status_flags ( virq , IRQ_LEVEL ) ;
2013-01-25 21:32:41 +04:00
2015-03-03 13:43:15 +03:00
if ( is_percpu_irq ( hw ) ) {
2013-01-25 21:32:41 +04:00
irq_set_percpu_devid ( virq ) ;
irq_set_chip_and_handler ( virq , & armada_370_xp_irq_chip ,
handle_percpu_devid_irq ) ;
} else {
irq_set_chip_and_handler ( virq , & armada_370_xp_irq_chip ,
handle_level_irq ) ;
}
2015-08-30 02:01:22 +03:00
irq_set_probe ( virq ) ;
2012-06-13 21:01:28 +04:00
return 0 ;
}
2014-04-14 17:54:02 +04:00
static void armada_xp_mpic_smp_cpu_init ( void )
2012-08-02 12:19:12 +04:00
{
2014-05-31 00:18:18 +04:00
u32 control ;
int nr_irqs , i ;
control = readl ( main_int_base + ARMADA_370_XP_INT_CONTROL ) ;
nr_irqs = ( control > > 2 ) & 0x3ff ;
for ( i = 0 ; i < nr_irqs ; i + + )
writel ( i , per_cpu_int_base + ARMADA_370_XP_INT_SET_MASK_OFFS ) ;
2012-08-02 12:19:12 +04:00
/* Clear pending IPIs */
writel ( 0 , per_cpu_int_base + ARMADA_370_XP_IN_DRBEL_CAUSE_OFFS ) ;
/* Enable first 8 IPIs */
2013-04-10 01:26:17 +04:00
writel ( IPI_DOORBELL_MASK , per_cpu_int_base +
2012-08-02 12:19:12 +04:00
ARMADA_370_XP_IN_DRBEL_MSK_OFFS ) ;
/* Unmask IPI interrupt */
writel ( 0 , per_cpu_int_base + ARMADA_370_XP_INT_CLEAR_MASK_OFFS ) ;
}
2014-04-14 17:54:02 +04:00
2015-03-03 13:43:16 +03:00
static void armada_xp_mpic_perf_init ( void )
{
unsigned long cpuid = cpu_logical_map ( smp_processor_id ( ) ) ;
/* Enable Performance Counter Overflow interrupts */
writel ( ARMADA_370_XP_INT_CAUSE_PERF ( cpuid ) ,
per_cpu_int_base + ARMADA_370_XP_INT_FABRIC_MASK_OFFS ) ;
}
2015-03-03 13:43:14 +03:00
# ifdef CONFIG_SMP
static void armada_mpic_send_doorbell ( const struct cpumask * mask ,
unsigned int irq )
{
int cpu ;
unsigned long map = 0 ;
/* Convert our logical CPU mask into a physical one. */
for_each_cpu ( cpu , mask )
map | = 1 < < cpu_logical_map ( cpu ) ;
/*
* Ensure that stores to Normal memory are visible to the
* other CPUs before issuing the IPI .
*/
dsb ( ) ;
/* submit softirq */
writel ( ( map < < 8 ) | irq , main_int_base +
ARMADA_370_XP_SW_TRIG_INT_OFFS ) ;
}
2014-04-14 17:54:02 +04:00
static int armada_xp_mpic_secondary_init ( struct notifier_block * nfb ,
unsigned long action , void * hcpu )
{
2015-03-03 13:43:16 +03:00
if ( action = = CPU_STARTING | | action = = CPU_STARTING_FROZEN ) {
armada_xp_mpic_perf_init ( ) ;
2014-04-14 17:54:02 +04:00
armada_xp_mpic_smp_cpu_init ( ) ;
2015-03-03 13:43:16 +03:00
}
irqchip: armada-370-xp: Fix chained per-cpu interrupts
On the Cortex-A9-based Armada SoCs, the MPIC is not the primary interrupt
controller. Yet, it still has to handle some per-cpu interrupt.
To do so, it is chained with the GIC using a per-cpu interrupt. However, the
current code only call irq_set_chained_handler, which is called and enable that
interrupt only on the boot CPU, which means that the parent per-CPU interrupt
is never unmasked on the secondary CPUs, preventing the per-CPU interrupt to
actually work as expected.
This was not seen until now since the only MPIC PPI users were the Marvell
timers that were not working, but not used either since the system use the ARM
TWD by default, and the ethernet controllers, that are faking there interrupts
as SPI, and don't really expect to have interrupts on the secondary cores
anyway.
Add a CPU notifier that will enable the PPI on the secondary cores when they
are brought up.
Cc: <stable@vger.kernel.org> # 3.15+
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Link: https://lkml.kernel.org/r/1425378443-28822-1-git-send-email-maxime.ripard@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2015-03-03 13:27:23 +03:00
2014-04-14 17:54:02 +04:00
return NOTIFY_OK ;
}
static struct notifier_block armada_370_xp_mpic_cpu_notifier = {
. notifier_call = armada_xp_mpic_secondary_init ,
. priority = 100 ,
} ;
irqchip: armada-370-xp: Fix chained per-cpu interrupts
On the Cortex-A9-based Armada SoCs, the MPIC is not the primary interrupt
controller. Yet, it still has to handle some per-cpu interrupt.
To do so, it is chained with the GIC using a per-cpu interrupt. However, the
current code only call irq_set_chained_handler, which is called and enable that
interrupt only on the boot CPU, which means that the parent per-CPU interrupt
is never unmasked on the secondary CPUs, preventing the per-CPU interrupt to
actually work as expected.
This was not seen until now since the only MPIC PPI users were the Marvell
timers that were not working, but not used either since the system use the ARM
TWD by default, and the ethernet controllers, that are faking there interrupts
as SPI, and don't really expect to have interrupts on the secondary cores
anyway.
Add a CPU notifier that will enable the PPI on the secondary cores when they
are brought up.
Cc: <stable@vger.kernel.org> # 3.15+
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Link: https://lkml.kernel.org/r/1425378443-28822-1-git-send-email-maxime.ripard@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2015-03-03 13:27:23 +03:00
static int mpic_cascaded_secondary_init ( struct notifier_block * nfb ,
unsigned long action , void * hcpu )
{
2015-03-03 13:43:16 +03:00
if ( action = = CPU_STARTING | | action = = CPU_STARTING_FROZEN ) {
armada_xp_mpic_perf_init ( ) ;
irqchip: armada-370-xp: Fix chained per-cpu interrupts
On the Cortex-A9-based Armada SoCs, the MPIC is not the primary interrupt
controller. Yet, it still has to handle some per-cpu interrupt.
To do so, it is chained with the GIC using a per-cpu interrupt. However, the
current code only call irq_set_chained_handler, which is called and enable that
interrupt only on the boot CPU, which means that the parent per-CPU interrupt
is never unmasked on the secondary CPUs, preventing the per-CPU interrupt to
actually work as expected.
This was not seen until now since the only MPIC PPI users were the Marvell
timers that were not working, but not used either since the system use the ARM
TWD by default, and the ethernet controllers, that are faking there interrupts
as SPI, and don't really expect to have interrupts on the secondary cores
anyway.
Add a CPU notifier that will enable the PPI on the secondary cores when they
are brought up.
Cc: <stable@vger.kernel.org> # 3.15+
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Link: https://lkml.kernel.org/r/1425378443-28822-1-git-send-email-maxime.ripard@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2015-03-03 13:27:23 +03:00
enable_percpu_irq ( parent_irq , IRQ_TYPE_NONE ) ;
2015-03-03 13:43:16 +03:00
}
irqchip: armada-370-xp: Fix chained per-cpu interrupts
On the Cortex-A9-based Armada SoCs, the MPIC is not the primary interrupt
controller. Yet, it still has to handle some per-cpu interrupt.
To do so, it is chained with the GIC using a per-cpu interrupt. However, the
current code only call irq_set_chained_handler, which is called and enable that
interrupt only on the boot CPU, which means that the parent per-CPU interrupt
is never unmasked on the secondary CPUs, preventing the per-CPU interrupt to
actually work as expected.
This was not seen until now since the only MPIC PPI users were the Marvell
timers that were not working, but not used either since the system use the ARM
TWD by default, and the ethernet controllers, that are faking there interrupts
as SPI, and don't really expect to have interrupts on the secondary cores
anyway.
Add a CPU notifier that will enable the PPI on the secondary cores when they
are brought up.
Cc: <stable@vger.kernel.org> # 3.15+
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Link: https://lkml.kernel.org/r/1425378443-28822-1-git-send-email-maxime.ripard@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2015-03-03 13:27:23 +03:00
return NOTIFY_OK ;
}
static struct notifier_block mpic_cascaded_cpu_notifier = {
. notifier_call = mpic_cascaded_secondary_init ,
. priority = 100 ,
} ;
2012-08-02 12:19:12 +04:00
# endif /* CONFIG_SMP */
2015-04-27 15:54:24 +03:00
static const struct irq_domain_ops armada_370_xp_mpic_irq_ops = {
2012-06-13 21:01:28 +04:00
. map = armada_370_xp_mpic_irq_map ,
. xlate = irq_domain_xlate_onecell ,
} ;
2014-02-11 00:00:01 +04:00
# ifdef CONFIG_PCI_MSI
2014-02-11 00:00:02 +04:00
static void armada_370_xp_handle_msi_irq ( struct pt_regs * regs , bool is_chained )
2014-02-11 00:00:01 +04:00
{
u32 msimask , msinr ;
msimask = readl_relaxed ( per_cpu_int_base +
ARMADA_370_XP_IN_DRBEL_CAUSE_OFFS )
& PCI_MSI_DOORBELL_MASK ;
writel ( ~ msimask , per_cpu_int_base +
ARMADA_370_XP_IN_DRBEL_CAUSE_OFFS ) ;
for ( msinr = PCI_MSI_DOORBELL_START ;
msinr < PCI_MSI_DOORBELL_END ; msinr + + ) {
int irq ;
if ( ! ( msimask & BIT ( msinr ) ) )
continue ;
2014-08-26 14:03:21 +04:00
if ( is_chained ) {
irq = irq_find_mapping ( armada_370_xp_msi_domain ,
msinr - 16 ) ;
2014-02-11 00:00:02 +04:00
generic_handle_irq ( irq ) ;
2014-08-26 14:03:21 +04:00
} else {
irq = msinr - 16 ;
handle_domain_irq ( armada_370_xp_msi_domain ,
irq , regs ) ;
}
2014-02-11 00:00:01 +04:00
}
}
# else
2014-02-11 00:00:02 +04:00
static void armada_370_xp_handle_msi_irq ( struct pt_regs * r , bool b ) { }
2014-02-11 00:00:01 +04:00
# endif
2015-09-14 11:42:37 +03:00
static void armada_370_xp_mpic_handle_cascade_irq ( struct irq_desc * desc )
2014-02-11 00:00:02 +04:00
{
2015-06-04 07:13:20 +03:00
struct irq_chip * chip = irq_desc_get_chip ( desc ) ;
2014-09-25 15:17:19 +04:00
unsigned long irqmap , irqn , irqsrc , cpuid ;
2014-02-11 00:00:02 +04:00
unsigned int cascade_irq ;
chained_irq_enter ( chip , desc ) ;
irqmap = readl_relaxed ( per_cpu_int_base + ARMADA_375_PPI_CAUSE ) ;
2014-09-25 15:17:19 +04:00
cpuid = cpu_logical_map ( smp_processor_id ( ) ) ;
2014-02-11 00:00:02 +04:00
for_each_set_bit ( irqn , & irqmap , BITS_PER_LONG ) {
2014-09-25 15:17:19 +04:00
irqsrc = readl_relaxed ( main_int_base +
ARMADA_370_XP_INT_SOURCE_CTL ( irqn ) ) ;
/* Check if the interrupt is not masked on current CPU.
* Test IRQ ( 0 - 1 ) and FIQ ( 8 - 9 ) mask bits .
*/
if ( ! ( irqsrc & ARMADA_370_XP_INT_IRQ_FIQ_MASK ( cpuid ) ) )
continue ;
if ( irqn = = 1 ) {
armada_370_xp_handle_msi_irq ( NULL , true ) ;
continue ;
}
2014-02-11 00:00:02 +04:00
cascade_irq = irq_find_mapping ( armada_370_xp_mpic_domain , irqn ) ;
generic_handle_irq ( cascade_irq ) ;
}
chained_irq_exit ( chip , desc ) ;
}
2014-03-05 04:40:30 +04:00
static void __exception_irq_entry
2013-04-10 01:26:15 +04:00
armada_370_xp_handle_irq ( struct pt_regs * regs )
2012-06-13 21:01:28 +04:00
{
u32 irqstat , irqnr ;
do {
irqstat = readl_relaxed ( per_cpu_int_base +
ARMADA_370_XP_CPU_INTACK_OFFS ) ;
irqnr = irqstat & 0x3FF ;
2012-08-02 12:19:12 +04:00
if ( irqnr > 1022 )
break ;
2013-08-10 00:27:11 +04:00
if ( irqnr > 1 ) {
2014-08-26 14:03:21 +04:00
handle_domain_irq ( armada_370_xp_mpic_domain ,
irqnr , regs ) ;
2012-06-13 21:01:28 +04:00
continue ;
}
2013-08-10 00:27:11 +04:00
/* MSI handling */
2014-02-11 00:00:01 +04:00
if ( irqnr = = 1 )
2014-02-11 00:00:02 +04:00
armada_370_xp_handle_msi_irq ( regs , false ) ;
2013-08-10 00:27:11 +04:00
2012-08-02 12:19:12 +04:00
# ifdef CONFIG_SMP
/* IPI Handling */
if ( irqnr = = 0 ) {
u32 ipimask , ipinr ;
ipimask = readl_relaxed ( per_cpu_int_base +
ARMADA_370_XP_IN_DRBEL_CAUSE_OFFS )
2013-04-10 01:26:17 +04:00
& IPI_DOORBELL_MASK ;
2012-08-02 12:19:12 +04:00
2013-11-25 20:26:44 +04:00
writel ( ~ ipimask , per_cpu_int_base +
2012-08-02 12:19:12 +04:00
ARMADA_370_XP_IN_DRBEL_CAUSE_OFFS ) ;
/* Handle all pending doorbells */
2013-04-10 01:26:17 +04:00
for ( ipinr = IPI_DOORBELL_START ;
ipinr < IPI_DOORBELL_END ; ipinr + + ) {
2012-08-02 12:19:12 +04:00
if ( ipimask & ( 0x1 < < ipinr ) )
handle_IPI ( ipinr , regs ) ;
}
continue ;
}
# endif
2012-06-13 21:01:28 +04:00
} while ( 1 ) ;
}
2014-11-21 19:00:00 +03:00
static int armada_370_xp_mpic_suspend ( void )
{
doorbell_mask_reg = readl ( per_cpu_int_base +
ARMADA_370_XP_IN_DRBEL_MSK_OFFS ) ;
return 0 ;
}
static void armada_370_xp_mpic_resume ( void )
{
int nirqs ;
irq_hw_number_t irq ;
/* Re-enable interrupts */
nirqs = ( readl ( main_int_base + ARMADA_370_XP_INT_CONTROL ) > > 2 ) & 0x3ff ;
for ( irq = 0 ; irq < nirqs ; irq + + ) {
struct irq_data * data ;
int virq ;
virq = irq_linear_revmap ( armada_370_xp_mpic_domain , irq ) ;
if ( virq = = 0 )
continue ;
if ( irq ! = ARMADA_370_XP_TIMER0_PER_CPU_IRQ )
writel ( irq , per_cpu_int_base +
ARMADA_370_XP_INT_CLEAR_MASK_OFFS ) ;
else
writel ( irq , main_int_base +
ARMADA_370_XP_INT_SET_ENABLE_OFFS ) ;
data = irq_get_irq_data ( virq ) ;
if ( ! irqd_irq_disabled ( data ) )
armada_370_xp_irq_unmask ( data ) ;
}
/* Reconfigure doorbells for IPIs and MSIs */
writel ( doorbell_mask_reg ,
per_cpu_int_base + ARMADA_370_XP_IN_DRBEL_MSK_OFFS ) ;
if ( doorbell_mask_reg & IPI_DOORBELL_MASK )
writel ( 0 , per_cpu_int_base + ARMADA_370_XP_INT_CLEAR_MASK_OFFS ) ;
if ( doorbell_mask_reg & PCI_MSI_DOORBELL_MASK )
writel ( 1 , per_cpu_int_base + ARMADA_370_XP_INT_CLEAR_MASK_OFFS ) ;
}
struct syscore_ops armada_370_xp_mpic_syscore_ops = {
. suspend = armada_370_xp_mpic_suspend ,
. resume = armada_370_xp_mpic_resume ,
} ;
2013-04-10 01:26:16 +04:00
static int __init armada_370_xp_mpic_of_init ( struct device_node * node ,
struct device_node * parent )
2012-06-13 21:01:28 +04:00
{
2013-08-10 00:27:10 +04:00
struct resource main_int_res , per_cpu_int_res ;
irqchip: armada-370-xp: Fix chained per-cpu interrupts
On the Cortex-A9-based Armada SoCs, the MPIC is not the primary interrupt
controller. Yet, it still has to handle some per-cpu interrupt.
To do so, it is chained with the GIC using a per-cpu interrupt. However, the
current code only call irq_set_chained_handler, which is called and enable that
interrupt only on the boot CPU, which means that the parent per-CPU interrupt
is never unmasked on the secondary CPUs, preventing the per-CPU interrupt to
actually work as expected.
This was not seen until now since the only MPIC PPI users were the Marvell
timers that were not working, but not used either since the system use the ARM
TWD by default, and the ethernet controllers, that are faking there interrupts
as SPI, and don't really expect to have interrupts on the secondary cores
anyway.
Add a CPU notifier that will enable the PPI on the secondary cores when they
are brought up.
Cc: <stable@vger.kernel.org> # 3.15+
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Link: https://lkml.kernel.org/r/1425378443-28822-1-git-send-email-maxime.ripard@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2015-03-03 13:27:23 +03:00
int nr_irqs , i ;
2013-04-10 01:26:16 +04:00
u32 control ;
2013-08-10 00:27:10 +04:00
BUG_ON ( of_address_to_resource ( node , 0 , & main_int_res ) ) ;
BUG_ON ( of_address_to_resource ( node , 1 , & per_cpu_int_res ) ) ;
2013-04-10 01:26:16 +04:00
2013-08-10 00:27:10 +04:00
BUG_ON ( ! request_mem_region ( main_int_res . start ,
resource_size ( & main_int_res ) ,
node - > full_name ) ) ;
BUG_ON ( ! request_mem_region ( per_cpu_int_res . start ,
resource_size ( & per_cpu_int_res ) ,
node - > full_name ) ) ;
main_int_base = ioremap ( main_int_res . start ,
resource_size ( & main_int_res ) ) ;
2013-04-10 01:26:16 +04:00
BUG_ON ( ! main_int_base ) ;
2013-08-10 00:27:10 +04:00
per_cpu_int_base = ioremap ( per_cpu_int_res . start ,
resource_size ( & per_cpu_int_res ) ) ;
2013-04-10 01:26:16 +04:00
BUG_ON ( ! per_cpu_int_base ) ;
control = readl ( main_int_base + ARMADA_370_XP_INT_CONTROL ) ;
2014-05-31 00:18:18 +04:00
nr_irqs = ( control > > 2 ) & 0x3ff ;
for ( i = 0 ; i < nr_irqs ; i + + )
writel ( i , main_int_base + ARMADA_370_XP_INT_CLEAR_ENABLE_OFFS ) ;
2013-04-10 01:26:16 +04:00
armada_370_xp_mpic_domain =
2014-05-31 00:18:18 +04:00
irq_domain_add_linear ( node , nr_irqs ,
2013-04-10 01:26:16 +04:00
& armada_370_xp_mpic_irq_ops , NULL ) ;
2013-08-10 00:27:10 +04:00
BUG_ON ( ! armada_370_xp_mpic_domain ) ;
2013-04-10 01:26:16 +04:00
2015-03-03 13:43:14 +03:00
/* Setup for the boot CPU */
2015-03-03 13:43:16 +03:00
armada_xp_mpic_perf_init ( ) ;
2013-04-10 01:26:16 +04:00
armada_xp_mpic_smp_cpu_init ( ) ;
2013-08-10 00:27:11 +04:00
armada_370_xp_msi_init ( node , main_int_res . start ) ;
2014-02-11 00:00:02 +04:00
parent_irq = irq_of_parse_and_map ( node , 0 ) ;
if ( parent_irq < = 0 ) {
irq_set_default_host ( armada_370_xp_mpic_domain ) ;
set_handle_irq ( armada_370_xp_handle_irq ) ;
2014-04-14 17:54:01 +04:00
# ifdef CONFIG_SMP
set_smp_cross_call ( armada_mpic_send_doorbell ) ;
2014-04-14 17:54:02 +04:00
register_cpu_notifier ( & armada_370_xp_mpic_cpu_notifier ) ;
2014-04-14 17:54:01 +04:00
# endif
2014-02-11 00:00:02 +04:00
} else {
irqchip: armada-370-xp: Fix chained per-cpu interrupts
On the Cortex-A9-based Armada SoCs, the MPIC is not the primary interrupt
controller. Yet, it still has to handle some per-cpu interrupt.
To do so, it is chained with the GIC using a per-cpu interrupt. However, the
current code only call irq_set_chained_handler, which is called and enable that
interrupt only on the boot CPU, which means that the parent per-CPU interrupt
is never unmasked on the secondary CPUs, preventing the per-CPU interrupt to
actually work as expected.
This was not seen until now since the only MPIC PPI users were the Marvell
timers that were not working, but not used either since the system use the ARM
TWD by default, and the ethernet controllers, that are faking there interrupts
as SPI, and don't really expect to have interrupts on the secondary cores
anyway.
Add a CPU notifier that will enable the PPI on the secondary cores when they
are brought up.
Cc: <stable@vger.kernel.org> # 3.15+
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Link: https://lkml.kernel.org/r/1425378443-28822-1-git-send-email-maxime.ripard@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2015-03-03 13:27:23 +03:00
# ifdef CONFIG_SMP
register_cpu_notifier ( & mpic_cascaded_cpu_notifier ) ;
# endif
2014-02-11 00:00:02 +04:00
irq_set_chained_handler ( parent_irq ,
armada_370_xp_mpic_handle_cascade_irq ) ;
}
2013-04-10 01:26:16 +04:00
2014-11-21 19:00:00 +03:00
register_syscore_ops ( & armada_370_xp_mpic_syscore_ops ) ;
2013-04-10 01:26:16 +04:00
return 0 ;
2012-06-13 21:01:28 +04:00
}
2013-04-10 01:26:16 +04:00
2013-04-10 01:26:15 +04:00
IRQCHIP_DECLARE ( armada_370_xp_mpic , " marvell,mpic " , armada_370_xp_mpic_of_init ) ;