From patchwork Tue Jul 27 09:42:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Feng Tang X-Patchwork-Id: 114476 X-Patchwork-Delegate: grant.likely@secretlab.ca Received: from lists.sourceforge.net (lists.sourceforge.net [216.34.181.88]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o6R9MvJL025218 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 27 Jul 2010 09:23:33 GMT Received: from localhost ([127.0.0.1] helo=sfs-ml-2.v29.ch3.sourceforge.com) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1OdgNE-00060O-5y; Tue, 27 Jul 2010 09:22:56 +0000 Received: from sfi-mx-4.v28.ch3.sourceforge.com ([172.29.28.124] helo=mx.sourceforge.net) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1OdgNC-00060I-RF for spi-devel-general@lists.sourceforge.net; Tue, 27 Jul 2010 09:22:54 +0000 X-ACL-Warn: Received: from mga01.intel.com ([192.55.52.88]) by sfi-mx-4.v28.ch3.sourceforge.com with esmtp (Exim 4.69) id 1OdgNB-0005RO-Re for spi-devel-general@lists.sourceforge.net; Tue, 27 Jul 2010 09:22:54 +0000 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 27 Jul 2010 02:20:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.55,267,1278313200"; d="scan'208";a="590052122" Received: from feng-i7.sh.intel.com (HELO localhost.localdomain) ([10.239.14.181]) by fmsmga002.fm.intel.com with ESMTP; 27 Jul 2010 02:22:00 -0700 From: Feng Tang To: david-b@pacbell.net, grant.likely@secretlab.ca Date: Tue, 27 Jul 2010 17:42:49 +0800 Message-Id: <1280223769-19919-1-git-send-email-feng.tang@intel.com> X-Mailer: git-send-email 1.7.0.4 X-Spam-Score: 0.0 (/) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. _SUMMARY_ X-Headers-End: 1OdgNB-0005RO-Re Cc: spi-devel-general@lists.sourceforge.net, alan@linux.intel.com Subject: [spi-devel-general] [PATCH] spi: enable spi_board_info to be registered after spi_master X-BeenThere: spi-devel-general@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list List-Id: Linux SPI core/device drivers discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: spi-devel-general-bounces@lists.sourceforge.net X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 27 Jul 2010 09:23:33 +0000 (UTC) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index b3a1f92..f4a5221 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -196,13 +196,16 @@ EXPORT_SYMBOL_GPL(spi_register_driver); struct boardinfo { struct list_head list; - unsigned n_board_info; - struct spi_board_info board_info[0]; + struct spi_board_info board_info; }; static LIST_HEAD(board_list); static DEFINE_MUTEX(board_lock); + +static LIST_HEAD(master_list); +static DEFINE_MUTEX(master_lock); + /** * spi_alloc_device - Allocate a new SPI device * @master: Controller to which device is connected @@ -365,6 +368,19 @@ struct spi_device *spi_new_device(struct spi_master *master, } EXPORT_SYMBOL_GPL(spi_new_device); +static void scan_masterlist(struct spi_board_info *bi) +{ + struct spi_master *master; + + mutex_lock(&master_lock); + list_for_each_entry(master, &master_list, list) { + if (master->bus_num != bi->bus_num) + continue; + (void) spi_new_device(master, bi); + } + mutex_unlock(&master_lock); +} + /** * spi_register_board_info - register SPI devices for a given board * @info: array of chip descriptors @@ -387,41 +403,45 @@ EXPORT_SYMBOL_GPL(spi_new_device); int __init spi_register_board_info(struct spi_board_info const *info, unsigned n) { - struct boardinfo *bi; + struct boardinfo *bi, *tmp_bi; + int i; - bi = kmalloc(sizeof(*bi) + n * sizeof *info, GFP_KERNEL); + bi = kzalloc(n * sizeof *bi, GFP_KERNEL); if (!bi) return -ENOMEM; - bi->n_board_info = n; - memcpy(bi->board_info, info, n * sizeof *info); + tmp_bi = bi; mutex_lock(&board_lock); - list_add_tail(&bi->list, &board_list); + for (i = 0; i < n; i++, bi++, info++) { + memcpy(&bi->board_info, info, sizeof *info); + list_add_tail(&bi->list, &board_list); + } mutex_unlock(&board_lock); + + bi = tmp_bi; + for (i = 0; i < n; i++) + scan_masterlist(&bi->board_info); + return 0; } /* FIXME someone should add support for a __setup("spi", ...) that * creates board info from kernel command lines */ - static void scan_boardinfo(struct spi_master *master) { struct boardinfo *bi; mutex_lock(&board_lock); list_for_each_entry(bi, &board_list, list) { - struct spi_board_info *chip = bi->board_info; - unsigned n; - - for (n = bi->n_board_info; n > 0; n--, chip++) { - if (chip->bus_num != master->bus_num) - continue; - /* NOTE: this relies on spi_new_device to - * issue diagnostics when given bogus inputs - */ - (void) spi_new_device(master, chip); - } + struct spi_board_info *chip = &bi->board_info; + + if (chip->bus_num != master->bus_num) + continue; + /* NOTE: this relies on spi_new_device to + * issue diagnostics when given bogus inputs + */ + (void) spi_new_device(master, chip); } mutex_unlock(&board_lock); } @@ -537,6 +557,10 @@ int spi_register_master(struct spi_master *master) dev_dbg(dev, "registered master %s%s\n", dev_name(&master->dev), dynamic ? " (dynamic)" : ""); + mutex_lock(&master_lock); + list_add_tail(&master->list, &master_list); + mutex_unlock(&master_lock); + /* populate children from any spi device tables */ scan_boardinfo(master); status = 0; @@ -568,6 +592,10 @@ void spi_unregister_master(struct spi_master *master) { int dummy; + mutex_lock(&master_lock); + list_del(&master->list); + mutex_unlock(&master_lock); + dummy = device_for_each_child(master->dev.parent, &master->dev, __unregister); device_unregister(&master->dev); diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h index af56071..f4a29b6 100644 --- a/include/linux/spi/spi.h +++ b/include/linux/spi/spi.h @@ -204,6 +204,7 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv) /** * struct spi_master - interface to SPI master controller * @dev: device interface to this driver + * @list: link with the global spi_master list * @bus_num: board-specific (and often SOC-specific) identifier for a * given SPI controller. * @num_chipselect: chipselects are used to distinguish individual @@ -235,6 +236,8 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv) struct spi_master { struct device dev; + struct list_head list; + /* other than negative (== assign one dynamically), bus_num is fully * board-specific. usually that simplifies to being SOC-specific. * example: one SOC has three SPI controllers, numbered 0..2,