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

Commit 5c949070 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Benjamin Herrenschmidt
Browse files

powerpc/ps3: Printing fixups for l64 to ll64 conversion arch/powerpc 



Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Acked-by: default avatarGeoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 5418b9c6

arch/powerpc/platforms/ps3/device-init.c

+13 −13
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static int __init ps3_register_lpm_devices(void) 
		goto fail_rights;

	}



	pr_debug("%s:%d: pu_id %lu, rights %lu(%lxh)\n",

	pr_debug("%s:%d: pu_id %llu, rights %llu(%llxh)\n",

		__func__, __LINE__, dev->lpm.pu_id, dev->lpm.rights,

		dev->lpm.rights);
@@ -348,7 +348,7 @@ static int ps3_setup_storage_dev(const struct ps3_repository_device *repo, 
		return -ENODEV;

	}



	pr_debug("%s:%u: (%u:%u:%u): port %lu blk_size %lu num_blocks %lu "

	pr_debug("%s:%u: (%u:%u:%u): port %llu blk_size %llu num_blocks %llu "

		 "num_regions %u\n", __func__, __LINE__, repo->bus_index,

		 repo->dev_index, repo->dev_type, port, blk_size, num_blocks,

		 num_regions);
@@ -394,7 +394,7 @@ static int ps3_setup_storage_dev(const struct ps3_repository_device *repo, 
			result = -ENODEV;

			goto fail_read_region;

		}

		pr_debug("%s:%u: region %u: id %u start %lu size %lu\n",

		pr_debug("%s:%u: region %u: id %u start %llu size %llu\n",

			 __func__, __LINE__, i, id, start, size);



		p->regions[i].id = id;
@@ -662,13 +662,13 @@ static void ps3_find_and_add_device(u64 bus_id, u64 dev_id) 
		if (rem)

			break;

	}

	pr_warning("%s:%u: device %lu:%lu not found\n", __func__, __LINE__,

	pr_warning("%s:%u: device %llu:%llu not found\n", __func__, __LINE__,

		   bus_id, dev_id);

	return;



found:

	if (retries)

		pr_debug("%s:%u: device %lu:%lu found after %u retries\n",

		pr_debug("%s:%u: device %llu:%llu found after %u retries\n",

			 __func__, __LINE__, bus_id, dev_id, retries);



	ps3_setup_dynamic_device(&repo);
@@ -715,14 +715,14 @@ static irqreturn_t ps3_notification_interrupt(int irq, void *data) 
	res = lv1_storage_get_async_status(PS3_NOTIFICATION_DEV_ID, &tag,

					   &status);

	if (tag != dev->tag)

		pr_err("%s:%u: tag mismatch, got %lx, expected %lx\n",

		pr_err("%s:%u: tag mismatch, got %llx, expected %llx\n",

		       __func__, __LINE__, tag, dev->tag);



	if (res) {

		pr_err("%s:%u: res %d status 0x%lx\n", __func__, __LINE__, res,

		pr_err("%s:%u: res %d status 0x%llx\n", __func__, __LINE__, res,

		       status);

	} else {

		pr_debug("%s:%u: completed, status 0x%lx\n", __func__,

		pr_debug("%s:%u: completed, status 0x%llx\n", __func__,

			 __LINE__, status);

		dev->lv1_status = status;

		complete(&dev->done);
@@ -761,7 +761,7 @@ static int ps3_notification_read_write(struct ps3_notification_device *dev, 
	}



	if (dev->lv1_status) {

		pr_err("%s:%u: %s not completed, status 0x%lx\n", __func__,

		pr_err("%s:%u: %s not completed, status 0x%llx\n", __func__,

		       __LINE__, op, dev->lv1_status);

		return -EIO;

	}
@@ -850,16 +850,16 @@ static int ps3_probe_thread(void *data) 
		if (res)

			break;



		pr_debug("%s:%u: notify event type 0x%lx bus id %lu dev id %lu"

			 " type %lu port %lu\n", __func__, __LINE__,

		pr_debug("%s:%u: notify event type 0x%llx bus id %llu dev id %llu"

			 " type %llu port %llu\n", __func__, __LINE__,

			 notify_event->event_type, notify_event->bus_id,

			 notify_event->dev_id, notify_event->dev_type,

			 notify_event->dev_port);



		if (notify_event->event_type != notify_region_probe ||

		    notify_event->bus_id != dev.sbd.bus_id) {

			pr_warning("%s:%u: bad notify_event: event %lu, "

				   "dev_id %lu, dev_type %lu\n",

			pr_warning("%s:%u: bad notify_event: event %llu, "

				   "dev_id %llu, dev_type %llu\n",

				   __func__, __LINE__, notify_event->event_type,

				   notify_event->dev_id,

				   notify_event->dev_type);

arch/powerpc/platforms/ps3/htab.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static long ps3_hpte_insert(unsigned long hpte_group, unsigned long va, 


	if (result) {

		/* all entries bolted !*/

		pr_info("%s:result=%d va=%lx pa=%lx ix=%lx v=%lx r=%lx\n",

		pr_info("%s:result=%d va=%lx pa=%lx ix=%lx v=%llx r=%llx\n",

			__func__, result, va, pa, hpte_group, hpte_v, hpte_r);

		BUG();

	}

arch/powerpc/platforms/ps3/interrupt.c

+8 −8
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static void ps3_chip_mask(unsigned int virq) 
	struct ps3_private *pd = get_irq_chip_data(virq);

	unsigned long flags;



	pr_debug("%s:%d: thread_id %lu, virq %d\n", __func__, __LINE__,

	pr_debug("%s:%d: thread_id %llu, virq %d\n", __func__, __LINE__,

		pd->thread_id, virq);



	local_irq_save(flags);
@@ -125,7 +125,7 @@ static void ps3_chip_unmask(unsigned int virq) 
	struct ps3_private *pd = get_irq_chip_data(virq);

	unsigned long flags;



	pr_debug("%s:%d: thread_id %lu, virq %d\n", __func__, __LINE__,

	pr_debug("%s:%d: thread_id %llu, virq %d\n", __func__, __LINE__,

		pd->thread_id, virq);



	local_irq_save(flags);
@@ -223,7 +223,7 @@ static int ps3_virq_destroy(unsigned int virq) 
{

	const struct ps3_private *pd = get_irq_chip_data(virq);



	pr_debug("%s:%d: ppe_id %lu, thread_id %lu, virq %u\n", __func__,

	pr_debug("%s:%d: ppe_id %llu, thread_id %llu, virq %u\n", __func__,

		__LINE__, pd->ppe_id, pd->thread_id, virq);



	set_irq_chip_data(virq, NULL);
@@ -293,7 +293,7 @@ int ps3_irq_plug_destroy(unsigned int virq) 
	int result;

	const struct ps3_private *pd = get_irq_chip_data(virq);



	pr_debug("%s:%d: ppe_id %lu, thread_id %lu, virq %u\n", __func__,

	pr_debug("%s:%d: ppe_id %llu, thread_id %llu, virq %u\n", __func__,

		__LINE__, pd->ppe_id, pd->thread_id, virq);



	ps3_chip_mask(virq);
@@ -693,7 +693,7 @@ void __init ps3_register_ipi_debug_brk(unsigned int cpu, unsigned int virq) 


	pd->bmp.ipi_debug_brk_mask = 0x8000000000000000UL >> virq;



	pr_debug("%s:%d: cpu %u, virq %u, mask %lxh\n", __func__, __LINE__,

	pr_debug("%s:%d: cpu %u, virq %u, mask %llxh\n", __func__, __LINE__,

		cpu, virq, pd->bmp.ipi_debug_brk_mask);

}
@@ -712,7 +712,7 @@ static unsigned int ps3_get_irq(void) 
	plug &= 0x3f;



	if (unlikely(plug == NO_IRQ)) {

		pr_debug("%s:%d: no plug found: thread_id %lu\n", __func__,

		pr_debug("%s:%d: no plug found: thread_id %llu\n", __func__,

			__LINE__, pd->thread_id);

		dump_bmp(&per_cpu(ps3_private, 0));

		dump_bmp(&per_cpu(ps3_private, 1));
@@ -747,7 +747,7 @@ void __init ps3_init_IRQ(void) 
		pd->thread_id = get_hard_smp_processor_id(cpu);

		spin_lock_init(&pd->bmp.lock);



		pr_debug("%s:%d: ppe_id %lu, thread_id %lu, bmp %lxh\n",

		pr_debug("%s:%d: ppe_id %llu, thread_id %llu, bmp %lxh\n",

			__func__, __LINE__, pd->ppe_id, pd->thread_id,

			ps3_mm_phys_to_lpar(__pa(&pd->bmp)));
@@ -772,6 +772,6 @@ void ps3_shutdown_IRQ(int cpu) 
	lv1_get_logical_ppe_id(&ppe_id);

	result = lv1_configure_irq_state_bitmap(ppe_id, thread_id, 0);



	DBG("%s:%d: lv1_configure_irq_state_bitmap (%lu:%lu/%d) %s\n", __func__,

	DBG("%s:%d: lv1_configure_irq_state_bitmap (%llu:%llu/%d) %s\n", __func__,

		__LINE__, ppe_id, thread_id, cpu, ps3_result(result));

}

arch/powerpc/platforms/ps3/mm.c

+5 −5
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ static unsigned long dma_sb_lpar_to_bus(struct ps3_dma_region *r, 
static void  __maybe_unused _dma_dump_region(const struct ps3_dma_region *r,

	const char *func, int line)

{

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

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

		r->dev->dev_id);

	DBG("%s:%d: page_size  %u\n", func, line, r->page_size);

	DBG("%s:%d: bus_addr   %lxh\n", func, line, r->bus_addr);
@@ -389,7 +389,7 @@ struct dma_chunk { 
static void _dma_dump_chunk (const struct dma_chunk* c, const char* func,

	int line)

{

	DBG("%s:%d: r.dev        %lu:%lu\n", func, line,

	DBG("%s:%d: r.dev        %llu:%llu\n", func, line,

		c->region->dev->bus_id, c->region->dev->dev_id);

	DBG("%s:%d: r.bus_addr   %lxh\n", func, line, c->region->bus_addr);

	DBG("%s:%d: r.page_size  %u\n", func, line, c->region->page_size);
@@ -595,7 +595,7 @@ static int dma_ioc0_map_pages(struct ps3_dma_region *r, unsigned long phys_addr, 


	/* build ioptes for the area */

	pages = len >> r->page_size;

	DBG("%s: pgsize=%#x len=%#lx pages=%#x iopteflag=%#lx\n", __func__,

	DBG("%s: pgsize=%#x len=%#lx pages=%#x iopteflag=%#llx\n", __func__,

	    r->page_size, r->len, pages, iopte_flag);

	for (iopage = 0; iopage < pages; iopage++) {

		offset = (1 << r->page_size) * iopage;
@@ -654,7 +654,7 @@ static int dma_sb_region_create(struct ps3_dma_region *r) 
	BUG_ON(!r);



	if (!r->dev->bus_id) {

		pr_info("%s:%d: %lu:%lu no dma\n", __func__, __LINE__,

		pr_info("%s:%d: %llu:%llu no dma\n", __func__, __LINE__,

			r->dev->bus_id, r->dev->dev_id);

		return 0;

	}
@@ -723,7 +723,7 @@ static int dma_sb_region_free(struct ps3_dma_region *r) 
	BUG_ON(!r);



	if (!r->dev->bus_id) {

		pr_info("%s:%d: %lu:%lu no dma\n", __func__, __LINE__,

		pr_info("%s:%d: %llu:%llu no dma\n", __func__, __LINE__,

			r->dev->bus_id, r->dev->dev_id);

		return 0;

	}

arch/powerpc/platforms/ps3/os-area.c

+1 −1
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ static void _dump_params(const struct os_area_params *p, const char *func, 
{

	pr_debug("%s:%d: p.boot_flag:       %u\n", func, line, p->boot_flag);

	pr_debug("%s:%d: p.num_params:      %u\n", func, line, p->num_params);

	pr_debug("%s:%d: p.rtc_diff         %ld\n", func, line, p->rtc_diff);

	pr_debug("%s:%d: p.rtc_diff         %lld\n", func, line, p->rtc_diff);

	pr_debug("%s:%d: p.av_multi_out     %u\n", func, line, p->av_multi_out);

	pr_debug("%s:%d: p.ctrl_button:     %u\n", func, line, p->ctrl_button);

	pr_debug("%s:%d: p.static_ip_addr:  %u.%u.%u.%u\n", func, line,