From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (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 1358E47CA69 for ; Mon, 7 Sep 2026 11:26:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788780414; cv=none; b=IPMtrZvdQHYNYInL2yjMYlagLSwzhbvF9UeVx4KHKIRCAyQz1ZB59Xq9JkmtP+TcIz80OjVb2PGpobtZVvgpPfFRjXE7iINijft3vmvh040A4oBxEg44N7MQ2YvrUpbWXXDIvWDsOTrIEqegU4QUMzczQbyf3FmE/xJP7+WrHjY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788780414; c=relaxed/simple; bh=6xPsWRUPeleJLK8WJ2QWq0vWWv1E8zE0psVdoiyxOqc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=j3OF68yuK+ktmJmzOvW+ahsBMTNlXOdAifn4WepXofmaW5xgD2MskJFpq4Pw5bQqX+CLLuXQMYNxpGM7/l7ZREmyD0pwxhJvXba+RiQru3Lq9UMtXbbsjP+evcdYzHNPI4aU6XdWScNLHUeCc+H2c5+IgAkZg+ya3I5JA85iNwk= 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=kW86g9n7; arc=none smtp.client-ip=209.85.214.173 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="kW86g9n7" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-2d944747d41so36221655ad.0 for ; Mon, 07 Sep 2026 04:26:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788780412; x=1789385212; darn=lists.linux.dev; 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=/VmjijarNN4xgegaOIIjybmiUp5b9EVo/zWnU+ss9Bo=; b=kW86g9n7s8hSQf/n5wz8P4paDwQHIaNz5Z0cbiS0A5KAdwleZl+f2B+Ayc1YwMRBcG wKgQstwFsgYxzdwVPVlzVQhHO56Vr97wKs4SknoKuOnaEHNZBkRvw5vQ2VgQO+XRAUp0 tMKcBPvSWRLP14kKTnn93TDZEebADxuukxiGG6TMFR7zKW3bQXUE0xNE6pZOr8QBtqgx wgeZpdC+7qwYkumG2HwAsL5wRiK+WC8DQrJO9WS2yJ9r03c2o0AUYPND3p8UhE5oZyDT iqrlwDaEuJJ0nFNGQYjbPeeaHMvzn9+ikKUEfiWptHwDQ2+7bNoaM98/RDSKM7PJ9yQa /7Sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788780412; x=1789385212; 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=/VmjijarNN4xgegaOIIjybmiUp5b9EVo/zWnU+ss9Bo=; b=nqS/IzE4z2VSZfcGdD51QoMVBXH4sQ8l6zhZ/AH8oawID3Ym6TSDI7L1QVST4UZGm9 uaD/LWHHAbWKAY/7qzU6AN8Ggm1KPyVuclniZDq0ofv7FLP1bxHhAfXVOmYOC5FSPqTV m65x6geol35eeaG6tWMQv6R8NzgoExcU1/iEWPNl15W8FRXEL/zSeqU9KwT4svmjVGuT 4HHeD8fVG7a37B49YJhBcnFF2SQCOg/F49MtEBPWhBT7ecxIdUC7vheCZ+OCJrVkSW3s dxBnTmy42iGmXdnkBvlzS0wvCpF7csaXGjmUsD85uzKoAZzF/IDAZ2UEjQGByXPJ/cxU 3qpA== X-Forwarded-Encrypted: i=1; AKwUvByuKs8dVt0myEJj0LkmsTZDmF7YNc0ChYU7sWwcQ+j89eKbh13MK2XYiy+iHAYtJmOu4lpdZbYr9A==@lists.linux.dev X-Gm-Message-State: AFuF++kmGPe9vOAmMtKqoTdp55GG/NkIJsdsOOeJ4KoAzDCut7+/4obO /8eYZEzHbHqkmGLN2G7CaGvMYLwJ/6YFmFRwQNyfCLL+adHYr+mIzrMa X-Gm-Gg: AYBFou3QA/VlKzPes7p7l2zaBrJ3sc0YQX28/fo6aqXgupR/J0n/AW9uwUmz9wbbmVw xqJ7GOWE7HiFO0roev4aIrT403TiPGgUf7uHMLAYYsyOUUBSctvarMgqWsAx+P1qhhVTPncPsW4 FdsYTvrlwPguUq4slGXF2pbUOVIQm5nIm9d5Q8x621PEcncyZ0bBKFY8HXcm2A2eFEkC3lAY9i1 Ui3TtcTBCBYH0Kcu/L/i3qiCc2iEMTRKmV32RnKLwf4sOFOJdD1L2Zsk17VL1aTr9N2GJYQXhEC xiivtecYzhO/VnlhCRp4Puf7gAaNKBc5JZquc65Y+rZbqoNAY7Wp7HKFImuit0tZL87PgRyhNMi owwJqKaeLTAZ9xJmHgSrqbc33Yh+XXWllg8Isg/egV8w2EPC19F+usIUmKbbiKfnZ+Wbk7/2tcs yZbLKggvbHR7sdwFKcaJS3niJUKcQ56etbikBe X-Received: by 2002:a17:902:e951:b0:2d8:d4ce:7e3b with SMTP id d9443c01a7336-2db126289bbmr311560445ad.16.1788780412378; Mon, 07 Sep 2026 04:26:52 -0700 (PDT) Received: from localhost ([2001:da8:7001:11::cb]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2db1982c63fsm41788675ad.42.2026.09.07.04.26.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Sep 2026 04:26:52 -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 , Krishna Chaitanya Chundru , Senchuan Zhang , Inochi Amaoto , Alex Elder , Xincheng Zhang , Randolph Lin , Siddharth Vadapalli , Andy Shevchenko , Vidya Sagar , Neil Armstrong , Danilo Krummrich , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig=20=28The=20Capable=20Hub=29?= , Pengpeng Hou , Anirudh Srinivasan , 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 v5 6/6] PCI: spacemit-k1: Add Spacemit K3 PCIe host controller support Date: Mon, 7 Sep 2026 19:26:05 +0800 Message-ID: <20260907112606.465778-7-inochiama@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260907112606.465778-1-inochiama@gmail.com> References: <20260907112606.465778-1-inochiama@gmail.com> Precedence: bulk X-Mailing-List: spacemit@lists.linux.dev 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 | 132 ++++++++++++++++++ 2 files changed, 134 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 c610b367412a..5031b688fdab 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; @@ -303,6 +316,116 @@ 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; + + 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: + 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_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; + + /* This register require a RAW for cleanup */ + 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; @@ -380,8 +503,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