August 2014 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH 1/2] ALSA: hda - add PCI IDs for Intel Braswell
by libin.yang＠intel.com 04 Aug '14

04 Aug '14

From: Libin Yang <libin.yang(a)intel.com> Add HD Audio Device PCI ID for the Intel Braswell platform. It is an HDA Intel PCH controller. AZX_DCAPS_ALIGN_BUFSIZE is not necessary for this controller. Signed-off-by: Libin Yang <libin.yang(a)intel.com> --- sound/pci/hda/hda_intel.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 387fc73..5db1948 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2017,6 +2017,9 @@ static const struct pci_device_id azx_ids[] = { /* BayTrail */ { PCI_DEVICE(0x8086, 0x0f04), .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM }, + /* Braswell */ + { PCI_DEVICE(0x8086, 0x2284), + .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH }, /* ICH */ { PCI_DEVICE(0x8086, 0x2668), .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_OLD_SSYNC | -- 1.9.1

2 2

[alsa-devel] [PATCH] hdajackretask: Add "hints" functionality
by David Henningsson 04 Aug '14

04 Aug '14

The kernel driver has some hints you can send to it that changes parser behaviour. This patch exposes that functionality to the user. (This patch also includes minor fixes for documentation, GTK warnings and whitespace.) Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- hdajackretask/Makefile.am | 2 +- hdajackretask/README | 12 ++-- hdajackretask/apply-changes.c | 48 +++++++++---- hdajackretask/apply-changes.h | 4 +- hdajackretask/main-gtk.c | 144 +++++++++++++++++++++++++++++++++++--- hdajackretask/sysfs-pin-configs.c | 28 +++++++- hdajackretask/sysfs-pin-configs.h | 4 ++ 7 files changed, 209 insertions(+), 33 deletions(-) diff --git a/hdajackretask/Makefile.am b/hdajackretask/Makefile.am index 3479b83..e313159 100644 --- a/hdajackretask/Makefile.am +++ b/hdajackretask/Makefile.am @@ -1,5 +1,5 @@ EXTRA_DIST = gitcompile README -AM_CFLAGS = @GTK3_CFLAGS@ +AM_CFLAGS = @GTK3_CFLAGS@ -Wno-deprecated-declarations bin_PROGRAMS = hdajackretask man_MANS = hdajackretask_SOURCES = main-gtk.c sysfs-pin-configs.c apply-changes.c diff --git a/hdajackretask/README b/hdajackretask/README index 68f62b1..209e332 100644 --- a/hdajackretask/README +++ b/hdajackretask/README @@ -1,12 +1,12 @@ -Documentation for hda-jack-retask -================================= +Documentation for hdajackretask +=============================== Most HDA Intel soundcards are to some degree retaskable, i e can be used for more than one thing. This tool is a GUI to make it easy to retask your jacks - e g, turn your Mic jack into an extra Headphone, or why not make them both line outs and connect them to your surround receiver? Quickstart ========== -Start the application "hda-jack-retask" from the command line. +Start the application "hdajackretask" from the command line. Select a codec in the top bar; some people have only one - if you have more than one, one is the "main" one, and the rest are probably HDMI codecs. All jacks (and other inputs/outputs) are shown under "Pin configuration". To override one of your jacks, click the "Override" checkbox for that pin and select the desired function. @@ -44,9 +44,11 @@ Options Your BIOS is responsible for setting up what pins on the codec that are actually connected to something and which ones are not. Sometimes BIOS is buggy, and will not show all your jacks. If you have a jack your BIOS says you haven't, you can try enabling random pins and see if it works. * Set Model=auto -Some codecs, especially older ones, are hard-coded to use a specific model, and thus will not care about your overrides. In many cases and with a reasonably new kernel, the auto parser now works well for these codecs as well. You can force the auto parser to be used by checking this box. In some cases, though, the explicit model is there for a reason, if so, you're stuck. +Some codecs, especially older ones and on kernels 3.8 and below, are hard-coded to use a specific model, and thus will not care about your overrides. In many cases and with a reasonably new kernel, the auto parser now works well for these codecs as well. You can force the auto parser to be used by checking this box. In some cases, though, the explicit model is there for a reason, if so, you're stuck. * Advanced override This is for the experts only. It makes you select each configuration field individually, instead of just a few predefined values that make sense. Note that most combinations here are invalid in one way or the other, so you should probably not mess with this unless you have read and understood the "Configuration Default" section of the HD Audio specification. (Which, at the time of this writing, is available here: -http://www.intel.com/content/dam/doc/product-specification/high-definition-audio-specification.pdf ) +http://www.intel.com/content/dam/www/public/us/en/documents/product-specifications/high-definition-audio-specification.pdf ) + * Parser hints +This enables you to send special "hints" to the driver that causes parsing to behave differently. Leave them at the "default" setting unless you have read the driver documentation. ( Which, at the time of this writing, is available here: https://www.kernel.org/doc/Documentation/sound/alsa/HD-Audio.txt - see the "Hint strings" section. ) diff --git a/hdajackretask/apply-changes.c b/hdajackretask/apply-changes.c index 840f649..aa291ce 100644 --- a/hdajackretask/apply-changes.c +++ b/hdajackretask/apply-changes.c @@ -15,6 +15,11 @@ static gchar* tempdir = NULL; static gchar* scriptfile = NULL; static gchar* errorfile = NULL; +static GQuark quark() +{ + return g_quark_from_static_string("hda-jack-retask-error"); +} + static gboolean ensure_tempdir(GError** err) { if (!tempdir) { @@ -29,10 +34,10 @@ static gboolean ensure_tempdir(GError** err) } static gboolean create_reconfig_script(pin_configs_t* pins, int entries, int card, int device, - const char* model, GError** err) + const char* model, const char* hints, GError** err) { gchar* hwdir = g_strdup_printf("/sys/class/sound/hwC%dD%d", card, device); - gchar destbuf[120*40] = "#!/bin/sh\n"; + gchar destbuf[150*40] = "#!/bin/sh\n"; int bufleft = sizeof(destbuf) - strlen(destbuf); gboolean ok = FALSE; gchar* s = destbuf + strlen(destbuf); @@ -44,9 +49,16 @@ static gboolean create_reconfig_script(pin_configs_t* pins, int entries, int car int l = g_snprintf(s, bufleft, "echo \"%s\" | tee %s/modelname 2>>%s\n", model, hwdir, errorfile); bufleft-=l; - s+=l; + s+=l; } - + + if (hints) { + int l = g_snprintf(s, bufleft, "echo \"%s\" | tee %s/hints 2>>%s\n", + hints, hwdir, errorfile); + bufleft-=l; + s+=l; + } + while (entries) { int l = g_snprintf(s, bufleft, "echo \"0x%02x 0x%08x\" | tee %s/user_pin_configs 2>>%s\n", pins->nid, (unsigned int) actual_pin_config(pins), hwdir, errorfile); @@ -57,7 +69,7 @@ static gboolean create_reconfig_script(pin_configs_t* pins, int entries, int car } if (bufleft < g_snprintf(s, bufleft, "echo 1 | tee %s/reconfig 2>>%s", hwdir, errorfile)) { - g_set_error(err, 0, 0, "Bug in %s:%d!", __FILE__, __LINE__); + g_set_error(err, quark(), 0, "Bug in %s:%d!", __FILE__, __LINE__); goto cleanup; } @@ -85,7 +97,7 @@ gboolean run_sudo_script(const gchar* script_name, GError** err) g_chmod(script_name, 0755); g_spawn_command_line_sync(cmdline, NULL, NULL, &exit_status, NULL); if (errorfile && g_file_get_contents(errorfile, &errfilecontents, &errlen, NULL) && errlen) { - g_set_error(err, 0, 0, "%s", errfilecontents); + g_set_error(err, quark(), 0, "%s", errfilecontents); ok = FALSE; } else ok = TRUE; @@ -130,7 +142,7 @@ static gboolean kill_pulseaudio(gboolean* was_killed, int card, GError** err) clientconf = get_pulseaudio_client_conf(); if (!(ok = !g_file_test(clientconf, G_FILE_TEST_EXISTS))) { - g_set_error(err, 0, 0, "Cannot block PulseAudio from respawning:\n" + g_set_error(err, quark(), 0, "Cannot block PulseAudio from respawning:\n" "Please either remove '%s' or kill PulseAudio manually.", clientconf); goto cleanup; } @@ -153,7 +165,7 @@ static gboolean restore_pulseaudio(gboolean was_killed, GError** err) { gchar* clientconf = get_pulseaudio_client_conf(); if (was_killed && g_unlink(clientconf) != 0) { - g_set_error(err, 0, 0, "%s", g_strerror(errno)); + g_set_error(err, quark(), 0, "%s", g_strerror(errno)); g_free(clientconf); return FALSE; } @@ -162,7 +174,7 @@ static gboolean restore_pulseaudio(gboolean was_killed, GError** err) } gboolean apply_changes_reconfig(pin_configs_t* pins, int entries, int card, int device, - const char* model, GError** err) + const char* model, const char* hints, GError** err) { gboolean result = FALSE; // gchar* script_name = NULL; @@ -172,7 +184,7 @@ gboolean apply_changes_reconfig(pin_configs_t* pins, int entries, int card, int if (!kill_pulseaudio(&pa_killed, card, err)) goto cleanup; /* Create script */ - if (!create_reconfig_script(pins, entries, card, device, model, err)) + if (!create_reconfig_script(pins, entries, card, device, model, hints, err)) goto cleanup; /* Run script as root */ if (!run_sudo_script(scriptfile, err)) @@ -187,10 +199,10 @@ cleanup: } static gboolean create_firmware_file(pin_configs_t* pins, int entries, int card, int device, - const char* model, GError** err) + const char* model, const char* hints, GError** err) { gboolean ok; - gchar destbuf[40*40] = ""; + gchar destbuf[40*40+40*24] = ""; gchar* s = destbuf; gchar* filename = g_strdup_printf("%s/hda-jack-retask.fw", tempdir); unsigned int address, codec_vendorid, codec_ssid; @@ -216,6 +228,12 @@ static gboolean create_firmware_file(pin_configs_t* pins, int entries, int card, s+=l; } + if (hints) { + int l = g_snprintf(s, bufleft, "\n[hints]\n%s\n", hints); + bufleft-=l; + s+=l; + } + ok = g_file_set_contents(filename, destbuf, -1, err); g_free(filename); return ok; @@ -238,14 +256,14 @@ static const gchar* install_script = "mv %s/hda-jack-retask.conf /etc/modprobe.d/hda-jack-retask.conf 2>>%s\n"; gboolean apply_changes_boot(pin_configs_t* pins, int entries, int card, int device, - const char* model, GError** err) + const char* model, const char* hints, GError** err) { gchar *s; if (!ensure_tempdir(err)) return FALSE; - if (!create_firmware_file(pins, entries, card, device, model, err)) + if (!create_firmware_file(pins, entries, card, device, model, hints, err)) return FALSE; /* Create hda-jack-retask.conf */ @@ -277,7 +295,7 @@ gboolean reset_changes_boot(GError** err) if ((g_file_test("/etc/modprobe.d/hda-jack-retask.conf", G_FILE_TEST_EXISTS) == 0) && (g_file_test("/lib/firmware/hda-jack-retask.fw", G_FILE_TEST_EXISTS) == 0)) { - g_set_error(err, 0, 0, "No boot override is currently installed, nothing to remove."); + g_set_error(err, quark(), 0, "No boot override is currently installed, nothing to remove."); return FALSE; } diff --git a/hdajackretask/apply-changes.h b/hdajackretask/apply-changes.h index 2507a6a..e08d66d 100644 --- a/hdajackretask/apply-changes.h +++ b/hdajackretask/apply-changes.h @@ -5,10 +5,10 @@ #include <glib.h> gboolean apply_changes_reconfig(pin_configs_t* pins, int entries, int card, int device, - const char* model, GError** err); + const char* model, const char* hints, GError** err); gboolean apply_changes_boot(pin_configs_t* pins, int entries, int card, int device, - const char* model, GError** err); + const char* model, const char* hints, GError** err); gboolean reset_changes_boot(); #endif diff --git a/hdajackretask/main-gtk.c b/hdajackretask/main-gtk.c index 9101af4..f5ff6e4 100644 --- a/hdajackretask/main-gtk.c +++ b/hdajackretask/main-gtk.c @@ -20,6 +20,13 @@ typedef struct pin_ui_data_t { ui_data_t* owner; } pin_ui_data_t; +typedef struct hints_ui_data_t { + gboolean visible; + GtkWidget *frame; + GtkListStore *store; + gchar *values; +} hints_ui_data_t; + struct ui_data_t { GList* pin_ui_data; GtkWidget *main_window; @@ -35,6 +42,8 @@ struct ui_data_t { gboolean trust_codec; gboolean trust_defcfg; gboolean model_auto; + + hints_ui_data_t hints; }; static void update_user_pin_config(ui_data_t* ui, pin_configs_t* cfg); @@ -229,14 +238,44 @@ static void update_all_user_pin_config(ui_data_t* ui) update_user_pin_config(ui, &ui->sysfs_pins[i]); } +static gboolean update_one_hint(GtkTreeModel *model, GtkTreePath *path, + GtkTreeIter *iter, gpointer userdata) +{ + gchar *name, *value; + ui_data_t *ui = userdata; + gtk_tree_model_get(GTK_TREE_MODEL(ui->hints.store), iter, 0, &name, 1, &value, -1); + if (g_strcmp0(value, "default")) { + gchar *s = g_strconcat(name, "=", value, "\n", ui->hints.values, NULL); + g_free(ui->hints.values); + ui->hints.values = s; + } + g_free(name); + g_free(value); + return FALSE; +} + +static void update_hints(ui_data_t* ui) +{ + g_free(ui->hints.values); + ui->hints.values = NULL; + if (ui->hints.visible) + gtk_tree_model_foreach(GTK_TREE_MODEL(ui->hints.store), update_one_hint, ui); +} + +static GQuark quark() +{ + return g_quark_from_static_string("hda-jack-retask-error"); +} + static gboolean validate_user_pin_config(ui_data_t* ui, GError** err) { int i; if (!ui->current_codec) { - g_set_error(err, 0, 0, "You must first select a codec!"); + g_set_error(err, quark(), 0, "You must first select a codec!"); return FALSE; } + update_hints(ui); update_all_user_pin_config(ui); if (ui->free_overrides) return TRUE; @@ -249,21 +288,44 @@ static gboolean validate_user_pin_config(ui_data_t* ui, GError** err) if ((v & 0xf0) != 0x10) continue; if (((v & 0xf) != 0) && !find_pin_channel_match(ui->sysfs_pins, ui->sysfs_pincount, v & 0xf0)) { - g_set_error(err, 0, 0, "This surround setup also requires a \"front\" channel override."); + g_set_error(err, quark(), 0, "This surround setup also requires a \"front\" channel override."); return FALSE; } if (((v & 0xf) >= 3) && !find_pin_channel_match(ui->sysfs_pins, ui->sysfs_pincount, 2 + (v & 0xf0))) { - g_set_error(err, 0, 0, "This surround setup also requires a \"back\" channel override."); + g_set_error(err, quark(), 0, "This surround setup also requires a \"back\" channel override."); return FALSE; } if ((v & 0xf) >= 3 && !find_pin_channel_match(ui->sysfs_pins, ui->sysfs_pincount, 1 + (v & 0xf0))) { - g_set_error(err, 0, 0, "This surround setup also requires a \"Center/LFE\" channel override."); + g_set_error(err, quark(), 0, "This surround setup also requires a \"Center/LFE\" channel override."); return FALSE; } } return TRUE; } +static gboolean update_tree_one_hint(GtkTreeModel *model, GtkTreePath *path, + GtkTreeIter *iter, gpointer userdata) +{ + gchar *name; + ui_data_t *ui = userdata; + gtk_tree_model_get(GTK_TREE_MODEL(ui->hints.store), iter, 0, &name, -1); + gchar *s = strstr(ui->hints.values, name); + if (!s) { + g_free(name); + gtk_list_store_set(ui->hints.store, iter, 1, "default", -1); + return FALSE; + } + s += strlen(name); + while (*s == ' ' || *s == '=') s++; + gchar *s2 = s; + while (*s != '\n' && *s != '\0') s++; + s2 = g_strndup(s2, s - s2); + gtk_list_store_set(ui->hints.store, iter, 1, s2, -1); + g_free(s2); + g_free(name); + return FALSE; +} + static void show_action_result(ui_data_t* ui, GError* err, const gchar* ok_msg) { GtkWidget* dialog; @@ -285,7 +347,7 @@ static void apply_now_clicked(GtkButton* button, gpointer user_data) if (ok) apply_changes_reconfig(ui->sysfs_pins, ui->sysfs_pincount, ui->current_codec->card, ui->current_codec->device, - ui->model_auto ? "auto" : NULL, &err); + ui->model_auto ? "auto" : NULL, ui->hints.values, &err); show_action_result(ui, err, "Ok, now go ahead and test to see if it actually worked!\n" "(Remember, this stuff is still experimental.)"); @@ -299,8 +361,8 @@ static void apply_boot_clicked(GtkButton* button, gpointer user_data) if (ok) apply_changes_boot(ui->sysfs_pins, ui->sysfs_pincount, ui->current_codec->card, ui->current_codec->device, - ui->model_auto ? "auto" : NULL, &err); - show_action_result(ui, err, + ui->model_auto ? "auto" : NULL, ui->hints.values, &err); + show_action_result(ui, err, "Ok, now reboot to test to see if it actually worked!\n" "(Remember, this stuff is still experimental.)"); } @@ -359,15 +421,24 @@ static void update_codec_ui(ui_data_t* ui, bool codec_change) if (codec_index < 0) return; ui->current_codec = &ui->sysfs_codec_names[codec_index]; - if (codec_change) + if (codec_change) { ui->sysfs_pincount = get_pin_configs_list(ui->sysfs_pins, 32, ui->current_codec->card, ui->current_codec->device); + ui->hints.values = get_hint_overrides(ui->current_codec->card, ui->current_codec->device); + gtk_tree_model_foreach(GTK_TREE_MODEL(ui->hints.store), update_tree_one_hint, ui); + } for (i = 0; i < ui->sysfs_pincount; i++) { GtkWidget *w = create_pin_ui(ui, &ui->sysfs_pins[i]); if (w) gtk_container_add(GTK_CONTAINER(ui->content_inner_box), w); } - + gtk_widget_show_all(GTK_WIDGET(ui->content_inner_box)); + + if (ui->hints.visible) + gtk_widget_show_all(ui->hints.frame); + else + gtk_widget_hide(ui->hints.frame); + resize_main_window(ui); } @@ -394,6 +465,32 @@ static void free_override_toggled(GtkWidget* sender, ui_data_t* ui_data) update_codec_ui(ui_data, false); } +static void hints_toggled(GtkWidget* sender, ui_data_t* ui_data) +{ + ui_data->hints.visible = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sender)); + update_codec_ui(ui_data, false); +} + +static void hints_row_activated(GtkTreeView *tree_view, GtkTreePath *path, + GtkTreeViewColumn *column, ui_data_t* ui_data) +{ + GtkTreeIter iter; + gchar *value; + const gchar *newvalue = "default"; + + gtk_tree_model_get_iter(GTK_TREE_MODEL(ui_data->hints.store), &iter, path); + gtk_tree_model_get(GTK_TREE_MODEL(ui_data->hints.store), &iter, 1, &value, -1); + + if (!g_strcmp0(value, "default")) + newvalue = "yes"; + else if (!g_strcmp0(value, "yes")) + newvalue = "no"; + gtk_list_store_set(ui_data->hints.store, &iter, 1, newvalue, -1); + + g_free(value); +} + + static const char* readme_text = #include "README.generated.h" ; @@ -480,6 +577,31 @@ static ui_data_t* create_ui() gtk_box_set_child_packing(GTK_BOX(toplevel_2ndbox), frame, TRUE, TRUE, 2, GTK_PACK_START); } + /* Create hints */ + { + GtkWidget* frame = gtk_frame_new("Hints"); + ui->hints.frame = frame; + + GtkListStore *store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING); + ui->hints.store = store; + const gchar** names = get_standard_hint_names(); + for (; *names; names++) { + GtkTreeIter iter; + gtk_list_store_append(store, &iter); + gtk_list_store_set(store, &iter, 0, *names, 1, "default", -1); + } + + GtkWidget *tree = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store)); + gtk_tree_view_append_column(GTK_TREE_VIEW(tree), gtk_tree_view_column_new_with_attributes + ("Name", gtk_cell_renderer_text_new(), "text", 0, NULL)); + gtk_tree_view_append_column(GTK_TREE_VIEW(tree), gtk_tree_view_column_new_with_attributes + ("Value", gtk_cell_renderer_text_new(), "text", 1, NULL)); + g_signal_connect(tree, "row-activated", G_CALLBACK(hints_row_activated), ui); + + gtk_container_add(GTK_CONTAINER(frame), tree); + gtk_container_add(toplevel_2ndbox, frame); + } + /* Create settings */ { GtkWidget* frame = gtk_frame_new("Options"); @@ -498,6 +620,10 @@ static ui_data_t* create_ui() g_signal_connect(check, "toggled", G_CALLBACK(free_override_toggled), ui); gtk_container_add(box, check); + check = gtk_check_button_new_with_label("Parser hints"); + g_signal_connect(check, "toggled", G_CALLBACK(hints_toggled), ui); + gtk_container_add(box, check); + gtk_container_add(GTK_CONTAINER(frame), GTK_WIDGET(box)); gtk_container_add(rightside_box, frame); } diff --git a/hdajackretask/sysfs-pin-configs.c b/hdajackretask/sysfs-pin-configs.c index 5bae0f9..592ffe2 100644 --- a/hdajackretask/sysfs-pin-configs.c +++ b/hdajackretask/sysfs-pin-configs.c @@ -7,6 +7,21 @@ #include "sysfs-pin-configs.h" #include "apply-changes.h" +const gchar *hint_names[25] = { +"jack_detect", "inv_jack_detect", "trigger_sense", "inv_eapd", +"pcm_format_first", "sticky_stream", "spdif_status_reset", +"pin_amp_workaround", "single_adc_amp", "auto_mute", "auto_mic", +"line_in_auto_switch", "auto_mute_via_amp", "need_dac_fix", "primary_hp", +"multi_io", "multi_cap_vol", "inv_dmic_split", "indep_hp", +"add_stereo_mix_input", "add_jack_modes", "power_down_unused", "add_hp_mic", +"hp_mic_detect", NULL }; + +const gchar** get_standard_hint_names() +{ + return hint_names; +} + + int get_codec_name_list(codec_name_t* names, int entries) { GDir* sysdir = g_dir_open("/sys/class/sound", 0, NULL); @@ -117,6 +132,16 @@ static void get_pin_caps(pin_configs_t* pins, int entries, int card, int device) g_free(contents); } +gchar *get_hint_overrides(int card, int device) +{ + gchar* filename = g_strdup_printf("/sys/class/sound/hwC%dD%d/hints", card, device); + gchar* contents = NULL; + int ok = g_file_get_contents(filename, &contents, NULL, NULL); + g_free(filename); + if (!ok) + return NULL; + return contents; +} static void read_pin_overrides(pin_configs_t* pins, int entries, int card, int device, gboolean is_user) { @@ -126,7 +151,7 @@ static void read_pin_overrides(pin_configs_t* pins, int entries, int card, int d int count = 0; int ok = g_file_get_contents(filename, &contents, NULL, NULL); g_free(filename); - if (!ok) + if (!ok) return; line_iterator = lines = g_strsplit(contents, "\n", entries); while (count < entries && *line_iterator) { @@ -151,6 +176,7 @@ static void read_pin_overrides(pin_configs_t* pins, int entries, int card, int d g_strfreev(line); } g_strfreev(lines); + g_free(contents); } int get_pin_configs_list(pin_configs_t* pins, int entries, int card, int device) diff --git a/hdajackretask/sysfs-pin-configs.h b/hdajackretask/sysfs-pin-configs.h index 9a0a902..d198f8b 100644 --- a/hdajackretask/sysfs-pin-configs.h +++ b/hdajackretask/sysfs-pin-configs.h @@ -48,6 +48,10 @@ gchar* get_config_description(unsigned long config); gchar* get_caps_description(unsigned long pin_caps); +const gchar** get_standard_hint_names(); +gchar *get_hint_overrides(int card, int device); + + /* 0 = Jack, 1 = N/A, 2 = Internal, 3 = Both (?!) */ int get_port_conn(unsigned long config); -- 1.9.1

2 1

[alsa-devel] [PATCH] ASoC: adau1977: Fix truncation warning on 64 bit architectures
by Mark Brown 04 Aug '14

04 Aug '14

From: Mark Brown <broonie(a)linaro.org> Negating ADAU1977_BLOCK_POWER_SAI_LDO_EN creates an unsigned long constant with all bits set which on 64 bit architectures needs to be truncated to an unsigned int, generating a warning. Add an explicit cast since we know this is OK. Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/codecs/adau1977.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/adau1977.c b/sound/soc/codecs/adau1977.c index fd55da7..70ab357 100644 --- a/sound/soc/codecs/adau1977.c +++ b/sound/soc/codecs/adau1977.c @@ -968,7 +968,7 @@ int adau1977_probe(struct device *dev, struct regmap *regmap, if (adau1977->dvdd_reg) power_off_mask = ~0; else - power_off_mask = ~ADAU1977_BLOCK_POWER_SAI_LDO_EN; + power_off_mask = (unsigned int)~ADAU1977_BLOCK_POWER_SAI_LDO_EN; ret = regmap_update_bits(adau1977->regmap, ADAU1977_REG_BLOCK_POWER_SAI, power_off_mask, 0x00); -- 2.0.0

2 1

[alsa-devel] [PATCH] ASoC: rsnd: fixup SND_SOC_DAIFMT_xB_xF behavior
by Kuninori Morimoto 04 Aug '14

04 Aug '14

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> In current R-Car rsnd driver, the SND_SOC_DAIFMT_xB_xF flags are used to HW default behavior, but, it should be used to specific format. The waveforms of LEFT_J/RIGHT_J format with SND_SOC_DAIFMT_NB_NF flag will be started from "falling edge" without this patch. But, it should be started from "rising edge". Reported-by: Jun Watanabe <jun.watanabe.ue(a)renesas.com> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/sh/rcar/core.c | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index d7c6697..19f7896 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -624,40 +624,41 @@ static int rsnd_soc_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) return -EINVAL; } - /* set clock inversion */ - switch (fmt & SND_SOC_DAIFMT_INV_MASK) { - case SND_SOC_DAIFMT_NB_IF: - rdai->bit_clk_inv = 0; - rdai->frm_clk_inv = 1; - break; - case SND_SOC_DAIFMT_IB_NF: - rdai->bit_clk_inv = 1; - rdai->frm_clk_inv = 0; - break; - case SND_SOC_DAIFMT_IB_IF: - rdai->bit_clk_inv = 1; - rdai->frm_clk_inv = 1; - break; - case SND_SOC_DAIFMT_NB_NF: - default: - rdai->bit_clk_inv = 0; - rdai->frm_clk_inv = 0; - break; - } - /* set format */ switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { case SND_SOC_DAIFMT_I2S: rdai->sys_delay = 0; rdai->data_alignment = 0; + rdai->frm_clk_inv = 0; break; case SND_SOC_DAIFMT_LEFT_J: rdai->sys_delay = 1; rdai->data_alignment = 0; + rdai->frm_clk_inv = 1; break; case SND_SOC_DAIFMT_RIGHT_J: rdai->sys_delay = 1; rdai->data_alignment = 1; + rdai->frm_clk_inv = 1; + break; + } + + /* set clock inversion */ + switch (fmt & SND_SOC_DAIFMT_INV_MASK) { + case SND_SOC_DAIFMT_NB_IF: + rdai->bit_clk_inv = rdai->bit_clk_inv; + rdai->frm_clk_inv = !rdai->frm_clk_inv; + break; + case SND_SOC_DAIFMT_IB_NF: + rdai->bit_clk_inv = !rdai->bit_clk_inv; + rdai->frm_clk_inv = rdai->frm_clk_inv; + break; + case SND_SOC_DAIFMT_IB_IF: + rdai->bit_clk_inv = !rdai->bit_clk_inv; + rdai->frm_clk_inv = !rdai->frm_clk_inv; + break; + case SND_SOC_DAIFMT_NB_NF: + default: break; } -- 1.7.9.5

3 2

Re: [alsa-devel] [PATCH 1/1] cris: fix %d confusingly prefixed with 0x in format string
by Joe Perches 04 Aug '14

04 Aug '14

On Sat, 2014-08-02 at 15:20 -0700, Hans Wennborg wrote: > Signed-off-by: Hans Wennborg <hans(a)hanshq.net> > --- > arch/cris/arch-v32/drivers/cryptocop.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/cris/arch-v32/drivers/cryptocop.c b/arch/cris/arch-v32/drivers/cryptocop.c [] > @@ -3155,7 +3155,7 @@ static void print_dma_descriptors(struct cryptocop_int_operation *iop) > printk("print_dma_descriptors start\n"); > > printk("iop:\n"); > - printk("\tsid: 0x%lld\n", iop->sid); > + printk("\tsid: 0x%llx\n", iop->sid); > > printk("\tcdesc_out: 0x%p\n", iop->cdesc_out); > printk("\tcdesc_in: 0x%p\n", iop->cdesc_in); Thanks. This is a surprisingly common error: $ /usr/bin/git grep -P '0x\%(?!ull\b|ul\b|u\b|lu\b|llu\b|llux\b|lux\b|lx\b|lluX\b|luX\b|lX\b)[ul]*[ud]' arch/arm/mach-omap2/id.c: pr_warn("%s: unknown idcode=0x%08x (hawkeye=0x%08x,rev=0x%d)\n", arch/cris/arch-v32/drivers/cryptocop.c: printk("\tsid: 0x%lld\n", iop->sid); drivers/atm/eni.c: return sprintf(page,"tx[%d]: 0x%ld-0x%ld " drivers/atm/eni.c: length += sprintf(page+length,"0x%ld-0x%ld " drivers/block/DAC960.c: DAC960_Error("IO port 0x%d busy for Controller at\n", drivers/block/DAC960.c: DAC960_Error("IO port 0x%d busy for Controller at\n", drivers/block/cciss.c: dev_dbg(&h->pdev->dev, " Max outstanding commands = 0x%d\n", drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c: mfc_debug(2, "stream buf addr: 0x%08lx, size: 0x%d\n", drivers/mfd/htc-i2cpld.c: snprintf(client->name, I2C_NAME_SIZE, "Chip_0x%d", client->addr); drivers/mfd/omap-usb-host.c: "USB HOST Rev:0x%d not recognized, assuming %d ports\n", drivers/misc/sgi-gru/grumain.c: gru_dbg(grudev, "gid %d, gts %p, gms %p, ctxnum 0x%d, asidmap 0x%lx\n", drivers/net/ethernet/smsc/smc911x.c: DBG(SMC_DEBUG_MISC, dev, "phy_id1=0x%x, phy_id2=0x%x phyaddr=0x%d\n", drivers/net/wireless/ath/ath6kl/init.c: "found reserved ram size ie 0x%d\n", drivers/net/wireless/ath/ath6kl/main.c: ath6kl_err("failed to write 0x%x during diagnose window to 0x%d\n", drivers/net/wireless/iwlegacy/4965-mac.c: IL_ERR("failed setting tx power (0x%d).\n", ret); drivers/net/wireless/rtlwifi/pci.c: "more desc left, wake skb_queue@%d, ring->idx = %d, skb_queue_len = 0x%d\n", drivers/net/wireless/rtlwifi/pci.c: "No more TX desc@%d, ring->idx = %d, idx = %d, skb_queue_len = 0x%d\n", drivers/net/wireless/rtlwifi/pci.c: "less desc left, stop skb_queue@%d, ring->idx = %d, idx = %d, skb_queue_len = 0x%d\n", drivers/net/wireless/rtlwifi/rtl8192de/phy.c: "MCSTxPowerLevelOriginalOffset[%d][%d] = 0x%ulx\n", drivers/net/wireless/rtlwifi/rtl8192de/phy.c: "ver 1 set RF-A, 5G, 0x28 = 0x%ulx !!\n", u4tmp); drivers/net/wireless/rtlwifi/rtl8192de/phy.c: "ver 3 set RF-B, 2G, 0x28 = 0x%ulx !!\n", u4tmp); drivers/net/wireless/rtlwifi/rtl8192de/phy.c: "ver 3 set RF-B, 2G, 0x28 = 0x%ulx !!\n", drivers/parisc/dino.c: printk(KERN_ERR "DINO: Hey! Someone took my MMIO space (0x%ld)!\n", drivers/scsi/hpsa.c: dev_info(dev, " Max outstanding commands = 0x%d\n", drivers/staging/nokia_h4p/nokia_core.c: dev_err(info->dev, "Cannot get GPIO line 0x%d", drivers/staging/rtl8192ee/pci.c: ("more desc left, wake skb_queue@%d,ring->idx = %d, skb_queue_len = 0x%d\n", drivers/staging/rtl8192ee/pci.c: ("No more TX desc@%d, ring->idx = %d, idx = %d, skb_queue_len = 0x%d\n", drivers/staging/rtl8192ee/pci.c: ("less desc left, stop skb_queue@%d, ring->idx = %d, idx = %d, skb_queue_len = 0x%d\n", drivers/staging/rtl8821ae/pci.c: "skb_queue_len = 0x%d\n", drivers/staging/rtl8821ae/pci.c: "idx = %d, skb_queue_len = 0x%d\n", drivers/staging/rtl8821ae/pci.c: "idx = %d, skb_queue_len = 0x%d\n", fs/cifs/cifs_debug.c: "\n\tPathComponentMax: %d Status: 0x%d", fs/cifs/misc.c: cifs_dbg(FYI, "notify err 0x%d\n", fs/cifs/misc.c: cifs_dbg(FYI, "oplock type 0x%d level 0x%d\n", fs/cifs/smb2misc.c: cifs_dbg(FYI, "lease key match, lease break 0x%d\n", fs/cifs/smb2misc.c: cifs_dbg(FYI, "lease key match, lease break 0x%d\n", fs/cifs/smb2misc.c: cifs_dbg(FYI, "oplock level 0x%d\n", rsp->OplockLevel); sound/firewire/fireworks/fireworks_proc.c: "phys in grp[0x%d]: type 0x%d, count 0x%d\n", sound/firewire/fireworks/fireworks_proc.c: "phys out grps[0x%d]: type 0x%d, count 0x%d\n", sound/pci/riptide/riptide.c: snd_printdd("sent mixer %d: 0x%d 0x%d\n", num, rval, lval); sound/pci/riptide/riptide.c: snd_printdd("got mixer %d: 0x%d 0x%d\n", num, *rval, *lval);

3 5

[alsa-devel] FSL SSI 32 bit transfer (WAS Re: [RFC PATCH] ASoC: fsl-ssi: Add support for CBM_CFS 16/24 bit)
by Michael Trimarchi 04 Aug '14

04 Aug '14

Hi all I have a quick question. Do you know if 32 bit transfer on dma is suppose to work on IMX6? 32LE sample 2 channels Michael On Thu, Jul 31, 2014 at 7:09 AM, Michael Trimarchi <michael(a)amarulasolutions.com> wrote: > Hi > > Il 29/lug/2014 08:18 "Markus Pargmann" <mpa(a)pengutronix.de> ha scritto: > > >> >> Hi, >> >> On Mon, Jul 28, 2014 at 02:46:38PM +0200, Michael Trimarchi wrote: >> > Signed-off-by: Michael Trimarchi <michael(a)amarulasolutions.com> >> >> A commit description what you are doing in this patch and how your setup >> looks like would be good. >> >> > --- >> > sound/soc/fsl/fsl_ssi.c | 27 +++++++++++++++++++++++++-- >> > 1 file changed, 25 insertions(+), 2 deletions(-) >> > >> > diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c >> > index 9bfef55..743e50d 100644 >> > --- a/sound/soc/fsl/fsl_ssi.c >> > +++ b/sound/soc/fsl/fsl_ssi.c >> > @@ -724,10 +724,19 @@ static int fsl_ssi_hw_params(struct >> > snd_pcm_substream *substream, >> > regmap_update_bits(regs, CCSR_SSI_SRCCR, >> > CCSR_SSI_SxCCR_WL_MASK, >> > wl); >> > >> > - if (!fsl_ssi_is_ac97(ssi_private)) >> > + if (!fsl_ssi_is_ac97(ssi_private)) { >> > + u8 i2smode; >> > + >> > + if (ssi_private->i2s_mode == (CCSR_SSI_SCR_I2S_MODE_NORMAL >> > | >> > + CCSR_SSI_SCR_NET) && sample_size >= 24) >> >> This condition seems a bit fragile using the i2s_mode variable. >> >> I don't know about this bitclock master mode, why is this condition >> necessary, what is the difference with sample_size >= 24? >> > > I will do in better way and cleanup. Problem is how data is packed in 32 bit > sample. So 24/32 should be master but 16/32 seems a different story. It > packs like 16/16 bit. > > I will take a look during the weekend > > Michael > >> Regards, >> >> Markus >> >> > + i2smode = CCSR_SSI_SCR_I2S_MODE_MASTER; >> > + else >> > + i2smode = ssi_private->i2s_mode; >> > + >> > regmap_update_bits(regs, CCSR_SSI_SCR, >> > CCSR_SSI_SCR_NET | >> > CCSR_SSI_SCR_I2S_MODE_MASK, >> > - channels == 1 ? 0 : >> > ssi_private->i2s_mode); >> > + channels == 1 ? 0 : i2smode); >> > + } >> > >> > return 0; >> > } >> > @@ -789,6 +798,15 @@ static int _fsl_ssi_set_dai_fmt(struct >> > fsl_ssi_private *ssi_private, >> > CCSR_SSI_SxCCR_DC_MASK, >> > CCSR_SSI_SxCCR_DC(2)); >> > break; >> > + case SND_SOC_DAIFMT_CBM_CFS: >> > + ssi_private->i2s_mode |= >> > CCSR_SSI_SCR_I2S_MODE_NORMAL; >> > + regmap_update_bits(regs, CCSR_SSI_STCCR, >> > + CCSR_SSI_SxCCR_DC_MASK, >> > + CCSR_SSI_SxCCR_DC(2)); >> > + regmap_update_bits(regs, CCSR_SSI_SRCCR, >> > + CCSR_SSI_SxCCR_DC_MASK, >> > + CCSR_SSI_SxCCR_DC(2)); >> > + break; >> > case SND_SOC_DAIFMT_CBM_CFM: >> > ssi_private->i2s_mode |= >> > CCSR_SSI_SCR_I2S_MODE_SLAVE; >> > break; >> > @@ -853,6 +871,11 @@ static int _fsl_ssi_set_dai_fmt(struct >> > fsl_ssi_private *ssi_private, >> > case SND_SOC_DAIFMT_CBM_CFM: >> > scr &= ~CCSR_SSI_SCR_SYS_CLK_EN; >> > break; >> > + case SND_SOC_DAIFMT_CBM_CFS: >> > + strcr &= ~CCSR_SSI_STCR_TXDIR; >> > + strcr |= CCSR_SSI_STCR_TFDIR; >> > + scr &= ~CCSR_SSI_SCR_SYS_CLK_EN; >> > + break; >> > default: >> > return -EINVAL; >> > } >> > -- >> > 1.8.1.2 >> > >> > >> >> -- >> Pengutronix e.K. | | >> Industrial Linux Solutions |http://www.pengutronix.de/ | >> Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone:+49-5121-206917-0 | >> Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555|

1 1

[alsa-devel] ASUS Phoebus (CMI8888) HDA Support
by Vincent Lejeune 03 Aug '14

03 Aug '14

Hi, I just found this thread http://thread.gmane.org/gmane.linux.alsa.devel/116096 I'm trying to find what can make the CMI8888 not work in non single_cmd mode and it looks more and more like a DMA issue. I don't have an "iommu mode" option in my bios like Geoffrey McRae, it looks like an AMD only option, and using bigger page size/alignement constraint didnt solve the issue. However I added some code to dump the content of the rirb buffer in the update_rirb() function and I copied it below. The first command seems to be correctly handled the second time it is send to the hardware. As the AZX_DCAPS_*DELAY_RIRB doesnt change anything, I'm starting to think that the corb engine may require some delay to be processed. Is there a way to spy the dma transfer request from the device point of view ? I'd like to know when the cmi8888 request a dma read from the corb buffer and when it requests a dma write to the rirb buffer to determine if it parses the corb buffer correctly or not. In addition the first value returned is very odd : 13f68888. The pci id of the phoebus is 13f6:5011. What does the 100f0001 cmd mean ? hda-decode-verb tells me the verb is "0x0"... [ 4038.467696] snd_hda_intel 0000:01:00.1: Handle VGA-switcheroo audio client [ 4038.467723] snd_hda_intel 0000:01:00.1: irq 50 for MSI/MSI-X [ 4038.467836] snd_hda_intel 0000:02:00.0: Disabling MSI [ 4038.469852] snd_hda_intel 0000:01:00.1: Pointers values : rirblbase : ffff8800, corbbase : ffff8000 [ 4038.469887] snd_hda_intel 0000:01:00.1: no codecs initialized [ 4038.471618] snd_hda_intel 0000:02:00.0: Pointers values : rirblbase : ffff7800, corbbase : ffff7000 [ 4038.471721] snd_hda_intel 0000:02:00.0: corb write @ 1 value 100f0000 [ 4038.471780] snd_hda_intel 0000:02:00.0: rirb content @ 0 : 0 0 [ 4038.471782] snd_hda_intel 0000:02:00.0: rirb content @ 1 : 0 0 ... lots of 0 0 ... [ 4038.471968] snd_hda_intel 0000:02:00.0: rirb content @ 254 : 0 0 [ 4038.471968] snd_hda_intel 0000:02:00.0: rirb content @ 255 : 0 0 [ 4038.471969] snd_hda_intel 0000:02:00.0: rirb pos 1 : 0 0 [ 4038.471970] snd_hda_intel 0000:02:00.0: spurious response 0x0:0x0, rp = 1, wp = 1 [ 4038.471971] ------------[ cut here ]------------ [ 4038.471973] WARNING: CPU: 0 PID: 0 at sound/pci/hda/hda_controller.c:1212 azx_update_rirb+0x1a5/0x220 [snd_hda_controller]() [ 4038.471974] BUG? [ 4038.471974] Modules linked in: snd_hda_intel snd_hda_controller snd_hda_codec_generic snd_hda_codec snd_hwdep snd_pcm nls_utf8 isofs fuse ip6t_rpfilter bnep bluetooth ip6t_REJECT cfg80211 xt_conntrack rfkill ebtable_nat ebtable_broute bridge stp llc ebtable_filter ebtables ip6table_nat nf_conntrack_ipv6 nf_defrag_ipv6 nf_nat_ipv6 ip6table_mangle ip6table_security ip6table_raw ip6table_filter ip6_tables iptable_nat nf_conntrack_ipv4 nf_defrag_ipv4 nf_nat_ipv4 nf_nat nf_conntrack iptable_mangle iptable_security iptable_raw x86_pkg_temp_thermal coretemp kvm_intel vfat fat uas kvm usb_storage mxm_wmi snd_seq snd_seq_device crct10dif_pclmul crc32_pclmul crc32c_intel joydev snd_timer ghash_clmulni_intel mei_me snd mei microcode serio_raw pcspkr soundcore shpchp wmi video i2c_hid dw_dmac dw_dmac_core i2c_designware_platform [ 4038.471995] acpi_pad i2c_designware_core radeon i2c_algo_bit drm_kms_helper ttm drm sdhci_acpi sdhci mmc_core alx i2c_core mdio [last unloaded: snd_hda_controller] [ 4038.472001] CPU: 0 PID: 0 Comm: swapper/0 Tainted: G W 3.16.0-rc4+ #2 [ 4038.472001] Hardware name: Gigabyte Technology Co., Ltd. G1.Sniper Z97/G1.Sniper Z97, BIOS F6 05/30/2014 [ 4038.472002] 0000000000000000 92922082461d2d28 ffff88021ec03d90 ffffffff816ff2e2 [ 4038.472003] ffff88021ec03dd8 ffff88021ec03dc8 ffffffff8108bead ffff8800d79d3800 [ 4038.472005] 0000000000000000 0000000000000001 0000000000000000 0000000000000000 [ 4038.472006] Call Trace: [ 4038.472007] <IRQ> [<ffffffff816ff2e2>] dump_stack+0x45/0x56 [ 4038.472013] [<ffffffff8108bead>] warn_slowpath_common+0x7d/0xa0 [ 4038.472014] [<ffffffff8108bf2c>] warn_slowpath_fmt+0x5c/0x80 [ 4038.472016] [<ffffffffa0304645>] azx_update_rirb+0x1a5/0x220 [snd_hda_controller] [ 4038.472017] [<ffffffffa03048c9>] azx_interrupt+0x179/0x1c0 [snd_hda_controller] [ 4038.472020] [<ffffffff810e697e>] handle_irq_event_percpu+0x3e/0x1a0 [ 4038.472021] [<ffffffff810e6b16>] handle_irq_event+0x36/0x60 [ 4038.472023] [<ffffffff810e9ebc>] handle_fasteoi_irq+0x7c/0x140 [ 4038.472026] [<ffffffff81015eff>] handle_irq+0xbf/0x150 [ 4038.472029] [<ffffffff810b33fa>] ? atomic_notifier_call_chain+0x1a/0x20 [ 4038.472032] [<ffffffff8170968f>] do_IRQ+0x4f/0xf0 [ 4038.472033] [<ffffffff8170746d>] common_interrupt+0x6d/0x6d [ 4038.472033] <EOI> [<ffffffff81597792>] ? cpuidle_enter_state+0x52/0xc0 [ 4038.472037] [<ffffffff815978b7>] cpuidle_enter+0x17/0x20 [ 4038.472039] [<ffffffff810d3035>] cpu_startup_entry+0x315/0x440 [ 4038.472042] [<ffffffff816f1427>] rest_init+0x77/0x80 [ 4038.472045] [<ffffffff81d280e1>] start_kernel+0x465/0x486 [ 4038.472046] [<ffffffff81d27a85>] ? set_init_arg+0x53/0x53 [ 4038.472048] [<ffffffff81d27120>] ? early_idt_handlers+0x120/0x120 [ 4038.472049] [<ffffffff81d275ee>] x86_64_start_reservations+0x2a/0x2c [ 4038.472050] [<ffffffff81d2773d>] x86_64_start_kernel+0x14d/0x170 [ 4038.472051] ---[ end trace 63c0b6054db2a1ea ]--- [ 4039.472815] snd_hda_intel 0000:02:00.0: Codec #1 probe error; disabling it... [ 4039.477032] snd_hda_intel 0000:02:00.0: Pointers values : rirblbase : ffff7800, corbbase : ffff7000 [ 4039.477038] snd_hda_intel 0000:02:00.0: corb write @ 1 value 100f0000 [ 4039.477113] snd_hda_intel 0000:02:00.0: rirb content @ 0 : 0 0 [ 4039.477115] snd_hda_intel 0000:02:00.0: rirb content @ 1 : 13f68888 1 [ 4039.477116] snd_hda_intel 0000:02:00.0: rirb content @ 2 : 0 0 [ 4039.477117] snd_hda_intel 0000:02:00.0: rirb content @ 3 : 0 0 ... lots of 0 0 ... [ 4039.477306] snd_hda_intel 0000:02:00.0: rirb content @ 254 : 0 0 [ 4039.477307] snd_hda_intel 0000:02:00.0: rirb content @ 255 : 0 0 [ 4039.477308] snd_hda_intel 0000:02:00.0: rirb pos 1 : 13f68888 1 [ 4039.477318] snd_hda_intel 0000:02:00.0: corb write @ 2 value 100f0001 [ 4039.477373] snd_hda_intel 0000:02:00.0: rirb content @ 0 : 0 0 [ 4039.477374] snd_hda_intel 0000:02:00.0: rirb content @ 1 : 13f68888 1 [ 4039.477375] snd_hda_intel 0000:02:00.0: rirb content @ 2 : 0 0 [ 4039.477376] snd_hda_intel 0000:02:00.0: rirb content @ 3 : 0 0 ... lots of 0 0 ... [ 4039.477568] snd_hda_intel 0000:02:00.0: rirb content @ 253 : 0 0 [ 4039.477568] snd_hda_intel 0000:02:00.0: rirb content @ 254 : 0 0 [ 4039.477569] snd_hda_intel 0000:02:00.0: rirb content @ 255 : 0 0 [ 4039.477570] snd_hda_intel 0000:02:00.0: rirb pos 2 : 0 0 [ 4039.477571] snd_hda_intel 0000:02:00.0: spurious response 0x0:0x0, rp = 2, wp = 2 [ 4039.477572] ------------[ cut here ]------------ [ 4039.477575] WARNING: CPU: 0 PID: 0 at sound/pci/hda/hda_controller.c:1212 azx_update_rirb+0x1a5/0x220 [snd_hda_controller]() [ 4039.477576] BUG? [ 4039.477576] Modules linked in: snd_hda_intel snd_hda_controller snd_hda_codec_generic snd_hda_codec snd_hwdep snd_pcm nls_utf8 isofs fuse ip6t_rpfilter bnep bluetooth ip6t_REJECT cfg80211 xt_conntrack rfkill ebtable_nat ebtable_broute bridge stp llc ebtable_filter ebtables ip6table_nat nf_conntrack_ipv6 nf_defrag_ipv6 nf_nat_ipv6 ip6table_mangle ip6table_security ip6table_raw ip6table_filter ip6_tables iptable_nat nf_conntrack_ipv4 nf_defrag_ipv4 nf_nat_ipv4 nf_nat nf_conntrack iptable_mangle iptable_security iptable_raw x86_pkg_temp_thermal coretemp kvm_intel vfat fat uas kvm usb_storage mxm_wmi snd_seq snd_seq_device crct10dif_pclmul crc32_pclmul crc32c_intel joydev snd_timer ghash_clmulni_intel mei_me snd mei microcode serio_raw pcspkr soundcore shpchp wmi video i2c_hid dw_dmac dw_dmac_core i2c_designware_platform [ 4039.477599] acpi_pad i2c_designware_core radeon i2c_algo_bit drm_kms_helper ttm drm sdhci_acpi sdhci mmc_core alx i2c_core mdio [last unloaded: snd_hda_controller] [ 4039.477605] CPU: 0 PID: 0 Comm: swapper/0 Tainted: G W 3.16.0-rc4+ #2 [ 4039.477606] Hardware name: Gigabyte Technology Co., Ltd. G1.Sniper Z97/G1.Sniper Z97, BIOS F6 05/30/2014 [ 4039.477607] 0000000000000000 92922082461d2d28 ffff88021ec03d90 ffffffff816ff2e2 [ 4039.477608] ffff88021ec03dd8 ffff88021ec03dc8 ffffffff8108bead ffff8800d79d3800 [ 4039.477609] 0000000000000000 0000000000000002 0000000000000000 0000000000000000 [ 4039.477611] Call Trace: [ 4039.477612] <IRQ> [<ffffffff816ff2e2>] dump_stack+0x45/0x56 [ 4039.477617] [<ffffffff8108bead>] warn_slowpath_common+0x7d/0xa0 [ 4039.477619] [<ffffffff8108bf2c>] warn_slowpath_fmt+0x5c/0x80 [ 4039.477620] [<ffffffffa0304645>] azx_update_rirb+0x1a5/0x220 [snd_hda_controller] [ 4039.477622] [<ffffffffa03048c9>] azx_interrupt+0x179/0x1c0 [snd_hda_controller] [ 4039.477624] [<ffffffff810e697e>] handle_irq_event_percpu+0x3e/0x1a0 [ 4039.477626] [<ffffffff810e6b16>] handle_irq_event+0x36/0x60 [ 4039.477628] [<ffffffff810e9ebc>] handle_fasteoi_irq+0x7c/0x140 [ 4039.477631] [<ffffffff81015eff>] handle_irq+0xbf/0x150 [ 4039.477633] [<ffffffff810b33fa>] ? atomic_notifier_call_chain+0x1a/0x20 [ 4039.477636] [<ffffffff8170968f>] do_IRQ+0x4f/0xf0 [ 4039.477637] [<ffffffff8170746d>] common_interrupt+0x6d/0x6d [ 4039.477638] <EOI> [<ffffffff81597792>] ? cpuidle_enter_state+0x52/0xc0 [ 4039.477641] [<ffffffff815978b7>] cpuidle_enter+0x17/0x20 [ 4039.477643] [<ffffffff810d3035>] cpu_startup_entry+0x315/0x440 [ 4039.477646] [<ffffffff816f1427>] rest_init+0x77/0x80 [ 4039.477649] [<ffffffff81d280e1>] start_kernel+0x465/0x486 [ 4039.477651] [<ffffffff81d27a85>] ? set_init_arg+0x53/0x53 [ 4039.477652] [<ffffffff81d27120>] ? early_idt_handlers+0x120/0x120 [ 4039.477654] [<ffffffff81d275ee>] x86_64_start_reservations+0x2a/0x2c [ 4039.477655] [<ffffffff81d2773d>] x86_64_start_kernel+0x14d/0x170 [ 4039.477656] ---[ end trace 63c0b6054db2a1eb ]--- Regards,Vincent

1 0

[alsa-devel] [PATCH] ARM: sun7i: Fix HDMI Audio driver's Alsa interface and do 8CH IEC60958 output
by thomas schorpp 03 Aug '14

03 Aug '14

Version 0.2 -Fix PCM Name -Free up to 8 dma buffers -Alsa driver frontend incomplete? FIXME speaker-test -c8 succeds with output of 6ch, sides are dead and channels are mismapped by center=RL, LFE=RR on my (half broken) receiver in MCH PCM mode. speaker-test -c6 fails with tone frequency doubled, don't use, You may kill your tweeters or amps with up to 40Khz input. Try setup with a respective asound.conf and load an alsa-card module with the correct parameters in Pulseaudio par config file, see ALSA and Pulseaudio docs for more information, suggest the known channel remapping configs for CM106 7.1 chip headsets as example. Signed-off-by: thomas.schorpp(a)gmail.com ----------- https://github.com/linux-sunxi/linux-sunxi * stage/sunxi-3.4 diff --git a/drivers/video/sunxi/hdmi/drv_hdmi.c b/drivers/video/sunxi/hdmi/drv_hdmi.c index 283d2ae..9cf2cc2 100644 --- a/drivers/video/sunxi/hdmi/drv_hdmi.c +++ b/drivers/video/sunxi/hdmi/drv_hdmi.c @@ -314,7 +314,7 @@ __s32 Hdmi_init(struct platform_device *dev) if (err) return err; - audio_info.channel_num = 2; + audio_info.channel_num = 8; #if 0 { /* for audio test */ hdmi_audio_t audio_para; diff --git a/sound/soc/sunxi/hdmiaudio/sndhdmi.c b/sound/soc/sunxi/hdmiaudio/sndhdmi.c index 1c306d2..4563010 100644 --- a/sound/soc/sunxi/hdmiaudio/sndhdmi.c +++ b/sound/soc/sunxi/hdmiaudio/sndhdmi.c @@ -85,7 +85,9 @@ static int sndhdmi_hw_params(struct snd_pcm_substream *substream, return -EINVAL; } - if (4 == hdmi_para.channel_num) + if (2 < hdmi_para.channel_num) + hdmi_para.channel_num = 8; + if (2 > hdmi_para.channel_num) hdmi_para.channel_num = 2; g_hdmi_func.hdmi_set_audio_para(&hdmi_para); @@ -129,11 +131,11 @@ struct snd_soc_dai_ops sndhdmi_dai_ops = { /* codec dai */ struct snd_soc_dai_driver sndhdmi_dai = { .name = "sndhdmi", - /* playback capabilities */ + /* playback capabilities, hdmi_core::audio_config() claims 8ch cap */ .playback = { .stream_name = "Playback", - .channels_min = 1, - .channels_max = 2, + .channels_min = 2, + .channels_max = 8, .rates = SNDHDMI_RATES, .formats = SNDHDMI_FORMATS, }, diff --git a/sound/soc/sunxi/hdmiaudio/sunxi-hdmiaudio.c b/sound/soc/sunxi/hdmiaudio/sunxi-hdmiaudio.c index 12da1a6..80dd3b9 100644 --- a/sound/soc/sunxi/hdmiaudio/sunxi-hdmiaudio.c +++ b/sound/soc/sunxi/hdmiaudio/sunxi-hdmiaudio.c @@ -34,8 +34,8 @@ #include <plat/sys_config.h> #include <plat/dma_compat.h> -static struct sunxi_dma_params sunxi_hdmiaudio_pcm_stereo_out = { - .client.name = "HDMIAUDIO PCM Stereo out", +static struct sunxi_dma_params sunxi_hdmiaudio_pcm_iec60958_out = { + .client.name = "HDMIAUDIO PCM IEC60958 out", #if defined CONFIG_ARCH_SUN4I || defined CONFIG_ARCH_SUN5I .channel = DMACH_HDMIAUDIO, #endif @@ -67,7 +67,7 @@ static int sunxi_hdmiaudio_hw_params(struct snd_pcm_substream *substream, rtd = substream->private_data; if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) - dma_data = &sunxi_hdmiaudio_pcm_stereo_out; + dma_data = &sunxi_hdmiaudio_pcm_iec60958_out; else printk("error:hdmiaudio can't support capture:%s,line:%d\n", __func__, __LINE__); @@ -182,8 +182,8 @@ static struct snd_soc_dai_driver sunxi_hdmiaudio_dai = { .resume = sunxi_hdmiaudio_resume, .remove = sunxi_hdmiaudio_dai_remove, .playback = { - .channels_min = 1, - .channels_max = 2, + .channels_min = 2, + .channels_max = 8, .rates = SUNXI_HDMI_RATES, .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE, }, diff --git a/sound/soc/sunxi/hdmiaudio/sunxi-hdmipcm.c b/sound/soc/sunxi/hdmiaudio/sunxi-hdmipcm.c index 4916b51..3266061 100644 --- a/sound/soc/sunxi/hdmiaudio/sunxi-hdmipcm.c +++ b/sound/soc/sunxi/hdmiaudio/sunxi-hdmipcm.c @@ -45,8 +45,8 @@ static const struct snd_pcm_hardware sunxi_pcm_hardware = { SNDRV_PCM_RATE_KNOT, .rate_min = 8000, .rate_max = 192000, - .channels_min = 1, - .channels_max = 2, + .channels_min = 2, + .channels_max = 8, .buffer_bytes_max = 128*1024, /* value must be (2^n)Kbyte size */ .period_bytes_min = 1024*4, .period_bytes_max = 1024*32, @@ -347,7 +347,7 @@ static void sunxi_pcm_free_dma_buffers(struct snd_pcm *pcm) struct snd_dma_buffer *buf; struct snd_pcm_substream *substream; - for (stream = 0; stream < 2; stream++) { + for (stream = 0; stream < 8; stream++) { substream = pcm->streams[stream].substream; if (!substream) continue; @@ -375,6 +375,8 @@ static int sunxi_pcm_new(struct snd_soc_pcm_runtime *rtd) if (!card->dev->coherent_dma_mask) card->dev->coherent_dma_mask = 0xffffffff; + strcpy(rtd->pcm->name, "sunxi HDMI PCM"); + if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) { ret = sunxi_pcm_preallocate_dma_buffer(pcm, SNDRV_PCM_STREAM_PLAYBACK);

1 0

[alsa-devel] [PATCH] sound/usb/mixer.c: fix dmesg source grepability
by Michał Mirosław 03 Aug '14

03 Aug '14

This fixes messages from commit 80acefff3bc7bd53d46c16c683ab66c0ece20810. Signed-off-by: Michał Miroslaw <mirq-linux(a)rere.qmqm.pl> --- sound/usb/mixer.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index d40a285..a278b82 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -1305,13 +1305,13 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc, * devices. It will definitively catch all buggy Logitech devices. */ if (range > 384) { - usb_audio_warn(state->chip, "Warning! Unlikely big " - "volume range (=%u), cval->res is probably wrong.", - range); - usb_audio_warn(state->chip, "[%d] FU [%s] ch = %d, " - "val = %d/%d/%d", cval->id, - kctl->id.name, cval->channels, - cval->min, cval->max, cval->res); + usb_audio_warn(state->chip, + "Warning! Unlikely big volume range (=%u), cval->res is probably wrong.", + range); + usb_audio_warn(state->chip, + "[%d] FU [%s] ch = %d, val = %d/%d/%d", + cval->id, kctl->id.name, cval->channels, + cval->min, cval->max, cval->res); } usb_audio_dbg(state->chip, "[%d] FU [%s] ch = %d, val = %d/%d/%d\n", -- 2.0.1

2 2

[alsa-devel] Advanced Gtk+ Sequencer Version 0.4.0
by Joël Krähemann 02 Aug '14

02 Aug '14

Hi everybody out there, I'm proud to announce the current release of Advanced Gtk+ Sequencer Version 0.4.0 http://ags.sf.net kind regards Joël

1 0