From patchwork Fri Oct 11 14:00:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daire McNamara X-Patchwork-Id: 13832580 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.153.233]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 40AA5D517; Fri, 11 Oct 2024 14:02:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=68.232.153.233 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728655325; cv=none; b=sftOb+wpYHKXRZQVKJjii2zdK75PWTWy40/j7po+XNnL1GDPhlYSO+C/oOJniGt0q5YhchTGrqXfyBfdo0FwObHFyUHbIP6DjcS5OnYE/U7WBn/krJwo2wJe7uIOfw6MVZs0cgwYPSWir68Upwj04+3sOFn+E2Lb2bmz0nBhkJQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728655325; c=relaxed/simple; bh=sQQRl84OSqc71fs5ZYTHiOsVda3ygHGyCvYxoo3m6Vo=; h=From:To:CC:Subject:Date:Message-ID:MIME-Version:Content-Type; b=qO6aFN4rhUwA6adHZcBoEeo9eL8VMNcA9riz8FD466PuRTZe8MBy9xstVgsSLavCxF9naZwh04dr/f8sjYrtv7jc7DcbEJeV3yjBRX8Np3hbZWa5ojRqylq0JdcI0oVOCvWCBIiTl+L5HXRrWcPgWfQgHFgN0VFIPUmyjduwSZ0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=microchip.com; spf=pass smtp.mailfrom=microchip.com; dkim=pass (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b=foW5HfcF; arc=none smtp.client-ip=68.232.153.233 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=microchip.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=microchip.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b="foW5HfcF" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1728655324; x=1760191324; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=sQQRl84OSqc71fs5ZYTHiOsVda3ygHGyCvYxoo3m6Vo=; b=foW5HfcFh63wgZu9/1zKmftuUr/DanKJVNZ+XH++fvbRo05OOiYBkgi5 QPf2CKZnXVSS4KHFm5vgtc2xEc2jHUUO2ltkjC4wQK/g6kOsd8hrdEhOX us7b9kTXmAcZZac5rmVFZQzNKlTASRvhpnEacT6Kqv/CCmdm2d4ja1TAV +PlQfndCLCtLTuf+TG7xDVmyljvCFk+tN0GweIC0vDyrrVN3rBJYH1RFL aU0kUalX8eOp4OWA4icINOrP7r00kV52d/cAGK3oZNxeLfsQSo9buL3p6 UZgVq8CSacTy1DXNS6FgmH0fa+NzsWAdARDPPC66lRk9Sva6Ory7+p/Qm Q==; X-CSE-ConnectionGUID: PBjGkC+SSZ+djG4FWi+TaQ== X-CSE-MsgGUID: /gNjHoa8S1WzSWJx2oYLbg== X-IronPort-AV: E=Sophos;i="6.11,196,1725346800"; d="scan'208";a="263956557" X-Amp-Result: SKIPPED(no attachment in message) Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa5.microchip.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 11 Oct 2024 07:02:03 -0700 Received: from chn-vm-ex04.mchp-main.com (10.10.85.152) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Fri, 11 Oct 2024 07:01:26 -0700 Received: from wendy.microchip.com (10.10.85.11) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server id 15.1.2507.35 via Frontend Transport; Fri, 11 Oct 2024 07:01:24 -0700 From: To: , CC: , , , , , , , , , , , Subject: [PATCH v10 0/3] Fix address translations on MPFS PCIe controller Date: Fri, 11 Oct 2024 15:00:40 +0100 Message-ID: <20241011140043.1250030-1-daire.mcnamara@microchip.com> X-Mailer: git-send-email 2.43.2 Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Daire McNamara Hi all, On Microchip PolarFire SoC (MPFS), the PCIe controller is connected to the CPU via one of three Fabric Interface Connectors (FICs). Each FIC present to the CPU complex as 64-bit AXI-M and 64-bit AXI-S. To preserve compatibility with other PolarFire family members, the PCIe controller is connected to its encapsulating FIC via a 32-bit AXI-M and 32-bit AXI-S interface. Each FIC is implemented in FPGA logic and can incorporate logic along its 64-bit AXI-M to 32-bit AXI-M chain (including address translation) and, likewise, along its 32-bit AXI-S to 64-bit AXI-S chain (again including address translation). In order to reduce the potential support space for the PCIe controller in this environment, MPFS supports certain reference designs for these address translations: reference designs for cache-coherent memory accesses and reference designs for non-cache-coherent memory accesses. The precise details of these reference designs and associated customer guidelines recommending that customers adhere to the addressing schemes used in those reference designs are available from Microchip, but the implication for the PCIe controller address translation between CPU-space and PCIe-space are: For outbound address translation, the PCIe controller address translation tables are treated as if they are 32-bit only. Any further address translation must be done in FPGA fabric. For inbound address translation, the PCIe controller is configurable for two cases: * In the case of cache-coherent designs, the base of the AXI-S side of the address translation must be set to 0 and the size should be 4 GiB wide. The FPGA fabric must complete any address translations based on that 0-based address translation. * In the case of non-cache coherent designs, the base of AXI-S side of the address translation must be set to 0x8000'0000 and the size shall be 2 GiB wide. The FPGA fabric must complete any address translation based on that 0x80000000 base. So, for example, in the non-cache-coherent case, with a device tree property that maps an inbound range from 0x10'0000'0000 in PCIe space to 0x10'0000'0000 in CPU space, the PCIe rootport will translate a PCIe address of 0x10'0000'0000 to an intermediate 32-bit AXI-S address of 0x8000'0000 and the FIC is responsible for translating that intermediate 32-bit AXI-S address of 0x8000'0000 to a 64-bit AXI-S address of 0x10'0000'0000. And similarly, for example, in the cache-coherent case, with a device tree property that maps an inbound range from 0x10'0000'0000 in PCIe space to 0x10'0000'0000 in CPU space, the PCIe rootport will translate a PCIe address of 0x10'0000'0000 to an intermediate 32-bit AXI-S address of 0x0000'0000 and the FIC is responsible for translating that intermediate 32-bit AXI-S address of 0x0000'0000 to a 64-bit AXI-S address of 0x10'0000'0000. See https://lore.kernel.org/all/20220902142202.2437658-1-daire.mcnamara@microchip.com/T/ for backstory. Changes since v9: - Dropped plda_setup_inbound_address_translation() from StarFive driver Changes since v8: - Edits suggested by BHelgass and Ilpo Jarvinen - Dropped the setup_inbound_atr u64 change (passing on openrisc 32-bit without it) Changes since v7: - Rebased on top of 6.11rc1 Changes since v6: - Added Reviewed-by: Ilpo tag to outbound patch - Fixed typos/capitalisation/etc as suggested by Ilpo Changes since v5: - Reverted setup_inbound_atr size parameter to u64 as ci system reported SZ_4G getting truncated to 0 on mips when I try to use size_t or resource_size_t. Added Acked-by tags Changes since v4: - Added more cleanups suggested by Ilpo Jarvinen Added cleanups for inbound v4 and outbound v3. Changes since v3: - Added nice cleanups suggested by Ilpo Jarvinen Changes since v2: - Added Changes since v1: - added bindings patch to allow dma-noncoherent - changed a size_t to u64 to pass 32-bit compile tests - allowed 64-bit outbound pcie translations - tied PCIe side of eCAM translation table to 0 Conor Dooley (1): dt-bindings: PCI: microchip,pcie-host: allow dma-noncoherent Daire McNamara (2): PCI: microchip: Fix outbound address translation tables PCI: microchip: Fix inbound address translation tables .../bindings/pci/microchip,pcie-host.yaml | 2 + .../pci/controller/plda/pcie-microchip-host.c | 123 +++++++++++++++++- drivers/pci/controller/plda/pcie-plda-host.c | 17 ++- drivers/pci/controller/plda/pcie-plda.h | 6 +- 4 files changed, 139 insertions(+), 9 deletions(-) base-commit: 8400291e289ee6b2bf9779ff1c83a291501f017b