Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6bb5cf10 authored by Geoff Levand's avatar Geoff Levand Committed by Paul Mackerras
Browse files

[POWERPC] PS3: System-bus rework 



Rework the PS3 system bus to unify device support.
 - DMA region sizes must be a power of two
 - storage bus DMA updates:
  - Small fixes for the PS3 DMA core:
      o fix alignment bug
      o kill superfluous test
      o indentation
      o spelling
      o export ps3_dma_region_{create,free}()
  - ps3_dma_region_init():
      o Add `addr' and `len' parameters, so you can create a DMA region that
        does not cover all memory (use `NULL' and `0' to cover all memory).
	This is needed because there are not sufficient IOMMU resources to have
	all DMA regions cover all memory.
      o Uninline
  - Added remove and shutdown routines to all drivers.
  - Added loadable module support to all drivers.
  - Added HV calls for iopte management (needed by sound driver).

Signed-off-by: default avatarMOKUNO Masakazu <mokuno@sm.sony.co.jp>
Signed-off-by: default avatarGeert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Signed-off-by: default avatarGeoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 9263e85a

arch/powerpc/platforms/ps3/interrupt.c

+11 −13
Original line number Diff line number Diff line
@@ -400,17 +400,15 @@ int ps3_send_event_locally(unsigned int virq) 
 * ps3_sb_event_receive_port_setup - Setup a system bus event receive port.

 * @cpu: enum ps3_cpu_binding indicating the cpu the interrupt should be

 * serviced on.

 * @did: The HV device identifier read from the system repository.

 * @interrupt_id: The device interrupt id read from the system repository.

 * @dev: The system bus device instance.

 * @virq: The assigned Linux virq.

 *

 * An event irq represents a virtual device interrupt.  The interrupt_id

 * coresponds to the software interrupt number.

 */



int ps3_sb_event_receive_port_setup(enum ps3_cpu_binding cpu,

	const struct ps3_device_id *did, unsigned int interrupt_id,

	unsigned int *virq)

int ps3_sb_event_receive_port_setup(struct ps3_system_bus_device *dev,

	enum ps3_cpu_binding cpu, unsigned int *virq)

{

	/* this should go in system-bus.c */
@@ -421,8 +419,8 @@ int ps3_sb_event_receive_port_setup(enum ps3_cpu_binding cpu, 
	if (result)

		return result;



	result = lv1_connect_interrupt_event_receive_port(did->bus_id,

		did->dev_id, virq_to_hw(*virq), interrupt_id);

	result = lv1_connect_interrupt_event_receive_port(dev->bus_id,

		dev->dev_id, virq_to_hw(*virq), dev->interrupt_id);



	if (result) {

		pr_debug("%s:%d: lv1_connect_interrupt_event_receive_port"
@@ -434,24 +432,24 @@ int ps3_sb_event_receive_port_setup(enum ps3_cpu_binding cpu, 
	}



	pr_debug("%s:%d: interrupt_id %u, virq %u\n", __func__, __LINE__,

		interrupt_id, *virq);

		dev->interrupt_id, *virq);



	return 0;

}

EXPORT_SYMBOL(ps3_sb_event_receive_port_setup);



int ps3_sb_event_receive_port_destroy(const struct ps3_device_id *did,

	unsigned int interrupt_id, unsigned int virq)

int ps3_sb_event_receive_port_destroy(struct ps3_system_bus_device *dev,

	unsigned int virq)

{

	/* this should go in system-bus.c */



	int result;



	pr_debug(" -> %s:%d: interrupt_id %u, virq %u\n", __func__, __LINE__,

		interrupt_id, virq);

		dev->interrupt_id, virq);



	result = lv1_disconnect_interrupt_event_receive_port(did->bus_id,

		did->dev_id, virq_to_hw(virq), interrupt_id);

	result = lv1_disconnect_interrupt_event_receive_port(dev->bus_id,

		dev->dev_id, virq_to_hw(virq), dev->interrupt_id);



	if (result)

		pr_debug("%s:%d: lv1_disconnect_interrupt_event_receive_port"

arch/powerpc/platforms/ps3/mm.c

+514 −108

File changed.

Preview size limit exceeded, changes collapsed.

arch/powerpc/platforms/ps3/platform.h

+11 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ enum ps3_dev_type { 
	PS3_DEV_TYPE_STOR_ROM = TYPE_ROM,	/* 5 */

	PS3_DEV_TYPE_SB_GPIO = 6,

	PS3_DEV_TYPE_STOR_FLASH = TYPE_RBC,	/* 14 */

	PS3_DEV_TYPE_NOACCESS = 255,

};



int ps3_repository_read_bus_str(unsigned int bus_index, const char *bus_str,
@@ -217,4 +218,14 @@ int ps3_repository_read_num_spu_resource_id(unsigned int *num_resource_id); 
int ps3_repository_read_spu_resource_id(unsigned int res_index,

	enum ps3_spu_resource_type* resource_type, unsigned int *resource_id);



/* Page table entries */

#define IOPTE_PP_W		0x8000000000000000ul /* protection: write */

#define IOPTE_PP_R		0x4000000000000000ul /* protection: read */

#define IOPTE_M			0x2000000000000000ul /* coherency required */

#define IOPTE_SO_R		0x1000000000000000ul /* ordering: writes */

#define IOPTE_SO_RW             0x1800000000000000ul /* ordering: r & w */

#define IOPTE_RPN_Mask		0x07fffffffffff000ul /* RPN */

#define IOPTE_H			0x0000000000000800ul /* cache hint */

#define IOPTE_IOID_Mask		0x00000000000007fful /* ioid */



#endif

arch/powerpc/platforms/ps3/system-bus.c

+452 −81
Original line number Diff line number Diff line
@@ -30,22 +30,228 @@ 


#include "platform.h"



static struct device ps3_system_bus = {

	.bus_id = "ps3_system",

};



/* FIXME: need device usage counters! */

struct {

	struct mutex mutex;

	int sb_11; /* usb 0 */

	int sb_12; /* usb 0 */

	int gpu;

} static usage_hack;



static int ps3_is_device(struct ps3_system_bus_device *dev,

			 unsigned int bus_id, unsigned int dev_id)

{

	return dev->bus_id == bus_id && dev->dev_id == dev_id;

}



static int ps3_open_hv_device_sb(struct ps3_system_bus_device *dev)

{

	int result;



	BUG_ON(!dev->bus_id);

	mutex_lock(&usage_hack.mutex);



	if (ps3_is_device(dev, 1, 1)) {

		usage_hack.sb_11++;

		if (usage_hack.sb_11 > 1) {

			result = 0;

			goto done;

		}

	}



	if (ps3_is_device(dev, 1, 2)) {

		usage_hack.sb_12++;

		if (usage_hack.sb_12 > 1) {

			result = 0;

			goto done;

		}

	}



	result = lv1_open_device(dev->bus_id, dev->dev_id, 0);



	if (result) {

		pr_debug("%s:%d: lv1_open_device failed: %s\n", __func__,

			__LINE__, ps3_result(result));

			result = -EPERM;

	}



done:

	mutex_unlock(&usage_hack.mutex);

	return result;

}



static int ps3_close_hv_device_sb(struct ps3_system_bus_device *dev)

{

	int result;



	BUG_ON(!dev->bus_id);

	mutex_lock(&usage_hack.mutex);



	if (ps3_is_device(dev, 1, 1)) {

		usage_hack.sb_11--;

		if (usage_hack.sb_11) {

			result = 0;

			goto done;

		}

	}



	if (ps3_is_device(dev, 1, 2)) {

		usage_hack.sb_12--;

		if (usage_hack.sb_12) {

			result = 0;

			goto done;

		}

	}



	result = lv1_close_device(dev->bus_id, dev->dev_id);

	BUG_ON(result);



done:

	mutex_unlock(&usage_hack.mutex);

	return result;

}



static int ps3_open_hv_device_gpu(struct ps3_system_bus_device *dev)

{

	int result;



	mutex_lock(&usage_hack.mutex);



	usage_hack.gpu++;

	if (usage_hack.gpu > 1) {

		result = 0;

		goto done;

	}



	result = lv1_gpu_open(0);



	if (result) {

		pr_debug("%s:%d: lv1_gpu_open failed: %s\n", __func__,

			__LINE__, ps3_result(result));

			result = -EPERM;

	}



done:

	mutex_unlock(&usage_hack.mutex);

	return result;

}



static int ps3_close_hv_device_gpu(struct ps3_system_bus_device *dev)

{

	int result;



	mutex_lock(&usage_hack.mutex);



	usage_hack.gpu--;

	if (usage_hack.gpu) {

		result = 0;

		goto done;

	}



	result = lv1_gpu_close();

	BUG_ON(result);



done:

	mutex_unlock(&usage_hack.mutex);

	return result;

}



int ps3_open_hv_device(struct ps3_system_bus_device *dev)

{

	BUG_ON(!dev);

	pr_debug("%s:%d: match_id: %u\n", __func__, __LINE__, dev->match_id);



	switch (dev->match_id) {

	case PS3_MATCH_ID_EHCI:

	case PS3_MATCH_ID_OHCI:

	case PS3_MATCH_ID_GELIC:

	case PS3_MATCH_ID_STOR_DISK:

	case PS3_MATCH_ID_STOR_ROM:

	case PS3_MATCH_ID_STOR_FLASH:

		return ps3_open_hv_device_sb(dev);



	case PS3_MATCH_ID_SOUND:

	case PS3_MATCH_ID_GRAPHICS:

		return ps3_open_hv_device_gpu(dev);



	case PS3_MATCH_ID_AV_SETTINGS:

	case PS3_MATCH_ID_SYSTEM_MANAGER:

		pr_debug("%s:%d: unsupported match_id: %u\n", __func__,

			__LINE__, dev->match_id);

		pr_debug("%s:%d: bus_id: %u\n", __func__,

			__LINE__, dev->bus_id);

		BUG();

		return -EINVAL;



	default:

		break;

	}



	pr_debug("%s:%d: unknown match_id: %u\n", __func__, __LINE__,

		dev->match_id);

	BUG();

	return -ENODEV;

}

EXPORT_SYMBOL_GPL(ps3_open_hv_device);



int ps3_close_hv_device(struct ps3_system_bus_device *dev)

{

	BUG_ON(!dev);

	pr_debug("%s:%d: match_id: %u\n", __func__, __LINE__, dev->match_id);



	switch (dev->match_id) {

	case PS3_MATCH_ID_EHCI:

	case PS3_MATCH_ID_OHCI:

	case PS3_MATCH_ID_GELIC:

	case PS3_MATCH_ID_STOR_DISK:

	case PS3_MATCH_ID_STOR_ROM:

	case PS3_MATCH_ID_STOR_FLASH:

		return ps3_close_hv_device_sb(dev);



	case PS3_MATCH_ID_SOUND:

	case PS3_MATCH_ID_GRAPHICS:

		return ps3_close_hv_device_gpu(dev);



	case PS3_MATCH_ID_AV_SETTINGS:

	case PS3_MATCH_ID_SYSTEM_MANAGER:

		pr_debug("%s:%d: unsupported match_id: %u\n", __func__,

			__LINE__, dev->match_id);

		pr_debug("%s:%d: bus_id: %u\n", __func__,

			__LINE__, dev->bus_id);

		BUG();

		return -EINVAL;



	default:

		break;

	}



	pr_debug("%s:%d: unknown match_id: %u\n", __func__, __LINE__,

		dev->match_id);

	BUG();

	return -ENODEV;

}

EXPORT_SYMBOL_GPL(ps3_close_hv_device);



#define dump_mmio_region(_a) _dump_mmio_region(_a, __func__, __LINE__)

static void _dump_mmio_region(const struct ps3_mmio_region* r,

	const char* func, int line)

{

	pr_debug("%s:%d: dev       %u:%u\n", func, line, r->did.bus_id,

		r->did.dev_id);

	pr_debug("%s:%d: dev       %u:%u\n", func, line, r->dev->bus_id,

		r->dev->dev_id);

	pr_debug("%s:%d: bus_addr  %lxh\n", func, line, r->bus_addr);

	pr_debug("%s:%d: len       %lxh\n", func, line, r->len);

	pr_debug("%s:%d: lpar_addr %lxh\n", func, line, r->lpar_addr);

}



int ps3_mmio_region_create(struct ps3_mmio_region *r)

static int ps3_sb_mmio_region_create(struct ps3_mmio_region *r)

{

	int result;



	result = lv1_map_device_mmio_region(r->did.bus_id, r->did.dev_id,

	result = lv1_map_device_mmio_region(r->dev->bus_id, r->dev->dev_id,

		r->bus_addr, r->len, r->page_size, &r->lpar_addr);



	if (result) {
@@ -57,13 +263,26 @@ int ps3_mmio_region_create(struct ps3_mmio_region *r) 
	dump_mmio_region(r);

	return result;

}



static int ps3_ioc0_mmio_region_create(struct ps3_mmio_region *r)

{

	/* device specific; do nothing currently */

	return 0;

}



int ps3_mmio_region_create(struct ps3_mmio_region *r)

{

	return r->mmio_ops->create(r);

}

EXPORT_SYMBOL_GPL(ps3_mmio_region_create);



int ps3_free_mmio_region(struct ps3_mmio_region *r)

static int ps3_sb_free_mmio_region(struct ps3_mmio_region *r)

{

	int result;



	result = lv1_unmap_device_mmio_region(r->did.bus_id, r->did.dev_id,

	dump_mmio_region(r);

;

	result = lv1_unmap_device_mmio_region(r->dev->bus_id, r->dev->dev_id,

		r->lpar_addr);



	if (result)
@@ -73,14 +292,60 @@ int ps3_free_mmio_region(struct ps3_mmio_region *r) 
	r->lpar_addr = 0;

	return result;

}



static int ps3_ioc0_free_mmio_region(struct ps3_mmio_region *r)

{

	/* device specific; do nothing currently */

	return 0;

}





int ps3_free_mmio_region(struct ps3_mmio_region *r)

{

	return r->mmio_ops->free(r);

}



EXPORT_SYMBOL_GPL(ps3_free_mmio_region);



static const struct ps3_mmio_region_ops ps3_mmio_sb_region_ops = {

	.create = ps3_sb_mmio_region_create,

	.free = ps3_sb_free_mmio_region

};



static const struct ps3_mmio_region_ops ps3_mmio_ioc0_region_ops = {

	.create = ps3_ioc0_mmio_region_create,

	.free = ps3_ioc0_free_mmio_region

};



int ps3_mmio_region_init(struct ps3_system_bus_device *dev,

	struct ps3_mmio_region *r, unsigned long bus_addr, unsigned long len,

	enum ps3_mmio_page_size page_size)

{

	r->dev = dev;

	r->bus_addr = bus_addr;

	r->len = len;

	r->page_size = page_size;

	switch (dev->dev_type) {

	case PS3_DEVICE_TYPE_SB:

		r->mmio_ops = &ps3_mmio_sb_region_ops;

		break;

	case PS3_DEVICE_TYPE_IOC0:

		r->mmio_ops = &ps3_mmio_ioc0_region_ops;

		break;

	default:

		BUG();

		return -EINVAL;

	}

	return 0;

}

EXPORT_SYMBOL_GPL(ps3_mmio_region_init);



static int ps3_system_bus_match(struct device *_dev,

	struct device_driver *_drv)

{

	int result;

	struct ps3_system_bus_driver *drv = to_ps3_system_bus_driver(_drv);

	struct ps3_system_bus_device *dev = to_ps3_system_bus_device(_dev);

	struct ps3_system_bus_driver *drv = ps3_drv_to_system_bus_drv(_drv);

	struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev);



	result = dev->match_id == drv->match_id;
@@ -92,32 +357,14 @@ static int ps3_system_bus_match(struct device *_dev, 


static int ps3_system_bus_probe(struct device *_dev)

{

	int result;

	struct ps3_system_bus_device *dev = to_ps3_system_bus_device(_dev);

	struct ps3_system_bus_driver *drv =

		to_ps3_system_bus_driver(_dev->driver);



	result = lv1_open_device(dev->did.bus_id, dev->did.dev_id, 0);



	if (result) {

		pr_debug("%s:%d: lv1_open_device failed (%d)\n",

			__func__, __LINE__, result);

		result = -EACCES;

		goto clean_none;

	}



	if (dev->d_region->did.bus_id) {

		result = ps3_dma_region_create(dev->d_region);

	int result = 0;

	struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev);

	struct ps3_system_bus_driver *drv;



		if (result) {

			pr_debug("%s:%d: ps3_dma_region_create failed (%d)\n",

				__func__, __LINE__, result);

			BUG_ON("check region type");

			result = -EINVAL;

			goto clean_device;

		}

	}

	BUG_ON(!dev);

	pr_info(" -> %s:%d: %s\n", __func__, __LINE__, _dev->bus_id);



	drv = ps3_system_bus_dev_to_system_bus_drv(dev);

	BUG_ON(!drv);



	if (drv->probe)
@@ -126,38 +373,68 @@ static int ps3_system_bus_probe(struct device *_dev) 
		pr_info("%s:%d: %s no probe method\n", __func__, __LINE__,

			dev->core.bus_id);



	if (result) {

		pr_debug("%s:%d: drv->probe failed\n", __func__, __LINE__);

		goto clean_dma;

	}



	return result;



clean_dma:

	ps3_dma_region_free(dev->d_region);

clean_device:

	lv1_close_device(dev->did.bus_id, dev->did.dev_id);

clean_none:

	pr_info(" <- %s:%d: %s\n", __func__, __LINE__, dev->core.bus_id);

	return result;

}



static int ps3_system_bus_remove(struct device *_dev)

{

	struct ps3_system_bus_device *dev = to_ps3_system_bus_device(_dev);

	struct ps3_system_bus_driver *drv =

		to_ps3_system_bus_driver(_dev->driver);

	int result = 0;

	struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev);

	struct ps3_system_bus_driver *drv;



	BUG_ON(!dev);

	pr_info(" -> %s:%d: %s\n", __func__, __LINE__, _dev->bus_id);



	drv = ps3_system_bus_dev_to_system_bus_drv(dev);

	BUG_ON(!drv);



	if (drv->remove)

		drv->remove(dev);

		result = drv->remove(dev);

	else

		pr_info("%s:%d: %s no remove method\n", __func__, __LINE__,

			dev->core.bus_id);

		dev_dbg(&dev->core, "%s:%d %s: no remove method\n",

			__func__, __LINE__, drv->core.name);



	pr_info(" <- %s:%d: %s\n", __func__, __LINE__, dev->core.bus_id);

	return result;

}



	ps3_dma_region_free(dev->d_region);

	ps3_free_mmio_region(dev->m_region);

	lv1_close_device(dev->did.bus_id, dev->did.dev_id);

static void ps3_system_bus_shutdown(struct device *_dev)

{

	struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev);

	struct ps3_system_bus_driver *drv;



	return 0;

	BUG_ON(!dev);



	dev_dbg(&dev->core, " -> %s:%d: match_id %d\n", __func__, __LINE__,

		dev->match_id);



	if (!dev->core.driver) {

		dev_dbg(&dev->core, "%s:%d: no driver bound\n", __func__,

			__LINE__);

		return;

	}



	drv = ps3_system_bus_dev_to_system_bus_drv(dev);



	BUG_ON(!drv);



	dev_dbg(&dev->core, "%s:%d: %s -> %s\n", __func__, __LINE__,

		dev->core.bus_id, drv->core.name);



	if (drv->shutdown)

		drv->shutdown(dev);

	else if (drv->remove) {

		dev_dbg(&dev->core, "%s:%d %s: no shutdown, calling remove\n",

			__func__, __LINE__, drv->core.name);

		drv->remove(dev);

	} else {

		dev_dbg(&dev->core, "%s:%d %s: no shutdown method\n",

			__func__, __LINE__, drv->core.name);

		BUG();

	}



	dev_dbg(&dev->core, " <- %s:%d\n", __func__, __LINE__);

}



struct bus_type ps3_system_bus_type = {
@@ -165,17 +442,27 @@ struct bus_type ps3_system_bus_type = { 
	.match = ps3_system_bus_match,

	.probe = ps3_system_bus_probe,

	.remove = ps3_system_bus_remove,

	.shutdown = ps3_system_bus_shutdown,

};



int __init ps3_system_bus_init(void)

static int __init ps3_system_bus_init(void)

{

	int result;



	if (!firmware_has_feature(FW_FEATURE_PS3_LV1))

		return -ENODEV;



	pr_debug(" -> %s:%d\n", __func__, __LINE__);



	mutex_init(&usage_hack.mutex);



	result = device_register(&ps3_system_bus);

	BUG_ON(result);



	result = bus_register(&ps3_system_bus_type);

	BUG_ON(result);



	pr_debug(" <- %s:%d\n", __func__, __LINE__);

	return result;

}
@@ -185,16 +472,13 @@ core_initcall(ps3_system_bus_init); 
 * Returns the virtual address of the buffer and sets dma_handle

 * to the dma address (mapping) of the first page.

 */



static void * ps3_alloc_coherent(struct device *_dev, size_t size,

				      dma_addr_t *dma_handle, gfp_t flag)

{

	int result;

	struct ps3_system_bus_device *dev = to_ps3_system_bus_device(_dev);

	struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev);

	unsigned long virt_addr;



	BUG_ON(!dev->d_region->bus_addr);



	flag &= ~(__GFP_DMA | __GFP_HIGHMEM);

	flag |= __GFP_ZERO;
@@ -205,7 +489,8 @@ static void * ps3_alloc_coherent(struct device *_dev, size_t size, 
		goto clean_none;

	}



	result = ps3_dma_map(dev->d_region, virt_addr, size, dma_handle);

	result = ps3_dma_map(dev->d_region, virt_addr, size, dma_handle,

			     IOPTE_PP_W | IOPTE_PP_R | IOPTE_SO_RW | IOPTE_M);



	if (result) {

		pr_debug("%s:%d: ps3_dma_map failed (%d)\n",
@@ -226,7 +511,7 @@ static void * ps3_alloc_coherent(struct device *_dev, size_t size, 
static void ps3_free_coherent(struct device *_dev, size_t size, void *vaddr,

	dma_addr_t dma_handle)

{

	struct ps3_system_bus_device *dev = to_ps3_system_bus_device(_dev);

	struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev);



	ps3_dma_unmap(dev->d_region, dma_handle, size);

	free_pages((unsigned long)vaddr, get_order(size));
@@ -239,15 +524,16 @@ static void ps3_free_coherent(struct device *_dev, size_t size, void *vaddr, 
 * byte within the page as vaddr.

 */



static dma_addr_t ps3_map_single(struct device *_dev, void *ptr, size_t size,

static dma_addr_t ps3_sb_map_single(struct device *_dev, void *ptr, size_t size,

	enum dma_data_direction direction)

{

	struct ps3_system_bus_device *dev = to_ps3_system_bus_device(_dev);

	struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev);

	int result;

	unsigned long bus_addr;



	result = ps3_dma_map(dev->d_region, (unsigned long)ptr, size,

		&bus_addr);

			     &bus_addr,

			     IOPTE_PP_R | IOPTE_PP_W | IOPTE_SO_RW | IOPTE_M);



	if (result) {

		pr_debug("%s:%d: ps3_dma_map failed (%d)\n",
@@ -257,10 +543,44 @@ static dma_addr_t ps3_map_single(struct device *_dev, void *ptr, size_t size, 
	return bus_addr;

}



static dma_addr_t ps3_ioc0_map_single(struct device *_dev, void *ptr,

				      size_t size,

				      enum dma_data_direction direction)

{

	struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev);

	int result;

	unsigned long bus_addr;

	u64 iopte_flag;



	iopte_flag = IOPTE_M;

	switch (direction) {

	case DMA_BIDIRECTIONAL:

		iopte_flag |= IOPTE_PP_R | IOPTE_PP_W | IOPTE_SO_RW;

		break;

	case DMA_TO_DEVICE:

		iopte_flag |= IOPTE_PP_R | IOPTE_SO_R;

		break;

	case DMA_FROM_DEVICE:

		iopte_flag |= IOPTE_PP_W | IOPTE_SO_RW;

		break;

	default:

		/* not happned */

		BUG();

	};

	result = ps3_dma_map(dev->d_region, (unsigned long)ptr, size,

			     &bus_addr, iopte_flag);



	if (result) {

		pr_debug("%s:%d: ps3_dma_map failed (%d)\n",

			__func__, __LINE__, result);

	}

	return bus_addr;

}



static void ps3_unmap_single(struct device *_dev, dma_addr_t dma_addr,

	size_t size, enum dma_data_direction direction)

{

	struct ps3_system_bus_device *dev = to_ps3_system_bus_device(_dev);

	struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev);

	int result;



	result = ps3_dma_unmap(dev->d_region, dma_addr, size);
@@ -271,20 +591,20 @@ static void ps3_unmap_single(struct device *_dev, dma_addr_t dma_addr, 
	}

}



static int ps3_map_sg(struct device *_dev, struct scatterlist *sg, int nents,

static int ps3_sb_map_sg(struct device *_dev, struct scatterlist *sg, int nents,

	enum dma_data_direction direction)

{

#if defined(CONFIG_PS3_DYNAMIC_DMA)

	BUG_ON("do");

	return -EPERM;

#else

	struct ps3_system_bus_device *dev = to_ps3_system_bus_device(_dev);

	struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev);

	int i;



	for (i = 0; i < nents; i++, sg++) {

		int result = ps3_dma_map(dev->d_region,

			page_to_phys(sg->page) + sg->offset, sg->length,

			&sg->dma_address);

					 &sg->dma_address, 0);



		if (result) {

			pr_debug("%s:%d: ps3_dma_map failed (%d)\n",
@@ -299,7 +619,15 @@ static int ps3_map_sg(struct device *_dev, struct scatterlist *sg, int nents, 
#endif

}



static void ps3_unmap_sg(struct device *_dev, struct scatterlist *sg,

static int ps3_ioc0_map_sg(struct device *_dev, struct scatterlist *sg,

			   int nents,

			   enum dma_data_direction direction)

{

	BUG();

	return 0;

}



static void ps3_sb_unmap_sg(struct device *_dev, struct scatterlist *sg,

	int nents, enum dma_data_direction direction)

{

#if defined(CONFIG_PS3_DYNAMIC_DMA)
@@ -307,18 +635,34 @@ static void ps3_unmap_sg(struct device *_dev, struct scatterlist *sg, 
#endif

}



static void ps3_ioc0_unmap_sg(struct device *_dev, struct scatterlist *sg,

			    int nents, enum dma_data_direction direction)

{

	BUG();

}



static int ps3_dma_supported(struct device *_dev, u64 mask)

{

	return mask >= DMA_32BIT_MASK;

}



static struct dma_mapping_ops ps3_dma_ops = {

static struct dma_mapping_ops ps3_sb_dma_ops = {

	.alloc_coherent = ps3_alloc_coherent,

	.free_coherent = ps3_free_coherent,

	.map_single = ps3_sb_map_single,

	.unmap_single = ps3_unmap_single,

	.map_sg = ps3_sb_map_sg,

	.unmap_sg = ps3_sb_unmap_sg,

	.dma_supported = ps3_dma_supported

};



static struct dma_mapping_ops ps3_ioc0_dma_ops = {

	.alloc_coherent = ps3_alloc_coherent,

	.free_coherent = ps3_free_coherent,

	.map_single = ps3_map_single,

	.map_single = ps3_ioc0_map_single,

	.unmap_single = ps3_unmap_single,

	.map_sg = ps3_map_sg,

	.unmap_sg = ps3_unmap_sg,

	.map_sg = ps3_ioc0_map_sg,

	.unmap_sg = ps3_ioc0_unmap_sg,

	.dma_supported = ps3_dma_supported

};
@@ -328,7 +672,7 @@ static struct dma_mapping_ops ps3_dma_ops = { 


static void ps3_system_bus_release_device(struct device *_dev)

{

	struct ps3_system_bus_device *dev = to_ps3_system_bus_device(_dev);

	struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev);

	kfree(dev);

}
@@ -343,19 +687,38 @@ static void ps3_system_bus_release_device(struct device *_dev) 
int ps3_system_bus_device_register(struct ps3_system_bus_device *dev)

{

	int result;

	static unsigned int dev_count = 1;

	static unsigned int dev_ioc0_count;

	static unsigned int dev_sb_count;

	static unsigned int dev_vuart_count;



	dev->core.parent = NULL;

	if (!dev->core.parent)

		dev->core.parent = &ps3_system_bus;

	dev->core.bus = &ps3_system_bus_type;

	dev->core.release = ps3_system_bus_release_device;



	switch (dev->dev_type) {

	case PS3_DEVICE_TYPE_IOC0:

		dev->core.archdata.dma_ops = &ps3_ioc0_dma_ops;

		snprintf(dev->core.bus_id, sizeof(dev->core.bus_id),

			"ioc0_%02x", ++dev_ioc0_count);

		break;

	case PS3_DEVICE_TYPE_SB:

		dev->core.archdata.dma_ops = &ps3_sb_dma_ops;

		snprintf(dev->core.bus_id, sizeof(dev->core.bus_id),

			"sb_%02x", ++dev_sb_count);



		break;

	case PS3_DEVICE_TYPE_VUART:

		snprintf(dev->core.bus_id, sizeof(dev->core.bus_id),

			"vuart_%02x", ++dev_vuart_count);

		break;

	default:

		BUG();

	};



	dev->core.archdata.of_node = NULL;

	dev->core.archdata.dma_ops = &ps3_dma_ops;

	dev->core.archdata.numa_node = 0;



	snprintf(dev->core.bus_id, sizeof(dev->core.bus_id), "sb_%02x",

		dev_count++);



	pr_debug("%s:%d add %s\n", __func__, __LINE__, dev->core.bus_id);



	result = device_register(&dev->core);
@@ -368,9 +731,15 @@ int ps3_system_bus_driver_register(struct ps3_system_bus_driver *drv) 
{

	int result;



	pr_debug(" -> %s:%d: %s\n", __func__, __LINE__, drv->core.name);



	if (!firmware_has_feature(FW_FEATURE_PS3_LV1))

		return -ENODEV;



	drv->core.bus = &ps3_system_bus_type;



	result = driver_register(&drv->core);

	pr_debug(" <- %s:%d: %s\n", __func__, __LINE__, drv->core.name);

	return result;

}
@@ -378,7 +747,9 @@ EXPORT_SYMBOL_GPL(ps3_system_bus_driver_register); 


void ps3_system_bus_driver_unregister(struct ps3_system_bus_driver *drv)

{

	pr_debug(" -> %s:%d: %s\n", __func__, __LINE__, drv->core.name);

	driver_unregister(&drv->core);

	pr_debug(" <- %s:%d: %s\n", __func__, __LINE__, drv->core.name);

}



EXPORT_SYMBOL_GPL(ps3_system_bus_driver_unregister);

include/asm-powerpc/lv1call.h

+3 −0
Original line number Diff line number Diff line
@@ -238,6 +238,7 @@ LV1_CALL(destruct_virtual_address_space, 1, 0, 10 ) 
LV1_CALL(configure_irq_state_bitmap,                    3, 0,  11 )

LV1_CALL(connect_irq_plug_ext,                          5, 0,  12 )

LV1_CALL(release_memory,                                1, 0,  13 )

LV1_CALL(put_iopte,                                     5, 0,  15 )

LV1_CALL(disconnect_irq_plug_ext,                       3, 0,  17 )

LV1_CALL(construct_event_receive_port,                  0, 1,  18 )

LV1_CALL(destruct_event_receive_port,                   1, 0,  19 )
@@ -268,6 +269,8 @@ LV1_CALL(remove_repository_node, 4, 0, 93 ) 
LV1_CALL(read_htab_entries,                             2, 5,  95 )

LV1_CALL(set_dabr,                                      2, 0,  96 )

LV1_CALL(get_total_execution_time,                      2, 1, 103 )

LV1_CALL(allocate_io_segment,                           3, 1, 116 )

LV1_CALL(release_io_segment,                            2, 0, 117 )

LV1_CALL(construct_io_irq_outlet,                       1, 1, 120 )

LV1_CALL(destruct_io_irq_outlet,                        1, 0, 121 )

LV1_CALL(map_htab,                                      1, 1, 122 )