From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) (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 C324726B756 for ; Mon, 10 Nov 2025 11:04:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762772654; cv=none; b=NJbwFeaU+8B4t4HqEa77OItY2c1RGfouhO63V5T9lIUQbURvpwvrtv5esgFSLDCyxzPcY5jzgK0NxD2j7xK40wVba0i9Lt/27CqGNzJtWMN2xGSURhJuE3uUCStDIa0DYR3oQLTh+weZGv7stakENSqOEiKYMqpLYF2ejhlltCM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762772654; c=relaxed/simple; bh=1Z+gaT40oj3T5r3ek/hMQ0J0ma0x2pMde1fuBz+MOWc=; h=Message-ID:Date:MIME-Version:From:Subject:To:Cc:References: In-Reply-To:Content-Type; b=gt4G7VNAgyJKecikgrahjCc0Fj0i38wjOzrOkfKMp1WBuRvozR0TFDl5tEGp0vw5ksOnSc3FYeW6utKyQo6LGrDma6MaRqw8F+FdJ6+39pB6SQwv9uu+alV4AngBwEstyTJYnLPegVlWuLu1R8PsO6zvXyXnRKGEQnTtHzxZaTA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=IL2wBUnZ; arc=none smtp.client-ip=209.85.221.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="IL2wBUnZ" Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-42b3377aaf2so680547f8f.2 for ; Mon, 10 Nov 2025 03:04:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1762772650; x=1763377450; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:references:cc:to:subject:reply-to:from:user-agent :mime-version:date:message-id:from:to:cc:subject:date:message-id :reply-to; bh=yIWnZ8dEqAIo6e04DNrTq+ZCsjQol4ZAc5Df0I8mreM=; b=IL2wBUnZGYGVWNEpyCph9/ihdD+tX5BiyHigu9uHwImLuvHER+s21IVTwJxByNOF08 IFvBbqHjowPabtmwGtm0uyxuFXgyPhQWBj34PVJRWXl9JMeBQ1NHNZIxK9JI3e5eQwy+ RjWOtbEmfUGMGn5bkY89LCsOWdc8PF+x3CkBE5XiALHxJErI2NMutfBlpBcRjBqifYOL kWMM5L8Fgs+KffgNNWNO0nqZ2pIb1y5GkTRBD43WZBd2DX/db9714XGUtoz1cnTVrrRD 46IGtLXprJxPW71shUaijrKUHLoXLGt5Oyo9/HhFRgyfHNMny9GZW3tdaXwkFx0xYivc 2djg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762772650; x=1763377450; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:references:cc:to:subject:reply-to:from:user-agent :mime-version:date:message-id:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yIWnZ8dEqAIo6e04DNrTq+ZCsjQol4ZAc5Df0I8mreM=; b=MhFSFQagf55iEn5UWu2LDvew4iCCUb3mbd8QZyPXAvxREYDWR2D69i9cbJS/NCPoGr qe9GYNO473yIXLAgRfeKVkOyUApFQY9Q8M8LHDnwsjJsXPeWpIKwMEyeN1M8uixEuc3j lm3pW+8v56uGPG0jdQp8HCOCcNBs3zNQmDumWndlxe86KS0EWPuh/wA6KALBDOo7XAj3 bWqANuRq3KAkcueiZKDJRZhRIISEjUMgKgrORoDkqflpfnCozompXOdF/WsW5hKTyMps EWJ+QBgz3+l/IHxh/NjqIbMgPZfq4ztT5ADXqs58zQieljmol7GZQoQv2dNWf24Cns6G lzLg== X-Forwarded-Encrypted: i=1; AJvYcCWZNWsrViuQZ76SDRgO/xOY/rp11WW81CUx9aCUrVa4PPcO27WxA6uOeiKiJXESTZvl/sLbjWl2Vrc=@vger.kernel.org X-Gm-Message-State: AOJu0YyI4fgUMVq1hnaxyNAd0k67n9LT6bhkQIOyfrCPLbCuDyhwkCBk K8XvWDvHK0FrjeJwGi/78R1AVoh4AUjzoizmQPKTIoBvsNkuOAESr+xWVBdW1DRCZy8= X-Gm-Gg: ASbGnctv+XOMhrp7YuGVggby4wbpddKJMZdzxFhvakCr0QErQhRsQkol356mEadJ3z4 ZFezCI+MTcchLSxH9uYUMgbaJEWfFeYmftfr/LfYl0oS3R8/coqh1i8OQx7dkNf1792D1KFR+9C e3aP25PzJwks8BJKyPu2i90JQHrJnp9+h0oJ+3RxyLWgd3rJqKL+HFklBqiF71WUE4mP1PUOHwO oyTIHljKeFvNnR+LdTtJKff7BrA9748xZ/3ogX2OvrT3CtWVGeYj5MYJLKqxMIgTPXFUl1Mokkx 4BcuYnFDP4ojWGNA5a9SaQrPSDEiS2wXDzhm0kWWPsi3xjvEaIQ+uzVbVIL4kQI0vO6o/4D7kEo bPguyVxdrENWiHKh9klpb/CGzHD4sb6ln8QUM/ZXFEUnghinzM+cailVxOh2Hi58fhMvs/z7ub2 eox4Z5Yf/dHpMzlOsKMLGXdq7vlSZxVHtX5U7zL/zeE/DKLuz6XjlW X-Google-Smtp-Source: AGHT+IH0yKFYlADFFoNgI+vt5Nvr3682vUUZksEIjYehH1HnbB5yCLv9XtMdyOspZEkknqy2NTGIgA== X-Received: by 2002:a05:600c:c84:b0:46e:3f75:da49 with SMTP id 5b1f17b1804b1-477732a1d2bmr55933905e9.37.1762772649975; Mon, 10 Nov 2025 03:04:09 -0800 (PST) Received: from ?IPV6:2a01:e0a:3d9:2080:f168:a23e:c1b2:ae61? ([2a01:e0a:3d9:2080:f168:a23e:c1b2:ae61]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47763e4f13dsm106249415e9.5.2025.11.10.03.04.09 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 10 Nov 2025 03:04:09 -0800 (PST) Message-ID: <3c98a3f1-ca68-41ed-a8bb-f99a57ac57d7@linaro.org> Date: Mon, 10 Nov 2025 12:04:08 +0100 Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Neil Armstrong Reply-To: Neil Armstrong Subject: Re: [PATCH] PCI: meson: Remove meson_pcie_link_up() timeout, message, speed check To: Bjorn Helgaas , Yue Wang , Kevin Hilman Cc: Jerome Brunet , Martin Blumenstingl , Linnaea Lavia , FUKAUMI Naoki , Krishna Chaitanya Chundru , linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Helgaas , stable@vger.kernel.org References: <20251103221930.1831376-1-helgaas@kernel.org> Content-Language: en-US, fr Autocrypt: addr=neil.armstrong@linaro.org; keydata= xsBNBE1ZBs8BCAD78xVLsXPwV/2qQx2FaO/7mhWL0Qodw8UcQJnkrWmgTFRobtTWxuRx8WWP GTjuhvbleoQ5Cxjr+v+1ARGCH46MxFP5DwauzPekwJUD5QKZlaw/bURTLmS2id5wWi3lqVH4 BVF2WzvGyyeV1o4RTCYDnZ9VLLylJ9bneEaIs/7cjCEbipGGFlfIML3sfqnIvMAxIMZrvcl9 qPV2k+KQ7q+aXavU5W+yLNn7QtXUB530Zlk/d2ETgzQ5FLYYnUDAaRl+8JUTjc0CNOTpCeik 80TZcE6f8M76Xa6yU8VcNko94Ck7iB4vj70q76P/J7kt98hklrr85/3NU3oti3nrIHmHABEB AAHNKk5laWwgQXJtc3Ryb25nIDxuZWlsLmFybXN0cm9uZ0BsaW5hcm8ub3JnPsLAkQQTAQoA OwIbIwULCQgHAwUVCgkICwUWAgMBAAIeAQIXgBYhBInsPQWERiF0UPIoSBaat7Gkz/iuBQJk Q5wSAhkBAAoJEBaat7Gkz/iuyhMIANiD94qDtUTJRfEW6GwXmtKWwl/mvqQtaTtZID2dos04 YqBbshiJbejgVJjy+HODcNUIKBB3PSLaln4ltdsV73SBcwUNdzebfKspAQunCM22Mn6FBIxQ GizsMLcP/0FX4en9NaKGfK6ZdKK6kN1GR9YffMJd2P08EO8mHowmSRe/ExAODhAs9W7XXExw UNCY4pVJyRPpEhv373vvff60bHxc1k/FF9WaPscMt7hlkbFLUs85kHtQAmr8pV5Hy9ezsSRa GzJmiVclkPc2BY592IGBXRDQ38urXeM4nfhhvqA50b/nAEXc6FzqgXqDkEIwR66/Gbp0t3+r yQzpKRyQif3OwE0ETVkGzwEIALyKDN/OGURaHBVzwjgYq+ZtifvekdrSNl8TIDH8g1xicBYp QTbPn6bbSZbdvfeQPNCcD4/EhXZuhQXMcoJsQQQnO4vwVULmPGgtGf8PVc7dxKOeta+qUh6+ SRh3vIcAUFHDT3f/Zdspz+e2E0hPV2hiSvICLk11qO6cyJE13zeNFoeY3ggrKY+IzbFomIZY 4yG6xI99NIPEVE9lNBXBKIlewIyVlkOaYvJWSV+p5gdJXOvScNN1epm5YHmf9aE2ZjnqZGoM Mtsyw18YoX9BqMFInxqYQQ3j/HpVgTSvmo5ea5qQDDUaCsaTf8UeDcwYOtgI8iL4oHcsGtUX oUk33HEAEQEAAcLAXwQYAQIACQUCTVkGzwIbDAAKCRAWmrexpM/4rrXiB/sGbkQ6itMrAIfn M7IbRuiSZS1unlySUVYu3SD6YBYnNi3G5EpbwfBNuT3H8//rVvtOFK4OD8cRYkxXRQmTvqa3 3eDIHu/zr1HMKErm+2SD6PO9umRef8V82o2oaCLvf4WeIssFjwB0b6a12opuRP7yo3E3gTCS KmbUuLv1CtxKQF+fUV1cVaTPMyT25Od+RC1K+iOR0F54oUJvJeq7fUzbn/KdlhA8XPGzwGRy 4zcsPWvwnXgfe5tk680fEKZVwOZKIEuJC3v+/yZpQzDvGYJvbyix0lHnrCzq43WefRHI5XTT QbM0WUIBIcGmq38+OgUsMYu4NzLu7uZFAcmp6h8g Organization: Linaro In-Reply-To: <20251103221930.1831376-1-helgaas@kernel.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 11/3/25 23:19, Bjorn Helgaas wrote: > From: Bjorn Helgaas > > Previously meson_pcie_link_up() only returned true if the link was in the > L0 state. This was incorrect because hardware autonomously manages > transitions between L0, L0s, and L1 while both components on the link stay > in D0. Those states should all be treated as "link is active". > > Returning false when the device was in L0s or L1 broke config accesses > because dw_pcie_other_conf_map_bus() fails if the link is down, which > caused errors like this: > > meson-pcie fc000000.pcie: error: wait linkup timeout > pci 0000:01:00.0: BAR 0: error updating (0xfc700004 != 0xffffffff) > > Remove the LTSSM state check, timeout, speed check, and error message from > meson_pcie_link_up(), the dw_pcie_ops.link_up() method, so it is a simple > boolean check of whether the link is active. Timeouts and and error > messages are handled at a higher level, e.g., dw_pcie_wait_for_link(). > > Fixes: 9c0ef6d34fdb ("PCI: amlogic: Add the Amlogic Meson PCIe controller driver") > Reported-by: Linnaea Lavia > Closes: https://lore.kernel.org/r/DM4PR05MB102707B8CDF84D776C39F22F2C7F0A@DM4PR05MB10270.namprd05.prod.outlook.com > Signed-off-by: Bjorn Helgaas > Tested-by: Linnaea Lavia > Cc: stable@vger.kernel.org > --- > drivers/pci/controller/dwc/pci-meson.c | 36 +++----------------------- > 1 file changed, 3 insertions(+), 33 deletions(-) > > diff --git a/drivers/pci/controller/dwc/pci-meson.c b/drivers/pci/controller/dwc/pci-meson.c > index 787469d1b396..13685d89227a 100644 > --- a/drivers/pci/controller/dwc/pci-meson.c > +++ b/drivers/pci/controller/dwc/pci-meson.c > @@ -338,40 +338,10 @@ static struct pci_ops meson_pci_ops = { > static bool meson_pcie_link_up(struct dw_pcie *pci) > { > struct meson_pcie *mp = to_meson_pcie(pci); > - struct device *dev = pci->dev; > - u32 speed_okay = 0; > - u32 cnt = 0; > - u32 state12, state17, smlh_up, ltssm_up, rdlh_up; > + u32 state12; > > - do { > - state12 = meson_cfg_readl(mp, PCIE_CFG_STATUS12); > - state17 = meson_cfg_readl(mp, PCIE_CFG_STATUS17); > - smlh_up = IS_SMLH_LINK_UP(state12); > - rdlh_up = IS_RDLH_LINK_UP(state12); > - ltssm_up = IS_LTSSM_UP(state12); > - > - if (PM_CURRENT_STATE(state17) < PCIE_GEN3) > - speed_okay = 1; > - > - if (smlh_up) > - dev_dbg(dev, "smlh_link_up is on\n"); > - if (rdlh_up) > - dev_dbg(dev, "rdlh_link_up is on\n"); > - if (ltssm_up) > - dev_dbg(dev, "ltssm_up is on\n"); > - if (speed_okay) > - dev_dbg(dev, "speed_okay\n"); > - > - if (smlh_up && rdlh_up && ltssm_up && speed_okay) > - return true; > - > - cnt++; > - > - udelay(10); > - } while (cnt < WAIT_LINKUP_TIMEOUT); > - > - dev_err(dev, "error: wait linkup timeout\n"); > - return false; > + state12 = meson_cfg_readl(mp, PCIE_CFG_STATUS12); > + return IS_SMLH_LINK_UP(state12) && IS_RDLH_LINK_UP(state12); > } > > static int meson_pcie_host_init(struct dw_pcie_rp *pp) Reviewed-by: Neil Armstrong Tested-by: Neil Armstrong # on BananaPi M2S Thanks ! Neil