Commit 8498ffd6 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  powerpc: Fix vio_bus_probe oops on probe error
  powerpc/ibmebus: Restore "name" sysfs attribute on ibmebus devices
  powerpc: Fix /dev/oldmem interface for kdump
  powerpc/spufs: Remove invalid semicolon after if statement
  powerpc/spufs: reference context while dropping state mutex in scheduler
  powerpc/spufs: fix npc setting for NOSCHED contexts
parents 75d95062 cd5aeb9f
...@@ -86,6 +86,19 @@ static int __init parse_savemaxmem(char *p) ...@@ -86,6 +86,19 @@ static int __init parse_savemaxmem(char *p)
} }
__setup("savemaxmem=", parse_savemaxmem); __setup("savemaxmem=", parse_savemaxmem);
static size_t copy_oldmem_vaddr(void *vaddr, char *buf, size_t csize,
unsigned long offset, int userbuf)
{
if (userbuf) {
if (copy_to_user((char __user *)buf, (vaddr + offset), csize))
return -EFAULT;
} else
memcpy(buf, (vaddr + offset), csize);
return csize;
}
/** /**
* copy_oldmem_page - copy one page from "oldmem" * copy_oldmem_page - copy one page from "oldmem"
* @pfn: page frame number to be copied * @pfn: page frame number to be copied
...@@ -107,16 +120,16 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf, ...@@ -107,16 +120,16 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
if (!csize) if (!csize)
return 0; return 0;
vaddr = __ioremap(pfn << PAGE_SHIFT, PAGE_SIZE, 0); csize = min(csize, PAGE_SIZE);
if (userbuf) { if (pfn < max_pfn) {
if (copy_to_user((char __user *)buf, (vaddr + offset), csize)) { vaddr = __va(pfn << PAGE_SHIFT);
iounmap(vaddr); csize = copy_oldmem_vaddr(vaddr, buf, csize, offset, userbuf);
return -EFAULT; } else {
} vaddr = __ioremap(pfn << PAGE_SHIFT, PAGE_SIZE, 0);
} else csize = copy_oldmem_vaddr(vaddr, buf, csize, offset, userbuf);
memcpy(buf, (vaddr + offset), csize); iounmap(vaddr);
}
iounmap(vaddr);
return csize; return csize;
} }
...@@ -233,17 +233,6 @@ void ibmebus_free_irq(u32 ist, void *dev_id) ...@@ -233,17 +233,6 @@ void ibmebus_free_irq(u32 ist, void *dev_id)
} }
EXPORT_SYMBOL(ibmebus_free_irq); EXPORT_SYMBOL(ibmebus_free_irq);
static ssize_t name_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
return sprintf(buf, "%s\n", to_of_device(dev)->node->name);
}
static struct device_attribute ibmebus_dev_attrs[] = {
__ATTR_RO(name),
__ATTR_NULL
};
static char *ibmebus_chomp(const char *in, size_t count) static char *ibmebus_chomp(const char *in, size_t count)
{ {
char *out = kmalloc(count + 1, GFP_KERNEL); char *out = kmalloc(count + 1, GFP_KERNEL);
...@@ -327,7 +316,6 @@ static struct bus_attribute ibmebus_bus_attrs[] = { ...@@ -327,7 +316,6 @@ static struct bus_attribute ibmebus_bus_attrs[] = {
struct bus_type ibmebus_bus_type = { struct bus_type ibmebus_bus_type = {
.uevent = of_device_uevent, .uevent = of_device_uevent,
.dev_attrs = ibmebus_dev_attrs,
.bus_attrs = ibmebus_bus_attrs .bus_attrs = ibmebus_bus_attrs
}; };
EXPORT_SYMBOL(ibmebus_bus_type); EXPORT_SYMBOL(ibmebus_bus_type);
......
...@@ -1113,7 +1113,7 @@ static int vio_bus_probe(struct device *dev) ...@@ -1113,7 +1113,7 @@ static int vio_bus_probe(struct device *dev)
return error; return error;
} }
error = viodrv->probe(viodev, id); error = viodrv->probe(viodev, id);
if (error) if (error && firmware_has_feature(FW_FEATURE_CMO))
vio_cmo_bus_remove(viodev); vio_cmo_bus_remove(viodev);
} }
......
...@@ -206,11 +206,6 @@ static int spu_run_init(struct spu_context *ctx, u32 *npc) ...@@ -206,11 +206,6 @@ static int spu_run_init(struct spu_context *ctx, u32 *npc)
(SPU_RUNCNTL_RUNNABLE | SPU_RUNCNTL_ISOLATE); (SPU_RUNCNTL_RUNNABLE | SPU_RUNCNTL_ISOLATE);
if (runcntl == 0) if (runcntl == 0)
runcntl = SPU_RUNCNTL_RUNNABLE; runcntl = SPU_RUNCNTL_RUNNABLE;
}
if (ctx->flags & SPU_CREATE_NOSCHED) {
spuctx_switch_state(ctx, SPU_UTIL_USER);
ctx->ops->runcntl_write(ctx, runcntl);
} else { } else {
unsigned long privcntl; unsigned long privcntl;
...@@ -219,9 +214,15 @@ static int spu_run_init(struct spu_context *ctx, u32 *npc) ...@@ -219,9 +214,15 @@ static int spu_run_init(struct spu_context *ctx, u32 *npc)
else else
privcntl = SPU_PRIVCNTL_MODE_NORMAL; privcntl = SPU_PRIVCNTL_MODE_NORMAL;
ctx->ops->npc_write(ctx, *npc);
ctx->ops->privcntl_write(ctx, privcntl); ctx->ops->privcntl_write(ctx, privcntl);
ctx->ops->runcntl_write(ctx, runcntl); ctx->ops->npc_write(ctx, *npc);
}
ctx->ops->runcntl_write(ctx, runcntl);
if (ctx->flags & SPU_CREATE_NOSCHED) {
spuctx_switch_state(ctx, SPU_UTIL_USER);
} else {
if (ctx->state == SPU_STATE_SAVED) { if (ctx->state == SPU_STATE_SAVED) {
ret = spu_activate(ctx, 0); ret = spu_activate(ctx, 0);
......
...@@ -641,8 +641,10 @@ static struct spu *find_victim(struct spu_context *ctx) ...@@ -641,8 +641,10 @@ static struct spu *find_victim(struct spu_context *ctx)
if (tmp && tmp->prio > ctx->prio && if (tmp && tmp->prio > ctx->prio &&
!(tmp->flags & SPU_CREATE_NOSCHED) && !(tmp->flags & SPU_CREATE_NOSCHED) &&
(!victim || tmp->prio > victim->prio)) (!victim || tmp->prio > victim->prio)) {
victim = spu->ctx; victim = spu->ctx;
get_spu_context(victim);
}
} }
mutex_unlock(&cbe_spu_info[node].list_mutex); mutex_unlock(&cbe_spu_info[node].list_mutex);
...@@ -658,6 +660,7 @@ static struct spu *find_victim(struct spu_context *ctx) ...@@ -658,6 +660,7 @@ static struct spu *find_victim(struct spu_context *ctx)
* look at another context or give up after X retries. * look at another context or give up after X retries.
*/ */
if (!mutex_trylock(&victim->state_mutex)) { if (!mutex_trylock(&victim->state_mutex)) {
put_spu_context(victim);
victim = NULL; victim = NULL;
goto restart; goto restart;
} }
...@@ -670,6 +673,7 @@ static struct spu *find_victim(struct spu_context *ctx) ...@@ -670,6 +673,7 @@ static struct spu *find_victim(struct spu_context *ctx)
* restart the search. * restart the search.
*/ */
mutex_unlock(&victim->state_mutex); mutex_unlock(&victim->state_mutex);
put_spu_context(victim);
victim = NULL; victim = NULL;
goto restart; goto restart;
} }
...@@ -687,6 +691,7 @@ static struct spu *find_victim(struct spu_context *ctx) ...@@ -687,6 +691,7 @@ static struct spu *find_victim(struct spu_context *ctx)
spu_add_to_rq(victim); spu_add_to_rq(victim);
mutex_unlock(&victim->state_mutex); mutex_unlock(&victim->state_mutex);
put_spu_context(victim);
return spu; return spu;
} }
...@@ -985,9 +990,11 @@ static int spusched_thread(void *unused) ...@@ -985,9 +990,11 @@ static int spusched_thread(void *unused)
struct spu_context *ctx = spu->ctx; struct spu_context *ctx = spu->ctx;
if (ctx) { if (ctx) {
get_spu_context(ctx);
mutex_unlock(mtx); mutex_unlock(mtx);
spusched_tick(ctx); spusched_tick(ctx);
mutex_lock(mtx); mutex_lock(mtx);
put_spu_context(ctx);
} }
} }
mutex_unlock(mtx); mutex_unlock(mtx);
...@@ -1030,7 +1037,7 @@ void spuctx_switch_state(struct spu_context *ctx, ...@@ -1030,7 +1037,7 @@ void spuctx_switch_state(struct spu_context *ctx,
node = spu->node; node = spu->node;
if (old_state == SPU_UTIL_USER) if (old_state == SPU_UTIL_USER)
atomic_dec(&cbe_spu_info[node].busy_spus); atomic_dec(&cbe_spu_info[node].busy_spus);
if (new_state == SPU_UTIL_USER); if (new_state == SPU_UTIL_USER)
atomic_inc(&cbe_spu_info[node].busy_spus); atomic_inc(&cbe_spu_info[node].busy_spus);
} }
} }
......
...@@ -57,6 +57,15 @@ static ssize_t devspec_show(struct device *dev, ...@@ -57,6 +57,15 @@ static ssize_t devspec_show(struct device *dev,
return sprintf(buf, "%s\n", ofdev->node->full_name); return sprintf(buf, "%s\n", ofdev->node->full_name);
} }
static ssize_t name_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
struct of_device *ofdev;
ofdev = to_of_device(dev);
return sprintf(buf, "%s\n", ofdev->node->name);
}
static ssize_t modalias_show(struct device *dev, static ssize_t modalias_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
...@@ -71,6 +80,7 @@ static ssize_t modalias_show(struct device *dev, ...@@ -71,6 +80,7 @@ static ssize_t modalias_show(struct device *dev,
struct device_attribute of_platform_device_attrs[] = { struct device_attribute of_platform_device_attrs[] = {
__ATTR_RO(devspec), __ATTR_RO(devspec),
__ATTR_RO(name),
__ATTR_RO(modalias), __ATTR_RO(modalias),
__ATTR_NULL __ATTR_NULL
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment