From patchwork Mon Dec 9 11:50:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Draszik?= X-Patchwork-Id: 13899408 Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 34FF021D010 for ; Mon, 9 Dec 2024 11:51:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733745063; cv=none; b=ZwIREd94sqMb/epZifkRdN2ZPJA7rjDqWEtjJm1txh8cqZVN0djIvK7LzcmevmNEoyMn4c+Ll8nqywneEkLXLFHv/g5CLSSUEKo0D5aW2+48/UBKIuC+o3YGVoBSTa+1mR34/8SHYiUD0rZtchPdoku2MgUs71PHtsuk6eM1V1M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733745063; c=relaxed/simple; bh=hDXV/1bil5Sbip3JdzwU/CVIebPwMcuyT26X0OLgQOY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=I45HBTHezusEqlOfhgT+74e0YQyacPWBtbIg+2LYgAuBsIb4SgoXXvPiGUjtL3HLpGPUhqIOTmyMKaT9AGB23yTMj9oyXEoAioWUxScMlxYIlmmX1Z0hjxaDun7mOVC9F0/RsFCOe0KnmVzEnQ+4pmPr+0En9GPsuRvfflM7tzE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=fQIEc8bu; arc=none smtp.client-ip=209.85.218.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="fQIEc8bu" Received: by mail-ej1-f53.google.com with SMTP id a640c23a62f3a-aa662795ca3so273438166b.1 for ; Mon, 09 Dec 2024 03:51:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1733745059; x=1734349859; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=2UThATHBfgQMuZzXlZec1zi4mZkLBkE7/Lnp3OOskfs=; b=fQIEc8buKOQ8JDqnJ8j62KqSJOUFvRDl00KSs3bX5Lz7Mmh45Y/FoAtLSN4uMHwof5 IbDXVzri46JHO49Cks5v46pQ3QxIJ8nlRckwBkpWRi5XJLiJBvd5ohJCP/ixd/YrhE0q q9H6qhAb+GMApoWyFiZ8oNsC0IXTWyYvMDWjRjBd3tzxZFrLVh6CLoDuNtL3V/pQ1E7M 11YhNu9wQmf9ZWDWvpl/6JH+wqCNE0McUDgU0VJrxe2v9AflRCVqziHMpCP/AEdSnOmO Jfx7OkKeWXXOOYg/9XfGJPhGZ2I2sNDeFgC2g+vN4xmPCwYq7weXYvJ32bUhuBXF7ARz DkUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733745059; x=1734349859; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=2UThATHBfgQMuZzXlZec1zi4mZkLBkE7/Lnp3OOskfs=; b=UWT+I6cSnl+FbYd7+de4HaMoVnW5K0fI6tI1V5TyfL9VTTjQqTMHEKpQsD0hvyPnOc WaTxOZr+kr/D2WvRbaguvDkYZHtxJns0ppyfULbtaKpciO4E/S7iWJVHNbRBE07cbK34 ixxXAn3VfzFFx+o+zlJCDteuTSkCDMHxTY/YprgR/3hT4rtlj3RB3XLo2e2tu9bFCjSY Z1ZJoDK0ImzrJX4Nt06eIfjEHhNLGwlsrr9BfRJmQhI1e2g947ZwcVUDBLIl+OIgm4jM zsPr4IGOIzaCW8F5OniO2+LKXsQL61SvBNSUNFSHwTo9BhH/EWBvRLWKeKXIiIHltCFg 1yOA== X-Gm-Message-State: AOJu0YxlFMNG1iiZV5ML7SRocO6AH3kU+Sf268TmVYHOsrS5qQ0eJt6s WNIxnto2zTFvktIp51tx6anYQz2qHWPV86mLWlQpqUsIZy5aglNGQ2rlJ2AwFflixvpwsYgGPR6 fycs= X-Gm-Gg: ASbGncvPROQA2Q4YT29hLg+yp/QreBl5f1Ne0aQJEMT1qLAY/TFt33IVvlJM8Z3MlFI zr/NFVZ9NGuiD19ckAju2VurOOeVnqTX8IP85OY7TiVO63cvYHWuNMURJZRj4pGw7N6s9Jzdf/O 4DwliJtgnaqn67PE02q1zya9y4/ERqYE3rm35oc/NOYIZBr9jFjwH8QEoQNHcdjBiWvdg12WFDM jxGIhUbjfsM+M+BjSwQsKKjVLG/bV384ybhpANwdP0kaHp2jOIJ+pVOV7bUG46t6AIqSTLSD6tn hSS71fIuyniPCZyBTNm8zNXK7Xt+E3aUCw== X-Google-Smtp-Source: AGHT+IHT9zX4Tl6UkHikg9SBri7nnosBVvDw7I1G5fIqMYEisRPhgHI6J/Nc3IpufiZgaCPRxuXJGQ== X-Received: by 2002:a17:906:2181:b0:aa6:86d1:c3f0 with SMTP id a640c23a62f3a-aa686d1f281mr342181766b.8.1733745059541; Mon, 09 Dec 2024 03:50:59 -0800 (PST) Received: from puffmais.c.googlers.com (64.227.90.34.bc.googleusercontent.com. [34.90.227.64]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aa695c3ac07sm64169866b.66.2024.12.09.03.50.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Dec 2024 03:50:59 -0800 (PST) From: =?utf-8?q?Andr=C3=A9_Draszik?= Date: Mon, 09 Dec 2024 11:50:57 +0000 Subject: [PATCH for stable 5.4 v2] usb: dwc3: gadget: fix writing NYET threshold Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241209-dwc3-nyet-fix-5-4-v2-1-66a67836ae70@linaro.org> X-B4-Tracking: v=1; b=H4sIAKDZVmcC/x2MQQqEMAwAv1JyNqLdqNSviIeqUQNSpS3qIv59y x6HYeaBwF44QKse8HxKkN0l0JmCcbVuYZQpMehCU6kLg9M1ftB9OeIsN1ZIaImbeiiNMVRD6g7 PSf2fHcy7VyHaYWNV5QT9+/4AuLmLdnMAAAA= To: Thinh Nguyen , Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, =?utf-8?q?Andr=C3=A9_Draszik?= X-Mailer: b4 0.13.0 Before writing a new value to the register, the old value needs to be masked out for the new value to be programmed as intended, because at least in some cases the reset value of that field is 0xf (max value). At the moment, the dwc3 core initialises the threshold to the maximum value (0xf), with the option to override it via a DT. No upstream DTs seem to override it, therefore this commit doesn't change behaviour for any upstream platform. Nevertheless, the code should be fixed to have the desired outcome. Do so. Fixes: 80caf7d21adc ("usb: dwc3: add lpm erratum support") Cc: stable@vger.kernel.org # 5.4 (needs adjustment for 5.10+) Signed-off-by: André Draszik --- * has been marked as v2, to be in line with the 5.10+ patch * for stable-5.10+, the if() test is slightly different, so a separate patch has been sent for it for the patch to apply. --- drivers/usb/dwc3/core.h | 1 + drivers/usb/dwc3/gadget.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) --- base-commit: cd5b619ac41b6b1a8167380ca6655df7ccf5b5eb change-id: 20241209-dwc3-nyet-fix-5-4-a4e76b199946 Best regards, diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index 34f3fbba391b..e9835a1a8842 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -413,6 +413,7 @@ #define DWC3_DCTL_TRGTULST_SS_INACT (DWC3_DCTL_TRGTULST(6)) /* These apply for core versions 1.94a and later */ +#define DWC3_DCTL_NYET_THRES_MASK (0xf << 20) #define DWC3_DCTL_NYET_THRES(n) (((n) & 0xf) << 20) #define DWC3_DCTL_KEEP_CONNECT BIT(19) diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index ecb79156351f..e40cba594ba1 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -3273,8 +3273,10 @@ static void dwc3_gadget_conndone_interrupt(struct dwc3 *dwc) && dwc->has_lpm_erratum, "LPM Erratum not available on dwc3 revisions < 2.40a\n"); - if (dwc->has_lpm_erratum && dwc->revision >= DWC3_REVISION_240A) + if (dwc->has_lpm_erratum && dwc->revision >= DWC3_REVISION_240A) { + reg &= ~DWC3_DCTL_NYET_THRES_MASK; reg |= DWC3_DCTL_NYET_THRES(dwc->lpm_nyet_threshold); + } dwc3_writel(dwc->regs, DWC3_DCTL, reg); } else {