* [PATCH]qemu-xen: let xenfb_guest_copy() handle depth=32 case
From: Chun Yan Liu @ 2010-10-20 6:38 UTC (permalink / raw)
To: xen-devel
[-- Attachment #1.1: Type: text/plain, Size: 1814 bytes --]
In hw/xenfb.c, xenfb_guest_copy() function doesn't handle xenfb->depth=32 case. When xenfb->depth=32, it will report error and won't copy data from the guest framebuffer region into QEMU's displaysurface, thus when enter CTRL+ALT+2 to qemu monitor console then CTRL+ALT+1 back to guest X window, the screen cannot be restored.
This patch adds two things:
1. when xenfb->depth equals destination bpp, do not need data translation, simply copy data from guest framebuffer into QEMU's displaysurface.
2. when xenfb->depth and destination bpp differs, add processing for xenfb->depth=32 case.
Signed-off by Chunyan Liu <cyliu@novell.com>
diff -r e4f337bb97f7 tools/ioemu-qemu-xen/hw/xenfb.c
--- a/hw/xenfb.c Wed Oct 20 19:39:28 2010 +0800
+++ b/hw/xenfb.c Wed Oct 20 21:42:37 2010 +0800
@@ -612,6 +612,12 @@
uint8_t *data = ds_get_data(xenfb->c.ds);
if (!is_buffer_shared(xenfb->c.ds->surface)) {
+ if (xenfb->depth == bpp) {
+ for (line = y; line < (y+h); line++) {
+ memcpy (data + (line * linesize) + (x * bpp / 8), xenfb->pixels + xenfb->offset + (line * xenfb->row_stride) + (x * xenfb->depth / 8), w * xenfb->depth / 8);
+ }
+ }
+ else{
switch (xenfb->depth) {
case 8:
if (bpp == 16) {
@@ -631,9 +637,17 @@
oops = 1;
}
break;
+ case 32:
+ if (bpp == 16) {
+ BLT(uint32_t, uint16_t, 8, 8, 8, 5, 6, 5);
+ } else {
+ oops = 1;
+ }
+ break;
default:
oops = 1;
}
+ }
}
if (oops) /* should not happen */
xen_be_printf(&xenfb->c.xendev, 0, "%s: oops: convert %d -> %d bpp?\n",
[-- Attachment #1.2: Type: text/html, Size: 3683 bytes --]
[-- Attachment #2: xenfb_32bpp.PATCH --]
[-- Type: text/plain, Size: 1168 bytes --]
diff -r e4f337bb97f7 tools/ioemu-qemu-xen/hw/xenfb.c
--- a/hw/xenfb.c Wed Oct 20 19:39:28 2010 +0800
+++ b/hw/xenfb.c Wed Oct 20 21:42:37 2010 +0800
@@ -612,6 +612,12 @@
uint8_t *data = ds_get_data(xenfb->c.ds);
if (!is_buffer_shared(xenfb->c.ds->surface)) {
+ if (xenfb->depth == bpp) {
+ for (line = y; line < (y+h); line++) {
+ memcpy (data + (line * linesize) + (x * bpp / 8), xenfb->pixels + xenfb->offset + (line * xenfb->row_stride) + (x * xenfb->depth / 8), w * xenfb->depth / 8);
+ }
+ }
+ else{
switch (xenfb->depth) {
case 8:
if (bpp == 16) {
@@ -631,9 +637,17 @@
oops = 1;
}
break;
+ case 32:
+ if (bpp == 16) {
+ BLT(uint32_t, uint16_t, 8, 8, 8, 5, 6, 5);
+ } else {
+ oops = 1;
+ }
+ break;
default:
oops = 1;
}
+ }
}
if (oops) /* should not happen */
xen_be_printf(&xenfb->c.xendev, 0, "%s: oops: convert %d -> %d bpp?\n",
[-- Attachment #3: Type: text/plain, Size: 138 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
^ permalink raw reply
* Re: [PATCH] dma: imx-dma: fix signedness bug
From: Sascha Hauer @ 2010-10-20 6:37 UTC (permalink / raw)
To: Dan Williams
Cc: Vasiliy Kulikov, kernel-janitors, Linus Walleij, linux-kernel
In-Reply-To: <AANLkTik15Z2_wyDRDOHOnpKKPgb+PHWs477esndgWmex@mail.gmail.com>
mxdmac->channel was unsigned, so check (imxdmac->channel < 0) for
failed imx_dma_request_by_prio() made no sence. Explicitly check
signed values.
Also, fix uninitialzed use of ret.
Signed-off-by: Vasiliy Kulikov <segooon@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
Here's an updated patch fixing both issues.
drivers/dma/imx-dma.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c
index 346be62..f629e49 100644
--- a/drivers/dma/imx-dma.c
+++ b/drivers/dma/imx-dma.c
@@ -335,8 +335,10 @@ static int __init imxdma_probe(struct platform_device *pdev)
imxdmac->imxdma_channel = imx_dma_request_by_prio("dmaengine",
DMA_PRIO_MEDIUM);
- if (imxdmac->channel < 0)
+ if ((int)imxdmac->channel < 0) {
+ ret = -ENODEV;
goto err_init;
+ }
imx_dma_setup_handlers(imxdmac->imxdma_channel,
imxdma_irq_handler, imxdma_err_handler, imxdmac);
--
1.7.2.3
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply related
* [U-Boot] [PATCH 3/3] tqm85xx: Update PCI code
From: Kumar Gala @ 2010-10-20 6:37 UTC (permalink / raw)
To: u-boot
In-Reply-To: <1285785448-4703-3-git-send-email-ptyser@xes-inc.com>
On Sep 29, 2010, at 1:37 PM, Peter Tyser wrote:
> Update to use the recent, common FSL PCI initialization code.
>
> Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
> CC: sr at denx.de
> ---
> board/tqc/tqm85xx/law.c | 4 +-
> board/tqc/tqm85xx/tlb.c | 10 ++--
> board/tqc/tqm85xx/tqm85xx.c | 151 ++++++++++++-------------------------------
> include/configs/TQM85xx.h | 20 +++---
> 4 files changed, 59 insertions(+), 126 deletions(-)
applied to 85xx.
- k
^ permalink raw reply
* Re: [PATCH] dma: imx-dma: fix signedness bug
From: Sascha Hauer @ 2010-10-20 6:37 UTC (permalink / raw)
To: Dan Williams
Cc: Vasiliy Kulikov, kernel-janitors, Linus Walleij, linux-kernel
In-Reply-To: <AANLkTik15Z2_wyDRDOHOnpKKPgb+PHWs477esndgWmex@mail.gmail.com>
mxdmac->channel was unsigned, so check (imxdmac->channel < 0) for
failed imx_dma_request_by_prio() made no sence. Explicitly check
signed values.
Also, fix uninitialzed use of ret.
Signed-off-by: Vasiliy Kulikov <segooon@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
Here's an updated patch fixing both issues.
drivers/dma/imx-dma.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c
index 346be62..f629e49 100644
--- a/drivers/dma/imx-dma.c
+++ b/drivers/dma/imx-dma.c
@@ -335,8 +335,10 @@ static int __init imxdma_probe(struct platform_device *pdev)
imxdmac->imxdma_channel = imx_dma_request_by_prio("dmaengine",
DMA_PRIO_MEDIUM);
- if (imxdmac->channel < 0)
+ if ((int)imxdmac->channel < 0) {
+ ret = -ENODEV;
goto err_init;
+ }
imx_dma_setup_handlers(imxdmac->imxdma_channel,
imxdma_irq_handler, imxdma_err_handler, imxdmac);
--
1.7.2.3
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply related
* [U-Boot] [PATCH 2/3] sbc8641d: Update PCI code
From: Kumar Gala @ 2010-10-20 6:37 UTC (permalink / raw)
To: u-boot
In-Reply-To: <1285785448-4703-2-git-send-email-ptyser@xes-inc.com>
On Sep 29, 2010, at 1:37 PM, Peter Tyser wrote:
> Update to use the recent, common FSL PCI initialization code.
>
> Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
> CC: joe.hamman at embeddedspecialties.com
> ---
> board/sbc8641d/sbc8641d.c | 103 ++++++++++----------------------------------
> 1 files changed, 24 insertions(+), 79 deletions(-)
applied to 85xx.
- k
^ permalink raw reply
* [U-Boot] [PATCH 1/3] mpc8641hpcn: Update PCI code
From: Kumar Gala @ 2010-10-20 6:37 UTC (permalink / raw)
To: u-boot
In-Reply-To: <1285785448-4703-1-git-send-email-ptyser@xes-inc.com>
On Sep 29, 2010, at 1:37 PM, Peter Tyser wrote:
> Update to use the recent, common FSL PCI initialization code.
>
> Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
> ---
> I was making the same changes to X-ES code, so applied them to
> other users of the old PCI init code. I only compile tested
> them on these boards.
>
> board/freescale/mpc8641hpcn/mpc8641hpcn.c | 97 +++++++----------------------
> 1 files changed, 22 insertions(+), 75 deletions(-)
applied to 85xx.
- k
^ permalink raw reply
* [U-Boot] [PATCH 17/17] 85xx: Use gc-sections to reduce image size
From: Kumar Gala @ 2010-10-20 6:36 UTC (permalink / raw)
To: u-boot
In-Reply-To: <1285787156-6005-17-git-send-email-ptyser@xes-inc.com>
On Sep 29, 2010, at 2:05 PM, Peter Tyser wrote:
> On an XPedite5370 over 11KBytes were saved:
> Before:
> text data bss dec hex filename
> 332456 33364 33476 399296 617c0 ./u-boot
>
> After:
> text data bss dec hex filename
> 321075 33836 33476 388387 5ed23 ./u-boot
>
> Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
> CC: Kumar Gala <galak@kernel.crashing.org>
> ---
> arch/powerpc/cpu/mpc85xx/config.mk | 4 +++
> arch/powerpc/cpu/mpc85xx/u-boot.lds | 52 +++++++----------------------------
> 2 files changed, 14 insertions(+), 42 deletions(-)
applied to 85xx.
- k
^ permalink raw reply
* [U-Boot] [PATCH 16/17] 86xx: Use gc-sections to reduce image size
From: Kumar Gala @ 2010-10-20 6:36 UTC (permalink / raw)
To: u-boot
In-Reply-To: <1285787156-6005-16-git-send-email-ptyser@xes-inc.com>
On Sep 29, 2010, at 2:05 PM, Peter Tyser wrote:
> On an XPedite5170 over 11KBytes were saved:
> Before:
> text data bss dec hex filename
> 319488 28700 33204 381392 5d1d0 ./u-boot
>
> After:
> text data bss dec hex filename
> 307663 29144 33204 370011 5a55b ./u-boot
>
> Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
> CC: Kumar Gala <galak@kernel.crashing.org>
> ---
> arch/powerpc/cpu/mpc86xx/config.mk | 4 ++++
> arch/powerpc/cpu/mpc86xx/u-boot.lds | 26 ++++++++------------------
> 2 files changed, 12 insertions(+), 18 deletions(-)
cleaned up and applied to 85xx.
- k
^ permalink raw reply
* [U-Boot] [PATCH 15/17] 86xx: Create common linker script
From: Kumar Gala @ 2010-10-20 6:36 UTC (permalink / raw)
To: u-boot
In-Reply-To: <1285787156-6005-15-git-send-email-ptyser@xes-inc.com>
On Sep 29, 2010, at 2:05 PM, Peter Tyser wrote:
> Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
> CC: Kumar Gala <galak@kernel.crashing.org>
> ---
> arch/powerpc/cpu/mpc86xx/config.mk | 3 +
> .../powerpc/cpu/mpc86xx}/u-boot.lds | 0
> board/freescale/mpc8610hpcd/u-boot.lds | 132 -------------------
> board/freescale/mpc8641hpcn/u-boot.lds | 133 --------------------
> board/xes/xpedite517x/u-boot.lds | 132 -------------------
> 5 files changed, 3 insertions(+), 397 deletions(-)
> rename {board/sbc8641d => arch/powerpc/cpu/mpc86xx}/u-boot.lds (100%)
> delete mode 100644 board/freescale/mpc8610hpcd/u-boot.lds
> delete mode 100644 board/freescale/mpc8641hpcn/u-boot.lds
> delete mode 100644 board/xes/xpedite517x/u-boot.lds
cleaned up and applied to 85xx.
- k
^ permalink raw reply
* Re: [PATCH] dma: imx-dma: fix signedness bug
From: Sascha Hauer @ 2010-10-20 6:35 UTC (permalink / raw)
To: Dan Williams
Cc: Vasiliy Kulikov, kernel-janitors, Linus Walleij, linux-kernel
In-Reply-To: <AANLkTik15Z2_wyDRDOHOnpKKPgb+PHWs477esndgWmex@mail.gmail.com>
On Tue, Oct 19, 2010 at 03:26:05PM -0700, Dan Williams wrote:
> On Sun, Oct 17, 2010 at 7:51 AM, Vasiliy Kulikov <segooon@gmail.com> wrote:
> > mxdmac->channel was unsigned, so check (imxdmac->channel < 0) for
> > failed imx_dma_request_by_prio() made no sence. Explicitly check
> > signed values.
> >
> > Signed-off-by: Vasiliy Kulikov <segooon@gmail.com>
> > ---
> > drivers/dma/imx-dma.c | 2 +-
> > 1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c
> > index 346be62..75d870f 100644
> > --- a/drivers/dma/imx-dma.c
> > +++ b/drivers/dma/imx-dma.c
> > @@ -335,7 +335,7 @@ static int __init imxdma_probe(struct platform_device *pdev)
> >
> > imxdmac->imxdma_channel = imx_dma_request_by_prio("dmaengine",
> > DMA_PRIO_MEDIUM);
> > - if (imxdmac->channel < 0)
> > + if ((int)imxdmac->channel < 0)
> > goto err_init;
>
> Should this be:
>
> if ((int)imxdmac->channel < 0) {
> ret = -ENODEV;
> goto err_init;
> }
>
> ...because I get the following in my compilation tests.
Yes, ret is clearly used uninitialized. I wonder why my gcc-4.3.2 compiler
does not warn me about this :(
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply
* Re: [PATCH] dma: imx-dma: fix signedness bug
From: Sascha Hauer @ 2010-10-20 6:35 UTC (permalink / raw)
To: Dan Williams
Cc: Vasiliy Kulikov, kernel-janitors, Linus Walleij, linux-kernel
In-Reply-To: <AANLkTik15Z2_wyDRDOHOnpKKPgb+PHWs477esndgWmex@mail.gmail.com>
On Tue, Oct 19, 2010 at 03:26:05PM -0700, Dan Williams wrote:
> On Sun, Oct 17, 2010 at 7:51 AM, Vasiliy Kulikov <segooon@gmail.com> wrote:
> > mxdmac->channel was unsigned, so check (imxdmac->channel < 0) for
> > failed imx_dma_request_by_prio() made no sence. Explicitly check
> > signed values.
> >
> > Signed-off-by: Vasiliy Kulikov <segooon@gmail.com>
> > ---
> > drivers/dma/imx-dma.c | 2 +-
> > 1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c
> > index 346be62..75d870f 100644
> > --- a/drivers/dma/imx-dma.c
> > +++ b/drivers/dma/imx-dma.c
> > @@ -335,7 +335,7 @@ static int __init imxdma_probe(struct platform_device *pdev)
> >
> > imxdmac->imxdma_channel = imx_dma_request_by_prio("dmaengine",
> > DMA_PRIO_MEDIUM);
> > - if (imxdmac->channel < 0)
> > + if ((int)imxdmac->channel < 0)
> > goto err_init;
>
> Should this be:
>
> if ((int)imxdmac->channel < 0) {
> ret = -ENODEV;
> goto err_init;
> }
>
> ...because I get the following in my compilation tests.
Yes, ret is clearly used uninitialized. I wonder why my gcc-4.3.2 compiler
does not warn me about this :(
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: [PATCH v2 3/3] drivers: cleanup Kconfig stuff
From: Felipe Balbi @ 2010-10-20 6:35 UTC (permalink / raw)
To: Kevin Hilman
Cc: Tony Lindgren, Felipe Contreras, Felipe Balbi, Balbi, Felipe,
linux-usb@vger.kernel.org, linux-omap, linux-main, Greg KH
In-Reply-To: <87fww1u3fw.fsf@deeprootsystems.com>
Hi,
On Tue, Oct 19, 2010 at 07:13:07PM -0500, Kevin Hilman wrote:
>One thing I don't like about this is that there is currently no way to
>'select' as a module.
Yeah, I remember suggesting to add "module" to Kconfig language which
would do the job of selecting as module.
--
balbi
^ permalink raw reply
* [LTP] NFS testcase error
From: ARJIT SHARMA @ 2010-10-20 6:35 UTC (permalink / raw)
To: ltp-list, hannuxx, Garrett Cooper; +Cc: ajay.khandelwal
[-- Attachment #1.1: Type: text/plain, Size: 8002 bytes --]
Hi,
During the execution of NFS testcase in ARM architechture, 5 out of 8
tests are failing.
There is very strange kind of error occuring in few tests which i am
not able to track, actually what is happening is that, instead of looking
for the file say " /opt/ltp/testcases bin/nfs02 " it is looking for
" /opt/ltp/testcases bin/nfs02493 " or something like this kind of random
file, which does not exists.
Hence occurs "Permission denied" and test fails.
This problem is also in few other tests, but here i am telling
you this problem with reference to NFS testcase.
I am also sending you the log of the testcase, please suggest ways to
correct it and why this occurs.....
Ltp version >> Ltp-intermediate-20100228
Processor >> armv7 processor
Kernel version >> 2.6.32 (LSP3.0-alpha)
INFO: creating /opt/ltp/results directory
If some fields are empty or look unusual you may have an old version.
Compare to the current minimal requirements in Documentation/Changes.
Linux 192.168.1.10 2.6.32 #2 SMP Fri Aug 27 12:31:08 IST 2010 armv7l unknown
unknown GNU/Linux
Gnu C gcc (GCC) 4.5.0
Gnu make 3.81
util-linux ng 2.16.1)
mount ng 2.16.1 (with libblkid support)
modutils 3.1
e2fsprogs 1.41.9
PPP 2.4.4
Linux C Library 2.10.1
Dynamic linker (ldd) 2.10.1
Linux C++ Library 6.0.14
Procps 100.
Net-tools 1.60
iproute2 iproute2-ss100224
Console-tools 0.2.3
Sh-utils 5.2.1
Modules Loaded
free reports:
total used free shared buffers cached
Mem: 255556 58804 196752 0 0 45884
-/+ buffers/cache: 12920 242636
Swap: 0 0 0
/proc/cpuinfo
Processor : ARMv7 Processor rev 1 (v7l)
processor : 0
BogoMIPS : 996.14
processor : 1
BogoMIPS : 996.14
Features : swp half thumb fastmult vfp edsp vfpv3 vfpv3d16
CPU implementer : 0x41
CPU architecture: 7
CPU variant : 0x1
CPU part : 0xc09
CPU revision : 1
Hardware : ST-SPEAR1300-EVB
Revision : 0000
Serial : 0000000000000000
remove test cases which require the block device.
You can specify it with option -b
COMMAND: /opt/ltp/bin/ltp-pan -e -S -a 375 -n 375 -p -f
/tmp/ltp-aCaatAb381/alltests -l /opt/ltp/results/nfs.result -C
/opt/ltp/output/LTP_RUN_ON-nfs.result.failed
LOG File: /opt/ltp/results/nfs.result
FAILED COMMAND File: /opt/ltp/output/LTP_RUN_ON-nfs.result.failed
Running tests.......
<<<test_start>>>
tag=nfs01 stime=351719851
cmdline="export VERSION SOCKET_TYPE; TCbin=$LTPROOT/testcases/bin nfs01"
contacts=""
analysis=exit
<<<test_output>>>
/opt/ltp/testcases/bin/nfs01: line 203: test_resm: command not found
<<<execution_status>>>
initiation_status="ok"
duration=1 termination_type=exited termination_id=0 corefile=no
cutime=2 cstime=7
<<<test_end>>>
<<<test_start>>>
tag=nfs02 stime=351719852
cmdline="export VERSION SOCKET_TYPE; TCbin=$LTPROOT/testcases/bin nfs02"
contacts=""
analysis=exit
<<<test_output>>>
do_setup nfs02
Test Options:
VERSION: 2
RHOST: 192.168.1.10
SOCKET_TYPE: udp
NFS_TYPE: nfs
TESTDIR: /tmp/nfs02493.testdir
Permission denied.
do_cleanup nfs02
umount: /opt/ltp/testcases/bin/nfs02493: not found
rmdir: `/opt/ltp/testcases/bin/nfs02493': No such file or directory
Permission denied.
Permission denied.
Test Failed: Could not create /tmp/nfs02493.testdir from 192.168.1.10
<<<execution_status>>>
initiation_status="ok"
duration=3 termination_type=exited termination_id=1 corefile=no
cutime=6 cstime=15
<<<test_end>>>
<<<test_start>>>
tag=nfs03 stime=351719855
cmdline="export VERSION SOCKET_TYPE; TCbin=$LTPROOT/testcases/bin nfs03"
contacts=""
analysis=exit
<<<test_output>>>
Test Options:
VERSION: 2
SOCKET_TYPE: udp
TESTDIR: /tmp/nfs03507.testdir
RHOST: 192.168.1.10
NFS_TYPE: nfs
Test Parameters:
Number of Directories: 100
Number of Files per Directory: 100
Number of nfsds tested: 1
Setting up remote machine: 192.168.1.10
Permission denied.
Cleaning up testcase
umount: /opt/ltp/testcases/bin/nfs03507: not mounted
Cannot umount /opt/ltp/testcases/bin/nfs03507
Permission denied.
Permission denied.
Permission denied.
Test Failed: Could not create remote directory
<<<execution_status>>>
initiation_status="ok"
duration=2 termination_type=exited termination_id=1 corefile=no
cutime=8 cstime=18
<<<test_end>>>
<<<test_start>>>
tag=nfs04 stime=351719857
cmdline="export VERSION SOCKET_TYPE; TCbin=$LTPROOT/testcases/bin nfs04"
contacts=""
analysis=exit
<<<test_output>>>
Test Options:
VERSION: 2
RHOST: 192.168.1.10
FILESIZE: 10
SOCKET_TYPE: udp
TESTDIR: /tmp/nfs04525.testdir
NFS_TYPE: nfs
LOOPS: 1
nfs04 0 TINFO : Setting up remote machine: 192.168.1.10
Permission denied.
umount: /tmp/nfs04525: not mounted
nfs04 1 TBROK : Cannot umount /tmp/nfs04525
Permission denied.
Permission denied.
nfs04 1 TFAIL : Test Failed: Could not create remote directory
<<<execution_status>>>
initiation_status="ok"
duration=3 termination_type=exited termination_id=1 corefile=no
cutime=3 cstime=21
<<<test_end>>>
<<<test_start>>>
tag=nfslock01 stime=351719860
cmdline="export VERSION; nfslock01"
contacts=""
analysis=exit
<<<test_output>>>
doing Setup
Testing locking
locking /opt/ltp/testcases/bin/nfslock544/nfs_flock_idata file and writing
data
: doing /opt/ltp/testcases/bin/nfslock01.
Test Successful
<<<execution_status>>>
initiation_status="ok"
duration=22 termination_type=exited termination_id=0 corefile=no
cutime=20 cstime=433
<<<test_end>>>
<<<test_start>>>
tag=nfsstress stime=351719882
cmdline="export VERSION SOCKET_TYPE; nfsstress 20 50 1"
contacts=""
analysis=exit
<<<test_output>>>
Test Options:
VERSION: 2
RHOST: 192.168.1.10
SOCKET_TYPE: udp
NFS_TYPE: nfs
Test Parameters:
Number of Directories: 20
Number of Files per Directory: 50
Number of Threads: 1
Setting up remote machine: 192.168.1.10
Permission denied.
Cleaning up testcase
umount: /opt/ltp/testcases/bin/nfsstress563: not mounted
Cannot umount /opt/ltp/testcases/bin/nfsstress563
Permission denied.
Permission denied.
Test Failed: Could not create remote directory
<<<execution_status>>>
initiation_status="ok"
duration=4 termination_type=exited termination_id=1 corefile=no
cutime=7 cstime=18
<<<test_end>>>
<<<test_start>>>
tag=nfsstat01 stime=351719886
cmdline="export VERSION; TCbin=$LTPROOT/testcases/bin nfsstat01"
contacts=""
analysis=exit
<<<test_output>>>
do_setup nfsstat01
This test runs LOCALLY.
do_cleanup nfsstat01
Unmounting TESTDIR
umount: /tmp/nfsstat01582.testdir: not found
Unmounting EXPORTDIR
umount: /tmp/nfsstat01582: not found
Test PASS
<<<execution_status>>>
initiation_status="ok"
duration=10 termination_type=exited termination_id=0 corefile=no
cutime=6 cstime=18
<<<test_end>>>
<<<test_start>>>
tag=nfsx-linux stime=351719896
cmdline="export VERSION SOCKET_TYPE; TCbin=$LTPROOT/testcases/bin fsx.sh"
contacts=""
analysis=exit
<<<test_output>>>
Test Options:
VERSION: 2
RHOST: 192.168.1.10
ITERATIONS: 50000
SOCKET_TYPE: udp
NFS_TYPE: nfs
Setting up remote machine: 192.168.1.10
Permission denied.
Cleaning up testcase
Unmounting /opt/ltp/testcases/bin/fsx597
umount: /opt/ltp/testcases/bin/fsx597: not mounted
/opt/ltp/testcases/bin/fsx.sh: line 174: error: command not found
Permission denied.
Permission denied.
Test Failed: Could not create remote directory
incrementing stop
<<<execution_status>>>
initiation_status="ok"
duration=2 termination_type=exited termination_id=1 corefile=no
cutime=5 cstime=10
<<<test_end>>>
INFO: ltp-pan reported some tests FAIL
LTP Version: LTP-20100131
###############################################################"
Done executing testcases."
LTP Version: LTP-20100131
###############################################################"
--
Best Regards,
Arjit Sharma.
[-- Attachment #1.2: Type: text/html, Size: 10139 bytes --]
[-- Attachment #2: Type: text/plain, Size: 369 bytes --]
------------------------------------------------------------------------------
Download new Adobe(R) Flash(R) Builder(TM) 4
The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly
Flex(R) Builder(TM)) enable the development of rich applications that run
across multiple browsers and platforms. Download your free trials today!
http://p.sf.net/sfu/adobe-dev2dev
[-- Attachment #3: Type: text/plain, Size: 155 bytes --]
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list
^ permalink raw reply
* Re: [PATCH v2 1/3] usb: fix Kconfig warning
From: Felipe Balbi @ 2010-10-20 6:34 UTC (permalink / raw)
To: Felipe Contreras
Cc: linux-usb@vger.kernel.org, linux-omap, linux-main, Greg KH,
Balbi, Felipe, Tony Lindgren
In-Reply-To: <1287482608-11320-2-git-send-email-felipe.contreras@gmail.com>
On Tue, Oct 19, 2010 at 05:03:26AM -0500, Felipe Contreras wrote:
>warning: (USB_MUSB_HDRC_HCD && USB_SUPPORT && USB_MUSB_HDRC &&
>(USB_MUSB_HOST || USB_MUSB_OTG) && USB_GADGET_MUSB_HDRC || USB_MUSB_OTG
>&& <choice> && USB && USB_GADGET && PM && EXPERIMENTAL) selects USB_OTG
>which has unmet direct dependencies (USB_GADGET_OMAP && ARCH_OMAP_OTG &&
>USB_OHCI_HCD)
>
>This doesn't seem to happen on 2.6.36-rc8, but still doesn't make sense
>to keep this duplicated config that is already defined in usb/core.
>
Acked-by: Felipe Balbi <balbi@ti.com>
>Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
>---
> drivers/usb/gadget/Kconfig | 11 -----------
> 1 files changed, 0 insertions(+), 11 deletions(-)
>
>diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
>index cd27f9b..19a6eb6 100644
>--- a/drivers/usb/gadget/Kconfig
>+++ b/drivers/usb/gadget/Kconfig
>@@ -209,17 +209,6 @@ config USB_OMAP
> default USB_GADGET
> select USB_GADGET_SELECTED
>
>-config USB_OTG
>- boolean "OTG Support"
>- depends on USB_GADGET_OMAP && ARCH_OMAP_OTG && USB_OHCI_HCD
>- help
>- The most notable feature of USB OTG is support for a
>- "Dual-Role" device, which can act as either a device
>- or a host. The initial role choice can be changed
>- later, when two dual-role devices talk to each other.
>-
>- Select this only if your OMAP board has a Mini-AB connector.
>-
> config USB_GADGET_PXA25X
> boolean "PXA 25x or IXP 4xx"
> depends on (ARCH_PXA && PXA25x) || ARCH_IXP4XX
>--
>1.7.3.1.2.g7fe2b
--
balbi
^ permalink raw reply
* Re: [PATCH v2 1/3] usb: fix Kconfig warning
From: Felipe Balbi @ 2010-10-20 6:34 UTC (permalink / raw)
To: Felipe Contreras
Cc: linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-omap,
linux-main, Greg KH, Balbi, Felipe, Tony Lindgren
In-Reply-To: <1287482608-11320-2-git-send-email-felipe.contreras-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
On Tue, Oct 19, 2010 at 05:03:26AM -0500, Felipe Contreras wrote:
>warning: (USB_MUSB_HDRC_HCD && USB_SUPPORT && USB_MUSB_HDRC &&
>(USB_MUSB_HOST || USB_MUSB_OTG) && USB_GADGET_MUSB_HDRC || USB_MUSB_OTG
>&& <choice> && USB && USB_GADGET && PM && EXPERIMENTAL) selects USB_OTG
>which has unmet direct dependencies (USB_GADGET_OMAP && ARCH_OMAP_OTG &&
>USB_OHCI_HCD)
>
>This doesn't seem to happen on 2.6.36-rc8, but still doesn't make sense
>to keep this duplicated config that is already defined in usb/core.
>
Acked-by: Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org>
>Signed-off-by: Felipe Contreras <felipe.contreras-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
>---
> drivers/usb/gadget/Kconfig | 11 -----------
> 1 files changed, 0 insertions(+), 11 deletions(-)
>
>diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
>index cd27f9b..19a6eb6 100644
>--- a/drivers/usb/gadget/Kconfig
>+++ b/drivers/usb/gadget/Kconfig
>@@ -209,17 +209,6 @@ config USB_OMAP
> default USB_GADGET
> select USB_GADGET_SELECTED
>
>-config USB_OTG
>- boolean "OTG Support"
>- depends on USB_GADGET_OMAP && ARCH_OMAP_OTG && USB_OHCI_HCD
>- help
>- The most notable feature of USB OTG is support for a
>- "Dual-Role" device, which can act as either a device
>- or a host. The initial role choice can be changed
>- later, when two dual-role devices talk to each other.
>-
>- Select this only if your OMAP board has a Mini-AB connector.
>-
> config USB_GADGET_PXA25X
> boolean "PXA 25x or IXP 4xx"
> depends on (ARCH_PXA && PXA25x) || ARCH_IXP4XX
>--
>1.7.3.1.2.g7fe2b
--
balbi
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: [PATCH] t4203 (mailmap): stop hardcoding commit ids and dates
From: Junio C Hamano @ 2010-10-20 6:31 UTC (permalink / raw)
To: Junio C Hamano
Cc: Jonathan Nieder, Ævar Arnfjörð Bjarmason,
Jim Meyering, git list, Thomas Rast
In-Reply-To: <7vsk01wf65.fsf@alter.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> writes:
> Junio C Hamano <gitster@pobox.com> writes:
>
>> Jonathan Nieder <jrnieder@gmail.com> writes:
>>
>>> Here's a better fix. Still no idea about the other failures Ævar
>>> and Thomas were seeing.
>>
>> I saw intermittent failures too. Thanks for the objid fix.
>
> I found a way to reliably make this fail at test #7.
>
> $ sh t4203-mailmap.sh </dev/null
>
> Without the input redirection, things seem to work Ok.
>
> Still puzzled...
Ah, of course.
t/t4203-mailmap.sh | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t4203-mailmap.sh b/t/t4203-mailmap.sh
index a267d07..e818de6 100755
--- a/t/t4203-mailmap.sh
+++ b/t/t4203-mailmap.sh
@@ -114,7 +114,7 @@ test_expect_success 'name entry after email entry' '
mkdir -p internal_mailmap &&
echo "<bugs@company.xy> <bugs@company.xx>" >internal_mailmap/.mailmap &&
echo "Internal Guy <bugs@company.xx>" >>internal_mailmap/.mailmap &&
- git shortlog >actual &&
+ git shortlog HEAD >actual &&
test_cmp expect actual
'
@@ -131,7 +131,7 @@ test_expect_success 'name entry after email entry, case-insensitive' '
mkdir -p internal_mailmap &&
echo "<bugs@company.xy> <bugs@company.xx>" >internal_mailmap/.mailmap &&
echo "Internal Guy <BUGS@Company.xx>" >>internal_mailmap/.mailmap &&
- git shortlog >actual &&
+ git shortlog HEAD >actual &&
test_cmp expect actual
'
^ permalink raw reply related
* [U-Boot] [PATCHv3] mpc83xx: Add -fpic relocation support
From: Joakim Tjernlund @ 2010-10-20 6:32 UTC (permalink / raw)
To: u-boot
In-Reply-To: <1287004319-21282-1-git-send-email-Joakim.Tjernlund@transmode.se>
> From: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
> To: u-boot at lists.denx.de, Scott Wood <scottwood@freescale.com>, Kim
Phillips
> <kim.phillips@freescale.com>
> Cc: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
> Date: 2010/10/13 23:12
> Subject: [U-Boot] [PATCHv3] mpc83xx: Add -fpic relocation support
> Sent by: u-boot-bounces at lists.denx.de
>
> This adds relocation of .got entries produced
> by -fpic. -fpic produces 2-3% smaller code and
> is faster. Unfortunately gcc promotes -fpic to
> -fPIC when -mrelocatable is used so one need a very
> small patch to gcc too(sent upstream).
>
> -fpic puts its GOT entries in .got section(s) and
> linker defines the symbol _GLOBAL_OFFSET_TABLE_ to point
> to the middle of this table. The entry at _GLOBAL_OFFSET_TABLE_-4
> contains a blrl insn which is used to find the table's
> real address by branching to _GLOBAL_OFFSET_TABLE_-4.
Ping?
Jocke
^ permalink raw reply
* [U-Boot] [PATCH] MPC52xx, motionpro: update default configuration
From: Wolfgang Denk @ 2010-10-20 6:31 UTC (permalink / raw)
To: u-boot
Signed-off-by: Wolfgang Denk <wd@denx.de>
---
include/configs/motionpro.h | 70 ++++++++++++++++--------------------------
1 files changed, 27 insertions(+), 43 deletions(-)
diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h
index fa4310b..c47c815 100644
--- a/include/configs/motionpro.h
+++ b/include/configs/motionpro.h
@@ -45,29 +45,27 @@
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
-
/*
* Command line configuration.
*/
#include <config_cmd_default.h>
#define CONFIG_CMD_ASKENV
+#define CONFIG_CMD_BEDBUG
+#define CONFIG_CMD_DATE
#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_REGINFO
-#define CONFIG_CMD_IMMAP
+#define CONFIG_CMD_DTT
+#define CONFIG_CMD_EEPROM
#define CONFIG_CMD_ELF
+#define CONFIG_CMD_FAT
+#define CONFIG_CMD_I2C
+#define CONFIG_CMD_IDE
+#define CONFIG_CMD_IMMAP
+#define CONFIG_CMD_JFFS2
#define CONFIG_CMD_MII
-#define CONFIG_CMD_BEDBUG
#define CONFIG_CMD_NET
#define CONFIG_CMD_PING
-#define CONFIG_CMD_IDE
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_I2C
-#define CONFIG_CMD_DATE
-#define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_DTT
-
+#define CONFIG_CMD_REGINFO
/*
* Serial console configuration
@@ -77,7 +75,6 @@
#define CONFIG_BAUDRATE 115200
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
-
/*
* Ethernet configuration
*/
@@ -99,11 +96,14 @@
#define CONFIG_AUTOBOOT_PROMPT "Autobooting in %d seconds, " \
"press \"<Esc><Esc>\" to stop\n", bootdelay
+#define CONFIG_CMDLINE_EDITING 1 /* add command line history */
+#define CONFIG_SYS_HUSH_PARSER 1 /* use "hush" command parser */
+#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
+
#define CONFIG_ETHADDR 00:50:C2:40:10:00
#define CONFIG_OVERWRITE_ETHADDR_ONCE 1
#define CONFIG_VERSION_VARIABLE 1 /* include version env variable */
-
/*
* Default environment settings
*/
@@ -115,21 +115,22 @@
"serverip=192.168.1.1\0" \
"gatewayip=192.168.1.1\0" \
"console=ttyPSC0,115200\0" \
- "u-boot_addr=100000\0" \
- "kernel_addr=200000\0" \
- "fdt_addr=400000\0" \
- "ramdisk_addr=500000\0" \
+ "u-boot_addr=400000\0" \
+ "kernel_addr=400000\0" \
+ "fdt_addr=700000\0" \
+ "ramdisk_addr=800000\0" \
"multi_image_addr=800000\0" \
- "rootpath=/opt/eldk-4.1/ppc_6xx\0" \
- "u-boot=/tftpboot/motionpro/u-boot.bin\0" \
- "bootfile=/tftpboot/motionpro/uImage\0" \
- "fdt_file=/tftpboot/motionpro/motionpro.dtb\0" \
- "ramdisk_file=/tftpboot/motionpro/uRamdisk\0" \
+ "rootpath=/opt/eldk/ppc_6xx\0" \
+ "u-boot=motionpro/u-boot.bin\0" \
+ "bootfile=motionpro/uImage\0" \
+ "fdt_file=motionpro/motionpro.dtb\0" \
+ "ramdisk_file=motionpro/uRamdisk\0" \
"multi_image_file=kernel+initrd+dtb.img\0" \
"load=tftp ${u-boot_addr} ${u-boot}\0" \
- "update=prot off fff00000 fff3ffff; era fff00000 fff3ffff; " \
+ "update=prot off fff00000 +${filesize};" \
+ "era fff00000 +${filesize}; " \
"cp.b ${u-boot_addr} fff00000 ${filesize};" \
- "prot on fff00000 fff3ffff\0" \
+ "prot on fff00000 +${filesize}\0" \
"ramargs=setenv bootargs root=/dev/ram rw\0" \
"nfsargs=setenv bootargs root=/dev/nfs rw " \
"nfsroot=${serverip}:${rootpath}\0" \
@@ -158,24 +159,20 @@
*/
#define CONFIG_BOARD_EARLY_INIT_R 1
-
/*
* Low level configuration
*/
-
/*
* Clock configuration: SYS_XTALIN = 33MHz
*/
#define CONFIG_SYS_MPC5XXX_CLKIN 33000000
-
/*
* Set IPB speed to 100MHz
*/
#define CONFIG_SYS_IPBCLK_EQUALS_XLBCLK
-
/*
* Memory map
*/
@@ -184,7 +181,7 @@
* Setting MBAR to otherwise will cause system hang when using SmartDMA such
* as network commands.
*/
-#define CONFIG_SYS_MBAR 0xf0000000
+#define CONFIG_SYS_MBAR 0xf0000000
#define CONFIG_SYS_SDRAM_BASE 0x00000000
/*
@@ -216,7 +213,6 @@
#define CONFIG_SYS_MALLOC_LEN (1024 << 10) /* 1 MiB for malloc() */
#define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* initial mem map for Linux */
-
/*
* Chip selects configuration
*/
@@ -249,7 +245,6 @@
#define CONFIG_SYS_CS_BURST 0x00000000
#define CONFIG_SYS_CS_DEADCYCLE 0x22222222
-
/*
* SDRAM configuration
*/
@@ -259,7 +254,6 @@
#define SDRAM_CONTROL 0x504f0000
#define SDRAM_MODE 0x00cd0000
-
/*
* Flash configuration
*/
@@ -297,7 +291,6 @@
#define CONFIG_SYS_ATA_STRIDE 4
#define CONFIG_DOS_PARTITION
-
/*
* I2C configuration
*/
@@ -306,7 +299,6 @@
#define CONFIG_SYS_I2C_SPEED 100000 /* 100 kHz */
#define CONFIG_SYS_I2C_SLAVE 0x7F
-
/*
* EEPROM configuration
*/
@@ -315,14 +307,12 @@
#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 /* 2ms/cycle + 3ms extra */
#define CONFIG_SYS_I2C_MULTI_EEPROMS 1 /* 2 EEPROMs (addr:50,52) */
-
/*
* RTC configuration
*/
#define CONFIG_RTC_DS1337 1
#define CONFIG_SYS_I2C_RTC_ADDR 0x68
-
/*
* Status LED configuration
*/
@@ -344,14 +334,12 @@ extern void __led_toggle(led_id_t id);
extern void __led_set(led_id_t id, int state);
#endif /* __ASSEMBLY__ */
-
/*
* Temperature sensor
*/
#define CONFIG_DTT_LM75 1
#define CONFIG_DTT_SENSORS { 0x49 }
-
/*
* Environment settings
*/
@@ -379,13 +367,11 @@ extern void __led_set(led_id_t id, int state);
*/
#define CONFIG_SYS_GPS_PORT_CONFIG 0x1105a004
-
/*
* Motion-PRO's CPLD revision control register
*/
#define CPLD_REV_REGISTER (CONFIG_SYS_CS2_START + 0x06)
-
/*
* Miscellaneous configurable options
*/
@@ -404,7 +390,6 @@ extern void __led_set(led_id_t id, int state);
#define CONFIG_SYS_HZ 1000 /* decrementer freq: 1 ms ticks */
-
/*
* Various low-level settings
*/
@@ -416,7 +401,6 @@ extern void __led_set(led_id_t id, int state);
#define CONFIG_SYS_CACHELINE_SIZE 32 /* For MPC5xxx CPUs */
-
/* Not needed for MPC 5xxx U-Boot, but used by tools/updater */
#define CONFIG_SYS_RESET_ADDRESS 0xfff00100
--
1.7.2.3
^ permalink raw reply related
* Re: linux-next - multi-omap image fails to boot on omap3/4
From: Gadiyar, Anand @ 2010-10-20 6:30 UTC (permalink / raw)
To: Tony Lindgren; +Cc: linux-omap
In-Reply-To: <AANLkTikrVJ3bw3aKE6V7uH9DmheVDihedNOP+wypYunC@mail.gmail.com>
On Wed, Oct 20, 2010 at 5:16 AM, Gadiyar, Anand <gadiyar@ti.com> wrote:
> On Wed, Oct 20, 2010 at 5:02 AM, Tony Lindgren <tony@atomide.com> wrote:
>> * Tony Lindgren <tony@atomide.com> [101019 15:48]:
>>> * Gadiyar, Anand <gadiyar@ti.com> [101019 11:26]:
>>> > On Tue, Oct 19, 2010 at 11:51 PM, Tony Lindgren <tony@atomide.com> wrote:
>>> > > * Anand Gadiyar <gadiyar@ti.com> [101019 07:41]:
>>> > >> Hi all,
>>> > >>
>>> > >> linux-next, as of 20101019, built with the omap2plus_defconfig fails
>>> > >> to boot on omap3 and omap4. (I've disabled CONFIG_ARCH_OMAP2 or
>>> > >> CONFIG_SWP_EMULATE to get the image to build). Building with only
>>> > >> ARCH_OMAP3 allows the resultant image to boot up on OMAP3. Likewise,
>>> > >> an image built with only ARCH_OMAP4 boots up on OMAP4 boards.
>>> > >>
>>> > >> earlyprintk does not provide any additional prints after
>>> > >> "Uncompressing Linux... done, booting the kernel."
>>> > >>
>>> > >> Any ideas where to look?
>>> > >
>>> > > Hmm I did a quick test merge of linux-omap master and rmk/devel
>>> > > branches and that boots just fine.
>>> > >
>>> > > So it's probably something that already got fixed in rmk/devel
>>> > > but is not yet in next, or something that came from elsewhere,
>>> > > or something that we have in omap-testing branch that's not in
>>> > > for-next for some reason.
>>> >
>>> > I tried bisecting linux-next between v2.6.36-rc8 and HEAD, but
>>> > there's a commit in between that breaks the build. I'll take another
>>> > stab at this in a while.
>>>
>>> Looks like current next at 80f8f1f8b33750d954beb386c0c8142d0c01c25c
>>> boots again except on 2430sdp it produces a NULL pointer at ubi_io_write.
>>
>> Oops, sorry it's still broken, wrong tree.
>>
>
> I've started bisecting again - I needed to pick commit 5bac0926121e
> (driver core: platform_bus: allow runtime override of dev_pm_ops) to
> solve the build break.
>
> Will report back if I find something.
>
I tried disabling CONFIG_SMP and CONFIG_SMP_ON_UP, and the resulting
image booted up just fine.
- Anand
^ permalink raw reply
* Re: [PATCH] t4203 (mailmap): stop hardcoding commit ids and dates
From: Junio C Hamano @ 2010-10-20 6:29 UTC (permalink / raw)
To: Jonathan Nieder
Cc: Ævar Arnfjörð Bjarmason, Jim Meyering, git list,
Thomas Rast
In-Reply-To: <7vpqv95szu.fsf@alter.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> writes:
> Jonathan Nieder <jrnieder@gmail.com> writes:
>
>> Here's a better fix. Still no idea about the other failures Ævar
>> and Thomas were seeing.
>
> I saw intermittent failures too. Thanks for the objid fix.
I found a way to reliably make this fail at test #7.
$ sh t4203-mailmap.sh </dev/null
Without the input redirection, things seem to work Ok.
Still puzzled...
^ permalink raw reply
* Re: [PATCH 21/42] i.MX remove wdog registers from header files
From: Sascha Hauer @ 2010-10-20 6:27 UTC (permalink / raw)
To: Jean-Christophe PLAGNIOL-VILLARD; +Cc: barebox
In-Reply-To: <20101020014820.GB20390@game.jcrosoft.org>
On Wed, Oct 20, 2010 at 03:48:20AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> On 14:55 Tue 19 Oct , Sascha Hauer wrote:
> > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> > ---
> > arch/arm/mach-imx/clocksource.c | 23 +++++++++++++++++++----
> > arch/arm/mach-imx/include/mach/imx1-regs.h | 8 --------
> > arch/arm/mach-imx/include/mach/imx21-regs.h | 8 --------
> > arch/arm/mach-imx/include/mach/imx27-regs.h | 8 --------
> > arch/arm/mach-imx/include/mach/imx31-regs.h | 10 ----------
> > arch/arm/mach-imx/include/mach/imx35-regs.h | 10 ----------
> > arch/arm/mach-imx/include/mach/imx51-regs.h | 7 -------
> > 7 files changed, 19 insertions(+), 55 deletions(-)
> >
> > diff --git a/arch/arm/mach-imx/clocksource.c b/arch/arm/mach-imx/clocksource.c
> > index e492890..4cb923f 100644
> > --- a/arch/arm/mach-imx/clocksource.c
> > +++ b/arch/arm/mach-imx/clocksource.c
> > @@ -101,19 +101,34 @@ static int clocksource_init (void)
> > core_initcall(clocksource_init);
> >
> > /*
> > + * Watchdog Registers
> > + */
> > +#ifdef CONFIG_ARCH_IMX1
> > +#define WDOG_WCR 0x00 /* Watchdog Control Register */
> > +#define WDOG_WSR 0x02 /* Watchdog Service Register */
> > +#define WDOG_WSTR 0x04 /* Watchdog Status Register */
> > +#define WDOG_WCR_WDE (1 << 0)
> > +#else
> > +#define WDOG_WCR 0x00 /* Watchdog Control Register */
> > +#define WDOG_WSR 0x02 /* Watchdog Service Register */
> > +#define WDOG_WSTR 0x04 /* Watchdog Status Register */
> > +#define WDOG_WCR_WDE (1 << 2)
> only the WDE seems different
oops, bug. on i.MX1 WSR should be 0x4 and SWTR should be 0x8. Will fix
this.
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply
* [PATCH 2/2] arm: omap: zoom: substitute gpio number with symbolic name
From: Felipe Balbi @ 2010-10-20 6:25 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Linux OMAP Mailing List, Anand Gadiyar, Felipe Balbi
In-Reply-To: <1287555912-16058-1-git-send-email-balbi@ti.com>
It's easier to understand what that number means and
also avoids problems if we ever have to change it.
Tested-by: Anand Gadiyar <gadiyar@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
---
arch/arm/mach-omap2/board-zoom.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/board-zoom.c b/arch/arm/mach-omap2/board-zoom.c
index 4215abc..d641be8 100644
--- a/arch/arm/mach-omap2/board-zoom.c
+++ b/arch/arm/mach-omap2/board-zoom.c
@@ -30,6 +30,8 @@
#include "sdram-micron-mt46h32m32lf-6.h"
#include "sdram-hynix-h8mbx00u0mer-0em.h"
+#define ZOOM3_EHCI_RESET_GPIO 64
+
static void __init omap_zoom_init_irq(void)
{
if (machine_is_omap_zoom2())
@@ -146,7 +148,7 @@ static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
.port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN,
.phy_reset = true,
.reset_gpio_port[0] = -EINVAL,
- .reset_gpio_port[1] = 64,
+ .reset_gpio_port[1] = ZOOM3_EHCI_RESET_GPIO,
.reset_gpio_port[2] = -EINVAL,
};
@@ -156,7 +158,7 @@ static void __init omap_zoom_init(void)
omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
} else if (machine_is_omap_zoom3()) {
omap3_mux_init(board_mux, OMAP_PACKAGE_CBP);
- omap_mux_init_gpio(64, OMAP_PIN_OUTPUT);
+ omap_mux_init_gpio(ZOOM3_EHCI_RESET_GPIO, OMAP_PIN_OUTPUT);
usb_ehci_init(&ehci_pdata);
}
--
1.7.3.1.120.g38a18
^ permalink raw reply related
* [PATCH 1/2] arm: omap: combine zoom2 and zoom3 board-files
From: Felipe Balbi @ 2010-10-20 6:25 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Linux OMAP Mailing List, Anand Gadiyar, Felipe Balbi
In-Reply-To: <1287555912-16058-1-git-send-email-balbi@ti.com>
They are extremely similar anyway, let's get rid
of one file.
While at that, also remove the empty zoom_config
variable.
Tested-by: Anand Gadiyar <gadiyar@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
---
arch/arm/mach-omap2/Makefile | 4 +-
.../arm/mach-omap2/{board-zoom2.c => board-zoom.c} | 52 +++++++--
arch/arm/mach-omap2/board-zoom3.c | 133 --------------------
3 files changed, 45 insertions(+), 144 deletions(-)
rename arch/arm/mach-omap2/{board-zoom2.c => board-zoom.c} (73%)
delete mode 100644 arch/arm/mach-omap2/board-zoom3.c
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 7352412..a57ae62 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -140,12 +140,12 @@ obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o \
board-rx51-peripherals.o \
board-rx51-video.o \
hsmmc.o
-obj-$(CONFIG_MACH_OMAP_ZOOM2) += board-zoom2.o \
+obj-$(CONFIG_MACH_OMAP_ZOOM2) += board-zoom.o \
board-zoom-peripherals.o \
board-flash.o \
hsmmc.o \
board-zoom-debugboard.o
-obj-$(CONFIG_MACH_OMAP_ZOOM3) += board-zoom3.o \
+obj-$(CONFIG_MACH_OMAP_ZOOM3) += board-zoom.o \
board-zoom-peripherals.o \
board-flash.o \
hsmmc.o \
diff --git a/arch/arm/mach-omap2/board-zoom2.c b/arch/arm/mach-omap2/board-zoom.c
similarity index 73%
rename from arch/arm/mach-omap2/board-zoom2.c
rename to arch/arm/mach-omap2/board-zoom.c
index 694c926..4215abc 100644
--- a/arch/arm/mach-omap2/board-zoom2.c
+++ b/arch/arm/mach-omap2/board-zoom.c
@@ -1,6 +1,7 @@
/*
- * Copyright (C) 2009 Texas Instruments Inc.
+ * Copyright (C) 2009-2010 Texas Instruments Inc.
* Mikkel Christensen <mlc@ti.com>
+ * Felipe Balbi <balbi@ti.com>
*
* Modified from mach-omap2/board-ldp.c
*
@@ -20,17 +21,24 @@
#include <plat/common.h>
#include <plat/board.h>
+#include <plat/usb.h>
#include <mach/board-zoom.h>
#include "board-flash.h"
#include "mux.h"
#include "sdram-micron-mt46h32m32lf-6.h"
+#include "sdram-hynix-h8mbx00u0mer-0em.h"
-static void __init omap_zoom2_init_irq(void)
+static void __init omap_zoom_init_irq(void)
{
- omap2_init_common_hw(mt46h32m32lf6_sdrc_params,
- mt46h32m32lf6_sdrc_params);
+ if (machine_is_omap_zoom2())
+ omap2_init_common_hw(mt46h32m32lf6_sdrc_params,
+ mt46h32m32lf6_sdrc_params);
+ else if (machine_is_omap_zoom3())
+ omap2_init_common_hw(h8mbx00u0mer0em_sdrc_params,
+ h8mbx00u0mer0em_sdrc_params);
+
omap_init_irq();
omap_gpio_init();
}
@@ -132,20 +140,46 @@ static struct mtd_partition zoom_nand_partitions[] = {
},
};
-static void __init omap_zoom2_init(void)
+static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
+ .port_mode[0] = EHCI_HCD_OMAP_MODE_UNKNOWN,
+ .port_mode[1] = EHCI_HCD_OMAP_MODE_PHY,
+ .port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN,
+ .phy_reset = true,
+ .reset_gpio_port[0] = -EINVAL,
+ .reset_gpio_port[1] = 64,
+ .reset_gpio_port[2] = -EINVAL,
+};
+
+static void __init omap_zoom_init(void)
{
- omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
- zoom_peripherals_init();
+ if (machine_is_omap_zoom2()) {
+ omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
+ } else if (machine_is_omap_zoom3()) {
+ omap3_mux_init(board_mux, OMAP_PACKAGE_CBP);
+ omap_mux_init_gpio(64, OMAP_PIN_OUTPUT);
+ usb_ehci_init(&ehci_pdata);
+ }
+
board_nand_init(zoom_nand_partitions,
ARRAY_SIZE(zoom_nand_partitions), ZOOM_NAND_CS);
zoom_debugboard_init();
+ zoom_peripherals_init();
}
MACHINE_START(OMAP_ZOOM2, "OMAP Zoom2 board")
.boot_params = 0x80000100,
.map_io = omap3_map_io,
.reserve = omap_reserve,
- .init_irq = omap_zoom2_init_irq,
- .init_machine = omap_zoom2_init,
+ .init_irq = omap_zoom_init_irq,
+ .init_machine = omap_zoom_init,
+ .timer = &omap_timer,
+MACHINE_END
+
+MACHINE_START(OMAP_ZOOM3, "OMAP Zoom3 board")
+ .boot_params = 0x80000100,
+ .map_io = omap3_map_io,
+ .reserve = omap_reserve,
+ .init_irq = omap_zoom_init_irq,
+ .init_machine = omap_zoom_init,
.timer = &omap_timer,
MACHINE_END
diff --git a/arch/arm/mach-omap2/board-zoom3.c b/arch/arm/mach-omap2/board-zoom3.c
deleted file mode 100644
index 5adde12..0000000
--- a/arch/arm/mach-omap2/board-zoom3.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (C) 2009 Texas Instruments Inc.
- *
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/input.h>
-#include <linux/gpio.h>
-
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-
-#include <mach/board-zoom.h>
-
-#include <plat/common.h>
-#include <plat/board.h>
-#include <plat/usb.h>
-
-#include "board-flash.h"
-#include "mux.h"
-#include "sdram-hynix-h8mbx00u0mer-0em.h"
-
-static struct omap_board_config_kernel zoom_config[] __initdata = {
-};
-
-static struct mtd_partition zoom_nand_partitions[] = {
- /* All the partition sizes are listed in terms of NAND block size */
- {
- .name = "X-Loader-NAND",
- .offset = 0,
- .size = 4 * (64 * 2048), /* 512KB, 0x80000 */
- .mask_flags = MTD_WRITEABLE, /* force read-only */
- },
- {
- .name = "U-Boot-NAND",
- .offset = MTDPART_OFS_APPEND, /* Offset = 0x80000 */
- .size = 10 * (64 * 2048), /* 1.25MB, 0x140000 */
- .mask_flags = MTD_WRITEABLE, /* force read-only */
- },
- {
- .name = "Boot Env-NAND",
- .offset = MTDPART_OFS_APPEND, /* Offset = 0x1c0000 */
- .size = 2 * (64 * 2048), /* 256KB, 0x40000 */
- },
- {
- .name = "Kernel-NAND",
- .offset = MTDPART_OFS_APPEND, /* Offset = 0x0200000*/
- .size = 240 * (64 * 2048), /* 30M, 0x1E00000 */
- },
- {
- .name = "system",
- .offset = MTDPART_OFS_APPEND, /* Offset = 0x2000000 */
- .size = 3328 * (64 * 2048), /* 416M, 0x1A000000 */
- },
- {
- .name = "userdata",
- .offset = MTDPART_OFS_APPEND, /* Offset = 0x1C000000*/
- .size = 256 * (64 * 2048), /* 32M, 0x2000000 */
- },
- {
- .name = "cache",
- .offset = MTDPART_OFS_APPEND, /* Offset = 0x1E000000*/
- .size = 256 * (64 * 2048), /* 32M, 0x2000000 */
- },
-};
-
-static void __init omap_zoom_init_irq(void)
-{
- omap_board_config = zoom_config;
- omap_board_config_size = ARRAY_SIZE(zoom_config);
- omap2_init_common_hw(h8mbx00u0mer0em_sdrc_params,
- h8mbx00u0mer0em_sdrc_params);
- omap_init_irq();
- omap_gpio_init();
-}
-
-#ifdef CONFIG_OMAP_MUX
-static struct omap_board_mux board_mux[] __initdata = {
- /* WLAN IRQ - GPIO 162 */
- OMAP3_MUX(MCBSP1_CLKX, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP),
- /* WLAN POWER ENABLE - GPIO 101 */
- OMAP3_MUX(CAM_D2, OMAP_MUX_MODE4 | OMAP_PIN_OUTPUT),
- /* WLAN SDIO: MMC3 CMD */
- OMAP3_MUX(MCSPI1_CS1, OMAP_MUX_MODE3 | OMAP_PIN_INPUT_PULLUP),
- /* WLAN SDIO: MMC3 CLK */
- OMAP3_MUX(ETK_CLK, OMAP_MUX_MODE2 | OMAP_PIN_INPUT_PULLUP),
- /* WLAN SDIO: MMC3 DAT[0-3] */
- OMAP3_MUX(ETK_D3, OMAP_MUX_MODE2 | OMAP_PIN_INPUT_PULLUP),
- OMAP3_MUX(ETK_D4, OMAP_MUX_MODE2 | OMAP_PIN_INPUT_PULLUP),
- OMAP3_MUX(ETK_D5, OMAP_MUX_MODE2 | OMAP_PIN_INPUT_PULLUP),
- OMAP3_MUX(ETK_D6, OMAP_MUX_MODE2 | OMAP_PIN_INPUT_PULLUP),
- { .reg_offset = OMAP_MUX_TERMINATOR },
-};
-#else
-#define board_mux NULL
-#endif
-
-static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
- .port_mode[0] = EHCI_HCD_OMAP_MODE_UNKNOWN,
- .port_mode[1] = EHCI_HCD_OMAP_MODE_PHY,
- .port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN,
- .phy_reset = true,
- .reset_gpio_port[0] = -EINVAL,
- .reset_gpio_port[1] = 64,
- .reset_gpio_port[2] = -EINVAL,
-};
-
-static void __init omap_zoom_init(void)
-{
- omap3_mux_init(board_mux, OMAP_PACKAGE_CBP);
- zoom_peripherals_init();
- board_nand_init(zoom_nand_partitions,
- ARRAY_SIZE(zoom_nand_partitions), ZOOM_NAND_CS);
- zoom_debugboard_init();
-
- omap_mux_init_gpio(64, OMAP_PIN_OUTPUT);
- usb_ehci_init(&ehci_pdata);
-}
-
-MACHINE_START(OMAP_ZOOM3, "OMAP Zoom3 board")
- .boot_params = 0x80000100,
- .map_io = omap3_map_io,
- .reserve = omap_reserve,
- .init_irq = omap_zoom_init_irq,
- .init_machine = omap_zoom_init,
- .timer = &omap_timer,
-MACHINE_END
--
1.7.3.1.120.g38a18
^ permalink raw reply related
* [PATCH 0/2] Combine zoom board-files
From: Felipe Balbi @ 2010-10-20 6:25 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Linux OMAP Mailing List, Anand Gadiyar, Felipe Balbi
Those boards are so similar that they don't
deserve separate board files.
Felipe Balbi (2):
arm: omap: combine zoom2 and zoom3 board-files
arm: omap: zoom: substitute gpio number with symbolic name
arch/arm/mach-omap2/Makefile | 4 +-
.../arm/mach-omap2/{board-zoom2.c => board-zoom.c} | 54 +++++++--
arch/arm/mach-omap2/board-zoom3.c | 133 --------------------
3 files changed, 47 insertions(+), 144 deletions(-)
rename arch/arm/mach-omap2/{board-zoom2.c => board-zoom.c} (72%)
delete mode 100644 arch/arm/mach-omap2/board-zoom3.c
--
1.7.3.1.120.g38a18
^ permalink raw reply
* Re: [PATCH v2][memcg+dirtylimit] Fix overwriting global vm dirty limit setting by memcg (Re: [PATCH v3 00/11] memcg: per cgroup dirty page accounting
From: Daisuke Nishimura @ 2010-10-20 6:09 UTC (permalink / raw)
To: KAMEZAWA Hiroyuki
Cc: Greg Thelen, Andrew Morton, linux-kernel, linux-mm, containers,
Andrea Righi, Balbir Singh, Minchan Kim, Ciju Rajan K,
David Rientjes, Daisuke Nishimura
In-Reply-To: <20101020140255.5b8afb63.kamezawa.hiroyu@jp.fujitsu.com>
On Wed, 20 Oct 2010 14:02:55 +0900
KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> wrote:
> Fixed one here.
> ==
> From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
>
> Now, at calculating dirty limit, vm_dirty_param() is called.
> This function returns dirty-limit related parameters considering
> memory cgroup settings.
>
> Now, assume that vm_dirty_bytes=100M (global dirty limit) and
> memory cgroup has 1G of pages and 40 dirty_ratio, dirtyable memory is
> 500MB.
>
> In this case, global_dirty_limits will consider dirty_limt as
> 500 *0.4 = 200MB. This is bad...memory cgroup is not back door.
>
> This patch limits the return value of vm_dirty_param() considring
> global settings.
>
> Changelog:
> - fixed an argument "mem" int to u64
> - fixed to use global available memory to cap memcg's value.
>
> Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.