VirtualBox

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


Ignore:
Timestamp:
Apr 6, 2018 8:51:26 PM (7 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
121820
Message:

DevHDA: Made it work in raw-mode.

Location:
trunk/src/VBox/Devices
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Devices/Audio/DevHDA.cpp

    r71712 r71721  
    714714 * @todo r=andy Break this up into two functions?
    715715 */
    716 static int hdaCmdSync(PHDASTATE pThis, bool fLocal)
     716static int hdaR3CmdSync(PHDASTATE pThis, bool fLocal)
    717717{
    718718    int rc = VINF_SUCCESS;
    … …  
    725725
    726726            rc = PDMDevHlpPhysRead(pThis->CTX_SUFF(pDevIns), pThis->u64CORBBase, pThis->pu32CorbBuf, pThis->cbCorbBuf);
    727             if (RT_FAILURE(rc))
    728                 AssertRCReturn(rc, rc);
     727            Log(("hdaR3CmdSync/CORB: read %RGp LB %#x (%Rrc)\n", pThis->u64CORBBase, pThis->cbCorbBuf, rc));
     728            AssertRCReturn(rc, rc);
    729729        }
    730730    }
    … …  
    737737
    738738            rc = PDMDevHlpPCIPhysWrite(pThis->CTX_SUFF(pDevIns), pThis->u64RIRBBase, pThis->pu64RirbBuf, pThis->cbRirbBuf);
    739             if (RT_FAILURE(rc))
    740                 AssertRCReturn(rc, rc);
     739            Log(("hdaR3CmdSync/RIRB: phys read %RGp LB %#x (%Rrc)\n", pThis->u64RIRBBase, pThis->pu64RirbBuf, rc));
     740            AssertRCReturn(rc, rc);
    741741        }
    742742    }
    … …  
    794794 * @param   pThis               HDA state.
    795795 */
    796 static int hdaCORBCmdProcess(PHDASTATE pThis)
     796static int hdaR3CORBCmdProcess(PHDASTATE pThis)
    797797{
    798798    uint8_t corbRp = HDA_REG(pThis, CORBRP);
    … …  
    810810    Assert(pThis->cbCorbBuf);
    811811
    812     int rc = hdaCmdSync(pThis, true /* Sync from guest */);
     812    int rc = hdaR3CmdSync(pThis, true /* Sync from guest */);
    813813    AssertRCReturn(rc, rc);
    814814
    … …  
    887887    HDA_REG(pThis, RIRBWP) = rirbWp;
    888888
    889     rc = hdaCmdSync(pThis, false /* Sync to guest */);
     889    rc = hdaR3CmdSync(pThis, false /* Sync to guest */);
    890890    AssertRCReturn(rc, rc);
    891891
    … …  
    11541154    if (HDA_REG(pThis, CORBCTL) & HDA_CORBCTL_DMA) /* Start DMA engine. */
    11551155    {
    1156         rc = hdaCORBCmdProcess(pThis);
     1156        rc = hdaR3CORBCmdProcess(pThis);
    11571157    }
    11581158    else
    … …  
    12471247    AssertRCSuccess(rc);
    12481248
    1249     rc = hdaCORBCmdProcess(pThis);
     1249    rc = hdaR3CORBCmdProcess(pThis);
    12501250
    12511251    DEVHDA_UNLOCK(pThis);
    … …  
    22312231
    22322232    int rc = hdaRegWriteU32(pThis, iReg, u32Value);
    2233     Assert(rc == VINF_SUCCESS);
     2233    AssertRCSuccess(rc);
    22342234
    22352235    switch (iReg)
    … …  
    30303030    int         rc;
    30313031    RT_NOREF_PV(pvUser);
     3032    Assert(pThis->uAlignmentCheckMagic == HDASTATE_ALIGNMENT_CHECK_MAGIC);
    30323033
    30333034    /*
    … …  
    30723073             * ASSUMES that only DWORD reads have sideeffects.
    30733074             */
     3075#ifdef IN_RING3
    30743076            uint32_t u32Value = 0;
    30753077            unsigned cbLeft   = 4;
    … …  
    30943096            else
    30953097                Assert(!IOM_SUCCESS(rc));
     3098#else  /* !IN_RING3 */
     3099            /* Take the easy way out. */
     3100            rc = VINF_IOM_R3_MMIO_READ;
     3101#endif /* !IN_RING3 */
    30963102        }
    30973103    }
    … …  
    31623168
    31633169    /* Leave the lock before calling write function. */
     3170    /** @todo r=bird: Why do we need to do that??  There is no
     3171     *        explanation why this is necessary here...
     3172     *
     3173     * More or less all write functions retake the lock, so why not let
     3174     * those who need to drop the lock or take additional locks release
     3175     * it? See, releasing a lock you already got always runs the risk
     3176     * of someone else grabbing it and forcing you to wait, better to
     3177     * do the two-three things a write handle needs to do than enter
     3178     * and exit the lock all the time. */
    31643179    DEVHDA_UNLOCK(pThis);
    31653180
    … …  
    31843199    int       rc;
    31853200    RT_NOREF_PV(pvUser);
     3201    Assert(pThis->uAlignmentCheckMagic == HDASTATE_ALIGNMENT_CHECK_MAGIC);
    31863202
    31873203    /*
    … …  
    32393255    else
    32403256    {
     3257#ifdef IN_RING3
    32413258        /*
    32423259         * If it's an access beyond the start of the register, shift the input
    … …  
    32713288                              g_afMasks[cbReg] & ~g_afMasks[cb], u64Value & g_afMasks[cb], u64Value));
    32723289                }
    3273 #ifdef LOG_ENABLED
     3290# ifdef LOG_ENABLED
    32743291                uint32_t uLogOldVal = pThis->au32Regs[idxRegMem];
    3275 #endif
     3292# endif
    32763293                rc = hdaWriteReg(pThis, idxRegDsc, u64Value, "*");
    32773294                Log3Func(("\t%#x -> %#x\n", uLogOldVal, pThis->au32Regs[idxRegMem]));
    … …  
    33033320            }
    33043321        }
     3322
     3323#else  /* !IN_RING3 */
     3324        /* Take the simple way out. */
     3325        rc = VINF_IOM_R3_MMIO_WRITE;
     3326#endif /* !IN_RING3 */
    33053327    }
    33063328
    … …  
    33363358        return rc;
    33373359
    3338     if (pThis->fR0Enabled)
     3360    if (pThis->fRZEnabled)
    33393361    {
    33403362        rc = PDMDevHlpMMIORegisterR0(pDevIns, GCPhysAddress, cb, NIL_RTR0PTR /*pvUser*/,
    … …  
    33423364        if (RT_FAILURE(rc))
    33433365            return rc;
    3344     }
    3345 
    3346     if (pThis->fRCEnabled)
    3347     {
     3366
    33483367        rc = PDMDevHlpMMIORegisterRC(pDevIns, GCPhysAddress, cb, NIL_RTRCPTR /*pvUser*/,
    33493368                                     "hdaMMIOWrite", "hdaMMIORead");
    … …  
    43464365/* PDMDEVREG */
    43474366
     4367/**
     4368 * @interface_method_impl{PDMDEVREG,pfnRelocate}
     4369 */
     4370static DECLCALLBACK(void) hdaRelocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta)
     4371{
     4372    NOREF(offDelta);
     4373    PHDASTATE pThis = PDMINS_2_DATA(pDevIns, PHDASTATE);
     4374    pThis->pDevInsRC = PDMDEVINS_2_RCPTR(pDevIns);
     4375}
     4376
    43484377
    43494378/**
    … …  
    43734402    DEVHDA_UNLOCK(pThis);
    43744403}
     4404
    43754405
    43764406/**
    … …  
    46894719    hdaCodecPowerOff(pThis->pCodec);
    46904720
    4691     /**
     4721    /*
    46924722     * Note: Destroy the mixer while powering off and *not* in hdaDestruct,
    46934723     *       giving the mixer the chance to release any references held to
    … …  
    47144744
    47154745    /*
     4746     * Initialize the state sufficently to make the destructor work.
     4747     */
     4748    pThis->uAlignmentCheckMagic = HDASTATE_ALIGNMENT_CHECK_MAGIC;
     4749    /** @todo r=bird: we'll crash checking if the list is empty!    */
     4750
     4751    /*
    47164752     * Validations.
    47174753     */
    4718     if (!CFGMR3AreValuesValid(pCfg, "R0Enabled\0"
    4719                                     "RCEnabled\0"
     4754    if (!CFGMR3AreValuesValid(pCfg, "RZEnabled\0"
    47204755                                    "TimerHz\0"
    47214756                                    "PosAdjustEnabled\0"
    … …  
    47284763    }
    47294764
    4730     int rc = CFGMR3QueryBoolDef(pCfg, "RCEnabled", &pThis->fRCEnabled, false);
     4765    int rc = CFGMR3QueryBoolDef(pCfg, "RZEnabled", &pThis->fRZEnabled, false);
    47314766    if (RT_FAILURE(rc))
    47324767        return PDMDEV_SET_ERROR(pDevIns, rc,
    47334768                                N_("HDA configuration error: failed to read RCEnabled as boolean"));
    4734     rc = CFGMR3QueryBoolDef(pCfg, "R0Enabled", &pThis->fR0Enabled, false);
    4735     if (RT_FAILURE(rc))
    4736         return PDMDEV_SET_ERROR(pDevIns, rc,
    4737                                 N_("HDA configuration error: failed to read R0Enabled as boolean"));
     4769
    47384770
    47394771    rc = CFGMR3QueryU16Def(pCfg, "TimerHz", &pThis->u16TimerHz, HDA_TIMER_HZ_DEFAULT /* Default value, if not set. */);
    … …  
    52845316    hdaDestruct,
    52855317    /* pfnRelocate */
    5286     NULL,
     5318    hdaRelocate,
    52875319    /* pfnMemSetup */
    52885320    NULL,

  • trunk/src/VBox/Devices/Audio/DevHDA.h

    r70964 r71721  
    151151    /** DMA position buffer enable bit. */
    152152    bool                               fDMAPosition;
    153     /** Flag whether the R0 part is enabled. */
    154     bool                               fR0Enabled;
    155     /** Flag whether the RC part is enabled. */
    156     bool                               fRCEnabled;
     153    /** Flag whether the R0 and RC parts are enabled. */
     154    bool                               fRZEnabled;
     155    /** Reserved. */
     156    bool                               fPadding1b;
    157157    /** Number of active (running) SDn streams. */
    158158    uint8_t                            cStreamsActive;
    … …  
    218218    uint8_t                            au8Padding3[3];
    219219    HDASTATEDBGINFO                    Dbg;
     220    /** This is for checking that the build was correctly configured in all contexts.
     221     * This is set to HDASTATE_ALIGNMENT_CHECK_MAGIC.  */
     222    uint64_t                            uAlignmentCheckMagic;
    220223} HDASTATE, *PHDASTATE;
     224
     225/** Value for HDASTATE:uAlignmentCheckMagic. */
     226#define HDASTATE_ALIGNMENT_CHECK_MAGIC  UINT64_C(0x1298afb75893e059)
     227
    221228#endif /* !DEV_HDA_H */
    222229

  • trunk/src/VBox/Devices/Config.kmk

    r69111 r71721  
    7575TEMPLATE_VBoxBios32Lib_POST_CMDS  = $(NO_SUCH_VARIABLE)
    7676
     77
     78#
     79# Audio configuration.
     80# This must live here because of testcase/
     81#
     82VBOX_AUDIO_DEFS :=
     83if 0 # Not stable yet.
     84 # Enable microphone-in support for HDA. Otherwise only line-in is supported.
     85 VBOX_AUDIO_DEFS += VBOX_WITH_AUDIO_HDA_MIC_IN
     86
     87 # Enable interleavig streams support for HDA. Needed for 5.1 surround support.
     88 VBOX_AUDIO_DEFS  += VBOX_WITH_AUDIO_HDA_INTERLEAVING_STREAMS_SUPPORT
     89
     90 # Enable 5.1 surround support (Front, Center/LFE, Rear) for HDA.
     91 # Without this, only stereo output (Front) is supported.
     92 VBOX_AUDIO_DEFS += VBOX_WITH_AUDIO_HDA_51_SURROUND
     93endif
     94
     95# Enable backend-independent device enumeration support.
     96VBOX_AUDIO_DEFS  += VBOX_WITH_AUDIO_ENUM
     97
     98# Enable backend callback support.
     99VBOX_AUDIO_DEFS += VBOX_WITH_AUDIO_CALLBACKS
     100
     101# Disable one-time audio stream initialization at device creation (VM startup) instead
     102# of creating the stream when needed at some later point in time.
     103#
     104# This was the default behavior ever since.
     105#
     106# We now go with the new behavior by default now.
     107#VBOX_AUDIO_DEFS += VBOX_WITH_AUDIO_SB16_ONETIME_INIT
     108
     109ifdef VBOX_WITH_HP_HDA
     110 VBOX_AUDIO_DEFS += VBOX_WITH_HP_HDA
     111endif
     112ifdef VBOX_WITH_INTEL_HDA
     113 VBOX_AUDIO_DEFS += VBOX_WITH_INTEL_HDA
     114endif
     115ifdef VBOX_WITH_NVIDIA_HDA
     116 VBOX_AUDIO_DEFS += VBOX_WITH_NVIDIA_HDA
     117endif
     118
     119#
     120# Enables asynchronous audio data handling
     121# to speed up the actual DMA data routines and keeping up
     122# audio processing out of EMT as much as possible.
     123#
     124# Disabled for AC'97 for now.
     125#VBOX_AUDIO_DEFS  += VBOX_WITH_AUDIO_AC97_ASYNC_IO
     126VBOX_AUDIO_DEFS += VBOX_WITH_AUDIO_HDA_ASYNC_IO
     127
     128# Not yet enabled: Callbacks for the device emulation to let the backends
     129#                  tell the emulation when and how to process data.
     130if 0
     131 VBOX_AUDIO_DEFS  += VBOX_WITH_AUDIO_SB16_CALLBACKS
     132 VBOX_AUDIO_DEFS  += VBOX_WITH_AUDIO_AC97_CALLBACKS
     133 VBOX_AUDIO_DEFS  += VBOX_WITH_AUDIO_HDA_CALLBACKS
     134endif
     135

  • trunk/src/VBox/Devices/Makefile.kmk

    r71210 r71721  
    549549 endif
    550550
    551  # --- Audio bits. ---
    552 
    553  if 0 # Not stable yet.
    554   # Enable microphone-in support for HDA. Otherwise only line-in is supported.
    555   VBoxDD_DEFS += VBOX_WITH_AUDIO_HDA_MIC_IN
    556 
    557   # Enable interleavig streams support for HDA. Needed for 5.1 surround support.
    558   VBoxDD_DEFS += VBOX_WITH_AUDIO_HDA_INTERLEAVING_STREAMS_SUPPORT
    559 
    560   # Enable 5.1 surround support (Front, Center/LFE, Rear) for HDA.
    561   # Without this, only stereo output (Front) is supported.
    562   VBoxDD_DEFS += VBOX_WITH_AUDIO_HDA_51_SURROUND
    563  endif
    564 
    565  # Enable backend-independent device enumeration support.
    566  VBoxDD_DEFS  += VBOX_WITH_AUDIO_ENUM
    567 
    568  # Enable backend callback support.
    569  VBoxDD_DEFS  += VBOX_WITH_AUDIO_CALLBACKS
    570 
    571  # Disable one-time audio stream initialization at device creation (VM startup) instead
    572  # of creating the stream when needed at some later point in time.
    573  #
    574  # This was the default behavior ever since.
    575  #
    576  # We now go with the new behavior by default now.
    577  #VBoxDD_DEFS  += VBOX_WITH_AUDIO_SB16_ONETIME_INIT
    578  #VBoxDD_DEFS  += VBOX_WITH_AUDIO_AC97_ONETIME_INIT
    579  #VBoxDD_DEFS  += VBOX_WITH_AUDIO_HDA_ONETIME_INIT
    580 
    581  VBoxDD_DEFS += \
    582         $(if $(VBOX_WITH_HP_HDA),VBOX_WITH_HP_HDA,) \
    583         $(if $(VBOX_WITH_INTEL_HDA),VBOX_WITH_INTEL_HDA,) \
    584         $(if $(VBOX_WITH_NVIDIA_HDA),VBOX_WITH_NVIDIA_HDA,)
    585 
    586  #
    587  # Enables asynchronous audio data handling
    588  # to speed up the actual DMA data routines and keeping up
    589  # audio processing out of EMT as much as possible.
    590  #
    591  # Disabled for AC'97 for now.
    592  #VBoxDD_DEFS  += VBOX_WITH_AUDIO_AC97_ASYNC_IO
    593  VBoxDD_DEFS  += VBOX_WITH_AUDIO_HDA_ASYNC_IO
    594 
    595  # Not yet enabled: Callbacks for the device emulation to let the backends
    596  #                  tell the emulation when and how to process data.
    597  if 0
    598   VBOX_DEFS   += VBOX_WITH_AUDIO_SB16_CALLBACKS
    599   VBOX_DEFS   += VBOX_WITH_AUDIO_AC97_CALLBACKS
    600   VBOX_DEFS   += VBOX_WITH_AUDIO_HDA_CALLBACKS
    601  endif
    602 
     551 # --- Audio bits (see also VBOX_AUDIO_DEFS in ./Config.kmk). ---
     552
     553 VBoxDD_DEFS += $(VBOX_AUDIO_DEFS)
    603554 VBoxDD_SOURCES         += \
    604555        Audio/DevIchAc97.cpp \
    … …  
    980931        VMMDev/VMMDevTesting.cpp
    981932
     933  VBoxDDRC_DEFS         += $(VBOX_AUDIO_DEFS)
    982934  VBoxDDRC_SOURCES      += \
    983935        Audio/DevHDA.cpp \
    … …  
    11481100        VMMDev/VMMDevTesting.cpp \
    11491101        Network/DrvIntNet.cpp \
    1150         Network/DrvDedicatedNic.cpp \
    1151         Audio/DevHDA.cpp \
    1152         Audio/DevHDACommon.cpp
     1102        Network/DrvDedicatedNic.cpp
    11531103
    11541104 VBoxDDR0_SOURCES.win += Parallel/DrvHostParallel.cpp
    … …  
    11641114        $(if $(VBOX_WITH_INTEL_HDA),VBOX_WITH_INTEL_HDA,) \
    11651115        $(if $(VBOX_WITH_NVIDIA_HDA),VBOX_WITH_NVIDIA_HDA,)
     1116
     1117 VBoxDDR0_DEFS += $(VBOX_AUDIO_DEFS)
     1118 VBoxDDR0_SOURCES += \
     1119        Audio/DevHDA.cpp \
     1120        Audio/DevHDACommon.cpp
    11661121
    11671122 ifdef VBOX_WITH_E1000

  • trunk/src/VBox/Devices/testcase/Makefile.kmk

    r70433 r71721  
    4848        $(if $(VBOX_WITH_VMSVGA),VBOX_WITH_VMSVGA,) \
    4949        $(if $(VBOX_WITH_WDDM),VBOX_WITH_WDDM,) \
    50         $(if $(VBOX_WITH_XHCI_IMPL),VBOX_WITH_XHCI_IMPL,)
     50        $(if $(VBOX_WITH_XHCI_IMPL),VBOX_WITH_XHCI_IMPL,) \
     51       $(VBOX_AUDIO_DEFS)
    5152
    5253#

  • trunk/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp

    r71351 r71721  
    18951895    GEN_CHECK_OFF(HDASTATE, pu64RirbBuf);
    18961896    GEN_CHECK_OFF(HDASTATE, cbRirbBuf);
    1897     GEN_CHECK_OFF(HDASTATE, fR0Enabled);
    1898     GEN_CHECK_OFF(HDASTATE, fRCEnabled);
    1899 #ifndef VBOX_WITH_AUDIO_CALLBACKS
    1900 #endif
     1897    GEN_CHECK_OFF(HDASTATE, fRZEnabled);
    19011898#ifdef VBOX_WITH_STATISTICS
    19021899# ifndef VBOX_WITH_AUDIO_CALLBACKS
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette