* [Qemu-devel] [PATCH V2] hw/pci: disable pci-bridge's shpc by default
@ 2017-01-11 11:46 Marcel Apfelbaum
2017-01-24 16:23 ` Marcel Apfelbaum
0 siblings, 1 reply; 4+ messages in thread
From: Marcel Apfelbaum @ 2017-01-11 11:46 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, marcel
The shpc component is optional while ACPI hotplug is used
for hot-plugging PCI devices into a PCI-PCI bridge.
Disabling the shpc by default will make slot 0 usable at boot time
and not only for hot-plug, without loosing any functionality.
Older machines will have shpc enabled for compatibility reasons.
Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
---
v1 -> v2:
- Moved the compat property to HW_COMPAT_2_8
hw/pci-bridge/pci_bridge_dev.c | 2 +-
include/hw/compat.h | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/hw/pci-bridge/pci_bridge_dev.c b/hw/pci-bridge/pci_bridge_dev.c
index 5dbd933..647ad80 100644
--- a/hw/pci-bridge/pci_bridge_dev.c
+++ b/hw/pci-bridge/pci_bridge_dev.c
@@ -163,7 +163,7 @@ static Property pci_bridge_dev_properties[] = {
DEFINE_PROP_ON_OFF_AUTO(PCI_BRIDGE_DEV_PROP_MSI, PCIBridgeDev, msi,
ON_OFF_AUTO_AUTO),
DEFINE_PROP_BIT(PCI_BRIDGE_DEV_PROP_SHPC, PCIBridgeDev, flags,
- PCI_BRIDGE_DEV_F_SHPC_REQ, true),
+ PCI_BRIDGE_DEV_F_SHPC_REQ, false),
DEFINE_PROP_END_OF_LIST(),
};
diff --git a/include/hw/compat.h b/include/hw/compat.h
index 4fe44d1..428c127 100644
--- a/include/hw/compat.h
+++ b/include/hw/compat.h
@@ -2,7 +2,11 @@
#define HW_COMPAT_H
#define HW_COMPAT_2_8 \
- /* empty */
+ {\
+ .driver = "pci-bridge",\
+ .property = "shpc",\
+ .value = "on",\
+ },
#define HW_COMPAT_2_7 \
{\
--
2.5.5
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH V2] hw/pci: disable pci-bridge's shpc by default
2017-01-11 11:46 [Qemu-devel] [PATCH V2] hw/pci: disable pci-bridge's shpc by default Marcel Apfelbaum
@ 2017-01-24 16:23 ` Marcel Apfelbaum
2017-01-24 16:30 ` Michael S. Tsirkin
0 siblings, 1 reply; 4+ messages in thread
From: Marcel Apfelbaum @ 2017-01-24 16:23 UTC (permalink / raw)
To: qemu-devel, mst
On 01/11/2017 01:46 PM, Marcel Apfelbaum wrote:
> The shpc component is optional while ACPI hotplug is used
> for hot-plugging PCI devices into a PCI-PCI bridge.
> Disabling the shpc by default will make slot 0 usable at boot time
> and not only for hot-plug, without loosing any functionality.
> Older machines will have shpc enabled for compatibility reasons.
>
> Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
> ---
> v1 -> v2:
> - Moved the compat property to HW_COMPAT_2_8
>
Hi Michael,
Can you please merge this?
Thanks,
Marcel
> hw/pci-bridge/pci_bridge_dev.c | 2 +-
> include/hw/compat.h | 6 +++++-
> 2 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/hw/pci-bridge/pci_bridge_dev.c b/hw/pci-bridge/pci_bridge_dev.c
> index 5dbd933..647ad80 100644
> --- a/hw/pci-bridge/pci_bridge_dev.c
> +++ b/hw/pci-bridge/pci_bridge_dev.c
> @@ -163,7 +163,7 @@ static Property pci_bridge_dev_properties[] = {
> DEFINE_PROP_ON_OFF_AUTO(PCI_BRIDGE_DEV_PROP_MSI, PCIBridgeDev, msi,
> ON_OFF_AUTO_AUTO),
> DEFINE_PROP_BIT(PCI_BRIDGE_DEV_PROP_SHPC, PCIBridgeDev, flags,
> - PCI_BRIDGE_DEV_F_SHPC_REQ, true),
> + PCI_BRIDGE_DEV_F_SHPC_REQ, false),
> DEFINE_PROP_END_OF_LIST(),
> };
>
> diff --git a/include/hw/compat.h b/include/hw/compat.h
> index 4fe44d1..428c127 100644
> --- a/include/hw/compat.h
> +++ b/include/hw/compat.h
> @@ -2,7 +2,11 @@
> #define HW_COMPAT_H
>
> #define HW_COMPAT_2_8 \
> - /* empty */
> + {\
> + .driver = "pci-bridge",\
> + .property = "shpc",\
> + .value = "on",\
> + },
>
> #define HW_COMPAT_2_7 \
> {\
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH V2] hw/pci: disable pci-bridge's shpc by default
2017-01-24 16:23 ` Marcel Apfelbaum
@ 2017-01-24 16:30 ` Michael S. Tsirkin
2017-01-25 8:45 ` Marcel Apfelbaum
0 siblings, 1 reply; 4+ messages in thread
From: Michael S. Tsirkin @ 2017-01-24 16:30 UTC (permalink / raw)
To: Marcel Apfelbaum; +Cc: qemu-devel
On Tue, Jan 24, 2017 at 06:23:49PM +0200, Marcel Apfelbaum wrote:
> On 01/11/2017 01:46 PM, Marcel Apfelbaum wrote:
> > The shpc component is optional while ACPI hotplug is used
> > for hot-plugging PCI devices into a PCI-PCI bridge.
> > Disabling the shpc by default will make slot 0 usable at boot time
> > and not only for hot-plug, without loosing any functionality.
> > Older machines will have shpc enabled for compatibility reasons.
> >
> > Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
> > ---
> > v1 -> v2:
> > - Moved the compat property to HW_COMPAT_2_8
> >
>
> Hi Michael,
> Can you please merge this?
>
> Thanks,
> Marcel
Yes but pls rebase to master.
> > hw/pci-bridge/pci_bridge_dev.c | 2 +-
> > include/hw/compat.h | 6 +++++-
> > 2 files changed, 6 insertions(+), 2 deletions(-)
> >
> > diff --git a/hw/pci-bridge/pci_bridge_dev.c b/hw/pci-bridge/pci_bridge_dev.c
> > index 5dbd933..647ad80 100644
> > --- a/hw/pci-bridge/pci_bridge_dev.c
> > +++ b/hw/pci-bridge/pci_bridge_dev.c
> > @@ -163,7 +163,7 @@ static Property pci_bridge_dev_properties[] = {
> > DEFINE_PROP_ON_OFF_AUTO(PCI_BRIDGE_DEV_PROP_MSI, PCIBridgeDev, msi,
> > ON_OFF_AUTO_AUTO),
> > DEFINE_PROP_BIT(PCI_BRIDGE_DEV_PROP_SHPC, PCIBridgeDev, flags,
> > - PCI_BRIDGE_DEV_F_SHPC_REQ, true),
> > + PCI_BRIDGE_DEV_F_SHPC_REQ, false),
> > DEFINE_PROP_END_OF_LIST(),
> > };
> >
> > diff --git a/include/hw/compat.h b/include/hw/compat.h
> > index 4fe44d1..428c127 100644
> > --- a/include/hw/compat.h
> > +++ b/include/hw/compat.h
> > @@ -2,7 +2,11 @@
> > #define HW_COMPAT_H
> >
> > #define HW_COMPAT_2_8 \
> > - /* empty */
> > + {\
> > + .driver = "pci-bridge",\
> > + .property = "shpc",\
> > + .value = "on",\
> > + },
> >
> > #define HW_COMPAT_2_7 \
> > {\
> >
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH V2] hw/pci: disable pci-bridge's shpc by default
2017-01-24 16:30 ` Michael S. Tsirkin
@ 2017-01-25 8:45 ` Marcel Apfelbaum
0 siblings, 0 replies; 4+ messages in thread
From: Marcel Apfelbaum @ 2017-01-25 8:45 UTC (permalink / raw)
To: Michael S. Tsirkin; +Cc: qemu-devel
On 01/24/2017 06:30 PM, Michael S. Tsirkin wrote:
> On Tue, Jan 24, 2017 at 06:23:49PM +0200, Marcel Apfelbaum wrote:
>> On 01/11/2017 01:46 PM, Marcel Apfelbaum wrote:
>>> The shpc component is optional while ACPI hotplug is used
>>> for hot-plugging PCI devices into a PCI-PCI bridge.
>>> Disabling the shpc by default will make slot 0 usable at boot time
>>> and not only for hot-plug, without loosing any functionality.
>>> Older machines will have shpc enabled for compatibility reasons.
>>>
>>> Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
>>> ---
>>> v1 -> v2:
>>> - Moved the compat property to HW_COMPAT_2_8
>>>
>>
>> Hi Michael,
>> Can you please merge this?
>>
>> Thanks,
>> Marcel
>
> Yes but pls rebase to master.
Posted V3.
Thanks,
Marcel
>>> hw/pci-bridge/pci_bridge_dev.c | 2 +-
>>> include/hw/compat.h | 6 +++++-
>>> 2 files changed, 6 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/hw/pci-bridge/pci_bridge_dev.c b/hw/pci-bridge/pci_bridge_dev.c
>>> index 5dbd933..647ad80 100644
>>> --- a/hw/pci-bridge/pci_bridge_dev.c
>>> +++ b/hw/pci-bridge/pci_bridge_dev.c
>>> @@ -163,7 +163,7 @@ static Property pci_bridge_dev_properties[] = {
>>> DEFINE_PROP_ON_OFF_AUTO(PCI_BRIDGE_DEV_PROP_MSI, PCIBridgeDev, msi,
>>> ON_OFF_AUTO_AUTO),
>>> DEFINE_PROP_BIT(PCI_BRIDGE_DEV_PROP_SHPC, PCIBridgeDev, flags,
>>> - PCI_BRIDGE_DEV_F_SHPC_REQ, true),
>>> + PCI_BRIDGE_DEV_F_SHPC_REQ, false),
>>> DEFINE_PROP_END_OF_LIST(),
>>> };
>>>
>>> diff --git a/include/hw/compat.h b/include/hw/compat.h
>>> index 4fe44d1..428c127 100644
>>> --- a/include/hw/compat.h
>>> +++ b/include/hw/compat.h
>>> @@ -2,7 +2,11 @@
>>> #define HW_COMPAT_H
>>>
>>> #define HW_COMPAT_2_8 \
>>> - /* empty */
>>> + {\
>>> + .driver = "pci-bridge",\
>>> + .property = "shpc",\
>>> + .value = "on",\
>>> + },
>>>
>>> #define HW_COMPAT_2_7 \
>>> {\
>>>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-01-25 8:45 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-11 11:46 [Qemu-devel] [PATCH V2] hw/pci: disable pci-bridge's shpc by default Marcel Apfelbaum
2017-01-24 16:23 ` Marcel Apfelbaum
2017-01-24 16:30 ` Michael S. Tsirkin
2017-01-25 8:45 ` Marcel Apfelbaum
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.