PCI: Reference bridge window resources explicitly
PATCH 1/1 PCI: Reference bridge window resources explicitly
Add definitions to allow for more explicit mapping of P2P and CardBus bridge window resources.
Added for P2P:
PCI_BRIDGE_IO_WINDOW
PCI_BRIDGE_MEM_WINDOW
PCI_BRIDGE_PREF_MEM_WINDOW
Added for CardBus:
PCI_CB_BRIDGE_IO_0_WINDOW
PCI_CB_BRIDGE_IO_1_WINDOW
PCI_CB_BRIDGE_MEM_0_WINDOW
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]
Also, correct the PCI quirk for the ALI M7101 chipset. The second quirk used to claimed an I/O resource from the a memory window which is not correct.
This patch builds a top of the changes proposed before:
https://lore.kernel.org/r/[email protected]
https://lore.kernel.org/r/[email protected]/
--- drivers/pci/quirks.c | 34 +++++----- drivers/pci/setup-bus.c | 116 ++++++++++++++++++---------------- drivers/pcmcia/yenta_socket.c | 22 ++++--- include/linux/pci.h | 14 +++- 4 files changed, 105 insertions(+), 81 deletions(-)
drivers/pci/quirks.c +17 -17
@@ -653,8 +653,8 @@ DECLARE_PCI_FIXUP_CLASS_HEADER(PCI_VENDOR_ID_SYNOPSYS, PCI_ANY_ID,*/ static void quirk_ali7101_acpi (struct pci_dev *dev) { -quirk_io_region (dev,0xE0 ,64 ,PCI_BRIDGE_RESOURCES ,"ali7101 ACPI" ); -quirk_io_region (dev,0xE2 ,32 ,PCI_BRIDGE_RESOURCES +1 ,"ali7101 SMB" ); +quirk_io_region (dev,0xE0 ,64 ,PCI_BRIDGE_IO_WINDOW ,"ali7101 ACPI" ); +quirk_io_region (dev,0xE2 ,32 ,PCI_BRIDGE_IO_WINDOW ,"ali7101 SMB" ); }DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_AL ,PCI_DEVICE_ID_AL_M7101 , quirk_ali7101_acpi);
@@ -720,8 +720,8 @@ static void quirk_piix4_acpi(struct pci_dev *dev) {u32 res_a; -quirk_io_region (dev,0x40 ,64 ,PCI_BRIDGE_RESOURCES ,"PIIX4 ACPI" ); -quirk_io_region (dev,0x90 ,16 ,PCI_BRIDGE_RESOURCES +1 ,"PIIX4 SMB" ); +quirk_io_region (dev,0x40 ,64 ,PCI_BRIDGE_IO_WINDOW ,"PIIX4 ACPI" ); +quirk_io_region (dev,0x90 ,16 ,PCI_BRIDGE_MEM_WINDOW ,"PIIX4 SMB" );/* Device resource A has enables for some of the other ones */ pci_read_config_dword (dev,0x5c , &res_a);
@@ -776,12 +776,12 @@ static void quirk_ich4_lpc_acpi(struct pci_dev *dev)*/ pci_read_config_byte (dev,ICH_ACPI_CNTL , &enable);if (enable &ICH4_ACPI_EN ) -quirk_io_region (dev,ICH_PMBASE ,128 ,PCI_BRIDGE_RESOURCES , -"ICH4 ACPI/GPIO/TCO" ); +quirk_io_region (dev,ICH_PMBASE ,128 ,PCI_BRIDGE_IO_WINDOW , +"ICH4 ACPI/GPIO/TCO" );pci_read_config_byte (dev,ICH4_GPIO_CNTL , &enable);if (enable &ICH4_GPIO_EN ) -quirk_io_region (dev,ICH4_GPIOBASE ,64 ,PCI_BRIDGE_RESOURCES +1 , +quirk_io_region (dev,ICH4_GPIOBASE ,64 ,PCI_BRIDGE_MEM_WINDOW ,"ICH4 GPIO" ); }DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_82801AA_0 , quirk_ich4_lpc_acpi);
@@ -801,12 +801,12 @@ static void ich6_lpc_acpi_gpio(struct pci_dev *dev)pci_read_config_byte (dev,ICH_ACPI_CNTL , &enable);if (enable &ICH6_ACPI_EN ) -quirk_io_region (dev,ICH_PMBASE ,128 ,PCI_BRIDGE_RESOURCES , -"ICH6 ACPI/GPIO/TCO" ); +quirk_io_region (dev,ICH_PMBASE ,128 ,PCI_BRIDGE_IO_WINDOW , +"ICH6 ACPI/GPIO/TCO" );pci_read_config_byte (dev,ICH6_GPIO_CNTL , &enable);if (enable &ICH6_GPIO_EN ) -quirk_io_region (dev,ICH6_GPIOBASE ,64 ,PCI_BRIDGE_RESOURCES +1 , +quirk_io_region (dev,ICH6_GPIOBASE ,64 ,PCI_BRIDGE_MEM_WINDOW ,"ICH6 GPIO" ); }
@@ -911,7 +911,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_1, quistatic void quirk_vt82c586_acpi (struct pci_dev *dev) {if (dev->revision &0x10 ) -quirk_io_region (dev,0x48 ,256 ,PCI_BRIDGE_RESOURCES , +quirk_io_region (dev,0x48 ,256 ,PCI_BRIDGE_IO_WINDOW ,"vt82c586 ACPI" ); }DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_VIA ,PCI_DEVICE_ID_VIA_82C586_3 , quirk_vt82c586_acpi);
@@ -926,10 +926,10 @@ static void quirk_vt82c686_acpi(struct pci_dev *dev) {quirk_vt82c586_acpi (dev); -quirk_io_region (dev,0x70 ,128 ,PCI_BRIDGE_RESOURCES +1 , -"vt82c686 HW-mon" ); - -quirk_io_region (dev,0x90 ,16 ,PCI_BRIDGE_RESOURCES +2 ,"vt82c686 SMB" ); +quirk_io_region (dev,0x70 ,128 ,PCI_BRIDGE_MEM_WINDOW , +"vt82c686 HW-mon" ); +quirk_io_region (dev,0x90 ,16 ,PCI_BRIDGE_PREF_MEM_WINDOW , +"vt82c686 SMB" ); }DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_VIA ,PCI_DEVICE_ID_VIA_82C686_4 , quirk_vt82c686_acpi);
@@ -940,8 +940,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_4, quirk_vt*/ static void quirk_vt8235_acpi (struct pci_dev *dev) { -quirk_io_region (dev,0x88 ,128 ,PCI_BRIDGE_RESOURCES ,"vt8235 PM" ); -quirk_io_region (dev,0xd0 ,16 ,PCI_BRIDGE_RESOURCES +1 ,"vt8235 SMB" ); +quirk_io_region (dev,0x88 ,128 ,PCI_BRIDGE_IO_WINDOW ,"vt8235 PM" ); +quirk_io_region (dev,0xd0 ,16 ,PCI_BRIDGE_MEM_WINDOW ,"vt8235 SMB" ); }DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_VIA ,PCI_DEVICE_ID_VIA_8235 , quirk_vt8235_acpi);
drivers/pci/setup-bus.c +62 -54
232 lines not on this page · raw message
drivers/pcmcia/yenta_socket.c +13 -9
@@ -694,7 +694,7 @@ static int yenta_allocate_res(struct yenta_socket *socket, int nr, unsigned typestruct pci_bus_region region;unsigned mask; - res = dev->resource +PCI_BRIDGE_RESOURCES + nr; + res = &dev->resource[nr];/* Already allocated? */ if (res->parent)return 0 ;
@@ -711,7 +711,7 @@ static int yenta_allocate_res(struct yenta_socket *socket, int nr, unsigned type region.end =config_readl (socket, addr_end) | ~mask;if (region.start && region.end > region.start && !override_bios) {pcibios_bus_to_resource (dev->bus, res, ®ion); -if (pci_claim_resource (dev,PCI_BRIDGE_RESOURCES + nr) ==0 ) +if (pci_claim_resource (dev, nr) ==0 )return 0 ; dev_info(&dev->dev, "Preassigned resource %d busy or not available, reconfiguring...\n",
@@ -751,14 +751,18 @@ static int yenta_allocate_res(struct yenta_socket *socket, int nr, unsigned typestatic void yenta_allocate_resources (struct yenta_socket *socket) {int program =0 ; - program +=yenta_allocate_res (socket,0 ,IORESOURCE_IO , -PCI_CB_IO_BASE_0 ,PCI_CB_IO_LIMIT_0 ); - program +=yenta_allocate_res (socket,1 ,IORESOURCE_IO , -PCI_CB_IO_BASE_1 ,PCI_CB_IO_LIMIT_1 ); - program +=yenta_allocate_res (socket,2 ,IORESOURCE_MEM |IORESOURCE_PREFETCH , + program +=yenta_allocate_res (socket,PCI_CB_BRIDGE_IO_0_WINDOW , +IORESOURCE_IO ,PCI_CB_IO_BASE_0 , +PCI_CB_IO_LIMIT_0 ); + program +=yenta_allocate_res (socket,PCI_CB_BRIDGE_IO_1_WINDOW , +IORESOURCE_IO ,PCI_CB_IO_BASE_1 , +PCI_CB_IO_LIMIT_1 ); + program +=yenta_allocate_res (socket,PCI_CB_BRIDGE_MEM_0_WINDOW , +IORESOURCE_MEM |IORESOURCE_PREFETCH ,PCI_CB_MEMORY_BASE_0 ,PCI_CB_MEMORY_LIMIT_0 ); - program +=yenta_allocate_res (socket,3 ,IORESOURCE_MEM , -PCI_CB_MEMORY_BASE_1 ,PCI_CB_MEMORY_LIMIT_1 ); + program +=yenta_allocate_res (socket,PCI_CB_BRIDGE_MEM_1_WINDOW , +IORESOURCE_MEM ,PCI_CB_MEMORY_BASE_1 , +PCI_CB_MEMORY_LIMIT_1 );if (program)pci_setup_cardbus (socket->dev->subordinate); }
include/linux/pci.h +13 -1
@@ -100,9 +100,21 @@ enum { PCI_IOV_RESOURCE_END = PCI_IOV_RESOURCES + PCI_SRIOV_NUM_BARS - 1,#endif -/* Resources assigned to buses behind the bridge */ +/* PCI-to-PCI (P2P) bridge windows */ +#define PCI_BRIDGE_IO_WINDOW (PCI_BRIDGE_RESOURCES + 0) +#define PCI_BRIDGE_MEM_WINDOW (PCI_BRIDGE_RESOURCES + 1) +#define PCI_BRIDGE_PREF_MEM_WINDOW (PCI_BRIDGE_RESOURCES + 2) + +/* CardBus bridge windows */ +#define PCI_CB_BRIDGE_IO_0_WINDOW (PCI_BRIDGE_RESOURCES + 0) +#define PCI_CB_BRIDGE_IO_1_WINDOW (PCI_BRIDGE_RESOURCES + 1) +#define PCI_CB_BRIDGE_MEM_0_WINDOW (PCI_BRIDGE_RESOURCES + 2) +#define PCI_CB_BRIDGE_MEM_1_WINDOW (PCI_BRIDGE_RESOURCES + 3) + +/* Total number of bridge resources for P2P and CardBus */ #define PCI_BRIDGE_RESOURCE_NUM 4 +/* Resources assigned to buses behind the bridge */ PCI_BRIDGE_RESOURCES ,PCI_BRIDGE_RESOURCE_END =PCI_BRIDGE_RESOURCES + PCI_BRIDGE_RESOURCE_NUM - 1,
Signature · 1 line
2.26.2
v2 cover PCI: Reference bridge window resources explicitly
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/[email protected]
https://lore.kernel.org/r/[email protected]
Also, correct the PCI quirk for the ALI M7101 chipset so that it would stop claiming an I/O resource from the memory window which was not correct.
Krzysztof Wilczynski (3):
PCI: Correct the PCI quirk for the ALI M7101 chipset
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.
drivers/pci/quirks.c | 34 +++++----- drivers/pci/setup-bus.c | 116 ++++++++++++++++++---------------- drivers/pcmcia/yenta_socket.c | 46 +++++++++----- include/linux/pci.h | 14 +++- 4 files changed, 121 insertions(+), 89 deletions(-)
Signature · 1 line
2.26.2
PATCH v2 1/3 PCI: Correct the PCI quirk for the ALI M7101 chipset
As per the specifications from the vendor:
- "M1543 Preliminary Data Sheet", "M1543: Desktop South Bridge",
Acer Laboratories Inc., January 1998, Version 1.25, p. 78
- "M1543C Preliminary Datasheet", "M1543C Desktop Southbridge",
Acer Laboratories Inc., September 1998, Version 1.10, p. 126
Both the ACPI I/O and SMB I/O registers should be mapped into I/O space, but the second quirk used to claimed an I/O resource from the memory window which is not correct.
--- drivers/pci/quirks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/quirks.c +1 -1
@@ -654,7 +654,7 @@ DECLARE_PCI_FIXUP_CLASS_HEADER(PCI_VENDOR_ID_SYNOPSYS, PCI_ANY_ID,static void quirk_ali7101_acpi (struct pci_dev *dev) {quirk_io_region (dev,0xE0 ,64 ,PCI_BRIDGE_RESOURCES ,"ali7101 ACPI" ); -quirk_io_region (dev,0xE2 ,32 ,PCI_BRIDGE_RESOURCES +1 ,"ali7101 SMB" ); +quirk_io_region (dev,0xE2 ,32 ,PCI_BRIDGE_RESOURCES ,"ali7101 SMB" ); }DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_AL ,PCI_DEVICE_ID_AL_M7101 , quirk_ali7101_acpi);
Signature · 1 line
2.26.2
Re: [PATCH v2 1/3] PCI: Correct the PCI quirk for the ALI M7101 chipset
Quoted 22 lines · Krzysztof Wilczynski
As per the specifications from the vendor:
- "M1543 Preliminary Data Sheet", "M1543: Desktop South Bridge",
Acer Laboratories Inc., January 1998, Version 1.25, p. 78- "M1543C Preliminary Datasheet", "M1543C Desktop Southbridge",
Acer Laboratories Inc., September 1998, Version 1.10, p. 126Both the ACPI I/O and SMB I/O registers should be mapped into I/O space, but the second quirk used to claimed an I/O resource from the memory window which is not correct.
Signed-off-by Krzysztof Wilczynski <[email protected]>--- drivers/pci/quirks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/pci/quirks.c +0
-0
drivers/pci/quirks.c DECLARE_PCI_FIXUP_CLASS_HEADER(PCI_VENDOR_ID_SYNOPSYS, PCI_ANY_ID, · line 657
Quoted 5 lines
drivers/pci/quirks.c +1
-1@@ -654,7 +654,7 @@ DECLARE_PCI_FIXUP_CLASS_HEADER(PCI_VENDOR_ID_SYNOPSYS, PCI_ANY_ID,static void quirk_ali7101_acpi (struct pci_dev *dev) {quirk_io_region (dev,0xE0 ,64 ,PCI_BRIDGE_RESOURCES ,"ali7101 ACPI" ); -quirk_io_region (dev,0xE2 ,32 ,PCI_BRIDGE_RESOURCES +1 ,"ali7101 SMB" ); +quirk_io_region (dev,0xE2 ,32 ,PCI_BRIDGE_RESOURCES ,"ali7101 SMB" );
Wow, this is way too subtle. I proposed this fix, but I was wrong.
I thought PCI_BRIDGE_RESOURCES was identifying a bridge window that the region should be claimed from: dev->resource[PCI_BRIDGE_RESOURCES] would be the I/O port window of a bridge.
But that's not what's happening at all. quirk_io_region() is using that index to fill in a dev->resource[] entry with an IORESOURCE_IO resource, and then it calls pci_claim_resource(), which looks for an upstream bridge window that contains the resource (in pci_find_parent_resource()).
So the use of PCI_BRIDGE_RESOURCES here is just a convenient way to find an empty slot in dev->resource[]. We know it's empty because the ali7101 device is not a bridge, so it has no windows.
And PCI_BRIDGE_RESOURCES+1 *looks* like a reference to a bridge's memory window, but it's not; it's just a way to find another empty dev->resource[] slot.
Sigh. This is ugly and misleading. But in the absence of good ideas, I guess we should just leave it alone.
Quoted 6 lines
drivers/pci/quirks.c +0
-0}DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_AL ,PCI_DEVICE_ID_AL_M7101 , quirk_ali7101_acpi);Signature · 1 line
2.26.2
v3 cover PCI: Reference bridge window resources explicitly
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/[email protected]
https://lore.kernel.org/r/[email protected]
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(-)
Signature · 1 line
2.26.2
PATCH v3 1/2 PCI: Move from using PCI_BRIDGE_RESOURCES to bridge resource definitions
Move to use bridge resource definitions instead of using the PCI_BRIDGE_RESOURCES constant with an integer offeset.
--- drivers/pci/quirks.c | 34 +++++----- drivers/pci/setup-bus.c | 114 ++++++++++++++++++---------------- drivers/pcmcia/yenta_socket.c | 22 ++++--- include/linux/pci.h | 14 ++++- 4 files changed, 104 insertions(+), 80 deletions(-)
drivers/pci/quirks.c +17 -17
@@ -653,8 +653,8 @@ DECLARE_PCI_FIXUP_CLASS_HEADER(PCI_VENDOR_ID_SYNOPSYS, PCI_ANY_ID,*/ static void quirk_ali7101_acpi (struct pci_dev *dev) { -quirk_io_region (dev,0xE0 ,64 ,PCI_BRIDGE_RESOURCES ,"ali7101 ACPI" ); -quirk_io_region (dev,0xE2 ,32 ,PCI_BRIDGE_RESOURCES +1 ,"ali7101 SMB" ); +quirk_io_region (dev,0xE0 ,64 ,PCI_BRIDGE_IO_WINDOW ,"ali7101 ACPI" ); +quirk_io_region (dev,0xE2 ,32 ,PCI_BRIDGE_MEM_WINDOW ,"ali7101 SMB" ); }DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_AL ,PCI_DEVICE_ID_AL_M7101 , quirk_ali7101_acpi);
@@ -720,8 +720,8 @@ static void quirk_piix4_acpi(struct pci_dev *dev) {u32 res_a; -quirk_io_region (dev,0x40 ,64 ,PCI_BRIDGE_RESOURCES ,"PIIX4 ACPI" ); -quirk_io_region (dev,0x90 ,16 ,PCI_BRIDGE_RESOURCES +1 ,"PIIX4 SMB" ); +quirk_io_region (dev,0x40 ,64 ,PCI_BRIDGE_IO_WINDOW ,"PIIX4 ACPI" ); +quirk_io_region (dev,0x90 ,16 ,PCI_BRIDGE_MEM_WINDOW ,"PIIX4 SMB" );/* Device resource A has enables for some of the other ones */ pci_read_config_dword (dev,0x5c , &res_a);
@@ -776,12 +776,12 @@ static void quirk_ich4_lpc_acpi(struct pci_dev *dev)*/ pci_read_config_byte (dev,ICH_ACPI_CNTL , &enable);if (enable &ICH4_ACPI_EN ) -quirk_io_region (dev,ICH_PMBASE ,128 ,PCI_BRIDGE_RESOURCES , -"ICH4 ACPI/GPIO/TCO" ); +quirk_io_region (dev,ICH_PMBASE ,128 ,PCI_BRIDGE_IO_WINDOW , +"ICH4 ACPI/GPIO/TCO" );pci_read_config_byte (dev,ICH4_GPIO_CNTL , &enable);if (enable &ICH4_GPIO_EN ) -quirk_io_region (dev,ICH4_GPIOBASE ,64 ,PCI_BRIDGE_RESOURCES +1 , +quirk_io_region (dev,ICH4_GPIOBASE ,64 ,PCI_BRIDGE_MEM_WINDOW ,"ICH4 GPIO" ); }DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_82801AA_0 , quirk_ich4_lpc_acpi);
@@ -801,12 +801,12 @@ static void ich6_lpc_acpi_gpio(struct pci_dev *dev)pci_read_config_byte (dev,ICH_ACPI_CNTL , &enable);if (enable &ICH6_ACPI_EN ) -quirk_io_region (dev,ICH_PMBASE ,128 ,PCI_BRIDGE_RESOURCES , -"ICH6 ACPI/GPIO/TCO" ); +quirk_io_region (dev,ICH_PMBASE ,128 ,PCI_BRIDGE_IO_WINDOW , +"ICH6 ACPI/GPIO/TCO" );pci_read_config_byte (dev,ICH6_GPIO_CNTL , &enable);if (enable &ICH6_GPIO_EN ) -quirk_io_region (dev,ICH6_GPIOBASE ,64 ,PCI_BRIDGE_RESOURCES +1 , +quirk_io_region (dev,ICH6_GPIOBASE ,64 ,PCI_BRIDGE_MEM_WINDOW ,"ICH6 GPIO" ); }
@@ -911,7 +911,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_1, quistatic void quirk_vt82c586_acpi (struct pci_dev *dev) {if (dev->revision &0x10 ) -quirk_io_region (dev,0x48 ,256 ,PCI_BRIDGE_RESOURCES , +quirk_io_region (dev,0x48 ,256 ,PCI_BRIDGE_IO_WINDOW ,"vt82c586 ACPI" ); }DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_VIA ,PCI_DEVICE_ID_VIA_82C586_3 , quirk_vt82c586_acpi);
@@ -926,10 +926,10 @@ static void quirk_vt82c686_acpi(struct pci_dev *dev) {quirk_vt82c586_acpi (dev); -quirk_io_region (dev,0x70 ,128 ,PCI_BRIDGE_RESOURCES +1 , -"vt82c686 HW-mon" ); - -quirk_io_region (dev,0x90 ,16 ,PCI_BRIDGE_RESOURCES +2 ,"vt82c686 SMB" ); +quirk_io_region (dev,0x70 ,128 ,PCI_BRIDGE_MEM_WINDOW , +"vt82c686 HW-mon" ); +quirk_io_region (dev,0x90 ,16 ,PCI_BRIDGE_PREF_MEM_WINDOW , +"vt82c686 SMB" ); }DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_VIA ,PCI_DEVICE_ID_VIA_82C686_4 , quirk_vt82c686_acpi);
@@ -940,8 +940,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_4, quirk_vt*/ static void quirk_vt8235_acpi (struct pci_dev *dev) { -quirk_io_region (dev,0x88 ,128 ,PCI_BRIDGE_RESOURCES ,"vt8235 PM" ); -quirk_io_region (dev,0xd0 ,16 ,PCI_BRIDGE_RESOURCES +1 ,"vt8235 SMB" ); +quirk_io_region (dev,0x88 ,128 ,PCI_BRIDGE_IO_WINDOW ,"vt8235 PM" ); +quirk_io_region (dev,0xd0 ,16 ,PCI_BRIDGE_MEM_WINDOW ,"vt8235 SMB" ); }DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_VIA ,PCI_DEVICE_ID_VIA_8235 , quirk_vt8235_acpi);
drivers/pci/setup-bus.c +61 -53
231 lines not on this page · raw message
drivers/pcmcia/yenta_socket.c +13 -9
@@ -694,7 +694,7 @@ static int yenta_allocate_res(struct yenta_socket *socket, int nr, unsigned typestruct pci_bus_region region;unsigned mask; - res = dev->resource +PCI_BRIDGE_RESOURCES + nr; + res = &dev->resource[nr];/* Already allocated? */ if (res->parent)return 0 ;
@@ -711,7 +711,7 @@ static int yenta_allocate_res(struct yenta_socket *socket, int nr, unsigned type region.end =config_readl (socket, addr_end) | ~mask;if (region.start && region.end > region.start && !override_bios) {pcibios_bus_to_resource (dev->bus, res, ®ion); -if (pci_claim_resource (dev,PCI_BRIDGE_RESOURCES + nr) ==0 ) +if (pci_claim_resource (dev, nr) ==0 )return 0 ; dev_info(&dev->dev, "Preassigned resource %d busy or not available, reconfiguring...\n",
@@ -751,14 +751,18 @@ static int yenta_allocate_res(struct yenta_socket *socket, int nr, unsigned typestatic void yenta_allocate_resources (struct yenta_socket *socket) {int program =0 ; - program +=yenta_allocate_res (socket,0 ,IORESOURCE_IO , -PCI_CB_IO_BASE_0 ,PCI_CB_IO_LIMIT_0 ); - program +=yenta_allocate_res (socket,1 ,IORESOURCE_IO , -PCI_CB_IO_BASE_1 ,PCI_CB_IO_LIMIT_1 ); - program +=yenta_allocate_res (socket,2 ,IORESOURCE_MEM |IORESOURCE_PREFETCH , + program +=yenta_allocate_res (socket,PCI_CB_BRIDGE_IO_0_WINDOW , +IORESOURCE_IO ,PCI_CB_IO_BASE_0 , +PCI_CB_IO_LIMIT_0 ); + program +=yenta_allocate_res (socket,PCI_CB_BRIDGE_IO_1_WINDOW , +IORESOURCE_IO ,PCI_CB_IO_BASE_1 , +PCI_CB_IO_LIMIT_1 ); + program +=yenta_allocate_res (socket,PCI_CB_BRIDGE_MEM_0_WINDOW , +IORESOURCE_MEM |IORESOURCE_PREFETCH ,PCI_CB_MEMORY_BASE_0 ,PCI_CB_MEMORY_LIMIT_0 ); - program +=yenta_allocate_res (socket,3 ,IORESOURCE_MEM , -PCI_CB_MEMORY_BASE_1 ,PCI_CB_MEMORY_LIMIT_1 ); + program +=yenta_allocate_res (socket,PCI_CB_BRIDGE_MEM_1_WINDOW , +IORESOURCE_MEM ,PCI_CB_MEMORY_BASE_1 , +PCI_CB_MEMORY_LIMIT_1 );if (program)pci_setup_cardbus (socket->dev->subordinate); }
include/linux/pci.h +13 -1
@@ -100,9 +100,21 @@ enum { PCI_IOV_RESOURCE_END = PCI_IOV_RESOURCES + PCI_SRIOV_NUM_BARS - 1,#endif -/* Resources assigned to buses behind the bridge */ +/* PCI-to-PCI (P2P) bridge windows */ +#define PCI_BRIDGE_IO_WINDOW (PCI_BRIDGE_RESOURCES + 0) +#define PCI_BRIDGE_MEM_WINDOW (PCI_BRIDGE_RESOURCES + 1) +#define PCI_BRIDGE_PREF_MEM_WINDOW (PCI_BRIDGE_RESOURCES + 2) + +/* CardBus bridge windows */ +#define PCI_CB_BRIDGE_IO_0_WINDOW (PCI_BRIDGE_RESOURCES + 0) +#define PCI_CB_BRIDGE_IO_1_WINDOW (PCI_BRIDGE_RESOURCES + 1) +#define PCI_CB_BRIDGE_MEM_0_WINDOW (PCI_BRIDGE_RESOURCES + 2) +#define PCI_CB_BRIDGE_MEM_1_WINDOW (PCI_BRIDGE_RESOURCES + 3) + +/* Total number of bridge resources for P2P and CardBus */ #define PCI_BRIDGE_RESOURCE_NUM 4 +/* Resources assigned to buses behind the bridge */ PCI_BRIDGE_RESOURCES ,PCI_BRIDGE_RESOURCE_END =PCI_BRIDGE_RESOURCES + PCI_BRIDGE_RESOURCE_NUM - 1,
Signature · 1 line
2.26.2
PATCH v3 2/2 pcmcia: Use resources definitions when freeing CardBus resources
In reply to Krzysztof WilczynskiRemove the loop used to free CardBus resources and replace it with a yenta_free_res() helper used to release bridge resources explicitly.
--- drivers/pcmcia/yenta_socket.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-)
drivers/pcmcia/yenta_socket.c +16 -8
@@ -745,6 +745,18 @@ static int yenta_allocate_res(struct yenta_socket *socket, int nr, unsigned typereturn 0 ; } +static void yenta_free_res (struct yenta_socket *socket,int nr) +{ +struct pci_dev *dev = socket->dev; +struct resource *res; + + res = &dev->resource[nr]; +if (res->start !=0 && res->end !=0 ) +release_resource (res); + + res->start = res->end = res->flags =0 ; +} +/* * Allocate the bridge mappings for the device.. */
@@ -773,14 +785,10 @@ static void yenta_allocate_resources(struct yenta_socket *socket)*/ static void yenta_free_resources (struct yenta_socket *socket) { -int i; -for (i =0 ; i <4 ; i++) { -struct resource *res; - res = socket->dev->resource +PCI_BRIDGE_RESOURCES + i; -if (res->start !=0 && res->end !=0 ) -release_resource (res); - res->start = res->end = res->flags =0 ; - } +yenta_free_res (socket,PCI_CB_BRIDGE_IO_0_WINDOW ); +yenta_free_res (socket,PCI_CB_BRIDGE_IO_1_WINDOW ); +yenta_free_res (socket,PCI_CB_BRIDGE_MEM_0_WINDOW ); +yenta_free_res (socket,PCI_CB_BRIDGE_MEM_1_WINDOW ); }
Signature · 1 line
2.26.2
Bjorn Helgaas
AppliedQuoted 45 lines · Krzysztof Wilczynski
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_WINDOWPCI_BRIDGE_RESOURCES+ 1 ->PCI_BRIDGE_MEM_WINDOWPCI_BRIDGE_RESOURCES+ 2 ->PCI_BRIDGE_PREF_MEM_WINDOWAdded for CardBus:
PCI_BRIDGE_RESOURCES+ 0 ->PCI_CB_BRIDGE_IO_0_WINDOWPCI_BRIDGE_RESOURCES+ 1 ->PCI_CB_BRIDGE_IO_1_WINDOWPCI_BRIDGE_RESOURCES+ 2 ->PCI_CB_BRIDGE_MEM_0_WINDOWPCI_BRIDGE_RESOURCES+ 3 ->PCI_CB_BRIDGE_MEM_1_WINDOWThe 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/[email protected]
https://lore.kernel.org/r/[email protected]Krzysztof Wilczynski (2):
PCI: Move from usingPCI_BRIDGE_RESOURCESto 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 inpci_bus_size_cardbus().
Quoted 5 lines
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!
On 20-05-20 15:30:22, Bjorn Helgaas wrote:
Hello Bjorn!
[...]
Quoted 2 lines
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
Quoted 6 lines · Krzysztof Wilczynski
On 20-05-20 15:30:22, Bjorn Helgaas wrote:
Hello Bjorn!
[...]
Quoted 1 line
Quoted 7 lines
Quoted 1 line
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
for the pcmcia part.
Thanks,
Dominik
v4 cover PCI: Reference bridge window resources explicitly
In reply to Krzysztof WilczynskiAdd definitions to allow for more explicit mapping of PCI-to-PCI (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/[email protected]
https://lore.kernel.org/r/[email protected]
Krzysztof Wilczynski (2):
PCI: Move from using PCI_BRIDGE_RESOURCES to bridge resource
definitions
pcmcia: Use resources definitions when freeing CardBus resources
---
Changes in v4:
Correct variable name as per the kbuild bot feedback. Added "Acked-by" from Dominik Brodowski for the PCMCIA changes. Update cover letter wording.
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().
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.
Krzysztof Wilczynski (2):
PCI: Move from using PCI_BRIDGE_RESOURCES to bridge resource
definitions
pcmcia: Use resources definitions when freeing CardBus resources
drivers/pci/quirks.c | 34 +++++----- drivers/pci/setup-bus.c | 114 ++++++++++++++++++---------------- drivers/pcmcia/yenta_socket.c | 46 +++++++++----- include/linux/pci.h | 14 ++++- 4 files changed, 120 insertions(+), 88 deletions(-)
Signature · 1 line
2.26.2
PATCH v4 1/2 PCI: Move from using PCI_BRIDGE_RESOURCES to bridge resource definitions
Move to use bridge resource definitions instead of using the PCI_BRIDGE_RESOURCES constant with an integer offeset.
--- drivers/pci/quirks.c | 34 +++++----- drivers/pci/setup-bus.c | 114 ++++++++++++++++++---------------- drivers/pcmcia/yenta_socket.c | 22 ++++--- include/linux/pci.h | 14 ++++- 4 files changed, 104 insertions(+), 80 deletions(-)
drivers/pci/quirks.c +17 -17
@@ -653,8 +653,8 @@ DECLARE_PCI_FIXUP_CLASS_HEADER(PCI_VENDOR_ID_SYNOPSYS, PCI_ANY_ID,*/ static void quirk_ali7101_acpi (struct pci_dev *dev) { -quirk_io_region (dev,0xE0 ,64 ,PCI_BRIDGE_RESOURCES ,"ali7101 ACPI" ); -quirk_io_region (dev,0xE2 ,32 ,PCI_BRIDGE_RESOURCES +1 ,"ali7101 SMB" ); +quirk_io_region (dev,0xE0 ,64 ,PCI_BRIDGE_IO_WINDOW ,"ali7101 ACPI" ); +quirk_io_region (dev,0xE2 ,32 ,PCI_BRIDGE_MEM_WINDOW ,"ali7101 SMB" ); }DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_AL ,PCI_DEVICE_ID_AL_M7101 , quirk_ali7101_acpi);
@@ -720,8 +720,8 @@ static void quirk_piix4_acpi(struct pci_dev *dev) {u32 res_a; -quirk_io_region (dev,0x40 ,64 ,PCI_BRIDGE_RESOURCES ,"PIIX4 ACPI" ); -quirk_io_region (dev,0x90 ,16 ,PCI_BRIDGE_RESOURCES +1 ,"PIIX4 SMB" ); +quirk_io_region (dev,0x40 ,64 ,PCI_BRIDGE_IO_WINDOW ,"PIIX4 ACPI" ); +quirk_io_region (dev,0x90 ,16 ,PCI_BRIDGE_MEM_WINDOW ,"PIIX4 SMB" );/* Device resource A has enables for some of the other ones */ pci_read_config_dword (dev,0x5c , &res_a);
@@ -776,12 +776,12 @@ static void quirk_ich4_lpc_acpi(struct pci_dev *dev)*/ pci_read_config_byte (dev,ICH_ACPI_CNTL , &enable);if (enable &ICH4_ACPI_EN ) -quirk_io_region (dev,ICH_PMBASE ,128 ,PCI_BRIDGE_RESOURCES , -"ICH4 ACPI/GPIO/TCO" ); +quirk_io_region (dev,ICH_PMBASE ,128 ,PCI_BRIDGE_IO_WINDOW , +"ICH4 ACPI/GPIO/TCO" );pci_read_config_byte (dev,ICH4_GPIO_CNTL , &enable);if (enable &ICH4_GPIO_EN ) -quirk_io_region (dev,ICH4_GPIOBASE ,64 ,PCI_BRIDGE_RESOURCES +1 , +quirk_io_region (dev,ICH4_GPIOBASE ,64 ,PCI_BRIDGE_MEM_WINDOW ,"ICH4 GPIO" ); }DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_82801AA_0 , quirk_ich4_lpc_acpi);
@@ -801,12 +801,12 @@ static void ich6_lpc_acpi_gpio(struct pci_dev *dev)pci_read_config_byte (dev,ICH_ACPI_CNTL , &enable);if (enable &ICH6_ACPI_EN ) -quirk_io_region (dev,ICH_PMBASE ,128 ,PCI_BRIDGE_RESOURCES , -"ICH6 ACPI/GPIO/TCO" ); +quirk_io_region (dev,ICH_PMBASE ,128 ,PCI_BRIDGE_IO_WINDOW , +"ICH6 ACPI/GPIO/TCO" );pci_read_config_byte (dev,ICH6_GPIO_CNTL , &enable);if (enable &ICH6_GPIO_EN ) -quirk_io_region (dev,ICH6_GPIOBASE ,64 ,PCI_BRIDGE_RESOURCES +1 , +quirk_io_region (dev,ICH6_GPIOBASE ,64 ,PCI_BRIDGE_MEM_WINDOW ,"ICH6 GPIO" ); }
@@ -911,7 +911,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_1, quistatic void quirk_vt82c586_acpi (struct pci_dev *dev) {if (dev->revision &0x10 ) -quirk_io_region (dev,0x48 ,256 ,PCI_BRIDGE_RESOURCES , +quirk_io_region (dev,0x48 ,256 ,PCI_BRIDGE_IO_WINDOW ,"vt82c586 ACPI" ); }DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_VIA ,PCI_DEVICE_ID_VIA_82C586_3 , quirk_vt82c586_acpi);
@@ -926,10 +926,10 @@ static void quirk_vt82c686_acpi(struct pci_dev *dev) {quirk_vt82c586_acpi (dev); -quirk_io_region (dev,0x70 ,128 ,PCI_BRIDGE_RESOURCES +1 , -"vt82c686 HW-mon" ); - -quirk_io_region (dev,0x90 ,16 ,PCI_BRIDGE_RESOURCES +2 ,"vt82c686 SMB" ); +quirk_io_region (dev,0x70 ,128 ,PCI_BRIDGE_MEM_WINDOW , +"vt82c686 HW-mon" ); +quirk_io_region (dev,0x90 ,16 ,PCI_BRIDGE_PREF_MEM_WINDOW , +"vt82c686 SMB" ); }DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_VIA ,PCI_DEVICE_ID_VIA_82C686_4 , quirk_vt82c686_acpi);
@@ -940,8 +940,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_4, quirk_vt*/ static void quirk_vt8235_acpi (struct pci_dev *dev) { -quirk_io_region (dev,0x88 ,128 ,PCI_BRIDGE_RESOURCES ,"vt8235 PM" ); -quirk_io_region (dev,0xd0 ,16 ,PCI_BRIDGE_RESOURCES +1 ,"vt8235 SMB" ); +quirk_io_region (dev,0x88 ,128 ,PCI_BRIDGE_IO_WINDOW ,"vt8235 PM" ); +quirk_io_region (dev,0xd0 ,16 ,PCI_BRIDGE_MEM_WINDOW ,"vt8235 SMB" ); }DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_VIA ,PCI_DEVICE_ID_VIA_8235 , quirk_vt8235_acpi);
drivers/pci/setup-bus.c +61 -53
231 lines not on this page · raw message
drivers/pcmcia/yenta_socket.c +13 -9
@@ -694,7 +694,7 @@ static int yenta_allocate_res(struct yenta_socket *socket, int nr, unsigned typestruct pci_bus_region region;unsigned mask; - res = dev->resource +PCI_BRIDGE_RESOURCES + nr; + res = &dev->resource[nr];/* Already allocated? */ if (res->parent)return 0 ;
@@ -711,7 +711,7 @@ static int yenta_allocate_res(struct yenta_socket *socket, int nr, unsigned type region.end =config_readl (socket, addr_end) | ~mask;if (region.start && region.end > region.start && !override_bios) {pcibios_bus_to_resource (dev->bus, res, ®ion); -if (pci_claim_resource (dev,PCI_BRIDGE_RESOURCES + nr) ==0 ) +if (pci_claim_resource (dev, nr) ==0 )return 0 ; dev_info(&dev->dev, "Preassigned resource %d busy or not available, reconfiguring...\n",
@@ -751,14 +751,18 @@ static int yenta_allocate_res(struct yenta_socket *socket, int nr, unsigned typestatic void yenta_allocate_resources (struct yenta_socket *socket) {int program =0 ; - program +=yenta_allocate_res (socket,0 ,IORESOURCE_IO , -PCI_CB_IO_BASE_0 ,PCI_CB_IO_LIMIT_0 ); - program +=yenta_allocate_res (socket,1 ,IORESOURCE_IO , -PCI_CB_IO_BASE_1 ,PCI_CB_IO_LIMIT_1 ); - program +=yenta_allocate_res (socket,2 ,IORESOURCE_MEM |IORESOURCE_PREFETCH , + program +=yenta_allocate_res (socket,PCI_CB_BRIDGE_IO_0_WINDOW , +IORESOURCE_IO ,PCI_CB_IO_BASE_0 , +PCI_CB_IO_LIMIT_0 ); + program +=yenta_allocate_res (socket,PCI_CB_BRIDGE_IO_1_WINDOW , +IORESOURCE_IO ,PCI_CB_IO_BASE_1 , +PCI_CB_IO_LIMIT_1 ); + program +=yenta_allocate_res (socket,PCI_CB_BRIDGE_MEM_0_WINDOW , +IORESOURCE_MEM |IORESOURCE_PREFETCH ,PCI_CB_MEMORY_BASE_0 ,PCI_CB_MEMORY_LIMIT_0 ); - program +=yenta_allocate_res (socket,3 ,IORESOURCE_MEM , -PCI_CB_MEMORY_BASE_1 ,PCI_CB_MEMORY_LIMIT_1 ); + program +=yenta_allocate_res (socket,PCI_CB_BRIDGE_MEM_1_WINDOW , +IORESOURCE_MEM ,PCI_CB_MEMORY_BASE_1 , +PCI_CB_MEMORY_LIMIT_1 );if (program)pci_setup_cardbus (socket->dev->subordinate); }
include/linux/pci.h +13 -1
@@ -100,9 +100,21 @@ enum { PCI_IOV_RESOURCE_END = PCI_IOV_RESOURCES + PCI_SRIOV_NUM_BARS - 1,#endif -/* Resources assigned to buses behind the bridge */ +/* PCI-to-PCI (P2P) bridge windows */ +#define PCI_BRIDGE_IO_WINDOW (PCI_BRIDGE_RESOURCES + 0) +#define PCI_BRIDGE_MEM_WINDOW (PCI_BRIDGE_RESOURCES + 1) +#define PCI_BRIDGE_PREF_MEM_WINDOW (PCI_BRIDGE_RESOURCES + 2) + +/* CardBus bridge windows */ +#define PCI_CB_BRIDGE_IO_0_WINDOW (PCI_BRIDGE_RESOURCES + 0) +#define PCI_CB_BRIDGE_IO_1_WINDOW (PCI_BRIDGE_RESOURCES + 1) +#define PCI_CB_BRIDGE_MEM_0_WINDOW (PCI_BRIDGE_RESOURCES + 2) +#define PCI_CB_BRIDGE_MEM_1_WINDOW (PCI_BRIDGE_RESOURCES + 3) + +/* Total number of bridge resources for P2P and CardBus */ #define PCI_BRIDGE_RESOURCE_NUM 4 +/* Resources assigned to buses behind the bridge */ PCI_BRIDGE_RESOURCES ,PCI_BRIDGE_RESOURCE_END =PCI_BRIDGE_RESOURCES + PCI_BRIDGE_RESOURCE_NUM - 1,
Signature · 1 line
2.26.2
PATCH v4 2/2 pcmcia: Use resources definitions when freeing CardBus resources
In reply to Krzysztof WilczynskiRemove the loop used to free CardBus resources and replace it with a yenta_free_res() helper used to release bridge resources explicitly.
--- drivers/pcmcia/yenta_socket.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-)
drivers/pcmcia/yenta_socket.c +16 -8
@@ -745,6 +745,18 @@ static int yenta_allocate_res(struct yenta_socket *socket, int nr, unsigned typereturn 0 ; } +static void yenta_free_res (struct yenta_socket *socket,int nr) +{ +struct pci_dev *dev = socket->dev; +struct resource *res; + + res = &dev->resource[nr]; +if (res->start !=0 && res->end !=0 ) +release_resource (res); + + res->start = res->end = res->flags =0 ; +} +/* * Allocate the bridge mappings for the device.. */
@@ -773,14 +785,10 @@ static void yenta_allocate_resources(struct yenta_socket *socket)*/ static void yenta_free_resources (struct yenta_socket *socket) { -int i; -for (i =0 ; i <4 ; i++) { -struct resource *res; - res = socket->dev->resource +PCI_BRIDGE_RESOURCES + i; -if (res->start !=0 && res->end !=0 ) -release_resource (res); - res->start = res->end = res->flags =0 ; - } +yenta_free_res (socket,PCI_CB_BRIDGE_IO_0_WINDOW ); +yenta_free_res (socket,PCI_CB_BRIDGE_IO_1_WINDOW ); +yenta_free_res (socket,PCI_CB_BRIDGE_MEM_0_WINDOW ); +yenta_free_res (socket,PCI_CB_BRIDGE_MEM_1_WINDOW ); }
Signature · 1 line
2.26.2
PATCH v2 2/3 PCI: Move from using PCI_BRIDGE_RESOURCES to bridge resource definitions
In reply to Krzysztof WilczynskiMove to use bridge resource definitions instead of using the PCI_BRIDGE_RESOURCES constant with an integer offeset.
--- drivers/pci/quirks.c | 34 +++++----- drivers/pci/setup-bus.c | 116 ++++++++++++++++++---------------- drivers/pcmcia/yenta_socket.c | 22 ++++--- include/linux/pci.h | 14 +++- 4 files changed, 105 insertions(+), 81 deletions(-)
drivers/pci/quirks.c +17 -17
@@ -653,8 +653,8 @@ DECLARE_PCI_FIXUP_CLASS_HEADER(PCI_VENDOR_ID_SYNOPSYS, PCI_ANY_ID,*/ static void quirk_ali7101_acpi (struct pci_dev *dev) { -quirk_io_region (dev,0xE0 ,64 ,PCI_BRIDGE_RESOURCES ,"ali7101 ACPI" ); -quirk_io_region (dev,0xE2 ,32 ,PCI_BRIDGE_RESOURCES ,"ali7101 SMB" ); +quirk_io_region (dev,0xE0 ,64 ,PCI_BRIDGE_IO_WINDOW ,"ali7101 ACPI" ); +quirk_io_region (dev,0xE2 ,32 ,PCI_BRIDGE_IO_WINDOW ,"ali7101 SMB" ); }DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_AL ,PCI_DEVICE_ID_AL_M7101 , quirk_ali7101_acpi);
@@ -720,8 +720,8 @@ static void quirk_piix4_acpi(struct pci_dev *dev) {u32 res_a; -quirk_io_region (dev,0x40 ,64 ,PCI_BRIDGE_RESOURCES ,"PIIX4 ACPI" ); -quirk_io_region (dev,0x90 ,16 ,PCI_BRIDGE_RESOURCES +1 ,"PIIX4 SMB" ); +quirk_io_region (dev,0x40 ,64 ,PCI_BRIDGE_IO_WINDOW ,"PIIX4 ACPI" ); +quirk_io_region (dev,0x90 ,16 ,PCI_BRIDGE_MEM_WINDOW ,"PIIX4 SMB" );/* Device resource A has enables for some of the other ones */ pci_read_config_dword (dev,0x5c , &res_a);
@@ -776,12 +776,12 @@ static void quirk_ich4_lpc_acpi(struct pci_dev *dev)*/ pci_read_config_byte (dev,ICH_ACPI_CNTL , &enable);if (enable &ICH4_ACPI_EN ) -quirk_io_region (dev,ICH_PMBASE ,128 ,PCI_BRIDGE_RESOURCES , -"ICH4 ACPI/GPIO/TCO" ); +quirk_io_region (dev,ICH_PMBASE ,128 ,PCI_BRIDGE_IO_WINDOW , +"ICH4 ACPI/GPIO/TCO" );pci_read_config_byte (dev,ICH4_GPIO_CNTL , &enable);if (enable &ICH4_GPIO_EN ) -quirk_io_region (dev,ICH4_GPIOBASE ,64 ,PCI_BRIDGE_RESOURCES +1 , +quirk_io_region (dev,ICH4_GPIOBASE ,64 ,PCI_BRIDGE_MEM_WINDOW ,"ICH4 GPIO" ); }DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_82801AA_0 , quirk_ich4_lpc_acpi);
@@ -801,12 +801,12 @@ static void ich6_lpc_acpi_gpio(struct pci_dev *dev)pci_read_config_byte (dev,ICH_ACPI_CNTL , &enable);if (enable &ICH6_ACPI_EN ) -quirk_io_region (dev,ICH_PMBASE ,128 ,PCI_BRIDGE_RESOURCES , -"ICH6 ACPI/GPIO/TCO" ); +quirk_io_region (dev,ICH_PMBASE ,128 ,PCI_BRIDGE_IO_WINDOW , +"ICH6 ACPI/GPIO/TCO" );pci_read_config_byte (dev,ICH6_GPIO_CNTL , &enable);if (enable &ICH6_GPIO_EN ) -quirk_io_region (dev,ICH6_GPIOBASE ,64 ,PCI_BRIDGE_RESOURCES +1 , +quirk_io_region (dev,ICH6_GPIOBASE ,64 ,PCI_BRIDGE_MEM_WINDOW ,"ICH6 GPIO" ); }
@@ -911,7 +911,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_1, quistatic void quirk_vt82c586_acpi (struct pci_dev *dev) {if (dev->revision &0x10 ) -quirk_io_region (dev,0x48 ,256 ,PCI_BRIDGE_RESOURCES , +quirk_io_region (dev,0x48 ,256 ,PCI_BRIDGE_IO_WINDOW ,"vt82c586 ACPI" ); }DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_VIA ,PCI_DEVICE_ID_VIA_82C586_3 , quirk_vt82c586_acpi);
@@ -926,10 +926,10 @@ static void quirk_vt82c686_acpi(struct pci_dev *dev) {quirk_vt82c586_acpi (dev); -quirk_io_region (dev,0x70 ,128 ,PCI_BRIDGE_RESOURCES +1 , -"vt82c686 HW-mon" ); - -quirk_io_region (dev,0x90 ,16 ,PCI_BRIDGE_RESOURCES +2 ,"vt82c686 SMB" ); +quirk_io_region (dev,0x70 ,128 ,PCI_BRIDGE_MEM_WINDOW , +"vt82c686 HW-mon" ); +quirk_io_region (dev,0x90 ,16 ,PCI_BRIDGE_PREF_MEM_WINDOW , +"vt82c686 SMB" ); }DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_VIA ,PCI_DEVICE_ID_VIA_82C686_4 , quirk_vt82c686_acpi);
@@ -940,8 +940,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_4, quirk_vt*/ static void quirk_vt8235_acpi (struct pci_dev *dev) { -quirk_io_region (dev,0x88 ,128 ,PCI_BRIDGE_RESOURCES ,"vt8235 PM" ); -quirk_io_region (dev,0xd0 ,16 ,PCI_BRIDGE_RESOURCES +1 ,"vt8235 SMB" ); +quirk_io_region (dev,0x88 ,128 ,PCI_BRIDGE_IO_WINDOW ,"vt8235 PM" ); +quirk_io_region (dev,0xd0 ,16 ,PCI_BRIDGE_MEM_WINDOW ,"vt8235 SMB" ); }DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_VIA ,PCI_DEVICE_ID_VIA_8235 , quirk_vt8235_acpi);
drivers/pci/setup-bus.c +62 -54
232 lines not on this page · raw message
drivers/pcmcia/yenta_socket.c +13 -9
@@ -694,7 +694,7 @@ static int yenta_allocate_res(struct yenta_socket *socket, int nr, unsigned typestruct pci_bus_region region;unsigned mask; - res = dev->resource +PCI_BRIDGE_RESOURCES + nr; + res = &dev->resource[nr];/* Already allocated? */ if (res->parent)return 0 ;
@@ -711,7 +711,7 @@ static int yenta_allocate_res(struct yenta_socket *socket, int nr, unsigned type region.end =config_readl (socket, addr_end) | ~mask;if (region.start && region.end > region.start && !override_bios) {pcibios_bus_to_resource (dev->bus, res, ®ion); -if (pci_claim_resource (dev,PCI_BRIDGE_RESOURCES + nr) ==0 ) +if (pci_claim_resource (dev, nr) ==0 )return 0 ; dev_info(&dev->dev, "Preassigned resource %d busy or not available, reconfiguring...\n",
@@ -751,14 +751,18 @@ static int yenta_allocate_res(struct yenta_socket *socket, int nr, unsigned typestatic void yenta_allocate_resources (struct yenta_socket *socket) {int program =0 ; - program +=yenta_allocate_res (socket,0 ,IORESOURCE_IO , -PCI_CB_IO_BASE_0 ,PCI_CB_IO_LIMIT_0 ); - program +=yenta_allocate_res (socket,1 ,IORESOURCE_IO , -PCI_CB_IO_BASE_1 ,PCI_CB_IO_LIMIT_1 ); - program +=yenta_allocate_res (socket,2 ,IORESOURCE_MEM |IORESOURCE_PREFETCH , + program +=yenta_allocate_res (socket,PCI_CB_BRIDGE_IO_0_WINDOW , +IORESOURCE_IO ,PCI_CB_IO_BASE_0 , +PCI_CB_IO_LIMIT_0 ); + program +=yenta_allocate_res (socket,PCI_CB_BRIDGE_IO_1_WINDOW , +IORESOURCE_IO ,PCI_CB_IO_BASE_1 , +PCI_CB_IO_LIMIT_1 ); + program +=yenta_allocate_res (socket,PCI_CB_BRIDGE_MEM_0_WINDOW , +IORESOURCE_MEM |IORESOURCE_PREFETCH ,PCI_CB_MEMORY_BASE_0 ,PCI_CB_MEMORY_LIMIT_0 ); - program +=yenta_allocate_res (socket,3 ,IORESOURCE_MEM , -PCI_CB_MEMORY_BASE_1 ,PCI_CB_MEMORY_LIMIT_1 ); + program +=yenta_allocate_res (socket,PCI_CB_BRIDGE_MEM_1_WINDOW , +IORESOURCE_MEM ,PCI_CB_MEMORY_BASE_1 , +PCI_CB_MEMORY_LIMIT_1 );if (program)pci_setup_cardbus (socket->dev->subordinate); }
include/linux/pci.h +13 -1
@@ -100,9 +100,21 @@ enum { PCI_IOV_RESOURCE_END = PCI_IOV_RESOURCES + PCI_SRIOV_NUM_BARS - 1,#endif -/* Resources assigned to buses behind the bridge */ +/* PCI-to-PCI (P2P) bridge windows */ +#define PCI_BRIDGE_IO_WINDOW (PCI_BRIDGE_RESOURCES + 0) +#define PCI_BRIDGE_MEM_WINDOW (PCI_BRIDGE_RESOURCES + 1) +#define PCI_BRIDGE_PREF_MEM_WINDOW (PCI_BRIDGE_RESOURCES + 2) + +/* CardBus bridge windows */ +#define PCI_CB_BRIDGE_IO_0_WINDOW (PCI_BRIDGE_RESOURCES + 0) +#define PCI_CB_BRIDGE_IO_1_WINDOW (PCI_BRIDGE_RESOURCES + 1) +#define PCI_CB_BRIDGE_MEM_0_WINDOW (PCI_BRIDGE_RESOURCES + 2) +#define PCI_CB_BRIDGE_MEM_1_WINDOW (PCI_BRIDGE_RESOURCES + 3) + +/* Total number of bridge resources for P2P and CardBus */ #define PCI_BRIDGE_RESOURCE_NUM 4 +/* Resources assigned to buses behind the bridge */ PCI_BRIDGE_RESOURCES ,PCI_BRIDGE_RESOURCE_END =PCI_BRIDGE_RESOURCES + PCI_BRIDGE_RESOURCE_NUM - 1,
Signature · 1 line
2.26.2
PATCH v2 3/3 pcmcia: Use resources definitions when freeing CardBus resources
In reply to Krzysztof WilczynskiRemove the loop used to free CardBus resources and replace it with a yenta_free_res() helper used to release bridge resources explicitly.
--- drivers/pcmcia/yenta_socket.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-)
drivers/pcmcia/yenta_socket.c +16 -8
@@ -745,6 +745,18 @@ static int yenta_allocate_res(struct yenta_socket *socket, int nr, unsigned typereturn 0 ; } +static void yenta_free_res (struct yenta_socket *socket,int nr) +{ +struct pci_dev *dev = socket->dev; +struct resource *res; + + res = &dev->resource[nr]; +if (res->start !=0 && res->end !=0 ) +release_resource (res); + + res->start = res->end = res->flags =0 ; +} +/* * Allocate the bridge mappings for the device.. */
@@ -773,14 +785,10 @@ static void yenta_allocate_resources(struct yenta_socket *socket)*/ static void yenta_free_resources (struct yenta_socket *socket) { -int i; -for (i =0 ; i <4 ; i++) { -struct resource *res; - res = socket->dev->resource +PCI_BRIDGE_RESOURCES + i; -if (res->start !=0 && res->end !=0 ) -release_resource (res); - res->start = res->end = res->flags =0 ; - } +yenta_free_res (socket,PCI_CB_BRIDGE_IO_0_WINDOW ); +yenta_free_res (socket,PCI_CB_BRIDGE_IO_1_WINDOW ); +yenta_free_res (socket,PCI_CB_BRIDGE_MEM_0_WINDOW ); +yenta_free_res (socket,PCI_CB_BRIDGE_MEM_1_WINDOW ); }
Signature · 1 line
2.26.2