From: Marc Zyngier <maz@kernel.org>
To: Jianjun Wang <jianjun.wang@mediatek.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>,
Rob Herring <robh+dt@kernel.org>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Ryder Lee <ryder.lee@mediatek.com>,
Philipp Zabel <p.zabel@pengutronix.de>,
Matthias Brugger <matthias.bgg@gmail.com>,
<linux-pci@vger.kernel.org>, <linux-mediatek@lists.infradead.org>,
<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
Sj Huang <sj.huang@mediatek.com>, <youlin.pei@mediatek.com>,
<chuanjia.liu@mediatek.com>, <qizhong.cheng@mediatek.com>,
<sin_jieyang@mediatek.com>, <drinkcat@chromium.org>,
<Rex-BC.Chen@mediatek.com>, <anson.chuang@mediatek.com>
Subject: Re: [v8,4/7] PCI: mediatek-gen3: Add INTx support
Date: Tue, 09 Mar 2021 11:10:37 +0000 [thread overview]
Message-ID: <87r1koy442.wl-maz@kernel.org> (raw)
In-Reply-To: <20210224061132.26526-5-jianjun.wang@mediatek.com>
On Wed, 24 Feb 2021 06:11:29 +0000,
Jianjun Wang <jianjun.wang@mediatek.com> wrote:
>
> Add INTx support for MediaTek Gen3 PCIe controller.
>
> Signed-off-by: Jianjun Wang <jianjun.wang@mediatek.com>
> Acked-by: Ryder Lee <ryder.lee@mediatek.com>
> ---
> drivers/pci/controller/pcie-mediatek-gen3.c | 176 ++++++++++++++++++++
> 1 file changed, 176 insertions(+)
>
> diff --git a/drivers/pci/controller/pcie-mediatek-gen3.c b/drivers/pci/controller/pcie-mediatek-gen3.c
> index c602beb9afec..8b3b5f838b69 100644
> --- a/drivers/pci/controller/pcie-mediatek-gen3.c
> +++ b/drivers/pci/controller/pcie-mediatek-gen3.c
> @@ -9,6 +9,9 @@
> #include <linux/clk.h>
> #include <linux/delay.h>
> #include <linux/iopoll.h>
> +#include <linux/irq.h>
> +#include <linux/irqchip/chained_irq.h>
> +#include <linux/irqdomain.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/pci.h>
> @@ -45,6 +48,13 @@
> #define PCIE_LINK_STATUS_REG 0x154
> #define PCIE_PORT_LINKUP BIT(8)
>
> +#define PCIE_INT_ENABLE_REG 0x180
> +#define PCIE_INTX_SHIFT 24
> +#define PCIE_INTX_ENABLE \
> + GENMASK(PCIE_INTX_SHIFT + PCI_NUM_INTX - 1, PCIE_INTX_SHIFT)
> +
> +#define PCIE_INT_STATUS_REG 0x184
> +
> #define PCIE_TRANS_TABLE_BASE_REG 0x800
> #define PCIE_ATR_SRC_ADDR_MSB_OFFSET 0x4
> #define PCIE_ATR_TRSL_ADDR_LSB_OFFSET 0x8
> @@ -73,6 +83,9 @@
> * @phy: PHY controller block
> * @clks: PCIe clocks
> * @num_clks: PCIe clocks count for this port
> + * @irq: PCIe controller interrupt number
> + * @irq_lock: lock protecting IRQ register access
> + * @intx_domain: legacy INTx IRQ domain
> */
> struct mtk_pcie_port {
> struct device *dev;
> @@ -83,6 +96,10 @@ struct mtk_pcie_port {
> struct phy *phy;
> struct clk_bulk_data *clks;
> int num_clks;
> +
> + int irq;
> + raw_spinlock_t irq_lock;
> + struct irq_domain *intx_domain;
> };
>
> /**
> @@ -199,6 +216,11 @@ static int mtk_pcie_startup_port(struct mtk_pcie_port *port)
> val |= PCI_CLASS(PCI_CLASS_BRIDGE_PCI << 8);
> writel_relaxed(val, port->base + PCIE_PCI_IDS_1);
>
> + /* Mask all INTx interrupts */
> + val = readl_relaxed(port->base + PCIE_INT_ENABLE_REG);
> + val &= ~PCIE_INTX_ENABLE;
> + writel_relaxed(val, port->base + PCIE_INT_ENABLE_REG);
> +
> /* Assert all reset signals */
> val = readl_relaxed(port->base + PCIE_RST_CTRL_REG);
> val |= PCIE_MAC_RSTB | PCIE_PHY_RSTB | PCIE_BRG_RSTB | PCIE_PE_RSTB;
> @@ -262,6 +284,154 @@ static int mtk_pcie_startup_port(struct mtk_pcie_port *port)
> return 0;
> }
>
> +static int mtk_pcie_set_affinity(struct irq_data *data,
> + const struct cpumask *mask, bool force)
> +{
> + return -EINVAL;
> +}
> +
> +static void mtk_intx_mask(struct irq_data *data)
> +{
> + struct mtk_pcie_port *port = irq_data_get_irq_chip_data(data);
> + unsigned long flags;
> + u32 val;
> +
> + raw_spin_lock_irqsave(&port->irq_lock, flags);
> + val = readl_relaxed(port->base + PCIE_INT_ENABLE_REG);
> + val &= ~BIT(data->hwirq + PCIE_INTX_SHIFT);
> + writel_relaxed(val, port->base + PCIE_INT_ENABLE_REG);
> + raw_spin_unlock_irqrestore(&port->irq_lock, flags);
> +}
> +
> +static void mtk_intx_unmask(struct irq_data *data)
> +{
> + struct mtk_pcie_port *port = irq_data_get_irq_chip_data(data);
> + unsigned long flags;
> + u32 val;
> +
> + raw_spin_lock_irqsave(&port->irq_lock, flags);
> + val = readl_relaxed(port->base + PCIE_INT_ENABLE_REG);
> + val |= BIT(data->hwirq + PCIE_INTX_SHIFT);
> + writel_relaxed(val, port->base + PCIE_INT_ENABLE_REG);
> + raw_spin_unlock_irqrestore(&port->irq_lock, flags);
> +}
> +
> +/**
> + * mtk_intx_eoi
> + * @data: pointer to chip specific data
> + *
> + * As an emulated level IRQ, its interrupt status will remain
> + * until the corresponding de-assert message is received; hence that
> + * the status can only be cleared when the interrupt has been serviced.
> + */
> +static void mtk_intx_eoi(struct irq_data *data)
> +{
> + struct mtk_pcie_port *port = irq_data_get_irq_chip_data(data);
> + unsigned long hwirq;
> +
> + hwirq = data->hwirq + PCIE_INTX_SHIFT;
> + writel_relaxed(BIT(hwirq), port->base + PCIE_INT_STATUS_REG);
> +}
> +
> +static struct irq_chip mtk_intx_irq_chip = {
> + .irq_enable = mtk_intx_unmask,
> + .irq_disable = mtk_intx_mask,
Please get rid of enable/disable. Given that you already have
mask/unmask with the *same* implementation, this offers zero benefit.
> + .irq_mask = mtk_intx_mask,
> + .irq_unmask = mtk_intx_unmask,
> + .irq_eoi = mtk_intx_eoi,
> + .irq_set_affinity = mtk_pcie_set_affinity,
> + .name = "INTx",
> +};
[...]
Other that that, this look good to me.
Thanks,
M.
--
Without deviation from the norm, progress is not possible.
next prev parent reply other threads:[~2021-03-09 11:11 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-24 6:11 [v8,0/7] PCI: mediatek: Add new generation controller support Jianjun Wang
2021-02-24 6:11 ` [v8,1/7] dt-bindings: PCI: mediatek-gen3: Add YAML schema Jianjun Wang
2021-03-06 20:09 ` Rob Herring
2021-02-24 6:11 ` [v8,2/7] PCI: Export pci_pio_to_address() for module use Jianjun Wang
2021-02-24 6:11 ` [v8,3/7] PCI: mediatek-gen3: Add MediaTek Gen3 driver for MT8192 Jianjun Wang
2021-02-24 13:36 ` Krzysztof Wilczyński
2021-02-25 3:07 ` Jianjun Wang
2021-03-11 12:38 ` Pali Rohár
2021-03-13 7:43 ` Jianjun Wang
2021-03-18 0:02 ` Pali Rohár
2021-03-18 5:48 ` Jianjun Wang
2021-03-19 18:53 ` Pali Rohár
2021-03-23 1:31 ` Jianjun Wang
2021-03-23 14:51 ` Pali Rohár
2021-03-29 22:58 ` Pali Rohár
2021-02-24 6:11 ` [v8,4/7] PCI: mediatek-gen3: Add INTx support Jianjun Wang
2021-02-24 14:24 ` Krzysztof Wilczyński
2021-02-25 3:10 ` Jianjun Wang
2021-03-09 11:10 ` Marc Zyngier [this message]
2021-03-10 3:05 ` Jianjun Wang
2021-02-24 6:11 ` [v8,5/7] PCI: mediatek-gen3: Add MSI support Jianjun Wang
2021-02-24 14:31 ` Krzysztof Wilczyński
2021-02-25 3:09 ` Jianjun Wang
2021-03-09 11:23 ` Marc Zyngier
2021-03-10 6:48 ` Jianjun Wang
[not found] ` <87a6rbxs4w.wl-maz@kernel.org>
2021-03-11 9:47 ` Jianjun Wang
2021-03-11 0:05 ` Pali Rohár
2021-03-11 8:19 ` Marc Zyngier
2021-03-11 9:50 ` Jianjun Wang
2021-02-24 6:11 ` [v8,6/7] PCI: mediatek-gen3: Add system PM support Jianjun Wang
2021-02-24 14:10 ` Krzysztof Wilczyński
2021-02-25 3:34 ` Jianjun Wang
2021-02-25 22:00 ` Krzysztof Wilczyński
2021-02-26 10:06 ` Jianjun Wang
2021-02-24 6:11 ` [v8,7/7] MAINTAINERS: Add Jianjun Wang as MediaTek PCI co-maintainer Jianjun Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87r1koy442.wl-maz@kernel.org \
--to=maz@kernel.org \
--cc=Rex-BC.Chen@mediatek.com \
--cc=anson.chuang@mediatek.com \
--cc=bhelgaas@google.com \
--cc=chuanjia.liu@mediatek.com \
--cc=devicetree@vger.kernel.org \
--cc=drinkcat@chromium.org \
--cc=jianjun.wang@mediatek.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-pci@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=matthias.bgg@gmail.com \
--cc=p.zabel@pengutronix.de \
--cc=qizhong.cheng@mediatek.com \
--cc=robh+dt@kernel.org \
--cc=ryder.lee@mediatek.com \
--cc=sin_jieyang@mediatek.com \
--cc=sj.huang@mediatek.com \
--cc=youlin.pei@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).