Re: [parisc-linux] [PATCH] PDC cleanup and encapsulation

[Bjorn Helgaas <bjorn_helgaas@hp.com>]

[-- Attachment #1: Type: text/plain, Size: 1120 bytes --]

Looks good to me.  A couple minor questions/comments, more for my 
edification than anything else:

- pdc.h contains a commented-out struct pdc_iodc.  The comment suggests 
possible issues with using it with 64-bit firmware, but I think the fear 
is unfounded.  There are several places that use pdc_iodc_read(), but they 
all seem to define their own equivalent of struct pdc_iodc.  I'm not sure 
why they don't use struct pdc_iodc.  Also, include/asm-parisc/hardware.h 
contains #defines for the IODC_TYPE field (HPHW_NPROC, etc); should these 
be defined alongside struct pdc_iodc?

- What are the guidelines for #ifdef __LP64__ vs CONFIG_PA20?  You 
replaced __LP64__ with CONFIG_PA20 in some places but not others and I'm 
not clear on the difference.

- In firmware.c, the "yes 'int', not 'long' -- IODC I/O is always 32-bit 
stuff" comment moved from pdc.h seems obsolete, or at least, I can't 
figure out what the 'int' refers to.  I'd remove the "This means Cxxx 
boxes can't run wide kernels right now." comment, since CONFIG_PDC_NARROW 
addresses that issue.

I attached a diff that fixes a few typos.

Bjorn

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: spell --]
[-- Type: text/english; name="spell", Size: 7422 bytes --]

diff -urN linux/arch/parisc/kernel/firmware.c linux.wip/arch/parisc/kernel/firmware.c
--- linux/arch/parisc/kernel/firmware.c	Wed Apr  4 10:35:58 2001
+++ linux.wip/arch/parisc/kernel/firmware.c	Wed Apr  4 10:49:09 2001
@@ -12,7 +12,7 @@
  *	 - the name of the pdc wrapper should match one of the macros
  *	   used for the first two arguments
  *	 - don't use caps for random parts of the name
- *	 - use ASSERT_ALIGN to ensure the aligment of the arguments is
+ *	 - use ASSERT_ALIGN to ensure the alignment of the arguments is
  *	   correct
  *	 - use __pa() to convert virtual (kernel) pointers to physical
  *	   ones.
@@ -106,7 +106,7 @@
  * convert_to_wide - Convert the return buffer addresses into kernel addresses.
  * @address: The return buffer from PDC.
  *
- * This fucntion is used to convert the return buffer addresses retrieve from PDC
+ * This function is used to convert the return buffer addresses retrieved from PDC
  * into kernel addresses when the PDC address size and kernel address size are
  * different.
  */
@@ -121,7 +121,7 @@
 }
 
 /**
- * pdc_add_valid - Verify address can be accessesd without causing a HPMC.
+ * pdc_add_valid - Verify address can be accessed without causing a HPMC.
  * @address: Address to be verified.
  *
  * This PDC call attempts to read from the specified address and verify
@@ -340,7 +340,7 @@
         int retval;
 
         spin_lock_irq(&pdc_lock);
-        pdc_result[0] = 0; /* preset zero (call may not be implimented!) */
+        pdc_result[0] = 0; /* preset zero (call may not be implemented!) */
         retval = mem_pdc_call(PDC_MODEL, PDC_MODEL_CPU_ID, __pa(pdc_result), 0);
         convert_to_wide(pdc_result);
         *cpu_id = pdc_result[0];
@@ -730,7 +730,7 @@
  * @r_addr: The return buffer.
  * @cell_num: The target cell.
  *
- * This PDC functin returns the actual interrupt table for the specified cell.
+ * This PDC function returns the actual interrupt table for the specified cell.
  */
 int pdc_pat_get_irt(void *r_addr, unsigned long cell_num)
 {
diff -urN linux/drivers/net/lasi_82596.c linux.wip/drivers/net/lasi_82596.c
--- linux/drivers/net/lasi_82596.c	Wed Apr  4 10:35:58 2001
+++ linux.wip/drivers/net/lasi_82596.c	Wed Apr  4 10:41:42 2001
@@ -1172,7 +1172,7 @@
 	if (pdc_lan_station_id( (char*)&eth_addr, (void*)dev->base_addr)) {
 	    for(i=0;i<6;i++)
 		eth_addr[i] = gsc_readb(LAN_PROM_ADDR+i);
-	    printk("82596.c: MAC of HP700 LAN blindely read from the prom!\n");
+	    printk("82596.c: MAC of HP700 LAN blindly read from the prom!\n");
 	}
 
 	dev->mem_start = (int)pci_alloc_consistent( NULL, 
diff -urN linux/include/asm-parisc/pdc.h linux.wip/include/asm-parisc/pdc.h
--- linux/include/asm-parisc/pdc.h	Wed Apr  4 10:35:58 2001
+++ linux.wip/include/asm-parisc/pdc.h	Wed Apr  4 10:46:37 2001
@@ -12,7 +12,7 @@
 #define PDC_CHASSIS_DISP	0	/* update chassis display	*/
 #define PDC_CHASSIS_WARN	1	/* return chassis warnings	*/
 #define PDC_CHASSIS_DISPWARN	2	/* update&return chassis status */
-#define PDC_RETURN_CHASSIS_INFO 128	/* HVERSION dependend: return chassis LED/LCD info  */
+#define PDC_RETURN_CHASSIS_INFO 128	/* HVERSION dependent: return chassis LED/LCD info  */
 
 #define PDC_PIM         3               /* Get PIM data                 */
 #define PDC_PIM_HPMC            0       /* Transfer HPMC data           */
@@ -126,8 +126,8 @@
 #define PDC_REQ_ERR_1       2  /* See above */
 #define PDC_REQ_ERR_0       1  /* Call would generate a requestor error */
 #define PDC_OK	      0  /* Call completed successfully */
-#define PDC_BAD_PROC	   -1  /* Called non-existant procedure */
-#define PDC_BAD_OPTION     -2  /* Called with non-existant option */
+#define PDC_BAD_PROC	   -1  /* Called non-existent procedure */
+#define PDC_BAD_OPTION     -2  /* Called with non-existent option */
 #define PDC_ERROR	  -3  /* Call could not complete without an error */
 #define PDC_INVALID_ARG   -10  /* Called with an invalid argument */
 #define PDC_BUS_POW_WARN  -12  /* Call could not complete in allowed power budget */
@@ -138,7 +138,7 @@
 
 #define PDC_RET_OK       0L	/* Call completed successfully */
 #define PDC_RET_NE_PROC -1L	/* Non-existent procedure */
-#define PDC_RET_NE_OPT  -2L	/* non-existant option - arg1 */
+#define PDC_RET_NE_OPT  -2L	/* non-existent option - arg1 */
 #define PDC_RET_NE_MOD  -5L	/* Module not found */
 #define PDC_RET_NE_CELL_MOD -7L	/* Cell module not found */
 #define PDC_RET_INV_ARG	-10L	/* Invalid argument */
@@ -151,7 +151,7 @@
 #define PDC_ADD_VALID_REQ_ERR_1       2  /* See above */
 #define PDC_ADD_VALID_REQ_ERR_0       1  /* Call would generate a requestor error */
 #define PDC_ADD_VALID_OK	      0  /* Call completed successfully */
-#define PDC_ADD_VALID_BAD_OPTION     -2  /* Called with non-existant option */
+#define PDC_ADD_VALID_BAD_OPTION     -2  /* Called with non-existent option */
 #define PDC_ADD_VALID_ERROR	  -3  /* Call could not complete without an error */
 #define PDC_ADD_VALID_INVALID_ARG   -10  /* Called with an invalid argument */
 #define PDC_ADD_VALID_BUS_POW_WARN  -12  /* Call could not complete in allowed power budget */
@@ -181,7 +181,7 @@
 #ifdef __LP64__
 /* PDC PAT CELL */
 #define PDC_PAT_CELL           	64L   /* Interface for gaining and 
-                                         * manipulatin g cell state within PD */
+                                         * manipulating cell state within PD */
 #define PDC_PAT_CELL_GET_NUMBER    0L   /* Return Cell number */
 #define PDC_PAT_CELL_GET_INFO      1L   /* Returns info about Cell */
 #define PDC_PAT_CELL_MODULE        2L   /* Returns info about Module */
@@ -195,7 +195,7 @@
 #define PDC_PAT_CELL_GET_REMOTE_PDH_SZ 16L /* Return Remote PDH Buffer Size */
 #define PDC_PAT_CELL_GET_REMOTE_PDH 17L /* Read Remote PDH Buffer */
 #define PDC_PAT_CELL_GET_DBG_INFO   128L  /* Return DBG Buffer Info */
-#define PDC_PAT_CELL_CHANGE_ALIAS   129L  /* Change Non-Equivalent Alias Chacking */
+#define PDC_PAT_CELL_CHANGE_ALIAS   129L  /* Change Non-Equivalent Alias Checking */
 
 /*
 ** Arg to PDC_PAT_CELL_MODULE memaddr[4]
@@ -222,7 +222,7 @@
 #define PAT_GMMIO           2         /* > 4G MMIO Space */
 #define PAT_NPIOP           3         /* Non Postable I/O Port Space */
 #define PAT_PIOP            4         /* Postable I/O Port Space */
-#define PAT_AHPA            5         /* Addional HPA Space */
+#define PAT_AHPA            5         /* Additional HPA Space */
 #define PAT_UFO             6         /* HPA Space (UFO for Mariposa) */
 #define PAT_GNIP            7         /* GNI Reserved Space */
 
@@ -266,7 +266,7 @@
 				       ** Monarch Processor */
 #define PDC_PAT_HPMC_RENDEZ_CPU     0L /* go into spin loop */
 #define PDC_PAT_HPMC_SET_PARAMS     1L /* Allows OS to specify intr which PDC 
-                                        * will use to interupt OS during machine
+                                        * will use to interrupt OS during machine
                                         * check rendezvous */
 
 /* parameters for PDC_PAT_HPMC_SET_PARAMS: */
@@ -400,7 +400,7 @@
 #ifdef __LP64__
 		cc_padW:32,
 #endif
-		cc_alias:4,	/* alias boundaries for virtual adresses   */
+		cc_alias:4,	/* alias boundaries for virtual addresses   */
 		cc_block: 4,	/* to determine most efficient stride */
 		cc_line	: 3,	/* maximum amount written back as a result of store (multiple of 16 bytes) */
 		cc_pad0 : 2,	/* reserved */