From patchwork Mon Oct 24 11:32:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8957 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp436266wru; Mon, 24 Oct 2022 05:56:49 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5XjmcM9TpWrON2dPj1q82Ot5p/jnw59BQESy3KAl26G40fenT83VPz+zUJrzxwiVJq2itd X-Received: by 2002:a17:902:e28b:b0:186:ada2:8173 with SMTP id o11-20020a170902e28b00b00186ada28173mr3872208plc.138.1666616209359; Mon, 24 Oct 2022 05:56:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666616209; cv=none; d=google.com; s=arc-20160816; b=zj4XKmJhGgnucohUEo+lcBataD8Mjc8OxbP3GQ9rsd6Vf6vwTEYcfRtLR06jeEed6L dMolUmXXxgPUuWjJVKi9vOyKpSi5sSAI2rOwuBr/zFbDIPU+5ISYUMc/80i52W3iS78h p1xPFJAOjeJ9vpmgZIU89NtH3NhYFqKzjojdD19fraJcbHCViq7d7zNOA0IWqwKfT1KK +sDYsoPJgme2H3T2xqt+wBGY5GtpOCgSUyOJcrY1MFdSvWfjXR5A/XXcBJ3VTpDy+VXz uAGQ+Snb1wFXhYfg+xVnp+Yx5r2z6RKMcZUHtq/zsmnn6+7zgK160Bo6gsarFOOaPeek 9MCg== 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=kb0szHMXH+9EZSfyjVSFmTwigaYO9/kzC35YjAKHqgJKheKk5DrL5lRIAtrwpm2Ppq Q+cKfs72xpe0k/0DBVQj4FHnUr/6BJSNihA1q+Jn8OHpzx06Bc2hGl1qYgz/ebimO87A kzT5wY2XkeLtLHW+iA2rrd9ceVgppgKWJnH/Yajf4my7l0wErN6d2tu6PCOFQodL5iQb kXs5CuBIbnVYHeC3gXUoW6VhG0bQ/MWf5iUiQ69bvtuX8z2cwDWvlX81TrHeuxSopds3 ADuyGpEUewOAHTxxr4G9rmRg8vdk/d2M43OXGPGvqHjxgdGXR9D/i14L1BfnivB8odBJ 5epA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=EKbSeLWd; 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 35-20020a630c63000000b0043a345c81edsi34893915pgm.836.2022.10.24.05.56.35; Mon, 24 Oct 2022 05:56:49 -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=EKbSeLWd; 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 S234724AbiJXMzg (ORCPT + 99 others); Mon, 24 Oct 2022 08:55:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41076 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234679AbiJXMyi (ORCPT ); Mon, 24 Oct 2022 08:54:38 -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 3AD36B843; Mon, 24 Oct 2022 05:15:05 -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 BA0A16126B; Mon, 24 Oct 2022 12:04:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CD754C433C1; Mon, 24 Oct 2022 12:04:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666613064; bh=9nmIX1CbbtzBfzsDqPxMj8VYIeUwmfAAsFdjW+FQUjg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EKbSeLWdTbaoxaFvv8BuwL5FGsyq0HMRsFook4lyfGFxCcyXPjVYfZND564gcZOaH /UviGAbjFPavULQB81A/Q2UMgsqvVV7npFgkknSpx6EJ4uyxCjijuuZBD8wyWY802d wK4MfPFhibwAPe34Igm9cl1EPG0i2scIvo83DU4E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, sunghwan jung , Sasha Levin Subject: [PATCH 4.19 217/229] Revert "usb: storage: Add quirk for Samsung Fit flash" Date: Mon, 24 Oct 2022 13:32:16 +0200 Message-Id: <20221024113006.260648538@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112959.085534368@linuxfoundation.org> References: <20221024112959.085534368@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?1747573757970538602?= X-GMAIL-MSGID: =?utf-8?q?1747573757970538602?= 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",