diff mbox

linux-next: Tree for Jun 25 [ kbuild or rapidio? ]

Message ID CA+icZUVcWAmbRGXqrbkPXux6hSpYVM2yAPfbv_q8Faf348TGyw@mail.gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Sedat Dilek June 25, 2013, 9:17 a.m. UTC
On Tue, Jun 25, 2013 at 10:55 AM, Sedat Dilek <sedat.dilek@gmail.com> wrote:
> On Tue, Jun 25, 2013 at 10:44 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> Hi all,
>>
>> Changes since 20130624:
>>
>> The vfs tree lost its build failure.
>>
>> The net-next tree gained a conflict against the net tree.
>>
>> The usb tree gained a conflict against the devicetree tree.
>>
>> The staging tree lost its build failure.
>>
>> The msm tree gained a conflict against the arm-soc tree.
>>
>> The samsung tree gained a conflict against the tip tree.
>>
>> The akpm tree lost a patch that turned up elsewhere and gained a conflict
>> against the samsung tree.
>>
>> ----------------------------------------------------------------------------
>>
>
> [ CC linux-kbuild folks ]
>
> Not sure what's going on, but I get this with today's Linux-Next.
> ( Yesterday's next-20130624 was OK. )
>
> $ LANG=C LC_ALL=C  yes "" | make oldconfig && LANG=C LC_ALL=C make
> silentoldconfig </dev/null
> ...
> #
> # configuration written to .config
> #
> scripts/kconfig/conf --silentoldconfig Kconfig
> *
> * Restart config...
> *
> *
> * Bus options (PCI etc.)
> *
> PCI support (PCI) [Y/n/?] y
>   Support mmconfig PCI config space access (PCI_MMCONFIG) [Y/n] y
>   Read CNB20LE Host Bridge Windows (PCI_CNB20LE_QUIRK) [N/y/?] n
>   PCI Express support (PCIEPORTBUS) [Y/n/?] y
>     PCI Express Hotplug driver (HOTPLUG_PCI_PCIE) [Y/n/m/?] y
>     Root Port Advanced Error Reporting support (PCIEAER) [Y/n/?] y
>       PCI Express ECRC settings control (PCIE_ECRC) [N/y/?] n
>       PCIe AER error injector support (PCIEAER_INJECT) [N/m/y/?] n
>     PCI Express ASPM control (PCIEASPM) [Y/n/?] y
>       Debug PCI Express ASPM (PCIEASPM_DEBUG) [N/y/?] n
>       Default ASPM policy
>       > 1. BIOS default (PCIEASPM_DEFAULT)
>         2. Powersave (PCIEASPM_POWERSAVE)
>         3. Performance (PCIEASPM_PERFORMANCE)
>       choice[1-3]: 1
> Message Signaled Interrupts (MSI and MSI-X) (PCI_MSI) [Y/?] y
> PCI Debugging (PCI_DEBUG) [N/y/?] n
> Enable PCI resource re-allocation detection (PCI_REALLOC_ENABLE_AUTO) [Y/n/?] y
> PCI Stub driver (PCI_STUB) [M/n/y/?] m
> Interrupts on hypertransport devices (HT_IRQ) [Y/n/?] y
> PCI IOV support (PCI_IOV) [Y/n/?] y
> PCI PRI support (PCI_PRI) [Y/?] y
> PCI PASID support (PCI_PASID) [Y/?] y
> PCI IO-APIC hotplug support (PCI_IOAPIC) [Y/n/m] y
> ISA-style DMA support (ISA_DMA_API) [Y/n/?] y
> RapidIO support (RAPIDIO) [Y/n/?] y
>   IDT Tsi721 PCI Express SRIO Controller support (RAPIDIO_TSI721) [Y/n/?] y
>   Discovery timeout duration (seconds) (RAPIDIO_DISC_TIMEOUT) [30] 30
>   Enable RapidIO Input/Output Ports (RAPIDIO_ENABLE_RX_TX_PORTS) [N/y/?] n
>   DMA Engine support for RapidIO (RAPIDIO_DMA_ENGINE) [Y/n/?] y
>   RapidIO subsystem debug messages (RAPIDIO_DEBUG) [N/y/?] n
>   Enumeration method [M/y/?] (NEW) aborted!
>
> Console input/output is redirected. Run 'make oldconfig' to update
> configuration.
>
> make[1]: *** [silentoldconfig] Error 1
> make: *** [silentoldconfig] Error 2
>

[ CC rapidio maintainers ]

Not sure if the Kconfig-logic is wrong for RAPIDIO... or
choice/endchoice has now problems with tristate...
Switching from tristate to bool makes the error go away.


Please, have a look at "rapidio: make enumeration/discovery configurable" [1].

[ drivers/rapidio/Kconfig ]
...
+choice
+ prompt "Enumeration method"
+ depends on RAPIDIO
+ default RAPIDIO_ENUM_BASIC
+ help
+ There are different enumeration and discovery mechanisms offered
+ for RapidIO subsystem. You may select single built-in method or
+ or any number of methods to be built as modules.
+ Selecting a built-in method disables use of loadable methods.
+
+ If unsure, select Basic built-in.
+
+config RAPIDIO_ENUM_BASIC
+ tristate "Basic"
+ help
+ This option includes basic RapidIO fabric enumeration and discovery
+ mechanism similar to one described in RapidIO specification Annex 1.
+
+endchoice
+
...

- Sedat -

[1] http://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/?id=a11650e11093ed57dca78bf16e7836517c599098

> - Sedat -
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Sedat Dilek June 25, 2013, 9:28 a.m. UTC | #1
On Tue, Jun 25, 2013 at 11:17 AM, Sedat Dilek <sedat.dilek@gmail.com> wrote:
> On Tue, Jun 25, 2013 at 10:55 AM, Sedat Dilek <sedat.dilek@gmail.com> wrote:
>> On Tue, Jun 25, 2013 at 10:44 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>> Hi all,
>>>
>>> Changes since 20130624:
>>>
>>> The vfs tree lost its build failure.
>>>
>>> The net-next tree gained a conflict against the net tree.
>>>
>>> The usb tree gained a conflict against the devicetree tree.
>>>
>>> The staging tree lost its build failure.
>>>
>>> The msm tree gained a conflict against the arm-soc tree.
>>>
>>> The samsung tree gained a conflict against the tip tree.
>>>
>>> The akpm tree lost a patch that turned up elsewhere and gained a conflict
>>> against the samsung tree.
>>>
>>> ----------------------------------------------------------------------------
>>>
>>
>> [ CC linux-kbuild folks ]
>>
>> Not sure what's going on, but I get this with today's Linux-Next.
>> ( Yesterday's next-20130624 was OK. )
>>
>> $ LANG=C LC_ALL=C  yes "" | make oldconfig && LANG=C LC_ALL=C make
>> silentoldconfig </dev/null
>> ...
>> #
>> # configuration written to .config
>> #
>> scripts/kconfig/conf --silentoldconfig Kconfig
>> *
>> * Restart config...
>> *
>> *
>> * Bus options (PCI etc.)
>> *
>> PCI support (PCI) [Y/n/?] y
>>   Support mmconfig PCI config space access (PCI_MMCONFIG) [Y/n] y
>>   Read CNB20LE Host Bridge Windows (PCI_CNB20LE_QUIRK) [N/y/?] n
>>   PCI Express support (PCIEPORTBUS) [Y/n/?] y
>>     PCI Express Hotplug driver (HOTPLUG_PCI_PCIE) [Y/n/m/?] y
>>     Root Port Advanced Error Reporting support (PCIEAER) [Y/n/?] y
>>       PCI Express ECRC settings control (PCIE_ECRC) [N/y/?] n
>>       PCIe AER error injector support (PCIEAER_INJECT) [N/m/y/?] n
>>     PCI Express ASPM control (PCIEASPM) [Y/n/?] y
>>       Debug PCI Express ASPM (PCIEASPM_DEBUG) [N/y/?] n
>>       Default ASPM policy
>>       > 1. BIOS default (PCIEASPM_DEFAULT)
>>         2. Powersave (PCIEASPM_POWERSAVE)
>>         3. Performance (PCIEASPM_PERFORMANCE)
>>       choice[1-3]: 1
>> Message Signaled Interrupts (MSI and MSI-X) (PCI_MSI) [Y/?] y
>> PCI Debugging (PCI_DEBUG) [N/y/?] n
>> Enable PCI resource re-allocation detection (PCI_REALLOC_ENABLE_AUTO) [Y/n/?] y
>> PCI Stub driver (PCI_STUB) [M/n/y/?] m
>> Interrupts on hypertransport devices (HT_IRQ) [Y/n/?] y
>> PCI IOV support (PCI_IOV) [Y/n/?] y
>> PCI PRI support (PCI_PRI) [Y/?] y
>> PCI PASID support (PCI_PASID) [Y/?] y
>> PCI IO-APIC hotplug support (PCI_IOAPIC) [Y/n/m] y
>> ISA-style DMA support (ISA_DMA_API) [Y/n/?] y
>> RapidIO support (RAPIDIO) [Y/n/?] y
>>   IDT Tsi721 PCI Express SRIO Controller support (RAPIDIO_TSI721) [Y/n/?] y
>>   Discovery timeout duration (seconds) (RAPIDIO_DISC_TIMEOUT) [30] 30
>>   Enable RapidIO Input/Output Ports (RAPIDIO_ENABLE_RX_TX_PORTS) [N/y/?] n
>>   DMA Engine support for RapidIO (RAPIDIO_DMA_ENGINE) [Y/n/?] y
>>   RapidIO subsystem debug messages (RAPIDIO_DEBUG) [N/y/?] n
>>   Enumeration method [M/y/?] (NEW) aborted!
>>
>> Console input/output is redirected. Run 'make oldconfig' to update
>> configuration.
>>
>> make[1]: *** [silentoldconfig] Error 1
>> make: *** [silentoldconfig] Error 2
>>
>
> [ CC rapidio maintainers ]
>
> Not sure if the Kconfig-logic is wrong for RAPIDIO... or
> choice/endchoice has now problems with tristate...
> Switching from tristate to bool makes the error go away.
>

So, it's a kbuild issue (info to the rapidio maintainers).

- Sedat -

http://marc.info/?l=linux-kbuild&m=137215211929876&w=2

> diff --git a/drivers/rapidio/Kconfig b/drivers/rapidio/Kconfig
> index 5ab0564..c43b413 100644
> --- a/drivers/rapidio/Kconfig
> +++ b/drivers/rapidio/Kconfig
> @@ -60,7 +60,7 @@ choice
>           If unsure, select Basic built-in.
>
>  config RAPIDIO_ENUM_BASIC
> -       tristate "Basic"
> +       bool "Basic"
>         help
>           This option includes basic RapidIO fabric enumeration and discovery
>           mechanism similar to one described in RapidIO specification Annex 1.
>
> Please, have a look at "rapidio: make enumeration/discovery configurable" [1].
>
> [ drivers/rapidio/Kconfig ]
> ...
> +choice
> + prompt "Enumeration method"
> + depends on RAPIDIO
> + default RAPIDIO_ENUM_BASIC
> + help
> + There are different enumeration and discovery mechanisms offered
> + for RapidIO subsystem. You may select single built-in method or
> + or any number of methods to be built as modules.
> + Selecting a built-in method disables use of loadable methods.
> +
> + If unsure, select Basic built-in.
> +
> +config RAPIDIO_ENUM_BASIC
> + tristate "Basic"
> + help
> + This option includes basic RapidIO fabric enumeration and discovery
> + mechanism similar to one described in RapidIO specification Annex 1.
> +
> +endchoice
> +
> ...
>
> - Sedat -
>
> [1] http://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/?id=a11650e11093ed57dca78bf16e7836517c599098
>
>> - Sedat -
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Yann E. MORIN June 25, 2013, 8:57 p.m. UTC | #2
Sedat, All,

On 2013-06-25 11:28 +0200, Sedat Dilek spake thusly:
> On Tue, Jun 25, 2013 at 11:17 AM, Sedat Dilek <sedat.dilek@gmail.com> wrote:
> > On Tue, Jun 25, 2013 at 10:55 AM, Sedat Dilek <sedat.dilek@gmail.com> wrote:
[--SNIP--]
> >> Not sure what's going on, but I get this with today's Linux-Next.
> >> ( Yesterday's next-20130624 was OK. )
> >>
> >> $ LANG=C LC_ALL=C  yes "" | make oldconfig && LANG=C LC_ALL=C make
> >> silentoldconfig </dev/null
[--SNIP--]
> >> RapidIO support (RAPIDIO) [Y/n/?] y
> >>   IDT Tsi721 PCI Express SRIO Controller support (RAPIDIO_TSI721) [Y/n/?] y
> >>   Discovery timeout duration (seconds) (RAPIDIO_DISC_TIMEOUT) [30] 30
> >>   Enable RapidIO Input/Output Ports (RAPIDIO_ENABLE_RX_TX_PORTS) [N/y/?] n
> >>   DMA Engine support for RapidIO (RAPIDIO_DMA_ENGINE) [Y/n/?] y
> >>   RapidIO subsystem debug messages (RAPIDIO_DEBUG) [N/y/?] n
> >>   Enumeration method [M/y/?] (NEW) aborted!
> >>
> >> Console input/output is redirected. Run 'make oldconfig' to update
> >> configuration.
> >>
> >> make[1]: *** [silentoldconfig] Error 1
> >> make: *** [silentoldconfig] Error 2
[--SNIP--]
> So, it's a kbuild issue (info to the rapidio maintainers).

To be true, it's a kconfig (not kbuild) issue I introduced when trying
to fix choice randomisation.

Regards,
Yann E. MORIN.
Sedat Dilek June 25, 2013, 9:22 p.m. UTC | #3
On Tue, Jun 25, 2013 at 10:57 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> Sedat, All,
>
> On 2013-06-25 11:28 +0200, Sedat Dilek spake thusly:
>> On Tue, Jun 25, 2013 at 11:17 AM, Sedat Dilek <sedat.dilek@gmail.com> wrote:
>> > On Tue, Jun 25, 2013 at 10:55 AM, Sedat Dilek <sedat.dilek@gmail.com> wrote:
> [--SNIP--]
>> >> Not sure what's going on, but I get this with today's Linux-Next.
>> >> ( Yesterday's next-20130624 was OK. )
>> >>
>> >> $ LANG=C LC_ALL=C  yes "" | make oldconfig && LANG=C LC_ALL=C make
>> >> silentoldconfig </dev/null
> [--SNIP--]
>> >> RapidIO support (RAPIDIO) [Y/n/?] y
>> >>   IDT Tsi721 PCI Express SRIO Controller support (RAPIDIO_TSI721) [Y/n/?] y
>> >>   Discovery timeout duration (seconds) (RAPIDIO_DISC_TIMEOUT) [30] 30
>> >>   Enable RapidIO Input/Output Ports (RAPIDIO_ENABLE_RX_TX_PORTS) [N/y/?] n
>> >>   DMA Engine support for RapidIO (RAPIDIO_DMA_ENGINE) [Y/n/?] y
>> >>   RapidIO subsystem debug messages (RAPIDIO_DEBUG) [N/y/?] n
>> >>   Enumeration method [M/y/?] (NEW) aborted!
>> >>
>> >> Console input/output is redirected. Run 'make oldconfig' to update
>> >> configuration.
>> >>
>> >> make[1]: *** [silentoldconfig] Error 1
>> >> make: *** [silentoldconfig] Error 2
> [--SNIP--]
>> So, it's a kbuild issue (info to the rapidio maintainers).
>
> To be true, it's a kconfig (not kbuild) issue I introduced when trying
> to fix choice randomisation.
>

I was not precise enough "linux-kbuild" (I know there exists kbuild
and kconfig).

BTW, there is another GIT tree (from rostedt) containing kconfig stuff
in Linux-Next (seems not to be very active).

kbuild		git	git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#for-next
kconfig		git	git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig.git#for-next

Confusing :-).

- Sedat -

http://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/tree/Next/Trees#n96
http://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/tree/Next/Trees#n97

> Regards,
> Yann E. MORIN.
>
> --
> .-----------------.--------------------.------------------.--------------------.
> |  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> | +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
> | +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
> '------------------------------^-------^------------------^--------------------'
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/rapidio/Kconfig b/drivers/rapidio/Kconfig
index 5ab0564..c43b413 100644
--- a/drivers/rapidio/Kconfig
+++ b/drivers/rapidio/Kconfig
@@ -60,7 +60,7 @@  choice
          If unsure, select Basic built-in.

 config RAPIDIO_ENUM_BASIC
-       tristate "Basic"
+       bool "Basic"
        help
          This option includes basic RapidIO fabric enumeration and discovery
          mechanism similar to one described in RapidIO specification Annex 1.