From patchwork Wed Oct 19 08:35:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 5486 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp334000wrs; Wed, 19 Oct 2022 06:42:00 -0700 (PDT) X-Google-Smtp-Source: AMsMyM62q3DEdwt0kzTKjxSlp0GU9TctkLK7a5Bs3eaBEaigW3C7ZIxto5EKlw+aLGpGktVd6G4d X-Received: by 2002:a17:906:9752:b0:78d:d2e1:d745 with SMTP id o18-20020a170906975200b0078dd2e1d745mr6705273ejy.452.1666186919822; Wed, 19 Oct 2022 06:41:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666186919; cv=none; d=google.com; s=arc-20160816; b=a5OJts97hscfUEYevVYbNFlwhbJCLZ5LokFWnggV235pnO6eZoTSeQUJIL2nGuanKD 2ZeBi6Y4eytoVMArF2TDuQZha5a84jqk4QlF5nxXfaqRFlOYy2bNqsXI928kXIH+jflG 7BsMWSIDX8QNVYPPVWcZG+eKFCLt1wLep9UEjNKJibg2i24ETQONb96udaQXf2ifETnF kXWYVQZQS5X/hn8SQT6Y/508pcgA+qTx/xsfpYPedsTSSgBh10uEkDFYHCJCY6l8iI0Q Q3hDYEaS2QIfzv64C1AlYlgsKDa3MMvDOUC22UPK60ePecJv1GzQESH2m4JdCemt9ohD JwvQ== 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=xJQEd/tw+5bihUtS8xNDx4uOCFTFc7l87/IjfaVZf1w=; b=hirLuW7qj0zwmmjdyHxwx65lqxzThN6L7swMIvrkjxXgk2BJPx0++DsN/MxpNBhPlL PmfW+3YHFispeHALJht7Hxhe99lMBGM/wpvoq/9xuel0MNmo21lCKH49BM9f+q0RRa+U MxbkiesTD96/GI7brVWkmwXLC1PuJH8JsSWk9+vhWtFUPSnWYXva9PowPMz/midi0YYd vwVkcrl8lLLABnRq65Sm6XGYHgD+WcG4brPR5gsVuqF6cdfZBtLUfAqXyIMlMg+sIYWE e1OVuA9jOlKSUxRogWPhX2V34BLABGbquFzIZy+vzp19YPTpEvn1dfla/152HUqMIBEa xq+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Uz5CIb8C; 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 r7-20020a05640251c700b0045d4f995ac0si12457351edd.588.2022.10.19.06.41.33; Wed, 19 Oct 2022 06:41:59 -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=Uz5CIb8C; 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 S232630AbiJSNhn (ORCPT + 99 others); Wed, 19 Oct 2022 09:37:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56970 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232311AbiJSNgo (ORCPT ); Wed, 19 Oct 2022 09:36:44 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A3F881633B3; Wed, 19 Oct 2022 06:25:13 -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 ams.source.kernel.org (Postfix) with ESMTPS id E2EC9B824EC; Wed, 19 Oct 2022 09:16:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 52F35C433C1; Wed, 19 Oct 2022 09:16:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666170964; bh=6vbKmmz0ryFxKZLGyy2yrARzgTOezGzvxGBhsplRrh8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Uz5CIb8CLGxofcZm65WllZlfFB0iRtpIBlYGhHEuqCzyrfJOXdfeaGIO5VMTwspqE 235mQUwRTHakFhNnDFiDlMM4UbyXOQc47y+nDi4ZBgD+5C++ol++yhHXlN3db2MEKV rqxkAMrJRNVnhszHfJo7EYksyvaVHYl1Pe/otJkw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, sunghwan jung , Sasha Levin Subject: [PATCH 6.0 822/862] Revert "usb: storage: Add quirk for Samsung Fit flash" Date: Wed, 19 Oct 2022 10:35:09 +0200 Message-Id: <20221019083326.232981997@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221019083249.951566199@linuxfoundation.org> References: <20221019083249.951566199@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.4 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?1747123615409036663?= X-GMAIL-MSGID: =?utf-8?q?1747123615409036663?= 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 4993227ab293..20dcbccb290b 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",