From patchwork Mon Oct 24 11:34:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9541 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp510365wru; Mon, 24 Oct 2022 08:23:03 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7zOzIDjoSv2TnzB8zRR6JvyuUFronXZLTQcPQwWAzlUtE8Hl5Usy0/+uiKECr4svLcrKFL X-Received: by 2002:a63:d24b:0:b0:454:defd:db65 with SMTP id t11-20020a63d24b000000b00454defddb65mr28216528pgi.203.1666624983172; Mon, 24 Oct 2022 08:23:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666624983; cv=none; d=google.com; s=arc-20160816; b=jKvFJSmXYNBxfIs1iHOWSFJVaMZOv8NvxIVT+SjUkKpvm7N3913kMdZOjIF0HGZ/Pw j56zBbBY/pHyayqN8aSRtqIOsWeul02ukdoqY6sxkbpQMqFSXk/HcdsXZRx4vvtBSfYc 2uUi6pIWl9Bh1SkGm2Z7Djjj9p078YZ3l9WqtZa5fRAe4bKuCmBsFhBxazx6lCJa3ypQ A8JCqUk22pAqnsYBvIJgB3RT7FBZUlhfGmTTZmSwOoShb6H8NC5J6m1loHFVXLR3zbQr DNT8d5kQAyvoFySiUDLOmQBxaU5eET5uD1sgtM7kngBnyECyut0MF8KR5j6P34+NtsVm +LLA== 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=aghG9nKIotRFt5qBGSUXL9gmein7oV66wGSuzoFt6dkpPfWqommpkrU6Avl0yPB7Pu mz2xmkQZ7rxdYCfDOxBas3QPZvcn/Qe51bHSCgcvkaTjUwx1ZXKZITFSPfiE7HFf7OdE 2brWM9Ma7/PMC9JDQsWHlVOksOM0ZJZwkYaRHfkP1aUVq8XSwRHe2/P7DhNAg9H6VdfP JvL0pAHYqd7qI2ZBKadn+A7d4IJ7d9ttSA5emJSC7o68lGEtWqsy6brZOMA2gk+RVi0Z 95AW4UO/LhlFpa3rlnVLyapSbHvan9cofoZY/SoddrludpSH3IU7LwxlCv4YywMMZLHJ AuEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=rzpi37FM; 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 q17-20020a656251000000b0044c3ec9ea71si33011844pgv.630.2022.10.24.08.22.48; Mon, 24 Oct 2022 08:23:03 -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=rzpi37FM; 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 S236217AbiJXOj2 (ORCPT + 99 others); Mon, 24 Oct 2022 10:39:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237186AbiJXOjK (ORCPT ); Mon, 24 Oct 2022 10:39:10 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5602121801; Mon, 24 Oct 2022 06:15:33 -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 64A5D61150; Mon, 24 Oct 2022 12:56:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 514A9C433D6; Mon, 24 Oct 2022 12:56:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666616180; bh=6vbKmmz0ryFxKZLGyy2yrARzgTOezGzvxGBhsplRrh8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rzpi37FMhKnQhMkJdFqQL6i9aJ6TQSiPyeBPGyqJ9FNzsYv4zI/q376oO1j0t3AVO o1bgJlAenYwsY75ECRLLUo8u+EDD4qs6fiGGO7oiwc9qCwQG/PhTUdIetYLHmizMXD LzyGSOpA2GUlX0UfV6+kOYjXCljD4pE1QwQkEeIU= 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.15 500/530] Revert "usb: storage: Add quirk for Samsung Fit flash" Date: Mon, 24 Oct 2022 13:34:04 +0200 Message-Id: <20221024113107.678397573@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@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?1747582958747699485?= X-GMAIL-MSGID: =?utf-8?q?1747582958747699485?= 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",