diff for duplicates of <200812081755.13024.bzolnier@gmail.com> diff --git a/a/1.txt b/N1/1.txt index f721e59..1bcc03a 100644 Binary files a/a/1.txt and b/N1/1.txt differ diff --git a/a/content_digest b/N1/content_digest index 0cd9f9a..f7bbd26 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -10,216 +10,12 @@ "b\0" "\n" "Linus, please pull from:\n" - "\n" "master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6.git/\n" - "\n" "to receive the following updates:\n" + " drivers/ide/Kconfig | 14 +++----------- drivers/ide/ide-io.c | 6 ++++-- drivers/ide/pmac.c | 30 +++--------------------------- 3 files changed, 10 insertions(+), 40 deletions(-)\n" "\n" - " drivers/ide/Kconfig | 14 +++-----------\n" - " drivers/ide/ide-io.c | 6 ++++--\n" - " drivers/ide/pmac.c | 30 +++---------------------------\n" - " 3 files changed, 10 insertions(+), 40 deletions(-)\n" - "\n" - "\n" - "Bartlomiej Zolnierkiewicz (2):\n" - " Revert \"ide: respect current DMA setting during resume\"\n" - " ide: build-fix for CONFIG_BLK_DEV_IDEDMA_PMAC=n\n" - "\n" + "Bartlomiej Zolnierkiewicz (2): Revert \"ide: respect current DMA setting during resume\" ide: build-fix for CONFIG_BLK_DEV_IDEDMA_PMAC=n\n" "\n" - "diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig\n" - "index 6d74017..e6857e0 100644\n" - "--- a/drivers/ide/Kconfig\n" - "+++ b/drivers/ide/Kconfig\n" - "@@ -669,10 +669,12 @@ config BLK_DEV_CELLEB\n" - " \n" - " endif\n" - " \n" - "+# TODO: BLK_DEV_IDEDMA_PCI -> BLK_DEV_IDEDMA_SFF\n" - " config BLK_DEV_IDE_PMAC\n" - " \ttristate \"PowerMac on-board IDE support\"\n" - " \tdepends on PPC_PMAC && IDE=y\n" - " \tselect IDE_TIMINGS\n" - "+\tselect BLK_DEV_IDEDMA_PCI\n" - " \thelp\n" - " \t This driver provides support for the on-board IDE controller on\n" - " \t most of the recent Apple Power Macintoshes and PowerBooks.\n" - "@@ -689,16 +691,6 @@ config BLK_DEV_IDE_PMAC_ATA100FIRST\n" - " \t CD-ROM on hda. This option changes this to more natural hda for\n" - " \t hard disk and hdc for CD-ROM.\n" - " \n" - "-config BLK_DEV_IDEDMA_PMAC\n" - "-\tbool \"PowerMac IDE DMA support\"\n" - "-\tdepends on BLK_DEV_IDE_PMAC\n" - "-\tselect BLK_DEV_IDEDMA_PCI\n" - "-\thelp\n" - "-\t This option allows the driver for the on-board IDE controller on\n" - "-\t Power Macintoshes and PowerBooks to use DMA (direct memory access)\n" - "-\t to transfer data to and from memory. Saying Y is safe and improves\n" - "-\t performance.\n" - "-\n" - " config BLK_DEV_IDE_AU1XXX\n" - " bool \"IDE for AMD Alchemy Au1200\"\n" - " depends on SOC_AU1200\n" - "@@ -912,7 +904,7 @@ config BLK_DEV_UMC8672\n" - " endif\n" - " \n" - " config BLK_DEV_IDEDMA\n" - "-\tdef_bool BLK_DEV_IDEDMA_SFF || BLK_DEV_IDEDMA_PMAC || \\\n" - "+\tdef_bool BLK_DEV_IDEDMA_SFF || \\\n" - " \t\t BLK_DEV_IDEDMA_ICS || BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA\n" - " \n" - " endif # IDE\n" - "diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c\n" - "index 7d275b2..cc35d6d 100644\n" - "--- a/drivers/ide/ide-io.c\n" - "+++ b/drivers/ide/ide-io.c\n" - "@@ -208,8 +208,10 @@ static ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request *\n" - " \t\t */\n" - " \t\tif (drive->hwif->dma_ops == NULL)\n" - " \t\t\tbreak;\n" - "-\t\tif (drive->dev_flags & IDE_DFLAG_USING_DMA)\n" - "-\t\t\tide_set_dma(drive);\n" - "+\t\t/*\n" - "+\t\t * TODO: respect IDE_DFLAG_USING_DMA\n" - "+\t\t */\n" - "+\t\tide_set_dma(drive);\n" - " \t\tbreak;\n" - " \t}\n" - " \n" - "diff --git a/drivers/ide/pmac.c b/drivers/ide/pmac.c\n" - "index 2e19d62..7c481bb 100644\n" - "--- a/drivers/ide/pmac.c\n" - "+++ b/drivers/ide/pmac.c\n" - "@@ -66,7 +66,6 @@ typedef struct pmac_ide_hwif {\n" - " \tstruct macio_dev\t\t*mdev;\n" - " \tu32\t\t\t\ttimings[4];\n" - " \tvolatile u32 __iomem *\t\t*kauai_fcr;\n" - "-#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC\n" - " \t/* Those fields are duplicating what is in hwif. We currently\n" - " \t * can't use the hwif ones because of some assumptions that are\n" - " \t * beeing done by the generic code about the kind of dma controller\n" - "@@ -74,8 +73,6 @@ typedef struct pmac_ide_hwif {\n" - " \t */\n" - " \tvolatile struct dbdma_regs __iomem *\tdma_regs;\n" - " \tstruct dbdma_cmd*\t\tdma_table_cpu;\n" - "-#endif\n" - "-\t\n" - " } pmac_ide_hwif_t;\n" - " \n" - " enum {\n" - "@@ -222,8 +219,6 @@ static const char* model_name[] = {\n" - " #define KAUAI_FCR_UATA_RESET_N\t\t0x00000002\n" - " #define KAUAI_FCR_UATA_ENABLE\t\t0x00000001\n" - " \n" - "-#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC\n" - "-\n" - " /* Rounded Multiword DMA timings\n" - " * \n" - " * I gave up finding a generic formula for all controller\n" - "@@ -413,8 +408,6 @@ static int pmac_ide_build_dmatable(ide_drive_t *drive, struct request *rq);\n" - " static void pmac_ide_selectproc(ide_drive_t *drive);\n" - " static void pmac_ide_kauai_selectproc(ide_drive_t *drive);\n" - " \n" - "-#endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */\n" - "-\n" - " #define PMAC_IDE_REG(x) \\\n" - " \t((void __iomem *)((drive)->hwif->io_ports.data_addr + (x)))\n" - " \n" - "@@ -584,8 +577,6 @@ pmac_ide_set_pio_mode(ide_drive_t *drive, const u8 pio)\n" - " \tpmac_ide_do_update_timings(drive);\n" - " }\n" - " \n" - "-#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC\n" - "-\n" - " /*\n" - " * Calculate KeyLargo ATA/66 UDMA timings\n" - " */\n" - "@@ -786,7 +777,6 @@ set_timings_mdma(ide_drive_t *drive, int intf_type, u32 *timings, u32 *timings2,\n" - " \t\tdrive->name, speed & 0xf, *timings);\n" - " #endif\t\n" - " }\n" - "-#endif /* #ifdef CONFIG_BLK_DEV_IDEDMA_PMAC */\n" - " \n" - " static void pmac_ide_set_dma_mode(ide_drive_t *drive, const u8 speed)\n" - " {\n" - "@@ -804,7 +794,6 @@ static void pmac_ide_set_dma_mode(ide_drive_t *drive, const u8 speed)\n" - " \ttl[0] = *timings;\n" - " \ttl[1] = *timings2;\n" - " \n" - "-#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC\n" - " \tif (speed >= XFER_UDMA_0) {\n" - " \t\tif (pmif->kind == controller_kl_ata4)\n" - " \t\t\tret = set_timings_udma_ata4(&tl[0], speed);\n" - "@@ -817,7 +806,7 @@ static void pmac_ide_set_dma_mode(ide_drive_t *drive, const u8 speed)\n" - " \t\t\tret = -1;\n" - " \t} else\n" - " \t\tset_timings_mdma(drive, pmif->kind, &tl[0], &tl[1], speed);\n" - "-#endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */\n" - "+\n" - " \tif (ret)\n" - " \t\treturn;\n" - " \n" - "@@ -1008,9 +997,7 @@ static const struct ide_port_info pmac_port_info = {\n" - " \t.chipset\t\t= ide_pmac,\n" - " \t.tp_ops\t\t\t= &pmac_tp_ops,\n" - " \t.port_ops\t\t= &pmac_ide_port_ops,\n" - "-#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC\n" - " \t.dma_ops\t\t= &pmac_dma_ops,\n" - "-#endif\n" - " \t.host_flags\t\t= IDE_HFLAG_SET_PIO_MODE_KEEP_DMA |\n" - " \t\t\t\t IDE_HFLAG_POST_SET_MODE |\n" - " \t\t\t\t IDE_HFLAG_MMIO |\n" - "@@ -1182,7 +1169,7 @@ pmac_ide_macio_attach(struct macio_dev *mdev, const struct of_device_id *match)\n" - " \tpmif->regbase = regbase;\n" - " \tpmif->irq = irq;\n" - " \tpmif->kauai_fcr = NULL;\n" - "-#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC\n" - "+\n" - " \tif (macio_resource_count(mdev) >= 2) {\n" - " \t\tif (macio_request_resource(mdev, 1, \"ide-pmac (dma)\"))\n" - " \t\t\tprintk(KERN_WARNING \"ide-pmac: can't request DMA \"\n" - "@@ -1192,7 +1179,7 @@ pmac_ide_macio_attach(struct macio_dev *mdev, const struct of_device_id *match)\n" - " \t\t\tpmif->dma_regs = ioremap(macio_resource_start(mdev, 1), 0x1000);\n" - " \t} else\n" - " \t\tpmif->dma_regs = NULL;\n" - "-#endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */\n" - "+\n" - " \tdev_set_drvdata(&mdev->ofdev.dev, pmif);\n" - " \n" - " \tmemset(&hw, 0, sizeof(hw));\n" - "@@ -1300,9 +1287,7 @@ pmac_ide_pci_attach(struct pci_dev *pdev, const struct pci_device_id *id)\n" - " \n" - " \tbase = ioremap(rbase, rlen);\n" - " \tpmif->regbase = (unsigned long) base + 0x2000;\n" - "-#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC\n" - " \tpmif->dma_regs = base + 0x1000;\n" - "-#endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */\n" - " \tpmif->kauai_fcr = base;\n" - " \tpmif->irq = pdev->irq;\n" - " \n" - "@@ -1434,8 +1419,6 @@ out:\n" - " \treturn error;\n" - " }\n" - " \n" - "-#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC\n" - "-\n" - " /*\n" - " * pmac_ide_build_dmatable builds the DBDMA command list\n" - " * for a transfer and sets the DBDMA channel to point to it.\n" - "@@ -1723,13 +1706,6 @@ static int __devinit pmac_ide_init_dma(ide_hwif_t *hwif,\n" - " \n" - " \treturn 0;\n" - " }\n" - "-#else\n" - "-static int __devinit pmac_ide_init_dma(ide_hwif_t *hwif,\n" - "-\t\t\t\t const struct ide_port_info *d)\n" - "-{\n" - "-\treturn -EOPNOTSUPP;\n" - "-}\n" - "-#endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */\n" - " \n" - " module_init(pmac_ide_probe);\n" - " \n" - "\0" + "diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfigindex 6d74017..e6857e0 100644--- a/drivers/ide/Kconfig+++ b/drivers/ide/Kconfig@@ -669,10 +669,12 @@ config BLK_DEV_CELLEB endif +# TODO: BLK_DEV_IDEDMA_PCI -> BLK_DEV_IDEDMA_SFF config BLK_DEV_IDE_PMAC \ttristate \"PowerMac on-board IDE support\" \tdepends on PPC_PMAC && IDE=y \tselect IDE_TIMINGS+\tselect BLK_DEV_IDEDMA_PCI \thelp \t This driver provides support for the on-board IDE controller on \t most of the recent Apple Power Macintoshes and PowerBooks.@@ -689,16 +691,6 @@ config BLK_DEV_IDE_PMAC_ATA100FIRST \t CD-ROM on hda. This option changes this to more natural hda for \t hard disk and hdc for CD-ROM. -config BLK_DEV_IDEDMA_PMAC-\tbool \"PowerMac IDE DMA support\"-\tdepends on BLK_DEV_IDE_PMAC-\tselect BLK_DEV_IDEDMA_PCI-\thelp-\t This option allows the driver for the on-board IDE controller on-\t Power Macintoshes and PowerBooks to use DMA (direct memory access)-\t to transfer data to and from memory. Saying Y is safe and improves-\t performance.- config BLK_DEV_IDE_AU1XXX bool \"IDE for AMD Alchemy Au1200\" depends on SOC_AU1200@@ -912,7 +904,7 @@ config BLK_DEV_UMC8672 endif config BLK_DEV_IDEDMA-\tdef_bool BLK_DEV_IDEDMA_SFF || BLK_DEV_IDEDMA_PMAC || \\+\tdef_bool BLK_DEV_IDEDMA_SFF || \\ \t\t BLK_DEV_IDEDMA_ICS || BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA endif # IDEdiff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.cindex 7d275b2..cc35d6d 100644--- a/drivers/ide/ide-io.c+++ b/drivers/ide/ide-io.c@@ -208,8 +208,10 @@ static ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request * \t\t */ \t\tif (drive->hwif->dma_ops == NULL) \t\t\tbreak;-\t\tif (drive->dev_flags & IDE_DFLAG_USING_DMA)-\t\t\tide_set_dma(drive);+\t\t/*+\t\t * TODO: respect IDE_DFLAG_USING_DMA+\t\t */+\t\tide_set_dma(drive); \t\tbreak; \t} diff --git a/drivers/ide/pmac.c b/drivers/ide/pmac.cindex 2e19d62..7c481bb 100644--- a/drivers/ide/pmac.c+++ b/drivers/ide/pmac.c@@ -66,7 +66,6 @@ typedef struct pmac_ide_hwif { \tstruct macio_dev\t\t*mdev; \tu32\t\t\t\ttimings[4]; \tvolatile u32 __iomem *\t\t*kauai_fcr;-#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC \t/* Those fields are duplicating what is in hwif. We currently \t * can't use the hwif ones because of some assumptions that are \t * beeing done by the generic code about the kind of dma controller@@ -74,8 +73,6 @@ typedef struct pmac_ide_hwif { \t */ \tvolatile struct dbdma_regs __iomem *\tdma_regs; \tstruct dbdma_cmd*\t\tdma_table_cpu;-#endif-\t } pmac_ide_hwif_t; enum {@@ -222,8 +219,6 @@ static const char* model_name[] = { #define KAUAI_FCR_UATA_RESET_N\t\t0x00000002 #define KAUAI_FCR_UATA_ENABLE\t\t0x00000001 -#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC- /* Rounded Multiword DMA timings * * I gave up finding a generic formula for all controller@@ -413,8 +408,6 @@ static int pmac_ide_build_dmatable(ide_drive_t *drive, struct request *rq); static void pmac_ide_selectproc(ide_drive_t *drive); static void pmac_ide_kauai_selectproc(ide_drive_t *drive); -#endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */- #define PMAC_IDE_REG(x) \\ \t((void __iomem *)((drive)->hwif->io_ports.data_addr + (x))) @@ -584,8 +577,6 @@ pmac_ide_set_pio_mode(ide_drive_t *drive, const u8 pio) \tpmac_ide_do_update_timings(drive); } -#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC- /* * Calculate KeyLargo ATA/66 UDMA timings */@@ -786,7 +777,6 @@ set_timings_mdma(ide_drive_t *drive, int intf_type, u32 *timings, u32 *timings2, \t\tdrive->name, speed & 0xf, *timings); #endif\t }-#endif /* #ifdef CONFIG_BLK_DEV_IDEDMA_PMAC */ static void pmac_ide_set_dma_mode(ide_drive_t *drive, const u8 speed) {@@ -804,7 +794,6 @@ static void pmac_ide_set_dma_mode(ide_drive_t *drive, const u8 speed) \ttl[0] = *timings; \ttl[1] = *timings2; -#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC \tif (speed >= XFER_UDMA_0) { \t\tif (pmif->kind == controller_kl_ata4) \t\t\tret = set_timings_udma_ata4(&tl[0], speed);@@ -817,7 +806,7 @@ static void pmac_ide_set_dma_mode(ide_drive_t *drive, const u8 speed) \t\t\tret = -1; \t} else \t\tset_timings_mdma(drive, pmif->kind, &tl[0], &tl[1], speed);-#endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */+ \tif (ret) \t\treturn; @@ -1008,9 +997,7 @@ static const struct ide_port_info pmac_port_info = { \t.chipset\t\t= ide_pmac, \t.tp_ops\t\t\t= &pmac_tp_ops, \t.port_ops\t\t= &pmac_ide_port_ops,-#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC \t.dma_ops\t\t= &pmac_dma_ops,-#endif \t.host_flags\t\t= IDE_HFLAG_SET_PIO_MODE_KEEP_DMA | \t\t\t\t IDE_HFLAG_POST_SET_MODE | \t\t\t\t IDE_HFLAG_MMIO |@@ -1182,7 +1169,7 @@ pmac_ide_macio_attach(struct macio_dev *mdev, const struct of_device_id *match) \tpmif->regbase = regbase; \tpmif->irq = irq; \tpmif->kauai_fcr = NULL;-#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC+ \tif (macio_resource_count(mdev) >= 2) { \t\tif (macio_request_resource(mdev, 1, \"ide-pmac (dma)\")) \t\t\tprintk(KERN_WARNING \"ide-pmac: can't request DMA \"@@ -1192,7 +1179,7 @@ pmac_ide_macio_attach(struct macio_dev *mdev, const struct of_device_id *match) \t\t\tpmif->dma_regs = ioremap(macio_resource_start(mdev, 1), 0x1000); \t} else \t\tpmif->dma_regs = NULL;-#endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */+ \tdev_set_drvdata(&mdev->ofdev.dev, pmif); \tmemset(&hw, 0, sizeof(hw));@@ -1300,9 +1287,7 @@ pmac_ide_pci_attach(struct pci_dev *pdev, const struct pci_device_id *id) \tbase = ioremap(rbase, rlen); \tpmif->regbase = (unsigned long) base + 0x2000;-#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC \tpmif->dma_regs = base + 0x1000;-#endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */ \tpmif->kauai_fcr = base; \tpmif->irq = pdev->irq; @@ -1434,8 +1419,6 @@ out: \treturn error; } -#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC- /* * pmac_ide_build_dmatable builds the DBDMA command list * for a transfer and sets the DBDMA channel to point to it.@@ -1723,13 +1706,6 @@ static int __devinit pmac_ide_init_dma(ide_hwif_t *hwif, \treturn 0; }-#else-static int __devinit pmac_ide_init_dma(ide_hwif_t *hwif,-\t\t\t\t const struct ide_port_info *d)-{-\treturn -EOPNOTSUPP;-}-#endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */ module_init(pmac_ide_probe); \0\303\277\303\264\303\250\302\272{.n\303\207+\302\211\302\267\302\237\302\256\302\211\302\255\302\206+%\302\212\303\213\303\277\302\261\303\251\303\235\302\266\027\302\245\302\212w\303\277\302\272{.n\303\207+\302\211\302\267\302\245\302\212{\302\261\303\276G\302\253\302\235\303\251\303\277\302\212{ay\302\272\035\303\212\302\207\303\232\302\231\303\253,j\a\302\255\302\242f\302\243\302\242\302\267h\302\232\302\217\303\257\302\201\303\252\303\277\302\221\303\252\303\247z_\303\250\302\256\003(\302\255\303\251\302\232\302\216\302\212\303\235\302\242j\"\302\235\303\272\032\302\266\033m\302\247\303\277\303\277\302\276\a\302\253\303\276G\302\253\302\235\303\251\303\277\302\242\302\270?\302\231\302\250\303\250\302\255\303\232&\302\243\303\270\302\247~\302\217\303\241\302\266iO\302\225\303\246\302\254z\302\267\302\232v\303\230^\024\004\032\302\266\033m\302\247\303\277\303\277\303\203\f\303\277\302\266\303\254\303\277\302\242\302\270?\302\226I\302\245" -c6aba005ef7dc8d610ba19553e2829ce031a219d8f3c05c79cd7e1b014476592 +1c31d9a5413fc27cbcc34132f2c3ee74702436df7387044cd7d3c0b9dd44f259
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.