tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Revert "sparc: Convert to using %pOFn instead of device_node.name"

This reverts commit 0b9871a3a8cc7234c285b5d9bf66cc6712cfee7c.

Causes crashes with qemu, interacts badly with commit commit
6d0a70a284be ("vsprintf: print OF node name using full_name")
etc.

Reported-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

David S. Miller a06ecbfe d1f1f98c

+51 -51
unified split
+2 -2
arch/sparc/kernel/auxio_64.c
··· 115 auxio_devtype = AUXIO_TYPE_SBUS; 116 size = 1; 117 } else { 118 - printk("auxio: Unknown parent bus type [%pOFn]\n", 119 - dp->parent); 120 return -ENODEV; 121 } 122 auxio_register = of_ioremap(&dev->resource[0], 0, size, "auxio");
··· 115 auxio_devtype = AUXIO_TYPE_SBUS; 116 size = 1; 117 } else { 118 + printk("auxio: Unknown parent bus type [%s]\n", 119 + dp->parent->name); 120 return -ENODEV; 121 } 122 auxio_register = of_ioremap(&dev->resource[0], 0, size, "auxio");
+2 -2
arch/sparc/kernel/power.c
··· 41 42 power_reg = of_ioremap(res, 0, 0x4, "power"); 43 44 - printk(KERN_INFO "%pOFn: Control reg at %llx\n", 45 - op->dev.of_node, res->start); 46 47 if (has_button_interrupt(irq, op->dev.of_node)) { 48 if (request_irq(irq,
··· 41 42 power_reg = of_ioremap(res, 0, 0x4, "power"); 43 44 + printk(KERN_INFO "%s: Control reg at %llx\n", 45 + op->dev.of_node->name, res->start); 46 47 if (has_button_interrupt(irq, op->dev.of_node)) { 48 if (request_irq(irq,
+13 -13
arch/sparc/kernel/prom_32.c
··· 68 return; 69 70 regs = rprop->value; 71 - sprintf(tmp_buf, "%pOFn@%x,%x", 72 - dp, 73 regs->which_io, regs->phys_addr); 74 } 75 ··· 84 return; 85 86 regs = prop->value; 87 - sprintf(tmp_buf, "%pOFn@%x,%x", 88 - dp, 89 regs->which_io, 90 regs->phys_addr); 91 } ··· 104 regs = prop->value; 105 devfn = (regs->phys_hi >> 8) & 0xff; 106 if (devfn & 0x07) { 107 - sprintf(tmp_buf, "%pOFn@%x,%x", 108 - dp, 109 devfn >> 3, 110 devfn & 0x07); 111 } else { 112 - sprintf(tmp_buf, "%pOFn@%x", 113 - dp, 114 devfn >> 3); 115 } 116 } ··· 127 128 regs = prop->value; 129 130 - sprintf(tmp_buf, "%pOFn@%x,%x", 131 - dp, 132 regs->which_io, regs->phys_addr); 133 } 134 ··· 167 return; 168 device = prop->value; 169 170 - sprintf(tmp_buf, "%pOFn:%d:%d@%x,%x", 171 - dp, *vendor, *device, 172 *intr, reg0); 173 } 174 ··· 201 tmp_buf[0] = '\0'; 202 __build_path_component(dp, tmp_buf); 203 if (tmp_buf[0] == '\0') 204 - snprintf(tmp_buf, sizeof(tmp_buf), "%pOFn", dp); 205 206 n = prom_early_alloc(strlen(tmp_buf) + 1); 207 strcpy(n, tmp_buf);
··· 68 return; 69 70 regs = rprop->value; 71 + sprintf(tmp_buf, "%s@%x,%x", 72 + dp->name, 73 regs->which_io, regs->phys_addr); 74 } 75 ··· 84 return; 85 86 regs = prop->value; 87 + sprintf(tmp_buf, "%s@%x,%x", 88 + dp->name, 89 regs->which_io, 90 regs->phys_addr); 91 } ··· 104 regs = prop->value; 105 devfn = (regs->phys_hi >> 8) & 0xff; 106 if (devfn & 0x07) { 107 + sprintf(tmp_buf, "%s@%x,%x", 108 + dp->name, 109 devfn >> 3, 110 devfn & 0x07); 111 } else { 112 + sprintf(tmp_buf, "%s@%x", 113 + dp->name, 114 devfn >> 3); 115 } 116 } ··· 127 128 regs = prop->value; 129 130 + sprintf(tmp_buf, "%s@%x,%x", 131 + dp->name, 132 regs->which_io, regs->phys_addr); 133 } 134 ··· 167 return; 168 device = prop->value; 169 170 + sprintf(tmp_buf, "%s:%d:%d@%x,%x", 171 + dp->name, *vendor, *device, 172 *intr, reg0); 173 } 174 ··· 201 tmp_buf[0] = '\0'; 202 __build_path_component(dp, tmp_buf); 203 if (tmp_buf[0] == '\0') 204 + strcpy(tmp_buf, dp->name); 205 206 n = prom_early_alloc(strlen(tmp_buf) + 1); 207 strcpy(n, tmp_buf);
+34 -34
arch/sparc/kernel/prom_64.c
··· 82 83 regs = rprop->value; 84 if (!of_node_is_root(dp->parent)) { 85 - sprintf(tmp_buf, "%pOFn@%x,%x", 86 - dp, 87 (unsigned int) (regs->phys_addr >> 32UL), 88 (unsigned int) (regs->phys_addr & 0xffffffffUL)); 89 return; ··· 97 const char *prefix = (type == 0) ? "m" : "i"; 98 99 if (low_bits) 100 - sprintf(tmp_buf, "%pOFn@%s%x,%x", 101 - dp, prefix, 102 high_bits, low_bits); 103 else 104 - sprintf(tmp_buf, "%pOFn@%s%x", 105 - dp, 106 prefix, 107 high_bits); 108 } else if (type == 12) { 109 - sprintf(tmp_buf, "%pOFn@%x", 110 - dp, high_bits); 111 } 112 } 113 ··· 122 123 regs = prop->value; 124 if (!of_node_is_root(dp->parent)) { 125 - sprintf(tmp_buf, "%pOFn@%x,%x", 126 - dp, 127 (unsigned int) (regs->phys_addr >> 32UL), 128 (unsigned int) (regs->phys_addr & 0xffffffffUL)); 129 return; ··· 138 if (tlb_type >= cheetah) 139 mask = 0x7fffff; 140 141 - sprintf(tmp_buf, "%pOFn@%x,%x", 142 - dp, 143 *(u32 *)prop->value, 144 (unsigned int) (regs->phys_addr & mask)); 145 } ··· 156 return; 157 158 regs = prop->value; 159 - sprintf(tmp_buf, "%pOFn@%x,%x", 160 - dp, 161 regs->which_io, 162 regs->phys_addr); 163 } ··· 176 regs = prop->value; 177 devfn = (regs->phys_hi >> 8) & 0xff; 178 if (devfn & 0x07) { 179 - sprintf(tmp_buf, "%pOFn@%x,%x", 180 - dp, 181 devfn >> 3, 182 devfn & 0x07); 183 } else { 184 - sprintf(tmp_buf, "%pOFn@%x", 185 - dp, 186 devfn >> 3); 187 } 188 } ··· 203 if (!prop) 204 return; 205 206 - sprintf(tmp_buf, "%pOFn@%x,%x", 207 - dp, 208 *(u32 *) prop->value, 209 (unsigned int) (regs->phys_addr & 0xffffffffUL)); 210 } ··· 221 222 regs = prop->value; 223 224 - sprintf(tmp_buf, "%pOFn@%x", dp, *regs); 225 } 226 227 /* "name@addrhi,addrlo" */ ··· 236 237 regs = prop->value; 238 239 - sprintf(tmp_buf, "%pOFn@%x,%x", 240 - dp, 241 (unsigned int) (regs->phys_addr >> 32UL), 242 (unsigned int) (regs->phys_addr & 0xffffffffUL)); 243 } ··· 257 /* This actually isn't right... should look at the #address-cells 258 * property of the i2c bus node etc. etc. 259 */ 260 - sprintf(tmp_buf, "%pOFn@%x,%x", 261 - dp, regs[0], regs[1]); 262 } 263 264 /* "name@reg0[,reg1]" */ ··· 274 regs = prop->value; 275 276 if (prop->length == sizeof(u32) || regs[1] == 1) { 277 - sprintf(tmp_buf, "%pOFn@%x", 278 - dp, regs[0]); 279 } else { 280 - sprintf(tmp_buf, "%pOFn@%x,%x", 281 - dp, regs[0], regs[1]); 282 } 283 } 284 ··· 295 regs = prop->value; 296 297 if (regs[2] || regs[3]) { 298 - sprintf(tmp_buf, "%pOFn@%08x%08x,%04x%08x", 299 - dp, regs[0], regs[1], regs[2], regs[3]); 300 } else { 301 - sprintf(tmp_buf, "%pOFn@%08x%08x", 302 - dp, regs[0], regs[1]); 303 } 304 } 305 ··· 361 tmp_buf[0] = '\0'; 362 __build_path_component(dp, tmp_buf); 363 if (tmp_buf[0] == '\0') 364 - snprintf(tmp_buf, sizeof(tmp_buf), "%pOFn", dp); 365 366 n = prom_early_alloc(strlen(tmp_buf) + 1); 367 strcpy(n, tmp_buf);
··· 82 83 regs = rprop->value; 84 if (!of_node_is_root(dp->parent)) { 85 + sprintf(tmp_buf, "%s@%x,%x", 86 + dp->name, 87 (unsigned int) (regs->phys_addr >> 32UL), 88 (unsigned int) (regs->phys_addr & 0xffffffffUL)); 89 return; ··· 97 const char *prefix = (type == 0) ? "m" : "i"; 98 99 if (low_bits) 100 + sprintf(tmp_buf, "%s@%s%x,%x", 101 + dp->name, prefix, 102 high_bits, low_bits); 103 else 104 + sprintf(tmp_buf, "%s@%s%x", 105 + dp->name, 106 prefix, 107 high_bits); 108 } else if (type == 12) { 109 + sprintf(tmp_buf, "%s@%x", 110 + dp->name, high_bits); 111 } 112 } 113 ··· 122 123 regs = prop->value; 124 if (!of_node_is_root(dp->parent)) { 125 + sprintf(tmp_buf, "%s@%x,%x", 126 + dp->name, 127 (unsigned int) (regs->phys_addr >> 32UL), 128 (unsigned int) (regs->phys_addr & 0xffffffffUL)); 129 return; ··· 138 if (tlb_type >= cheetah) 139 mask = 0x7fffff; 140 141 + sprintf(tmp_buf, "%s@%x,%x", 142 + dp->name, 143 *(u32 *)prop->value, 144 (unsigned int) (regs->phys_addr & mask)); 145 } ··· 156 return; 157 158 regs = prop->value; 159 + sprintf(tmp_buf, "%s@%x,%x", 160 + dp->name, 161 regs->which_io, 162 regs->phys_addr); 163 } ··· 176 regs = prop->value; 177 devfn = (regs->phys_hi >> 8) & 0xff; 178 if (devfn & 0x07) { 179 + sprintf(tmp_buf, "%s@%x,%x", 180 + dp->name, 181 devfn >> 3, 182 devfn & 0x07); 183 } else { 184 + sprintf(tmp_buf, "%s@%x", 185 + dp->name, 186 devfn >> 3); 187 } 188 } ··· 203 if (!prop) 204 return; 205 206 + sprintf(tmp_buf, "%s@%x,%x", 207 + dp->name, 208 *(u32 *) prop->value, 209 (unsigned int) (regs->phys_addr & 0xffffffffUL)); 210 } ··· 221 222 regs = prop->value; 223 224 + sprintf(tmp_buf, "%s@%x", dp->name, *regs); 225 } 226 227 /* "name@addrhi,addrlo" */ ··· 236 237 regs = prop->value; 238 239 + sprintf(tmp_buf, "%s@%x,%x", 240 + dp->name, 241 (unsigned int) (regs->phys_addr >> 32UL), 242 (unsigned int) (regs->phys_addr & 0xffffffffUL)); 243 } ··· 257 /* This actually isn't right... should look at the #address-cells 258 * property of the i2c bus node etc. etc. 259 */ 260 + sprintf(tmp_buf, "%s@%x,%x", 261 + dp->name, regs[0], regs[1]); 262 } 263 264 /* "name@reg0[,reg1]" */ ··· 274 regs = prop->value; 275 276 if (prop->length == sizeof(u32) || regs[1] == 1) { 277 + sprintf(tmp_buf, "%s@%x", 278 + dp->name, regs[0]); 279 } else { 280 + sprintf(tmp_buf, "%s@%x,%x", 281 + dp->name, regs[0], regs[1]); 282 } 283 } 284 ··· 295 regs = prop->value; 296 297 if (regs[2] || regs[3]) { 298 + sprintf(tmp_buf, "%s@%08x%08x,%04x%08x", 299 + dp->name, regs[0], regs[1], regs[2], regs[3]); 300 } else { 301 + sprintf(tmp_buf, "%s@%08x%08x", 302 + dp->name, regs[0], regs[1]); 303 } 304 } 305 ··· 361 tmp_buf[0] = '\0'; 362 __build_path_component(dp, tmp_buf); 363 if (tmp_buf[0] == '\0') 364 + strcpy(tmp_buf, dp->name); 365 366 n = prom_early_alloc(strlen(tmp_buf) + 1); 367 strcpy(n, tmp_buf);