diff options
| author |  Niklas Cassel <cassel@kernel.org>
| 2024-03-20 12:31:54 +0100 |
|---|---|---|
| committer |  Krzysztof Wilczyński <kwilczynski@kernel.org>
| 2024-04-10 17:32:31 +0000 |
| commit | de66b37a174f979cb1c7e9ba15e87f181cb5ad32 (patch) | |
| tree | 35d5feb6365f08dd468f0ac28ada96e45654d721 /drivers/pci | |
| parent | Linux 6.9-rc1 (diff) | |
| download | linux-de66b37a174f979cb1c7e9ba15e87f181cb5ad32.tar.gz linux-de66b37a174f979cb1c7e9ba15e87f181cb5ad32.tar.bz2 linux-de66b37a174f979cb1c7e9ba15e87f181cb5ad32.zip | |
PCI: rockchip-ep: Set a 64-bit BAR if requested
Ever since commit f25b5fae29d4 ("PCI: endpoint: Setting a BAR size > 4 GB
is invalid if 64-bit flag is not set") it has been impossible to get the
.set_bar() callback with a BAR size > 2 GB (yes, 2GB!), if the BAR was
also not requested to be configured as a 64-bit BAR.
It is however possible that an EPF driver configures a BAR as 64-bit,
even if the requested size is < 4 GB.
Respect the requested BAR configuration, just like how it is already
respected with regards to the prefetchable bit.
Link: https://lore.kernel.org/linux-pci/20240320113157.322695-8-cassel@kernel.org
Signed-off-by: Niklas Cassel <cassel@kernel.org>
Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/controller/pcie-rockchip-ep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/controller/pcie-rockchip-ep.c b/drivers/pci/controller/pcie-rockchip-ep.c index c9046e97a1d2..57472cf48997 100644 --- a/drivers/pci/controller/pcie-rockchip-ep.c +++ b/drivers/pci/controller/pcie-rockchip-ep.c @@ -153,7 +153,7 @@ static int rockchip_pcie_ep_set_bar(struct pci_epc *epc, u8 fn, u8 vfn, ctrl = ROCKCHIP_PCIE_CORE_BAR_CFG_CTRL_IO_32BITS; } else { bool is_prefetch = !!(flags & PCI_BASE_ADDRESS_MEM_PREFETCH); - bool is_64bits = sz > SZ_2G; + bool is_64bits = !!(flags & PCI_BASE_ADDRESS_MEM_TYPE_64); if (is_64bits && (bar & 1)) return -EINVAL; |