diff options
| author | awilliam@xenbuild2.aw <awilliam@xenbuild2.aw> | 2007-02-06 09:26:25 -0700 |
|---|---|---|
| committer | awilliam@xenbuild2.aw <awilliam@xenbuild2.aw> | 2007-02-06 09:26:25 -0700 |
| commit | a356cbd5f6fd8c7a786e1ff6d3b330431ccbc296 (patch) | |
| tree | cc81a653527022ceb387e2075c2dbdcf736c8ca2 /unmodified_drivers | |
| parent | d7e51f76c87e031bab860bfc2086136d53c2f05a (diff) | |
| download | xen-a356cbd5f6fd8c7a786e1ff6d3b330431ccbc296.tar.gz xen-a356cbd5f6fd8c7a786e1ff6d3b330431ccbc296.tar.bz2 xen-a356cbd5f6fd8c7a786e1ff6d3b330431ccbc296.zip | |
[IA64] Follow to allow PV-on-HVM callback irq to be identified by PCI device.
Also delete IA64 specific spec concerned with IA64_CALLBACK_IRQ_RID.
Signed-off-by: Tsunehisa Doi <Doi.Tsunehisa@jp.fujitsu.com>
Diffstat (limited to 'unmodified_drivers')
| -rw-r--r-- | unmodified_drivers/linux-2.6/platform-pci/platform-pci.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c index e6ff4107cb..1cbfcf11b9 100644 --- a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c +++ b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c @@ -181,23 +181,18 @@ static int get_hypercall_stubs(void) static uint64_t get_callback_via(struct pci_dev *pdev) { + u8 pin; #ifdef __ia64__ int irq, rid; for (irq = 0; irq < 16; irq++) { if (isa_irq_to_vector(irq) == pdev->irq) - return irq; + return irq; /* ISA IRQ */ } - /* use Requester-ID as callback_irq */ - /* RID: '<#bus(8)><#dev(5)><#func(3)>' (cf. PCI-Express spec) */ - rid = ((pdev->bus->number & 0xff) << 8) | pdev->devfn; - printk(KERN_INFO DRV_NAME ":use Requester-ID(%04x) as callback irq\n", - rid); - return rid | IA64_CALLBACK_IRQ_RID; #else /* !__ia64__ */ - u8 pin; if (pdev->irq < 16) return pdev->irq; /* ISA IRQ */ +#endif #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) pin = pdev->pin; @@ -211,7 +206,6 @@ static uint64_t get_callback_via(struct pci_dev *pdev) ((uint64_t)pdev->bus->number << 16) | ((uint64_t)(pdev->devfn & 0xff) << 8) | ((uint64_t)(pin - 1) & 3)); -#endif } /* Invalidate foreign mappings (e.g., in qemu-based device model). */ |