mbox series

[v3,0/2] PCI: Reference bridge window resources explicitly

Message ID 20200520183411.1534621-1-kw@linux.com (mailing list archive)
Headers show
Series PCI: Reference bridge window resources explicitly | expand

Message

Krzysztof Wilczyński May 20, 2020, 6:34 p.m. UTC
Add definitions to allow for more explicit mapping of Peer-to-Peer (P2P)
and CardBus bridge window resources.

Added for P2P:

  PCI_BRIDGE_RESOURCES + 0 -> PCI_BRIDGE_IO_WINDOW
  PCI_BRIDGE_RESOURCES + 1 -> PCI_BRIDGE_MEM_WINDOW
  PCI_BRIDGE_RESOURCES + 2 -> PCI_BRIDGE_PREF_MEM_WINDOW

Added for CardBus:

  PCI_BRIDGE_RESOURCES + 0 -> PCI_CB_BRIDGE_IO_0_WINDOW
  PCI_BRIDGE_RESOURCES + 1 -> PCI_CB_BRIDGE_IO_1_WINDOW
  PCI_BRIDGE_RESOURCES + 2 -> PCI_CB_BRIDGE_MEM_0_WINDOW
  PCI_BRIDGE_RESOURCES + 3 -> PCI_CB_BRIDGE_MEM_1_WINDOW

The old way of addressing resources using an index:

  bridge->resource[PCI_BRIDGE_RESOURCES+0]

Would now be replaced with:

  bridge->resource[PCI_BRIDGE_IO_WINDOW]

This series of patches builds on top of the changes proposed before:

  https://lore.kernel.org/r/20100203233931.10803.39854.stgit@bob.kio
  https://lore.kernel.org/r/20100212170022.19522.81135.stgit@bob.kio

Krzysztof Wilczynski (2):
  PCI: Move from using PCI_BRIDGE_RESOURCES to bridge resource
    definitions
  pcmcia: Use resources definitions when freeing CardBus resources

---
Changes in v2:
  Split patches based on the feedback from Bjorn allowing for the
  patch that correct the PCI quirk for the ALI chipset to be applied
  independently, if someone needs to cherry-pick it, before updating
  the said quirk to use definitions for bridge window resources.

Changes in v3:
  Remove the PCI quirk patch for ALI M7101 chipset as it's not needed.
  Remove surplus new variables added in pci_bus_size_cardbus().

 drivers/pci/quirks.c          |  37 +++++------
 drivers/pci/setup-bus.c       | 114 ++++++++++++++++++----------------
 drivers/pcmcia/yenta_socket.c |  46 +++++++++-----
 include/linux/pci.h           |  14 ++++-
 4 files changed, 122 insertions(+), 89 deletions(-)

Comments

Bjorn Helgaas May 20, 2020, 8:30 p.m. UTC | #1
On Wed, May 20, 2020 at 06:34:09PM +0000, Krzysztof Wilczynski wrote:
> Add definitions to allow for more explicit mapping of Peer-to-Peer (P2P)
> and CardBus bridge window resources.
> 
> Added for P2P:
> 
>   PCI_BRIDGE_RESOURCES + 0 -> PCI_BRIDGE_IO_WINDOW
>   PCI_BRIDGE_RESOURCES + 1 -> PCI_BRIDGE_MEM_WINDOW
>   PCI_BRIDGE_RESOURCES + 2 -> PCI_BRIDGE_PREF_MEM_WINDOW
> 
> Added for CardBus:
> 
>   PCI_BRIDGE_RESOURCES + 0 -> PCI_CB_BRIDGE_IO_0_WINDOW
>   PCI_BRIDGE_RESOURCES + 1 -> PCI_CB_BRIDGE_IO_1_WINDOW
>   PCI_BRIDGE_RESOURCES + 2 -> PCI_CB_BRIDGE_MEM_0_WINDOW
>   PCI_BRIDGE_RESOURCES + 3 -> PCI_CB_BRIDGE_MEM_1_WINDOW
> 
> The old way of addressing resources using an index:
> 
>   bridge->resource[PCI_BRIDGE_RESOURCES+0]
> 
> Would now be replaced with:
> 
>   bridge->resource[PCI_BRIDGE_IO_WINDOW]
> 
> This series of patches builds on top of the changes proposed before:
> 
>   https://lore.kernel.org/r/20100203233931.10803.39854.stgit@bob.kio
>   https://lore.kernel.org/r/20100212170022.19522.81135.stgit@bob.kio
> 
> Krzysztof Wilczynski (2):
>   PCI: Move from using PCI_BRIDGE_RESOURCES to bridge resource
>     definitions
>   pcmcia: Use resources definitions when freeing CardBus resources
> 
> ---
> Changes in v2:
>   Split patches based on the feedback from Bjorn allowing for the
>   patch that correct the PCI quirk for the ALI chipset to be applied
>   independently, if someone needs to cherry-pick it, before updating
>   the said quirk to use definitions for bridge window resources.
> 
> Changes in v3:
>   Remove the PCI quirk patch for ALI M7101 chipset as it's not needed.
>   Remove surplus new variables added in pci_bus_size_cardbus().
> 
>  drivers/pci/quirks.c          |  37 +++++------
>  drivers/pci/setup-bus.c       | 114 ++++++++++++++++++----------------
>  drivers/pcmcia/yenta_socket.c |  46 +++++++++-----
>  include/linux/pci.h           |  14 ++++-
>  4 files changed, 122 insertions(+), 89 deletions(-)

Applied to pci/enumeration for v5.8, thanks!
Krzysztof Wilczyński May 21, 2020, 8:16 a.m. UTC | #2
On 20-05-20 15:30:22, Bjorn Helgaas wrote:

Hello Bjorn!

[...]
> 
> Applied to pci/enumeration for v5.8, thanks!

Thank you for help!

Sadly, I need to send v4 after getting a message from the kbuild bot, as
there was a variable I missed when authoring diff for v3.  Sorry about
that!

Krzysztof
Dominik Brodowski May 21, 2020, 8:24 a.m. UTC | #3
On Thu, May 21, 2020 at 10:16:38AM +0200, Krzysztof Wilczynski wrote:
> On 20-05-20 15:30:22, Bjorn Helgaas wrote:
> 
> Hello Bjorn!
> 
> [...]
> > 
> > Applied to pci/enumeration for v5.8, thanks!
> 
> Thank you for help!
> 
> Sadly, I need to send v4 after getting a message from the kbuild bot, as
> there was a variable I missed when authoring diff for v3.  Sorry about
> that!

FWIW, feel free to add my

	Acked-by: Dominik Brodowski <linux@dominikbrodowski.net>

for the pcmcia part.

Thanks,
	Dominik