From patchwork Mon Nov 6 17:38:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Lentocha X-Patchwork-Id: 13447933 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EBAF3C4167D for ; Tue, 7 Nov 2023 06:07:55 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0FEp-0008NO-MB; Tue, 07 Nov 2023 01:06:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r03YC-0003rK-6P for qemu-devel@nongnu.org; Mon, 06 Nov 2023 12:38:12 -0500 Received: from mail-oa1-x2b.google.com ([2001:4860:4864:20::2b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r03Y9-0004zQ-IQ for qemu-devel@nongnu.org; Mon, 06 Nov 2023 12:38:11 -0500 Received: by mail-oa1-x2b.google.com with SMTP id 586e51a60fabf-1f05247791fso2708007fac.0 for ; Mon, 06 Nov 2023 09:38:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699292287; x=1699897087; darn=nongnu.org; h=content-transfer-encoding:from:content-language:subject:to :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=oLnPWFLhs80TrKWzlvMdCRF9YVC7x/Qmz7uVLLwBbJM=; b=R0mtL76wKm3k/A/oNA1FZFp2+kEi5EquR8xT1bUmxLfjo9kQegJ97Na6lP4v8Yrves OjvY7i5q/TJbRXPXOiAkIEd5fNPjpg77/3z0pnbc7pQyZgByg6jIQTeq3QBRkyiBO05V n7CmgmFcn7IQ53bG6XgDYUXMEz8nfy4gEq4xnnQqScouQkxJtjZpPJSsRMr4C7waV0mw n2B2hgU+Hrtx1MyIIJgmuU7Eqdk3hWfTXDRTu9ojkwz+yQUJQmSXtarXJaHX8EmHla76 zfZXb2WKiNrPDNzaU/SB6jK3w9S0A6R/76g5+zsTrfZuF2Bm18MgL0LlkyiVhBfKIt5+ ka5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699292287; x=1699897087; h=content-transfer-encoding:from:content-language:subject:to :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=oLnPWFLhs80TrKWzlvMdCRF9YVC7x/Qmz7uVLLwBbJM=; b=unCsYiquHa26szPWqs+7Nq3Pqu8eqls/3otCtw2kvq6XJ4Tvh/mYpKD4Olv6JU89ys Ap7dYiRwJ0hRNDic+7qkmzwEs4ThaGye1F2iu5kMnu8EOB0I66K0UqQl4PQqmyok1tZC 5QwkpZxKpciPrAHhrlnPxYgRDjJTXCy9ymtta8MLUXV+zYf3oMs7UBAzINTSu1rL3IyR /INYsaPJtCdlEmsHXt1ev/2va865qXfCQSnb2lniz1EqVaCYnvAwv//uE/zD8KdoIQtH asybr6SPVcQIwDYSdsSGlUtwhPCborXlmy3caK3R/K3bhSMLfoG25Q4g0qpG4SWxKhbL s4NQ== X-Gm-Message-State: AOJu0YyOcb4RbTGgNcEk+53ycbFKOnl1+v5ni8/a/NncsmaWhZlzgNh0 7YWE9O4trPFD6QE2f5K+5Y/e1ueNlZBDUg== X-Google-Smtp-Source: AGHT+IFsV2pPe3nAsUKXVZEdj5V2b+HP1QdoLOAiTdTsGzsBI1qfeSpIAO+FF38jTqMdVU8kQD5qxA== X-Received: by 2002:a05:6870:b0b:b0:1d5:a17e:f62 with SMTP id lh11-20020a0568700b0b00b001d5a17e0f62mr477072oab.24.1699292286677; Mon, 06 Nov 2023 09:38:06 -0800 (PST) Received: from [192.168.1.4] (172-8-197-221.lightspeed.livnmi.sbcglobal.net. [172.8.197.221]) by smtp.gmail.com with ESMTPSA id g3-20020a056870c38300b001efa91630f6sm1482171oao.6.2023.11.06.09.38.05 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 06 Nov 2023 09:38:06 -0800 (PST) Message-ID: Date: Mon, 6 Nov 2023 12:38:05 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.5.0 To: qemu-devel@nongnu.org Subject: [PATCH] Fix Windows 2000 and XP HDAudio Support Content-Language: en-US From: Christopher Lentocha Received-SPF: pass client-ip=2001:4860:4864:20::2b; envelope-from=christopherericlentocha@gmail.com; helo=mail-oa1-x2b.google.com X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, TRACKER_ID=0.1, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Tue, 07 Nov 2023 01:06:58 -0500 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Change the ID to be a Realtek ALC885 so that both Windows 2000 and up (including XP) and macOS (on a later patch for HDEF ACPI Fixes) support HDA HDA is supported for ALC885 on macOS AppleHDA.kext and 2K people can use the following file to get sound working (MD5sum): 959c6ad895ee22d0003fe24b6ce1b150 WDM_R269.exe for Vista+, the following can be used for EQ or if the native one doesn't work OOTB (MD5sum): fb0aaffcfc620b70b7f3c3b1381d08e5 Vista_Win7_Win8_R270.exe A Note for the Vista+ Driver: You need to go to playback settings, under the Speaker, Advanced, change the Hz to one that is valid, so sound actually plays, though you may need to enable under the Enhancements tab, check Disable All then change the Hz, and uncheck Disable All Under Enhancements, applying after each of the tasks, due to a bug in the stock Realtek Driver, also note, newer drivers don't work at all, even on real machines, this is the latest confirmed to work at the moment! Signed-off-by: Christopher Lentocha --- hw/audio/hda-codec-common.h | 66 +++++++++++++++++-------------------- hw/audio/hda-codec.c | 8 +++-- 2 files changed, 36 insertions(+), 38 deletions(-) #define QEMU_HDA_AMP_NONE (0) @@ -514,7 +513,7 @@ static void hda_audio_command(HDACodecDevice *hda, uint32_t nid, uint32_t data) node = hda_codec_find_node(a->desc, nid); if (node == NULL) { - goto fail; + goto liaf; } dprint(a, 2, "%s: nid %d (%s), verb 0x%x, payload 0x%x\n", __func__, nid, node->name, verb, payload); @@ -652,6 +651,11 @@ fail: dprint(a, 1, "%s: not handled: nid %d (%s), verb 0x%x, payload 0x%x\n", __func__, nid, node ? node->name : "?", verb, payload); hda_codec_response(hda, true, 0); + +liaf: + dprint(a, 1, "%s: not handled: nid %d (%s), verb 0x%x, payload 0x%x\n", + __func__, nid, node ? node->name : "?", verb, payload); + hda_codec_response(hda, true, 0x0885); } static void hda_audio_stream(HDACodecDevice *hda, uint32_t stnr, bool running, bool output) diff --git a/hw/audio/hda-codec-common.h b/hw/audio/hda-codec-common.h index b4fdb51e8b..ef57a1b98d 100644 --- a/hw/audio/hda-codec-common.h +++ b/hw/audio/hda-codec-common.h @@ -24,19 +24,15 @@ * HDA codec descriptions */ +#define QEMU_HDA_ID 0x10EC0885 + #ifdef HDA_MIXER -#define QEMU_HDA_ID_OUTPUT ((QEMU_HDA_ID_VENDOR << 16) | 0x12) -#define QEMU_HDA_ID_DUPLEX ((QEMU_HDA_ID_VENDOR << 16) | 0x22) -#define QEMU_HDA_ID_MICRO ((QEMU_HDA_ID_VENDOR << 16) | 0x32) #define QEMU_HDA_AMP_CAPS \ (AC_AMPCAP_MUTE | \ (QEMU_HDA_AMP_STEPS << AC_AMPCAP_OFFSET_SHIFT) | \ (QEMU_HDA_AMP_STEPS << AC_AMPCAP_NUM_STEPS_SHIFT) | \ (3 << AC_AMPCAP_STEP_SIZE_SHIFT)) #else -#define QEMU_HDA_ID_OUTPUT ((QEMU_HDA_ID_VENDOR << 16) | 0x11) -#define QEMU_HDA_ID_DUPLEX ((QEMU_HDA_ID_VENDOR << 16) | 0x21) -#define QEMU_HDA_ID_MICRO ((QEMU_HDA_ID_VENDOR << 16) | 0x31) #define QEMU_HDA_AMP_CAPS QEMU_HDA_AMP_NONE #endif @@ -137,10 +133,10 @@ static const desc_param glue(common_params_audio_linein_, PARAM)[] = { static const desc_param glue(output_params_root_, PARAM)[] = { { .id = AC_PAR_VENDOR_ID, - .val = QEMU_HDA_ID_OUTPUT, + .val = QEMU_HDA_ID, },{ .id = AC_PAR_SUBSYSTEM_ID, - .val = QEMU_HDA_ID_OUTPUT, + .val = QEMU_HDA_ID, },{ .id = AC_PAR_REV_ID, .val = 0x00100101, @@ -157,7 +153,7 @@ static const desc_param glue(output_params_audio_func_, PARAM)[] = { .val = AC_GRP_AUDIO_FUNCTION, },{ .id = AC_PAR_SUBSYSTEM_ID, - .val = QEMU_HDA_ID_OUTPUT, + .val = QEMU_HDA_ID, },{ .id = AC_PAR_NODE_COUNT, .val = 0x00020002, @@ -208,9 +204,9 @@ static const desc_node glue(output_nodes_, PARAM)[] = { .name = "out", .params = glue(common_params_audio_lineout_, PARAM), .nparams = ARRAY_SIZE(glue(common_params_audio_lineout_, PARAM)), - .config = ((AC_JACK_PORT_COMPLEX << AC_DEFCFG_PORT_CONN_SHIFT) | - (AC_JACK_LINE_OUT << AC_DEFCFG_DEVICE_SHIFT) | - (AC_JACK_CONN_UNKNOWN << AC_DEFCFG_CONN_TYPE_SHIFT) | + .config = ((AC_JACK_PORT_FIXED << AC_DEFCFG_PORT_CONN_SHIFT) | + (AC_JACK_SPEAKER << AC_DEFCFG_DEVICE_SHIFT) | + (AC_JACK_CONN_1_8 << AC_DEFCFG_CONN_TYPE_SHIFT) | (AC_JACK_COLOR_GREEN << AC_DEFCFG_COLOR_SHIFT) | 0x10), .pinctl = AC_PINCTL_OUT_EN, @@ -221,7 +217,7 @@ static const desc_node glue(output_nodes_, PARAM)[] = { /* output: codec */ static const desc_codec glue(output_, PARAM) = { .name = "output", - .iid = QEMU_HDA_ID_OUTPUT, + .iid = QEMU_HDA_ID, .nodes = glue(output_nodes_, PARAM), .nnodes = ARRAY_SIZE(glue(output_nodes_, PARAM)), }; @@ -230,10 +226,10 @@ static const desc_codec glue(output_, PARAM) = { static const desc_param glue(duplex_params_root_, PARAM)[] = { { .id = AC_PAR_VENDOR_ID, - .val = QEMU_HDA_ID_DUPLEX, + .val = QEMU_HDA_ID, },{ .id = AC_PAR_SUBSYSTEM_ID, - .val = QEMU_HDA_ID_DUPLEX, + .val = QEMU_HDA_ID, },{ .id = AC_PAR_REV_ID, .val = 0x00100101, @@ -250,7 +246,7 @@ static const desc_param glue(duplex_params_audio_func_, PARAM)[] = { .val = AC_GRP_AUDIO_FUNCTION, },{ .id = AC_PAR_SUBSYSTEM_ID, - .val = QEMU_HDA_ID_DUPLEX, + .val = QEMU_HDA_ID, },{ .id = AC_PAR_NODE_COUNT, .val = 0x00020004, @@ -301,9 +297,9 @@ static const desc_node glue(duplex_nodes_, PARAM)[] = { .name = "out", .params = glue(common_params_audio_lineout_, PARAM), .nparams = ARRAY_SIZE(glue(common_params_audio_lineout_, PARAM)), - .config = ((AC_JACK_PORT_COMPLEX << AC_DEFCFG_PORT_CONN_SHIFT) | - (AC_JACK_LINE_OUT << AC_DEFCFG_DEVICE_SHIFT) | - (AC_JACK_CONN_UNKNOWN << AC_DEFCFG_CONN_TYPE_SHIFT) | + .config = ((AC_JACK_PORT_FIXED << AC_DEFCFG_PORT_CONN_SHIFT) | + (AC_JACK_SPEAKER << AC_DEFCFG_DEVICE_SHIFT) | + (AC_JACK_CONN_1_8 << AC_DEFCFG_CONN_TYPE_SHIFT) | (AC_JACK_COLOR_GREEN << AC_DEFCFG_COLOR_SHIFT) | 0x10), .pinctl = AC_PINCTL_OUT_EN, @@ -320,10 +316,10 @@ static const desc_node glue(duplex_nodes_, PARAM)[] = { .name = "in", .params = glue(common_params_audio_linein_, PARAM), .nparams = ARRAY_SIZE(glue(common_params_audio_linein_, PARAM)), - .config = ((AC_JACK_PORT_COMPLEX << AC_DEFCFG_PORT_CONN_SHIFT) | - (AC_JACK_LINE_IN << AC_DEFCFG_DEVICE_SHIFT) | - (AC_JACK_CONN_UNKNOWN << AC_DEFCFG_CONN_TYPE_SHIFT) | - (AC_JACK_COLOR_RED << AC_DEFCFG_COLOR_SHIFT) | + .config = ((AC_JACK_PORT_FIXED << AC_DEFCFG_PORT_CONN_SHIFT) | + (AC_JACK_MIC_IN << AC_DEFCFG_DEVICE_SHIFT) | + (AC_JACK_CONN_1_8 << AC_DEFCFG_CONN_TYPE_SHIFT) | + (AC_JACK_COLOR_PINK << AC_DEFCFG_COLOR_SHIFT) | 0x20), .pinctl = AC_PINCTL_IN_EN, } @@ -332,7 +328,7 @@ static const desc_node glue(duplex_nodes_, PARAM)[] = { /* duplex: codec */ static const desc_codec glue(duplex_, PARAM) = { .name = "duplex", - .iid = QEMU_HDA_ID_DUPLEX, + .iid = QEMU_HDA_ID, .nodes = glue(duplex_nodes_, PARAM), .nnodes = ARRAY_SIZE(glue(duplex_nodes_, PARAM)), }; @@ -341,10 +337,10 @@ static const desc_codec glue(duplex_, PARAM) = { static const desc_param glue(micro_params_root_, PARAM)[] = { { .id = AC_PAR_VENDOR_ID, - .val = QEMU_HDA_ID_MICRO, + .val = QEMU_HDA_ID, },{ .id = AC_PAR_SUBSYSTEM_ID, - .val = QEMU_HDA_ID_MICRO, + .val = QEMU_HDA_ID, },{ .id = AC_PAR_REV_ID, .val = 0x00100101, @@ -361,7 +357,7 @@ static const desc_param glue(micro_params_audio_func_, PARAM)[] = { .val = AC_GRP_AUDIO_FUNCTION, },{ .id = AC_PAR_SUBSYSTEM_ID, - .val = QEMU_HDA_ID_MICRO, + .val = QEMU_HDA_ID, },{ .id = AC_PAR_NODE_COUNT, .val = 0x00020004, @@ -412,9 +408,9 @@ static const desc_node glue(micro_nodes_, PARAM)[] = { .name = "out", .params = glue(common_params_audio_lineout_, PARAM), .nparams = ARRAY_SIZE(glue(common_params_audio_lineout_, PARAM)), - .config = ((AC_JACK_PORT_COMPLEX << AC_DEFCFG_PORT_CONN_SHIFT) | + .config = ((AC_JACK_PORT_FIXED << AC_DEFCFG_PORT_CONN_SHIFT) | (AC_JACK_SPEAKER << AC_DEFCFG_DEVICE_SHIFT) | - (AC_JACK_CONN_UNKNOWN << AC_DEFCFG_CONN_TYPE_SHIFT) | + (AC_JACK_CONN_1_8 << AC_DEFCFG_CONN_TYPE_SHIFT) | (AC_JACK_COLOR_GREEN << AC_DEFCFG_COLOR_SHIFT) | 0x10), .pinctl = AC_PINCTL_OUT_EN, @@ -431,10 +427,10 @@ static const desc_node glue(micro_nodes_, PARAM)[] = { .name = "in", .params = glue(common_params_audio_linein_, PARAM), .nparams = ARRAY_SIZE(glue(common_params_audio_linein_, PARAM)), - .config = ((AC_JACK_PORT_COMPLEX << AC_DEFCFG_PORT_CONN_SHIFT) | + .config = ((AC_JACK_PORT_FIXED << AC_DEFCFG_PORT_CONN_SHIFT) | (AC_JACK_MIC_IN << AC_DEFCFG_DEVICE_SHIFT) | - (AC_JACK_CONN_UNKNOWN << AC_DEFCFG_CONN_TYPE_SHIFT) | - (AC_JACK_COLOR_RED << AC_DEFCFG_COLOR_SHIFT) | + (AC_JACK_CONN_1_8 << AC_DEFCFG_CONN_TYPE_SHIFT) | + (AC_JACK_COLOR_PINK << AC_DEFCFG_COLOR_SHIFT) | 0x20), .pinctl = AC_PINCTL_IN_EN, } @@ -443,14 +439,12 @@ static const desc_node glue(micro_nodes_, PARAM)[] = { /* micro: codec */ static const desc_codec glue(micro_, PARAM) = { .name = "micro", - .iid = QEMU_HDA_ID_MICRO, + .iid = QEMU_HDA_ID, .nodes = glue(micro_nodes_, PARAM), .nnodes = ARRAY_SIZE(glue(micro_nodes_, PARAM)), }; #undef PARAM #undef HDA_MIXER -#undef QEMU_HDA_ID_OUTPUT -#undef QEMU_HDA_ID_DUPLEX -#undef QEMU_HDA_ID_MICRO +#undef QEMU_HDA_ID #undef QEMU_HDA_AMP_CAPS diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c index b9ad1f4c39..6999869c70 100644 --- a/hw/audio/hda-codec.c +++ b/hw/audio/hda-codec.c @@ -117,7 +117,6 @@ static void hda_codec_parse_fmt(uint32_t format, struct audsettings *as) /* some defines */ -#define QEMU_HDA_ID_VENDOR 0x1af4 #define QEMU_HDA_PCM_FORMATS (AC_SUPPCM_BITS_16 | \ 0x1fc /* 16 -> 96 kHz */)