From nobody Wed Oct 8 11:02:04 2025 Received: from mail-qv1-f47.google.com (mail-qv1-f47.google.com [209.85.219.47]) (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 B314A2AD1C; Sun, 29 Jun 2025 12:47:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751201281; cv=none; b=uYswEWvXTLuuFXZZv0L9gUiT8H9cqj1DKOtSSEKmh0UUnnn6esyeBiMfXZ9DwWMH2x/54aaPFe5YONhJ6FTK82AcnTh/DLV1Ym7e9Lvbd7EWcaHbDp2jAhrdmdO4vnnEqBdMe+e2iaqSYzlIxviLF8jbwsFt1RBrOiSm/+bLcEc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751201281; c=relaxed/simple; bh=tpbE2FvztANs2/izJnOECYoMP2X5oOScRQHxOIydI1k=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=csa43wIZxR5LpK4KuGzkYyp1ANWJD7iJLhc5c28WncnaFHkBJb4GRX0ZPexa/4pEg8hTin/3rCy79IU3hz9/PNTmHaTk2JxXN3EbDK43Inx49i+x6g+ySgGwv8q4s2lx5twTbv7p+EfgUsyOyKWOqvf7BkgB/uihxxUoUWWeQ0o= 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=fZ9RPpEo; arc=none smtp.client-ip=209.85.219.47 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="fZ9RPpEo" Received: by mail-qv1-f47.google.com with SMTP id 6a1803df08f44-6fb1be9ba89so13433236d6.2; Sun, 29 Jun 2025 05:47:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751201279; x=1751806079; 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=mt5O7/7JEumjsAyKxjvlFipcH+4/5yB2S8im+OQhNPo=; b=fZ9RPpEoPNLUfM65J/PhqD9uhkK+WHkfI0IagujEsR4AeJKm6i9WHfs0rLZasryh3q rMI5yWNjISWDJ+qdTi8jJbbFpCIpMT6HR2qppJ2FaT16/R3YtOhGpctm/idmJ/n71Pc2 xp7cMcJMoNwifPJdz0ug9QpEweQ4MF58ywXr4m+G6bSin/9PNiI+phq3iGcdzJlxLd5Q zT9b4S83JvKI+4hIMOyBuc2QEQw64MVYwTHB9LXvXQlDloNyNrdH101zWg1/LcCUtWwN lLgyNGrm5Eg5+pxGa6zZFuPPuK889FPxyFZ1JkDEsbjT7q+lxzx6dn4tXMNFVsxMogpj oSFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751201279; x=1751806079; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=mt5O7/7JEumjsAyKxjvlFipcH+4/5yB2S8im+OQhNPo=; b=khF854414U6av4eHR3M53eYiaaf+sTAX2uyglqOmRohSCFSeJRqbOZXWQSCNxzcrXT br4qPYKv0RWm+Ysd6rONLQ0d8gKsBdaXETS/4T+Ed1L7dNNxzvptwDVzQvIu0MCAWHqx nUc9bHVGpe5MCD7H6rxEhDL833ExF2kZlb886FbaC5rIWSaeMAyDzTG9utEu7loyat0+ qwaAhOfeR9SdBPkxvT7oC+qj7ttpH+K4sJPeUm9QfUx9+B+9xi67ZZHy7BpuiIgYU6qU dvCCgl3TYSsvvjs4mcz5ykqOpVfXB1RlYetADKK/gNrjOVj0oJcqwI4SuqNjfBSroKeQ 8XQg== X-Forwarded-Encrypted: i=1; AJvYcCVRJVUYbegU6WKuhOq3D7AFbCue9jwl0O3Y0D3h6DNmRcwYVlb+GkGm6/xzeRW2tKJAM+ktMT79/5Ga3Jc=@vger.kernel.org, AJvYcCWEv9XGRQtC3p+tMkSKzyulXKKG70+6pknHOtp3CNkK+uApymgHf+kC57V0KDZXz3NimhyTgPQjSy0G@vger.kernel.org X-Gm-Message-State: AOJu0YwimpMN4zI2QPpd4Y0qTCu5nzG1HF46TINlCnC6xgnKASN9Bd28 LLCfRd9eJDz0hIQskM6vfuOeGWWXBNwIZhtfqrIVtcAyJ55KJCSQbfeoUL9OFSEQM+e7hjCE X-Gm-Gg: ASbGncvYvSxqE6Wm+lPDqNTNoo8nI5QIfUuOn93SkSi0uLC20V/5fz06xFXb4kAxJhc wpJw7CKXKrLh7+IkiEZqnIlcWcftH06/QH25s/2RTXd/StZKqniGV10BHMh1VxyoQRGOVywEnBL /qe7G1Zf7zjyfgIQ+e9RGo+Q+/bMXpNqu65yJcl73WDRN075BCKLD7l6SAjUkRPsEA/FKmbrJW+ OgmrPNfa00iw+w1is1/FyMOVsOBjrP6cFM8b512D+BKpvc2AeIcOcvZWu3nariFaL6eIj6BR9yU oRA1zOQGI2bxqQ1ezGdm3ZcZuhn6itkqlsb2wlRynd8yP6q8QsofM+cubJZS X-Google-Smtp-Source: AGHT+IHocG7UtWZgsnIGmbC7UspJnhoAN5x/ew8mM4xZqkjjdWtW5lElOGgSrE/Q/9dl85srVKenyQ== X-Received: by 2002:ad4:5bcf:0:b0:6fb:4caf:5d04 with SMTP id 6a1803df08f44-700031c6a5bmr157198156d6.45.1751201278602; Sun, 29 Jun 2025 05:47:58 -0700 (PDT) Received: from geday ([2804:7f2:800b:24f4::dead:c001]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7d44313a2b7sm431703385a.11.2025.06.29.05.47.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 05:47:58 -0700 (PDT) Date: Sun, 29 Jun 2025 09:47:52 -0300 From: Geraldo Nascimento To: linux-rockchip@lists.infradead.org Cc: Shawn Lin , Lorenzo Pieralisi , Krzysztof =?utf-8?Q?Wilczy=C5=84ski?= , Manivannan Sadhasivam , Rob Herring , Bjorn Helgaas , Heiko Stuebner , Vinod Koul , Kishon Vijay Abraham I , Rick wertenbroek , linux-phy@lists.infradead.org, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v7 1/4] PCI: rockchip: Use standard PCIe defines Message-ID: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Current code uses custom-defined register offsets and bitfields for standard PCIe registers. Change to using standard PCIe defines. Since we are now using standard PCIe defines, drop unused custom-defined ones, which are now referenced from offset at added Capabilities Register. Suggested-By: Bjorn Helgaas Signed-off-by: Geraldo Nascimento --- drivers/pci/controller/pcie-rockchip-ep.c | 4 +- drivers/pci/controller/pcie-rockchip-host.c | 44 ++++++++++----------- drivers/pci/controller/pcie-rockchip.h | 12 +----- 3 files changed, 25 insertions(+), 35 deletions(-) diff --git a/drivers/pci/controller/pcie-rockchip-ep.c b/drivers/pci/contro= ller/pcie-rockchip-ep.c index 55416b8311dd..300cd85fa035 100644 --- a/drivers/pci/controller/pcie-rockchip-ep.c +++ b/drivers/pci/controller/pcie-rockchip-ep.c @@ -518,9 +518,9 @@ static void rockchip_pcie_ep_retrain_link(struct rockch= ip_pcie *rockchip) { u32 status; =20 - status =3D rockchip_pcie_read(rockchip, PCIE_EP_CONFIG_LCS); + status =3D rockchip_pcie_read(rockchip, PCIE_EP_CONFIG_BASE + PCI_EXP_LNK= CTL); status |=3D PCI_EXP_LNKCTL_RL; - rockchip_pcie_write(rockchip, status, PCIE_EP_CONFIG_LCS); + rockchip_pcie_write(rockchip, status, PCIE_EP_CONFIG_BASE + PCI_EXP_LNKCT= L); } =20 static bool rockchip_pcie_ep_link_up(struct rockchip_pcie *rockchip) diff --git a/drivers/pci/controller/pcie-rockchip-host.c b/drivers/pci/cont= roller/pcie-rockchip-host.c index b9e7a8710cf0..65653218b9ab 100644 --- a/drivers/pci/controller/pcie-rockchip-host.c +++ b/drivers/pci/controller/pcie-rockchip-host.c @@ -40,18 +40,18 @@ static void rockchip_pcie_enable_bw_int(struct rockchip= _pcie *rockchip) { u32 status; =20 - status =3D rockchip_pcie_read(rockchip, PCIE_RC_CONFIG_LCS); + status =3D rockchip_pcie_read(rockchip, PCIE_RC_CONFIG_CR + PCI_EXP_LNKCT= L); status |=3D (PCI_EXP_LNKCTL_LBMIE | PCI_EXP_LNKCTL_LABIE); - rockchip_pcie_write(rockchip, status, PCIE_RC_CONFIG_LCS); + rockchip_pcie_write(rockchip, status, PCIE_RC_CONFIG_CR + PCI_EXP_LNKCTL); } =20 static void rockchip_pcie_clr_bw_int(struct rockchip_pcie *rockchip) { u32 status; =20 - status =3D rockchip_pcie_read(rockchip, PCIE_RC_CONFIG_LCS); + status =3D rockchip_pcie_read(rockchip, PCIE_RC_CONFIG_CR + PCI_EXP_LNKCT= L); status |=3D (PCI_EXP_LNKSTA_LBMS | PCI_EXP_LNKSTA_LABS) << 16; - rockchip_pcie_write(rockchip, status, PCIE_RC_CONFIG_LCS); + rockchip_pcie_write(rockchip, status, PCIE_RC_CONFIG_CR + PCI_EXP_LNKCTL); } =20 static void rockchip_pcie_update_txcredit_mui(struct rockchip_pcie *rockch= ip) @@ -269,7 +269,7 @@ static void rockchip_pcie_set_power_limit(struct rockch= ip_pcie *rockchip) scale =3D 3; /* 0.001x */ curr =3D curr / 1000; /* convert to mA */ power =3D (curr * 3300) / 1000; /* milliwatt */ - while (power > PCIE_RC_CONFIG_DCR_CSPL_LIMIT) { + while (power > FIELD_MAX(PCI_EXP_DEVCAP_PWR_VAL)) { if (!scale) { dev_warn(rockchip->dev, "invalid power supply\n"); return; @@ -278,10 +278,10 @@ static void rockchip_pcie_set_power_limit(struct rock= chip_pcie *rockchip) power =3D power / 10; } =20 - status =3D rockchip_pcie_read(rockchip, PCIE_RC_CONFIG_DCR); - status |=3D (power << PCIE_RC_CONFIG_DCR_CSPL_SHIFT) | - (scale << PCIE_RC_CONFIG_DCR_CPLS_SHIFT); - rockchip_pcie_write(rockchip, status, PCIE_RC_CONFIG_DCR); + status =3D rockchip_pcie_read(rockchip, PCIE_RC_CONFIG_CR + PCI_EXP_DEVCA= P); + status |=3D FIELD_PREP(PCI_EXP_DEVCAP_PWR_VAL, power); + status |=3D FIELD_PREP(PCI_EXP_DEVCAP_PWR_SCL, scale); + rockchip_pcie_write(rockchip, status, PCIE_RC_CONFIG_CR + PCI_EXP_DEVCAP); } =20 /** @@ -309,14 +309,14 @@ static int rockchip_pcie_host_init_port(struct rockch= ip_pcie *rockchip) rockchip_pcie_set_power_limit(rockchip); =20 /* Set RC's clock architecture as common clock */ - status =3D rockchip_pcie_read(rockchip, PCIE_RC_CONFIG_LCS); + status =3D rockchip_pcie_read(rockchip, PCIE_RC_CONFIG_CR + PCI_EXP_LNKCT= L); status |=3D PCI_EXP_LNKSTA_SLC << 16; - rockchip_pcie_write(rockchip, status, PCIE_RC_CONFIG_LCS); + rockchip_pcie_write(rockchip, status, PCIE_RC_CONFIG_CR + PCI_EXP_LNKCTL); =20 /* Set RC's RCB to 128 */ - status =3D rockchip_pcie_read(rockchip, PCIE_RC_CONFIG_LCS); + status =3D rockchip_pcie_read(rockchip, PCIE_RC_CONFIG_CR + PCI_EXP_LNKCT= L); status |=3D PCI_EXP_LNKCTL_RCB; - rockchip_pcie_write(rockchip, status, PCIE_RC_CONFIG_LCS); + rockchip_pcie_write(rockchip, status, PCIE_RC_CONFIG_CR + PCI_EXP_LNKCTL); =20 /* Enable Gen1 training */ rockchip_pcie_write(rockchip, PCIE_CLIENT_LINK_TRAIN_ENABLE, @@ -341,9 +341,9 @@ static int rockchip_pcie_host_init_port(struct rockchip= _pcie *rockchip) * Enable retrain for gen2. This should be configured only after * gen1 finished. */ - status =3D rockchip_pcie_read(rockchip, PCIE_RC_CONFIG_LCS); + status =3D rockchip_pcie_read(rockchip, PCIE_RC_CONFIG_CR + PCI_EXP_LNKC= TL); status |=3D PCI_EXP_LNKCTL_RL; - rockchip_pcie_write(rockchip, status, PCIE_RC_CONFIG_LCS); + rockchip_pcie_write(rockchip, status, PCIE_RC_CONFIG_CR + PCI_EXP_LNKCTL= ); =20 err =3D readl_poll_timeout(rockchip->apb_base + PCIE_CORE_CTRL, status, PCIE_LINK_IS_GEN2(status), 20, @@ -380,15 +380,15 @@ static int rockchip_pcie_host_init_port(struct rockch= ip_pcie *rockchip) =20 /* Clear L0s from RC's link cap */ if (of_property_read_bool(dev->of_node, "aspm-no-l0s")) { - status =3D rockchip_pcie_read(rockchip, PCIE_RC_CONFIG_LINK_CAP); - status &=3D ~PCIE_RC_CONFIG_LINK_CAP_L0S; - rockchip_pcie_write(rockchip, status, PCIE_RC_CONFIG_LINK_CAP); + status =3D rockchip_pcie_read(rockchip, PCIE_RC_CONFIG_CR + PCI_EXP_LNKC= AP); + status &=3D ~PCI_EXP_LNKCAP_ASPM_L0S; + rockchip_pcie_write(rockchip, status, PCIE_RC_CONFIG_CR + PCI_EXP_LNKCAP= ); } =20 - status =3D rockchip_pcie_read(rockchip, PCIE_RC_CONFIG_DCSR); - status &=3D ~PCIE_RC_CONFIG_DCSR_MPS_MASK; - status |=3D PCIE_RC_CONFIG_DCSR_MPS_256; - rockchip_pcie_write(rockchip, status, PCIE_RC_CONFIG_DCSR); + status =3D rockchip_pcie_read(rockchip, PCIE_RC_CONFIG_CR + PCI_EXP_DEVCT= L); + status &=3D ~PCI_EXP_DEVCTL_PAYLOAD; + status |=3D PCI_EXP_DEVCTL_PAYLOAD_256B; + rockchip_pcie_write(rockchip, status, PCIE_RC_CONFIG_CR + PCI_EXP_DEVCTL); =20 return 0; err_power_off_phy: diff --git a/drivers/pci/controller/pcie-rockchip.h b/drivers/pci/controlle= r/pcie-rockchip.h index 5864a20323f2..f5cbf3c9d2d9 100644 --- a/drivers/pci/controller/pcie-rockchip.h +++ b/drivers/pci/controller/pcie-rockchip.h @@ -155,17 +155,7 @@ #define PCIE_EP_CONFIG_DID_VID (PCIE_EP_CONFIG_BASE + 0x00) #define PCIE_EP_CONFIG_LCS (PCIE_EP_CONFIG_BASE + 0xd0) #define PCIE_RC_CONFIG_RID_CCR (PCIE_RC_CONFIG_BASE + 0x08) -#define PCIE_RC_CONFIG_DCR (PCIE_RC_CONFIG_BASE + 0xc4) -#define PCIE_RC_CONFIG_DCR_CSPL_SHIFT 18 -#define PCIE_RC_CONFIG_DCR_CSPL_LIMIT 0xff -#define PCIE_RC_CONFIG_DCR_CPLS_SHIFT 26 -#define PCIE_RC_CONFIG_DCSR (PCIE_RC_CONFIG_BASE + 0xc8) -#define PCIE_RC_CONFIG_DCSR_MPS_MASK GENMASK(7, 5) -#define PCIE_RC_CONFIG_DCSR_MPS_256 (0x1 << 5) -#define PCIE_RC_CONFIG_LINK_CAP (PCIE_RC_CONFIG_BASE + 0xcc) -#define PCIE_RC_CONFIG_LINK_CAP_L0S BIT(10) -#define PCIE_RC_CONFIG_LCS (PCIE_RC_CONFIG_BASE + 0xd0) -#define PCIE_EP_CONFIG_LCS (PCIE_EP_CONFIG_BASE + 0xd0) +#define PCIE_RC_CONFIG_CR (PCIE_RC_CONFIG_BASE + 0xc0) #define PCIE_RC_CONFIG_L1_SUBSTATE_CTRL2 (PCIE_RC_CONFIG_BASE + 0x90c) #define PCIE_RC_CONFIG_THP_CAP (PCIE_RC_CONFIG_BASE + 0x274) #define PCIE_RC_CONFIG_THP_CAP_NEXT_MASK GENMASK(31, 20) --=20 2.49.0 From nobody Wed Oct 8 11:02:04 2025 Received: from mail-qt1-f179.google.com (mail-qt1-f179.google.com [209.85.160.179]) (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 D687E1F37DA; Sun, 29 Jun 2025 12:48:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751201296; cv=none; b=aq0Q4QHpIwpg+K29eAwkCneEEqkTJpzNdatWghxT8e3mgicSOrBifrtHQLEu/HTBCYK+/uxFQ/bbOSAJ6pcnf5c/ZkwN5sd1Mmq0ttZSzTqRY3XEDv8c3U0DAAzODnfnEkodCDgmJF6MFLvtle4T18kSUNbTTkf3nlqmEtzQBMw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751201296; c=relaxed/simple; bh=TMyeQZWAOAuTwvIXse5kaD0KDoeWmnfqoNhsSOfoCv0=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=aivEwPgyaU3WxGzN2ekgGZ5cGiHSwMmUWdnv5p3TdUs4JXSib+Q1sBdZqZjuxrWbNfHWQXrs2zhs6PlW+WhzU6iOY2Ra2RI/U1WesfP5yQQpycRFu+tyEUrP50VgXmF2zai0jeUuYRuBphIKMdho4hVzYWuRuUINjvNspssSbC4= 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=MvoQ+zJG; arc=none smtp.client-ip=209.85.160.179 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="MvoQ+zJG" Received: by mail-qt1-f179.google.com with SMTP id d75a77b69052e-4a58f79d6e9so51168951cf.2; Sun, 29 Jun 2025 05:48:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751201294; x=1751806094; 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=rtc4GJjYIzCc3h+Hv3COhOArvofrVT3IhU2L5CEaYbA=; b=MvoQ+zJGsD5SOu8I1y3TiFFimD5ryZdbjqTYT2yDg8xqIHiMh8GQ9K12UraKRk5lBN 2XPThrGBKlgAkTOje8+mgOPwvLWrXH7SYtS1J8QLPe2Q0h1fSA8oExcmMNJ7LCcQCQ6m ixHfYG0pGTt5g2SrrAxMIri97JFXEbRrTq8UUOeWT8EF9yPgK6mUTfuMPuAvIhHpMUbA UrV13lvIkANj/nuNF8UhQhg6dG/8kgw7MrQZdN1lhL7lrrXoynUDmagnBKCNxrmJIu3h x7BhjHtGx5UgNsEBg5Bov5ojoakSMISOTBW08jxFOBanaqUnXjPKqfKlfXe0Fh34cUMZ iHAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751201294; x=1751806094; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=rtc4GJjYIzCc3h+Hv3COhOArvofrVT3IhU2L5CEaYbA=; b=JEB8D41i1YRZEI49+n+VsdX6hagflo+EOZHXeoRK7QLeGdbVdjVc+h6IZTaPAa+HhP Q05I8rqfSl0Cfai49M6+j+yPOWkKc7xLFDuN2dTcGiAelCcnU3xvZ65D5z0n/ugwGspd DcgNbl0GW6ot9hjBF+yRBZt+Rx4c12PrSJBsIfkC1Eu/XxLyus8PtHRp6tcsy+JLqlD5 hj1yZtFUcfwlO71BcvvgjXl/Jr2RK5y/SPLMS+pBefc6i2T2QYjUxyrc77RAcJavN8bf V2xHEg0E1KxAxtNiwcvYLzIpD0KCDixsrxj0paiB2qndF3vg1DLFf5MEc9JcgUwy7ipH 2Tmw== X-Forwarded-Encrypted: i=1; AJvYcCWbSXL52gBUc/VkGdR5RiPNtJH7bw6+wmXi/0zzB+TgbqgPmZNjVu7Gu4dkWK8s52nWDF1yIpvBwBuq@vger.kernel.org, AJvYcCXFxBKvXgTEVhrJj9EKQUJDM+kuBNathYRaPBgVUJaHNr157ekn5LvpweTWC8w3cL3c1Oo1FviJ5hWJQec=@vger.kernel.org X-Gm-Message-State: AOJu0Yyz4fTBQzG2JgvvTvzPsJXw6S/hhgN6uRR9/XekFi6HrBZfXZuw 3c+7eenzZLelF82q8E+uRJIe11l4SXVUvNsR7Z4vLebcNSPxBjpgcv9w X-Gm-Gg: ASbGncsn9qpqiPlD7gYHp4YSE7908rBw/4bgkjllYiy6Oy7N2mgqecJA/nHUYi3euz/ GKTrrlefXSSQy0vQuDHDD9VYmO7k22UJY/a0Wi1oUBhfk3rtO0pAR/tOxPlsVP3cc2GC0xKXMQG dHo6n80g+PkeMflAcpKPO8lbuFt00X67ht53BbdaFFg7FkJZSfgfCLQTbAACgDnzvGjuSCFYeuY pQekBjHk8PHm0g5+W2MaRUbhc0EwFYzhDVD60zv0ahQUlKA4L+pRU+G49KcYdm5YfPQNmNp1Ur7 CGkb397bP04CBXEic2esNS6XAal/p0fFEgzkQMLRz9H2z7ZPmQ== X-Google-Smtp-Source: AGHT+IGiNquMhzJugS2btiY1s8UNBRt+TPGhGmmXE7yoAsxq4Al8mQ1vd1rQAy8wXSXKKwGcZx27oA== X-Received: by 2002:a05:622a:244a:b0:4a1:356:5e7b with SMTP id d75a77b69052e-4a7fc9d55ccmr164616551cf.1.1751201293645; Sun, 29 Jun 2025 05:48:13 -0700 (PDT) Received: from geday ([2804:7f2:800b:24f4::dead:c001]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4a7fc1392a1sm43185851cf.27.2025.06.29.05.48.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 05:48:13 -0700 (PDT) Date: Sun, 29 Jun 2025 09:48:07 -0300 From: Geraldo Nascimento To: linux-rockchip@lists.infradead.org Cc: Shawn Lin , Lorenzo Pieralisi , Krzysztof =?utf-8?Q?Wilczy=C5=84ski?= , Manivannan Sadhasivam , Rob Herring , Bjorn Helgaas , Heiko Stuebner , Vinod Koul , Kishon Vijay Abraham I , Rick wertenbroek , linux-phy@lists.infradead.org, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v7 2/4] PCI: rockchip: Set Target Link Speed before retraining Message-ID: <0afa6bc47b7f50e2e81b0b47d51c66feb0fb565f.1751200382.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-Disposition: inline In-Reply-To: Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Current code may fail 5.0GT/s retraining if Target Link Speed is set to 2.5 GT/s in Link Control and Status Register 2. Set it to 5.0 GT/s accordingly. Tested-by: Robin Murphy Signed-off-by: Geraldo Nascimento --- drivers/pci/controller/pcie-rockchip-host.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/pci/controller/pcie-rockchip-host.c b/drivers/pci/cont= roller/pcie-rockchip-host.c index 65653218b9ab..25890f6c0e17 100644 --- a/drivers/pci/controller/pcie-rockchip-host.c +++ b/drivers/pci/controller/pcie-rockchip-host.c @@ -341,6 +341,10 @@ static int rockchip_pcie_host_init_port(struct rockchi= p_pcie *rockchip) * Enable retrain for gen2. This should be configured only after * gen1 finished. */ + status =3D rockchip_pcie_read(rockchip, PCIE_RC_CONFIG_CR + PCI_EXP_LNKC= TL2); + status &=3D ~PCI_EXP_LNKCTL2_TLS; + status |=3D PCI_EXP_LNKCTL2_TLS_5_0GT; + rockchip_pcie_write(rockchip, status, PCIE_RC_CONFIG_CR + PCI_EXP_LNKCTL= 2);=09 status =3D rockchip_pcie_read(rockchip, PCIE_RC_CONFIG_CR + PCI_EXP_LNKC= TL); status |=3D PCI_EXP_LNKCTL_RL; rockchip_pcie_write(rockchip, status, PCIE_RC_CONFIG_CR + PCI_EXP_LNKCTL= ); --=20 2.49.0 From nobody Wed Oct 8 11:02:04 2025 Received: from mail-qv1-f44.google.com (mail-qv1-f44.google.com [209.85.219.44]) (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 6088E33985; Sun, 29 Jun 2025 20:58:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751230726; cv=none; b=LFLouDcmKk/q1V3P8yxdUvou66ESt89Vk4UxzhSicrzRqZI8f+KZWifYPz2gCwo07xpCrARMUxMc1k6YRLlykAfsdgtJenN1vyhZAPK3PgQ3uvrrXh7NSLYeV2Xm3QT1YOKdgJ3+kluc0m+7yiu2vMae25KBW0VVMyL38MqD/AE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751230726; c=relaxed/simple; bh=ICTpLVM2M7G18zzAFC+A0bTSgAg31tSJVTdM/HqBFLc=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=XZLAfuVN0ubBjysYotqRsizrJMZyosRp2aDHFlpBg7v7kNIw5HhTP+34TY6dsFbvfg62G9RKz3FI9ju7SOneBDJH4XDWwzmRbnio0u92qMaXT6qU3prV2VmyXqIrr+Wm3+tz18P+rzIdnbc6/yl+NY/l5DMhYOSr1bXkoED83oY= 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=P4u9sp6b; arc=none smtp.client-ip=209.85.219.44 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="P4u9sp6b" Received: by mail-qv1-f44.google.com with SMTP id 6a1803df08f44-6fd0a91ae98so8988856d6.1; Sun, 29 Jun 2025 13:58:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751230724; x=1751835524; 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=yie4J6/XsAs1Q8lv5qOjqiXHg7FYWZHizYmDgi4UuNs=; b=P4u9sp6bZKHA60nOlmRck8CjvWeIHe8SsPVt49NuhnvrM8KouMam8u49vLs1SKfshx PXQcYtJSl5VKJ4tci9vmxWbCMbecq2R/ZSt5ApsD2HChYwiuqQiKFdu8gX0MpuphvUZe BuTh6Kysyk14Bdib74lGqQiwYNKF/zV2fudVaQhHRXEEcqaGALptzAQkYcL1+Q47HjIU beyv+Pz9KdZwYxv4yWyz+Xc0PB1FqxuFDyUmPRASQ9HHqfND/tymjFiEFnIrVoObcI6Y 0PMt9+uNL/YmJNfY2h3kFL7iH3fbthq2ZqcBxfXZjru2vRP8SdQQ5VyTDD8ngyIvZnYN RexQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751230724; x=1751835524; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=yie4J6/XsAs1Q8lv5qOjqiXHg7FYWZHizYmDgi4UuNs=; b=dltEHn0Zi2oCaZZo0/OwfutDS02c3i3kgyZLkAcqHCwgRIR+k6GhSHc5USPs1imRM+ QNDHA4Sx/3sYQkgdTDpoEShOxpM4y3PMgSknvBnJqTsFryQcTLdfCU5wS+YuGHsn0siZ ORVQPpS/KmNy5MASCXLOIIdIwriBKvr2GucSlgRgcLkZijWLLwL3BNODDhvmzpDRioNZ 5sPb4/8ySWxN59r1hHquwNeoMvjxlz+jdR2xHHwi2J/4LjPVtRo7LZ+aubGC/5cn2Gzc DOkbpZzHOox+Nqb0fCDkQyXCtqfVoKpshiD5qxGByay3NcT2TA5CfI8pP3CtdE4IlNKY 8MYQ== X-Forwarded-Encrypted: i=1; AJvYcCV2oDVQzMASG4YfOAK95Rg6QQYa3v807KuNzpaDhHZY3iA91uVCKHXRVC6hGiAMUKxWwjz0XSuvqoDW@vger.kernel.org, AJvYcCXi7AvYbJglKUvGSAzbUsVZvRg05YQ7zN0ILxJWtjHDJMgqSM5L5+ANYEHs4pGEzzwaOAVHTHAq2+JLXxc=@vger.kernel.org X-Gm-Message-State: AOJu0YwvDjE8fYvFU7w+53J1pF/i7KK5FLlAMnD/hOx2UVfrPS8MAEWE qvn/9astsLd0opfi0D69TgiUFC8GonhGdIZ3+pY17qHbPk2Nfe/uXDTYfv6i7Z3q1BCUZQ== X-Gm-Gg: ASbGnctrXUnN4GRnvDzLVyDXpkz81IpLj94t4yrwv6Lt6lJuq++OFi7BabLZ1wb3zOC uDM4rVV3W4UHyfgrfbMFij7B2uy06jiGeN/z0SyvvPoK8Y9StzPKpLPBULzstArsLLq8B723WFh z2/1aDESiUmJd3adUWtimmPnt6ntMbNxjnDzNbaOhiM8vUHuJDoFgTjwjFp+aUqmly4nL8+uv6L C1Blif0QHytmQn546zdQaxLgchZFiKmFZP0/ifGEO3rn0gt7PKoaiZjnRl66c9lG43R587MftXL bkQIkqQCRGf1mhgV12ZYiiPjCFeWegJ7ku5g15J27unZBKy71g== X-Google-Smtp-Source: AGHT+IHV9zmUEfgqMrmNKPmx2kRTuxTdY/cY3aGuTYatCyaiuxMqaEx69QeCSt7OKPnppAGC83yv0w== X-Received: by 2002:a05:6214:6201:b0:700:c7ef:ad26 with SMTP id 6a1803df08f44-700c7efaf90mr50674366d6.29.1751230724134; Sun, 29 Jun 2025 13:58:44 -0700 (PDT) Received: from geday ([2804:7f2:800b:24f4::dead:c001]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7d443231da6sm484599585a.101.2025.06.29.13.58.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 13:58:43 -0700 (PDT) Date: Sun, 29 Jun 2025 17:58:30 -0300 From: Geraldo Nascimento To: linux-rockchip@lists.infradead.org Cc: Shawn Lin , Lorenzo Pieralisi , Krzysztof =?utf-8?Q?Wilczy=C5=84ski?= , Manivannan Sadhasivam , Rob Herring , Bjorn Helgaas , Heiko Stuebner , Vinod Koul , Kishon Vijay Abraham I , Rick wertenbroek , linux-phy@lists.infradead.org, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v7 3/4] phy: rockchip-pcie: Enable all four lanes if required Message-ID: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Current code enables only Lane 0 because pwr_cnt will be incremented on first call to the function. Let's reorder the enablement code to enable all 4 lanes through GRF. Signed-off-by: Geraldo Nascimento Reviewed-by: Neil Armstrong Reviewed-by: Robin Murphy --- drivers/phy/rockchip/phy-rockchip-pcie.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-pcie.c b/drivers/phy/rockchi= p/phy-rockchip-pcie.c index bd44af36c67a..f22ffb41cdc2 100644 --- a/drivers/phy/rockchip/phy-rockchip-pcie.c +++ b/drivers/phy/rockchip/phy-rockchip-pcie.c @@ -160,6 +160,12 @@ static int rockchip_pcie_phy_power_on(struct phy *phy) =20 guard(mutex)(&rk_phy->pcie_mutex); =20 + regmap_write(rk_phy->reg_base, + rk_phy->phy_data->pcie_laneoff, + HIWORD_UPDATE(!PHY_LANE_IDLE_OFF, + PHY_LANE_IDLE_MASK, + PHY_LANE_IDLE_A_SHIFT + inst->index)); + if (rk_phy->pwr_cnt++) { return 0; } @@ -176,12 +182,6 @@ static int rockchip_pcie_phy_power_on(struct phy *phy) PHY_CFG_ADDR_MASK, PHY_CFG_ADDR_SHIFT)); =20 - regmap_write(rk_phy->reg_base, - rk_phy->phy_data->pcie_laneoff, - HIWORD_UPDATE(!PHY_LANE_IDLE_OFF, - PHY_LANE_IDLE_MASK, - PHY_LANE_IDLE_A_SHIFT + inst->index)); - /* * No documented timeout value for phy operation below, * so we make it large enough here. And we use loop-break --=20 2.49.0 From nobody Wed Oct 8 11:02:04 2025 Received: from mail-qk1-f180.google.com (mail-qk1-f180.google.com [209.85.222.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 69D0A21FF59; Sun, 29 Jun 2025 12:48:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751201313; cv=none; b=kempmrL6uy8oITbjebJMuWusE8Zo/+YCJcpOEwb2wIoQOhji8Fb/0Bj6y0byQu51zOGbMu9KlaqaFJ2o/b9h9JP7Msy+uPMhiU/qtIEicvt5hqAIaO3BvuvWY0Z+OMAJ/kiris7IJA90uBL1XB8CY+RyGcSO5R7Mjnl3W+8ZYQg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751201313; c=relaxed/simple; bh=ZHiuNjkysUslUmsJxg+pQGZzasofUlWvOElEMSh7s+0=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=cxdrpqgK8HtLwa4IkRm/n9NnwWpZHNcWzAI4z26wdLD+ieDTUKWR5qHNqreCU7ZJNEypNxj2HyzPkA83TA1jdKMDHRGwHkP3uyPf9hWYVmdNx8+7Khcke+SdoqqpJtMk1pOUP7LouC5cAqO1+dpHqY99HjchA/MsdTSDqttw4jo= 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=OJwvcV4q; arc=none smtp.client-ip=209.85.222.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="OJwvcV4q" Received: by mail-qk1-f180.google.com with SMTP id af79cd13be357-7d3f5796755so346997685a.1; Sun, 29 Jun 2025 05:48:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751201311; x=1751806111; 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=OvjviZOYrIKurfYh7ExfJUlmx0DJYashywHEqMq8QKk=; b=OJwvcV4q1yol3NJWPxTgIuLNLBBVTDHbt/u+tSMG03eG6jFIqXpwgpAI4ZciLEd38X A2VaBCrkr5DgnRqYOyKEows36CMqNdk3zvvaZo7+Tjsz4aVKrZvl0oX/K3iTjDNLGvSA iyo1x3qSD+N4WkkcMbAWmik3HF5dLQtJOta1cxHQwBtV0J1LmJcoKUKzKBUafTRxYOK2 Pk6Q3OPmuipb3qj/hjYv6gKe+UCSGqh5MA7xd33h4UKEKhziftvAeoPJawnNzOKKybP4 0fc7USeb8aCcQCaeoPPKfyU10dgZBhE8ut3txWCC5aH4NNzY3jYwsMG55wbhn6xRI52A hW5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751201311; x=1751806111; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=OvjviZOYrIKurfYh7ExfJUlmx0DJYashywHEqMq8QKk=; b=M5saFTzLdWEF1JPaPlDKDrGzY63O7qUK63OAtk0+bSq/e+TO0IuCS2MnhySh1Gl+iP 9IuobaAPMJDIzPq6HH7weyeRfzZcwUdzjKemo3ZgN3+vlKbMdc+sdqqXAasgo6acPrQD OkPGOVuHGF3pq7m7XCpvw/0d7n+zsCs5IiSTaZrMyNRJ85JmUI0YpeCNv/btW+sO2nOx wRKzHPxBKcRbiYqDlDCPgpc7McxSbT6ZbazkimLaGq4zbKumdlxeHc6N5lgNtOP3zmFJ gb+R+jBLQvTVBJsEBri8hVl/hwa7Eqz37NqULZrCkAXGdrMaGF+23AjWZ/XWAD05AfVG 787Q== X-Forwarded-Encrypted: i=1; AJvYcCU/WLpvnAAqvZRL78Ty8U6bteCyk9yDwPCLUD4QPwOpfxFLEC5inxXEdAQY0y8VjYveYf73/4ekob1pi0I=@vger.kernel.org, AJvYcCU0wUENljNv54/URpQ2U+n2+maz0O6fka6uceKwljeFfR+X0IkdJnt929HEC3QRN1X5lXJGS6XcvVmS@vger.kernel.org X-Gm-Message-State: AOJu0YxsNdfgQQKLJ99+B7/xT65reO3M8prIxJatB/F3e+c6iMJShcCp eIOZ8nQOQuGgoFc+cdAIrT9oomtH50bUaAQBVrPWjsh/JFO8ZICZhNXu X-Gm-Gg: ASbGncutGePa+hZUYd4evTRKqvDSVNPojDILbx8rlLzJ/Svek3w3uZdXlH5Tqngu5Wq 2FEizjJ663u0nA5LwGwk5FiGWO7mSYwuR1sO3CqSTFAQ5z68+VlkPi96hCGUH6vX076aFMWtKER RLos0asTi5zjfKAlSaIOKUoUM16g2gZjIqdaQjD0q858MEOxH6G7rLHZ0pb6dlHn5LqINcFuETx XPEBeSiRViSwbHPuT9xkjXzEPwPnsJ7RPbAxslsH/AiB5fcdgcw7CYL77awxB3lhBwph5OMYwAK TAaA9aCDtNb2r/fVK39jp8+tyb5jYIyvyOAlsdv17srylPlv9A== X-Google-Smtp-Source: AGHT+IEL/USEP/o68qM8kpTv7RVt+yvEVYuaMW1bky10qQjPlYApX6JjeupaO/caQhzoh8VdKrp98w== X-Received: by 2002:a05:620a:2556:b0:7d4:567e:3df3 with SMTP id af79cd13be357-7d4567e4429mr264478785a.46.1751201311114; Sun, 29 Jun 2025 05:48:31 -0700 (PDT) Received: from geday ([2804:7f2:800b:24f4::dead:c001]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7d443203134sm435231085a.67.2025.06.29.05.48.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jun 2025 05:48:30 -0700 (PDT) Date: Sun, 29 Jun 2025 09:48:24 -0300 From: Geraldo Nascimento To: linux-rockchip@lists.infradead.org Cc: Shawn Lin , Lorenzo Pieralisi , Krzysztof =?utf-8?Q?Wilczy=C5=84ski?= , Manivannan Sadhasivam , Rob Herring , Bjorn Helgaas , Heiko Stuebner , Vinod Koul , Kishon Vijay Abraham I , Rick wertenbroek , linux-phy@lists.infradead.org, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v7 4/4] phy: rockchip-pcie: Properly disable TEST_WRITE strobe signal Message-ID: <60ad1985a0de0a6b47044ea9c0acefe6ff865aad.1751200382.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-Disposition: inline In-Reply-To: Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" pcie_conf is used to touch TEST_WRITE strobe signal. This signal should be enabled, a little time waited, and then disabled. Current code clearly was copy-pasted and never disables the strobe signal. Adjust the define. While at it, remove PHY_CFG_RD_MASK which has been unused since 64cdc0360811 ("phy: rockchip-pcie: remove unused phy_rd_cfg function"). Signed-off-by: Geraldo Nascimento Reviewed-by: Neil Armstrong --- drivers/phy/rockchip/phy-rockchip-pcie.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-pcie.c b/drivers/phy/rockchi= p/phy-rockchip-pcie.c index f22ffb41cdc2..4e2dfd01adf2 100644 --- a/drivers/phy/rockchip/phy-rockchip-pcie.c +++ b/drivers/phy/rockchip/phy-rockchip-pcie.c @@ -30,9 +30,8 @@ #define PHY_CFG_ADDR_SHIFT 1 #define PHY_CFG_DATA_MASK 0xf #define PHY_CFG_ADDR_MASK 0x3f -#define PHY_CFG_RD_MASK 0x3ff #define PHY_CFG_WR_ENABLE 1 -#define PHY_CFG_WR_DISABLE 1 +#define PHY_CFG_WR_DISABLE 0 #define PHY_CFG_WR_SHIFT 0 #define PHY_CFG_WR_MASK 1 #define PHY_CFG_PLL_LOCK 0x10 --=20 2.49.0