From mboxrd@z Thu Jan 1 00:00:00 1970 From: boris.brezillon@free-electrons.com (Boris Brezillon) Date: Wed, 14 Jan 2015 15:03:32 +0100 Subject: [PATCH v2 1/5] irqchip: add dumb demultiplexer implementation In-Reply-To: <54B670EA.1010800@atmel.com> References: <1421174781-4340-1-git-send-email-boris.brezillon@free-electrons.com> <1421174781-4340-2-git-send-email-boris.brezillon@free-electrons.com> <54B670EA.1010800@atmel.com> Message-ID: <20150114150332.09fecbea@bbrezillon> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Wed, 14 Jan 2015 14:36:42 +0100 Nicolas Ferre wrote: > Le 13/01/2015 19:46, Boris Brezillon a ?crit : > > Some interrupt controllers are multiplexing several peripheral IRQs on > > a single interrupt line. > > While this is not a problem for most IRQs (as long as all peripherals > > request the interrupt with IRQF_SHARED flag set), multiplexing timers and > > other type of peripherals will generate a WARNING (mixing IRQF_NO_SUSPEND > > and !IRQF_NO_SUSPEND is prohibited). > > > > Create a dumb irq demultiplexer which simply forwards interrupts to all > > peripherals (exactly what's happening with IRQ_SHARED) but keep a unique > > irq number for each peripheral, thus preventing the IRQF_NO_SUSPEND > > and !IRQF_NO_SUSPEND mix on a given interrupt. > > > > Signed-off-by: Boris Brezillon > > --- > > drivers/irqchip/Kconfig | 4 ++ > > drivers/irqchip/Makefile | 1 + > > drivers/irqchip/irq-dumb-demux.c | 70 ++++++++++++++++++++ > > include/linux/irq.h | 49 ++++++++++++++ > > include/linux/irqdomain.h | 1 + > > kernel/irq/Kconfig | 5 ++ > > kernel/irq/Makefile | 1 + > > kernel/irq/chip.c | 41 ++++++++++++ > > kernel/irq/dumb-demux-chip.c | 140 +++++++++++++++++++++++++++++++++++++++ > > kernel/irq/handle.c | 31 ++++++++- > > kernel/irq/internals.h | 3 + > > 11 files changed, 344 insertions(+), 2 deletions(-) > > create mode 100644 drivers/irqchip/irq-dumb-demux.c > > create mode 100644 kernel/irq/dumb-demux-chip.c > > > > diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig > > index cc79d2a..8a9df88 100644 > > --- a/drivers/irqchip/Kconfig > > +++ b/drivers/irqchip/Kconfig > > @@ -70,6 +70,10 @@ config BRCMSTB_L2_IRQ > > select GENERIC_IRQ_CHIP > > select IRQ_DOMAIN > > > > +config DUMB_DEMUX_IRQ > > + bool > > + select DUMB_IRQ_DEMUX_CHIP > > + > > config DW_APB_ICTL > > bool > > select GENERIC_IRQ_CHIP > > diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile > > index 9516a32..77f3c51 100644 > > --- a/drivers/irqchip/Makefile > > +++ b/drivers/irqchip/Makefile > > @@ -8,6 +8,7 @@ obj-$(CONFIG_ARCH_MVEBU) += irq-armada-370-xp.o > > obj-$(CONFIG_ARCH_MXS) += irq-mxs.o > > obj-$(CONFIG_ARCH_S3C24XX) += irq-s3c24xx.o > > obj-$(CONFIG_DW_APB_ICTL) += irq-dw-apb-ictl.o > > +obj-$(CONFIG_DUMB_DEMUX_IRQ) += irq-dumb-demux.o > > obj-$(CONFIG_METAG) += irq-metag-ext.o > > obj-$(CONFIG_METAG_PERFCOUNTER_IRQS) += irq-metag.o > > obj-$(CONFIG_ARCH_MOXART) += irq-moxart.o > > diff --git a/drivers/irqchip/irq-dumb-demux.c b/drivers/irqchip/irq-dumb-demux.c > > new file mode 100644 > > index 0000000..dfa05ce > > --- /dev/null > > +++ b/drivers/irqchip/irq-dumb-demux.c > > @@ -0,0 +1,70 @@ > > Maybe add a little file header here. It's always better. Sure, I just forgot it. > > +#ifdef CONFIG_DUMB_IRQ_DEMUX_CHIP > > +/** > > + * handle_dumb_demux_irq - Dumb demuxer irq handle function. > > + * @irq: the interrupt number > > + * @desc: the interrupt description structure for this irq > > + * > > + * Dumb demux interrupts are sent from a demultiplexing interrupt handler > > + * which is not able to decide which child interrupt interrupt handler > > typo: "interrupt interrupt" I'll fix that. > > > + * should be called. > > + * > > + * Note: The caller is expected to handle the ack, clear, mask and > > + * unmask issues if necessary. > > + */ [...] > > + > > /* > > * Called unconditionally from handle_level_irq() and only for oneshot > > * interrupts from handle_fasteoi_irq() > > diff --git a/kernel/irq/dumb-demux-chip.c b/kernel/irq/dumb-demux-chip.c > > new file mode 100644 > > index 0000000..8e2de1d > > --- /dev/null > > +++ b/kernel/irq/dumb-demux-chip.c > > @@ -0,0 +1,140 @@ > > +/* > > + * Library implementing common dumb irq demux chip functions > > + * > > + * Copyright (C) 2015, Boris Brezillon > > License here, please. Yep, I'll add it. > > > + */ > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > + > > +#include "internals.h" > > + > > +static void irq_dumb_demux_mask(struct irq_data *d) > > +{ > > + struct irq_chip_dumb_demux *demux = irq_data_get_irq_chip_data(d); > > + > > + clear_bit(d->hwirq, &demux->unmasked); > > + > > + if (!demux->unmasked) > > + disable_irq_nosync(demux->src_irq); > > +} > > + > > +static void irq_dumb_demux_unmask(struct irq_data *d) > > +{ > > + struct irq_chip_dumb_demux *demux = irq_data_get_irq_chip_data(d); > > + bool enable_src_irq = !demux->unmasked; > > Why this additional "bool" unlike the other function above? Because set_bit will modify the unmasked status and we must check if it is equal to 0 (in other terms, all irqs are masked) before modifying it in order to know whether we should enable the src irq or not. > > > + > > + set_bit(d->hwirq, &demux->unmasked); > > + > > + if (enable_src_irq) > > + enable_irq(demux->src_irq); > > +} > > + [...] > > + > > +/** > > + * irq_alloc_dumb_demux_chip - Allocate a dumb demux chip > > + * @src_irq: irq feeding the dumb demux chip > > + * @dd_flags: irq_dumb_demux_flags flags > > + * @valid_irqs: Bitmask representing valid irqs > > + * @clr_flags: irq_flags to clear when mapping an interrupt > > + * @set_flags: irq_flags to set when mapping an interrupt > > Nit. not same order as the function parameters... I'll fix that. Thanks, Boris -- Boris Brezillon, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com From mboxrd@z Thu Jan 1 00:00:00 1970 From: Boris Brezillon Subject: Re: [PATCH v2 1/5] irqchip: add dumb demultiplexer implementation Date: Wed, 14 Jan 2015 15:03:32 +0100 Message-ID: <20150114150332.09fecbea@bbrezillon> References: <1421174781-4340-1-git-send-email-boris.brezillon@free-electrons.com> <1421174781-4340-2-git-send-email-boris.brezillon@free-electrons.com> <54B670EA.1010800@atmel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <54B670EA.1010800@atmel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: Nicolas Ferre Cc: Mark Rutland , devicetree@vger.kernel.org, Jason Cooper , Pawel Moll , Ian Campbell , "Rafael J. Wysocki" , linux-kernel@vger.kernel.org, Rob Herring , Alexandre Belloni , Kumar Gala , Thomas Gleixner , Jean-Christophe Plagniol-Villard , linux-arm-kernel@lists.infradead.org List-Id: devicetree@vger.kernel.org T24gV2VkLCAxNCBKYW4gMjAxNSAxNDozNjo0MiArMDEwMApOaWNvbGFzIEZlcnJlIDxuaWNvbGFz LmZlcnJlQGF0bWVsLmNvbT4gd3JvdGU6Cgo+IExlIDEzLzAxLzIwMTUgMTk6NDYsIEJvcmlzIEJy ZXppbGxvbiBhIMOpY3JpdCA6Cj4gPiBTb21lIGludGVycnVwdCBjb250cm9sbGVycyBhcmUgbXVs dGlwbGV4aW5nIHNldmVyYWwgcGVyaXBoZXJhbCBJUlFzIG9uCj4gPiBhIHNpbmdsZSBpbnRlcnJ1 cHQgbGluZS4KPiA+IFdoaWxlIHRoaXMgaXMgbm90IGEgcHJvYmxlbSBmb3IgbW9zdCBJUlFzIChh cyBsb25nIGFzIGFsbCBwZXJpcGhlcmFscwo+ID4gcmVxdWVzdCB0aGUgaW50ZXJydXB0IHdpdGgg SVJRRl9TSEFSRUQgZmxhZyBzZXQpLCBtdWx0aXBsZXhpbmcgdGltZXJzIGFuZAo+ID4gb3RoZXIg dHlwZSBvZiBwZXJpcGhlcmFscyB3aWxsIGdlbmVyYXRlIGEgV0FSTklORyAobWl4aW5nIElSUUZf Tk9fU1VTUEVORAo+ID4gYW5kICFJUlFGX05PX1NVU1BFTkQgaXMgcHJvaGliaXRlZCkuCj4gPiAK PiA+IENyZWF0ZSBhIGR1bWIgaXJxIGRlbXVsdGlwbGV4ZXIgd2hpY2ggc2ltcGx5IGZvcndhcmRz IGludGVycnVwdHMgdG8gYWxsCj4gPiBwZXJpcGhlcmFscyAoZXhhY3RseSB3aGF0J3MgaGFwcGVu aW5nIHdpdGggSVJRX1NIQVJFRCkgYnV0IGtlZXAgYSB1bmlxdWUKPiA+IGlycSBudW1iZXIgZm9y IGVhY2ggcGVyaXBoZXJhbCwgdGh1cyBwcmV2ZW50aW5nIHRoZSBJUlFGX05PX1NVU1BFTkQKPiA+ IGFuZCAhSVJRRl9OT19TVVNQRU5EIG1peCBvbiBhIGdpdmVuIGludGVycnVwdC4KPiA+IAo+ID4g U2lnbmVkLW9mZi1ieTogQm9yaXMgQnJlemlsbG9uIDxib3Jpcy5icmV6aWxsb25AZnJlZS1lbGVj dHJvbnMuY29tPgo+ID4gLS0tCj4gPiAgZHJpdmVycy9pcnFjaGlwL0tjb25maWcgICAgICAgICAg fCAgIDQgKysKPiA+ICBkcml2ZXJzL2lycWNoaXAvTWFrZWZpbGUgICAgICAgICB8ICAgMSArCj4g PiAgZHJpdmVycy9pcnFjaGlwL2lycS1kdW1iLWRlbXV4LmMgfCAgNzAgKysrKysrKysrKysrKysr KysrKysKPiA+ICBpbmNsdWRlL2xpbnV4L2lycS5oICAgICAgICAgICAgICB8ICA0OSArKysrKysr KysrKysrKwo+ID4gIGluY2x1ZGUvbGludXgvaXJxZG9tYWluLmggICAgICAgIHwgICAxICsKPiA+ ICBrZXJuZWwvaXJxL0tjb25maWcgICAgICAgICAgICAgICB8ICAgNSArKwo+ID4gIGtlcm5lbC9p cnEvTWFrZWZpbGUgICAgICAgICAgICAgIHwgICAxICsKPiA+ICBrZXJuZWwvaXJxL2NoaXAuYyAg ICAgICAgICAgICAgICB8ICA0MSArKysrKysrKysrKysKPiA+ICBrZXJuZWwvaXJxL2R1bWItZGVt dXgtY2hpcC5jICAgICB8IDE0MCArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysKPiA+ICBrZXJuZWwvaXJxL2hhbmRsZS5jICAgICAgICAgICAgICB8ICAzMSArKysrKysrKy0K PiA+ICBrZXJuZWwvaXJxL2ludGVybmFscy5oICAgICAgICAgICB8ICAgMyArCj4gPiAgMTEgZmls ZXMgY2hhbmdlZCwgMzQ0IGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCj4gPiAgY3JlYXRl IG1vZGUgMTAwNjQ0IGRyaXZlcnMvaXJxY2hpcC9pcnEtZHVtYi1kZW11eC5jCj4gPiAgY3JlYXRl IG1vZGUgMTAwNjQ0IGtlcm5lbC9pcnEvZHVtYi1kZW11eC1jaGlwLmMKPiA+IAo+ID4gZGlmZiAt LWdpdCBhL2RyaXZlcnMvaXJxY2hpcC9LY29uZmlnIGIvZHJpdmVycy9pcnFjaGlwL0tjb25maWcK PiA+IGluZGV4IGNjNzlkMmEuLjhhOWRmODggMTAwNjQ0Cj4gPiAtLS0gYS9kcml2ZXJzL2lycWNo aXAvS2NvbmZpZwo+ID4gKysrIGIvZHJpdmVycy9pcnFjaGlwL0tjb25maWcKPiA+IEBAIC03MCw2 ICs3MCwxMCBAQCBjb25maWcgQlJDTVNUQl9MMl9JUlEKPiA+ICAJc2VsZWN0IEdFTkVSSUNfSVJR X0NISVAKPiA+ICAJc2VsZWN0IElSUV9ET01BSU4KPiA+ICAKPiA+ICtjb25maWcgRFVNQl9ERU1V WF9JUlEKPiA+ICsJYm9vbAo+ID4gKwlzZWxlY3QgRFVNQl9JUlFfREVNVVhfQ0hJUAo+ID4gKwo+ ID4gIGNvbmZpZyBEV19BUEJfSUNUTAo+ID4gIAlib29sCj4gPiAgCXNlbGVjdCBHRU5FUklDX0lS UV9DSElQCj4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9pcnFjaGlwL01ha2VmaWxlIGIvZHJpdmVy cy9pcnFjaGlwL01ha2VmaWxlCj4gPiBpbmRleCA5NTE2YTMyLi43N2YzYzUxIDEwMDY0NAo+ID4g LS0tIGEvZHJpdmVycy9pcnFjaGlwL01ha2VmaWxlCj4gPiArKysgYi9kcml2ZXJzL2lycWNoaXAv TWFrZWZpbGUKPiA+IEBAIC04LDYgKzgsNyBAQCBvYmotJChDT05GSUdfQVJDSF9NVkVCVSkJCSs9 IGlycS1hcm1hZGEtMzcwLXhwLm8KPiA+ICBvYmotJChDT05GSUdfQVJDSF9NWFMpCQkJKz0gaXJx LW14cy5vCj4gPiAgb2JqLSQoQ09ORklHX0FSQ0hfUzNDMjRYWCkJCSs9IGlycS1zM2MyNHh4Lm8K PiA+ICBvYmotJChDT05GSUdfRFdfQVBCX0lDVEwpCQkrPSBpcnEtZHctYXBiLWljdGwubwo+ID4g K29iai0kKENPTkZJR19EVU1CX0RFTVVYX0lSUSkJCSs9IGlycS1kdW1iLWRlbXV4Lm8KPiA+ICBv YmotJChDT05GSUdfTUVUQUcpCQkJKz0gaXJxLW1ldGFnLWV4dC5vCj4gPiAgb2JqLSQoQ09ORklH X01FVEFHX1BFUkZDT1VOVEVSX0lSUVMpCSs9IGlycS1tZXRhZy5vCj4gPiAgb2JqLSQoQ09ORklH X0FSQ0hfTU9YQVJUKQkJKz0gaXJxLW1veGFydC5vCj4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9p cnFjaGlwL2lycS1kdW1iLWRlbXV4LmMgYi9kcml2ZXJzL2lycWNoaXAvaXJxLWR1bWItZGVtdXgu Ywo+ID4gbmV3IGZpbGUgbW9kZSAxMDA2NDQKPiA+IGluZGV4IDAwMDAwMDAuLmRmYTA1Y2UKPiA+ IC0tLSAvZGV2L251bGwKPiA+ICsrKyBiL2RyaXZlcnMvaXJxY2hpcC9pcnEtZHVtYi1kZW11eC5j Cj4gPiBAQCAtMCwwICsxLDcwIEBACj4gCj4gTWF5YmUgYWRkIGEgbGl0dGxlIGZpbGUgaGVhZGVy IGhlcmUuIEl0J3MgYWx3YXlzIGJldHRlci4KClN1cmUsIEkganVzdCBmb3Jnb3QgaXQuCgo+ID4g KyNpZmRlZiBDT05GSUdfRFVNQl9JUlFfREVNVVhfQ0hJUAo+ID4gKy8qKgo+ID4gKyAqCWhhbmRs ZV9kdW1iX2RlbXV4X2lycSAtIER1bWIgZGVtdXhlciBpcnEgaGFuZGxlIGZ1bmN0aW9uLgo+ID4g KyAqCUBpcnE6CXRoZSBpbnRlcnJ1cHQgbnVtYmVyCj4gPiArICoJQGRlc2M6CXRoZSBpbnRlcnJ1 cHQgZGVzY3JpcHRpb24gc3RydWN0dXJlIGZvciB0aGlzIGlycQo+ID4gKyAqCj4gPiArICoJRHVt YiBkZW11eCBpbnRlcnJ1cHRzIGFyZSBzZW50IGZyb20gYSBkZW11bHRpcGxleGluZyBpbnRlcnJ1 cHQgaGFuZGxlcgo+ID4gKyAqCXdoaWNoIGlzIG5vdCBhYmxlIHRvIGRlY2lkZSB3aGljaCBjaGls ZCBpbnRlcnJ1cHQgaW50ZXJydXB0IGhhbmRsZXIKPiAKPiB0eXBvOiAiaW50ZXJydXB0IGludGVy cnVwdCIKCkknbGwgZml4IHRoYXQuCgo+IAo+ID4gKyAqCXNob3VsZCBiZSBjYWxsZWQuCj4gPiAr ICoKPiA+ICsgKglOb3RlOiBUaGUgY2FsbGVyIGlzIGV4cGVjdGVkIHRvIGhhbmRsZSB0aGUgYWNr LCBjbGVhciwgbWFzayBhbmQKPiA+ICsgKgl1bm1hc2sgaXNzdWVzIGlmIG5lY2Vzc2FyeS4KPiA+ ICsgKi8KClsuLi5dCgo+ID4gKwo+ID4gIC8qCj4gPiAgICogQ2FsbGVkIHVuY29uZGl0aW9uYWxs eSBmcm9tIGhhbmRsZV9sZXZlbF9pcnEoKSBhbmQgb25seSBmb3Igb25lc2hvdAo+ID4gICAqIGlu dGVycnVwdHMgZnJvbSBoYW5kbGVfZmFzdGVvaV9pcnEoKQo+ID4gZGlmZiAtLWdpdCBhL2tlcm5l bC9pcnEvZHVtYi1kZW11eC1jaGlwLmMgYi9rZXJuZWwvaXJxL2R1bWItZGVtdXgtY2hpcC5jCj4g PiBuZXcgZmlsZSBtb2RlIDEwMDY0NAo+ID4gaW5kZXggMDAwMDAwMC4uOGUyZGUxZAo+ID4gLS0t IC9kZXYvbnVsbAo+ID4gKysrIGIva2VybmVsL2lycS9kdW1iLWRlbXV4LWNoaXAuYwo+ID4gQEAg LTAsMCArMSwxNDAgQEAKPiA+ICsvKgo+ID4gKyAqIExpYnJhcnkgaW1wbGVtZW50aW5nIGNvbW1v biBkdW1iIGlycSBkZW11eCBjaGlwIGZ1bmN0aW9ucwo+ID4gKyAqCj4gPiArICogQ29weXJpZ2h0 IChDKSAyMDE1LCBCb3JpcyBCcmV6aWxsb24KPiAKPiBMaWNlbnNlIGhlcmUsIHBsZWFzZS4KClll cCwgSSdsbCBhZGQgaXQuCgo+IAo+ID4gKyAqLwo+ID4gKyNpbmNsdWRlIDxsaW51eC9lcnIuaD4K PiA+ICsjaW5jbHVkZSA8bGludXgvaW8uaD4KPiA+ICsjaW5jbHVkZSA8bGludXgvaXJxLmg+Cj4g PiArI2luY2x1ZGUgPGxpbnV4L3NsYWIuaD4KPiA+ICsjaW5jbHVkZSA8bGludXgvZXhwb3J0Lmg+ Cj4gPiArI2luY2x1ZGUgPGxpbnV4L2lycS5oPgo+ID4gKyNpbmNsdWRlIDxsaW51eC9pcnFkb21h aW4uaD4KPiA+ICsjaW5jbHVkZSA8bGludXgvaXJxY2hpcC9jaGFpbmVkX2lycS5oPgo+ID4gKyNp bmNsdWRlIDxsaW51eC9pbnRlcnJ1cHQuaD4KPiA+ICsjaW5jbHVkZSA8bGludXgva2VybmVsX3N0 YXQuaD4KPiA+ICsjaW5jbHVkZSA8bGludXgvc3lzY29yZV9vcHMuaD4KPiA+ICsKPiA+ICsjaW5j bHVkZSAiaW50ZXJuYWxzLmgiCj4gPiArCj4gPiArc3RhdGljIHZvaWQgaXJxX2R1bWJfZGVtdXhf bWFzayhzdHJ1Y3QgaXJxX2RhdGEgKmQpCj4gPiArewo+ID4gKwlzdHJ1Y3QgaXJxX2NoaXBfZHVt Yl9kZW11eCAqZGVtdXggPSBpcnFfZGF0YV9nZXRfaXJxX2NoaXBfZGF0YShkKTsKPiA+ICsKPiA+ ICsJY2xlYXJfYml0KGQtPmh3aXJxLCAmZGVtdXgtPnVubWFza2VkKTsKPiA+ICsKPiA+ICsJaWYg KCFkZW11eC0+dW5tYXNrZWQpCj4gPiArCQlkaXNhYmxlX2lycV9ub3N5bmMoZGVtdXgtPnNyY19p cnEpOwo+ID4gK30KPiA+ICsKPiA+ICtzdGF0aWMgdm9pZCBpcnFfZHVtYl9kZW11eF91bm1hc2so c3RydWN0IGlycV9kYXRhICpkKQo+ID4gK3sKPiA+ICsJc3RydWN0IGlycV9jaGlwX2R1bWJfZGVt dXggKmRlbXV4ID0gaXJxX2RhdGFfZ2V0X2lycV9jaGlwX2RhdGEoZCk7Cj4gPiArCWJvb2wgZW5h YmxlX3NyY19pcnEgPSAhZGVtdXgtPnVubWFza2VkOwo+IAo+IFdoeSB0aGlzIGFkZGl0aW9uYWwg ImJvb2wiIHVubGlrZSB0aGUgb3RoZXIgZnVuY3Rpb24gYWJvdmU/CgpCZWNhdXNlIHNldF9iaXQg d2lsbCBtb2RpZnkgdGhlIHVubWFza2VkIHN0YXR1cyBhbmQgd2UgbXVzdCBjaGVjayBpZiBpdApp cyBlcXVhbCB0byAwIChpbiBvdGhlciB0ZXJtcywgYWxsIGlycXMgYXJlIG1hc2tlZCkgYmVmb3Jl IG1vZGlmeWluZyBpdAppbiBvcmRlciB0byBrbm93IHdoZXRoZXIgd2Ugc2hvdWxkIGVuYWJsZSB0 aGUgc3JjIGlycSBvciBub3QuCgo+IAo+ID4gKwo+ID4gKwlzZXRfYml0KGQtPmh3aXJxLCAmZGVt dXgtPnVubWFza2VkKTsKPiA+ICsKPiA+ICsJaWYgKGVuYWJsZV9zcmNfaXJxKQo+ID4gKwkJZW5h YmxlX2lycShkZW11eC0+c3JjX2lycSk7Cj4gPiArfQo+ID4gKwoKWy4uLl0KCj4gPiArCj4gPiAr LyoqCj4gPiArICogaXJxX2FsbG9jX2R1bWJfZGVtdXhfY2hpcCAtIEFsbG9jYXRlIGEgZHVtYiBk ZW11eCBjaGlwCj4gPiArICogQHNyY19pcnE6CQlpcnEgZmVlZGluZyB0aGUgZHVtYiBkZW11eCBj aGlwCj4gPiArICogQGRkX2ZsYWdzOgkJaXJxX2R1bWJfZGVtdXhfZmxhZ3MgZmxhZ3MKPiA+ICsg KiBAdmFsaWRfaXJxczoJCUJpdG1hc2sgcmVwcmVzZW50aW5nIHZhbGlkIGlycXMKPiA+ICsgKiBA Y2xyX2ZsYWdzOgkJaXJxX2ZsYWdzIHRvIGNsZWFyIHdoZW4gbWFwcGluZyBhbiBpbnRlcnJ1cHQK PiA+ICsgKiBAc2V0X2ZsYWdzOgkJaXJxX2ZsYWdzIHRvIHNldCB3aGVuIG1hcHBpbmcgYW4gaW50 ZXJydXB0Cj4gCj4gTml0LiBub3Qgc2FtZSBvcmRlciBhcyB0aGUgZnVuY3Rpb24gcGFyYW1ldGVy cy4uLgoKSSdsbCBmaXggdGhhdC4KClRoYW5rcywKCkJvcmlzCi0tIApCb3JpcyBCcmV6aWxsb24s IEZyZWUgRWxlY3Ryb25zCkVtYmVkZGVkIExpbnV4IGFuZCBLZXJuZWwgZW5naW5lZXJpbmcKaHR0 cDovL2ZyZWUtZWxlY3Ryb25zLmNvbQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QKbGludXgtYXJtLWtl cm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxt YW4vbGlzdGluZm8vbGludXgtYXJtLWtlcm5lbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753429AbbANODj (ORCPT ); Wed, 14 Jan 2015 09:03:39 -0500 Received: from down.free-electrons.com ([37.187.137.238]:44132 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753387AbbANODg convert rfc822-to-8bit (ORCPT ); Wed, 14 Jan 2015 09:03:36 -0500 Date: Wed, 14 Jan 2015 15:03:32 +0100 From: Boris Brezillon To: Nicolas Ferre Cc: Thomas Gleixner , Jason Cooper , "Jean-Christophe Plagniol-Villard" , Alexandre Belloni , "Rafael J. Wysocki" , , , "Rob Herring" , Pawel Moll , Mark Rutland , Ian Campbell , "Kumar Gala" , Subject: Re: [PATCH v2 1/5] irqchip: add dumb demultiplexer implementation Message-ID: <20150114150332.09fecbea@bbrezillon> In-Reply-To: <54B670EA.1010800@atmel.com> References: <1421174781-4340-1-git-send-email-boris.brezillon@free-electrons.com> <1421174781-4340-2-git-send-email-boris.brezillon@free-electrons.com> <54B670EA.1010800@atmel.com> X-Mailer: Claws Mail 3.9.3 (GTK+ 2.24.23; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 14 Jan 2015 14:36:42 +0100 Nicolas Ferre wrote: > Le 13/01/2015 19:46, Boris Brezillon a écrit : > > Some interrupt controllers are multiplexing several peripheral IRQs on > > a single interrupt line. > > While this is not a problem for most IRQs (as long as all peripherals > > request the interrupt with IRQF_SHARED flag set), multiplexing timers and > > other type of peripherals will generate a WARNING (mixing IRQF_NO_SUSPEND > > and !IRQF_NO_SUSPEND is prohibited). > > > > Create a dumb irq demultiplexer which simply forwards interrupts to all > > peripherals (exactly what's happening with IRQ_SHARED) but keep a unique > > irq number for each peripheral, thus preventing the IRQF_NO_SUSPEND > > and !IRQF_NO_SUSPEND mix on a given interrupt. > > > > Signed-off-by: Boris Brezillon > > --- > > drivers/irqchip/Kconfig | 4 ++ > > drivers/irqchip/Makefile | 1 + > > drivers/irqchip/irq-dumb-demux.c | 70 ++++++++++++++++++++ > > include/linux/irq.h | 49 ++++++++++++++ > > include/linux/irqdomain.h | 1 + > > kernel/irq/Kconfig | 5 ++ > > kernel/irq/Makefile | 1 + > > kernel/irq/chip.c | 41 ++++++++++++ > > kernel/irq/dumb-demux-chip.c | 140 +++++++++++++++++++++++++++++++++++++++ > > kernel/irq/handle.c | 31 ++++++++- > > kernel/irq/internals.h | 3 + > > 11 files changed, 344 insertions(+), 2 deletions(-) > > create mode 100644 drivers/irqchip/irq-dumb-demux.c > > create mode 100644 kernel/irq/dumb-demux-chip.c > > > > diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig > > index cc79d2a..8a9df88 100644 > > --- a/drivers/irqchip/Kconfig > > +++ b/drivers/irqchip/Kconfig > > @@ -70,6 +70,10 @@ config BRCMSTB_L2_IRQ > > select GENERIC_IRQ_CHIP > > select IRQ_DOMAIN > > > > +config DUMB_DEMUX_IRQ > > + bool > > + select DUMB_IRQ_DEMUX_CHIP > > + > > config DW_APB_ICTL > > bool > > select GENERIC_IRQ_CHIP > > diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile > > index 9516a32..77f3c51 100644 > > --- a/drivers/irqchip/Makefile > > +++ b/drivers/irqchip/Makefile > > @@ -8,6 +8,7 @@ obj-$(CONFIG_ARCH_MVEBU) += irq-armada-370-xp.o > > obj-$(CONFIG_ARCH_MXS) += irq-mxs.o > > obj-$(CONFIG_ARCH_S3C24XX) += irq-s3c24xx.o > > obj-$(CONFIG_DW_APB_ICTL) += irq-dw-apb-ictl.o > > +obj-$(CONFIG_DUMB_DEMUX_IRQ) += irq-dumb-demux.o > > obj-$(CONFIG_METAG) += irq-metag-ext.o > > obj-$(CONFIG_METAG_PERFCOUNTER_IRQS) += irq-metag.o > > obj-$(CONFIG_ARCH_MOXART) += irq-moxart.o > > diff --git a/drivers/irqchip/irq-dumb-demux.c b/drivers/irqchip/irq-dumb-demux.c > > new file mode 100644 > > index 0000000..dfa05ce > > --- /dev/null > > +++ b/drivers/irqchip/irq-dumb-demux.c > > @@ -0,0 +1,70 @@ > > Maybe add a little file header here. It's always better. Sure, I just forgot it. > > +#ifdef CONFIG_DUMB_IRQ_DEMUX_CHIP > > +/** > > + * handle_dumb_demux_irq - Dumb demuxer irq handle function. > > + * @irq: the interrupt number > > + * @desc: the interrupt description structure for this irq > > + * > > + * Dumb demux interrupts are sent from a demultiplexing interrupt handler > > + * which is not able to decide which child interrupt interrupt handler > > typo: "interrupt interrupt" I'll fix that. > > > + * should be called. > > + * > > + * Note: The caller is expected to handle the ack, clear, mask and > > + * unmask issues if necessary. > > + */ [...] > > + > > /* > > * Called unconditionally from handle_level_irq() and only for oneshot > > * interrupts from handle_fasteoi_irq() > > diff --git a/kernel/irq/dumb-demux-chip.c b/kernel/irq/dumb-demux-chip.c > > new file mode 100644 > > index 0000000..8e2de1d > > --- /dev/null > > +++ b/kernel/irq/dumb-demux-chip.c > > @@ -0,0 +1,140 @@ > > +/* > > + * Library implementing common dumb irq demux chip functions > > + * > > + * Copyright (C) 2015, Boris Brezillon > > License here, please. Yep, I'll add it. > > > + */ > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > + > > +#include "internals.h" > > + > > +static void irq_dumb_demux_mask(struct irq_data *d) > > +{ > > + struct irq_chip_dumb_demux *demux = irq_data_get_irq_chip_data(d); > > + > > + clear_bit(d->hwirq, &demux->unmasked); > > + > > + if (!demux->unmasked) > > + disable_irq_nosync(demux->src_irq); > > +} > > + > > +static void irq_dumb_demux_unmask(struct irq_data *d) > > +{ > > + struct irq_chip_dumb_demux *demux = irq_data_get_irq_chip_data(d); > > + bool enable_src_irq = !demux->unmasked; > > Why this additional "bool" unlike the other function above? Because set_bit will modify the unmasked status and we must check if it is equal to 0 (in other terms, all irqs are masked) before modifying it in order to know whether we should enable the src irq or not. > > > + > > + set_bit(d->hwirq, &demux->unmasked); > > + > > + if (enable_src_irq) > > + enable_irq(demux->src_irq); > > +} > > + [...] > > + > > +/** > > + * irq_alloc_dumb_demux_chip - Allocate a dumb demux chip > > + * @src_irq: irq feeding the dumb demux chip > > + * @dd_flags: irq_dumb_demux_flags flags > > + * @valid_irqs: Bitmask representing valid irqs > > + * @clr_flags: irq_flags to clear when mapping an interrupt > > + * @set_flags: irq_flags to set when mapping an interrupt > > Nit. not same order as the function parameters... I'll fix that. Thanks, Boris -- Boris Brezillon, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com