Re-work ACPI PCI IRQ routing (_PRT, link devices). The old approach was

incomplete in that the PRT routing was not aware of link programming.
Fix this by doing all routing through the link devices.  The new algorithm
for setting up links is:

1. Read _CRS to get current setting.  If invalid (not in _PRS), then set
   to 0.
2. Attempt to call _DIS on the link.  If successful, mark the link as not
   routed.  Otherwise, assume it still is.

Then when a routing request occurs:

3. Update weights for all IRQs
4. Attempt to route the initial IRQ if valid
5. If that fails, walk through the sorted list, attempting to route IRQs.
6. Configure the trigger/polarity based on _PRS.

Other changes:
* Add acpi_pci_find_prt() to look up the PRT entry for a given device and
  acpi_pci_link_route() to select/route the best IRQ for it.
* Remove duplicated code in acpi_pcib_route_interrupt() that picked the
  first IRQ from _PRS.
* Remove unneeded arguments from acpi_pcib_resume() and friends.
* Ignore _STA on link devices but report if it seems strange.
* Add a prt_source handle to the PRT structure since the ACPI struct
  ACPI_PCI_ROUTING_TABLE uses a fixed-size entry for it.  We'll need to
  dynamically size this object if we want to use it the same way ACPI-CA
  does.  Null-terminate the source.

Tested by:	Luo Hong <luohong99_at_mails.tsinghua.edu.cn>,
		Jeffrey Katcher <jmkatcher_at_yahoo.com>
Info from:	jhb, Len Brown (Intel)

1 files changed, 35 insertions, 4 deletions

diff --git a/sys/dev/acpica/acpi_pcibvar.h b/sys/dev/acpica/acpi_pcibvar.h
index a7a5f20..2c59fae 100644
--- a/sys/dev/acpica/acpi_pcibvar.h
+++ b/sys/dev/acpica/acpi_pcibvar.h
@@ -31,11 +31,42 @@
 #define	_ACPI_PCIBVAR_H_
 
 int	acpi_pcib_attach(device_t bus, ACPI_BUFFER *prt, int busno);
-int	acpi_pcib_route_interrupt(device_t pcib, device_t dev, int pin,
-    ACPI_BUFFER *ptrbuf);
-int	acpi_pcib_resume(device_t bus, ACPI_BUFFER *prt, int busno);
+int	acpi_pcib_route_interrupt(device_t pcib, device_t dev, int pin);
+int	acpi_pcib_resume(device_t dev);
+
+#define MAX_POSSIBLE_INTERRUPTS	16
+#define MAX_ISA_INTERRUPTS	16
+#define MAX_ACPI_INTERRUPTS	255
+
+struct acpi_pci_link_entry {
+	TAILQ_ENTRY(acpi_pci_link_entry) links;
+	ACPI_HANDLE	handle;
+	UINT8		current_irq;
+	UINT8		initial_irq;
+	ACPI_RESOURCE	possible_resources;
+	UINT8		number_of_interrupts;
+	UINT8		interrupts[MAX_POSSIBLE_INTERRUPTS];
+	UINT8		sorted_irq[MAX_POSSIBLE_INTERRUPTS];
+	int		references;
+	int		priority; 
+	int		flags;
+#define ACPI_LINK_NONE		0
+#define ACPI_LINK_ROUTED	(1 << 0)
+};
+
+struct acpi_prt_entry {
+	TAILQ_ENTRY(acpi_prt_entry) links;
+	device_t	pcidev;
+	int		busno;
+	ACPI_PCI_ROUTING_TABLE prt;
+	ACPI_HANDLE	prt_source;
+	struct acpi_pci_link_entry *pci_link;
+};
 
 int	acpi_pci_link_config(device_t pcib, ACPI_BUFFER *prt, int busno);
-int	acpi_pci_link_resume(device_t pcib, ACPI_BUFFER *prt, int busno);
+int	acpi_pci_link_resume(device_t pcib);
+struct	acpi_prt_entry *acpi_pci_find_prt(device_t pcibdev, device_t dev,
+	    int pin);
+int	acpi_pci_link_route(device_t dev, struct acpi_prt_entry *prt);
 
 #endif