Pull sound fixes from Takashi Iwai: "This update contains a slightly hight amount of changes due to the pending ASoC fixes: - ALSA timer core got a couple of fixes for races between read and ioctl, leading to potential read of uninitialized kmalloced memory - ASoC core fixed the de-registration pattern for use-after-free bug - The rewrite of probe code in ASoC Intel Skylake for i915 component - ASoC R-snd got a series of fixes for SSI - ASoC simple-card, atmel, da7213, and rt286 trivial fixes - HD-audio ALC269 quirk and rearrangement of quirk table" * tag 'sound-4.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ALSA: timer: Fix missing queue indices reset at SNDRV_TIMER_IOCTL_SELECT ALSA: timer: Fix race between read and ioctl ALSA: hda/realtek - Reorder ALC269 ASUS quirk entries ALSA: hda/realtek: Fix mic and headset jack sense on Asus X705UD ASoC: rsnd: fixup parent_clk_name of AUDIO_CLKOUTx ASoC: Intel: Skylake: Fix to parse consecutive string tkns in manifest ASoC: Intel: Skylake: Fix IPC rx_list corruption ASoC: rsnd: SSI PIO adjust to 24bit mode MAINTAINERS: Update email address for patches to Wolfson parts ASoC: Fix use-after-free at card unregistration ASoC: simple-card: fix mic jack initialization ASoC: rsnd: don't call free_irq() on Parent SSI ASoC: atmel-classd: sync regcache when resuming ASoC: rsnd: don't use PDTA bit for 24bit on SSI ASoC: da7213: Fix incorrect usage of bitwise '&' operator for SRM check rt286: add Thinkpad Helix 2 to force_combo_jack_table ASoC: Intel: Skylake: Move i915 registration to worker thread
Unified · Split
| @@ -13861,7 +13861,7 @@ S: Odd fixes · 13860 unmodified lines | ||
| 13861 | 13861 | F: drivers/net/wireless/wl3501* |
| 13862 | 13862 | |
| 13863 | 13863 | WOLFSON MICROELECTRONICS DRIVERS |
| 13864 | −L: patches@opensource.wolfsonmicro.com | |
| 13864 | +L: patches@opensource.cirrus.com | |
| 13865 | 13865 | T: git https://github.com/CirrusLogic/linux-drivers.git |
| 13866 | 13866 | W: https://github.com/CirrusLogic/linux-drivers/wiki |
| 13867 | 13867 | S: Supported |
| @@ -1618,6 +1618,7 @@ static int snd_timer_user_tselect(struct file *file, · 1617 unmodified lines | ||
| 1618 | 1618 | if (err < 0) |
| 1619 | 1619 | goto __err; |
| 1620 | 1620 | |
| 1621 | + tu->qhead = tu->qtail = tu->qused = 0; | |
| 1621 | 1622 | kfree(tu->queue); |
| 1622 | 1623 | tu->queue = NULL; |
| 1623 | 1624 | kfree(tu->tqueue); |
| @@ -1959,6 +1960,7 @@ static ssize_t snd_timer_user_read(struct file *file, char __user *buffer, · 335 unmodified lines | ||
| 1959 | 1960 | |
| 1960 | 1961 | tu = file->private_data; |
| 1961 | 1962 | unit = tu->tread ? sizeof(struct snd_timer_tread) : sizeof(struct snd_timer_read); |
| 1963 | + mutex_lock(&tu->ioctl_lock); | |
| 1962 | 1964 | spin_lock_irq(&tu->qlock); |
| 1963 | 1965 | while ((long)count - result >= unit) { |
| 1964 | 1966 | while (!tu->qused) { |
| @@ -1974,7 +1976,9 @@ static ssize_t snd_timer_user_read(struct file *file, char __user *buffer, · 9 unmodified lines | ||
| 1974 | 1976 | add_wait_queue(&tu->qchange_sleep, &wait); |
| 1975 | 1977 | |
| 1976 | 1978 | spin_unlock_irq(&tu->qlock); |
| 1979 | + mutex_unlock(&tu->ioctl_lock); | |
| 1977 | 1980 | schedule(); |
| 1981 | + mutex_lock(&tu->ioctl_lock); | |
| 1978 | 1982 | spin_lock_irq(&tu->qlock); |
| 1979 | 1983 | |
| 1980 | 1984 | remove_wait_queue(&tu->qchange_sleep, &wait); |
| @@ -1994,7 +1998,6 @@ static ssize_t snd_timer_user_read(struct file *file, char __user *buffer, · 13 unmodified lines | ||
| 1994 | 1998 | tu->qused--; |
| 1995 | 1999 | spin_unlock_irq(&tu->qlock); |
| 1996 | 2000 | |
| 1997 | − mutex_lock(&tu->ioctl_lock); | |
| 1998 | 2001 | if (tu->tread) { |
| 1999 | 2002 | if (copy_to_user(buffer, &tu->tqueue[qhead], |
| 2000 | 2003 | sizeof(struct snd_timer_tread))) |
| @@ -2004,7 +2007,6 @@ static ssize_t snd_timer_user_read(struct file *file, char __user *buffer, · 3 unmodified lines | ||
| 2004 | 2007 | sizeof(struct snd_timer_read))) |
| 2005 | 2008 | err = -EFAULT; |
| 2006 | 2009 | } |
| 2007 | − mutex_unlock(&tu->ioctl_lock); | |
| 2008 | 2010 | |
| 2009 | 2011 | spin_lock_irq(&tu->qlock); |
| 2010 | 2012 | if (err < 0) |
| @@ -2014,6 +2016,7 @@ static ssize_t snd_timer_user_read(struct file *file, char __user *buffer, · 3 unmodified lines | ||
| 2014 | 2016 | } |
| 2015 | 2017 | _error: |
| 2016 | 2018 | spin_unlock_irq(&tu->qlock); |
| 2019 | + mutex_unlock(&tu->ioctl_lock); | |
| 2017 | 2020 | return result > 0 ? result : err; |
| 2018 | 2021 | } |
| 2019 | 2022 | |
| @@ -5854,7 +5854,11 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { · 5853 unmodified lines | ||
| 5854 | 5854 | SND_PCI_QUIRK(0x1043, 0x103f, "ASUS TX300", ALC282_FIXUP_ASUS_TX300), |
| 5855 | 5855 | SND_PCI_QUIRK(0x1043, 0x106d, "Asus K53BE", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), |
| 5856 | 5856 | SND_PCI_QUIRK(0x1043, 0x10c0, "ASUS X540SA", ALC256_FIXUP_ASUS_MIC), |
| 5857 | + SND_PCI_QUIRK(0x1043, 0x10d0, "ASUS X540LA/X540LJ", ALC255_FIXUP_ASUS_MIC_NO_PRESENCE), | |
| 5857 | 5858 | SND_PCI_QUIRK(0x1043, 0x115d, "Asus 1015E", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), |
| 5859 | + SND_PCI_QUIRK(0x1043, 0x11c0, "ASUS X556UR", ALC255_FIXUP_ASUS_MIC_NO_PRESENCE), | |
| 5860 | + SND_PCI_QUIRK(0x1043, 0x1290, "ASUS X441SA", ALC233_FIXUP_EAPD_COEF_AND_MIC_NO_PRESENCE), | |
| 5861 | + SND_PCI_QUIRK(0x1043, 0x12a0, "ASUS X441UV", ALC233_FIXUP_EAPD_COEF_AND_MIC_NO_PRESENCE), | |
| 5858 | 5862 | SND_PCI_QUIRK(0x1043, 0x12f0, "ASUS X541UV", ALC256_FIXUP_ASUS_MIC), |
| 5859 | 5863 | SND_PCI_QUIRK(0x1043, 0x12e0, "ASUS X541SA", ALC256_FIXUP_ASUS_MIC), |
| 5860 | 5864 | SND_PCI_QUIRK(0x1043, 0x13b0, "ASUS Z550SA", ALC256_FIXUP_ASUS_MIC), |
| @@ -5862,13 +5866,10 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { · 1 unmodified line | ||
| 5862 | 5866 | SND_PCI_QUIRK(0x1043, 0x1517, "Asus Zenbook UX31A", ALC269VB_FIXUP_ASUS_ZENBOOK_UX31A), |
| 5863 | 5867 | SND_PCI_QUIRK(0x1043, 0x16e3, "ASUS UX50", ALC269_FIXUP_STEREO_DMIC), |
| 5864 | 5868 | SND_PCI_QUIRK(0x1043, 0x1a13, "Asus G73Jw", ALC269_FIXUP_ASUS_G73JW), |
| 5869 | + SND_PCI_QUIRK(0x1043, 0x1a30, "ASUS X705UD", ALC256_FIXUP_ASUS_MIC), | |
| 5865 | 5870 | SND_PCI_QUIRK(0x1043, 0x1b13, "Asus U41SV", ALC269_FIXUP_INV_DMIC), |
| 5866 | − SND_PCI_QUIRK(0x1043, 0x1c23, "Asus X55U", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), | |
| 5867 | 5871 | SND_PCI_QUIRK(0x1043, 0x1bbd, "ASUS Z550MA", ALC255_FIXUP_ASUS_MIC_NO_PRESENCE), |
| 5868 | − SND_PCI_QUIRK(0x1043, 0x10d0, "ASUS X540LA/X540LJ", ALC255_FIXUP_ASUS_MIC_NO_PRESENCE), | |
| 5869 | − SND_PCI_QUIRK(0x1043, 0x11c0, "ASUS X556UR", ALC255_FIXUP_ASUS_MIC_NO_PRESENCE), | |
| 5870 | − SND_PCI_QUIRK(0x1043, 0x1290, "ASUS X441SA", ALC233_FIXUP_EAPD_COEF_AND_MIC_NO_PRESENCE), | |
| 5871 | − SND_PCI_QUIRK(0x1043, 0x12a0, "ASUS X441UV", ALC233_FIXUP_EAPD_COEF_AND_MIC_NO_PRESENCE), | |
| 5872 | + SND_PCI_QUIRK(0x1043, 0x1c23, "Asus X55U", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), | |
| 5872 | 5873 | SND_PCI_QUIRK(0x1043, 0x1ccd, "ASUS X555UB", ALC256_FIXUP_ASUS_MIC), |
| 5873 | 5874 | SND_PCI_QUIRK(0x1043, 0x3030, "ASUS ZN270IE", ALC256_FIXUP_ASUS_AIO_GPIO2), |
| 5874 | 5875 | SND_PCI_QUIRK(0x1043, 0x831a, "ASUS P901", ALC269_FIXUP_STEREO_DMIC), |
| @@ -301,6 +301,14 @@ static int atmel_classd_codec_probe(struct snd_soc_codec *codec) · 300 unmodified lines | ||
| 301 | 301 | return 0; |
| 302 | 302 | } |
| 303 | 303 | |
| 304 | +static int atmel_classd_codec_resume(struct snd_soc_codec *codec) | |
| 305 | +{ | |
| 306 | + struct snd_soc_card *card = snd_soc_codec_get_drvdata(codec); | |
| 307 | + struct atmel_classd *dd = snd_soc_card_get_drvdata(card); | |
| 308 | + | |
| 309 | + return regcache_sync(dd->regmap); | |
| 310 | +} | |
| 311 | + | |
| 304 | 312 | static struct regmap *atmel_classd_codec_get_remap(struct device *dev) |
| 305 | 313 | { |
| 306 | 314 | return dev_get_regmap(dev, NULL); |
| @@ -308,6 +316,7 @@ static struct regmap *atmel_classd_codec_get_remap(struct device *dev) · 1 unmodified line | ||
| 308 | 316 | |
| 309 | 317 | static struct snd_soc_codec_driver soc_codec_dev_classd = { |
| 310 | 318 | .probe = atmel_classd_codec_probe, |
| 319 | + .resume = atmel_classd_codec_resume, | |
| 311 | 320 | .get_regmap = atmel_classd_codec_get_remap, |
| 312 | 321 | .component_driver = { |
| 313 | 322 | .controls = atmel_classd_snd_controls, |
| @@ -772,7 +772,7 @@ static int da7213_dai_event(struct snd_soc_dapm_widget *w, · 771 unmodified lines | ||
| 772 | 772 | ++i; |
| 773 | 773 | msleep(50); |
| 774 | 774 | } |
| 775 | − } while ((i < DA7213_SRM_CHECK_RETRIES) & (!srm_lock)); | |
| 775 | + } while ((i < DA7213_SRM_CHECK_RETRIES) && (!srm_lock)); | |
| 776 | 776 | |
| 777 | 777 | if (!srm_lock) |
| 778 | 778 | dev_warn(codec->dev, "SRM failed to lock\n"); |
| @@ -1108,6 +1108,13 @@ static const struct dmi_system_id force_combo_jack_table[] = { · 1107 unmodified lines | ||
| 1108 | 1108 | DMI_MATCH(DMI_PRODUCT_NAME, "Kabylake Client platform") |
| 1109 | 1109 | } |
| 1110 | 1110 | }, |
| 1111 | + { | |
| 1112 | + .ident = "Thinkpad Helix 2nd", | |
| 1113 | + .matches = { | |
| 1114 | + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), | |
| 1115 | + DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad Helix 2nd") | |
| 1116 | + } | |
| 1117 | + }, | |
| 1111 | 1118 | |
| 1112 | 1119 | { } |
| 1113 | 1120 | }; |
| @@ -202,7 +202,7 @@ static int asoc_simple_card_dai_init(struct snd_soc_pcm_runtime *rtd) · 201 unmodified lines | ||
| 202 | 202 | if (ret < 0) |
| 203 | 203 | return ret; |
| 204 | 204 | |
| 205 | − ret = asoc_simple_card_init_mic(rtd->card, &priv->hp_jack, PREFIX); | |
| 205 | + ret = asoc_simple_card_init_mic(rtd->card, &priv->mic_jack, PREFIX); | |
| 206 | 206 | if (ret < 0) |
| 207 | 207 | return ret; |
| 208 | 208 | |
| @@ -413,8 +413,11 @@ static void skl_ipc_process_reply(struct sst_generic_ipc *ipc, · 412 unmodified lines | ||
| 413 | 413 | u32 reply = header.primary & IPC_GLB_REPLY_STATUS_MASK; |
| 414 | 414 | u64 *ipc_header = (u64 *)(&header); |
| 415 | 415 | struct skl_sst *skl = container_of(ipc, struct skl_sst, ipc); |
| 416 | + unsigned long flags; | |
| 416 | 417 | |
| 418 | + spin_lock_irqsave(&ipc->dsp->spinlock, flags); | |
| 417 | 419 | msg = skl_ipc_reply_get_msg(ipc, *ipc_header); |
| 420 | + spin_unlock_irqrestore(&ipc->dsp->spinlock, flags); | |
| 418 | 421 | if (msg == NULL) { |
| 419 | 422 | dev_dbg(ipc->dev, "ipc: rx list is empty\n"); |
| 420 | 423 | return; |
| @@ -456,8 +459,10 @@ static void skl_ipc_process_reply(struct sst_generic_ipc *ipc, · 35 unmodified lines | ||
| 456 | 459 | } |
| 457 | 460 | } |
| 458 | 461 | |
| 462 | + spin_lock_irqsave(&ipc->dsp->spinlock, flags); | |
| 459 | 463 | list_del(&msg->list); |
| 460 | 464 | sst_ipc_tx_msg_reply_complete(ipc, msg); |
| 465 | + spin_unlock_irqrestore(&ipc->dsp->spinlock, flags); | |
| 461 | 466 | } |
| 462 | 467 | |
| 463 | 468 | irqreturn_t skl_dsp_irq_thread_handler(int irq, void *context) |
| @@ -2502,7 +2502,7 @@ static int skl_tplg_get_manifest_tkn(struct device *dev, · 2501 unmodified lines | ||
| 2502 | 2502 | |
| 2503 | 2503 | if (ret < 0) |
| 2504 | 2504 | return ret; |
| 2505 | − tkn_count += ret; | |
| 2505 | + tkn_count = ret; | |
| 2506 | 2506 | |
| 2507 | 2507 | tuple_size += tkn_count * |
| 2508 | 2508 | sizeof(struct snd_soc_tplg_vendor_string_elem); |
| @@ -410,7 +410,7 @@ static int skl_free(struct hdac_ext_bus *ebus) · 409 unmodified lines | ||
| 410 | 410 | struct skl *skl = ebus_to_skl(ebus); |
| 411 | 411 | struct hdac_bus *bus = ebus_to_hbus(ebus); |
| 412 | 412 | |
| 413 | − skl->init_failed = 1; /* to be sure */ | |
| 413 | + skl->init_done = 0; /* to be sure */ | |
| 414 | 414 | |
| 415 | 415 | snd_hdac_ext_stop_streams(ebus); |
| 416 | 416 | |
| @@ -428,8 +428,10 @@ static int skl_free(struct hdac_ext_bus *ebus) · 11 unmodified lines | ||
| 428 | 428 | |
| 429 | 429 | snd_hdac_ext_bus_exit(ebus); |
| 430 | 430 | |
| 431 | + cancel_work_sync(&skl->probe_work); | |
| 431 | 432 | if (IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)) |
| 432 | 433 | snd_hdac_i915_exit(&ebus->bus); |
| 434 | + | |
| 433 | 435 | return 0; |
| 434 | 436 | } |
| 435 | 437 | |
| @@ -566,6 +568,84 @@ static const struct hdac_bus_ops bus_core_ops = { · 130 unmodified lines | ||
| 566 | 568 | .get_response = snd_hdac_bus_get_response, |
| 567 | 569 | }; |
| 568 | 570 | |
| 571 | +static int skl_i915_init(struct hdac_bus *bus) | |
| 572 | +{ | |
| 573 | + int err; | |
| 574 | + | |
| 575 | + /* | |
| 576 | + * The HDMI codec is in GPU so we need to ensure that it is powered | |
| 577 | + * up and ready for probe | |
| 578 | + */ | |
| 579 | + err = snd_hdac_i915_init(bus); | |
| 580 | + if (err < 0) | |
| 581 | + return err; | |
| 582 | + | |
| 583 | + err = snd_hdac_display_power(bus, true); | |
| 584 | + if (err < 0) | |
| 585 | + dev_err(bus->dev, "Cannot turn on display power on i915\n"); | |
| 586 | + | |
| 587 | + return err; | |
| 588 | +} | |
| 589 | + | |
| 590 | +static void skl_probe_work(struct work_struct *work) | |
| 591 | +{ | |
| 592 | + struct skl *skl = container_of(work, struct skl, probe_work); | |
| 593 | + struct hdac_ext_bus *ebus = &skl->ebus; | |
| 594 | + struct hdac_bus *bus = ebus_to_hbus(ebus); | |
| 595 | + struct hdac_ext_link *hlink = NULL; | |
| 596 | + int err; | |
| 597 | + | |
| 598 | + if (IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)) { | |
| 599 | + err = skl_i915_init(bus); | |
| 600 | + if (err < 0) | |
| 601 | + return; | |
| 602 | + } | |
| 603 | + | |
| 604 | + err = skl_init_chip(bus, true); | |
| 605 | + if (err < 0) { | |
| 606 | + dev_err(bus->dev, "Init chip failed with err: %d\n", err); | |
| 607 | + goto out_err; | |
| 608 | + } | |
| 609 | + | |
| 610 | + /* codec detection */ | |
| 611 | + if (!bus->codec_mask) | |
| 612 | + dev_info(bus->dev, "no hda codecs found!\n"); | |
| 613 | + | |
| 614 | + /* create codec instances */ | |
| 615 | + err = skl_codec_create(ebus); | |
| 616 | + if (err < 0) | |
| 617 | + goto out_err; | |
| 618 | + | |
| 619 | + if (IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)) { | |
| 620 | + err = snd_hdac_display_power(bus, false); | |
| 621 | + if (err < 0) { | |
| 622 | + dev_err(bus->dev, "Cannot turn off display power on i915\n"); | |
| 623 | + return; | |
| 624 | + } | |
| 625 | + } | |
| 626 | + | |
| 627 | + /* register platform dai and controls */ | |
| 628 | + err = skl_platform_register(bus->dev); | |
| 629 | + if (err < 0) | |
| 630 | + return; | |
| 631 | + /* | |
| 632 | + * we are done probing so decrement link counts | |
| 633 | + */ | |
| 634 | + list_for_each_entry(hlink, &ebus->hlink_list, list) | |
| 635 | + snd_hdac_ext_bus_link_put(ebus, hlink); | |
| 636 | + | |
| 637 | + /* configure PM */ | |
| 638 | + pm_runtime_put_noidle(bus->dev); | |
| 639 | + pm_runtime_allow(bus->dev); | |
| 640 | + skl->init_done = 1; | |
| 641 | + | |
| 642 | + return; | |
| 643 | + | |
| 644 | +out_err: | |
| 645 | + if (IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)) | |
| 646 | + err = snd_hdac_display_power(bus, false); | |
| 647 | +} | |
| 648 | + | |
| 569 | 649 | /* |
| 570 | 650 | * constructor |
| 571 | 651 | */ |
| @@ -593,6 +673,7 @@ static int skl_create(struct pci_dev *pci, · 21 unmodified lines | ||
| 593 | 673 | snd_hdac_ext_bus_init(ebus, &pci->dev, &bus_core_ops, io_ops); |
| 594 | 674 | ebus->bus.use_posbuf = 1; |
| 595 | 675 | skl->pci = pci; |
| 676 | + INIT_WORK(&skl->probe_work, skl_probe_work); | |
| 596 | 677 | |
| 597 | 678 | ebus->bus.bdl_pos_adj = 0; |
| 598 | 679 | |
| @@ -601,27 +682,6 @@ static int skl_create(struct pci_dev *pci, · 2 unmodified lines | ||
| 601 | 682 | return 0; |
| 602 | 683 | } |
| 603 | 684 | |
| 604 | −static int skl_i915_init(struct hdac_bus *bus) | |
| 605 | −{ | |
| 606 | − int err; | |
| 607 | − | |
| 608 | − /* | |
| 609 | − * The HDMI codec is in GPU so we need to ensure that it is powered | |
| 610 | − * up and ready for probe | |
| 611 | − */ | |
| 612 | − err = snd_hdac_i915_init(bus); | |
| 613 | − if (err < 0) | |
| 614 | − return err; | |
| 615 | − | |
| 616 | − err = snd_hdac_display_power(bus, true); | |
| 617 | − if (err < 0) { | |
| 618 | − dev_err(bus->dev, "Cannot turn on display power on i915\n"); | |
| 619 | − return err; | |
| 620 | − } | |
| 621 | − | |
| 622 | − return err; | |
| 623 | −} | |
| 624 | − | |
| 625 | 685 | static int skl_first_init(struct hdac_ext_bus *ebus) |
| 626 | 686 | { |
| 627 | 687 | struct skl *skl = ebus_to_skl(ebus); |
| @@ -684,20 +744,7 @@ static int skl_first_init(struct hdac_ext_bus *ebus) · 56 unmodified lines | ||
| 684 | 744 | /* initialize chip */ |
| 685 | 745 | skl_init_pci(skl); |
| 686 | 746 | |
| 687 | − if (IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)) { | |
| 688 | − err = skl_i915_init(bus); | |
| 689 | − if (err < 0) | |
| 690 | − return err; | |
| 691 | − } | |
| 692 | − | |
| 693 | − skl_init_chip(bus, true); | |
| 694 | − | |
| 695 | − /* codec detection */ | |
| 696 | − if (!bus->codec_mask) { | |
| 697 | − dev_info(bus->dev, "no hda codecs found!\n"); | |
| 698 | − } | |
| 699 | − | |
| 700 | − return 0; | |
| 747 | + return skl_init_chip(bus, true); | |
| 701 | 748 | } |
| 702 | 749 | |
| 703 | 750 | static int skl_probe(struct pci_dev *pci, |
| @@ -706,7 +753,6 @@ static int skl_probe(struct pci_dev *pci, · 2 unmodified lines | ||
| 706 | 753 | struct skl *skl; |
| 707 | 754 | struct hdac_ext_bus *ebus = NULL; |
| 708 | 755 | struct hdac_bus *bus = NULL; |
| 709 | − struct hdac_ext_link *hlink = NULL; | |
| 710 | 756 | int err; |
| 711 | 757 | |
| 712 | 758 | /* we use ext core ops, so provide NULL for ops here */ |
| @@ -729,7 +775,7 @@ static int skl_probe(struct pci_dev *pci, · 16 unmodified lines | ||
| 729 | 775 | |
| 730 | 776 | if (skl->nhlt == NULL) { |
| 731 | 777 | err = -ENODEV; |
| 732 | − goto out_display_power_off; | |
| 778 | + goto out_free; | |
| 733 | 779 | } |
| 734 | 780 | |
| 735 | 781 | err = skl_nhlt_create_sysfs(skl); |
| @@ -760,56 +806,24 @@ static int skl_probe(struct pci_dev *pci, · 24 unmodified lines | ||
| 760 | 806 | if (bus->mlcap) |
| 761 | 807 | snd_hdac_ext_bus_get_ml_capabilities(ebus); |
| 762 | 808 | |
| 809 | + snd_hdac_bus_stop_chip(bus); | |
| 810 | + | |
| 763 | 811 | /* create device for soc dmic */ |
| 764 | 812 | err = skl_dmic_device_register(skl); |
| 765 | 813 | if (err < 0) |
| 766 | 814 | goto out_dsp_free; |
| 767 | 815 | |
| 768 | − /* register platform dai and controls */ | |
| 769 | − err = skl_platform_register(bus->dev); | |
| 770 | − if (err < 0) | |
| 771 | − goto out_dmic_free; | |
| 772 | − | |
| 773 | − /* create codec instances */ | |
| 774 | − err = skl_codec_create(ebus); | |
| 775 | − if (err < 0) | |
| 776 | − goto out_unregister; | |
| 777 | − | |
| 778 | − if (IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)) { | |
| 779 | − err = snd_hdac_display_power(bus, false); | |
| 780 | − if (err < 0) { | |
| 781 | − dev_err(bus->dev, "Cannot turn off display power on i915\n"); | |
| 782 | − return err; | |
| 783 | − } | |
| 784 | − } | |
| 785 | − | |
| 786 | − /* | |
| 787 | − * we are done probling so decrement link counts | |
| 788 | − */ | |
| 789 | − list_for_each_entry(hlink, &ebus->hlink_list, list) | |
| 790 | − snd_hdac_ext_bus_link_put(ebus, hlink); | |
| 791 | − | |
| 792 | − /* configure PM */ | |
| 793 | − pm_runtime_put_noidle(bus->dev); | |
| 794 | − pm_runtime_allow(bus->dev); | |
| 816 | + schedule_work(&skl->probe_work); | |
| 795 | 817 | |
| 796 | 818 | return 0; |
| 797 | 819 | |
| 798 | −out_unregister: | |
| 799 | − skl_platform_unregister(bus->dev); | |
| 800 | −out_dmic_free: | |
| 801 | − skl_dmic_device_unregister(skl); | |
| 802 | 820 | out_dsp_free: |
| 803 | 821 | skl_free_dsp(skl); |
| 804 | 822 | out_mach_free: |
| 805 | 823 | skl_machine_device_unregister(skl); |
| 806 | 824 | out_nhlt_free: |
| 807 | 825 | skl_nhlt_free(skl->nhlt); |
| 808 | −out_display_power_off: | |
| 809 | − if (IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)) | |
| 810 | − snd_hdac_display_power(bus, false); | |
| 811 | 826 | out_free: |
| 812 | − skl->init_failed = 1; | |
| 813 | 827 | skl_free(ebus); |
| 814 | 828 | |
| 815 | 829 | return err; |
| @@ -828,7 +842,7 @@ static void skl_shutdown(struct pci_dev *pci) · 12 unmodified lines | ||
| 828 | 842 | |
| 829 | 843 | skl = ebus_to_skl(ebus); |
| 830 | 844 | |
| 831 | − if (skl->init_failed) | |
| 845 | + if (!skl->init_done) | |
| 832 | 846 | return; |
| 833 | 847 | |
| 834 | 848 | snd_hdac_ext_stop_streams(ebus); |
| @@ -46,7 +46,7 @@ struct skl { · 45 unmodified lines | ||
| 46 | 46 | struct hdac_ext_bus ebus; |
| 47 | 47 | struct pci_dev *pci; |
| 48 | 48 | |
| 49 | − unsigned int init_failed:1; /* delayed init failed */ | |
| 49 | + unsigned int init_done:1; /* delayed init status */ | |
| 50 | 50 | struct platform_device *dmic_dev; |
| 51 | 51 | struct platform_device *i2s_dev; |
| 52 | 52 | struct snd_soc_platform *platform; |
| @@ -64,6 +64,8 @@ struct skl { · 11 unmodified lines | ||
| 64 | 64 | const struct firmware *tplg; |
| 65 | 65 | |
| 66 | 66 | int supend_active; |
| 67 | + | |
| 68 | + struct work_struct probe_work; | |
| 67 | 69 | }; |
| 68 | 70 | |
| 69 | 71 | #define skl_to_ebus(s) (&(s)->ebus) |
| @@ -507,7 +507,8 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv, · 506 unmodified lines | ||
| 507 | 507 | rbga = rbgx; |
| 508 | 508 | adg->rbga_rate_for_441khz = rate / div; |
| 509 | 509 | ckr |= brg_table[i] << 20; |
| 510 | − if (req_441kHz_rate) | |
| 510 | + if (req_441kHz_rate && | |
| 511 | + !(adg_mode_flags(adg) & AUDIO_OUT_48)) | |
| 511 | 512 | parent_clk_name = __clk_get_name(clk); |
| 512 | 513 | } |
| 513 | 514 | } |
| @@ -522,7 +523,8 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv, · 8 unmodified lines | ||
| 522 | 523 | rbgb = rbgx; |
| 523 | 524 | adg->rbgb_rate_for_48khz = rate / div; |
| 524 | 525 | ckr |= brg_table[i] << 16; |
| 525 | − if (req_48kHz_rate) | |
| 526 | + if (req_48kHz_rate && | |
| 527 | + (adg_mode_flags(adg) & AUDIO_OUT_48)) | |
| 526 | 528 | parent_clk_name = __clk_get_name(clk); |
| 527 | 529 | } |
| 528 | 530 | } |
| @@ -89,6 +89,7 @@ static int rsnd_cmd_init(struct rsnd_mod *mod, · 88 unmodified lines | ||
| 89 | 89 | dev_dbg(dev, "ctu/mix path = 0x%08x", data); |
| 90 | 90 | |
| 91 | 91 | rsnd_mod_write(mod, CMD_ROUTE_SLCT, data); |
| 92 | + rsnd_mod_write(mod, CMD_BUSIF_MODE, rsnd_get_busif_shift(io, mod) | 1); | |
| 92 | 93 | rsnd_mod_write(mod, CMD_BUSIF_DALIGN, rsnd_get_dalign(mod, io)); |
| 93 | 94 | |
| 94 | 95 | rsnd_adg_set_cmd_timsel_gen2(mod, io); |
| @@ -343,6 +343,57 @@ u32 rsnd_get_dalign(struct rsnd_mod *mod, struct rsnd_dai_stream *io) · 342 unmodified lines | ||
| 343 | 343 | return 0x76543210; |
| 344 | 344 | } |
| 345 | 345 | |
| 346 | +u32 rsnd_get_busif_shift(struct rsnd_dai_stream *io, struct rsnd_mod *mod) | |
| 347 | +{ | |
| 348 | + enum rsnd_mod_type playback_mods[] = { | |
| 349 | + RSND_MOD_SRC, | |
| 350 | + RSND_MOD_CMD, | |
| 351 | + RSND_MOD_SSIU, | |
| 352 | + }; | |
| 353 | + enum rsnd_mod_type capture_mods[] = { | |
| 354 | + RSND_MOD_CMD, | |
| 355 | + RSND_MOD_SRC, | |
| 356 | + RSND_MOD_SSIU, | |
| 357 | + }; | |
| 358 | + struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io); | |
| 359 | + struct rsnd_mod *tmod = NULL; | |
| 360 | + enum rsnd_mod_type *mods = | |
| 361 | + rsnd_io_is_play(io) ? | |
| 362 | + playback_mods : capture_mods; | |
| 363 | + int i; | |
| 364 | + | |
| 365 | + /* | |
| 366 | + * This is needed for 24bit data | |
| 367 | + * We need to shift 8bit | |
| 368 | + * | |
| 369 | + * Linux 24bit data is located as 0x00****** | |
| 370 | + * HW 24bit data is located as 0x******00 | |
| 371 | + * | |
| 372 | + */ | |
| 373 | + switch (runtime->sample_bits) { | |
| 374 | + case 16: | |
| 375 | + return 0; | |
| 376 | + case 32: | |
| 377 | + break; | |
| 378 | + } | |
| 379 | + | |
| 380 | + for (i = 0; i < ARRAY_SIZE(playback_mods); i++) { | |
| 381 | + tmod = rsnd_io_to_mod(io, mods[i]); | |
| 382 | + if (tmod) | |
| 383 | + break; | |
| 384 | + } | |
| 385 | + | |
| 386 | + if (tmod != mod) | |
| 387 | + return 0; | |
| 388 | + | |
| 389 | + if (rsnd_io_is_play(io)) | |
| 390 | + return (0 << 20) | /* shift to Left */ | |
| 391 | + (8 << 16); /* 8bit */ | |
| 392 | + else | |
| 393 | + return (1 << 20) | /* shift to Right */ | |
| 394 | + (8 << 16); /* 8bit */ | |
| 395 | +} | |
| 396 | + | |
| 346 | 397 | /* |
| 347 | 398 | * rsnd_dai functions |
| 348 | 399 | */ |
| @@ -236,6 +236,7 @@ static int rsnd_gen2_probe(struct rsnd_priv *priv) · 235 unmodified lines | ||
| 236 | 236 | RSND_GEN_M_REG(SRC_ROUTE_MODE0, 0xc, 0x20), |
| 237 | 237 | RSND_GEN_M_REG(SRC_CTRL, 0x10, 0x20), |
| 238 | 238 | RSND_GEN_M_REG(SRC_INT_ENABLE0, 0x18, 0x20), |
| 239 | + RSND_GEN_M_REG(CMD_BUSIF_MODE, 0x184, 0x20), | |
| 239 | 240 | RSND_GEN_M_REG(CMD_BUSIF_DALIGN,0x188, 0x20), |
| 240 | 241 | RSND_GEN_M_REG(CMD_ROUTE_SLCT, 0x18c, 0x20), |
| 241 | 242 | RSND_GEN_M_REG(CMD_CTRL, 0x190, 0x20), |
| @@ -73,6 +73,7 @@ enum rsnd_reg { · 72 unmodified lines | ||
| 73 | 73 | RSND_REG_SCU_SYS_INT_EN0, |
| 74 | 74 | RSND_REG_SCU_SYS_INT_EN1, |
| 75 | 75 | RSND_REG_CMD_CTRL, |
| 76 | + RSND_REG_CMD_BUSIF_MODE, | |
| 76 | 77 | RSND_REG_CMD_BUSIF_DALIGN, |
| 77 | 78 | RSND_REG_CMD_ROUTE_SLCT, |
| 78 | 79 | RSND_REG_CMDOUT_TIMSEL, |
| @@ -204,6 +205,7 @@ void rsnd_bset(struct rsnd_priv *priv, struct rsnd_mod *mod, enum rsnd_reg reg, · 125 unmodified lines | ||
| 204 | 205 | u32 mask, u32 data); |
| 205 | 206 | u32 rsnd_get_adinr_bit(struct rsnd_mod *mod, struct rsnd_dai_stream *io); |
| 206 | 207 | u32 rsnd_get_dalign(struct rsnd_mod *mod, struct rsnd_dai_stream *io); |
| 208 | +u32 rsnd_get_busif_shift(struct rsnd_dai_stream *io, struct rsnd_mod *mod); | |
| 207 | 209 | |
| 208 | 210 | /* |
| 209 | 211 | * R-Car DMA |
| @@ -190,11 +190,13 @@ static void rsnd_src_set_convert_rate(struct rsnd_dai_stream *io, · 189 unmodified lines | ||
| 190 | 190 | struct rsnd_priv *priv = rsnd_mod_to_priv(mod); |
| 191 | 191 | struct device *dev = rsnd_priv_to_dev(priv); |
| 192 | 192 | struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io); |
| 193 | + int is_play = rsnd_io_is_play(io); | |
| 193 | 194 | int use_src = 0; |
| 194 | 195 | u32 fin, fout; |
| 195 | 196 | u32 ifscr, fsrate, adinr; |
| 196 | 197 | u32 cr, route; |
| 197 | 198 | u32 bsdsr, bsisr; |
| 199 | + u32 i_busif, o_busif, tmp; | |
| 198 | 200 | uint ratio; |
| 199 | 201 | |
| 200 | 202 | if (!runtime) |
| @@ -270,6 +272,11 @@ static void rsnd_src_set_convert_rate(struct rsnd_dai_stream *io, · 69 unmodified lines | ||
| 270 | 272 | break; |
| 271 | 273 | } |
| 272 | 274 | |
| 275 | + /* BUSIF_MODE */ | |
| 276 | + tmp = rsnd_get_busif_shift(io, mod); | |
| 277 | + i_busif = ( is_play ? tmp : 0) | 1; | |
| 278 | + o_busif = (!is_play ? tmp : 0) | 1; | |
| 279 | + | |
| 273 | 280 | rsnd_mod_write(mod, SRC_ROUTE_MODE0, route); |
| 274 | 281 | |
| 275 | 282 | rsnd_mod_write(mod, SRC_SRCIR, 1); /* initialize */ |
| @@ -281,8 +288,9 @@ static void rsnd_src_set_convert_rate(struct rsnd_dai_stream *io, · 5 unmodified lines | ||
| 281 | 288 | rsnd_mod_write(mod, SRC_BSISR, bsisr); |
| 282 | 289 | rsnd_mod_write(mod, SRC_SRCIR, 0); /* cancel initialize */ |
| 283 | 290 | |
| 284 | − rsnd_mod_write(mod, SRC_I_BUSIF_MODE, 1); | |
| 285 | − rsnd_mod_write(mod, SRC_O_BUSIF_MODE, 1); | |
| 291 | + rsnd_mod_write(mod, SRC_I_BUSIF_MODE, i_busif); | |
| 292 | + rsnd_mod_write(mod, SRC_O_BUSIF_MODE, o_busif); | |
| 293 | + | |
| 286 | 294 | rsnd_mod_write(mod, SRC_BUSIF_DALIGN, rsnd_get_dalign(mod, io)); |
| 287 | 295 | |
| 288 | 296 | rsnd_adg_set_src_timesel_gen2(mod, io, fin, fout); |
| @@ -302,7 +302,7 @@ static void rsnd_ssi_config_init(struct rsnd_mod *mod, · 301 unmodified lines | ||
| 302 | 302 | * always use 32bit system word. |
| 303 | 303 | * see also rsnd_ssi_master_clk_enable() |
| 304 | 304 | */ |
| 305 | − cr_own = FORCE | SWL_32 | PDTA; | |
| 305 | + cr_own = FORCE | SWL_32; | |
| 306 | 306 | |
| 307 | 307 | if (rdai->bit_clk_inv) |
| 308 | 308 | cr_own |= SCKP; |
| @@ -550,6 +550,13 @@ static void __rsnd_ssi_interrupt(struct rsnd_mod *mod, · 241 unmodified lines | ||
| 550 | 550 | struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io); |
| 551 | 551 | u32 *buf = (u32 *)(runtime->dma_area + |
| 552 | 552 | rsnd_dai_pointer_offset(io, 0)); |
| 553 | + int shift = 0; | |
| 554 | + | |
| 555 | + switch (runtime->sample_bits) { | |
| 556 | + case 32: | |
| 557 | + shift = 8; | |
| 558 | + break; | |
| 559 | + } | |
| 553 | 560 | |
| 554 | 561 | /* |
| 555 | 562 | * 8/16/32 data can be assesse to TDR/RDR register |
| @@ -557,9 +564,9 @@ static void __rsnd_ssi_interrupt(struct rsnd_mod *mod, · 1 unmodified line | ||
| 557 | 564 | * see rsnd_ssi_init() |
| 558 | 565 | */ |
| 559 | 566 | if (rsnd_io_is_play(io)) |
| 560 | − rsnd_mod_write(mod, SSITDR, *buf); | |
| 567 | + rsnd_mod_write(mod, SSITDR, (*buf) << shift); | |
| 561 | 568 | else |
| 562 | − *buf = rsnd_mod_read(mod, SSIRDR); | |
| 569 | + *buf = (rsnd_mod_read(mod, SSIRDR) >> shift); | |
| 563 | 570 | |
| 564 | 571 | elapsed = rsnd_dai_pointer_update(io, sizeof(*buf)); |
| 565 | 572 | } |
| @@ -709,6 +716,11 @@ static int rsnd_ssi_dma_remove(struct rsnd_mod *mod, · 143 unmodified lines | ||
| 709 | 716 | struct rsnd_priv *priv) |
| 710 | 717 | { |
| 711 | 718 | struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod); |
| 719 | + struct rsnd_mod *ssi_parent_mod = rsnd_io_to_mod_ssip(io); | |
| 720 | + | |
| 721 | + /* Do nothing for SSI parent mod */ | |
| 722 | + if (ssi_parent_mod == mod) | |
| 723 | + return 0; | |
| 712 | 724 | |
| 713 | 725 | /* PIO will request IRQ again */ |
| 714 | 726 | free_irq(ssi->irq, mod); |
| @@ -144,7 +144,8 @@ static int rsnd_ssiu_init_gen2(struct rsnd_mod *mod, · 143 unmodified lines | ||
| 144 | 144 | (rsnd_io_is_play(io) ? |
| 145 | 145 | rsnd_runtime_channel_after_ctu(io) : |
| 146 | 146 | rsnd_runtime_channel_original(io))); |
| 147 | − rsnd_mod_write(mod, SSI_BUSIF_MODE, 1); | |
| 147 | + rsnd_mod_write(mod, SSI_BUSIF_MODE, | |
| 148 | + rsnd_get_busif_shift(io, mod) | 1); | |
| 148 | 149 | rsnd_mod_write(mod, SSI_BUSIF_DALIGN, |
| 149 | 150 | rsnd_get_dalign(mod, io)); |
| 150 | 151 | } |
| @@ -2286,6 +2286,9 @@ static int soc_cleanup_card_resources(struct snd_soc_card *card) · 2285 unmodified lines | ||
| 2286 | 2286 | list_for_each_entry(rtd, &card->rtd_list, list) |
| 2287 | 2287 | flush_delayed_work(&rtd->delayed_work); |
| 2288 | 2288 | |
| 2289 | + /* free the ALSA card at first; this syncs with pending operations */ | |
| 2290 | + snd_card_free(card->snd_card); | |
| 2291 | + | |
| 2289 | 2292 | /* remove and free each DAI */ |
| 2290 | 2293 | soc_remove_dai_links(card); |
| 2291 | 2294 | soc_remove_pcm_runtimes(card); |
| @@ -2300,9 +2303,7 @@ static int soc_cleanup_card_resources(struct snd_soc_card *card) · 8 unmodified lines | ||
| 2300 | 2303 | if (card->remove) |
| 2301 | 2304 | card->remove(card); |
| 2302 | 2305 | |
| 2303 | − snd_card_free(card->snd_card); | |
| 2304 | 2306 | return 0; |
| 2305 | − | |
| 2306 | 2307 | } |
| 2307 | 2308 | |
| 2308 | 2309 | /* removes a socdev */ |