July 2021 - Alsa-devel - mailman.alsa-project.org

[PATCH] ALSA: sc6000: Use explicit cast for __iomem pointer
by Takashi Iwai 21 Jul '21

21 Jul '21

The recent optimization to store an iomem pointer in card's private_data field caused sparse warnings. Although they are practically harmless, add the explicit cast for avoiding the spurious warnings. Fixes: 9b7843d1e125 ("ALSA: sc6000: Assign vport directly on card's private_data") Reported-by: kernel test robot <lkp(a)intel.com> Link: https://lore.kernel.org/r/202107210511.SnFqlZMa-lkp@intel.com Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/isa/sc6000.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/isa/sc6000.c b/sound/isa/sc6000.c index d92e56cb0490..26ab7ff80768 100644 --- a/sound/isa/sc6000.c +++ b/sound/isa/sc6000.c @@ -531,7 +531,7 @@ static int snd_sc6000_match(struct device *devptr, unsigned int dev) static void snd_sc6000_free(struct snd_card *card) { - char __iomem *vport = card->private_data; + char __iomem *vport = (char __force __iomem *)card->private_data; if (vport) sc6000_setup_board(vport, 0); @@ -582,7 +582,7 @@ static int snd_sc6000_probe(struct device *devptr, unsigned int dev) "I/O port cannot be iomapped.\n"); return -EBUSY; } - card->private_data = vport; + card->private_data = (void __force *)vport; /* to make it marked as used */ if (!devm_request_region(devptr, mss_port[dev], 4, DRV_NAME)) { -- 2.26.2

1 0

[PATCH v2 00/79] ALSA: More devres usages
by Takashi Iwai 21 Jul '21

21 Jul '21

Hi, this is a v2 patch series for adapting more devres usages in ALSA drivers, a resurrect of my early RFC patch with the fix and applying to more drivers. The main purpose is merely the code cleanup over the tree by replacing the resource allocations with devres helpers as much as possible. The only major change is the addition of devres-supported card object handling snd_devm_card_new() and the page allocation helper snd_devm_alloc_pages(). Those allow us to get rid of the remove callback completely in many drivers. In the end, the series resulted in a significant amount of code reduction. Now ISA drivers and a few other drivers have been covered as well as a couple of missing PCI drivers and fixes. Takashi === v1->v2: * Rearrange patch order * Use size_t in snd_devm_card_new() * Move card->releasing check into devres release * Most of ISA drivers are included * A few platform drivers included * Fixed missing initializations, etc in a few drivers. Takashi Iwai (79): ALSA: core: Add device-managed page allocator helper ALSA: core: Add managed card creation ALSA: core: Add device-managed request_dma() ALSA: doc: Add device-managed resource section ALSA: intel8x0: Allocate resources with device-managed APIs ALSA: atiixp: Allocate resources with device-managed APIs ALSA: hda: Allocate resources with device-managed APIs ALSA: ad1889: Allocate resources with device-managed APIs ALSA: als300: Allocate resources with device-managed APIs ALSA: als4000: Allocate resources with device-managed APIs ALSA: azt3328: Allocate resources with device-managed APIs ALSA: bt87x: Allocate resources with device-managed APIs ALSA: cmipci: Allocate resources with device-managed APIs ALSA: cs4281: Allocate resources with device-managed APIs ALSA: cs5530: Allocate resources with device-managed APIs ALSA: ens137x: Allocate resources with device-managed APIs ALSA: es1938: Allocate resources with device-managed APIs ALSA: es1968: Allocate resources with device-managed APIs ALSA: fm801: Allocate resources with device-managed APIs ALSA: maestro3: Allocate resources with device-managed APIs ALSA: rme32: Allocate resources with device-managed APIs ALSA: rme96: Allocate resources with device-managed APIs ALSA: sis7019: Allocate resources with device-managed APIs ALSA: sonicvibes: Allocate resources with device-managed APIs ALSA: via82xx: Allocate resources with device-managed APIs ALSA: ali5451: Allocate resources with device-managed APIs ALSA: au88x0: Allocate resources with device-managed APIs ALSA: aw2: Allocate resources with device-managed APIs ALSA: ca0106: Allocate resources with device-managed APIs ALSA: cs46xx: Allocate resources with device-managed APIs ALSA: cs5535audio: Allocate resources with device-managed APIs ALSA: echoaudio: Allocate resources with device-managed APIs ALSA: emu10k1: Allocate resources with device-managed APIs ALSA: emu10k1x: Allocate resources with device-managed APIs ALSA: ice1712: Allocate resources with device-managed APIs ALSA: ice1724: Allocate resources with device-managed APIs ALSA: ali5451: Allocate resources with device-managed APIs ALSA: ice1724: Allocate resources with device-managed APIs ALSA: korg1212: Allocate resources with device-managed APIs ALSA: lola: Allocate resources with device-managed APIs ALSA: lx6464es: Allocate resources with device-managed APIs ALSA: nm256: Allocate resources with device-managed APIs ALSA: oxygen: Allocate resources with device-managed APIs ALSA: riptide: Allocate resources with device-managed APIs ALSA: hdsp: Allocate resources with device-managed APIs ALSA: hdspm: Allocate resources with device-managed APIs ALSA: rme9652: Allocate resources with device-managed APIs ALSA: trident: Allocate resources with device-managed APIs ALSA: vx: Manage vx_core object with devres ALSA: vx222: Allocate resources with device-managed APIs ALSA: ymfpci: Allocate resources with device-managed APIs ALSA: ad1816a: Allocate resources with device-managed APIs ALSA: wss: Allocate resources with device-managed APIs ALSA: sb: Allocate resources with device-managed APIs ALSA: ad1848: Allocate resources with device-managed APIs ALSA: adlib: Allocate resources with device-managed APIs ALSA: als100: Allocate resources with device-managed APIs ALSA: azt2320: Allocate resources with device-managed APIs ALSA: cmi8328: Allocate resources with device-managed APIs ALSA: cmi8330: Allocate resources with device-managed APIs ALSA: cs423x: Allocate resources with device-managed APIs ALSA: es1688: Allocate resources with device-managed APIs ALSA: es18xx: Allocate resources with device-managed APIs ALSA: galaxy: Allocate resources with device-managed APIs ALSA: gus: Allocate resources with device-managed APIs ALSA: msnd: Allocate resources with device-managed APIs ALSA: opti9xx: Allocate resources with device-managed APIs ALSA: opl3sa2: Allocate resources with device-managed APIs ALSA: sc6000: Allocate resources with device-managed APIs ALSA: sscape: Allocate resources with device-managed APIs ALSA: wavefront: Allocate resources with device-managed APIs ALSA: x86: Allocate resources with device-managed APIs ALSA: virmidi: Allocate resources with device-managed APIs ALSA: mtpav: Allocate resources with device-managed APIs ALSA: serial-u16550: Allocate resources with device-managed APIs ALSA: mpu401: Allocate resources with device-managed APIs ALSA: aloop: Allocate resources with device-managed APIs ALSA: dummy: Allocate resources with device-managed APIs ALSA: pcsp: Allocate resources with device-managed APIs .../kernel-api/writing-an-alsa-driver.rst | 33 +++ include/sound/core.h | 6 + include/sound/emu10k1.h | 6 +- include/sound/emu8000.h | 3 - include/sound/es1688.h | 1 - include/sound/memalloc.h | 4 + sound/core/init.c | 99 +++++++- sound/core/isadma.c | 38 ++++ sound/core/memalloc.c | 46 ++++ sound/drivers/aloop.c | 26 +-- sound/drivers/dummy.c | 24 +- sound/drivers/mpu401/mpu401.c | 34 +-- sound/drivers/mtpav.c | 30 +-- sound/drivers/pcsp/pcsp.c | 49 ++-- sound/drivers/pcsp/pcsp_input.c | 14 +- sound/drivers/pcsp/pcsp_input.h | 1 - sound/drivers/serial-u16550.c | 57 +---- sound/drivers/virmidi.c | 21 +- sound/drivers/vx/vx_core.c | 12 +- sound/isa/ad1816a/ad1816a.c | 41 +--- sound/isa/ad1816a/ad1816a_lib.c | 49 +--- sound/isa/ad1848/ad1848.c | 19 +- sound/isa/adlib.c | 28 +-- sound/isa/als100.c | 41 +--- sound/isa/azt2320.c | 49 +--- sound/isa/cmi8328.c | 31 +-- sound/isa/cmi8330.c | 27 +-- sound/isa/cs423x/cs4231.c | 21 +- sound/isa/cs423x/cs4236.c | 52 +---- sound/isa/cs423x/cs4236_lib.c | 2 - sound/isa/es1688/es1688.c | 33 +-- sound/isa/es1688/es1688_lib.c | 29 +-- sound/isa/es18xx.c | 112 ++-------- sound/isa/galaxy/galaxy.c | 82 +++---- sound/isa/gus/gus_main.c | 44 ++-- sound/isa/gus/gusclassic.c | 28 +-- sound/isa/gus/gusextreme.c | 39 ++-- sound/isa/gus/gusmax.c | 65 ++---- sound/isa/gus/interwave.c | 53 +---- sound/isa/msnd/msnd_pinnacle.c | 119 +++------- sound/isa/opl3sa2.c | 60 +---- sound/isa/opti9xx/miro.c | 76 ++----- sound/isa/opti9xx/opti92x-ad1848.c | 80 ++----- sound/isa/sb/emu8000.c | 48 +--- sound/isa/sb/jazz16.c | 39 +--- sound/isa/sb/sb16.c | 42 +--- sound/isa/sb/sb8.c | 48 ++-- sound/isa/sb/sb_common.c | 64 ++---- sound/isa/sc6000.c | 73 +++--- sound/isa/sscape.c | 92 ++------ sound/isa/wavefront/wavefront.c | 46 +--- sound/isa/wss/wss_lib.c | 67 +----- sound/pci/ad1889.c | 144 +++--------- sound/pci/ali5451/ali5451.c | 90 ++------ sound/pci/als300.c | 79 ++----- sound/pci/als4000.c | 59 ++--- sound/pci/atiixp.c | 92 ++------ sound/pci/atiixp_modem.c | 92 ++------ sound/pci/au88x0/au88x0.c | 134 +++-------- sound/pci/aw2/aw2-alsa.c | 102 ++------- sound/pci/azt3328.c | 124 +++------- sound/pci/bt87x.c | 98 +++----- sound/pci/ca0106/ca0106.h | 3 +- sound/pci/ca0106/ca0106_main.c | 114 +++------- sound/pci/cmipci.c | 104 +++------ sound/pci/cs4281.c | 112 ++-------- sound/pci/cs46xx/cs46xx.c | 51 ++--- sound/pci/cs46xx/cs46xx.h | 4 +- sound/pci/cs46xx/cs46xx_lib.c | 111 ++------- sound/pci/cs5530.c | 86 ++----- sound/pci/cs5535audio/cs5535audio.c | 94 ++------ sound/pci/cs5535audio/cs5535audio_olpc.c | 7 +- sound/pci/echoaudio/echoaudio.c | 168 ++++---------- sound/pci/echoaudio/echoaudio.h | 2 +- sound/pci/emu10k1/emu10k1.c | 53 ++--- sound/pci/emu10k1/emu10k1_main.c | 102 +++------ sound/pci/emu10k1/emu10k1x.c | 128 +++-------- sound/pci/emu10k1/p16v.c | 22 +- sound/pci/ens1370.c | 115 +++------- sound/pci/es1938.c | 97 ++------ sound/pci/es1968.c | 112 ++-------- sound/pci/fm801.c | 103 ++------- sound/pci/hda/hda_controller.h | 1 - sound/pci/hda/hda_intel.c | 26 +-- sound/pci/ice1712/ice1712.c | 133 +++-------- sound/pci/ice1712/ice1724.c | 129 +++-------- sound/pci/intel8x0.c | 140 ++++-------- sound/pci/intel8x0m.c | 139 ++++-------- sound/pci/korg1212/korg1212.c | 211 +++++------------- sound/pci/lola/lola.c | 127 +++-------- sound/pci/lola/lola.h | 5 +- sound/pci/lola/lola_pcm.c | 20 +- sound/pci/lx6464es/lx6464es.c | 112 ++-------- sound/pci/maestro3.c | 106 ++------- sound/pci/nm256/nm256.c | 130 +++-------- sound/pci/oxygen/oxygen.c | 1 - sound/pci/oxygen/oxygen.h | 1 - sound/pci/oxygen/oxygen_lib.c | 66 ++---- sound/pci/oxygen/se6x.c | 1 - sound/pci/oxygen/virtuoso.c | 1 - sound/pci/riptide/riptide.c | 89 ++------ sound/pci/rme32.c | 49 +--- sound/pci/rme96.c | 57 ++--- sound/pci/rme9652/hdsp.c | 89 +++----- sound/pci/rme9652/hdspm.c | 64 +----- sound/pci/rme9652/rme9652.c | 85 ++----- sound/pci/sis7019.c | 87 ++------ sound/pci/sonicvibes.c | 117 +++------- sound/pci/trident/trident.c | 39 +--- sound/pci/trident/trident.h | 7 +- sound/pci/trident/trident_main.c | 90 +++----- sound/pci/trident/trident_memory.c | 8 +- sound/pci/via82xx.c | 116 +++------- sound/pci/via82xx_modem.c | 88 ++------ sound/pci/vx222/vx222.c | 69 +----- sound/pci/ymfpci/ymfpci.c | 66 +++--- sound/pci/ymfpci/ymfpci.h | 8 +- sound/pci/ymfpci/ymfpci_main.c | 149 ++++--------- sound/pcmcia/vx/vxpocket.c | 22 -- sound/x86/intel_hdmi_audio.c | 57 ++--- 120 files changed, 1997 insertions(+), 5513 deletions(-) -- 2.26.2

2 85

[sound:for-next 92/92] sound/isa/sc6000.c:534:35: sparse: sparse: incorrect type in initializer (different address spaces)
by kernel test robot 20 Jul '21

20 Jul '21

tree: https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git for-next head: 9b7843d1e125dca0d6ed0af9e8dd709d41eb25ad commit: 9b7843d1e125dca0d6ed0af9e8dd709d41eb25ad [92/92] ALSA: sc6000: Assign vport directly on card's private_data config: x86_64-randconfig-s021-20210718 (attached as .config) compiler: gcc-10 (Ubuntu 10.3.0-1ubuntu1~20.04) 10.3.0 reproduce: # apt-get install sparse # sparse version: v0.6.3-341-g8af24329-dirty # https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git/commit/?id=… git remote add sound https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git git fetch --no-tags sound for-next git checkout 9b7843d1e125dca0d6ed0af9e8dd709d41eb25ad # save the attached .config to linux build tree make W=1 C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' ARCH=x86_64 If you fix the issue, kindly add following tag as appropriate Reported-by: kernel test robot <lkp(a)intel.com> sparse warnings: (new ones prefixed by >>) >> sound/isa/sc6000.c:534:35: sparse: sparse: incorrect type in initializer (different address spaces) @@ expected char [noderef] __iomem *vport @@ got void *private_data @@ sound/isa/sc6000.c:534:35: sparse: expected char [noderef] __iomem *vport sound/isa/sc6000.c:534:35: sparse: got void *private_data >> sound/isa/sc6000.c:585:28: sparse: sparse: incorrect type in assignment (different address spaces) @@ expected void *private_data @@ got char [noderef] __iomem *[assigned] vport @@ sound/isa/sc6000.c:585:28: sparse: expected void *private_data sound/isa/sc6000.c:585:28: sparse: got char [noderef] __iomem *[assigned] vport vim +534 sound/isa/sc6000.c 531 532 static void snd_sc6000_free(struct snd_card *card) 533 { > 534 char __iomem *vport = card->private_data; 535 536 if (vport) 537 sc6000_setup_board(vport, 0); 538 } 539 540 static int snd_sc6000_probe(struct device *devptr, unsigned int dev) 541 { 542 static const int possible_irqs[] = { 5, 7, 9, 10, 11, -1 }; 543 static const int possible_dmas[] = { 1, 3, 0, -1 }; 544 int err; 545 int xirq = irq[dev]; 546 int xdma = dma[dev]; 547 struct snd_card *card; 548 struct snd_wss *chip; 549 struct snd_opl3 *opl3; 550 char __iomem *vport; 551 char __iomem *vmss_port; 552 553 err = snd_devm_card_new(devptr, index[dev], id[dev], THIS_MODULE, 554 0, &card); 555 if (err < 0) 556 return err; 557 558 if (xirq == SNDRV_AUTO_IRQ) { 559 xirq = snd_legacy_find_free_irq(possible_irqs); 560 if (xirq < 0) { 561 snd_printk(KERN_ERR PFX "unable to find a free IRQ\n"); 562 return -EBUSY; 563 } 564 } 565 566 if (xdma == SNDRV_AUTO_DMA) { 567 xdma = snd_legacy_find_free_dma(possible_dmas); 568 if (xdma < 0) { 569 snd_printk(KERN_ERR PFX "unable to find a free DMA\n"); 570 return -EBUSY; 571 } 572 } 573 574 if (!devm_request_region(devptr, port[dev], 0x10, DRV_NAME)) { 575 snd_printk(KERN_ERR PFX 576 "I/O port region is already in use.\n"); 577 return -EBUSY; 578 } 579 vport = devm_ioport_map(devptr, port[dev], 0x10); 580 if (!vport) { 581 snd_printk(KERN_ERR PFX 582 "I/O port cannot be iomapped.\n"); 583 return -EBUSY; 584 } > 585 card->private_data = vport; 586 587 /* to make it marked as used */ 588 if (!devm_request_region(devptr, mss_port[dev], 4, DRV_NAME)) { 589 snd_printk(KERN_ERR PFX 590 "SC-6000 port I/O port region is already in use.\n"); 591 return -EBUSY; 592 } 593 vmss_port = devm_ioport_map(devptr, mss_port[dev], 4); 594 if (!vmss_port) { 595 snd_printk(KERN_ERR PFX 596 "MSS port I/O cannot be iomapped.\n"); 597 return -EBUSY; 598 } 599 600 snd_printd("Initializing BASE[0x%lx] IRQ[%d] DMA[%d] MIRQ[%d]\n", 601 port[dev], xirq, xdma, 602 mpu_irq[dev] == SNDRV_AUTO_IRQ ? 0 : mpu_irq[dev]); 603 604 err = sc6000_init_board(vport, vmss_port, dev); 605 if (err < 0) 606 return err; 607 card->private_free = snd_sc6000_free; 608 609 err = snd_wss_create(card, mss_port[dev] + 4, -1, xirq, xdma, -1, 610 WSS_HW_DETECT, 0, &chip); 611 if (err < 0) 612 return err; 613 614 err = snd_wss_pcm(chip, 0); 615 if (err < 0) { 616 snd_printk(KERN_ERR PFX 617 "error creating new WSS PCM device\n"); 618 return err; 619 } 620 err = snd_wss_mixer(chip); 621 if (err < 0) { 622 snd_printk(KERN_ERR PFX "error creating new WSS mixer\n"); 623 return err; 624 } 625 err = snd_sc6000_mixer(chip); 626 if (err < 0) { 627 snd_printk(KERN_ERR PFX "the mixer rewrite failed\n"); 628 return err; 629 } 630 if (snd_opl3_create(card, 631 0x388, 0x388 + 2, 632 OPL3_HW_AUTO, 0, &opl3) < 0) { 633 snd_printk(KERN_ERR PFX "no OPL device at 0x%x-0x%x ?\n", 634 0x388, 0x388 + 2); 635 } else { 636 err = snd_opl3_hwdep_new(opl3, 0, 1, NULL); 637 if (err < 0) 638 return err; 639 } 640 641 if (mpu_port[dev] != SNDRV_AUTO_PORT) { 642 if (mpu_irq[dev] == SNDRV_AUTO_IRQ) 643 mpu_irq[dev] = -1; 644 if (snd_mpu401_uart_new(card, 0, 645 MPU401_HW_MPU401, 646 mpu_port[dev], 0, 647 mpu_irq[dev], NULL) < 0) 648 snd_printk(KERN_ERR "no MPU-401 device at 0x%lx ?\n", 649 mpu_port[dev]); 650 } 651 652 strcpy(card->driver, DRV_NAME); 653 strcpy(card->shortname, "SC-6000"); 654 sprintf(card->longname, "Gallant SC-6000 at 0x%lx, irq %d, dma %d", 655 mss_port[dev], xirq, xdma); 656 657 err = snd_card_register(card); 658 if (err < 0) 659 return err; 660 661 dev_set_drvdata(devptr, card); 662 return 0; 663 } 664 --- 0-DAY CI Kernel Test Service, Intel Corporation https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org

1 0

[PATCH v4 00/12] Add Vangogh ACP ASoC driver
by Vijendar Mukunda 20 Jul '21

20 Jul '21

This adds an ASoC driver for the ACP (Audio CoProcessor) block on AMD Vangogh APU. Changes since v3: - Fixed typo errors - Fixed platform devices unregister logic - Updated acp resources count with macro value - updated ACP5x_I2S_MODE macro value to avoid unregistering platform devices for other ACP audio configurations in driver remove callback - Fixed error handling - Fixed indentation issues in irq handler - Add __maybe_unused for PM functions Changes since v2: - remove extra stuff from Make file Changes since v1: - add comment for acp_readl() & acp_writel() API's in common header file. - add amd: tag in commit message - modify condition check in acp5x_power_on() - removed acp_power_gating flag related code - drop acp5x_audio_remove() API - use single flag for handling irq status - fixed indetation issue and used dev_err instead of pr_err - drop acp5x_dai_remove() API - use SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK - use PM related Macros in ACP PCI driver - use PM related Macros in ACP DMA driver - remove extra line in Make file Vijendar Mukunda (12): ASoC: amd: add Vangogh ACP5x IP register header ASoC: amd: add Vangogh ACP PCI driver ASoc: amd: add acp5x init/de-init functions ASoC: amd: create acp5x platform devices ASoC: amd: add ACP5x PCM platform driver ASoC: amd: irq handler changes for ACP5x PCM dma driver ASoC: amd: add ACP5x pcm dma driver ops ASoC: amd: add vangogh i2s controller driver ASoC: amd: add vangogh i2s dai driver ops ASoC: amd: add vangogh pci driver pm ops ASoC: amd: add vangogh i2s dma driver pm ops ASoC: amd: enable vangogh acp5x driver build sound/soc/amd/Kconfig | 9 + sound/soc/amd/Makefile | 1 + sound/soc/amd/vangogh/Makefile | 9 + sound/soc/amd/vangogh/acp5x-i2s.c | 427 ++++++++++++++++ sound/soc/amd/vangogh/acp5x-pcm-dma.c | 524 ++++++++++++++++++++ sound/soc/amd/vangogh/acp5x.h | 193 +++++++ sound/soc/amd/vangogh/pci-acp5x.c | 326 ++++++++++++ sound/soc/amd/vangogh/vg_chip_offset_byte.h | 337 +++++++++++++ 8 files changed, 1826 insertions(+) create mode 100644 sound/soc/amd/vangogh/Makefile create mode 100644 sound/soc/amd/vangogh/acp5x-i2s.c create mode 100644 sound/soc/amd/vangogh/acp5x-pcm-dma.c create mode 100644 sound/soc/amd/vangogh/acp5x.h create mode 100644 sound/soc/amd/vangogh/pci-acp5x.c create mode 100644 sound/soc/amd/vangogh/vg_chip_offset_byte.h -- 2.17.1

1 0

[PATCH] ALSA: sc6000: Assign vport directly on card's private_data
by Takashi Iwai 20 Jul '21

20 Jul '21

sc6000 driver tries to allocate an extra pointer for keeping the vport address and point it over card->private_data. But, this indirect access is utterly superfluous, and we can keep the vport address directly in card->private_data instead. This will simply the code and avoid confusion. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/isa/sc6000.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/sound/isa/sc6000.c b/sound/isa/sc6000.c index 44c05b55fc15..d92e56cb0490 100644 --- a/sound/isa/sc6000.c +++ b/sound/isa/sc6000.c @@ -531,10 +531,10 @@ static int snd_sc6000_match(struct device *devptr, unsigned int dev) static void snd_sc6000_free(struct snd_card *card) { - char __iomem **vport = card->private_data; + char __iomem *vport = card->private_data; - if (*vport) - sc6000_setup_board(*vport, 0); + if (vport) + sc6000_setup_board(vport, 0); } static int snd_sc6000_probe(struct device *devptr, unsigned int dev) @@ -547,16 +547,14 @@ static int snd_sc6000_probe(struct device *devptr, unsigned int dev) struct snd_card *card; struct snd_wss *chip; struct snd_opl3 *opl3; - char __iomem **vport; + char __iomem *vport; char __iomem *vmss_port; - err = snd_devm_card_new(devptr, index[dev], id[dev], THIS_MODULE, - sizeof(*vport), &card); + 0, &card); if (err < 0) return err; - vport = card->private_data; if (xirq == SNDRV_AUTO_IRQ) { xirq = snd_legacy_find_free_irq(possible_irqs); if (xirq < 0) { @@ -578,12 +576,13 @@ static int snd_sc6000_probe(struct device *devptr, unsigned int dev) "I/O port region is already in use.\n"); return -EBUSY; } - *vport = devm_ioport_map(devptr, port[dev], 0x10); - if (*vport == NULL) { + vport = devm_ioport_map(devptr, port[dev], 0x10); + if (!vport) { snd_printk(KERN_ERR PFX "I/O port cannot be iomapped.\n"); return -EBUSY; } + card->private_data = vport; /* to make it marked as used */ if (!devm_request_region(devptr, mss_port[dev], 4, DRV_NAME)) { @@ -602,7 +601,7 @@ static int snd_sc6000_probe(struct device *devptr, unsigned int dev) port[dev], xirq, xdma, mpu_irq[dev] == SNDRV_AUTO_IRQ ? 0 : mpu_irq[dev]); - err = sc6000_init_board(*vport, vmss_port, dev); + err = sc6000_init_board(vport, vmss_port, dev); if (err < 0) return err; card->private_free = snd_sc6000_free; -- 2.26.2

1 0

[PATCH][next] ALSA: sc6000: Fix incorrect sizeof operator
by Colin King 20 Jul '21

20 Jul '21

From: Colin Ian King <colin.king(a)canonical.com> Static analysis is warning that the sizeof being used is should be of *vport and not vport. Although these are the same size it is not a portable assumption to assume this is true for all cases. Fix this by using sizeof(*vport). Addresses-Coverity: ("Sizeof not portable") Fixes: 111601ff76e9 ("ALSA: sc6000: Allocate resources with device-managed APIs") Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/isa/sc6000.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/isa/sc6000.c b/sound/isa/sc6000.c index 6236c4fa766a..44c05b55fc15 100644 --- a/sound/isa/sc6000.c +++ b/sound/isa/sc6000.c @@ -552,7 +552,7 @@ static int snd_sc6000_probe(struct device *devptr, unsigned int dev) err = snd_devm_card_new(devptr, index[dev], id[dev], THIS_MODULE, - sizeof(vport), &card); + sizeof(*vport), &card); if (err < 0) return err; -- 2.31.1

2 1

[PATCH] ALSA: hda/hdmi: Add quirk to force pin connectivity on NUC10
by Kai Vehmanen 20 Jul '21

20 Jul '21

On some Intel NUC10 variants, codec reports AC_JACK_PORT_NONE as pin default config for all pins. This results in broken audio. Add a quirk to force connectivity. BugLink: https://github.com/clearlinux/distribution/issues/2396 Signed-off-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> --- sound/pci/hda/patch_hdmi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 2be5eaa3d968..65d2c5539919 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1945,6 +1945,7 @@ static const struct snd_pci_quirk force_connect_list[] = { SND_PCI_QUIRK(0x103c, 0x870f, "HP", 1), SND_PCI_QUIRK(0x103c, 0x871a, "HP", 1), SND_PCI_QUIRK(0x1462, 0xec94, "MS-7C94", 1), + SND_PCI_QUIRK(0x8086, 0x2081, "Intel NUC 10", 1), {} }; base-commit: 89b4a874d2af12ad13c1c36cdc93bbc05f56cd97 -- 2.32.0

2 1

[PATCH][next] ALSA: opti9xx: fix missing { } around an if block
by Colin King 20 Jul '21

20 Jul '21

From: Colin Ian King <colin.king(a)canonical.com> Currently the { } braces are missing around an if block causing subsequent code after the return to become unreachable. Fix this by adding the missing { }. Addresses-Coverity: ("Structurally dead code") Fixes: 2973ee4a5b54 ("ALSA: opti9xx: Allocate resources with device-managed APIs") Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/isa/opti9xx/opti92x-ad1848.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c index 8988de8cca96..4beeb32fe2a7 100644 --- a/sound/isa/opti9xx/opti92x-ad1848.c +++ b/sound/isa/opti9xx/opti92x-ad1848.c @@ -1096,9 +1096,10 @@ static int snd_opti9xx_pnp_probe(struct pnp_card_link *pcard, if (error) return error; error = snd_opti9xx_read_check(card, chip); - if (error) + if (error) { snd_printk(KERN_ERR "OPTI chip not found\n"); return error; + } error = snd_opti9xx_probe(card); if (error < 0) return error; -- 2.31.1

2 1

[PATCH -next] ALSA: nm256: Fix error return code in snd_nm256_create()
by Yang Yingliang 20 Jul '21

20 Jul '21

If pci_request_regions() fails, it should return error code in snd_nm256_create(). Reported-by: Hulk Robot <hulkci(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- sound/pci/nm256/nm256.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/pci/nm256/nm256.c b/sound/pci/nm256/nm256.c index a54b9b26a0c2..c9c178504959 100644 --- a/sound/pci/nm256/nm256.c +++ b/sound/pci/nm256/nm256.c @@ -1478,7 +1478,8 @@ snd_nm256_create(struct snd_card *card, struct pci_dev *pci) chip->buffer_addr = pci_resource_start(pci, 0); chip->cport_addr = pci_resource_start(pci, 1); - if (pci_request_regions(pci, card->driver)) + err = pci_request_regions(pci, card->driver); + if (err < 0) return err; /* Init the memory port info. */ -- 2.25.1

2 1

[PATCH] ALSA: pcm: Fix mmap without buffer preallocation
by Takashi Iwai 20 Jul '21

20 Jul '21

The recent rewrite of the memory allocation helpers also changed the page extraction to a common helper, snd_sgbuf_get_page(). But this assumes implicitly that the buffer was allocated via the standard helper (usually via preallocation), and didn't consider the case of the manual buffer handling. This patch fixes it and also covers the manual buffer management. Fixes: 37af81c5998f ("ALSA: core: Abstract memory alloc helpers") Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/core/pcm_native.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 6919d2943b9d..6a2971a7e6a1 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -3675,6 +3675,8 @@ static vm_fault_t snd_pcm_mmap_data_fault(struct vm_fault *vmf) return VM_FAULT_SIGBUS; if (substream->ops->page) page = substream->ops->page(substream, offset); + else if (!snd_pcm_get_dma_buf(substream)) + page = virt_to_page(runtime->dma_area + offset); else page = snd_sgbuf_get_page(snd_pcm_get_dma_buf(substream), offset); if (!page) -- 2.26.2

1 0