SeaBIOS

seabios@seabios.org

4 participants
3800 discussions

Re: [SeaBIOS] [PATCH 1/4] acpi: generate mixed asl/aml listing
by Michael S. Tsirkin 21 Sep '11

21 Sep '11

On Wed, Sep 21, 2011 at 03:44:21PM +0300, Michael S. Tsirkin wrote: > Use iasl -l flag to produce a mixed listing, where a > source line is followed by matching AML. > Since we use a preprocessed input, this generates long lines with > multiple commands per line. To make it possible to match > AML to source exactly, split the input that we supply iasl, > with each command on a separate line. > > Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com> I thought I'd add an example listing here: 467.... Device (S1) { 0000080B....5B 82 25 53 31 5F 5F ... "[.%S1__" 468.... Name (_ADR, 0x00010000) 00000812....08 5F 41 44 52 0C 00 00 "._ADR..." 0000081A....01 00 .................. ".." 469.... Method (EJ0_,1) { 0000081C....14 0F 45 4A 30 5F 01 ... "..EJ0_." 470.... Store(ShiftLeft(1, 0x0001), B0EJ) -- MST

1 0

Re: [SeaBIOS] [SeaBIOS PATCH v2] hotplug: Add device per func in ACPI DSDT tables
by Kevin O'Connor 21 Sep '11

21 Sep '11

On Tue, Sep 20, 2011 at 06:45:57AM -0400, Amos Kong wrote: > From 48ea1c9188334b89a60b4f9e853e86fc04fda4a5 Mon Sep 17 00:00:00 2001 > From: Amos Kong <akong(a)redhat.com> > Date: Tue, 20 Sep 2011 15:38:43 +0800 > Subject: [SeaBIOS PATCH v2] hotplug: Add device per func in ACPI DSDT tables > > 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. > --- > Changes from v1: > - cleanup the macros, bios.bin gets back to 128K > - notify only when func0 is added and removed How about moving code into functions so that it isn't duplicated for each PCI device. See the patch below as an example (100% untested). The CPU hotplug stuff works this way, except it run-time generates the equivalent of "Device(S???)" and "PCNT". (It may make sense to run-time generate the PCI hotplug as well - it consumes about 10K of space to statically generate the 31 devices.) -Kevin diff --git a/src/acpi-dsdt.dsl b/src/acpi-dsdt.dsl index 08412e2..31ac5eb 100644 --- a/src/acpi-dsdt.dsl +++ b/src/acpi-dsdt.dsl @@ -128,48 +128,6 @@ DefinitionBlock ( PCRM, 32, } -#define hotplug_slot(name, nr) \ - Device (S##name) { \ - Name (_ADR, nr##0000) \ - Method (_EJ0,1) { \ - Store(ShiftLeft(1, nr), B0EJ) \ - Return (0x0) \ - } \ - Name (_SUN, name) \ - } - - hotplug_slot(1, 0x0001) - hotplug_slot(2, 0x0002) - hotplug_slot(3, 0x0003) - hotplug_slot(4, 0x0004) - hotplug_slot(5, 0x0005) - hotplug_slot(6, 0x0006) - hotplug_slot(7, 0x0007) - hotplug_slot(8, 0x0008) - hotplug_slot(9, 0x0009) - hotplug_slot(10, 0x000a) - hotplug_slot(11, 0x000b) - hotplug_slot(12, 0x000c) - hotplug_slot(13, 0x000d) - hotplug_slot(14, 0x000e) - hotplug_slot(15, 0x000f) - hotplug_slot(16, 0x0010) - hotplug_slot(17, 0x0011) - hotplug_slot(18, 0x0012) - hotplug_slot(19, 0x0013) - hotplug_slot(20, 0x0014) - hotplug_slot(21, 0x0015) - hotplug_slot(22, 0x0016) - hotplug_slot(23, 0x0017) - hotplug_slot(24, 0x0018) - hotplug_slot(25, 0x0019) - hotplug_slot(26, 0x001a) - hotplug_slot(27, 0x001b) - hotplug_slot(28, 0x001c) - hotplug_slot(29, 0x001d) - hotplug_slot(30, 0x001e) - hotplug_slot(31, 0x001f) - Name (_CRS, ResourceTemplate () { WordBusNumber (ResourceProducer, MinFixed, MaxFixed, PosDecode, @@ -762,6 +720,119 @@ DefinitionBlock ( Zero /* reserved */ }) + /* PCI hotplug */ + Scope(\_SB.PCI0) { + /* Methods called by bulk generated PCI devices below */ + Method (PCEJ, 1, NotSerialized) { + // _EJ0 method - eject callback + Store(ShiftLeft(1, Arg0), B0EJ) + Return (0x0) + } + + /* Bulk generated PCI hotplug devices */ +#define hotplug_func(nr, fn) \ + Device (S##nr##fn) { \ + Name (_ADR, 0x##nr##000##fn) \ + Method (_EJ0, 1) { Return(PCEJ(0x##nr)) } \ + Name (_SUN, 0x##nr) \ + } + +#define hotplug_slot(nr) \ + hotplug_func(nr, 0) \ + hotplug_func(nr, 1) \ + hotplug_func(nr, 2) \ + hotplug_func(nr, 3) \ + hotplug_func(nr, 4) \ + hotplug_func(nr, 5) \ + hotplug_func(nr, 6) \ + hotplug_func(nr, 7) + + hotplug_slot(01) + hotplug_slot(02) + hotplug_slot(03) + hotplug_slot(04) + hotplug_slot(05) + hotplug_slot(06) + hotplug_slot(07) + hotplug_slot(08) + hotplug_slot(09) + hotplug_slot(0a) + hotplug_slot(0b) + hotplug_slot(0c) + hotplug_slot(0d) + hotplug_slot(0e) + hotplug_slot(0f) + hotplug_slot(10) + hotplug_slot(11) + hotplug_slot(12) + hotplug_slot(13) + hotplug_slot(14) + hotplug_slot(15) + hotplug_slot(16) + hotplug_slot(17) + hotplug_slot(18) + hotplug_slot(19) + hotplug_slot(1a) + hotplug_slot(1b) + hotplug_slot(1c) + hotplug_slot(1d) + hotplug_slot(1e) + hotplug_slot(1f) + + /* PCI hotplug notify method */ + Method(PCNF, 0) { + // Local0 = iterator + Store (Zero, Local0) + While (LLess(Local0, 31)) { + Increment(Local0) + If (And(PCIU, ShiftLeft(1, Local0))) { + PCNT(Local0, 1) + } + If (And(PCID, ShiftLeft(1, Local0))) { + PCNT(Local0, 3) + } + } + Return(One) + } + +#define hotplug_notify(nr) \ + If (LEqual(Arg0, 0x##nr)) {Notify(S##nr##0, Arg1)} + + Method(PCNT, 2) { + hotplug_notify(01) + hotplug_notify(02) + hotplug_notify(03) + hotplug_notify(04) + hotplug_notify(05) + hotplug_notify(06) + hotplug_notify(07) + hotplug_notify(08) + hotplug_notify(09) + hotplug_notify(0a) + hotplug_notify(0b) + hotplug_notify(0c) + hotplug_notify(0d) + hotplug_notify(0e) + hotplug_notify(0f) + hotplug_notify(10) + hotplug_notify(11) + hotplug_notify(12) + hotplug_notify(13) + hotplug_notify(14) + hotplug_notify(15) + hotplug_notify(16) + hotplug_notify(17) + hotplug_notify(18) + hotplug_notify(19) + hotplug_notify(1a) + hotplug_notify(1b) + hotplug_notify(1c) + hotplug_notify(1d) + hotplug_notify(1e) + hotplug_notify(1f) + } + } + /* CPU hotplug */ Scope(\_SB) { /* Objects filled in by run-time generated SSDT */ @@ -842,49 +913,9 @@ DefinitionBlock ( Return(0x01) } -#define gen_pci_hotplug(nr) \ - If (And(\_SB.PCI0.PCIU, ShiftLeft(1, nr))) { \ - Notify(\_SB.PCI0.S##nr, 1) \ - } \ - If (And(\_SB.PCI0.PCID, ShiftLeft(1, nr))) { \ - Notify(\_SB.PCI0.S##nr, 3) \ - } - Method(_L01) { - gen_pci_hotplug(1) - gen_pci_hotplug(2) - gen_pci_hotplug(3) - gen_pci_hotplug(4) - gen_pci_hotplug(5) - gen_pci_hotplug(6) - gen_pci_hotplug(7) - gen_pci_hotplug(8) - gen_pci_hotplug(9) - gen_pci_hotplug(10) - gen_pci_hotplug(11) - gen_pci_hotplug(12) - gen_pci_hotplug(13) - gen_pci_hotplug(14) - gen_pci_hotplug(15) - gen_pci_hotplug(16) - gen_pci_hotplug(17) - gen_pci_hotplug(18) - gen_pci_hotplug(19) - gen_pci_hotplug(20) - gen_pci_hotplug(21) - gen_pci_hotplug(22) - gen_pci_hotplug(23) - gen_pci_hotplug(24) - gen_pci_hotplug(25) - gen_pci_hotplug(26) - gen_pci_hotplug(27) - gen_pci_hotplug(28) - gen_pci_hotplug(29) - gen_pci_hotplug(30) - gen_pci_hotplug(31) - - Return (0x01) - + // PCI hotplug event + Return(\_SB.PCI0.PCNF()) } Method(_L02) { // CPU hotplug event

2 1

Re: [SeaBIOS] [SeaBIOS PATCH v2] Fix regression of commit 87b533bf
by Kevin O'Connor 20 Sep '11

20 Sep '11

On Tue, Sep 20, 2011 at 04:00:57AM -0400, Amos Kong wrote: > From 4678a3cb0e0a3cd7a4bc3d284c5719fdba90bc61 Mon Sep 17 00:00:00 2001 > From: Kevin O'Connor <kevin(a)koconnor.net> > Date: Tue, 20 Sep 2011 15:43:55 +0800 > Subject: [PATCH V2] Fix regression of commit 87b533bf > > From: Kevin O'Connor <kevin(a)koconnor.net> > > After adding more device entries in ACPI DSDT tables, > the filesize of bios.bin changed from 128K to 256K. > But bios could not initialize successfully. > > This is 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. > The patch (just a hack) would cover up the issue. Thanks. I committed a slightly different patch (but similar concept) to the seabios repo. -Kevin

1 0

Re: [SeaBIOS] [SeaBIOS PATCH v2] 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:45:57AM -0400, Amos Kong wrote: > >From 48ea1c9188334b89a60b4f9e853e86fc04fda4a5 Mon Sep 17 00:00:00 2001 > From: Amos Kong <akong(a)redhat.com> > Date: Tue, 20 Sep 2011 15:38:43 +0800 > Subject: [SeaBIOS PATCH v2] hotplug: Add device per func in ACPI DSDT tables > > 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. > --- > Changes from v1: > - cleanup the macros, bios.bin gets back to 128K > - notify only when func0 is added and removed > > Signed-off-by: Amos Kong <akong(a)redhat.com> > Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com> > --- > src/acpi-dsdt.dsl | 106 ++++++++++++++++++++++++++++++---------------------- > 1 files changed, 61 insertions(+), 45 deletions(-) > > diff --git a/src/acpi-dsdt.dsl b/src/acpi-dsdt.dsl > index 08412e2..707c3d6 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) > @@ -460,7 +470,7 @@ DefinitionBlock ( > } > } > > -#define gen_pci_device(name, nr) \ > +#define gen_pci_device(name, nr) \ > Device(SL##name) { \ > Name (_ADR, nr##0000) \ > Method (_RMV) { \ > @@ -502,6 +512,52 @@ DefinitionBlock ( > gen_pci_device(29, 0x001d) > gen_pci_device(30, 0x001e) > gen_pci_device(31, 0x001f) > + > +#define gen_pci_hotplug(nr) \ > + If (And(PCIU, ShiftLeft(1, nr))) { \ > + Notify(S##nr##0, 1) \ > + } \ > + If (And(PCID, ShiftLeft(1, nr))) { \ > + Notify(S##nr##0, 3) \ > + } > + > + Method(HPLG) { > + gen_pci_hotplug(1) > + gen_pci_hotplug(2) > + gen_pci_hotplug(3) > + gen_pci_hotplug(4) > + gen_pci_hotplug(5) > + gen_pci_hotplug(6) > + gen_pci_hotplug(7) > + gen_pci_hotplug(8) > + gen_pci_hotplug(9) > + gen_pci_hotplug(10) > + gen_pci_hotplug(11) > + gen_pci_hotplug(12) > + gen_pci_hotplug(13) > + gen_pci_hotplug(14) > + gen_pci_hotplug(15) > + gen_pci_hotplug(16) > + gen_pci_hotplug(17) > + gen_pci_hotplug(18) > + gen_pci_hotplug(19) > + gen_pci_hotplug(20) > + gen_pci_hotplug(21) > + gen_pci_hotplug(22) > + gen_pci_hotplug(23) > + gen_pci_hotplug(24) > + gen_pci_hotplug(25) > + gen_pci_hotplug(26) > + gen_pci_hotplug(27) > + gen_pci_hotplug(28) > + gen_pci_hotplug(29) > + gen_pci_hotplug(30) > + gen_pci_hotplug(31) > + > + Return (0x01) > + } > + > + > } > > /* PCI IRQs */ > @@ -842,49 +898,9 @@ DefinitionBlock ( > Return(0x01) > } > > -#define gen_pci_hotplug(nr) \ > - If (And(\_SB.PCI0.PCIU, ShiftLeft(1, nr))) { \ > - Notify(\_SB.PCI0.S##nr, 1) \ > - } \ > - If (And(\_SB.PCI0.PCID, ShiftLeft(1, nr))) { \ > - Notify(\_SB.PCI0.S##nr, 3) \ > - } > - > Method(_L01) { > - gen_pci_hotplug(1) > - gen_pci_hotplug(2) > - gen_pci_hotplug(3) > - gen_pci_hotplug(4) > - gen_pci_hotplug(5) > - gen_pci_hotplug(6) > - gen_pci_hotplug(7) > - gen_pci_hotplug(8) > - gen_pci_hotplug(9) > - gen_pci_hotplug(10) > - gen_pci_hotplug(11) > - gen_pci_hotplug(12) > - gen_pci_hotplug(13) > - gen_pci_hotplug(14) > - gen_pci_hotplug(15) > - gen_pci_hotplug(16) > - gen_pci_hotplug(17) > - gen_pci_hotplug(18) > - gen_pci_hotplug(19) > - gen_pci_hotplug(20) > - gen_pci_hotplug(21) > - gen_pci_hotplug(22) > - gen_pci_hotplug(23) > - gen_pci_hotplug(24) > - gen_pci_hotplug(25) > - gen_pci_hotplug(26) > - gen_pci_hotplug(27) > - gen_pci_hotplug(28) > - gen_pci_hotplug(29) > - gen_pci_hotplug(30) > - gen_pci_hotplug(31) > - > + \_SB.PCI0.HPLG() What is the point of this new method?

1 0

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS