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 08C6447CC87 for ; Tue, 29 Sep 2026 08:38:16 +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=1790671099; cv=none; b=ZlRsyf3eWb20CD4MFbadyTa9SeeB+W5LiDGO5AVf1E4c7QfOUVeKIfN2vS6efDwQQ6fGNhL14ku6rWvOXO5Zq9mDdwnmzH7tyZkzIeU5oEFRygNCdS/5Bvqt3WG8YE6VEUCYshYyhIVZVeNX0EKkjng3wa5zJxXDTgEHFrQqDq4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790671099; c=relaxed/simple; bh=y8V2hkGzlhdb/0KFjTahh6x/FG8XQrgc9cx9Thrw2Xo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mdjwRJG+cK6MDTgA2ix2WjUg+6jMaev9oXmLOFsyOBHAyNBdsEIyO/eg7n2K2hTxRugujnB6n9KLmX+nQZwpF31U3kjnkb6oZGh4/Vtid3EHxjgiR1XJbc9pVT+eWYLw+vpOHW6g4hAdhgw+w2UI7RmVxTl1MxmDDLDGn+vTg7k= 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=e9VlfhHp; 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="e9VlfhHp" Received: by mail-pj2-f13.google.com with SMTP id 98e67ed59e1d1-396ccafb751so1832173a91.2 for ; Tue, 29 Sep 2026 01:38:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790671096; x=1791275896; 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=e9VlfhHpCALpaO0McDf6gCRZI/bnhnwSqCjsT/H99GBfzzT+Gtg3YNl83C1FDAu98L uqjeF5rB3iaM0i2JV+f9FtwN5BKhmaG0w3uUa514OFjOeZiR7I848poFg8jbFyx8r+2n aOyclMt3CINMeYB7NA1S1NKM1OR0d7Ozk6as1mWmVtMThvr8BrNqwYkPjyeCbJhBFsaJ l9HnEeI412/2FcQ/V0P5ph4sx09p6BazM2+2rGJG+mPI/4Klop0N6wpIMahgC2BNDWe3 zNlgOiW5yEduK7gxbcORu6vc0DHwhIkXDJTtnz8Rxf0hNK1zLzKf27YOsle/GqjVsJ+x uIvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790671096; x=1791275896; 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=Lr/69QEvedHnGkQwteutMlWXvrlAr3sCxmeB/ckBAXb8S5eW+jPfZ9O1nax5vz4/fV ObK7oswVaEZJ+ylRDqa6LhQXibFQrFAlpKYjU9xqCDwtb6LWxFXN4ui1kf+coX5s6oTC HPHxXkZdtYtO/wmsMqWcWEbQhmo5B+9jlmUq1pOa2ywzpfFPozr1+Sk5zH6skkx2g7YP uOiTStk+2RlQ6lsHUQJriK+BB8Bg84YWFf8UfhItSQwI4Z2L9HWVKQ8U3MIoXpobeUPC ZtzTNP/yo2/bAZo7JYpvV6gPd/I8LrAMn5e0XW3rOl+w2rNcwtCOXJVTPsq5b8q6cDlR E62g== X-Forwarded-Encrypted: i=1; AKwUvBx0wv2R5XmOQhnh4pT0n2Qmjhs7BDIeJdU6k8X7o+ENnCxqZtVccM2di5cEuEbciKNLQ+Uv2cW6QnON@vger.kernel.org X-Gm-Message-State: AFq9FYKZ0Wzx4PDkmIPZnvwe5jrqcgFYytyKKBSv31CO5SAo107UXAOP A0G08B7SzlPrEAbDNycQew4xRP+LouXLBrnx4EcRlUBzIruWH3HXgVPl X-Gm-Gg: AYBFou1Cnsvf/JSRednNyZptwPIpJIE4H7d8tJTeefXS9lS6dMtqmI/72gcGINVc087 mmPBFaYNR6AxH5W1fA1M/VwIk5Ten7XyD9DYTZFC759nEZAJ/fIoxyKflMBZwjq77nPzgSkxklR g3Qj2cVkGavfZEfjGB6XqB+6ODdgVP7grcLTceAHm2iuBHC1UHJWkIx6R26O0T7pTHjgHNDZUwV fNKyLKdr8VD1BBYSsqOMXg0itqzRWQ2MA6qSxJQ5yL2qOKHyV7hQDYNsSp9aXAB9SOt2wHEua/x 4YRn5C+7mZeNI+QsnYNPgaoSAkdobPL7aRsT4R5YuQuxb60GhOKt4TYn4DCcSeu9nTucUuAA+Q/ TnUX4wYztZXfw8eYF+unqQg6oyw8vl1TS4fUiNZAEjtmUVgOdnzmMfwOjKg/qJlbDCh+BylY9uf UiN1Y4/MyKabHgq/tXfkyhqcDIu1Z/cnb65zsP8kJ2xgQFQzLmkxygjSwNp3Q8j1G/OKbj X-Received: by 2002:a17:90b:17c6:b0:3a0:516d:9f88 with SMTP id 98e67ed59e1d1-3a098761df2mr11251455a91.26.1790671095882; Tue, 29 Sep 2026 01:38:15 -0700 (PDT) Received: from localhost ([2001:19f0:8000:3e6e:5400:6ff:fe38:3d01]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2e2c9d06766sm5127845ad.54.2026.09.29.01.38.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Sep 2026 01:38:15 -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 , Arnd Bergmann , Niklas Cassel , Christian Bruel , Senchuan Zhang , Vincent Guittot , Randolph Lin , Xincheng Zhang , Alex Elder , Siddharth Vadapalli , Andy Shevchenko , Marek Vasut , Inochi Amaoto , Vidya Sagar , Pengpeng Hou , 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 v7 3/6] PCI: spacemit-k1: Add device id update helper Date: Tue, 29 Sep 2026 16:37:49 +0800 Message-ID: <20260929083755.458238-4-inochiama@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260929083755.458238-1-inochiama@gmail.com> References: <20260929083755.458238-1-inochiama@gmail.com> Precedence: bulk X-Mailing-List: devicetree@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