* [PATCH 0/4] Series short description
@ 2009-05-06 16:08 Alan Cox
2009-05-06 16:08 ` [PATCH 1/4] ata_piix: ICH7 does not support correct MWDMA timings Alan Cox
` (4 more replies)
0 siblings, 5 replies; 12+ messages in thread
From: Alan Cox @ 2009-05-06 16:08 UTC (permalink / raw)
To: linux-ide, jeff
A quick batch of PIIX updates
---
Alan Cox (4):
ata_piix: Remove stale comment
ata_piix: Turn on hotplugging support for older chips
ata_piix: The Sony TZ90 needs the cable type hardcoding
ata_piix: ICH7 does not support correct MWDMA timings
drivers/ata/ata_piix.c | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH 1/4] ata_piix: ICH7 does not support correct MWDMA timings 2009-05-06 16:08 [PATCH 0/4] Series short description Alan Cox @ 2009-05-06 16:08 ` Alan Cox 2009-05-06 16:09 ` [PATCH 2/4] ata_piix: The Sony TZ90 needs the cable type hardcoding Alan Cox ` (3 subsequent siblings) 4 siblings, 0 replies; 12+ messages in thread From: Alan Cox @ 2009-05-06 16:08 UTC (permalink / raw) To: linux-ide, jeff From: Alan Cox <alan@linux.intel.com> See Errata documentation. The recommended workaround is to use PIO4 instead which will we automatically do by flagging this mode not available. Signed-off-by: Alan Cox <alan.cox@linux.intel.com> --- drivers/ata/ata_piix.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index 942d14a..2b5700a 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c @@ -72,6 +72,7 @@ * ICH2 spec c #20 - IDE PRD must not cross a 64K boundary * and must be dword aligned * ICH2 spec c #24 - UDMA mode 4,5 t85/86 should be 6ns not 3.3 + * ICH7 errata #16 - MWDMA1 timings are incorrect * * Should have been BIOS fixed: * 450NX: errata #19 - DMA hangs on old 450NX @@ -94,7 +95,7 @@ #include <linux/dmi.h> #define DRV_NAME "ata_piix" -#define DRV_VERSION "2.12" +#define DRV_VERSION "2.13" enum { PIIX_IOCFG = 0x54, /* IDE I/O configuration register */ @@ -136,6 +137,7 @@ enum piix_controller_ids { ich_pata_33, /* ICH up to UDMA 33 only */ ich_pata_66, /* ICH up to 66 Mhz */ ich_pata_100, /* ICH up to UDMA 100 */ + ich_pata_100_nomwdma1, /* ICH up to UDMA 100 but with no MWDMA1*/ ich5_sata, ich6_sata, ich6m_sata, @@ -216,8 +218,8 @@ static const struct pci_device_id piix_pci_tbl[] = { /* ICH6 (and 6) (i915) UDMA 100 */ { 0x8086, 0x266F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, /* ICH7/7-R (i945, i975) UDMA 100*/ - { 0x8086, 0x27DF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, - { 0x8086, 0x269E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, + { 0x8086, 0x27DF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100_nomwdma1 }, + { 0x8086, 0x269E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100_nomwdma1 }, /* ICH8 Mobile PATA Controller */ { 0x8086, 0x2850, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, @@ -487,6 +489,15 @@ static struct ata_port_info piix_port_info[] = { .port_ops = &ich_pata_ops, }, + [ich_pata_100_nomwdma1] = + { + .flags = PIIX_PATA_FLAGS | PIIX_FLAG_CHECKINTR, + .pio_mask = ATA_PIO4, + .mwdma_mask = ATA_MWDMA2_ONLY, + .udma_mask = ATA_UDMA5, + .port_ops = &ich_pata_ops, + }, + [ich5_sata] = { .flags = PIIX_SATA_FLAGS, ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 2/4] ata_piix: The Sony TZ90 needs the cable type hardcoding 2009-05-06 16:08 [PATCH 0/4] Series short description Alan Cox 2009-05-06 16:08 ` [PATCH 1/4] ata_piix: ICH7 does not support correct MWDMA timings Alan Cox @ 2009-05-06 16:09 ` Alan Cox 2009-05-11 18:33 ` Jeff Garzik 2009-05-06 16:10 ` [PATCH 3/4] ata_piix: Turn on hotplugging support for older chips Alan Cox ` (2 subsequent siblings) 4 siblings, 1 reply; 12+ messages in thread From: Alan Cox @ 2009-05-06 16:09 UTC (permalink / raw) To: linux-ide, jeff From: Alan Cox <alan@linux.intel.com> The Sony TZ90 needs the cable type hardcoding. See bug #12734 Signed-off-by: Alan Cox <alan@linux.intel.com> --- drivers/ata/ata_piix.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index 2b5700a..d51a17c 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c @@ -605,6 +605,7 @@ static const struct ich_laptop ich_laptop[] = { { 0x24CA, 0x1025, 0x003d }, /* ICH4 on ACER TM290 */ { 0x266F, 0x1025, 0x0066 }, /* ICH6 on ACER Aspire 1694WLMi */ { 0x2653, 0x1043, 0x82D8 }, /* ICH6M on Asus Eee 701 */ + { 0x27df, 0x104d, 0x900e }, /* ICH7 on Sony TZ-90 */ /* end marker */ { 0, } }; ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH 2/4] ata_piix: The Sony TZ90 needs the cable type hardcoding 2009-05-06 16:09 ` [PATCH 2/4] ata_piix: The Sony TZ90 needs the cable type hardcoding Alan Cox @ 2009-05-11 18:33 ` Jeff Garzik 0 siblings, 0 replies; 12+ messages in thread From: Jeff Garzik @ 2009-05-11 18:33 UTC (permalink / raw) To: Alan Cox; +Cc: linux-ide Alan Cox wrote: > From: Alan Cox <alan@linux.intel.com> > > The Sony TZ90 needs the cable type hardcoding. See bug #12734 > > Signed-off-by: Alan Cox <alan@linux.intel.com> > --- > > drivers/ata/ata_piix.c | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > > diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c > index 2b5700a..d51a17c 100644 > --- a/drivers/ata/ata_piix.c > +++ b/drivers/ata/ata_piix.c > @@ -605,6 +605,7 @@ static const struct ich_laptop ich_laptop[] = { > { 0x24CA, 0x1025, 0x003d }, /* ICH4 on ACER TM290 */ > { 0x266F, 0x1025, 0x0066 }, /* ICH6 on ACER Aspire 1694WLMi */ > { 0x2653, 0x1043, 0x82D8 }, /* ICH6M on Asus Eee 701 */ > + { 0x27df, 0x104d, 0x900e }, /* ICH7 on Sony TZ-90 */ > /* end marker */ applied 1-2 to #upstream-fixes ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 3/4] ata_piix: Turn on hotplugging support for older chips 2009-05-06 16:08 [PATCH 0/4] Series short description Alan Cox 2009-05-06 16:08 ` [PATCH 1/4] ata_piix: ICH7 does not support correct MWDMA timings Alan Cox 2009-05-06 16:09 ` [PATCH 2/4] ata_piix: The Sony TZ90 needs the cable type hardcoding Alan Cox @ 2009-05-06 16:10 ` Alan Cox 2009-05-20 20:12 ` Jeff Garzik 2009-05-06 16:10 ` [PATCH 4/4] ata_piix: Remove stale comment Alan Cox 2009-05-11 17:21 ` [PATCH 0/4] Series short description Jeff Garzik 4 siblings, 1 reply; 12+ messages in thread From: Alan Cox @ 2009-05-06 16:10 UTC (permalink / raw) To: linux-ide, jeff From: Alan Cox <alan@linux.intel.com> We can't do this for the later ones as they have all sorts of magic boot time stuff that needs reviewing and the like. However we can do it for the older ones and it turns out we need to as some IBM docking stations have a second PIIX series device in them and without this change you can't use it very well Signed-off-by: Alan Cox <alan@linux.intel.com> --- drivers/ata/ata_piix.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index d51a17c..3434468 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c @@ -1500,8 +1500,8 @@ static int __devinit piix_init_one(struct pci_dev *pdev, dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n"); - /* no hotplugging support (FIXME) */ - if (!in_module_init) + /* no hotplugging support for later devices (FIXME) */ + if (!in_module_init && ent->driver_data >= ich5_sata) return -ENODEV; if (piix_broken_system_poweroff(pdev)) { ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH 3/4] ata_piix: Turn on hotplugging support for older chips 2009-05-06 16:10 ` [PATCH 3/4] ata_piix: Turn on hotplugging support for older chips Alan Cox @ 2009-05-20 20:12 ` Jeff Garzik 0 siblings, 0 replies; 12+ messages in thread From: Jeff Garzik @ 2009-05-20 20:12 UTC (permalink / raw) To: Alan Cox; +Cc: linux-ide Alan Cox wrote: > From: Alan Cox <alan@linux.intel.com> > > We can't do this for the later ones as they have all sorts of magic boot > time stuff that needs reviewing and the like. However we can do it for the > older ones and it turns out we need to as some IBM docking stations have a > second PIIX series device in them and without this change you can't use it > very well > > Signed-off-by: Alan Cox <alan@linux.intel.com> > --- > > drivers/ata/ata_piix.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > > diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c > index d51a17c..3434468 100644 > --- a/drivers/ata/ata_piix.c > +++ b/drivers/ata/ata_piix.c > @@ -1500,8 +1500,8 @@ static int __devinit piix_init_one(struct pci_dev *pdev, > dev_printk(KERN_DEBUG, &pdev->dev, > "version " DRV_VERSION "\n"); > > - /* no hotplugging support (FIXME) */ > - if (!in_module_init) > + /* no hotplugging support for later devices (FIXME) */ > + if (!in_module_init && ent->driver_data >= ich5_sata) > return -ENODEV; applied ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 4/4] ata_piix: Remove stale comment 2009-05-06 16:08 [PATCH 0/4] Series short description Alan Cox ` (2 preceding siblings ...) 2009-05-06 16:10 ` [PATCH 3/4] ata_piix: Turn on hotplugging support for older chips Alan Cox @ 2009-05-06 16:10 ` Alan Cox 2009-05-20 20:12 ` Jeff Garzik 2009-05-11 17:21 ` [PATCH 0/4] Series short description Jeff Garzik 4 siblings, 1 reply; 12+ messages in thread From: Alan Cox @ 2009-05-06 16:10 UTC (permalink / raw) To: linux-ide, jeff From: Alan Cox <alan@linux.intel.com> Combined mode pci quirk hacks went away - so the table to keep in sync no longer exists. Signed-off-by: Alan Cox <alan@linux.intel.com> --- drivers/ata/ata_piix.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index 3434468..0fba112 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c @@ -223,10 +223,8 @@ static const struct pci_device_id piix_pci_tbl[] = { /* ICH8 Mobile PATA Controller */ { 0x8086, 0x2850, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, - /* NOTE: The following PCI ids must be kept in sync with the - * list in drivers/pci/quirks.c. - */ - + /* SATA ports */ + /* 82801EB (ICH5) */ { 0x8086, 0x24d1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich5_sata }, /* 82801EB (ICH5) */ ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH 4/4] ata_piix: Remove stale comment 2009-05-06 16:10 ` [PATCH 4/4] ata_piix: Remove stale comment Alan Cox @ 2009-05-20 20:12 ` Jeff Garzik 0 siblings, 0 replies; 12+ messages in thread From: Jeff Garzik @ 2009-05-20 20:12 UTC (permalink / raw) To: Alan Cox; +Cc: linux-ide Alan Cox wrote: > From: Alan Cox <alan@linux.intel.com> > > Combined mode pci quirk hacks went away - so the table to keep in sync > no longer exists. > > Signed-off-by: Alan Cox <alan@linux.intel.com> > --- > > drivers/ata/ata_piix.c | 6 ++---- > 1 files changed, 2 insertions(+), 4 deletions(-) > > > diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c > index 3434468..0fba112 100644 > --- a/drivers/ata/ata_piix.c > +++ b/drivers/ata/ata_piix.c > @@ -223,10 +223,8 @@ static const struct pci_device_id piix_pci_tbl[] = { > /* ICH8 Mobile PATA Controller */ > { 0x8086, 0x2850, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, > > - /* NOTE: The following PCI ids must be kept in sync with the > - * list in drivers/pci/quirks.c. > - */ > - > + /* SATA ports */ > + > /* 82801EB (ICH5) */ applied ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 0/4] Series short description 2009-05-06 16:08 [PATCH 0/4] Series short description Alan Cox ` (3 preceding siblings ...) 2009-05-06 16:10 ` [PATCH 4/4] ata_piix: Remove stale comment Alan Cox @ 2009-05-11 17:21 ` Jeff Garzik 2009-05-11 17:25 ` Alan Cox 4 siblings, 1 reply; 12+ messages in thread From: Jeff Garzik @ 2009-05-11 17:21 UTC (permalink / raw) To: Alan Cox; +Cc: linux-ide Alan Cox wrote: > A quick batch of PIIX updates > --- > > Alan Cox (4): > ata_piix: Remove stale comment > ata_piix: Turn on hotplugging support for older chips > ata_piix: The Sony TZ90 needs the cable type hardcoding > ata_piix: ICH7 does not support correct MWDMA timings I guess 1 & 2 are #upstream-fixes material, and 3 & 4 are #upstream ? Jeff ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 0/4] Series short description 2009-05-11 17:21 ` [PATCH 0/4] Series short description Jeff Garzik @ 2009-05-11 17:25 ` Alan Cox 2009-05-11 17:33 ` Jeff Garzik 0 siblings, 1 reply; 12+ messages in thread From: Alan Cox @ 2009-05-11 17:25 UTC (permalink / raw) To: Jeff Garzik; +Cc: linux-ide On Mon, 11 May 2009 13:21:43 -0400 Jeff Garzik <jeff@garzik.org> wrote: > Alan Cox wrote: > > A quick batch of PIIX updates > > --- > > > > Alan Cox (4): > > ata_piix: Remove stale comment > > ata_piix: Turn on hotplugging support for older chips > > ata_piix: The Sony TZ90 needs the cable type hardcoding > > ata_piix: ICH7 does not support correct MWDMA timings > > I guess 1 & 2 are #upstream-fixes material, and 3 & 4 are #upstream ? I'd say they are all fixes. In terms of urgency #4 hasn't been reported by anyone it was found when checking errata, #3 is a real problem encountered by users #2 affects only fairly obscure hardware and isn't a regression, #1 is a comment. I've also now confirmed with the Intel hardware folks that there isn't any reason we can't turn on parallel probing in ata_piix. Alan ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 0/4] Series short description 2009-05-11 17:25 ` Alan Cox @ 2009-05-11 17:33 ` Jeff Garzik 2009-05-11 17:58 ` Alan Cox 0 siblings, 1 reply; 12+ messages in thread From: Jeff Garzik @ 2009-05-11 17:33 UTC (permalink / raw) To: Alan Cox; +Cc: linux-ide Alan Cox wrote: > On Mon, 11 May 2009 13:21:43 -0400 > Jeff Garzik <jeff@garzik.org> wrote: > >> Alan Cox wrote: >>> A quick batch of PIIX updates >>> --- >>> >>> Alan Cox (4): >>> ata_piix: Remove stale comment >>> ata_piix: Turn on hotplugging support for older chips >>> ata_piix: The Sony TZ90 needs the cable type hardcoding >>> ata_piix: ICH7 does not support correct MWDMA timings >> I guess 1 & 2 are #upstream-fixes material, and 3 & 4 are #upstream ? > > I'd say they are all fixes. In terms of urgency #4 hasn't been reported > by anyone it was found when checking errata, #3 is a real problem > encountered by users #2 affects only fairly obscure hardware and isn't a > regression, #1 is a comment. I was referring to the patch numbering provided by you, in your submission, which is the reverse of the order listed above: patch #1: ICH7 MWDMA timings patch #2: TZ90 patch #3: turn on hotplugging patch #4: fix comment patch #3 is a behavior change IMO very late in -rc cycle, and patch #4 is not urgent. Jeff ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 0/4] Series short description 2009-05-11 17:33 ` Jeff Garzik @ 2009-05-11 17:58 ` Alan Cox 0 siblings, 0 replies; 12+ messages in thread From: Alan Cox @ 2009-05-11 17:58 UTC (permalink / raw) To: Jeff Garzik; +Cc: linux-ide > I was referring to the patch numbering provided by you, in your > submission, which is the reverse of the order listed above: > > patch #1: ICH7 MWDMA timings > patch #2: TZ90 > patch #3: turn on hotplugging > patch #4: fix comment > > patch #3 is a behavior change IMO very late in -rc cycle, and patch #4 > is not urgent. Agreed - sorry I'd forgotten that stgit is quite creative with its ordering. ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2009-05-20 20:12 UTC | newest] Thread overview: 12+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2009-05-06 16:08 [PATCH 0/4] Series short description Alan Cox 2009-05-06 16:08 ` [PATCH 1/4] ata_piix: ICH7 does not support correct MWDMA timings Alan Cox 2009-05-06 16:09 ` [PATCH 2/4] ata_piix: The Sony TZ90 needs the cable type hardcoding Alan Cox 2009-05-11 18:33 ` Jeff Garzik 2009-05-06 16:10 ` [PATCH 3/4] ata_piix: Turn on hotplugging support for older chips Alan Cox 2009-05-20 20:12 ` Jeff Garzik 2009-05-06 16:10 ` [PATCH 4/4] ata_piix: Remove stale comment Alan Cox 2009-05-20 20:12 ` Jeff Garzik 2009-05-11 17:21 ` [PATCH 0/4] Series short description Jeff Garzik 2009-05-11 17:25 ` Alan Cox 2009-05-11 17:33 ` Jeff Garzik 2009-05-11 17:58 ` Alan Cox
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).