From patchwork Tue Apr 5 14:25:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: dann frazier X-Patchwork-Id: 556496 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 CEC7FC4167D for ; Tue, 5 Apr 2022 21:24:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348331AbiDEVXW (ORCPT ); Tue, 5 Apr 2022 17:23:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49192 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1448238AbiDEPrw (ORCPT ); Tue, 5 Apr 2022 11:47:52 -0400 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C5BAE1A489B for ; Tue, 5 Apr 2022 07:26:17 -0700 (PDT) Received: from mail-io1-f69.google.com (mail-io1-f69.google.com [209.85.166.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 07B2A3F1AE for ; Tue, 5 Apr 2022 14:26:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1649168774; bh=Y3qA21GdVt9EyLc8wWOqDUmvTUTxeNLjjQVOf+YBvyo=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type; b=MBSCuYj2X2fkeAhKepEtoBndxGqanJRuud0WrH1IxI0nhdb2iTnzvLgV2co+wIckx TFEjhFudq4GYiDXag/81IJOL3kaF7LupCYnpPr7gOM8xUNe9EhZ3wXvCF1Tuy6BbSJ X0U5+DS413RRgo0RT/aPfcj4rgcB9nyHlbHICLy8Hy4RxHofJXwtAeNsgn7nqIslev nsCh8qQ00keMXFnR9uMJ+gG+/Xd94Sx8s8bZh/QAuMUHYhdeHp0QT4kkBjAnjlXr6d YLeqbeMekNxT/+mbI6MAOCeUXKEyVJeRTuC6oesmS/2ldqopZqJ3ei+Wv+hqrVgt5P 9s+JxDNq6Vdgw== Received: by mail-io1-f69.google.com with SMTP id x16-20020a6bfe10000000b006409f03e39eso8487904ioh.7 for ; Tue, 05 Apr 2022 07:26:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Y3qA21GdVt9EyLc8wWOqDUmvTUTxeNLjjQVOf+YBvyo=; b=8FEW9Ylc7437I6LLSHuwhhcEjMtdVrnKXGU7noo6S7ptQwmKF9MyMqaXwaFeeeDkSq 286nSNG1u0Ce9xX/R1FOWaSbz3SUn92q8J6UsgsKdPqHna6qEfdYXS3MR8yGEaC8EDTo Ox1PHazKGbdP9zIaX2WVhcV2RZS3prL2006nudTUdxmRcUUCLAweCKl3LDLwIi0/5iPO BmMPP7XPb7BTx5u16Mia3SlL9JaduzkMA5ynwLI0KHvkopNDrDyYj5+X8oQeOWqVqmJY 5W19PUTavY9RNBVK2q0PArvSwY8XDcqWmS/Q3cbC3lvxoBNDoSoaWKDNgIoElyJxnZvx yiag== X-Gm-Message-State: AOAM5321NVA0PrlbVWqlXSkwKE1iozbYq9vBMstrHRjucEZdbztDxcIN Sznzsvt4iyj/wNaRPjEUrtGOAeET6SRGgjoPFSW3o2neV042ogmPo2DKKEZhnqc0t1YsAhHXvLw ARBoz8HSO7yimI/+qDZ8nHk4Dh3M7j339gA== X-Received: by 2002:a05:6638:2107:b0:323:9164:144a with SMTP id n7-20020a056638210700b003239164144amr2184577jaj.198.1649168772931; Tue, 05 Apr 2022 07:26:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyR+xk9Zo0F9Pe5uEJsI3dmBvG/yDamRyrdoDNHp8TqECE8eriliS6qBoGzeftd95eSg17U9Q== X-Received: by 2002:a05:6638:2107:b0:323:9164:144a with SMTP id n7-20020a056638210700b003239164144amr2184562jaj.198.1649168772632; Tue, 05 Apr 2022 07:26:12 -0700 (PDT) Received: from localhost (c-73-14-97-161.hsd1.co.comcast.net. [73.14.97.161]) by smtp.gmail.com with ESMTPSA id x8-20020a0566022c4800b006464119d985sm8332729iov.43.2022.04.05.07.26.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Apr 2022 07:26:11 -0700 (PDT) From: dann frazier To: Marc Zyngier , Lorenzo Pieralisi , stable@vger.kernel.org Cc: Rob Herring , Toan Le , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Bjorn Helgaas , =?utf-8?q?St=C3=A9phane_Graber?= Subject: [PATCH v5.15+v5.16] PCI: xgene: Revert "PCI: xgene: Use inbound resources for setup" Date: Tue, 5 Apr 2022 08:25:05 -0600 Message-Id: <20220405142505.1268999-1-dann.frazier@canonical.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Marc Zyngier commit 1874b6d7ab1bdc900e8398026350313ac29caddb upstream. Commit 6dce5aa59e0b ("PCI: xgene: Use inbound resources for setup") killed PCIe on my XGene-1 box (a Mustang board). The machine itself is still alive, but half of its storage (over NVMe) is gone, and the NVMe driver just times out. Note that this machine boots with a device tree provided by the UEFI firmware (2016 vintage), which could well be non conformant with the spec, hence the breakage. With the patch reverted, the box boots 5.17-rc8 with flying colors. Link: https://lore.kernel.org/all/Yf2wTLjmcRj+AbDv@xps13.dannf Link: https://lore.kernel.org/r/20220321104843.949645-2-maz@kernel.org Fixes: 6dce5aa59e0b ("PCI: xgene: Use inbound resources for setup") Signed-off-by: Marc Zyngier Signed-off-by: Lorenzo Pieralisi Cc: stable@vger.kernel.org Cc: Rob Herring Cc: Toan Le Cc: Lorenzo Pieralisi Cc: Krzysztof Wilczyński Cc: Bjorn Helgaas Cc: Stéphane Graber Cc: dann frazier [dannf: minor context adjustment] Signed-off-by: dann frazier --- drivers/pci/controller/pci-xgene.c | 33 ++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/drivers/pci/controller/pci-xgene.c b/drivers/pci/controller/pci-xgene.c index 56d0d50338c89..02869d3ed0314 100644 --- a/drivers/pci/controller/pci-xgene.c +++ b/drivers/pci/controller/pci-xgene.c @@ -479,28 +479,27 @@ static int xgene_pcie_select_ib_reg(u8 *ib_reg_mask, u64 size) } static void xgene_pcie_setup_ib_reg(struct xgene_pcie_port *port, - struct resource_entry *entry, - u8 *ib_reg_mask) + struct of_pci_range *range, u8 *ib_reg_mask) { void __iomem *cfg_base = port->cfg_base; struct device *dev = port->dev; void __iomem *bar_addr; u32 pim_reg; - u64 cpu_addr = entry->res->start; - u64 pci_addr = cpu_addr - entry->offset; - u64 size = resource_size(entry->res); + u64 cpu_addr = range->cpu_addr; + u64 pci_addr = range->pci_addr; + u64 size = range->size; u64 mask = ~(size - 1) | EN_REG; u32 flags = PCI_BASE_ADDRESS_MEM_TYPE_64; u32 bar_low; int region; - region = xgene_pcie_select_ib_reg(ib_reg_mask, size); + region = xgene_pcie_select_ib_reg(ib_reg_mask, range->size); if (region < 0) { dev_warn(dev, "invalid pcie dma-range config\n"); return; } - if (entry->res->flags & IORESOURCE_PREFETCH) + if (range->flags & IORESOURCE_PREFETCH) flags |= PCI_BASE_ADDRESS_MEM_PREFETCH; bar_low = pcie_bar_low_val((u32)cpu_addr, flags); @@ -531,13 +530,25 @@ static void xgene_pcie_setup_ib_reg(struct xgene_pcie_port *port, static int xgene_pcie_parse_map_dma_ranges(struct xgene_pcie_port *port) { - struct pci_host_bridge *bridge = pci_host_bridge_from_priv(port); - struct resource_entry *entry; + struct device_node *np = port->node; + struct of_pci_range range; + struct of_pci_range_parser parser; + struct device *dev = port->dev; u8 ib_reg_mask = 0; - resource_list_for_each_entry(entry, &bridge->dma_ranges) - xgene_pcie_setup_ib_reg(port, entry, &ib_reg_mask); + if (of_pci_dma_range_parser_init(&parser, np)) { + dev_err(dev, "missing dma-ranges property\n"); + return -EINVAL; + } + + /* Get the dma-ranges from DT */ + for_each_of_pci_range(&parser, &range) { + u64 end = range.cpu_addr + range.size - 1; + dev_dbg(dev, "0x%08x 0x%016llx..0x%016llx -> 0x%016llx\n", + range.flags, range.cpu_addr, end, range.pci_addr); + xgene_pcie_setup_ib_reg(port, &range, &ib_reg_mask); + } return 0; }