[PATCH] PCI: pciehp: Convert pciehp to be builtin only, not modular

[PATCH] PCI: pciehp: Convert pciehp to be builtin only, not modular

[Bjorn Helgaas]

I originally intended to merge this patch for v3.12.

However, Yinghai is working on a regression fix ("PCI: Separate stop and
remove devices in pciehp") that needs to go into v3.11, and his fix will be
simpler if we remove the module option for pciehp in v3.11.  That will mean
he won't have to export pci_stop_bus_device() and pci_remove_bus_device()
for use by modules.

I think this will be pretty safe because we already supported pciehp
being built-in and RHEL6 and Ubuntu 12.10 already make it built-in.

Therefore, I propose to put this in my for-linus branch and merge it
for v3.11.

---

Bjorn Helgaas (1):
      PCI: pciehp: Convert pciehp to be builtin only, not modular


 drivers/pci/pcie/Kconfig |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

[PATCH] PCI: pciehp: Convert pciehp to be builtin only, not modular

[Bjorn Helgaas]

Convert pciehp to be builtin only, with no module option.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
 drivers/pci/pcie/Kconfig |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/pci/pcie/Kconfig b/drivers/pci/pcie/Kconfig
index 569f82f..3b94cfc 100644
--- a/drivers/pci/pcie/Kconfig
+++ b/drivers/pci/pcie/Kconfig
@@ -14,15 +14,12 @@ config PCIEPORTBUS
 # Include service Kconfig here
 #
 config HOTPLUG_PCI_PCIE
-	tristate "PCI Express Hotplug driver"
+	bool "PCI Express Hotplug driver"
 	depends on HOTPLUG_PCI && PCIEPORTBUS
 	help
 	  Say Y here if you have a motherboard that supports PCI Express Native
 	  Hotplug
 
-	  To compile this driver as a module, choose M here: the
-	  module will be called pciehp.
-
 	  When in doubt, say N.
 
 source "drivers/pci/pcie/aer/Kconfig"

Re: [PATCH] PCI: pciehp: Convert pciehp to be builtin only, not modular

[Rafael J. Wysocki]

On Tuesday, July 23, 2013 12:08:21 PM Bjorn Helgaas wrote:
> Convert pciehp to be builtin only, with no module option.
> 
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

> ---
>  drivers/pci/pcie/Kconfig |    5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/drivers/pci/pcie/Kconfig b/drivers/pci/pcie/Kconfig
> index 569f82f..3b94cfc 100644
> --- a/drivers/pci/pcie/Kconfig
> +++ b/drivers/pci/pcie/Kconfig
> @@ -14,15 +14,12 @@ config PCIEPORTBUS
>  # Include service Kconfig here
>  #
>  config HOTPLUG_PCI_PCIE
> -	tristate "PCI Express Hotplug driver"
> +	bool "PCI Express Hotplug driver"
>  	depends on HOTPLUG_PCI && PCIEPORTBUS
>  	help
>  	  Say Y here if you have a motherboard that supports PCI Express Native
>  	  Hotplug
>  
> -	  To compile this driver as a module, choose M here: the
> -	  module will be called pciehp.
> -
>  	  When in doubt, say N.
>  
>  source "drivers/pci/pcie/aer/Kconfig"
> 
-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.

Re: [PATCH] PCI: pciehp: Convert pciehp to be builtin only, not modular

[Yinghai Lu]

On Tue, Jul 23, 2013 at 11:08 AM, Bjorn Helgaas <bhelgaas@google.com> wrote:
> Convert pciehp to be builtin only, with no module option.
>
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
> ---
>  drivers/pci/pcie/Kconfig |    5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/drivers/pci/pcie/Kconfig b/drivers/pci/pcie/Kconfig
> index 569f82f..3b94cfc 100644
> --- a/drivers/pci/pcie/Kconfig
> +++ b/drivers/pci/pcie/Kconfig
> @@ -14,15 +14,12 @@ config PCIEPORTBUS
>  # Include service Kconfig here
>  #
>  config HOTPLUG_PCI_PCIE
> -       tristate "PCI Express Hotplug driver"
> +       bool "PCI Express Hotplug driver"
>         depends on HOTPLUG_PCI && PCIEPORTBUS

HOTPLUG_PCI is still tristate,

 menuconfig HOTPLUG_PCI
        tristate "Support for PCI Hotplug"


Can you make HOTPLUG_PCI to be built-in ?

or to be more aggressive, just kill HOTPLUG_PCI as with HOTPLUG.

Thanks

Yinghai

>         help
>           Say Y here if you have a motherboard that supports PCI Express Native
>           Hotplug
>
> -         To compile this driver as a module, choose M here: the
> -         module will be called pciehp.
> -
>           When in doubt, say N.
>
>  source "drivers/pci/pcie/aer/Kconfig"
>

Re: [PATCH] PCI: pciehp: Convert pciehp to be builtin only, not modular

[Bjorn Helgaas]

On Tue, Jul 23, 2013 at 5:10 PM, Yinghai Lu <yinghai@kernel.org> wrote:
> On Tue, Jul 23, 2013 at 11:08 AM, Bjorn Helgaas <bhelgaas@google.com> wrote:
>> Convert pciehp to be builtin only, with no module option.
>>
>> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
>> ---
>>  drivers/pci/pcie/Kconfig |    5 +----
>>  1 file changed, 1 insertion(+), 4 deletions(-)
>>
>> diff --git a/drivers/pci/pcie/Kconfig b/drivers/pci/pcie/Kconfig
>> index 569f82f..3b94cfc 100644
>> --- a/drivers/pci/pcie/Kconfig
>> +++ b/drivers/pci/pcie/Kconfig
>> @@ -14,15 +14,12 @@ config PCIEPORTBUS
>>  # Include service Kconfig here
>>  #
>>  config HOTPLUG_PCI_PCIE
>> -       tristate "PCI Express Hotplug driver"
>> +       bool "PCI Express Hotplug driver"
>>         depends on HOTPLUG_PCI && PCIEPORTBUS
>
> HOTPLUG_PCI is still tristate,
>
>  menuconfig HOTPLUG_PCI
>         tristate "Support for PCI Hotplug"
>
>
> Can you make HOTPLUG_PCI to be built-in ?

Is that necessary for this CONFIG_HOTPLUG_PCI_PCIE change?  The config
tools are smart enough to only offer CONFIG_HOTPLUG_PCI_PCIE as an
option when CONFIG_HOTPLUG_PCI=y, so I'm not sure it's actually a
problem yet.

> or to be more aggressive, just kill HOTPLUG_PCI as with HOTPLUG.

Getting rid of CONFIG_HOTPLUG let us get rid of all the __devinit*
markings, which helps avoid a whole class of bugs.  That doesn't apply
to CONFIG_HOTPLUG_PCI, of course.

But if somebody wants to do the work and see if it's useful to remove
CONFIG_HOTPLUG_PCI, I'm certainly willing to consider it.  I'm sure
most general-purpose distros will set CONFIG_HOTPLUG_PCI=y and
CONFIG_HOTPLUG_PCI_PCIE=y, but I wouldn't be surprised if embedded
folks still leave them both disabled.

Bjorn

Re: [PATCH] PCI: pciehp: Convert pciehp to be builtin only, not modular

[Don Dutile]

On 07/23/2013 02:08 PM, Bjorn Helgaas wrote:
> Convert pciehp to be builtin only, with no module option.
>
> Signed-off-by: Bjorn Helgaas<bhelgaas@google.com>

Acked-by: Donald Dutile <ddutile@redhat.com>

> ---
>   drivers/pci/pcie/Kconfig |    5 +----
>   1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/drivers/pci/pcie/Kconfig b/drivers/pci/pcie/Kconfig
> index 569f82f..3b94cfc 100644
> --- a/drivers/pci/pcie/Kconfig
> +++ b/drivers/pci/pcie/Kconfig
> @@ -14,15 +14,12 @@ config PCIEPORTBUS
>   # Include service Kconfig here
>   #
>   config HOTPLUG_PCI_PCIE
> -	tristate "PCI Express Hotplug driver"
> +	bool "PCI Express Hotplug driver"
>   	depends on HOTPLUG_PCI&&  PCIEPORTBUS
>   	help
>   	  Say Y here if you have a motherboard that supports PCI Express Native
>   	  Hotplug
>
> -	  To compile this driver as a module, choose M here: the
> -	  module will be called pciehp.
> -
>   	  When in doubt, say N.
>
>   source "drivers/pci/pcie/aer/Kconfig"
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] PCI: pciehp: Convert pciehp to be builtin only, not modular

[Yinghai Lu]

On Wed, Jul 24, 2013 at 10:59 AM, Bjorn Helgaas <bhelgaas@google.com> wrote:
> On Tue, Jul 23, 2013 at 5:10 PM, Yinghai Lu <yinghai@kernel.org> wrote:
>> On Tue, Jul 23, 2013 at 11:08 AM, Bjorn Helgaas <bhelgaas@google.com> wrote:
>>> Convert pciehp to be builtin only, with no module option.
>>>
>>> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
>>> ---
>>>  drivers/pci/pcie/Kconfig |    5 +----
>>>  1 file changed, 1 insertion(+), 4 deletions(-)
>>>
>>> diff --git a/drivers/pci/pcie/Kconfig b/drivers/pci/pcie/Kconfig
>>> index 569f82f..3b94cfc 100644
>>> --- a/drivers/pci/pcie/Kconfig
>>> +++ b/drivers/pci/pcie/Kconfig
>>> @@ -14,15 +14,12 @@ config PCIEPORTBUS
>>>  # Include service Kconfig here
>>>  #
>>>  config HOTPLUG_PCI_PCIE
>>> -       tristate "PCI Express Hotplug driver"
>>> +       bool "PCI Express Hotplug driver"
>>>         depends on HOTPLUG_PCI && PCIEPORTBUS
>>
>> HOTPLUG_PCI is still tristate,
>>
>>  menuconfig HOTPLUG_PCI
>>         tristate "Support for PCI Hotplug"
>>
>>
>> Can you make HOTPLUG_PCI to be built-in ?
>
> Is that necessary for this CONFIG_HOTPLUG_PCI_PCIE change?  The config
> tools are smart enough to only offer CONFIG_HOTPLUG_PCI_PCIE as an
> option when CONFIG_HOTPLUG_PCI=y, so I'm not sure it's actually a
> problem yet.

a little weird.
before this change normally
CONFIG_HOTPLUG_PCI=m, and CONFIG_HOTPLUG_PCI_PCIE=m.

now if user may select
CONFIG_HOTPLUG_PCI=m, and CONFIG_HOTPLUG_PCI_PCIE=y
never test that if it is really work.

>
>> or to be more aggressive, just kill HOTPLUG_PCI as with HOTPLUG.
>
> Getting rid of CONFIG_HOTPLUG let us get rid of all the __devinit*
> markings, which helps avoid a whole class of bugs.  That doesn't apply
> to CONFIG_HOTPLUG_PCI, of course.
>
> But if somebody wants to do the work and see if it's useful to remove
> CONFIG_HOTPLUG_PCI, I'm certainly willing to consider it.  I'm sure
> most general-purpose distros will set CONFIG_HOTPLUG_PCI=y and
> CONFIG_HOTPLUG_PCI_PCIE=y, but I wouldn't be surprised if embedded
> folks still leave them both disabled.

ok, let's leave HOTPLUG_PCI alone.

Yinghai

Re: [PATCH] PCI: pciehp: Convert pciehp to be builtin only, not modular

[Bjorn Helgaas]

On Thu, Jul 25, 2013 at 7:14 AM, Yinghai Lu <yinghai@kernel.org> wrote:
> On Wed, Jul 24, 2013 at 10:59 AM, Bjorn Helgaas <bhelgaas@google.com> wrote:
>> On Tue, Jul 23, 2013 at 5:10 PM, Yinghai Lu <yinghai@kernel.org> wrote:
>>> On Tue, Jul 23, 2013 at 11:08 AM, Bjorn Helgaas <bhelgaas@google.com> wrote:
>>>> Convert pciehp to be builtin only, with no module option.
>>>>
>>>> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
>>>> ---
>>>>  drivers/pci/pcie/Kconfig |    5 +----
>>>>  1 file changed, 1 insertion(+), 4 deletions(-)
>>>>
>>>> diff --git a/drivers/pci/pcie/Kconfig b/drivers/pci/pcie/Kconfig
>>>> index 569f82f..3b94cfc 100644
>>>> --- a/drivers/pci/pcie/Kconfig
>>>> +++ b/drivers/pci/pcie/Kconfig
>>>> @@ -14,15 +14,12 @@ config PCIEPORTBUS
>>>>  # Include service Kconfig here
>>>>  #
>>>>  config HOTPLUG_PCI_PCIE
>>>> -       tristate "PCI Express Hotplug driver"
>>>> +       bool "PCI Express Hotplug driver"
>>>>         depends on HOTPLUG_PCI && PCIEPORTBUS
>>>
>>> HOTPLUG_PCI is still tristate,
>>>
>>>  menuconfig HOTPLUG_PCI
>>>         tristate "Support for PCI Hotplug"
>>>
>>>
>>> Can you make HOTPLUG_PCI to be built-in ?
>>
>> Is that necessary for this CONFIG_HOTPLUG_PCI_PCIE change?  The config
>> tools are smart enough to only offer CONFIG_HOTPLUG_PCI_PCIE as an
>> option when CONFIG_HOTPLUG_PCI=y, so I'm not sure it's actually a
>> problem yet.
>
> a little weird.
> before this change normally
> CONFIG_HOTPLUG_PCI=m, and CONFIG_HOTPLUG_PCI_PCIE=m.
>
> now if user may select
> CONFIG_HOTPLUG_PCI=m, and CONFIG_HOTPLUG_PCI_PCIE=y
> never test that if it is really work.

Ooh, you're right!  I tried CONFIG_HOTPLUG_PCI=m and
CONFIG_HOTPLUG_PCI_PCIE=y, and config *allows* that and builds a
working kernel (though pciehp doesn't actually work), even though I
don't think menuconfig will actually generate that combination.  I'll
convert CONFIG_HOTPLUG_PCI to a bool as well.

Bjorn