* Re: [PATCH 0/8] v3 De-couple sysfs memory directories from memory sections
From: Greg KH @ 2010-07-31 19:55 UTC (permalink / raw)
To: Benjamin Herrenschmidt
Cc: linux-mm, linux-kernel, KAMEZAWA Hiroyuki, linuxppc-dev
In-Reply-To: <1280554584.1902.31.camel@pasglop>
On Sat, Jul 31, 2010 at 03:36:24PM +1000, Benjamin Herrenschmidt wrote:
> On Mon, 2010-07-19 at 22:45 -0500, Nathan Fontenot wrote:
> > This set of patches de-couples the idea that there is a single
> > directory in sysfs for each memory section. The intent of the
> > patches is to reduce the number of sysfs directories created to
> > resolve a boot-time performance issue. On very large systems
> > boot time are getting very long (as seen on powerpc hardware)
> > due to the enormous number of sysfs directories being created.
> > On a system with 1 TB of memory we create ~63,000 directories.
> > For even larger systems boot times are being measured in hours.
>
> Greg, Kame, how do we proceed with these ? I'm happy to put them in
> powerpc.git with appropriate acks or will you take them ?
I thought there would be at least one more round of these patches based
on the review comments, right?
I'll be glad to take them when everyone agrees with them.
thanks,
greg k-h
^ permalink raw reply
* Re: [PATCH 0/8] v3 De-couple sysfs memory directories from memory sections
From: Benjamin Herrenschmidt @ 2010-08-01 0:27 UTC (permalink / raw)
To: Greg KH; +Cc: linux-mm, linux-kernel, KAMEZAWA Hiroyuki, linuxppc-dev
In-Reply-To: <20100731195506.GC4644@kroah.com>
On Sat, 2010-07-31 at 12:55 -0700, Greg KH wrote:
> On Sat, Jul 31, 2010 at 03:36:24PM +1000, Benjamin Herrenschmidt wrote:
> > On Mon, 2010-07-19 at 22:45 -0500, Nathan Fontenot wrote:
> > > This set of patches de-couples the idea that there is a single
> > > directory in sysfs for each memory section. The intent of the
> > > patches is to reduce the number of sysfs directories created to
> > > resolve a boot-time performance issue. On very large systems
> > > boot time are getting very long (as seen on powerpc hardware)
> > > due to the enormous number of sysfs directories being created.
> > > On a system with 1 TB of memory we create ~63,000 directories.
> > > For even larger systems boot times are being measured in hours.
> >
> > Greg, Kame, how do we proceed with these ? I'm happy to put them in
> > powerpc.git with appropriate acks or will you take them ?
>
> I thought there would be at least one more round of these patches based
> on the review comments, right?
Yes, but I was nontheless inquiring whether I should pick them up after
said repost :-)
> I'll be glad to take them when everyone agrees with them.
Ok, good, one less thing to worry about in powerpc patchwork :-)
Cheers,
Ben.
> thanks,
>
> greg k-h
^ permalink raw reply
* Re: [PATCH 0/2 v3] mpc5200 ac97 gpio reset
From: Grant Likely @ 2010-08-01 4:42 UTC (permalink / raw)
To: Mark Brown; +Cc: linuxppc-dev@lists.ozlabs.org, Eric Millbrandt
In-Reply-To: <D37786F8-EBA7-4E55-AE83-5D0ABF1E17BF@opensource.wolfsonmicro.com>
On Sun, Jun 27, 2010 at 4:01 PM, Mark Brown
<broonie@opensource.wolfsonmicro.com> wrote:
>
> On 26 Jun 2010, at 00:04, Grant Likely <grant.likely@secretlab.ca> wrote:
>
>> On Tue, Jun 22, 2010 at 5:00 PM, Mark Brown
>>> On Tue, Jun 15, 2010 at 12:05:05PM -0400, Eric Millbrandt wrote:
>>>> These patches reimplement the reset fuction in the ac97 to use gpio pi=
ns
>>>> instead of using the mpc5200 ac97 reset functionality in the psc. =A0T=
his
>>>> avoids a problem in which attached ac97 devices go into "test" mode ap=
pear
>>>> unresponsive.
>>>>
>>>> These patches were tested on a pcm030 baseboard and on custom hardware=
with
>>>> a wm9715 audio codec/touchscreen controller.
>>>
>>> Grant, are you OK with this series?
>>
>> Yes, I'm going to pick it up.
>
> I'm a little concerned with a collision with multi codec here. It'd
> be handy if you could keep it separate in case it needs merging
> into both trees (or we could merge via ASoC only).
Hmmm. Yeah, probably better to take it via your tree then. I've
currently got patch 1 in linux-next, but I'll drop it before asking
benh to pull. Go ahead and add my acked-by.
g.
--=20
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
^ permalink raw reply
* Re: [PATCH 2/7] usb: fsl_udc_core: check return value of create_proc_read_entry()
From: Vasiliy Kulikov @ 2010-08-01 6:19 UTC (permalink / raw)
To: Dan Carpenter, kernel-janitors, Li Yang, David Brownell,
Greg Kroah-Hartman, Dinh Nguyen, Anton Vorontsov, linux-usb,
linuxppc-dev, linux-kernel
In-Reply-To: <20100731191743.GF26313@bicker>
On Sat, Jul 31, 2010 at 21:17 +0200, Dan Carpenter wrote:
> On Sat, Jul 31, 2010 at 09:38:20PM +0400, Kulikov Vasiliy wrote:
> > create_proc_read_entry() may fail, if so return -ENOMEM.
> >
>
> It can fail, but also we return NULL if procfs is disabled. I haven't
> looked at it very carefully, would this patch break the module if procfs
> was disabled?
Probably you are right, but many drivers in tree compare return value
with NULL. Some of them interpret this as error, some of them simply
call pr_warn("Hmm, I cannot create file in proc, strange..."). Maybe
there is more simplier way to check it without #ifdefs?
>
> The same applies to the similar patches in this set.
>
> regards,
> dan carpenter
>
>
^ permalink raw reply
* Re: [PATCH] PCI: MSI: Restore read_msi_msg_desc(); add get_cached_msi_msg_desc()
From: Michael Ellerman @ 2010-08-01 6:23 UTC (permalink / raw)
To: Jesse Barnes; +Cc: Ben Hutchings, Stephen Rothwell, ppc-dev, LKML, linux-pci
In-Reply-To: <20100730094247.05cb070e@virtuousgeek.org>
[-- Attachment #1: Type: text/plain, Size: 1234 bytes --]
On Fri, 2010-07-30 at 09:42 -0700, Jesse Barnes wrote:
> On Fri, 23 Jul 2010 14:56:28 +0100
> Ben Hutchings <bhutchings@solarflare.com> wrote:
>
> > commit 2ca1af9aa3285c6a5f103ed31ad09f7399fc65d7 "PCI: MSI: Remove
> > unsafe and unnecessary hardware access" changed read_msi_msg_desc() to
> > return the last MSI message written instead of reading it from the
> > device, since it may be called while the device is in a reduced
> > power state.
> >
> > However, the pSeries platform code really does need to read messages
> > from the device, since they are initially written by firmware.
> > Therefore:
> > - Restore the previous behaviour of read_msi_msg_desc()
> > - Add new functions get_cached_msi_msg{,_desc}() which return the
> > last MSI message written
> > - Use the new functions where appropriate
> >
> > Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
> > ---
> > Compile-tested only.
> >
>
> Applied to linux-next with Michael's ack, thanks. I hope it actually
> works, I didn't see a tested-by!
I assume Stephen has been using it, otherwise his linux-next boot tests
will all have been failing. Either way he'll test it when it gets into
linux-next proper.
cheers
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* [PATCH] of/device: Replace struct of_device with struct of_platform
From: Grant Likely @ 2010-08-01 7:57 UTC (permalink / raw)
To: sfr, monstr, microblaze-uclinux, devicetree-discuss, linux-kernel,
linuxppc-dev, benh, sparclinux, davem
of_device is just an alias for platform_device, so remove it entirely. Also
replace to_of_device() with to_platform_device().
This patch was initially generated from the following semantic patch, and then
edited by hand to pick up the bits that coccinelle didn't catch.
@@
@@
-struct of_device
+struct platform_device
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
---
This patch is *huge*, so rather than posting it and having lists barf at me, I've pushed it out to my git tree. You can view the branch[1] and the diff[2].
[1] http://git.secretlab.ca/?p=linux-2.6.git;a=shortlog;h=refs/heads/devicetree/of-device-rename
[2] http://git.secretlab.ca/?p=linux-2.6.git;a=commitdiff;h=48465300aab074396bdbad54b4fa01c793e5c987;hp=7fb8f881c54beb05dd4d2c947dada1c636581d87
It is a very mechanical change, only replaces of_device references with platform_device. I won't push it into linux-next right away because it's sure to cause a truckload of conflicts. Instead, I'll wait until the merge window settles down, spin it again with all the new driver changes, repost and ask Linus to pull.
If anyone has any problems with this plan, then please let me know.
Cheers,
g.
drivers/ata/pata_mpc52xx.c | 8 ++---
drivers/ata/pata_of_platform.c | 4 +-
drivers/ata/sata_fsl.c | 8 ++---
drivers/atm/fore200e.c | 26 +++++++--------
drivers/block/xsysace.c | 4 +-
drivers/char/hw_random/n2-drv.c | 4 +-
drivers/char/hw_random/n2rng.h | 2 +
drivers/char/hw_random/pasemi-rng.c | 4 +-
drivers/char/ipmi/ipmi_si_intf.c | 4 +-
drivers/char/rtc.c | 2 +
drivers/char/xilinx_hwicap/xilinx_hwicap.c | 4 +-
drivers/crypto/amcc/crypto4xx_core.c | 4 +-
drivers/crypto/amcc/crypto4xx_core.h | 2 +
drivers/crypto/n2_core.c | 20 ++++++-----
drivers/crypto/talitos.c | 6 ++-
drivers/dma/fsldma.c | 4 +-
drivers/dma/mpc512x_dma.c | 4 +-
drivers/dma/ppc4xx/adma.c | 8 ++---
drivers/edac/mpc85xx_edac.c | 12 +++----
drivers/edac/ppc4xx_edac.c | 12 +++----
drivers/hwmon/ams/ams.h | 2 +
drivers/hwmon/ultra45_env.c | 4 +-
drivers/i2c/busses/i2c-cpm.c | 8 ++---
drivers/i2c/busses/i2c-ibm_iic.c | 6 ++-
drivers/i2c/busses/i2c-mpc.c | 4 +-
drivers/infiniband/hw/ehca/ehca_classes.h | 2 +
drivers/infiniband/hw/ehca/ehca_main.c | 4 +-
drivers/input/misc/sparcspkr.c | 10 +++---
drivers/input/serio/i8042-sparcio.h | 8 ++---
drivers/input/serio/xilinx_ps2.c | 4 +-
drivers/leds/leds-gpio.c | 4 +-
drivers/macintosh/macio_sysfs.c | 6 ++-
drivers/macintosh/smu.c | 6 ++-
drivers/macintosh/therm_adt746x.c | 2 +
drivers/macintosh/therm_pm72.c | 6 ++-
drivers/macintosh/therm_windtunnel.c | 6 ++-
drivers/mmc/host/sdhci-of-core.c | 8 ++---
drivers/mtd/maps/physmap_of.c | 8 ++---
drivers/mtd/maps/sun_uflash.c | 6 ++-
drivers/mtd/nand/fsl_elbc_nand.c | 4 +-
drivers/mtd/nand/fsl_upm.c | 4 +-
drivers/mtd/nand/mpc5121_nfc.c | 4 +-
drivers/mtd/nand/ndfc.c | 6 ++-
drivers/mtd/nand/pasemi_nand.c | 4 +-
drivers/mtd/nand/socrates_nand.c | 4 +-
drivers/net/can/mscan/mpc5xxx_can.c | 18 +++++-----
drivers/net/can/sja1000/sja1000_of_platform.c | 4 +-
drivers/net/ehea/ehea.h | 4 +-
drivers/net/ehea/ehea_main.c | 12 +++----
drivers/net/fec_mpc52xx.c | 8 ++---
drivers/net/fec_mpc52xx_phy.c | 4 +-
drivers/net/fs_enet/fs_enet-main.c | 4 +-
drivers/net/fs_enet/mac-fcc.c | 2 +
drivers/net/fs_enet/mac-fec.c | 2 +
drivers/net/fs_enet/mac-scc.c | 2 +
drivers/net/fs_enet/mii-bitbang.c | 4 +-
drivers/net/fs_enet/mii-fec.c | 4 +-
drivers/net/fsl_pq_mdio.c | 4 +-
drivers/net/gianfar.c | 10 +++---
drivers/net/gianfar.h | 2 +
drivers/net/greth.c | 4 +-
drivers/net/ibm_newemac/core.c | 6 ++-
drivers/net/ibm_newemac/core.h | 12 +++----
drivers/net/ibm_newemac/mal.c | 4 +-
drivers/net/ibm_newemac/mal.h | 2 +
drivers/net/ibm_newemac/rgmii.c | 18 +++++-----
drivers/net/ibm_newemac/rgmii.h | 16 +++++----
drivers/net/ibm_newemac/tah.c | 14 ++++----
drivers/net/ibm_newemac/tah.h | 12 +++----
drivers/net/ibm_newemac/zmii.c | 18 +++++-----
drivers/net/ibm_newemac/zmii.h | 16 +++++----
drivers/net/ll_temac_main.c | 8 ++---
drivers/net/myri_sbus.c | 4 +-
drivers/net/myri_sbus.h | 2 +
drivers/net/niu.c | 8 ++---
drivers/net/phy/mdio-gpio.c | 4 +-
drivers/net/sunbmac.c | 18 +++++-----
drivers/net/sunbmac.h | 4 +-
drivers/net/sunhme.c | 22 ++++++-------
drivers/net/sunlance.c | 20 ++++++-----
drivers/net/sunqe.c | 16 +++++----
drivers/net/sunqe.h | 4 +-
drivers/net/ucc_geth.c | 8 ++---
drivers/net/xilinx_emaclite.c | 6 ++-
drivers/parport/parport_sunbpp.c | 4 +-
drivers/pcmcia/electra_cf.c | 6 ++-
drivers/pcmcia/m8xx_pcmcia.c | 4 +-
drivers/rtc/rtc-mpc5121.c | 4 +-
drivers/sbus/char/bbc_envctrl.c | 6 ++-
drivers/sbus/char/bbc_i2c.c | 18 +++++-----
drivers/sbus/char/bbc_i2c.h | 10 +++---
drivers/sbus/char/display7seg.c | 4 +-
drivers/sbus/char/envctrl.c | 4 +-
drivers/sbus/char/flash.c | 4 +-
drivers/sbus/char/uctrl.c | 4 +-
drivers/scsi/qlogicpti.c | 14 ++++----
drivers/scsi/qlogicpti.h | 2 +
drivers/scsi/sun_esp.c | 44 +++++++++++++------------
drivers/serial/apbuart.c | 2 +
drivers/serial/cpm_uart/cpm_uart_core.c | 4 +-
drivers/serial/mpc52xx_uart.c | 8 ++---
drivers/serial/nwpserial.c | 2 +
drivers/serial/of_serial.c | 6 ++-
drivers/serial/sunhv.c | 4 +-
drivers/serial/sunsab.c | 8 ++---
drivers/serial/sunsu.c | 8 ++---
drivers/serial/sunzilog.c | 6 ++-
drivers/serial/uartlite.c | 4 +-
drivers/serial/ucc_uart.c | 4 +-
drivers/spi/mpc512x_psc_spi.c | 4 +-
drivers/spi/mpc52xx_psc_spi.c | 4 +-
drivers/spi/mpc52xx_spi.c | 4 +-
drivers/spi/spi_mpc8xxx.c | 4 +-
drivers/spi/spi_ppc4xx.c | 4 +-
drivers/spi/xilinx_spi_of.c | 6 ++-
drivers/usb/gadget/fsl_qe_udc.c | 10 +++---
drivers/usb/host/ehci-ppc-of.c | 6 ++-
drivers/usb/host/ehci-xilinx-of.c | 6 ++-
drivers/usb/host/fhci-hcd.c | 4 +-
drivers/usb/host/isp1760-if.c | 4 +-
drivers/usb/host/ohci-ppc-of.c | 6 ++-
drivers/video/bw2.c | 4 +-
drivers/video/cg14.c | 6 ++-
drivers/video/cg3.c | 4 +-
drivers/video/cg6.c | 6 ++-
drivers/video/ffb.c | 4 +-
drivers/video/fsl-diu-fb.c | 8 ++---
drivers/video/leo.c | 6 ++-
drivers/video/mb862xx/mb862xxfb.c | 4 +-
drivers/video/p9100.c | 4 +-
drivers/video/platinumfb.c | 4 +-
drivers/video/sunxvr1000.c | 4 +-
drivers/video/tcx.c | 6 ++-
drivers/video/xilinxfb.c | 4 +-
drivers/watchdog/cpwd.c | 4 +-
drivers/watchdog/gef_wdt.c | 2 +
drivers/watchdog/mpc8xxx_wdt.c | 4 +-
drivers/watchdog/riowd.c | 4 +-
include/linux/of_device.h | 3 --
sound/aoa/soundbus/core.c | 2 +
sound/aoa/soundbus/soundbus.h | 2 +
sound/aoa/soundbus/sysfs.c | 2 +
sound/soc/fsl/mpc5200_dma.c | 4 +-
sound/soc/fsl/mpc5200_dma.h | 4 +-
sound/soc/fsl/mpc5200_psc_ac97.c | 4 +-
sound/soc/fsl/mpc5200_psc_i2s.c | 4 +-
sound/soc/fsl/mpc8610_hpcd.c | 4 +-
sound/sparc/amd7930.c | 8 ++---
sound/sparc/cs4231.c | 18 +++++-----
sound/sparc/dbri.c | 8 ++---
150 files changed, 493 insertions(+), 496 deletions(-)
^ permalink raw reply
* Re: [PATCH] of/device: Replace struct of_device with struct of_platform
From: David Miller @ 2010-08-01 8:05 UTC (permalink / raw)
To: grant.likely
Cc: sfr, monstr, microblaze-uclinux, devicetree-discuss, linux-kernel,
linuxppc-dev, sparclinux
In-Reply-To: <20100801074831.1099.3318.stgit@angua>
Subject should say "struct platform_device" not "struct of_platform",
I think :-)
^ permalink raw reply
* Re: [PATCH] of/device: Replace struct of_device with struct of_platform
From: Grant Likely @ 2010-08-01 8:08 UTC (permalink / raw)
To: David Miller
Cc: sfr, monstr, microblaze-uclinux, devicetree-discuss, linux-kernel,
linuxppc-dev, sparclinux
In-Reply-To: <20100801.010501.27813939.davem@davemloft.net>
On Sun, Aug 1, 2010 at 2:05 AM, David Miller <davem@davemloft.net> wrote:
>
> Subject should say "struct platform_device" not "struct of_platform",
> I think :-)
Gah! yup, will fix. Thanks.
g.
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
^ permalink raw reply
* Re: [PATCH 2/7] usb: fsl_udc_core: check return value of create_proc_read_entry()
From: Dan Carpenter @ 2010-08-01 10:49 UTC (permalink / raw)
To: Vasiliy Kulikov
Cc: David Brownell, Greg Kroah-Hartman, kernel-janitors, linux-kernel,
linuxppc-dev, linux-usb, Anton Vorontsov, Dinh Nguyen
In-Reply-To: <20100801061934.GB2650@albatros>
On Sun, Aug 01, 2010 at 10:19:34AM +0400, Vasiliy Kulikov wrote:
> On Sat, Jul 31, 2010 at 21:17 +0200, Dan Carpenter wrote:
> > On Sat, Jul 31, 2010 at 09:38:20PM +0400, Kulikov Vasiliy wrote:
> > > create_proc_read_entry() may fail, if so return -ENOMEM.
> > >
> >
> > It can fail, but also we return NULL if procfs is disabled. I haven't
> > looked at it very carefully, would this patch break the module if procfs
> > was disabled?
> Probably you are right, but many drivers in tree compare return value
> with NULL. Some of them interpret this as error, some of them simply
> call pr_warn("Hmm, I cannot create file in proc, strange..."). Maybe
> there is more simplier way to check it without #ifdefs?
>
If the allocation fails, there is already a warning so no need to add
another.
These things are one time allocation, normally near boot up when memory
is plentifull. The places that do check should be audited to make sure
there isn't an unneeded dependency on PROC_FS. I would just leave the
rest.
regards,
dan carpenter
^ permalink raw reply
* [PATCH] edac: mpc85xx: Add support for new MPCxxx/Pxxxx EDAC controllers (fix)
From: Anton Vorontsov @ 2010-08-01 10:54 UTC (permalink / raw)
To: Andrew Morton, Scott Wood
Cc: linuxppc-dev, Peter Tyser, Doug Thompson, linux-kernel,
Dave Jiang
In-Reply-To: <20100721182108.5a22c822@schlenkerla.am.freescale.net>
On Wed, Jul 21, 2010 at 06:21:08PM -0500, Scott Wood wrote:
[...]
> > > > + { .compatible = "fsl,p4080-l2-cache-controller", },
> > >
> > > L2 on the p4080 is quite different from those other chips. It's part
> > > of the core, controlled by SPRs.
> >
> > erm, was that an ack or a nack?
>
> NACK, p4080 doesn't belong in this table, at least not its L2.
>
> L3 on p4080 is similar to L2 on these other chips, though, and it
> wouldn't take much to get this driver working on it -- but the match
> table entry should wait until the differences are accommodated.
Signed-off-by: Anton Vorontsov <avorontsov@mvista.com>
---
Scott, thanks for catching this!
Andrew, please merge this patch into
edac-mpc85xx-add-support-for-new-mpcxxx-pxxxx-edac-controllers.patch
Thanks!
drivers/edac/mpc85xx_edac.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c
index cfa86f7..b178cfa 100644
--- a/drivers/edac/mpc85xx_edac.c
+++ b/drivers/edac/mpc85xx_edac.c
@@ -652,7 +652,6 @@ static struct of_device_id mpc85xx_l2_err_of_match[] = {
{ .compatible = "fsl,p1020-l2-cache-controller", },
{ .compatible = "fsl,p1021-l2-cache-controller", },
{ .compatible = "fsl,p2020-l2-cache-controller", },
- { .compatible = "fsl,p4080-l2-cache-controller", },
{},
};
MODULE_DEVICE_TABLE(of, mpc85xx_l2_err_of_match);
--
1.7.0.5
^ permalink raw reply related
* Re: [PATCH 00/27] KVM PPC PV framework v3
From: Avi Kivity @ 2010-08-01 14:02 UTC (permalink / raw)
To: Alexander Graf; +Cc: linuxppc-dev, KVM list, kvm-ppc
In-Reply-To: <1280407688-9815-1-git-send-email-agraf@suse.de>
On 07/29/2010 03:47 PM, Alexander Graf wrote:
> On PPC we run PR=0 (kernel mode) code in PR=1 (user mode) and don't use the
> hypervisor extensions.
>
> While that is all great to show that virtualization is possible, there are
> quite some cases where the emulation overhead of privileged instructions is
> killing performance.
>
> This patchset tackles exactly that issue. It introduces a paravirtual framework
> using which KVM and Linux share a page to exchange register state with. That
> way we don't have to switch to the hypervisor just to change a value of a
> privileged register.
>
> To prove my point, I ran the same test I did for the MMU optimizations against
> the PV framework. Here are the results:
>
> [without]
>
> debian-powerpc:~# time for i in {1..1000}; do /bin/echo hello> /dev/null; done
>
> real 0m14.659s
> user 0m8.967s
> sys 0m5.688s
>
> [with]
>
> debian-powerpc:~# time for i in {1..1000}; do /bin/echo hello> /dev/null; done
>
> real 0m7.557s
> user 0m4.121s
> sys 0m3.426s
>
>
> So this is a significant performance improvement! I'm quite happy how fast this
> whole thing becomes :)
>
> I tried to take all comments I've heard from people so far about such a PV
> framework into account. In case you told me something before that is a no-go
> and I still did it, please just tell me again.
>
> To make use of this whole thing you also need patches to qemu and openbios. I
> have them in my queue, but want to see this set upstream first before I start
> sending patches to the other projects.
>
> Now go and have fun with fast VMs on PPC! Get yourself a G5 on ebay and start
> experiencing the power yourself. - heh
>
> v1 -> v2:
>
> - change hypervisor calls to use r0 and r3
> - make crit detection only trigger in supervisor mode
> - RMO -> PAM
> - introduce kvm_patch_ins
> - only flush icache when patching
> - introduce kvm_patch_ins_b
> - update documentation
>
> v2 -> v3:
>
> - use pPAPR conventions for hypercall interface
> - only use r0 as magic sc number
> - remove PVR detection
> - remove BookE shared page mapping support
> - combine book3s-64 and -32 magic page ra override
> - add self-test check if the mapping works to guest code
> - add safety check for relocatable kernels
>
Looks reasonable. Since it's fair to say I understand nothing about
powerpc, I'd like someone who does to review it and ack, please, with an
emphasis on the interfaces.
--
error compiling committee.c: too many arguments to function
^ permalink raw reply
* Re: [PATCH 4/7] KVM: PPC: Add book3s_32 tlbie flush acceleration
From: Avi Kivity @ 2010-08-01 14:08 UTC (permalink / raw)
To: Alexander Graf; +Cc: linuxppc-dev, KVM list, kvm-ppc
In-Reply-To: <1280408662-10328-5-git-send-email-agraf@suse.de>
On 07/29/2010 04:04 PM, Alexander Graf wrote:
> On Book3s_32 the tlbie instruction flushed effective addresses by the mask
> 0x0ffff000. This is pretty hard to reflect with a hash that hashes ~0xfff, so
> to speed up that target we should also keep a special hash around for it.
>
>
> static inline u64 kvmppc_mmu_hash_vpte(u64 vpage)
> {
> return hash_64(vpage& 0xfffffffffULL, HPTEG_HASH_BITS_VPTE);
> @@ -66,6 +72,11 @@ void kvmppc_mmu_hpte_cache_map(struct kvm_vcpu *vcpu, struct hpte_cache *pte)
> index = kvmppc_mmu_hash_pte(pte->pte.eaddr);
> hlist_add_head_rcu(&pte->list_pte,&vcpu->arch.hpte_hash_pte[index]);
>
> + /* Add to ePTE_long list */
> + index = kvmppc_mmu_hash_pte_long(pte->pte.eaddr);
> + hlist_add_head_rcu(&pte->list_pte_long,
> + &vcpu->arch.hpte_hash_pte_long[index]);
> +
Isn't it better to make operations on this list conditional on
Book3s_32? Hashes are expensive since they usually cost cache misses.
Can of course be done later as an optimization.
--
error compiling committee.c: too many arguments to function
^ permalink raw reply
* Re: [PATCH 0/7] Rest of my KVM-PPC patch queue
From: Avi Kivity @ 2010-08-01 14:09 UTC (permalink / raw)
To: Alexander Graf; +Cc: linuxppc-dev, KVM list, kvm-ppc
In-Reply-To: <1280408662-10328-1-git-send-email-agraf@suse.de>
On 07/29/2010 04:04 PM, Alexander Graf wrote:
> During the past few weeks a couple of fixes have gathered in my queue. This
> is a dump of everything that is not related to the PV framework.
>
> Please apply on top of the PV stuff.
>
Looks reasonable as well. I'll apply as soon as I get a review on the
previous patchset.
--
error compiling committee.c: too many arguments to function
^ permalink raw reply
* Re: [PATCH 4/7] KVM: PPC: Add book3s_32 tlbie flush acceleration
From: Alexander Graf @ 2010-08-01 20:20 UTC (permalink / raw)
To: Avi Kivity; +Cc: linuxppc-dev, KVM list, kvm-ppc
In-Reply-To: <4C557FF1.4000400@redhat.com>
On 01.08.2010, at 16:08, Avi Kivity wrote:
> On 07/29/2010 04:04 PM, Alexander Graf wrote:
>> On Book3s_32 the tlbie instruction flushed effective addresses by the =
mask
>> 0x0ffff000. This is pretty hard to reflect with a hash that hashes =
~0xfff, so
>> to speed up that target we should also keep a special hash around for =
it.
>>=20
>>=20
>> static inline u64 kvmppc_mmu_hash_vpte(u64 vpage)
>> {
>> return hash_64(vpage& 0xfffffffffULL, HPTEG_HASH_BITS_VPTE);
>> @@ -66,6 +72,11 @@ void kvmppc_mmu_hpte_cache_map(struct kvm_vcpu =
*vcpu, struct hpte_cache *pte)
>> index =3D kvmppc_mmu_hash_pte(pte->pte.eaddr);
>> =
hlist_add_head_rcu(&pte->list_pte,&vcpu->arch.hpte_hash_pte[index]);
>>=20
>> + /* Add to ePTE_long list */
>> + index =3D kvmppc_mmu_hash_pte_long(pte->pte.eaddr);
>> + hlist_add_head_rcu(&pte->list_pte_long,
>> + &vcpu->arch.hpte_hash_pte_long[index]);
>> +
>=20
> Isn't it better to make operations on this list conditional on =
Book3s_32? Hashes are expensive since they usually cost cache misses.
Yes, the same for vpte_long and vpte - book3s_32 guests don't need them =
except for the all flush. The tough part is that this is not host but =
guest dependent, so I need to have different structs for book3s_32 and =
book3s_64 guests. This isn't a big issue, but complicates the code.
> Can of course be done later as an optimization.
Yes, that was the plan. Great to see you got the same feeling there =
though :). To be honest, I even started a book3s_32 host optimization =
patch and threw it away because it made the code less readable. So yes, =
this is on my radar.
Alex
^ permalink raw reply
* Re: [PATCH 00/27] KVM PPC PV framework v3
From: Alexander Graf @ 2010-08-01 20:21 UTC (permalink / raw)
To: Avi Kivity; +Cc: KVM list, linuxppc-dev, kvm-ppc
In-Reply-To: <4C557E7A.3010606@redhat.com>
On 01.08.2010, at 16:02, Avi Kivity wrote:
> On 07/29/2010 03:47 PM, Alexander Graf wrote:
>> On PPC we run PR=3D0 (kernel mode) code in PR=3D1 (user mode) and =
don't use the
>> hypervisor extensions.
>>=20
>> While that is all great to show that virtualization is possible, =
there are
>> quite some cases where the emulation overhead of privileged =
instructions is
>> killing performance.
>>=20
>> This patchset tackles exactly that issue. It introduces a paravirtual =
framework
>> using which KVM and Linux share a page to exchange register state =
with. That
>> way we don't have to switch to the hypervisor just to change a value =
of a
>> privileged register.
>>=20
>> To prove my point, I ran the same test I did for the MMU =
optimizations against
>> the PV framework. Here are the results:
>>=20
>> [without]
>>=20
>> debian-powerpc:~# time for i in {1..1000}; do /bin/echo hello> =
/dev/null; done
>>=20
>> real 0m14.659s
>> user 0m8.967s
>> sys 0m5.688s
>>=20
>> [with]
>>=20
>> debian-powerpc:~# time for i in {1..1000}; do /bin/echo hello> =
/dev/null; done
>>=20
>> real 0m7.557s
>> user 0m4.121s
>> sys 0m3.426s
>>=20
>>=20
>> So this is a significant performance improvement! I'm quite happy how =
fast this
>> whole thing becomes :)
>>=20
>> I tried to take all comments I've heard from people so far about such =
a PV
>> framework into account. In case you told me something before that is =
a no-go
>> and I still did it, please just tell me again.
>>=20
>> To make use of this whole thing you also need patches to qemu and =
openbios. I
>> have them in my queue, but want to see this set upstream first before =
I start
>> sending patches to the other projects.
>>=20
>> Now go and have fun with fast VMs on PPC! Get yourself a G5 on ebay =
and start
>> experiencing the power yourself. - heh
>>=20
>> v1 -> v2:
>>=20
>> - change hypervisor calls to use r0 and r3
>> - make crit detection only trigger in supervisor mode
>> - RMO -> PAM
>> - introduce kvm_patch_ins
>> - only flush icache when patching
>> - introduce kvm_patch_ins_b
>> - update documentation
>>=20
>> v2 -> v3:
>>=20
>> - use pPAPR conventions for hypercall interface
>> - only use r0 as magic sc number
>> - remove PVR detection
>> - remove BookE shared page mapping support
>> - combine book3s-64 and -32 magic page ra override
>> - add self-test check if the mapping works to guest code
>> - add safety check for relocatable kernels
>>=20
>=20
> Looks reasonable. Since it's fair to say I understand nothing about =
powerpc, I'd like someone who does to review it and ack, please, with an =
emphasis on the interfaces.
Sounds good. Preferably someone with access to the ePAPR spec :).
Alex
^ permalink raw reply
* [git pull] powerpc 5xxx and xilinx virtex changes
From: Grant Likely @ 2010-08-01 23:09 UTC (permalink / raw)
To: Benjamin Herrenschmidt, linuxppc-dev
Cc: Albrecht Dreß, Anatolij Gustschin, Adrian Alonso
Hi Ben,
Here are the mpc5xxx and Xilinx virtex changes I've collected for the
2.6.36 merge window. Please pull.
g.
The following changes since commit b37fa16e78d6f9790462b3181602a26b5af36260=
:
Linus Torvalds (1):
Linux 2.6.35-rc6
are available in the git repository at:
git://git.secretlab.ca/git/linux-2.6 next
Adrian Alonso (1):
of/xilinxfb: update tft compatible versions
Albrecht Dre=DF (2):
powerpc/5200: improve uart baud rate calculation (reach high
baud rates, better accuracy)
powerpc/5200/i2c: improve i2c bus error recovery
Anatolij Gustschin (8):
powerpc/512x: Group mpc512x board's selection menu
powerpc/5121: add initial support for PDM360NG board
powerpc/512x: add clock structure for Video-IN (VIU) unit
powerpc/5121: fsl-diu-fb: fix issue with re-enabling DIU area descrip=
tor
powerpc/5121: move fsl-diu-fb.h to include/linux
powerpc/5121: shared DIU framebuffer support
powerpc/5121: doc/dts-bindings: update doc of FSL DIU bindings
powerpc/fsl-diu-fb: Support setting display mode using EDID
Documentation/powerpc/dts-bindings/fsl/diu.txt | 20 +-
Documentation/powerpc/dts-bindings/fsl/i2c.txt | 2 +
arch/powerpc/boot/dts/pdm360ng.dts | 410 ++++++++++++++++++++=
++++
arch/powerpc/include/asm/mpc5121.h | 32 ++
arch/powerpc/platforms/512x/Kconfig | 20 +-
arch/powerpc/platforms/512x/Makefile | 1 +
arch/powerpc/platforms/512x/clock.c | 18 +
arch/powerpc/platforms/512x/mpc5121_ads.c | 2 +
arch/powerpc/platforms/512x/mpc5121_generic.c | 2 +
arch/powerpc/platforms/512x/mpc512x.h | 2 +
arch/powerpc/platforms/512x/mpc512x_shared.c | 284 ++++++++++++++++
arch/powerpc/platforms/512x/pdm360ng.c | 129 ++++++++
arch/powerpc/sysdev/fsl_soc.h | 1 +
drivers/i2c/busses/i2c-mpc.c | 69 +++--
drivers/serial/mpc52xx_uart.c | 145 +++++++--
drivers/video/Kconfig | 1 +
drivers/video/fsl-diu-fb.c | 137 +++++++--
drivers/video/xilinxfb.c | 2 +
{drivers/video =3D> include/linux}/fsl-diu-fb.h | 0
19 files changed, 1191 insertions(+), 86 deletions(-)
create mode 100644 arch/powerpc/boot/dts/pdm360ng.dts
create mode 100644 arch/powerpc/platforms/512x/pdm360ng.c
rename {drivers/video =3D> include/linux}/fsl-diu-fb.h (100%)
--=20
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
^ permalink raw reply
* [PATCH 02/11] powerpc/nvram: More flexible nvram_create_partition()
From: Benjamin Herrenschmidt @ 2010-08-02 0:55 UTC (permalink / raw)
To: linuxppc-dev
In-Reply-To: <1280710522-6362-2-git-send-email-benh@kernel.crashing.org>
Replace nvram_create_os_partition() with a variant that takes
the partition name, signature and size as arguments.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
arch/powerpc/kernel/nvram_64.c | 46 +++++++++++++++++++------------
arch/powerpc/platforms/pseries/nvram.c | 6 ++--
2 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c
index a8154f1..974b3ec 100644
--- a/arch/powerpc/kernel/nvram_64.c
+++ b/arch/powerpc/kernel/nvram_64.c
@@ -307,13 +307,15 @@ static int __init nvram_remove_os_partition(void)
return 0;
}
-/* nvram_create_os_partition
- *
- * Create a OS linux partition to buffer error logs.
- * Will create a partition starting at the first free
- * space found if space has enough room.
+/**
+ * nvram_create_partition - Create a partition in nvram
+ * @name: name of the partition to create
+ * @sig: signature of the partition to create
+ * @req_size: size to allocate preferrably
+ * @min_size: minimum acceptable size (0 means req_size)
*/
-static int __init nvram_create_os_partition(void)
+static int __init nvram_create_partition(const char *name, int sig,
+ int req_size, int min_size)
{
struct nvram_partition *part;
struct nvram_partition *new_part;
@@ -322,20 +324,27 @@ static int __init nvram_create_os_partition(void)
loff_t tmp_index;
long size = 0;
int rc;
-
+
+ /* If no minimum size specified, make it the same as the
+ * requested size
+ */
+ if (min_size == 0)
+ min_size = req_size;
+
/* Find a free partition that will give us the maximum needed size
If can't find one that will give us the minimum size needed */
list_for_each_entry(part, &nvram_part->partition, partition) {
if (part->header.signature != NVRAM_SIG_FREE)
continue;
- if (part->header.length >= NVRAM_MAX_REQ) {
- size = NVRAM_MAX_REQ;
+ if (part->header.length >= req_size) {
+ size = req_size;
free_part = part;
break;
}
- if (!size && part->header.length >= NVRAM_MIN_REQ) {
- size = NVRAM_MIN_REQ;
+ if (part->header.length > size &&
+ part->header.length >= min_size) {
+ size = part->header.length;
free_part = part;
}
}
@@ -350,9 +359,9 @@ static int __init nvram_create_os_partition(void)
}
new_part->index = free_part->index;
- new_part->header.signature = NVRAM_SIG_OS;
+ new_part->header.signature = sig;
new_part->header.length = size;
- strcpy(new_part->header.name, "ppc64,linux");
+ strncpy(new_part->header.name, name, 12);
new_part->header.checksum = nvram_checksum(&new_part->header);
rc = nvram_write_header(new_part);
@@ -451,10 +460,10 @@ static int __init nvram_setup_partition(void)
}
/* try creating a partition with the free space we have */
- rc = nvram_create_partition("ppc64,linux", );
- if (!rc) {
+ rc = nvram_create_partition("ppc64,linux", NVRAM_SIG_OS,
+ NVRAM_MIN_REQ, NVRAM_MAX_REQ);
+ if (!rc)
return 0;
- }
/* need to free up some space */
rc = nvram_remove_os_partition();
@@ -463,9 +472,10 @@ static int __init nvram_setup_partition(void)
}
/* create a partition in this new space */
- rc = nvram_create_os_partition();
+ rc = nvram_create_partition("ppc64,linux", NVRAM_SIG_OS,
+ NVRAM_MIN_REQ, NVRAM_MAX_REQ);
if (rc) {
- printk(KERN_ERR "nvram_create_os_partition: Could not find a "
+ printk(KERN_ERR "nvram_create_partition: Could not find a "
"NVRAM partition large enough\n");
return rc;
}
diff --git a/arch/powerpc/platforms/pseries/nvram.c b/arch/powerpc/platforms/pseries/nvram.c
index f4e4c06..2a1ef5c 100644
--- a/arch/powerpc/platforms/pseries/nvram.c
+++ b/arch/powerpc/platforms/pseries/nvram.c
@@ -22,14 +22,14 @@
#include <asm/prom.h>
#include <asm/machdep.h>
+/* Max bytes to read/write in one go */
+#define NVRW_CNT 0x20
+
static unsigned int nvram_size;
static int nvram_fetch, nvram_store;
static char nvram_buf[NVRW_CNT]; /* assume this is in the first 4GB */
static DEFINE_SPINLOCK(nvram_lock);
-/* Max bytes to read/write in one go */
-#define NVRW_CNT 0x20
-
static ssize_t pSeries_nvram_read(char *buf, size_t count, loff_t *index)
{
unsigned int i;
--
1.6.3.3
^ permalink raw reply related
* [PATCH 01/11] powerpc/nvram: Move things out of asm/nvram.h
From: Benjamin Herrenschmidt @ 2010-08-02 0:55 UTC (permalink / raw)
To: linuxppc-dev
In-Reply-To: <1280710522-6362-1-git-send-email-benh@kernel.crashing.org>
This moves a bunch of definitions out of asm/nvram.h to the files
that use them or just outright remove completely unused stuff.
We leave the partition signatures definitions, they will be useful
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
arch/powerpc/include/asm/nvram.h | 42 +------------------------------
arch/powerpc/kernel/nvram_64.c | 21 +++++++++++++++-
arch/powerpc/platforms/chrp/time.c | 4 +++
arch/powerpc/platforms/pseries/nvram.c | 2 +
4 files changed, 28 insertions(+), 41 deletions(-)
diff --git a/arch/powerpc/include/asm/nvram.h b/arch/powerpc/include/asm/nvram.h
index 850b72f..459dc09 100644
--- a/arch/powerpc/include/asm/nvram.h
+++ b/arch/powerpc/include/asm/nvram.h
@@ -10,31 +10,7 @@
#ifndef _ASM_POWERPC_NVRAM_H
#define _ASM_POWERPC_NVRAM_H
-#include <linux/errno.h>
-
-#define NVRW_CNT 0x20
-#define NVRAM_HEADER_LEN 16 /* sizeof(struct nvram_header) */
-#define NVRAM_BLOCK_LEN 16
-#define NVRAM_MAX_REQ (2080/NVRAM_BLOCK_LEN)
-#define NVRAM_MIN_REQ (1056/NVRAM_BLOCK_LEN)
-
-#define NVRAM_AS0 0x74
-#define NVRAM_AS1 0x75
-#define NVRAM_DATA 0x77
-
-
-/* RTC Offsets */
-
-#define MOTO_RTC_SECONDS 0x1FF9
-#define MOTO_RTC_MINUTES 0x1FFA
-#define MOTO_RTC_HOURS 0x1FFB
-#define MOTO_RTC_DAY_OF_WEEK 0x1FFC
-#define MOTO_RTC_DAY_OF_MONTH 0x1FFD
-#define MOTO_RTC_MONTH 0x1FFE
-#define MOTO_RTC_YEAR 0x1FFF
-#define MOTO_RTC_CONTROLA 0x1FF8
-#define MOTO_RTC_CONTROLB 0x1FF9
-
+/* Signatures for nvram partitions */
#define NVRAM_SIG_SP 0x02 /* support processor */
#define NVRAM_SIG_OF 0x50 /* open firmware config */
#define NVRAM_SIG_FW 0x51 /* general firmware */
@@ -49,25 +25,11 @@
#define NVRAM_SIG_OS 0xa0 /* OS defined */
#define NVRAM_SIG_PANIC 0xa1 /* Apple OSX "panic" */
-/* If change this size, then change the size of NVNAME_LEN */
-struct nvram_header {
- unsigned char signature;
- unsigned char checksum;
- unsigned short length;
- char name[12];
-};
-
#ifdef __KERNEL__
+#include <linux/errno.h>
#include <linux/list.h>
-struct nvram_partition {
- struct list_head partition;
- struct nvram_header header;
- unsigned int index;
-};
-
-
extern int nvram_write_error_log(char * buff, int length,
unsigned int err_type, unsigned int err_seq);
extern int nvram_read_error_log(char * buff, int length,
diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c
index 9cf197f..a8154f1 100644
--- a/arch/powerpc/kernel/nvram_64.c
+++ b/arch/powerpc/kernel/nvram_64.c
@@ -34,6 +34,25 @@
#undef DEBUG_NVRAM
+#define NVRAM_HEADER_LEN 16 /* sizeof(struct nvram_header) */
+#define NVRAM_BLOCK_LEN 16
+#define NVRAM_MAX_REQ (2080/NVRAM_BLOCK_LEN)
+#define NVRAM_MIN_REQ (1056/NVRAM_BLOCK_LEN)
+
+/* If change this size, then change the size of NVNAME_LEN */
+struct nvram_header {
+ unsigned char signature;
+ unsigned char checksum;
+ unsigned short length;
+ char name[12];
+};
+
+struct nvram_partition {
+ struct list_head partition;
+ struct nvram_header header;
+ unsigned int index;
+};
+
static struct nvram_partition * nvram_part;
static long nvram_error_log_index = -1;
static long nvram_error_log_size = 0;
@@ -432,7 +451,7 @@ static int __init nvram_setup_partition(void)
}
/* try creating a partition with the free space we have */
- rc = nvram_create_os_partition();
+ rc = nvram_create_partition("ppc64,linux", );
if (!rc) {
return 0;
}
diff --git a/arch/powerpc/platforms/chrp/time.c b/arch/powerpc/platforms/chrp/time.c
index 054dfe5..f803f4b 100644
--- a/arch/powerpc/platforms/chrp/time.c
+++ b/arch/powerpc/platforms/chrp/time.c
@@ -29,6 +29,10 @@
extern spinlock_t rtc_lock;
+#define NVRAM_AS0 0x74
+#define NVRAM_AS1 0x75
+#define NVRAM_DATA 0x77
+
static int nvram_as1 = NVRAM_AS1;
static int nvram_as0 = NVRAM_AS0;
static int nvram_data = NVRAM_DATA;
diff --git a/arch/powerpc/platforms/pseries/nvram.c b/arch/powerpc/platforms/pseries/nvram.c
index bc3c7f2..f4e4c06 100644
--- a/arch/powerpc/platforms/pseries/nvram.c
+++ b/arch/powerpc/platforms/pseries/nvram.c
@@ -27,6 +27,8 @@ static int nvram_fetch, nvram_store;
static char nvram_buf[NVRW_CNT]; /* assume this is in the first 4GB */
static DEFINE_SPINLOCK(nvram_lock);
+/* Max bytes to read/write in one go */
+#define NVRW_CNT 0x20
static ssize_t pSeries_nvram_read(char *buf, size_t count, loff_t *index)
{
--
1.6.3.3
^ permalink raw reply related
* [RFC] Clean up ppc64 nvram code
From: Benjamin Herrenschmidt @ 2010-08-02 0:55 UTC (permalink / raw)
To: linuxppc-dev
This series is a first go at cleaning up some cruft in nvram_64.c for
handling nvram partitions. The current ppc64,linux partition is really
pseries specific, so we change the code for finding/creating it gets
turned into a more generic API for manipulating nvram partitions, and
the specifics to that partition are moved to pseries. We also rename
it to better represent what it's for
^ permalink raw reply
* [PATCH 04/11] powerpc/nvram: Ensure that the partition header/block size is right
From: Benjamin Herrenschmidt @ 2010-08-02 0:55 UTC (permalink / raw)
To: linuxppc-dev
In-Reply-To: <1280710522-6362-4-git-send-email-benh@kernel.crashing.org>
Use BUILD_BUG_ON to ensure the structure representing a partition
header have the right size.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
arch/powerpc/kernel/nvram_64.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c
index b0f2114..dd18a5a 100644
--- a/arch/powerpc/kernel/nvram_64.c
+++ b/arch/powerpc/kernel/nvram_64.c
@@ -565,6 +565,8 @@ static int __init nvram_init(void)
int error;
int rc;
+ BUILD_BUG_ON(NVRAM_BLOCK_LEN != 16);
+
if (ppc_md.nvram_size == NULL || ppc_md.nvram_size() <= 0)
return -ENODEV;
--
1.6.3.3
^ permalink raw reply related
* [PATCH 05/11] powerpc/nvram: Completely clear a new partition
From: Benjamin Herrenschmidt @ 2010-08-02 0:55 UTC (permalink / raw)
To: linuxppc-dev
In-Reply-To: <1280710522-6362-5-git-send-email-benh@kernel.crashing.org>
When creating a partition, we clear it entirely rather than
just the first two words since the previous code was rather
specific to the pseries log partition format.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
arch/powerpc/kernel/nvram_64.c | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c
index dd18a5a..7ddeaa6 100644
--- a/arch/powerpc/kernel/nvram_64.c
+++ b/arch/powerpc/kernel/nvram_64.c
@@ -320,7 +320,7 @@ static int __init nvram_create_partition(const char *name, int sig,
struct nvram_partition *part;
struct nvram_partition *new_part;
struct nvram_partition *free_part = NULL;
- int seq_init[2] = { 0, 0 };
+ static char nv_init_vals[16];
loff_t tmp_index;
long size = 0;
int rc;
@@ -379,14 +379,15 @@ static int __init nvram_create_partition(const char *name, int sig,
return rc;
}
- /* make sure and initialize to zero the sequence number and the error
- type logged */
- tmp_index = new_part->index + NVRAM_HEADER_LEN;
- rc = ppc_md.nvram_write((char *)&seq_init, sizeof(seq_init), &tmp_index);
- if (rc <= 0) {
- printk(KERN_ERR "nvram_create_os_partition: nvram_write "
- "failed (%d)\n", rc);
- return rc;
+ /* Clear the partition */
+ for (tmp_index = new_part->index + NVRAM_HEADER_LEN;
+ tmp_index < ((size - 1) * NVRAM_BLOCK_LEN);
+ tmp_index += NVRAM_BLOCK_LEN) {
+ rc = ppc_md.nvram_write(nv_init_vals, NVRAM_BLOCK_LEN, &tmp_index);
+ if (rc <= 0) {
+ pr_err("nvram_create_partition: nvram_write failed (%d)\n", rc);
+ return rc;
+ }
}
nvram_error_log_index = new_part->index + NVRAM_HEADER_LEN;
--
1.6.3.3
^ permalink raw reply related
* [PATCH 03/11] powerpc/nvram: nvram_create_partitions() now uses bytes
From: Benjamin Herrenschmidt @ 2010-08-02 0:55 UTC (permalink / raw)
To: linuxppc-dev
In-Reply-To: <1280710522-6362-3-git-send-email-benh@kernel.crashing.org>
This converts nvram_create_partition() to use a size in bytes
rather than blocks. It does the appropriate alignment internally
The size passed is also the data size (ie. doesn't include the
header anymore).
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
arch/powerpc/kernel/nvram_64.c | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c
index 974b3ec..b0f2114 100644
--- a/arch/powerpc/kernel/nvram_64.c
+++ b/arch/powerpc/kernel/nvram_64.c
@@ -34,10 +34,10 @@
#undef DEBUG_NVRAM
-#define NVRAM_HEADER_LEN 16 /* sizeof(struct nvram_header) */
-#define NVRAM_BLOCK_LEN 16
-#define NVRAM_MAX_REQ (2080/NVRAM_BLOCK_LEN)
-#define NVRAM_MIN_REQ (1056/NVRAM_BLOCK_LEN)
+#define NVRAM_HEADER_LEN sizeof(struct nvram_header)
+#define NVRAM_BLOCK_LEN NVRAM_HEADER_LEN
+#define NVRAM_MAX_REQ 2079
+#define NVRAM_MIN_REQ 1055
/* If change this size, then change the size of NVNAME_LEN */
struct nvram_header {
@@ -311,7 +311,7 @@ static int __init nvram_remove_os_partition(void)
* nvram_create_partition - Create a partition in nvram
* @name: name of the partition to create
* @sig: signature of the partition to create
- * @req_size: size to allocate preferrably
+ * @req_size: size of data to allocate in bytes
* @min_size: minimum acceptable size (0 means req_size)
*/
static int __init nvram_create_partition(const char *name, int sig,
@@ -325,12 +325,20 @@ static int __init nvram_create_partition(const char *name, int sig,
long size = 0;
int rc;
+ /* Convert sizes from bytes to blocks */
+ req_size = _ALIGN_UP(req_size, NVRAM_BLOCK_LEN) / NVRAM_BLOCK_LEN;
+ min_size = _ALIGN_UP(min_size, NVRAM_BLOCK_LEN) / NVRAM_BLOCK_LEN;
+
/* If no minimum size specified, make it the same as the
* requested size
*/
if (min_size == 0)
min_size = req_size;
+ /* Now add one block to each for the header */
+ req_size += 1;
+ min_size += 1;
+
/* Find a free partition that will give us the maximum needed size
If can't find one that will give us the minimum size needed */
list_for_each_entry(part, &nvram_part->partition, partition) {
@@ -450,7 +458,7 @@ static int __init nvram_setup_partition(void)
if (strcmp(part->header.name, "ppc64,linux"))
continue;
- if (part->header.length >= NVRAM_MIN_REQ) {
+ if ((part->header.length - 1) * NVRAM_BLOCK_LEN >= NVRAM_MIN_REQ) {
/* found our partition */
nvram_error_log_index = part->index + NVRAM_HEADER_LEN;
nvram_error_log_size = ((part->header.length - 1) *
--
1.6.3.3
^ permalink raw reply related
* [PATCH 07/11] powerpc/nvram: Improve partition removal
From: Benjamin Herrenschmidt @ 2010-08-02 0:55 UTC (permalink / raw)
To: linuxppc-dev
In-Reply-To: <1280710522-6362-7-git-send-email-benh@kernel.crashing.org>
Existing code is nasty, has bugs etc... rewrite the function
more simply, and make it take the signature and optional
name of the partitions to remove as arguments, thus making
it a more generic utility.
We also try to remove a log partition that we find and is too
small rather than creating a duplicate.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
arch/powerpc/kernel/nvram_64.c | 91 +++++++++++++++++++---------------------
1 files changed, 43 insertions(+), 48 deletions(-)
diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c
index 10f4b82..c934b5a 100644
--- a/arch/powerpc/kernel/nvram_64.c
+++ b/arch/powerpc/kernel/nvram_64.c
@@ -247,61 +247,54 @@ static unsigned char __init nvram_checksum(struct nvram_header *p)
return c_sum;
}
-static int __init nvram_remove_os_partition(void)
+/**
+ * nvram_remove_partition - Remove one or more partitions in nvram
+ * @name: name of the partition to remove, or NULL for a
+ * signature only match
+ * @sig: signature of the partition(s) to remove
+ */
+
+static int __init nvram_remove_partition(const char *name, int sig)
{
- struct list_head *i;
- struct list_head *j;
- struct nvram_partition * part;
- struct nvram_partition * cur_part;
+ struct nvram_partition *part, *prev, *tmp;
int rc;
- list_for_each(i, &nvram_part->partition) {
- part = list_entry(i, struct nvram_partition, partition);
- if (part->header.signature != NVRAM_SIG_OS)
+ list_for_each_entry(part, &nvram_part->partition, partition) {
+ if (part->header.signature != sig)
continue;
-
- /* Make os partition a free partition */
+ if (name && strncmp(name, part->header.name, 12))
+ continue;
+
+ /* Make partition a free partition */
part->header.signature = NVRAM_SIG_FREE;
sprintf(part->header.name, "wwwwwwwwwwww");
part->header.checksum = nvram_checksum(&part->header);
-
- /* Merge contiguous free partitions backwards */
- list_for_each_prev(j, &part->partition) {
- cur_part = list_entry(j, struct nvram_partition, partition);
- if (cur_part == nvram_part || cur_part->header.signature != NVRAM_SIG_FREE) {
- break;
- }
-
- part->header.length += cur_part->header.length;
- part->header.checksum = nvram_checksum(&part->header);
- part->index = cur_part->index;
-
- list_del(&cur_part->partition);
- kfree(cur_part);
- j = &part->partition; /* fixup our loop */
- }
-
- /* Merge contiguous free partitions forwards */
- list_for_each(j, &part->partition) {
- cur_part = list_entry(j, struct nvram_partition, partition);
- if (cur_part == nvram_part || cur_part->header.signature != NVRAM_SIG_FREE) {
- break;
- }
-
- part->header.length += cur_part->header.length;
- part->header.checksum = nvram_checksum(&part->header);
-
- list_del(&cur_part->partition);
- kfree(cur_part);
- j = &part->partition; /* fixup our loop */
- }
-
rc = nvram_write_header(part);
if (rc <= 0) {
- printk(KERN_ERR "nvram_remove_os_partition: nvram_write failed (%d)\n", rc);
+ printk(KERN_ERR "nvram_remove_partition: nvram_write failed (%d)\n", rc);
return rc;
}
+ }
+ /* Merge contiguous ones */
+ prev = NULL;
+ list_for_each_entry_safe(part, tmp, &nvram_part->partition, partition) {
+ if (part->header.signature != NVRAM_SIG_FREE) {
+ prev = NULL;
+ continue;
+ }
+ if (prev) {
+ prev->header.length += part->header.length;
+ prev->header.checksum = nvram_checksum(&part->header);
+ rc = nvram_write_header(part);
+ if (rc <= 0) {
+ printk(KERN_ERR "nvram_remove_partition: nvram_write failed (%d)\n", rc);
+ return rc;
+ }
+ list_del(&part->partition);
+ kfree(part);
+ } else
+ prev = part;
}
return 0;
@@ -484,17 +477,19 @@ static int __init nvram_setup_partition(void)
NVRAM_BLOCK_LEN) - sizeof(struct err_log_info);
return 0;
}
+
+ /* Found one but it's too small, remove it */
+ nvram_remove_partition("ppc64,linux", NVRAM_SIG_OS);
}
/* try creating a partition with the free space we have */
rc = nvram_create_partition("ppc64,linux", NVRAM_SIG_OS,
NVRAM_MIN_REQ, NVRAM_MAX_REQ);
if (rc < 0) {
- /* need to free up some space */
- rc = nvram_remove_os_partition();
- if (rc)
- return rc;
- /* create a partition in this new space */
+ /* need to free up some space, remove any "OS" partition */
+ nvram_remove_partition(NULL, NVRAM_SIG_OS);
+
+ /* Try again */
rc = nvram_create_partition("ppc64,linux", NVRAM_SIG_OS,
NVRAM_MIN_REQ, NVRAM_MAX_REQ);
if (rc < 0) {
--
1.6.3.3
^ permalink raw reply related
* [PATCH 06/11] powerpc/nvram: Shuffle code around in nvram_create_partition()
From: Benjamin Herrenschmidt @ 2010-08-02 0:55 UTC (permalink / raw)
To: linuxppc-dev
In-Reply-To: <1280710522-6362-6-git-send-email-benh@kernel.crashing.org>
This error log stuff is really pseries specific. As a first step we move
the initialization of these variables to the caller of
nvram_create_partition(), which is also slightly reorganized so we
setup the free partition before we clear the new partition, so the
chance of an error during clear leaving us with invalid headers
is lessened.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
arch/powerpc/kernel/nvram_64.c | 107 +++++++++++++++++++++++-----------------
1 files changed, 62 insertions(+), 45 deletions(-)
diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c
index 7ddeaa6..10f4b82 100644
--- a/arch/powerpc/kernel/nvram_64.c
+++ b/arch/powerpc/kernel/nvram_64.c
@@ -313,9 +313,15 @@ static int __init nvram_remove_os_partition(void)
* @sig: signature of the partition to create
* @req_size: size of data to allocate in bytes
* @min_size: minimum acceptable size (0 means req_size)
+ *
+ * Returns a negative error code or a positive nvram index
+ * of the beginning of the data area of the newly created
+ * partition. If you provided a min_size smaller than req_size
+ * you need to query for the actual size yourself after the
+ * call using nvram_partition_get_size().
*/
-static int __init nvram_create_partition(const char *name, int sig,
- int req_size, int min_size)
+static loff_t __init nvram_create_partition(const char *name, int sig,
+ int req_size, int min_size)
{
struct nvram_partition *part;
struct nvram_partition *new_part;
@@ -334,6 +340,8 @@ static int __init nvram_create_partition(const char *name, int sig,
*/
if (min_size == 0)
min_size = req_size;
+ if (min_size > req_size)
+ return -EINVAL;
/* Now add one block to each for the header */
req_size += 1;
@@ -362,7 +370,7 @@ static int __init nvram_create_partition(const char *name, int sig,
/* Create our OS partition */
new_part = kmalloc(sizeof(*new_part), GFP_KERNEL);
if (!new_part) {
- printk(KERN_ERR "nvram_create_os_partition: kmalloc failed\n");
+ pr_err("nvram_create_os_partition: kmalloc failed\n");
return -ENOMEM;
}
@@ -374,12 +382,29 @@ static int __init nvram_create_partition(const char *name, int sig,
rc = nvram_write_header(new_part);
if (rc <= 0) {
- printk(KERN_ERR "nvram_create_os_partition: nvram_write_header "
- "failed (%d)\n", rc);
+ pr_err("nvram_create_os_partition: nvram_write_header "
+ "failed (%d)\n", rc);
return rc;
}
+ list_add_tail(&new_part->partition, &free_part->partition);
- /* Clear the partition */
+ /* Adjust or remove the partition we stole the space from */
+ if (free_part->header.length > size) {
+ free_part->index += size * NVRAM_BLOCK_LEN;
+ free_part->header.length -= size;
+ free_part->header.checksum = nvram_checksum(&free_part->header);
+ rc = nvram_write_header(free_part);
+ if (rc <= 0) {
+ pr_err("nvram_create_os_partition: nvram_write_header "
+ "failed (%d)\n", rc);
+ return rc;
+ }
+ } else {
+ list_del(&free_part->partition);
+ kfree(free_part);
+ }
+
+ /* Clear the new partition */
for (tmp_index = new_part->index + NVRAM_HEADER_LEN;
tmp_index < ((size - 1) * NVRAM_BLOCK_LEN);
tmp_index += NVRAM_BLOCK_LEN) {
@@ -390,31 +415,24 @@ static int __init nvram_create_partition(const char *name, int sig,
}
}
- nvram_error_log_index = new_part->index + NVRAM_HEADER_LEN;
- nvram_error_log_size = ((part->header.length - 1) *
- NVRAM_BLOCK_LEN) - sizeof(struct err_log_info);
-
- list_add_tail(&new_part->partition, &free_part->partition);
-
- if (free_part->header.length <= size) {
- list_del(&free_part->partition);
- kfree(free_part);
- return 0;
- }
+ return new_part->index + NVRAM_HEADER_LEN;
+}
- /* Adjust the partition we stole the space from */
- free_part->index += size * NVRAM_BLOCK_LEN;
- free_part->header.length -= size;
- free_part->header.checksum = nvram_checksum(&free_part->header);
+/**
+ * nvram_get_partition_size - Get the data size of an nvram partition
+ * @data_index: This is the offset of the start of the data of
+ * the partition. The same value that is returned by
+ * nvram_create_partition().
+ */
+static int nvram_get_partition_size(loff_t data_index)
+{
+ struct nvram_partition *part;
- rc = nvram_write_header(free_part);
- if (rc <= 0) {
- printk(KERN_ERR "nvram_create_os_partition: nvram_write_header "
- "failed (%d)\n", rc);
- return rc;
+ list_for_each_entry(part, &nvram_part->partition, partition) {
+ if (part->index + NVRAM_HEADER_LEN == data_index)
+ return (part->header.length - 1) * NVRAM_BLOCK_LEN;
}
-
- return 0;
+ return -1;
}
@@ -469,30 +487,29 @@ static int __init nvram_setup_partition(void)
}
/* try creating a partition with the free space we have */
- rc = nvram_create_partition("ppc64,linux", NVRAM_SIG_OS,
+ rc = nvram_create_partition("ppc64,linux", NVRAM_SIG_OS,
NVRAM_MIN_REQ, NVRAM_MAX_REQ);
- if (!rc)
- return 0;
-
- /* need to free up some space */
- rc = nvram_remove_os_partition();
- if (rc) {
- return rc;
+ if (rc < 0) {
+ /* need to free up some space */
+ rc = nvram_remove_os_partition();
+ if (rc)
+ return rc;
+ /* create a partition in this new space */
+ rc = nvram_create_partition("ppc64,linux", NVRAM_SIG_OS,
+ NVRAM_MIN_REQ, NVRAM_MAX_REQ);
+ if (rc < 0) {
+ pr_err("nvram_create_partition: Could not find"
+ " enough space in NVRAM for partition\n");
+ return rc;
+ }
}
- /* create a partition in this new space */
- rc = nvram_create_partition("ppc64,linux", NVRAM_SIG_OS,
- NVRAM_MIN_REQ, NVRAM_MAX_REQ);
- if (rc) {
- printk(KERN_ERR "nvram_create_partition: Could not find a "
- "NVRAM partition large enough\n");
- return rc;
- }
+ nvram_error_log_index = rc;
+ nvram_error_log_size = nvram_get_partition_size(rc) - sizeof(struct err_log_info);
return 0;
}
-
static int __init nvram_scan_partitions(void)
{
loff_t cur_index = 0;
--
1.6.3.3
^ permalink raw reply related
* [PATCH 08/11] powerpc/nvram: Add nvram_find_partition()
From: Benjamin Herrenschmidt @ 2010-08-02 0:55 UTC (permalink / raw)
To: linuxppc-dev
In-Reply-To: <1280710522-6362-8-git-send-email-benh@kernel.crashing.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
arch/powerpc/kernel/nvram_64.c | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c
index c934b5a..fd0d12d 100644
--- a/arch/powerpc/kernel/nvram_64.c
+++ b/arch/powerpc/kernel/nvram_64.c
@@ -429,6 +429,28 @@ static int nvram_get_partition_size(loff_t data_index)
}
+/**
+ * nvram_find_partition - Find an nvram partition by signature and name
+ * @name: Name of the partition or NULL for any name
+ * @sig: Signature to test against
+ * @out_size: if non-NULL, returns the size of the data part of the partition
+ */
+loff_t nvram_find_partition(const char *name, int sig, int *out_size)
+{
+ struct nvram_partition *p;
+
+ list_for_each_entry(p, &nvram_part->partition, partition) {
+ if (p->header.signature == sig &&
+ (!name || !strncmp(p->header.name, name, 12))) {
+ if (out_size)
+ *out_size = (p->header.length - 1) *
+ NVRAM_BLOCK_LEN;
+ return p->index + NVRAM_HEADER_LEN;
+ }
+ }
+ return 0;
+}
+
/* nvram_setup_partition
*
* This will setup the partition we need for buffering the
--
1.6.3.3
^ permalink raw reply related
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