From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj2-f43.google.com (mail-pj2-f43.google.com [74.125.227.171]) (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 93E74366566 for ; Wed, 23 Sep 2026 01:51:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790128282; cv=none; b=TYLZZRaQMQ99fUTKASoxw3pKGdZ0Qoh9Yvlfb6c7ngfHAI17a/z1tyjrH2KuFkkTVmM14vyq7ydifxifK4tZK4NmynPS0FBI6oenfu0W3u7sjqJaIzcBHTRyA4tIcD1qcQl6vUdgV42QNUA3tyoWtsPXkl5bmvEniEdu35ab7Yk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790128282; c=relaxed/simple; bh=y8V2hkGzlhdb/0KFjTahh6x/FG8XQrgc9cx9Thrw2Xo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=V8/d7lXx1b8iZd7WLdo9iVFQtvcLWw5P6gQZVR0mnHo//3Scg3l3ipba619O2pdmvaMbXcYSOHBit1dp1dgrFF735BHYJ2n6FdmC1dhVY2srT2dGr3CbD/YCUpYyVtPAjJ1CxKCVMrpJUFw7sFxhc1m+Ll8RLJyt3xhc+7oRZ5U= 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=qPIJ0VOx; arc=none smtp.client-ip=74.125.227.171 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="qPIJ0VOx" Received: by mail-pj2-f43.google.com with SMTP id 98e67ed59e1d1-396ccb1a98fso358677a91.1 for ; Tue, 22 Sep 2026 18:51:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790128280; x=1790733080; 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=HjSZP90MeKeabAnBLqvA1Hzeszd2ueVzqTRJsmZUKHU=; b=qPIJ0VOxQVyo3UFbubKkviQTfnsu1eol8XQ6cj9SRR5SJSc1Go4vX4k1vdeszARmFw Cfz9SEy/sJfhM0l7uOB0pnvXdnEyqGtPE4PgJu/67+qPhC5axInQkyrXWXMVs/0p/o31 E58pmmQ0tog/LEXOEWdyrx49nySDDLAcSHu+eFOHtC4g7C7DaM0oipwo3siW2UyBFBiH s2xX3l2JJS5TnQffGDHuNm5IQeN9+8aeioGX+ttgewO32AkuTkidkPTu9oOLfFiTVgym IefMQLjx/4WtqofRxcyoGrlteenuYX3R8DYNrAOyTaozCNDs0HWNVhibHJqT1TovYQIO pOCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790128280; x=1790733080; 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=HjSZP90MeKeabAnBLqvA1Hzeszd2ueVzqTRJsmZUKHU=; b=ngYAaK8IHcfPlqHIMLOPvHeHi9b8/5hlJOXhZyXCimgjkGBI8n3pDrwK92CMMU8va/ vfHl3BmH0NpKlLOBH+3kTp576Tilqd3O7aMd/VJYbtmm4Fo+oHXo6WlwxY9EcPaAJmZC n9bhA4vuZqtpwnLrJ5ES9yIIuj4ZlOMbPw8GR2/Imqs9/cp7CHlHq+RBs/OawRidVDwI AcpGabY3MWEn4kRfWwELzpgLmnF1UEyt8TrqhZDylo73Kfb0d7qYUjMfOcXjN14GkGAy zvn8fNtVdhZdyf3cgrL6uaBbbEm4Bcgj9s2chG7muFCI9gdsRzYDx4ZoYp1I+wI6oIHF Xemg== X-Forwarded-Encrypted: i=1; AKwUvBy2d532CR2lioDXgfSTgi3m+Ria3UND1WuD4fhImNAcTngltwZJzloLcWSLgnBWRCV6UDbA+KMm/MGxkIs=@vger.kernel.org X-Gm-Message-State: AFuF++leW9sIFXGJs9hCNo3hpwHpPWr0Z/Ejc5LfNvAgpI+X9l97l3jt V5WWHRmwqldPyDTRE809JgFmsLONu/69pCPs65MW/6saljpCSxTs9Yt8 X-Gm-Gg: AYBFou0th2ZLGrEvMqwM+kJpLfM7YaVvYOYBNLEvcJ6Pe98YeWuPz7dpeQcXj+mu7pF maeOI5GrSJoIovhkyB9Q536RYvmAjg8tmmurWGOkVFnPWveyDuJjg085peC7P3mZZp86KD1C95q boM+qsdWCS4olNk5Ei4nkBXsY2w78XRZJlRFBH+whqYUOBjf3HNIkUUMSWPWU8nO53VS3E85rBC DNriPPvXmpF2CQ4gI/gUrJYNsCvVb7mTH9/bg8gXNYVJ+LNzLMmRs8d8eaEJZ0LqONeYi6Mvx3J yiu3+EHBUhO2WqgGsK06oC/46QwOyRPnuQDyA60Scey8LWyGpUUUdcu/yV7s3oWALABlUMLb/ek VnVW04PIT7DonqPlPH8BOLc5gGQM9GopgxhYk+fm1fczHdyM8qTrCQbr+tZSIUCTe5YwwArurHD PLf/EeeqMnZu4FYn1GkmAyQdxQRCzcfThhYbgltRVQrQAZ267rs44SUzY+mQ== X-Received: by 2002:a17:90b:3f0e:b0:39e:6c6a:6572 with SMTP id 98e67ed59e1d1-3a07e6563dcmr1112630a91.53.1790128279914; Tue, 22 Sep 2026 18:51:19 -0700 (PDT) Received: from localhost ([2001:da8:7001:11::cb]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3a085b5694dsm266746a91.6.2026.09.22.18.51.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Sep 2026 18:51:19 -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 3/6] PCI: spacemit-k1: Add device id update helper Date: Wed, 23 Sep 2026 09:50:12 +0800 Message-ID: <20260923015016.64069-4-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 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 8c4f0b09fe24..ec59ccb710ec 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 { @@ -153,6 +154,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); @@ -168,10 +179,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 @@ -381,6 +389,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