From: Icenowy Zheng <icenowy-ymACFijhrKM@public.gmane.org> To: Srinivas Kandagatla <srinivas.kandagatla-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>, Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>, Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>, Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org> Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org, Icenowy Zheng <icenowy-ymACFijhrKM@public.gmane.org> Subject: [PATCH v3 2/3] nvmem: sunxi-sid: add support for H3's SID controller Date: Thu, 2 Feb 2017 21:13:37 +0800 [thread overview] Message-ID: <20170202131338.20234-2-icenowy@aosc.xyz> (raw) In-Reply-To: <20170202131338.20234-1-icenowy-ymACFijhrKM@public.gmane.org> The H3 SoC have a bigger SID controller, which has its direct read address at 0x200 position in the SID block, not 0x0. Also, H3 SID controller has some silicon bug that makes the direct read value wrong at cold boot, add code to workaround the bug. (This bug has already been fixed on A64 and later SoCs) Signed-off-by: Icenowy Zheng <icenowy-ymACFijhrKM@public.gmane.org> --- This patch is the part of [PATCH v2 1/1] that adds support for H3 SID controller. .../bindings/nvmem/allwinner,sunxi-sid.txt | 12 +++- drivers/nvmem/sunxi_sid.c | 72 +++++++++++++++++++++- 2 files changed, 82 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt b/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt index d543ed3f5363..9ab9e75a6351 100644 --- a/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt +++ b/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt @@ -1,7 +1,11 @@ Allwinner sunxi-sid Required properties: -- compatible: "allwinner,sun4i-a10-sid" or "allwinner,sun7i-a20-sid" +- compatible: Should be one of the following (depending on your SoC): + "allwinner,sun4i-a10-sid" + "allwinner,sun7i-a20-sid" + "allwinner,sun8i-h3-sid" + - reg: Should contain registers location and length = Data cells = @@ -19,3 +23,9 @@ Example for sun7i: compatible = "allwinner,sun7i-a20-sid"; reg = <0x01c23800 0x200> }; + +Example for sun8i-h3: + sid@01c14000 { + compatible = "allwinner,sun8i-h3-sid"; + reg = <0x01c14000 0x400>; + }; diff --git a/drivers/nvmem/sunxi_sid.c b/drivers/nvmem/sunxi_sid.c index 69524b67007f..476a161ff23a 100644 --- a/drivers/nvmem/sunxi_sid.c +++ b/drivers/nvmem/sunxi_sid.c @@ -25,6 +25,16 @@ #include <linux/slab.h> #include <linux/random.h> +/* Registers and special values for doing register-based SID readout on H3 */ +#define SUN8I_SID_PRCTL 0x40 +#define SUN8I_SID_RDKEY 0x60 + +#define SUN8I_SID_OP_LOCK 0xAC +#define SUN8I_SID_OFFSET_MASK 0x1FF +#define SUN8I_SID_OFFSET_SHIFT 16 +#define SUN8I_SID_LOCK_SHIFT 8 +#define SUN8I_SID_READ BIT(1) + static struct nvmem_config econfig = { .name = "sunxi-sid", .read_only = true, @@ -34,11 +44,14 @@ static struct nvmem_config econfig = { }; struct sunxi_sid_cfg { + u32 value_offset; u32 size; + bool need_register_readout; }; struct sunxi_sid { void __iomem *base; + u32 value_offset; }; /* We read the entire key, due to a 32 bit read alignment requirement. Since we @@ -51,7 +64,8 @@ static u8 sunxi_sid_read_byte(const struct sunxi_sid *sid, { u32 sid_key; - sid_key = ioread32be(sid->base + round_down(offset, 4)); + sid_key = ioread32be(sid->base + sid->value_offset + + round_down(offset, 4)); sid_key >>= (offset % 4) * 8; return sid_key; /* Only return the last byte */ @@ -69,6 +83,33 @@ static int sunxi_sid_read(void *context, unsigned int offset, return 0; } +static int sun8i_sid_register_readout(const struct sunxi_sid *sid, + const unsigned int word, + u32 *out) +{ + u32 reg_val; + unsigned long expire = jiffies + msecs_to_jiffies(250); + + /* Set word, lock access, and set read command */ + reg_val = (word & SUN8I_SID_OFFSET_MASK) + << SUN8I_SID_OFFSET_SHIFT; + reg_val |= SUN8I_SID_OP_LOCK << SUN8I_SID_LOCK_SHIFT; + reg_val |= SUN8I_SID_READ; + writel(reg_val, sid->base + SUN8I_SID_PRCTL); + + do { + reg_val = readl(sid->base + SUN8I_SID_PRCTL); + } while (time_before(jiffies, expire) && (reg_val & SUN8I_SID_READ)); + + if (reg_val & SUN8I_SID_READ) + return -EIO; + + if (out) + *out = readl(sid->base + SUN8I_SID_RDKEY); + writel(0, sid->base + SUN8I_SID_PRCTL); + return 0; +} + static int sunxi_sid_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -86,6 +127,7 @@ static int sunxi_sid_probe(struct platform_device *pdev) cfg = of_device_get_match_data(dev); if (!cfg) return -EINVAL; + sid->value_offset = cfg->value_offset; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); sid->base = devm_ioremap_resource(dev, res); @@ -94,6 +136,23 @@ static int sunxi_sid_probe(struct platform_device *pdev) size = cfg->size; + if (cfg->need_register_readout) { + /* + * H3's SID controller have a bug that the value at 0x200 + * offset is not the correct value when the hardware is reset. + * However, after doing a register-based read operation, the + * value become right. + * Do a full read operation here, but ignore its value + * (as it's more fast to read by direct MMIO value than + * with registers) + */ + for (i = 0; i < (size >> 2); i++) { + ret = sun8i_sid_register_readout(sid, i, NULL); + if (ret) + return ret; + } + } + econfig.size = size; econfig.dev = dev; econfig.reg_read = sunxi_sid_read; @@ -131,16 +190,27 @@ static int sunxi_sid_remove(struct platform_device *pdev) } static const struct sunxi_sid_cfg sun4i_a10_cfg = { + .value_offset = 0, .size = 0x10, + .need_register_readout = false, }; static const struct sunxi_sid_cfg sun7i_a20_cfg = { + .value_offset = 0, .size = 0x200, + .need_register_readout = false, +}; + +static const struct sunxi_sid_cfg sun8i_h3_cfg = { + .value_offset = 0x200, + .size = 0x100, + .need_register_readout = true, }; static const struct of_device_id sunxi_sid_of_match[] = { { .compatible = "allwinner,sun4i-a10-sid", .data = &sun4i_a10_cfg }, { .compatible = "allwinner,sun7i-a20-sid", .data = &sun7i_a20_cfg }, + { .compatible = "allwinner,sun8i-h3-sid", .data = &sun8i_h3_cfg }, {/* sentinel */}, }; MODULE_DEVICE_TABLE(of, sunxi_sid_of_match); -- 2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: icenowy@aosc.xyz (Icenowy Zheng) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 2/3] nvmem: sunxi-sid: add support for H3's SID controller Date: Thu, 2 Feb 2017 21:13:37 +0800 [thread overview] Message-ID: <20170202131338.20234-2-icenowy@aosc.xyz> (raw) In-Reply-To: <20170202131338.20234-1-icenowy@aosc.xyz> The H3 SoC have a bigger SID controller, which has its direct read address at 0x200 position in the SID block, not 0x0. Also, H3 SID controller has some silicon bug that makes the direct read value wrong at cold boot, add code to workaround the bug. (This bug has already been fixed on A64 and later SoCs) Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz> --- This patch is the part of [PATCH v2 1/1] that adds support for H3 SID controller. .../bindings/nvmem/allwinner,sunxi-sid.txt | 12 +++- drivers/nvmem/sunxi_sid.c | 72 +++++++++++++++++++++- 2 files changed, 82 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt b/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt index d543ed3f5363..9ab9e75a6351 100644 --- a/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt +++ b/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt @@ -1,7 +1,11 @@ Allwinner sunxi-sid Required properties: -- compatible: "allwinner,sun4i-a10-sid" or "allwinner,sun7i-a20-sid" +- compatible: Should be one of the following (depending on your SoC): + "allwinner,sun4i-a10-sid" + "allwinner,sun7i-a20-sid" + "allwinner,sun8i-h3-sid" + - reg: Should contain registers location and length = Data cells = @@ -19,3 +23,9 @@ Example for sun7i: compatible = "allwinner,sun7i-a20-sid"; reg = <0x01c23800 0x200> }; + +Example for sun8i-h3: + sid at 01c14000 { + compatible = "allwinner,sun8i-h3-sid"; + reg = <0x01c14000 0x400>; + }; diff --git a/drivers/nvmem/sunxi_sid.c b/drivers/nvmem/sunxi_sid.c index 69524b67007f..476a161ff23a 100644 --- a/drivers/nvmem/sunxi_sid.c +++ b/drivers/nvmem/sunxi_sid.c @@ -25,6 +25,16 @@ #include <linux/slab.h> #include <linux/random.h> +/* Registers and special values for doing register-based SID readout on H3 */ +#define SUN8I_SID_PRCTL 0x40 +#define SUN8I_SID_RDKEY 0x60 + +#define SUN8I_SID_OP_LOCK 0xAC +#define SUN8I_SID_OFFSET_MASK 0x1FF +#define SUN8I_SID_OFFSET_SHIFT 16 +#define SUN8I_SID_LOCK_SHIFT 8 +#define SUN8I_SID_READ BIT(1) + static struct nvmem_config econfig = { .name = "sunxi-sid", .read_only = true, @@ -34,11 +44,14 @@ static struct nvmem_config econfig = { }; struct sunxi_sid_cfg { + u32 value_offset; u32 size; + bool need_register_readout; }; struct sunxi_sid { void __iomem *base; + u32 value_offset; }; /* We read the entire key, due to a 32 bit read alignment requirement. Since we @@ -51,7 +64,8 @@ static u8 sunxi_sid_read_byte(const struct sunxi_sid *sid, { u32 sid_key; - sid_key = ioread32be(sid->base + round_down(offset, 4)); + sid_key = ioread32be(sid->base + sid->value_offset + + round_down(offset, 4)); sid_key >>= (offset % 4) * 8; return sid_key; /* Only return the last byte */ @@ -69,6 +83,33 @@ static int sunxi_sid_read(void *context, unsigned int offset, return 0; } +static int sun8i_sid_register_readout(const struct sunxi_sid *sid, + const unsigned int word, + u32 *out) +{ + u32 reg_val; + unsigned long expire = jiffies + msecs_to_jiffies(250); + + /* Set word, lock access, and set read command */ + reg_val = (word & SUN8I_SID_OFFSET_MASK) + << SUN8I_SID_OFFSET_SHIFT; + reg_val |= SUN8I_SID_OP_LOCK << SUN8I_SID_LOCK_SHIFT; + reg_val |= SUN8I_SID_READ; + writel(reg_val, sid->base + SUN8I_SID_PRCTL); + + do { + reg_val = readl(sid->base + SUN8I_SID_PRCTL); + } while (time_before(jiffies, expire) && (reg_val & SUN8I_SID_READ)); + + if (reg_val & SUN8I_SID_READ) + return -EIO; + + if (out) + *out = readl(sid->base + SUN8I_SID_RDKEY); + writel(0, sid->base + SUN8I_SID_PRCTL); + return 0; +} + static int sunxi_sid_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -86,6 +127,7 @@ static int sunxi_sid_probe(struct platform_device *pdev) cfg = of_device_get_match_data(dev); if (!cfg) return -EINVAL; + sid->value_offset = cfg->value_offset; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); sid->base = devm_ioremap_resource(dev, res); @@ -94,6 +136,23 @@ static int sunxi_sid_probe(struct platform_device *pdev) size = cfg->size; + if (cfg->need_register_readout) { + /* + * H3's SID controller have a bug that the value at 0x200 + * offset is not the correct value when the hardware is reset. + * However, after doing a register-based read operation, the + * value become right. + * Do a full read operation here, but ignore its value + * (as it's more fast to read by direct MMIO value than + * with registers) + */ + for (i = 0; i < (size >> 2); i++) { + ret = sun8i_sid_register_readout(sid, i, NULL); + if (ret) + return ret; + } + } + econfig.size = size; econfig.dev = dev; econfig.reg_read = sunxi_sid_read; @@ -131,16 +190,27 @@ static int sunxi_sid_remove(struct platform_device *pdev) } static const struct sunxi_sid_cfg sun4i_a10_cfg = { + .value_offset = 0, .size = 0x10, + .need_register_readout = false, }; static const struct sunxi_sid_cfg sun7i_a20_cfg = { + .value_offset = 0, .size = 0x200, + .need_register_readout = false, +}; + +static const struct sunxi_sid_cfg sun8i_h3_cfg = { + .value_offset = 0x200, + .size = 0x100, + .need_register_readout = true, }; static const struct of_device_id sunxi_sid_of_match[] = { { .compatible = "allwinner,sun4i-a10-sid", .data = &sun4i_a10_cfg }, { .compatible = "allwinner,sun7i-a20-sid", .data = &sun7i_a20_cfg }, + { .compatible = "allwinner,sun8i-h3-sid", .data = &sun8i_h3_cfg }, {/* sentinel */}, }; MODULE_DEVICE_TABLE(of, sunxi_sid_of_match); -- 2.11.0
next prev parent reply other threads:[~2017-02-02 13:13 UTC|newest] Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-02-02 13:13 [PATCH v3 1/3] nvmem: sunxi-sid: read NVMEM size from device compatible Icenowy Zheng 2017-02-02 13:13 ` Icenowy Zheng [not found] ` <20170202131338.20234-1-icenowy-ymACFijhrKM@public.gmane.org> 2017-02-02 13:13 ` Icenowy Zheng [this message] 2017-02-02 13:13 ` [PATCH v3 2/3] nvmem: sunxi-sid: add support for H3's SID controller Icenowy Zheng 2017-02-06 8:54 ` Maxime Ripard 2017-02-06 8:54 ` Maxime Ripard 2017-02-06 8:54 ` Maxime Ripard 2017-02-06 8:56 ` Icenowy Zheng 2017-02-06 8:56 ` Icenowy Zheng 2017-02-07 9:25 ` Maxime Ripard 2017-02-07 9:25 ` Maxime Ripard 2017-02-07 9:25 ` Maxime Ripard 2017-02-07 13:36 ` Icenowy Zheng 2017-02-07 13:36 ` Icenowy Zheng 2017-02-10 8:05 ` Maxime Ripard 2017-02-10 8:05 ` Maxime Ripard 2017-02-10 8:05 ` Maxime Ripard 2017-02-02 13:13 ` [PATCH v3 3/3] ARM: dts: sun8i: enable SID on Allwinner H3 SoC Icenowy Zheng 2017-02-02 13:13 ` Icenowy Zheng 2017-02-06 8:48 ` [PATCH v3 1/3] nvmem: sunxi-sid: read NVMEM size from device compatible Maxime Ripard 2017-02-06 8:48 ` Maxime Ripard 2017-02-06 8:48 ` Maxime Ripard
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170202131338.20234-2-icenowy@aosc.xyz \ --to=icenowy-ymacfijhrkm@public.gmane.org \ --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \ --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org \ --cc=maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org \ --cc=robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \ --cc=srinivas.kandagatla-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \ --cc=wens-jdAy2FN1RRM@public.gmane.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.