Support for Marvel 6141 in ahci.c

Support for Marvel 6141 in ahci.c

[Christian P. Schmidt]

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

Hi all,

The Marvell 6141
08:00.0 SATA controller: Marvell Technology Group Ltd. 88SE614x SATA II PCI-E controller (rev 01)
08:00.0 0106: 11ab:6141 (rev 01)
seems to work with the ahci driver with the attached patch:

[17988264.905007] ahci 0000:08:00.0: version 3.0
[17988264.905029] ACPI: PCI Interrupt 0000:08:00.0[A] -> Link [APC7] -> GSI 16 (level, low) -> IRQ 16
[17988264.905054] ahci 0000:08:00.0: controller can't do NCQ, turning off CAP_NCQ
[17988264.905056] ahci 0000:08:00.0: MV_AHCI HACK: port_map 1f -> f
[17988266.267187] ahci 0000:08:00.0: AHCI 0001.0000 32 slots 5 ports 3 Gbps 0xf impl SATA mode
[17988266.267194] ahci 0000:08:00.0: flags: 64bit stag nz only pmp slum part
[17988266.267198] PCI: Setting latency timer of device 0000:08:00.0 to 64
[17988266.268188] scsi12 : ahci
[17988266.268760] scsi13 : ahci
[17988266.268770] scsi14 : ahci
[17988266.268770] scsi15 : ahci
[17988266.268770] scsi16 : ahci
[17988266.268770] ata13: SATA max UDMA/133 abar m1024@0xfdbff000 port 0xfdbff100 irq 16
[17988266.268770] ata14: SATA max UDMA/133 abar m1024@0xfdbff000 port 0xfdbff180 irq 16
[17988266.268770] ata15: SATA max UDMA/133 abar m1024@0xfdbff000 port 0xfdbff200 irq 16
[17988266.268770] ata16: SATA max UDMA/133 abar m1024@0xfdbff000 port 0xfdbff280 irq 16
[17988266.268770] ata17: DUMMY
[14472041.032859] ata13: SATA link up 1.5 Gbps (SStatus 113 SControl 113)
[17988267.192200] ata13.00: ATA-7: ST3500641AS, 3.AAJ, max UDMA/133
[17988267.192200] ata13.00: 976773168 sectors, multi 16: LBA48 NCQ (depth 0/32)
[17988267.289287] ata13.00: configured for UDMA/133
[14472041.486215] ata14: SATA link down (SStatus 0 SControl 0)
[17988268.150351] ata15: SATA link down (SStatus 0 SControl 0)
[14472042.140943] ata16: SATA link down (SStatus 0 SControl 0)
[17988268.564933] scsi 12:0:0:0: Direct-Access     ATA      ST3500641AS      3.AA PQ: 0 ANSI: 5
[17988268.565456] sd 12:0:0:0: [sdg] 976773168 512-byte hardware sectors (500108 MB)
[17988268.565472] sd 12:0:0:0: [sdg] Write Protect is off
[17988268.565474] sd 12:0:0:0: [sdg] Mode Sense: 00 3a 00 00
[17988268.565494] sd 12:0:0:0: [sdg] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA
[17988268.565579] sd 12:0:0:0: [sdg] 976773168 512-byte hardware sectors (500108 MB)
[17988268.565590] sd 12:0:0:0: [sdg] Write Protect is off
[17988268.565592] sd 12:0:0:0: [sdg] Mode Sense: 00 3a 00 00
[17988268.565611] sd 12:0:0:0: [sdg] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA
[17988268.565614]  sdg: sdg1
[17988268.585221] sd 12:0:0:0: [sdg] Attached SCSI disk
[17988268.585221] sd 12:0:0:0: Attached scsi generic sg6 type 0

The patch was done on top of Gentoo's 2.6.25-r6, and before that on some 2.6.24 release.

I'm not subscribed, so please CC: me directly on follow-ups.

Regards,
Chris

[-- Attachment #2: 6141.patch --]
[-- Type: text/plain, Size: 341 bytes --]

--- ahci.c.orig	2009-01-10 11:44:28.000000000 +0300
+++ ahci.c	2009-01-10 11:45:18.000000000 +0300
@@ -597,6 +597,7 @@
 
 	/* Marvell */
 	{ PCI_VDEVICE(MARVELL, 0x6145), board_ahci_mv },	/* 6145 */
+	{ PCI_VDEVICE(MARVELL, 0x6141), board_ahci_mv },	/* 6141 */
 	{ PCI_VDEVICE(MARVELL, 0x6121), board_ahci_mv },	/* 6121 */
 
 	/* Promise */

Re: Support for Marvel 6141 in ahci.c

[Alan Cox]

On Sat, 10 Jan 2009 12:31:20 +0300
"Christian P. Schmidt" <schmidt@digadd.de> wrote:

> Hi all,
> 
> The Marvell 6141
> 08:00.0 SATA controller: Marvell Technology Group Ltd. 88SE614x SATA II PCI-E controller (rev 01)
> 08:00.0 0106: 11ab:6141 (rev 01)
> seems to work with the ahci driver with the attached patch:

Try using the PATA port.

For 2.6.29 we can probably add this ID to AHCI now as our AHCI code
ignores Marvell devices when the pata_marvell driver is present.

Alan

Re: Support for Marvel 6141 in ahci.c

[Christian P. Schmidt]

Hi Alan,

Alan Cox wrote:
> On Sat, 10 Jan 2009 12:31:20 +0300
> "Christian P. Schmidt" <schmidt@digadd.de> wrote:
> 
>> Hi all,
>>
>> The Marvell 6141
>> 08:00.0 SATA controller: Marvell Technology Group Ltd. 88SE614x SATA II PCI-E controller (rev 01)
>> 08:00.0 0106: 11ab:6141 (rev 01)
>> seems to work with the ahci driver with the attached patch:
> 
> Try using the PATA port.

Sorry, can't do - the chip is on an ASUS M2N32 WS Professional mainboard where the PATA is only on the MCP55.

> For 2.6.29 we can probably add this ID to AHCI now as our AHCI code
> ignores Marvell devices when the pata_marvell driver is present.

pata_marvell.c doesn't seem to have support for the 6141 anyway, so there is no conflict.

Regards,
Chris

Re: Support for Marvel 6141 in ahci.c

[Brad Campbell]

Christian P. Schmidt wrote:
> Hi Alan,
> 
> Alan Cox wrote:
>> On Sat, 10 Jan 2009 12:31:20 +0300
>> "Christian P. Schmidt" <schmidt@digadd.de> wrote:
>>
>>> Hi all,
>>>
>>> The Marvell 6141
>>> 08:00.0 SATA controller: Marvell Technology Group Ltd. 88SE614x SATA 
>>> II PCI-E controller (rev 01)
>>> 08:00.0 0106: 11ab:6141 (rev 01)
>>> seems to work with the ahci driver with the attached patch:
>>
>> Try using the PATA port.
> 
> Sorry, can't do - the chip is on an ASUS M2N32 WS Professional mainboard 
> where the PATA is only on the MCP55.

How is that working for you? I did the same style of patch back in 2.6.26 (on the same board) and 
found it died _hard_ when writing to more than one port at a time. It worked with only one drive 
attached though, although I could not get hot plugging to work either.

Regards,
Brad
-- 
Dolphins are so intelligent that within a few weeks they can
train Americans to stand at the edge of the pool and throw them
fish.

Re: Support for Marvel 6141 in ahci.c

[Jeff Garzik]

Brad Campbell wrote:
> Christian P. Schmidt wrote:
>> Hi Alan,
>>
>> Alan Cox wrote:
>>> On Sat, 10 Jan 2009 12:31:20 +0300
>>> "Christian P. Schmidt" <schmidt@digadd.de> wrote:
>>>
>>>> Hi all,
>>>>
>>>> The Marvell 6141
>>>> 08:00.0 SATA controller: Marvell Technology Group Ltd. 88SE614x SATA 
>>>> II PCI-E controller (rev 01)
>>>> 08:00.0 0106: 11ab:6141 (rev 01)
>>>> seems to work with the ahci driver with the attached patch:
>>>
>>> Try using the PATA port.
>>
>> Sorry, can't do - the chip is on an ASUS M2N32 WS Professional 
>> mainboard where the PATA is only on the MCP55.
> 
> How is that working for you? I did the same style of patch back in 
> 2.6.26 (on the same board) and found it died _hard_ when writing to more 
> than one port at a time. It worked with only one drive attached though, 
> although I could not get hot plugging to work either.

Yes... that is why the ID is not in there at present :/

	Jeff

Re: Support for Marvel 6141 in ahci.c

[Alan Cox]

> > How is that working for you? I did the same style of patch back in 
> > 2.6.26 (on the same board) and found it died _hard_ when writing to more 
> > than one port at a time. It worked with only one drive attached though, 
> > although I could not get hot plugging to work either.
> 
> Yes... that is why the ID is not in there at present :/

You could try borrowing the extra logic from sl82c105_qc_defer and apply
it to the AHCI driver in this case. Would need a bit of reworking but it
is sufficient to keep command issue to one channel at a time.

Reminds me I must update the artop driver..