cmd64x: procfs code fixes/cleanups (take 2)

Fix several issues with the driver's procfs output:

- when testing if channel is enabled, the code looks at the "simplex" bits, not
  at the real enable bits -- add #define for the primary channel enable bit;

- UltraDMA modes 0, 1, 3 for slave drive reported incorrectly due to using the
  master drive's clock cycle resolution bit.

While at it, also perform the following cleanups:

- don't print extra newline before the first controller's dump;

- correct the chipset names (from CMDxxx to PCI-xxx)

- don't read from the registers which aren't used for dump;

- better align the table column sizes;

- rework UltraDMA mode dump code;

- remove PIO mode dump code that has never been finished;

- remove the duplicate interrupt status (the MRDMODE register bits mirror those
  those in the CFR and ARTTIM23 registers) and fold the dump into single line;

- correct the style of the ?: operators...

Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 55 insertions, 74 deletions

diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c
index 63fd9294c7c4..24acddfc27bc 100644
--- a/drivers/ide/pci/cmd64x.c
+++ b/drivers/ide/pci/cmd64x.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/ide/pci/cmd64x.c               Version 1.45    Mar 14, 2007
+ * linux/drivers/ide/pci/cmd64x.c               Version 1.46    Mar 16, 2007
  *
  * cmd64x.c: Enable interrupts at initialization time on Ultra/PCI machines.
  *           Due to massive hardware bugs, UltraDMA is only supported
@@ -38,9 +38,10 @@
 #define CFR             0x50
 #define   CFR_INTR_CH0          0x04
 #define CNTRL           0x51
-#define   CNTRL_DIS_RA0         0x40
-#define   CNTRL_DIS_RA1         0x80
-#define   CNTRL_ENA_2ND         0x08
+#define   CNTRL_ENA_1ST         0x04
+#define   CNTRL_ENA_2ND         0x08
+#define   CNTRL_DIS_RA0         0x40
+#define   CNTRL_DIS_RA1         0x80
 
 #define CMDTIM          0x52
 #define ARTTIM0         0x53
@@ -87,86 +88,67 @@ static int n_cmd_devs;
 static char * print_cmd64x_get_info (char *buf, struct pci_dev *dev, int index)
 {
         char *p = buf;
-
-        u8 reg53 = 0, reg54 = 0, reg55 = 0, reg56 = 0;  /* primary */
-        u8 reg57 = 0, reg58 = 0, reg5b;                 /* secondary */
         u8 reg72 = 0, reg73 = 0;                        /* primary */
         u8 reg7a = 0, reg7b = 0;                        /* secondary */
-        u8 reg50 = 0, reg71 = 0;                        /* extra */
+        u8 reg50 = 1, reg51 = 1, reg57 = 0, reg71 = 0;  /* extra */
+        u8 rev = 0;
 
         p += sprintf(p, "\nController: %d\n", index);
-        p += sprintf(p, "CMD%x Chipset.\n", dev->device);
+        p += sprintf(p, "PCI-%x Chipset.\n", dev->device);
+
         (void) pci_read_config_byte(dev, CFR,       &reg50);
-        (void) pci_read_config_byte(dev, ARTTIM0,   &reg53);
-        (void) pci_read_config_byte(dev, DRWTIM0,   &reg54);
-        (void) pci_read_config_byte(dev, ARTTIM1,   &reg55);
-        (void) pci_read_config_byte(dev, DRWTIM1,   &reg56);
-        (void) pci_read_config_byte(dev, ARTTIM2,   &reg57);
-        (void) pci_read_config_byte(dev, DRWTIM2,   &reg58);
-        (void) pci_read_config_byte(dev, DRWTIM3,   &reg5b);
+        (void) pci_read_config_byte(dev, CNTRL,     &reg51);
+        (void) pci_read_config_byte(dev, ARTTIM23,  &reg57);
         (void) pci_read_config_byte(dev, MRDMODE,   &reg71);
         (void) pci_read_config_byte(dev, BMIDESR0,  &reg72);
         (void) pci_read_config_byte(dev, UDIDETCR0, &reg73);
         (void) pci_read_config_byte(dev, BMIDESR1,  &reg7a);
         (void) pci_read_config_byte(dev, UDIDETCR1, &reg7b);
 
-        p += sprintf(p, "--------------- Primary Channel "
-                        "---------------- Secondary Channel "
-                        "-------------\n");
-        p += sprintf(p, "                %sabled           "
-                        "              %sabled\n",
-                (reg72&0x80)?"dis":" en",
-                (reg7a&0x80)?"dis":" en");
-        p += sprintf(p, "--------------- drive0 "
-                "--------- drive1 -------- drive0 "
-                "---------- drive1 ------\n");
-        p += sprintf(p, "DMA enabled:    %s              %s"
-                        "             %s               %s\n",
-                (reg72&0x20)?"yes":"no ", (reg72&0x40)?"yes":"no ",
-                (reg7a&0x20)?"yes":"no ", (reg7a&0x40)?"yes":"no ");
-
-        p += sprintf(p, "DMA Mode:       %s(%s)          %s(%s)",
-                (reg72&0x20)?((reg73&0x01)?"UDMA":" DMA"):" PIO",
-                (reg72&0x20)?(
-                        ((reg73&0x30)==0x30)?(((reg73&0x35)==0x35)?"3":"0"):
-                        ((reg73&0x20)==0x20)?(((reg73&0x25)==0x25)?"3":"1"):
-                        ((reg73&0x10)==0x10)?(((reg73&0x15)==0x15)?"4":"2"):
-                        ((reg73&0x00)==0x00)?(((reg73&0x05)==0x05)?"5":"2"):
-                        "X"):"?",
-                (reg72&0x40)?((reg73&0x02)?"UDMA":" DMA"):" PIO",
-                (reg72&0x40)?(
-                        ((reg73&0xC0)==0xC0)?(((reg73&0xC5)==0xC5)?"3":"0"):
-                        ((reg73&0x80)==0x80)?(((reg73&0x85)==0x85)?"3":"1"):
-                        ((reg73&0x40)==0x40)?(((reg73&0x4A)==0x4A)?"4":"2"):
-                        ((reg73&0x00)==0x00)?(((reg73&0x0A)==0x0A)?"5":"2"):
-                        "X"):"?");
-        p += sprintf(p, "         %s(%s)           %s(%s)\n",
-                (reg7a&0x20)?((reg7b&0x01)?"UDMA":" DMA"):" PIO",
-                (reg7a&0x20)?(
-                        ((reg7b&0x30)==0x30)?(((reg7b&0x35)==0x35)?"3":"0"):
-                        ((reg7b&0x20)==0x20)?(((reg7b&0x25)==0x25)?"3":"1"):
-                        ((reg7b&0x10)==0x10)?(((reg7b&0x15)==0x15)?"4":"2"):
-                        ((reg7b&0x00)==0x00)?(((reg7b&0x05)==0x05)?"5":"2"):
-                        "X"):"?",
-                (reg7a&0x40)?((reg7b&0x02)?"UDMA":" DMA"):" PIO",
-                (reg7a&0x40)?(
-                        ((reg7b&0xC0)==0xC0)?(((reg7b&0xC5)==0xC5)?"3":"0"):
-                        ((reg7b&0x80)==0x80)?(((reg7b&0x85)==0x85)?"3":"1"):
-                        ((reg7b&0x40)==0x40)?(((reg7b&0x4A)==0x4A)?"4":"2"):
-                        ((reg7b&0x00)==0x00)?(((reg7b&0x0A)==0x0A)?"5":"2"):
-                        "X"):"?" );
-        p += sprintf(p, "PIO Mode:       %s                %s"
-                        "               %s                 %s\n",
-                        "?", "?", "?", "?");
-        p += sprintf(p, "                %s                     %s\n",
-                (reg50 & CFR_INTR_CH0) ? "interrupting" : "polling     ",
-                (reg57 & ARTTIM23_INTR_CH1) ? "interrupting" : "polling");
-        p += sprintf(p, "                %s                          %s\n",
-                (reg71 & MRDMODE_INTR_CH0) ? "pending" : "clear  ",
-                (reg71 & MRDMODE_INTR_CH1) ? "pending" : "clear");
-        p += sprintf(p, "                %s                          %s\n",
-                (reg71 & MRDMODE_BLK_CH0) ? "blocked" : "enabled",
-                (reg71 & MRDMODE_BLK_CH1) ? "blocked" : "enabled");
+        /* PCI0643/6 originally didn't have the primary channel enable bit */
+        (void) pci_read_config_byte(dev, PCI_REVISION_ID, &rev);
+        if ((dev->device == PCI_DEVICE_ID_CMD_643) ||
+            (dev->device == PCI_DEVICE_ID_CMD_646 && rev < 3))
+                reg51 |= CNTRL_ENA_1ST;
+
+        p += sprintf(p, "---------------- Primary Channel "
+                        "---------------- Secondary Channel ------------\n");
+        p += sprintf(p, "                 %s                         %s\n",
+                 (reg51 & CNTRL_ENA_1ST) ? "enabled " : "disabled",
+                 (reg51 & CNTRL_ENA_2ND) ? "enabled " : "disabled");
+        p += sprintf(p, "---------------- drive0 --------- drive1 "
+                        "-------- drive0 --------- drive1 ------\n");
+        p += sprintf(p, "DMA enabled:     %s              %s"
+                        "             %s              %s\n",
+                (reg72 & 0x20) ? "yes" : "no ", (reg72 & 0x40) ? "yes" : "no ",
+                (reg7a & 0x20) ? "yes" : "no ", (reg7a & 0x40) ? "yes" : "no ");
+        p += sprintf(p, "UltraDMA mode:   %s (%c)          %s (%c)",
+                ( reg73 & 0x01) ? " on" : "off",
+                ((reg73 & 0x30) == 0x30) ? ((reg73 & 0x04) ? '3' : '0') :
+                ((reg73 & 0x30) == 0x20) ? ((reg73 & 0x04) ? '3' : '1') :
+                ((reg73 & 0x30) == 0x10) ? ((reg73 & 0x04) ? '4' : '2') :
+                ((reg73 & 0x30) == 0x00) ? ((reg73 & 0x04) ? '5' : '2') : '?',
+                ( reg73 & 0x02) ? " on" : "off",
+                ((reg73 & 0xC0) == 0xC0) ? ((reg73 & 0x08) ? '3' : '0') :
+                ((reg73 & 0xC0) == 0x80) ? ((reg73 & 0x08) ? '3' : '1') :
+                ((reg73 & 0xC0) == 0x40) ? ((reg73 & 0x08) ? '4' : '2') :
+                ((reg73 & 0xC0) == 0x00) ? ((reg73 & 0x08) ? '5' : '2') : '?');
+        p += sprintf(p, "         %s (%c)          %s (%c)\n",
+                ( reg7b & 0x01) ? " on" : "off",
+                ((reg7b & 0x30) == 0x30) ? ((reg7b & 0x04) ? '3' : '0') :
+                ((reg7b & 0x30) == 0x20) ? ((reg7b & 0x04) ? '3' : '1') :
+                ((reg7b & 0x30) == 0x10) ? ((reg7b & 0x04) ? '4' : '2') :
+                ((reg7b & 0x30) == 0x00) ? ((reg7b & 0x04) ? '5' : '2') : '?',
+                ( reg7b & 0x02) ? " on" : "off",
+                ((reg7b & 0xC0) == 0xC0) ? ((reg7b & 0x08) ? '3' : '0') :
+                ((reg7b & 0xC0) == 0x80) ? ((reg7b & 0x08) ? '3' : '1') :
+                ((reg7b & 0xC0) == 0x40) ? ((reg7b & 0x08) ? '4' : '2') :
+                ((reg7b & 0xC0) == 0x00) ? ((reg7b & 0x08) ? '5' : '2') : '?');
+        p += sprintf(p, "Interrupt:       %s, %s                 %s, %s\n",
+                (reg71 & MRDMODE_BLK_CH0  ) ? "blocked" : "enabled",
+                (reg50 & CFR_INTR_CH0     ) ? "pending" : "clear  ",
+                (reg71 & MRDMODE_BLK_CH1  ) ? "blocked" : "enabled",
+                (reg57 & ARTTIM23_INTR_CH1) ? "pending" : "clear  ");
 
         return (char *)p;
 }
@@ -176,7 +158,6 @@ static int cmd64x_get_info (char *buffer, char **addr, off_t offset, int count)
         char *p = buffer;
         int i;
 
-        p += sprintf(p, "\n");
         for (i = 0; i < n_cmd_devs; i++) {
                 struct pci_dev *dev     = cmd_devs[i];
                 p = print_cmd64x_get_info(p, dev, i);