diff mbox

[TRUSTY] ahci_xgene: Removing NCQ support from the APM X-Gene SoC AHCI SATA Host Controller driver.

Message ID 1408395272-15179-1-git-send-email-dann.frazier@canonical.com
State New
Headers show

Commit Message

dann frazier Aug. 18, 2014, 8:54 p.m. UTC
From: Suman Tripathi <stripathi@apm.com>

BugLink: http://bugs.launchpad.net/bugs/1350087

This patch removes the NCQ support from the APM X-Gene SoC AHCI
Host Controller driver as it doesn't support it.

Signed-off-by: Loc Ho <lho@apm.com>
Signed-off-by: Suman Tripathi <stripathi@apm.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: stable@vger.kernel.org
(from linux-next; backported to Ubuntu's 3.13)
Signed-off-by: dann frazier <dann.frazier@canonical.com>
---
 drivers/ata/ahci_xgene.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Chris J Arges Aug. 18, 2014, 9:07 p.m. UTC | #1
On 08/18/2014 03:54 PM, dann frazier wrote:
> From: Suman Tripathi <stripathi@apm.com>
> 
> BugLink: http://bugs.launchpad.net/bugs/1350087
> 
This bug doesn't include any SRU templating, can you please fill this
out in the bug report? Also this seems to already have been used for
another patch, can you perhaps include why there is an additional patch
needed to fix this bug, or if it is a separate bug file a new one with
the proper paperwork.

> This patch removes the NCQ support from the APM X-Gene SoC AHCI
> Host Controller driver as it doesn't support it.
> 
> Signed-off-by: Loc Ho <lho@apm.com>
> Signed-off-by: Suman Tripathi <stripathi@apm.com>
> Signed-off-by: Tejun Heo <tj@kernel.org>
> Cc: stable@vger.kernel.org
> (from linux-next; backported to Ubuntu's 3.13)

Can you please include a specific commit that this is backported from?
 (backported from commit XXXXXXXXXXXXXXXXX)

Thanks,
--chris j arges

> Signed-off-by: dann frazier <dann.frazier@canonical.com>
> ---
>  drivers/ata/ahci_xgene.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/ata/ahci_xgene.c b/drivers/ata/ahci_xgene.c
> index ebafa8b..961735d 100644
> --- a/drivers/ata/ahci_xgene.c
> +++ b/drivers/ata/ahci_xgene.c
> @@ -344,8 +344,8 @@ static struct ata_port_operations xgene_ahci_ops = {
>  };
>  
>  static const struct ata_port_info xgene_ahci_port_info = {
> -	AHCI_HFLAGS(AHCI_HFLAG_NO_PMP | AHCI_HFLAG_YES_NCQ),
> -	.flags = AHCI_FLAG_COMMON | ATA_FLAG_NCQ,
> +	AHCI_HFLAGS(AHCI_HFLAG_NO_PMP | AHCI_HFLAG_NO_NCQ),
> +	.flags = AHCI_FLAG_COMMON,
>  	.pio_mask = ATA_PIO4,
>  	.udma_mask = ATA_UDMA6,
>  	.port_ops = &xgene_ahci_ops,
>
dann frazier Aug. 18, 2014, 9:15 p.m. UTC | #2
On Mon, Aug 18, 2014 at 3:07 PM, Chris J Arges
<chris.j.arges@canonical.com> wrote:
> On 08/18/2014 03:54 PM, dann frazier wrote:
>> From: Suman Tripathi <stripathi@apm.com>
>>
>> BugLink: http://bugs.launchpad.net/bugs/1350087
>>
> This bug doesn't include any SRU templating, can you please fill this
> out in the bug report? Also this seems to already have been used for
> another patch, can you perhaps include why there is an additional patch
> needed to fix this bug, or if it is a separate bug file a new one with
> the proper paperwork.

I'll file a new bug and refresh the patch.

>> This patch removes the NCQ support from the APM X-Gene SoC AHCI
>> Host Controller driver as it doesn't support it.
>>
>> Signed-off-by: Loc Ho <lho@apm.com>
>> Signed-off-by: Suman Tripathi <stripathi@apm.com>
>> Signed-off-by: Tejun Heo <tj@kernel.org>
>> Cc: stable@vger.kernel.org
>> (from linux-next; backported to Ubuntu's 3.13)
>
> Can you please include a specific commit that this is backported from?
>  (backported from commit XXXXXXXXXXXXXXXXX)

Sure. But is that useful for linux-next backports?

fyi, this applies to utopic too, but stable was CC'd so I assume it'll
migrate in naturally.

 -dann

> Thanks,
> --chris j arges
>
>> Signed-off-by: dann frazier <dann.frazier@canonical.com>
>> ---
>>  drivers/ata/ahci_xgene.c | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/ata/ahci_xgene.c b/drivers/ata/ahci_xgene.c
>> index ebafa8b..961735d 100644
>> --- a/drivers/ata/ahci_xgene.c
>> +++ b/drivers/ata/ahci_xgene.c
>> @@ -344,8 +344,8 @@ static struct ata_port_operations xgene_ahci_ops = {
>>  };
>>
>>  static const struct ata_port_info xgene_ahci_port_info = {
>> -     AHCI_HFLAGS(AHCI_HFLAG_NO_PMP | AHCI_HFLAG_YES_NCQ),
>> -     .flags = AHCI_FLAG_COMMON | ATA_FLAG_NCQ,
>> +     AHCI_HFLAGS(AHCI_HFLAG_NO_PMP | AHCI_HFLAG_NO_NCQ),
>> +     .flags = AHCI_FLAG_COMMON,
>>       .pio_mask = ATA_PIO4,
>>       .udma_mask = ATA_UDMA6,
>>       .port_ops = &xgene_ahci_ops,
>>
>
>
Chris J Arges Aug. 18, 2014, 9:24 p.m. UTC | #3
On 08/18/2014 04:15 PM, Dann Frazier wrote:
> On Mon, Aug 18, 2014 at 3:07 PM, Chris J Arges
> <chris.j.arges@canonical.com> wrote:
>> On 08/18/2014 03:54 PM, dann frazier wrote:
>>> From: Suman Tripathi <stripathi@apm.com>
>>>
>>> BugLink: http://bugs.launchpad.net/bugs/1350087
>>>
>> This bug doesn't include any SRU templating, can you please fill this
>> out in the bug report? Also this seems to already have been used for
>> another patch, can you perhaps include why there is an additional patch
>> needed to fix this bug, or if it is a separate bug file a new one with
>> the proper paperwork.
> 
> I'll file a new bug and refresh the patch.
> 
>>> This patch removes the NCQ support from the APM X-Gene SoC AHCI
>>> Host Controller driver as it doesn't support it.
>>>
>>> Signed-off-by: Loc Ho <lho@apm.com>
>>> Signed-off-by: Suman Tripathi <stripathi@apm.com>
>>> Signed-off-by: Tejun Heo <tj@kernel.org>
>>> Cc: stable@vger.kernel.org
>>> (from linux-next; backported to Ubuntu's 3.13)
>>
>> Can you please include a specific commit that this is backported from?
>>  (backported from commit XXXXXXXXXXXXXXXXX)
> 
> Sure. But is that useful for linux-next backports?
>  

Yes even if its from linux-next it can be helpful in tracking down this
patch. Again this is information that would be expected in the SRU
template on the bug.

> fyi, this applies to utopic too, but stable was CC'd so I assume it'll
> migrate in naturally.
> 

For most of these patches we _expect_ that the fix is already in our
development release before we apply it to our stable releases. However
in this case we are working on HWE that is a fast moving target. Please
ensure that this does land in our development kernel (3.16) as well as 3.13.

>  -dann
> 
>> Thanks,
>> --chris j arges
>>
>>> Signed-off-by: dann frazier <dann.frazier@canonical.com>
>>> ---
>>>  drivers/ata/ahci_xgene.c | 4 ++--
>>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/drivers/ata/ahci_xgene.c b/drivers/ata/ahci_xgene.c
>>> index ebafa8b..961735d 100644
>>> --- a/drivers/ata/ahci_xgene.c
>>> +++ b/drivers/ata/ahci_xgene.c
>>> @@ -344,8 +344,8 @@ static struct ata_port_operations xgene_ahci_ops = {
>>>  };
>>>
>>>  static const struct ata_port_info xgene_ahci_port_info = {
>>> -     AHCI_HFLAGS(AHCI_HFLAG_NO_PMP | AHCI_HFLAG_YES_NCQ),
>>> -     .flags = AHCI_FLAG_COMMON | ATA_FLAG_NCQ,
>>> +     AHCI_HFLAGS(AHCI_HFLAG_NO_PMP | AHCI_HFLAG_NO_NCQ),
>>> +     .flags = AHCI_FLAG_COMMON,
>>>       .pio_mask = ATA_PIO4,
>>>       .udma_mask = ATA_UDMA6,
>>>       .port_ops = &xgene_ahci_ops,
>>>
>>
>>
>
dann frazier Aug. 18, 2014, 9:35 p.m. UTC | #4
On Mon, Aug 18, 2014 at 3:24 PM, Chris J Arges
<chris.j.arges@canonical.com> wrote:
>
>
> On 08/18/2014 04:15 PM, Dann Frazier wrote:
>> On Mon, Aug 18, 2014 at 3:07 PM, Chris J Arges
>> <chris.j.arges@canonical.com> wrote:
>>> On 08/18/2014 03:54 PM, dann frazier wrote:
>>>> From: Suman Tripathi <stripathi@apm.com>
>>>>
>>>> BugLink: http://bugs.launchpad.net/bugs/1350087
>>>>
>>> This bug doesn't include any SRU templating, can you please fill this
>>> out in the bug report? Also this seems to already have been used for
>>> another patch, can you perhaps include why there is an additional patch
>>> needed to fix this bug, or if it is a separate bug file a new one with
>>> the proper paperwork.
>>
>> I'll file a new bug and refresh the patch.
>>
>>>> This patch removes the NCQ support from the APM X-Gene SoC AHCI
>>>> Host Controller driver as it doesn't support it.
>>>>
>>>> Signed-off-by: Loc Ho <lho@apm.com>
>>>> Signed-off-by: Suman Tripathi <stripathi@apm.com>
>>>> Signed-off-by: Tejun Heo <tj@kernel.org>
>>>> Cc: stable@vger.kernel.org
>>>> (from linux-next; backported to Ubuntu's 3.13)
>>>
>>> Can you please include a specific commit that this is backported from?
>>>  (backported from commit XXXXXXXXXXXXXXXXX)
>>
>> Sure. But is that useful for linux-next backports?
>>
>
> Yes even if its from linux-next it can be helpful in tracking down this
> patch. Again this is information that would be expected in the SRU
> template on the bug.

OK.

>> fyi, this applies to utopic too, but stable was CC'd so I assume it'll
>> migrate in naturally.
>>
>
> For most of these patches we _expect_ that the fix is already in our
> development release before we apply it to our stable releases. However
> in this case we are working on HWE that is a fast moving target. Please
> ensure that this does land in our development kernel (3.16) as well as 3.13.

Let me know if you'd prefer I provide a linux-next cherry-pick (which
should apply cleanly), or wait till I can point you to a 3.17
cherry-pick (or 3.16.y stable update). Either way we're tracking these
patches against both releases, so we'll make sure it gets there.

 -dann

>>  -dann
>>
>>> Thanks,
>>> --chris j arges
>>>
>>>> Signed-off-by: dann frazier <dann.frazier@canonical.com>
>>>> ---
>>>>  drivers/ata/ahci_xgene.c | 4 ++--
>>>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>>>
>>>> diff --git a/drivers/ata/ahci_xgene.c b/drivers/ata/ahci_xgene.c
>>>> index ebafa8b..961735d 100644
>>>> --- a/drivers/ata/ahci_xgene.c
>>>> +++ b/drivers/ata/ahci_xgene.c
>>>> @@ -344,8 +344,8 @@ static struct ata_port_operations xgene_ahci_ops = {
>>>>  };
>>>>
>>>>  static const struct ata_port_info xgene_ahci_port_info = {
>>>> -     AHCI_HFLAGS(AHCI_HFLAG_NO_PMP | AHCI_HFLAG_YES_NCQ),
>>>> -     .flags = AHCI_FLAG_COMMON | ATA_FLAG_NCQ,
>>>> +     AHCI_HFLAGS(AHCI_HFLAG_NO_PMP | AHCI_HFLAG_NO_NCQ),
>>>> +     .flags = AHCI_FLAG_COMMON,
>>>>       .pio_mask = ATA_PIO4,
>>>>       .udma_mask = ATA_UDMA6,
>>>>       .port_ops = &xgene_ahci_ops,
>>>>
>>>
>>>
>>
diff mbox

Patch

diff --git a/drivers/ata/ahci_xgene.c b/drivers/ata/ahci_xgene.c
index ebafa8b..961735d 100644
--- a/drivers/ata/ahci_xgene.c
+++ b/drivers/ata/ahci_xgene.c
@@ -344,8 +344,8 @@  static struct ata_port_operations xgene_ahci_ops = {
 };
 
 static const struct ata_port_info xgene_ahci_port_info = {
-	AHCI_HFLAGS(AHCI_HFLAG_NO_PMP | AHCI_HFLAG_YES_NCQ),
-	.flags = AHCI_FLAG_COMMON | ATA_FLAG_NCQ,
+	AHCI_HFLAGS(AHCI_HFLAG_NO_PMP | AHCI_HFLAG_NO_NCQ),
+	.flags = AHCI_FLAG_COMMON,
 	.pio_mask = ATA_PIO4,
 	.udma_mask = ATA_UDMA6,
 	.port_ops = &xgene_ahci_ops,