From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qt1-f180.google.com (mail-qt1-f180.google.com [209.85.160.180]) (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 091683161BF for ; Thu, 11 Jun 2026 20:04:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.180 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781208271; cv=none; b=pcyQwt4HytRov0mUWJMs7M0SEUbZFiQ1t1Zmg6KMn+T4+970I2jzr+xSOLdK5ji3JN6XkOCN+xVgDAwj8urS8z1BSmhEvfIuxG3EJPac1gV6aQfvOry+I9K7e5X/GCPDJwnFuwZcYXGIZi5y2yc/axQm5HMlSHOkZXjpsv5HfaA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781208271; c=relaxed/simple; bh=gXRE62zSwChwM3SXDcOyQCR3fTW92/QJIOV0+o1WzRQ=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=JTwRQL/LbECW2F+zL9nDbhP2mwrPT+nrx75SUHOIIXFoo0mWgvfDahg5nwgsWQUvSptJrG9hQfyTtjuMFPaSnDiIwggyWrnjJAYFYK+VztWDRRHsvymJosipq8QbIlqsx10xpWphkiT2zuHnS0+dDk1mcAtxkCfJ1H8dnunG2MI= 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=datUvr6T; arc=none smtp.client-ip=209.85.160.180 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="datUvr6T" Received: by mail-qt1-f180.google.com with SMTP id d75a77b69052e-5176fc0cc72so1623991cf.1 for ; Thu, 11 Jun 2026 13:04:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781208269; x=1781813069; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=QPHgBrADPApAfZtc/YSxupn+3CjApqMQNAHkj/6KsE0=; b=datUvr6Tb6VgKh78CSoMIlgB3W5kBtOkB2l+yuQfKKroQYqNSRJc93vWEHV2Qjgcm2 DJRAi/Sy0D5MC1TbkPAuI4fW8OJ8IHx7JabkWHrSFmufKXDGNLIrwQb6/J/zcOdoeBKZ F6lvx8SKQmTfdknK0/RYJdevdvxdRC/pG8UbBAmk9EBMMMdNzbkGeOZLcQIv7VUyu9xE 4x0N7u2CSGKeY/VF5pzGloMohLgaaFXOEaf5aUOBW+aetOjKaeXYV0Pop/MFpLtGZYuL Y1M+2XEYIKj3HUONgksOExDjC6vqIu7K6rp49spfgjT7fiL2O/AGav4zcXWbUr+vauz8 JFNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781208269; x=1781813069; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QPHgBrADPApAfZtc/YSxupn+3CjApqMQNAHkj/6KsE0=; b=WPHmbst/4wGnzJ26HTdxYg7u4ksfSTtYDtewZx6rLrTkXG63t8ba7vgE3XHNj/8ui4 GmdvPmpT6qcjTvquuo4tz10XwYtSRi5DBURXaipT23sU29mFMqOR1JlCthZ/9/cFIPRR BlmcqoJ6OoVnYuuC5LvQ6kC0Rt0WgLdCt77W28Hms9QBpN+iIUiRQAyDP4RdYJyN04I6 oJIPnBci+nJfSM20TUf3Gh++JqFSbjvdwryOqEDo1BcEFNqWQzZzaHTTO2rW4XpkeKbp NennUc+wuAD8qxKScJfLJ1i7JIS9k8BPk3PjHcPMOZVmPSTkxxZLcuPX48RQu9NB72rx zrDQ== X-Forwarded-Encrypted: i=1; AFNElJ9a/UPg5LONiVYZh7zLDgnY3ba2aLScNmqopzSdmCvS3aJMcJsVbCOJPHcx7yzHYCM1e1RrXk0+6pLJCwc=@vger.kernel.org X-Gm-Message-State: AOJu0YzWo9H8KO3d5tM0aQNb3JLY2RJPYkqdgXUmYQvRz+ZR7jrCrK76 5fvw9JRlcjNPBwhLxYJqc1uI03E3eSQeuPhr6sBVnf2JXgjBitFFkb9Q X-Gm-Gg: Acq92OFQAePhBY8JvaZYSG8JEBUTEuXEjmPpueZmn1tTEVQwb3n/c/3ADDu9t06BAXs 4W0rFmsEx3MorFOq9pGzSwxSLYrm89LjVSRcIb/WkuH8yrBteoe53LdJRh/t7trlMR7hLDrOVuu zjsw6kizA9QpJWeL3DNm65w8/EwbA3nxXBcs+qeJQzmsJvzpE0ofSV/650caFjFZS6mgJFD6XQ5 t+M0ZTWXwPTRHaRGyRZU5CxPldJUaHBMXmln2GG6bowB6mruVwurC6UJwKXARzESG5S0SdznQNX gGclJEltFKWRrDd6xjOOCNiHhYmX9JyyaOnpctJ3Zxo2yAANuT3qSRlIMfApO32crQjEfjLYmeV w7BhjisZPIdotEIdQcNWntqnWBvYpsxrTowWtY6xda38W6EGSODTQqL4GSH1FekzEIVH71i4xi9 2AALhXvw5U X-Received: by 2002:ac8:5e4d:0:b0:516:ddfa:23a4 with SMTP id d75a77b69052e-517ee27dfa4mr66606851cf.41.1781208268618; Thu, 11 Jun 2026 13:04:28 -0700 (PDT) Received: from geday ([2804:7f2:800b:f09::dead:c001]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8d300f6b962sm3322496d6.9.2026.06.11.13.04.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jun 2026 13:04:28 -0700 (PDT) Date: Thu, 11 Jun 2026 17:04:22 -0300 From: Geraldo Nascimento To: Shawn Lin , Dragan Simic Cc: linux-rockchip@lists.infradead.org, Lorenzo Pieralisi , Krzysztof =?utf-8?Q?Wilczy=C5=84ski?= , Manivannan Sadhasivam , Rob Herring , Bjorn Helgaas , linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Geraldo Nascimento Subject: [PATCH v6 3/3] PCI: rockchip: drive at 2.5 GT/s, error other speeds Message-ID: <4ac5cd7d2271df375ed6307f5c394247721395d9.1781207474.git.geraldogabriel@gmail.com> References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Configure the core to be driven at 2.5 GT/s Link Speed and ignore any other speed with a warning. Also drop the 5.0 GT/s Link Speed defines from Rockchip PCIe header. The reason is that Shawn Lin from Rockchip has reiterated that there may be danger of "catastrophic failure" in using their PCIe with 5.0 GT/s speeds. While Rockchip has done so informally without issuing a proper errata, and the particulars are thus unknown, this may cause data loss or worse. This change is corroborated by RK3399 official datasheet [1], which states maximum link speed for this platform is 2.5 GT/s. [1] https://opensource.rock-chips.com/images/d/d7/Rockchip_RK3399_Datasheet_V2.1-20200323.pdf Fixes: 956cd99b35a8 ("PCI: rockchip: Separate common code from RC driver") Link: https://lore.kernel.org/all/ffd05070-9879-4468-94e3-b88968b4c21b@rock-chips.com/ Cc: stable@vger.kernel.org Reported-by: Dragan Simic Reported-by: Shawn Lin Signed-off-by: Geraldo Nascimento --- drivers/pci/controller/pcie-rockchip.c | 16 +++++++++------- drivers/pci/controller/pcie-rockchip.h | 3 --- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/drivers/pci/controller/pcie-rockchip.c b/drivers/pci/controller/pcie-rockchip.c index 0f88da3788054..5a2876d7c8547 100644 --- a/drivers/pci/controller/pcie-rockchip.c +++ b/drivers/pci/controller/pcie-rockchip.c @@ -66,8 +66,10 @@ int rockchip_pcie_parse_dt(struct rockchip_pcie *rockchip) } rockchip->link_gen = of_pci_get_max_link_speed(node); - if (rockchip->link_gen < 0 || rockchip->link_gen > 2) - rockchip->link_gen = 2; + if (rockchip->link_gen < 0 || rockchip->link_gen >= 2) { + rockchip->link_gen = 1; + dev_warn(dev, "invalid max-link-speed, limited to 2.5 GT/s\n"); + } for (i = 0; i < ROCKCHIP_NUM_PM_RSTS; i++) rockchip->pm_rsts[i].id = rockchip_pci_pm_rsts[i]; @@ -147,12 +149,12 @@ int rockchip_pcie_init_port(struct rockchip_pcie *rockchip) goto err_exit_phy; } + /* 5.0 GT/s may cause catastrophic failure for this core */ if (rockchip->link_gen == 2) - rockchip_pcie_write(rockchip, PCIE_CLIENT_GEN_SEL_2, - PCIE_CLIENT_CONFIG); - else - rockchip_pcie_write(rockchip, PCIE_CLIENT_GEN_SEL_1, - PCIE_CLIENT_CONFIG); + dev_warn(dev, "5.0 GT/s may cause data loss or worse\n"); + + rockchip_pcie_write(rockchip, PCIE_CLIENT_GEN_SEL_1, + PCIE_CLIENT_CONFIG); regs = PCIE_CLIENT_ARI_ENABLE | PCIE_CLIENT_CONF_LANE_NUM(rockchip->lanes); diff --git a/drivers/pci/controller/pcie-rockchip.h b/drivers/pci/controller/pcie-rockchip.h index 3e82a69b9c006..b5da15601b585 100644 --- a/drivers/pci/controller/pcie-rockchip.h +++ b/drivers/pci/controller/pcie-rockchip.h @@ -42,7 +42,6 @@ #define PCIE_CLIENT_MODE_RC HWORD_SET_BIT(0x0040) #define PCIE_CLIENT_MODE_EP HWORD_CLR_BIT(0x0040) #define PCIE_CLIENT_GEN_SEL_1 HWORD_CLR_BIT(0x0080) -#define PCIE_CLIENT_GEN_SEL_2 HWORD_SET_BIT(0x0080) #define PCIE_CLIENT_LEGACY_INT_CTRL (PCIE_CLIENT_BASE + 0x0c) #define PCIE_CLIENT_INT_IN_ASSERT HWORD_SET_BIT(0x0002) #define PCIE_CLIENT_INT_IN_DEASSERT HWORD_CLR_BIT(0x0002) @@ -197,8 +196,6 @@ (((x) & PCIE_CORE_PL_CONF_LS_MASK) == PCIE_CORE_PL_CONF_LS_READY) #define PCIE_LINK_UP(x) \ (((x) & PCIE_CLIENT_LINK_STATUS_MASK) == PCIE_CLIENT_LINK_STATUS_UP) -#define PCIE_LINK_IS_GEN2(x) \ - (((x) & PCIE_CORE_PL_CONF_SPEED_MASK) == PCIE_CORE_PL_CONF_SPEED_5G) #define RC_REGION_0_ADDR_TRANS_H 0x00000000 #define RC_REGION_0_ADDR_TRANS_L 0x00000000 -- 2.54.0