* Re: [Alsa-devel] [RFC] alsa integer control ranges
From: Johannes Berg @ 2006-05-16 14:55 UTC (permalink / raw)
To: Lee Revell; +Cc: linuxppc-dev list, ALSA development
In-Reply-To: <1147791186.13948.109.camel@mindpipe>
[-- Attachment #1: Type: text/plain, Size: 405 bytes --]
On Tue, 2006-05-16 at 10:53 -0400, Lee Revell wrote:
> Ummm... what problem is this patch fixing?
The problems that
(a) kmix, gnome-alsamixer, gnome-volume-control and others can't
properly use the playback volume control because it has a range
that doesn't start at 0
and
(b) alsamixer can't properly control the capture volume control for
apparently the same reason
johannes
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 793 bytes --]
^ permalink raw reply
* Re: [Alsa-devel] [RFC] alsa integer control ranges
From: Lee Revell @ 2006-05-16 14:53 UTC (permalink / raw)
To: Johannes Berg; +Cc: linuxppc-dev list, ALSA development
In-Reply-To: <1147780945.29795.110.camel@johannes>
On Tue, 2006-05-16 at 14:02 +0200, Johannes Berg wrote:
> Apparently all alsa userspace programs including alsamixer suck. Hence,
> this patch is required to make them work properly. Why is it so hard to
> do these additions/subtractions in the program or maybe even in the alsa
> library? The alsa libraries already think they know better and mess up
> all kinds of things.
>
> What are your opinions on this? Should this be required? And if so, why
> do we even have the value.integer.min when we can't use it anyway?
>
> The code this patch applies against is in
> http://johannes.sipsolutions.net/snd-aoa.git/ but that isn't all too
> relevant, the patch serves just as an illustration of what is wrong
> here.
>
Ummm... what problem is this patch fixing?
Lee
^ permalink raw reply
* Re: ppc32 kernel boot problem (pmu related?)
From: Nathan Pilatzke @ 2006-05-16 15:04 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: linuxppc-dev
In-Reply-To: <1147754594.13588.17.camel@localhost.localdomain>
[-- Attachment #1: Type: text/plain, Size: 986 bytes --]
On 5/16/06, Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote:
>
> Can you try editing arch/powerpc/platforms/powermac/low_i2c.c, in
> function pmac_i2c_init(), comment out the call to pmac_i2c_devscan() and
> tell me if that makes a difference.
>
> Thanks,
> Ben.
>
>
Commenting out the call to pmac_i2c_devscan() in function
pmac_i2c_init() allowed the kernel to boot. I am typing this email
booted under it. The kernel messages were printed a bit strangely
though. There was no scrolling or clearing of the screen. The kernel
messages would start at the top and overwrite old messages, with the
cursor jumping back to the top of the screen every so often. The
/proc/device-tree is attached for the booting 2.6.17-rc3 kernel with
pmu enabled, as is the new dmesg output. If you need the
/proc/device-tree from a 2.6.15 working kernel with pmu enabled
instead, let me know.
Is this kernel fairly safe/stable to use? What can be done next?
Nathan
[-- Attachment #2: device-tree_2.6.17-rc3-pmuworking.tar.bz2 --]
[-- Type: application/x-bzip2, Size: 15848 bytes --]
[-- Attachment #3: dmesg_2.6.17-rc3-pmuworking.bz2 --]
[-- Type: application/x-bzip2, Size: 3942 bytes --]
^ permalink raw reply
* Re: MPC8248 goes berserk when printing messages on the SMC console
From: Laurent Pinchart @ 2006-05-16 15:09 UTC (permalink / raw)
To: linuxppc-embedded
In-Reply-To: <200605151828.22727.laurent.pinchart@tbox.biz>
Hi,
after further investigation, I found out that my SMC problem is probably=20
caused by cache issues.
> The SMC console works fine in U-Boot. 115200 8N1, no problem there.
>
> When booting a Linux 2.6.16 kernel, the processor doesn't print anything =
on
> the console and seems to hang. Further analysis with a BDI2000 reveals the
> following.
>
> - The CPU is stuck in cpm_uart_console_write, checking for
>
> while ((bdp->cbd_sc & BD_SC_READY) !=3D 0);
>
> At that point, most of the external and internal memory read as 0 (SDRA=
M,
> flash, ...). A few memory locations contain values different than 0, and I
> suspect those to come directly from the cache.
The only memory locations that aren't filled with 0 when read from the BDI =
are=20
the ones present in D-cache lines. Accessing unmapped memory doesn't fail a=
nd=20
returns 0.
> - If I break right before setting the BD_SC_READY flag and run using step=
i,
> random characters are sent on the serial port. Measuring the baudrate usi=
ng
> an oscilloscope confirms that it has been correctly configured. Only the
> data is wrong.
=46rom http://www.freescale.com/webapp/sps/utils/SingleFaq.jsp?FAQ-19683.xml
"Note. If the core is in the debug mode then the cache content will not be=
=20
updated by the snooping."
I tried to clear the GBL bit in the SMC TFCR register to disable memory=20
snooping. This solved part of the problem, as the CPU doesn't hang anymore,=
=20
but the data sent on the serial port are garbage. I suppose that's a normal=
=20
behaviour once the D-cache is enabled.
This leads me to believe that I have a cache issue. Has anyone experienced =
the=20
same problem ?
Laurent Pinchart
^ permalink raw reply
* Unable to boot a kernel on a MPC8560
From: CORVELLER Mickael @ 2006-05-16 15:12 UTC (permalink / raw)
To: linuxppc-embedded
Hello,
first of all, I am a newbie in embedded linux systems.
I'm trying to boot a board based on a MPC8560 (with a e500 core).
I'm using a RS232 console via a debug module connected to the SCC1 port of
the 8560.
The boot loader is U-Boot.
It appears that the transfert of the kernel from the host to target is OK
(I'm using TFTP).
Problems begin when I try to execute the kernel. The system appears to be
frozen.
I don't know if the board is really frozen or if I have "only" lost the
console.
I suspect that my error is situated in the load/execution addresses.
I've tried different couples of values : 0/0, 100000/100000, 10000/10000,
200000/200000, etc...
I've also tried different file format (uImage, zImage.elf, zImage.s ...)
I've tried two distributions : ELINOS and DENX.
I don't know what's happened because I lose the console .
Here is the result of one of my tests :
-> niot 0
Client IP Address (0 for unknown) = 192.168.001.126 ?
Client address mask (0 for unknown) = 255.255.255.000 ?
Server IP Address (0 for unknown) = 192.168.001.127 ?
File Format S(rec)/I(ntel)/B(in)/E(lf) = B ? e
Boot File Name (NULL for unknown) = pimage ? zimage.elf
Boot File Load address = 80000 ? 0
Boot File Execution address = 80000 ? 100000
Data update in progress...
-> nbo 0
Initialize ETH 0 in progress...
Physical link is up at 100f.
TFTP parameters :
Client IP Address 192.168.001.126
Server IP Address 192.168.001.127
Boot File Format E
Boot File Name zimage.elf
Boot File Load address 0
Boot File Execution address 100000
TFTP load in progress...
Packets : 2065
ELF information :
Loading .text @ 0x00800000 : 18620 bytes
Loading .data @ 0x00805000 : 966656 bytes
Clearing .bss @ 0x008F1000 : 8500 bytes
Bytes received = 1057082, Bytes loaded = 0
Low address = 800000, High address = 7FFFFF
After that, the console is died !
I could use some help in trying to understand what's going on.
Regards,
Mickaël
^ permalink raw reply
* what does this mean?
From: Steve Iribarne (GMail) @ 2006-05-16 16:51 UTC (permalink / raw)
To: linuxppc-embedded
My code is hitting in sched.c ->
=09if (unlikely(in_interrupt())) {
=09=09printk("Scheduling in interrupt\n");
=09=09BUG();
=09}
It is hitting this printk. So is this telling me I'm calling schedule
from within an interrupt? How can this be? Has anyone else seen
something like this and can anyone give me a hint as to what to look
for.
Thanks.
-stv
^ permalink raw reply
* Re: what does this mean?
From: Walter L. Wimer III @ 2006-05-16 17:38 UTC (permalink / raw)
To: Steve Iribarne (GMail); +Cc: linuxppc-embedded
In-Reply-To: <b4b98b690605160951o5cefddd8t6b19a91a708f0431@mail.gmail.com>
On Tue, 2006-05-16 at 09:51 -0700, Steve Iribarne (GMail) wrote:
> My code is hitting in sched.c ->
>
> if (unlikely(in_interrupt())) {
> printk("Scheduling in interrupt\n");
> BUG();
> }
> It is hitting this printk. So is this telling me I'm calling schedule
> from within an interrupt? How can this be? Has anyone else seen
> something like this and can anyone give me a hint as to what to look
> for.
Check to make sure that in your interrupt handler you are not calling
something that can sleep. E.g. sleep(), usleep(), kmalloc(), vmalloc(),
etc.
> Thanks.
> -stv
Best regards,
Walt Wimer
TimeSys Corporation
^ permalink raw reply
* Re: what does this mean?
From: Walter L. Wimer III @ 2006-05-16 17:42 UTC (permalink / raw)
To: Steve Iribarne (GMail); +Cc: linuxppc-embedded
In-Reply-To: <1147801106.14881.2.camel@excalibur.timesys.com>
On Tue, 2006-05-16 at 13:38 -0400, Walter L. Wimer III wrote:
> Check to make sure that in your interrupt handler you are not calling
> something that can sleep. E.g. sleep(), usleep(), kmalloc(),
> vmalloc(), etc.
Also watch out for semaphore operations such as down() and
down_interruptible(). They can sleep too.
Walt
^ permalink raw reply
* Re: what does this mean?
From: Steve Iribarne (GMail) @ 2006-05-16 18:04 UTC (permalink / raw)
To: Walter L. Wimer III; +Cc: linuxppc-embedded
In-Reply-To: <1147801367.14881.4.camel@excalibur.timesys.com>
Thanks. That's what I think it is, but I didn't write this code so
I'm trying to track down
who is calling down at interrupt time.
On 5/16/06, Walter L. Wimer III <walt.wimer@timesys.com> wrote:
> On Tue, 2006-05-16 at 13:38 -0400, Walter L. Wimer III wrote:
> > Check to make sure that in your interrupt handler you are not calling
> > something that can sleep. E.g. sleep(), usleep(), kmalloc(),
> > vmalloc(), etc.
>
> Also watch out for semaphore operations such as down() and
> down_interruptible(). They can sleep too.
>
>
> Walt
>
>
>
^ permalink raw reply
* Re: Unable to boot a kernel on a MPC8560
From: Greg Weeks @ 2006-05-16 18:09 UTC (permalink / raw)
To: pito50; +Cc: linuxppc-embedded
In-Reply-To: <BAY105-F10857BC9DB3B958AC19C8D8EA00@phx.gbl>
CORVELLER Mickael wrote:
> Hello,
>
> first of all, I am a newbie in embedded linux systems.
>
> I'm trying to boot a board based on a MPC8560 (with a e500 core).
>
> I'm using a RS232 console via a debug module connected to the SCC1 port of
> the 8560.
>
> The boot loader is U-Boot.
>
>
What version of u-boot do you have? At some point I had a u-boot with
the value of CCSRBAR set different from what the current kernels use. It
caused a failure like this.
Greg Weeks
^ permalink raw reply
* Re: Unable to boot a kernel on a MPC8560
From: Walter L. Wimer III @ 2006-05-16 18:39 UTC (permalink / raw)
To: pito50; +Cc: linuxppc-embedded
In-Reply-To: <BAY105-F10857BC9DB3B958AC19C8D8EA00@phx.gbl>
On Tue, 2006-05-16 at 15:12 +0000, CORVELLER Mickael wrote:
> The boot loader is U-Boot.
>
[...]
>
> Here is the result of one of my tests :
> -> niot 0
> Client IP Address (0 for unknown) = 192.168.001.126 ?
> Client address mask (0 for unknown) = 255.255.255.000 ?
> Server IP Address (0 for unknown) = 192.168.001.127 ?
> File Format S(rec)/I(ntel)/B(in)/E(lf) = B ? e
> Boot File Name (NULL for unknown) = pimage ? zimage.elf
> Boot File Load address = 80000 ? 0
> Boot File Execution address = 80000 ? 100000
> Data update in progress...
> -> nbo 0
> Initialize ETH 0 in progress...
> Physical link is up at 100f.
>
> TFTP parameters :
> Client IP Address 192.168.001.126
> Server IP Address 192.168.001.127
> Boot File Format E
> Boot File Name zimage.elf
> Boot File Load address 0
> Boot File Execution address 100000
> TFTP load in progress...
> Packets : 2065
> ELF information :
> Loading .text @ 0x00800000 : 18620 bytes
> Loading .data @ 0x00805000 : 966656 bytes
> Clearing .bss @ 0x008F1000 : 8500 bytes
> Bytes received = 1057082, Bytes loaded = 0
> Low address = 800000, High address = 7FFFFF
>
> After that, the console is died !
Um, this doesn't look like U-Boot. This looks like an old Motorola
bootloader like MOTLoad....
Walt Wimer
TimeSys Corporation
^ permalink raw reply
* Re: [PATCH] yaboot: enable boot from iscsi target via ethernet devices on js20.
From: Paul Nasrat @ 2006-05-16 20:20 UTC (permalink / raw)
To: Doug Maxey; +Cc: yaboot-devel, Doug Maxey, Linux PowerPC List
In-Reply-To: <200604280605.k3S65tjv012348@bebe.enoyolf.org>
On Fri, 2006-04-28 at 01:05 -0500, Doug Maxey wrote:
> Certain levels of JS20 firmware will allow the system to boot from an
> iscsi target. System OFW accomplishes this by setting up a virtual
> disk device with parameters. These parameters, when passed back to
> OFW by yaboot, directs the FW to use virtual device over the ethernet
> port that will then access iscsi target as a block device. This patch
> extracts those parameters from the property of the virtual device and
> passes them back to OFW to indicate the kernel is to be retrieved via
> the iscsi protocol.
>
> Signed-off-by: Doug Maxey <dwm@austin.ibm.com>
Sorry for the delay in getting back to you - a few initial questions:
> diff --git a/second/file.c b/second/file.c
> @@ -185,16 +188,45 @@ parse_device_path(char *imagepath, char
>
> if (!imagepath)
> return 0;
> +
> + /*
> + * Do preliminary checking for an iscsi device; it may appear as
> + * pure a network device (device_type == "network") if this is
> + * ISWI. This is the case on IBM systems doing an iscsi OFW
> + * boot.
> + */
> + if (strstr(imagepath, ",iscsi"))
Is the , always guaranteed to be there - eg if I have boot
eth1:iscsi,ISCSIARGS won't this check fail.
> diff --git a/second/prom.c b/second/prom.c
> index 5ec06b8..9bc5415 100644
> --- a/second/prom.c
> +++ b/second/prom.c
> @@ -174,6 +174,9 @@ prom_get_devtype (char *device)
> int result;
> char tmp[64];
>
> + if (strstr(device, ",iscsi"))
> + device = strcpy(tmp, "/vdevice/gscsi/disk");
> +
Ditto here.
Paul
^ permalink raw reply
* Re: Unable to boot a kernel on a MPC8560
From: Wolfgang Denk @ 2006-05-16 20:26 UTC (permalink / raw)
To: pito50; +Cc: linuxppc-embedded
In-Reply-To: <BAY105-F10857BC9DB3B958AC19C8D8EA00@phx.gbl>
In message <BAY105-F10857BC9DB3B958AC19C8D8EA00@phx.gbl> you wrote:
>
> first of all, I am a newbie in embedded linux systems.
Seems you are also a newbie when it comes to posting to mailing lists
in general. Posting the same question several times to several
mailing lists is not a good idea. Please read
http://www.catb.org/%7eesr/faqs/smart-questions.html
> The boot loader is U-Boot.
...
> Here is the result of one of my tests :
> -> niot 0
...
> -> nbo 0
These are definitely no U-Boot commands.
Best regards,
Wolfgang Denk
--
Software Engineering: Embedded and Realtime Systems, Embedded Linux
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de
He's dead, Jim
-- McCoy, "The Devil in the Dark", stardate 3196.1
^ permalink raw reply
* Re: [PATCH] yaboot: enable boot from iscsi target via ethernet devices on js20.
From: Doug Maxey @ 2006-05-16 20:40 UTC (permalink / raw)
To: Paul Nasrat; +Cc: yaboot-devel, Linux PowerPC List
In-Reply-To: <1147810848.4115.33.camel@enki.eridu>
On Tue, 16 May 2006 16:20:47 EDT, Paul Nasrat wrote:
>On Fri, 2006-04-28 at 01:05 -0500, Doug Maxey wrote:
>> Certain levels of JS20 firmware will allow the system to boot from an
>> iscsi target. System OFW accomplishes this by setting up a virtual
>> disk device with parameters. These parameters, when passed back to
>> OFW by yaboot, directs the FW to use virtual device over the ethernet
>> port that will then access iscsi target as a block device. This patch
>> extracts those parameters from the property of the virtual device and
>> passes them back to OFW to indicate the kernel is to be retrieved via
>> the iscsi protocol.
>>
>> Signed-off-by: Doug Maxey <dwm@austin.ibm.com>
>
>Sorry for the delay in getting back to you - a few initial questions:
np. been on vacation the last 10 days. Switzerland is nice, and Milan
is cool. :)
>
>> diff --git a/second/file.c b/second/file.c
>
>> @@ -185,16 +188,45 @@ parse_device_path(char *imagepath, char
>>
>> if (!imagepath)
>> return 0;
>> +
>> + /*
>> + * Do preliminary checking for an iscsi device; it may appear as
>> + * pure a network device (device_type == "network") if this is
>> + * ISWI. This is the case on IBM systems doing an iscsi OFW
>> + * boot.
>> + */
>> + if (strstr(imagepath, ",iscsi"))
>
>Is the , always guaranteed to be there - eg if I have boot
>eth1:iscsi,ISCSIARGS won't this check fail.
Yes, with the above command line this would fail.
My point of reference are the bindings that we cannot yet talk about
here, yet. The device args would always be followed by a comma. I suppose
that we could just reference the string "iscsi", but then some wag
would want to create some other property that included "iscsi" as a
substring. Maybe append a comma?
>
>> diff --git a/second/prom.c b/second/prom.c
>> index 5ec06b8..9bc5415 100644
>> --- a/second/prom.c
>> +++ b/second/prom.c
>> @@ -174,6 +174,9 @@ prom_get_devtype (char *device)
>> int result;
>> char tmp[64];
>>
>> + if (strstr(device, ",iscsi"))
>> + device = strcpy(tmp, "/vdevice/gscsi/disk");
>> +
>
>Ditto here.
likewise. Maybe make it a #define so it would be common.
>
>Paul
>
^ permalink raw reply
* Re: [RFC] alsa integer control ranges
From: Benjamin Herrenschmidt @ 2006-05-16 22:00 UTC (permalink / raw)
To: Johannes Berg; +Cc: linuxppc-dev list, ALSA development, Benjamin Berg
In-Reply-To: <1147780945.29795.110.camel@johannes>
On Tue, 2006-05-16 at 14:02 +0200, Johannes Berg wrote:
> Apparently all alsa userspace programs including alsamixer suck. Hence,
> this patch is required to make them work properly. Why is it so hard to
> do these additions/subtractions in the program or maybe even in the alsa
> library? The alsa libraries already think they know better and mess up
> all kinds of things.
alsamixer works for me with negative ranges... but all other apps don't
and there are various bugs, I blame apps converted from OSS....
> What are your opinions on this? Should this be required? And if so, why
> do we even have the value.integer.min when we can't use it anyway?
>
> The code this patch applies against is in
> http://johannes.sipsolutions.net/snd-aoa.git/ but that isn't all too
> relevant, the patch serves just as an illustration of what is wrong
> here.
>
> Thanks,
> johannes
>
> --- snd-aoa.orig/aoa/codecs/onyx/snd-aoa-codec-onyx.c 2006-05-16 12:13:39.663950213 +0200
> +++ snd-aoa/aoa/codecs/onyx/snd-aoa-codec-onyx.c 2006-05-16 12:14:13.698643898 +0200
> @@ -102,8 +102,8 @@ static int onyx_snd_vol_info(struct snd_
> {
> uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
> uinfo->count = 2;
> - uinfo->value.integer.min = -128;
> - uinfo->value.integer.max = -1;
> + uinfo->value.integer.min = -128+128;
> + uinfo->value.integer.max = -1+128;
> return 0;
> }
>
> @@ -115,8 +115,8 @@ static int onyx_snd_vol_get(struct snd_k
>
> onyx_read_register(onyx, ONYX_REG_DAC_ATTEN_LEFT, &l);
> onyx_read_register(onyx, ONYX_REG_DAC_ATTEN_RIGHT, &r);
> - ucontrol->value.integer.value[0] = l;
> - ucontrol->value.integer.value[1] = r;
> + ucontrol->value.integer.value[0] = l+128;
> + ucontrol->value.integer.value[1] = r+128;
> return 0;
> }
>
> @@ -125,8 +125,8 @@ static int onyx_snd_vol_put(struct snd_k
> {
> struct onyx *onyx = snd_kcontrol_chip(kcontrol);
>
> - onyx_write_register(onyx, ONYX_REG_DAC_ATTEN_LEFT, ucontrol->value.integer.value[0]);
> - onyx_write_register(onyx, ONYX_REG_DAC_ATTEN_RIGHT, ucontrol->value.integer.value[1]);
> + onyx_write_register(onyx, ONYX_REG_DAC_ATTEN_LEFT, ucontrol->value.integer.value[0]-128);
> + onyx_write_register(onyx, ONYX_REG_DAC_ATTEN_RIGHT, ucontrol->value.integer.value[1]-128);
> /* FIXME: we could be checking if anything changed */
> return 1;
> }
> @@ -145,8 +145,8 @@ static int onyx_snd_inputgain_info(struc
> {
> uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
> uinfo->count = 1;
> - uinfo->value.integer.min = 3;
> - uinfo->value.integer.max = 28;
> + uinfo->value.integer.min = 3-3;
> + uinfo->value.integer.max = 28-3;
> return 0;
> }
>
> @@ -157,7 +157,7 @@ static int onyx_snd_inputgain_get(struct
> u8 ig;
>
> onyx_read_register(onyx, ONYX_REG_ADC_CONTROL, &ig);
> - ucontrol->value.integer.value[0] = ig & ONYX_ADC_PGA_GAIN_MASK;
> + ucontrol->value.integer.value[0] = (ig & ONYX_ADC_PGA_GAIN_MASK)-3;
> return 0;
> }
>
> @@ -169,7 +169,7 @@ static int onyx_snd_inputgain_put(struct
>
> onyx_read_register(onyx, ONYX_REG_ADC_CONTROL, &val);
> val &= ~ONYX_ADC_PGA_GAIN_MASK;
> - val |= ucontrol->value.integer.value[0] & ONYX_ADC_PGA_GAIN_MASK;
> + val |= (ucontrol->value.integer.value[0]+3) & ONYX_ADC_PGA_GAIN_MASK;
> onyx_write_register(onyx, ONYX_REG_ADC_CONTROL, val);
> return 1;
> }
>
^ permalink raw reply
* Re: [Alsa-devel] [RFC] alsa integer control ranges
From: Benjamin Herrenschmidt @ 2006-05-16 22:03 UTC (permalink / raw)
To: Takashi Iwai
Cc: linuxppc-dev list, Johannes Berg, ALSA development, Benjamin Berg
In-Reply-To: <s5h7j4m40kf.wl%tiwai@suse.de>
On Tue, 2006-05-16 at 14:27 +0200, Takashi Iwai wrote:
> At Tue, 16 May 2006 14:02:20 +0200,
> Johannes Berg wrote:
> >
> > Apparently all alsa userspace programs including alsamixer suck. Hence,
> > this patch is required to make them work properly. Why is it so hard to
> > do these additions/subtractions in the program or maybe even in the alsa
> > library? The alsa libraries already think they know better and mess up
> > all kinds of things.
>
> It's a pretty stupid question to ask why you are stupid :)
>
> I don't think it's alsa-lib that prevents the negative or non-zero
> integer range. The fact amixer works implies that it's an
> app-specific bug. But I'm not 100% sure and need more
> inside-looking.
Well, the problem I think is that pretty much all apps but amixer (and
alsamixer whch works too for me at least) are bogus. It would have been
good if Alsa had a more explicit specification that those values are not
to be interpreted in the old OSS range :) In fact, best would have been
to have the control structure carry a "unit" which a set of known units,
one being dB, since the natural way of specifying an attenuation on any
serious audio HW is dB and is negative...
> > What are your opinions on this? Should this be required? And if so, why
> > do we even have the value.integer.min when we can't use it anyway?
>
> Right now, the range 0-max would make your life easier, I guess.
>
> The min value is an API definition, and implemented and worked once.
> But no drivers used yet. So, there might be a breakage. It's of
> course to be fixed.
There is a lack of serious/professional audio drivers in the linux world
unfortunately...
Ben.
^ permalink raw reply
* Re: [Alsa-devel] [RFC] alsa integer control ranges
From: Benjamin Herrenschmidt @ 2006-05-16 22:04 UTC (permalink / raw)
To: Jaroslav Kysela
Cc: linuxppc-dev list, Johannes Berg, ALSA development, Benjamin Berg
In-Reply-To: <Pine.LNX.4.61.0605161430220.9330@tm8103.perex-int.cz>
On Tue, 2006-05-16 at 14:31 +0200, Jaroslav Kysela wrote:
> On Tue, 16 May 2006, Johannes Berg wrote:
>
> > Apparently all alsa userspace programs including alsamixer suck. Hence,
> > this patch is required to make them work properly. Why is it so hard to
> > do these additions/subtractions in the program or maybe even in the alsa
> > library? The alsa libraries already think they know better and mess up
> > all kinds of things.
>
> It's better to fix apps, if they are broken.
Problem is, they are currently all broken (pretty much) and thus unless
we want to release a driver that won't work with any current distros,
we'll have to whack the ranges :(
Ben.
^ permalink raw reply
* Re: [Alsa-devel] Re: [RFC] alsa integer control ranges
From: Lee Revell @ 2006-05-16 22:04 UTC (permalink / raw)
To: Benjamin Herrenschmidt
Cc: linuxppc-dev list, Johannes Berg, ALSA development, Benjamin Berg
In-Reply-To: <1147816857.6753.1.camel@localhost.localdomain>
On Wed, 2006-05-17 at 08:00 +1000, Benjamin Herrenschmidt wrote:
> On Tue, 2006-05-16 at 14:02 +0200, Johannes Berg wrote:
> > Apparently all alsa userspace programs including alsamixer suck. Hence,
> > this patch is required to make them work properly. Why is it so hard to
> > do these additions/subtractions in the program or maybe even in the alsa
> > library? The alsa libraries already think they know better and mess up
> > all kinds of things.
>
> alsamixer works for me with negative ranges... but all other apps don't
> and there are various bugs, I blame apps converted from OSS....
kmix is the worst by far, someone really needs to fix it. It has so
many bugs that it's unusable for debugging ALSA, we have to tell people
to use alsamixer.
Lee
^ permalink raw reply
* Re: ppc32 kernel boot problem (pmu related?)
From: Benjamin Herrenschmidt @ 2006-05-16 22:07 UTC (permalink / raw)
To: Nathan Pilatzke; +Cc: linuxppc-dev
In-Reply-To: <98889dd30605160804i78fc6a31w5147aba1dc5562b@mail.gmail.com>
On Tue, 2006-05-16 at 11:04 -0400, Nathan Pilatzke wrote:
> On 5/16/06, Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote:
> >
> > Can you try editing arch/powerpc/platforms/powermac/low_i2c.c, in
> > function pmac_i2c_init(), comment out the call to pmac_i2c_devscan() and
> > tell me if that makes a difference.
> >
> > Thanks,
> > Ben.
> >
> >
> Commenting out the call to pmac_i2c_devscan() in function
> pmac_i2c_init() allowed the kernel to boot. I am typing this email
> booted under it. The kernel messages were printed a bit strangely
> though. There was no scrolling or clearing of the screen. The kernel
> messages would start at the top and overwrite old messages, with the
> cursor jumping back to the top of the screen every so often.
That's because of the change you did to udbg.c for debugging :)
> The /proc/device-tree is attached for the booting 2.6.17-rc3 kernel with
> pmu enabled, as is the new dmesg output. If you need the
> /proc/device-tree from a 2.6.15 working kernel with pmu enabled
> instead, let me know.
No, it should be the same regardless of the kernel
> Is this kernel fairly safe/stable to use? What can be done next?
Well, I need to figure out what's going on with the i2c stuff... there
is a chip that hangs off the PMU and that says something like "do that
at boot"... but when I do it, it causes the crash you are seeing. So
either I'm not doing what it tells me to do properly or I should just
blacklist this machine (Apple doesn't execute the platform functions
from the device-tree on older machines I think).
I'm investigating, will come back to you.
Ben.
^ permalink raw reply
* Common Flash Interface v1.4(P30) and MTD support in Linux-2.4.16 kernel
From: Jayasri Sangu @ 2006-05-16 23:18 UTC (permalink / raw)
To: linuxppc-embedded
Hi,
Does linux-2.4.16 kernel MTD support the Intel P30 flash ?
If not what are the solutions ?
Thanks
Jayasri=20
Come see us at CommunicAsia 2006 http://www.communicasia.com/
June 20-23, 2006 in Singapore at the US International Pavilion booth =
6F1-03
^ permalink raw reply
* Re: Common Flash Interface v1.4(P30) and MTD support in Linux-2.4.16 kernel
From: Josh Boyer @ 2006-05-17 1:37 UTC (permalink / raw)
To: Jayasri Sangu; +Cc: linuxppc-embedded
In-Reply-To: <E76D631A87C2874E895D1639A1CEDB962AF95D@aae-exchange.aaesys.com>
On Tue, 2006-05-16 at 16:18 -0700, Jayasri Sangu wrote:
> Hi,
>
> Does linux-2.4.16 kernel MTD support the Intel P30 flash ?
No. That's almost 4.5 years old now. Intel P30 was released within the
last year.
>
> If not what are the solutions ?
Use 2.6.15 or 2.6.16
josh
^ permalink raw reply
* Re: [Alsa-devel] [RFC] alsa integer control ranges
From: Jaroslav Kysela @ 2006-05-17 6:41 UTC (permalink / raw)
To: Benjamin Herrenschmidt
Cc: linuxppc-dev list, Johannes Berg, ALSA development, Benjamin Berg
In-Reply-To: <1147817058.6753.7.camel@localhost.localdomain>
On Wed, 17 May 2006, Benjamin Herrenschmidt wrote:
> On Tue, 2006-05-16 at 14:31 +0200, Jaroslav Kysela wrote:
> > On Tue, 16 May 2006, Johannes Berg wrote:
> >
> > > Apparently all alsa userspace programs including alsamixer suck. Hence,
> > > this patch is required to make them work properly. Why is it so hard to
> > > do these additions/subtractions in the program or maybe even in the alsa
> > > library? The alsa libraries already think they know better and mess up
> > > all kinds of things.
> >
> > It's better to fix apps, if they are broken.
>
> Problem is, they are currently all broken (pretty much) and thus unless
> we want to release a driver that won't work with any current distros,
> we'll have to whack the ranges :(
It's better to have problematic values by default and define a module
(driver) option to enable the "compatible" behaviour. Otherwise the apps
will be never fixed. Also, ideally, you can fix apps and send patches to
authors and/or create problematic controls in the dummy driver
(drivers/dummy.c) and send a notice to app developers that they have
broken apps and ask to fix them refering to the dummy driver test case.
Jaroslav
-----
Jaroslav Kysela <perex@suse.cz>
Linux Kernel Sound Maintainer
ALSA Project, SUSE Labs
^ permalink raw reply
* [PATCH 1/5] powerpc: Make early xmon logic immune to location of early parsing
From: Michael Ellerman @ 2006-05-17 8:00 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev, Kumar Gala
Currently early_xmon() calls directly into debugger() if xmon=early is passed.
This ties the invocation of early xmon to the location of parse_early_param(),
which might change.
Tested on P5 LPAR and F50.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
---
arch/powerpc/kernel/setup-common.c | 3 ++-
arch/powerpc/kernel/setup.h | 1 +
arch/powerpc/kernel/setup_32.c | 3 +++
arch/powerpc/kernel/setup_64.c | 3 +++
4 files changed, 9 insertions(+), 1 deletion(-)
Index: to-merge/arch/powerpc/kernel/setup-common.c
===================================================================
--- to-merge.orig/arch/powerpc/kernel/setup-common.c
+++ to-merge/arch/powerpc/kernel/setup-common.c
@@ -443,6 +443,7 @@ void __init smp_setup_cpu_maps(void)
}
#endif /* CONFIG_SMP */
+int __initdata do_early_xmon;
#ifdef CONFIG_XMON
static int __init early_xmon(char *p)
{
@@ -456,7 +457,7 @@ static int __init early_xmon(char *p)
return 0;
}
xmon_init(1);
- debugger(NULL);
+ do_early_xmon = 1;
return 0;
}
Index: to-merge/arch/powerpc/kernel/setup.h
===================================================================
--- to-merge.orig/arch/powerpc/kernel/setup.h
+++ to-merge/arch/powerpc/kernel/setup.h
@@ -2,5 +2,6 @@
#define _POWERPC_KERNEL_SETUP_H
void check_for_initrd(void);
+extern int do_early_xmon;
#endif /* _POWERPC_KERNEL_SETUP_H */
Index: to-merge/arch/powerpc/kernel/setup_32.c
===================================================================
--- to-merge.orig/arch/powerpc/kernel/setup_32.c
+++ to-merge/arch/powerpc/kernel/setup_32.c
@@ -296,6 +296,9 @@ void __init setup_arch(char **cmdline_p)
parse_early_param();
+ if (do_early_xmon)
+ debugger(NULL);
+
/* set up the bootmem stuff with available memory */
do_init_bootmem();
if ( ppc_md.progress ) ppc_md.progress("setup_arch: bootmem", 0x3eab);
Index: to-merge/arch/powerpc/kernel/setup_64.c
===================================================================
--- to-merge.orig/arch/powerpc/kernel/setup_64.c
+++ to-merge/arch/powerpc/kernel/setup_64.c
@@ -425,6 +425,9 @@ void __init setup_system(void)
parse_early_param();
+ if (do_early_xmon)
+ debugger(NULL);
+
check_smt_enabled();
smp_setup_cpu_maps();
^ permalink raw reply
* [PATCH 2/5] powerpc: Parse early parameters early, rather than sorta early
From: Michael Ellerman @ 2006-05-17 8:00 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev, Kumar Gala
In-Reply-To: <1147852841.148164.91320074069.qpush@concordia>
Currently we have call parse_early_param() earliyish, but not really very
early. In particular, it's not early enough to do things like mem=x or
crashkernel=blah, which is annoying.
So do it earlier. I've checked all the early param handlers, and none of them
look like they should have any trouble with this. I haven't tested the
booke_wdt ones though.
On 32-bit we were doing the CONFIG_CMDLINE logic twice, so don't.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
---
arch/powerpc/kernel/prom.c | 5 +++++
arch/powerpc/kernel/setup_32.c | 14 ++------------
arch/powerpc/kernel/setup_64.c | 5 -----
3 files changed, 7 insertions(+), 17 deletions(-)
Index: to-merge/arch/powerpc/kernel/prom.c
===================================================================
--- to-merge.orig/arch/powerpc/kernel/prom.c
+++ to-merge/arch/powerpc/kernel/prom.c
@@ -1292,6 +1292,11 @@ void __init early_init_devtree(void *par
lmb_init();
of_scan_flat_dt(early_init_dt_scan_root, NULL);
of_scan_flat_dt(early_init_dt_scan_memory, NULL);
+
+ /* Save command line for /proc/cmdline and then parse parameters */
+ strlcpy(saved_command_line, cmd_line, COMMAND_LINE_SIZE);
+ parse_early_param();
+
lmb_enforce_memory_limit(memory_limit);
lmb_analyze();
Index: to-merge/arch/powerpc/kernel/setup_32.c
===================================================================
--- to-merge.orig/arch/powerpc/kernel/setup_32.c
+++ to-merge/arch/powerpc/kernel/setup_32.c
@@ -131,12 +131,6 @@ void __init machine_init(unsigned long d
/* Do some early initialization based on the flat device tree */
early_init_devtree(__va(dt_ptr));
- /* Check default command line */
-#ifdef CONFIG_CMDLINE
- if (cmd_line[0] == 0)
- strlcpy(cmd_line, CONFIG_CMDLINE, sizeof(cmd_line));
-#endif /* CONFIG_CMDLINE */
-
probe_machine();
#ifdef CONFIG_6xx
@@ -237,6 +231,8 @@ void __init setup_arch(char **cmdline_p)
{
extern void do_init_bootmem(void);
+ *cmdline_p = cmd_line;
+
/* so udelay does something sensible, assume <= 1000 bogomips */
loops_per_jiffy = 500000000 / HZ;
@@ -290,12 +286,6 @@ void __init setup_arch(char **cmdline_p)
init_mm.end_data = (unsigned long) _edata;
init_mm.brk = klimit;
- /* Save unparsed command line copy for /proc/cmdline */
- strlcpy(saved_command_line, cmd_line, COMMAND_LINE_SIZE);
- *cmdline_p = cmd_line;
-
- parse_early_param();
-
if (do_early_xmon)
debugger(NULL);
Index: to-merge/arch/powerpc/kernel/setup_64.c
===================================================================
--- to-merge.orig/arch/powerpc/kernel/setup_64.c
+++ to-merge/arch/powerpc/kernel/setup_64.c
@@ -420,11 +420,6 @@ void __init setup_system(void)
*/
register_early_udbg_console();
- /* Save unparsed command line copy for /proc/cmdline */
- strlcpy(saved_command_line, cmd_line, COMMAND_LINE_SIZE);
-
- parse_early_param();
-
if (do_early_xmon)
debugger(NULL);
^ permalink raw reply
* [PATCH 3/5] powerpc: Unify mem= handling
From: Michael Ellerman @ 2006-05-17 8:00 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev, Kumar Gala
In-Reply-To: <1147852841.148164.91320074069.qpush@concordia>
We currently do mem= handling in three seperate places. And as benh pointed out
I wrote two of them. Now that we parse command line parameters earlier we can
clean this mess up.
Moving the parsing out of prom_init means the device tree might be allocated
above the memory limit. If that happens we'd have to move it. As it happens
we already have logic to do that for kdump, so just genericise it.
This also means we might have reserved regions above the memory limit, if we
do the bootmem allocator will blow up, so we have to modify
lmb_enforce_memory_limit() to truncate the reserves as well.
Tested on P5 LPAR, iSeries, F50, 44p. Tested moving device tree on P5 and
44p and F50.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
---
arch/powerpc/kernel/machine_kexec_64.c | 5 +
arch/powerpc/kernel/prom.c | 89 +++++++++++++++++----------------
arch/powerpc/kernel/prom_init.c | 55 +-------------------
arch/powerpc/kernel/setup_64.c | 3 -
arch/powerpc/mm/lmb.c | 43 +++++++++++----
arch/powerpc/platforms/iseries/setup.c | 22 --------
include/asm-powerpc/kexec.h | 13 ++++
7 files changed, 100 insertions(+), 130 deletions(-)
Index: to-merge/arch/powerpc/kernel/machine_kexec_64.c
===================================================================
--- to-merge.orig/arch/powerpc/kernel/machine_kexec_64.c
+++ to-merge/arch/powerpc/kernel/machine_kexec_64.c
@@ -339,3 +339,8 @@ void __init kexec_setup(void)
{
export_htab_values();
}
+
+int overlaps_crashkernel(unsigned long start, unsigned long size)
+{
+ return (start + size) > crashk_res.start && start <= crashk_res.end;
+}
Index: to-merge/arch/powerpc/kernel/prom.c
===================================================================
--- to-merge.orig/arch/powerpc/kernel/prom.c
+++ to-merge/arch/powerpc/kernel/prom.c
@@ -50,6 +50,7 @@
#include <asm/machdep.h>
#include <asm/pSeries_reconfig.h>
#include <asm/pci-bridge.h>
+#include <asm/kexec.h>
#ifdef DEBUG
#define DBG(fmt...) printk(KERN_ERR fmt)
@@ -836,6 +837,42 @@ static unsigned long __init unflatten_dt
return mem;
}
+static int __init early_parse_mem(char *p)
+{
+ if (!p)
+ return 1;
+
+ memory_limit = PAGE_ALIGN(memparse(p, &p));
+ DBG("memory limit = 0x%lx\n", memory_limit);
+
+ return 0;
+}
+early_param("mem", early_parse_mem);
+
+/*
+ * The device tree may be allocated below our memory limit, or inside the
+ * crash kernel region for kdump. If so, move it out now.
+ */
+static void move_device_tree(void)
+{
+ unsigned long start, size;
+ void *p;
+
+ DBG("-> move_device_tree\n");
+
+ start = __pa(initial_boot_params);
+ size = initial_boot_params->totalsize;
+
+ if ((memory_limit && (start + size) > memory_limit) ||
+ overlaps_crashkernel(start, size)) {
+ p = __va(lmb_alloc_base(size, PAGE_SIZE, lmb.rmo_size));
+ memcpy(p, initial_boot_params, size);
+ initial_boot_params = (struct boot_param_header *)p;
+ DBG("Moved device tree to 0x%p\n", p);
+ }
+
+ DBG("<- move_device_tree\n");
+}
/**
* unflattens the device-tree passed by the firmware, creating the
@@ -1070,6 +1107,7 @@ static int __init early_init_dt_scan_cho
iommu_force_on = 1;
#endif
+ /* mem=x on the command line is the preferred mechanism */
lprop = of_get_flat_dt_prop(node, "linux,memory-limit", NULL);
if (lprop)
memory_limit = *lprop;
@@ -1123,17 +1161,6 @@ static int __init early_init_dt_scan_cho
DBG("Command line is: %s\n", cmd_line);
- if (strstr(cmd_line, "mem=")) {
- char *p, *q;
-
- for (q = cmd_line; (p = strstr(q, "mem=")) != 0; ) {
- q = p + 4;
- if (p > cmd_line && p[-1] != ' ')
- continue;
- memory_limit = memparse(q, &q);
- }
- }
-
/* break now */
return 1;
}
@@ -1297,11 +1324,6 @@ void __init early_init_devtree(void *par
strlcpy(saved_command_line, cmd_line, COMMAND_LINE_SIZE);
parse_early_param();
- lmb_enforce_memory_limit(memory_limit);
- lmb_analyze();
-
- DBG("Phys. mem: %lx\n", lmb_phys_mem_size());
-
/* Reserve LMB regions used by kernel, initrd, dt, etc... */
lmb_reserve(PHYSICAL_START, __pa(klimit) - PHYSICAL_START);
#ifdef CONFIG_CRASH_DUMP
@@ -1309,6 +1331,15 @@ void __init early_init_devtree(void *par
#endif
early_reserve_mem();
+ lmb_enforce_memory_limit(memory_limit);
+ lmb_analyze();
+
+ DBG("Phys. mem: %lx\n", lmb_phys_mem_size());
+
+ /* We may need to relocate the flat tree, do it now.
+ * FIXME .. and the initrd too? */
+ move_device_tree();
+
DBG("Scanning CPUs ...\n");
/* Retreive CPU related informations from the flat tree
@@ -2058,29 +2089,3 @@ int prom_update_property(struct device_n
return 0;
}
-#ifdef CONFIG_KEXEC
-/* We may have allocated the flat device tree inside the crash kernel region
- * in prom_init. If so we need to move it out into regular memory. */
-void kdump_move_device_tree(void)
-{
- unsigned long start, end;
- struct boot_param_header *new;
-
- start = __pa((unsigned long)initial_boot_params);
- end = start + initial_boot_params->totalsize;
-
- if (end < crashk_res.start || start > crashk_res.end)
- return;
-
- new = (struct boot_param_header*)
- __va(lmb_alloc(initial_boot_params->totalsize, PAGE_SIZE));
-
- memcpy(new, initial_boot_params, initial_boot_params->totalsize);
-
- initial_boot_params = new;
-
- DBG("Flat device tree blob moved to %p\n", initial_boot_params);
-
- /* XXX should we unreserve the old DT? */
-}
-#endif /* CONFIG_KEXEC */
Index: to-merge/arch/powerpc/kernel/prom_init.c
===================================================================
--- to-merge.orig/arch/powerpc/kernel/prom_init.c
+++ to-merge/arch/powerpc/kernel/prom_init.c
@@ -194,8 +194,6 @@ static int __initdata of_platform;
static char __initdata prom_cmd_line[COMMAND_LINE_SIZE];
-static unsigned long __initdata prom_memory_limit;
-
static unsigned long __initdata alloc_top;
static unsigned long __initdata alloc_top_high;
static unsigned long __initdata alloc_bottom;
@@ -594,16 +592,6 @@ static void __init early_cmdline_parse(v
}
#endif
- opt = strstr(RELOC(prom_cmd_line), RELOC("mem="));
- if (opt) {
- opt += 4;
- RELOC(prom_memory_limit) = prom_memparse(opt, (const char **)&opt);
-#ifdef CONFIG_PPC64
- /* Align to 16 MB == size of ppc64 large page */
- RELOC(prom_memory_limit) = ALIGN(RELOC(prom_memory_limit), 0x1000000);
-#endif
- }
-
#ifdef CONFIG_KEXEC
/*
* crashkernel=size@addr specifies the location to reserve for
@@ -1115,29 +1103,6 @@ static void __init prom_init_mem(void)
}
/*
- * If prom_memory_limit is set we reduce the upper limits *except* for
- * alloc_top_high. This must be the real top of RAM so we can put
- * TCE's up there.
- */
-
- RELOC(alloc_top_high) = RELOC(ram_top);
-
- if (RELOC(prom_memory_limit)) {
- if (RELOC(prom_memory_limit) <= RELOC(alloc_bottom)) {
- prom_printf("Ignoring mem=%x <= alloc_bottom.\n",
- RELOC(prom_memory_limit));
- RELOC(prom_memory_limit) = 0;
- } else if (RELOC(prom_memory_limit) >= RELOC(ram_top)) {
- prom_printf("Ignoring mem=%x >= ram_top.\n",
- RELOC(prom_memory_limit));
- RELOC(prom_memory_limit) = 0;
- } else {
- RELOC(ram_top) = RELOC(prom_memory_limit);
- RELOC(rmo_top) = min(RELOC(rmo_top), RELOC(prom_memory_limit));
- }
- }
-
- /*
* Setup our top alloc point, that is top of RMO or top of
* segment 0 when running non-LPAR.
* Some RS64 machines have buggy firmware where claims up at
@@ -1149,9 +1114,9 @@ static void __init prom_init_mem(void)
RELOC(rmo_top) = RELOC(ram_top);
RELOC(rmo_top) = min(0x30000000ul, RELOC(rmo_top));
RELOC(alloc_top) = RELOC(rmo_top);
+ RELOC(alloc_top_high) = RELOC(ram_top);
prom_printf("memory layout at init:\n");
- prom_printf(" memory_limit : %x (16 MB aligned)\n", RELOC(prom_memory_limit));
prom_printf(" alloc_bottom : %x\n", RELOC(alloc_bottom));
prom_printf(" alloc_top : %x\n", RELOC(alloc_top));
prom_printf(" alloc_top_hi : %x\n", RELOC(alloc_top_high));
@@ -1348,16 +1313,10 @@ static void __init prom_initialize_tce_t
reserve_mem(local_alloc_bottom, local_alloc_top - local_alloc_bottom);
- if (RELOC(prom_memory_limit)) {
- /*
- * We align the start to a 16MB boundary so we can map
- * the TCE area using large pages if possible.
- * The end should be the top of RAM so no need to align it.
- */
- RELOC(prom_tce_alloc_start) = _ALIGN_DOWN(local_alloc_bottom,
- 0x1000000);
- RELOC(prom_tce_alloc_end) = local_alloc_top;
- }
+ /* These are only really needed if there is a memory limit in
+ * effect, but we don't know so export them always. */
+ RELOC(prom_tce_alloc_start) = local_alloc_bottom;
+ RELOC(prom_tce_alloc_end) = local_alloc_top;
/* Flag the first invalid entry */
prom_debug("ending prom_initialize_tce_table\n");
@@ -2265,10 +2224,6 @@ unsigned long __init prom_init(unsigned
/*
* Fill in some infos for use by the kernel later on
*/
- if (RELOC(prom_memory_limit))
- prom_setprop(_prom->chosen, "/chosen", "linux,memory-limit",
- &RELOC(prom_memory_limit),
- sizeof(prom_memory_limit));
#ifdef CONFIG_PPC64
if (RELOC(ppc64_iommu_off))
prom_setprop(_prom->chosen, "/chosen", "linux,iommu-off",
Index: to-merge/arch/powerpc/kernel/setup_64.c
===================================================================
--- to-merge.orig/arch/powerpc/kernel/setup_64.c
+++ to-merge/arch/powerpc/kernel/setup_64.c
@@ -353,9 +353,6 @@ void __init setup_system(void)
{
DBG(" -> setup_system()\n");
-#ifdef CONFIG_KEXEC
- kdump_move_device_tree();
-#endif
/*
* Unflatten the device-tree passed by prom_init or kexec
*/
Index: to-merge/arch/powerpc/mm/lmb.c
===================================================================
--- to-merge.orig/arch/powerpc/mm/lmb.c
+++ to-merge/arch/powerpc/mm/lmb.c
@@ -89,20 +89,25 @@ static long __init lmb_regions_adjacent(
return lmb_addrs_adjacent(base1, size1, base2, size2);
}
-/* Assumption: base addr of region 1 < base addr of region 2 */
-static void __init lmb_coalesce_regions(struct lmb_region *rgn,
- unsigned long r1, unsigned long r2)
+static void __init lmb_remove_region(struct lmb_region *rgn, unsigned long r)
{
unsigned long i;
- rgn->region[r1].size += rgn->region[r2].size;
- for (i=r2; i < rgn->cnt-1; i++) {
- rgn->region[i].base = rgn->region[i+1].base;
- rgn->region[i].size = rgn->region[i+1].size;
+ for (i = r; i < rgn->cnt - 1; i++) {
+ rgn->region[i].base = rgn->region[i + 1].base;
+ rgn->region[i].size = rgn->region[i + 1].size;
}
rgn->cnt--;
}
+/* Assumption: base addr of region 1 < base addr of region 2 */
+static void __init lmb_coalesce_regions(struct lmb_region *rgn,
+ unsigned long r1, unsigned long r2)
+{
+ rgn->region[r1].size += rgn->region[r2].size;
+ lmb_remove_region(rgn, r2);
+}
+
/* This routine called with relocation disabled. */
void __init lmb_init(void)
{
@@ -294,17 +299,16 @@ unsigned long __init lmb_end_of_DRAM(voi
return (lmb.memory.region[idx].base + lmb.memory.region[idx].size);
}
-/*
- * Truncate the lmb list to memory_limit if it's set
- * You must call lmb_analyze() after this.
- */
+/* You must call lmb_analyze() after this. */
void __init lmb_enforce_memory_limit(unsigned long memory_limit)
{
unsigned long i, limit;
+ struct lmb_property *p;
if (! memory_limit)
return;
+ /* Truncate the lmb regions to satisfy the memory limit. */
limit = memory_limit;
for (i = 0; i < lmb.memory.cnt; i++) {
if (limit > lmb.memory.region[i].size) {
@@ -316,4 +320,21 @@ void __init lmb_enforce_memory_limit(uns
lmb.memory.cnt = i + 1;
break;
}
+
+ lmb.rmo_size = lmb.memory.region[0].size;
+
+ /* And truncate any reserves above the limit also. */
+ for (i = 0; i < lmb.reserved.cnt; i++) {
+ p = &lmb.reserved.region[i];
+
+ if (p->base > memory_limit)
+ p->size = 0;
+ else if ((p->base + p->size) > memory_limit)
+ p->size = memory_limit - p->base;
+
+ if (p->size == 0) {
+ lmb_remove_region(&lmb.reserved, i);
+ i--;
+ }
+ }
}
Index: to-merge/arch/powerpc/platforms/iseries/setup.c
===================================================================
--- to-merge.orig/arch/powerpc/platforms/iseries/setup.c
+++ to-merge/arch/powerpc/platforms/iseries/setup.c
@@ -90,8 +90,6 @@ extern unsigned long embedded_sysmap_end
extern unsigned long iSeries_recal_tb;
extern unsigned long iSeries_recal_titan;
-static unsigned long cmd_mem_limit;
-
struct MemoryBlock {
unsigned long absStart;
unsigned long absEnd;
@@ -1023,8 +1021,6 @@ void build_flat_dt(struct iseries_flat_d
/* /chosen */
dt_start_node(dt, "chosen");
dt_prop_str(dt, "bootargs", cmd_line);
- if (cmd_mem_limit)
- dt_prop_u64(dt, "linux,memory-limit", cmd_mem_limit);
dt_end_node(dt);
dt_cpus(dt);
@@ -1050,29 +1046,11 @@ void * __init iSeries_early_setup(void)
iSeries_get_cmdline();
- /* Save unparsed command line copy for /proc/cmdline */
- strlcpy(saved_command_line, cmd_line, COMMAND_LINE_SIZE);
-
- /* Parse early parameters, in particular mem=x */
- parse_early_param();
-
build_flat_dt(&iseries_dt, phys_mem_size);
return (void *) __pa(&iseries_dt);
}
-/*
- * On iSeries we just parse the mem=X option from the command line.
- * On pSeries it's a bit more complicated, see prom_init_mem()
- */
-static int __init early_parsemem(char *p)
-{
- if (p)
- cmd_mem_limit = ALIGN(memparse(p, &p), PAGE_SIZE);
- return 0;
-}
-early_param("mem", early_parsemem);
-
static void hvputc(char c)
{
if (c == '\n')
Index: to-merge/include/asm-powerpc/kexec.h
===================================================================
--- to-merge.orig/include/asm-powerpc/kexec.h
+++ to-merge/include/asm-powerpc/kexec.h
@@ -31,9 +31,10 @@
#define KEXEC_ARCH KEXEC_ARCH_PPC
#endif
+#ifndef __ASSEMBLY__
+
#ifdef CONFIG_KEXEC
-#ifndef __ASSEMBLY__
#ifdef __powerpc64__
/*
* This function is responsible for capturing register states if coming
@@ -123,8 +124,16 @@ extern int default_machine_kexec_prepare
extern void default_machine_crash_shutdown(struct pt_regs *regs);
extern void machine_kexec_simple(struct kimage *image);
+extern int overlaps_crashkernel(unsigned long start, unsigned long size);
+
+#else /* !CONFIG_KEXEC */
+
+static inline int overlaps_crashkernel(unsigned long start, unsigned long size)
+{
+ return 0;
+}
-#endif /* ! __ASSEMBLY__ */
#endif /* CONFIG_KEXEC */
+#endif /* ! __ASSEMBLY__ */
#endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_KEXEC_H */
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox