Message ID | 1484135195-29232-1-git-send-email-marcel@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
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 \ > {\ >
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 \ > > {\ > >
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 \ >>> {\ >>>
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 \ {\
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(-)