diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-02-17 11:36:10 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-02-17 11:36:10 -0800 |
commit | e6fde0a10f74db16b66241a1d1876af6e88e2ed8 (patch) | |
tree | ad851661d725a4cc59aa7ca93267babfb4b95f81 /pci | |
parent | 5c33faf00af6c361e18c13c62b1f1e4510df5756 (diff) | |
download | patches-e6fde0a10f74db16b66241a1d1876af6e88e2ed8.tar.gz |
2.6.16-rc3-git9 refresh
Diffstat (limited to 'pci')
-rw-r--r-- | pci/altix-msi-support.patch | 31 | ||||
-rw-r--r-- | pci/msi-vector-targeting-abstractions.patch | 4 |
2 files changed, 13 insertions, 22 deletions
diff --git a/pci/altix-msi-support.patch b/pci/altix-msi-support.patch index f28f089324ebc..59f99f217b937 100644 --- a/pci/altix-msi-support.patch +++ b/pci/altix-msi-support.patch @@ -20,10 +20,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> arch/ia64/sn/pci/tioca_provider.c | 8 + arch/ia64/sn/pci/tioce_provider.c | 65 ++++++--- include/asm-ia64/sn/intr.h | 8 + - include/asm-ia64/sn/pcibr_provider.h | 7 - + include/asm-ia64/sn/pcibr_provider.h | 5 include/asm-ia64/sn/pcibus_provider_defs.h | 17 ++ include/asm-ia64/sn/tiocp.h | 3 - 11 files changed, 406 insertions(+), 119 deletions(-) + 11 files changed, 405 insertions(+), 118 deletions(-) --- gregkh-2.6.orig/arch/ia64/sn/pci/msi.c +++ gregkh-2.6/arch/ia64/sn/pci/msi.c @@ -239,7 +239,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } --- gregkh-2.6.orig/arch/ia64/sn/kernel/io_init.c +++ gregkh-2.6/arch/ia64/sn/kernel/io_init.c -@@ -52,7 +52,7 @@ static int max_pcibus_number = 255; /* D +@@ -56,7 +56,7 @@ static int max_pcibus_number = 255; /* D */ static dma_addr_t @@ -553,16 +553,16 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* If PCI mode, func zero uses VCHAN0, every other func uses VCHAN1 */ if (!IS_PCIX(pcibus_info) && PCI_FUNC(info->pdi_linux_pcidev->devfn)) -@@ -142,7 +161,7 @@ pcibr_dmatrans_direct64(struct pcidev_in +@@ -141,7 +160,7 @@ pcibr_dmatrans_direct64(struct pcidev_in static dma_addr_t pcibr_dmatrans_direct32(struct pcidev_info * info, - u64 paddr, size_t req_size, u64 flags) + u64 paddr, size_t req_size, u64 flags, int dma_flags) { - struct pcidev_info *pcidev_info = info->pdi_host_pcidev_info; -@@ -158,8 +177,14 @@ pcibr_dmatrans_direct32(struct pcidev_in + struct pcibus_info *pcibus_info = (struct pcibus_info *)pcidev_info-> +@@ -156,8 +175,14 @@ pcibr_dmatrans_direct32(struct pcidev_in return 0; } @@ -579,7 +579,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> xio_base = pcibus_info->pbi_dir_xbase; offset = xio_addr - xio_base; -@@ -333,7 +358,7 @@ void sn_dma_flush(u64 addr) +@@ -327,7 +352,7 @@ void sn_dma_flush(u64 addr) */ dma_addr_t @@ -588,7 +588,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> { dma_addr_t dma_handle; struct pcidev_info *pcidev_info = SN_PCIDEV_INFO(hwdev); -@@ -350,11 +375,11 @@ pcibr_dma_map(struct pci_dev * hwdev, un +@@ -344,11 +369,11 @@ pcibr_dma_map(struct pci_dev * hwdev, un */ dma_handle = pcibr_dmatrans_direct64(pcidev_info, phys_addr, @@ -602,7 +602,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (!dma_handle) { /* * It is a 32 bit card and we cannot do direct mapping, -@@ -362,7 +387,8 @@ pcibr_dma_map(struct pci_dev * hwdev, un +@@ -356,7 +381,8 @@ pcibr_dma_map(struct pci_dev * hwdev, un */ dma_handle = pcibr_dmamap_ate32(pcidev_info, phys_addr, @@ -612,7 +612,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } } -@@ -371,18 +397,18 @@ pcibr_dma_map(struct pci_dev * hwdev, un +@@ -365,18 +391,18 @@ pcibr_dma_map(struct pci_dev * hwdev, un dma_addr_t pcibr_dma_map_consistent(struct pci_dev * hwdev, unsigned long phys_addr, @@ -905,15 +905,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/include/asm-ia64/sn/pcibr_provider.h +++ gregkh-2.6/include/asm-ia64/sn/pcibr_provider.h -@@ -3,7 +3,7 @@ - * License. See the file "COPYING" in the main directory of this archive - * for more details. - * -- * Copyright (C) 1992-1997,2000-2004 Silicon Graphics, Inc. All rights reserved. -+ * Copyright (C) 1992-1997,2000-2005 Silicon Graphics, Inc. All rights reserved. - */ - #ifndef _ASM_IA64_SN_PCI_PCIBR_PROVIDER_H - #define _ASM_IA64_SN_PCI_PCIBR_PROVIDER_H @@ -55,6 +55,7 @@ #define PCI32_ATE_V (0x1 << 0) #define PCI32_ATE_CO (0x1 << 1) @@ -922,7 +913,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define PCI32_ATE_PREF (0x1 << 3) #define PCI32_ATE_BAR (0x1 << 4) #define PCI32_ATE_ADDR_SHFT 12 -@@ -129,8 +130,8 @@ pcibr_lock(struct pcibus_info *pcibus_in +@@ -117,8 +118,8 @@ struct pcibus_info { extern int pcibr_init_provider(void); extern void *pcibr_bus_fixup(struct pcibus_bussoft *, struct pci_controller *); diff --git a/pci/msi-vector-targeting-abstractions.patch b/pci/msi-vector-targeting-abstractions.patch index ae41d5377f4ab..9dba47ff61eb7 100644 --- a/pci/msi-vector-targeting-abstractions.patch +++ b/pci/msi-vector-targeting-abstractions.patch @@ -356,7 +356,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #endif /* _ASM_IA64_MACHVEC_H */ --- gregkh-2.6.orig/include/asm-ia64/machvec_sn2.h +++ gregkh-2.6/include/asm-ia64/machvec_sn2.h -@@ -71,6 +71,7 @@ extern ia64_mv_dma_sync_single_for_devic +@@ -66,6 +66,7 @@ extern ia64_mv_dma_sync_single_for_devic extern ia64_mv_dma_sync_sg_for_device sn_dma_sync_sg_for_device; extern ia64_mv_dma_mapping_error sn_dma_mapping_error; extern ia64_mv_dma_supported sn_dma_supported; @@ -364,7 +364,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* * This stuff has dual use! -@@ -120,6 +121,11 @@ extern ia64_mv_dma_supported sn_dma_sup +@@ -115,6 +116,11 @@ extern ia64_mv_dma_supported sn_dma_sup #define platform_dma_sync_sg_for_device sn_dma_sync_sg_for_device #define platform_dma_mapping_error sn_dma_mapping_error #define platform_dma_supported sn_dma_supported |