From: Bjorn Helgaas <bhelgaas@google.com>
Date: Mon, 13 Apr 2026 17:50:46 +0000 (-0500)
Subject: Merge branch 'pci/controller/dwc-rcar-gen4-ep'
X-Git-Tag: v7.1-rc1~151^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e6df556f194a7b9a71b638a70138c1337990e69;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'pci/controller/dwc-rcar-gen4-ep'

- Mark BAR0 and BAR2 as Resizable (Koichiro Den)

- Reduce EPC BAR alignment requirement to 4K (Koichiro Den)

* pci/controller/dwc-rcar-gen4-ep:
  PCI: dwc: rcar-gen4: Change EPC BAR alignment to 4K as per the documentation
  PCI: dwc: rcar-gen4: Mark BAR0 and BAR2 as Resizable BARs in endpoint mode

# Conflicts:
#	drivers/pci/controller/dwc/pcie-rcar-gen4.c
---

1e6df556f194a7b9a71b638a70138c1337990e69
diff --cc drivers/pci/controller/dwc/pcie-rcar-gen4.c
index 1198ddc1752c8,396ef94322998..8b03c42f8c84c
--- a/drivers/pci/controller/dwc/pcie-rcar-gen4.c
+++ b/drivers/pci/controller/dwc/pcie-rcar-gen4.c
@@@ -413,11 -422,13 +413,13 @@@ static int rcar_gen4_pcie_ep_raise_irq(
  static const struct pci_epc_features rcar_gen4_pcie_epc_features = {
  	DWC_EPC_COMMON_FEATURES,
  	.msi_capable = true,
+ 	.bar[BAR_0] = { .type = BAR_RESIZABLE, },
 -	.bar[BAR_1] = { .type = BAR_RESERVED, },
 +	.bar[BAR_1] = { .type = BAR_DISABLED, },
+ 	.bar[BAR_2] = { .type = BAR_RESIZABLE, },
 -	.bar[BAR_3] = { .type = BAR_RESERVED, },
 +	.bar[BAR_3] = { .type = BAR_DISABLED, },
  	.bar[BAR_4] = { .type = BAR_FIXED, .fixed_size = 256 },
 -	.bar[BAR_5] = { .type = BAR_RESERVED, },
 +	.bar[BAR_5] = { .type = BAR_DISABLED, },
- 	.align = SZ_1M,
+ 	.align = SZ_4K,
  };
  
  static const struct pci_epc_features*