---

yaml
---
r: 131852
b: refs/heads/master
c: 7662b00
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5cf8cf4146de03de67d1a8aefbece66b65f255cc
+refs/heads/master: 7662b00c378fe638e84a853418cd833303fc050c

trunk/Documentation/ABI/testing/sysfs-bus-pci

@@ -1,46 +1,3 @@
-What:		/sys/bus/pci/drivers/.../bind
-Date:		December 2003
-Contact:	linux-pci@vger.kernel.org
-Description:
-		Writing a device location to this file will cause
-		the driver to attempt to bind to the device found at
-		this location.	This is useful for overriding default
-		bindings.  The format for the location is: DDDD:BB:DD.F.
-		That is Domain:Bus:Device.Function and is the same as
-		found in /sys/bus/pci/devices/.  For example:
-		# echo 0000:00:19.0 > /sys/bus/pci/drivers/foo/bind
-		(Note: kernels before 2.6.28 may require echo -n).
-
-What:		/sys/bus/pci/drivers/.../unbind
-Date:		December 2003
-Contact:	linux-pci@vger.kernel.org
-Description:
-		Writing a device location to this file will cause the
-		driver to attempt to unbind from the device found at
-		this location.	This may be useful when overriding default
-		bindings.  The format for the location is: DDDD:BB:DD.F.
-		That is Domain:Bus:Device.Function and is the same as
-		found in /sys/bus/pci/devices/. For example:
-		# echo 0000:00:19.0 > /sys/bus/pci/drivers/foo/unbind
-		(Note: kernels before 2.6.28 may require echo -n).
-
-What:		/sys/bus/pci/drivers/.../new_id
-Date:		December 2003
-Contact:	linux-pci@vger.kernel.org
-Description:
-		Writing a device ID to this file will attempt to
-		dynamically add a new device ID to a PCI device driver.
-		This may allow the driver to support more hardware than
-		was included in the driver's static device ID support
-		table at compile time.  The format for the device ID is:
-		VVVV DDDD SVVV SDDD CCCC MMMM PPPP.  That is Vendor ID,
-		Device ID, Subsystem Vendor ID, Subsystem Device ID,
-		Class, Class Mask, and Private Driver Data.  The Vendor ID
-		and Device ID fields are required, the rest are optional.
-		Upon successfully adding an ID, the driver will probe
-		for the device and attempt to bind to it.  For example:
-		# echo "8086 10f5" > /sys/bus/pci/drivers/foo/new_id
-
 What:		/sys/bus/pci/devices/.../vpd
 Date:		February 2008
 Contact:	Ben Hutchings <bhutchings@solarflare.com>

trunk/arch/powerpc/kernel/align.c

@@ -367,24 +367,27 @@ static int emulate_multiple(struct pt_regs *regs, unsigned char __user *addr,
 static int emulate_fp_pair(unsigned char __user *addr, unsigned int reg,
 			   unsigned int flags)
 {
-	char *ptr0 = (char *) &current->thread.TS_FPR(reg);
-	char *ptr1 = (char *) &current->thread.TS_FPR(reg+1);
-	int i, ret, sw = 0;
+	char *ptr = (char *) &current->thread.TS_FPR(reg);
+	int i, ret;
 
 	if (!(flags & F))
 		return 0;
 	if (reg & 1)
 		return 0;	/* invalid form: FRS/FRT must be even */
-	if (flags & SW)
-		sw = 7;
-	ret = 0;
-	for (i = 0; i < 8; ++i) {
-		if (!(flags & ST)) {
-			ret |= __get_user(ptr0[i^sw], addr + i);
-			ret |= __get_user(ptr1[i^sw], addr + i + 8);
-		} else {
-			ret |= __put_user(ptr0[i^sw], addr + i);
-			ret |= __put_user(ptr1[i^sw], addr + i + 8);
+	if (!(flags & SW)) {
+		/* not byte-swapped - easy */
+		if (!(flags & ST))
+			ret = __copy_from_user(ptr, addr, 16);
+		else
+			ret = __copy_to_user(addr, ptr, 16);
+	} else {
+		/* each FPR value is byte-swapped separately */
+		ret = 0;
+		for (i = 0; i < 16; ++i) {
+			if (!(flags & ST))
+				ret |= __get_user(ptr[i^7], addr + i);
+			else
+				ret |= __put_user(ptr[i^7], addr + i);
 		}
 	}
 	if (ret)

trunk/arch/powerpc/lib/copyuser_64.S

@@ -62,19 +62,18 @@ END_FTR_SECTION_IFCLR(CPU_FTR_UNALIGNED_LD_STD)
 72:	std	r8,8(r3)
 	beq+	3f
 	addi	r3,r3,16
+23:	ld	r9,8(r4)
 .Ldo_tail:
 	bf	cr7*4+1,1f
-23:	lwz	r9,8(r4)
-	addi	r4,r4,4
+	rotldi	r9,r9,32
 73:	stw	r9,0(r3)
 	addi	r3,r3,4
 1:	bf	cr7*4+2,2f
-44:	lhz	r9,8(r4)
-	addi	r4,r4,2
+	rotldi	r9,r9,16
 74:	sth	r9,0(r3)
 	addi	r3,r3,2
 2:	bf	cr7*4+3,3f
-45:	lbz	r9,8(r4)
+	rotldi	r9,r9,8
 75:	stb	r9,0(r3)
 3:	li	r3,0
 	blr
@@ -142,24 +141,11 @@ END_FTR_SECTION_IFCLR(CPU_FTR_UNALIGNED_LD_STD)
 6:	cmpwi	cr1,r5,8
 	addi	r3,r3,32
 	sld	r9,r9,r10
-	ble	cr1,7f
+	ble	cr1,.Ldo_tail
 34:	ld	r0,8(r4)
 	srd	r7,r0,r11
 	or	r9,r7,r9
-7:
-	bf	cr7*4+1,1f
-	rotldi	r9,r9,32
-94:	stw	r9,0(r3)
-	addi	r3,r3,4
-1:	bf	cr7*4+2,2f
-	rotldi	r9,r9,16
-95:	sth	r9,0(r3)
-	addi	r3,r3,2
-2:	bf	cr7*4+3,3f
-	rotldi	r9,r9,8
-96:	stb	r9,0(r3)
-3:	li	r3,0
-	blr
+	b	.Ldo_tail
 
 .Ldst_unaligned:
 	PPC_MTOCRF	0x01,r6		/* put #bytes to 8B bdry into cr7 */
@@ -232,16 +218,14 @@ END_FTR_SECTION_IFCLR(CPU_FTR_UNALIGNED_LD_STD)
 121:
 132:
 	addi	r3,r3,8
+123:
 134:
 135:
 138:
 139:
 140:
 141:
 142:
-123:
-144:
-145:
 
 /*
  * here we have had a fault on a load and r3 points to the first
@@ -325,9 +309,6 @@ END_FTR_SECTION_IFCLR(CPU_FTR_UNALIGNED_LD_STD)
 187:
 188:
 189:	
-194:
-195:
-196:
 1:
 	ld	r6,-24(r1)
 	ld	r5,-8(r1)
@@ -348,9 +329,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_UNALIGNED_LD_STD)
 	.llong	72b,172b
 	.llong	23b,123b
 	.llong	73b,173b
-	.llong	44b,144b
 	.llong	74b,174b
-	.llong	45b,145b
 	.llong	75b,175b
 	.llong	24b,124b
 	.llong	25b,125b
@@ -368,9 +347,6 @@ END_FTR_SECTION_IFCLR(CPU_FTR_UNALIGNED_LD_STD)
 	.llong	79b,179b
 	.llong	80b,180b
 	.llong	34b,134b
-	.llong	94b,194b
-	.llong	95b,195b
-	.llong	96b,196b
 	.llong	35b,135b
 	.llong	81b,181b
 	.llong	36b,136b

trunk/arch/powerpc/lib/memcpy_64.S

@@ -53,19 +53,18 @@ END_FTR_SECTION_IFCLR(CPU_FTR_UNALIGNED_LD_STD)
 3:	std	r8,8(r3)
 	beq	3f
 	addi	r3,r3,16
+	ld	r9,8(r4)
 .Ldo_tail:
 	bf	cr7*4+1,1f
-	lwz	r9,8(r4)
-	addi	r4,r4,4
+	rotldi	r9,r9,32
 	stw	r9,0(r3)
 	addi	r3,r3,4
 1:	bf	cr7*4+2,2f
-	lhz	r9,8(r4)
-	addi	r4,r4,2
+	rotldi	r9,r9,16
 	sth	r9,0(r3)
 	addi	r3,r3,2
 2:	bf	cr7*4+3,3f
-	lbz	r9,8(r4)
+	rotldi	r9,r9,8
 	stb	r9,0(r3)
 3:	ld	r3,48(r1)	/* return dest pointer */
 	blr
@@ -134,24 +133,11 @@ END_FTR_SECTION_IFCLR(CPU_FTR_UNALIGNED_LD_STD)
 	cmpwi	cr1,r5,8
 	addi	r3,r3,32
 	sld	r9,r9,r10
-	ble	cr1,6f
+	ble	cr1,.Ldo_tail
 	ld	r0,8(r4)
 	srd	r7,r0,r11
 	or	r9,r7,r9
-6:
-	bf	cr7*4+1,1f
-	rotldi	r9,r9,32
-	stw	r9,0(r3)
-	addi	r3,r3,4
-1:	bf	cr7*4+2,2f
-	rotldi	r9,r9,16
-	sth	r9,0(r3)
-	addi	r3,r3,2
-2:	bf	cr7*4+3,3f
-	rotldi	r9,r9,8
-	stb	r9,0(r3)
-3:	ld	r3,48(r1)	/* return dest pointer */
-	blr
+	b	.Ldo_tail
 
 .Ldst_unaligned:
 	PPC_MTOCRF	0x01,r6		# put #bytes to 8B bdry into cr7

trunk/arch/powerpc/sysdev/ppc4xx_pci.c

@@ -204,23 +204,6 @@ static int __init ppc4xx_setup_one_pci_PMM(struct pci_controller	*hose,
 {
 	u32 ma, pcila, pciha;
 
-	/* Hack warning ! The "old" PCI 2.x cell only let us configure the low
-	 * 32-bit of incoming PLB addresses. The top 4 bits of the 36-bit
-	 * address are actually hard wired to a value that appears to depend
-	 * on the specific SoC. For example, it's 0 on 440EP and 1 on 440EPx.
-	 *
-	 * The trick here is we just crop those top bits and ignore them when
-	 * programming the chip. That means the device-tree has to be right
-	 * for the specific part used (we don't print a warning if it's wrong
-	 * but on the other hand, you'll crash quickly enough), but at least
-	 * this code should work whatever the hard coded value is
-	 */
-	plb_addr &= 0xffffffffull;
-
-	/* Note: Due to the above hack, the test below doesn't actually test
-	 * if you address is above 4G, but it tests that address and
-	 * (address + size) are both contained in the same 4G
-	 */
 	if ((plb_addr + size) > 0xffffffffull || !is_power_of_2(size) ||
 	    size < 0x1000 || (plb_addr & (size - 1)) != 0) {
 		printk(KERN_WARNING "%s: Resource out of range\n",

trunk/block/blk-merge.c

@@ -38,84 +38,72 @@ void blk_recalc_rq_sectors(struct request *rq, int nsect)
 	}
 }
 
-static unsigned int __blk_recalc_rq_segments(struct request_queue *q,
-					     struct bio *bio,
-					     unsigned int *seg_size_ptr)
+void blk_recalc_rq_segments(struct request *rq)
 {
+	int nr_phys_segs;
 	unsigned int phys_size;
 	struct bio_vec *bv, *bvprv = NULL;
-	int cluster, i, high, highprv = 1;
-	unsigned int seg_size, nr_phys_segs;
-	struct bio *fbio;
+	int seg_size;
+	int cluster;
+	struct req_iterator iter;
+	int high, highprv = 1;
+	struct request_queue *q = rq->q;
 
-	if (!bio)
-		return 0;
+	if (!rq->bio)
+		return;
 
-	fbio = bio;
 	cluster = test_bit(QUEUE_FLAG_CLUSTER, &q->queue_flags);
 	seg_size = 0;
 	phys_size = nr_phys_segs = 0;
-	for_each_bio(bio) {
-		bio_for_each_segment(bv, bio, i) {
-			/*
-			 * the trick here is making sure that a high page is
-			 * never considered part of another segment, since that
-			 * might change with the bounce page.
-			 */
-			high = page_to_pfn(bv->bv_page) > q->bounce_pfn;
-			if (high || highprv)
+	rq_for_each_segment(bv, rq, iter) {
+		/*
+		 * the trick here is making sure that a high page is never
+		 * considered part of another segment, since that might
+		 * change with the bounce page.
+		 */
+		high = page_to_pfn(bv->bv_page) > q->bounce_pfn;
+		if (high || highprv)
+			goto new_segment;
+		if (cluster) {
+			if (seg_size + bv->bv_len > q->max_segment_size)
+				goto new_segment;
+			if (!BIOVEC_PHYS_MERGEABLE(bvprv, bv))
+				goto new_segment;
+			if (!BIOVEC_SEG_BOUNDARY(q, bvprv, bv))
 				goto new_segment;
-			if (cluster) {
-				if (seg_size + bv->bv_len > q->max_segment_size)
-					goto new_segment;
-				if (!BIOVEC_PHYS_MERGEABLE(bvprv, bv))
-					goto new_segment;
-				if (!BIOVEC_SEG_BOUNDARY(q, bvprv, bv))
-					goto new_segment;
-
-				seg_size += bv->bv_len;
-				bvprv = bv;
-				continue;
-			}
-new_segment:
-			if (nr_phys_segs == 1 && seg_size >
-			    fbio->bi_seg_front_size)
-				fbio->bi_seg_front_size = seg_size;
 
-			nr_phys_segs++;
+			seg_size += bv->bv_len;
 			bvprv = bv;
-			seg_size = bv->bv_len;
-			highprv = high;
+			continue;
 		}
-	}
-
-	if (seg_size_ptr)
-		*seg_size_ptr = seg_size;
-
-	return nr_phys_segs;
-}
-
-void blk_recalc_rq_segments(struct request *rq)
-{
-	unsigned int seg_size = 0, phys_segs;
+new_segment:
+		if (nr_phys_segs == 1 && seg_size > rq->bio->bi_seg_front_size)
+			rq->bio->bi_seg_front_size = seg_size;
 
-	phys_segs = __blk_recalc_rq_segments(rq->q, rq->bio, &seg_size);
+		nr_phys_segs++;
+		bvprv = bv;
+		seg_size = bv->bv_len;
+		highprv = high;
+	}
 
-	if (phys_segs == 1 && seg_size > rq->bio->bi_seg_front_size)
+	if (nr_phys_segs == 1 && seg_size > rq->bio->bi_seg_front_size)
 		rq->bio->bi_seg_front_size = seg_size;
 	if (seg_size > rq->biotail->bi_seg_back_size)
 		rq->biotail->bi_seg_back_size = seg_size;
 
-	rq->nr_phys_segments = phys_segs;
+	rq->nr_phys_segments = nr_phys_segs;
 }
 
 void blk_recount_segments(struct request_queue *q, struct bio *bio)
 {
+	struct request rq;
 	struct bio *nxt = bio->bi_next;
-
+	rq.q = q;
+	rq.bio = rq.biotail = bio;
 	bio->bi_next = NULL;
-	bio->bi_phys_segments = __blk_recalc_rq_segments(q, bio, NULL);
+	blk_recalc_rq_segments(&rq);
 	bio->bi_next = nxt;
+	bio->bi_phys_segments = rq.nr_phys_segments;
 	bio->bi_flags |= (1 << BIO_SEG_VALID);
 }
 EXPORT_SYMBOL(blk_recount_segments);