All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] ahci: add a boot option to enable promise ahci
@ 2012-09-24  2:34 ` Tony Hung - PTT 洪瑞嶸
  0 siblings, 0 replies; 6+ messages in thread
From: Tony Hung - PTT 洪瑞嶸 @ 2012-09-24  2:34 UTC (permalink / raw)
  To: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org

linux-3.2.0/drivers/ata/ahci.c: In function 'hptiop_host_request_callback':

Use min_t(size_t, ...) to fix.

Signed-off-by: Tony Hung <tony.hung@tw.promise.com>
---

diff --git a/linux-3.2.0/drivers/ata/ahci.c b/linux-3.2.0/drivers/ata/ahci.c
--- a/linux-3.2.0/drivers/ata/ahci.c	2012-08-29 13:40:26.046851693 +0800
+++ b/linux-3.2.0/drivers/ata/ahci.c	2012-08-30 17:23:10.207838960 +0800
@@ -430,6 +430,9 @@ static int marvell_enable = 1;
 module_param(marvell_enable, int, 0644);
 MODULE_PARM_DESC(marvell_enable, "Marvell SATA via AHCI (1 = enabled)");

+static int promise_enable;
+module_param(promise_enable, int, 0644);
+MODULE_PARM_DESC(promise_enable, "Promise SATA via AHCI (1 = enabled)");

 static void ahci_pci_save_initial_config(struct pci_dev *pdev,
 					 struct ahci_host_priv *hpriv)
@@ -1049,6 +1052,16 @@ static int ahci_init_one(struct pci_dev
 	if (pdev->vendor == PCI_VENDOR_ID_MARVELL && !marvell_enable)
 		return -ENODEV;

+        /*
+         * In RAID mode, Promise software RAID need to replace
+         * original AHCI module, but if AHCI driver build-in kernel,
+         * Promise AHCI module need a boot option to disable it
+         */
+        if (promise_enable &&
+            ((pdev->class >> 8) == PCI_CLASS_STORAGE_RAID) &&
+             (pdev->vendor == PCI_VENDOR_ID_ATI ||
+              pdev->vendor == PCI_VENDOR_ID_AMD))
+                return -ENODEV;
+
 	/*
 	 * For some reason, MCP89 on MacBook 7,1 doesn't work with
 	 * ahci, use ata_generic instead. 

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


^ permalink raw reply	[flat|nested] 6+ messages in thread
* [PATCH] ahci: add a boot option to enable promise ahci
@ 2012-09-24  2:34 ` Tony Hung - PTT 洪瑞嶸
  0 siblings, 0 replies; 6+ messages in thread
From: Tony Hung - PTT 洪瑞嶸 @ 2012-09-24  2:34 UTC (permalink / raw)
  To: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="big5", Size: 1862 bytes --]

linux-3.2.0/drivers/ata/ahci.c: In function 'hptiop_host_request_callback':

Use min_t(size_t, ...) to fix.

Signed-off-by: Tony Hung <tony.hung@tw.promise.com>
---

diff --git a/linux-3.2.0/drivers/ata/ahci.c b/linux-3.2.0/drivers/ata/ahci.c
--- a/linux-3.2.0/drivers/ata/ahci.c	2012-08-29 13:40:26.046851693 +0800
+++ b/linux-3.2.0/drivers/ata/ahci.c	2012-08-30 17:23:10.207838960 +0800
@@ -430,6 +430,9 @@ static int marvell_enable = 1;
 module_param(marvell_enable, int, 0644);
 MODULE_PARM_DESC(marvell_enable, "Marvell SATA via AHCI (1 = enabled)");

+static int promise_enable;
+module_param(promise_enable, int, 0644);
+MODULE_PARM_DESC(promise_enable, "Promise SATA via AHCI (1 = enabled)");

 static void ahci_pci_save_initial_config(struct pci_dev *pdev,
 					 struct ahci_host_priv *hpriv)
@@ -1049,6 +1052,16 @@ static int ahci_init_one(struct pci_dev
 	if (pdev->vendor == PCI_VENDOR_ID_MARVELL && !marvell_enable)
 		return -ENODEV;

+        /*
+         * In RAID mode, Promise software RAID need to replace
+         * original AHCI module, but if AHCI driver build-in kernel,
+         * Promise AHCI module need a boot option to disable it
+         */
+        if (promise_enable &&
+            ((pdev->class >> 8) == PCI_CLASS_STORAGE_RAID) &&
+             (pdev->vendor == PCI_VENDOR_ID_ATI ||
+              pdev->vendor == PCI_VENDOR_ID_AMD))
+                return -ENODEV;
+
 	/*
 	 * For some reason, MCP89 on MacBook 7,1 doesn't work with
 	 * ahci, use ata_generic instead. 

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

ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] ahci: add a boot option to enable promise ahci
  2012-09-24  2:34 ` Tony Hung - PTT 洪瑞嶸
@ 2012-09-25  3:05   ` Jeff Garzik
  -1 siblings, 0 replies; 6+ messages in thread
From: Jeff Garzik @ 2012-09-25  3:05 UTC (permalink / raw)
  To: Tony Hung - PTT 洪瑞嶸
  Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org

On 09/23/2012 10:34 PM, Tony Hung - PTT 洪瑞嶸 wrote:
> linux-3.2.0/drivers/ata/ahci.c: In function 'hptiop_host_request_callback':
> 
> Use min_t(size_t, ...) to fix.
> 
> Signed-off-by: Tony Hung <tony.hung@tw.promise.com>
> ---
> 
> diff --git a/linux-3.2.0/drivers/ata/ahci.c b/linux-3.2.0/drivers/ata/ahci.c
> --- a/linux-3.2.0/drivers/ata/ahci.c	2012-08-29 13:40:26.046851693 +0800
> +++ b/linux-3.2.0/drivers/ata/ahci.c	2012-08-30 17:23:10.207838960 +0800
> @@ -430,6 +430,9 @@ static int marvell_enable = 1;
>   module_param(marvell_enable, int, 0644);
>   MODULE_PARM_DESC(marvell_enable, "Marvell SATA via AHCI (1 = enabled)");
> 
> +static int promise_enable;
> +module_param(promise_enable, int, 0644);
> +MODULE_PARM_DESC(promise_enable, "Promise SATA via AHCI (1 = enabled)");
> 
>   static void ahci_pci_save_initial_config(struct pci_dev *pdev,
>   					 struct ahci_host_priv *hpriv)
> @@ -1049,6 +1052,16 @@ static int ahci_init_one(struct pci_dev
>   	if (pdev->vendor == PCI_VENDOR_ID_MARVELL && !marvell_enable)
>   		return -ENODEV;
> 
> +        /*
> +         * In RAID mode, Promise software RAID need to replace
> +         * original AHCI module, but if AHCI driver build-in kernel,
> +         * Promise AHCI module need a boot option to disable it
> +         */
> +        if (promise_enable &&
> +            ((pdev->class >> 8) == PCI_CLASS_STORAGE_RAID) &&
> +             (pdev->vendor == PCI_VENDOR_ID_ATI ||
> +              pdev->vendor == PCI_VENDOR_ID_AMD))
> +                return -ENODEV;

We need the patch for the Promise Software RAID driver, to accept this...

	Jeff




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

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] ahci: add a boot option to enable promise ahci
@ 2012-09-25  3:05   ` Jeff Garzik
  0 siblings, 0 replies; 6+ messages in thread
From: Jeff Garzik @ 2012-09-25  3:05 UTC (permalink / raw)
  To: Tony Hung - PTT 洪瑞嶸
  Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org

On 09/23/2012 10:34 PM, Tony Hung - PTT 洪瑞嶸 wrote:
> linux-3.2.0/drivers/ata/ahci.c: In function 'hptiop_host_request_callback':
> 
> Use min_t(size_t, ...) to fix.
> 
> Signed-off-by: Tony Hung <tony.hung@tw.promise.com>
> ---
> 
> diff --git a/linux-3.2.0/drivers/ata/ahci.c b/linux-3.2.0/drivers/ata/ahci.c
> --- a/linux-3.2.0/drivers/ata/ahci.c	2012-08-29 13:40:26.046851693 +0800
> +++ b/linux-3.2.0/drivers/ata/ahci.c	2012-08-30 17:23:10.207838960 +0800
> @@ -430,6 +430,9 @@ static int marvell_enable = 1;
>   module_param(marvell_enable, int, 0644);
>   MODULE_PARM_DESC(marvell_enable, "Marvell SATA via AHCI (1 = enabled)");
> 
> +static int promise_enable;
> +module_param(promise_enable, int, 0644);
> +MODULE_PARM_DESC(promise_enable, "Promise SATA via AHCI (1 = enabled)");
> 
>   static void ahci_pci_save_initial_config(struct pci_dev *pdev,
>   					 struct ahci_host_priv *hpriv)
> @@ -1049,6 +1052,16 @@ static int ahci_init_one(struct pci_dev
>   	if (pdev->vendor == PCI_VENDOR_ID_MARVELL && !marvell_enable)
>   		return -ENODEV;
> 
> +        /*
> +         * In RAID mode, Promise software RAID need to replace
> +         * original AHCI module, but if AHCI driver build-in kernel,
> +         * Promise AHCI module need a boot option to disable it
> +         */
> +        if (promise_enable &&
> +            ((pdev->class >> 8) == PCI_CLASS_STORAGE_RAID) &&
> +             (pdev->vendor == PCI_VENDOR_ID_ATI ||
> +              pdev->vendor == PCI_VENDOR_ID_AMD))
> +                return -ENODEV;

We need the patch for the Promise Software RAID driver, to accept this...

	Jeff





^ permalink raw reply	[flat|nested] 6+ messages in thread
* RE: [PATCH] ahci: add a boot option to enable promise ahci
  2012-09-25  3:05   ` Jeff Garzik
@ 2012-09-25  5:40     ` Tony Hung - PTT 洪瑞嶸
  -1 siblings, 0 replies; 6+ messages in thread
From: Tony Hung - PTT 洪瑞嶸 @ 2012-09-25  5:40 UTC (permalink / raw)
  To: Jeff Garzik; +Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org

[-- Attachment #1: Type: text/plain, Size: 2231 bytes --]

On 2012/9/25 11:05 AM, Jeff Garzik wrote:
>
> On 09/23/2012 10:34 PM, Tony Hung - PTT 洪瑞嶸 wrote:
>
> > linux-3.2.0/drivers/ata/ahci.c: In function 'hptiop_host_request_callback':
>
> > 
>
> > Use min_t(size_t, ...) to fix.

Correct this,
linux-3.2.0/drivers/ata/ahci.c: In function 'ahci_init_one':
Use variable promise_enable to disable RAID PCI controlled by original AHCI.
>
> > 
>
> > Signed-off-by: Tony Hung <tony.hung@tw.promise.com>
>
> > ---
>
> > 
>
> > diff --git a/linux-3.2.0/drivers/ata/ahci.c b/linux-3.2.0/drivers/ata/ahci.c
>
> > --- a/linux-3.2.0/drivers/ata/ahci.c    2012-08-29 13:40:26.046851693 +0800
>
> > +++ b/linux-3.2.0/drivers/ata/ahci.c  2012-08-30 17:23:10.207838960 +0800
>
> > @@ -430,6 +430,9 @@ static int marvell_enable = 1;
>
> >   module_param(marvell_enable, int, 0644);
>
> >   MODULE_PARM_DESC(marvell_enable, "Marvell SATA via AHCI (1 =
>
> > enabled)");
>
> > 
>
> > +static int promise_enable;
>
> > +module_param(promise_enable, int, 0644);
>
> > +MODULE_PARM_DESC(promise_enable, "Promise SATA via AHCI (1 =
>
> > +enabled)");
>
> > 
>
> >   static void ahci_pci_save_initial_config(struct pci_dev *pdev,
>
> >                                                struct ahci_host_priv *hpriv)
>
> > @@ -1049,6 +1052,16 @@ static int ahci_init_one(struct pci_dev
>
> >            if (pdev->vendor == PCI_VENDOR_ID_MARVELL && !marvell_enable)
>
> >                    return -ENODEV;
>
> > 
>
> > +        /*
>
> > +         * In RAID mode, Promise software RAID need to replace
>
> > +         * original AHCI module, but if AHCI driver build-in kernel,
>
> > +         * Promise AHCI module need a boot option to disable it
>
> > +         */
>
> > +        if (promise_enable &&
>
> > +            ((pdev->class >> 8) == PCI_CLASS_STORAGE_RAID) &&
>
> > +             (pdev->vendor == PCI_VENDOR_ID_ATI ||
>
> > +              pdev->vendor == PCI_VENDOR_ID_AMD))
>
> > +                return -ENODEV;
>
>  
>
> We need the patch for the Promise Software RAID driver, to accept this...
>
>  
>
>          Jeff 

Patch file is in attachment, and sorry for error descript.

Best wishes,
Tony Hung

[-- Attachment #2: Type: message/rfc822, Size: 5065 bytes --]

From: Jeff Garzik <jgarzik@pobox.com>
To: "Tony Hung - PTT 洪瑞嶸" <tony.hung@tw.promise.com>
Cc: "linux-scsi@vger.kernel.org" <linux-scsi@vger.kernel.org>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] ahci: add a boot option to enable promise ahci
Date: Tue, 25 Sep 2012 11:05:18 +0800
Message-ID: <50611F6E.8000607@pobox.com>

On 09/23/2012 10:34 PM, Tony Hung - PTT 洪瑞嶸 wrote:
> linux-3.2.0/drivers/ata/ahci.c: In function 'hptiop_host_request_callback':
>
> Use min_t(size_t, ...) to fix.
>
> Signed-off-by: Tony Hung <tony.hung@tw.promise.com>
> ---
>
> diff --git a/linux-3.2.0/drivers/ata/ahci.c b/linux-3.2.0/drivers/ata/ahci.c
> --- a/linux-3.2.0/drivers/ata/ahci.c  2012-08-29 13:40:26.046851693 +0800
> +++ b/linux-3.2.0/drivers/ata/ahci.c  2012-08-30 17:23:10.207838960 +0800
> @@ -430,6 +430,9 @@ static int marvell_enable = 1;
>   module_param(marvell_enable, int, 0644);
>   MODULE_PARM_DESC(marvell_enable, "Marvell SATA via AHCI (1 = enabled)");
>
> +static int promise_enable;
> +module_param(promise_enable, int, 0644);
> +MODULE_PARM_DESC(promise_enable, "Promise SATA via AHCI (1 = enabled)");
>
>   static void ahci_pci_save_initial_config(struct pci_dev *pdev,
>                                        struct ahci_host_priv *hpriv)
> @@ -1049,6 +1052,16 @@ static int ahci_init_one(struct pci_dev
>       if (pdev->vendor == PCI_VENDOR_ID_MARVELL && !marvell_enable)
>               return -ENODEV;
>
> +        /*
> +         * In RAID mode, Promise software RAID need to replace
> +         * original AHCI module, but if AHCI driver build-in kernel,
> +         * Promise AHCI module need a boot option to disable it
> +         */
> +        if (promise_enable &&
> +            ((pdev->class >> 8) == PCI_CLASS_STORAGE_RAID) &&
> +             (pdev->vendor == PCI_VENDOR_ID_ATI ||
> +              pdev->vendor == PCI_VENDOR_ID_AMD))
> +                return -ENODEV;

We need the patch for the Promise Software RAID driver, to accept this...

        Jeff





^ permalink raw reply	[flat|nested] 6+ messages in thread
* RE: [PATCH] ahci: add a boot option to enable promise ahci
@ 2012-09-25  5:40     ` Tony Hung - PTT 洪瑞嶸
  0 siblings, 0 replies; 6+ messages in thread
From: Tony Hung - PTT 洪瑞嶸 @ 2012-09-25  5:40 UTC (permalink / raw)
  To: Jeff Garzik; +Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org

[-- Attachment #1: Type: text/plain, Size: 2231 bytes --]

On 2012/9/25 11:05 AM, Jeff Garzik wrote:
>
> On 09/23/2012 10:34 PM, Tony Hung - PTT 洪瑞嶸 wrote:
>
> > linux-3.2.0/drivers/ata/ahci.c: In function 'hptiop_host_request_callback':
>
> > 
>
> > Use min_t(size_t, ...) to fix.

Correct this,
linux-3.2.0/drivers/ata/ahci.c: In function 'ahci_init_one':
Use variable promise_enable to disable RAID PCI controlled by original AHCI.
>
> > 
>
> > Signed-off-by: Tony Hung <tony.hung@tw.promise.com>
>
> > ---
>
> > 
>
> > diff --git a/linux-3.2.0/drivers/ata/ahci.c b/linux-3.2.0/drivers/ata/ahci.c
>
> > --- a/linux-3.2.0/drivers/ata/ahci.c    2012-08-29 13:40:26.046851693 +0800
>
> > +++ b/linux-3.2.0/drivers/ata/ahci.c  2012-08-30 17:23:10.207838960 +0800
>
> > @@ -430,6 +430,9 @@ static int marvell_enable = 1;
>
> >   module_param(marvell_enable, int, 0644);
>
> >   MODULE_PARM_DESC(marvell_enable, "Marvell SATA via AHCI (1 =
>
> > enabled)");
>
> > 
>
> > +static int promise_enable;
>
> > +module_param(promise_enable, int, 0644);
>
> > +MODULE_PARM_DESC(promise_enable, "Promise SATA via AHCI (1 =
>
> > +enabled)");
>
> > 
>
> >   static void ahci_pci_save_initial_config(struct pci_dev *pdev,
>
> >                                                struct ahci_host_priv *hpriv)
>
> > @@ -1049,6 +1052,16 @@ static int ahci_init_one(struct pci_dev
>
> >            if (pdev->vendor == PCI_VENDOR_ID_MARVELL && !marvell_enable)
>
> >                    return -ENODEV;
>
> > 
>
> > +        /*
>
> > +         * In RAID mode, Promise software RAID need to replace
>
> > +         * original AHCI module, but if AHCI driver build-in kernel,
>
> > +         * Promise AHCI module need a boot option to disable it
>
> > +         */
>
> > +        if (promise_enable &&
>
> > +            ((pdev->class >> 8) == PCI_CLASS_STORAGE_RAID) &&
>
> > +             (pdev->vendor == PCI_VENDOR_ID_ATI ||
>
> > +              pdev->vendor == PCI_VENDOR_ID_AMD))
>
> > +                return -ENODEV;
>
>  
>
> We need the patch for the Promise Software RAID driver, to accept this...
>
>  
>
>          Jeff 

Patch file is in attachment, and sorry for error descript.

Best wishes,
Tony Hung

[-- Attachment #2: Type: message/rfc822, Size: 5063 bytes --]

From: Jeff Garzik <jgarzik@pobox.com>
To: "Tony Hung - PTT 洪瑞嶸" <tony.hung@tw.promise.com>
Cc: "linux-scsi@vger.kernel.org" <linux-scsi@vger.kernel.org>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] ahci: add a boot option to enable promise ahci
Date: Tue, 25 Sep 2012 11:05:18 +0800
Message-ID: <50611F6E.8000607@pobox.com>

On 09/23/2012 10:34 PM, Tony Hung - PTT 洪瑞嶸 wrote:
> linux-3.2.0/drivers/ata/ahci.c: In function 'hptiop_host_request_callback':
>
> Use min_t(size_t, ...) to fix.
>
> Signed-off-by: Tony Hung <tony.hung@tw.promise.com>
> ---
>
> diff --git a/linux-3.2.0/drivers/ata/ahci.c b/linux-3.2.0/drivers/ata/ahci.c
> --- a/linux-3.2.0/drivers/ata/ahci.c  2012-08-29 13:40:26.046851693 +0800
> +++ b/linux-3.2.0/drivers/ata/ahci.c  2012-08-30 17:23:10.207838960 +0800
> @@ -430,6 +430,9 @@ static int marvell_enable = 1;
>   module_param(marvell_enable, int, 0644);
>   MODULE_PARM_DESC(marvell_enable, "Marvell SATA via AHCI (1 = enabled)");
>
> +static int promise_enable;
> +module_param(promise_enable, int, 0644);
> +MODULE_PARM_DESC(promise_enable, "Promise SATA via AHCI (1 = enabled)");
>
>   static void ahci_pci_save_initial_config(struct pci_dev *pdev,
>                                        struct ahci_host_priv *hpriv)
> @@ -1049,6 +1052,16 @@ static int ahci_init_one(struct pci_dev
>       if (pdev->vendor == PCI_VENDOR_ID_MARVELL && !marvell_enable)
>               return -ENODEV;
>
> +        /*
> +         * In RAID mode, Promise software RAID need to replace
> +         * original AHCI module, but if AHCI driver build-in kernel,
> +         * Promise AHCI module need a boot option to disable it
> +         */
> +        if (promise_enable &&
> +            ((pdev->class >> 8) == PCI_CLASS_STORAGE_RAID) &&
> +             (pdev->vendor == PCI_VENDOR_ID_ATI ||
> +              pdev->vendor == PCI_VENDOR_ID_AMD))
> +                return -ENODEV;

We need the patch for the Promise Software RAID driver, to accept this...

        Jeff





^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-09-25  5:39 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-24  2:34 [PATCH] ahci: add a boot option to enable promise ahci Tony Hung - PTT 洪瑞嶸
2012-09-24  2:34 ` Tony Hung - PTT 洪瑞嶸
2012-09-25  3:05 ` Jeff Garzik
2012-09-25  3:05   ` Jeff Garzik
2012-09-25  5:40   ` Tony Hung - PTT 洪瑞嶸
2012-09-25  5:40     ` Tony Hung - PTT 洪瑞嶸

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.