[PATCH] ppc64: fix call_prom return checks
Benjamin Herrenschmidt
benh at kernel.crashing.org
Thu Jun 2 11:24:22 EST 2005
On Thu, 2005-06-02 at 00:54 +0200, Arnd Bergmann wrote:
> On Dunnersdag 02 Juni 2005 00:48, Benjamin Herrenschmidt wrote:
> > My patch is still doing that ? I though I was removing those casts ...
>
> You removed most of them, but two are still left.
Ok, let's be clean. If I define PROM_ERROR to be (-1u) instead of (-1),
it actually works in all cases without needing ugly casts. What about
this patch ?
Index: linux-work/arch/ppc64/kernel/prom_init.c
===================================================================
--- linux-work.orig/arch/ppc64/kernel/prom_init.c 2005-06-02 08:11:37.000000000 +1000
+++ linux-work/arch/ppc64/kernel/prom_init.c 2005-06-02 11:24:05.000000000 +1000
@@ -216,7 +216,7 @@
* mode when we do. We switch back to 64b mode upon return.
*/
-#define PROM_ERROR (-1)
+#define PROM_ERROR (-1u)
static int __init call_prom(const char *service, int nargs, int nret, ...)
{
@@ -587,14 +587,13 @@
{
unsigned long offset = reloc_offset();
ihandle elfloader;
- int ret;
elfloader = call_prom("open", 1, 1, ADDR("/packages/elf-loader"));
- if (elfloader == 0) {
+ if (elfloader == PROM_ERROR || elfloader == 0) {
prom_printf("couldn't open /packages/elf-loader\n");
return;
}
- ret = call_prom("call-method", 3, 1, ADDR("process-elf-header"),
+ call_prom("call-method", 3, 1, ADDR("process-elf-header"),
elfloader, ADDR(&fake_elf));
call_prom("close", 1, 0, elfloader);
}
@@ -646,7 +645,7 @@
base = _ALIGN_UP(base + 0x100000, align)) {
prom_debug(" trying: 0x%x\n\r", base);
addr = (unsigned long)prom_claim(base, size, 0);
- if ((int)addr != PROM_ERROR)
+ if (addr != PROM_ERROR)
break;
addr = 0;
if (align == 0)
@@ -708,7 +707,7 @@
for(; base > RELOC(alloc_bottom); base = _ALIGN_DOWN(base - 0x100000, align)) {
prom_debug(" trying: 0x%x\n\r", base);
addr = (unsigned long)prom_claim(base, size, 0);
- if ((int)addr != PROM_ERROR)
+ if (addr != PROM_ERROR)
break;
addr = 0;
}
@@ -910,7 +909,7 @@
prom_rtas = call_prom("finddevice", 1, 1, ADDR("/rtas"));
prom_debug("prom_rtas: %x\n", prom_rtas);
- if (prom_rtas == (phandle) -1)
+ if (prom_rtas == PROM_ERROR)
return;
prom_getprop(prom_rtas, "rtas-size", &size, sizeof(size));
@@ -1062,7 +1061,7 @@
prom_printf("opening PHB %s", path);
phb_node = call_prom("open", 1, 1, path);
- if ( (long)phb_node <= 0)
+ if (phb_node == PROM_ERROR)
prom_printf("... failed\n");
else
prom_printf("... done\n");
@@ -1279,12 +1278,12 @@
/* get a handle for the stdout device */
_prom->chosen = call_prom("finddevice", 1, 1, ADDR("/chosen"));
- if ((long)_prom->chosen <= 0)
+ if (_prom->chosen == PROM_ERROR)
prom_panic("cannot find chosen"); /* msg won't be printed :( */
/* get device tree root */
_prom->root = call_prom("finddevice", 1, 1, ADDR("/"));
- if ((long)_prom->root <= 0)
+ if (_prom->root == PROM_ERROR)
prom_panic("cannot find device tree root"); /* msg won't be printed :( */
}
@@ -1356,9 +1355,8 @@
}
/* Default to pSeries. We need to know if we are running LPAR */
rtas = call_prom("finddevice", 1, 1, ADDR("/rtas"));
- if (rtas != (phandle) -1) {
- unsigned long x;
- x = prom_getproplen(rtas, "ibm,hypertas-functions");
+ if (rtas != PROM_ERROR) {
+ int x = prom_getproplen(rtas, "ibm,hypertas-functions");
if (x != PROM_ERROR) {
prom_printf("Hypertas detected, assuming LPAR !\n");
return PLATFORM_PSERIES_LPAR;
@@ -1426,12 +1424,13 @@
* leave some room at the end of the path for appending extra
* arguments
*/
- if (call_prom("package-to-path", 3, 1, node, path, PROM_SCRATCH_SIZE-10) < 0)
+ if (call_prom("package-to-path", 3, 1, node, path,
+ PROM_SCRATCH_SIZE-10) == PRROM_ERROR)
continue;
prom_printf("found display : %s, opening ... ", path);
ih = call_prom("open", 1, 1, path);
- if (ih == (ihandle)0 || ih == (ihandle)-1) {
+ if (ih == 0 || ih == PROM_ERROR) {
prom_printf("failed\n");
continue;
}
@@ -1514,6 +1513,12 @@
return 0;
}
+/*
+ * The Open Firmware 1275 specification states properties must be 31 bytes or
+ * less, however not all firmwares obey this. Make it 64 bytes to be safe.
+ */
+#define MAX_PROPERTY_NAME 64
+
static void __init scan_dt_build_strings(phandle node, unsigned long *mem_start,
unsigned long *mem_end)
{
@@ -1528,9 +1533,10 @@
prev_name = RELOC("");
for (;;) {
- /* 32 is max len of name including nul. */
- namep = make_room(mem_start, mem_end, 32, 1);
- if (call_prom("nextprop", 3, 1, node, prev_name, namep) <= 0) {
+ /* 64 is max len of name including nul. */
+ namep = make_room(mem_start, mem_end, MAX_PROPERTY_NAME, 1);
+ if (call_prom("nextprop", 3, 1, node, prev_name, namep)
+ == PROM_ERROR) {
/* No more nodes: unwind alloc */
*mem_start = (unsigned long)namep;
break;
@@ -1555,12 +1561,6 @@
}
}
-/*
- * The Open Firmware 1275 specification states properties must be 31 bytes or
- * less, however not all firmwares obey this. Make it 64 bytes to be safe.
- */
-#define MAX_PROPERTY_NAME 64
-
static void __init scan_dt_build_struct(phandle node, unsigned long *mem_start,
unsigned long *mem_end)
{
@@ -1607,7 +1607,8 @@
prev_name = RELOC("");
sstart = (char *)RELOC(dt_string_start);
for (;;) {
- if (call_prom("nextprop", 3, 1, node, prev_name, pname) <= 0)
+ if (call_prom("nextprop", 3, 1, node, prev_name, pname)
+ == PROM_ERROR)
break;
/* find string offset */
@@ -1623,7 +1624,7 @@
l = call_prom("getproplen", 2, 1, node, pname);
/* sanity checks */
- if (l < 0)
+ if (l == PROM_ERROR)
continue;
if (l > MAX_PROPERTY_LENGTH) {
prom_printf("WARNING: ignoring large property ");
@@ -1771,17 +1772,18 @@
/* Some G5s have a missing interrupt definition, fix it up here */
u3 = call_prom("finddevice", 1, 1, ADDR("/u3 at 0,f8000000"));
- if ((long)u3 <= 0)
+ if (u3 == PROM_ERROR)
return;
i2c = call_prom("finddevice", 1, 1, ADDR("/u3 at 0,f8000000/i2c at f8001000"));
- if ((long)i2c <= 0)
+ if (i2c <= PROM_ERROR)
return;
mpic = call_prom("finddevice", 1, 1, ADDR("/u3 at 0,f8000000/mpic at f8040000"));
- if ((long)mpic <= 0)
+ if (mpic <= PROM_ERROR)
return;
/* check if proper rev of u3 */
- if (prom_getprop(u3, "device-rev", &u3_rev, sizeof(u3_rev)) <= 0)
+ if (prom_getprop(u3, "device-rev", &u3_rev, sizeof(u3_rev))
+ == PROM_ERROR)
return;
if (u3_rev != 0x35)
return;
More information about the Linuxppc64-dev
mailing list