From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (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 05C5B1397 for ; Mon, 7 Sep 2026 11:26:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788780406; cv=none; b=RhKXKSo/zg0mxNB9/s0xPvhglY5UsLJ5aMNzbx+kDB6+d/bjhgapmgDoZkK9+VEI+4iDsO5zpmkImnbsbyvQ/QT/mj6l7QzII3fD8o3J1OqFIyEfSqIZ6wEvcvGMFZvpFugrLEpxdAcDvD6zsIdK2uX77kvIpzX3bohlY+RjlMs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788780406; c=relaxed/simple; bh=3KvegCNL4h2th2HP4yz1lMrFoOsU01heJpMNzftVqoQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tBMx2/st+HYzaT0RuSVoohSL15hYbk3K2WEk9OWYYszK7RdCxF1RIz13ttb2m1MeqF3oXt6kwg6uMaN/FDJGFPCqzZ/f0gT2k7RFks3iRwpByrFcm5afKdtz6MT1DaSwkBkJ2+JxutfnTA4CGt0rVxlFQnXXmfOYA4Uupi1yBPg= 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=C2s6xl8L; arc=none smtp.client-ip=209.85.214.172 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="C2s6xl8L" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-2d5cad1a6baso29404475ad.3 for ; Mon, 07 Sep 2026 04:26:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788780404; x=1789385204; 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=D4ROjh0Txn+cURQwAkggsPhj+gLlvJP/O4avQg1uNi4=; b=C2s6xl8L2S+fHA6hHFcP/4np5HwP0hMgbzvHFO/CWmA9Jwe76BlGGT26Hy3lJSJwza SGtuL149Apxw8KSqTSDwP7L9AjSniWouUEZo4Ozn4FTqRTO6uZWRD/e5z09yLRKFoz2x uoqPdVZ5thks9u6rks4M8NS/d+tmoI4W3evGU0kJFYFPJh1atuclHd2fwPjsHUYvzWeg W/latRea5IPLhI9lj7g7SwACDUlHQoLQAS0Cd2yVxIg4r1KhEYQxbse36c4bEeEprTdN PbgVoJOJdIS2Bdg1VZZDGvgDPU2KgSoRxtDo6IoXeBbcliWhX3fLZmgmh2n7/Gbm45d3 ITpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788780404; x=1789385204; 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=D4ROjh0Txn+cURQwAkggsPhj+gLlvJP/O4avQg1uNi4=; b=am/4NcgZfK62mHJ6lBUMvOP7IuYE0v8fxlYUH7lkRnGvrRrNJnhQ20YvlrJiwnYboW 8erRgUV9syrV8mxnRfWdIMqG6NdlPft3HQb2K3lWIfl2Whsco7dPQ/z5Gw0S6VU6f/Cx iPko9DktOFy9HOfAaGYCOpcayH7bEdVpwNAzXAXe9XWwRqGYAIHps23G3Z7tsViW4OUh uvn9G5eXFJ6Jvm+OcOzJjf0Kkcc85xbIbckf+ZE1/eSOheWq9COOvAjW6fENTkChobBW J7gPp8IE+VwhN2lWZZkk0Cm7AVGQZYSJSE02G5MbYCm5rFR6rUXWwftqfuQNQcHjpH3U lJyw== X-Forwarded-Encrypted: i=1; AKwUvBxEDN9ihqnh5zkl1rfTU3jf8Bt+6ymGnKZRWiIPMODteIPLMfDitLW+8HmVuvzfJzy27dG4dgQJ+nVZLWU=@vger.kernel.org X-Gm-Message-State: AFuF++kgMRbtv5lgP97sG0Sr0JLssuB7rT1Kg65oc3rYfE0bp5+fA8tM oiuiosdOiYWGbu9WjxoIstJtlA3vQMraHnwwv9m6sv2I/2n9UEo4bmMi X-Gm-Gg: AYBFou1tRh1bJy38qXxEnJWybCxCD2tKVK4/o0tnGWby7tG3Np6uV3QT0gqi2+REFRB bn+v8dSqKRlvzBY7pSdFDRJtxaOGqy/AEcjkH9yzWF3qKzwWI7x7sX/quY7Bu80x6ttwK1W7IVO 7af37AezX1YnFc9KWrqFqSztV0jKVLDUQKPjUnkVH1dn3aMJrSit/V/HdF5xcIjH31buwa3SkdK 2iSYLgHHDIUfXAg5lz8plFptmJL4KqOIyg/7SNjnNnOUZfp/w4o4dK+cfN5kwXDZQ098nCPCxMd /M+bQqHnbRtDl2jzVNyG2AXok8ok1blFQlOFSJ8tP6YZ656DWNrzDRyJLZhQYC36US/PUFKXGOE EQyExZiMlk/q/zuHe2wPSo1GyYsHSx3zTPycihQH3TWCMnYphYom9fiPfYn1hOYpvjHqMi7UfmW Xug2GAUxEiAECGHU03VQleDPC/7Tfk8OnQluZW X-Received: by 2002:a17:903:2c6:b0:2d8:d4d3:da50 with SMTP id d9443c01a7336-2db126aae2dmr385170325ad.20.1788780404053; Mon, 07 Sep 2026 04:26:44 -0700 (PDT) Received: from localhost ([2001:da8:7001:11::cb]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2db1499dad4sm44234655ad.55.2026.09.07.04.26.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Sep 2026 04:26:43 -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 3/6] PCI: spacemit-k1: Add device id update helper Date: Mon, 7 Sep 2026 19:26:02 +0800 Message-ID: <20260907112606.465778-4-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: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Both K1 and K3 need to set vendor id and device id, add a helper function to simplify this. Signed-off-by: Inochi Amaoto --- drivers/pci/controller/dwc/pcie-spacemit-k1.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/pci/controller/dwc/pcie-spacemit-k1.c b/drivers/pci/controller/dwc/pcie-spacemit-k1.c index 1049391beee8..c610b367412a 100644 --- a/drivers/pci/controller/dwc/pcie-spacemit-k1.c +++ b/drivers/pci/controller/dwc/pcie-spacemit-k1.c @@ -52,6 +52,7 @@ struct k1_pcie_device_data { const struct dw_pcie_ops *ops; int (*parse_port)(struct k1_pcie *k1); unsigned int max_phy_count; + unsigned int device_id; }; struct k1_pcie { @@ -151,6 +152,16 @@ static void k1_pcie_disable_aspm_l1(struct k1_pcie *k1) dw_pcie_dbi_ro_wr_dis(pci); } +static void k1_pcie_set_device_id(struct k1_pcie *k1) +{ + struct dw_pcie *pci = &k1->pci; + + dw_pcie_dbi_ro_wr_en(pci); + dw_pcie_writew_dbi(pci, PCI_VENDOR_ID, PCI_VENDOR_ID_SPACEMIT); + dw_pcie_writew_dbi(pci, PCI_DEVICE_ID, k1->data->device_id); + dw_pcie_dbi_ro_wr_dis(pci); +} + static int k1_pcie_init(struct dw_pcie_rp *pp) { struct dw_pcie *pci = to_dw_pcie_from_pp(pp); @@ -166,10 +177,7 @@ static int k1_pcie_init(struct dw_pcie_rp *pp) return ret; /* Set the PCI vendor and device ID */ - dw_pcie_dbi_ro_wr_en(pci); - dw_pcie_writew_dbi(pci, PCI_VENDOR_ID, PCI_VENDOR_ID_SPACEMIT); - dw_pcie_writew_dbi(pci, PCI_DEVICE_ID, PCI_DEVICE_ID_SPACEMIT_K1); - dw_pcie_dbi_ro_wr_dis(pci); + k1_pcie_set_device_id(k1); /* * Start by asserting fundamental reset (drive PERST# low). The @@ -369,6 +377,7 @@ static const struct k1_pcie_device_data k1_pcie_device_data = { .ops = &k1_pcie_ops, .parse_port = k1_pcie_parse_port, .max_phy_count = 1, + .device_id = PCI_DEVICE_ID_SPACEMIT_K1, }; static const struct of_device_id k1_pcie_of_match_table[] = { -- 2.55.0