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: 1835741 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=nYCDVgOZ; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=linux-pci-owner@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by legolas.ozlabs.org (Postfix) with ESMTP id 4RpZ9K4Nzjz1ynv for ; Mon, 18 Sep 2023 03:07:17 +1000 (AEST) 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 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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;