From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by mx.groups.io with SMTP id smtpd.web10.7147.1589380025719540555 for ; Wed, 13 May 2020 07:27:06 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@nuviainc-com.20150623.gappssmtp.com header.s=20150623 header.b=v4LMBCal; spf=pass (domain: nuviainc.com, ip: 209.85.221.68, mailfrom: leif@nuviainc.com) Received: by mail-wr1-f68.google.com with SMTP id w7so21157481wre.13 for ; Wed, 13 May 2020 07:27:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuviainc-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to :user-agent; bh=xGL7ZWe8yi6fG57UTSrkw3JFf3/G9GZSWsO7PmqJvU4=; b=v4LMBCalCIsfsvzF8TxXyJz4Xyy0LpUyi6H1k70Ka+EZTLnEY+FPAXEz2suSD6dMym mUuBJIPNNzwbL1CrglepjjL4zcJZdlCSAvJazA1EqpnPuNUXEGgUcgVZa2/dDKwo6hVB eJiyxTKFfSsy7tN8vL2yAE++j2noxPUVeE3pOicfsTTbQ3t0+ivJbMGmj5TNqRJdch7r rTwyeJF3SbjlgyHWqGD1/iUj7ihTgo+4Sj+Fy2TxoAr8RMvvFMr7SWwXIfFPbTkcJLBl tbRtOs20n10AxVLmaew5u/0fyoUmys6fiL6D3Sk2yy42eSTQypTMZ587IyxpxDprDI4A +mKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to:user-agent; bh=xGL7ZWe8yi6fG57UTSrkw3JFf3/G9GZSWsO7PmqJvU4=; b=a8RjSpg5VorZkziOkpk/sVtrstUcolX87ahLc/MfnmRoKbp1Fpuy5FlQxg27AVUkBC 8OhNIxrxzoGUGcxMA+HdLkCc1l2zlwjWi2guPurokMPLH2eCsvVdBbQsdcSj1zRirdw+ siH4Fq5j5DbxmeDnqKNxHOMxfCnca3bx/Epg+J6AFXxLh9Fd1wXo0XNrhZwij2rknMlV vadNShe0M545mIocucMh7lIHS3PZabc4wXGSXrhVPjWAKj30shTDQwbe+PgicjeJawKm +9CCKbNAKd5twrD3Zawsb6Mivw0Dl6EWbThYml4hrpc2sBaa1t5fuI/BBehsF7wgZYOO llxQ== X-Gm-Message-State: AGi0PubuIIU7XDleDTchXCAV6Xj5tNUJ/h7fcX0oyFQVLXhlAgak+NY+ L7cjZ21kHl0iisZRW1roSyMbkg== X-Google-Smtp-Source: APiQypKiYtcMvpaLoXto5WrdKq//+BnCtfkh/970VtvtGSI6orQRWiGSMKFMGibscDHVfVxltKYxxA== X-Received: by 2002:a5d:6108:: with SMTP id v8mr30161972wrt.286.1589380024251; Wed, 13 May 2020 07:27:04 -0700 (PDT) Return-Path: Received: from vanye ([2001:470:1f09:12f0:b26e:bfff:fea9:f1b8]) by smtp.gmail.com with ESMTPSA id s8sm2612wrg.34.2020.05.13.07.27.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 May 2020 07:27:03 -0700 (PDT) Date: Wed, 13 May 2020 15:27:00 +0100 From: "Leif Lindholm" To: Marcin Wojtas Cc: edk2-devel-groups-io , ard.biesheuvel@arm.com, "jsd@semihalf.com" , Grzegorz Jaszczyk , Kostya Porotchkin Subject: Re: [edk2-platforms: PATCH 1/3] Marvell/Library: UtmiLib: update USB2.0 analog settings Message-ID: <20200513142700.GR21486@vanye> References: <1589309971-12939-1-git-send-email-mw@semihalf.com> <1589309971-12939-2-git-send-email-mw@semihalf.com> <20200513134126.GQ21486@vanye> MIME-Version: 1.0 In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit On Wed, May 13, 2020 at 15:55:47 +0200, Marcin Wojtas wrote: > Hi Leif, > > śr., 13 maj 2020 o 15:41 Leif Lindholm napisał(a): > > > > On Tue, May 12, 2020 at 20:59:29 +0200, Marcin Wojtas wrote: > > > This patch introduce following modifications, allowing to > > > overcome the instabilities observed with certain USB2.0 endpoints: > > > * Add additional step which enables the Impedance and PLL calibration. > > > * Enable old squelch detector instead of the new analog squelch detector > > > circuit and update host disconnect threshold value. > > > * Update LS TX driver strength coarse and fine adjustment values. > > > > > > Signed-off-by: Grzegorz Jaszczyk > > > Signed-off-by: Marcin Wojtas > > > --- > > > Silicon/Marvell/Library/UtmiPhyLib/UtmiPhyLib.h | 10 +++++++- > > > Silicon/Marvell/Library/UtmiPhyLib/UtmiPhyLib.c | 26 ++++++++++++++------ > > > 2 files changed, 27 insertions(+), 9 deletions(-) > > > > > > diff --git a/Silicon/Marvell/Library/UtmiPhyLib/UtmiPhyLib.h b/Silicon/Marvell/Library/UtmiPhyLib/UtmiPhyLib.h > > > index 20e3133..8659110 100644 > > > --- a/Silicon/Marvell/Library/UtmiPhyLib/UtmiPhyLib.h > > > +++ b/Silicon/Marvell/Library/UtmiPhyLib/UtmiPhyLib.h > > > @@ -44,6 +44,10 @@ SPDX-License-Identifier: BSD-2-Clause-Patent > > > #define UTMI_CALIB_CTRL_REG 0x8 > > > #define UTMI_CALIB_CTRL_IMPCAL_VTH_OFFSET 8 > > > #define UTMI_CALIB_CTRL_IMPCAL_VTH_MASK (0x7 << UTMI_CALIB_CTRL_IMPCAL_VTH_OFFSET) > > > +#define UTMI_CALIB_CTRL_IMPCAL_START_OFFSET 13 > > > +#define UTMI_CALIB_CTRL_IMPCAL_START_MASK (0x1 << UTMI_CALIB_CTRL_IMPCAL_START_OFFSET) > > > +#define UTMI_CALIB_CTRL_PLLCAL_START_OFFSET 22 > > > +#define UTMI_CALIB_CTRL_PLLCAL_START_MASK (0x1 << UTMI_CALIB_CTRL_PLLCAL_START_OFFSET) > > > #define UTMI_CALIB_CTRL_IMPCAL_DONE_OFFSET 23 > > > #define UTMI_CALIB_CTRL_IMPCAL_DONE_MASK (0x1 << UTMI_CALIB_CTRL_IMPCAL_DONE_OFFSET) > > > #define UTMI_CALIB_CTRL_PLLCAL_DONE_OFFSET 31 > > > @@ -54,8 +58,12 @@ SPDX-License-Identifier: BSD-2-Clause-Patent > > > #define UTMI_TX_CH_CTRL_DRV_EN_LS_MASK (0xf << UTMI_TX_CH_CTRL_DRV_EN_LS_OFFSET) > > > #define UTMI_TX_CH_CTRL_IMP_SEL_LS_OFFSET 16 > > > #define UTMI_TX_CH_CTRL_IMP_SEL_LS_MASK (0xf << UTMI_TX_CH_CTRL_IMP_SEL_LS_OFFSET) > > > +#define UTMI_TX_CH_CTRL_AMP_OFFSET 20 > > > +#define UTMI_TX_CH_CTRL_AMP_MASK (0x7 << UTMI_TX_CH_CTRL_AMP_OFFSET) > > > > > > #define UTMI_RX_CH_CTRL0_REG 0x14 > > > +#define UTMI_RX_CH_CTRL0_DISCON_THRESH_OFFSET 8 > > > +#define UTMI_RX_CH_CTRL0_DISCON_THRESH_MASK (0x3 << UTMI_RX_CH_CTRL0_DISCON_THRESH_OFFSET) > > > #define UTMI_RX_CH_CTRL0_SQ_DET_OFFSET 15 > > > #define UTMI_RX_CH_CTRL0_SQ_DET_MASK (0x1 << UTMI_RX_CH_CTRL0_SQ_DET_OFFSET) > > > #define UTMI_RX_CH_CTRL0_SQ_ANA_DTC_OFFSET 28 > > > @@ -63,7 +71,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent > > > > > > #define UTMI_RX_CH_CTRL1_REG 0x18 > > > #define UTMI_RX_CH_CTRL1_SQ_AMP_CAL_OFFSET 0 > > > -#define UTMI_RX_CH_CTRL1_SQ_AMP_CAL_MASK (0x3 << UTMI_RX_CH_CTRL1_SQ_AMP_CAL_OFFSET) > > > +#define UTMI_RX_CH_CTRL1_SQ_AMP_CAL_MASK (0x7 << UTMI_RX_CH_CTRL1_SQ_AMP_CAL_OFFSET) > > > #define UTMI_RX_CH_CTRL1_SQ_AMP_CAL_EN_OFFSET 3 > > > #define UTMI_RX_CH_CTRL1_SQ_AMP_CAL_EN_MASK (0x1 << UTMI_RX_CH_CTRL1_SQ_AMP_CAL_EN_OFFSET) > > > > > > diff --git a/Silicon/Marvell/Library/UtmiPhyLib/UtmiPhyLib.c b/Silicon/Marvell/Library/UtmiPhyLib/UtmiPhyLib.c > > > index 3881ebd..60ea06e 100644 > > > --- a/Silicon/Marvell/Library/UtmiPhyLib/UtmiPhyLib.c > > > +++ b/Silicon/Marvell/Library/UtmiPhyLib/UtmiPhyLib.c > > > @@ -117,24 +117,34 @@ UtmiPhyConfig ( > > > RegSet (UtmiBaseAddr + UTMI_PLL_CTRL_REG, Data, Mask); > > > > > > /* Impedance Calibration Threshold Setting */ > > > - RegSet (UtmiBaseAddr + UTMI_CALIB_CTRL_REG, > > > - 0x6 << UTMI_CALIB_CTRL_IMPCAL_VTH_OFFSET, > > > - UTMI_CALIB_CTRL_IMPCAL_VTH_MASK); > > > + Mask = UTMI_CALIB_CTRL_IMPCAL_VTH_MASK; > > > + Data = 0x7 << UTMI_CALIB_CTRL_IMPCAL_VTH_OFFSET; > > > + RegSet (UtmiBaseAddr + UTMI_CALIB_CTRL_REG, Data, Mask); > > > + > > > + /* Start Impedance and PLL Calibration */ > > > + Mask = UTMI_CALIB_CTRL_PLLCAL_START_MASK; > > > + Data = (0x1 << UTMI_CALIB_CTRL_PLLCAL_START_OFFSET); > > > + Mask |= UTMI_CALIB_CTRL_IMPCAL_START_MASK; > > > + Data |= (0x1 << UTMI_CALIB_CTRL_IMPCAL_START_OFFSET); > > > + RegSet (UtmiBaseAddr + UTMI_CALIB_CTRL_REG, Data, Mask); > > > > > > /* Set LS TX driver strength coarse control */ > > > - Mask = UTMI_TX_CH_CTRL_DRV_EN_LS_MASK; > > > - Data = 0x3 << UTMI_TX_CH_CTRL_DRV_EN_LS_OFFSET; > > > - /* Set LS TX driver fine adjustment */ > > > + Mask = UTMI_TX_CH_CTRL_AMP_MASK; > > > + Data = 0x4 << UTMI_TX_CH_CTRL_AMP_OFFSET; > > > Mask |= UTMI_TX_CH_CTRL_IMP_SEL_LS_MASK; > > > Data |= 0x3 << UTMI_TX_CH_CTRL_IMP_SEL_LS_OFFSET; > > > + Mask |= UTMI_TX_CH_CTRL_DRV_EN_LS_MASK; > > > + Data |= 0x3 << UTMI_TX_CH_CTRL_DRV_EN_LS_OFFSET; > > > RegSet (UtmiBaseAddr + UTMI_TX_CH_CTRL_REG, Data, Mask); > > > > The above looks a bit more chaotic than necessary, partly because what > > looks like spuriously moving the existing assignment around and > > deleting a comment Is there a rationale behind that? > > > > I.e., the following would appear equivalent: > > > > /* Set LS TX driver strength coarse control */ > > Mask = UTMI_TX_CH_CTRL_DRV_EN_LS_MASK; > > Data = 0x3 << UTMI_TX_CH_CTRL_DRV_EN_LS_OFFSET; > > + Mask |= UTMI_TX_CH_CTRL_AMP_MASK; > > + Data |= 0x4 << UTMI_TX_CH_CTRL_AMP_OFFSET; > > /* Set LS TX driver fine adjustment */ > > Mask |= UTMI_TX_CH_CTRL_IMP_SEL_LS_MASK; > > Data |= 0x3 << UTMI_TX_CH_CTRL_IMP_SEL_LS_OFFSET; > > RegSet (UtmiBaseAddr + UTMI_TX_CH_CTRL_REG, Data, Mask); > > > > Right, I'll recheck and simplify the diff as much as possible in this aspect. Thanks. For clarity, I have no issue with 2-3/3, so you can just resubmit this one after rework. Regards, Leif > > Best regards, > Marcin > > > / > > Leif > > > > > > > > /* Enable SQ */ > > > Mask = UTMI_RX_CH_CTRL0_SQ_DET_MASK; > > > - Data = 0x0 << UTMI_RX_CH_CTRL0_SQ_DET_OFFSET; > > > + Data = 0x1 << UTMI_RX_CH_CTRL0_SQ_DET_OFFSET; > > > /* Enable analog squelch detect */ > > > Mask |= UTMI_RX_CH_CTRL0_SQ_ANA_DTC_MASK; > > > - Data |= 0x1 << UTMI_RX_CH_CTRL0_SQ_ANA_DTC_OFFSET; > > > + Data |= 0x0 << UTMI_RX_CH_CTRL0_SQ_ANA_DTC_OFFSET; > > > + Mask |= UTMI_RX_CH_CTRL0_DISCON_THRESH_MASK; > > > + Data |= 0x0 << UTMI_RX_CH_CTRL0_DISCON_THRESH_OFFSET; > > > RegSet (UtmiBaseAddr + UTMI_RX_CH_CTRL0_REG, Data, Mask); > > > > > > /* Set External squelch calibration number */ > > > -- > > > 2.7.4 > > >