From: Jon Hunter <jon-hunter@ti.com> To: Rob Herring <rob.herring@calxeda.com>, Grant Likely <grant.likely@secretlab.ca>, Tony Lindgren <tony@atomide.com>, Benoit Cousson <b-cousson@ti.com> Cc: device-tree <devicetree-discuss@lists.ozlabs.org>, linux-omap <linux-omap@vger.kernel.org>, linux-arm <linux-arm-kernel@lists.infradead.org>, Daniel Mack <zonque@gmail.com>, Ezequiel Garcia <elezegarcia@gmail.com>, Mark Jackson <mpfj-list@mimc.co.uk>, Jon Hunter <jon-hunter@ti.com> Subject: [PATCH V4 15/18] ARM: OMAP2+: Detect incorrectly aligned GPMC base address Date: Tue, 19 Mar 2013 11:35:53 -0500 [thread overview] Message-ID: <1363710956-26773-16-git-send-email-jon-hunter@ti.com> (raw) In-Reply-To: <1363710956-26773-1-git-send-email-jon-hunter@ti.com> Each GPMC chip-select can be configured to map 16MB, 32MB, 64MB or 128MB of address space. The physical base address where a chip-select starts is also configurable and must be aligned on a boundary that is equal to or greater than the size of the address space mapped bt the chip-select. When enabling a GPMC chip-select, ensure that the base address is aligned to the appropriate boundary. Reported-by: Mark Jackson <mpfj-list@mimc.co.uk> Signed-off-by: Jon Hunter <jon-hunter@ti.com> Tested-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> --- arch/arm/mach-omap2/gpmc.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index 94624bf..9797f46 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c @@ -403,11 +403,18 @@ int gpmc_cs_set_timings(int cs, const struct gpmc_timings *t) return 0; } -static void gpmc_cs_enable_mem(int cs, u32 base, u32 size) +static int gpmc_cs_enable_mem(int cs, u32 base, u32 size) { u32 l; u32 mask; + /* + * Ensure that base address is aligned on a + * boundary equal to or greater than size. + */ + if (base & (size - 1)) + return -EINVAL; + mask = (1 << GPMC_SECTION_SHIFT) - size; l = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG7); l &= ~0x3f; @@ -416,6 +423,8 @@ static void gpmc_cs_enable_mem(int cs, u32 base, u32 size) l |= ((mask >> GPMC_CHUNK_SHIFT) & 0x0f) << 8; l |= GPMC_CONFIG7_CSVALID; gpmc_cs_write_reg(cs, GPMC_CS_CONFIG7, l); + + return 0; } static void gpmc_cs_disable_mem(int cs) @@ -526,7 +535,9 @@ static int gpmc_cs_remap(int cs, u32 base) ret = gpmc_cs_insert_mem(cs, base, size); if (ret < 0) return ret; - gpmc_cs_enable_mem(cs, base, size); + ret = gpmc_cs_enable_mem(cs, base, size); + if (ret < 0) + return ret; return 0; } @@ -556,7 +567,12 @@ int gpmc_cs_request(int cs, unsigned long size, unsigned long *base) if (r < 0) goto out; - gpmc_cs_enable_mem(cs, res->start, resource_size(res)); + r = gpmc_cs_enable_mem(cs, res->start, resource_size(res)); + if (r < 0) { + release_resource(res); + goto out; + } + *base = res->start; gpmc_cs_set_reserved(cs, 1); out: -- 1.7.10.4
WARNING: multiple messages have this Message-ID (diff)
From: jon-hunter@ti.com (Jon Hunter) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH V4 15/18] ARM: OMAP2+: Detect incorrectly aligned GPMC base address Date: Tue, 19 Mar 2013 11:35:53 -0500 [thread overview] Message-ID: <1363710956-26773-16-git-send-email-jon-hunter@ti.com> (raw) In-Reply-To: <1363710956-26773-1-git-send-email-jon-hunter@ti.com> Each GPMC chip-select can be configured to map 16MB, 32MB, 64MB or 128MB of address space. The physical base address where a chip-select starts is also configurable and must be aligned on a boundary that is equal to or greater than the size of the address space mapped bt the chip-select. When enabling a GPMC chip-select, ensure that the base address is aligned to the appropriate boundary. Reported-by: Mark Jackson <mpfj-list@mimc.co.uk> Signed-off-by: Jon Hunter <jon-hunter@ti.com> Tested-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> --- arch/arm/mach-omap2/gpmc.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index 94624bf..9797f46 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c @@ -403,11 +403,18 @@ int gpmc_cs_set_timings(int cs, const struct gpmc_timings *t) return 0; } -static void gpmc_cs_enable_mem(int cs, u32 base, u32 size) +static int gpmc_cs_enable_mem(int cs, u32 base, u32 size) { u32 l; u32 mask; + /* + * Ensure that base address is aligned on a + * boundary equal to or greater than size. + */ + if (base & (size - 1)) + return -EINVAL; + mask = (1 << GPMC_SECTION_SHIFT) - size; l = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG7); l &= ~0x3f; @@ -416,6 +423,8 @@ static void gpmc_cs_enable_mem(int cs, u32 base, u32 size) l |= ((mask >> GPMC_CHUNK_SHIFT) & 0x0f) << 8; l |= GPMC_CONFIG7_CSVALID; gpmc_cs_write_reg(cs, GPMC_CS_CONFIG7, l); + + return 0; } static void gpmc_cs_disable_mem(int cs) @@ -526,7 +535,9 @@ static int gpmc_cs_remap(int cs, u32 base) ret = gpmc_cs_insert_mem(cs, base, size); if (ret < 0) return ret; - gpmc_cs_enable_mem(cs, base, size); + ret = gpmc_cs_enable_mem(cs, base, size); + if (ret < 0) + return ret; return 0; } @@ -556,7 +567,12 @@ int gpmc_cs_request(int cs, unsigned long size, unsigned long *base) if (r < 0) goto out; - gpmc_cs_enable_mem(cs, res->start, resource_size(res)); + r = gpmc_cs_enable_mem(cs, res->start, resource_size(res)); + if (r < 0) { + release_resource(res); + goto out; + } + *base = res->start; gpmc_cs_set_reserved(cs, 1); out: -- 1.7.10.4
next prev parent reply other threads:[~2013-03-19 16:35 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-03-19 16:35 [PATCH V4 00/18] ARM: OMAP2+: GPMC clean-up and DT update Jon Hunter 2013-03-19 16:35 ` Jon Hunter 2013-03-19 16:35 ` [PATCH V4 01/18] ARM: OMAP2+: Simplify code configuring ONENAND devices Jon Hunter 2013-03-19 16:35 ` Jon Hunter 2013-03-19 16:35 ` [PATCH V4 02/18] ARM: OMAP2+: Add variable to store number of GPMC waitpins Jon Hunter 2013-03-19 16:35 ` Jon Hunter 2013-03-19 16:35 ` [PATCH V4 03/18] ARM: OMAP2+: Add structure for storing GPMC settings Jon Hunter 2013-03-19 16:35 ` Jon Hunter 2013-03-19 16:35 ` [PATCH V4 04/18] ARM: OMAP2+: Add function for configuring " Jon Hunter 2013-03-19 16:35 ` Jon Hunter 2013-03-19 16:35 ` [PATCH V4 05/18] ARM: OMAP2+: Convert ONENAND to use gpmc_cs_program_settings() Jon Hunter 2013-03-19 16:35 ` Jon Hunter 2013-03-19 16:35 ` [PATCH V4 06/18] ARM: OMAP2+: Convert NAND " Jon Hunter 2013-03-19 16:35 ` Jon Hunter 2013-03-19 16:35 ` [PATCH V4 07/18] ARM: OMAP2+: Convert SMC91x " Jon Hunter 2013-03-19 16:35 ` Jon Hunter 2013-03-19 16:35 ` [PATCH V4 08/18] ARM: OMAP2+: Convert TUSB " Jon Hunter 2013-03-19 16:35 ` Jon Hunter 2013-03-19 16:35 ` [PATCH V4 09/18] ARM: OMAP2+: Don't configure of chip-select options in gpmc_cs_configure() Jon Hunter 2013-03-19 16:35 ` Jon Hunter 2013-03-19 16:35 ` [PATCH V4 10/18] ARM: OMAP2+: Add function to read GPMC settings from device-tree Jon Hunter 2013-03-19 16:35 ` Jon Hunter 2013-04-15 13:27 ` Grant Likely 2013-04-15 13:27 ` Grant Likely 2013-04-15 16:54 ` Jon Hunter 2013-04-15 16:54 ` Jon Hunter 2013-03-19 16:35 ` [PATCH V4 11/18] ARM: OMAP2+: Add additional GPMC timing parameters Jon Hunter 2013-03-19 16:35 ` Jon Hunter 2013-03-19 16:35 ` [PATCH V4 12/18] ARM: OMAP2+: Add device-tree support for NOR flash Jon Hunter 2013-03-19 16:35 ` Jon Hunter 2013-03-19 16:35 ` [PATCH V4 13/18] ARM: OMAP2+: Convert NAND to retrieve GPMC settings from DT Jon Hunter 2013-03-19 16:35 ` Jon Hunter 2013-03-19 16:35 ` [PATCH V4 14/18] ARM: OMAP2+: Convert ONENAND " Jon Hunter 2013-03-19 16:35 ` Jon Hunter 2013-03-19 16:35 ` Jon Hunter [this message] 2013-03-19 16:35 ` [PATCH V4 15/18] ARM: OMAP2+: Detect incorrectly aligned GPMC base address Jon Hunter 2013-03-19 16:35 ` [PATCH V4 16/18] ARM: OMAP2+: Remove unnecesssary GPMC definitions and variable Jon Hunter 2013-03-19 16:35 ` Jon Hunter 2013-03-19 16:35 ` [PATCH V4 17/18] ARM: OMAP2+: Allow GPMC probe to complete even if CS mapping fails Jon Hunter 2013-03-19 16:35 ` Jon Hunter 2013-03-19 16:35 ` [PATCH V4 18/18] ARM: OMAP2+: return -ENODEV if GPMC child device creation fails Jon Hunter 2013-03-19 16:35 ` Jon Hunter
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=1363710956-26773-16-git-send-email-jon-hunter@ti.com \ --to=jon-hunter@ti.com \ --cc=b-cousson@ti.com \ --cc=devicetree-discuss@lists.ozlabs.org \ --cc=elezegarcia@gmail.com \ --cc=grant.likely@secretlab.ca \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-omap@vger.kernel.org \ --cc=mpfj-list@mimc.co.uk \ --cc=rob.herring@calxeda.com \ --cc=tony@atomide.com \ --cc=zonque@gmail.com \ /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.