Merge branch 'irqdomain/merge' of git://git.secretlab.ca/git/linux-2.6
Pull the code to generalize the powerpc VIRQ_DEBUG code from Grant Likely. That code had been moved into generic irqdomain code, but still had powerpc-specific code and could only be enabled on powerpc. * 'irqdomain/merge' of git://git.secretlab.ca/git/linux-2.6: irqdomain/powerpc: updated defconfigs for VIRQ_DEBUG rename irqdomain: Remove powerpc dependency from debugfs file
This commit is contained in:
commit
55a3203089
|
@ -114,16 +114,6 @@ config DEBUGGER
|
||||||
depends on KGDB || XMON
|
depends on KGDB || XMON
|
||||||
default y
|
default y
|
||||||
|
|
||||||
config VIRQ_DEBUG
|
|
||||||
bool "Expose hardware/virtual IRQ mapping via debugfs"
|
|
||||||
depends on DEBUG_FS
|
|
||||||
help
|
|
||||||
This option will show the mapping relationship between hardware irq
|
|
||||||
numbers and virtual irq numbers. The mapping is exposed via debugfs
|
|
||||||
in the file powerpc/virq_mapping.
|
|
||||||
|
|
||||||
If you don't know what this means you don't need it.
|
|
||||||
|
|
||||||
config BDI_SWITCH
|
config BDI_SWITCH
|
||||||
bool "Include BDI-2000 user context switcher"
|
bool "Include BDI-2000 user context switcher"
|
||||||
depends on DEBUG_KERNEL && PPC32
|
depends on DEBUG_KERNEL && PPC32
|
||||||
|
|
|
@ -165,7 +165,7 @@ CONFIG_DETECT_HUNG_TASK=y
|
||||||
CONFIG_DEBUG_INFO=y
|
CONFIG_DEBUG_INFO=y
|
||||||
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
|
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
|
||||||
CONFIG_SYSCTL_SYSCALL_CHECK=y
|
CONFIG_SYSCTL_SYSCALL_CHECK=y
|
||||||
CONFIG_VIRQ_DEBUG=y
|
CONFIG_IRQ_DOMAIN_DEBUG=y
|
||||||
CONFIG_CRYPTO_PCBC=m
|
CONFIG_CRYPTO_PCBC=m
|
||||||
CONFIG_CRYPTO_SHA256=y
|
CONFIG_CRYPTO_SHA256=y
|
||||||
CONFIG_CRYPTO_SHA512=y
|
CONFIG_CRYPTO_SHA512=y
|
||||||
|
|
|
@ -279,7 +279,7 @@ CONFIG_FTRACE_SYSCALLS=y
|
||||||
CONFIG_PPC_EMULATED_STATS=y
|
CONFIG_PPC_EMULATED_STATS=y
|
||||||
CONFIG_XMON=y
|
CONFIG_XMON=y
|
||||||
CONFIG_XMON_DEFAULT=y
|
CONFIG_XMON_DEFAULT=y
|
||||||
CONFIG_VIRQ_DEBUG=y
|
CONFIG_IRQ_DOMAIN_DEBUG=y
|
||||||
CONFIG_PPC_EARLY_DEBUG=y
|
CONFIG_PPC_EARLY_DEBUG=y
|
||||||
CONFIG_KEYS_DEBUG_PROC_KEYS=y
|
CONFIG_KEYS_DEBUG_PROC_KEYS=y
|
||||||
CONFIG_CRYPTO_NULL=m
|
CONFIG_CRYPTO_NULL=m
|
||||||
|
|
|
@ -95,7 +95,7 @@ CONFIG_DEBUG_FS=y
|
||||||
CONFIG_DETECT_HUNG_TASK=y
|
CONFIG_DETECT_HUNG_TASK=y
|
||||||
CONFIG_DEBUG_INFO=y
|
CONFIG_DEBUG_INFO=y
|
||||||
CONFIG_SYSCTL_SYSCALL_CHECK=y
|
CONFIG_SYSCTL_SYSCALL_CHECK=y
|
||||||
CONFIG_VIRQ_DEBUG=y
|
CONFIG_IRQ_DOMAIN_DEBUG=y
|
||||||
CONFIG_CRYPTO_PCBC=m
|
CONFIG_CRYPTO_PCBC=m
|
||||||
CONFIG_CRYPTO_SHA256=y
|
CONFIG_CRYPTO_SHA256=y
|
||||||
CONFIG_CRYPTO_SHA512=y
|
CONFIG_CRYPTO_SHA512=y
|
||||||
|
|
|
@ -214,7 +214,7 @@ CONFIG_DEBUG_FS=y
|
||||||
CONFIG_DETECT_HUNG_TASK=y
|
CONFIG_DETECT_HUNG_TASK=y
|
||||||
CONFIG_DEBUG_INFO=y
|
CONFIG_DEBUG_INFO=y
|
||||||
CONFIG_SYSCTL_SYSCALL_CHECK=y
|
CONFIG_SYSCTL_SYSCALL_CHECK=y
|
||||||
CONFIG_VIRQ_DEBUG=y
|
CONFIG_IRQ_DOMAIN_DEBUG=y
|
||||||
CONFIG_CRYPTO_PCBC=m
|
CONFIG_CRYPTO_PCBC=m
|
||||||
CONFIG_CRYPTO_SHA256=y
|
CONFIG_CRYPTO_SHA256=y
|
||||||
CONFIG_CRYPTO_SHA512=y
|
CONFIG_CRYPTO_SHA512=y
|
||||||
|
|
|
@ -216,7 +216,7 @@ CONFIG_DEBUG_FS=y
|
||||||
CONFIG_DETECT_HUNG_TASK=y
|
CONFIG_DETECT_HUNG_TASK=y
|
||||||
CONFIG_DEBUG_INFO=y
|
CONFIG_DEBUG_INFO=y
|
||||||
CONFIG_SYSCTL_SYSCALL_CHECK=y
|
CONFIG_SYSCTL_SYSCALL_CHECK=y
|
||||||
CONFIG_VIRQ_DEBUG=y
|
CONFIG_IRQ_DOMAIN_DEBUG=y
|
||||||
CONFIG_CRYPTO_PCBC=m
|
CONFIG_CRYPTO_PCBC=m
|
||||||
CONFIG_CRYPTO_SHA256=y
|
CONFIG_CRYPTO_SHA256=y
|
||||||
CONFIG_CRYPTO_SHA512=y
|
CONFIG_CRYPTO_SHA512=y
|
||||||
|
|
|
@ -457,7 +457,7 @@ CONFIG_CODE_PATCHING_SELFTEST=y
|
||||||
CONFIG_FTR_FIXUP_SELFTEST=y
|
CONFIG_FTR_FIXUP_SELFTEST=y
|
||||||
CONFIG_MSI_BITMAP_SELFTEST=y
|
CONFIG_MSI_BITMAP_SELFTEST=y
|
||||||
CONFIG_XMON=y
|
CONFIG_XMON=y
|
||||||
CONFIG_VIRQ_DEBUG=y
|
CONFIG_IRQ_DOMAIN_DEBUG=y
|
||||||
CONFIG_BOOTX_TEXT=y
|
CONFIG_BOOTX_TEXT=y
|
||||||
CONFIG_CRYPTO_NULL=m
|
CONFIG_CRYPTO_NULL=m
|
||||||
CONFIG_CRYPTO_TEST=m
|
CONFIG_CRYPTO_TEST=m
|
||||||
|
|
|
@ -340,7 +340,7 @@ CONFIG_FTR_FIXUP_SELFTEST=y
|
||||||
CONFIG_MSI_BITMAP_SELFTEST=y
|
CONFIG_MSI_BITMAP_SELFTEST=y
|
||||||
CONFIG_XMON=y
|
CONFIG_XMON=y
|
||||||
CONFIG_XMON_DEFAULT=y
|
CONFIG_XMON_DEFAULT=y
|
||||||
CONFIG_VIRQ_DEBUG=y
|
CONFIG_IRQ_DOMAIN_DEBUG=y
|
||||||
CONFIG_CRYPTO_NULL=m
|
CONFIG_CRYPTO_NULL=m
|
||||||
CONFIG_CRYPTO_TEST=m
|
CONFIG_CRYPTO_TEST=m
|
||||||
CONFIG_CRYPTO_CCM=m
|
CONFIG_CRYPTO_CCM=m
|
||||||
|
|
|
@ -56,6 +56,16 @@ config GENERIC_IRQ_CHIP
|
||||||
config IRQ_DOMAIN
|
config IRQ_DOMAIN
|
||||||
bool
|
bool
|
||||||
|
|
||||||
|
config IRQ_DOMAIN_DEBUG
|
||||||
|
bool "Expose hardware/virtual IRQ mapping via debugfs"
|
||||||
|
depends on IRQ_DOMAIN && DEBUG_FS
|
||||||
|
help
|
||||||
|
This option will show the mapping relationship between hardware irq
|
||||||
|
numbers and Linux irq numbers. The mapping is exposed via debugfs
|
||||||
|
in the file "virq_mapping".
|
||||||
|
|
||||||
|
If you don't know what this means you don't need it.
|
||||||
|
|
||||||
# Support forced irq threading
|
# Support forced irq threading
|
||||||
config IRQ_FORCED_THREADING
|
config IRQ_FORCED_THREADING
|
||||||
bool
|
bool
|
||||||
|
|
|
@ -632,7 +632,7 @@ unsigned int irq_linear_revmap(struct irq_domain *domain,
|
||||||
return revmap[hwirq];
|
return revmap[hwirq];
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_VIRQ_DEBUG
|
#ifdef CONFIG_IRQ_DOMAIN_DEBUG
|
||||||
static int virq_debug_show(struct seq_file *m, void *private)
|
static int virq_debug_show(struct seq_file *m, void *private)
|
||||||
{
|
{
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
@ -668,7 +668,7 @@ static int virq_debug_show(struct seq_file *m, void *private)
|
||||||
data = irq_desc_get_chip_data(desc);
|
data = irq_desc_get_chip_data(desc);
|
||||||
seq_printf(m, "0x%16p ", data);
|
seq_printf(m, "0x%16p ", data);
|
||||||
|
|
||||||
if (desc->irq_data.domain->of_node)
|
if (desc->irq_data.domain && desc->irq_data.domain->of_node)
|
||||||
p = desc->irq_data.domain->of_node->full_name;
|
p = desc->irq_data.domain->of_node->full_name;
|
||||||
else
|
else
|
||||||
p = none;
|
p = none;
|
||||||
|
@ -695,14 +695,14 @@ static const struct file_operations virq_debug_fops = {
|
||||||
|
|
||||||
static int __init irq_debugfs_init(void)
|
static int __init irq_debugfs_init(void)
|
||||||
{
|
{
|
||||||
if (debugfs_create_file("virq_mapping", S_IRUGO, powerpc_debugfs_root,
|
if (debugfs_create_file("irq_domain_mapping", S_IRUGO, NULL,
|
||||||
NULL, &virq_debug_fops) == NULL)
|
NULL, &virq_debug_fops) == NULL)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
__initcall(irq_debugfs_init);
|
__initcall(irq_debugfs_init);
|
||||||
#endif /* CONFIG_VIRQ_DEBUG */
|
#endif /* CONFIG_IRQ_DOMAIN_DEBUG */
|
||||||
|
|
||||||
int irq_domain_simple_map(struct irq_domain *d, unsigned int irq,
|
int irq_domain_simple_map(struct irq_domain *d, unsigned int irq,
|
||||||
irq_hw_number_t hwirq)
|
irq_hw_number_t hwirq)
|
||||||
|
|
Loading…
Reference in a new issue