Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933232Ab1CXPVi (ORCPT ); Thu, 24 Mar 2011 11:21:38 -0400 Received: from mail-ww0-f44.google.com ([74.125.82.44]:36456 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933166Ab1CXPVf (ORCPT ); Thu, 24 Mar 2011 11:21:35 -0400 From: Jamie Iles To: linux-kernel@vger.kernel.org Cc: gregkh@suse.de, vapier@gentoo.org, Jamie Iles , Mike Frysinger Subject: [RFC PATCHv2 4/4] drivers/otp: convert bfin otp to generic OTP Date: Thu, 24 Mar 2011 15:21:11 +0000 Message-Id: <1300980071-24645-5-git-send-email-jamie@jamieiles.com> X-Mailer: git-send-email 1.7.4 In-Reply-To: <1300980071-24645-1-git-send-email-jamie@jamieiles.com> References: <1300980071-24645-1-git-send-email-jamie@jamieiles.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 11217 Lines: 393 Convert the blackfin OTP driver to the generic OTP layer. Cc: Mike Frysinger Signed-off-by: Jamie Iles --- drivers/char/Kconfig | 28 ------ drivers/char/Makefile | 1 - drivers/otp/Kconfig | 28 ++++++ drivers/otp/Makefile | 1 + drivers/{char => otp}/bfin-otp.c | 174 ++++++++++++++++--------------------- 5 files changed, 104 insertions(+), 128 deletions(-) rename drivers/{char => otp}/bfin-otp.c (54%) diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index 04f8b2d..21ad035 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -81,34 +81,6 @@ config BRIQ_PANEL It's safe to say N here. -config BFIN_OTP - tristate "Blackfin On-Chip OTP Memory Support" - depends on BLACKFIN && (BF51x || BF52x || BF54x) - default y - help - If you say Y here, you will get support for a character device - interface into the One Time Programmable memory pages that are - stored on the Blackfin processor. This will not get you access - to the secure memory pages however. You will need to write your - own secure code and reader for that. - - To compile this driver as a module, choose M here: the module - will be called bfin-otp. - - If unsure, it is safe to say Y. - -config BFIN_OTP_WRITE_ENABLE - bool "Enable writing support of OTP pages" - depends on BFIN_OTP - default n - help - If you say Y here, you will enable support for writing of the - OTP pages. This is dangerous by nature as you can only program - the pages once, so only enable this option when you actually - need it so as to not inadvertently clobber data. - - If unsure, say N. - config PRINTER tristate "Parallel printer support" depends on PARPORT diff --git a/drivers/char/Makefile b/drivers/char/Makefile index 057f654..35b2403 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile @@ -16,7 +16,6 @@ obj-$(CONFIG_VIOTAPE) += viotape.o obj-$(CONFIG_IBM_BSR) += bsr.o obj-$(CONFIG_SGI_MBCS) += mbcs.o obj-$(CONFIG_BRIQ_PANEL) += briq_panel.o -obj-$(CONFIG_BFIN_OTP) += bfin-otp.o obj-$(CONFIG_PRINTER) += lp.o diff --git a/drivers/otp/Kconfig b/drivers/otp/Kconfig index 9306ef6..15cc5fa 100644 --- a/drivers/otp/Kconfig +++ b/drivers/otp/Kconfig @@ -18,4 +18,32 @@ config OTP_PC3X3 Say y or m here to allow support for the OTP found in PC3X3 devices. If you say m then the module will be called otp_pc3x3. +config BFIN_OTP + tristate "Blackfin On-Chip OTP Memory Support" + depends on BLACKFIN && (BF51x || BF52x || BF54x) && OTP + default y + help + If you say Y here, you will get support for a character device + interface into the One Time Programmable memory pages that are + stored on the Blackfin processor. This will not get you access + to the secure memory pages however. You will need to write your + own secure code and reader for that. + + To compile this driver as a module, choose M here: the module + will be called bfin-otp. + + If unsure, it is safe to say Y. + +config BFIN_OTP_WRITE_ENABLE + bool "Enable writing support of OTP pages" + depends on BFIN_OTP + default n + help + If you say Y here, you will enable support for writing of the + OTP pages. This is dangerous by nature as you can only program + the pages once, so only enable this option when you actually + need it so as to not inadvertently clobber data. + + If unsure, say N. + endif diff --git a/drivers/otp/Makefile b/drivers/otp/Makefile index c710ec4..db79667 100644 --- a/drivers/otp/Makefile +++ b/drivers/otp/Makefile @@ -1,2 +1,3 @@ obj-$(CONFIG_OTP) += otp.o obj-$(CONFIG_OTP_PC3X3) += otp_pc3x3.o +obj-$(CONFIG_BFIN_OTP) += bfin-otp.o diff --git a/drivers/char/bfin-otp.c b/drivers/otp/bfin-otp.c similarity index 54% rename from drivers/char/bfin-otp.c rename to drivers/otp/bfin-otp.c index 44660f1..002058c 100644 --- a/drivers/char/bfin-otp.c +++ b/drivers/otp/bfin-otp.c @@ -9,12 +9,13 @@ */ #include +#include #include #include #include #include #include -#include +#include #include #include @@ -28,53 +29,35 @@ #define DRIVER_NAME "bfin-otp" #define PFX DRIVER_NAME ": " +#define BFIN_OTP_SIZE (64 * 1024) -static DEFINE_MUTEX(bfin_otp_lock); +static struct otp_device *bfin_otp; /** * bfin_otp_read - Read OTP pages * * All reads must be in half page chunks (half page == 64 bits). */ -static ssize_t bfin_otp_read(struct file *file, char __user *buff, size_t count, loff_t *pos) +static int bfin_region_read_word(struct otp_region *region, unsigned long addr, + u64 *word) { - ssize_t bytes_done; + int err; u32 page, flags, ret; - u64 content; stampit(); - - if (count % sizeof(u64)) - return -EMSGSIZE; - - if (mutex_lock_interruptible(&bfin_otp_lock)) - return -ERESTARTSYS; - - bytes_done = 0; - page = *pos / (sizeof(u64) * 2); - while (bytes_done < count) { - flags = (*pos % (sizeof(u64) * 2) ? OTP_UPPER_HALF : OTP_LOWER_HALF); - stamp("processing page %i (0x%x:%s)", page, flags, - (flags & OTP_UPPER_HALF ? "upper" : "lower")); - ret = bfrom_OtpRead(page, flags, &content); - if (ret & OTP_MASTER_ERROR) { - stamp("error from otp: 0x%x", ret); - bytes_done = -EIO; - break; - } - if (copy_to_user(buff + bytes_done, &content, sizeof(content))) { - bytes_done = -EFAULT; - break; - } - if (flags & OTP_UPPER_HALF) - ++page; - bytes_done += sizeof(content); - *pos += sizeof(content); - } - - mutex_unlock(&bfin_otp_lock); - - return bytes_done; + page = addr / 2; + flags = (addr & 0x1) ? OTP_UPPER_HALF : OTP_LOWER_HALF; + stamp("processing page %i (0x%x:%s)", page, flags, + (flags & OTP_UPPER_HALF ? "upper" : "lower")); + + err = bfrom_OtpRead(page, flags, word); + if (err & OTP_MASTER_ERROR) { + stamp("error from otp: 0x%x", ret); + err = -EIO; + } else + err = 0; + + return err; } #ifdef CONFIG_BFIN_OTP_WRITE_ENABLE @@ -117,61 +100,39 @@ static void bfin_otp_deinit_timing(u32 timing) * * All writes must be in half page chunks (half page == 64 bits). */ -static ssize_t bfin_otp_write(struct file *filp, const char __user *buff, size_t count, loff_t *pos) +static int bfin_region_write_word(struct otp_region *region, unsigned long addr, + u64 content) { - ssize_t bytes_done; + int err; u32 timing, page, base_flags, flags, ret; - u64 content; if (!allow_writes) return -EACCES; - if (count % sizeof(u64)) - return -EMSGSIZE; - - if (mutex_lock_interruptible(&bfin_otp_lock)) - return -ERESTARTSYS; - stampit(); - timing = bfin_otp_init_timing(); - if (timing == 0) { - mutex_unlock(&bfin_otp_lock); + if (timing == 0) return -EIO; - } - base_flags = OTP_CHECK_FOR_PREV_WRITE; - bytes_done = 0; - page = *pos / (sizeof(u64) * 2); - while (bytes_done < count) { - flags = base_flags | (*pos % (sizeof(u64) * 2) ? OTP_UPPER_HALF : OTP_LOWER_HALF); - stamp("processing page %i (0x%x:%s) from %p", page, flags, - (flags & OTP_UPPER_HALF ? "upper" : "lower"), buff + bytes_done); - if (copy_from_user(&content, buff + bytes_done, sizeof(content))) { - bytes_done = -EFAULT; - break; - } - ret = bfrom_OtpWrite(page, flags, &content); - if (ret & OTP_MASTER_ERROR) { - stamp("error from otp: 0x%x", ret); - bytes_done = -EIO; - break; - } - if (flags & OTP_UPPER_HALF) - ++page; - bytes_done += sizeof(content); - *pos += sizeof(content); - } + page = addr / 2; + flags = base_flags | (addr & 0x1) ? OTP_UPPER_HALF : OTP_LOWER_HALF; + stamp("processing page %i (0x%x:%s)", page, flags, + (flags & OTP_UPPER_HALF ? "upper" : "lower")); + ret = bfrom_OtpWrite(page, flags, &content); + if (ret & OTP_MASTER_ERROR) { + stamp("error from otp: 0x%x", ret); + err = -EIO; + } else + err = 0; bfin_otp_deinit_timing(timing); - mutex_unlock(&bfin_otp_lock); - - return bytes_done; + return err; } -static long bfin_otp_ioctl(struct file *filp, unsigned cmd, unsigned long arg) +static long bfin_region_ioctl(struct otp_region *region, unsigned cmd, + unsigned long arg) { stampit(); @@ -183,9 +144,6 @@ static long bfin_otp_ioctl(struct file *filp, unsigned cmd, unsigned long arg) if (!allow_writes) return -EACCES; - if (mutex_lock_interruptible(&bfin_otp_lock)) - return -ERESTARTSYS; - timing = bfin_otp_init_timing(); if (timing) { u32 otp_result = bfrom_OtpWrite(arg, OTP_LOCK, NULL); @@ -196,8 +154,6 @@ static long bfin_otp_ioctl(struct file *filp, unsigned cmd, unsigned long arg) bfin_otp_deinit_timing(timing); } - mutex_unlock(&bfin_otp_lock); - return ret; } @@ -213,22 +169,35 @@ static long bfin_otp_ioctl(struct file *filp, unsigned cmd, unsigned long arg) return -EINVAL; } #else -# define bfin_otp_write NULL -# define bfin_otp_ioctl NULL +static int bfin_region_write_word(struct otp_region *region, unsigned long addr, + u64 val) +{ + return -EACCES; +} +# define bfin_region_ioctl NULL #endif -static const struct file_operations bfin_otp_fops = { - .owner = THIS_MODULE, - .unlocked_ioctl = bfin_otp_ioctl, - .read = bfin_otp_read, - .write = bfin_otp_write, - .llseek = default_llseek, +static int bfin_otp_get_nr_regions(struct otp_device *dev) +{ + return 1; +} + +static const struct otp_device_ops bfin_otp_ops = { + .name = "BFIN", + .owner = THIS_MODULE, + .get_nr_regions = bfin_otp_get_nr_regions, }; -static struct miscdevice bfin_otp_misc_device = { - .minor = MISC_DYNAMIC_MINOR, - .name = DRIVER_NAME, - .fops = &bfin_otp_fops, +static ssize_t bfin_region_get_size(struct otp_region *region) +{ + return BFIN_OTP_SIZE; +} + +static const struct otp_region_ops bfin_region_ops = { + .read_word = bfin_region_read_word, + .write_word = bfin_region_write_word, + .get_size = bfin_region_get_size, + .ioctl = bfin_region_ioctl, }; /** @@ -239,14 +208,21 @@ static struct miscdevice bfin_otp_misc_device = { */ static int __init bfin_otp_init(void) { - int ret; + struct otp_region *region; stampit(); - ret = misc_register(&bfin_otp_misc_device); - if (ret) { - pr_init(KERN_ERR PFX "unable to register a misc device\n"); - return ret; + bfin_otp = otp_device_alloc(NULL, &bfin_otp_ops, BFIN_OTP_SIZE); + if (IS_ERR(bfin_otp)) { + pr_init(KERN_ERR PFX "failed to create OTP device\n"); + return PTR_ERR(bfin_otp); + } + + region = otp_region_alloc(bfin_otp, &bfin_region_ops, 1); + if (IS_ERR(region)) { + pr_init(KERN_ERR PFX "failed to create OTP region\n"); + otp_device_unregister(bfin_otp); + return PTR_ERR(region); } pr_init(KERN_INFO PFX "initialized\n"); @@ -264,7 +240,7 @@ static void __exit bfin_otp_exit(void) { stampit(); - misc_deregister(&bfin_otp_misc_device); + otp_device_unregister(bfin_otp); } module_init(bfin_otp_init); -- 1.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/