From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED,USER_AGENT_SANE_2 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 10EB9C433DB for ; Wed, 27 Jan 2021 13:21:44 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7A205207A3 for ; Wed, 27 Jan 2021 13:21:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7A205207A3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Date:To:From: Subject:Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ad5xZ5pdH1Eej3asax6fRr/tNqncHK/M1PtWi/QAC0E=; b=QU7hpYl+KyVmatA/YENKn74PL KbaO6WqrYXIgMnz7KdjTwuHGE4eA7IMcjfB3YXkNgmFictgNE8T22lafnbuUiGoFO7XYK/2Z81jGY /mrc8BuAhZWhbR7+abXPf5p2Dn9NdSF8cmrmI4bNlAkxel4tQDLSkhJvM2rNJWnfK2+NSJqmLJvpM 3T1BINB5GtoRtPi/EIaQAqgge0dRZ9ucFLxluqXWpmSDOsPVywaEc//GpSE1dQN7X2BC4MpEo9bgH LfzX5zm8MQuq7FVoDlZPxibEZGbgNds/gouDHLmz7BkMOTKKhAR+gwmTb/eRIhkuc4GxPqcgU2z4T 05XVoLxjw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l4kjR-0006Xz-PF; Wed, 27 Jan 2021 13:19:37 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l4kjM-0006XX-Ls; Wed, 27 Jan 2021 13:19:35 +0000 X-UUID: 46a5bb00ca9d4fd89edaa287ce25d8f8-20210127 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=nCXf7YML5q/xURh7/6p7ZD1VqZkBgl3bCbstiVDQEXA=; b=V9b8RnO05GbgmmeysrTvCZtDH1ITnzDqQ6LTpj/KzAd5IlzAxIjZAQNEerEu7Eqkj34US4BjlpnsVzDIF7/qtkBpU9UFqxrCiIvywIFr3ROCnO50jatAbAPPJWU+ai1ITfUprS+StwkFYVxg4alcD8B+wgPx2BnaPoUXPorXuBE=; X-UUID: 46a5bb00ca9d4fd89edaa287ce25d8f8-20210127 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 963270879; Wed, 27 Jan 2021 05:19:27 -0800 Received: from MTKMBS31N2.mediatek.inc (172.27.4.87) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 27 Jan 2021 05:09:25 -0800 Received: from MTKCAS32.mediatek.inc (172.27.4.184) by MTKMBS31N2.mediatek.inc (172.27.4.87) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 27 Jan 2021 21:09:15 +0800 Received: from [10.17.3.153] (10.17.3.153) by MTKCAS32.mediatek.inc (172.27.4.170) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 27 Jan 2021 21:09:14 +0800 Message-ID: <1611752954.14672.71.camel@mhfsdcap03> Subject: Re: [v7,4/7] PCI: mediatek-gen3: Add INTx support From: Jianjun Wang To: Marc Zyngier Date: Wed, 27 Jan 2021 21:09:14 +0800 In-Reply-To: <123724a33c29d1f078f2a65795c6e208@kernel.org> References: <20210113114001.5804-1-jianjun.wang@mediatek.com> <20210113114001.5804-5-jianjun.wang@mediatek.com> <123724a33c29d1f078f2a65795c6e208@kernel.org> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-TM-SNTS-SMTP: AF9B5706A00D243BE0B6F29EF02E078400C437CB2164FE789619A056B278AFB92000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210127_081932_986574_E1F881BB X-CRM114-Status: GOOD ( 35.45 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: youlin.pei@mediatek.com, devicetree@vger.kernel.org, Lorenzo Pieralisi , qizhong.cheng@mediatek.com, chuanjia.liu@mediatek.com, linux-pci@vger.kernel.org, Ryder Lee , Rob Herring , anson.chuang@mediatek.com, Matthias Brugger , Sj Huang , drinkcat@chromium.org, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Philipp Zabel , Rex-BC.Chen@mediatek.com, sin_jieyang@mediatek.com, Bjorn Helgaas , linux-kernel@vger.kernel.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, 2021-01-26 at 12:25 +0000, Marc Zyngier wrote: > On 2021-01-13 11:39, Jianjun Wang wrote: > > Add INTx support for MediaTek Gen3 PCIe controller. > > > > Signed-off-by: Jianjun Wang > > Acked-by: Ryder Lee > > --- > > drivers/pci/controller/pcie-mediatek-gen3.c | 163 ++++++++++++++++++++ > > 1 file changed, 163 insertions(+) > > > > diff --git a/drivers/pci/controller/pcie-mediatek-gen3.c > > b/drivers/pci/controller/pcie-mediatek-gen3.c > > index c00ea7c167de..7979a2856c35 100644 > > --- a/drivers/pci/controller/pcie-mediatek-gen3.c > > +++ b/drivers/pci/controller/pcie-mediatek-gen3.c > > @@ -9,6 +9,9 @@ > > #include > > #include > > #include > > +#include > > +#include > > +#include > > #include > > #include > > #include > > @@ -49,6 +52,12 @@ > > #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_MASK GENMASK(27, 24) > > I guess this '24' is actually PCIE_INTX_SHIFT? In this case, > please write it as > > GENMASK(PCIE_INTX_SHIFT + PCI_NUM_INTX - 1, PCIE_INTX_SHIFT) > > to make it clear that you are dealing with one bit per INTx. Yes, I will fix it in the next version, thanks for your review. > > > + > > +#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 > > @@ -77,6 +86,8 @@ > > * @phy: PHY controller block > > * @clks: PCIe clocks > > * @num_clks: PCIe clocks count for this port > > + * @irq: PCIe controller interrupt number > > + * @intx_domain: legacy INTx IRQ domain > > */ > > struct mtk_pcie_port { > > struct device *dev; > > @@ -87,6 +98,9 @@ struct mtk_pcie_port { > > struct phy *phy; > > struct clk_bulk_data *clks; > > int num_clks; > > + > > + int irq; > > + struct irq_domain *intx_domain; > > }; > > > > /** > > @@ -266,6 +280,149 @@ 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); > > + u32 val; > > + > > + 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); > > This is missing some locking. Otherwise, two concurrent mask/unmask > for different interrupts will corrupt each other's state. > > > +} > > + > > +static void mtk_intx_unmask(struct irq_data *data) > > +{ > > + struct mtk_pcie_port *port = irq_data_get_irq_chip_data(data); > > + u32 val; > > + > > + 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); > > Same thing here. > > > +} > > + > > +/** > > + * 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_mask = mtk_intx_mask, > > + .irq_unmask = mtk_intx_unmask, > > + .irq_eoi = mtk_intx_eoi, > > + .irq_set_affinity = mtk_pcie_set_affinity, > > + .name = "PCIe", > > nit: "PCIe" is not really descriptive. "INTx" would be a bit better. > > > +}; > > + > > +static int mtk_pcie_intx_map(struct irq_domain *domain, unsigned int > > irq, > > + irq_hw_number_t hwirq) > > +{ > > + irq_set_chip_and_handler_name(irq, &mtk_intx_irq_chip, > > + handle_fasteoi_irq, "INTx"); > > + irq_set_chip_data(irq, domain->host_data); > > You probably want to set the chip_data *before* wiring > the handler, as otherwise you could end-up with a NULL > pointer in any of the callbacks if the interrupt fires > between the two. > > > + > > + return 0; > > +} > > + > > +static const struct irq_domain_ops intx_domain_ops = { > > + .map = mtk_pcie_intx_map, > > +}; > > + > > +static int mtk_pcie_init_irq_domains(struct mtk_pcie_port *port, > > + struct device_node *node) > > +{ > > + struct device *dev = port->dev; > > + struct device_node *intc_node; > > + > > + /* Setup INTx */ > > + intc_node = of_get_child_by_name(node, "interrupt-controller"); > > + if (!intc_node) { > > + dev_err(dev, "missing PCIe Intc node\n"); > > + return -ENODEV; > > + } > > + > > + port->intx_domain = irq_domain_add_linear(intc_node, PCI_NUM_INTX, > > + &intx_domain_ops, port); > > + if (!port->intx_domain) { > > + dev_err(dev, "failed to get INTx IRQ domain\n"); > > + return -ENODEV; > > + } > > + > > + return 0; > > +} > > + > > +static void mtk_pcie_irq_teardown(struct mtk_pcie_port *port) > > +{ > > + irq_set_chained_handler_and_data(port->irq, NULL, NULL); > > + > > + if (port->intx_domain) > > + irq_domain_remove(port->intx_domain); > > + > > + irq_dispose_mapping(port->irq); > > +} > > + > > +static void mtk_pcie_irq_handler(struct irq_desc *desc) > > +{ > > + struct mtk_pcie_port *port = irq_desc_get_handler_data(desc); > > + struct irq_chip *irqchip = irq_desc_get_chip(desc); > > + unsigned long status; > > + unsigned int virq; > > + irq_hw_number_t irq_bit = PCIE_INTX_SHIFT; > > + > > + chained_irq_enter(irqchip, desc); > > + > > + status = readl_relaxed(port->base + PCIE_INT_STATUS_REG); > > + if (status & PCIE_INTX_MASK) { > > This "if (status & PCIE_INTX_MASK)" is already implicit from > the for_each_set_bit_from() iterator, and you can drop it. > > > + for_each_set_bit_from(irq_bit, &status, PCI_NUM_INTX + > > + PCIE_INTX_SHIFT) { > > + virq = irq_find_mapping(port->intx_domain, > > + irq_bit - PCIE_INTX_SHIFT); > > + generic_handle_irq(virq); > > + } > > + } > > + > > + chained_irq_exit(irqchip, desc); > > +} > > + > > +static int mtk_pcie_setup_irq(struct mtk_pcie_port *port, > > + struct device_node *node) > > +{ > > + struct device *dev = port->dev; > > + struct platform_device *pdev = to_platform_device(dev); > > + int err; > > + > > + err = mtk_pcie_init_irq_domains(port, node); > > + if (err) { > > + dev_err(dev, "failed to init PCIe IRQ domain\n"); > > + return err; > > + } > > + > > + port->irq = platform_get_irq(pdev, 0); > > + if (port->irq < 0) > > + return port->irq; > > + > > + irq_set_chained_handler_and_data(port->irq, mtk_pcie_irq_handler, > > port); > > You seem to be missing something that will mask all INTx interrupts > as an initial state. Yes, the INTx default state of this chip is disabled, but there are still risks for driver use, I will add mask all INTx interrupts to mtk_pcie_startup_port function in the next version. Thanks. > > > + > > + return 0; > > +} > > + > > static int mtk_pcie_clk_init(struct mtk_pcie_port *port) > > { > > int ret; > > @@ -388,6 +545,10 @@ static int mtk_pcie_setup(struct mtk_pcie_port > > *port) > > goto err_setup; > > } > > > > + err = mtk_pcie_setup_irq(port, dev->of_node); > > + if (err) > > + goto err_setup; > > + > > dev_info(dev, "PCIe link up success!\n"); > > > > return 0; > > @@ -423,6 +584,7 @@ static int mtk_pcie_probe(struct platform_device > > *pdev) > > > > err = pci_host_probe(host); > > if (err) { > > + mtk_pcie_irq_teardown(port); > > mtk_pcie_power_down(port); > > return err; > > } > > @@ -440,6 +602,7 @@ static int mtk_pcie_remove(struct platform_device > > *pdev) > > pci_remove_root_bus(host->bus); > > pci_unlock_rescan_remove(); > > > > + mtk_pcie_irq_teardown(port); > > mtk_pcie_power_down(port); > > > > return 0; > > Thanks, > > M. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel