From patchwork Tue Mar 25 00:33:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Murali Karicheri X-Patchwork-Id: 26961 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f69.google.com (mail-oa0-f69.google.com [209.85.219.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C356920143 for ; Tue, 25 Mar 2014 00:34:27 +0000 (UTC) Received: by mail-oa0-f69.google.com with SMTP id i7sf26679974oag.4 for ; Mon, 24 Mar 2014 17:34:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type; bh=cWN/0RVdbvgsTv7QeF1KTAbub3tDJE+aoxvRUiD2i40=; b=AenRPo09ngVPKvtveKTwyGQzr1UhXGS7GpnzVvTWuRaHmhepwqn0NEZn/THzeyJ4kC Gt+pM8E10LAPHaAQwPx51AkHIdPfqFfwQ3F+qBdWPm5F3KCJwK1wQuoOOfkYmRNfR/50 bGrV8xJQfWZyUa5QDmFbVejUIstAiAXMD3yYBONVPRnjXLnuzHhdzJrBCvLNzUV9uAG4 BThoNyEl20LWkqZFiIQEr0uKsddzCSZKAYo4+57ivFZtU8K8Q0fYuFUvMyCVk4EGPHtX kqDaj8fzFHcCbWvWo7Htww74c0FxIRqhmHCb7luyfkg65/AsgSo25fvl5JkxC14jsByu Pa/Q== X-Gm-Message-State: ALoCoQlBz5BHQo9qumx7pzzWRMPxGI5gKSVp8AEgo3yWgkghCeMgY80ltQb5JbdEqVGqNYlD39lM X-Received: by 10.182.241.9 with SMTP id we9mr1944739obc.22.1395707667233; Mon, 24 Mar 2014 17:34:27 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.105.197 with SMTP id c63ls18509qgf.3.gmail; Mon, 24 Mar 2014 17:34:27 -0700 (PDT) X-Received: by 10.52.6.162 with SMTP id c2mr11640514vda.6.1395707667057; Mon, 24 Mar 2014 17:34:27 -0700 (PDT) Received: from mail-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) by mx.google.com with ESMTPS id f9si3340850vck.145.2014.03.24.17.34.27 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 24 Mar 2014 17:34:27 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.176 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.176; Received: by mail-vc0-f176.google.com with SMTP id lc6so6756918vcb.35 for ; Mon, 24 Mar 2014 17:34:26 -0700 (PDT) X-Received: by 10.220.81.194 with SMTP id y2mr138188vck.29.1395707666902; Mon, 24 Mar 2014 17:34:26 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.78.9 with SMTP id i9csp264141vck; Mon, 24 Mar 2014 17:34:26 -0700 (PDT) X-Received: by 10.66.27.67 with SMTP id r3mr74083360pag.62.1395707665960; Mon, 24 Mar 2014 17:34:25 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id zw7si6588925pac.70.2014.03.24.17.34.23; Mon, 24 Mar 2014 17:34:23 -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; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751869AbaCYAeJ (ORCPT + 26 others); Mon, 24 Mar 2014 20:34:09 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:46160 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751121AbaCYAeF (ORCPT ); Mon, 24 Mar 2014 20:34:05 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id s2P0XUEN012874; Mon, 24 Mar 2014 19:33:30 -0500 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s2P0XTxH019449; Mon, 24 Mar 2014 19:33:29 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.174.1; Mon, 24 Mar 2014 19:33:28 -0500 Received: from ares-ubuntu.am.dhcp.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s2P0XTDN007367; Mon, 24 Mar 2014 19:33:29 -0500 Received: from a0868495 by ares-ubuntu.am.dhcp.ti.com with local (Exim 4.76) (envelope-from ) id 1WSFJ3-0005JJ-7W; Mon, 24 Mar 2014 20:33:29 -0400 From: Murali Karicheri To: , , , CC: Murali Karicheri , Jingoo Han , Bjorn Helgaas , Kukjin Kim , Richard Zhu , Shawn Guo , Mohit Kumar , Santosh Shilimkar Subject: [PATCH 2/3] pci: designware: enhancements to support keystone pcie Date: Mon, 24 Mar 2014 20:33:21 -0400 Message-ID: <1395707604-20377-2-git-send-email-m-karicheri2@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1395707604-20377-1-git-send-email-m-karicheri2@ti.com> References: <1395707604-20377-1-git-send-email-m-karicheri2@ti.com> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: m-karicheri2@ti.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.176 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , keystone pcie hardware is based on designware hw version 3.65. There is no support for ATU port and have registers in application space to configure inbound/outbound access. Also doesn't support PCI PVM option. So the MSI IRQ registers available in application space is used to mask/unmask/enable the MSI IRQs. This requires changes to designware core driver to support the keystone pcie driver. Also modified affected drivers to work with the APIs that are modified for to keystone pcie driver. CC: Jingoo Han CC: Bjorn Helgaas CC: Kukjin Kim CC: Richard Zhu CC: Shawn Guo CC: Mohit Kumar CC: Santosh Shilimkar Signed-off-by: Murali Karicheri --- drivers/pci/host/pci-exynos.c | 2 +- drivers/pci/host/pci-imx6.c | 2 +- drivers/pci/host/pcie-designware.c | 99 ++++++++++++++++++++++++------------ drivers/pci/host/pcie-designware.h | 14 ++++- 4 files changed, 81 insertions(+), 36 deletions(-) diff --git a/drivers/pci/host/pci-exynos.c b/drivers/pci/host/pci-exynos.c index 24beed3..3cae9b1 100644 --- a/drivers/pci/host/pci-exynos.c +++ b/drivers/pci/host/pci-exynos.c @@ -546,7 +546,7 @@ static int add_pcie_port(struct pcie_port *pp, struct platform_device *pdev) pp->ops = &exynos_pcie_host_ops; spin_lock_init(&pp->conf_lock); - ret = dw_pcie_host_init(pp); + ret = dw_pcie_host_init(pp, NULL, NULL); if (ret) { dev_err(&pdev->dev, "failed to initialize host\n"); return ret; diff --git a/drivers/pci/host/pci-imx6.c b/drivers/pci/host/pci-imx6.c index bd70af8..0d77047 100644 --- a/drivers/pci/host/pci-imx6.c +++ b/drivers/pci/host/pci-imx6.c @@ -397,7 +397,7 @@ static int imx6_add_pcie_port(struct pcie_port *pp, pp->ops = &imx6_pcie_host_ops; spin_lock_init(&pp->conf_lock); - ret = dw_pcie_host_init(pp); + ret = dw_pcie_host_init(pp, NULL, NULL); if (ret) { dev_err(&pdev->dev, "failed to initialize host\n"); return ret; diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c index e33b68b..02d4d25 100644 --- a/drivers/pci/host/pcie-designware.c +++ b/drivers/pci/host/pcie-designware.c @@ -248,11 +248,15 @@ static int assign_irq(int no_irqs, struct msi_desc *desc, int *pos) irq_alloc_descs((irq + i), (irq + i), 1, 0); irq_set_msi_desc(irq + i, desc); /*Enable corresponding interrupt in MSI interrupt controller */ - res = ((pos0 + i) / 32) * 12; - bit = (pos0 + i) % 32; - dw_pcie_rd_own_conf(pp, PCIE_MSI_INTR0_ENABLE + res, 4, &val); - val |= 1 << bit; - dw_pcie_wr_own_conf(pp, PCIE_MSI_INTR0_ENABLE + res, 4, val); + if (!(pp->version & DW_VERSION_PRE_3_70)) { + res = ((pos0 + i) / 32) * 12; + bit = (pos0 + i) % 32; + dw_pcie_rd_own_conf(pp, PCIE_MSI_INTR0_ENABLE + res, + 4, &val); + val |= 1 << bit; + dw_pcie_wr_own_conf(pp, PCIE_MSI_INTR0_ENABLE + res, + 4, val); + } i++; } @@ -288,11 +292,13 @@ static void clear_irq(unsigned int irq) clear_bit(pos, pp->msi_irq_in_use); /* Disable corresponding interrupt on MSI interrupt controller */ - res = (pos / 32) * 12; - bit = pos % 32; - dw_pcie_rd_own_conf(pp, PCIE_MSI_INTR0_ENABLE + res, 4, &val); - val &= ~(1 << bit); - dw_pcie_wr_own_conf(pp, PCIE_MSI_INTR0_ENABLE + res, 4, val); + if (!(pp->version & DW_VERSION_PRE_3_70)) { + res = (pos / 32) * 12; + bit = pos % 32; + dw_pcie_rd_own_conf(pp, PCIE_MSI_INTR0_ENABLE + res, 4, &val); + val &= ~(1 << bit); + dw_pcie_wr_own_conf(pp, PCIE_MSI_INTR0_ENABLE + res, 4, val); + } } static int dw_msi_setup_irq(struct msi_chip *chip, struct pci_dev *pdev, @@ -326,7 +332,10 @@ static int dw_msi_setup_irq(struct msi_chip *chip, struct pci_dev *pdev, msg_ctr); desc->msi_attrib.multiple = msgvec; - msg.address_lo = virt_to_phys((void *)pp->msi_data); + if (pp->ops->get_msi_data) + msg.address_lo = pp->ops->get_msi_data(pp); + else + msg.address_lo = virt_to_phys((void *)pp->msi_data); msg.address_hi = 0x0; msg.data = pos; write_msi_msg(irq, &msg); @@ -366,14 +375,27 @@ static const struct irq_domain_ops msi_domain_ops = { .map = dw_pcie_msi_map, }; -int __init dw_pcie_host_init(struct pcie_port *pp) +int __init dw_pcie_host_init(struct pcie_port *pp, struct hw_pci *hw, + const struct irq_domain_ops *irq_ops) { struct device_node *np = pp->dev->of_node; - struct of_pci_range range; + const struct irq_domain_ops *irq_msi_ops; struct of_pci_range_parser parser; + struct of_pci_range range; + struct hw_pci *hw_pci; u32 val; int i; + /* if glue driver provides its own hw ops, override the default */ + hw_pci = hw; + if (!hw_pci) + hw_pci = &dw_pci; + + /* if glue driver provides its own irq msi ops, override default */ + irq_msi_ops = irq_ops; + if (!irq_msi_ops) + irq_msi_ops = &msi_domain_ops; + if (of_pci_range_parser_init(&parser, np)) { dev_err(pp->dev, "missing ranges property\n"); return -EINVAL; @@ -422,17 +444,20 @@ int __init dw_pcie_host_init(struct pcie_port *pp) pp->io_base = pp->io.start; pp->mem_base = pp->mem.start; - pp->va_cfg0_base = devm_ioremap(pp->dev, pp->cfg0_base, - pp->config.cfg0_size); - if (!pp->va_cfg0_base) { - dev_err(pp->dev, "error with ioremap in function\n"); - return -ENOMEM; - } - pp->va_cfg1_base = devm_ioremap(pp->dev, pp->cfg1_base, - pp->config.cfg1_size); - if (!pp->va_cfg1_base) { - dev_err(pp->dev, "error with ioremap\n"); - return -ENOMEM; + if (!(pp->version & DW_VERSION_PRE_3_70)) { + /* only version 3.70 or later support ATU port */ + pp->va_cfg0_base = devm_ioremap(pp->dev, pp->cfg0_base, + pp->config.cfg0_size); + if (!pp->va_cfg0_base) { + dev_err(pp->dev, "error with ioremap in function\n"); + return -ENOMEM; + } + pp->va_cfg1_base = devm_ioremap(pp->dev, pp->cfg1_base, + pp->config.cfg1_size); + if (!pp->va_cfg1_base) { + dev_err(pp->dev, "error with ioremap\n"); + return -ENOMEM; + } } if (of_property_read_u32(np, "num-lanes", &pp->lanes)) { @@ -442,7 +467,7 @@ int __init dw_pcie_host_init(struct pcie_port *pp) if (IS_ENABLED(CONFIG_PCI_MSI)) { pp->irq_domain = irq_domain_add_linear(pp->dev->of_node, - MAX_MSI_IRQS, &msi_domain_ops, + MAX_MSI_IRQS, irq_msi_ops, &dw_pcie_msi_chip); if (!pp->irq_domain) { dev_err(pp->dev, "irq domain init failed\n"); @@ -465,10 +490,10 @@ int __init dw_pcie_host_init(struct pcie_port *pp) val |= PORT_LOGIC_SPEED_CHANGE; dw_pcie_wr_own_conf(pp, PCIE_LINK_WIDTH_SPEED_CONTROL, 4, val); - dw_pci.nr_controllers = 1; - dw_pci.private_data = (void **)&pp; + hw_pci->nr_controllers = 1; + hw_pci->private_data = (void **)&pp; - pci_common_init(&dw_pci); + pci_common_init(hw_pci); pci_assign_unassigned_resources(); #ifdef CONFIG_PCI_DOMAINS dw_pci.domain++; @@ -628,7 +653,11 @@ static int dw_pcie_rd_conf(struct pci_bus *bus, u32 devfn, int where, spin_lock_irqsave(&pp->conf_lock, flags); if (bus->number != pp->root_bus_nr) - ret = dw_pcie_rd_other_conf(pp, bus, devfn, + if (pp->ops->rd_other_conf) + ret = pp->ops->rd_other_conf(pp, bus, devfn, + where, size, val); + else + ret = dw_pcie_rd_other_conf(pp, bus, devfn, where, size, val); else ret = dw_pcie_rd_own_conf(pp, where, size, val); @@ -654,7 +683,11 @@ static int dw_pcie_wr_conf(struct pci_bus *bus, u32 devfn, spin_lock_irqsave(&pp->conf_lock, flags); if (bus->number != pp->root_bus_nr) - ret = dw_pcie_wr_other_conf(pp, bus, devfn, + if (pp->ops->wr_other_conf) + ret = pp->ops->wr_other_conf(pp, bus, devfn, + where, size, val); + else + ret = dw_pcie_wr_other_conf(pp, bus, devfn, where, size, val); else ret = dw_pcie_wr_own_conf(pp, where, size, val); @@ -668,7 +701,7 @@ static struct pci_ops dw_pcie_ops = { .write = dw_pcie_wr_conf, }; -static int dw_pcie_setup(int nr, struct pci_sys_data *sys) +int dw_pcie_setup(int nr, struct pci_sys_data *sys) { struct pcie_port *pp; @@ -691,7 +724,7 @@ static int dw_pcie_setup(int nr, struct pci_sys_data *sys) return 1; } -static struct pci_bus *dw_pcie_scan_bus(int nr, struct pci_sys_data *sys) +struct pci_bus *dw_pcie_scan_bus(int nr, struct pci_sys_data *sys) { struct pci_bus *bus; struct pcie_port *pp = sys_to_pcie(sys); @@ -715,7 +748,7 @@ static int dw_pcie_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) return pp->irq; } -static void dw_pcie_add_bus(struct pci_bus *bus) +void dw_pcie_add_bus(struct pci_bus *bus) { if (IS_ENABLED(CONFIG_PCI_MSI)) { struct pcie_port *pp = sys_to_pcie(bus->sysdata); diff --git a/drivers/pci/host/pcie-designware.h b/drivers/pci/host/pcie-designware.h index c15379b..da35a80 100644 --- a/drivers/pci/host/pcie-designware.h +++ b/drivers/pci/host/pcie-designware.h @@ -48,6 +48,8 @@ struct pcie_port { struct pcie_port_info config; int irq; u32 lanes; +#define DW_VERSION_PRE_3_70 BIT(0) + u32 version; struct pcie_host_ops *ops; int msi_irq; struct irq_domain *irq_domain; @@ -62,8 +64,13 @@ struct pcie_host_ops { u32 val, void __iomem *dbi_base); int (*rd_own_conf)(struct pcie_port *pp, int where, int size, u32 *val); int (*wr_own_conf)(struct pcie_port *pp, int where, int size, u32 val); + int (*rd_other_conf)(struct pcie_port *pp, struct pci_bus *bus, + unsigned int devfn, int where, int size, u32 *val); + int (*wr_other_conf)(struct pcie_port *pp, struct pci_bus *bus, + unsigned int devfn, int where, int size, u32 val); int (*link_up)(struct pcie_port *pp); void (*host_init)(struct pcie_port *pp); + u32 (*get_msi_data)(struct pcie_port *pp); }; int cfg_read(void __iomem *addr, int where, int size, u32 *val); @@ -72,6 +79,11 @@ void dw_handle_msi_irq(struct pcie_port *pp); void dw_pcie_msi_init(struct pcie_port *pp); int dw_pcie_link_up(struct pcie_port *pp); void dw_pcie_setup_rc(struct pcie_port *pp); -int dw_pcie_host_init(struct pcie_port *pp); +int dw_pcie_host_init(struct pcie_port *pp, struct hw_pci *dw_pci, + const struct irq_domain_ops *irq_ops); +int dw_pcie_setup(int nr, struct pci_sys_data *sys); +struct pci_bus *dw_pcie_scan_bus(int nr, struct pci_sys_data *sys); +void dw_pcie_add_bus(struct pci_bus *bus); + #endif /* _PCIE_DESIGNWARE_H */