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

Commit b762666c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  serial: Add 16850 uart type support to OF uart driver
  hvc_console: Remove tty->low_latency
  powerpc: Get the number of SLBs from "slb-size" property
  powerpc: is_hugepage_only_range() must account for both 4kB and 64kB slices
  powerpc/ps3: printing fixups for l64 to ll64 conversion drivers/video
  powerpc/ps3: Printing fixups for l64 to ll64 conversion drivers/scsi
  powerpc/ps3: Printing fixups for l64 to ll64 conversion drivers/ps3
  powerpc/ps3: Printing fixups for l64 to ll64 conversion sound/ppc
  powerpc/ps3: Printing fixups for l64 to ll64 conversion drivers/char
  powerpc/ps3: Printing fixups for l64 to ll64 conversion drivers/block
  powerpc/ps3: Printing fixups for l64 to ll64 conversion arch/powerpc
  powerpc/ps3: ps3_repository_read_mm_info() takes u64 * arguments
  powerpc/ps3: clear_bit()/set_bit() operate on unsigned longs
  powerpc/ps3: The lv1_ routines have u64 parameters
  powerpc/ps3: Use dma_addr_t down through the stack
  powerpc/ps3: set_dabr() takes an unsigned long
  powerpc: Cleanup from l64 to ll64 change drivers/scsi
parents e58d4fd8 0025e753

arch/powerpc/include/asm/ps3.h

+4 −4
Original line number Diff line number Diff line
@@ -103,10 +103,10 @@ struct ps3_dma_region_ops { 
	int (*map)(struct ps3_dma_region *,

		   unsigned long virt_addr,

		   unsigned long len,

		   unsigned long *bus_addr,

		   dma_addr_t *bus_addr,

		   u64 iopte_pp);

	int (*unmap)(struct ps3_dma_region *,

		     unsigned long bus_addr,

		     dma_addr_t bus_addr,

		     unsigned long len);

};

/**
@@ -124,9 +124,9 @@ int ps3_dma_region_init(struct ps3_system_bus_device *dev, 
int ps3_dma_region_create(struct ps3_dma_region *r);

int ps3_dma_region_free(struct ps3_dma_region *r);

int ps3_dma_map(struct ps3_dma_region *r, unsigned long virt_addr,

	unsigned long len, unsigned long *bus_addr,

	unsigned long len, dma_addr_t *bus_addr,

	u64 iopte_pp);

int ps3_dma_unmap(struct ps3_dma_region *r, unsigned long bus_addr,

int ps3_dma_unmap(struct ps3_dma_region *r, dma_addr_t bus_addr,

	unsigned long len);



/* mmio routines */

arch/powerpc/kernel/prom.c

+5 −0
Original line number Diff line number Diff line
@@ -590,6 +590,11 @@ static void __init check_cpu_slb_size(unsigned long node) 
{

	u32 *slb_size_ptr;



	slb_size_ptr = of_get_flat_dt_prop(node, "slb-size", NULL);

	if (slb_size_ptr != NULL) {

		mmu_slb_size = *slb_size_ptr;

		return;

	}

	slb_size_ptr = of_get_flat_dt_prop(node, "ibm,slb-size", NULL);

	if (slb_size_ptr != NULL) {

		mmu_slb_size = *slb_size_ptr;

arch/powerpc/mm/slice.c

+10 −1
Original line number Diff line number Diff line
@@ -710,9 +710,18 @@ int is_hugepage_only_range(struct mm_struct *mm, unsigned long addr, 
			   unsigned long len)

{

	struct slice_mask mask, available;

	unsigned int psize = mm->context.user_psize;



	mask = slice_range_to_mask(addr, len);

	available = slice_mask_for_size(mm, mm->context.user_psize);

	available = slice_mask_for_size(mm, psize);

#ifdef CONFIG_PPC_64K_PAGES

	/* We need to account for 4k slices too */

	if (psize == MMU_PAGE_64K) {

		struct slice_mask compat_mask;

		compat_mask = slice_mask_for_size(mm, MMU_PAGE_4K);

		or_mask(available, compat_mask);

	}

#endif



#if 0 /* too verbose */

	slice_dbg("is_hugepage_only_range(mm=%p, addr=%lx, len=%lx)\n",

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();

	}