From nobody Fri Oct 10 20:52:41 2025 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) (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 6E43C221DB9; Fri, 13 Jun 2025 05:20:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749792040; cv=none; b=Omc0sn930svRdtwciVXLdQqV1jk9pxqtDlgDqoNfQ4h15ROYbhueKuajR6fDaOVv5/i6MT0I1gLkrQYGQ7/Rgfnahb27ewogopZzrinRaveXRj3YRH1gGsu+jegi/BhS0hz8ObB00W2mqrcAbdAZXBGUEf0zqEAdhbBw3gYI/Xw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749792040; c=relaxed/simple; bh=HCHxyL0K42wwQ/tfkDZFm1mre6kRDwGlqurOi7MIwBc=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=OESLyduXRPB4oCbCJCpwB467GwBo9HnASbciOFbX+2dUItN66NoRF6r7+kRNAJbpj8GhrS4jsXSfjKQN92MzUOFKZmg4xH/vyr+wFKZn0gFwK8O0X49+6Pfwv/By404HSzLTAWIYaVgqbDzKxD1ryFr6pKmrY4aDwOf5F43V1Eg= 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=L6eBmX/O; arc=none smtp.client-ip=209.85.216.51 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="L6eBmX/O" Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-313154270bbso1871792a91.2; Thu, 12 Jun 2025 22:20:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749792038; x=1750396838; 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=mzNQkY2OXtljp7yt/i/tI+v/gWIw5D47TujWJasE/B0=; b=L6eBmX/OVNFfPMtSbx68CZfKhsh7OM+haQrBfLzn8FkX1SmKaTCQMh54/PDvZksSip efAt25SWdZYKL3mZVgaV3KWomUQMWXvtHFb3KTtBkj1mUxlSNDJFdX/M2CTdivBypvuK tnHwT7ktIGsySE/zCpj0tNdCGwuaPcuSjK0h4cvQ5KvgmUMBZfEKM/hlV9ThmMwvXaBq T3tsx8eq6Sn50GspU+VfqhABOJJEicHug1X7WI9qIAbR6BeRrSPFMsOnf4bzqh87NBmg Yl0tRAYamk9hM2/XWUpO2Y7lxbMoIKw/ioB4JB6aASbPH2XTsaEtXbzhqau+UBiVWDae ahzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749792038; x=1750396838; 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=mzNQkY2OXtljp7yt/i/tI+v/gWIw5D47TujWJasE/B0=; b=JghnrBxSzqX+rpBC+TDf4iPYGB36XFe4PYQlz+clXn5paBDUqlIOoA5Hw64A3VkX3a KQhfqQ0IaLmL17mXI8tBksM1hFJAlGZ+KDzsWZU+UJ1vLJq2C3auF23CpuPYRmIAaLZ5 /3VnSmnI25enIyiSNDrCQ4vTxZnnDncEtsvIWnqY7gsuBNhdxga/+CoF3Ho4avp28Kns O/LC1Nt2AhmANHvoSnAhRJWojowgmtSM4xH+e3NeQwFVExnF7iwFJ5TGmY2OwIGys2MQ rbkTJD+XDzoFXphPH2Dq+KgicTXzW6wiuNPCgWlvTzAkzQl7am/kJ/ROL8t2TsM5s723 w80g== X-Forwarded-Encrypted: i=1; AJvYcCU+0jnCb8JJ3sU7nRdFMLt2cw7wD0mP7wj0pG9IEsXUzbnKU3RgRRtHCdsV5JMm8s+GmdGKe20Qt+7s+aI=@vger.kernel.org, AJvYcCU9JDnirKuYF05Z2dNDhPDLQNOHt6yh4nXNasaUo1LRdMJScHBELKgN8qN69f6N/Tj6d43HGrjKlfQp@vger.kernel.org X-Gm-Message-State: AOJu0YwlmutbS8jqfal+0iezUDt6UcYUuR7lWEYxswa1gJqN18TqTEmg SkFNdGJOGboPvfFxI8p4duwi4ac/4nX5xble4hcaV18u8cNXTgUxH1S0 X-Gm-Gg: ASbGncszdHHr+4KE+0C4d9KeoDAZnE7FZi6H2PEyDsZ/2NA3sl+GMNj71OA2dkxm6NP gCQ4vMqeyESOGvaOUW2sVRUkTnipJtFIPplJPXD9HvkFa4sWngTVQ0ACWBNvYtBPGpkrS0P3KBr u4h4bgvIFB2sew6ZR7k+020VxoOFAEakwdFPZoGrlkDzsRKClowwbD5XzBuuMrk4YiXVNuLSGpw R42IPk4FfcVubq33EzS2AxcRUZHhm1S8lsblXvdnRFCbAZnSP40Lqnn+PUWrLK4loY83v+YvPf5 19xf5yPTtc/yxqlw6075gsZSHmFrVK3co7nnYlm1W83OpcopgezXZjAFKd1Q X-Google-Smtp-Source: AGHT+IFD4kNMkddGc3wLZDbhh2d7dD+nWlT0oop83EPQ5kX+4wOE8LIWl38jo2FQjDZelFQ07DNH1Q== X-Received: by 2002:a17:90b:53cf:b0:311:f99e:7f4b with SMTP id 98e67ed59e1d1-313d9eaa4c9mr2631617a91.28.1749792037498; Thu, 12 Jun 2025 22:20:37 -0700 (PDT) Received: from geday ([2804:7f2:800b:7667::dead:c001]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2365dea8fd6sm6190925ad.145.2025.06.12.22.20.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Jun 2025 22:20:37 -0700 (PDT) Date: Fri, 13 Jun 2025 02:20:31 -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 , linux-phy@lists.infradead.org, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH v3 1/5] PCI: rockchip-host: 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. Suggested-By: Bjorn Helgaas Signed-off-by: Geraldo Nascimento --- drivers/pci/controller/pcie-rockchip-host.c | 44 ++++++++++----------- 1 file changed, 22 insertions(+), 22 deletions(-) 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: --=20 2.49.0