Commit 2be6bb0c authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: intc: Split up the INTC code. 



This splits up the sh intc core in to something more vaguely resembling
a subsystem. Most of the functionality was alread fairly well
compartmentalized, and there were only a handful of interdependencies
that needed to be resolved in the process.

This also serves as future-proofing for the genirq and sparseirq rework,
which will make some of the split out functionality wholly generic,
allowing things to be killed off in place with minimal migration pain.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent d74310d3

drivers/sh/Kconfig

+3 −31
Original line number Diff line number Diff line 
config INTC_USERIMASK

	bool "Userspace interrupt masking support"

	depends on ARCH_SHMOBILE || (SUPERH && CPU_SH4A)

	help

	  This enables support for hardware-assisted userspace hardirq

	  masking.

menu "SuperH / SH-Mobile Driver Options"



	  SH-4A and newer interrupt blocks all support a special shadowed

	  page with all non-masking registers obscured when mapped in to

	  userspace. This is primarily for use by userspace device

	  drivers that are using special priority levels.

source "drivers/sh/intc/Kconfig"



	  If in doubt, say N.



config INTC_BALANCING

	bool "Hardware IRQ balancing support"

	depends on SMP && SUPERH && CPU_SHX3

	help

	  This enables support for IRQ auto-distribution mode on SH-X3

	  SMP parts. All of the balancing and CPU wakeup decisions are

	  taken care of automatically by hardware for distributed

	  vectors.



	  If in doubt, say N.



config INTC_MAPPING_DEBUG

	bool "Expose IRQ to per-controller id mapping via debugfs"

	depends on DEBUG_FS

	help

	  This will create a debugfs entry for showing the relationship

	  between system IRQs and the per-controller id tables.



	  If in doubt, say N.
 
endmenu

drivers/sh/Makefile

+1 −1
Original line number Diff line number Diff line 
#

# Makefile for the SuperH specific drivers.

#

obj-y	:= clk.o intc.o

obj-y	:= clk.o intc/



obj-$(CONFIG_SUPERHYWAY)	+= superhyway/

obj-$(CONFIG_MAPLE)		+= maple/

drivers/sh/intc.c

deleted100644 → 0
+0 −1776

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/sh/intc/access.c

0 → 100644
+237 −0
Original line number Diff line number Diff line 
/*

 * Common INTC2 register accessors

 *

 * Copyright (C) 2007, 2008 Magnus Damm

 * Copyright (C) 2009, 2010 Paul Mundt

 *

 * 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.

 */

#include <linux/io.h>

#include "internals.h"



unsigned long intc_phys_to_virt(struct intc_desc_int *d, unsigned long address)

{

	struct intc_window *window;

	int k;



	/* scan through physical windows and convert address */

	for (k = 0; k < d->nr_windows; k++) {

		window = d->window + k;



		if (address < window->phys)

			continue;



		if (address >= (window->phys + window->size))

			continue;



		address -= window->phys;

		address += (unsigned long)window->virt;



		return address;

	}



	/* no windows defined, register must be 1:1 mapped virt:phys */

	return address;

}



unsigned int intc_get_reg(struct intc_desc_int *d, unsigned long address)

{

	unsigned int k;



	address = intc_phys_to_virt(d, address);



	for (k = 0; k < d->nr_reg; k++) {

		if (d->reg[k] == address)

			return k;

	}



	BUG();

	return 0;

}



unsigned int intc_set_field_from_handle(unsigned int value,

					unsigned int field_value,

					unsigned int handle)

{

	unsigned int width = _INTC_WIDTH(handle);

	unsigned int shift = _INTC_SHIFT(handle);



	value &= ~(((1 << width) - 1) << shift);

	value |= field_value << shift;

	return value;

}



unsigned long intc_get_field_from_handle(unsigned int value, unsigned int handle)

{

	unsigned int width = _INTC_WIDTH(handle);

	unsigned int shift = _INTC_SHIFT(handle);

	unsigned int mask = ((1 << width) - 1) << shift;



	return (value & mask) >> shift;

}



static unsigned long test_8(unsigned long addr, unsigned long h,

			    unsigned long ignore)

{

	return intc_get_field_from_handle(__raw_readb(addr), h);

}



static unsigned long test_16(unsigned long addr, unsigned long h,

			     unsigned long ignore)

{

	return intc_get_field_from_handle(__raw_readw(addr), h);

}



static unsigned long test_32(unsigned long addr, unsigned long h,

			     unsigned long ignore)

{

	return intc_get_field_from_handle(__raw_readl(addr), h);

}



static unsigned long write_8(unsigned long addr, unsigned long h,

			     unsigned long data)

{

	__raw_writeb(intc_set_field_from_handle(0, data, h), addr);

	(void)__raw_readb(addr);	/* Defeat write posting */

	return 0;

}



static unsigned long write_16(unsigned long addr, unsigned long h,

			      unsigned long data)

{

	__raw_writew(intc_set_field_from_handle(0, data, h), addr);

	(void)__raw_readw(addr);	/* Defeat write posting */

	return 0;

}



static unsigned long write_32(unsigned long addr, unsigned long h,

			      unsigned long data)

{

	__raw_writel(intc_set_field_from_handle(0, data, h), addr);

	(void)__raw_readl(addr);	/* Defeat write posting */

	return 0;

}



static unsigned long modify_8(unsigned long addr, unsigned long h,

			      unsigned long data)

{

	unsigned long flags;

	unsigned int value;

	local_irq_save(flags);

	value = intc_set_field_from_handle(__raw_readb(addr), data, h);

	__raw_writeb(value, addr);

	(void)__raw_readb(addr);	/* Defeat write posting */

	local_irq_restore(flags);

	return 0;

}



static unsigned long modify_16(unsigned long addr, unsigned long h,

			       unsigned long data)

{

	unsigned long flags;

	unsigned int value;

	local_irq_save(flags);

	value = intc_set_field_from_handle(__raw_readw(addr), data, h);

	__raw_writew(value, addr);

	(void)__raw_readw(addr);	/* Defeat write posting */

	local_irq_restore(flags);

	return 0;

}



static unsigned long modify_32(unsigned long addr, unsigned long h,

			       unsigned long data)

{

	unsigned long flags;

	unsigned int value;

	local_irq_save(flags);

	value = intc_set_field_from_handle(__raw_readl(addr), data, h);

	__raw_writel(value, addr);

	(void)__raw_readl(addr);	/* Defeat write posting */

	local_irq_restore(flags);

	return 0;

}



static unsigned long intc_mode_field(unsigned long addr,

				     unsigned long handle,

				     unsigned long (*fn)(unsigned long,

						unsigned long,

						unsigned long),

				     unsigned int irq)

{

	return fn(addr, handle, ((1 << _INTC_WIDTH(handle)) - 1));

}



static unsigned long intc_mode_zero(unsigned long addr,

				    unsigned long handle,

				    unsigned long (*fn)(unsigned long,

					       unsigned long,

					       unsigned long),

				    unsigned int irq)

{

	return fn(addr, handle, 0);

}



static unsigned long intc_mode_prio(unsigned long addr,

				    unsigned long handle,

				    unsigned long (*fn)(unsigned long,

					       unsigned long,

					       unsigned long),

				    unsigned int irq)

{

	return fn(addr, handle, intc_get_prio_level(irq));

}



unsigned long (*intc_reg_fns[])(unsigned long addr,

				unsigned long h,

				unsigned long data) = {

	[REG_FN_TEST_BASE + 0] = test_8,

	[REG_FN_TEST_BASE + 1] = test_16,

	[REG_FN_TEST_BASE + 3] = test_32,

	[REG_FN_WRITE_BASE + 0] = write_8,

	[REG_FN_WRITE_BASE + 1] = write_16,

	[REG_FN_WRITE_BASE + 3] = write_32,

	[REG_FN_MODIFY_BASE + 0] = modify_8,

	[REG_FN_MODIFY_BASE + 1] = modify_16,

	[REG_FN_MODIFY_BASE + 3] = modify_32,

};



unsigned long (*intc_enable_fns[])(unsigned long addr,

				   unsigned long handle,

				   unsigned long (*fn)(unsigned long,

					    unsigned long,

					    unsigned long),

				   unsigned int irq) = {

	[MODE_ENABLE_REG] = intc_mode_field,

	[MODE_MASK_REG] = intc_mode_zero,

	[MODE_DUAL_REG] = intc_mode_field,

	[MODE_PRIO_REG] = intc_mode_prio,

	[MODE_PCLR_REG] = intc_mode_prio,

};



unsigned long (*intc_disable_fns[])(unsigned long addr,

				    unsigned long handle,

				    unsigned long (*fn)(unsigned long,

					     unsigned long,

					     unsigned long),

				    unsigned int irq) = {

	[MODE_ENABLE_REG] = intc_mode_zero,

	[MODE_MASK_REG] = intc_mode_field,

	[MODE_DUAL_REG] = intc_mode_field,

	[MODE_PRIO_REG] = intc_mode_zero,

	[MODE_PCLR_REG] = intc_mode_field,

};



unsigned long (*intc_enable_noprio_fns[])(unsigned long addr,

					  unsigned long handle,

					  unsigned long (*fn)(unsigned long,

						unsigned long,

						unsigned long),

					  unsigned int irq) = {

	[MODE_ENABLE_REG] = intc_mode_field,

	[MODE_MASK_REG] = intc_mode_zero,

	[MODE_DUAL_REG] = intc_mode_field,

	[MODE_PRIO_REG] = intc_mode_field,

	[MODE_PCLR_REG] = intc_mode_field,

};

drivers/sh/intc/balancing.c

0 → 100644
+97 −0
Original line number Diff line number Diff line 
/*

 * Support for hardware-managed IRQ auto-distribution.

 *

 * Copyright (C) 2010  Paul Mundt

 *

 * 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.

 */

#include "internals.h"



static unsigned long dist_handle[NR_IRQS];



void intc_balancing_enable(unsigned int irq)

{

	struct intc_desc_int *d = get_intc_desc(irq);

	unsigned long handle = dist_handle[irq];

	unsigned long addr;



	if (irq_balancing_disabled(irq) || !handle)

		return;



	addr = INTC_REG(d, _INTC_ADDR_D(handle), 0);

	intc_reg_fns[_INTC_FN(handle)](addr, handle, 1);

}



void intc_balancing_disable(unsigned int irq)

{

	struct intc_desc_int *d = get_intc_desc(irq);

	unsigned long handle = dist_handle[irq];

	unsigned long addr;



	if (irq_balancing_disabled(irq) || !handle)

		return;



	addr = INTC_REG(d, _INTC_ADDR_D(handle), 0);

	intc_reg_fns[_INTC_FN(handle)](addr, handle, 0);

}



static unsigned int intc_dist_data(struct intc_desc *desc,

				   struct intc_desc_int *d,

				   intc_enum enum_id)

{

	struct intc_mask_reg *mr = desc->hw.mask_regs;

	unsigned int i, j, fn, mode;

	unsigned long reg_e, reg_d;



	for (i = 0; mr && enum_id && i < desc->hw.nr_mask_regs; i++) {

		mr = desc->hw.mask_regs + i;



		/*

		 * Skip this entry if there's no auto-distribution

		 * register associated with it.

		 */

		if (!mr->dist_reg)

			continue;



		for (j = 0; j < ARRAY_SIZE(mr->enum_ids); j++) {

			if (mr->enum_ids[j] != enum_id)

				continue;



			fn = REG_FN_MODIFY_BASE;

			mode = MODE_ENABLE_REG;

			reg_e = mr->dist_reg;

			reg_d = mr->dist_reg;



			fn += (mr->reg_width >> 3) - 1;

			return _INTC_MK(fn, mode,

					intc_get_reg(d, reg_e),

					intc_get_reg(d, reg_d),

					1,

					(mr->reg_width - 1) - j);

		}

	}



	/*

	 * It's possible we've gotten here with no distribution options

	 * available for the IRQ in question, so we just skip over those.

	 */

	return 0;

}



void intc_set_dist_handle(unsigned int irq, struct intc_desc *desc,

			  struct intc_desc_int *d, intc_enum id)

{

	unsigned long flags;



	/*

	 * Nothing to do for this IRQ.

	 */

	if (!desc->hw.mask_regs)

		return;



	raw_spin_lock_irqsave(&intc_big_lock, flags);

	dist_handle[irq] = intc_dist_data(desc, d, id);

	raw_spin_unlock_irqrestore(&intc_big_lock, flags);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE