diff mbox

UBUNTU: [Upstream] ahci: Detect Marvell 88SE9172 SATA controller

Message ID 4F9A384B.60201@illinois.edu
State New
Headers show

Commit Message

Matt Johnson April 27, 2012, 6:10 a.m. UTC 
From ace8eb2fd920f3cc1b0830d014fb87850c2705eb Mon Sep 17 00:00:00 2001
From: Matt Johnson <johnso87@illinois.edu>
Date: Fri, 27 Apr 2012 01:01:05 -0500
Subject: [PATCH] UBUNTU: [Upstream] ahci: Detect Marvell 88SE9172 SATA
  controller

The Marvell 88SE9172 SATA controller (PCI ID 1b4b 917a) already worked
once it was detected, but was missing an ahci_pci_tbl entry.

Boot tested on a Gigabyte Z68X-UD3H-B3 motherboard.

Signed-off-by: Matt Johnson <johnso87@illinois.edu>
---
  drivers/ata/ahci.c |    2 ++
  1 file changed, 2 insertions(+)

         { PCI_DEVICE(0x1b4b, 0x91a3),
           .driver_data = board_ahci_yes_fbs },

Comments

Tim Gardner April 27, 2012, 12:13 p.m. UTC | #1 
On 04/27/2012 12:10 AM, Matt Johnson wrote:
> From ace8eb2fd920f3cc1b0830d014fb87850c2705eb Mon Sep 17 00:00:00 2001
> From: Matt Johnson <johnso87@illinois.edu>
> Date: Fri, 27 Apr 2012 01:01:05 -0500
> Subject: [PATCH] UBUNTU: [Upstream] ahci: Detect Marvell 88SE9172 SATA
>  controller
> 
> The Marvell 88SE9172 SATA controller (PCI ID 1b4b 917a) already worked
> once it was detected, but was missing an ahci_pci_tbl entry.
> 
> Boot tested on a Gigabyte Z68X-UD3H-B3 motherboard.
> 
> Signed-off-by: Matt Johnson <johnso87@illinois.edu>
> ---
>  drivers/ata/ahci.c |    2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
> index a833393..06f4c4f 100644
> --- a/drivers/ata/ahci.c
> +++ b/drivers/ata/ahci.c
> @@ -392,6 +392,8 @@ static const struct pci_device_id ahci_pci_tbl[] = {
>           .driver_data = board_ahci_yes_fbs },                  /*
> 88se9128 */
>         { PCI_DEVICE(0x1b4b, 0x9125),
>           .driver_data = board_ahci_yes_fbs },                  /*
> 88se9125 */
> +       { PCI_DEVICE(0x1b4b, 0x917a),
> +         .driver_data = board_ahci_yes_fbs },                  /*
> 88se9172 */
>         { PCI_DEVICE(0x1b4b, 0x91a3),
>           .driver_data = board_ahci_yes_fbs },
> 

This does not appear to have been merged upstream yet, correct? If not,
have you submitted it to the right places ?

scripts/get_maintainer.pl -f drivers/ata/ahci.c
Jeff Garzik <jgarzik@pobox.com> (supporter:SERIAL ATA (SATA)...)
linux-ide@vger.kernel.org (open list:SERIAL ATA (SATA)...)
linux-kernel@vger.kernel.org (open list)

rtg
Matt Johnson April 27, 2012, 2:59 p.m. UTC | #2 
On 04/27/2012 07:13 AM, Tim Gardner wrote:
> On 04/27/2012 12:10 AM, Matt Johnson wrote:
>>  From ace8eb2fd920f3cc1b0830d014fb87850c2705eb Mon Sep 17 00:00:00 2001
>> From: Matt Johnson<johnso87@illinois.edu>
>> Date: Fri, 27 Apr 2012 01:01:05 -0500
>> Subject: [PATCH] UBUNTU: [Upstream] ahci: Detect Marvell 88SE9172 SATA
>>   controller
>>
>> The Marvell 88SE9172 SATA controller (PCI ID 1b4b 917a) already worked
>> once it was detected, but was missing an ahci_pci_tbl entry.
>>
>> Boot tested on a Gigabyte Z68X-UD3H-B3 motherboard.
>>
>> Signed-off-by: Matt Johnson<johnso87@illinois.edu>
>> ---
>>   drivers/ata/ahci.c |    2 ++
>>   1 file changed, 2 insertions(+)
>>
>> diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
>> index a833393..06f4c4f 100644
>> --- a/drivers/ata/ahci.c
>> +++ b/drivers/ata/ahci.c
>> @@ -392,6 +392,8 @@ static const struct pci_device_id ahci_pci_tbl[] = {
>>            .driver_data = board_ahci_yes_fbs },                  /*
>> 88se9128 */
>>          { PCI_DEVICE(0x1b4b, 0x9125),
>>            .driver_data = board_ahci_yes_fbs },                  /*
>> 88se9125 */
>> +       { PCI_DEVICE(0x1b4b, 0x917a),
>> +         .driver_data = board_ahci_yes_fbs },                  /*
>> 88se9172 */
>>          { PCI_DEVICE(0x1b4b, 0x91a3),
>>            .driver_data = board_ahci_yes_fbs },
>>
>
> This does not appear to have been merged upstream yet, correct? If not,
> have you submitted it to the right places ?

Hi Tim,
I submitted the patch to Jeff/linux-ide/linux-kernel at the same
time as kernel-team.  It hasn't been merged though, correct.
Sorry if the [Upstream] tag was in error; I'm new at this, and
didn't know if it was for patches already merged upstream, or
patches that should also be submitted upstream.

-Matt


>
> scripts/get_maintainer.pl -f drivers/ata/ahci.c
> Jeff Garzik<jgarzik@pobox.com>  (supporter:SERIAL ATA (SATA)...)
> linux-ide@vger.kernel.org (open list:SERIAL ATA (SATA)...)
> linux-kernel@vger.kernel.org (open list)
>
> rtg
Tim Gardner April 27, 2012, 3:13 p.m. UTC | #3 
On 04/27/2012 08:59 AM, Matt Johnson wrote:
> On 04/27/2012 07:13 AM, Tim Gardner wrote:
>> On 04/27/2012 12:10 AM, Matt Johnson wrote:
>>>  From ace8eb2fd920f3cc1b0830d014fb87850c2705eb Mon Sep 17 00:00:00 2001
>>> From: Matt Johnson<johnso87@illinois.edu>
>>> Date: Fri, 27 Apr 2012 01:01:05 -0500
>>> Subject: [PATCH] UBUNTU: [Upstream] ahci: Detect Marvell 88SE9172 SATA
>>>   controller
>>>
>>> The Marvell 88SE9172 SATA controller (PCI ID 1b4b 917a) already worked
>>> once it was detected, but was missing an ahci_pci_tbl entry.
>>>
>>> Boot tested on a Gigabyte Z68X-UD3H-B3 motherboard.
>>>
>>> Signed-off-by: Matt Johnson<johnso87@illinois.edu>
>>> ---
>>>   drivers/ata/ahci.c |    2 ++
>>>   1 file changed, 2 insertions(+)
>>>
>>> diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
>>> index a833393..06f4c4f 100644
>>> --- a/drivers/ata/ahci.c
>>> +++ b/drivers/ata/ahci.c
>>> @@ -392,6 +392,8 @@ static const struct pci_device_id ahci_pci_tbl[] = {
>>>            .driver_data = board_ahci_yes_fbs },                  /*
>>> 88se9128 */
>>>          { PCI_DEVICE(0x1b4b, 0x9125),
>>>            .driver_data = board_ahci_yes_fbs },                  /*
>>> 88se9125 */
>>> +       { PCI_DEVICE(0x1b4b, 0x917a),
>>> +         .driver_data = board_ahci_yes_fbs },                  /*
>>> 88se9172 */
>>>          { PCI_DEVICE(0x1b4b, 0x91a3),
>>>            .driver_data = board_ahci_yes_fbs },
>>>
>>
>> This does not appear to have been merged upstream yet, correct? If not,
>> have you submitted it to the right places ?
> 
> Hi Tim,
> I submitted the patch to Jeff/linux-ide/linux-kernel at the same
> time as kernel-team.  It hasn't been merged though, correct.
> Sorry if the [Upstream] tag was in error; I'm new at this, and
> didn't know if it was for patches already merged upstream, or
> patches that should also be submitted upstream.
> 
> -Matt
> 
> 
>>
>> scripts/get_maintainer.pl -f drivers/ata/ahci.c
>> Jeff Garzik<jgarzik@pobox.com>  (supporter:SERIAL ATA (SATA)...)
>> linux-ide@vger.kernel.org (open list:SERIAL ATA (SATA)...)
>> linux-kernel@vger.kernel.org (open list)
>>
>> rtg
> 

We prefer receiving patches via upstream in order to reduce the
maintenance burden in the event of clashes. We typically make exceptions
for these type of simple patches if they've been accepted by a
maintainer. Let us know when that happens.

Be sure your patch has 'Cc: stable@vger.kernel.org' in the S-o-b chain.

rtg
Matt Johnson May 24, 2012, 2:47 a.m. UTC | #4 
On 04/27/2012 10:13 AM, Tim Gardner wrote:
> On 04/27/2012 08:59 AM, Matt Johnson wrote:
>> On 04/27/2012 07:13 AM, Tim Gardner wrote:
>>> On 04/27/2012 12:10 AM, Matt Johnson wrote:
>>>>    From ace8eb2fd920f3cc1b0830d014fb87850c2705eb Mon Sep 17 00:00:00 2001
>>>> From: Matt Johnson<johnso87@illinois.edu>
>>>> Date: Fri, 27 Apr 2012 01:01:05 -0500
>>>> Subject: [PATCH] UBUNTU: [Upstream] ahci: Detect Marvell 88SE9172 SATA
>>>>    controller
>>>>
>>>> The Marvell 88SE9172 SATA controller (PCI ID 1b4b 917a) already worked
>>>> once it was detected, but was missing an ahci_pci_tbl entry.
>>>>
>>>> Boot tested on a Gigabyte Z68X-UD3H-B3 motherboard.
>>>>
>>>> Signed-off-by: Matt Johnson<johnso87@illinois.edu>
>>>> ---
>>>>    drivers/ata/ahci.c |    2 ++
>>>>    1 file changed, 2 insertions(+)
>>>>
>>>> diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
>>>> index a833393..06f4c4f 100644
>>>> --- a/drivers/ata/ahci.c
>>>> +++ b/drivers/ata/ahci.c
>>>> @@ -392,6 +392,8 @@ static const struct pci_device_id ahci_pci_tbl[] = {
>>>>             .driver_data = board_ahci_yes_fbs },                  /*
>>>> 88se9128 */
>>>>           { PCI_DEVICE(0x1b4b, 0x9125),
>>>>             .driver_data = board_ahci_yes_fbs },                  /*
>>>> 88se9125 */
>>>> +       { PCI_DEVICE(0x1b4b, 0x917a),
>>>> +         .driver_data = board_ahci_yes_fbs },                  /*
>>>> 88se9172 */
>>>>           { PCI_DEVICE(0x1b4b, 0x91a3),
>>>>             .driver_data = board_ahci_yes_fbs },
>>>>
>>>
>>> This does not appear to have been merged upstream yet, correct? If not,
>>> have you submitted it to the right places ?
>>
>> Hi Tim,
>> I submitted the patch to Jeff/linux-ide/linux-kernel at the same
>> time as kernel-team.  It hasn't been merged though, correct.
>> Sorry if the [Upstream] tag was in error; I'm new at this, and
>> didn't know if it was for patches already merged upstream, or
>> patches that should also be submitted upstream.
>>
>> -Matt
>>
>>
>>>
>>> scripts/get_maintainer.pl -f drivers/ata/ahci.c
>>> Jeff Garzik<jgarzik@pobox.com>   (supporter:SERIAL ATA (SATA)...)
>>> linux-ide@vger.kernel.org (open list:SERIAL ATA (SATA)...)
>>> linux-kernel@vger.kernel.org (open list)
>>>
>>> rtg
>>
>
> We prefer receiving patches via upstream in order to reduce the
> maintenance burden in the event of clashes. We typically make exceptions
> for these type of simple patches if they've been accepted by a
> maintainer. Let us know when that happens.
>
> Be sure your patch has 'Cc: stable@vger.kernel.org' in the S-o-b chain.
>
> rtg

Hi Tim,
Sorry for the delay; I didn't monitor the upstream tree, and didn't 
notice that the patch had already been upstreamed.  It's in Linus' tree 
as of commit 642d892522 on April 27th.  It has S-o-b Jeff Garzik, but 
not "Cc: stable@kernel.org".

What's the process at this point?  Do I need to correspond with 
stable@kernel.org?  Do I need to resubmit the patch with Jeff G.'s S-o-b?

Thanks,
Matt
Tim Gardner May 24, 2012, 12:22 p.m. UTC | #5 
> 
> Hi Tim,
> Sorry for the delay; I didn't monitor the upstream tree, and didn't
> notice that the patch had already been upstreamed.  It's in Linus' tree
> as of commit 642d892522 on April 27th.  It has S-o-b Jeff Garzik, but
> not "Cc: stable@kernel.org".
> 
> What's the process at this point?  Do I need to correspond with
> stable@kernel.org?  Do I need to resubmit the patch with Jeff G.'s S-o-b?
> 
> Thanks,
> Matt

Remind me which bug number this is for.

rtg
Matt Johnson May 24, 2012, 10:25 p.m. UTC | #6 
>>
>> Hi Tim,
>> Sorry for the delay; I didn't monitor the upstream tree, and didn't
>> notice that the patch had already been upstreamed.  It's in Linus' tree
>> as of commit 642d892522 on April 27th.  It has S-o-b Jeff Garzik, but
>> not "Cc: stable@kernel.org".
>>
>> What's the process at this point?  Do I need to correspond with
>> stable@kernel.org?  Do I need to resubmit the patch with Jeff G.'s S-o-b?
>>
>> Thanks,
>> Matt
>
>Remind me which bug number this is for.
>

Sorry, I didn't file a bug, I originally just submitted the patch to
the mailing list at the same time I submitted it upstream.  The patch
has been upstreamed and will be in 3.4.  I didn't 'Cc: stable' when I
upstreamed the patch, so I took care of that last night.  The patch
is queued for the next 3.0 and 3.3 stable releases[1][2], and 3.2 should
be forthcoming.

If I understand correctly, the patch will automatically trickle down to the
12.04 kernel once 3.2.19 is released?  In that case, feel free to either
apply the patch now or wait until then.  I can also file a bug if necessary.

Thanks,
Matt

[1] http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git;a=commitdiff;h=e90c706efb694972f64409d25d09076ab7581f34
[2] http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git;a=commitdiff;h=898f26e7f5b166847e3157ceb7907580e2035e80

>rtg
>--
>Tim Gardner tim.gardner@canonical.com
Tim Gardner May 25, 2012, 1:47 a.m. UTC | #7 
On 05/24/2012 04:25 PM, Johnson, Matthew Robert wrote:
>>>
>>> Hi Tim,
>>> Sorry for the delay; I didn't monitor the upstream tree, and didn't
>>> notice that the patch had already been upstreamed.  It's in Linus' tree
>>> as of commit 642d892522 on April 27th.  It has S-o-b Jeff Garzik, but
>>> not "Cc: stable@kernel.org".
>>>
>>> What's the process at this point?  Do I need to correspond with
>>> stable@kernel.org?  Do I need to resubmit the patch with Jeff G.'s S-o-b?
>>>
>>> Thanks,
>>> Matt
>>
>> Remind me which bug number this is for.
>>
>
> Sorry, I didn't file a bug, I originally just submitted the patch to
> the mailing list at the same time I submitted it upstream.  The patch
> has been upstreamed and will be in 3.4.  I didn't 'Cc: stable' when I
> upstreamed the patch, so I took care of that last night.  The patch
> is queued for the next 3.0 and 3.3 stable releases[1][2], and 3.2 should
> be forthcoming.
>
> If I understand correctly, the patch will automatically trickle down to the
> 12.04 kernel once 3.2.19 is released?  In that case, feel free to either
> apply the patch now or wait until then.  I can also file a bug if necessary.
>
> Thanks,
> Matt
>
> [1] http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git;a=commitdiff;h=e90c706efb694972f64409d25d09076ab7581f34
> [2] http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git;a=commitdiff;h=898f26e7f5b166847e3157ceb7907580e2035e80
>
>> rtg
>> --
>> Tim Gardner tim.gardner@canonical.com

Waiting until this patch trickles down via stable is just fine. Thanks 
for the follow up.

rtg
diff mbox

Patch

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index a833393..06f4c4f 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -392,6 +392,8 @@  static const struct pci_device_id ahci_pci_tbl[] = {
           .driver_data = board_ahci_yes_fbs },                  /* 
88se9128 */
         { PCI_DEVICE(0x1b4b, 0x9125),
           .driver_data = board_ahci_yes_fbs },                  /* 
88se9125 */
+       { PCI_DEVICE(0x1b4b, 0x917a),
+         .driver_data = board_ahci_yes_fbs },                  /* 
88se9172 */