win-pvdrivers

changeset 1051:ca993d6b5539

fix regression in xenvbd for >4GB memory
author James Harper <james.harper@bendigoit.com.au>
date Tue May 21 16:09:35 2013 +1000 (2013-05-21)
parents 6bc417576ada
children 5bb1f345e06a
files xenvbd_scsiport/xenvbd.c
line diff
     1.1 --- a/xenvbd_scsiport/xenvbd.c	Mon May 13 21:29:22 2013 +1000
     1.2 +++ b/xenvbd_scsiport/xenvbd.c	Tue May 21 16:09:35 2013 +1000
     1.3 @@ -154,8 +154,6 @@ XenVbd_HwScsiFindAdapter(PVOID DeviceExt
     1.4    FUNCTION_MSG("MultipleRequestPerLu = %d\n", ConfigInfo->MultipleRequestPerLu);
     1.5    FUNCTION_MSG("TaggedQueuing = %d\n", ConfigInfo->TaggedQueuing);
     1.6    FUNCTION_MSG("AutoRequestSense  = %d\n", ConfigInfo->AutoRequestSense);
     1.7 -  ConfigInfo->ScatterGather = FALSE; //TRUE;
     1.8 -  ConfigInfo->Master = FALSE; //TRUE;
     1.9    ConfigInfo->CachesData = FALSE;
    1.10    ConfigInfo->MapBuffers = TRUE;
    1.11    ConfigInfo->AlignmentMask = 0;
    1.12 @@ -163,14 +161,18 @@ XenVbd_HwScsiFindAdapter(PVOID DeviceExt
    1.13    ConfigInfo->InitiatorBusId[0] = 1;
    1.14    ConfigInfo->MaximumNumberOfLogicalUnits = 1;
    1.15    ConfigInfo->MaximumNumberOfTargets = 2;
    1.16 -  #if 0
    1.17 +  FUNCTION_MSG("MapBuffers = %d\n", ConfigInfo->MapBuffers);
    1.18 +  FUNCTION_MSG("NeedPhysicalAddresses = %d\n", ConfigInfo->NeedPhysicalAddresses);
    1.19    if (ConfigInfo->Dma64BitAddresses == SCSI_DMA64_SYSTEM_SUPPORTED) {
    1.20 +    FUNCTION_MSG("Dma64BitAddresses supported\n");
    1.21      ConfigInfo->Dma64BitAddresses = SCSI_DMA64_MINIPORT_SUPPORTED;
    1.22 -    FUNCTION_MSG("Dma64BitAddresses supported\n");
    1.23 +    ConfigInfo->ScatterGather = TRUE;
    1.24 +    ConfigInfo->Master = TRUE;
    1.25    } else {
    1.26      FUNCTION_MSG("Dma64BitAddresses not supported\n");
    1.27 +    ConfigInfo->ScatterGather = FALSE;
    1.28 +    ConfigInfo->Master = FALSE;
    1.29    }
    1.30 -  #endif
    1.31    *Again = FALSE;
    1.32  
    1.33    FUNCTION_EXIT();