From patchwork Tue Jul 21 09:57:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ren=C3=A9_Herman?= X-Patchwork-Id: 11675283 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0FCB6618 for ; Tue, 21 Jul 2020 10:00:51 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 98EFF208E4 for ; Tue, 21 Jul 2020 10:00:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="KJ2PdCBl"; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="uerpUqtw" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 98EFF208E4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 2FC21169A; Tue, 21 Jul 2020 12:00:02 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 2FC21169A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1595325648; bh=6sA30XV+Rzi+uhrepSY3mJ9CNaO1cOzmPZ96ufz1Tnk=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=KJ2PdCBl07HjDQlpYPlDrjR9lUXawo1s+ykFlsqzWuqSpEnCkT2Wy4+oV6wvYpcNi gsRymbFGPU+2mjv54kzUoTz7BAieagIq9cTn4XJ9mB07EpgWsyeAWp5qV8ZxDYa2D6 2CsuT71fUVyE5g12qZ/oKihf+monvYRHgcsgsJkE= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 5F79CF8028B; Tue, 21 Jul 2020 11:58:34 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id 3806EF8024A; Tue, 21 Jul 2020 11:58:20 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on alsa1.perex.cz X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,SPF_PASS autolearn=disabled version=3.4.0 Received: from mail-ej1-x644.google.com (mail-ej1-x644.google.com [IPv6:2a00:1450:4864:20::644]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 51112F80117 for ; Tue, 21 Jul 2020 11:58:11 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 51112F80117 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="uerpUqtw" Received: by mail-ej1-x644.google.com with SMTP id f12so21001211eja.9 for ; Tue, 21 Jul 2020 02:58:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EaN6m4B+HW5c6N/gdC+oV2bOL95NDEqzPoV4eaRFmy8=; b=uerpUqtw3T7DXPJa6fr2yvoIyaNleI2h+uzeC8QwPcvsiR3vUvYfUg+RCR8C945evO oqNknGnRTOibvk5olx9JGWat0DpIDCjZgsddGyFkWDFdD5KFyKate9Mvvel6oybYbVIK Qse5oGHvOxRjHP6hkzVbwAOvEZDhJ1R/zecvKmhSYelKP02L0oWdudXkyzty5snzMn+G srB3eLHhjUZatyoFDQCC7nY5xv2ZG5HDv/oi4Tr0UX0YENBrd8Pg+Dj7Ch9hMkNnx1hz 8E+1Z/UXInSz+cioX4Il1AMFz174wQdpDm6iHYAk9ndxDz0em+e78wlmlBK6mgeQ88yQ hf2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EaN6m4B+HW5c6N/gdC+oV2bOL95NDEqzPoV4eaRFmy8=; b=QFd90CH0bOXvbg+2q7et3b9C9Vz+9Y0lN9Ci0lXJlQ3juXV5n9FO//HwBRvbYhmi2I 6yP+0qQ5darZVGaQXrQ8mFQ8D/sbSBH7FVsVVvAK4O42oll8yPdDe1yjHmfnE9qaU1Xh 0P5EXAbM6ezuL99LxHEaiaHq/pyUxlWMEndMahD4ctPtIxIe+xgSKeZ9/pT+wLi1NCDF 7vyN3/tdUtA+Ool9N/5w7b/X7v5XTpBokiSKR2QtB9PVBeEKzdsc7Q78Qb0AVOibU68R k+S2gxERRes3Sk0SOkRnR+aAHZNUPwCx79smdJ7RXX/YXwWOnqglPyObG/xVDvVtT91+ xe7g== X-Gm-Message-State: AOAM5320tAU4/j1Pp6zpBpRkhoK2oVQo4mA4r8GvsTRYGAmk0kEYMofm 0Ud2RPfxBLRL6ylcfhGM2KFaW/BtubAW7A== X-Google-Smtp-Source: ABdhPJyVMtCRa+tYrQ7gy/R7ciqd1wTunOltWXBowItQagkXgej5jDRTggurjecM4eVuSV8lMTIZkg== X-Received: by 2002:a17:906:1414:: with SMTP id p20mr24210750ejc.247.1595325491308; Tue, 21 Jul 2020 02:58:11 -0700 (PDT) Received: from t5500.home (2001-1c01-2f03-7200-763c-d807-63d8-4d15.cable.dynamic.v6.ziggo.nl. [2001:1c01:2f03:7200:763c:d807:63d8:4d15]) by smtp.gmail.com with ESMTPSA id o17sm16426079ejb.105.2020.07.21.02.58.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jul 2020 02:58:10 -0700 (PDT) From: =?utf-8?q?Ren=C3=A9_Herman?= To: Takashi Iwai Subject: [PATCH v2 1/2] Move DMA-buffer off the stack Date: Tue, 21 Jul 2020 11:57:47 +0200 Message-Id: <20200721095748.16224-2-rene.herman@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200721095748.16224-1-rene.herman@gmail.com> References: <20200721095748.16224-1-rene.herman@gmail.com> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, Torsten Schenk X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" snd-usb-fire currently fails its firmware load with "transfer buffer not dma capable". Move said buffer off of the stack. Signed-off-by: René Herman --- sound/usb/6fire/firmware.c | 95 ++++++++++++++++++-------------------- 1 file changed, 46 insertions(+), 49 deletions(-) diff --git a/sound/usb/6fire/firmware.c b/sound/usb/6fire/firmware.c index 69137c14d0dc..502653a89f01 100644 --- a/sound/usb/6fire/firmware.c +++ b/sound/usb/6fire/firmware.c @@ -355,63 +355,60 @@ static int usb6fire_fw_check(struct usb_interface *intf, const u8 *version) int usb6fire_fw_init(struct usb_interface *intf) { - int i; - int ret; struct usb_device *device = interface_to_usbdev(intf); + int ret, i; + /* buffer: 8 receiving bytes from device and * sizeof(EP_W_MAX_PACKET_SIZE) bytes for non-const copy */ - u8 buffer[12]; + u8 *buffer = kmalloc(12, GFP_KERNEL); + + if (!buffer) + return -ENOMEM; ret = usb6fire_fw_ezusb_read(device, 1, 0, buffer, 8); if (ret < 0) { dev_err(&intf->dev, "unable to receive device firmware state.\n"); - return ret; - } - if (buffer[0] != 0xeb || buffer[1] != 0xaa || buffer[2] != 0x55) { - dev_err(&intf->dev, - "unknown device firmware state received from device:"); - for (i = 0; i < 8; i++) - printk(KERN_CONT "%02x ", buffer[i]); - printk(KERN_CONT "\n"); - return -EIO; - } - /* do we need fpga loader ezusb firmware? */ - if (buffer[3] == 0x01) { - ret = usb6fire_fw_ezusb_upload(intf, - "6fire/dmx6firel2.ihx", 0, NULL, 0); - if (ret < 0) - return ret; - return FW_NOT_READY; + goto out; } - /* do we need fpga firmware and application ezusb firmware? */ - else if (buffer[3] == 0x02) { - ret = usb6fire_fw_check(intf, buffer + 4); - if (ret < 0) - return ret; - ret = usb6fire_fw_fpga_upload(intf, "6fire/dmx6firecf.bin"); - if (ret < 0) - return ret; - memcpy(buffer, ep_w_max_packet_size, - sizeof(ep_w_max_packet_size)); - ret = usb6fire_fw_ezusb_upload(intf, "6fire/dmx6fireap.ihx", - 0x0003, buffer, sizeof(ep_w_max_packet_size)); - if (ret < 0) - return ret; - return FW_NOT_READY; - } - /* all fw loaded? */ - else if (buffer[3] == 0x03) - return usb6fire_fw_check(intf, buffer + 4); - /* unknown data? */ - else { - dev_err(&intf->dev, - "unknown device firmware state received from device: "); - for (i = 0; i < 8; i++) - printk(KERN_CONT "%02x ", buffer[i]); - printk(KERN_CONT "\n"); - return -EIO; + if (buffer[0] == 0xeb && buffer[1] == 0xaa && buffer[2] == 0x55) { + /* do we need fpga loader ezusb firmware? */ + if (buffer[3] == 1) { + ret = usb6fire_fw_ezusb_upload(intf, + "6fire/dmx6firel2.ihx", 0, NULL, 0); + if (ret >= 0) + ret = FW_NOT_READY; + goto out; + } + /* do we need fpga firmware and application ezusb firmware? */ + if (buffer[3] == 2) { + ret = usb6fire_fw_check(intf, buffer + 4); + if (ret < 0) + goto out; + ret = usb6fire_fw_fpga_upload(intf, "6fire/dmx6firecf.bin"); + if (ret < 0) + goto out; + memcpy(buffer, ep_w_max_packet_size, + sizeof(ep_w_max_packet_size)); + ret = usb6fire_fw_ezusb_upload(intf, "6fire/dmx6fireap.ihx", + 0x0003, buffer, sizeof(ep_w_max_packet_size)); + if (ret >= 0) + ret = FW_NOT_READY; + goto out; + } + /* all fw loaded? */ + if (buffer[3] == 3) { + ret = usb6fire_fw_check(intf, buffer + 4); + goto out; + } } - return 0; + dev_err(&intf->dev, + "unknown device firmware state received from device: "); + for (i = 0; i < 8; i++) + printk(KERN_CONT "%02x ", buffer[i]); + printk(KERN_CONT "\n"); + ret = -EIO; + +out: kfree(buffer); + return ret; } - From patchwork Tue Jul 21 09:57:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ren=C3=A9_Herman?= X-Patchwork-Id: 11675277 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1DCD5618 for ; Tue, 21 Jul 2020 09:59:10 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1592C20729 for ; Tue, 21 Jul 2020 09:59:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="iqfO1amD"; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="t0m7J3cK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1592C20729 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 0DE581669; Tue, 21 Jul 2020 11:58:21 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 0DE581669 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1595325547; bh=toxX3ay6KFkAOXqip8vQyySu6iLUjfMkUX4+3iEyypk=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=iqfO1amDftyfYTEdiSgKKpBEPswk3QCvjTUsyCRTLQXNpmANkZRTi4Gj85WjysmcA VwQ9KjNXy4WuXkCBV1pOPaqRkCmHWBJzmZnZL57+u8C4dmDC0ua1h/fxrYjF6Tu1us ckCFa+YcEUaZFQ9fVlTDuQsEUoU9QfxCaUjBj1kU= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 8E464F80117; Tue, 21 Jul 2020 11:58:20 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id C02CFF80274; Tue, 21 Jul 2020 11:58:18 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on alsa1.perex.cz X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,SPF_PASS autolearn=disabled version=3.4.0 Received: from mail-ej1-x641.google.com (mail-ej1-x641.google.com [IPv6:2a00:1450:4864:20::641]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 64D01F8024A for ; Tue, 21 Jul 2020 11:58:12 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 64D01F8024A Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="t0m7J3cK" Received: by mail-ej1-x641.google.com with SMTP id rk21so21060105ejb.2 for ; Tue, 21 Jul 2020 02:58:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eBCLfYeJXOZusVoEeZmuNPBvbkxJljfVbIgIuShjfrc=; b=t0m7J3cKCDBSn5StTo/Zj/x5WR7QvJObd/9SNkTMTQhfGNQ/nPYXKGP4y5PTanoMmt ZxKtxCRGzZmz+3uIzDVpvQwfnmsEvc4Q7n4olM1JTJVohnfhYqNjz1KbryeNuNIldC1M Z2l3q4q9SU5YEwrSj97hSY/qR4xlIPzjJB1J9+fkWC3+fSCn6urUc4G68Dk6nRqJ3lWF g8xcOEagLdqyhTCLdZVUMWu3KQfE+kA5pkYu6G9Rl3lRNQJKdHZqFN25d7oxkbjU7jRn xMO0bEse5C5XKWLbmmgEcYvUG8lpFQmu+7e+7T0rWhaIlqOBGDL68uOHiReLDUp2R/Fa wThg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eBCLfYeJXOZusVoEeZmuNPBvbkxJljfVbIgIuShjfrc=; b=n3rmRW+tGt18XJB0koRE9wo4hvJxlWlRWwTsM7inMk3bmSod130KfEwCHDABSFcYo1 h1lP1wjror/0Peb8qg2lH33uUQL6A7PIAtfosoht16QGIpN4FSVDZAyv4ffwyg3xauHW Mjpz81EX+HWpVTGszaDfBv7shT8U6rgKHQslqaxMek8uSdRaG5jjXK9yv3/aQ/4Fyj2V rheF683lpltH8olhShL+XY/cQvAjsrEm9tPkrEMwABy2Oi4SaHFFIFhu0rDx/J9tc6fU lIqOuUarzysG2SLNVhyHIucADCB2Rav/Vgshu2Tma8Xwu19OJ0is1HZxMm3xv6z58qdX Bigw== X-Gm-Message-State: AOAM531fTYRJNFnia/L5vniDoJagmuupQX8mrxCALJg+rYw/9dvYx7sd qDa6CTnpDDOO6wqA7DeK0LU= X-Google-Smtp-Source: ABdhPJzJrzrC1Oem9FuZoV69MAFANon+oIsoi9bOeyVhXgQmrAi/ILO+sLiOsNOVKC4ByUHb0wjPaA== X-Received: by 2002:a17:906:958f:: with SMTP id r15mr23208558ejx.77.1595325492062; Tue, 21 Jul 2020 02:58:12 -0700 (PDT) Received: from t5500.home (2001-1c01-2f03-7200-763c-d807-63d8-4d15.cable.dynamic.v6.ziggo.nl. [2001:1c01:2f03:7200:763c:d807:63d8:4d15]) by smtp.gmail.com with ESMTPSA id o17sm16426079ejb.105.2020.07.21.02.58.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jul 2020 02:58:11 -0700 (PDT) From: =?utf-8?q?Ren=C3=A9_Herman?= To: Takashi Iwai Subject: [PATCH v2 2/2] Pulseaudio needs snd_pcm_hardware.channels_min > 1 Date: Tue, 21 Jul 2020 11:57:48 +0200 Message-Id: <20200721095748.16224-3-rene.herman@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200721095748.16224-1-rene.herman@gmail.com> References: <20200721095748.16224-1-rene.herman@gmail.com> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, Torsten Schenk X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" Pulseaudio with snd_pcm_hardware.channels_min=1 creates a mono device only. Signed-off-by: René Herman --- sound/usb/6fire/pcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/usb/6fire/pcm.c b/sound/usb/6fire/pcm.c index 88ac1c4ee163..cce1312db93a 100644 --- a/sound/usb/6fire/pcm.c +++ b/sound/usb/6fire/pcm.c @@ -58,7 +58,7 @@ static const struct snd_pcm_hardware pcm_hw = { .rate_min = 44100, .rate_max = 192000, - .channels_min = 1, + .channels_min = 2, .channels_max = 0, /* set in pcm_open, depending on capture/playback */ .buffer_bytes_max = MAX_BUFSIZE, .period_bytes_min = PCM_N_PACKETS_PER_URB * (PCM_MAX_PACKET_SIZE - 4),