From: Pat Gefre <pfg@sgi.com>
Change the definition and usage of iio_itte - make it an array
---
25-akpm/arch/ia64/sn/io/machvec/pci_bus_cvlink.c | 77 +++--------------------
25-akpm/arch/ia64/sn/io/sn2/pcibr/pcibr_intr.c | 28 +-------
25-akpm/include/asm-ia64/sn/pci/pcibr_private.h | 8 --
3 files changed, 17 insertions(+), 96 deletions(-)
diff -puN arch/ia64/sn/io/machvec/pci_bus_cvlink.c~sn46 arch/ia64/sn/io/machvec/pci_bus_cvlink.c
--- 25/arch/ia64/sn/io/machvec/pci_bus_cvlink.c~sn46 Thu Jan 8 15:25:17 2004
+++ 25-akpm/arch/ia64/sn/io/machvec/pci_bus_cvlink.c Thu Jan 8 15:25:17 2004
@@ -203,71 +203,18 @@ sn_dma_flush_init(unsigned long start, u
memset(flush_nasid_list[nasid].widget_p, 0, (HUB_WIDGET_ID_MAX+1) * sizeof(struct sn_flush_device_list *));
}
if (bwin > 0) {
- bwin--;
- switch (bwin) {
- case 0:
- flush_nasid_list[nasid].iio_itte1 = HUB_L(IIO_ITTE_GET(nasid, 0));
- wid_num = ((flush_nasid_list[nasid].iio_itte1) >> 8) & 0xf;
- bus = flush_nasid_list[nasid].iio_itte1 & 0xf;
- if (bus == 0x4 || bus == 0x8)
- bus = 0;
- else
- bus = 1;
- break;
- case 1:
- flush_nasid_list[nasid].iio_itte2 = HUB_L(IIO_ITTE_GET(nasid, 1));
- wid_num = ((flush_nasid_list[nasid].iio_itte2) >> 8) & 0xf;
- bus = flush_nasid_list[nasid].iio_itte2 & 0xf;
- if (bus == 0x4 || bus == 0x8)
- bus = 0;
- else
- bus = 1;
- break;
- case 2:
- flush_nasid_list[nasid].iio_itte3 = HUB_L(IIO_ITTE_GET(nasid, 2));
- wid_num = ((flush_nasid_list[nasid].iio_itte3) >> 8) & 0xf;
- bus = flush_nasid_list[nasid].iio_itte3 & 0xf;
- if (bus == 0x4 || bus == 0x8)
- bus = 0;
- else
- bus = 1;
- break;
- case 3:
- flush_nasid_list[nasid].iio_itte4 = HUB_L(IIO_ITTE_GET(nasid, 3));
- wid_num = ((flush_nasid_list[nasid].iio_itte4) >> 8) & 0xf;
- bus = flush_nasid_list[nasid].iio_itte4 & 0xf;
- if (bus == 0x4 || bus == 0x8)
- bus = 0;
- else
- bus = 1;
- break;
- case 4:
- flush_nasid_list[nasid].iio_itte5 = HUB_L(IIO_ITTE_GET(nasid, 4));
- wid_num = ((flush_nasid_list[nasid].iio_itte5) >> 8) & 0xf;
- bus = flush_nasid_list[nasid].iio_itte5 & 0xf;
- if (bus == 0x4 || bus == 0x8)
- bus = 0;
- else
- bus = 1;
- break;
- case 5:
- flush_nasid_list[nasid].iio_itte6 = HUB_L(IIO_ITTE_GET(nasid, 5));
- wid_num = ((flush_nasid_list[nasid].iio_itte6) >> 8) & 0xf;
- bus = flush_nasid_list[nasid].iio_itte6 & 0xf;
- if (bus == 0x4 || bus == 0x8)
- bus = 0;
- else
- bus = 1;
- break;
- case 6:
- flush_nasid_list[nasid].iio_itte7 = HUB_L(IIO_ITTE_GET(nasid, 6));
- wid_num = ((flush_nasid_list[nasid].iio_itte7) >> 8) & 0xf;
- bus = flush_nasid_list[nasid].iio_itte7 & 0xf;
- if (bus == 0x4 || bus == 0x8)
- bus = 0;
- else
- bus = 1;
- break;
+ int itte_index = bwin - 1;
+ unsigned long itte;
+
+ itte = HUB_L(IIO_ITTE_GET(nasid, itte_index));
+ flush_nasid_list[nasid].iio_itte[bwin] = itte;
+ wid_num = (itte >> IIO_ITTE_WIDGET_SHIFT) &
+ IIO_ITTE_WIDGET_MASK;
+ bus = itte & IIO_ITTE_OFFSET_MASK;
+ if (bus == 0x4 || bus == 0x8) {
+ bus = 0;
+ } else {
+ bus = 1;
}
}
diff -puN arch/ia64/sn/io/sn2/pcibr/pcibr_intr.c~sn46 arch/ia64/sn/io/sn2/pcibr/pcibr_intr.c
--- 25/arch/ia64/sn/io/sn2/pcibr/pcibr_intr.c~sn46 Thu Jan 8 15:25:17 2004
+++ 25-akpm/arch/ia64/sn/io/sn2/pcibr/pcibr_intr.c Thu Jan 8 15:25:17 2004
@@ -156,30 +156,10 @@ sn_dma_flush(unsigned long addr) {
if (flush_nasid_list[nasid].widget_p == NULL) return;
if (bwin > 0) {
- bwin--;
- switch (bwin) {
- case 0:
- wid_num = ((flush_nasid_list[nasid].iio_itte1) >> 8) & 0xf;
- break;
- case 1:
- wid_num = ((flush_nasid_list[nasid].iio_itte2) >> 8) & 0xf;
- break;
- case 2:
- wid_num = ((flush_nasid_list[nasid].iio_itte3) >> 8) & 0xf;
- break;
- case 3:
- wid_num = ((flush_nasid_list[nasid].iio_itte4) >> 8) & 0xf;
- break;
- case 4:
- wid_num = ((flush_nasid_list[nasid].iio_itte5) >> 8) & 0xf;
- break;
- case 5:
- wid_num = ((flush_nasid_list[nasid].iio_itte6) >> 8) & 0xf;
- break;
- case 6:
- wid_num = ((flush_nasid_list[nasid].iio_itte7) >> 8) & 0xf;
- break;
- }
+ unsigned long itte = flush_nasid_list[nasid].iio_itte[bwin];
+
+ wid_num = (itte >> IIO_ITTE_WIDGET_SHIFT) &
+ IIO_ITTE_WIDGET_MASK;
}
if (flush_nasid_list[nasid].widget_p == NULL) return;
if (flush_nasid_list[nasid].widget_p[wid_num] == NULL) return;
diff -puN include/asm-ia64/sn/pci/pcibr_private.h~sn46 include/asm-ia64/sn/pci/pcibr_private.h
--- 25/include/asm-ia64/sn/pci/pcibr_private.h~sn46 Thu Jan 8 15:25:17 2004
+++ 25-akpm/include/asm-ia64/sn/pci/pcibr_private.h Thu Jan 8 15:25:17 2004
@@ -713,13 +713,7 @@ struct sn_flush_device_list {
struct sn_flush_nasid_entry {
struct sn_flush_device_list **widget_p;
- unsigned long iio_itte1;
- unsigned long iio_itte2;
- unsigned long iio_itte3;
- unsigned long iio_itte4;
- unsigned long iio_itte5;
- unsigned long iio_itte6;
- unsigned long iio_itte7;
+ unsigned long iio_itte[8];
};
#endif /* _ASM_SN_PCI_PCIBR_PRIVATE_H */
_