[parisc-linux-cvs] DIFF 2.6.2-rc2-pa3 lba_gmmio

[Grant Grundler]

On Sat, Jan 31, 2004 at 11:25:09PM -0700, Grant Grundler wrote:
> Log message:
> 2.6.2-rc2-pa3 remove dead fields from struct lba_dev
> white space clean up and removed usage of dead fields.
> Also removed warning about PAT get slot status on 64-bit builds.


Index: Makefile
===================================================================
RCS file: /var/cvs/linux-2.6/Makefile,v
retrieving revision 1.119
diff -u -p -r1.119 Makefile
--- Makefile	28 Jan 2004 06:05:15 -0000	1.119
+++ Makefile	1 Feb 2004 06:22:57 -0000
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 2
-EXTRAVERSION = -rc2-pa2
+EXTRAVERSION = -rc2-pa3
 
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"
Index: drivers/parisc/lba_pci.c
===================================================================
RCS file: /var/cvs/linux-2.6/drivers/parisc/lba_pci.c,v
retrieving revision 1.7
diff -u -p -r1.7 lba_pci.c
--- drivers/parisc/lba_pci.c	23 Jan 2004 01:42:05 -0000	1.7
+++ drivers/parisc/lba_pci.c	1 Feb 2004 06:22:57 -0000
@@ -185,8 +185,6 @@ struct lba_device {
 	void		*iosapic_obj;
 
 #ifdef __LP64__
-	unsigned long	lmmio_base;  /* PA_VIEW - fixup MEM addresses */
-	unsigned long	gmmio_base;  /* PA_VIEW - > 4GB MMIO address space */
 	unsigned long	iop_base;    /* PA_VIEW - for IO port accessor funcs */
 #endif
 
@@ -1042,8 +1040,8 @@ lba_pat_resources(struct parisc_device *
 			lba_dev->hba.bus_num.start = p->start;
 			lba_dev->hba.bus_num.end   = p->end;
 			break;
-		case PAT_LMMIO:
 
+		case PAT_LMMIO:
 			/* used to fix up pre-initialized MEM BARs */
 			lba_dev->hba.lmmio_space_offset = p->start - io->start;
 
@@ -1056,7 +1054,7 @@ lba_pat_resources(struct parisc_device *
 			break;
 
 		case PAT_GMMIO:
-
+			/* MMIO space > 4GB phys addr; for 64-bit BAR */
 			r = &(lba_dev->hba.gmmio_space);
 			r->name   = "LBA GMMIO";
 			r->start  = p->start;
@@ -1064,20 +1062,18 @@ lba_pat_resources(struct parisc_device *
 			r->flags  = IORESOURCE_MEM;
 			r->parent = r->sibling = r->child = NULL;
 			break;
-			lba_dev->gmmio_base = p->start;
-			break;
 
 		case PAT_NPIOP:
 			printk(KERN_WARNING MODULE_NAME
 				" range[%d] : ignoring NPIOP (0x%lx)\n",
 				i, p->start);
 			break;
+
 		case PAT_PIOP:
 			/*
 			** Postable I/O port space is per PCI host adapter.
+			** base of 64MB PIOP region
 			*/
-
-			/* save base of 64MB PIOP region */
 			lba_dev->iop_base = p->start;
 
 			r = &(lba_dev->hba.io_space);
@@ -1087,6 +1083,7 @@ lba_pat_resources(struct parisc_device *
 			r->flags  = IORESOURCE_IO;
 			r->parent = r->sibling = r->child = NULL;
 			break;
+
 		default:
 			printk(KERN_WARNING MODULE_NAME
 				" range[%d] : unknown pat range type (0x%lx)\n",
@@ -1240,7 +1237,11 @@ lba_hw_init(struct lba_device *d)
 #endif	/* DEBUG_LBA_PAT */
 
 #ifdef __LP64__
-#warning FIXME add support for PDC_PAT_IO "Get slot status" - OLAR support
+/*
+ * FIXME add support for PDC_PAT_IO "Get slot status" - OLAR support
+ * Only N-Class and up can really make use of Get slot status.
+ * maybe L-class too but I've never played with it there.
+ */
 #endif
 
 	/* PDC_PAT_BUG: exhibited in rev 40.48  on L2000 */