Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp468610ybv; Thu, 13 Feb 2020 04:02:12 -0800 (PST) X-Google-Smtp-Source: APXvYqw44w9HUg4DwfYhNvofJB7fDjG3syFfiCiuyfUIVu1pZQ+vMKzA+jsT+l/XX7hSvbiWj35f X-Received: by 2002:a9d:6a48:: with SMTP id h8mr13150343otn.264.1581595332415; Thu, 13 Feb 2020 04:02:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581595332; cv=none; d=google.com; s=arc-20160816; b=pQSBhgtX7E5svFjN+aHYRYWbYZkTeMnFm+3fBhWRIqUMELmyQpXMrVCYlkULTruwSE JCSFixo2fjJAN41JsMy4BNr2GOhVxyS71QKxKqDA34R3JEJmHfiQmOzaOdXeHuvDQQon k3EuDY/eDuiJgJrRwLjC6rMP5fe9TVzSDyu5ol6E6nkvKMqNogwMy3aguIgUoxAQxKwR ML8K/tgvrJsq54vBapOopNZ9miRrmydLR2v80UhkAstupogoygbXDXjhHnvmun4HydUF /jYQaRqgsgyrDs4QpiCTSd0f+uW0jgtHlwgbnyOOr7yXLt+bbacNyGI6nfOrxPAWjKoA Z5kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from; bh=xtiS2fogTHFHFLYSJk60rZpOqZJZrEQCQUzNh5BZeEc=; b=U/tYRczw/1xc00hWHkAS42U4aN/xxHkRM+KOGltA5imCAi3MlrkacLX0rLmP9CPWHC iztqLV+0hmW1Ia9uel6rpl+U5U5z2tEfUBcX7vq4xVchfyINNPrvyQRALaXS6SEqCYS5 gxvFrUeV8tX8tEcramX6KUTFu/+yQli0UCJUmq3qiktBl5DOONA07OirGV6Da9hYu5TN aEEFtascKi4pU8RU3X6FbrSdnYOYMMFz21Ls8ydFN7nxgLdJDkMpQaasyyOSOBmmuJl0 JSZ4PlUIPsYIZbLhPxQMTJaEPmbJeAnAjVeJrJRs5nllG3mACGHcKuW0djavWIvzrDul p7tw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 22si1030818oin.34.2020.02.13.04.01.58; Thu, 13 Feb 2020 04:02:12 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729911AbgBMMB2 (ORCPT + 99 others); Thu, 13 Feb 2020 07:01:28 -0500 Received: from Galois.linutronix.de ([193.142.43.55]:51745 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729531AbgBMMB2 (ORCPT ); Thu, 13 Feb 2020 07:01:28 -0500 Received: from [5.158.153.52] (helo=nanos.tec.linutronix.de) by Galois.linutronix.de with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1j2DBK-0000AB-2E; Thu, 13 Feb 2020 13:01:22 +0100 Received: by nanos.tec.linutronix.de (Postfix, from userid 1000) id B69E71013A6; Thu, 13 Feb 2020 13:01:21 +0100 (CET) From: Thomas Gleixner To: Mubin Usman Sayyed , jason@lakedaemon.net, maz@kernel.org, michal.simek@xilinx.com, linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, siva.durga.paladugu@xilinx.com, anirudha.sarangi@xilinx.com, Mubin Sayyed Subject: Re: [PATCH v3] irqchip: xilinx: Add support for multiple instances In-Reply-To: <20200211190303.7991-1-mubin.usman.sayyed@xilinx.com> References: <20200211190303.7991-1-mubin.usman.sayyed@xilinx.com> Date: Thu, 13 Feb 2020 13:01:21 +0100 Message-ID: <871rqy3dda.fsf@nanos.tec.linutronix.de> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Mubin, Mubin Usman Sayyed writes: > From: Mubin Sayyed > > This patch adds support for multiple instances of git grep 'This patch' Documentation/process/submitting-patches.rst > xilinx interrupt controller. Below configurations are > supported by driver, > > - peripheral->xilinx-intc->xilinx-intc->gic > - peripheral->xilinx-intc->xilinx-intc This is really not much of an explanation. > Signed-off-by: Anirudha Sarangi > Signed-off-by: Mubin Sayyed This Signed-off-by chain is incorrect. See chapter 11 and 12 in the same document. > @@ -38,29 +38,32 @@ struct xintc_irq_chip { > void __iomem *base; > struct irq_domain *root_domain; > u32 intr_mask; > + struct irq_chip *intc_dev; > + u32 nr_irq; > }; > > -static struct xintc_irq_chip *xintc_irqc; > +static struct xintc_irq_chip *primary_intc; > > -static void xintc_write(int reg, u32 data) > +static void xintc_write(struct xintc_irq_chip *irqc, int reg, u32 data) > { > if (static_branch_unlikely(&xintc_is_be)) > - iowrite32be(data, xintc_irqc->base + reg); > + iowrite32be(data, irqc->base + reg); > else > - iowrite32(data, xintc_irqc->base + reg); > + iowrite32(data, irqc->base + reg); > } > > -static unsigned int xintc_read(int reg) > +static u32 xintc_read(struct xintc_irq_chip *irqc, int reg) > { > if (static_branch_unlikely(&xintc_is_be)) > - return ioread32be(xintc_irqc->base + reg); > + return ioread32be(irqc->base + reg); > else > - return ioread32(xintc_irqc->base + reg); > + return ioread32(irqc->base + reg); > } > > static void intc_enable_or_unmask(struct irq_data *d) > { > - unsigned long mask = 1 << d->hwirq; > + unsigned long mask = BIT(d->hwirq); > + struct xintc_irq_chip *irqc = irq_data_get_irq_chip_data(d); Please order your local variables in reverse fir tree order: struct xintc_irq_chip *irqc = irq_data_get_irq_chip_data(d); unsigned long mask = BIT(d->hwirq); which is the preferred coding style in this subsystem and way simpler to read. > static void intc_mask_ack(struct irq_data *d) > { > - unsigned long mask = 1 << d->hwirq; > + unsigned long mask = BIT(d->hwirq); > + struct xintc_irq_chip *irqc = irq_data_get_irq_chip_data(d); Ditto. > pr_debug("irq-xilinx: disable_and_ack: %ld\n", d->hwirq); > - xintc_write(CIE, mask); > - xintc_write(IAR, mask); > + xintc_write(irqc, CIE, mask); > + xintc_write(irqc, IAR, mask); > } > +static unsigned int xintc_get_irq_local(struct xintc_irq_chip *irqc) > +{ > + u32 hwirq; > + unsigned int irq = 0; Same. > + hwirq = xintc_read(irqc, IVR); > + if (hwirq != -1U) > + irq = irq_find_mapping(irqc->root_domain, hwirq); > + > + pr_debug("irq-xilinx: hwirq=%d, irq=%d\n", hwirq, irq); Are these pr_debugs all over the please really required? I can understand that you use them for development, but are they useful once the stuff works? > + return irq; > +} > + > unsigned int xintc_get_irq(void) > { > - unsigned int hwirq, irq = -1; > + u32 hwirq; > + unsigned int irq = -1; See above. > - hwirq = xintc_read(IVR); > + hwirq = xintc_read(primary_intc, IVR); > if (hwirq != -1U) > - irq = irq_find_mapping(xintc_irqc->root_domain, hwirq); > + irq = irq_find_mapping(primary_intc->root_domain, hwirq); > > pr_debug("irq-xilinx: hwirq=%d, irq=%d\n", hwirq, irq); > > @@ -138,12 +164,14 @@ static const struct irq_domain_ops xintc_irq_domain_ops = { > static void xil_intc_irq_handler(struct irq_desc *desc) > { > struct irq_chip *chip = irq_desc_get_chip(desc); > + struct xintc_irq_chip *irqc = > + irq_data_get_irq_handler_data(&desc->irq_data); Please avoid these ugly line breaks and put the initialization of the variable in to the code below the declaration. > /* Turn on the Master Enable. */ > - xintc_write(MER, MER_HIE | MER_ME); > - if (!(xintc_read(MER) & (MER_HIE | MER_ME))) { > + xintc_write(irqc, MER, MER_HIE | MER_ME); > + if (!(xintc_read(irqc, MER) & (MER_HIE | MER_ME))) { > static_branch_enable(&xintc_is_be); I see it's existing logic, but this lacks a comment how it's determined that xintc is big endian. Looks like some weird "write works?" probing. Why? > + xintc_write(irqc, MER, MER_HIE | MER_ME); So this writes MER_HIE | MER_ME into MER > + if (!(xintc_read(irqc, MER) & (MER_HIE | MER_ME))) { but this checks just whether ONE of the bits is set. Shouldn't it check for MER == (MER_HIE | MER_ME), i.e. read back what was written? Thanks, tglx