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 065B0C433EF for ; Wed, 6 Oct 2021 07:45:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D149D60F5B for ; Wed, 6 Oct 2021 07:45:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237531AbhJFHrb (ORCPT ); Wed, 6 Oct 2021 03:47:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:49434 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230013AbhJFHrb (ORCPT ); Wed, 6 Oct 2021 03:47:31 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E6AFB60F5B; Wed, 6 Oct 2021 07:45:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1633506339; bh=ZmhN0p2Q0afbdhcCJY7Qn0HizzmVgFqSJ8kYb/azv0M=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=ZGqPLy9r2QanDidt2L48uyU87qgvtsWemdvkYRDfszeyvpdXxdYYHuKKBzO2vWzWX QLy7rbLtYmiUtTxYwq9pypTHa2kkYBabipIefDz9EiAQ9/XZtuuzJehO2IQ6zBvJoU OZnoCQ6xzGdHCHoqwQA0bLNUcfd/a4H7PTzpiWQY= Date: Wed, 6 Oct 2021 09:45:37 +0200 From: Greg KH To: Pavel Hofman Cc: linux-usb@vger.kernel.org Subject: Re: [PATCH] usb: gadget: u_audio.c: Adding Playback Pitch ctl for sync playback Message-ID: References: <20210925143003.12476-1-pavel.hofman@ivitera.com> <37a0e221-6332-86a4-fade-60a6225d5bc5@ivitera.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <37a0e221-6332-86a4-fade-60a6225d5bc5@ivitera.com> Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org On Wed, Oct 06, 2021 at 09:40:51AM +0200, Pavel Hofman wrote: > > > Dne 06. 10. 21 v 9:34 Greg KH napsal(a): > > On Wed, Oct 06, 2021 at 08:43:08AM +0200, Pavel Hofman wrote: > > > > > > 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)? > > > > I have 2 branches (well 3) in my tree: > > master - tracks Linus's tree > > usb-linus - patches to go to Linus for "this" release > > usb-next - patches to go to Linus for the "next" release > > > > > > So bugfixes go into usb-linus, and new features go into usb-next. > > > > After the patches in usb-linus get merged into Linus, I merge that > > branch (well Linus's -rc release) into the usb-next branch so that > > dependencies can get resolved and bugfixes show up for testing. > > Greg, thanks for the explanation. Very useful. > > > > > or tell me and I will wait until that happens myself. > > Is there a standardized way for that, e.g. somewhere in the PATCH mail > message? Put notes below the --- line and I will read them :) thanks, greg k-h