Changeset 48744 in vbox for trunk

Timestamp:

Sep 27, 2013 6:21:23 PM (11 years ago)

Author:

vboxsync

Message:

Devices/Storage: Support different sector sizes, booting from images with a sector size != 512 is not supported

Location:

trunk/src/VBox/Devices/Storage

Files:

• DevAHCI.cpp (modified) (1 diff)
• DevATA.cpp (modified) (6 diffs)
• DrvVD.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Storage/DevAHCI.cpp

@@ -3021 +3021 @@
     if (pAhciPort->cbSector != 512)
     {
+        uint32_t cSectorSizeInWords = pAhciPort->cbSector / sizeof(uint16_t);
         /* Enable reporting of logical sector size. */
-        p[106] |= RT_H2LE_U16(RT_BIT(12));
-        p[117] = RT_H2LE_U16(pAhciPort->cbSector);
-        p[118] = RT_H2LE_U16(pAhciPort->cbSector >> 16);
+        p[106] |= RT_H2LE_U16(RT_BIT(12) | RT_BIT(14));
+        p[117] = RT_H2LE_U16(cSectorSizeInWords);
+        p[118] = RT_H2LE_U16(cSectorSizeInWords >> 16);
     }
 

trunk/src/VBox/Devices/Storage/DevATA.cpp

@@ -1211 +1211 @@
     p[3] = RT_H2LE_U16(s->PCHSGeometry.cHeads);
     /* Block size; obsolete, but required for the BIOS. */
-    p[5] = RT_H2LE_U16(512);
+    p[5] = RT_H2LE_U16(s->cbSector);
     p[6] = RT_H2LE_U16(s->PCHSGeometry.cSectors);
     ataPadString((uint8_t *)(p + 10), s->szSerialNumber, ATA_SERIAL_NUMBER_LENGTH); /* serial number */
@@ -1292 +1292 @@
     if (s->cbSector != 512)
     {
+        uint32_t cSectorSizeInWords = s->cbSector / sizeof(uint16_t);
         /* Enable reporting of logical sector size. */
-        p[106] |= RT_H2LE_U16(RT_BIT(12));
-        p[117] = RT_H2LE_U16(s->cbSector);
-        p[118] = RT_H2LE_U16(s->cbSector >> 16);
+        p[106] |= RT_H2LE_U16(RT_BIT(12) | RT_BIT(14));
+        p[117] = RT_H2LE_U16(cSectorSizeInWords);
+        p[118] = RT_H2LE_U16(cSectorSizeInWords >> 16);
     }
 
@@ -1633 +1634 @@
     bool fRedo;
 
-    cSectors = s->cbElementaryTransfer / 512;
+    cSectors = s->cbElementaryTransfer / s->cbSector;
     Assert(cSectors);
     iLBA = ataGetSector(s);
@@ -1671 +1672 @@
     bool fRedo;
 
-    cSectors = s->cbElementaryTransfer / 512;
+    cSectors = s->cbElementaryTransfer / s->cbSector;
     Assert(cSectors);
     iLBA = ataGetSector(s);
@@ -3799 +3800 @@
         pIf->cTotalSectors = pIf->pDrvBlock->pfnGetSize(pIf->pDrvBlock) / 2048;
     else
-        pIf->cTotalSectors = pIf->pDrvBlock->pfnGetSize(pIf->pDrvBlock) / 512;
+        pIf->cTotalSectors = pIf->pDrvBlock->pfnGetSize(pIf->pDrvBlock) / pIf->cbSector;
 
     LogRel(("PIIX3 ATA: LUN#%d: CD/DVD, total number of sectors %Ld, passthrough unchanged\n", pIf->iLUN, pIf->cTotalSectors));
@@ -4213 +4214 @@
                 goto abort_cmd;
             s->fDMA = true;
-            ataStartTransfer(s, (s->uATARegNSectorHOB << 8 | s->uATARegNSector) * 512, PDMBLOCKTXDIR_TO_DEVICE, ATAFN_BT_NULL, ATAFN_SS_TRIM, false);
+            ataStartTransfer(s, (s->uATARegNSectorHOB << 8 | s->uATARegNSector) * s->cbSector, PDMBLOCKTXDIR_TO_DEVICE, ATAFN_BT_NULL, ATAFN_SS_TRIM, false);
             break;
         default:

trunk/src/VBox/Devices/Storage/DrvVD.cpp

@@ -1621 +1621 @@
     LogFlowFunc(("\n"));
     PVBOXDISK pThis = PDMIMEDIA_2_VBOXDISK(pInterface);
-    uint32_t cb = 512;
+    uint32_t cb = VDGetSectorSize(pThis->pDisk, VD_LAST_IMAGE);
     LogFlowFunc(("returns %u\n", cb));
     return cb;