From patchwork Mon Feb 26 07:03:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Nazzareno Trimarchi X-Patchwork-Id: 206279 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp1910967dyb; Sun, 25 Feb 2024 23:10:14 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUSO+Nieg2cAXlFeJutYVLaEvyq37rjY7bSPYFnP6sW5xUwNf99hUon6y2nbL2HzmqItaLcWqM7H8WViuxkoubTLKbc+A== X-Google-Smtp-Source: AGHT+IFejYkRkyvQQg43e3ol5+Y3uCsWm+cIdufghYN/4rr1yTFikPOeE8dgL8wzLfrFGcN7U4jt X-Received: by 2002:a17:902:ce84:b0:1dc:4199:a31d with SMTP id f4-20020a170902ce8400b001dc4199a31dmr6572924plg.53.1708931414317; Sun, 25 Feb 2024 23:10:14 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708931414; cv=pass; d=google.com; s=arc-20160816; b=bxKOHl3hx//qzZT/603RC38GQbbtrKyV3cxoPmm+2E+6Lf+hzY29BhkudedTKRPwjq htcdeq1oeuNk22+j+ndf+exNLArKkibfNK//kumuIQV5V2blLffBc4KYjowAhXAOdCAP 7Jlvr9SqEf79DlYo/Aq2B43A0usf07kECpXcMdpakagnYQGUeaWJpgijOdnkFxLWcLdt vlaoPKhNW0ww/CJykUYKmcaSDLn4fvYAeFume8w/Vwlwdp+3n6vMN9trVQlfE1IhcHNb H6nKe56AE7sVXjN5YLrT+oSL0uHQcQ3xS8cWGsjygQYEc7SQeSLyLGh7CVKY5r2qC1a+ JFGQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=fSE72hosePwIODA3ma0iMUICuvRTZJycGm7fYD6dWx8=; fh=e4JQCxwoFifzMijnv3BzJTlESbZV38emcNPAcKiv30Q=; b=jvOuzI0CUUgp9pSdvFAhxv7YcQyp6HuTsEH8gX4BBNRgE5hgqe+iiUlJsfR9Cil4/D 5KhoWhMdDuNdIfQS3bn1hzrXD71LWdtIK7Kz5GPFq3y0cn0oEGxSzbiQVpz/LZjOGZTp irzV34zK7RrzSvmY1aXKLMAvll2xxc4s0Y2KVKhLntG3HDQUS6pYxzP2QOIR0vuUd+L8 lEESjgdmWZg4/Rsg8pPl75a4KiWfc4CgX6y9hj1g8BYC/cBuheCJzR24JxxxV4lAnW/9 NRQim3/M28qFX9GkcyKmLstfADB+cqT9++RghCYpF+wQxCwvQxePGXGuiQiaeRRg+j32 /scQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=rxT2SNsF; arc=pass (i=1 spf=pass spfdomain=amarulasolutions.com dkim=pass dkdomain=amarulasolutions.com dmarc=pass fromdomain=amarulasolutions.com); spf=pass (google.com: domain of linux-kernel+bounces-80616-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-80616-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id mf14-20020a170902fc8e00b001dcabe98268si355311plb.419.2024.02.25.23.10.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Feb 2024 23:10:14 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-80616-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=rxT2SNsF; arc=pass (i=1 spf=pass spfdomain=amarulasolutions.com dkim=pass dkdomain=amarulasolutions.com dmarc=pass fromdomain=amarulasolutions.com); spf=pass (google.com: domain of linux-kernel+bounces-80616-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-80616-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 71AFD2835FE for ; Mon, 26 Feb 2024 07:04:22 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2CE1B1BF34; Mon, 26 Feb 2024 07:04:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="rxT2SNsF" Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 603231BC4F for ; Mon, 26 Feb 2024 07:04:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708931043; cv=none; b=qA47UEz/cNXkkle2ckTXMMFbtsgg2NZabqeihgaMOXEKEC7VhtwhvkiS3Sj8WWEgGxpayGG+geiyKOj4BEaIMOhqJlsYCd+8WWeXqKIC+gxOue8QbOgQlW5MgoESRNVKz5qR2ZuyH3EMfbeTz3KCKf7OjvTCBTEtshj8JGhQwfY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708931043; c=relaxed/simple; bh=Unv7g8gDlUHz8759iS1KZ216R5awBoIqH88AQPH0qWc=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=JjvlEtHVvIw/SgYcCiwntW6ElTGqgg2TULPHur3n0+/uljfICwim6jzGJe+26CHBduujAE0Zr3/4BaA9qNqoKV1t6/H21vQxeVGYHRKdeslx2g4UaET99anyuBosKdgfoCKmbgjvfo8kZCXRKzPFhjLmNHQhAUolxac9R+mC7hk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=amarulasolutions.com; spf=pass smtp.mailfrom=amarulasolutions.com; dkim=pass (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b=rxT2SNsF; arc=none smtp.client-ip=209.85.208.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=amarulasolutions.com Received: by mail-ed1-f41.google.com with SMTP id 4fb4d7f45d1cf-564647bcdbfso2548359a12.2 for ; Sun, 25 Feb 2024 23:04:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1708931039; x=1709535839; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=fSE72hosePwIODA3ma0iMUICuvRTZJycGm7fYD6dWx8=; b=rxT2SNsFWMsUJdUEaIFPHlj8CE8S8GJX1XG1CsTtN/0L8l0Wqf3+i7D1L3iarg4yyg DrXnfiqU1n9xFMBt9FBXlP36ZRPuwLDPUqe4LIs/KKWYGbd86feKH+yYnufN/Z+I1Bu1 xKt8/4Ykb6pgko1SvoXMXsLl2AlD55xTnSCxo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708931039; x=1709535839; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=fSE72hosePwIODA3ma0iMUICuvRTZJycGm7fYD6dWx8=; b=R8nqOgH5NMrtL8Sof7ptwRr3qsdKzN9RH7C5DG/TAV0CYPyVeXc0fgtrMuaKHU8IEY x+sd0d0QQ73sqse1pfMaxVVb5rlkepXgNVbjkDqUXUFDkidvxQIklKvuw0s/GOl+ire7 +/ryRzMmMTiXOMt/ESGYcm8yC4+Uhf5rLTAuZxkAYHPwaWCaBGD63uhDCNUPX1i875Yx b8UNG/Qiw6wBNMnq3lL4lrOggtVwecBHmMbid2CtlmjOV8x8MlDzXRuuKr0kgkzdBN7h m5rhwF5SqlpwqiWjk1MAvKdvhMrQus87rpJnc7e2mK2ahUxrMuyOnMxFwF727Gsc0hlz iuXw== X-Forwarded-Encrypted: i=1; AJvYcCVkM7aCzELmzmbR5CoH0fuM2Qc4FdPw4aeWJ/GfoWNGZLLFNiAoXTeUZqH1GHLlvVSyZipbuWmlm7NBSU3wQ3QtvPlnqdGkpRk6Tnh6 X-Gm-Message-State: AOJu0YyUrxevNcW2D34L0CvP7Oqu9pMNeUdxaKTHeRDkiJsUdwB36Eg0 68/3xdcyu04LjCa1RTAmdyVgpAH2gtjSLlQPbctLSuhEnM5US1WSSXylhgmls6s= X-Received: by 2002:a17:906:1715:b0:a3e:d835:5685 with SMTP id c21-20020a170906171500b00a3ed8355685mr3620666eje.67.1708931039608; Sun, 25 Feb 2024 23:03:59 -0800 (PST) Received: from panicking.. (host-188-15-122-229.business.telecomitalia.it. [188.15.122.229]) by smtp.gmail.com with ESMTPSA id qo3-20020a170907874300b00a3fcbd4eb2esm2125331ejc.1.2024.02.25.23.03.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Feb 2024 23:03:59 -0800 (PST) From: Michael Trimarchi To: Thinh Nguyen , Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-amarula@amarulasolutions.com, Michael Trimarchi , stable@vger.kernel.org Subject: [PATCH V2] usb: dwc3: gadget: Fix suspend/resume warning when no-gadget is connected Date: Mon, 26 Feb 2024 08:03:48 +0100 Message-Id: <20240226070348.1703879-1-michael@amarulasolutions.com> X-Mailer: git-send-email 2.40.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791944466527902329 X-GMAIL-MSGID: 1791944466527902329 This patch restore the logic but protects the variable using a spinlock without moving the code [ 45.597274] dwc3 31000000.usb: wait for SETUP phase timed out [ 45.599140] dwc3 31000000.usb: failed to set STALL on ep0out [ 45.601069] ------------[ cut here ]------------ [ 45.601073] WARNING: CPU: 0 PID: 150 at drivers/usb/dwc3/ep0.c:289 dwc3_ep0_out_start+0xcc/0xd4 [ 45.601102] Modules linked in: cfg80211 rfkill ipv6 rpmsg_ctrl rpmsg_char crct10dif_ce rti_wdt k3_j72xx_bandgap rtc_ti_k3 omap_mailbox sa2ul authenc [last unloaded: ti_k3_r5_remoteproc] [ 45.601151] CPU: 0 PID: 150 Comm: sh Not tainted 6.8.0-rc5 #1 [ 45.601159] Hardware name: BSH - CCM-M3 (DT) [ 45.601164] pstate: 600000c5 (nZCv daIF -PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 45.601172] pc : dwc3_ep0_out_start+0xcc/0xd4 [ 45.601179] lr : dwc3_ep0_out_start+0x50/0xd4 [ 45.601186] sp : ffff8000832739e0 [ 45.601189] x29: ffff8000832739e0 x28: ffff800082a21000 x27: ffff8000808dc630 [ 45.601200] x26: 0000000000000002 x25: ffff800082530a44 x24: 0000000000000000 [ 45.601210] x23: ffff000000e079a0 x22: ffff000000e07a68 x21: 0000000000000001 [ 45.601219] x20: ffff000000e07880 x19: ffff000000e07880 x18: 0000000000000040 [ 45.601229] x17: ffff7fff8e1ce000 x16: ffff800080000000 x15: fffffffffffe5260 [ 45.601239] x14: 0000000000000000 x13: 206e6f204c4c4154 x12: 5320746573206f74 [ 45.601249] x11: 0000000000000001 x10: 000000000000000a x9 : ffff800083273930 [ 45.601259] x8 : 000000000000000a x7 : ffffffffffff3f0c x6 : ffffffffffff3f00 [ 45.601268] x5 : ffffffffffff3f0c x4 : 0000000000000000 x3 : 0000000000000000 [ 45.601278] x2 : 0000000000000000 x1 : ffff000004e7e600 x0 : 00000000ffffff92 [ 45.601289] Call trace: [ 45.601293] dwc3_ep0_out_start+0xcc/0xd4 [ 45.601301] dwc3_ep0_stall_and_restart+0x98/0xbc [ 45.601309] dwc3_ep0_reset_state+0x5c/0x88 [ 45.601315] dwc3_gadget_soft_disconnect+0x144/0x160 [ 45.601323] dwc3_gadget_suspend+0x18/0xb0 [ 45.601329] dwc3_suspend_common+0x5c/0x18c [ 45.601341] dwc3_suspend+0x20/0x44 [ 45.601350] platform_pm_suspend+0x2c/0x6c [ 45.601360] __device_suspend+0x10c/0x34c [ 45.601372] dpm_suspend+0x1a8/0x240 [ 45.601382] dpm_suspend_start+0x80/0x9c [ 45.601391] suspend_devices_and_enter+0x1c4/0x584 [ 45.601402] pm_suspend+0x1b0/0x264 [ 45.601408] state_store+0x80/0xec [ 45.601415] kobj_attr_store+0x18/0x2c [ 45.601426] sysfs_kf_write+0x44/0x54 [ 45.601434] kernfs_fop_write_iter+0x120/0x1ec [ 45.601445] vfs_write+0x23c/0x358 [ 45.601458] ksys_write+0x70/0x104 [ 45.601467] __arm64_sys_write+0x1c/0x28 [ 45.601477] invoke_syscall+0x48/0x114 [ 45.601488] el0_svc_common.constprop.0+0x40/0xe0 [ 45.601498] do_el0_svc+0x1c/0x28 [ 45.601506] el0_svc+0x34/0xb8 [ 45.601516] el0t_64_sync_handler+0x100/0x12c [ 45.601522] el0t_64_sync+0x190/0x194 [ 45.601531] ---[ end trace 0000000000000000 ]--- [ 45.608794] Disabling non-boot CPUs ... [ 45.611029] psci: CPU1 killed (polled 0 ms) [ 45.611837] Enabling non-boot CPUs ... [ 45.612247] Detected VIPT I-cache on CPU1 Tested on a am62x board Fixes: 61a348857e86 ("usb: dwc3: gadget: Fix NULL pointer dereference in dwc3_gadget_suspend) Cc: stable@vger.kernel.org Signed-off-by: Michael Trimarchi --- V1->V2: Add cc to stable --- drivers/usb/dwc3/gadget.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 4c8dd6724678..4c88e44127b5 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -4703,13 +4703,19 @@ int dwc3_gadget_suspend(struct dwc3 *dwc) unsigned long flags; int ret; + spin_lock_irqsave(&dwc->lock, flags); + if (!dwc->gadget_driver) { + spin_unlock_irqrestore(&dwc->lock, flags); + return 0; + } + spin_unlock_irqrestore(&dwc->lock, flags); + ret = dwc3_gadget_soft_disconnect(dwc); if (ret) goto err; spin_lock_irqsave(&dwc->lock, flags); - if (dwc->gadget_driver) - dwc3_disconnect_gadget(dwc); + dwc3_disconnect_gadget(dwc); spin_unlock_irqrestore(&dwc->lock, flags); return 0;