From patchwork Sun Sep 17 17:05:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "D M, Sharath Kumar" X-Patchwork-Id: 13388621 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 661AACD13D1 for ; Sun, 17 Sep 2023 17:06:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234517AbjIQRFk (ORCPT ); Sun, 17 Sep 2023 13:05:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38608 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232295AbjIQRFV (ORCPT ); Sun, 17 Sep 2023 13:05:21 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C238612B; Sun, 17 Sep 2023 10:05:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694970315; x=1726506315; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=+wAJ0RSAnIZQ5D+pd9Rpg0BhW5nvGWerfVLB6j7UcyM=; b=nYCDVgOZOh1RB3bFyCyYiwN89Ot8ZGqHEWIU+qBlWuZfHc+tQ9/rjDvH ALscahN3P903pt0sJb8/y0MEH9VKLAYRMP+qOuBp2x4Km5XyI9qhQ4T5j jO66gmh/pIDSmnojg0E0ZmV5al6Y2XHHjonATP/9+hnmaOzRs8ywyJWXG JjgLjku0P0dotZiHU83evwsqEIS5ts+AJlHspsUMvAQNuUKalrMoRnFGM fAcH6Eb747xHvVnX5BbJLdKfkZw21lS/QYbB1nnH4bGz6QjIi/cKwd5YT mPlR/972269jU0hUt1dzzTVG1L1g14yBvR4UFg/EK24mQgSEf8qnKWqil g==; X-IronPort-AV: E=McAfee;i="6600,9927,10836"; a="378419214" X-IronPort-AV: E=Sophos;i="6.02,154,1688454000"; d="scan'208";a="378419214" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Sep 2023 10:05:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10836"; a="815770757" X-IronPort-AV: E=Sophos;i="6.02,154,1688454000"; d="scan'208";a="815770757" Received: from unknown (HELO bapvecise024..) ([10.190.254.46]) by fmsmga004.fm.intel.com with ESMTP; 17 Sep 2023 10:05:12 -0700 From: sharath.kumar.d.m@intel.com To: helgaas@kernel.org Cc: bhelgaas@google.com, dinguyen@kernel.org, kw@linux.com, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, lpieralisi@kernel.org, robh@kernel.org, sharath.kumar.d.m@intel.com Subject: [PATCH v4 1/2] PCI: altera: refactor driver for supporting new platform Date: Sun, 17 Sep 2023 22:35:45 +0530 Message-Id: <20230917170546.2097352-2-sharath.kumar.d.m@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230917170546.2097352-1-sharath.kumar.d.m@intel.com> References: <20230913125946.GA429409@bhelgaas> <20230917170546.2097352-1-sharath.kumar.d.m@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: D M Sharath Kumar added the below callbacks that eases is supporting newer platforms for read/write to root port configuration space registers for read/write to non root port (endpoint, switch) cfg space regs root port interrupt handler Signed-off-by: D M Sharath Kumar --- drivers/pci/controller/pcie-altera.c | 108 +++++++++++++++++++-------- 1 file changed, 75 insertions(+), 33 deletions(-) diff --git a/drivers/pci/controller/pcie-altera.c b/drivers/pci/controller/pcie-altera.c index a9536dc4bf96..bb073f8424ed 100644 --- a/drivers/pci/controller/pcie-altera.c +++ b/drivers/pci/controller/pcie-altera.c @@ -3,6 +3,7 @@ * Copyright Altera Corporation (C) 2013-2015. All rights reserved * * Author: Ley Foon Tan + * Author: sharath * Description: Altera PCIe host controller driver */ @@ -99,10 +100,15 @@ struct altera_pcie_ops { void (*tlp_write_pkt)(struct altera_pcie *pcie, u32 *headers, u32 data, bool align); bool (*get_link_status)(struct altera_pcie *pcie); - int (*rp_read_cfg)(struct altera_pcie *pcie, int where, - int size, u32 *value); - int (*rp_write_cfg)(struct altera_pcie *pcie, u8 busno, - int where, int size, u32 value); + int (*alt_read_own_cfg)(struct altera_pcie *pcie, u8 busno, + unsigned int devfn, int where, int size, u32 *value); + int (*alt_write_own_cfg)(struct altera_pcie *pcie, u8 busno, + unsigned int devfn, int where, int size, u32 value); + int (*alt_read_other_cfg)(struct altera_pcie *pcie, u8 busno, + unsigned int devfn, int where, int size, u32 *value); + int (*alt_write_other_cfg)(struct altera_pcie *pcie, u8 busno, + unsigned int devfn, int where, int size, u32 value); + void (*rp_isr)(struct irq_desc *desc); }; struct altera_pcie_data { @@ -379,8 +385,8 @@ static int tlp_cfg_dword_write(struct altera_pcie *pcie, u8 bus, u32 devfn, return PCIBIOS_SUCCESSFUL; } -static int s10_rp_read_cfg(struct altera_pcie *pcie, int where, - int size, u32 *value) +static int s10_rp_read_cfg(struct altera_pcie *pcie, u8 busno, u32 devfn, + int where, int size, u32 *value) { void __iomem *addr = S10_RP_CFG_ADDR(pcie, where); @@ -399,7 +405,7 @@ static int s10_rp_read_cfg(struct altera_pcie *pcie, int where, return PCIBIOS_SUCCESSFUL; } -static int s10_rp_write_cfg(struct altera_pcie *pcie, u8 busno, +static int s10_rp_write_cfg(struct altera_pcie *pcie, u8 busno, u32 devfn, int where, int size, u32 value) { void __iomem *addr = S10_RP_CFG_ADDR(pcie, where); @@ -426,18 +432,13 @@ static int s10_rp_write_cfg(struct altera_pcie *pcie, u8 busno, return PCIBIOS_SUCCESSFUL; } -static int _altera_pcie_cfg_read(struct altera_pcie *pcie, u8 busno, - unsigned int devfn, int where, int size, - u32 *value) +static int arr_read_cfg(struct altera_pcie *pcie, u8 busno, u32 devfn, + int where, int size, u32 *value) { int ret; u32 data; u8 byte_en; - if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_read_cfg) - return pcie->pcie_data->ops->rp_read_cfg(pcie, where, - size, value); - switch (size) { case 1: byte_en = 1 << (where & 3); @@ -470,18 +471,13 @@ static int _altera_pcie_cfg_read(struct altera_pcie *pcie, u8 busno, return PCIBIOS_SUCCESSFUL; } -static int _altera_pcie_cfg_write(struct altera_pcie *pcie, u8 busno, - unsigned int devfn, int where, int size, - u32 value) +static int arr_write_cfg(struct altera_pcie *pcie, u8 busno, u32 devfn, + int where, int size, u32 value) { u32 data32; u32 shift = 8 * (where & 3); u8 byte_en; - if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_write_cfg) - return pcie->pcie_data->ops->rp_write_cfg(pcie, busno, - where, size, value); - switch (size) { case 1: data32 = (value & 0xff) << shift; @@ -499,6 +495,37 @@ static int _altera_pcie_cfg_write(struct altera_pcie *pcie, u8 busno, return tlp_cfg_dword_write(pcie, busno, devfn, (where & ~DWORD_MASK), byte_en, data32); + +} + +static int _altera_pcie_cfg_read(struct altera_pcie *pcie, u8 busno, + unsigned int devfn, int where, int size, + u32 *value) +{ + if (busno == pcie->root_bus_nr && + pcie->pcie_data->ops->alt_read_own_cfg) + return pcie->pcie_data->ops->alt_read_own_cfg(pcie, busno, + devfn, where, size, value); + + if (pcie->pcie_data->ops->alt_read_other_cfg) + return pcie->pcie_data->ops->alt_read_other_cfg(pcie, busno, + devfn, where, size, value); + return PCIBIOS_FUNC_NOT_SUPPORTED; +} + +static int _altera_pcie_cfg_write(struct altera_pcie *pcie, u8 busno, + unsigned int devfn, int where, int size, + u32 value) +{ + if (busno == pcie->root_bus_nr && + pcie->pcie_data->ops->alt_write_own_cfg) + return pcie->pcie_data->ops->alt_write_own_cfg(pcie, busno, + devfn, where, size, value); + + if (pcie->pcie_data->ops->alt_write_other_cfg) + return pcie->pcie_data->ops->alt_write_other_cfg(pcie, busno, + devfn, where, size, value); + return PCIBIOS_FUNC_NOT_SUPPORTED; } static int altera_pcie_cfg_read(struct pci_bus *bus, unsigned int devfn, @@ -660,7 +687,6 @@ static void altera_pcie_isr(struct irq_desc *desc) dev_err_ratelimited(dev, "unexpected IRQ, INT%d\n", bit); } } - chained_irq_exit(chip, desc); } @@ -691,9 +717,13 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie) { struct platform_device *pdev = pcie->pdev; - pcie->cra_base = devm_platform_ioremap_resource_byname(pdev, "Cra"); - if (IS_ERR(pcie->cra_base)) - return PTR_ERR(pcie->cra_base); + if ((pcie->pcie_data->version == ALTERA_PCIE_V1) || + (pcie->pcie_data->version == ALTERA_PCIE_V2)) { + pcie->cra_base = + devm_platform_ioremap_resource_byname(pdev, "Cra"); + if (IS_ERR(pcie->cra_base)) + return PTR_ERR(pcie->cra_base); + } if (pcie->pcie_data->version == ALTERA_PCIE_V2) { pcie->hip_base = @@ -707,7 +737,8 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie) if (pcie->irq < 0) return pcie->irq; - irq_set_chained_handler_and_data(pcie->irq, altera_pcie_isr, pcie); + irq_set_chained_handler_and_data(pcie->irq, + pcie->pcie_data->ops->rp_isr, pcie); return 0; } @@ -720,14 +751,22 @@ static const struct altera_pcie_ops altera_pcie_ops_1_0 = { .tlp_read_pkt = tlp_read_packet, .tlp_write_pkt = tlp_write_packet, .get_link_status = altera_pcie_link_up, + .alt_read_own_cfg = arr_read_cfg, + .alt_write_own_cfg = arr_write_cfg, + .alt_read_other_cfg = arr_read_cfg, + .alt_write_other_cfg = arr_write_cfg, + .rp_isr = altera_pcie_isr, }; static const struct altera_pcie_ops altera_pcie_ops_2_0 = { .tlp_read_pkt = s10_tlp_read_packet, .tlp_write_pkt = s10_tlp_write_packet, .get_link_status = s10_altera_pcie_link_up, - .rp_read_cfg = s10_rp_read_cfg, - .rp_write_cfg = s10_rp_write_cfg, + .alt_read_own_cfg = s10_rp_read_cfg, + .alt_write_own_cfg = s10_rp_write_cfg, + .alt_read_other_cfg = arr_read_cfg, + .alt_write_other_cfg = arr_write_cfg, + .rp_isr = altera_pcie_isr, }; static const struct altera_pcie_data altera_pcie_1_0_data = { @@ -792,11 +831,14 @@ static int altera_pcie_probe(struct platform_device *pdev) return ret; } - /* clear all interrupts */ - cra_writel(pcie, P2A_INT_STS_ALL, P2A_INT_STATUS); - /* enable all interrupts */ - cra_writel(pcie, P2A_INT_ENA_ALL, P2A_INT_ENABLE); - altera_pcie_host_init(pcie); + if ((pcie->pcie_data->version == ALTERA_PCIE_V1) || + (pcie->pcie_data->version == ALTERA_PCIE_V2)) { + /* clear all interrupts */ + cra_writel(pcie, P2A_INT_STS_ALL, P2A_INT_STATUS); + /* enable all interrupts */ + cra_writel(pcie, P2A_INT_ENA_ALL, P2A_INT_ENABLE); + altera_pcie_host_init(pcie); + } bridge->sysdata = pcie; bridge->busnr = pcie->root_bus_nr; From patchwork Sun Sep 17 17:05:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "D M, Sharath Kumar" X-Patchwork-Id: 13388623 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8D5C2CD13D3 for ; Sun, 17 Sep 2023 17:06:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236215AbjIQRFk (ORCPT ); Sun, 17 Sep 2023 13:05:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232422AbjIQRFZ (ORCPT ); Sun, 17 Sep 2023 13:05:25 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2BB6712A; Sun, 17 Sep 2023 10:05:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694970320; x=1726506320; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=iMrmRgBeGiFbfKgVi62KMsCxyQAwEc19x4PNGCXGy/Q=; b=BMfB8geanfEL5KhvUN2rmz5n/Fa7SnhpgpFVNMkmpNO9/HjWV67EPaXo 2KHprUmCA0x+SG484zrdsXyaA/IW8LUsj+44G7hdE6hEJU3Ha9dBASXQj S4hMqGy6ZOp5UHQAGWE9XEgKUj/F5od/EgxedbcKVIaG2VRNLW0HhreMo bcAnKTdZgBHI0mGlv1Phy6cEMVHcPgWld89Y0IUzTQnS6jMztQldo0ooh wVMGs7E4kbgvoyH+Mx0YCpj1TI0efHEYpHg6YiA0WPT+R5o19VKCSWCoj sfqLriw1TUcf3dp0QXMJ9oSGD0XCfbJ+X+6YkWVQ5npkImNpN62gqWjqO A==; X-IronPort-AV: E=McAfee;i="6600,9927,10836"; a="378419227" X-IronPort-AV: E=Sophos;i="6.02,154,1688454000"; d="scan'208";a="378419227" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Sep 2023 10:05:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10836"; a="815770790" X-IronPort-AV: E=Sophos;i="6.02,154,1688454000"; d="scan'208";a="815770790" Received: from unknown (HELO bapvecise024..) ([10.190.254.46]) by fmsmga004.fm.intel.com with ESMTP; 17 Sep 2023 10:05:17 -0700 From: sharath.kumar.d.m@intel.com To: helgaas@kernel.org Cc: bhelgaas@google.com, dinguyen@kernel.org, kw@linux.com, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, lpieralisi@kernel.org, robh@kernel.org, sharath.kumar.d.m@intel.com Subject: [PATCH v4 2/2] PCI: altera: add support for agilex family fpga Date: Sun, 17 Sep 2023 22:35:46 +0530 Message-Id: <20230917170546.2097352-3-sharath.kumar.d.m@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230917170546.2097352-1-sharath.kumar.d.m@intel.com> References: <20230913125946.GA429409@bhelgaas> <20230917170546.2097352-1-sharath.kumar.d.m@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: D M Sharath Kumar create new instance of struct altera_pcie_data for "altr,pcie-root-port-3.0" provide corresponding callback "port_conf_off" points to avmm port config register base Signed-off-by: D M Sharath Kumar --- drivers/pci/controller/pcie-altera.c | 207 ++++++++++++++++++++++++++- 1 file changed, 206 insertions(+), 1 deletion(-) diff --git a/drivers/pci/controller/pcie-altera.c b/drivers/pci/controller/pcie-altera.c index bb073f8424ed..46457e976615 100644 --- a/drivers/pci/controller/pcie-altera.c +++ b/drivers/pci/controller/pcie-altera.c @@ -79,9 +79,20 @@ #define S10_TLP_FMTTYPE_CFGWR0 0x45 #define S10_TLP_FMTTYPE_CFGWR1 0x44 +#define AGLX_RP_CFG_ADDR(pcie, reg) \ + (((pcie)->hip_base) + (reg)) +#define AGLX_RP_SECONDARY(pcie) \ + readb(AGLX_RP_CFG_ADDR(pcie, PCI_SECONDARY_BUS)) + +#define AGLX_BDF_REG 0x00002004 +#define AGLX_ROOT_PORT_IRQ_STATUS 0x14c +#define AGLX_ROOT_PORT_IRQ_ENABLE 0x150 +#define AGLX_CFG_AER (1<<4) + enum altera_pcie_version { ALTERA_PCIE_V1 = 0, ALTERA_PCIE_V2, + ALTERA_PCIE_V3, /* AGILEX p-tile, f-tile */ }; struct altera_pcie { @@ -93,6 +104,8 @@ struct altera_pcie { struct irq_domain *irq_domain; struct resource bus_range; const struct altera_pcie_data *pcie_data; + void __iomem *cs_base; + u32 port_conf_off; }; struct altera_pcie_ops { @@ -138,6 +151,39 @@ static inline u32 cra_readl(struct altera_pcie *pcie, const u32 reg) return readl_relaxed(pcie->cra_base + reg); } +static inline void cs_writel(struct altera_pcie *pcie, const u32 value, + const u32 reg) +{ + writel_relaxed(value, pcie->cs_base + reg); +} + +static inline void cs_writew(struct altera_pcie *pcie, const u32 value, + const u32 reg) +{ + writew_relaxed(value, pcie->cs_base + reg); +} + +static inline void cs_writeb(struct altera_pcie *pcie, const u32 value, + const u32 reg) +{ + writeb_relaxed(value, pcie->cs_base + reg); +} + +static inline u32 cs_readl(struct altera_pcie *pcie, const u32 reg) +{ + return readl_relaxed(pcie->cs_base + reg); +} + +static inline u32 cs_readw(struct altera_pcie *pcie, const u32 reg) +{ + return readw_relaxed(pcie->cs_base + reg); +} + +static inline u32 cs_readb(struct altera_pcie *pcie, const u32 reg) +{ + return readb_relaxed(pcie->cs_base + reg); +} + static bool altera_pcie_link_up(struct altera_pcie *pcie) { return !!((cra_readl(pcie, RP_LTSSM) & RP_LTSSM_MASK) == LTSSM_L0); @@ -152,6 +198,14 @@ static bool s10_altera_pcie_link_up(struct altera_pcie *pcie) return !!(readw(addr) & PCI_EXP_LNKSTA_DLLLA); } +static bool aglx_altera_pcie_link_up(struct altera_pcie *pcie) +{ + void __iomem *addr = AGLX_RP_CFG_ADDR(pcie, + pcie->pcie_data->cap_offset + PCI_EXP_LNKSTA); + + return !!(readw(addr) & PCI_EXP_LNKSTA_DLLLA); +} + /* * Altera PCIe port uses BAR0 of RC's configuration space as the translation * from PCI bus to native BUS. Entire DDR region is mapped into PCIe space @@ -432,6 +486,101 @@ static int s10_rp_write_cfg(struct altera_pcie *pcie, u8 busno, u32 devfn, return PCIBIOS_SUCCESSFUL; } +static int aglx_read_own_cfg(struct altera_pcie *pcie, u8 busno, u32 devfn, + int where, int size, u32 *value) +{ + void __iomem *addr = AGLX_RP_CFG_ADDR(pcie, where); + + switch (size) { + case 1: + *value = readb(addr); + break; + case 2: + *value = readw(addr); + break; + default: + *value = readl(addr); + break; + } + + /* interrupt pin not programmed in hardware, set to INTA*/ + if (where == PCI_INTERRUPT_PIN && size == 1) + *value = 0x01; + else if (where == PCI_INTERRUPT_LINE) + *value |= 0x0100; + + return PCIBIOS_SUCCESSFUL; +} + +static int aglx_write_own_cfg(struct altera_pcie *pcie, u8 busno, u32 devfn, + int where, int size, u32 value) +{ + void __iomem *addr = AGLX_RP_CFG_ADDR(pcie, where); + + switch (size) { + case 1: + writeb(value, addr); + break; + case 2: + writew(value, addr); + break; + default: + writel(value, addr); + break; + } + + /* + * Monitor changes to PCI_PRIMARY_BUS register on root port + * and update local copy of root bus number accordingly. + */ + if (busno == pcie->root_bus_nr && where == PCI_PRIMARY_BUS) + pcie->root_bus_nr = value & 0xff; + + return PCIBIOS_SUCCESSFUL; +} + +static int aglx_write_other_cfg(struct altera_pcie *pcie, u8 busno, + unsigned int devfn, int where, int size, u32 value) +{ + cs_writel(pcie, ((busno<<8) | devfn), AGLX_BDF_REG); + if (busno > AGLX_RP_SECONDARY(pcie)) + where |= (1<<12); /* type 1 */ + + switch (size) { + case 1: + cs_writeb(pcie, value, where); + break; + case 2: + cs_writew(pcie, value, where); + break; + default: + cs_writel(pcie, value, where); + break; + } + return PCIBIOS_SUCCESSFUL; +} + +static int aglx_read_other_cfg(struct altera_pcie *pcie, u8 busno, + unsigned int devfn, int where, int size, u32 *value) +{ + cs_writel(pcie, ((busno<<8) | devfn), AGLX_BDF_REG); + if (busno > AGLX_RP_SECONDARY(pcie)) + where |= (1<<12); /* type 1 */ + + switch (size) { + case 1: + *value = cs_readb(pcie, where); + break; + case 2: + *value = cs_readw(pcie, where); + break; + default: + *value = cs_readl(pcie, where); + break; + } + return PCIBIOS_SUCCESSFUL; +} + static int arr_read_cfg(struct altera_pcie *pcie, u8 busno, u32 devfn, int where, int size, u32 *value) { @@ -690,6 +839,30 @@ static void altera_pcie_isr(struct irq_desc *desc) chained_irq_exit(chip, desc); } +static void aglx_isr(struct irq_desc *desc) +{ + struct irq_chip *chip = irq_desc_get_chip(desc); + struct altera_pcie *pcie; + struct device *dev; + u32 status; + int ret; + + chained_irq_enter(chip, desc); + pcie = irq_desc_get_handler_data(desc); + dev = &pcie->pdev->dev; + + status = readl((pcie->hip_base + pcie->port_conf_off + + AGLX_ROOT_PORT_IRQ_STATUS)); + if (status & AGLX_CFG_AER) { + ret = generic_handle_domain_irq(pcie->irq_domain, 0); + if (ret) + dev_err_ratelimited(dev, "unexpected IRQ\n"); + } + writel(AGLX_CFG_AER, (pcie->hip_base + pcie->port_conf_off + + AGLX_ROOT_PORT_IRQ_STATUS)); + chained_irq_exit(chip, desc); +} + static int altera_pcie_init_irq_domain(struct altera_pcie *pcie) { struct device *dev = &pcie->pdev->dev; @@ -725,13 +898,25 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie) return PTR_ERR(pcie->cra_base); } - if (pcie->pcie_data->version == ALTERA_PCIE_V2) { + if ((pcie->pcie_data->version == ALTERA_PCIE_V2) || + (pcie->pcie_data->version == ALTERA_PCIE_V3)) { pcie->hip_base = devm_platform_ioremap_resource_byname(pdev, "Hip"); if (IS_ERR(pcie->hip_base)) return PTR_ERR(pcie->hip_base); } + if (pcie->pcie_data->version == ALTERA_PCIE_V3) { + pcie->cs_base = + devm_platform_ioremap_resource_byname(pdev, "Cs"); + if (IS_ERR(pcie->cs_base)) + return PTR_ERR(pcie->cs_base); + of_property_read_u32(pcie->pdev->dev.of_node, "port_conf_stat", + &pcie->port_conf_off); + dev_dbg(&pcie->pdev->dev, "port_conf_stat_off =%#x\n", + pcie->port_conf_off); + } + /* setup IRQ */ pcie->irq = platform_get_irq(pdev, 0); if (pcie->irq < 0) @@ -769,6 +954,15 @@ static const struct altera_pcie_ops altera_pcie_ops_2_0 = { .rp_isr = altera_pcie_isr, }; +static const struct altera_pcie_ops altera_pcie_ops_3_0 = { + .alt_read_own_cfg = aglx_read_own_cfg, + .alt_write_own_cfg = aglx_write_own_cfg, + .get_link_status = aglx_altera_pcie_link_up, + .alt_read_other_cfg = aglx_read_other_cfg, + .alt_write_other_cfg = aglx_write_other_cfg, + .rp_isr = aglx_isr, +}; + static const struct altera_pcie_data altera_pcie_1_0_data = { .ops = &altera_pcie_ops_1_0, .cap_offset = 0x80, @@ -789,11 +983,19 @@ static const struct altera_pcie_data altera_pcie_2_0_data = { .cfgwr1 = S10_TLP_FMTTYPE_CFGWR1, }; +static const struct altera_pcie_data altera_pcie_3_0_data = { + .ops = &altera_pcie_ops_3_0, + .version = ALTERA_PCIE_V3, + .cap_offset = 0x70, +}; + static const struct of_device_id altera_pcie_of_match[] = { {.compatible = "altr,pcie-root-port-1.0", .data = &altera_pcie_1_0_data }, {.compatible = "altr,pcie-root-port-2.0", .data = &altera_pcie_2_0_data }, + {.compatible = "altr,pcie-root-port-3.0", + .data = &altera_pcie_3_0_data }, {}, }; @@ -838,6 +1040,9 @@ static int altera_pcie_probe(struct platform_device *pdev) /* enable all interrupts */ cra_writel(pcie, P2A_INT_ENA_ALL, P2A_INT_ENABLE); altera_pcie_host_init(pcie); + } else if (pcie->pcie_data->version == ALTERA_PCIE_V3) { + writel(AGLX_CFG_AER, (pcie->hip_base + pcie->port_conf_off + + AGLX_ROOT_PORT_IRQ_ENABLE)); } bridge->sysdata = pcie;