From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj2-f13.google.com (mail-pj2-f13.google.com [74.125.227.141]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EDF2536D9EE for ; Wed, 23 Sep 2026 01:51:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.141 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790128290; cv=none; b=EHs3skdKYmnKt8Qo6mxnwxfJuIVu5BsQBZI0bL0FdnAAybEiCDYjQGDeZw6APKbGOsNHba4UQ/Zc+DMbyTUsiqDCJUpIItbk5Q/YY+797Un6IF0niobWXpatucyQLbb0H4qg6qvRQxQuSMN9bzi9rSkgCgMimxvFmVXRUj4Yao4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790128290; c=relaxed/simple; bh=h2OAHMQcGpb0AsWpFEucPqrsPoM9+UcRqt7PH7w3D9Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WVpaPXCly8e5uSIm6m+Spd+2l556OCnOwtiCKBPbQsZcOz6vdMt7V+uEbhK6ykgtHL0zHKsV02tJKT8q/z9LOk2JTcDAZoPOldPfivj6Vh1LN58uNd1CTN7auQ+/D1D2u3eWaCnuv6H0wjhw4LMWtYV0t4Cgqy7y2M/sVLDG1Ts= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=T8DgnBHV; arc=none smtp.client-ip=74.125.227.141 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="T8DgnBHV" Received: by mail-pj2-f13.google.com with SMTP id 98e67ed59e1d1-396ccb1a98fso358710a91.1 for ; Tue, 22 Sep 2026 18:51:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790128287; x=1790733087; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=3mM3n6clTLJK9jPcXnqbcvBUkpBEQhM5nHViLUCww2U=; b=T8DgnBHVF+Q5gJGTipKg9EJwa0Fupt+Ii/lcdBMRw7lVVZjLZqGsOVivkH81oxXipm Y3GzPvuP7h2CTtqD/1aDrx/RyGm589up2GdtByQkVnsM7SeaFiiAJ0bBjSsgmt8QGCz6 zcAaprQmLLXqF0I3emrUkHaMqZDsbViUmBdUKopFUsUz522FeinJOYOl+01SEuwTa+mz L8jpjgdDciom06g4HYSQR5F2Vucho3Hf+/xkb4+uRu2QmamCTVJo8KBNI4qJpgCnmVv/ dxT5iN50RTkw7ELMkeX5ouqvPhAa0glDy/Bcsoe364a3N6HPzvUrkhP8r/E4UkqsJ2KH lJrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790128287; x=1790733087; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=3mM3n6clTLJK9jPcXnqbcvBUkpBEQhM5nHViLUCww2U=; b=2LVlVrjb7jQLDPYXttOXeUjJAKWCctKtlgOTcgjyKSeFm3OSntDo5USqBO6fcES2LU XjgnuC9C/wwfzRO6Gv4U7keTFYcNSEV3FWB692l15ef+YUNdisYYu3C7TYD8ULhoXXxL xvsDS2buNKb3bNvHnDmclIJiqVOH7sxOeet4v92uXld8L6hjrcxt93YfLBJoXcyigaVe VSfzrdAeSB5fiKnYJg5J/p3wZYTOcIx5IRVuHcVNN3u5/hZaKTP9AbVR+c1YOlaau00A 3vmvErKjIxmf9wY/BHLyPuAta2lVGR6tDwvwVubetBAl2WCqPrt57IjBPMDktuAOpPXS rXag== X-Forwarded-Encrypted: i=1; AKwUvBygmms9gWI5Yb5j75D+ERSWZIGRyPGiwKPi8LgxxJqzqdriLeqZuWDV95OzMobjR5oGTpYVasiIFbx5T3I=@vger.kernel.org X-Gm-Message-State: AFuF++np0VzADWmyvbqm4voXvbB7RsISCPCRI3O8jfvLb34eluc/h72k QAtG1nh19c+vxnlSgJ7k+Fcxxo8duXUG54KOrVC3TNKX9Mk0F23whqEj X-Gm-Gg: AYBFou1NyhGWrfDErzIGcISd9m0ViE5CcXheFXxlprE60sTzUA/3Z560SPlfbQhJWgJ vIcbyaKj+gPTsQP1f8wl2AzYb90UnO3ao0da0uYwdLmp5gum8tI6pmZcxxGRlmtNH6elZZ7+MCh wt0VC7gDGkK2lUvhCJYXQIs4Ev7t4pGTRakLYP4rAHY/+JDMcBYVx/qrfb5TZQkrBTil7Gy+IaN TgbySis8+AVu8g2IocDuLM0S5D4YUvo44GDLR9xKhn2QBx8gnpUDEMzlgXkk2GtTQ64+kGsX8r4 E4Mb5XcNgiCXY3jF3Oaay2R58pTXI9uUXmv1Rp92e8FlPCsKkmG5VnWBDicqUIZ8n7VfPtXmnpn nTqvNUzBl2sj/n6M1YyGtTp/0NMsKZVfCLBz39yQSlF2Sk7KLp0qZ65xKhsMNgE0bzBqeGXXeXN yfOpFgD6ouR7CES/i6iD1Mo/jM7SPhJl/BG7nmNEaEU2aZhg8pE4PdiVO/qQ== X-Received: by 2002:a17:90b:33c9:b0:39e:6c6a:657e with SMTP id 98e67ed59e1d1-3a07e6a6e38mr1007010a91.65.1790128287307; Tue, 22 Sep 2026 18:51:27 -0700 (PDT) Received: from localhost ([2001:da8:7001:11::cb]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3a07ddae723sm1924413a91.5.2026.09.22.18.51.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Sep 2026 18:51:26 -0700 (PDT) From: Inochi Amaoto To: Jingoo Han , Manivannan Sadhasivam , Lorenzo Pieralisi , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Rob Herring , Bjorn Helgaas , Krzysztof Kozlowski , Conor Dooley , Yixun Lan , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Frank Li , Niklas Cassel , Sherry Sun , Arnd Bergmann , Christian Bruel , Sascha Hauer , Vidya Sagar , Xincheng Zhang , Alex Elder , Siddharth Vadapalli , Randolph Lin , Andy Shevchenko , Neil Armstrong , Marek Vasut , Inochi Amaoto , Pengpeng Hou , Ping-Ke Shih , Anirudh Srinivasan , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig=20=28The=20Capable=20Hub=29?= , Gustavo Pimentel Cc: linux-pci@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, spacemit@lists.linux.dev, Yixun Lan , Longbin Li Subject: [PATCH v6 6/6] PCI: spacemit-k1: Add Spacemit K3 PCIe host controller support Date: Wed, 23 Sep 2026 09:50:15 +0800 Message-ID: <20260923015016.64069-7-inochiama@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260923015016.64069-1-inochiama@gmail.com> References: <20260923015016.64069-1-inochiama@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The PCIe controller on Spacemit K3 is almost a standard Synopsys DesignWare PCIe IP with extra link and reset control. Unlike the PCIe controller on K1, this controller supports external MSI interrupt controller and can use multiple PHYs at the same time. Add driver to support PCIe controller on Spacemit K3 PCIe. Signed-off-by: Inochi Amaoto --- drivers/pci/controller/dwc/Kconfig | 4 +- drivers/pci/controller/dwc/pcie-spacemit-k1.c | 139 ++++++++++++++++++ 2 files changed, 141 insertions(+), 2 deletions(-) diff --git a/drivers/pci/controller/dwc/Kconfig b/drivers/pci/controller/dwc/Kconfig index dcfbe7e229fd..f9c27165260e 100644 --- a/drivers/pci/controller/dwc/Kconfig +++ b/drivers/pci/controller/dwc/Kconfig @@ -443,7 +443,7 @@ config PCIE_SOPHGO_DW Sophgo SoCs. config PCIE_SPACEMIT_K1 - tristate "SpacemiT K1 PCIe controller (host mode)" + tristate "SpacemiT PCIe controller (host mode)" depends on ARCH_SPACEMIT || COMPILE_TEST depends on HAS_IOMEM select PCIE_DW_HOST @@ -451,7 +451,7 @@ config PCIE_SPACEMIT_K1 default ARCH_SPACEMIT help Enables support for the DesignWare based PCIe controller in - the SpacemiT K1 SoC operating in host mode. Three controllers + the SpacemiT SoC operating in host mode. Three controllers are available on the K1 SoC; the first of these shares a PHY with a USB 3.0 host controller (one or the other can be used). diff --git a/drivers/pci/controller/dwc/pcie-spacemit-k1.c b/drivers/pci/controller/dwc/pcie-spacemit-k1.c index ec59ccb710ec..c3b935f424cd 100644 --- a/drivers/pci/controller/dwc/pcie-spacemit-k1.c +++ b/drivers/pci/controller/dwc/pcie-spacemit-k1.c @@ -28,8 +28,18 @@ #define SMLH_LINK_UP BIT(1) #define RDLH_LINK_UP BIT(12) +#define INTR_STATUS 0x0010 + #define INTR_ENABLE 0x0014 #define MSI_CTRL_INT BIT(11) +#define RDLH_LINK_UP_INT BIT(20) + +#define K3_PHY_AHB_IRQSTATUS_INTX 0x0008 + +#define K3_ADDR_INTR_STATUS1 0x0018 + +#define K3_CACHE_MSTR_AWCACHE_MODE GENMASK(14, 11) +#define K3_CACHE_MSTR_AWCACHE_BEHAVIOR 0xf /* Some controls require APMU regmap access */ #define SYSCON_APMU "spacemit,apmu" @@ -44,6 +54,9 @@ #define PCIE_CONTROL_LOGIC 0x0004 #define PCIE_SOFT_RESET BIT(0) +#define PCIE_PERSTN_OE BIT(24) +#define PCIE_PERSTN_OUT BIT(25) +#define PCIE_IGNORE_PERSTN BIT(31) struct k1_pcie; @@ -315,6 +328,123 @@ static int k1_pcie_parse_port(struct k1_pcie *k1) return ret; } +static int k3_pcie_init(struct dw_pcie_rp *pp) +{ + struct dw_pcie *pci = to_dw_pcie_from_pp(pp); + struct k1_pcie *k1 = to_k1_pcie(pci); + u32 reset_ctrl = k1->pmu_off + PCIE_CLK_RESET_CONTROL; + u32 val; + int ret; + + regmap_clear_bits(k1->pmu, reset_ctrl, LTSSM_EN); + + k1_pcie_toggle_soft_reset(k1); + + /* K3: Set IGNORE_PERSTN and drive PERSTN_OE high (assert reset) */ + regmap_update_bits(k1->pmu, k1->pmu_off + PCIE_CONTROL_LOGIC, + PCIE_IGNORE_PERSTN | PCIE_PERSTN_OE | PCIE_PERSTN_OUT, + PCIE_IGNORE_PERSTN | PCIE_PERSTN_OE); + + ret = k1_pcie_enable_resources(k1); + if (ret) + goto failed_resources; + + regmap_set_bits(k1->pmu, reset_ctrl, PCIE_AUX_PWR_DET); + regmap_clear_bits(k1->pmu, reset_ctrl, APP_HOLD_PHY_RST); + + ret = phy_bulk_init(k1->phy_count, k1->phys); + if (ret) + goto failed_phy_init; + + ret = phy_bulk_power_on(k1->phy_count, k1->phys); + if (ret) + goto failed_phy_power_on; + + msleep(PCIE_T_PVPERL_MS); + + regmap_set_bits(k1->pmu, k1->pmu_off + PCIE_CONTROL_LOGIC, + PCIE_PERSTN_OUT | PCIE_PERSTN_OE); + + val = dw_pcie_readl_dbi(pci, GEN3_EQ_CONTROL_OFF); + val = u32_replace_bits(val, BIT(7), + GEN3_EQ_CONTROL_OFF_PSET_REQ_VEC); + dw_pcie_writel_dbi(pci, GEN3_EQ_CONTROL_OFF, val); + + k1_pcie_set_device_id(k1); + + /* Finally, as a workaround, disable ASPM L1 */ + k1_pcie_disable_aspm_l1(k1); + + return 0; + +failed_phy_power_on: + phy_bulk_exit(k1->phy_count, k1->phys); +failed_phy_init: + k1_pcie_disable_resources(k1); +failed_resources: + regmap_update_bits(k1->pmu, k1->pmu_off + PCIE_CONTROL_LOGIC, + PCIE_PERSTN_OUT | PCIE_PERSTN_OE | PCIE_IGNORE_PERSTN, + PCIE_PERSTN_OUT | PCIE_PERSTN_OE); + + return ret; +} + +static void k3_pcie_deinit(struct dw_pcie_rp *pp) +{ + struct dw_pcie *pci = to_dw_pcie_from_pp(pp); + struct k1_pcie *k1 = to_k1_pcie(pci); + + /* Assert fundamental reset (drive PERST# low) */ + regmap_update_bits(k1->pmu, k1->pmu_off + PCIE_CONTROL_LOGIC, + PCIE_PERSTN_OUT | PCIE_PERSTN_OE, + PCIE_PERSTN_OE); + + phy_bulk_power_off(k1->phy_count, k1->phys); + phy_bulk_exit(k1->phy_count, k1->phys); + + k1_pcie_disable_resources(k1); +} + +static int k3_pcie_msi_host_init(struct dw_pcie_rp *pp) +{ + struct dw_pcie *pci = to_dw_pcie_from_pp(pp); + u32 val; + + dw_pcie_dbi_ro_wr_en(pci); + + /* For IMSIC interrupt */ + val = dw_pcie_readl_dbi(pci, COHERENCY_CONTROL_3_OFF); + val = u32_replace_bits(val, K3_CACHE_MSTR_AWCACHE_BEHAVIOR, + K3_CACHE_MSTR_AWCACHE_MODE); + dw_pcie_writel_dbi(pci, COHERENCY_CONTROL_3_OFF, val); + + dw_pcie_dbi_ro_wr_dis(pci); + + return 0; +} + +static const struct dw_pcie_host_ops k3_pcie_host_ops = { + .init = k3_pcie_init, + .deinit = k3_pcie_deinit, + .msi_init = k3_pcie_msi_host_init, +}; + +static int k3_pcie_parse_port(struct k1_pcie *k1) +{ + u32 status0, status1, status2; + + /* Clear the status registers */ + status0 = readl_relaxed(k1->link + K3_PHY_AHB_IRQSTATUS_INTX); + status1 = readl_relaxed(k1->link + INTR_STATUS); + status2 = readl_relaxed(k1->link + K3_ADDR_INTR_STATUS1); + + writel_relaxed(status0, k1->link + K3_PHY_AHB_IRQSTATUS_INTX); + writel_relaxed(status1, k1->link + INTR_STATUS); + writel_relaxed(status2, k1->link + K3_ADDR_INTR_STATUS1); + + return k1_pcie_parse_port(k1); +} + static int k1_pcie_probe(struct platform_device *pdev) { const struct k1_pcie_device_data *data; @@ -392,8 +522,17 @@ static const struct k1_pcie_device_data k1_pcie_device_data = { .device_id = PCI_DEVICE_ID_SPACEMIT_K1, }; +static const struct k1_pcie_device_data k3_pcie_device_data = { + .host_ops = &k3_pcie_host_ops, + .ops = &k1_pcie_ops, + .parse_port = k3_pcie_parse_port, + .max_phy_count = 6, + .device_id = PCI_DEVICE_ID_SPACEMIT_K3, +}; + static const struct of_device_id k1_pcie_of_match_table[] = { { .compatible = "spacemit,k1-pcie", .data = &k1_pcie_device_data }, + { .compatible = "spacemit,k3-pcie", .data = &k3_pcie_device_data }, { } }; MODULE_DEVICE_TABLE(of, k1_pcie_of_match_table); -- 2.55.0