From patchwork Thu May 30 23:43:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 13680962 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (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 4709B183092 for ; Thu, 30 May 2024 23:43:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717112614; cv=none; b=ZO595XLPVlR1Udi8aO2iBZd015yHs+wjGEP/clhMNh13a6pXUgApalyn+LKjWBIlhywrm0G9l/Kch3X0YI5yXE2duUcKOEtNBrpdNCUh+oW7kNkb5BFziWXhixlEsPoONHtA1KTImCwGGGOUWN8x3wHqlxG0sM0RbMg8iHi79s0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717112614; c=relaxed/simple; bh=uUh0scWgAAnBxAOdDHx9RouN1dRcQ02724YXzEXjoLY=; h=Message-ID:From:To:Cc:Subject:Date:MIME-Version; b=OlL0BwKWIWprgrE4KlJZeHt31ZgzYKvKjjDN+FJDlRCg59xJxQcqo4ZBAlp6+eGbnwC5vEIdLZsJbUBtarBTFGHNyw2cQGLykGtxR/8Mv0CPRWx851PkfhiYYM3HzIHAgqxcCVSK/E4aDg4s0y/H9dOZmJd+DKaq1Zjq4pUFe3U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=I1rKgK37; arc=none smtp.client-ip=209.85.214.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="I1rKgK37" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-1f480624d10so12539045ad.1 for ; Thu, 30 May 2024 16:43:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1717112611; x=1717717411; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:date:subject:cc:to:from :message-id:from:to:cc:subject:date:message-id:reply-to; bh=213yq+FHXchIlGeobquZB8jFxU/5d0H9yaCh+D4OtRk=; b=I1rKgK37fIlXWZIsGetzPmix8j3X1QZosRNbTiMumTfRBJYCsI1TJ/mmHzCtHOOAws MQr5/S2mct+n6XG66oO7eDXX9l8KEkqn+7lRS24rHrpCkIWxpKiu1gGq8Z3rZa8zjUp9 s7OPpAW9FhJTZg7Rstkpt9BuH2ZgVNPYyo1zY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717112611; x=1717717411; h=content-transfer-encoding:mime-version:date:subject:cc:to:from :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=213yq+FHXchIlGeobquZB8jFxU/5d0H9yaCh+D4OtRk=; b=C9itqLeakLoAlAu7nsJe4YPR//CKqoG0CckfOl8rG5h/k/eODPYlEdDx8vY/TK/IFO GXPMCuGFsILmybpOTdKvvC06QjAXG2DGFAD0VH+xWyJknqKqz4g9lph9yhN8MRN3FLLn 8wrJLnhInA1QpH7JGGlDLmG0EyCKuTxUWSrDIisCY0Du2ev1EVHNFstgf+ODBIVs4Oh/ DrJ6Ts/xTR9DSdkf/r6KSmaO8u5NS3XDIQYBWSeXEg70llaXh/iUflOO2kZTzlJeerSX 08pYjBIIRw1m06kW7PwuQbU/1Y2jDx7z7mar43fTz4gqsyGePn31VTQUl+MtZtteHe74 zKsA== X-Forwarded-Encrypted: i=1; AJvYcCW4A9o2iOU84XEriX3DT8FQanKhkk1AGERrP52G6AgWA+ou1vbAmZkkBfSnMmikCUD48AfyDXV8ZPMi2gkOul2vtQBumAqY X-Gm-Message-State: AOJu0YxT9G4UL8+Zaq5yUo/YUCTuzjbgI6MtJZjpmhCKkVYDGx4f25yS MAkWDEgzrT4VG2SfoOgdysrUIxEyxxwA5YgDo0rZDkZh70Piu6MkzOqCToIj7A== X-Google-Smtp-Source: AGHT+IHIzulL1B1l4HrbVqXV+F8H37u4frOFnXNzNFoAa36TIVDnW/yMHkJcvalkHwod+UBLfL46Ig== X-Received: by 2002:a17:902:f646:b0:1f4:ae25:3d07 with SMTP id d9443c01a7336-1f6370e6510mr3732175ad.60.1717112611373; Thu, 30 May 2024 16:43:31 -0700 (PDT) Received: from dianders.sjc.corp.google.com ([2620:15c:9d:2:564b:72b6:4827:cf6a]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f632416d90sm3459275ad.285.2024.05.30.16.43.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 May 2024 16:43:30 -0700 (PDT) Message-ID: <66590f22.170a0220.8b5ad.1750@mx.google.com> X-Google-Original-Message-ID: <20240530164304.REPOST net-next.1.Ibeda5c0772812ce18953150da5a0888d2d875150@changeid> From: Douglas Anderson To: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Hayes Wang Cc: danielgeorgem@google.com, Douglas Anderson , Andrew Lunn , Grant Grundler , Heiner Kallweit , linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH REPOST net-next 1/2] r8152: If inaccessible at resume time, issue a reset Date: Thu, 30 May 2024 16:43:08 -0700 X-Mailer: git-send-email 2.45.1.288.g0e0cd299f1-goog Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org If we happened to get a USB transfer error during the transition to suspend then the usb_queue_reset_device() that r8152_control_msg() calls will get dropped on the floor. This is because usb_lock_device_for_reset() (which usb_queue_reset_device() uses) silently fails if it's called when a device is suspended or if too much time passes. Let's resolve this by resetting the device ourselves in r8152's resume() function. NOTE: due to timing, it's _possible_ that we could end up with two USB resets: the one queued previously and the one called from the resume() patch. This didn't happen in test cases I ran, though it's conceivably possible. We can't easily know if this happened since usb_queue_reset_device() can just silently drop the reset request. In any case, it's not expected that this is a problem since the two resets can't run at the same time (because of the device lock) and it should be OK to reset the device twice. If somehow the double-reset causes problems we could prevent resets from being queued up while suspend is running. Signed-off-by: Douglas Anderson Acked-by: Hayes Wang --- Reposting now that the merge window is open as per [1]. [1] https://lore.kernel.org/r/75651199a933427a7fc3980ef8a2139f5f1f1695.camel@redhat.com drivers/net/usb/r8152.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index 19df1cd9f072..6a3f4b2114ee 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -8554,6 +8554,19 @@ static int rtl8152_system_resume(struct r8152 *tp) usb_submit_urb(tp->intr_urb, GFP_NOIO); } + /* If the device is RTL8152_INACCESSIBLE here then we should do a + * reset. This is important because the usb_lock_device_for_reset() + * that happens as a result of usb_queue_reset_device() will silently + * fail if the device was suspended or if too much time passed. + * + * NOTE: The device is locked here so we can directly do the reset. + * We don't need usb_lock_device_for_reset() because that's just a + * wrapper over device_lock() and device_resume() (which calls us) + * does that for us. + */ + if (test_bit(RTL8152_INACCESSIBLE, &tp->flags)) + usb_reset_device(tp->udev); + return 0; }