From patchwork Mon Oct 24 11:32:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8990 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp439475wru; Mon, 24 Oct 2022 06:02:48 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6HtsykaNDbc5jbRfcq9wZVnoJ/9R8ukEEOl9V7Q0+Chb/SZGbEvkiAxGjezwv5JYhhyzEl X-Received: by 2002:a17:902:7297:b0:17f:93b5:5ecc with SMTP id d23-20020a170902729700b0017f93b55eccmr32963745pll.93.1666616557710; Mon, 24 Oct 2022 06:02:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666616557; cv=none; d=google.com; s=arc-20160816; b=kmINSglSJF0Pwf2DBC+sf/p/w4wRMdGylFVVLV99zAevqBSc8YbZvtEeviQQR34ycB mVUYXhd96L3fRQgbcEfAhssefPpSHeUYfm+USQfyvkN46Knj9fmLaepeJsKU7chhr9ea OEEACKI/vS4nZ1SNqCp2skLYwhggxIzL3G7MIFwdJ6hFvCSHbwsXvmBagkMLcRaiiSdU QaxmhPfAXLqyQ/RCXVG1bqb7zsAbiIwlADdQleUyJvCV7uWl1WuT6Sn7reeNHR6SXb6m 2rNtchHm7Di2znNFBUqQvXulv8Wt6u8sh47n2zHg0kDhsau85fApu02LAMH0xZVhUSL9 MN8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=9SEQQBejgvCYb4i4gdFNtD1eAU+v00ORZRu1N0jub68=; b=nuVaUy8dE+qDnbos4ekWzVZ7G5fRkeIdkybKzexnX1cvYcYZE6fUjn+9m+HlWLwsAO eKGIT57UjCDWYK84peBFOitR7beNJIf7gEYuTlsLI8fszPgwd2/mzplL+ZMosvrqtshH fE3q+axXSttLzluL2Jpxltk6luNZZ9jMe8Dmr0YIm/DBmyr57C/F6MGY7O1lioXyGGeG bLmfcJKbGFK31jsfSLPOdxZbm6WtpTKqR3UnZckjilkzpS9RZGRdgqXvMJJ12h80MwXi iwdUzvi/90rN8nvcVVmBVlg/ID3o/NuNdtgjeKE3JvSrf559uamRromBnOVxlK6D3FQI Wu2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=bnuNQ0Ih; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w3-20020a1709029a8300b0017a0a2e40e6si5825575plp.159.2022.10.24.06.01.52; Mon, 24 Oct 2022 06:02:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=bnuNQ0Ih; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235067AbiJXNBP (ORCPT + 99 others); Mon, 24 Oct 2022 09:01:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234980AbiJXM7E (ORCPT ); Mon, 24 Oct 2022 08:59:04 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 04AB398C98; Mon, 24 Oct 2022 05:17:42 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 7ADFF61321; Mon, 24 Oct 2022 12:15:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8C030C433C1; Mon, 24 Oct 2022 12:15:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666613710; bh=9nmIX1CbbtzBfzsDqPxMj8VYIeUwmfAAsFdjW+FQUjg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bnuNQ0Ihl36eNDc3FRqlzFVVntDZE3Bx/+j2CSYexMG7uq0ax6qZUH1XkC6AkFoKF OX3RLnbDt4X6Vsfw0Xh8B/X7TNokLQh1qc8M9W04VpY4AexsUopLAo2dnrfopCgd1o snm/rY950KpbCSOtJAxL88urFqsaVxlExesxMboc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, sunghwan jung , Sasha Levin Subject: [PATCH 5.4 240/255] Revert "usb: storage: Add quirk for Samsung Fit flash" Date: Mon, 24 Oct 2022 13:32:30 +0200 Message-Id: <20221024113011.208750500@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113002.471093005@linuxfoundation.org> References: <20221024113002.471093005@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747574123520193062?= X-GMAIL-MSGID: =?utf-8?q?1747574123520193062?= From: sunghwan jung [ Upstream commit ad5dbfc123e6ffbbde194e2a4603323e09f741ee ] This reverts commit 86d92f5465958752481269348d474414dccb1552, which fix the timeout issue for "Samsung Fit Flash". But the commit affects not only "Samsung Fit Flash" but also other usb storages that use the same controller and causes severe performance regression. # hdparm -t /dev/sda (without the quirk) Timing buffered disk reads: 622 MB in 3.01 seconds = 206.66 MB/sec # hdparm -t /dev/sda (with the quirk) Timing buffered disk reads: 220 MB in 3.00 seconds = 73.32 MB/sec The commit author mentioned that "Issue was reproduced after device has bad block", so this quirk should be applied when we have the timeout issue with a device that has bad blocks. We revert the commit so that we apply this quirk by adding kernel paramters using a bootloader or other ways when we really need it, without the performance regression with devices that don't have the issue. Signed-off-by: sunghwan jung Link: https://lore.kernel.org/r/20220913114913.3073-1-onenowy@gmail.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/usb/storage/unusual_devs.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h index 6a59950a63a0..b270be141b8e 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h @@ -1275,12 +1275,6 @@ UNUSUAL_DEV( 0x090a, 0x1200, 0x0000, 0x9999, USB_SC_RBC, USB_PR_BULK, NULL, 0 ), -UNUSUAL_DEV(0x090c, 0x1000, 0x1100, 0x1100, - "Samsung", - "Flash Drive FIT", - USB_SC_DEVICE, USB_PR_DEVICE, NULL, - US_FL_MAX_SECTORS_64), - /* aeb */ UNUSUAL_DEV( 0x090c, 0x1132, 0x0000, 0xffff, "Feiya",