From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A177AC433F5 for ; Wed, 6 Oct 2021 06:43:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 83415610E5 for ; Wed, 6 Oct 2021 06:43:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235862AbhJFGpM (ORCPT ); Wed, 6 Oct 2021 02:45:12 -0400 Received: from cable.insite.cz ([84.242.75.189]:60610 "EHLO cable.insite.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232979AbhJFGpL (ORCPT ); Wed, 6 Oct 2021 02:45:11 -0400 Received: from localhost (localhost [127.0.0.1]) by cable.insite.cz (Postfix) with ESMTP id 787D8A1A3D403; Wed, 6 Oct 2021 08:43:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=ivitera.com; s=mail; t=1633502598; bh=j0JfYnRkZBCUFNZxEggYhpK/0sNW8X30UCgxNBf1kS0=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=jR/TILEvd+ccr/M26+vwTVEHrEaJph+3wQPAHut8vlvlJbSjXikg61SUJRd8srFkI t7NSyCGHXB+CCX8El7unmR3koKaYM0Bx0j3F/Da49R5iYTpUEWTr1EPVvDjy87uPQH jRsUe3L28/WXYNU2NccZMam8oQRdWRahZayojBvo= Received: from cable.insite.cz ([84.242.75.189]) by localhost (server.insite.cz [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UWub_Yev3x2r; Wed, 6 Oct 2021 08:43:13 +0200 (CEST) Received: from [192.168.105.22] (ip28.insite.cz [81.0.237.28]) (Authenticated sender: pavel) by cable.insite.cz (Postfix) with ESMTPSA id 0AA58A1A3D402; Wed, 6 Oct 2021 08:43:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=ivitera.com; s=mail; t=1633502593; bh=j0JfYnRkZBCUFNZxEggYhpK/0sNW8X30UCgxNBf1kS0=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=qDEJU+vLQa2ZcRdz0O+ig2CdrmNke6QDIyuewwOtd2Rhbqnl8pUBMfjql3oMkFlQi FYRniGyGOAUqS7UGrFqscnMsKOwnG84eSPZaPz/d5vUxl2gIt6Bf8whJp9JqEizklI a9vKivywZPFNW0hLy5jP3pPUxswundjuIa0Ln3MA= Subject: Re: [PATCH] usb: gadget: u_audio.c: Adding Playback Pitch ctl for sync playback To: Greg KH Cc: linux-usb@vger.kernel.org, Ruslan Bilovol , Felipe Balbi , Jerome Brunet , Jack Pham References: <20210925143003.12476-1-pavel.hofman@ivitera.com> From: Pavel Hofman Message-ID: Date: Wed, 6 Oct 2021 08:43:08 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=iso-8859-2; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Dne 05. 10. 21 v 13:31 Greg KH napsal(a): > On Sat, Sep 25, 2021 at 04:30:03PM +0200, Pavel Hofman wrote: >> EP IN is hard-coded as ASYNC both in f_uac1 and f_uac2 but u_audio sends >> steady number of audio frames in each USB packet, without any control. >> >> This patch adds 'Playback Pitch 1000000' ctl analogous to the existing >> 'Capture Pitch 1000000' ctl. The calculation of playback req->length in >> u_audio_iso_complete respects the Playback Pitch ctl value to 1ppm now. >> >> Max. value for Playback Pitch is configured by the existing parameter >> uac2_opts->fb_max, used also for the Capture Pitch. >> >> Since the EP IN packet size can be increased by uac2_opts->fb_max now, >> maxPacketSize for the playback direction is calculated by the same >> algorithm as for the async capture direction in >> f_uac2.c:set_ep_max_packet_size. >> >> Signed-off-by: Pavel Hofman >> --- >> drivers/usb/gadget/function/f_uac2.c | 5 +- >> drivers/usb/gadget/function/u_audio.c | 93 ++++++++++++++++++++------- >> 2 files changed, 74 insertions(+), 24 deletions(-) > > Does not apply to my tree, what kernel release / branch did you make > this against? > Greg, the patch requires patch 0560c9c ("usb: gadget: f_uac2: fixed EP-IN wMaxPacketSize") which I sent prior to this one (not as a patch series, this patch was not ready at that time). You applied 0560c9c to your usb-linus yesterday, hence this patch applies cleanly to usb-linus now. Your branch usb-next does not have 0560c9c yet, therefore the patch fails. But both patches apply cleanly to usb-next as a series, tested just now. This patch ("usb: gadget: u_audio.c: Adding Playback Pitch ctl for sync playback") is not a bugfix and can wait in usb-next. That goes back to my question of what are the rules for the two of your branches. What if a new patch requires patches from both usb-linus (bugfix) and usb-next (new features)? Thanks a lot for explaining and applying the patch, Pavel.