Received: by 10.192.165.148 with SMTP id m20csp288286imm; Thu, 3 May 2018 20:26:47 -0700 (PDT) X-Google-Smtp-Source: AB8JxZp/NB7cwMO0xQoKUP11p3abUuSC1g3QZPP9uzMyPQrE+kPc9qeBm11EwKb3PFNmibqizzTo X-Received: by 10.98.20.195 with SMTP id 186mr7741265pfu.92.1525404407940; Thu, 03 May 2018 20:26:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525404407; cv=none; d=google.com; s=arc-20160816; b=FkxwBL08/9MZhvGa/AWC/yiQJndscpCbnC8ftd7t+Ic3T8ajRAlUNAfMVEUK538+1A 9uqy+bPm6WcdLKOyCtKwDl75lsu2yDNxgRzTJFqgZ6Qq5VEysp2nm8KADmBfDhMoewTj gChsHl7dgI9RQkmtFAPyfuX69dpbtzKNzkCFbsydRhb+lcdC9RlVAxSvSetG3K6sAgcn Dpa22NT22yON5BjrzfslCGs/NqLI3zAmNdCgdgYIrNFo/Vh00jo6BywdUy/PmyFML2dI Mz41C8V1y5rL1qPkbDvMY02I85wmDlaj3GkDwmiewyVHJcUlomHPrv9lSbCVpg4stcqS giIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :references:in-reply-to:date:cc:to:from:subject:message-id :arc-authentication-results; bh=FKqSEVU47w539Zv/9Lso1bJMY80ZLLYdTpD9ESnplEM=; b=B89QTYEPlfJnJNsw3fCI8+24TP2xGWj73lSzXzlCUSMgOVx1dK1BpSNtZOxac/WEEM M91CBzCV+cBK4z9ZaMGHPFEx8/dqZap7xXbMEtKiC3Fl1KvtqtNbzgdzw3bwEHhavbr2 6XFbq9+ESq9FyyHr0LNjszr1mIilDAtZLJpBaY3kGvtRPI1OoKvX+jxcTaqGjfHqG0no acCWfeQBVgWJHUbC/wctjUcg8qGVIUxA35j6VR8VBaa0IwC2OvfKolAm5dSucJJVzt2Y m35Z682AlJ99vsfnALruy590Ln6gxBKCQby0KE6X0BpYO1fGcLIMCP49cCniMztzeOLp 1h6w== 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 r15-v6si12493145pgs.292.2018.05.03.20.26.20; Thu, 03 May 2018 20:26:47 -0700 (PDT) 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 S1751302AbeEDD0R (ORCPT + 99 others); Thu, 3 May 2018 23:26:17 -0400 Received: from Mailgw01.mediatek.com ([1.203.163.78]:51375 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1751214AbeEDD0Q (ORCPT ); Thu, 3 May 2018 23:26:16 -0400 X-UUID: 43a74e46122045dc94eb0e0bd47566f4-20180504 Received: from mtkcas34.mediatek.inc [(172.27.4.250)] by mailgw01.mediatek.com (envelope-from ) (mailgw01.mediatek.com ESMTP with TLS) with ESMTP id 2099540671; Fri, 04 May 2018 11:26:01 +0800 Received: from MTKCAS32.mediatek.inc (172.27.4.184) by MTKMBS31N1.mediatek.inc (172.27.4.69) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Fri, 4 May 2018 11:25:59 +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.1210.3 via Frontend Transport; Fri, 4 May 2018 11:25:58 +0800 Message-ID: <1525404358.22948.29.camel@mhfsdcap03> Subject: Re: [PATCH 2/2] PCI: mediatek: Using chained IRQ to setup IRQ handle From: Honghui Zhang To: Marc Zyngier CC: , , , , , , , , , , , , , , , , Date: Fri, 4 May 2018 11:25:58 +0800 In-Reply-To: <7efd1486-9f65-a647-5ab0-9a97b10c2ec7@arm.com> References: <1524201910-22836-1-git-send-email-honghui.zhang@mediatek.com> <1524201910-22836-3-git-send-email-honghui.zhang@mediatek.com> <1525254064.22948.11.camel@mhfsdcap03> <1525340514.22948.25.camel@mhfsdcap03> <7efd1486-9f65-a647-5ab0-9a97b10c2ec7@arm.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.3-0ubuntu6 Content-Transfer-Encoding: 7bit MIME-Version: 1.0 X-MTK: N Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 2018-05-03 at 14:05 +0100, Marc Zyngier wrote: > On 03/05/18 10:41, Honghui Zhang wrote: > > On Wed, 2018-05-02 at 11:09 +0100, Marc Zyngier wrote: > >> On 02/05/18 10:41, Honghui Zhang wrote: > >>> On Mon, 2018-04-30 at 12:03 +0100, Marc Zyngier wrote: > >>>> Hi Zhang, > >>>> > >>>> On 20/04/18 06:25, honghui.zhang@mediatek.com wrote: > >>>>> From: Honghui Zhang > >>>>> > >>>>> Using irq_chip solution to setup IRQs for the consistent with IRQ framework. > >>>>> > >>>>> Signed-off-by: Honghui Zhang > >>>>> --- > >>>>> drivers/pci/host/pcie-mediatek.c | 192 +++++++++++++++++++++------------------ > >>>>> 1 file changed, 105 insertions(+), 87 deletions(-) > >>>>> > >>>>> diff --git a/drivers/pci/host/pcie-mediatek.c b/drivers/pci/host/pcie-mediatek.c > >>>>> index c3dc549..1d9c6f1 100644 > >>>>> --- a/drivers/pci/host/pcie-mediatek.c > >>>>> +++ b/drivers/pci/host/pcie-mediatek.c > >>>>> @@ -11,8 +11,10 @@ > >>>>> #include > >>>>> #include > >>>>> #include > >>>>> +#include > >>>>> #include > >>>>> #include > >>>>> +#include > >>>>> #include > >>>>> #include > >>>>> #include > >>>>> @@ -130,14 +132,12 @@ struct mtk_pcie_port; > >>>>> /** > >>>>> * struct mtk_pcie_soc - differentiate between host generations > >>>>> * @need_fix_class_id: whether this host's class ID needed to be fixed or not > >>>>> - * @has_msi: whether this host supports MSI interrupts or not > >>>>> * @ops: pointer to configuration access functions > >>>>> * @startup: pointer to controller setting functions > >>>>> * @setup_irq: pointer to initialize IRQ functions > >>>>> */ > >>>>> struct mtk_pcie_soc { > >>>>> bool need_fix_class_id; > >>>>> - bool has_msi; > >>>>> struct pci_ops *ops; > >>>>> int (*startup)(struct mtk_pcie_port *port); > >>>>> int (*setup_irq)(struct mtk_pcie_port *port, struct device_node *node); > >>>>> @@ -161,7 +161,9 @@ struct mtk_pcie_soc { > >>>>> * @lane: lane count > >>>>> * @slot: port slot > >>>>> * @irq_domain: legacy INTx IRQ domain > >>>>> + * @inner_domain: inner IRQ domain > >>>>> * @msi_domain: MSI IRQ domain > >>>>> + * @lock: protect the msi_irq_in_use bitmap > >>>>> * @msi_irq_in_use: bit map for assigned MSI IRQ > >>>>> */ > >>>>> struct mtk_pcie_port { > >>>>> @@ -179,7 +181,9 @@ struct mtk_pcie_port { > >>>>> u32 lane; > >>>>> u32 slot; > >>>>> struct irq_domain *irq_domain; > >>>>> + struct irq_domain *inner_domain; > >>>>> struct irq_domain *msi_domain; > >>>>> + struct mutex lock; > >>>>> DECLARE_BITMAP(msi_irq_in_use, MTK_MSI_IRQS_NUM); > >>>>> }; > >>>>> > >>>>> @@ -446,103 +450,122 @@ static int mtk_pcie_startup_port_v2(struct mtk_pcie_port *port) > >>>>> return 0; > >>>>> } > >>>>> > >>>>> -static int mtk_pcie_msi_alloc(struct mtk_pcie_port *port) > >>>>> +static void mtk_compose_msi_msg(struct irq_data *data, struct msi_msg *msg) > >>>>> { > >>>>> - int msi; > >>>>> + struct mtk_pcie_port *port = irq_data_get_irq_chip_data(data); > >>>>> + phys_addr_t addr; > >>>>> > >>>>> - msi = find_first_zero_bit(port->msi_irq_in_use, MTK_MSI_IRQS_NUM); > >>>>> - if (msi < MTK_MSI_IRQS_NUM) > >>>>> - set_bit(msi, port->msi_irq_in_use); > >>>>> - else > >>>>> - return -ENOSPC; > >>>>> + /* MT2712/MT7622 only support 32-bit MSI addresses */ > >>>>> + addr = virt_to_phys(port->base + PCIE_MSI_VECTOR); > >>>>> + msg->address_hi = 0; > >>>>> + msg->address_lo = lower_32_bits(addr); > >>>>> > >>>>> - return msi; > >>>>> + msg->data = data->hwirq; > >>>>> + > >>>>> + dev_dbg(port->pcie->dev, "msi#%d address_hi %#x address_lo %#x\n", > >>>>> + (int)data->hwirq, msg->address_hi, msg->address_lo); > >>>>> } > >>>>> > >>>>> -static void mtk_pcie_msi_free(struct mtk_pcie_port *port, unsigned long hwirq) > >>>>> +static int mtk_msi_set_affinity(struct irq_data *irq_data, > >>>>> + const struct cpumask *mask, bool force) > >>>>> { > >>>>> - clear_bit(hwirq, port->msi_irq_in_use); > >>>>> + return -EINVAL; > >>>>> } > >>>>> > >>>>> -static int mtk_pcie_msi_setup_irq(struct msi_controller *chip, > >>>>> - struct pci_dev *pdev, struct msi_desc *desc) > >>>>> -{ > >>>>> - struct mtk_pcie_port *port; > >>>>> - struct msi_msg msg; > >>>>> - unsigned int irq; > >>>>> - int hwirq; > >>>>> - phys_addr_t msg_addr; > >>>>> +static struct irq_chip mtk_msi_bottom_irq_chip = { > >>>>> + .name = "MTK MSI", > >>>>> + .irq_compose_msi_msg = mtk_compose_msi_msg, > >>>>> + .irq_set_affinity = mtk_msi_set_affinity, > >>>>> + .irq_mask = pci_msi_mask_irq, > >>>>> + .irq_unmask = pci_msi_unmask_irq, > >>>>> +}; > >>>>> > >>>>> - port = mtk_pcie_find_port(pdev->bus, pdev->devfn); > >>>>> - if (!port) > >>>>> - return -EINVAL; > >>>>> +static int mtk_pcie_irq_domain_alloc(struct irq_domain *domain, unsigned int virq, > >>>>> + unsigned int nr_irqs, void *args) > >>>>> +{ > >>>>> + struct mtk_pcie_port *port = domain->host_data; > >>>>> + unsigned long bit; > >>>>> > >>>>> - hwirq = mtk_pcie_msi_alloc(port); > >>>>> - if (hwirq < 0) > >>>>> - return hwirq; > >>>>> + WARN_ON(nr_irqs != 1); > >>>>> + mutex_lock(&port->lock); > >>>>> > >>>>> - irq = irq_create_mapping(port->msi_domain, hwirq); > >>>>> - if (!irq) { > >>>>> - mtk_pcie_msi_free(port, hwirq); > >>>>> - return -EINVAL; > >>>>> + bit = find_first_zero_bit(port->msi_irq_in_use, MTK_MSI_IRQS_NUM); > >>>>> + if (bit >= MTK_MSI_IRQS_NUM) { > >>>>> + mutex_unlock(&port->lock); > >>>>> + return -ENOSPC; > >>>>> } > >>>>> > >>>>> - chip->dev = &pdev->dev; > >>>>> - > >>>>> - irq_set_msi_desc(irq, desc); > >>>>> + __set_bit(bit, port->msi_irq_in_use); > >>>>> > >>>>> - /* MT2712/MT7622 only support 32-bit MSI addresses */ > >>>>> - msg_addr = virt_to_phys(port->base + PCIE_MSI_VECTOR); > >>>>> - msg.address_hi = 0; > >>>>> - msg.address_lo = lower_32_bits(msg_addr); > >>>>> - msg.data = hwirq; > >>>>> + mutex_unlock(&port->lock); > >>>>> > >>>>> - pci_write_msi_msg(irq, &msg); > >>>>> + irq_domain_set_info(domain, virq, bit, &mtk_msi_bottom_irq_chip, > >>>>> + domain->host_data, handle_simple_irq, > >>>> > >>>> Why don't you handle the interrupt as an edge interrupt > >>>> (handle_edge_irq)? That's what it really is, and the fact that you use > >>>> "handle_simple_irq" makes me think that wou're papering over some other > >>>> issue (see below). > >>> > >>> Hi, Marc, > >>> > >>> Thanks very much for your comments. > >>> > >>> I guess the MSI irq is more like a level IRQ instead of edge IRQ. > >>> When a MSI IRQ arrived, the corresponding bit of MSI status register > >>> will be asserted and stay asserted until it's been cleared by software. > >> > >> There is some confusion here. The MSI itself is always edge-triggered. > >> That's by definition, and you cannot change it. The interrupt that is > >> used to signal that MSIs are pending (the multiplexing interrupt) can > >> itself be level triggered (and goes low once all the MSIs have been > >> acknowledged). > > > > Hi, Marc, thanks for your comments. > > > > Yes, PCIe SPEC have defined that the MSI must be edge trigged. But I'm > > not sure whether the HW design needed to following some edge irq > > standard. > > > Given that the device is writing to the MSI doorbell, this can only be > an edge (one way to look at it is that you cannot "unwrite" something, > so you can't drop the level). > Thanks for your explain in this point of view. I will handle it as edge IRQ in the next version. > > In our design, when there's MSI irq trigged(which may is edge > > trigged in hw implemented), the corresponding msi irq status bits will > > be asserted until it's been cleared by software. It's more like that the > > HW IP have translate the edge irq to level status. Do you think using > > handle_level_irq or handle_simple_irq(which most of the pci host driver > > now doing) is acceptable in this case? > > This is how it is supposed to work: > > Device --edge--> MSI-controller --level--> primary controller > > When you're handling the MSI, it has to be edge. When handling the > interrupt between the MSI controller and the main irqchip, this is level. > > At the moment, you have handle that first interrupt as level, which is > wrong. > > > BTW, I'm still struggling in trying the handle_edge_irq solution. Seems > > that I could not get the msi index in irq_ack callback from > > irq_data->hwirq, the hwirq was set by pci_msi_domain_calc_hwirq() which > > I'm still try to figure out the proper routine in my driver. > > That's because you've plugged it in the wrong irqchip. Your top-level > irqchip (the one backing the PCI domain) must be implemented with > irq_chip_ack_parent, and you them implement the ack logic in the > HW-specific irqchip. > Thanks very much for your advise, that's exactly the mistake that I made. Now it's works fine, I will check it again and send the next version. thanks. > M.