Skip to contentSkip to conversation

2.4.20/drivers/ide/pdc202xx.c

PATCH In review Nikolai Zhubr 3 participants 3 messages Dec 23, 2002 – Dec 26, 2002

lore
Share & tools
lore

Nikolai Zhubr

author
#0 lore raw

PATCH 1/1 2.4.20/drivers/ide/pdc202xx.c

Hi, this patch fixes misdetection of 80-pin vs 40-pin IDE cable connected to Promise 202xx IDE controller (kernel 2.4.20). The original code used hwif->dma_base field which is yet unset upon the call, therefore some random value was returned. The patch came out of reading 2.5.xx code. I've tested it with both 40pin and 80pin cables, pdc20276 controller. I'm not subscribed, please CC me if necessary. Thank you.

drivers/ide/pdc202xx.c Mon Dec 23 21:32:53 2002 renamed from drivers/ide/pdc202xx.c Sat Aug 3 04:39:44 2002 +6 -2
diff -u --recursive linux-2.4.20/drivers/ide/pdc202xx.c linux-2.4.20-zh/drivers/ide/pdc202xx.c
@@ -1121,6 +1121,10 @@
 {
        unsigned short mask = (hwif->channel) ? (1<<11) : (1<<10);
        unsigned short CIS;
+       struct pci_dev *dev     = hwif->pci_dev;
+       unsigned long high_16   = pci_resource_start(dev, 4);
+       unsigned long indexreg  = high_16 + (hwif->channel ? 0x09 : 0x01);
+       unsigned long datareg   = (indexreg + 2);
 
                switch(hwif->pci_dev->device) {
                case PCI_DEVICE_ID_PROMISE_20276:

@@ -1128,8 +1132,8 @@
                case PCI_DEVICE_ID_PROMISE_20269:
                case PCI_DEVICE_ID_PROMISE_20268:
                case PCI_DEVICE_ID_PROMISE_20270:
-                       OUT_BYTE(0x0b, (hwif->dma_base + 1));
-                       return (!(IN_BYTE((hwif->dma_base + 3)) & 0x04));
+                       OUT_BYTE(0x0b, indexreg);
+                       return (!(IN_BYTE(datareg) & 0x04));
                        /* check 80pin cable */
                default:
                        pci_read_config_word(hwif->pci_dev, 0x50, &CIS);
Signature · 2 lines
Best regards,
 Nikolai Zhubr
#1 lore raw
Quoted 2 lines · Nikolai Zhubr

Hi, this patch fixes misdetection of 80-pin vs 40-pin IDE cable connected to Promise 202xx IDE controller (kernel 2.4.20). The original

2.4.21pre updates the IDE massively. This should already be fixed

#2 lore raw
Quoted 5 lines · Nikolai Zhubr
Quoted 2 lines

Hi, this patch fixes misdetection of 80-pin vs 40-pin IDE cable connected to Promise 202xx IDE controller (kernel 2.4.20). The original

2.4.21pre updates the IDE massively. This should already be fixed

Well it's fixed but a new bug has been introduced. 2.4.21-pre2 won't let you set UDMA3+ on the secondary channel of a PDC20268 no matter what, even ide1=ata66 is no use.

Signature · 1 line
Tomas Szepe <[email protected]>