Re: [PATCH V2 1/3] lib: add support for stmp-style devices

From: Huang Shijie
Date: Wed Apr 04 2012 - 07:21:38 EST


HI Wolfram:

Could you provide an API such as gpmi_reset_block()?
It will much helpful to me.

BR
Huang Shijie

On Wed, Mar 21, 2012 at 6:21 PM, Wolfram Sang <w.sang@xxxxxxxxxxxxxx> wrote:
> MX23/28 use IP cores which follow a register layout I have first seen on
> STMP3xxx SoCs. In this layout, every register actually has four u32:
>
> Â1.) to store a value directly
> Â2.) a SET register where every 1-bit sets the corresponding bit,
> Â Â others are unaffected
> Â3.) same with a CLR register
> Â4.) same with a TOG (toggle) register
>
> Also, the 2 MSBs in register 0 are always the same and can be used to reset
> the IP core.
>
> All this is strictly speaking not mach-specific (but IP core specific) and,
> thus, doesn't need to be in mach-mxs/include. At least, mx6 and mx50 also
> utilize IP cores following this stmp-style. So:
>
> Introduce a stmp-style device, put the code and defines for that in a public
> place (lib/), and let drivers for stmp-style devices select that code.
> To avoid regressions and ease reviewing, the actual code is simply copied from
> mach-mxs. It definately wants updates, but those need a seperate patch series.
>
> Voila, mach dependency gone, reusable code introduced. Note that I didn't
> remove the duplicated code from mach-mxs yet, first the drivers have to be
> converted.
>
> Signed-off-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
> Acked-by: Shawn Guo <shawn.guo@xxxxxxxxxx>
> ---
> Âinclude/linux/stmp_device.h | Â 20 +++++++++++
> Âlib/Kconfig         |  Â3 ++
> Âlib/Makefile        Â|  Â2 +
> Âlib/stmp_device.c      |  80 +++++++++++++++++++++++++++++++++++++++++++
> Â4 files changed, 105 insertions(+), 0 deletions(-)
> Âcreate mode 100644 include/linux/stmp_device.h
> Âcreate mode 100644 lib/stmp_device.c
>
> diff --git a/include/linux/stmp_device.h b/include/linux/stmp_device.h
> new file mode 100644
> index 0000000..6cf7ec9
> --- /dev/null
> +++ b/include/linux/stmp_device.h
> @@ -0,0 +1,20 @@
> +/*
> + * basic functions for devices following the "stmp" style register layout
> + *
> + * Copyright (C) 2011 Wolfram Sang, Pengutronix e.K.
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + */
> +
> +#ifndef __STMP_DEVICE_H__
> +#define __STMP_DEVICE_H__
> +
> +#define STMP_OFFSET_REG_SET Â Â0x4
> +#define STMP_OFFSET_REG_CLR Â Â0x8
> +#define STMP_OFFSET_REG_TOG Â Â0xc
> +
> +extern int stmp_reset_block(void __iomem *);
> +#endif /* __STMP_DEVICE_H__ */
> diff --git a/lib/Kconfig b/lib/Kconfig
> index 028aba9..d4af46f 100644
> --- a/lib/Kconfig
> +++ b/lib/Kconfig
> @@ -29,6 +29,9 @@ config GENERIC_IOMAP
> Â Â Â Âbool
> Â Â Â Âselect GENERIC_PCI_IOMAP
>
> +config STMP_DEVICE
> + Â Â Â bool
> +
> Âconfig CRC_CCITT
> Â Â Â Âtristate "CRC-CCITT functions"
> Â Â Â Âhelp
> diff --git a/lib/Makefile b/lib/Makefile
> index 18515f0..f78dbcd 100644
> --- a/lib/Makefile
> +++ b/lib/Makefile
> @@ -123,6 +123,8 @@ obj-$(CONFIG_SIGNATURE) += digsig.o
>
> Âobj-$(CONFIG_CLZ_TAB) += clz_tab.o
>
> +obj-$(CONFIG_STMP_DEVICE) += stmp_device.o
> +
> Âhostprogs-y  Â:= gen_crc32table
> Âclean-files  Â:= crc32table.h
>
> diff --git a/lib/stmp_device.c b/lib/stmp_device.c
> new file mode 100644
> index 0000000..8ac9bcc
> --- /dev/null
> +++ b/lib/stmp_device.c
> @@ -0,0 +1,80 @@
> +/*
> + * Copyright (C) 1999 ARM Limited
> + * Copyright (C) 2000 Deep Blue Solutions Ltd
> + * Copyright 2006-2007,2010 Freescale Semiconductor, Inc. All Rights Reserved.
> + * Copyright 2008 Juergen Beisert, kernel@xxxxxxxxxxxxxx
> + * Copyright 2009 Ilya Yanok, Emcraft Systems Ltd, yanok@xxxxxxxxxxx
> + * Copyright (C) 2011 Wolfram Sang, Pengutronix e.K.
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + */
> +
> +#include <linux/io.h>
> +#include <linux/errno.h>
> +#include <linux/delay.h>
> +#include <linux/module.h>
> +#include <linux/stmp_device.h>
> +
> +#define STMP_MODULE_CLKGATE Â Â(1 << 30)
> +#define STMP_MODULE_SFTRST Â Â (1 << 31)
> +
> +/*
> + * Clear the bit and poll it cleared. ÂThis is usually called with
> + * a reset address and mask being either SFTRST(bit 31) or CLKGATE
> + * (bit 30).
> + */
> +static int stmp_clear_poll_bit(void __iomem *addr, u32 mask)
> +{
> + Â Â Â int timeout = 0x400;
> +
> + Â Â Â writel(mask, addr + STMP_OFFSET_REG_CLR);
> + Â Â Â udelay(1);
> + Â Â Â while ((readl(addr) & mask) && --timeout)
> + Â Â Â Â Â Â Â /* nothing */;
> +
> + Â Â Â return !timeout;
> +}
> +
> +int stmp_reset_block(void __iomem *reset_addr)
> +{
> + Â Â Â int ret;
> + Â Â Â int timeout = 0x400;
> +
> + Â Â Â /* clear and poll SFTRST */
> + Â Â Â ret = stmp_clear_poll_bit(reset_addr, STMP_MODULE_SFTRST);
> + Â Â Â if (unlikely(ret))
> + Â Â Â Â Â Â Â goto error;
> +
> + Â Â Â /* clear CLKGATE */
> + Â Â Â writel(STMP_MODULE_CLKGATE, reset_addr + STMP_OFFSET_REG_CLR);
> +
> + Â Â Â /* set SFTRST to reset the block */
> + Â Â Â writel(STMP_MODULE_SFTRST, reset_addr + STMP_OFFSET_REG_SET);
> + Â Â Â udelay(1);
> +
> + Â Â Â /* poll CLKGATE becoming set */
> + Â Â Â while ((!(readl(reset_addr) & STMP_MODULE_CLKGATE)) && --timeout)
> + Â Â Â Â Â Â Â /* nothing */;
> + Â Â Â if (unlikely(!timeout))
> + Â Â Â Â Â Â Â goto error;
> +
> + Â Â Â /* clear and poll SFTRST */
> + Â Â Â ret = stmp_clear_poll_bit(reset_addr, STMP_MODULE_SFTRST);
> + Â Â Â if (unlikely(ret))
> + Â Â Â Â Â Â Â goto error;
> +
> + Â Â Â /* clear and poll CLKGATE */
> + Â Â Â ret = stmp_clear_poll_bit(reset_addr, STMP_MODULE_CLKGATE);
> + Â Â Â if (unlikely(ret))
> + Â Â Â Â Â Â Â goto error;
> +
> + Â Â Â return 0;
> +
> +error:
> + Â Â Â pr_err("%s(%p): module reset timeout\n", __func__, reset_addr);
> + Â Â Â return -ETIMEDOUT;
> +}
> +EXPORT_SYMBOL(stmp_reset_block);
> --
> 1.7.2.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at Âhttp://vger.kernel.org/majordomo-info.html
> Please read the FAQ at Âhttp://www.tux.org/lkml/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/