2 files changed, 19 insertions, 7 deletions

diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index 0eae9b453556..5a4aad123c42 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -1013,9 +1013,12 @@ next_sg:
                 qc->cursg_ofs = 0;
         }
 
-        /* consumed can be larger than count only for the last transfer */
-        WARN_ON_ONCE(qc->cursg && count != consumed);
-
+        /*
+         * There used to be a  WARN_ON_ONCE(qc->cursg && count != consumed);
+         * Unfortunately __atapi_pio_bytes doesn't know enough to do the WARN
+         * check correctly as it doesn't know if it is the last request being
+         * made. Somebody should implement a proper sanity check.
+         */
         if (bytes)
                 goto next_sg;
         return 0;
diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c
index f828a29d7756..f1bb2f9fecbf 100644
--- a/drivers/ata/pata_it821x.c
+++ b/drivers/ata/pata_it821x.c
@@ -80,7 +80,7 @@
 
 
 #define DRV_NAME "pata_it821x"
-#define DRV_VERSION "0.4.0"
+#define DRV_VERSION "0.4.2"
 
 struct it821x_dev
 {
@@ -494,8 +494,6 @@ static int it821x_smart_set_mode(struct ata_link *link, struct ata_device **unus
  *      special. In our case we need to lock the sector count to avoid
  *      blowing the brains out of the firmware with large LBA48 requests
  *
- *      FIXME: When FUA appears we need to block FUA too. And SMART and
- *      basically we need to filter commands for this chip.
  */
 
 static void it821x_dev_config(struct ata_device *adev)
@@ -890,6 +888,13 @@ static int it821x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                 .flags = ATA_FLAG_SLAVE_POSS,
                 .pio_mask = 0x1f,
                 .mwdma_mask = 0x07,
+                .udma_mask = ATA_UDMA6,
+                .port_ops = &it821x_rdc_port_ops
+        };
+        static const struct ata_port_info info_rdc_11 = {
+                .flags = ATA_FLAG_SLAVE_POSS,
+                .pio_mask = 0x1f,
+                .mwdma_mask = 0x07,
                 /* No UDMA */
                 .port_ops = &it821x_rdc_port_ops
         };
@@ -903,7 +908,11 @@ static int it821x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                 return rc;
                 
         if (pdev->vendor == PCI_VENDOR_ID_RDC) {
-                ppi[0] = &info_rdc;
+                /* Deal with Vortex86SX */
+                if (pdev->revision == 0x11)
+                        ppi[0] = &info_rdc_11;
+                else
+                        ppi[0] = &info_rdc;
         } else {
                 /* Force the card into bypass mode if so requested */
                 if (it8212_noraid) {