From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: + serial-apbuartc-fix-two-problems-related-to-grlib_apbuart_configure.patch added to -mm tree Date: Mon, 10 May 2010 15:37:19 -0700 Message-ID: <201005102237.o4AMbJJc026790@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:45622 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932077Ab0EJWhe (ORCPT ); Mon, 10 May 2010 18:37:34 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: mm-commits@vger.kernel.org Cc: miguel.ojeda.sandonis@gmail.com, davem@davemloft.net, greg@kroah.com, kristoffer@gaisler.com The patch titled serial: apbuart.c: fix two problems related to grlib_apbuart_configure() has been added to the -mm tree. Its filename is serial-apbuartc-fix-two-problems-related-to-grlib_apbuart_configure.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: serial: apbuart.c: fix two problems related to grlib_apbuart_configure() From: Miguel Ojeda I found two problems using the Simics' sunfire target, so maybe the following does not occur in real machines. 1. At grlib_apbuart_configure() in apbuart.c, prop can be NULL if "clock-frequency" doesn't exist in the OF tree: /* Get bus frequency */ rp = of_find_node_by_path("/"); rp = of_get_next_child(rp, NULL); prop = of_get_property(rp, "clock-frequency", NULL); freq_khz = *prop; 2. In addition, apbuart.c does not check if there aren't any ports configured after calls to grlib_apbuart_configure(), so other oops will occur if no port was configured (e.g. uart_set_options() because of port->ops). In order to solve that, I added a check after both of the calls to grlib_apbuart_configure(). The patch that I provide below prevents both problems in the Simics' sunfire target. Signed-off-by: Miguel Ojeda Cc: "David S. Miller" Cc: Kristoffer Glembo Cc: Greg KH Signed-off-by: Andrew Morton --- drivers/serial/apbuart.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff -puN drivers/serial/apbuart.c~serial-apbuartc-fix-two-problems-related-to-grlib_apbuart_configure drivers/serial/apbuart.c --- a/drivers/serial/apbuart.c~serial-apbuartc-fix-two-problems-related-to-grlib_apbuart_configure +++ a/drivers/serial/apbuart.c @@ -525,6 +525,9 @@ static void grlib_apbuart_configure(void static int __init apbuart_console_init(void) { grlib_apbuart_configure(); + if (grlib_apbuart_port_nr == 0) + return 0; + register_console(&grlib_apbuart_console); return 0; } @@ -612,6 +615,8 @@ static void grlib_apbuart_configure(void rp = of_find_node_by_path("/"); rp = of_get_next_child(rp, NULL); prop = of_get_property(rp, "clock-frequency", NULL); + if (prop == NULL) + return; freq_khz = *prop; line = 0; @@ -666,6 +671,11 @@ static int __init grlib_apbuart_init(voi /* Find all APBUARTS in device the tree and initialize their ports */ grlib_apbuart_configure(); + if (grlib_apbuart_port_nr == 0) { + printk(KERN_INFO "Serial: GRLIB APBUART: No ports found.\n", + __FILE__); + return 0; + } printk(KERN_INFO "Serial: GRLIB APBUART driver\n"); _ Patches currently in -mm which might be from miguel.ojeda.sandonis@gmail.com are serial-apbuartc-fix-two-problems-related-to-grlib_apbuart_configure.patch auxdisplay-section-cleanup-in-cfag12864bfb-driver.patch