* [PATCH] Update : Silicon Image 3114, 4 ports support
@ 2004-01-04 13:12 Mickael Marchand
2004-01-04 19:20 ` Jeff Garzik
2004-01-06 9:32 ` [PATCH] libata update Jeff Garzik
0 siblings, 2 replies; 5+ messages in thread
From: Mickael Marchand @ 2004-01-04 13:12 UTC (permalink / raw)
To: Kernel Mailing List; +Cc: Jeff Garzik, B. Gajdos
[-- Attachment #1: Type: Text/Plain, Size: 684 bytes --]
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi,
Thanks to the info Brian provided, I was able to set up the 4 ports of the
sil3114.
Attached is the patch for sata_sil.c, tested on a 2.6.1-rc1-mm1 and tested by
Brian too.
I used
if (ent->driver_data == sil_3114) { ... }
to ensure the 4 ports are probed only for sil3114 , I am not sure this is the
correct way to do it (so that sil3112 support is not broken). I guess Jeff
will review that :)
Cheers,
Mik
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)
iD8DBQE/+BFcyOYzc4nQ8j0RAttHAJ4gUBQt6tgTQp4m2pxBhGq+y2tqwgCbBRPU
p9u5AR+f22MEqlB5kxhM/zc=
=jPSE
-----END PGP SIGNATURE-----
[-- Attachment #2: sil3114-4ports.diff --]
[-- Type: text/x-diff, Size: 2409 bytes --]
--- sata_sil.c.orig 2004-01-03 12:23:37.000000000 +0100
+++ sata_sil.c 2004-01-04 13:51:28.000000000 +0100
@@ -39,6 +39,7 @@
enum {
sil_3112 = 0,
+ sil_3114 = 1,
SIL_IDE0_TF = 0x80,
SIL_IDE0_CTL = 0x8A,
@@ -49,6 +50,16 @@
SIL_IDE1_CTL = 0xCA,
SIL_IDE1_BMDMA = 0x08,
SIL_IDE1_SCR = 0x180,
+
+ SIL_IDE2_TF = 0x280,
+ SIL_IDE2_CTL = 0x28A,
+ SIL_IDE2_BMDMA = 0x200,
+ SIL_IDE2_SCR = 0x300,
+
+ SIL_IDE3_TF = 0x2C0,
+ SIL_IDE3_CTL = 0x2CA,
+ SIL_IDE3_BMDMA = 0x208,
+ SIL_IDE3_SCR = 0x380,
};
static void sil_set_piomode (struct ata_port *ap, struct ata_device *adev,
@@ -62,6 +73,7 @@
static struct pci_device_id sil_pci_tbl[] = {
{ 0x1095, 0x3112, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112 },
+ { 0x1095, 0x3114, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3114 },
{ } /* terminate list */
};
@@ -120,6 +132,14 @@
.pio_mask = 0x03, /* pio3-4 */
.udma_mask = 0x7f, /* udma0-6; FIXME */
.port_ops = &sil_ops,
+ }, /* sil_3114 */
+ {
+ .sht = &sil_sht,
+ .host_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
+ ATA_FLAG_SRST | ATA_FLAG_MMIO,
+ .pio_mask = 0x03, /* pio3-4 */
+ .udma_mask = 0x7f, /* udma0-6; FIXME */
+ .port_ops = &sil_ops,
},
};
@@ -267,7 +287,7 @@
probe_ent->pdev = pdev;
probe_ent->port_ops = sil_port_info[ent->driver_data].port_ops;
probe_ent->sht = sil_port_info[ent->driver_data].sht;
- probe_ent->n_ports = 2;
+ probe_ent->n_ports = (ent->driver_data == sil_3114) ? 4 : 2; //4 ports for a sil_3114
probe_ent->pio_mask = sil_port_info[ent->driver_data].pio_mask;
probe_ent->udma_mask = sil_port_info[ent->driver_data].udma_mask;
probe_ent->irq = pdev->irq;
@@ -296,6 +316,20 @@
probe_ent->port[1].scr_addr = base + SIL_IDE1_SCR;
ata_std_ports(&probe_ent->port[1]);
+ if (ent->driver_data == sil_3114) {
+ probe_ent->port[2].cmd_addr = base + SIL_IDE2_TF;
+ probe_ent->port[2].ctl_addr = base + SIL_IDE2_CTL;
+ probe_ent->port[2].bmdma_addr = base + SIL_IDE2_BMDMA;
+ probe_ent->port[2].scr_addr = base + SIL_IDE2_SCR;
+ ata_std_ports(&probe_ent->port[2]);
+
+ probe_ent->port[3].cmd_addr = base + SIL_IDE3_TF;
+ probe_ent->port[3].ctl_addr = base + SIL_IDE3_CTL;
+ probe_ent->port[3].bmdma_addr = base + SIL_IDE3_BMDMA;
+ probe_ent->port[3].scr_addr = base + SIL_IDE3_SCR;
+ ata_std_ports(&probe_ent->port[3]);
+ }
+
pci_set_master(pdev);
/* FIXME: check ata_device_add return value */
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] Update : Silicon Image 3114, 4 ports support 2004-01-04 13:12 [PATCH] Update : Silicon Image 3114, 4 ports support Mickael Marchand @ 2004-01-04 19:20 ` Jeff Garzik 2004-01-04 19:24 ` Mickael Marchand 2004-01-06 9:32 ` [PATCH] libata update Jeff Garzik 1 sibling, 1 reply; 5+ messages in thread From: Jeff Garzik @ 2004-01-04 19:20 UTC (permalink / raw) To: Mickael Marchand; +Cc: Kernel Mailing List, B. Gajdos On Sun, Jan 04, 2004 at 02:12:56PM +0100, Mickael Marchand wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > Hi, > > Thanks to the info Brian provided, I was able to set up the 4 ports of the > sil3114. > Attached is the patch for sata_sil.c, tested on a 2.6.1-rc1-mm1 and tested by > Brian too. > > I used > if (ent->driver_data == sil_3114) { ... } > > to ensure the 4 ports are probed only for sil3114 , I am not sure this is the > correct way to do it (so that sil3112 support is not broken). I guess Jeff > will review that :) Yeah, your patch looks good. I assume you tested ports 3 and 4? Jeff ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Update : Silicon Image 3114, 4 ports support 2004-01-04 19:20 ` Jeff Garzik @ 2004-01-04 19:24 ` Mickael Marchand 0 siblings, 0 replies; 5+ messages in thread From: Mickael Marchand @ 2004-01-04 19:24 UTC (permalink / raw) To: Jeff Garzik; +Cc: Kernel Mailing List, B. Gajdos -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Le Sunday 04 January 2004 20:20, vous avez écrit : > On Sun, Jan 04, 2004 at 02:12:56PM +0100, Mickael Marchand wrote: > > -----BEGIN PGP SIGNED MESSAGE----- > > Hash: SHA1 > > > > Hi, > > > > Thanks to the info Brian provided, I was able to set up the 4 ports of > > the sil3114. > > Attached is the patch for sata_sil.c, tested on a 2.6.1-rc1-mm1 and > > tested by Brian too. > > > > I used > > if (ent->driver_data == sil_3114) { ... } > > > > to ensure the 4 ports are probed only for sil3114 , I am not sure this is > > the correct way to do it (so that sil3112 support is not broken). I guess > > Jeff will review that :) > > Yeah, your patch looks good. I assume you tested ports 3 and 4? Brian tested them yes. on my (remote) box, the ports appears in dmesg but have no disks connected. Brian confirmed he can use his 4 drives with the patch. Cheers, Mik -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (GNU/Linux) iD8DBQE/+GhhyOYzc4nQ8j0RAhpzAJ95KGcYQ0wJwPKQJWoIF90hY3dHPgCcDb64 L5O9Uu7TZDlQ8AoEoDTgqys= =5nrB -----END PGP SIGNATURE----- ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] libata update 2004-01-04 13:12 [PATCH] Update : Silicon Image 3114, 4 ports support Mickael Marchand 2004-01-04 19:20 ` Jeff Garzik @ 2004-01-06 9:32 ` Jeff Garzik 2004-01-06 16:33 ` Roland Dreier 1 sibling, 1 reply; 5+ messages in thread From: Jeff Garzik @ 2004-01-06 9:32 UTC (permalink / raw) To: Kernel Mailing List; +Cc: Mickael Marchand, B. Gajdos, linux-ide [-- Attachment #1: Type: text/plain, Size: 193 bytes --] Ok, here is the latest libata, just a few Silicon Image updates (mainly thanks for Mikael). Patch: (attachment #2) Changelog: (attachment #1) BK repo: bk://gkernel.bkbits.net/libata-2.5 [-- Attachment #2: changelog.txt --] [-- Type: text/plain, Size: 448 bytes --] ChangeSet@1.1571, 2004-01-06 04:26:01-05:00, marchand@kde.org [libata sata_sil] add support for adaptec 1210sa, 4-port sii 3114 ChangeSet@1.1570, 2004-01-06 04:22:09-05:00, jgarzik@redhat.com [libata sata_svr] fix DRV_NAME to reflect actual driver filename ChangeSet@1.1534.6.1, 2003-12-30 19:46:09-05:00, jgarzik@redhat.com [libata sata_sil] unmask interrupts during initialization Prudent in general, and needed for Adaptec BIOSes. [-- Attachment #3: patch --] [-- Type: text/plain, Size: 3571 bytes --] diff -Nru a/drivers/scsi/sata_sil.c b/drivers/scsi/sata_sil.c --- a/drivers/scsi/sata_sil.c Tue Jan 6 04:29:01 2004 +++ b/drivers/scsi/sata_sil.c Tue Jan 6 04:29:01 2004 @@ -34,11 +34,16 @@ #include "hosts.h" #include <linux/libata.h> -#define DRV_NAME "ata_sil" -#define DRV_VERSION "0.51" +#define DRV_NAME "sata_sil" +#define DRV_VERSION "0.52" enum { sil_3112 = 0, + sil_3114 = 1, + + SIL_SYSCFG = 0x48, + SIL_MASK_IDE0_INT = (1 << 22), + SIL_MASK_IDE1_INT = (1 << 23), SIL_IDE0_TF = 0x80, SIL_IDE0_CTL = 0x8A, @@ -49,6 +54,16 @@ SIL_IDE1_CTL = 0xCA, SIL_IDE1_BMDMA = 0x08, SIL_IDE1_SCR = 0x180, + + SIL_IDE2_TF = 0x280, + SIL_IDE2_CTL = 0x28A, + SIL_IDE2_BMDMA = 0x200, + SIL_IDE2_SCR = 0x300, + + SIL_IDE3_TF = 0x2C0, + SIL_IDE3_CTL = 0x2CA, + SIL_IDE3_BMDMA = 0x208, + SIL_IDE3_SCR = 0x380, }; static void sil_set_piomode (struct ata_port *ap, struct ata_device *adev, @@ -62,6 +77,8 @@ static struct pci_device_id sil_pci_tbl[] = { { 0x1095, 0x3112, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112 }, + { 0x1095, 0x0240, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112 }, + { 0x1095, 0x3114, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3114 }, { } /* terminate list */ }; @@ -120,6 +137,14 @@ .pio_mask = 0x03, /* pio3-4 */ .udma_mask = 0x7f, /* udma0-6; FIXME */ .port_ops = &sil_ops, + }, /* sil_3114 */ + { + .sht = &sil_sht, + .host_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | + ATA_FLAG_SRST | ATA_FLAG_MMIO, + .pio_mask = 0x03, /* pio3-4 */ + .udma_mask = 0x7f, /* udma0-6; FIXME */ + .port_ops = &sil_ops, }, }; @@ -236,6 +261,7 @@ unsigned long base; void *mmio_base; int rc; + u32 tmp; if (!printed_version++) printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n"); @@ -267,7 +293,7 @@ probe_ent->pdev = pdev; probe_ent->port_ops = sil_port_info[ent->driver_data].port_ops; probe_ent->sht = sil_port_info[ent->driver_data].sht; - probe_ent->n_ports = 2; + probe_ent->n_ports = (ent->driver_data == sil_3114) ? 4 : 2; probe_ent->pio_mask = sil_port_info[ent->driver_data].pio_mask; probe_ent->udma_mask = sil_port_info[ent->driver_data].udma_mask; probe_ent->irq = pdev->irq; @@ -295,6 +321,28 @@ probe_ent->port[1].bmdma_addr = base + SIL_IDE1_BMDMA; probe_ent->port[1].scr_addr = base + SIL_IDE1_SCR; ata_std_ports(&probe_ent->port[1]); + + /* make sure IDE0/1 interrupts are not masked */ + tmp = readl(mmio_base + SIL_SYSCFG); + if (tmp & (SIL_MASK_IDE0_INT | SIL_MASK_IDE1_INT)) { + tmp &= ~(SIL_MASK_IDE0_INT | SIL_MASK_IDE1_INT); + writel(tmp, mmio_base + SIL_SYSCFG); + readl(mmio_base + SIL_SYSCFG); /* flush */ + } + + if (ent->driver_data == sil_3114) { + probe_ent->port[2].cmd_addr = base + SIL_IDE2_TF; + probe_ent->port[2].ctl_addr = base + SIL_IDE2_CTL; + probe_ent->port[2].bmdma_addr = base + SIL_IDE2_BMDMA; + probe_ent->port[2].scr_addr = base + SIL_IDE2_SCR; + ata_std_ports(&probe_ent->port[2]); + + probe_ent->port[3].cmd_addr = base + SIL_IDE3_TF; + probe_ent->port[3].ctl_addr = base + SIL_IDE3_CTL; + probe_ent->port[3].bmdma_addr = base + SIL_IDE3_BMDMA; + probe_ent->port[3].scr_addr = base + SIL_IDE3_SCR; + ata_std_ports(&probe_ent->port[3]); + } pci_set_master(pdev); diff -Nru a/drivers/scsi/sata_svw.c b/drivers/scsi/sata_svw.c --- a/drivers/scsi/sata_svw.c Tue Jan 6 04:29:01 2004 +++ b/drivers/scsi/sata_svw.c Tue Jan 6 04:29:01 2004 @@ -43,7 +43,7 @@ #include <asm/pci-bridge.h> #endif /* CONFIG_ALL_PPC */ -#define DRV_NAME "ata_k2" +#define DRV_NAME "sata_svw" #define DRV_VERSION "1.03" ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] libata update 2004-01-06 9:32 ` [PATCH] libata update Jeff Garzik @ 2004-01-06 16:33 ` Roland Dreier 0 siblings, 0 replies; 5+ messages in thread From: Roland Dreier @ 2004-01-06 16:33 UTC (permalink / raw) To: Jeff Garzik; +Cc: Kernel Mailing List, linux-ide Hi Jeff and others, On the topic of Silicon Image SATA support, how do things look for supporting the SiI 3512? This chip seems to be pretty common on Nforce3 boards. I had a look on the SiI web site and they say the programming interface is very close to the 3112. Unfortunately their data sheets don't seem to be freely available so I can't tell how close the interface really is (or do the work to add 3512 support myself). Thanks, Roland ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2004-01-06 16:33 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2004-01-04 13:12 [PATCH] Update : Silicon Image 3114, 4 ports support Mickael Marchand 2004-01-04 19:20 ` Jeff Garzik 2004-01-04 19:24 ` Mickael Marchand 2004-01-06 9:32 ` [PATCH] libata update Jeff Garzik 2004-01-06 16:33 ` Roland Dreier
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.