forked from Minki/linux
6e99e45828
This patch slightly reworks the new irq code to fix a small design error. I removed the passing of the trigger to the map() calls entirely, it was not a good idea to have one call do two different things. It also fixes a couple of corner cases. Mapping a linux virtual irq to a physical irq now does only that. Setting the trigger is a different action which has a different call. The main changes are: - I no longer call host->ops->map() for an already mapped irq, I just return the virtual number that was already mapped. It was called before to give an opportunity to change the trigger, but that was causing issues as that could happen while the interrupt was in use by a device, and because of the trigger change, map would potentially muck around with things in a racy way. That was causing much burden on a given's controller implementation of map() to get it right. This is much simpler now. map() is only called on the initial mapping of an irq, meaning that you know that this irq is _not_ being used. You can initialize the hardware if you want (though you don't have to). - Controllers that can handle different type of triggers (level/edge/etc...) now implement the standard irq_chip->set_type() call as defined by the generic code. That means that you can use the standard set_irq_type() to configure an irq line manually if you wish or (though I don't like that interface), pass explicit trigger flags to request_irq() as defined by the generic kernel interfaces. Also, using those interfaces guarantees that your controller set_type callback is called with the descriptor lock held, thus providing locking against activity on the same interrupt (including mask/unmask/etc...) automatically. A result is that, for example, MPIC's own map() implementation calls irq_set_type(NONE) to configure the hardware to the default triggers. - To allow the above, the irq_map array entry for the new mapped interrupt is now set before map() callback is called for the controller. - The irq_create_of_mapping() (also used by irq_of_parse_and_map()) function for mapping interrupts from the device-tree now also call the separate set_irq_type(), and only does so if there is a change in the trigger type. - While I was at it, I changed pci_read_irq_line() (which is the helper I would expect most archs to use in their pcibios_fixup() to get the PCI interrupt routing from the device tree) to also handle a fallback when the DT mapping fails consisting of reading the PCI_INTERRUPT_PIN to know wether the device has an interrupt at all, and the the PCI_INTERRUPT_LINE to get an interrupt number from the device. That number is then mapped using the default controller, and the trigger is set to level low. That default behaviour works for several platforms that don't have a proper interrupt tree like Pegasos. If it doesn't work for your platform, then either provide a proper interrupt tree from the firmware so that fallback isn't needed, or don't call pci_read_irq_line() - Add back a bit that got dropped by my main rework patch for properly clearing pending IPIs on pSeries when using a kexec Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> |
||
|---|---|---|
| .. | ||
| vdso32 | ||
| vdso64 | ||
| align.c | ||
| asm-offsets.c | ||
| binfmt_elf32.c | ||
| btext.c | ||
| cpu_setup_6xx.S | ||
| cpu_setup_power4.S | ||
| cputable.c | ||
| crash_dump.c | ||
| crash.c | ||
| dma_64.c | ||
| entry_32.S | ||
| entry_64.S | ||
| firmware.c | ||
| fpu.S | ||
| head_4xx.S | ||
| head_8xx.S | ||
| head_32.S | ||
| head_44x.S | ||
| head_64.S | ||
| head_booke.h | ||
| head_fsl_booke.S | ||
| ibmebus.c | ||
| idle_6xx.S | ||
| idle_power4.S | ||
| idle.c | ||
| init_task.c | ||
| iomap.c | ||
| iommu.c | ||
| irq.c | ||
| kprobes.c | ||
| l2cr_6xx.S | ||
| legacy_serial.c | ||
| lparcfg.c | ||
| lparmap.c | ||
| machine_kexec_32.c | ||
| machine_kexec_64.c | ||
| machine_kexec.c | ||
| Makefile | ||
| misc_32.S | ||
| misc_64.S | ||
| misc.S | ||
| module_32.c | ||
| module_64.c | ||
| nvram_64.c | ||
| of_device.c | ||
| paca.c | ||
| pci_32.c | ||
| pci_64.c | ||
| pci_direct_iommu.c | ||
| pci_dn.c | ||
| pci_iommu.c | ||
| perfmon_fsl_booke.c | ||
| pmc.c | ||
| ppc32.h | ||
| ppc_ksyms.c | ||
| proc_ppc64.c | ||
| process.c | ||
| prom_init.c | ||
| prom_parse.c | ||
| prom.c | ||
| ptrace32.c | ||
| ptrace-common.h | ||
| ptrace.c | ||
| rtas_flash.c | ||
| rtas_pci.c | ||
| rtas-proc.c | ||
| rtas-rtc.c | ||
| rtas.c | ||
| semaphore.c | ||
| setup_32.c | ||
| setup_64.c | ||
| setup-common.c | ||
| setup.h | ||
| signal_32.c | ||
| signal_64.c | ||
| smp-tbsync.c | ||
| smp.c | ||
| swsusp_32.S | ||
| sys_ppc32.c | ||
| syscalls.c | ||
| sysfs.c | ||
| systbl.S | ||
| tau_6xx.c | ||
| time.c | ||
| traps.c | ||
| udbg_16550.c | ||
| udbg.c | ||
| vdso.c | ||
| vecemu.c | ||
| vector.S | ||
| vio.c | ||
| vmlinux.lds.S | ||