From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) (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 AD3FA346A15 for ; Thu, 9 Jul 2026 04:01:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783569691; cv=none; b=OKneGb0wTSyojqd+7rPA0b2Yo/SEaPGa0Z/UMhClhMyfYVApnoV3qxYLpaMSJkQhxhmBALABai1bMXE3Udaasw6AEp4ngD2Qxum9crIiWRhuqH6vxiQ92ITdSAD6ah6N1hFsSuaM+oFOik50Artke9uqKdsVOw9vbdDciJ/GSn8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783569691; c=relaxed/simple; bh=jCP5Zz2e1jsHNyBDmkkcnVgytoZly9neC/WVj1uD+uo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=H9M4LqX0g1Ji1raOtWb/8bcCLwrYts8Wz8s7ikNYwQe65mrF5+6aDCPkz1qNhv8V1yCcnZVLsjJWBt9TcCBnhWDV0F0fXamtgFXfYNSShEWI75+4S4yHsRSyf8Qs79ubQZBYT6em/6mqVGBqIye6CZlZg0JPJgvI9KsDKLLxEig= 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=WaRbmS4+; arc=none smtp.client-ip=209.85.210.174 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="WaRbmS4+" Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-8485bd28dd0so225867b3a.2 for ; Wed, 08 Jul 2026 21:01:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783569688; x=1784174488; 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=7O6mnMyk+6LPMo3beQtKUpBA4veH6tNlOCZqSC3QPZs=; b=WaRbmS4+K1jWOiasRvXBXXbFkpodjrDZyS6+d+1dUa0gvljJk8gZGwPbA6cK9VjGAW io5fRKooqAsSYf2NVldvTM2o9U+NVNJNnWl7GfaE/SRhe5oyzgSzrO6qbn2mqPQiBJCz 4M9qdkPYynSjNMjJp7tm8VERDRqoc6sAbm41L/g2dbYemZ6AtlO6ueL4pKwGeD2Xsreb 6eu+pnzlV4/KpjxxCKm5QGGNTu8aIzfp+X5unn8e9oiL6CAvXBG5u57ZrB0C0elQnFWo qiIzSuQobrHMlB0btiHdBXayToqu2y8TsLrY8DQUpHbFFtfgpUnHLLy/ZsN5JkXleeYG iHCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783569688; x=1784174488; 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=7O6mnMyk+6LPMo3beQtKUpBA4veH6tNlOCZqSC3QPZs=; b=T9Q5mRl7p9boHWvz0/hRLPxR7TmxpcdjBRTcTp5EpYAjHJ/3uvxs2HKPIN6d8FHa4W dhvT168JB0bUgX/gcAozPyzoG3dx0hP07xLKiK4jmn01kq98c1JIntfFWCPKcEFu5gpb +Tgqx6nz7mm/GwA+6kGWUh+rKcTlwnYX7RmG1mEwzInwU2nIFsyojDyqy7b5JzHufPF6 oGtikiOy8GFlBCV6cMF9dumXwI+iFiM4nlYGhCoaGcHEaVGl8cV3hQ1LyfZJsHKzt3Xj wTdfSHmzkj3/Namlni3awLzp+1XbeZSqEuMUXArNMNBcfjl7owDJsv8ic87bqZ6T6rsC pS2A== X-Forwarded-Encrypted: i=1; AHgh+RrV7YaBIWOVZzSNoTUQ42UZP35s8K7MP1UclJuQyCoK+oqpq+A1v3Ml39Ier4pIPdF9coaShCXRC9lem3c=@vger.kernel.org X-Gm-Message-State: AOJu0YwwfAfn66Rl/mM5cd9GkGZBCwqQNsmshEwZ/AAJVCFj3Px/PGag bc5YUkmucMq6JJ12UbYQ8Fhoj7+jJVd8N+aKITnbTavW7wi4vPb/TUCO X-Gm-Gg: AfdE7cnJ0UGItzqqOXtLvwSU65OP4/uLWLOCV2//YDUIS27NAmBY4u/YuVABPvHd7C2 5pDgj1WvR+tQmAoG97tJ4i/LPjxmszD+yUU+oAa7rgTifDtYSaygYzflBu8+aCeb3u3LpMCqGFd dPJP5+1UiFet9uiikucOrveLjjg9BSn2L4uvMIwFcqKufLA1iSqnd0SkpaweQSAF0x+lyIM6DrN gJs/S95Iq2emUx0z67MdBIaxkpvqF7mK+gy2R5gKrUqDye+e+LeFkz6/hPplmC9SRftfkZBebw2 XWeJTk25LztMCa76XPiifv6Mec3LBC4UEQZOhv3iZ0pLj5Cmzs/WtOXPEmrStZ0XViSjWR1ZKcb 9JDQW5VMj3ZVUqDQTyEppdNB6itwtYIpLXfqknfxC3cWXAF4nn6GQ1TTMybGFOvl7 X-Received: by 2002:aa7:9067:0:b0:846:1b9:cb63 with SMTP id d2e1a72fcca58-8484356de46mr5839163b3a.62.1783569687912; Wed, 08 Jul 2026 21:01:27 -0700 (PDT) Received: from localhost ([2001:da8:7001:11::cb]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-847f6d7a96fsm7868309b3a.46.2026.07.08.21.01.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jul 2026 21:01:27 -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 , Nam Cao , Qiang Yu , Krishna Chaitanya Chundru , Xincheng Zhang , Alex Elder , Siddharth Vadapalli , Andy Shevchenko , Vidya Sagar , Neil Armstrong , 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 v4 3/6] PCI: spacemit-k1: Add device id update helper Date: Thu, 9 Jul 2026 12:00:23 +0800 Message-ID: <20260709040027.958400-4-inochiama@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260709040027.958400-1-inochiama@gmail.com> References: <20260709040027.958400-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