| Message ID | 201110131454.48888.bzolnier@gmail.com |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
Hello. On 10/13/2011 04:54 PM, Bartlomiej Zolnierkiewicz wrote: >> On 13-10-2011 15:10, Bartlomiej Zolnierkiewicz wrote: >>> From: Bartlomiej Zolnierkiewicz<bzolnier@gmail.com> >>> Subject: [PATCH] pata_via: add via_fixup() >>> Factor out common code from via_[re]init_one() to via_fixup(). >>> Signed-off-by: Bartlomiej Zolnierkiewicz<bzolnier@gmail.com> >>> --- >>> earlier references: >>> https://lkml.org/lkml/2009/11/25/381 >>> drivers/ata/pata_via.c | 49 +++++++++++++++++++++++-------------------------- >>> 1 file changed, 23 insertions(+), 26 deletions(-) >>> Index: b/drivers/ata/pata_via.c >>> =================================================================== >>> --- a/drivers/ata/pata_via.c >>> +++ b/drivers/ata/pata_via.c >>> @@ -491,6 +491,27 @@ static void via_config_fifo(struct pci_d >>> } >>> } >>> >>> +static void via_fixup(struct pci_dev *pdev, const struct via_isa_bridge *config) >>> +{ >>> + u32 timing; >>> + >>> + /* Initialise the FIFO for the enabled channels. */ >>> + via_config_fifo(pdev, config->flags); >>> + >>> + if (config->udma_mask == ATA_UDMA4) { >>> + /* The 66 MHz devices require we enable the clock */ >>> + pci_read_config_dword(pdev, 0x50,&timing); >>> + timing |= 0x80008; >>> + pci_write_config_dword(pdev, 0x50, timing); >>> + } >> Hm, via_init_one() doesn't do this now... but used to do this before your >> patch: >> http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=460f5318460a9a3b2562d8055b9fb1c60b768e1f >> Was that patch wrong or am I misundertanding? > It seems that the previous patch was wrong and I haven't noticed it earlier > because both patches were in my patch queue. > From: Bartlomiej Zolnierkiewicz<bzolnier@gmail.com> > Subject: [PATCH v2] pata_via: add via_fixup() > * Fix via_init_one() to enable clock on 66 MHz devices > (bug introduced in commit 460f531 "pata_via: store UDMA masks > in via_isa_bridges table"). > * Factor out common code from via_[re]init_one() to via_fixup(). > Signed-off-by: Bartlomiej Zolnierkiewicz<bzolnier@gmail.com> OK, but don't you think the fix should be separate from refactor (and be applied to -stable)? WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Index: b/drivers/ata/pata_via.c =================================================================== --- a/drivers/ata/pata_via.c +++ b/drivers/ata/pata_via.c @@ -491,6 +491,27 @@ static void via_config_fifo(struct pci_d } } +static void via_fixup(struct pci_dev *pdev, const struct via_isa_bridge *config) +{ + u32 timing; + + /* Initialise the FIFO for the enabled channels. */ + via_config_fifo(pdev, config->flags); + + if (config->udma_mask == ATA_UDMA4) { + /* The 66 MHz devices require we enable the clock */ + pci_read_config_dword(pdev, 0x50, &timing); + timing |= 0x80008; + pci_write_config_dword(pdev, 0x50, timing); + } + if (config->flags & VIA_BAD_CLK66) { + /* Disable the 66MHz clock on problem devices */ + pci_read_config_dword(pdev, 0x50, &timing); + timing &= ~0x80008; + pci_write_config_dword(pdev, 0x50, timing); + } +} + /** * via_init_one - discovery callback * @pdev: PCI device @@ -553,7 +574,6 @@ static int via_init_one(struct pci_dev * const struct via_isa_bridge *config; static int printed_version; u8 enable; - u32 timing; unsigned long flags = id->driver_data; int rc; @@ -593,9 +613,6 @@ static int via_init_one(struct pci_dev * return -ENODEV; } - /* Initialise the FIFO for the enabled channels. */ - via_config_fifo(pdev, config->flags); - /* Clock set up */ switch (config->udma_mask) { case 0x00: @@ -621,12 +638,7 @@ static int via_init_one(struct pci_dev * return -ENODEV; } - if (config->flags & VIA_BAD_CLK66) { - /* Disable the 66MHz clock on problem devices */ - pci_read_config_dword(pdev, 0x50, &timing); - timing &= ~0x80008; - pci_write_config_dword(pdev, 0x50, timing); - } + via_fixup(pdev, config); /* We have established the device type, now fire it up */ return ata_pci_bmdma_init_one(pdev, ppi, &via_sht, (void *)config, 0); @@ -645,29 +657,14 @@ static int via_init_one(struct pci_dev * static int via_reinit_one(struct pci_dev *pdev) { - u32 timing; struct ata_host *host = dev_get_drvdata(&pdev->dev); - const struct via_isa_bridge *config = host->private_data; int rc; rc = ata_pci_device_do_resume(pdev); if (rc) return rc; - via_config_fifo(pdev, config->flags); - - if (config->udma_mask == ATA_UDMA4) { - /* The 66 MHz devices require we enable the clock */ - pci_read_config_dword(pdev, 0x50, &timing); - timing |= 0x80008; - pci_write_config_dword(pdev, 0x50, timing); - } - if (config->flags & VIA_BAD_CLK66) { - /* Disable the 66MHz clock on problem devices */ - pci_read_config_dword(pdev, 0x50, &timing); - timing &= ~0x80008; - pci_write_config_dword(pdev, 0x50, timing); - } + via_fixup(pdev, host->private_data); ata_host_resume(host); return 0;