Changeset 24172 in vbox for trunk/src/VBox/Devices

Timestamp:

Oct 29, 2009 5:48:16 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

54111

Message:

AHCI: Add additional VPD keys

Location:

trunk/src/VBox/Devices

Files:

• Storage/DevAHCI.cpp (modified) (7 diffs)
• testcase/tstDeviceStructSizeGC.cpp (modified) (1 diff)

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

@@ -97 +97 @@
  * Length of the configurable VPD data (without termination)
  */
-#define AHCI_SERIAL_NUMBER_LENGTH     20
-#define AHCI_FIRMWARE_REVISION_LENGTH  8
-#define AHCI_MODEL_NUMBER_LENGTH      40
+#define AHCI_SERIAL_NUMBER_LENGTH            20
+#define AHCI_FIRMWARE_REVISION_LENGTH         8
+#define AHCI_MODEL_NUMBER_LENGTH             40
+#define AHCI_ATAPI_INQUIRY_VENDOR_ID_LENGTH   8
+#define AHCI_ATAPI_INQUIRY_PRODUCT_ID_LENGTH 16
+#define AHCI_ATAPI_INQUIRY_REVISION_LENGTH    4
 
 /* Command Header. */
@@ -437 +440 @@
     R3PTRTYPE(PAHCIPORTTASKSTATE)   aCachedTasks[AHCI_NR_COMMAND_SLOTS];
 
+    uint32_t                        u32Alignment5;
+
     /** Release statistics: number of DMA commands. */
     STAMCOUNTER                     StatDMA;
@@ -468 +473 @@
     /** The model number to use for IDENTIFY DEVICE commands. */
     char                            szModelNumber[AHCI_MODEL_NUMBER_LENGTH+1]; /** < one extra byte for termination */
-
-#if HC_ARCH_BITS == 64
-    uint32_t                        Alignment5;
-#endif
+    /** The vendor identification string for SCSI INQUIRY commands. */
+    char                            szInquiryVendorId[AHCI_ATAPI_INQUIRY_VENDOR_ID_LENGTH+1];
+    /** The product identification string for SCSI INQUIRY commands. */
+    char                            szInquiryProductId[AHCI_ATAPI_INQUIRY_PRODUCT_ID_LENGTH+1];
+    /** The revision string for SCSI INQUIRY commands. */
+    char                            szInquiryRevision[AHCI_ATAPI_INQUIRY_REVISION_LENGTH+1];
+
+    uint32_t                        Alignment6;
 
 } AHCIPort, *PAHCIPort;
@@ -2894 +2903 @@
 {
     uint16_t p[256];
-    char aSerial[20];
     RTUUID Uuid;
     int rc;
-
-    rc = pAhciPort->pDrvBlock ? pAhciPort->pDrvBlock->pfnGetUuid(pAhciPort->pDrvBlock, &Uuid) : RTUuidClear(&Uuid);
-    if (RT_FAILURE(rc) || RTUuidIsNull(&Uuid))
-    {
-        /* Generate a predictable serial for drives which don't have a UUID. */
-        RTStrPrintf(aSerial, sizeof(aSerial), "VB%x-1a2b3c4d",
-                    pAhciPort->iLUN);
-    }
-    else
-        RTStrPrintf(aSerial, sizeof(aSerial), "VB%08x-%08x", Uuid.au32[0], Uuid.au32[3]);
 
     memset(p, 0, 512);
     /* Removable CDROM, 50us response, 12 byte packets */
     p[0] = RT_H2LE_U16(2 << 14 | 5 << 8 | 1 << 7 | 2 << 5 | 0 << 0);
-    ataPadString((uint8_t *)(p + 10), aSerial, 20); /* serial number */
+    ataPadString((uint8_t *)(p + 10), pAhciPort->szSerialNumber, AHCI_SERIAL_NUMBER_LENGTH); /* serial number */
     p[20] = RT_H2LE_U16(3); /* XXX: retired, cache type */
     p[21] = RT_H2LE_U16(512); /* XXX: retired, cache size in sectors */
-    ataPadString((uint8_t *)(p + 23), "1.0", 8); /* firmware version */
-    ataPadString((uint8_t *)(p + 27), "VBOX CD-ROM", 40); /* model */
+    ataPadString((uint8_t *)(p + 23), pAhciPort->szFirmwareRevision, AHCI_FIRMWARE_REVISION_LENGTH); /* firmware version */
+    ataPadString((uint8_t *)(p + 27), pAhciPort->szModelNumber, AHCI_MODEL_NUMBER_LENGTH); /* model */
     p[49] = RT_H2LE_U16(1 << 11 | 1 << 9 | 1 << 8); /* DMA and LBA supported */
     p[50] = RT_H2LE_U16(1 << 14);  /* No drive specific standby timer minimum */
@@ -3071 +3069 @@
     aBuf[6] = 0; /* reserved */
     aBuf[7] = 0; /* reserved */
-    ataSCSIPadStr(aBuf + 8, "VBOX", 8);
-    ataSCSIPadStr(aBuf + 16, "CD-ROM", 16);
-    ataSCSIPadStr(aBuf + 32, "1.0", 4);
+    ataSCSIPadStr(aBuf +  8, pAhciPort->szInquiryVendorId, 8);
+    ataSCSIPadStr(aBuf + 16, pAhciPort->szInquiryProductId, 16);
+    ataSCSIPadStr(aBuf + 32, pAhciPort->szInquiryRevision, 4);
 
     /* Copy the buffer in to the scatter gather list. */
@@ -6756 +6754 @@
 
             rc = CFGMR3QueryStringDef(pCfgNode, "ModelNumber", pAhciPort->szModelNumber, sizeof(pAhciPort->szModelNumber),
-                                      "VBOX HARDDISK");
+                                      pAhciPort->fATAPI ? "VBOX CD-ROM" : "VBOX HARDDISK");
             if (RT_FAILURE(rc))
             {
@@ -6764 +6762 @@
                 return PDMDEV_SET_ERROR(pDevIns, rc,
                             N_("AHCI configuration error: failed to read \"ModelNumber\" as string"));
+            }
+
+            /* There are three other identification strings for CD drives used for INQUIRY */
+            if (pAhciPort->fATAPI)
+            {
+                rc = CFGMR3QueryStringDef(pCfgNode, "ATAPIVendorId", pAhciPort->szInquiryVendorId, sizeof(pAhciPort->szInquiryVendorId),
+                                          "VBOX");
+                if (RT_FAILURE(rc))
+                {
+                        if (rc == VERR_CFGM_NOT_ENOUGH_SPACE)
+                        return PDMDEV_SET_ERROR(pDevIns, VERR_INVALID_PARAMETER,
+                                        N_("PIIX3 configuration error: \"ATAPIVendorId\" is longer than 16 bytes"));
+                        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("PIIX3 configuration error: failed to read \"ATAPIVendorId\" as string"));
+                }
+
+                rc = CFGMR3QueryStringDef(pCfgNode, "ATAPIProductId", pAhciPort->szInquiryProductId, sizeof(pAhciPort->szInquiryProductId),
+                                          "CD-ROM");
+                if (RT_FAILURE(rc))
+                {
+                        if (rc == VERR_CFGM_NOT_ENOUGH_SPACE)
+                        return PDMDEV_SET_ERROR(pDevIns, VERR_INVALID_PARAMETER,
+                                        N_("PIIX3 configuration error: \"ATAPIProductId\" is longer than 16 bytes"));
+                        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("PIIX3 configuration error: failed to read \"ATAPIProductId\" as string"));
+                }
+
+                rc = CFGMR3QueryStringDef(pCfgNode, "ATAPIRevision", pAhciPort->szInquiryRevision, sizeof(pAhciPort->szInquiryRevision),
+                                          "1.0");
+                if (RT_FAILURE(rc))
+                {
+                        if (rc == VERR_CFGM_NOT_ENOUGH_SPACE)
+                        return PDMDEV_SET_ERROR(pDevIns, VERR_INVALID_PARAMETER,
+                                        N_("PIIX3 configuration error: \"ATAPIRevision\" is longer than 4 bytes"));
+                        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("PIIX3 configuration error: failed to read \"ATAPIRevision\" as string"));
+                }
             }
 

trunk/src/VBox/Devices/testcase/tstDeviceStructSizeGC.cpp

@@ -1195 +1195 @@
     GEN_CHECK_OFF(AHCIPort, szModelNumber);
     GEN_CHECK_OFF(AHCIPort, szModelNumber[AHCI_MODEL_NUMBER_LENGTH]); /* One additional byte for the termination.*/
+    GEN_CHECK_OFF(AHCIPort, szInquiryVendorId[AHCI_ATAPI_INQUIRY_VENDOR_ID_LENGTH]);
+    GEN_CHECK_OFF(AHCIPort, szInquiryProductId);
+    GEN_CHECK_OFF(AHCIPort, szInquiryProductId[AHCI_ATAPI_INQUIRY_PRODUCT_ID_LENGTH]);
+    GEN_CHECK_OFF(AHCIPort, szInquiryRevision);
+    GEN_CHECK_OFF(AHCIPort, szInquiryRevision[AHCI_ATAPI_INQUIRY_REVISION_LENGTH]);
 
     GEN_CHECK_SIZE(AHCI);