From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (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 CC1492F9980 for ; Mon, 3 Nov 2025 09:49:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762163350; cv=none; b=Vv02IqkEPU+VC9acxVQRPE0QawZGRW/26lJ4jRTA2wA/huSgq+RcM3bb4j/vJ9ys/hzkwhBcYUivqKhSOsCEr8iUuhhRbFjOEsvxSRcAVk1t9F0VDWa+nmGRbE1BSsYO0aV1tZ1Gw2gwn5qh74d3p2QWWJWEQ1dVmHjGAjFUPvM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762163350; c=relaxed/simple; bh=euNZNniqY5spJKkr8zuiCVFsRb7Eip5e9xluBi2RfY0=; h=Message-ID:Date:MIME-Version:From:Subject:To:Cc:References: In-Reply-To:Content-Type; b=Vq+BpBZ+ny7+DavoY0SotxN9kljVB1j1kqmv7Wd3SkRHdVcxLUYM91cd5lAs2kT5uYccJpXk3I814h5UL1DLmxJxkyD2CSXWFtG6tVSifZSd8w08qfJ44WKp5JiAv8EQQUeMXzuHfyr4W2FvqJJjKGq6dvUJ2/HkpHGnnMGiC0I= 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=nYPajexp; arc=none smtp.client-ip=209.85.128.42 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="nYPajexp" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-47721743fd0so22024325e9.2 for ; Mon, 03 Nov 2025 01:49:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1762163345; x=1762768145; 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=cyfgOfO5wbQrka4RaJRIQ58bY784PFhznl4lHer181M=; b=nYPajexpfrbBlNWoNzPIXYMX67JecI5MZ6WVbh9YQKg3SdUV0dTmK4lDFnMT0jS64d Ab/7Bs8UgYTHqVisKXcAiz1OIpUmlWMVXTsLVMaTtsJPSD8p2l1Hfl2d3qXXhzduMs8k Te9Oxt6EgMmNEHbIpblYx38COuwF6S0aEGcvHsGGEbzdfRMuEcrVee0+io/arl1FZlEe m+2QYa4P7CA0hhQzgFxzTaLlNtsGyYUMIMDgK8BkfFbDfltUZhETDCovjCNhYkJ+e1h6 zZ/n3cRJojpAlFwLGQWJJsKUWUICea4MOo67kgG8DNAmn0bZZqBUSi7R8WwMx8QyyP50 5vEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762163345; x=1762768145; 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-message-state:from:to:cc:subject :date:message-id:reply-to; bh=cyfgOfO5wbQrka4RaJRIQ58bY784PFhznl4lHer181M=; b=QX/aeRiuxwJBJS072452o1wTC8hTPTbQZidKZJeoHBODKyYoXF8Ypa0MYLHI4tes7J lyyU7TuU/SxceRK649BEW9rnQgMY23cNkexs3TbXSvmxcQ1+rayCsp4bAGsUpokuwXGr isMkAMLFCijq3N0YmqvheDbGJRqniabD0HcTo5UFFO1uNMLk/pci7VnhtF3fCRk5ya1q kS7xhZP+JQg47nYjbUXdGNIoduP8r8T9DzqVKm0KdMjWfg5ivLpEUz5wggTvQLG0Wx6E VhBoWpHgKyI4isrz3ACPI7CiiWbGpeMST84uE4aumejUS8UZom/GEcRPJw2wMMzNrHWP Gmzg== X-Forwarded-Encrypted: i=1; AJvYcCXqJej+drFlGgKOHXPTO9Zu9htQHQHtEMOid7jg2yCFg4n4mVhogl+tPsCYGpAKcJT/rg4bukNGRLwv3KM=@vger.kernel.org X-Gm-Message-State: AOJu0Yzd7bLDXHu1Z0kvvdgqI+zkdhStdhxLK9wjv99sr2SNINoa0sKU dW/ZkH/Lqs9YRevIaX+m2/wez3fyLpyFpnKHF9ZMlKZTMjtuJ9ml/oWnGLELfuUXVHY= X-Gm-Gg: ASbGncvfxHHyMMVXCm98ze0JlnUSImFLemfiZ/N8i2pa7jfkbtvOyQ6Y58EdUK0gHA3 yx0Eu6qVMSFa3UeLxik5g/o/JdnDSNlw8To/B5UIFzTkhob3sedFKts8x6BIYzz2cAtYndl9CL2 fmj//OhLThMuBKilgKw9kyxPUzWyz6RcsJH6ep1NOdHwTpz8tFwdTtoWJ+G+g/lM6dkp8ZWHyp0 VbANh/vO8RqN2YQM1onbeRGYsdOgVU/pu/4cl1UkRBUQmOWGs3M2MPAFIbO2qHHCXw/vyZx8sBT cgveMtVxEyyjr/tFtxAlsRQTvJAV5xsQ3UVpRUsjcQf0txlJNaaOrJnvQIqhEVdBeEzGGWHx1mV mn/IMqrbPVEj4p4d+A1ZayGgWI4hdvXxo1VqNIQ5g7dvv2PWiPlfVCTsNW5hrEIzGpbNI4jd8/j 8ysX53SV3mWmDSsaaI9Uk7pnqlJaU551biEusq5ZEU8w6g X-Google-Smtp-Source: AGHT+IH9c7oxZUwI4MZc+UcQYfSkmXSjNxCEXJEJzZAI5xj3Z/FVbn/Z55mp6ddo/Yu2LHLMUnh/Mg== X-Received: by 2002:a05:600c:b8d:b0:471:803:6a26 with SMTP id 5b1f17b1804b1-477308c8bc7mr112449905e9.37.1762163344829; Mon, 03 Nov 2025 01:49:04 -0800 (PST) Received: from [192.168.27.65] (home.rastines.starnux.net. [82.64.67.166]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4773c4ac18bsm144251275e9.5.2025.11.03.01.49.02 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 03 Nov 2025 01:49:03 -0800 (PST) Message-ID: <807e9f74-79ed-44bc-8a80-3d99787edc65@linaro.org> Date: Mon, 3 Nov 2025 10:49:04 +0100 Precedence: bulk X-Mailing-List: linux-kernel@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 RESEND 3/3] PCI: meson: Fix parsing the DBI register region To: Manivannan Sadhasivam , Bjorn Helgaas , Lorenzo Pieralisi , =?UTF-8?Q?Krzysztof_Wilczy=C5=84ski?= , Manivannan Sadhasivam , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Hanjie Lin , Yue Wang , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Andrew Murray , Jingoo Han , Krishna Chaitanya Chundru Cc: linux-pci@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, stable@vger.kernel.org, Linnaea Lavia References: <20251101-pci-meson-fix-v1-0-c50dcc56ed6a@oss.qualcomm.com> <20251101-pci-meson-fix-v1-3-c50dcc56ed6a@oss.qualcomm.com> 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: <20251101-pci-meson-fix-v1-3-c50dcc56ed6a@oss.qualcomm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 11/1/25 05:29, Manivannan Sadhasivam wrote: > First of all, the driver was parsing the 'dbi' register region as 'elbi'. > This was due to DT mistakenly passing 'dbi' as 'elbi'. Since the DT is > now fixed to supply 'dbi' region, this driver can rely on the DWC core > driver to parse and map it. > > However, to support the old DTs, if the 'elbi' region is found in DT, parse > and map the region as both 'dw_pcie::elbi_base' as 'dw_pcie::dbi_base'. > This will allow the driver to work with both broken and fixed DTs. > > Also, skip parsing the 'elbi' region in DWC core if 'pci->elbi_base' was > already populated. > > Cc: # 6.2 > Reported-by: Linnaea Lavia > Closes: https://lore.kernel.org/linux-pci/DM4PR05MB102707B8CDF84D776C39F22F2C7F0A@DM4PR05MB10270.namprd05.prod.outlook.com/ > Fixes: 9c0ef6d34fdb ("PCI: amlogic: Add the Amlogic Meson PCIe controller driver") > Fixes: c96992a24bec ("PCI: dwc: Add support for ELBI resource mapping") > Signed-off-by: Manivannan Sadhasivam > --- > drivers/pci/controller/dwc/pci-meson.c | 18 +++++++++++++++--- > drivers/pci/controller/dwc/pcie-designware.c | 12 +++++++----- > 2 files changed, 22 insertions(+), 8 deletions(-) > > diff --git a/drivers/pci/controller/dwc/pci-meson.c b/drivers/pci/controller/dwc/pci-meson.c > index 787469d1b396d4c7b3e28edfe276b7b997fb8aee..54b6a4196f1767a3c14c6c901bfee3505588134c 100644 > --- a/drivers/pci/controller/dwc/pci-meson.c > +++ b/drivers/pci/controller/dwc/pci-meson.c > @@ -108,10 +108,22 @@ static int meson_pcie_get_mems(struct platform_device *pdev, > struct meson_pcie *mp) > { > struct dw_pcie *pci = &mp->pci; > + struct resource *res; > > - pci->dbi_base = devm_platform_ioremap_resource_byname(pdev, "elbi"); > - if (IS_ERR(pci->dbi_base)) > - return PTR_ERR(pci->dbi_base); > + /* > + * For the broken DTs that supply 'dbi' as 'elbi', parse the 'elbi' > + * region and assign it to both 'pci->elbi_base' and 'pci->dbi_space' so > + * that the DWC core can skip parsing both regions. > + */ > + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "elbi"); > + if (res) { > + pci->elbi_base = devm_pci_remap_cfg_resource(pci->dev, res); > + if (IS_ERR(pci->elbi_base)) > + return PTR_ERR(pci->elbi_base); > + > + pci->dbi_base = pci->elbi_base; > + pci->dbi_phys_addr = res->start; > + } > > mp->cfg_base = devm_platform_ioremap_resource_byname(pdev, "cfg"); > if (IS_ERR(mp->cfg_base)) > diff --git a/drivers/pci/controller/dwc/pcie-designware.c b/drivers/pci/controller/dwc/pcie-designware.c > index c644216995f69cbf065e61a0392bf1e5e32cf56e..06eca858eb1b3c7a8a833df6616febcdbe854850 100644 > --- a/drivers/pci/controller/dwc/pcie-designware.c > +++ b/drivers/pci/controller/dwc/pcie-designware.c > @@ -168,11 +168,13 @@ int dw_pcie_get_resources(struct dw_pcie *pci) > } > > /* ELBI is an optional resource */ > - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "elbi"); > - if (res) { > - pci->elbi_base = devm_ioremap_resource(pci->dev, res); > - if (IS_ERR(pci->elbi_base)) > - return PTR_ERR(pci->elbi_base); > + if (!pci->elbi_base) { > + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "elbi"); > + if (res) { > + pci->elbi_base = devm_ioremap_resource(pci->dev, res); > + if (IS_ERR(pci->elbi_base)) > + return PTR_ERR(pci->elbi_base); > + } > } > > /* LLDD is supposed to manually switch the clocks and resets state */ > Reviewed-by: Neil Armstrong