From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.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 E2227CA6F for ; Fri, 3 Jul 2026 02:00:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783044050; cv=none; b=o69kr4wUbQwzkPLY8XvIBFI/f2Uyy88UCRzUcng4ffqoTHltnaAcQQq9QbKz0gxNDk7SZU2INxYNjBu9tYVlLJHwzazTC4v6nKoDWtIrpKq+40iBhsEgiPFD8e4sQuMjlrGeV8bgpYbzQoBXrBjEnxRDotXyfM6MDIfMfi8D8Ms= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783044050; c=relaxed/simple; bh=jCP5Zz2e1jsHNyBDmkkcnVgytoZly9neC/WVj1uD+uo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VcsewFNM4lrDaG0Xq1IWqbPxE/BQtAY50u0CkwRPkXFMwi1+nxLVa7EpLypZn+DMAFvfVcyb+2bF19WULydDEZ9BMOWmP+IWtca/opSQrlgpZc5mOf/YaCrz4KTxqB01VvSIcRjLmJlHZimS66+xpa9Ppam76cR7TlT1L91aGWE= 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=PaEkLTDW; arc=none smtp.client-ip=209.85.215.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="PaEkLTDW" Received: by mail-pg1-f173.google.com with SMTP id 41be03b00d2f7-c9e0b89e228so24990a12.1 for ; Thu, 02 Jul 2026 19:00:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783044047; x=1783648847; 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; bh=7O6mnMyk+6LPMo3beQtKUpBA4veH6tNlOCZqSC3QPZs=; b=PaEkLTDW/PSalIsY2SIoHIHGK3kdy+02ahesagKFNq2bESVNTBJzOGyXhH+jYFaJiM 9Ql9hQSYTBrUHukuvHFLochYSkFBEcfuQBFp3NKjGy3KDIUJPhNPLxynDdshMzwKidkI 4dsrWx5j5zf/H3mLM101RgLP2MYHm7QN/s2CrSAk8T+edqS/cpAnNHiviJCRpsI0tVOU EH0Gu0Vf84kxPXqSe/YNP0FhTZrHUK9r4nCV1+SBt6YzK6yydqqVa3rrjDKWvHgLurFa VKwg106i/1VrEWxU7hA4s5sTBaNfh8IGWkbjLdtnm4T+s64zD7tsrdTFr2qOoFpUMNr7 525g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783044047; x=1783648847; 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; bh=7O6mnMyk+6LPMo3beQtKUpBA4veH6tNlOCZqSC3QPZs=; b=R+KUKUR4CBrCYcUZaKM4Uz8wwT7MPBH4gDEn2fF4K1iRkh2LescwKAhdPDzhXlzJun fA0Q62d/JTqpH/iTkdenTIfTvnnruM4nl2WAaQKkVPEVodM+RhhkSZ2Xye6Ot3EYr1Zv Q4Ue/nsmncXYGHKgSjxAGeO56yAaxRH2hFaea+pjg1OP1ZyRcvvDgndlstfsPhBkbbdr IBe0IEpN3OO9RD5hFiIb1ll3OkuCYdEDTV5yX4EUjsC5accWo7HOkRx/MC2N0hiR5yrC wNyD0I/+rG784+S7a1s522Iu58B2AOz6DpUigrdS7CFpkPIefoBXIzbzGxXJC8Sk8n4Y vuNQ== X-Forwarded-Encrypted: i=1; AFNElJ+EBJ0UTeA0mD6qrtIRvPSLzojBAWkthZQ4h0OUFsP/7bZLRn7odB3rzWnBKYVUl6ERilycd1HjxuUUE8g=@vger.kernel.org X-Gm-Message-State: AOJu0Yx+CrSkMGuSa7NlxWc17ztDYqkGzOhd8PVbzxR4REGlu8dCMmYM PDdBylejWWRKJIVoAQ3wLuF0u8iU5wYGWXGNEpptUxhm0hXwrck5uAwI X-Gm-Gg: AfdE7clRYmRfl8RbouITtRPQSl2IQvnH3MjLp2QPr+HnL7gwfDnippOYfs3QRc/YZWw gmz73Am0KG2AmqWnni2bMhKrTWUuL1H11mptlfOJhGBet5Dc7nzaW3P8Wtpm78hkqHatixjH6AM YbOVk5/J46LDl8ia5wHZuxrmsoHTzl9EoG0SMut2gYXllojFkGZVnEUG+mz3a8GDZkjnweEPw4U 2YpW+wscD8WkqlXQ/tlzjp8Mia5rbwRV/B/vkvZg6YRR/DMdUvmkTxfyvN+aJLV0Fn1S2ZGnaoP zYhnnH8e0FQ/VcAAoVuEuUtsDYnfMwFnl2B8GnhCZbIuekw7/D1AC30wUVPnPVvGXnpYDZz81zf 6SVJboce1H5JYges/lm5l3372sy7MWMhVvLmCt2+8rPwQdF0fuE2nHp5wDe5bQ48O2ILYAN6qXq +CVt9F4UDE3/4= X-Received: by 2002:a05:6a20:c98b:b0:3bf:7e2a:e874 with SMTP id adf61e73a8af0-3bff4038a89mr8316617637.1.1783044047021; Thu, 02 Jul 2026 19:00:47 -0700 (PDT) Received: from localhost ([2001:19f0:8000:3e6e:5400:6ff:fe38:3d01]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c9e8f3d74ccsm2024844a12.9.2026.07.02.19.00.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jul 2026 19:00:46 -0700 (PDT) From: Inochi Amaoto To: Jingoo Han , Manivannan Sadhasivam , Bjorn Helgaas , Lorenzo Pieralisi , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Yixun Lan , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Christian Bruel , Inochi Amaoto , Frank Li , Neil Armstrong , Andy Shevchenko , Sascha Hauer , Xincheng Zhang , Alex Elder , Randolph Lin , Siddharth Vadapalli , Vidya Sagar , 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 v3 3/6] PCI: spacemit-k1: Add device id update helper Date: Fri, 3 Jul 2026 09:59:59 +0800 Message-ID: <20260703020003.485436-4-inochiama@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260703020003.485436-1-inochiama@gmail.com> References: <20260703020003.485436-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 needs 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 e22ecbd09579..31aac056b68e 100644 --- a/drivers/pci/controller/dwc/pcie-spacemit-k1.c +++ b/drivers/pci/controller/dwc/pcie-spacemit-k1.c @@ -56,6 +56,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 { @@ -186,6 +187,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); @@ -201,10 +212,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 @@ -406,6 +414,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