From owner-svn-src-all@freebsd.org Wed Mar 21 15:24:47 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EDD9DF4D2E2; Wed, 21 Mar 2018 15:24:46 +0000 (UTC) (envelope-from byond.lenox@gmail.com) Received: from mail-lf0-f47.google.com (mail-lf0-f47.google.com [209.85.215.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 464A9759FC; Wed, 21 Mar 2018 15:24:46 +0000 (UTC) (envelope-from byond.lenox@gmail.com) Received: by mail-lf0-f47.google.com with SMTP id z143-v6so8466217lff.3; Wed, 21 Mar 2018 08:24:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=ciJEVQPkr6Hpt1isNVMD2qVCaO8d4lkuR+9OjgaAZkU=; b=D68eeQBGR91RKq/yvNq3BHciw48Lo3XquyhE0BDMPqetvl9ds5CU9awAJWTelFQIYs zXrNJGgFuU5+mkrGU8hMuk3SaQJctsQA4HEYjyDfMlews+GRFES/zUkc/mfgO/mmo58O ScQaSujUhgwuE5zWTer1KqrzQC0YlqXQ4Qxa/qXyNXoTcOHouRJQzgZbX9gaqEWZrM9z vGfYzUCuJIuak7sGSMYlCA8FR7TS0g/UV3kD7L0GvGAx5d7tRe5qiBtugVTBQ1sdQYsx We9WJOPIU7ImwXZN4Z2MeWezRD0l9+7aErcPe0qQlP5WBptSIzXTLAB8NwxhL/v4Nw7u u15Q== X-Gm-Message-State: AElRT7H1DkjOCkUIia0n8Aqlyf6EV6tY8eTkdlAkPdFKMlkzVEwov2tv sIOTAfbP1HpuO3Lp9R49wXx8bpmC X-Google-Smtp-Source: AG47ELsMETvoBcSbaxa3by1lU2ldudeKr0qxuX7006Cxtuof0mhdpfZlwBJgqzJgSWeJe69kDOiT0Q== X-Received: by 2002:a19:590c:: with SMTP id n12-v6mr14759131lfb.10.1521645878495; Wed, 21 Mar 2018 08:24:38 -0700 (PDT) Received: from mail-lf0-f47.google.com (mail-lf0-f47.google.com. [209.85.215.47]) by smtp.gmail.com with ESMTPSA id p1sm932659lje.56.2018.03.21.08.24.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Mar 2018 08:24:38 -0700 (PDT) Received: by mail-lf0-f47.google.com with SMTP id e5-v6so8464727lfb.7; Wed, 21 Mar 2018 08:24:38 -0700 (PDT) X-Received: by 10.46.155.204 with SMTP id w12mr13690980ljj.76.1521645878198; Wed, 21 Mar 2018 08:24:38 -0700 (PDT) MIME-Version: 1.0 Received: by 10.46.129.90 with HTTP; Wed, 21 Mar 2018 08:24:17 -0700 (PDT) In-Reply-To: <201803211517.w2LFHsHf007714@repo.freebsd.org> References: <201803211517.w2LFHsHf007714@repo.freebsd.org> From: Kyle Evans Date: Wed, 21 Mar 2018 10:24:17 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r331306 - head/sys/dev/usb/controller To: Andrew Turner , Hans Petter Selasky Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Mar 2018 15:24:47 -0000 On Wed, Mar 21, 2018 at 10:17 AM, Andrew Turner wrote: > Author: andrew > Date: Wed Mar 21 15:17:54 2018 > New Revision: 331306 > URL: https://svnweb.freebsd.org/changeset/base/331306 > > Log: > Use a table to find the endpoint configuration > > On the Allwinner SoCs we need to set a custom endpoint configuration. To > allow for this use a table to store the configuration so the attachment > can override it. > > Reviewed by: hselasky > Sponsored by: DARPA, AFRL > Differential Revision: https://reviews.freebsd.org/D14783 > > Modified: > head/sys/dev/usb/controller/musb_otg.c > head/sys/dev/usb/controller/musb_otg.h > > Modified: head/sys/dev/usb/controller/musb_otg.c > ============================================================================== > --- head/sys/dev/usb/controller/musb_otg.c Wed Mar 21 15:13:47 2018 (r331305) > +++ head/sys/dev/usb/controller/musb_otg.c Wed Mar 21 15:17:54 2018 (r331306) > @@ -149,6 +149,27 @@ static const struct usb_hw_ep_profile musbotg_ep_profi > } > }; > > +static const struct musb_otg_ep_cfg musbotg_ep_default[] = { > + { > + .ep_end = 1, > + .ep_fifosz_shift = 12, > + .ep_fifosz_reg = MUSB2_VAL_FIFOSZ_4096 | MUSB2_MASK_FIFODB, > + }, > + { > + .ep_end = 7, > + .ep_fifosz_shift = 9, > + .ep_fifosz_reg = MUSB2_VAL_FIFOSZ_512 | MUSB2_MASK_FIFODB, > + }, I'm afraid I'm not familiar with this- why did .ep_fifosz_shift for this case drop to 9? frx = 10 in the temp < 8 case in the removals of the following hunks. Mostly curious because the others seemed to stay the same. > [..snip..] > @@ -3193,20 +3220,15 @@ musbotg_init(struct musbotg_softc *sc) > > if (dynfifo) { > if (frx && (temp <= nrx)) { > - if (temp == 1) { > - frx = 12; /* 4K */ > - MUSB2_WRITE_1(sc, MUSB2_REG_RXFIFOSZ, > - MUSB2_VAL_FIFOSZ_4096 | > - MUSB2_MASK_FIFODB); > - } else if (temp < 8) { > - frx = 10; /* 1K */ > - MUSB2_WRITE_1(sc, MUSB2_REG_RXFIFOSZ, > - MUSB2_VAL_FIFOSZ_512 | > - MUSB2_MASK_FIFODB); > - } else { > - frx = 7; /* 128 bytes */ > - MUSB2_WRITE_1(sc, MUSB2_REG_RXFIFOSZ, > - MUSB2_VAL_FIFOSZ_128); > + for (i = 0; sc->sc_ep_cfg[i].ep_end >= 0; i++) { > + cfg = &sc->sc_ep_cfg[i]; > + if (temp <= cfg->ep_end) { > + frx = cfg->ep_fifosz_shift; > + MUSB2_WRITE_1(sc, > + MUSB2_REG_RXFIFOSZ, > + cfg->ep_fifosz_reg); > + break; > + } > } > > MUSB2_WRITE_2(sc, MUSB2_REG_RXFIFOADD, > @@ -3215,20 +3237,15 @@ musbotg_init(struct musbotg_softc *sc) > offset += (1 << frx); > } > if (ftx && (temp <= ntx)) { > - if (temp == 1) { > - ftx = 12; /* 4K */ > - MUSB2_WRITE_1(sc, MUSB2_REG_TXFIFOSZ, > - MUSB2_VAL_FIFOSZ_4096 | > - MUSB2_MASK_FIFODB); > - } else if (temp < 8) { > - ftx = 10; /* 1K */ > - MUSB2_WRITE_1(sc, MUSB2_REG_TXFIFOSZ, > - MUSB2_VAL_FIFOSZ_512 | > - MUSB2_MASK_FIFODB); > - } else { > - ftx = 7; /* 128 bytes */ > - MUSB2_WRITE_1(sc, MUSB2_REG_TXFIFOSZ, > - MUSB2_VAL_FIFOSZ_128); > + for (i = 0; sc->sc_ep_cfg[i].ep_end >= 0; i++) { > + cfg = &sc->sc_ep_cfg[i]; > + if (temp <= cfg->ep_end) { > + ftx = cfg->ep_fifosz_shift; > + MUSB2_WRITE_1(sc, > + MUSB2_REG_TXFIFOSZ, > + cfg->ep_fifosz_reg); > + break; > + } > } > > MUSB2_WRITE_2(sc, MUSB2_REG_TXFIFOADD, > > Modified: head/sys/dev/usb/controller/musb_otg.h > ============================================================================== > --- head/sys/dev/usb/controller/musb_otg.h Wed Mar 21 15:13:47 2018 (r331305) > +++ head/sys/dev/usb/controller/musb_otg.h Wed Mar 21 15:17:54 2018 (r331306) > @@ -387,6 +387,12 @@ struct musbotg_flags { > uint8_t d_pulled_up:1; > }; > > +struct musb_otg_ep_cfg { > + int ep_end; > + int ep_fifosz_shift; > + uint8_t ep_fifosz_reg; > +}; > + > struct musbotg_softc { > struct usb_bus sc_bus; > union musbotg_hub_temp sc_hub_temp; > @@ -423,6 +429,7 @@ struct musbotg_softc { > uint8_t sc_id; > uint8_t sc_mode; > void *sc_platform_data; > + const struct musb_otg_ep_cfg *sc_ep_cfg; > }; > > /* prototypes */ >