GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-04 05:37:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[POWERPC] Fix error handling in detecting legacy serial ports

Browse source 
Previously we weren't checking for failures in translating device
addresses from the firmware.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Benjamin Herrenschmidt 2006-07-03 17:24:15 +10:00 • committed by Paul Mackerras
parent 980a651365
commit 7c6efda599
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
arch/powerpc/kernel/legacy_serial.c
View file

@ -126,6 +126,8 @@ static int __init add_legacy_soc_port(struct device_node *np,
return -1; return -1;
addr = of_translate_address(soc_dev, addrp); addr = of_translate_address(soc_dev, addrp);
if (addr == OF_BAD_ADDR)
return -1;
/* Add port, irq will be dealt with later. We passed a translated /* Add port, irq will be dealt with later. We passed a translated
* IO port value. It will be fixed up later along with the irq * IO port value. It will be fixed up later along with the irq
@ -141,6 +143,8 @@ static int __init add_legacy_isa_port(struct device_node *np,
int index = -1; int index = -1;
phys_addr_t taddr; phys_addr_t taddr;
DBG(" -> add_legacy_isa_port(%s)\n", np->full_name);
/* Get the ISA port number */ /* Get the ISA port number */
reg = (u32 *)get_property(np, "reg", NULL); reg = (u32 *)get_property(np, "reg", NULL);
if (reg == NULL) if (reg == NULL)
@ -161,9 +165,12 @@ static int __init add_legacy_isa_port(struct device_node *np,
/* Translate ISA address */ /* Translate ISA address */
taddr = of_translate_address(np, reg); taddr = of_translate_address(np, reg);
if (taddr == OF_BAD_ADDR)
return -1;
/* Add port, irq will be dealt with later */ /* Add port, irq will be dealt with later */
return add_legacy_port(np, index, UPIO_PORT, reg[1], taddr, NO_IRQ, UPF_BOOT_AUTOCONF); return add_legacy_port(np, index, UPIO_PORT, reg[1], taddr,
NO_IRQ, UPF_BOOT_AUTOCONF);
} }
@ -176,6 +183,8 @@ static int __init add_legacy_pci_port(struct device_node *np,
unsigned int flags; unsigned int flags;
int iotype, index = -1, lindex = 0; int iotype, index = -1, lindex = 0;
DBG(" -> add_legacy_pci_port(%s)\n", np->full_name);
/* We only support ports that have a clock frequency properly /* We only support ports that have a clock frequency properly
* encoded in the device-tree (that is have an fcode). Anything * encoded in the device-tree (that is have an fcode). Anything
* else can't be used that early and will be normally probed by * else can't be used that early and will be normally probed by
@ -194,6 +203,8 @@ static int __init add_legacy_pci_port(struct device_node *np,
/* We only support BAR 0 for now */ /* We only support BAR 0 for now */
iotype = (flags & IORESOURCE_MEM) ? UPIO_MEM : UPIO_PORT; iotype = (flags & IORESOURCE_MEM) ? UPIO_MEM : UPIO_PORT;
addr = of_translate_address(pci_dev, addrp); addr = of_translate_address(pci_dev, addrp);
if (addr == OF_BAD_ADDR)
return -1;
/* Set the IO base to the same as the translated address for MMIO, /* Set the IO base to the same as the translated address for MMIO,
* or to the domain local IO base for PIO (it will be fixed up later) * or to the domain local IO base for PIO (it will be fixed up later)