From patchwork Thu Jun 24 12:55:56 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Govindraj.R" X-Patchwork-Id: 107853 X-Patchwork-Delegate: khilman@deeprootsystems.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o5OCu4Fw008692 for ; Thu, 24 Jun 2010 12:56:05 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754822Ab0FXMz6 (ORCPT ); Thu, 24 Jun 2010 08:55:58 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:54089 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753736Ab0FXMz6 (ORCPT ); Thu, 24 Jun 2010 08:55:58 -0400 Received: from dlep35.itg.ti.com ([157.170.170.118]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id o5OCtvuk001845 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 24 Jun 2010 07:55:57 -0500 Received: from webmail.ti.com (localhost [127.0.0.1]) by dlep35.itg.ti.com (8.13.7/8.13.7) with ESMTP id o5OCtsrs027754; Thu, 24 Jun 2010 07:55:55 -0500 (CDT) Received: from 192.168.10.88 (proxying for 10.24.255.18) (SquirrelMail authenticated user x0100947); by dbdmail.itg.ti.com with HTTP; Thu, 24 Jun 2010 18:25:56 +0530 (IST) Message-ID: <61551.192.168.10.88.1277384156.squirrel@dbdmail.itg.ti.com> Date: Thu, 24 Jun 2010 18:25:56 +0530 (IST) Subject: [pm-wip/uart][PATCH v3] Serial: Avoid using hwmod lookup using name string From: "Govindraj.R" To: linux-omap@vger.kernel.org Cc: "Kevin Hilman" User-Agent: SquirrelMail/1.4.3a X-Mailer: SquirrelMail/1.4.3a MIME-Version: 1.0 X-Priority: 3 (Normal) Importance: Normal Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 24 Jun 2010 12:56:05 +0000 (UTC) diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index 38a74d0..68cbd16 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c @@ -55,8 +55,6 @@ */ #define DEFAULT_TIMEOUT 0 -#define MAX_UART_HWMOD_NAME_LEN 16 - struct omap_uart_state { int num; int can_sleep; @@ -96,6 +94,12 @@ struct omap_uart_state { #endif }; +struct uart_oh { + struct list_head node; + struct omap_hwmod *oh; +}; + +static LIST_HEAD(uart_oh_list); static LIST_HEAD(uart_list); static u8 num_uarts; @@ -568,52 +572,37 @@ static void serial_out_override(struct uart_port *up, int offset, int value) } #endif -void __init omap_serial_early_init(void) +static int omap_serial_port_init(struct omap_hwmod *oh, void *user) { - int i = 0; - - do { - char oh_name[MAX_UART_HWMOD_NAME_LEN]; - struct omap_hwmod *oh; - struct omap_uart_state *uart; - - snprintf(oh_name, MAX_UART_HWMOD_NAME_LEN, - "uart%d", i + 1); - oh = omap_hwmod_lookup(oh_name); - if (!oh) - break; - - uart = kzalloc(sizeof(struct omap_uart_state), GFP_KERNEL); - if (WARN_ON(!uart)) - return; - - uart->oh = oh; - uart->num = i++; - list_add_tail(&uart->node, &uart_list); - num_uarts++; - - /* - * NOTE: omap_hwmod_init() has not yet been called, - * so no hwmod functions will work yet. - */ + struct uart_oh *uoh; - /* - * During UART early init, device need to be probed - * to determine SoC specific init before omap_device - * is ready. Therefore, don't allow idle here - */ - uart->oh->flags |= HWMOD_INIT_NO_IDLE; - - /* - * Since UART hwmod is idle/enabled inside the - * idle loop, interrupts are already disabled and - * thus no locking is needed. Since the mutex-based - * locking in hwmod might sleep, allowing locking - * may introduce problems. - */ - uart->oh->flags |= HWMOD_NO_IDLE_LOCKING; + uoh = kzalloc(sizeof(struct uart_oh), GFP_KERNEL); + if (WARN_ON(!uoh)) + return -ENOMEM; + /* + * During UART early init, device need to be probed + * to determine SoC specific init before omap_device + * is ready. Therefore, don't allow idle here + */ + oh->flags |= HWMOD_INIT_NO_IDLE; + /* + * Since UART hwmod is idle/enabled inside the + * idle loop, interrupts are already disabled and + * thus no locking is needed. Since the mutex-based + * locking in hwmod might sleep, allowing locking + * may introduce problems. + */ + oh->flags |= HWMOD_NO_IDLE_LOCKING; + list_add_tail(&uoh->node, &uart_oh_list); + uoh->oh = oh; + num_uarts++; + return 0; +} - } while (1); +void __init omap_serial_early_init(void) +{ + omap_hwmod_for_each_by_class("uart", + omap_serial_port_init, NULL); } /** @@ -769,7 +758,16 @@ void __init omap_serial_init_port(int port) void __init omap_serial_init(void) { struct omap_uart_state *uart; + struct uart_oh *uoh; + int i = 0; - list_for_each_entry(uart, &uart_list, node) + list_for_each_entry(uoh, &uart_oh_list, node) { + uart = kzalloc(sizeof(struct omap_uart_state), GFP_KERNEL); + if (WARN_ON(!uart)) + return; + list_add_tail(&uart->node, &uart_list); + uart->num = i++; + uart->oh = uoh->oh; omap_serial_init_port(uart->num); + } }