From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (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 DB63D301714 for ; Mon, 29 Sep 2025 11:38:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759145906; cv=none; b=Zd8VDFwH5V6LNn2p+nUcVLu4JvXO0Pwz0PBgahD1deJJXxlQ0f0P8rQ0MbwffAukDhukED5VXVJpbqpdljZ7fbEmDVn3buutUs2+EMmFmS6RVrqWudDOqwjuEOo0AC15jmo8vsTGxD9XF7OKzTRovptCjkMJjFT4zwc2fnIoW6I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759145906; c=relaxed/simple; bh=Y9B4pzLzBUoQ9UIuQ9tIIiCjBmPz1CktqXuCtCWM/sI=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jXfZUDbS7VsSnV2MLCbxnLuAmaBvm3rMx/bKSeXJEZp9KpmF9XlUSHCjAkrjCBIXPC6GeULF2Rc22oXAtiBzZrz/EpwWv3tPakON+V6MdvnRX4Xsm2f0Y1QklXsONb+gjyqF8JgbytjBgAbUgKAptB0ehMm0F7UXm7Pftjw9/6o= 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=PgLlWE2V; arc=none smtp.client-ip=209.85.128.47 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="PgLlWE2V" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-46e2e6a708fso29235025e9.0 for ; Mon, 29 Sep 2025 04:38:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1759145903; x=1759750703; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=HfCCKZmM8pHKKYsT+xDhYQD00mwQ4CthcxXjlQ/ajbw=; b=PgLlWE2VVDs5gVdfQme1SED6pFSZ8LG0i6DrTeojYnEV2/WzX9F9nb7eWeQGPPRA7d B+hFkECQ0al2qeu4K87WXDcus1xHYXkDZ5RNVcLXb2cqSRtWs+6oIR1k4fpNfYRJhLP6 q10p3PGwqD/tW6fYr3EjNpFikq+tegwarDwDKaYR0aDiHFD9e25AljUj4C3l4uHzwCku XB655er/hfGG6E37RqLafMqbJY+dkydMEqzR4E6RXHE+u+VcpUEfTkB6C0gKOZdvqgto ovY7cN6nlwRu/+fTPicbaDwe0X6DPrWb6/uekD2dj736US8mNEhFAg9FqlldV2sf9ZiF 8wfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759145903; x=1759750703; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HfCCKZmM8pHKKYsT+xDhYQD00mwQ4CthcxXjlQ/ajbw=; b=uECSo912na8tDGb2tR1E5i+Yzcs9Ysjqqardm2pf+3/nUnFLczwpzcn+YpSGs4NoVG xWeqro0g5iskh++PD+hDiKTsWZvCL86eBCVgCISDYm8GeXonXebd85v5feeWTsFNXVuO 0OeazUGET2Bjql0wz7Ndv/ORLa3vCwn5mO2c492SP195HM6wQk6Nhb4ogGN8ZqWWqJmy YEas7EmB2R2IF9Mze8mgmtFLH11HdWSCa3Il5TY6AeFzGDnxQFbUmF1WMF+m+IRAtAjc cFr1OW2CHAtZci/wuqohFBzAuQXG2/bezzgm6cR8drI8OyQtqFHeGzaf0/UThbjgmXWQ sHbQ== X-Forwarded-Encrypted: i=1; AJvYcCVp+hrcC81uvZzMKSdKbkhVV3/nYGh6vFQ71CtobvdAXJWfkKWUvtYgV4K0zMUgmGgr3a+9Yl3p0XM=@vger.kernel.org X-Gm-Message-State: AOJu0Yx9RjE7nUSYVRUfiLru4c5d4WJAaIXPA9YRJfoWpVNjem95uRTo v/DEPd6ea2iN9autrf9p3WMVL+FWadSPcTAKUk2oyZsADz0jC5dsviQd X-Gm-Gg: ASbGncuus/9ovO/OqORAUEhFltQUSP4uDLy7k3akTelpOn7plr0inkqFIg4/H2Qq+He 3/3rCC4cJJC1N0BqRdjGf0cjmi5kELC1hc/dXE0X13gYDxKh2/94HKbs+w5Q66VywmhKR83ciZ5 IL5OmBLtyu0JehAjvDIrriBXNBgt7Vwd147yVymtYLQG5uyak3nVJog9YDyP23VXUPTlnwhuKPl JVavm93L+watQtWzbSHzPcCE0CCZzlVQhnVC4ZLQm6ViiR7MV0GnDwFnM8N6+PH5AgImAbhypPT n7uUslgA2QdLmwAGse6Yc3OWTWBB0lZV8mBsuShASoHhJe5wtuwd6JlQw3il46+VRUeOLMRE7+s +kGVR/VTQVZNPCMQ09ApOCDEKXtDp908XNQl4nzc9dA0Q+jcDlkRNze30aLaMPjDCTVqrhsgFVe xwq9psVA== X-Google-Smtp-Source: AGHT+IHyG6lnL8qQ0LD131D8WPiKwUrMMhMJ4PKeOnuBD/ytBbwWaTjIucbfk9dUwJTA+msn8KI/1A== X-Received: by 2002:a05:600c:608d:b0:46e:4f25:aace with SMTP id 5b1f17b1804b1-46e510d28edmr38669385e9.6.1759145902845; Mon, 29 Sep 2025 04:38:22 -0700 (PDT) Received: from Ansuel-XPS24 (host-95-249-236-54.retail.telecomitalia.it. [95.249.236.54]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-46e56f53596sm9502465e9.7.2025.09.29.04.38.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Sep 2025 04:38:22 -0700 (PDT) From: Christian Marangi To: Ryder Lee , Jianjun Wang , Bjorn Helgaas , Lorenzo Pieralisi , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Manivannan Sadhasivam , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno , Christian Marangi , linux-pci@vger.kernel.org, linux-mediatek@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 5/5] PCI: mediatek: add support for Airoha AN7583 SoC Date: Mon, 29 Sep 2025 13:38:04 +0200 Message-ID: <20250929113806.2484-6-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250929113806.2484-1-ansuelsmth@gmail.com> References: <20250929113806.2484-1-ansuelsmth@gmail.com> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Add support for the second PCIe Root Complex present on Airoha AN7583 SoC. This is based on the Mediatek Gen1/2 PCIe driver and similar to Gen3 also require workaround for the reset signals. Introduce a new flag to skip having to reset signals and also introduce some additional logic to configure the PBUS registers required for Airoha SoC. While at it, also add additional info on the PERST# Signal delay comments and use dedicated macro. Signed-off-by: Christian Marangi --- drivers/pci/controller/pcie-mediatek.c | 92 ++++++++++++++++++++------ 1 file changed, 70 insertions(+), 22 deletions(-) diff --git a/drivers/pci/controller/pcie-mediatek.c b/drivers/pci/controller/pcie-mediatek.c index 1678461e56d3..3340c005da4b 100644 --- a/drivers/pci/controller/pcie-mediatek.c +++ b/drivers/pci/controller/pcie-mediatek.c @@ -148,6 +148,7 @@ enum mtk_pcie_flags { NO_MSI = BIT(2), /* Bridge has no MSI support, and relies on an * external block */ + SKIP_PCIE_RSTB = BIT(3), /* Skip calling RSTB bits on PCIe probe */ }; /** @@ -684,28 +685,32 @@ static int mtk_pcie_startup_port_v2(struct mtk_pcie_port *port) regmap_update_bits(pcie->cfg, PCIE_SYS_CFG_V2, val, val); } - /* Assert all reset signals */ - writel(0, port->base + PCIE_RST_CTRL); - - /* - * Enable PCIe link down reset, if link status changed from link up to - * link down, this will reset MAC control registers and configuration - * space. - */ - writel(PCIE_LINKDOWN_RST_EN, port->base + PCIE_RST_CTRL); - - /* - * Described in PCIe CEM specification sections 2.2 (PERST# Signal) and - * 2.2.1 (Initial Power-Up (G3 to S0)). The deassertion of PERST# should - * be delayed 100ms (TPVPERL) for the power and clock to become stable. - */ - msleep(100); - - /* De-assert PHY, PE, PIPE, MAC and configuration reset */ - val = readl(port->base + PCIE_RST_CTRL); - val |= PCIE_PHY_RSTB | PCIE_PERSTB | PCIE_PIPE_SRSTB | - PCIE_MAC_SRSTB | PCIE_CRSTB; - writel(val, port->base + PCIE_RST_CTRL); + if (!(soc->flags & SKIP_PCIE_RSTB)) { + /* Assert all reset signals */ + writel(0, port->base + PCIE_RST_CTRL); + + /* + * Enable PCIe link down reset, if link status changed from + * link up to link down, this will reset MAC control registers + * and configuration space. + */ + writel(PCIE_LINKDOWN_RST_EN, port->base + PCIE_RST_CTRL); + + /* + * Described in PCIe CEM specification revision 3.0 sections + * 2.2 (PERST# Signal) and 2.2.1 (Initial Power-Up (G3 to S0)). + * + * The deassertion of PERST# should be delayed 100ms (TPVPERL) + * for the power and clock to become stable. + */ + msleep(PCIE_T_PVPERL_MS); + + /* De-assert PHY, PE, PIPE, MAC and configuration reset */ + val = readl(port->base + PCIE_RST_CTRL); + val |= PCIE_PHY_RSTB | PCIE_PERSTB | PCIE_PIPE_SRSTB | + PCIE_MAC_SRSTB | PCIE_CRSTB; + writel(val, port->base + PCIE_RST_CTRL); + } /* Set up vendor ID and class code */ if (soc->flags & NEED_FIX_CLASS_ID) { @@ -826,6 +831,41 @@ static int mtk_pcie_startup_port(struct mtk_pcie_port *port) return 0; } +static int mtk_pcie_startup_port_an7583(struct mtk_pcie_port *port) +{ + struct mtk_pcie *pcie = port->pcie; + struct device *dev = pcie->dev; + struct pci_host_bridge *host; + struct resource_entry *entry; + struct regmap *pbus_regmap; + resource_size_t addr; + u32 args[2], size; + + /* + * Configure PBus base address and base address mask to allow + * the hw to detect if a given address is accessible on PCIe + * controller. + */ + pbus_regmap = syscon_regmap_lookup_by_phandle_args(dev->of_node, + "mediatek,pbus-csr", + ARRAY_SIZE(args), + args); + if (IS_ERR(pbus_regmap)) + return PTR_ERR(pbus_regmap); + + host = pci_host_bridge_from_priv(pcie); + entry = resource_list_first_type(&host->windows, IORESOURCE_MEM); + if (!entry) + return -ENODEV; + + addr = entry->res->start - entry->offset; + regmap_write(pbus_regmap, args[0], lower_32_bits(addr)); + size = lower_32_bits(resource_size(entry->res)); + regmap_write(pbus_regmap, args[1], GENMASK(31, __fls(size))); + + return mtk_pcie_startup_port_v2(port); +} + static void mtk_pcie_enable_port(struct mtk_pcie_port *port) { struct mtk_pcie *pcie = port->pcie; @@ -1210,6 +1250,13 @@ static const struct mtk_pcie_soc mtk_pcie_soc_mt7622 = { .flags = NEED_FIX_CLASS_ID, }; +static const struct mtk_pcie_soc mtk_pcie_soc_an7583 = { + .ops = &mtk_pcie_ops_v2, + .startup = mtk_pcie_startup_port_an7583, + .setup_irq = mtk_pcie_setup_irq, + .flags = NEED_FIX_CLASS_ID | SKIP_PCIE_RSTB, +}; + static const struct mtk_pcie_soc mtk_pcie_soc_mt7629 = { .device_id = PCI_DEVICE_ID_MEDIATEK_7629, .ops = &mtk_pcie_ops_v2, @@ -1219,6 +1266,7 @@ static const struct mtk_pcie_soc mtk_pcie_soc_mt7629 = { }; static const struct of_device_id mtk_pcie_ids[] = { + { .compatible = "airoha,an7583-pcie", .data = &mtk_pcie_soc_an7583 }, { .compatible = "mediatek,mt2701-pcie", .data = &mtk_pcie_soc_v1 }, { .compatible = "mediatek,mt7623-pcie", .data = &mtk_pcie_soc_v1 }, { .compatible = "mediatek,mt2712-pcie", .data = &mtk_pcie_soc_mt2712 }, -- 2.51.0