2010-02-05 13:29:49

by Christoph Egger

Subject: [PATCH] non-existant config in kernel source (CONFIG_AHCI)

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 <[email protected]>
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 <[email protected]>
---
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

2010-02-05 13:57:08

by Frans Pop

Subject: Re: [PATCH] non-existant config in kernel source (CONFIG_AHCI)

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

2010-02-05 14:17:27

by Sergei Shtylyov

Subject: Re: [PATCH] non-existant config in kernel source (CONFIG_AHCI)

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 <[email protected]>
> 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 <[email protected]>
> ---
> 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

2010-02-05 15:26:26

by Christoph Egger

Subject: Re: [PATCH] non-existant config in kernel source (CONFIG_AHCI)

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 <[email protected]>
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 <[email protected]>
---
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

2010-02-05 17:34:50

by Randy Dunlap

Subject: Re: [PATCH] non-existant config in kernel source (CONFIG_AHCI)

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<[email protected]>
> 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<[email protected]>
> ---
> 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

2010-02-13 22:49:22

by Jeff Garzik

Subject: Re: [PATCH] non-existant config in kernel source (CONFIG_AHCI)

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<[email protected]>
> 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<[email protected]>
> ---
> drivers/ata/pata_marvell.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)

applied