All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] non-existant config in kernel source (CONFIG_AHCI)
@ 2010-02-05 13:29 Christoph Egger
  2010-02-05 13:57 ` Frans Pop
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Christoph Egger @ 2010-02-05 13:29 UTC (permalink / raw)
  To: Jeff Garzik, Erik Inge Bols??,
	Bartlomiej Zolnierkiewicz, linux-ide, linux-kernel
  Cc: vamos, Alan Cox

Hi all!

	As part of the VAMOS[0] research project at the University of
Erlangen we're checking referential integrity between kernel KConfig
options and in-code Conditional blocks.

	While there's one place that is checking for CONFIG_AHCI, this
config being referenced from printed books and people pointing to this
config item I can't find it anywhere in the kernel kconfig
infrastruture and it doesn't seem to ever have been there (since
git). Is this maybe a typo for CONFIG_SATA_AHCI? reading the
information for the affected piece of source it would actually make
sense.

	Please keep me informed of this patch getting confirmed /
merged so we can keep track of it.

Regards

	Christoph Egger

[0] http://vamos1.informatik.uni-erlangen.de/

----
>From 60136f94d9c97f9a788738e30731e25bd794322b Mon Sep 17 00:00:00 2001
From: Christoph Egger <siccegge@stud.informatik.uni-erlangen.de>
Date: Fri, 5 Feb 2010 13:26:33 +0100
Subject: [PATCH] CONFIG_AHCI is really CONFIG_SATA_AHCI

The marvell driver comtains a fallback to ahci for the sata ports
which is incorrectly checked as CONFIG_AHCI while the only AHCI config
item is actually called SATA_AHCI (which also sounds sensible
considering it's a fallback for the sata ports).

Signed-off-by: Christoph Egger <siccegge@stud.informatik.uni-erlangen.de>
---
 drivers/ata/pata_marvell.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c
index 950da39..eabd138 100644
--- a/drivers/ata/pata_marvell.c
+++ b/drivers/ata/pata_marvell.c
@@ -147,7 +147,7 @@ static int marvell_init_one (struct pci_dev *pdev, const struct pci_device_id *i
 	if (pdev->device == 0x6101)
 		ppi[1] = &ata_dummy_port_info;
 
-#if defined(CONFIG_AHCI) || defined(CONFIG_AHCI_MODULE)
+#if defined(CONFIG_SATA_AHCI) || defined(SATA_CONFIG_AHCI_MODULE)
 	if (!marvell_pata_active(pdev)) {
 		printk(KERN_INFO DRV_NAME ": PATA port not active, deferring to AHCI driver.\n");
 		return -ENODEV;
-- 
1.6.3.3



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH] non-existant config in kernel source (CONFIG_AHCI)
  2010-02-05 13:29 [PATCH] non-existant config in kernel source (CONFIG_AHCI) Christoph Egger
@ 2010-02-05 13:57 ` Frans Pop
  2010-02-05 15:26   ` Christoph Egger
  2010-02-05 14:08 ` Sergei Shtylyov
  2010-02-05 17:32 ` Randy Dunlap
  2 siblings, 1 reply; 6+ messages in thread
From: Frans Pop @ 2010-02-05 13:57 UTC (permalink / raw)
  To: Christoph Egger
  Cc: jgarzik, knan-lkml, bzolnier, linux-ide, linux-kernel, vamos, alan

Christoph Egger wrote:
> --- a/drivers/ata/pata_marvell.c
> +++ b/drivers/ata/pata_marvell.c
> @@ -147,7 +147,7 @@ static int marvell_init_one (struct pci_dev *pdev,
> 	if (pdev->device == 0x6101)
>		ppi[1] = &ata_dummy_port_info;
> 
> -#if defined(CONFIG_AHCI) || defined(CONFIG_AHCI_MODULE)
> +#if defined(CONFIG_SATA_AHCI) || defined(SATA_CONFIG_AHCI_MODULE)

Shouldn't the last be CONFIG_SATA_AHCI_MODULE ?

Cheers,
FJP

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] non-existant config in kernel source (CONFIG_AHCI)
  2010-02-05 13:29 [PATCH] non-existant config in kernel source (CONFIG_AHCI) Christoph Egger
  2010-02-05 13:57 ` Frans Pop
@ 2010-02-05 14:08 ` Sergei Shtylyov
  2010-02-05 17:32 ` Randy Dunlap
  2 siblings, 0 replies; 6+ messages in thread
From: Sergei Shtylyov @ 2010-02-05 14:08 UTC (permalink / raw)
  To: Christoph Egger
  Cc: Jeff Garzik, Erik Inge Bols??,
	Bartlomiej Zolnierkiewicz, linux-ide, linux-kernel, vamos,
	Alan Cox

Hello.

Christoph Egger wrote:

> 	As part of the VAMOS[0] research project at the University of
> Erlangen we're checking referential integrity between kernel KConfig
> options and in-code Conditional blocks.
>
> 	While there's one place that is checking for CONFIG_AHCI, this
> config being referenced from printed books and people pointing to this
> config item I can't find it anywhere in the kernel kconfig
> infrastruture and it doesn't seem to ever have been there (since
> git). Is this maybe a typo for CONFIG_SATA_AHCI? reading the
> information for the affected piece of source it would actually make
> sense.
>
> 	Please keep me informed of this patch getting confirmed /
> merged so we can keep track of it.
>
> Regards
>
> 	Christoph Egger
>
> [0] http://vamos1.informatik.uni-erlangen.de/
>
> ----
> From 60136f94d9c97f9a788738e30731e25bd794322b Mon Sep 17 00:00:00 2001
> From: Christoph Egger <siccegge@stud.informatik.uni-erlangen.de>
> Date: Fri, 5 Feb 2010 13:26:33 +0100
> Subject: [PATCH] CONFIG_AHCI is really CONFIG_SATA_AHCI
>
> The marvell driver comtains a fallback to ahci for the sata ports
>   

   Only "contains".

> which is incorrectly checked as CONFIG_AHCI while the only AHCI config
> item is actually called SATA_AHCI (which also sounds sensible
> considering it's a fallback for the sata ports).
>
> Signed-off-by: Christoph Egger <siccegge@stud.informatik.uni-erlangen.de>
> ---
>  drivers/ata/pata_marvell.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c
> index 950da39..eabd138 100644
> --- a/drivers/ata/pata_marvell.c
> +++ b/drivers/ata/pata_marvell.c
> @@ -147,7 +147,7 @@ static int marvell_init_one (struct pci_dev *pdev, const struct pci_device_id *i
>  	if (pdev->device == 0x6101)
>  		ppi[1] = &ata_dummy_port_info;
>  
> -#if defined(CONFIG_AHCI) || defined(CONFIG_AHCI_MODULE)
> +#if defined(CONFIG_SATA_AHCI) || defined(SATA_CONFIG_AHCI_MODULE)
>   

   You surely meant CONFIG_SATA_AHCI_MODULE.

WBR, Sergei

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] non-existant config in kernel source (CONFIG_AHCI)
  2010-02-05 13:57 ` Frans Pop
@ 2010-02-05 15:26   ` Christoph Egger
  2010-02-13 22:49     ` Jeff Garzik
  0 siblings, 1 reply; 6+ messages in thread
From: Christoph Egger @ 2010-02-05 15:26 UTC (permalink / raw)
  To: Frans Pop
  Cc: jgarzik, knan-lkml, bzolnier, linux-ide, linux-kernel, vamos, alan

On Fri, Feb 05, 2010 at 02:57:00PM +0100, Frans Pop wrote:
> Christoph Egger wrote:
> > --- a/drivers/ata/pata_marvell.c
> > +++ b/drivers/ata/pata_marvell.c
> > @@ -147,7 +147,7 @@ static int marvell_init_one (struct pci_dev *pdev,
> > 	if (pdev->device == 0x6101)
> >		ppi[1] = &ata_dummy_port_info;
> > 
> > -#if defined(CONFIG_AHCI) || defined(CONFIG_AHCI_MODULE)
> > +#if defined(CONFIG_SATA_AHCI) || defined(SATA_CONFIG_AHCI_MODULE)
> 
> Shouldn't the last be CONFIG_SATA_AHCI_MODULE ?

Right my fault. Updated patch below

-----
>From 60136f94d9c97f9a788738e30731e25bd794322b Mon Sep 17 00:00:00 2001
From: Christoph Egger <siccegge@stud.informatik.uni-erlangen.de>
Date: Fri, 5 Feb 2010 13:26:33 +0100
Subject: [PATCH] CONFIG_AHCI is really CONFIG_SATA_AHCI

The marvell driver comtains a fallback to ahci for the sata ports
which is incorrectly checked as CONFIG_AHCI while the only AHCI config
item is actually called SATA_AHCI (which also sounds sensible
considering it's a fallback for the sata ports).

Signed-off-by: Christoph Egger <siccegge@stud.informatik.uni-erlangen.de>
---
 drivers/ata/pata_marvell.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c
index 950da39..eabd138 100644
--- a/drivers/ata/pata_marvell.c
+++ b/drivers/ata/pata_marvell.c
@@ -147,7 +147,7 @@ static int marvell_init_one (struct pci_dev *pdev, const struct pci_device_id *i
 	if (pdev->device == 0x6101)
 		ppi[1] = &ata_dummy_port_info;
 
-#if defined(CONFIG_AHCI) || defined(CONFIG_AHCI_MODULE)
+#if defined(CONFIG_SATA_AHCI) || defined(CONFIG_SATA_AHCI_MODULE)
 	if (!marvell_pata_active(pdev)) {
 		printk(KERN_INFO DRV_NAME ": PATA port not active, deferring to AHCI driver.\n");
 		return -ENODEV;
-- 
1.6.3.3



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH] non-existant config in kernel source (CONFIG_AHCI)
  2010-02-05 13:29 [PATCH] non-existant config in kernel source (CONFIG_AHCI) Christoph Egger
  2010-02-05 13:57 ` Frans Pop
  2010-02-05 14:08 ` Sergei Shtylyov
@ 2010-02-05 17:32 ` Randy Dunlap
  2 siblings, 0 replies; 6+ messages in thread
From: Randy Dunlap @ 2010-02-05 17:32 UTC (permalink / raw)
  To: Christoph Egger
  Cc: Jeff Garzik, Erik Inge Bols??,
	Bartlomiej Zolnierkiewicz, linux-ide, linux-kernel, vamos,
	Alan Cox

On 02/05/10 05:29, Christoph Egger wrote:
> Hi all!
>
> 	As part of the VAMOS[0] research project at the University of
> Erlangen we're checking referential integrity between kernel KConfig
> options and in-code Conditional blocks.
>
> 	While there's one place that is checking for CONFIG_AHCI, this
> config being referenced from printed books and people pointing to this
> config item I can't find it anywhere in the kernel kconfig
> infrastruture and it doesn't seem to ever have been there (since
> git). Is this maybe a typo for CONFIG_SATA_AHCI? reading the
> information for the affected piece of source it would actually make
> sense.
>
> 	Please keep me informed of this patch getting confirmed /
> merged so we can keep track of it.
>
> Regards
>
> 	Christoph Egger
>
> [0] http://vamos1.informatik.uni-erlangen.de/
>
> ----
>  From 60136f94d9c97f9a788738e30731e25bd794322b Mon Sep 17 00:00:00 2001
> From: Christoph Egger<siccegge@stud.informatik.uni-erlangen.de>
> Date: Fri, 5 Feb 2010 13:26:33 +0100
> Subject: [PATCH] CONFIG_AHCI is really CONFIG_SATA_AHCI
>
> The marvell driver comtains a fallback to ahci for the sata ports
> which is incorrectly checked as CONFIG_AHCI while the only AHCI config
> item is actually called SATA_AHCI (which also sounds sensible
> considering it's a fallback for the sata ports).
>
> Signed-off-by: Christoph Egger<siccegge@stud.informatik.uni-erlangen.de>
> ---
>   drivers/ata/pata_marvell.c |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c
> index 950da39..eabd138 100644
> --- a/drivers/ata/pata_marvell.c
> +++ b/drivers/ata/pata_marvell.c
> @@ -147,7 +147,7 @@ static int marvell_init_one (struct pci_dev *pdev, const struct pci_device_id *i
>   	if (pdev->device == 0x6101)
>   		ppi[1] =&ata_dummy_port_info;
>
> -#if defined(CONFIG_AHCI) || defined(CONFIG_AHCI_MODULE)
> +#if defined(CONFIG_SATA_AHCI) || defined(SATA_CONFIG_AHCI_MODULE)
                                             ~~~~~~~~~~~~~~~~~~~~~~~
                                      -->    CONFIG_SATA_AHCI_MODULE

>   	if (!marvell_pata_active(pdev)) {
>   		printk(KERN_INFO DRV_NAME ": PATA port not active, deferring to AHCI driver.\n");
>   		return -ENODEV;


-- 
~Randy

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] non-existant config in kernel source (CONFIG_AHCI)
  2010-02-05 15:26   ` Christoph Egger
@ 2010-02-13 22:49     ` Jeff Garzik
  0 siblings, 0 replies; 6+ messages in thread
From: Jeff Garzik @ 2010-02-13 22:49 UTC (permalink / raw)
  To: Christoph Egger
  Cc: Frans Pop, knan-lkml, bzolnier, linux-ide, linux-kernel, vamos, alan

On 02/05/2010 10:26 AM, Christoph Egger wrote:
> On Fri, Feb 05, 2010 at 02:57:00PM +0100, Frans Pop wrote:
>> Christoph Egger wrote:
>>> --- a/drivers/ata/pata_marvell.c
>>> +++ b/drivers/ata/pata_marvell.c
>>> @@ -147,7 +147,7 @@ static int marvell_init_one (struct pci_dev *pdev,
>>> 	if (pdev->device == 0x6101)
>>> 		ppi[1] =&ata_dummy_port_info;
>>>
>>> -#if defined(CONFIG_AHCI) || defined(CONFIG_AHCI_MODULE)
>>> +#if defined(CONFIG_SATA_AHCI) || defined(SATA_CONFIG_AHCI_MODULE)
>>
>> Shouldn't the last be CONFIG_SATA_AHCI_MODULE ?
>
> Right my fault. Updated patch below
>
> -----
>> From 60136f94d9c97f9a788738e30731e25bd794322b Mon Sep 17 00:00:00 2001
> From: Christoph Egger<siccegge@stud.informatik.uni-erlangen.de>
> Date: Fri, 5 Feb 2010 13:26:33 +0100
> Subject: [PATCH] CONFIG_AHCI is really CONFIG_SATA_AHCI
>
> The marvell driver comtains a fallback to ahci for the sata ports
> which is incorrectly checked as CONFIG_AHCI while the only AHCI config
> item is actually called SATA_AHCI (which also sounds sensible
> considering it's a fallback for the sata ports).
>
> Signed-off-by: Christoph Egger<siccegge@stud.informatik.uni-erlangen.de>
> ---
>   drivers/ata/pata_marvell.c |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)

applied



^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2010-02-13 22:49 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-02-05 13:29 [PATCH] non-existant config in kernel source (CONFIG_AHCI) Christoph Egger
2010-02-05 13:57 ` Frans Pop
2010-02-05 15:26   ` Christoph Egger
2010-02-13 22:49     ` Jeff Garzik
2010-02-05 14:08 ` Sergei Shtylyov
2010-02-05 17:32 ` Randy Dunlap

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.