SeaBIOS September 2011

seabios@seabios.org

15 participants
31 discussions

Re: [SeaBIOS] [SeaBIOS PATCH] hotplug: Add device per func in ACPI DSDT tables
by Marcelo Tosatti 20 Sep '11

20 Sep '11

On Tue, Sep 20, 2011 at 06:44:54AM -0400, Amos Kong wrote: > ----- Original Message ----- > > On Mon, Sep 19, 2011 at 01:02:59PM +0300, Michael S. Tsirkin wrote: > > > On Mon, Sep 19, 2011 at 12:57:33PM +0300, Gleb Natapov wrote: > > > > On Mon, Sep 19, 2011 at 03:27:38AM -0400, Amos Kong wrote: > > > > > > > > > > Only func 0 is registered to guest driver (we can > > > > > only found func 0 in slot->funcs list of driver), > > > > > the other functions could not be cleaned when > > > > > hot-removing the whole slot. This patch adds > > > > > device per function in ACPI DSDT tables. > > > > > > > > > You can't unplug a single function. Guest surely knows that. > > > > > > Looking at guest code, it's clear that > > > at least a Linux guest doesn't know that. > > > > acpiphp_disable_slot function appears to eject all functions. > > > > > > > Have tested with linux/winxp/win7, hot-adding/hot-remving, > > > > > single/multiple function device, they are all fine. > > > > > > > > > Does not work for me (FC12 guest). > > what's your problem? only func 0 can be added? > I hotplug/hot-remove device by this script(add func 1~7, then add func 0): > > j=6 > for i in `seq 1 7` 0;do > qemu-img create /tmp/resize$j$i.qcow2 10M -f qcow2 > echo drive_add 0x$j.$i id=drv$j$i,if=none,file=/tmp/resize$j$i.qcow2 | nc -U /tmp/a > echo device_add virtio-blk-pci,id=dev$j$i,drive=drv$j$i,addr=0x$j.$i,multifunction=on | nc -U /tmp/monitor > done > sleep 5; > echo device_del dev60 | nc -U /tmp/monitor > > > As mentioned previously, Linux driver > > looks for function 0 when injection request is seen (see > > enable_device > > function in acpiphp_glue.c). > > > > > > What was not fine before? > > When hot-removing multifunc device, only func 0 can be removed from guest. Ah OK, musunderstood the patch was aiming for per-function hotplug.

1 0

Re: [SeaBIOS] [SeaBIOS PATCH 2/2] hotplug: Add device per func in ACPI DSDT tables
by Gleb Natapov 20 Sep '11

20 Sep '11

On Mon, Sep 19, 2011 at 03:27:38AM -0400, Amos Kong wrote: > > Only func 0 is registered to guest driver (we can > only found func 0 in slot->funcs list of driver), > the other functions could not be cleaned when > hot-removing the whole slot. This patch adds > device per function in ACPI DSDT tables. > You can't unplug a single function. Guest surely knows that. > Have tested with linux/winxp/win7, hot-adding/hot-remving, > single/multiple function device, they are all fine. > What was not fine before? Have you looked at real HW that supports PCI hot plug DSDT? Does it looks the same? > new acpi-dst.hex(332K): > http://amos-kong.rhcloud.com/pub/acpi-dsdt.hex > > Signed-off-by: Amos Kong <akong(a)redhat.com> > --- > src/acpi-dsdt.dsl | 31 +++++++++++++++++++++++++------ > 1 files changed, 25 insertions(+), 6 deletions(-) > > diff --git a/src/acpi-dsdt.dsl b/src/acpi-dsdt.dsl > index 08412e2..d1426ec 100644 > --- a/src/acpi-dsdt.dsl > +++ b/src/acpi-dsdt.dsl > @@ -128,9 +128,9 @@ DefinitionBlock ( > PCRM, 32, > } > > -#define hotplug_slot(name, nr) \ > - Device (S##name) { \ > - Name (_ADR, nr##0000) \ > +#define hotplug_func(name, nr, adr, fn) \ > + Device (S##name##fn) { \ > + Name (_ADR, adr) \ > Method (_EJ0,1) { \ > Store(ShiftLeft(1, nr), B0EJ) \ > Return (0x0) \ > @@ -138,6 +138,16 @@ DefinitionBlock ( > Name (_SUN, name) \ > } > > +#define hotplug_slot(name, nr) \ > + hotplug_func(name, nr, nr##0000, 0) \ > + hotplug_func(name, nr, nr##0001, 1) \ > + hotplug_func(name, nr, nr##0002, 2) \ > + hotplug_func(name, nr, nr##0003, 3) \ > + hotplug_func(name, nr, nr##0004, 4) \ > + hotplug_func(name, nr, nr##0005, 5) \ > + hotplug_func(name, nr, nr##0006, 6) \ > + hotplug_func(name, nr, nr##0007, 7) > + > hotplug_slot(1, 0x0001) > hotplug_slot(2, 0x0002) > hotplug_slot(3, 0x0003) > @@ -842,13 +852,22 @@ DefinitionBlock ( > Return(0x01) > } > > -#define gen_pci_hotplug(nr) \ > +#define gen_pci_hotplug_func(nr, fn) \ > If (And(\_SB.PCI0.PCIU, ShiftLeft(1, nr))) { \ > - Notify(\_SB.PCI0.S##nr, 1) \ > + Notify(\_SB.PCI0.S##nr##fn, 1) \ > } \ > If (And(\_SB.PCI0.PCID, ShiftLeft(1, nr))) { \ > - Notify(\_SB.PCI0.S##nr, 3) \ > + Notify(\_SB.PCI0.S##nr##fn, 3) \ > } > +#define gen_pci_hotplug(nr) \ > + gen_pci_hotplug_func(nr, 0) \ > + gen_pci_hotplug_func(nr, 1) \ > + gen_pci_hotplug_func(nr, 2) \ > + gen_pci_hotplug_func(nr, 3) \ > + gen_pci_hotplug_func(nr, 4) \ > + gen_pci_hotplug_func(nr, 5) \ > + gen_pci_hotplug_func(nr, 6) \ > + gen_pci_hotplug_func(nr, 7) > > Method(_L01) { > gen_pci_hotplug(1) > -- > 1.7.6.1 > > _______________________________________________ > SeaBIOS mailing list > SeaBIOS(a)seabios.org > http://www.seabios.org/mailman/listinfo/seabios -- Gleb.

4 8

[SEABIOS PATCH 0/2] fix of hotplug multi-func device
by Amos Kong 20 Sep '11

20 Sep '11

Hotplug multi-func device doesn't work, only func 0 are regiestered to guest pci driver, this patchset just add device entry in ACPI DSDT tables for all functions in the slot. --- Amos Kong (2): Fix regression of commit 87b533bf hotplug: Add device per func in ACPI DSDT tables 0 files changed, 0 insertions(+), 0 deletions(-) -- Amos

1 3

Re: [SeaBIOS] [SeaBIOS PATCH 2/2] hotplug: Add device per func in ACPI DSDT tables
by Michael S. Tsirkin 19 Sep '11

19 Sep '11

On Mon, Sep 19, 2011 at 12:36:44PM +0300, Michael S. Tsirkin wrote: > On Mon, Sep 19, 2011 at 02:53:47PM +0800, Amos Kong wrote: > > Only func 0 is registered to guest driver (we can > > only found func 0 in slot->funcs list of driver), > > the other functions could not be cleaned when > > hot-removing the whole slot. This patch adds > > device per function in ACPI DSDT tables. > > > > Have tested with linux/winxp/win7, hot-adding/hot-remving, > > single/multiple function device, they are all fine. > > > > Signed-off-by: Amos Kong <akong(a)redhat.com> > > On top of my previous patch, the below saves another 6K by moving the > method to the correct scope. The code for hotplug handling > also gets better organized this way which is nice. > > Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com> We naturally should cleanup the old macro, it's unused now, even though this doe snot save space :) diff --git a/src/acpi-dsdt.dsl b/src/acpi-dsdt.dsl index 36467ea..646f146 100644 --- a/src/acpi-dsdt.dsl +++ b/src/acpi-dsdt.dsl @@ -523,7 +523,7 @@ DefinitionBlock ( Notify(S##nr##5, 1) \ Notify(S##nr##6, 1) \ Notify(S##nr##7, 1) \ - } \ + } \ If (And(PCID, ShiftLeft(1, nr))) { \ Notify(S##nr##0, 3) \ Notify(S##nr##1, 3) \ @@ -910,28 +910,6 @@ DefinitionBlock ( Return(0x01) } -#define gen_pci_hotplug(nr) \ - If (And(\_SB.PCI0.PCIU, ShiftLeft(1, nr))) { \ - Notify(\_SB.PCI0.S##nr##0, 1) \ - Notify(\_SB.PCI0.S##nr##1, 1) \ - Notify(\_SB.PCI0.S##nr##2, 1) \ - Notify(\_SB.PCI0.S##nr##3, 1) \ - Notify(\_SB.PCI0.S##nr##4, 1) \ - Notify(\_SB.PCI0.S##nr##5, 1) \ - Notify(\_SB.PCI0.S##nr##6, 1) \ - Notify(\_SB.PCI0.S##nr##7, 1) \ - } \ - If (And(\_SB.PCI0.PCID, ShiftLeft(1, nr))) { \ - Notify(\_SB.PCI0.S##nr##0, 3) \ - Notify(\_SB.PCI0.S##nr##1, 3) \ - Notify(\_SB.PCI0.S##nr##2, 3) \ - Notify(\_SB.PCI0.S##nr##3, 3) \ - Notify(\_SB.PCI0.S##nr##4, 3) \ - Notify(\_SB.PCI0.S##nr##5, 3) \ - Notify(\_SB.PCI0.S##nr##6, 3) \ - Notify(\_SB.PCI0.S##nr##7, 3) \ - } - Method(_L01) { \_SB.PCI0.HPLG() Return (0x01)

1 0

Re: [SeaBIOS] [SeaBIOS PATCH 2/2] hotplug: Add device per func in ACPI DSDT tables
by Michael S. Tsirkin 19 Sep '11

19 Sep '11

1 0

Re: [SeaBIOS] [PATCH] pci: clean all funcs when hot-removing multifunc device
by Kenji Kaneshige 15 Sep '11

15 Sep '11

(2011/09/16 4:03), Bjorn Helgaas wrote: > On Tue, Sep 13, 2011 at 10:55 PM, Amos Kong<akong(a)redhat.com> wrote: >> 'slot->funcs' is initialized in acpiphp_glue.c:register_slot() before >> hotpluging device, and only one entry(func 0) is added to it, >> no new entry will be added to the list when hotpluging devices to the slot. >> When we release the whole device, there is only one entry in the list, >> this causes func1~7 could not be released. >> I try to add entries for all hotpluged device in enable_device(), but >> it doesn't work, because 'slot->funcs' is used in many place which we only >> need to process func 0. This patch just try to clean all funcs in >> disable_device(). > ... >> Hotpluging multifunc of WinXp is fine. > > I'm going to ignore this patch for now. Please consider these > questions, then repost it if you still want it: > > I assume you mean that Linux and WinXP are both running on top of the > same SeaBIOS, and hot-remove of a multifunction device works in WinXP > and fails in Linux. That sounds like Linux is broken, and we should > fix it. We might want to make a SeaBIOS change for other reasons, but > it'd still be good to fix Linux in case there are other similar > BIOSes. No objection about fixing Linux. > > Why do we need pci_scan_single_device()? The device should have been > scanned already when it was added, and I would think that should have > set pdev->multifunction. It should be pci_get_slot() instead. Note that it needs corresponding pci_dev_put(). Regards, Kenji Kaneshige > > Your patch needs spaces around the operators in the "for" loop. > > In the changelog, it would be nice to have the URL of a bugzilla where > the dmesg and DSDT are attached. > > Bjorn > >> Signed-off-by: Amos Kong<akong(a)redhat.com> >> --- >> drivers/pci/hotplug/acpiphp_glue.c | 27 ++++++++++++++++++--------- >> 1 files changed, 18 insertions(+), 9 deletions(-) >> >> diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c >> index a70fa89..3b86d1a 100644 >> --- a/drivers/pci/hotplug/acpiphp_glue.c >> +++ b/drivers/pci/hotplug/acpiphp_glue.c >> @@ -880,6 +880,8 @@ static int disable_device(struct acpiphp_slot *slot) >> { >> struct acpiphp_func *func; >> struct pci_dev *pdev; >> + struct pci_bus *bus = slot->bridge->pci_bus; >> + int i, num = 1; >> >> /* is this slot already disabled? */ >> if (!(slot->flags& SLOT_ENABLED)) >> @@ -893,16 +895,23 @@ static int disable_device(struct acpiphp_slot *slot) >> func->bridge = NULL; >> } >> >> - pdev = pci_get_slot(slot->bridge->pci_bus, >> - PCI_DEVFN(slot->device, func->function)); >> - if (pdev) { >> - pci_stop_bus_device(pdev); >> - if (pdev->subordinate) { >> - disable_bridges(pdev->subordinate); >> - pci_disable_device(pdev); >> + pdev = pci_scan_single_device(bus, >> + PCI_DEVFN(slot->device, 0)); >> + if (!pdev) >> + goto err_exit; >> + if (pdev->multifunction == 1) >> + num = 8; >> + for (i=0; i<num; i++) { >> + pdev = pci_get_slot(bus, PCI_DEVFN(slot->device, i)); >> + if (pdev) { >> + pci_stop_bus_device(pdev); >> + if (pdev->subordinate) { >> + disable_bridges(pdev->subordinate); >> + pci_disable_device(pdev); >> + } >> + pci_remove_bus_device(pdev); >> + pci_dev_put(pdev); >> } >> - pci_remove_bus_device(pdev); >> - pci_dev_put(pdev); >> } >> } >> >> -- >> 1.7.6.1 >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-pci" in >> the body of a message to majordomo(a)vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html >> > >

1 0

Re: [SeaBIOS] [PATCH] pci: clean all funcs when hot-removing multifunc device
by Bjorn Helgaas 15 Sep '11

15 Sep '11

On Tue, Sep 13, 2011 at 10:55 PM, Amos Kong <akong(a)redhat.com> wrote: > 'slot->funcs' is initialized in acpiphp_glue.c:register_slot() before > hotpluging device, and only one entry(func 0) is added to it, > no new entry will be added to the list when hotpluging devices to the slot. > When we release the whole device, there is only one entry in the list, > this causes func1~7 could not be released. > I try to add entries for all hotpluged device in enable_device(), but > it doesn't work, because 'slot->funcs' is used in many place which we only > need to process func 0. This patch just try to clean all funcs in > disable_device(). ... > Hotpluging multifunc of WinXp is fine. I'm going to ignore this patch for now. Please consider these questions, then repost it if you still want it: I assume you mean that Linux and WinXP are both running on top of the same SeaBIOS, and hot-remove of a multifunction device works in WinXP and fails in Linux. That sounds like Linux is broken, and we should fix it. We might want to make a SeaBIOS change for other reasons, but it'd still be good to fix Linux in case there are other similar BIOSes. Why do we need pci_scan_single_device()? The device should have been scanned already when it was added, and I would think that should have set pdev->multifunction. Your patch needs spaces around the operators in the "for" loop. In the changelog, it would be nice to have the URL of a bugzilla where the dmesg and DSDT are attached. Bjorn > Signed-off-by: Amos Kong <akong(a)redhat.com> > --- > drivers/pci/hotplug/acpiphp_glue.c | 27 ++++++++++++++++++--------- > 1 files changed, 18 insertions(+), 9 deletions(-) > > diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c > index a70fa89..3b86d1a 100644 > --- a/drivers/pci/hotplug/acpiphp_glue.c > +++ b/drivers/pci/hotplug/acpiphp_glue.c > @@ -880,6 +880,8 @@ static int disable_device(struct acpiphp_slot *slot) > { > struct acpiphp_func *func; > struct pci_dev *pdev; > + struct pci_bus *bus = slot->bridge->pci_bus; > + int i, num = 1; > > /* is this slot already disabled? */ > if (!(slot->flags & SLOT_ENABLED)) > @@ -893,16 +895,23 @@ static int disable_device(struct acpiphp_slot *slot) > func->bridge = NULL; > } > > - pdev = pci_get_slot(slot->bridge->pci_bus, > - PCI_DEVFN(slot->device, func->function)); > - if (pdev) { > - pci_stop_bus_device(pdev); > - if (pdev->subordinate) { > - disable_bridges(pdev->subordinate); > - pci_disable_device(pdev); > + pdev = pci_scan_single_device(bus, > + PCI_DEVFN(slot->device, 0)); > + if (!pdev) > + goto err_exit; > + if (pdev->multifunction == 1) > + num = 8; > + for (i=0; i<num; i++) { > + pdev = pci_get_slot(bus, PCI_DEVFN(slot->device, i)); > + if (pdev) { > + pci_stop_bus_device(pdev); > + if (pdev->subordinate) { > + disable_bridges(pdev->subordinate); > + pci_disable_device(pdev); > + } > + pci_remove_bus_device(pdev); > + pci_dev_put(pdev); > } > - pci_remove_bus_device(pdev); > - pci_dev_put(pdev); > } > } > > -- > 1.7.6.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-pci" in > the body of a message to majordomo(a)vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >

1 0

Re: [SeaBIOS] [PATCH] pci: clean all funcs when hot-removing multifunc device
by Kevin O'Connor 15 Sep '11

15 Sep '11

On Wed, Sep 14, 2011 at 07:45:59AM -0400, Amos Kong wrote: > The size of bios.bin compiled from seabios > original: 128K > only apply patch1: 256K > only apply patch2: 128K > > patch1: add 6 slot(only slot6 has 8 funcs) to the table > can hotplug/hot-remove a multifunc device to slot 6 successfully > > patch2: add 31 slot(with 8 funcs) to the table > could not boot up guest. > I found there is a special process for large bios.bin in qemu, > problem maybe exist here, I'm driving into it... > > qemu/hw/pc.c: > void pc_memory_init(... > .... > /* map the last 128KB of the BIOS in ISA space */ > isa_bios_size = bios_size; > if (isa_bios_size > (128 * 1024)) > isa_bios_size = 128 * 1024; This is probably a regression since seabios commit 87b533bf. Prior to that commit, seabios did not mark the early 32bit initialization code as init code. However, a side effect of marking that code (handle_post) as init code is that it is more likely the linker could place the code at an address less than 0xe0000. I'm guesing the patch below (just a hack) would cover up the issue. -Kevin --- a/src/post.c +++ b/src/post.c @@ -336,7 +336,7 @@ reloc_init(void) // Start of Power On Self Test (POST) - the BIOS initilization phase. // This function does the setup needed for code relocation, and then // invokes the relocation and main setup code. -void VISIBLE32INIT +void VISIBLE32FLAT handle_post(void) { debug_serial_setup(); @@ -356,6 +356,14 @@ handle_post(void) // Allow writes to modify bios area (0xf0000) make_bios_writable(); + + void handle_post2(void); + handle_post2(); +} + +void VISIBLE32INIT +handle_post2(void) +{ HaveRunPost = 1; // Detect ram and setup internal malloc.

1 0

Re: [SeaBIOS] [PATCH] pci: clean all funcs when hot-removing multifunc device
by Amos Kong 14 Sep '11

14 Sep '11

----- Original Message ----- > ----- Original Message ----- > > (2011/09/14 13:55), Amos Kong wrote: > > > 'slot->funcs' is initialized in acpiphp_glue.c:register_slot() > > > before > > > hotpluging device, and only one entry(func 0) is added to it, > > > no new entry will be added to the list when hotpluging devices to > > > the slot. > > > > I guess your hotplug slot has only one device object (for func#0) > > in ACPI Namespace (DSDT), and guess this is why there is only one > > entry in the 'slot->funcs'. If so, what about adding device objects > > for function 1-7 to ACPI Namespace? I think most of bare-metal > > environments have such definition in ACPI Namespace. For example: > > Hi Kaneshige, > > I did some test, fix acpi tables can resolve this problem, > then register_slot() will be executed for all funcs, > and each func has a entry in slot->funcs. > I will send a patch to seabios. The size of bios.bin compiled from seabios original: 128K only apply patch1: 256K only apply patch2: 128K patch1: add 6 slot(only slot6 has 8 funcs) to the table can hotplug/hot-remove a multifunc device to slot 6 successfully patch2: add 31 slot(with 8 funcs) to the table could not boot up guest. I found there is a special process for large bios.bin in qemu, problem maybe exist here, I'm driving into it... qemu/hw/pc.c: void pc_memory_init(... .... /* map the last 128KB of the BIOS in ISA space */ isa_bios_size = bios_size; if (isa_bios_size > (128 * 1024)) isa_bios_size = 128 * 1024; > > > Device (P2P) { // PCI to PCI bridge > > Name (_ADR, ...) // PCI address > > Name (_HPP, ...) // Hot Plug parameter > > ... > > Device (S0F0) { // For function 0 > > Name (_ADR, ...) > > Name (_SUN, ...) > > Method (_EJ0, ...) > > } > > Device (S0F1) { // For function 1 > > ... > > } > > ... > > Device (S0F7) { // For function 7 > > ... > > } > > } > > > > Regards, > > Kenji Kaneshige > > > > > > > When we release the whole device, there is only one entry in the > > > list, > > > this causes func1~7 could not be released. > > > I try to add entries for all hotpluged device in enable_device(), > > > but > > > it doesn't work, because 'slot->funcs' is used in many place which > > > we only > > > need to process func 0. This patch just try to clean all funcs in > > > disable_device(). > > > > > > drivers/pci/hotplug/acpiphp_glue.c: > > > static int disable_device(struct acpiphp_slot *slot) { > > > list_for_each_entry(func,&slot->funcs, sibling) { > > > pdev = pci_get_slot(slot->bridge->pci_bus, > > > PCI_DEVFN(slot->device, func->function)); > > > ..clean code.. // those code can only be executed one time(func > > > 0) > > > pci_remove_bus_device(pdev); > > > --- > > > pci_bus_add_device() is called for each func device in > > > acpiphp_glue.c:enable_device(). > > > pci_remove_bus_device(pdev) is only called for func 0 in > > > acpiphp_glue.c:disable_device(). > > > > > > Boot up a KVM guest, hotplug a multifunc device(8 funcs), we can > > > find it in the guest. > > > @ ls /dev/vd* > > > vda vdb vdc vde vdf vdg vdh > > > @ lspci > > > 00:06.0 SCSI storage controller: Red Hat, Inc Virtio block > > > device > > > ... > > > 00:06.7 SCSI storage controller: Red Hat, Inc Virtio block > > > device > > > > > > But func 1~7 still exist in guest after hot-removing the multifunc > > > device through qemu monitor. > > > @ lspci (00:06.0 disappeared) > > > 00:06.1 SCSI storage controller: Red Hat, Inc Virtio block > > > device (rev ff) > > > ... > > > 00:06.7 SCSI storage controller: Red Hat, Inc Virtio block > > > device (rev ff) > > > ^^^^^^^^ > > > @ ls /dev/vd* > > > vdb vdc vde vdf vdg vdh > > > @ mkfs /dev/vdb > > > INFO: task mkfs.ext2:1784 blocked for more than 120 seconds. > > > (task hung) > > > > > > Hotpluging multifunc of WinXp is fine. > > > > > > Signed-off-by: Amos Kong<akong(a)redhat.com> > > > --- > > > drivers/pci/hotplug/acpiphp_glue.c | 27 > > > ++++++++++++++++++--------- > > > 1 files changed, 18 insertions(+), 9 deletions(-) > > > > > > diff --git a/drivers/pci/hotplug/acpiphp_glue.c > > > b/drivers/pci/hotplug/acpiphp_glue.c > > > index a70fa89..3b86d1a 100644 > > > --- a/drivers/pci/hotplug/acpiphp_glue.c > > > +++ b/drivers/pci/hotplug/acpiphp_glue.c > > > @@ -880,6 +880,8 @@ static int disable_device(struct acpiphp_slot > > > *slot) > > > { > > > struct acpiphp_func *func; > > > struct pci_dev *pdev; > > > + struct pci_bus *bus = slot->bridge->pci_bus; > > > + int i, num = 1; > > > > > > /* is this slot already disabled? */ > > > if (!(slot->flags& SLOT_ENABLED)) > > > @@ -893,16 +895,23 @@ static int disable_device(struct > > > acpiphp_slot > > > *slot) > > > func->bridge = NULL; > > > } > > > > > > - pdev = pci_get_slot(slot->bridge->pci_bus, > > > - PCI_DEVFN(slot->device, func->function)); > > > - if (pdev) { > > > - pci_stop_bus_device(pdev); > > > - if (pdev->subordinate) { > > > - disable_bridges(pdev->subordinate); > > > - pci_disable_device(pdev); > > > + pdev = pci_scan_single_device(bus, > > > + PCI_DEVFN(slot->device, 0)); > > > + if (!pdev) > > > + goto err_exit; > > > + if (pdev->multifunction == 1) > > > + num = 8; > > > + for (i=0; i<num; i++) { > > > + pdev = pci_get_slot(bus, PCI_DEVFN(slot->device, i)); > > > + if (pdev) { > > > + pci_stop_bus_device(pdev); > > > + if (pdev->subordinate) { > > > + disable_bridges(pdev->subordinate); > > > + pci_disable_device(pdev); > > > + } > > > + pci_remove_bus_device(pdev); > > > + pci_dev_put(pdev); > > > } > > > - pci_remove_bus_device(pdev); > > > - pci_dev_put(pdev); > > > } > > > } > > > > -- > To unsubscribe from this list: send the line "unsubscribe kvm" in > the body of a message to majordomo(a)vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html

1 0

Re: [SeaBIOS] [PATCH] memory hotplug
by Vasilis Liaskovitis 08 Sep '11

08 Sep '11

Hi, On Wed, Sep 07, 2011 at 05:58:49PM +0800, Lai Jiangshan wrote: > On 09/06/2011 04:07 PM, Vasilis Liaskovitis wrote: > > Hi Lai, > > Yes, it is virtio disk. (the guest kernel is 2.6.32-71.el6) > > [root@lai qemu-kvm]# x86_64-softmmu/qemu-system-x86_64 -drive file=/home/laijs/Machines/rhel6.img,if=none,id=drive-virtio-disk0,format=qcow2 -device virtio-blk-pci,bus=pci.0,multifunction=on,addr=0x5.0x0,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 -m 1024,maxmem=2048 -smp 2,maxcpus=8 -bios ../seabios/out/bios.bin > > When I changed it to IDE disk: (the guest kernel is 3.1.0-rc4-tip) > [root@lai qemu-kvm]# x86_64-softmmu/qemu-system-x86_64 /home/laijs/Machines/rhel6.img -m 1024,maxmem=2048 -smp 2,maxcpus=8 -bios ../seabios/out/bios.bin > > The memory block was successfully added, but when after > "echo online > /sys/devices/system/memory/memory3/state", > the result are the same: disk failed. > I notice that you only have 2 memory devices initially, for 1GB initial memory. This suggests your /sys/devices/system/memory/block_size_bytes is 512MB, can you verify? Currently the draft patches I sent only work with x86_64 guest, where block_size_bytes are 128 MB. You 'll have to change the definition of the constant LINUX_MIN_BLOCK_SIZE to whatever block_size_bytes your guest uses (in both the qemu-kvm and seabios patch). Additionally, in SeaBIOS the final line of the QWordMemory descriptor in src/ssdt-mem.dsl will need to match the new block_size_bytes as well. Is your rhel6 guest 32-bit with PAE? This combination has SECTION_SIZE_BITS==29 in arch/x86/include/asm/sparsemem.h which would explain the number of memory devices you are seeing. thanks, - Vasilis

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS September 2011