2019-05-29 00:10:09 +07:00
|
|
|
// SPDX-License-Identifier: GPL-2.0-only
|
2015-11-30 09:48:55 +07:00
|
|
|
/*
|
|
|
|
* Common CPM code
|
|
|
|
*
|
|
|
|
* Author: Scott Wood <scottwood@freescale.com>
|
|
|
|
*
|
|
|
|
* Copyright 2007-2008,2010 Freescale Semiconductor, Inc.
|
|
|
|
*
|
|
|
|
* Some parts derived from commproc.c/cpm2_common.c, which is:
|
|
|
|
* Copyright (c) 1997 Dan error_act (dmalek@jlc.net)
|
|
|
|
* Copyright (c) 1999-2001 Dan Malek <dan@embeddedalley.com>
|
|
|
|
* Copyright (c) 2000 MontaVista Software, Inc (source@mvista.com)
|
|
|
|
* 2006 (c) MontaVista Software, Inc.
|
|
|
|
* Vitaly Bordug <vbordug@ru.mvista.com>
|
|
|
|
*/
|
|
|
|
#include <linux/genalloc.h>
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/list.h>
|
|
|
|
#include <linux/of_device.h>
|
|
|
|
#include <linux/spinlock.h>
|
|
|
|
#include <linux/export.h>
|
|
|
|
#include <linux/of.h>
|
|
|
|
#include <linux/of_address.h>
|
|
|
|
#include <linux/slab.h>
|
|
|
|
#include <linux/io.h>
|
2015-11-30 09:48:57 +07:00
|
|
|
#include <soc/fsl/qe/qe.h>
|
2015-11-30 09:48:55 +07:00
|
|
|
|
|
|
|
static struct gen_pool *muram_pool;
|
|
|
|
static spinlock_t cpm_muram_lock;
|
|
|
|
static u8 __iomem *muram_vbase;
|
|
|
|
static phys_addr_t muram_pbase;
|
|
|
|
|
|
|
|
struct muram_block {
|
|
|
|
struct list_head head;
|
soc: fsl: qe: change return type of cpm_muram_alloc() to s32
There are a number of problems with cpm_muram_alloc() and its
callers. Most callers assign the return value to some variable and
then use IS_ERR_VALUE to check for allocation failure. However, when
that variable is not sizeof(long), this leads to warnings - and it is
indeed broken to do e.g.
u32 foo = cpm_muram_alloc();
if (IS_ERR_VALUE(foo))
on a 64-bit platform, since the condition
foo >= (unsigned long)-ENOMEM
is tautologically false. There are also callers that ignore the
possibility of error, and then there are those that check for error by
comparing the return value to 0...
One could fix that by changing all callers to store the return value
temporarily in an "unsigned long" and test that. However, use of
IS_ERR_VALUE() is error-prone and should be restricted to things which
are inherently long-sized (stuff in pt_regs etc.). Instead, let's aim
for changing to the standard kernel style
int foo = cpm_muram_alloc();
if (foo < 0)
deal_with_it()
some->where = foo;
Changing the return type from unsigned long to s32 (aka signed int)
doesn't change the value that gets stored into any of the callers'
variables except if the caller was storing the result in a u64 _and_
the allocation failed, so in itself this patch should be a no-op.
Another problem with cpm_muram_alloc() is that it can certainly
validly return 0 - and except if some cpm_muram_alloc_fixed() call
interferes, the very first cpm_muram_alloc() call will return just
that. But that shows that both ucc_slow_free() and ucc_fast_free() are
buggy, since they assume that a value of 0 means "that field was never
allocated". We'll later change cpm_muram_free() to accept (and ignore)
a negative offset, so callers can use a sentinel of -1 instead of 0
and just unconditionally call cpm_muram_free().
Reviewed-by: Timur Tabi <timur@kernel.org>
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: Li Yang <leoyang.li@nxp.com>
2019-11-28 21:55:40 +07:00
|
|
|
s32 start;
|
2015-11-30 09:48:55 +07:00
|
|
|
int size;
|
|
|
|
};
|
|
|
|
|
|
|
|
static LIST_HEAD(muram_block_list);
|
|
|
|
|
|
|
|
/* max address size we deal with */
|
|
|
|
#define OF_MAX_ADDR_CELLS 4
|
|
|
|
#define GENPOOL_OFFSET (4096 * 8)
|
|
|
|
|
|
|
|
int cpm_muram_init(void)
|
|
|
|
{
|
|
|
|
struct device_node *np;
|
|
|
|
struct resource r;
|
2020-03-13 03:41:43 +07:00
|
|
|
__be32 zero[OF_MAX_ADDR_CELLS] = {};
|
2015-11-30 09:48:55 +07:00
|
|
|
resource_size_t max = 0;
|
|
|
|
int i = 0;
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
if (muram_pbase)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
spin_lock_init(&cpm_muram_lock);
|
|
|
|
np = of_find_compatible_node(NULL, NULL, "fsl,cpm-muram-data");
|
|
|
|
if (!np) {
|
|
|
|
/* try legacy bindings */
|
|
|
|
np = of_find_node_by_name(NULL, "data-only");
|
|
|
|
if (!np) {
|
|
|
|
pr_err("Cannot find CPM muram data node");
|
|
|
|
ret = -ENODEV;
|
|
|
|
goto out_muram;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
muram_pool = gen_pool_create(0, -1);
|
2016-08-16 13:26:20 +07:00
|
|
|
if (!muram_pool) {
|
|
|
|
pr_err("Cannot allocate memory pool for CPM/QE muram");
|
|
|
|
ret = -ENOMEM;
|
|
|
|
goto out_muram;
|
|
|
|
}
|
2015-11-30 09:48:55 +07:00
|
|
|
muram_pbase = of_translate_address(np, zero);
|
|
|
|
if (muram_pbase == (phys_addr_t)OF_BAD_ADDR) {
|
|
|
|
pr_err("Cannot translate zero through CPM muram node");
|
|
|
|
ret = -ENODEV;
|
|
|
|
goto out_pool;
|
|
|
|
}
|
|
|
|
|
|
|
|
while (of_address_to_resource(np, i++, &r) == 0) {
|
|
|
|
if (r.end > max)
|
|
|
|
max = r.end;
|
|
|
|
ret = gen_pool_add(muram_pool, r.start - muram_pbase +
|
|
|
|
GENPOOL_OFFSET, resource_size(&r), -1);
|
|
|
|
if (ret) {
|
|
|
|
pr_err("QE: couldn't add muram to pool!\n");
|
|
|
|
goto out_pool;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
muram_vbase = ioremap(muram_pbase, max - muram_pbase + 1);
|
|
|
|
if (!muram_vbase) {
|
|
|
|
pr_err("Cannot map QE muram");
|
|
|
|
ret = -ENOMEM;
|
|
|
|
goto out_pool;
|
|
|
|
}
|
|
|
|
goto out_muram;
|
|
|
|
out_pool:
|
|
|
|
gen_pool_destroy(muram_pool);
|
|
|
|
out_muram:
|
|
|
|
of_node_put(np);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2016-01-26 15:52:01 +07:00
|
|
|
/*
|
|
|
|
* cpm_muram_alloc_common - cpm_muram_alloc common code
|
|
|
|
* @size: number of bytes to allocate
|
|
|
|
* @algo: algorithm for alloc.
|
|
|
|
* @data: data for genalloc's algorithm.
|
|
|
|
*
|
soc: fsl: qe: change return type of cpm_muram_alloc() to s32
There are a number of problems with cpm_muram_alloc() and its
callers. Most callers assign the return value to some variable and
then use IS_ERR_VALUE to check for allocation failure. However, when
that variable is not sizeof(long), this leads to warnings - and it is
indeed broken to do e.g.
u32 foo = cpm_muram_alloc();
if (IS_ERR_VALUE(foo))
on a 64-bit platform, since the condition
foo >= (unsigned long)-ENOMEM
is tautologically false. There are also callers that ignore the
possibility of error, and then there are those that check for error by
comparing the return value to 0...
One could fix that by changing all callers to store the return value
temporarily in an "unsigned long" and test that. However, use of
IS_ERR_VALUE() is error-prone and should be restricted to things which
are inherently long-sized (stuff in pt_regs etc.). Instead, let's aim
for changing to the standard kernel style
int foo = cpm_muram_alloc();
if (foo < 0)
deal_with_it()
some->where = foo;
Changing the return type from unsigned long to s32 (aka signed int)
doesn't change the value that gets stored into any of the callers'
variables except if the caller was storing the result in a u64 _and_
the allocation failed, so in itself this patch should be a no-op.
Another problem with cpm_muram_alloc() is that it can certainly
validly return 0 - and except if some cpm_muram_alloc_fixed() call
interferes, the very first cpm_muram_alloc() call will return just
that. But that shows that both ucc_slow_free() and ucc_fast_free() are
buggy, since they assume that a value of 0 means "that field was never
allocated". We'll later change cpm_muram_free() to accept (and ignore)
a negative offset, so callers can use a sentinel of -1 instead of 0
and just unconditionally call cpm_muram_free().
Reviewed-by: Timur Tabi <timur@kernel.org>
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: Li Yang <leoyang.li@nxp.com>
2019-11-28 21:55:40 +07:00
|
|
|
* This function returns a non-negative offset into the muram area, or
|
|
|
|
* a negative errno on failure.
|
2016-01-26 15:52:01 +07:00
|
|
|
*/
|
soc: fsl: qe: change return type of cpm_muram_alloc() to s32
There are a number of problems with cpm_muram_alloc() and its
callers. Most callers assign the return value to some variable and
then use IS_ERR_VALUE to check for allocation failure. However, when
that variable is not sizeof(long), this leads to warnings - and it is
indeed broken to do e.g.
u32 foo = cpm_muram_alloc();
if (IS_ERR_VALUE(foo))
on a 64-bit platform, since the condition
foo >= (unsigned long)-ENOMEM
is tautologically false. There are also callers that ignore the
possibility of error, and then there are those that check for error by
comparing the return value to 0...
One could fix that by changing all callers to store the return value
temporarily in an "unsigned long" and test that. However, use of
IS_ERR_VALUE() is error-prone and should be restricted to things which
are inherently long-sized (stuff in pt_regs etc.). Instead, let's aim
for changing to the standard kernel style
int foo = cpm_muram_alloc();
if (foo < 0)
deal_with_it()
some->where = foo;
Changing the return type from unsigned long to s32 (aka signed int)
doesn't change the value that gets stored into any of the callers'
variables except if the caller was storing the result in a u64 _and_
the allocation failed, so in itself this patch should be a no-op.
Another problem with cpm_muram_alloc() is that it can certainly
validly return 0 - and except if some cpm_muram_alloc_fixed() call
interferes, the very first cpm_muram_alloc() call will return just
that. But that shows that both ucc_slow_free() and ucc_fast_free() are
buggy, since they assume that a value of 0 means "that field was never
allocated". We'll later change cpm_muram_free() to accept (and ignore)
a negative offset, so callers can use a sentinel of -1 instead of 0
and just unconditionally call cpm_muram_free().
Reviewed-by: Timur Tabi <timur@kernel.org>
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: Li Yang <leoyang.li@nxp.com>
2019-11-28 21:55:40 +07:00
|
|
|
static s32 cpm_muram_alloc_common(unsigned long size,
|
|
|
|
genpool_algo_t algo, void *data)
|
2016-01-26 15:52:01 +07:00
|
|
|
{
|
|
|
|
struct muram_block *entry;
|
soc: fsl: qe: change return type of cpm_muram_alloc() to s32
There are a number of problems with cpm_muram_alloc() and its
callers. Most callers assign the return value to some variable and
then use IS_ERR_VALUE to check for allocation failure. However, when
that variable is not sizeof(long), this leads to warnings - and it is
indeed broken to do e.g.
u32 foo = cpm_muram_alloc();
if (IS_ERR_VALUE(foo))
on a 64-bit platform, since the condition
foo >= (unsigned long)-ENOMEM
is tautologically false. There are also callers that ignore the
possibility of error, and then there are those that check for error by
comparing the return value to 0...
One could fix that by changing all callers to store the return value
temporarily in an "unsigned long" and test that. However, use of
IS_ERR_VALUE() is error-prone and should be restricted to things which
are inherently long-sized (stuff in pt_regs etc.). Instead, let's aim
for changing to the standard kernel style
int foo = cpm_muram_alloc();
if (foo < 0)
deal_with_it()
some->where = foo;
Changing the return type from unsigned long to s32 (aka signed int)
doesn't change the value that gets stored into any of the callers'
variables except if the caller was storing the result in a u64 _and_
the allocation failed, so in itself this patch should be a no-op.
Another problem with cpm_muram_alloc() is that it can certainly
validly return 0 - and except if some cpm_muram_alloc_fixed() call
interferes, the very first cpm_muram_alloc() call will return just
that. But that shows that both ucc_slow_free() and ucc_fast_free() are
buggy, since they assume that a value of 0 means "that field was never
allocated". We'll later change cpm_muram_free() to accept (and ignore)
a negative offset, so callers can use a sentinel of -1 instead of 0
and just unconditionally call cpm_muram_free().
Reviewed-by: Timur Tabi <timur@kernel.org>
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: Li Yang <leoyang.li@nxp.com>
2019-11-28 21:55:40 +07:00
|
|
|
s32 start;
|
2016-01-26 15:52:01 +07:00
|
|
|
|
2019-11-28 21:55:44 +07:00
|
|
|
entry = kmalloc(sizeof(*entry), GFP_ATOMIC);
|
|
|
|
if (!entry)
|
|
|
|
return -ENOMEM;
|
2016-01-26 15:52:01 +07:00
|
|
|
start = gen_pool_alloc_algo(muram_pool, size, algo, data);
|
2019-11-28 21:55:44 +07:00
|
|
|
if (!start) {
|
|
|
|
kfree(entry);
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
2016-01-26 15:52:01 +07:00
|
|
|
start = start - GENPOOL_OFFSET;
|
|
|
|
memset_io(cpm_muram_addr(start), 0, size);
|
|
|
|
entry->start = start;
|
|
|
|
entry->size = size;
|
|
|
|
list_add(&entry->head, &muram_block_list);
|
|
|
|
|
|
|
|
return start;
|
|
|
|
}
|
|
|
|
|
2015-11-30 09:48:55 +07:00
|
|
|
/*
|
|
|
|
* cpm_muram_alloc - allocate the requested size worth of multi-user ram
|
|
|
|
* @size: number of bytes to allocate
|
|
|
|
* @align: requested alignment, in bytes
|
|
|
|
*
|
soc: fsl: qe: change return type of cpm_muram_alloc() to s32
There are a number of problems with cpm_muram_alloc() and its
callers. Most callers assign the return value to some variable and
then use IS_ERR_VALUE to check for allocation failure. However, when
that variable is not sizeof(long), this leads to warnings - and it is
indeed broken to do e.g.
u32 foo = cpm_muram_alloc();
if (IS_ERR_VALUE(foo))
on a 64-bit platform, since the condition
foo >= (unsigned long)-ENOMEM
is tautologically false. There are also callers that ignore the
possibility of error, and then there are those that check for error by
comparing the return value to 0...
One could fix that by changing all callers to store the return value
temporarily in an "unsigned long" and test that. However, use of
IS_ERR_VALUE() is error-prone and should be restricted to things which
are inherently long-sized (stuff in pt_regs etc.). Instead, let's aim
for changing to the standard kernel style
int foo = cpm_muram_alloc();
if (foo < 0)
deal_with_it()
some->where = foo;
Changing the return type from unsigned long to s32 (aka signed int)
doesn't change the value that gets stored into any of the callers'
variables except if the caller was storing the result in a u64 _and_
the allocation failed, so in itself this patch should be a no-op.
Another problem with cpm_muram_alloc() is that it can certainly
validly return 0 - and except if some cpm_muram_alloc_fixed() call
interferes, the very first cpm_muram_alloc() call will return just
that. But that shows that both ucc_slow_free() and ucc_fast_free() are
buggy, since they assume that a value of 0 means "that field was never
allocated". We'll later change cpm_muram_free() to accept (and ignore)
a negative offset, so callers can use a sentinel of -1 instead of 0
and just unconditionally call cpm_muram_free().
Reviewed-by: Timur Tabi <timur@kernel.org>
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: Li Yang <leoyang.li@nxp.com>
2019-11-28 21:55:40 +07:00
|
|
|
* This function returns a non-negative offset into the muram area, or
|
|
|
|
* a negative errno on failure.
|
2015-11-30 09:48:55 +07:00
|
|
|
* Use cpm_dpram_addr() to get the virtual address of the area.
|
|
|
|
* Use cpm_muram_free() to free the allocation.
|
|
|
|
*/
|
soc: fsl: qe: change return type of cpm_muram_alloc() to s32
There are a number of problems with cpm_muram_alloc() and its
callers. Most callers assign the return value to some variable and
then use IS_ERR_VALUE to check for allocation failure. However, when
that variable is not sizeof(long), this leads to warnings - and it is
indeed broken to do e.g.
u32 foo = cpm_muram_alloc();
if (IS_ERR_VALUE(foo))
on a 64-bit platform, since the condition
foo >= (unsigned long)-ENOMEM
is tautologically false. There are also callers that ignore the
possibility of error, and then there are those that check for error by
comparing the return value to 0...
One could fix that by changing all callers to store the return value
temporarily in an "unsigned long" and test that. However, use of
IS_ERR_VALUE() is error-prone and should be restricted to things which
are inherently long-sized (stuff in pt_regs etc.). Instead, let's aim
for changing to the standard kernel style
int foo = cpm_muram_alloc();
if (foo < 0)
deal_with_it()
some->where = foo;
Changing the return type from unsigned long to s32 (aka signed int)
doesn't change the value that gets stored into any of the callers'
variables except if the caller was storing the result in a u64 _and_
the allocation failed, so in itself this patch should be a no-op.
Another problem with cpm_muram_alloc() is that it can certainly
validly return 0 - and except if some cpm_muram_alloc_fixed() call
interferes, the very first cpm_muram_alloc() call will return just
that. But that shows that both ucc_slow_free() and ucc_fast_free() are
buggy, since they assume that a value of 0 means "that field was never
allocated". We'll later change cpm_muram_free() to accept (and ignore)
a negative offset, so callers can use a sentinel of -1 instead of 0
and just unconditionally call cpm_muram_free().
Reviewed-by: Timur Tabi <timur@kernel.org>
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: Li Yang <leoyang.li@nxp.com>
2019-11-28 21:55:40 +07:00
|
|
|
s32 cpm_muram_alloc(unsigned long size, unsigned long align)
|
2015-11-30 09:48:55 +07:00
|
|
|
{
|
soc: fsl: qe: change return type of cpm_muram_alloc() to s32
There are a number of problems with cpm_muram_alloc() and its
callers. Most callers assign the return value to some variable and
then use IS_ERR_VALUE to check for allocation failure. However, when
that variable is not sizeof(long), this leads to warnings - and it is
indeed broken to do e.g.
u32 foo = cpm_muram_alloc();
if (IS_ERR_VALUE(foo))
on a 64-bit platform, since the condition
foo >= (unsigned long)-ENOMEM
is tautologically false. There are also callers that ignore the
possibility of error, and then there are those that check for error by
comparing the return value to 0...
One could fix that by changing all callers to store the return value
temporarily in an "unsigned long" and test that. However, use of
IS_ERR_VALUE() is error-prone and should be restricted to things which
are inherently long-sized (stuff in pt_regs etc.). Instead, let's aim
for changing to the standard kernel style
int foo = cpm_muram_alloc();
if (foo < 0)
deal_with_it()
some->where = foo;
Changing the return type from unsigned long to s32 (aka signed int)
doesn't change the value that gets stored into any of the callers'
variables except if the caller was storing the result in a u64 _and_
the allocation failed, so in itself this patch should be a no-op.
Another problem with cpm_muram_alloc() is that it can certainly
validly return 0 - and except if some cpm_muram_alloc_fixed() call
interferes, the very first cpm_muram_alloc() call will return just
that. But that shows that both ucc_slow_free() and ucc_fast_free() are
buggy, since they assume that a value of 0 means "that field was never
allocated". We'll later change cpm_muram_free() to accept (and ignore)
a negative offset, so callers can use a sentinel of -1 instead of 0
and just unconditionally call cpm_muram_free().
Reviewed-by: Timur Tabi <timur@kernel.org>
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: Li Yang <leoyang.li@nxp.com>
2019-11-28 21:55:40 +07:00
|
|
|
s32 start;
|
2015-11-30 09:48:55 +07:00
|
|
|
unsigned long flags;
|
|
|
|
struct genpool_data_align muram_pool_data;
|
|
|
|
|
|
|
|
spin_lock_irqsave(&cpm_muram_lock, flags);
|
|
|
|
muram_pool_data.align = align;
|
|
|
|
start = cpm_muram_alloc_common(size, gen_pool_first_fit_align,
|
|
|
|
&muram_pool_data);
|
|
|
|
spin_unlock_irqrestore(&cpm_muram_lock, flags);
|
|
|
|
return start;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(cpm_muram_alloc);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* cpm_muram_free - free a chunk of multi-user ram
|
|
|
|
* @offset: The beginning of the chunk as returned by cpm_muram_alloc().
|
|
|
|
*/
|
2019-11-28 21:55:41 +07:00
|
|
|
void cpm_muram_free(s32 offset)
|
2015-11-30 09:48:55 +07:00
|
|
|
{
|
|
|
|
unsigned long flags;
|
|
|
|
int size;
|
|
|
|
struct muram_block *tmp;
|
|
|
|
|
2019-11-28 21:55:42 +07:00
|
|
|
if (offset < 0)
|
|
|
|
return;
|
|
|
|
|
2015-11-30 09:48:55 +07:00
|
|
|
size = 0;
|
|
|
|
spin_lock_irqsave(&cpm_muram_lock, flags);
|
|
|
|
list_for_each_entry(tmp, &muram_block_list, head) {
|
|
|
|
if (tmp->start == offset) {
|
|
|
|
size = tmp->size;
|
|
|
|
list_del(&tmp->head);
|
|
|
|
kfree(tmp);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
gen_pool_free(muram_pool, offset + GENPOOL_OFFSET, size);
|
|
|
|
spin_unlock_irqrestore(&cpm_muram_lock, flags);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(cpm_muram_free);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* cpm_muram_alloc_fixed - reserve a specific region of multi-user ram
|
|
|
|
* @offset: offset of allocation start address
|
|
|
|
* @size: number of bytes to allocate
|
soc: fsl: qe: change return type of cpm_muram_alloc() to s32
There are a number of problems with cpm_muram_alloc() and its
callers. Most callers assign the return value to some variable and
then use IS_ERR_VALUE to check for allocation failure. However, when
that variable is not sizeof(long), this leads to warnings - and it is
indeed broken to do e.g.
u32 foo = cpm_muram_alloc();
if (IS_ERR_VALUE(foo))
on a 64-bit platform, since the condition
foo >= (unsigned long)-ENOMEM
is tautologically false. There are also callers that ignore the
possibility of error, and then there are those that check for error by
comparing the return value to 0...
One could fix that by changing all callers to store the return value
temporarily in an "unsigned long" and test that. However, use of
IS_ERR_VALUE() is error-prone and should be restricted to things which
are inherently long-sized (stuff in pt_regs etc.). Instead, let's aim
for changing to the standard kernel style
int foo = cpm_muram_alloc();
if (foo < 0)
deal_with_it()
some->where = foo;
Changing the return type from unsigned long to s32 (aka signed int)
doesn't change the value that gets stored into any of the callers'
variables except if the caller was storing the result in a u64 _and_
the allocation failed, so in itself this patch should be a no-op.
Another problem with cpm_muram_alloc() is that it can certainly
validly return 0 - and except if some cpm_muram_alloc_fixed() call
interferes, the very first cpm_muram_alloc() call will return just
that. But that shows that both ucc_slow_free() and ucc_fast_free() are
buggy, since they assume that a value of 0 means "that field was never
allocated". We'll later change cpm_muram_free() to accept (and ignore)
a negative offset, so callers can use a sentinel of -1 instead of 0
and just unconditionally call cpm_muram_free().
Reviewed-by: Timur Tabi <timur@kernel.org>
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: Li Yang <leoyang.li@nxp.com>
2019-11-28 21:55:40 +07:00
|
|
|
* This function returns @offset if the area was available, a negative
|
|
|
|
* errno otherwise.
|
2015-11-30 09:48:55 +07:00
|
|
|
* Use cpm_dpram_addr() to get the virtual address of the area.
|
|
|
|
* Use cpm_muram_free() to free the allocation.
|
|
|
|
*/
|
soc: fsl: qe: change return type of cpm_muram_alloc() to s32
There are a number of problems with cpm_muram_alloc() and its
callers. Most callers assign the return value to some variable and
then use IS_ERR_VALUE to check for allocation failure. However, when
that variable is not sizeof(long), this leads to warnings - and it is
indeed broken to do e.g.
u32 foo = cpm_muram_alloc();
if (IS_ERR_VALUE(foo))
on a 64-bit platform, since the condition
foo >= (unsigned long)-ENOMEM
is tautologically false. There are also callers that ignore the
possibility of error, and then there are those that check for error by
comparing the return value to 0...
One could fix that by changing all callers to store the return value
temporarily in an "unsigned long" and test that. However, use of
IS_ERR_VALUE() is error-prone and should be restricted to things which
are inherently long-sized (stuff in pt_regs etc.). Instead, let's aim
for changing to the standard kernel style
int foo = cpm_muram_alloc();
if (foo < 0)
deal_with_it()
some->where = foo;
Changing the return type from unsigned long to s32 (aka signed int)
doesn't change the value that gets stored into any of the callers'
variables except if the caller was storing the result in a u64 _and_
the allocation failed, so in itself this patch should be a no-op.
Another problem with cpm_muram_alloc() is that it can certainly
validly return 0 - and except if some cpm_muram_alloc_fixed() call
interferes, the very first cpm_muram_alloc() call will return just
that. But that shows that both ucc_slow_free() and ucc_fast_free() are
buggy, since they assume that a value of 0 means "that field was never
allocated". We'll later change cpm_muram_free() to accept (and ignore)
a negative offset, so callers can use a sentinel of -1 instead of 0
and just unconditionally call cpm_muram_free().
Reviewed-by: Timur Tabi <timur@kernel.org>
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: Li Yang <leoyang.li@nxp.com>
2019-11-28 21:55:40 +07:00
|
|
|
s32 cpm_muram_alloc_fixed(unsigned long offset, unsigned long size)
|
2015-11-30 09:48:55 +07:00
|
|
|
{
|
soc: fsl: qe: change return type of cpm_muram_alloc() to s32
There are a number of problems with cpm_muram_alloc() and its
callers. Most callers assign the return value to some variable and
then use IS_ERR_VALUE to check for allocation failure. However, when
that variable is not sizeof(long), this leads to warnings - and it is
indeed broken to do e.g.
u32 foo = cpm_muram_alloc();
if (IS_ERR_VALUE(foo))
on a 64-bit platform, since the condition
foo >= (unsigned long)-ENOMEM
is tautologically false. There are also callers that ignore the
possibility of error, and then there are those that check for error by
comparing the return value to 0...
One could fix that by changing all callers to store the return value
temporarily in an "unsigned long" and test that. However, use of
IS_ERR_VALUE() is error-prone and should be restricted to things which
are inherently long-sized (stuff in pt_regs etc.). Instead, let's aim
for changing to the standard kernel style
int foo = cpm_muram_alloc();
if (foo < 0)
deal_with_it()
some->where = foo;
Changing the return type from unsigned long to s32 (aka signed int)
doesn't change the value that gets stored into any of the callers'
variables except if the caller was storing the result in a u64 _and_
the allocation failed, so in itself this patch should be a no-op.
Another problem with cpm_muram_alloc() is that it can certainly
validly return 0 - and except if some cpm_muram_alloc_fixed() call
interferes, the very first cpm_muram_alloc() call will return just
that. But that shows that both ucc_slow_free() and ucc_fast_free() are
buggy, since they assume that a value of 0 means "that field was never
allocated". We'll later change cpm_muram_free() to accept (and ignore)
a negative offset, so callers can use a sentinel of -1 instead of 0
and just unconditionally call cpm_muram_free().
Reviewed-by: Timur Tabi <timur@kernel.org>
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: Li Yang <leoyang.li@nxp.com>
2019-11-28 21:55:40 +07:00
|
|
|
s32 start;
|
2015-11-30 09:48:55 +07:00
|
|
|
unsigned long flags;
|
|
|
|
struct genpool_data_fixed muram_pool_data_fixed;
|
|
|
|
|
|
|
|
spin_lock_irqsave(&cpm_muram_lock, flags);
|
|
|
|
muram_pool_data_fixed.offset = offset + GENPOOL_OFFSET;
|
|
|
|
start = cpm_muram_alloc_common(size, gen_pool_fixed_alloc,
|
|
|
|
&muram_pool_data_fixed);
|
|
|
|
spin_unlock_irqrestore(&cpm_muram_lock, flags);
|
|
|
|
return start;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(cpm_muram_alloc_fixed);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* cpm_muram_addr - turn a muram offset into a virtual address
|
|
|
|
* @offset: muram offset to convert
|
|
|
|
*/
|
|
|
|
void __iomem *cpm_muram_addr(unsigned long offset)
|
|
|
|
{
|
|
|
|
return muram_vbase + offset;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(cpm_muram_addr);
|
|
|
|
|
|
|
|
unsigned long cpm_muram_offset(void __iomem *addr)
|
|
|
|
{
|
|
|
|
return addr - (void __iomem *)muram_vbase;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(cpm_muram_offset);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* cpm_muram_dma - turn a muram virtual address into a DMA address
|
|
|
|
* @offset: virtual address from cpm_muram_addr() to convert
|
|
|
|
*/
|
|
|
|
dma_addr_t cpm_muram_dma(void __iomem *addr)
|
|
|
|
{
|
|
|
|
return muram_pbase + ((u8 __iomem *)addr - muram_vbase);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(cpm_muram_dma);
|