From nobody Sun Feb 8 05:43:18 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EA6E138F93F for ; Wed, 14 Jan 2026 10:07:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768385281; cv=none; b=rHRXbuMQc4aCjuJORIRsqQHggfbfNe1Ikg6M7cvFm9Zhm++mdP/BVULY7Sw0vCfKvtc7OFik2JVPg066OdZo433sj2nf0PJTy4UL0EHgQsPsgYFG1cz11JkaeUUkiELmJZzvme/PH4kEu+zZsMmYp52n0rDNs/irIoGnb4ADnSg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768385281; c=relaxed/simple; bh=phMaZEdW+xwnGZ/4yeh8Mowv3dTqrpN1TGsy4KysEu8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=NyszISQG3lpK6BiTiyZpRtrkbZHl9kvNlunqGtq4KNRIKRrxOZ6HAcRIGNIDV7aPnuzSkHhbcMNQT8rDoga8EZe8GTiVa/tzGaUaBxjLOHlDm/gaSchg4L/922QYV5LfMQytGXWd+wtQvZU0ql8UAR5VlkYaM3pinx82MDa73es= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=GCnxFrLm; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Xyia5pM8; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="GCnxFrLm"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Xyia5pM8" Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 60E7jPDU2057182 for ; Wed, 14 Jan 2026 10:07:59 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=cdPa96MAj6K cEAgrDqHeO2LCi+XsOMkFPiPYTvWqu9g=; b=GCnxFrLmQh/9UfLZODrAy8FyEM/ 22hGQehbourkAA9ZPt0SDl4oHpGQTg4G7v2C+dcaGAdbXtdPMVuR5H0IuPd8Tpcg A9ZdL62gjVnf/CTlqP1hDU6lEbL50kq1OuFQ/8RW/F/8jqIi1O5SjpvnSUb6LL33 5nwqY9nU6nmDMObw1+WLIt7uJjsyyb5w2znL3hn5nku7vpz754AmWpU99YVJjFRw H2DUVx4sMTmCKu+XSm1BVuveRpLmXWAh4un4vxY1V8JpEE8iOq0gdOQDZlMiqOY7 Bi3xQAk/tI4rd2i8nR//hmdq6WiPnd0uwFosx5xE6GMBpagN9SMLzGri+FA== Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4bnr3ebph2-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 14 Jan 2026 10:07:59 +0000 (GMT) Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-2a58c1c74a3so16256735ad.2 for ; Wed, 14 Jan 2026 02:07:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1768385278; x=1768990078; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cdPa96MAj6KcEAgrDqHeO2LCi+XsOMkFPiPYTvWqu9g=; b=Xyia5pM8W2TusvWG7OBQnsPXtHMbc8ygnKnIW81O+7TCsgTPgaMW3XqILDZQ/bOyti /RzLWL55AUECSigIJ52rcIcWgKKcnf+Yh2E9IBI8KI/9XEJ0HPe0jU4FnSiA/DbPQ2MZ W3tRK2V/nmTGkiihSdi8erPJDh08VVjTP2OqIhE0G+rfWO7yPawbaPhVWRIKT7A/QrS4 IgFI0VxZeGC0Py0fznAvXqjFYgaWSt9s1ezBsF+PTnZ7STbALc5WQPmKD1laxeGj7GCp uo+eWs4exdbhhUFi2qoRhV5y8GiOWn5q9GPTZb1SGPuNSCpE73EirKFhKDV9F6fppPG0 i5tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768385278; x=1768990078; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=cdPa96MAj6KcEAgrDqHeO2LCi+XsOMkFPiPYTvWqu9g=; b=SGQnAE4DH+YS5p+kHZ5FhEqx4IwRXpHuSaNqbLOL8yERxJGuVl1uRrbk/J/0Tehjn5 WNPqf3/Cft4H/ma9LuPjfrmnPAGS9DJWitt6X1fe2nSrOpGvHalwgTS+RkJYNuXj1Db+ 9a6djypcW+cBDemFXl6TRm9KQPWDGxx8L6FCfj4Pb6AzfS6G+83istHfRz2bAP9julnv Qe0eG66sAjR+cLvHR8hItXn5GlnQoZG64yjwczunbpZSwoL/4CHEI5Pm84LVRFQexl0i wH5LQ2FbGRjyGAjBUlZn4FwgtjGcm53bONqbhmQVqPVScz6sC6xuLBtUxmaP9/TJoWkW LZNQ== X-Forwarded-Encrypted: i=1; AJvYcCX2A8Qp4MGO7zCsEdJBEiKgV8Nfos8dq0aAC67Jw2IruDjmm9xLolUEqmKiJH4KiQfz6ZcBwJWkLFQ9y4A=@vger.kernel.org X-Gm-Message-State: AOJu0Yz23LenAYSJfzObFgSdDdD+EkYgiNEibWaw4RFyQQs852fuqlym LGHPRW6VV7/NM5zIvJxQghV/zlKnMUA1VMZ3dC1TU6O7Ewsqvjwz7ukGgJbnTP7mJsAA7TwLpiw iSWabhSaKzj9beZeyhd2lb8lt3oqQ7h/0jr7L/4HGNCkPuncSPkbbSLQ3nTdlZKmO/WBCcR+e2n I= X-Gm-Gg: AY/fxX6zIIId7tDaJQmLwhWxVEbW7sBVd/L+oFQFItT3HNFuvJdEhWLWypWAhXYRKCx mCISr+hG0AkNrhOLZaQHw3gk25jcMUhnusRG91PH8U4rtzU3nEtD9DlhhwwxKl5SVU1Xx2LcBkJ 4Un0/gqH7s9pVuxWzY0ImCpuCO8vdPGfAdN4/j+GerFf1etgI0diCS54zB475Pp+nLH+o8YWt15 XorM7AY1vWDey3QFRyRDcQE8UBh4T86oyKsovqPhmUPafjHjNubxBorv0BPe2H0f2DlUzVdQ+4e tR+dC/qhEdDOLsZBEL3FjAwBVND8EOFr2HiWx+Q7Wx1DU9LQ7JXJsY5r5wc9hopezfiEUMvrxYk zCW9Lq6bBIJvUfC41hGuTHs+ihmA/0w2EymqI6A== X-Received: by 2002:a17:902:d4cd:b0:2a1:1f28:d7ee with SMTP id d9443c01a7336-2a599e5b9fcmr19238925ad.57.1768385277703; Wed, 14 Jan 2026 02:07:57 -0800 (PST) X-Received: by 2002:a17:902:d4cd:b0:2a1:1f28:d7ee with SMTP id d9443c01a7336-2a599e5b9fcmr19238675ad.57.1768385277253; Wed, 14 Jan 2026 02:07:57 -0800 (PST) Received: from hu-prashk-hyd.qualcomm.com ([202.46.22.19]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a3e3cd3632sm226379975ad.95.2026.01.14.02.07.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jan 2026 02:07:56 -0800 (PST) From: Prashanth K To: Thinh Nguyen , Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Prashanth K Subject: [PATCH v4 1/3] usb: dwc3: Remove of dep->regs Date: Wed, 14 Jan 2026 15:37:46 +0530 Message-Id: <20260114100748.2950103-2-prashanth.k@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260114100748.2950103-1-prashanth.k@oss.qualcomm.com> References: <20260114100748.2950103-1-prashanth.k@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Authority-Analysis: v=2.4 cv=TPFIilla c=1 sm=1 tr=0 ts=69676aff cx=c_pps a=JL+w9abYAAE89/QcEU+0QA==:117 a=fChuTYTh2wq5r3m49p7fHw==:17 a=vUbySO9Y5rIA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=jIQo8A4GAAAA:8 a=M8qNcNEInNZZPuFPK7cA:9 a=324X-CrmTo6CU4MGRt3R:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTE0MDA4MiBTYWx0ZWRfX4BhJ9AS50rn/ qhNPbD7C324kXXVTVEPQWECTk6ngNgJEfX8pweBa8wUTZbJdoMLpk97P5I/E4Jx+TvqBNl3AtRM /eKICEvpzu2Eo0h0k3cvv1WHqMr24dULkQ7Z8bBndrEn7gx6u18m+3pOr/yJJ4wXIOoWGqe43Ek /GAYU0CQ0zNoDex1/D/uS2Oq3H78xN+/dEpXSKGhbV+K+TmPXVvCu0Kax8o6kolKRBeDfLwdLcC McOdkhvll02+vSLM2HWez7iaEK+uTlgC5bX4sXwgMSVxuYkh2QIcj3hhAIoSlbJVQ6xSRzbsh1L wE6esH0hlxFeU86MsMdNkCr48dJ/5Es3/of+p95KpEVD7tCxW5/uxnbrqzGStpobWycMXg5icZJ FB8gNAi8iCXELfJQe8BAHsH4Ihl30yK0u+LpPmi8KEKqALemN8TbAtvO0gIHFpmbdClTyW4KL7T a/RS0pv/BkU50SfeHdg== X-Proofpoint-GUID: 3_KP0ZfQiT8vcFy9WvF_O1Z_CyaK39qc X-Proofpoint-ORIG-GUID: 3_KP0ZfQiT8vcFy9WvF_O1Z_CyaK39qc X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2026-01-14_03,2026-01-09_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 suspectscore=0 phishscore=0 clxscore=1015 spamscore=0 lowpriorityscore=0 malwarescore=0 adultscore=0 impostorscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2512120000 definitions=main-2601140082 Content-Type: text/plain; charset="utf-8" Remove dep->regs from struct dwc3_ep and reuse dwc->regs instead. Thus eliminating redundant iomem addresses and making register access more consistent across the driver. Signed-off-by: Prashanth K Acked-by: Thinh Nguyen --- drivers/usb/dwc3/core.h | 10 ++++------ drivers/usb/dwc3/debugfs.c | 12 ++++-------- drivers/usb/dwc3/gadget.c | 12 ++++++------ drivers/usb/dwc3/gadget.h | 2 +- 4 files changed, 15 insertions(+), 21 deletions(-) diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index a5fc92c4ffa3..23188b910528 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -165,10 +165,10 @@ #define DWC3_DCFG1 0xc740 /* DWC_usb32 only */ =20 #define DWC3_DEP_BASE(n) (0xc800 + ((n) * 0x10)) -#define DWC3_DEPCMDPAR2 0x00 -#define DWC3_DEPCMDPAR1 0x04 -#define DWC3_DEPCMDPAR0 0x08 -#define DWC3_DEPCMD 0x0c +#define DWC3_DEPCMDPAR2(n) (DWC3_DEP_BASE(n) + 0x00) +#define DWC3_DEPCMDPAR1(n) (DWC3_DEP_BASE(n) + 0x04) +#define DWC3_DEPCMDPAR0(n) (DWC3_DEP_BASE(n) + 0x08) +#define DWC3_DEPCMD(n) (DWC3_DEP_BASE(n) + 0x0c) =20 #define DWC3_DEV_IMOD(n) (0xca00 + ((n) * 0x4)) =20 @@ -749,8 +749,6 @@ struct dwc3_ep { struct list_head pending_list; struct list_head started_list; =20 - void __iomem *regs; - struct dwc3_trb *trb_pool; dma_addr_t trb_pool_dma; struct dwc3 *dwc; diff --git a/drivers/usb/dwc3/debugfs.c b/drivers/usb/dwc3/debugfs.c index d18bf5e32cc8..0b45ff16f575 100644 --- a/drivers/usb/dwc3/debugfs.c +++ b/drivers/usb/dwc3/debugfs.c @@ -36,23 +36,19 @@ #define dump_ep_register_set(n) \ { \ .name =3D "DEPCMDPAR2("__stringify(n)")", \ - .offset =3D DWC3_DEP_BASE(n) + \ - DWC3_DEPCMDPAR2, \ + .offset =3D DWC3_DEPCMDPAR2(n), \ }, \ { \ .name =3D "DEPCMDPAR1("__stringify(n)")", \ - .offset =3D DWC3_DEP_BASE(n) + \ - DWC3_DEPCMDPAR1, \ + .offset =3D DWC3_DEPCMDPAR1(n), \ }, \ { \ .name =3D "DEPCMDPAR0("__stringify(n)")", \ - .offset =3D DWC3_DEP_BASE(n) + \ - DWC3_DEPCMDPAR0, \ + .offset =3D DWC3_DEPCMDPAR0(n), \ }, \ { \ .name =3D "DEPCMD("__stringify(n)")", \ - .offset =3D DWC3_DEP_BASE(n) + \ - DWC3_DEPCMD, \ + .offset =3D DWC3_DEPCMD(n), \ } =20 =20 diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 8a35a6901db7..ce087cbc4a53 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -320,6 +320,7 @@ int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsign= ed int cmd, =20 int cmd_status =3D 0; int ret =3D -EINVAL; + u8 epnum =3D dep->number; =20 /* * When operating in USB 2.0 speeds (HS/FS), if GUSB2PHYCFG.ENBLSLPM or @@ -355,9 +356,9 @@ int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsign= ed int cmd, * improve performance. */ if (DWC3_DEPCMD_CMD(cmd) !=3D DWC3_DEPCMD_UPDATETRANSFER) { - dwc3_writel(dep->regs, DWC3_DEPCMDPAR0, params->param0); - dwc3_writel(dep->regs, DWC3_DEPCMDPAR1, params->param1); - dwc3_writel(dep->regs, DWC3_DEPCMDPAR2, params->param2); + dwc3_writel(dwc->regs, DWC3_DEPCMDPAR0(epnum), params->param0); + dwc3_writel(dwc->regs, DWC3_DEPCMDPAR1(epnum), params->param1); + dwc3_writel(dwc->regs, DWC3_DEPCMDPAR2(epnum), params->param2); } =20 /* @@ -381,7 +382,7 @@ int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsign= ed int cmd, else cmd |=3D DWC3_DEPCMD_CMDACT; =20 - dwc3_writel(dep->regs, DWC3_DEPCMD, cmd); + dwc3_writel(dwc->regs, DWC3_DEPCMD(epnum), cmd); =20 if (!(cmd & DWC3_DEPCMD_CMDACT) || (DWC3_DEPCMD_CMD(cmd) =3D=3D DWC3_DEPCMD_ENDTRANSFER && @@ -391,7 +392,7 @@ int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsign= ed int cmd, } =20 do { - reg =3D dwc3_readl(dep->regs, DWC3_DEPCMD); + reg =3D dwc3_readl(dwc->regs, DWC3_DEPCMD(epnum)); if (!(reg & DWC3_DEPCMD_CMDACT)) { cmd_status =3D DWC3_DEPCMD_STATUS(reg); =20 @@ -3381,7 +3382,6 @@ static int dwc3_gadget_init_endpoint(struct dwc3 *dwc= , u8 epnum) dep->dwc =3D dwc; dep->number =3D epnum; dep->direction =3D direction; - dep->regs =3D dwc->regs + DWC3_DEP_BASE(epnum); dwc->eps[epnum] =3D dep; dep->combo_num =3D 0; dep->start_cmd_status =3D 0; diff --git a/drivers/usb/dwc3/gadget.h b/drivers/usb/dwc3/gadget.h index d73e735e4081..c3aa9638b7a5 100644 --- a/drivers/usb/dwc3/gadget.h +++ b/drivers/usb/dwc3/gadget.h @@ -132,7 +132,7 @@ static inline void dwc3_gadget_ep_get_transfer_index(st= ruct dwc3_ep *dep) { u32 res_id; =20 - res_id =3D dwc3_readl(dep->regs, DWC3_DEPCMD); + res_id =3D dwc3_readl(dep->dwc->regs, DWC3_DEPCMD(dep->number)); dep->resource_index =3D DWC3_DEPCMD_GET_RSC_IDX(res_id); } =20 --=20 2.34.1 From nobody Sun Feb 8 05:43:18 2026 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AA39E38A9D6 for ; Wed, 14 Jan 2026 10:08:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768385286; cv=none; b=LxltcsR6zwTMbjoNvH322V58mCbDhpx7hC66+QVc7x0++D6AQtEkB16DfattDK2enmJbJIqzAfuVjwoKap6ouTpoZQ+wHhmCq3DarQrof89DPjVll/rib8u0QcwYLQEp1Fir9YAXimjrjwsVooFqTZsmbh/KuSjFJURIV9+KP9s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768385286; c=relaxed/simple; bh=D+9W4dTwWCD2n+CjX4PWKR6Ex4Ovq4O01BJnZ+Kv60E=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=UH3auZg3mU4IDCcEllegqBEne4jn9G9Q7/6m726BBxoWIqatF6B3k+UlNJnXSjriy8o/zmpM/5/CfLeJQbLEN8eAbVcDmVymqn/P0EotFKhXcJgkSo9lxpUvU/1YVh0DiAMlhr3L715pc8k6mDoWkaTyHkWtjmoYEKePd9KTuCA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=jRD6dVEf; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=B6f5lkXH; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="jRD6dVEf"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="B6f5lkXH" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 60EA58lO2902925 for ; Wed, 14 Jan 2026 10:08:02 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=uf4DXUdfgfu R90EC5K2dgDqOlGSshHVNwx5HlEmBjOM=; b=jRD6dVEf8z2hP0bB7jAjOpa735y SOaq85cMoFSO5ZZmoBQbP06jVBCijzIVabIpJ1jw3E4p7fL7lq/vlZXOl6FYJmKG 4p+/nEuMhQ0QQt6D29KtjwvcwBYPxIeEiCFDMuy9mGjzoDjcMwOlCN1sQrNhy+5Q 41vHF6ToldzBHAhlg4oYA9ibx+LMn66yeZdqm18U8fg5VCSnO0YM96MyoNo4IbY2 v+XwF4GANaKiIJlOmltoZM5NJnNcNUVEB2qHhuCEwvIYzt2R/h/vIcThuexzKB0s 5zDmhXDv/m+i0DteLHZf4qwyHiyMvTAwl7k1H6Fj/YPfWDf1QlBjfUBcknQ== Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4bp931g0c9-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 14 Jan 2026 10:08:02 +0000 (GMT) Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-2a0fe4ade9eso80539995ad.0 for ; Wed, 14 Jan 2026 02:08:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1768385282; x=1768990082; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uf4DXUdfgfuR90EC5K2dgDqOlGSshHVNwx5HlEmBjOM=; b=B6f5lkXH5zFfFVFZ+RMh9A9B1n7Q39EZKiSAbZezyEYWiWjofNOQMylxIxl9lSrUzS MnAA7w7ayaMyPTc0wnIxX2i+qSrZdSfhaNx24gUb4BAAMILfselBUqoVbGOgfit8JnoI LYjHIBGxUSKZRjKr6daFhW5e1D8KtHT3ehsOI2RAjpTRBe/nm6/Qh3Q/dfdxZ1fmysR9 ZTfIrv/ZcQlTyC8sFKl0fB9Oxxjwa5FaTaY0/IxRjeBAqS+7FDYep5lda5pW3TFkbgkL EVqN+kXI25hJOh3LTEXhBe94XM4zpm+Bf6K5DQXWwTPA9pDuFRBjjLfK2yspVX0wAl0q UwXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768385282; x=1768990082; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=uf4DXUdfgfuR90EC5K2dgDqOlGSshHVNwx5HlEmBjOM=; b=Tby/Gl2fjGAdTspKZ9gjBQ7/xfmaCQZFiUTAJI0RiDB5OVP1wsF852bI6c6LPsMnqJ 1+bDzE0t9L98GmgpuSy1Bg3NFfJG7CLzipkDVzqWsrT2yB5wfP+bDAUIgDoRw30d6Yhj frOtuse6iBZEhT6tMTsZkezbZwA/AKZdJRnplP7jo0CqTMO1lcFBSj0LIJPVAoFued9+ N0a+o1zMprO1Crj1qjbm4GcogEWMMzMETMcl26X92y+gu68UTcN/jSFn0vmUfF94/Jpr lP8mAbS7GOicuubDQ7Ujh6wbAfzlNV2En0NzEITopmhECbtD5jqGzC2prG3nfvj1DWOr CmVw== X-Forwarded-Encrypted: i=1; AJvYcCVPcU1ZK9OnaiCqTCM1+nCB5bEXbuPp8eeAewkcwoUYLkEDkTnDncXjIPBRmMOnBAITl5k2j/VN2mOcrOc=@vger.kernel.org X-Gm-Message-State: AOJu0YwCBcr58Mpj0uG7h3U+qVfyuPyk+g+6s6/eKKfS5RUAukbWtMQX 7HmvXcqjMxDTBCjpfmWcKY9quUDBJR/Z72WWF4/6liQuvD1R5PCwT0bqspXpZm7ZCTls9nRlA2f DTExRT+TtC9W0FVFSyoS7GFBJ5zpgNmvvR02NLJEXl0/4/r1y3s1s9b8ksAN99csXn5lBxkO/Ez g= X-Gm-Gg: AY/fxX7F02GRuTqe9lahGQdyxV7viT+qwKdaIqVFZpeZNXWmt1M+rVVZjlcGmIDeTtZ l+Of1+S8Ks5QCT6Gvg+mn6JUWtzKUny8MMzuZFBPoEy8Z4l9onw7btnyAacE/HFQlEcotcK2zl2 zJrbt9duZCpk7+ItVh3RSMiHucLYxcuNKFz3qRuvbDd5Mrm0h8/2pRY9/xOGBaQGL3WI8Of7vwK +EUE8vsYWl5gCHXuifyWZyNwcWH3kRdbBha9Hj8zVn/3Z8y3n8aqg+00sRpk7lyzdC7RmuanXv8 9SemYV6/G51xzkcgEb8+L+Y8GNQ+QO/uxSLAxNyctfcwx5qnhTUCHrh1Pv0QKfT2tQdHGsHhc4U iP/aW36HE+D1nv7wqP1r9wQR2Aa7J8xIcW0EcFA== X-Received: by 2002:a17:903:b0f:b0:2a0:d364:983b with SMTP id d9443c01a7336-2a599e5cb87mr18161265ad.60.1768385280715; Wed, 14 Jan 2026 02:08:00 -0800 (PST) X-Received: by 2002:a17:903:b0f:b0:2a0:d364:983b with SMTP id d9443c01a7336-2a599e5cb87mr18160965ad.60.1768385279919; Wed, 14 Jan 2026 02:07:59 -0800 (PST) Received: from hu-prashk-hyd.qualcomm.com ([202.46.22.19]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a3e3cd3632sm226379975ad.95.2026.01.14.02.07.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jan 2026 02:07:59 -0800 (PST) From: Prashanth K To: Thinh Nguyen , Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Prashanth K Subject: [PATCH v4 2/3] usb: dwc3: Add dwc pointer to dwc3_readl/writel Date: Wed, 14 Jan 2026 15:37:47 +0530 Message-Id: <20260114100748.2950103-3-prashanth.k@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260114100748.2950103-1-prashanth.k@oss.qualcomm.com> References: <20260114100748.2950103-1-prashanth.k@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Authority-Analysis: v=2.4 cv=BOW+bVQG c=1 sm=1 tr=0 ts=69676b02 cx=c_pps a=JL+w9abYAAE89/QcEU+0QA==:117 a=fChuTYTh2wq5r3m49p7fHw==:17 a=vUbySO9Y5rIA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=jIQo8A4GAAAA:8 a=1-JGb9IuH62Of12rmQMA:9 a=324X-CrmTo6CU4MGRt3R:22 X-Proofpoint-ORIG-GUID: YtSs5RToUcPQzqES_N6cAhD5FnZjeyGl X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTE0MDA4MiBTYWx0ZWRfX0rxBZ6xxbiO8 nJke8268anlHCzLn1SAmgbqV0/SwokAnqRytfbPS3iNmUyVKxblvzPAirutxkM0NtvwrzhXkjcf 71Z4Wl/HJpYzLe8mmGAg3xDCxBrbV8we6Q2AYNs/ekdHpTGtZMYhsjOqrbIF3wPkgoxfeJPXbuc 2gsO6igmIbIRWKaMVb3VLavy54RLtc4PbP25FJ3uuH7syJyCguW2/fE0USa9ZMxFerHJ1UV2w/C gjbJLyXMXwfj0lkm/bSzztn7iahGeXyIJ9QioMJk3SWSoKAipW6BcWSuaxXnaC25KDL67J14z1L SzfH2PQDZbsmyOdfWa7iwZs/RYzHqFTigcmu+YMitAzU/ry8NeUQtDYktv7p1JZHzmsSkAPUwUR n3kuihU8NUDUELdNF8Z+khjfi31Pj7VTDiEvUYh17cC+HY/zS2Z4c/LJjI5LlXWp6l9eVtYj2KZ 195lgjBAYVmLVZbPv+w== X-Proofpoint-GUID: YtSs5RToUcPQzqES_N6cAhD5FnZjeyGl X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2026-01-14_03,2026-01-09_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 spamscore=0 priorityscore=1501 malwarescore=0 clxscore=1015 adultscore=0 lowpriorityscore=0 phishscore=0 impostorscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2512120000 definitions=main-2601140082 Content-Type: text/plain; charset="utf-8" Use dwc pointer in dwc3_readl() dwc3_writel() instead of passing the dwc->regs. This would help us access the dwc structure and log the base address in traces. There's no functional changes in this patch, just refactoring existing APIs. Signed-off-by: Prashanth K Acked-by: Thinh Nguyen --- drivers/usb/dwc3/core.c | 194 ++++++++++++++++++------------------- drivers/usb/dwc3/debugfs.c | 32 +++--- drivers/usb/dwc3/drd.c | 76 +++++++-------- drivers/usb/dwc3/ep0.c | 20 ++-- drivers/usb/dwc3/gadget.c | 160 +++++++++++++++--------------- drivers/usb/dwc3/gadget.h | 4 +- drivers/usb/dwc3/io.h | 7 +- drivers/usb/dwc3/ulpi.c | 10 +- 8 files changed, 253 insertions(+), 250 deletions(-) diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index ec8407972b9d..670a9d4bfff2 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -114,23 +114,23 @@ void dwc3_enable_susphy(struct dwc3 *dwc, bool enable) int i; =20 for (i =3D 0; i < dwc->num_usb3_ports; i++) { - reg =3D dwc3_readl(dwc->regs, DWC3_GUSB3PIPECTL(i)); + reg =3D dwc3_readl(dwc, DWC3_GUSB3PIPECTL(i)); if (enable && !dwc->dis_u3_susphy_quirk) reg |=3D DWC3_GUSB3PIPECTL_SUSPHY; else reg &=3D ~DWC3_GUSB3PIPECTL_SUSPHY; =20 - dwc3_writel(dwc->regs, DWC3_GUSB3PIPECTL(i), reg); + dwc3_writel(dwc, DWC3_GUSB3PIPECTL(i), reg); } =20 for (i =3D 0; i < dwc->num_usb2_ports; i++) { - reg =3D dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(i)); + reg =3D dwc3_readl(dwc, DWC3_GUSB2PHYCFG(i)); if (enable && !dwc->dis_u2_susphy_quirk) reg |=3D DWC3_GUSB2PHYCFG_SUSPHY; else reg &=3D ~DWC3_GUSB2PHYCFG_SUSPHY; =20 - dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(i), reg); + dwc3_writel(dwc, DWC3_GUSB2PHYCFG(i), reg); } } EXPORT_SYMBOL_GPL(dwc3_enable_susphy); @@ -140,7 +140,7 @@ void dwc3_set_prtcap(struct dwc3 *dwc, u32 mode, bool i= gnore_susphy) unsigned int hw_mode; u32 reg; =20 - reg =3D dwc3_readl(dwc->regs, DWC3_GCTL); + reg =3D dwc3_readl(dwc, DWC3_GCTL); =20 /* * For DRD controllers, GUSB3PIPECTL.SUSPENDENABLE and @@ -155,7 +155,7 @@ void dwc3_set_prtcap(struct dwc3 *dwc, u32 mode, bool i= gnore_susphy) =20 reg &=3D ~(DWC3_GCTL_PRTCAPDIR(DWC3_GCTL_PRTCAP_OTG)); reg |=3D DWC3_GCTL_PRTCAPDIR(mode); - dwc3_writel(dwc->regs, DWC3_GCTL, reg); + dwc3_writel(dwc, DWC3_GCTL, reg); =20 dwc->current_dr_role =3D mode; trace_dwc3_set_prtcap(mode); @@ -216,9 +216,9 @@ static void __dwc3_set_mode(struct work_struct *work) if (dwc->current_dr_role && ((DWC3_IP_IS(DWC3) || DWC3_VER_IS_PRIOR(DWC31, 190A)) && desired_dr_role !=3D DWC3_GCTL_PRTCAP_OTG)) { - reg =3D dwc3_readl(dwc->regs, DWC3_GCTL); + reg =3D dwc3_readl(dwc, DWC3_GCTL); reg |=3D DWC3_GCTL_CORESOFTRESET; - dwc3_writel(dwc->regs, DWC3_GCTL, reg); + dwc3_writel(dwc, DWC3_GCTL, reg); =20 /* * Wait for internal clocks to synchronized. DWC_usb31 and @@ -228,9 +228,9 @@ static void __dwc3_set_mode(struct work_struct *work) */ msleep(100); =20 - reg =3D dwc3_readl(dwc->regs, DWC3_GCTL); + reg =3D dwc3_readl(dwc, DWC3_GCTL); reg &=3D ~DWC3_GCTL_CORESOFTRESET; - dwc3_writel(dwc->regs, DWC3_GCTL, reg); + dwc3_writel(dwc, DWC3_GCTL, reg); } =20 spin_lock_irqsave(&dwc->lock, flags); @@ -254,9 +254,9 @@ static void __dwc3_set_mode(struct work_struct *work) phy_set_mode(dwc->usb3_generic_phy[i], PHY_MODE_USB_HOST); =20 if (dwc->dis_split_quirk) { - reg =3D dwc3_readl(dwc->regs, DWC3_GUCTL3); + reg =3D dwc3_readl(dwc, DWC3_GUCTL3); reg |=3D DWC3_GUCTL3_SPLITDISABLE; - dwc3_writel(dwc->regs, DWC3_GUCTL3, reg); + dwc3_writel(dwc, DWC3_GUCTL3, reg); } } break; @@ -306,11 +306,11 @@ u32 dwc3_core_fifo_space(struct dwc3_ep *dep, u8 type) struct dwc3 *dwc =3D dep->dwc; u32 reg; =20 - dwc3_writel(dwc->regs, DWC3_GDBGFIFOSPACE, - DWC3_GDBGFIFOSPACE_NUM(dep->number) | - DWC3_GDBGFIFOSPACE_TYPE(type)); + dwc3_writel(dwc, DWC3_GDBGFIFOSPACE, + DWC3_GDBGFIFOSPACE_NUM(dep->number) | + DWC3_GDBGFIFOSPACE_TYPE(type)); =20 - reg =3D dwc3_readl(dwc->regs, DWC3_GDBGFIFOSPACE); + reg =3D dwc3_readl(dwc, DWC3_GDBGFIFOSPACE); =20 return DWC3_GDBGFIFOSPACE_SPACE_AVAILABLE(reg); } @@ -332,7 +332,7 @@ int dwc3_core_soft_reset(struct dwc3 *dwc) if (dwc->current_dr_role =3D=3D DWC3_GCTL_PRTCAP_HOST) return 0; =20 - reg =3D dwc3_readl(dwc->regs, DWC3_DCTL); + reg =3D dwc3_readl(dwc, DWC3_DCTL); reg |=3D DWC3_DCTL_CSFTRST; reg &=3D ~DWC3_DCTL_RUN_STOP; dwc3_gadget_dctl_write_safe(dwc, reg); @@ -347,7 +347,7 @@ int dwc3_core_soft_reset(struct dwc3 *dwc) retries =3D 10; =20 do { - reg =3D dwc3_readl(dwc->regs, DWC3_DCTL); + reg =3D dwc3_readl(dwc, DWC3_DCTL); if (!(reg & DWC3_DCTL_CSFTRST)) goto done; =20 @@ -387,12 +387,12 @@ static void dwc3_frame_length_adjustment(struct dwc3 = *dwc) if (dwc->fladj =3D=3D 0) return; =20 - reg =3D dwc3_readl(dwc->regs, DWC3_GFLADJ); + reg =3D dwc3_readl(dwc, DWC3_GFLADJ); dft =3D reg & DWC3_GFLADJ_30MHZ_MASK; if (dft !=3D dwc->fladj) { reg &=3D ~DWC3_GFLADJ_30MHZ_MASK; reg |=3D DWC3_GFLADJ_30MHZ_SDBND_SEL | dwc->fladj; - dwc3_writel(dwc->regs, DWC3_GFLADJ, reg); + dwc3_writel(dwc, DWC3_GFLADJ, reg); } } =20 @@ -424,10 +424,10 @@ static void dwc3_ref_clk_period(struct dwc3 *dwc) return; } =20 - reg =3D dwc3_readl(dwc->regs, DWC3_GUCTL); + reg =3D dwc3_readl(dwc, DWC3_GUCTL); reg &=3D ~DWC3_GUCTL_REFCLKPER_MASK; reg |=3D FIELD_PREP(DWC3_GUCTL_REFCLKPER_MASK, period); - dwc3_writel(dwc->regs, DWC3_GUCTL, reg); + dwc3_writel(dwc, DWC3_GUCTL, reg); =20 if (DWC3_VER_IS_PRIOR(DWC3, 250A)) return; @@ -455,7 +455,7 @@ static void dwc3_ref_clk_period(struct dwc3 *dwc) */ decr =3D 480000000 / rate; =20 - reg =3D dwc3_readl(dwc->regs, DWC3_GFLADJ); + reg =3D dwc3_readl(dwc, DWC3_GFLADJ); reg &=3D ~DWC3_GFLADJ_REFCLK_FLADJ_MASK & ~DWC3_GFLADJ_240MHZDECR & ~DWC3_GFLADJ_240MHZDECR_PLS1; @@ -466,7 +466,7 @@ static void dwc3_ref_clk_period(struct dwc3 *dwc) if (dwc->gfladj_refclk_lpm_sel) reg |=3D DWC3_GFLADJ_REFCLK_LPM_SEL; =20 - dwc3_writel(dwc->regs, DWC3_GFLADJ, reg); + dwc3_writel(dwc, DWC3_GFLADJ, reg); } =20 /** @@ -569,16 +569,16 @@ int dwc3_event_buffers_setup(struct dwc3 *dwc) =20 evt =3D dwc->ev_buf; evt->lpos =3D 0; - dwc3_writel(dwc->regs, DWC3_GEVNTADRLO(0), - lower_32_bits(evt->dma)); - dwc3_writel(dwc->regs, DWC3_GEVNTADRHI(0), - upper_32_bits(evt->dma)); - dwc3_writel(dwc->regs, DWC3_GEVNTSIZ(0), - DWC3_GEVNTSIZ_SIZE(evt->length)); + dwc3_writel(dwc, DWC3_GEVNTADRLO(0), + lower_32_bits(evt->dma)); + dwc3_writel(dwc, DWC3_GEVNTADRHI(0), + upper_32_bits(evt->dma)); + dwc3_writel(dwc, DWC3_GEVNTSIZ(0), + DWC3_GEVNTSIZ_SIZE(evt->length)); =20 /* Clear any stale event */ - reg =3D dwc3_readl(dwc->regs, DWC3_GEVNTCOUNT(0)); - dwc3_writel(dwc->regs, DWC3_GEVNTCOUNT(0), reg); + reg =3D dwc3_readl(dwc, DWC3_GEVNTCOUNT(0)); + dwc3_writel(dwc, DWC3_GEVNTCOUNT(0), reg); return 0; } =20 @@ -593,7 +593,7 @@ void dwc3_event_buffers_cleanup(struct dwc3 *dwc) * Exynos platforms may not be able to access event buffer if the * controller failed to halt on dwc3_core_exit(). */ - reg =3D dwc3_readl(dwc->regs, DWC3_DSTS); + reg =3D dwc3_readl(dwc, DWC3_DSTS); if (!(reg & DWC3_DSTS_DEVCTRLHLT)) return; =20 @@ -601,14 +601,14 @@ void dwc3_event_buffers_cleanup(struct dwc3 *dwc) =20 evt->lpos =3D 0; =20 - dwc3_writel(dwc->regs, DWC3_GEVNTADRLO(0), 0); - dwc3_writel(dwc->regs, DWC3_GEVNTADRHI(0), 0); - dwc3_writel(dwc->regs, DWC3_GEVNTSIZ(0), DWC3_GEVNTSIZ_INTMASK + dwc3_writel(dwc, DWC3_GEVNTADRLO(0), 0); + dwc3_writel(dwc, DWC3_GEVNTADRHI(0), 0); + dwc3_writel(dwc, DWC3_GEVNTSIZ(0), DWC3_GEVNTSIZ_INTMASK | DWC3_GEVNTSIZ_SIZE(0)); =20 /* Clear any stale event */ - reg =3D dwc3_readl(dwc->regs, DWC3_GEVNTCOUNT(0)); - dwc3_writel(dwc->regs, DWC3_GEVNTCOUNT(0), reg); + reg =3D dwc3_readl(dwc, DWC3_GEVNTCOUNT(0)); + dwc3_writel(dwc, DWC3_GEVNTCOUNT(0), reg); } =20 static void dwc3_core_num_eps(struct dwc3 *dwc) @@ -622,18 +622,18 @@ static void dwc3_cache_hwparams(struct dwc3 *dwc) { struct dwc3_hwparams *parms =3D &dwc->hwparams; =20 - parms->hwparams0 =3D dwc3_readl(dwc->regs, DWC3_GHWPARAMS0); - parms->hwparams1 =3D dwc3_readl(dwc->regs, DWC3_GHWPARAMS1); - parms->hwparams2 =3D dwc3_readl(dwc->regs, DWC3_GHWPARAMS2); - parms->hwparams3 =3D dwc3_readl(dwc->regs, DWC3_GHWPARAMS3); - parms->hwparams4 =3D dwc3_readl(dwc->regs, DWC3_GHWPARAMS4); - parms->hwparams5 =3D dwc3_readl(dwc->regs, DWC3_GHWPARAMS5); - parms->hwparams6 =3D dwc3_readl(dwc->regs, DWC3_GHWPARAMS6); - parms->hwparams7 =3D dwc3_readl(dwc->regs, DWC3_GHWPARAMS7); - parms->hwparams8 =3D dwc3_readl(dwc->regs, DWC3_GHWPARAMS8); + parms->hwparams0 =3D dwc3_readl(dwc, DWC3_GHWPARAMS0); + parms->hwparams1 =3D dwc3_readl(dwc, DWC3_GHWPARAMS1); + parms->hwparams2 =3D dwc3_readl(dwc, DWC3_GHWPARAMS2); + parms->hwparams3 =3D dwc3_readl(dwc, DWC3_GHWPARAMS3); + parms->hwparams4 =3D dwc3_readl(dwc, DWC3_GHWPARAMS4); + parms->hwparams5 =3D dwc3_readl(dwc, DWC3_GHWPARAMS5); + parms->hwparams6 =3D dwc3_readl(dwc, DWC3_GHWPARAMS6); + parms->hwparams7 =3D dwc3_readl(dwc, DWC3_GHWPARAMS7); + parms->hwparams8 =3D dwc3_readl(dwc, DWC3_GHWPARAMS8); =20 if (DWC3_IP_IS(DWC32)) - parms->hwparams9 =3D dwc3_readl(dwc->regs, DWC3_GHWPARAMS9); + parms->hwparams9 =3D dwc3_readl(dwc, DWC3_GHWPARAMS9); } =20 static void dwc3_config_soc_bus(struct dwc3 *dwc) @@ -641,10 +641,10 @@ static void dwc3_config_soc_bus(struct dwc3 *dwc) if (dwc->gsbuscfg0_reqinfo !=3D DWC3_GSBUSCFG0_REQINFO_UNSPECIFIED) { u32 reg; =20 - reg =3D dwc3_readl(dwc->regs, DWC3_GSBUSCFG0); + reg =3D dwc3_readl(dwc, DWC3_GSBUSCFG0); reg &=3D ~DWC3_GSBUSCFG0_REQINFO(~0); reg |=3D DWC3_GSBUSCFG0_REQINFO(dwc->gsbuscfg0_reqinfo); - dwc3_writel(dwc->regs, DWC3_GSBUSCFG0, reg); + dwc3_writel(dwc, DWC3_GSBUSCFG0, reg); } } =20 @@ -668,7 +668,7 @@ static int dwc3_ss_phy_setup(struct dwc3 *dwc, int inde= x) { u32 reg; =20 - reg =3D dwc3_readl(dwc->regs, DWC3_GUSB3PIPECTL(index)); + reg =3D dwc3_readl(dwc, DWC3_GUSB3PIPECTL(index)); =20 /* * Make sure UX_EXIT_PX is cleared as that causes issues with some @@ -706,7 +706,7 @@ static int dwc3_ss_phy_setup(struct dwc3 *dwc, int inde= x) if (dwc->dis_del_phy_power_chg_quirk) reg &=3D ~DWC3_GUSB3PIPECTL_DEPOCHANGE; =20 - dwc3_writel(dwc->regs, DWC3_GUSB3PIPECTL(index), reg); + dwc3_writel(dwc, DWC3_GUSB3PIPECTL(index), reg); =20 return 0; } @@ -715,7 +715,7 @@ static int dwc3_hs_phy_setup(struct dwc3 *dwc, int inde= x) { u32 reg; =20 - reg =3D dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(index)); + reg =3D dwc3_readl(dwc, DWC3_GUSB2PHYCFG(index)); =20 /* Select the HS PHY interface */ switch (DWC3_GHWPARAMS3_HSPHY_IFC(dwc->hwparams.hwparams3)) { @@ -727,7 +727,7 @@ static int dwc3_hs_phy_setup(struct dwc3 *dwc, int inde= x) } else if (dwc->hsphy_interface && !strncmp(dwc->hsphy_interface, "ulpi", 4)) { reg |=3D DWC3_GUSB2PHYCFG_ULPI_UTMI; - dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(index), reg); + dwc3_writel(dwc, DWC3_GUSB2PHYCFG(index), reg); } else { /* Relying on default value. */ if (!(reg & DWC3_GUSB2PHYCFG_ULPI_UTMI)) @@ -777,7 +777,7 @@ static int dwc3_hs_phy_setup(struct dwc3 *dwc, int inde= x) if (dwc->ulpi_ext_vbus_drv) reg |=3D DWC3_GUSB2PHYCFG_ULPIEXTVBUSDRV; =20 - dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(index), reg); + dwc3_writel(dwc, DWC3_GUSB2PHYCFG(index), reg); =20 return 0; } @@ -991,15 +991,15 @@ static bool dwc3_core_is_valid(struct dwc3 *dwc) { u32 reg; =20 - reg =3D dwc3_readl(dwc->regs, DWC3_GSNPSID); + reg =3D dwc3_readl(dwc, DWC3_GSNPSID); dwc->ip =3D DWC3_GSNPS_ID(reg); =20 /* This should read as U3 followed by revision number */ if (DWC3_IP_IS(DWC3)) { dwc->revision =3D reg; } else if (DWC3_IP_IS(DWC31) || DWC3_IP_IS(DWC32)) { - dwc->revision =3D dwc3_readl(dwc->regs, DWC3_VER_NUMBER); - dwc->version_type =3D dwc3_readl(dwc->regs, DWC3_VER_TYPE); + dwc->revision =3D dwc3_readl(dwc, DWC3_VER_NUMBER); + dwc->version_type =3D dwc3_readl(dwc, DWC3_VER_TYPE); } else { return false; } @@ -1013,7 +1013,7 @@ static void dwc3_core_setup_global_control(struct dwc= 3 *dwc) unsigned int hw_mode; u32 reg; =20 - reg =3D dwc3_readl(dwc->regs, DWC3_GCTL); + reg =3D dwc3_readl(dwc, DWC3_GCTL); reg &=3D ~DWC3_GCTL_SCALEDOWN_MASK; hw_mode =3D DWC3_GHWPARAMS0_MODE(dwc->hwparams.hwparams0); power_opt =3D DWC3_GHWPARAMS1_EN_PWROPT(dwc->hwparams.hwparams1); @@ -1091,7 +1091,7 @@ static void dwc3_core_setup_global_control(struct dwc= 3 *dwc) if (DWC3_VER_IS_PRIOR(DWC3, 190A)) reg |=3D DWC3_GCTL_U2RSTECN; =20 - dwc3_writel(dwc->regs, DWC3_GCTL, reg); + dwc3_writel(dwc, DWC3_GCTL, reg); } =20 static int dwc3_core_get_phy(struct dwc3 *dwc); @@ -1111,7 +1111,7 @@ static void dwc3_set_incr_burst_type(struct dwc3 *dwc) int ret; int i; =20 - cfg =3D dwc3_readl(dwc->regs, DWC3_GSBUSCFG0); + cfg =3D dwc3_readl(dwc, DWC3_GSBUSCFG0); =20 /* * Handle property "snps,incr-burst-type-adjustment". @@ -1186,7 +1186,7 @@ static void dwc3_set_incr_burst_type(struct dwc3 *dwc) break; } =20 - dwc3_writel(dwc->regs, DWC3_GSBUSCFG0, cfg); + dwc3_writel(dwc, DWC3_GSBUSCFG0, cfg); } =20 static void dwc3_set_power_down_clk_scale(struct dwc3 *dwc) @@ -1211,12 +1211,12 @@ static void dwc3_set_power_down_clk_scale(struct dw= c3 *dwc) * (3x or more) to be within the requirement. */ scale =3D DIV_ROUND_UP(clk_get_rate(dwc->susp_clk), 16000); - reg =3D dwc3_readl(dwc->regs, DWC3_GCTL); + reg =3D dwc3_readl(dwc, DWC3_GCTL); if ((reg & DWC3_GCTL_PWRDNSCALE_MASK) < DWC3_GCTL_PWRDNSCALE(scale) || (reg & DWC3_GCTL_PWRDNSCALE_MASK) > DWC3_GCTL_PWRDNSCALE(scale*3)) { reg &=3D ~(DWC3_GCTL_PWRDNSCALE_MASK); reg |=3D DWC3_GCTL_PWRDNSCALE(scale); - dwc3_writel(dwc->regs, DWC3_GCTL, reg); + dwc3_writel(dwc, DWC3_GCTL, reg); } } =20 @@ -1239,7 +1239,7 @@ static void dwc3_config_threshold(struct dwc3 *dwc) tx_maxburst =3D dwc->tx_max_burst_prd; =20 if (rx_thr_num && rx_maxburst) { - reg =3D dwc3_readl(dwc->regs, DWC3_GRXTHRCFG); + reg =3D dwc3_readl(dwc, DWC3_GRXTHRCFG); reg |=3D DWC31_RXTHRNUMPKTSEL_PRD; =20 reg &=3D ~DWC31_RXTHRNUMPKT_PRD(~0); @@ -1248,11 +1248,11 @@ static void dwc3_config_threshold(struct dwc3 *dwc) reg &=3D ~DWC31_MAXRXBURSTSIZE_PRD(~0); reg |=3D DWC31_MAXRXBURSTSIZE_PRD(rx_maxburst); =20 - dwc3_writel(dwc->regs, DWC3_GRXTHRCFG, reg); + dwc3_writel(dwc, DWC3_GRXTHRCFG, reg); } =20 if (tx_thr_num && tx_maxburst) { - reg =3D dwc3_readl(dwc->regs, DWC3_GTXTHRCFG); + reg =3D dwc3_readl(dwc, DWC3_GTXTHRCFG); reg |=3D DWC31_TXTHRNUMPKTSEL_PRD; =20 reg &=3D ~DWC31_TXTHRNUMPKT_PRD(~0); @@ -1261,7 +1261,7 @@ static void dwc3_config_threshold(struct dwc3 *dwc) reg &=3D ~DWC31_MAXTXBURSTSIZE_PRD(~0); reg |=3D DWC31_MAXTXBURSTSIZE_PRD(tx_maxburst); =20 - dwc3_writel(dwc->regs, DWC3_GTXTHRCFG, reg); + dwc3_writel(dwc, DWC3_GTXTHRCFG, reg); } } =20 @@ -1272,7 +1272,7 @@ static void dwc3_config_threshold(struct dwc3 *dwc) =20 if (DWC3_IP_IS(DWC3)) { if (rx_thr_num && rx_maxburst) { - reg =3D dwc3_readl(dwc->regs, DWC3_GRXTHRCFG); + reg =3D dwc3_readl(dwc, DWC3_GRXTHRCFG); reg |=3D DWC3_GRXTHRCFG_PKTCNTSEL; =20 reg &=3D ~DWC3_GRXTHRCFG_RXPKTCNT(~0); @@ -1281,11 +1281,11 @@ static void dwc3_config_threshold(struct dwc3 *dwc) reg &=3D ~DWC3_GRXTHRCFG_MAXRXBURSTSIZE(~0); reg |=3D DWC3_GRXTHRCFG_MAXRXBURSTSIZE(rx_maxburst); =20 - dwc3_writel(dwc->regs, DWC3_GRXTHRCFG, reg); + dwc3_writel(dwc, DWC3_GRXTHRCFG, reg); } =20 if (tx_thr_num && tx_maxburst) { - reg =3D dwc3_readl(dwc->regs, DWC3_GTXTHRCFG); + reg =3D dwc3_readl(dwc, DWC3_GTXTHRCFG); reg |=3D DWC3_GTXTHRCFG_PKTCNTSEL; =20 reg &=3D ~DWC3_GTXTHRCFG_TXPKTCNT(~0); @@ -1294,11 +1294,11 @@ static void dwc3_config_threshold(struct dwc3 *dwc) reg &=3D ~DWC3_GTXTHRCFG_MAXTXBURSTSIZE(~0); reg |=3D DWC3_GTXTHRCFG_MAXTXBURSTSIZE(tx_maxburst); =20 - dwc3_writel(dwc->regs, DWC3_GTXTHRCFG, reg); + dwc3_writel(dwc, DWC3_GTXTHRCFG, reg); } } else { if (rx_thr_num && rx_maxburst) { - reg =3D dwc3_readl(dwc->regs, DWC3_GRXTHRCFG); + reg =3D dwc3_readl(dwc, DWC3_GRXTHRCFG); reg |=3D DWC31_GRXTHRCFG_PKTCNTSEL; =20 reg &=3D ~DWC31_GRXTHRCFG_RXPKTCNT(~0); @@ -1307,11 +1307,11 @@ static void dwc3_config_threshold(struct dwc3 *dwc) reg &=3D ~DWC31_GRXTHRCFG_MAXRXBURSTSIZE(~0); reg |=3D DWC31_GRXTHRCFG_MAXRXBURSTSIZE(rx_maxburst); =20 - dwc3_writel(dwc->regs, DWC3_GRXTHRCFG, reg); + dwc3_writel(dwc, DWC3_GRXTHRCFG, reg); } =20 if (tx_thr_num && tx_maxburst) { - reg =3D dwc3_readl(dwc->regs, DWC3_GTXTHRCFG); + reg =3D dwc3_readl(dwc, DWC3_GTXTHRCFG); reg |=3D DWC31_GTXTHRCFG_PKTCNTSEL; =20 reg &=3D ~DWC31_GTXTHRCFG_TXPKTCNT(~0); @@ -1320,7 +1320,7 @@ static void dwc3_config_threshold(struct dwc3 *dwc) reg &=3D ~DWC31_GTXTHRCFG_MAXTXBURSTSIZE(~0); reg |=3D DWC31_GTXTHRCFG_MAXTXBURSTSIZE(tx_maxburst); =20 - dwc3_writel(dwc->regs, DWC3_GTXTHRCFG, reg); + dwc3_writel(dwc, DWC3_GTXTHRCFG, reg); } } } @@ -1343,7 +1343,7 @@ int dwc3_core_init(struct dwc3 *dwc) * Write Linux Version Code to our GUID register so it's easy to figure * out which kernel version a bug was found. */ - dwc3_writel(dwc->regs, DWC3_GUID, LINUX_VERSION_CODE); + dwc3_writel(dwc, DWC3_GUID, LINUX_VERSION_CODE); =20 ret =3D dwc3_phy_setup(dwc); if (ret) @@ -1408,9 +1408,9 @@ int dwc3_core_init(struct dwc3 *dwc) * DWC_usb31 controller. */ if (DWC3_VER_IS_WITHIN(DWC3, 310A, ANY)) { - reg =3D dwc3_readl(dwc->regs, DWC3_GUCTL2); + reg =3D dwc3_readl(dwc, DWC3_GUCTL2); reg |=3D DWC3_GUCTL2_RST_ACTBITLATER; - dwc3_writel(dwc->regs, DWC3_GUCTL2, reg); + dwc3_writel(dwc, DWC3_GUCTL2, reg); } =20 /* @@ -1423,9 +1423,9 @@ int dwc3_core_init(struct dwc3 *dwc) * setting GUCTL2[19] by default; instead, use GUCTL2[19] =3D 0. */ if (DWC3_VER_IS(DWC3, 320A)) { - reg =3D dwc3_readl(dwc->regs, DWC3_GUCTL2); + reg =3D dwc3_readl(dwc, DWC3_GUCTL2); reg &=3D ~DWC3_GUCTL2_LC_TIMER; - dwc3_writel(dwc->regs, DWC3_GUCTL2, reg); + dwc3_writel(dwc, DWC3_GUCTL2, reg); } =20 /* @@ -1438,13 +1438,13 @@ int dwc3_core_init(struct dwc3 *dwc) * legacy ULPI PHYs. */ if (dwc->resume_hs_terminations) { - reg =3D dwc3_readl(dwc->regs, DWC3_GUCTL1); + reg =3D dwc3_readl(dwc, DWC3_GUCTL1); reg |=3D DWC3_GUCTL1_RESUME_OPMODE_HS_HOST; - dwc3_writel(dwc->regs, DWC3_GUCTL1, reg); + dwc3_writel(dwc, DWC3_GUCTL1, reg); } =20 if (!DWC3_VER_IS_PRIOR(DWC3, 250A)) { - reg =3D dwc3_readl(dwc->regs, DWC3_GUCTL1); + reg =3D dwc3_readl(dwc, DWC3_GUCTL1); =20 /* * Enable hardware control of sending remote wakeup @@ -1479,7 +1479,7 @@ int dwc3_core_init(struct dwc3 *dwc) reg &=3D ~DWC3_GUCTL1_DEV_FORCE_20_CLK_FOR_30_CLK; } =20 - dwc3_writel(dwc->regs, DWC3_GUCTL1, reg); + dwc3_writel(dwc, DWC3_GUCTL1, reg); } =20 dwc3_config_threshold(dwc); @@ -1490,9 +1490,9 @@ int dwc3_core_init(struct dwc3 *dwc) int i; =20 for (i =3D 0; i < dwc->num_usb3_ports; i++) { - reg =3D dwc3_readl(dwc->regs, DWC3_LLUCTL(i)); + reg =3D dwc3_readl(dwc, DWC3_LLUCTL(i)); reg |=3D DWC3_LLUCTL_FORCE_GEN1; - dwc3_writel(dwc->regs, DWC3_LLUCTL(i), reg); + dwc3_writel(dwc, DWC3_LLUCTL(i), reg); } } =20 @@ -1511,9 +1511,9 @@ int dwc3_core_init(struct dwc3 *dwc) * function is available only from version 1.70a. */ if (DWC3_VER_IS_WITHIN(DWC31, 170A, 180A)) { - reg =3D dwc3_readl(dwc->regs, DWC3_GUCTL3); + reg =3D dwc3_readl(dwc, DWC3_GUCTL3); reg |=3D DWC3_GUCTL3_USB20_RETRY_DISABLE; - dwc3_writel(dwc->regs, DWC3_GUCTL3, reg); + dwc3_writel(dwc, DWC3_GUCTL3, reg); } =20 return 0; @@ -2437,9 +2437,9 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_m= essage_t msg) int ret; =20 if (!pm_runtime_suspended(dwc->dev) && !PMSG_IS_AUTO(msg)) { - dwc->susphy_state =3D (dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0)) & + dwc->susphy_state =3D (dwc3_readl(dwc, DWC3_GUSB2PHYCFG(0)) & DWC3_GUSB2PHYCFG_SUSPHY) || - (dwc3_readl(dwc->regs, DWC3_GUSB3PIPECTL(0)) & + (dwc3_readl(dwc, DWC3_GUSB3PIPECTL(0)) & DWC3_GUSB3PIPECTL_SUSPHY); /* * TI AM62 platform requires SUSPHY to be @@ -2469,10 +2469,10 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm= _message_t msg) if (dwc->dis_u2_susphy_quirk || dwc->dis_enblslpm_quirk) { for (i =3D 0; i < dwc->num_usb2_ports; i++) { - reg =3D dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(i)); + reg =3D dwc3_readl(dwc, DWC3_GUSB2PHYCFG(i)); reg |=3D DWC3_GUSB2PHYCFG_ENBLSLPM | DWC3_GUSB2PHYCFG_SUSPHY; - dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(i), reg); + dwc3_writel(dwc, DWC3_GUSB2PHYCFG(i), reg); } =20 /* Give some time for USB2 PHY to suspend */ @@ -2532,14 +2532,14 @@ static int dwc3_resume_common(struct dwc3 *dwc, pm_= message_t msg) } /* Restore GUSB2PHYCFG bits that were modified in suspend */ for (i =3D 0; i < dwc->num_usb2_ports; i++) { - reg =3D dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(i)); + reg =3D dwc3_readl(dwc, DWC3_GUSB2PHYCFG(i)); if (dwc->dis_u2_susphy_quirk) reg &=3D ~DWC3_GUSB2PHYCFG_SUSPHY; =20 if (dwc->dis_enblslpm_quirk) reg &=3D ~DWC3_GUSB2PHYCFG_ENBLSLPM; =20 - dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(i), reg); + dwc3_writel(dwc, DWC3_GUSB2PHYCFG(i), reg); } =20 for (i =3D 0; i < dwc->num_usb2_ports; i++) @@ -2721,9 +2721,9 @@ void dwc3_pm_complete(struct dwc3 *dwc) =20 if (dwc->current_dr_role =3D=3D DWC3_GCTL_PRTCAP_HOST && dwc->dis_split_quirk) { - reg =3D dwc3_readl(dwc->regs, DWC3_GUCTL3); + reg =3D dwc3_readl(dwc, DWC3_GUCTL3); reg |=3D DWC3_GUCTL3_SPLITDISABLE; - dwc3_writel(dwc->regs, DWC3_GUCTL3, reg); + dwc3_writel(dwc, DWC3_GUCTL3, reg); } } EXPORT_SYMBOL_GPL(dwc3_pm_complete); diff --git a/drivers/usb/dwc3/debugfs.c b/drivers/usb/dwc3/debugfs.c index 0b45ff16f575..ffb1101f55c7 100644 --- a/drivers/usb/dwc3/debugfs.c +++ b/drivers/usb/dwc3/debugfs.c @@ -296,14 +296,14 @@ static void dwc3_host_lsp(struct seq_file *s) =20 reg =3D DWC3_GDBGLSPMUX_HOSTSELECT(sel); =20 - dwc3_writel(dwc->regs, DWC3_GDBGLSPMUX, reg); - val =3D dwc3_readl(dwc->regs, DWC3_GDBGLSP); + dwc3_writel(dwc, DWC3_GDBGLSPMUX, reg); + val =3D dwc3_readl(dwc, DWC3_GDBGLSP); seq_printf(s, "GDBGLSP[%d] =3D 0x%08x\n", sel, val); =20 if (dbc_enabled && sel < 256) { reg |=3D DWC3_GDBGLSPMUX_ENDBC; - dwc3_writel(dwc->regs, DWC3_GDBGLSPMUX, reg); - val =3D dwc3_readl(dwc->regs, DWC3_GDBGLSP); + dwc3_writel(dwc, DWC3_GDBGLSPMUX, reg); + val =3D dwc3_readl(dwc, DWC3_GDBGLSP); seq_printf(s, "GDBGLSP_DBC[%d] =3D 0x%08x\n", sel, val); } } @@ -316,8 +316,8 @@ static void dwc3_gadget_lsp(struct seq_file *s) =20 for (i =3D 0; i < 16; i++) { reg =3D DWC3_GDBGLSPMUX_DEVSELECT(i); - dwc3_writel(dwc->regs, DWC3_GDBGLSPMUX, reg); - reg =3D dwc3_readl(dwc->regs, DWC3_GDBGLSP); + dwc3_writel(dwc, DWC3_GDBGLSPMUX, reg); + reg =3D dwc3_readl(dwc, DWC3_GDBGLSP); seq_printf(s, "GDBGLSP[%d] =3D 0x%08x\n", i, reg); } } @@ -335,7 +335,7 @@ static int dwc3_lsp_show(struct seq_file *s, void *unus= ed) return ret; =20 spin_lock_irqsave(&dwc->lock, flags); - reg =3D dwc3_readl(dwc->regs, DWC3_GSTS); + reg =3D dwc3_readl(dwc, DWC3_GSTS); current_mode =3D DWC3_GSTS_CURMOD(reg); =20 switch (current_mode) { @@ -406,7 +406,7 @@ static int dwc3_mode_show(struct seq_file *s, void *unu= sed) return ret; =20 spin_lock_irqsave(&dwc->lock, flags); - reg =3D dwc3_readl(dwc->regs, DWC3_GCTL); + reg =3D dwc3_readl(dwc, DWC3_GCTL); spin_unlock_irqrestore(&dwc->lock, flags); =20 mode =3D DWC3_GCTL_PRTCAP(reg); @@ -478,7 +478,7 @@ static int dwc3_testmode_show(struct seq_file *s, void = *unused) return ret; =20 spin_lock_irqsave(&dwc->lock, flags); - reg =3D dwc3_readl(dwc->regs, DWC3_DCTL); + reg =3D dwc3_readl(dwc, DWC3_DCTL); reg &=3D DWC3_DCTL_TSTCTRL_MASK; reg >>=3D 1; spin_unlock_irqrestore(&dwc->lock, flags); @@ -577,7 +577,7 @@ static int dwc3_link_state_show(struct seq_file *s, voi= d *unused) return ret; =20 spin_lock_irqsave(&dwc->lock, flags); - reg =3D dwc3_readl(dwc->regs, DWC3_GSTS); + reg =3D dwc3_readl(dwc, DWC3_GSTS); if (DWC3_GSTS_CURMOD(reg) !=3D DWC3_GSTS_CURMOD_DEVICE) { seq_puts(s, "Not available\n"); spin_unlock_irqrestore(&dwc->lock, flags); @@ -585,7 +585,7 @@ static int dwc3_link_state_show(struct seq_file *s, voi= d *unused) return 0; } =20 - reg =3D dwc3_readl(dwc->regs, DWC3_DSTS); + reg =3D dwc3_readl(dwc, DWC3_DSTS); state =3D DWC3_DSTS_USBLNKST(reg); speed =3D reg & DWC3_DSTS_CONNECTSPD; =20 @@ -639,14 +639,14 @@ static ssize_t dwc3_link_state_write(struct file *fil= e, return ret; =20 spin_lock_irqsave(&dwc->lock, flags); - reg =3D dwc3_readl(dwc->regs, DWC3_GSTS); + reg =3D dwc3_readl(dwc, DWC3_GSTS); if (DWC3_GSTS_CURMOD(reg) !=3D DWC3_GSTS_CURMOD_DEVICE) { spin_unlock_irqrestore(&dwc->lock, flags); pm_runtime_put_sync(dwc->dev); return -EINVAL; } =20 - reg =3D dwc3_readl(dwc->regs, DWC3_DSTS); + reg =3D dwc3_readl(dwc, DWC3_DSTS); speed =3D reg & DWC3_DSTS_CONNECTSPD; =20 if (speed < DWC3_DSTS_SUPERSPEED && @@ -942,10 +942,10 @@ static int dwc3_ep_info_register_show(struct seq_file= *s, void *unused) =20 spin_lock_irqsave(&dwc->lock, flags); reg =3D DWC3_GDBGLSPMUX_EPSELECT(dep->number); - dwc3_writel(dwc->regs, DWC3_GDBGLSPMUX, reg); + dwc3_writel(dwc, DWC3_GDBGLSPMUX, reg); =20 - lower_32_bits =3D dwc3_readl(dwc->regs, DWC3_GDBGEPINFO0); - upper_32_bits =3D dwc3_readl(dwc->regs, DWC3_GDBGEPINFO1); + lower_32_bits =3D dwc3_readl(dwc, DWC3_GDBGEPINFO0); + upper_32_bits =3D dwc3_readl(dwc, DWC3_GDBGEPINFO1); =20 ep_info =3D ((u64)upper_32_bits << 32) | lower_32_bits; seq_printf(s, "0x%016llx\n", ep_info); diff --git a/drivers/usb/dwc3/drd.c b/drivers/usb/dwc3/drd.c index 589bbeb27454..9558862d63d8 100644 --- a/drivers/usb/dwc3/drd.c +++ b/drivers/usb/dwc3/drd.c @@ -18,25 +18,25 @@ =20 static void dwc3_otg_disable_events(struct dwc3 *dwc, u32 disable_mask) { - u32 reg =3D dwc3_readl(dwc->regs, DWC3_OEVTEN); + u32 reg =3D dwc3_readl(dwc, DWC3_OEVTEN); =20 reg &=3D ~(disable_mask); - dwc3_writel(dwc->regs, DWC3_OEVTEN, reg); + dwc3_writel(dwc, DWC3_OEVTEN, reg); } =20 static void dwc3_otg_enable_events(struct dwc3 *dwc, u32 enable_mask) { - u32 reg =3D dwc3_readl(dwc->regs, DWC3_OEVTEN); + u32 reg =3D dwc3_readl(dwc, DWC3_OEVTEN); =20 reg |=3D (enable_mask); - dwc3_writel(dwc->regs, DWC3_OEVTEN, reg); + dwc3_writel(dwc, DWC3_OEVTEN, reg); } =20 static void dwc3_otg_clear_events(struct dwc3 *dwc) { - u32 reg =3D dwc3_readl(dwc->regs, DWC3_OEVT); + u32 reg =3D dwc3_readl(dwc, DWC3_OEVT); =20 - dwc3_writel(dwc->regs, DWC3_OEVTEN, reg); + dwc3_writel(dwc, DWC3_OEVTEN, reg); } =20 #define DWC3_OTG_ALL_EVENTS (DWC3_OEVTEN_XHCIRUNSTPSETEN | \ @@ -72,18 +72,18 @@ static irqreturn_t dwc3_otg_irq(int irq, void *_dwc) struct dwc3 *dwc =3D _dwc; irqreturn_t ret =3D IRQ_NONE; =20 - reg =3D dwc3_readl(dwc->regs, DWC3_OEVT); + reg =3D dwc3_readl(dwc, DWC3_OEVT); if (reg) { /* ignore non OTG events, we can't disable them in OEVTEN */ if (!(reg & DWC3_OTG_ALL_EVENTS)) { - dwc3_writel(dwc->regs, DWC3_OEVT, reg); + dwc3_writel(dwc, DWC3_OEVT, reg); return IRQ_NONE; } =20 if (dwc->current_otg_role =3D=3D DWC3_OTG_ROLE_HOST && !(reg & DWC3_OEVT_DEVICEMODE)) dwc->otg_restart_host =3D true; - dwc3_writel(dwc->regs, DWC3_OEVT, reg); + dwc3_writel(dwc, DWC3_OEVT, reg); ret =3D IRQ_WAKE_THREAD; } =20 @@ -100,23 +100,23 @@ static void dwc3_otgregs_init(struct dwc3 *dwc) * the signal outputs sent to the PHY, the OTG FSM logic of the * core and also the resets to the VBUS filters inside the core. */ - reg =3D dwc3_readl(dwc->regs, DWC3_OCFG); + reg =3D dwc3_readl(dwc, DWC3_OCFG); reg |=3D DWC3_OCFG_SFTRSTMASK; - dwc3_writel(dwc->regs, DWC3_OCFG, reg); + dwc3_writel(dwc, DWC3_OCFG, reg); =20 /* Disable hibernation for simplicity */ - reg =3D dwc3_readl(dwc->regs, DWC3_GCTL); + reg =3D dwc3_readl(dwc, DWC3_GCTL); reg &=3D ~DWC3_GCTL_GBLHIBERNATIONEN; - dwc3_writel(dwc->regs, DWC3_GCTL, reg); + dwc3_writel(dwc, DWC3_GCTL, reg); =20 /* * Initialize OTG registers as per * Figure 11-4 OTG Driver Overall Programming Flow */ /* OCFG.SRPCap =3D 0, OCFG.HNPCap =3D 0 */ - reg =3D dwc3_readl(dwc->regs, DWC3_OCFG); + reg =3D dwc3_readl(dwc, DWC3_OCFG); reg &=3D ~(DWC3_OCFG_SRPCAP | DWC3_OCFG_HNPCAP); - dwc3_writel(dwc->regs, DWC3_OCFG, reg); + dwc3_writel(dwc, DWC3_OCFG, reg); /* OEVT =3D FFFF */ dwc3_otg_clear_events(dwc); /* OEVTEN =3D 0 */ @@ -127,11 +127,11 @@ static void dwc3_otgregs_init(struct dwc3 *dwc) * OCTL.PeriMode =3D 1, OCTL.DevSetHNPEn =3D 0, OCTL.HstSetHNPEn =3D 0, * OCTL.HNPReq =3D 0 */ - reg =3D dwc3_readl(dwc->regs, DWC3_OCTL); + reg =3D dwc3_readl(dwc, DWC3_OCTL); reg |=3D DWC3_OCTL_PERIMODE; reg &=3D ~(DWC3_OCTL_DEVSETHNPEN | DWC3_OCTL_HSTSETHNPEN | DWC3_OCTL_HNPREQ); - dwc3_writel(dwc->regs, DWC3_OCTL, reg); + dwc3_writel(dwc, DWC3_OCTL, reg); } =20 static int dwc3_otg_get_irq(struct dwc3 *dwc) @@ -175,9 +175,9 @@ void dwc3_otg_init(struct dwc3 *dwc) /* GCTL.PrtCapDir=3D2'b11 */ dwc3_set_prtcap(dwc, DWC3_GCTL_PRTCAP_OTG, true); /* GUSB2PHYCFG0.SusPHY=3D0 */ - reg =3D dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0)); + reg =3D dwc3_readl(dwc, DWC3_GUSB2PHYCFG(0)); reg &=3D ~DWC3_GUSB2PHYCFG_SUSPHY; - dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg); + dwc3_writel(dwc, DWC3_GUSB2PHYCFG(0), reg); =20 /* Initialize OTG registers */ dwc3_otgregs_init(dwc); @@ -203,17 +203,17 @@ void dwc3_otg_host_init(struct dwc3 *dwc) * OCTL.PeriMode=3D0, OCTL.TermSelDLPulse =3D 0, * OCTL.DevSetHNPEn =3D 0, OCTL.HstSetHNPEn =3D 0 */ - reg =3D dwc3_readl(dwc->regs, DWC3_OCTL); + reg =3D dwc3_readl(dwc, DWC3_OCTL); reg &=3D ~(DWC3_OCTL_PERIMODE | DWC3_OCTL_TERMSELIDPULSE | DWC3_OCTL_DEVSETHNPEN | DWC3_OCTL_HSTSETHNPEN); - dwc3_writel(dwc->regs, DWC3_OCTL, reg); + dwc3_writel(dwc, DWC3_OCTL, reg); =20 /* * OCFG.DisPrtPwrCutoff =3D 0/1 */ - reg =3D dwc3_readl(dwc->regs, DWC3_OCFG); + reg =3D dwc3_readl(dwc, DWC3_OCFG); reg &=3D ~DWC3_OCFG_DISPWRCUTTOFF; - dwc3_writel(dwc->regs, DWC3_OCFG, reg); + dwc3_writel(dwc, DWC3_OCFG, reg); =20 /* * OCFG.SRPCap =3D 1, OCFG.HNPCap =3D GHWPARAMS6.HNP_CAP @@ -229,15 +229,15 @@ void dwc3_otg_host_init(struct dwc3 *dwc) =20 /* GUSB2PHYCFG.ULPIAutoRes =3D 1/0, GUSB2PHYCFG.SusPHY =3D 1 */ if (!dwc->dis_u2_susphy_quirk) { - reg =3D dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0)); + reg =3D dwc3_readl(dwc, DWC3_GUSB2PHYCFG(0)); reg |=3D DWC3_GUSB2PHYCFG_SUSPHY; - dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg); + dwc3_writel(dwc, DWC3_GUSB2PHYCFG(0), reg); } =20 /* Set Port Power to enable VBUS: OCTL.PrtPwrCtl =3D 1 */ - reg =3D dwc3_readl(dwc->regs, DWC3_OCTL); + reg =3D dwc3_readl(dwc, DWC3_OCTL); reg |=3D DWC3_OCTL_PRTPWRCTL; - dwc3_writel(dwc->regs, DWC3_OCTL, reg); + dwc3_writel(dwc, DWC3_OCTL, reg); } =20 /* should be called after Host controller driver is stopped */ @@ -258,9 +258,9 @@ static void dwc3_otg_host_exit(struct dwc3 *dwc) */ =20 /* OCTL.HstSetHNPEn =3D 0, OCTL.PrtPwrCtl=3D0 */ - reg =3D dwc3_readl(dwc->regs, DWC3_OCTL); + reg =3D dwc3_readl(dwc, DWC3_OCTL); reg &=3D ~(DWC3_OCTL_HSTSETHNPEN | DWC3_OCTL_PRTPWRCTL); - dwc3_writel(dwc->regs, DWC3_OCTL, reg); + dwc3_writel(dwc, DWC3_OCTL, reg); } =20 /* should be called before the gadget controller driver is started */ @@ -274,27 +274,27 @@ static void dwc3_otg_device_init(struct dwc3 *dwc) * OCFG.HNPCap =3D GHWPARAMS6.HNP_CAP, OCFG.SRPCap =3D 1 * but we keep them 0 for simple dual-role operation. */ - reg =3D dwc3_readl(dwc->regs, DWC3_OCFG); + reg =3D dwc3_readl(dwc, DWC3_OCFG); /* OCFG.OTGSftRstMsk =3D 0/1 */ reg |=3D DWC3_OCFG_SFTRSTMASK; - dwc3_writel(dwc->regs, DWC3_OCFG, reg); + dwc3_writel(dwc, DWC3_OCFG, reg); /* * OCTL.PeriMode =3D 1 * OCTL.TermSelDLPulse =3D 0/1, OCTL.HNPReq =3D 0 * OCTL.DevSetHNPEn =3D 0, OCTL.HstSetHNPEn =3D 0 */ - reg =3D dwc3_readl(dwc->regs, DWC3_OCTL); + reg =3D dwc3_readl(dwc, DWC3_OCTL); reg |=3D DWC3_OCTL_PERIMODE; reg &=3D ~(DWC3_OCTL_TERMSELIDPULSE | DWC3_OCTL_HNPREQ | DWC3_OCTL_DEVSETHNPEN | DWC3_OCTL_HSTSETHNPEN); - dwc3_writel(dwc->regs, DWC3_OCTL, reg); + dwc3_writel(dwc, DWC3_OCTL, reg); /* OEVTEN.OTGBDevSesVldDetEvntEn =3D 1 */ dwc3_otg_enable_events(dwc, DWC3_OEVTEN_BDEVSESSVLDDETEN); /* GUSB2PHYCFG.ULPIAutoRes =3D 0, GUSB2PHYCFG0.SusPHY =3D 1 */ if (!dwc->dis_u2_susphy_quirk) { - reg =3D dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0)); + reg =3D dwc3_readl(dwc, DWC3_GUSB2PHYCFG(0)); reg |=3D DWC3_GUSB2PHYCFG_SUSPHY; - dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg); + dwc3_writel(dwc, DWC3_GUSB2PHYCFG(0), reg); } /* GCTL.GblHibernationEn =3D 0. Already 0. */ } @@ -319,10 +319,10 @@ static void dwc3_otg_device_exit(struct dwc3 *dwc) DWC3_OEVTEN_BDEVBHOSTENDEN); =20 /* OCTL.DevSetHNPEn =3D 0, OCTL.HNPReq =3D 0, OCTL.PeriMode=3D1 */ - reg =3D dwc3_readl(dwc->regs, DWC3_OCTL); + reg =3D dwc3_readl(dwc, DWC3_OCTL); reg &=3D ~(DWC3_OCTL_DEVSETHNPEN | DWC3_OCTL_HNPREQ); reg |=3D DWC3_OCTL_PERIMODE; - dwc3_writel(dwc->regs, DWC3_OCTL, reg); + dwc3_writel(dwc, DWC3_OCTL, reg); } =20 void dwc3_otg_update(struct dwc3 *dwc, bool ignore_idstatus) @@ -341,7 +341,7 @@ void dwc3_otg_update(struct dwc3 *dwc, bool ignore_idst= atus) return; =20 if (!ignore_idstatus) { - reg =3D dwc3_readl(dwc->regs, DWC3_OSTS); + reg =3D dwc3_readl(dwc, DWC3_OSTS); id =3D !!(reg & DWC3_OSTS_CONIDSTS); =20 dwc->desired_otg_role =3D id ? DWC3_OTG_ROLE_DEVICE : diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c index e0bad5708664..a8ff8db610d3 100644 --- a/drivers/usb/dwc3/ep0.c +++ b/drivers/usb/dwc3/ep0.c @@ -361,7 +361,7 @@ static int dwc3_ep0_handle_status(struct dwc3 *dwc, =20 if ((dwc->speed =3D=3D DWC3_DSTS_SUPERSPEED) || (dwc->speed =3D=3D DWC3_DSTS_SUPERSPEED_PLUS)) { - reg =3D dwc3_readl(dwc->regs, DWC3_DCTL); + reg =3D dwc3_readl(dwc, DWC3_DCTL); if (reg & DWC3_DCTL_INITU1ENA) usb_status |=3D 1 << USB_DEV_STAT_U1_ENABLED; if (reg & DWC3_DCTL_INITU2ENA) @@ -417,12 +417,12 @@ static int dwc3_ep0_handle_u1(struct dwc3 *dwc, enum = usb_device_state state, if (set && dwc->dis_u1_entry_quirk) return -EINVAL; =20 - reg =3D dwc3_readl(dwc->regs, DWC3_DCTL); + reg =3D dwc3_readl(dwc, DWC3_DCTL); if (set) reg |=3D DWC3_DCTL_INITU1ENA; else reg &=3D ~DWC3_DCTL_INITU1ENA; - dwc3_writel(dwc->regs, DWC3_DCTL, reg); + dwc3_writel(dwc, DWC3_DCTL, reg); =20 return 0; } @@ -441,12 +441,12 @@ static int dwc3_ep0_handle_u2(struct dwc3 *dwc, enum = usb_device_state state, if (set && dwc->dis_u2_entry_quirk) return -EINVAL; =20 - reg =3D dwc3_readl(dwc->regs, DWC3_DCTL); + reg =3D dwc3_readl(dwc, DWC3_DCTL); if (set) reg |=3D DWC3_DCTL_INITU2ENA; else reg &=3D ~DWC3_DCTL_INITU2ENA; - dwc3_writel(dwc->regs, DWC3_DCTL, reg); + dwc3_writel(dwc, DWC3_DCTL, reg); =20 return 0; } @@ -612,10 +612,10 @@ static int dwc3_ep0_set_address(struct dwc3 *dwc, str= uct usb_ctrlrequest *ctrl) return -EINVAL; } =20 - reg =3D dwc3_readl(dwc->regs, DWC3_DCFG); + reg =3D dwc3_readl(dwc, DWC3_DCFG); reg &=3D ~(DWC3_DCFG_DEVADDR_MASK); reg |=3D DWC3_DCFG_DEVADDR(addr); - dwc3_writel(dwc->regs, DWC3_DCFG, reg); + dwc3_writel(dwc, DWC3_DCFG, reg); =20 if (addr) usb_gadget_set_state(dwc->gadget, USB_STATE_ADDRESS); @@ -672,12 +672,12 @@ static int dwc3_ep0_set_config(struct dwc3 *dwc, stru= ct usb_ctrlrequest *ctrl) * Enable transition to U1/U2 state when * nothing is pending from application. */ - reg =3D dwc3_readl(dwc->regs, DWC3_DCTL); + reg =3D dwc3_readl(dwc, DWC3_DCTL); if (!dwc->dis_u1_entry_quirk) reg |=3D DWC3_DCTL_ACCEPTU1ENA; if (!dwc->dis_u2_entry_quirk) reg |=3D DWC3_DCTL_ACCEPTU2ENA; - dwc3_writel(dwc->regs, DWC3_DCTL, reg); + dwc3_writel(dwc, DWC3_DCTL, reg); } break; =20 @@ -717,7 +717,7 @@ static void dwc3_ep0_set_sel_cmpl(struct usb_ep *ep, st= ruct usb_request *req) dwc->u2sel =3D le16_to_cpu(timing.u2sel); dwc->u2pel =3D le16_to_cpu(timing.u2pel); =20 - reg =3D dwc3_readl(dwc->regs, DWC3_DCTL); + reg =3D dwc3_readl(dwc, DWC3_DCTL); if (reg & DWC3_DCTL_INITU2ENA) param =3D dwc->u2pel; if (reg & DWC3_DCTL_INITU1ENA) diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index ce087cbc4a53..9355c952c140 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -42,7 +42,7 @@ int dwc3_gadget_set_test_mode(struct dwc3 *dwc, int mode) { u32 reg; =20 - reg =3D dwc3_readl(dwc->regs, DWC3_DCTL); + reg =3D dwc3_readl(dwc, DWC3_DCTL); reg &=3D ~DWC3_DCTL_TSTCTRL_MASK; =20 switch (mode) { @@ -73,7 +73,7 @@ int dwc3_gadget_get_link_state(struct dwc3 *dwc) { u32 reg; =20 - reg =3D dwc3_readl(dwc->regs, DWC3_DSTS); + reg =3D dwc3_readl(dwc, DWC3_DSTS); =20 return DWC3_DSTS_USBLNKST(reg); } @@ -97,7 +97,7 @@ int dwc3_gadget_set_link_state(struct dwc3 *dwc, enum dwc= 3_link_state state) */ if (!DWC3_VER_IS_PRIOR(DWC3, 194A)) { while (--retries) { - reg =3D dwc3_readl(dwc->regs, DWC3_DSTS); + reg =3D dwc3_readl(dwc, DWC3_DSTS); if (reg & DWC3_DSTS_DCNRD) udelay(5); else @@ -108,15 +108,15 @@ int dwc3_gadget_set_link_state(struct dwc3 *dwc, enum= dwc3_link_state state) return -ETIMEDOUT; } =20 - reg =3D dwc3_readl(dwc->regs, DWC3_DCTL); + reg =3D dwc3_readl(dwc, DWC3_DCTL); reg &=3D ~DWC3_DCTL_ULSTCHNGREQ_MASK; =20 /* set no action before sending new link state change */ - dwc3_writel(dwc->regs, DWC3_DCTL, reg); + dwc3_writel(dwc, DWC3_DCTL, reg); =20 /* set requested state */ reg |=3D DWC3_DCTL_ULSTCHNGREQ(state); - dwc3_writel(dwc->regs, DWC3_DCTL, reg); + dwc3_writel(dwc, DWC3_DCTL, reg); =20 /* * The following code is racy when called from dwc3_gadget_wakeup, @@ -128,7 +128,7 @@ int dwc3_gadget_set_link_state(struct dwc3 *dwc, enum d= wc3_link_state state) /* wait for a change in DSTS */ retries =3D 10000; while (--retries) { - reg =3D dwc3_readl(dwc->regs, DWC3_DSTS); + reg =3D dwc3_readl(dwc, DWC3_DSTS); =20 if (DWC3_DSTS_USBLNKST(reg) =3D=3D state) return 0; @@ -260,11 +260,11 @@ int dwc3_send_gadget_generic_command(struct dwc3 *dwc= , unsigned int cmd, int ret =3D 0; u32 reg; =20 - dwc3_writel(dwc->regs, DWC3_DGCMDPAR, param); - dwc3_writel(dwc->regs, DWC3_DGCMD, cmd | DWC3_DGCMD_CMDACT); + dwc3_writel(dwc, DWC3_DGCMDPAR, param); + dwc3_writel(dwc, DWC3_DGCMD, cmd | DWC3_DGCMD_CMDACT); =20 do { - reg =3D dwc3_readl(dwc->regs, DWC3_DGCMD); + reg =3D dwc3_readl(dwc, DWC3_DGCMD); if (!(reg & DWC3_DGCMD_CMDACT)) { status =3D DWC3_DGCMD_STATUS(reg); if (status) @@ -334,7 +334,7 @@ int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsign= ed int cmd, */ if (dwc->gadget->speed <=3D USB_SPEED_HIGH || DWC3_DEPCMD_CMD(cmd) =3D=3D DWC3_DEPCMD_ENDTRANSFER) { - reg =3D dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0)); + reg =3D dwc3_readl(dwc, DWC3_GUSB2PHYCFG(0)); if (unlikely(reg & DWC3_GUSB2PHYCFG_SUSPHY)) { saved_config |=3D DWC3_GUSB2PHYCFG_SUSPHY; reg &=3D ~DWC3_GUSB2PHYCFG_SUSPHY; @@ -346,7 +346,7 @@ int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsign= ed int cmd, } =20 if (saved_config) - dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg); + dwc3_writel(dwc, DWC3_GUSB2PHYCFG(0), reg); } =20 /* @@ -356,9 +356,9 @@ int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsign= ed int cmd, * improve performance. */ if (DWC3_DEPCMD_CMD(cmd) !=3D DWC3_DEPCMD_UPDATETRANSFER) { - dwc3_writel(dwc->regs, DWC3_DEPCMDPAR0(epnum), params->param0); - dwc3_writel(dwc->regs, DWC3_DEPCMDPAR1(epnum), params->param1); - dwc3_writel(dwc->regs, DWC3_DEPCMDPAR2(epnum), params->param2); + dwc3_writel(dwc, DWC3_DEPCMDPAR0(epnum), params->param0); + dwc3_writel(dwc, DWC3_DEPCMDPAR1(epnum), params->param1); + dwc3_writel(dwc, DWC3_DEPCMDPAR2(epnum), params->param2); } =20 /* @@ -382,7 +382,7 @@ int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsign= ed int cmd, else cmd |=3D DWC3_DEPCMD_CMDACT; =20 - dwc3_writel(dwc->regs, DWC3_DEPCMD(epnum), cmd); + dwc3_writel(dwc, DWC3_DEPCMD(epnum), cmd); =20 if (!(cmd & DWC3_DEPCMD_CMDACT) || (DWC3_DEPCMD_CMD(cmd) =3D=3D DWC3_DEPCMD_ENDTRANSFER && @@ -392,7 +392,7 @@ int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsign= ed int cmd, } =20 do { - reg =3D dwc3_readl(dwc->regs, DWC3_DEPCMD(epnum)); + reg =3D dwc3_readl(dwc, DWC3_DEPCMD(epnum)); if (!(reg & DWC3_DEPCMD_CMDACT)) { cmd_status =3D DWC3_DEPCMD_STATUS(reg); =20 @@ -448,9 +448,9 @@ int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsign= ed int cmd, mdelay(1); =20 if (saved_config) { - reg =3D dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0)); + reg =3D dwc3_readl(dwc, DWC3_GUSB2PHYCFG(0)); reg |=3D saved_config; - dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg); + dwc3_writel(dwc, DWC3_GUSB2PHYCFG(0), reg); } =20 return ret; @@ -727,7 +727,7 @@ static int dwc3_gadget_calc_ram_depth(struct dwc3 *dwc) u32 reg; =20 /* Check if TXFIFOs start at non-zero addr */ - reg =3D dwc3_readl(dwc->regs, DWC3_GTXFIFOSIZ(0)); + reg =3D dwc3_readl(dwc, DWC3_GTXFIFOSIZ(0)); fifo_0_start =3D DWC3_GTXFIFOSIZ_TXFSTADDR(reg); =20 ram_depth -=3D (fifo_0_start >> 16); @@ -755,7 +755,7 @@ void dwc3_gadget_clear_tx_fifos(struct dwc3 *dwc) =20 /* Read ep0IN related TXFIFO size */ dep =3D dwc->eps[1]; - size =3D dwc3_readl(dwc->regs, DWC3_GTXFIFOSIZ(0)); + size =3D dwc3_readl(dwc, DWC3_GTXFIFOSIZ(0)); if (DWC3_IP_IS(DWC3)) fifo_depth =3D DWC3_GTXFIFOSIZ_TXFDEP(size); else @@ -770,10 +770,10 @@ void dwc3_gadget_clear_tx_fifos(struct dwc3 *dwc) =20 /* Don't change TXFRAMNUM on usb31 version */ size =3D DWC3_IP_IS(DWC3) ? 0 : - dwc3_readl(dwc->regs, DWC3_GTXFIFOSIZ(num >> 1)) & + dwc3_readl(dwc, DWC3_GTXFIFOSIZ(num >> 1)) & DWC31_GTXFIFOSIZ_TXFRAMNUM; =20 - dwc3_writel(dwc->regs, DWC3_GTXFIFOSIZ(num >> 1), size); + dwc3_writel(dwc, DWC3_GTXFIFOSIZ(num >> 1), size); dep->flags &=3D ~DWC3_EP_TXFIFO_RESIZED; } dwc->num_ep_resized =3D 0; @@ -876,7 +876,7 @@ static int dwc3_gadget_resize_tx_fifos(struct dwc3_ep *= dep) fifo_size++; =20 /* Check if TXFIFOs start at non-zero addr */ - tmp =3D dwc3_readl(dwc->regs, DWC3_GTXFIFOSIZ(0)); + tmp =3D dwc3_readl(dwc, DWC3_GTXFIFOSIZ(0)); fifo_0_start =3D DWC3_GTXFIFOSIZ_TXFSTADDR(tmp); =20 fifo_size |=3D (fifo_0_start + (dwc->last_fifo_depth << 16)); @@ -899,7 +899,7 @@ static int dwc3_gadget_resize_tx_fifos(struct dwc3_ep *= dep) return -ENOMEM; } =20 - dwc3_writel(dwc->regs, DWC3_GTXFIFOSIZ(dep->number >> 1), fifo_size); + dwc3_writel(dwc, DWC3_GTXFIFOSIZ(dep->number >> 1), fifo_size); dep->flags |=3D DWC3_EP_TXFIFO_RESIZED; dwc->num_ep_resized++; =20 @@ -943,9 +943,9 @@ static int __dwc3_gadget_ep_enable(struct dwc3_ep *dep,= unsigned int action) dep->type =3D usb_endpoint_type(desc); dep->flags |=3D DWC3_EP_ENABLED; =20 - reg =3D dwc3_readl(dwc->regs, DWC3_DALEPENA); + reg =3D dwc3_readl(dwc, DWC3_DALEPENA); reg |=3D DWC3_DALEPENA_EP(dep->number); - dwc3_writel(dwc->regs, DWC3_DALEPENA, reg); + dwc3_writel(dwc, DWC3_DALEPENA, reg); =20 dep->trb_dequeue =3D 0; dep->trb_enqueue =3D 0; @@ -1080,9 +1080,9 @@ static int __dwc3_gadget_ep_disable(struct dwc3_ep *d= ep) if (dep->flags & DWC3_EP_STALL) __dwc3_gadget_ep_set_halt(dep, 0, false); =20 - reg =3D dwc3_readl(dwc->regs, DWC3_DALEPENA); + reg =3D dwc3_readl(dwc, DWC3_DALEPENA); reg &=3D ~DWC3_DALEPENA_EP(dep->number); - dwc3_writel(dwc->regs, DWC3_DALEPENA, reg); + dwc3_writel(dwc, DWC3_DALEPENA, reg); =20 dwc3_remove_requests(dwc, dep, -ESHUTDOWN); =20 @@ -1743,7 +1743,7 @@ static int __dwc3_gadget_get_frame(struct dwc3 *dwc) { u32 reg; =20 - reg =3D dwc3_readl(dwc->regs, DWC3_DSTS); + reg =3D dwc3_readl(dwc, DWC3_DSTS); return DWC3_DSTS_SOFFN(reg); } =20 @@ -2351,13 +2351,13 @@ static void dwc3_gadget_enable_linksts_evts(struct = dwc3 *dwc, bool set) if (DWC3_VER_IS_PRIOR(DWC3, 250A)) return; =20 - reg =3D dwc3_readl(dwc->regs, DWC3_DEVTEN); + reg =3D dwc3_readl(dwc, DWC3_DEVTEN); if (set) reg |=3D DWC3_DEVTEN_ULSTCNGEN; else reg &=3D ~DWC3_DEVTEN_ULSTCNGEN; =20 - dwc3_writel(dwc->regs, DWC3_DEVTEN, reg); + dwc3_writel(dwc, DWC3_DEVTEN, reg); } =20 static int dwc3_gadget_get_frame(struct usb_gadget *g) @@ -2380,7 +2380,7 @@ static int __dwc3_gadget_wakeup(struct dwc3 *dwc) * * We can check that via USB Link State bits in DSTS register. */ - reg =3D dwc3_readl(dwc->regs, DWC3_DSTS); + reg =3D dwc3_readl(dwc, DWC3_DSTS); =20 link_state =3D DWC3_DSTS_USBLNKST(reg); =20 @@ -2408,9 +2408,9 @@ static int __dwc3_gadget_wakeup(struct dwc3 *dwc) /* Recent versions do this automatically */ if (DWC3_VER_IS_PRIOR(DWC3, 194A)) { /* write zeroes to Link Change Request */ - reg =3D dwc3_readl(dwc->regs, DWC3_DCTL); + reg =3D dwc3_readl(dwc, DWC3_DCTL); reg &=3D ~DWC3_DCTL_ULSTCHNGREQ_MASK; - dwc3_writel(dwc->regs, DWC3_DCTL, reg); + dwc3_writel(dwc, DWC3_DCTL, reg); } =20 /* @@ -2530,7 +2530,7 @@ static void __dwc3_gadget_set_ssp_rate(struct dwc3 *d= wc) if (ssp_rate =3D=3D USB_SSP_GEN_UNKNOWN) ssp_rate =3D dwc->max_ssp_rate; =20 - reg =3D dwc3_readl(dwc->regs, DWC3_DCFG); + reg =3D dwc3_readl(dwc, DWC3_DCFG); reg &=3D ~DWC3_DCFG_SPEED_MASK; reg &=3D ~DWC3_DCFG_NUMLANES(~0); =20 @@ -2543,7 +2543,7 @@ static void __dwc3_gadget_set_ssp_rate(struct dwc3 *d= wc) dwc->max_ssp_rate !=3D USB_SSP_GEN_2x1) reg |=3D DWC3_DCFG_NUMLANES(1); =20 - dwc3_writel(dwc->regs, DWC3_DCFG, reg); + dwc3_writel(dwc, DWC3_DCFG, reg); } =20 static void __dwc3_gadget_set_speed(struct dwc3 *dwc) @@ -2561,7 +2561,7 @@ static void __dwc3_gadget_set_speed(struct dwc3 *dwc) return; } =20 - reg =3D dwc3_readl(dwc->regs, DWC3_DCFG); + reg =3D dwc3_readl(dwc, DWC3_DCFG); reg &=3D ~(DWC3_DCFG_SPEED_MASK); =20 /* @@ -2612,7 +2612,7 @@ static void __dwc3_gadget_set_speed(struct dwc3 *dwc) speed < USB_SPEED_SUPER_PLUS) reg &=3D ~DWC3_DCFG_NUMLANES(~0); =20 - dwc3_writel(dwc->regs, DWC3_DCFG, reg); + dwc3_writel(dwc, DWC3_DCFG, reg); } =20 static int dwc3_gadget_run_stop(struct dwc3 *dwc, int is_on) @@ -2637,7 +2637,7 @@ static int dwc3_gadget_run_stop(struct dwc3 *dwc, int= is_on) * mentioned in the dwc3 programming guide. It has been tested on an * Exynos platforms. */ - reg =3D dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0)); + reg =3D dwc3_readl(dwc, DWC3_GUSB2PHYCFG(0)); if (reg & DWC3_GUSB2PHYCFG_SUSPHY) { saved_config |=3D DWC3_GUSB2PHYCFG_SUSPHY; reg &=3D ~DWC3_GUSB2PHYCFG_SUSPHY; @@ -2649,9 +2649,9 @@ static int dwc3_gadget_run_stop(struct dwc3 *dwc, int= is_on) } =20 if (saved_config) - dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg); + dwc3_writel(dwc, DWC3_GUSB2PHYCFG(0), reg); =20 - reg =3D dwc3_readl(dwc->regs, DWC3_DCTL); + reg =3D dwc3_readl(dwc, DWC3_DCTL); if (is_on) { if (DWC3_VER_IS_WITHIN(DWC3, ANY, 187A)) { reg &=3D ~DWC3_DCTL_TRGTULST_MASK; @@ -2675,14 +2675,14 @@ static int dwc3_gadget_run_stop(struct dwc3 *dwc, i= nt is_on) =20 do { usleep_range(1000, 2000); - reg =3D dwc3_readl(dwc->regs, DWC3_DSTS); + reg =3D dwc3_readl(dwc, DWC3_DSTS); reg &=3D DWC3_DSTS_DEVCTRLHLT; } while (--timeout && !(!is_on ^ !reg)); =20 if (saved_config) { - reg =3D dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0)); + reg =3D dwc3_readl(dwc, DWC3_GUSB2PHYCFG(0)); reg |=3D saved_config; - dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg); + dwc3_writel(dwc, DWC3_GUSB2PHYCFG(0), reg); } =20 if (!timeout) @@ -2858,13 +2858,13 @@ static void dwc3_gadget_enable_irq(struct dwc3 *dwc) if (!DWC3_VER_IS_PRIOR(DWC3, 230A)) reg |=3D DWC3_DEVTEN_U3L2L1SUSPEN; =20 - dwc3_writel(dwc->regs, DWC3_DEVTEN, reg); + dwc3_writel(dwc, DWC3_DEVTEN, reg); } =20 static void dwc3_gadget_disable_irq(struct dwc3 *dwc) { /* mask all interrupts */ - dwc3_writel(dwc->regs, DWC3_DEVTEN, 0x00); + dwc3_writel(dwc, DWC3_DEVTEN, 0x00); } =20 static irqreturn_t dwc3_interrupt(int irq, void *_dwc); @@ -2905,10 +2905,10 @@ static void dwc3_gadget_setup_nump(struct dwc3 *dwc) nump =3D min_t(u32, nump, 16); =20 /* update NumP */ - reg =3D dwc3_readl(dwc->regs, DWC3_DCFG); + reg =3D dwc3_readl(dwc, DWC3_DCFG); reg &=3D ~DWC3_DCFG_NUMP_MASK; reg |=3D nump << DWC3_DCFG_NUMP_SHIFT; - dwc3_writel(dwc->regs, DWC3_DCFG, reg); + dwc3_writel(dwc, DWC3_DCFG, reg); } =20 static int __dwc3_gadget_start(struct dwc3 *dwc) @@ -2922,10 +2922,10 @@ static int __dwc3_gadget_start(struct dwc3 *dwc) * the core supports IMOD, disable it. */ if (dwc->imod_interval) { - dwc3_writel(dwc->regs, DWC3_DEV_IMOD(0), dwc->imod_interval); - dwc3_writel(dwc->regs, DWC3_GEVNTCOUNT(0), DWC3_GEVNTCOUNT_EHB); + dwc3_writel(dwc, DWC3_DEV_IMOD(0), dwc->imod_interval); + dwc3_writel(dwc, DWC3_GEVNTCOUNT(0), DWC3_GEVNTCOUNT_EHB); } else if (dwc3_has_imod(dwc)) { - dwc3_writel(dwc->regs, DWC3_DEV_IMOD(0), 0); + dwc3_writel(dwc, DWC3_DEV_IMOD(0), 0); } =20 /* @@ -2935,13 +2935,13 @@ static int __dwc3_gadget_start(struct dwc3 *dwc) * This way, we maximize the chances that we'll be able to get several * bursts of data without going through any sort of endpoint throttling. */ - reg =3D dwc3_readl(dwc->regs, DWC3_GRXTHRCFG); + reg =3D dwc3_readl(dwc, DWC3_GRXTHRCFG); if (DWC3_IP_IS(DWC3)) reg &=3D ~DWC3_GRXTHRCFG_PKTCNTSEL; else reg &=3D ~DWC31_GRXTHRCFG_PKTCNTSEL; =20 - dwc3_writel(dwc->regs, DWC3_GRXTHRCFG, reg); + dwc3_writel(dwc, DWC3_GRXTHRCFG, reg); =20 dwc3_gadget_setup_nump(dwc); =20 @@ -2952,15 +2952,15 @@ static int __dwc3_gadget_start(struct dwc3 *dwc) * ACK with NumP=3D0 and PP=3D0 (for IN direction). This slightly improves * the stream performance. */ - reg =3D dwc3_readl(dwc->regs, DWC3_DCFG); + reg =3D dwc3_readl(dwc, DWC3_DCFG); reg |=3D DWC3_DCFG_IGNSTRMPP; - dwc3_writel(dwc->regs, DWC3_DCFG, reg); + dwc3_writel(dwc, DWC3_DCFG, reg); =20 /* Enable MST by default if the device is capable of MST */ if (DWC3_MST_CAPABLE(&dwc->hwparams)) { - reg =3D dwc3_readl(dwc->regs, DWC3_DCFG1); + reg =3D dwc3_readl(dwc, DWC3_DCFG1); reg &=3D ~DWC3_DCFG1_DIS_MST_ENH; - dwc3_writel(dwc->regs, DWC3_DCFG1, reg); + dwc3_writel(dwc, DWC3_DCFG1, reg); } =20 /* Start with SuperSpeed Default */ @@ -3240,7 +3240,7 @@ static int dwc3_gadget_init_in_endpoint(struct dwc3_e= p *dep) /* MDWIDTH is represented in bits, we need it in bytes */ mdwidth /=3D 8; =20 - size =3D dwc3_readl(dwc->regs, DWC3_GTXFIFOSIZ(dep->number >> 1)); + size =3D dwc3_readl(dwc, DWC3_GTXFIFOSIZ(dep->number >> 1)); if (DWC3_IP_IS(DWC3)) size =3D DWC3_GTXFIFOSIZ_TXFDEP(size); else @@ -3289,7 +3289,7 @@ static int dwc3_gadget_init_out_endpoint(struct dwc3_= ep *dep) mdwidth /=3D 8; =20 /* All OUT endpoints share a single RxFIFO space */ - size =3D dwc3_readl(dwc->regs, DWC3_GRXFIFOSIZ(0)); + size =3D dwc3_readl(dwc, DWC3_GRXFIFOSIZ(0)); if (DWC3_IP_IS(DWC3)) size =3D DWC3_GRXFIFOSIZ_RXFDEP(size); else @@ -3742,9 +3742,9 @@ static bool dwc3_gadget_endpoint_trbs_complete(struct= dwc3_ep *dep, return no_started_trb; } =20 - reg =3D dwc3_readl(dwc->regs, DWC3_DCTL); + reg =3D dwc3_readl(dwc, DWC3_DCTL); reg |=3D dwc->u1u2; - dwc3_writel(dwc->regs, DWC3_DCTL, reg); + dwc3_writel(dwc, DWC3_DCTL, reg); =20 dwc->u1u2 =3D 0; } @@ -4074,7 +4074,7 @@ static void dwc3_gadget_disconnect_interrupt(struct d= wc3 *dwc) =20 dwc3_gadget_set_link_state(dwc, DWC3_LINK_STATE_RX_DET); =20 - reg =3D dwc3_readl(dwc->regs, DWC3_DCTL); + reg =3D dwc3_readl(dwc, DWC3_DCTL); reg &=3D ~DWC3_DCTL_INITU1ENA; reg &=3D ~DWC3_DCTL_INITU2ENA; dwc3_gadget_dctl_write_safe(dwc, reg); @@ -4163,7 +4163,7 @@ static void dwc3_gadget_reset_interrupt(struct dwc3 *= dwc) dwc3_stop_active_transfers(dwc); dwc->connected =3D true; =20 - reg =3D dwc3_readl(dwc->regs, DWC3_DCTL); + reg =3D dwc3_readl(dwc, DWC3_DCTL); reg &=3D ~DWC3_DCTL_TSTCTRL_MASK; dwc3_gadget_dctl_write_safe(dwc, reg); dwc->test_mode =3D false; @@ -4172,9 +4172,9 @@ static void dwc3_gadget_reset_interrupt(struct dwc3 *= dwc) dwc3_clear_stall_all_ep(dwc); =20 /* Reset device address to zero */ - reg =3D dwc3_readl(dwc->regs, DWC3_DCFG); + reg =3D dwc3_readl(dwc, DWC3_DCFG); reg &=3D ~(DWC3_DCFG_DEVADDR_MASK); - dwc3_writel(dwc->regs, DWC3_DCFG, reg); + dwc3_writel(dwc, DWC3_DCFG, reg); } =20 static void dwc3_gadget_conndone_interrupt(struct dwc3 *dwc) @@ -4188,7 +4188,7 @@ static void dwc3_gadget_conndone_interrupt(struct dwc= 3 *dwc) if (!dwc->softconnect) return; =20 - reg =3D dwc3_readl(dwc->regs, DWC3_DSTS); + reg =3D dwc3_readl(dwc, DWC3_DSTS); speed =3D reg & DWC3_DSTS_CONNECTSPD; dwc->speed =3D speed; =20 @@ -4263,11 +4263,11 @@ static void dwc3_gadget_conndone_interrupt(struct d= wc3 *dwc) !dwc->usb2_gadget_lpm_disable && (speed !=3D DWC3_DSTS_SUPERSPEED) && (speed !=3D DWC3_DSTS_SUPERSPEED_PLUS)) { - reg =3D dwc3_readl(dwc->regs, DWC3_DCFG); + reg =3D dwc3_readl(dwc, DWC3_DCFG); reg |=3D DWC3_DCFG_LPM_CAP; - dwc3_writel(dwc->regs, DWC3_DCFG, reg); + dwc3_writel(dwc, DWC3_DCFG, reg); =20 - reg =3D dwc3_readl(dwc->regs, DWC3_DCTL); + reg =3D dwc3_readl(dwc, DWC3_DCTL); reg &=3D ~(DWC3_DCTL_HIRD_THRES_MASK | DWC3_DCTL_L1_HIBER_EN); =20 reg |=3D DWC3_DCTL_HIRD_THRES(dwc->hird_threshold | @@ -4290,12 +4290,12 @@ static void dwc3_gadget_conndone_interrupt(struct d= wc3 *dwc) dwc3_gadget_dctl_write_safe(dwc, reg); } else { if (dwc->usb2_gadget_lpm_disable) { - reg =3D dwc3_readl(dwc->regs, DWC3_DCFG); + reg =3D dwc3_readl(dwc, DWC3_DCFG); reg &=3D ~DWC3_DCFG_LPM_CAP; - dwc3_writel(dwc->regs, DWC3_DCFG, reg); + dwc3_writel(dwc, DWC3_DCFG, reg); } =20 - reg =3D dwc3_readl(dwc->regs, DWC3_DCTL); + reg =3D dwc3_readl(dwc, DWC3_DCTL); reg &=3D ~DWC3_DCTL_HIRD_THRES_MASK; dwc3_gadget_dctl_write_safe(dwc, reg); } @@ -4401,7 +4401,7 @@ static void dwc3_gadget_linksts_change_interrupt(stru= ct dwc3 *dwc, switch (dwc->link_state) { case DWC3_LINK_STATE_U1: case DWC3_LINK_STATE_U2: - reg =3D dwc3_readl(dwc->regs, DWC3_DCTL); + reg =3D dwc3_readl(dwc, DWC3_DCTL); u1u2 =3D reg & (DWC3_DCTL_INITU2ENA | DWC3_DCTL_ACCEPTU2ENA | DWC3_DCTL_INITU1ENA @@ -4558,7 +4558,7 @@ static irqreturn_t dwc3_process_event_buf(struct dwc3= _event_buffer *evt) ret =3D IRQ_HANDLED; =20 /* Unmask interrupt */ - dwc3_writel(dwc->regs, DWC3_GEVNTSIZ(0), + dwc3_writel(dwc, DWC3_GEVNTSIZ(0), DWC3_GEVNTSIZ_SIZE(evt->length)); =20 evt->flags &=3D ~DWC3_EVENT_PENDING; @@ -4569,8 +4569,8 @@ static irqreturn_t dwc3_process_event_buf(struct dwc3= _event_buffer *evt) wmb(); =20 if (dwc->imod_interval) { - dwc3_writel(dwc->regs, DWC3_GEVNTCOUNT(0), DWC3_GEVNTCOUNT_EHB); - dwc3_writel(dwc->regs, DWC3_DEV_IMOD(0), dwc->imod_interval); + dwc3_writel(dwc, DWC3_GEVNTCOUNT(0), DWC3_GEVNTCOUNT_EHB); + dwc3_writel(dwc, DWC3_DEV_IMOD(0), dwc->imod_interval); } =20 return ret; @@ -4619,7 +4619,7 @@ static irqreturn_t dwc3_check_event_buf(struct dwc3_e= vent_buffer *evt) if (evt->flags & DWC3_EVENT_PENDING) return IRQ_HANDLED; =20 - count =3D dwc3_readl(dwc->regs, DWC3_GEVNTCOUNT(0)); + count =3D dwc3_readl(dwc, DWC3_GEVNTCOUNT(0)); count &=3D DWC3_GEVNTCOUNT_MASK; if (!count) return IRQ_NONE; @@ -4634,7 +4634,7 @@ static irqreturn_t dwc3_check_event_buf(struct dwc3_e= vent_buffer *evt) evt->flags |=3D DWC3_EVENT_PENDING; =20 /* Mask interrupt */ - dwc3_writel(dwc->regs, DWC3_GEVNTSIZ(0), + dwc3_writel(dwc, DWC3_GEVNTSIZ(0), DWC3_GEVNTSIZ_INTMASK | DWC3_GEVNTSIZ_SIZE(evt->length)); =20 amount =3D min(count, evt->length - evt->lpos); @@ -4643,7 +4643,7 @@ static irqreturn_t dwc3_check_event_buf(struct dwc3_e= vent_buffer *evt) if (amount < count) memcpy(evt->cache, evt->buf, count - amount); =20 - dwc3_writel(dwc->regs, DWC3_GEVNTCOUNT(0), count); + dwc3_writel(dwc, DWC3_GEVNTCOUNT(0), count); =20 return IRQ_WAKE_THREAD; } diff --git a/drivers/usb/dwc3/gadget.h b/drivers/usb/dwc3/gadget.h index c3aa9638b7a5..45f113b3c146 100644 --- a/drivers/usb/dwc3/gadget.h +++ b/drivers/usb/dwc3/gadget.h @@ -132,7 +132,7 @@ static inline void dwc3_gadget_ep_get_transfer_index(st= ruct dwc3_ep *dep) { u32 res_id; =20 - res_id =3D dwc3_readl(dep->dwc->regs, DWC3_DEPCMD(dep->number)); + res_id =3D dwc3_readl(dep->dwc, DWC3_DEPCMD(dep->number)); dep->resource_index =3D DWC3_DEPCMD_GET_RSC_IDX(res_id); } =20 @@ -147,7 +147,7 @@ static inline void dwc3_gadget_ep_get_transfer_index(st= ruct dwc3_ep *dep) static inline void dwc3_gadget_dctl_write_safe(struct dwc3 *dwc, u32 value) { value &=3D ~DWC3_DCTL_ULSTCHNGREQ_MASK; - dwc3_writel(dwc->regs, DWC3_DCTL, value); + dwc3_writel(dwc, DWC3_DCTL, value); } =20 #endif /* __DRIVERS_USB_DWC3_GADGET_H */ diff --git a/drivers/usb/dwc3/io.h b/drivers/usb/dwc3/io.h index 1e96ea339d48..7dd0c1e0cf74 100644 --- a/drivers/usb/dwc3/io.h +++ b/drivers/usb/dwc3/io.h @@ -16,9 +16,10 @@ #include "debug.h" #include "core.h" =20 -static inline u32 dwc3_readl(void __iomem *base, u32 offset) +static inline u32 dwc3_readl(struct dwc3 *dwc, u32 offset) { u32 value; + void __iomem *base =3D dwc->regs; =20 /* * We requested the mem region starting from the Globals address @@ -37,8 +38,10 @@ static inline u32 dwc3_readl(void __iomem *base, u32 off= set) return value; } =20 -static inline void dwc3_writel(void __iomem *base, u32 offset, u32 value) +static inline void dwc3_writel(struct dwc3 *dwc, u32 offset, u32 value) { + void __iomem *base =3D dwc->regs; + /* * We requested the mem region starting from the Globals address * space, see dwc3_probe in core.c. diff --git a/drivers/usb/dwc3/ulpi.c b/drivers/usb/dwc3/ulpi.c index f23f4c9a557e..57daad15f502 100644 --- a/drivers/usb/dwc3/ulpi.c +++ b/drivers/usb/dwc3/ulpi.c @@ -33,13 +33,13 @@ static int dwc3_ulpi_busyloop(struct dwc3 *dwc, u8 addr= , bool read) if (read) ns +=3D DWC3_ULPI_BASE_DELAY; =20 - reg =3D dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0)); + reg =3D dwc3_readl(dwc, DWC3_GUSB2PHYCFG(0)); if (reg & DWC3_GUSB2PHYCFG_SUSPHY) usleep_range(1000, 1200); =20 while (count--) { ndelay(ns); - reg =3D dwc3_readl(dwc->regs, DWC3_GUSB2PHYACC(0)); + reg =3D dwc3_readl(dwc, DWC3_GUSB2PHYACC(0)); if (reg & DWC3_GUSB2PHYACC_DONE) return 0; cpu_relax(); @@ -55,13 +55,13 @@ static int dwc3_ulpi_read(struct device *dev, u8 addr) int ret; =20 reg =3D DWC3_GUSB2PHYACC_NEWREGREQ | DWC3_ULPI_ADDR(addr); - dwc3_writel(dwc->regs, DWC3_GUSB2PHYACC(0), reg); + dwc3_writel(dwc, DWC3_GUSB2PHYACC(0), reg); =20 ret =3D dwc3_ulpi_busyloop(dwc, addr, true); if (ret) return ret; =20 - reg =3D dwc3_readl(dwc->regs, DWC3_GUSB2PHYACC(0)); + reg =3D dwc3_readl(dwc, DWC3_GUSB2PHYACC(0)); =20 return DWC3_GUSB2PHYACC_DATA(reg); } @@ -73,7 +73,7 @@ static int dwc3_ulpi_write(struct device *dev, u8 addr, u= 8 val) =20 reg =3D DWC3_GUSB2PHYACC_NEWREGREQ | DWC3_ULPI_ADDR(addr); reg |=3D DWC3_GUSB2PHYACC_WRITE | val; - dwc3_writel(dwc->regs, DWC3_GUSB2PHYACC(0), reg); + dwc3_writel(dwc, DWC3_GUSB2PHYACC(0), reg); =20 return dwc3_ulpi_busyloop(dwc, addr, false); } --=20 2.34.1 From nobody Sun Feb 8 05:43:18 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0B28438A725 for ; Wed, 14 Jan 2026 10:08:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768385289; cv=none; b=m7A/ALV3Yq8yTD+XUIY3QfUywFXiEWyoKcJjfEDPqh0TLgxzer7Sy46BR8SD2Nks9VdANrqEIBKEPbf8B8dCG0qfZG+y/BBdOrxonXpzi81S110SEKRz1atl2mbfr6/fVNGU2C79CYQD3HL9275CfD/5mOWb6NiJpSWTnD3cbAQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768385289; c=relaxed/simple; bh=DCXEvSUPfCjrotmSUir63Vcs6Jwns3pGCES9UK71IMk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=OFLq6ZSvzm6THW87LshxVWKHObqy+NVHaOLF/tUZ2cgV5nXxxmkbey6GZ+ZvNnEKMQNFzy2PiRUutuq67u3ISr0qDMPgpDIDJ965x59qdacMfTWXl0oxzf+gLR/NrFj5HtVesjEQrz/d6tZtG72ueyJFd+MQ3QQv+EXm2jnCKEI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=D6aZDhaG; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=dHY4MZGC; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="D6aZDhaG"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="dHY4MZGC" Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 60E7j50H2056596 for ; Wed, 14 Jan 2026 10:08:05 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=tgZmHHUg3P0 CjUtuQ51R9XAhuVkxwDKnHl6ppMZ1C2E=; b=D6aZDhaG59/pEz1K5fut1Fb9gVu np2LeYbCPRlPIIInvnm4TG/Xfd5KGWCTSurKfPDJ2uPSbD444DuwEgLftUGhnrE0 3TlJWSthguO0B3m8ESNKLVrJLe0VVYHYLtix3soXdIRQy1LqNZeYrmrk/NXLThCa cpDUEhEiYNl31IEzHY3sDjGCOJJigMvC8LLvgSJPqv+bgAbNt8TxTOTxu+2xSyHE 6QQeI0bSgtNQTsX2x/Rv+S2ECWGDLPjSHrbmmD5XPoO+2M/Oi7efUtl6D16Zx48u jvl2RBQoL2V13UWfL5x5DEKwHl3d3hJENuafZEgqO4LJpiaS/bZMwUPrFWw== Received: from mail-pj1-f70.google.com (mail-pj1-f70.google.com [209.85.216.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4bnr3ebphd-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 14 Jan 2026 10:08:04 +0000 (GMT) Received: by mail-pj1-f70.google.com with SMTP id 98e67ed59e1d1-34ab8aafd24so525115a91.0 for ; Wed, 14 Jan 2026 02:08:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1768385283; x=1768990083; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tgZmHHUg3P0CjUtuQ51R9XAhuVkxwDKnHl6ppMZ1C2E=; b=dHY4MZGCRm/vdxaSPYJ+l1dmvXLBHFFsoinBYTU54caOqZc1x/hIghd2YdWT67aE6y 3D/znSYKhwXHK66qJAoiz72PYcahhMNo7zetGq+iCojl7BfUWHn6XevZrrBpJ4kGKlRm OcMe+FY4fJIOXWlHrnRCn2JyY0MMstyeflLQo4hMpCOqt0OqgglQ1aT0JshVmbUD/CPN 9Mct8GWoLgPGr3IzzNHlbO2RFtUu0tftukp6sHuWL3OTYVBnmvIkcJzzZYNK38Sl1mea l0AjrKmFq1oqIDj29D6dRdiJ0rdS8WHQURjma0bQ5OpHMT4KaVF85YhTnFBg5cAPLqUh 9RXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768385283; x=1768990083; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=tgZmHHUg3P0CjUtuQ51R9XAhuVkxwDKnHl6ppMZ1C2E=; b=lG+nDd0l+cn/fENfl+zgcDM+t0GPUu1ZegY6RXkERtllMUVvO1PXIOGMp6SYh8IW0d f//OZr2DORFFBzBcCDTgaw24Kom3gJi2VcG7Pqua///JshtB4+ZgbXYQe9+Mly/T/tel uFCbgtmBibiIKhNkGQ9AZcKSpY1IIxXz2YwhpTqQJ1i4EhLkUQmNgKGwPjFBZ6HdgjEq 7nLIjAVWnLRKUMVLWyPQVM12iKSrdIcLVwa6EklLvkOJJgIH1mytURUy0eL1fZg8dHe7 eipdF1YXqM5Ge6ZNnDledIjFD5G10JMd3DdHNb87+XSlgEiiPUNhOFw1jHKANEyLhCQX 9f+Q== X-Forwarded-Encrypted: i=1; AJvYcCUzQ2Nso2+JdCNRadJtuEtfJxTWScnZ7dWi2KQ+AYmKnlYQxl8bOODt0IcFBQfIIRx3M1rvg++jlqfAeWU=@vger.kernel.org X-Gm-Message-State: AOJu0Yzv1kcyRBPd/lR7Z5i8fl7UCLKpCPE2UgBTR7LDJXdXaD5470b+ p3FIwPgY271ts0vZqgaQASZh+DMeS4uWMEZ/SDQx8GYIkIy7Jqad1pRHBHlMhZ4KyFx4u177B17 cm8JmGbNkLCYrFIeosInJvhO8vRiwNjVpcffNPHfebAkp+z54moHUlwphuWG2i2kBssd+yQpx4Z E= X-Gm-Gg: AY/fxX6ghgKkeNbror9fNKM0renJoN56nsR3jMYVugG3UgUteFtWoJoWwKx47vt5ybj EYgNpzrD5EoX5W2XiWNZuPAnBItd2Aw7iKsfRrc6LSVbjA0DHrVajCkSUirxwFB4P8cQjIm9/QT sNESA5nGFv0qFQfidwLCaxNAFT8aNkKlTH+mMPV+nGGIkQF62YXRs5OhSllHQ0+lOdUoQA3JE8y 55m97llx5OSW4wQ5iEvaV1DHd3PDKbV3R3OogiDzd1eeAlKvM/pYks0dZkIv6W/uiAjF6tUQQsI pZcpcj4idR1pBdxSMj2eEGYxOEhDuo1Z7J4Srnr2PlCUATJ0btlvzMCJNVa3hKSCzrM3c5ff6zE S+l5ZBi2sFStBQVkxgRC9nejE2Im4bIv5XohJcg== X-Received: by 2002:a17:903:41c3:b0:2a0:f0bf:197a with SMTP id d9443c01a7336-2a599dac241mr21023475ad.13.1768385283394; Wed, 14 Jan 2026 02:08:03 -0800 (PST) X-Received: by 2002:a17:903:41c3:b0:2a0:f0bf:197a with SMTP id d9443c01a7336-2a599dac241mr21023225ad.13.1768385282835; Wed, 14 Jan 2026 02:08:02 -0800 (PST) Received: from hu-prashk-hyd.qualcomm.com ([202.46.22.19]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a3e3cd3632sm226379975ad.95.2026.01.14.02.08.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jan 2026 02:08:01 -0800 (PST) From: Prashanth K To: Thinh Nguyen , Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Prashanth K Subject: [PATCH v4 3/3] usb: dwc3: Log dwc3 address in traces Date: Wed, 14 Jan 2026 15:37:48 +0530 Message-Id: <20260114100748.2950103-4-prashanth.k@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260114100748.2950103-1-prashanth.k@oss.qualcomm.com> References: <20260114100748.2950103-1-prashanth.k@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Authority-Analysis: v=2.4 cv=TPFIilla c=1 sm=1 tr=0 ts=69676b04 cx=c_pps a=0uOsjrqzRL749jD1oC5vDA==:117 a=fChuTYTh2wq5r3m49p7fHw==:17 a=vUbySO9Y5rIA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=canF8CTjMwtUwClMOGQA:9 a=sJs22xd4MC_LBXiP:21 a=mQ_c8vxmzFEMiUWkPHU9:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTE0MDA4MiBTYWx0ZWRfX7eldYNHJHBBP Sv9m1uym/GguxF0cThzcFpde0dUGFIiy5JBRAv1qvIJwFggut3XxiZuuv8NP259vScnX+t34xVh LPrzRQsxWfTJHXr8cAjx47/q6mRqahynVMaC/qpPEME7AxfdHBl3kwZIJrtSUSzM6vG9dig/ki0 pkCttHg8xrFrlAJl7QqImQtWQAdlDWNvmvAPQ0d9jAeVl0Wp7mMu8Q6nSdmhSRn68UbOALKljxX lMUmxNTkNndB8wPWBY+7W0Amg56jBUjDQ1OlP6NLAkrIOod1NAeD/IiyFiKGic8W8FPuj/ERymv +q7TnUm8PnbM6373VyPgPo8f2jzD+ZGXsyAmqZwmSy+7sSL6L7RRuBEFb3Z+bKlpbmqaPET555i yu7wLt7ZlnwX1uf6yCRl4cS3+g9rl/LBerhfX/mt2+f8Xo4J3UwuYjTcNefe+ArVb6aQs8plKgU DG04ewQqUzSgCdZ0MUQ== X-Proofpoint-GUID: o_bNGD61j2F-tqcWjtzicapsbECcQlvF X-Proofpoint-ORIG-GUID: o_bNGD61j2F-tqcWjtzicapsbECcQlvF X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2026-01-14_03,2026-01-09_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 suspectscore=0 phishscore=0 clxscore=1015 spamscore=0 lowpriorityscore=0 malwarescore=0 adultscore=0 impostorscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2512120000 definitions=main-2601140082 Content-Type: text/plain; charset="utf-8" When multiple DWC3 controllers are being used, trace events from different instances get mixed up making debugging difficult as there's no way to distinguish which instance generated the trace. Use the register base address of dwc3 controller and append it to trace events, so that the source instance is clearly identifiable. Example trace output, before -> dwc3_event: event (00000101): Reset [U0] after -> dwc3_event: 0a600000: event (00000101): Reset [U0] Signed-off-by: Prashanth K --- drivers/usb/dwc3/core.c | 5 ++- drivers/usb/dwc3/core.h | 2 + drivers/usb/dwc3/ep0.c | 2 +- drivers/usb/dwc3/gadget.c | 2 +- drivers/usb/dwc3/io.h | 4 +- drivers/usb/dwc3/trace.h | 88 ++++++++++++++++++++++++--------------- 6 files changed, 65 insertions(+), 38 deletions(-) diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 670a9d4bfff2..125616489e04 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -158,7 +158,7 @@ void dwc3_set_prtcap(struct dwc3 *dwc, u32 mode, bool i= gnore_susphy) dwc3_writel(dwc, DWC3_GCTL, reg); =20 dwc->current_dr_role =3D mode; - trace_dwc3_set_prtcap(mode); + trace_dwc3_set_prtcap(dwc, mode); } EXPORT_SYMBOL_GPL(dwc3_set_prtcap); =20 @@ -2193,6 +2193,9 @@ int dwc3_core_probe(const struct dwc3_probe_data *dat= a) dwc_res =3D *res; dwc_res.start +=3D DWC3_GLOBALS_REGS_START; =20 + /* Store the base register address for using it in traces later */ + dwc->address =3D (u32)res->start; + if (dev->of_node) { struct device_node *parent =3D of_get_parent(dev->of_node); =20 diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index 23188b910528..bc5ad3206d58 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -1043,6 +1043,7 @@ struct dwc3_glue_ops { * @gadget_max_speed: maximum gadget speed requested * @gadget_ssp_rate: Gadget driver's maximum supported SuperSpeed Plus sig= naling * rate and lane count. + * @address: Cached lower 32-bit base address to be used for logging. * @ip: controller's ID * @revision: controller's version of an IP * @version_type: VERSIONTYPE register contents, a sub release of a revisi= on @@ -1258,6 +1259,7 @@ struct dwc3 { enum usb_ssp_rate max_ssp_rate; enum usb_ssp_rate gadget_ssp_rate; =20 + u32 address; u32 ip; =20 #define DWC3_IP 0x5533 diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c index a8ff8db610d3..bfe616194dfa 100644 --- a/drivers/usb/dwc3/ep0.c +++ b/drivers/usb/dwc3/ep0.c @@ -833,7 +833,7 @@ static void dwc3_ep0_inspect_setup(struct dwc3 *dwc, if (!dwc->gadget_driver || !dwc->softconnect || !dwc->connected) goto out; =20 - trace_dwc3_ctrl_req(ctrl); + trace_dwc3_ctrl_req(dwc, ctrl); =20 len =3D le16_to_cpu(ctrl->wLength); if (!len) { diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 9355c952c140..384963151ece 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -278,7 +278,7 @@ int dwc3_send_gadget_generic_command(struct dwc3 *dwc, = unsigned int cmd, status =3D -ETIMEDOUT; } =20 - trace_dwc3_gadget_generic_cmd(cmd, param, status); + trace_dwc3_gadget_generic_cmd(dwc, cmd, param, status); =20 return ret; } diff --git a/drivers/usb/dwc3/io.h b/drivers/usb/dwc3/io.h index 7dd0c1e0cf74..cad9a2ae1547 100644 --- a/drivers/usb/dwc3/io.h +++ b/drivers/usb/dwc3/io.h @@ -33,7 +33,7 @@ static inline u32 dwc3_readl(struct dwc3 *dwc, u32 offset) * documentation, so we revert it back to the proper addresses, the * same way they are described on SNPS documentation */ - trace_dwc3_readl(base - DWC3_GLOBALS_REGS_START, offset, value); + trace_dwc3_readl(dwc, base - DWC3_GLOBALS_REGS_START, offset, value); =20 return value; } @@ -54,7 +54,7 @@ static inline void dwc3_writel(struct dwc3 *dwc, u32 offs= et, u32 value) * documentation, so we revert it back to the proper addresses, the * same way they are described on SNPS documentation */ - trace_dwc3_writel(base - DWC3_GLOBALS_REGS_START, offset, value); + trace_dwc3_writel(dwc, base - DWC3_GLOBALS_REGS_START, offset, value); } =20 #endif /* __DRIVERS_USB_DWC3_IO_H */ diff --git a/drivers/usb/dwc3/trace.h b/drivers/usb/dwc3/trace.h index b6ba984bafcd..6c2c4990917a 100644 --- a/drivers/usb/dwc3/trace.h +++ b/drivers/usb/dwc3/trace.h @@ -20,63 +20,70 @@ #include "debug.h" =20 DECLARE_EVENT_CLASS(dwc3_log_set_prtcap, - TP_PROTO(u32 mode), - TP_ARGS(mode), + TP_PROTO(struct dwc3 *dwc, u32 mode), + TP_ARGS(dwc, mode), TP_STRUCT__entry( + __field(u32, address) __field(u32, mode) ), TP_fast_assign( + __entry->address =3D dwc->address; __entry->mode =3D mode; ), - TP_printk("mode %s", dwc3_mode_string(__entry->mode)) + TP_printk("%08x: mode %s", __entry->address, dwc3_mode_string(__entry->mo= de)) ); =20 DEFINE_EVENT(dwc3_log_set_prtcap, dwc3_set_prtcap, - TP_PROTO(u32 mode), - TP_ARGS(mode) + TP_PROTO(struct dwc3 *dwc, u32 mode), + TP_ARGS(dwc, mode) ); =20 DECLARE_EVENT_CLASS(dwc3_log_io, - TP_PROTO(void *base, u32 offset, u32 value), - TP_ARGS(base, offset, value), + TP_PROTO(struct dwc3 *dwc, void *base, u32 offset, u32 value), + TP_ARGS(dwc, base, offset, value), TP_STRUCT__entry( + __field(u32, address) __field(void *, base) __field(u32, offset) __field(u32, value) ), TP_fast_assign( + __entry->address =3D dwc->address; __entry->base =3D base; __entry->offset =3D offset; __entry->value =3D value; ), - TP_printk("addr %p offset %04x value %08x", + TP_printk("%08x: addr %p offset %04x value %08x", + __entry->address, __entry->base + __entry->offset, __entry->offset, __entry->value) ); =20 DEFINE_EVENT(dwc3_log_io, dwc3_readl, - TP_PROTO(void __iomem *base, u32 offset, u32 value), - TP_ARGS(base, offset, value) + TP_PROTO(struct dwc3 *dwc, void __iomem *base, u32 offset, u32 value), + TP_ARGS(dwc, base, offset, value) ); =20 DEFINE_EVENT(dwc3_log_io, dwc3_writel, - TP_PROTO(void __iomem *base, u32 offset, u32 value), - TP_ARGS(base, offset, value) + TP_PROTO(struct dwc3 *dwc, void __iomem *base, u32 offset, u32 value), + TP_ARGS(dwc, base, offset, value) ); =20 DECLARE_EVENT_CLASS(dwc3_log_event, TP_PROTO(u32 event, struct dwc3 *dwc), TP_ARGS(event, dwc), TP_STRUCT__entry( + __field(u32, address) __field(u32, event) __field(u32, ep0state) ), TP_fast_assign( + __entry->address =3D dwc->address; __entry->event =3D event; __entry->ep0state =3D dwc->ep0state; ), - TP_printk("event (%08x): %s", __entry->event, + TP_printk("%08x: event (%08x): %s", __entry->address, __entry->event, dwc3_decode_event(__get_buf(DWC3_MSG_MAX), DWC3_MSG_MAX, __entry->event, __entry->ep0state)) ); @@ -87,9 +94,10 @@ DEFINE_EVENT(dwc3_log_event, dwc3_event, ); =20 DECLARE_EVENT_CLASS(dwc3_log_ctrl, - TP_PROTO(struct usb_ctrlrequest *ctrl), - TP_ARGS(ctrl), + TP_PROTO(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl), + TP_ARGS(dwc, ctrl), TP_STRUCT__entry( + __field(u32, address) __field(__u8, bRequestType) __field(__u8, bRequest) __field(__u16, wValue) @@ -97,13 +105,15 @@ DECLARE_EVENT_CLASS(dwc3_log_ctrl, __field(__u16, wLength) ), TP_fast_assign( + __entry->address =3D dwc->address; __entry->bRequestType =3D ctrl->bRequestType; __entry->bRequest =3D ctrl->bRequest; __entry->wValue =3D le16_to_cpu(ctrl->wValue); __entry->wIndex =3D le16_to_cpu(ctrl->wIndex); __entry->wLength =3D le16_to_cpu(ctrl->wLength); ), - TP_printk("%s", usb_decode_ctrl(__get_buf(DWC3_MSG_MAX), DWC3_MSG_MAX, + TP_printk("%08x: %s", __entry->address, usb_decode_ctrl(__get_buf(DWC3_MS= G_MAX), + DWC3_MSG_MAX, __entry->bRequestType, __entry->bRequest, __entry->wValue, __entry->wIndex, __entry->wLength) @@ -111,14 +121,15 @@ DECLARE_EVENT_CLASS(dwc3_log_ctrl, ); =20 DEFINE_EVENT(dwc3_log_ctrl, dwc3_ctrl_req, - TP_PROTO(struct usb_ctrlrequest *ctrl), - TP_ARGS(ctrl) + TP_PROTO(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl), + TP_ARGS(dwc, ctrl) ); =20 DECLARE_EVENT_CLASS(dwc3_log_request, TP_PROTO(struct dwc3_request *req), TP_ARGS(req), TP_STRUCT__entry( + __field(u32, address) __string(name, req->dep->name) __field(struct dwc3_request *, req) __field(unsigned int, actual) @@ -129,7 +140,7 @@ DECLARE_EVENT_CLASS(dwc3_log_request, __field(int, no_interrupt) ), TP_fast_assign( - __assign_str(name); + __entry->address =3D req->dep->dwc->address; __entry->req =3D req; __entry->actual =3D req->request.actual; __entry->length =3D req->request.length; @@ -138,8 +149,10 @@ DECLARE_EVENT_CLASS(dwc3_log_request, __entry->short_not_ok =3D req->request.short_not_ok; __entry->no_interrupt =3D req->request.no_interrupt; ), - TP_printk("%s: req %p length %u/%u %s%s%s =3D=3D> %d", - __get_str(name), __entry->req, __entry->actual, __entry->length, + TP_printk("%08x: %s: req %p length %u/%u %s%s%s =3D=3D> %d", + __entry->address, + __get_str(name), __entry->req, + __entry->actual, __entry->length, __entry->zero ? "Z" : "z", __entry->short_not_ok ? "S" : "s", __entry->no_interrupt ? "i" : "I", @@ -173,28 +186,30 @@ DEFINE_EVENT(dwc3_log_request, dwc3_gadget_giveback, ); =20 DECLARE_EVENT_CLASS(dwc3_log_generic_cmd, - TP_PROTO(unsigned int cmd, u32 param, int status), - TP_ARGS(cmd, param, status), + TP_PROTO(struct dwc3 *dwc, unsigned int cmd, u32 param, int status), + TP_ARGS(dwc, cmd, param, status), TP_STRUCT__entry( + __field(u32, address) __field(unsigned int, cmd) __field(u32, param) __field(int, status) ), TP_fast_assign( + __entry->address =3D dwc->address; __entry->cmd =3D cmd; __entry->param =3D param; __entry->status =3D status; ), - TP_printk("cmd '%s' [%x] param %08x --> status: %s", - dwc3_gadget_generic_cmd_string(__entry->cmd), + TP_printk("%08x: cmd '%s' [%x] param %08x --> status: %s", + __entry->address, dwc3_gadget_generic_cmd_string(__entry->cmd), __entry->cmd, __entry->param, dwc3_gadget_generic_cmd_status_string(__entry->status) ) ); =20 DEFINE_EVENT(dwc3_log_generic_cmd, dwc3_gadget_generic_cmd, - TP_PROTO(unsigned int cmd, u32 param, int status), - TP_ARGS(cmd, param, status) + TP_PROTO(struct dwc3 *dwc, unsigned int cmd, u32 param, int status), + TP_ARGS(dwc, cmd, param, status) ); =20 DECLARE_EVENT_CLASS(dwc3_log_gadget_ep_cmd, @@ -202,6 +217,7 @@ DECLARE_EVENT_CLASS(dwc3_log_gadget_ep_cmd, struct dwc3_gadget_ep_cmd_params *params, int cmd_status), TP_ARGS(dep, cmd, params, cmd_status), TP_STRUCT__entry( + __field(u32, address) __string(name, dep->name) __field(unsigned int, cmd) __field(u32, param0) @@ -210,6 +226,7 @@ DECLARE_EVENT_CLASS(dwc3_log_gadget_ep_cmd, __field(int, cmd_status) ), TP_fast_assign( + __entry->address =3D dep->dwc->address; __assign_str(name); __entry->cmd =3D cmd; __entry->param0 =3D params->param0; @@ -217,8 +234,9 @@ DECLARE_EVENT_CLASS(dwc3_log_gadget_ep_cmd, __entry->param2 =3D params->param2; __entry->cmd_status =3D cmd_status; ), - TP_printk("%s: cmd '%s' [%x] params %08x %08x %08x --> status: %s", - __get_str(name), dwc3_gadget_ep_cmd_string(__entry->cmd), + TP_printk("%08x: %s: cmd '%s' [%x] params %08x %08x %08x --> status: %s", + __entry->address, __get_str(name), + dwc3_gadget_ep_cmd_string(__entry->cmd), __entry->cmd, __entry->param0, __entry->param1, __entry->param2, dwc3_ep_cmd_status_string(__entry->cmd_status) @@ -235,6 +253,7 @@ DECLARE_EVENT_CLASS(dwc3_log_trb, TP_PROTO(struct dwc3_ep *dep, struct dwc3_trb *trb), TP_ARGS(dep, trb), TP_STRUCT__entry( + __field(u32, address) __string(name, dep->name) __field(struct dwc3_trb *, trb) __field(u32, bpl) @@ -246,6 +265,7 @@ DECLARE_EVENT_CLASS(dwc3_log_trb, __field(u32, dequeue) ), TP_fast_assign( + __entry->address =3D dep->dwc->address; __assign_str(name); __entry->trb =3D trb; __entry->bpl =3D trb->bpl; @@ -256,8 +276,8 @@ DECLARE_EVENT_CLASS(dwc3_log_trb, __entry->enqueue =3D dep->trb_enqueue; __entry->dequeue =3D dep->trb_dequeue; ), - TP_printk("%s: trb %p (E%d:D%d) buf %08x%08x size %s%d ctrl %08x sofn %08= x (%c%c%c%c:%c%c:%s)", - __get_str(name), __entry->trb, __entry->enqueue, + TP_printk("%08x: %s: trb %p (E%d:D%d) buf %08x%08x size %s%d ctrl %08x so= fn %08x (%c%c%c%c:%c%c:%s)", + __entry->address, __get_str(name), __entry->trb, __entry->enqueue, __entry->dequeue, __entry->bph, __entry->bpl, ({char *s; int pcm =3D ((__entry->size >> 24) & 3) + 1; @@ -307,6 +327,7 @@ DECLARE_EVENT_CLASS(dwc3_log_ep, TP_PROTO(struct dwc3_ep *dep), TP_ARGS(dep), TP_STRUCT__entry( + __field(u32, address) __string(name, dep->name) __field(unsigned int, maxpacket) __field(unsigned int, maxpacket_limit) @@ -318,6 +339,7 @@ DECLARE_EVENT_CLASS(dwc3_log_ep, __field(u8, trb_dequeue) ), TP_fast_assign( + __entry->address =3D dep->dwc->address; __assign_str(name); __entry->maxpacket =3D dep->endpoint.maxpacket; __entry->maxpacket_limit =3D dep->endpoint.maxpacket_limit; @@ -328,8 +350,8 @@ DECLARE_EVENT_CLASS(dwc3_log_ep, __entry->trb_enqueue =3D dep->trb_enqueue; __entry->trb_dequeue =3D dep->trb_dequeue; ), - TP_printk("%s: mps %d/%d streams %d burst %d ring %d/%d flags %c:%c%c%c%c= :%c", - __get_str(name), __entry->maxpacket, + TP_printk("%08x: %s: mps %d/%d streams %d burst %d ring %d/%d flags %c:%c= %c%c%c:%c", + __entry->address, __get_str(name), __entry->maxpacket, __entry->maxpacket_limit, __entry->max_streams, __entry->maxburst, __entry->trb_enqueue, __entry->trb_dequeue, --=20 2.34.1