From patchwork Sun Dec 18 13:34:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Duoming Zhou X-Patchwork-Id: 34320 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp1936156wrn; Sun, 18 Dec 2022 06:11:28 -0800 (PST) X-Google-Smtp-Source: AA0mqf4oP3JYlcWbiao2vz1WZnyWLzu58m7/VDYEtumMLUftPBz4R1H8TGoXUnbMIp7DxW8vJMk2 X-Received: by 2002:a05:6a21:1517:b0:a4:526a:3f25 with SMTP id nq23-20020a056a21151700b000a4526a3f25mr41468426pzb.44.1671372688588; Sun, 18 Dec 2022 06:11:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671372688; cv=none; d=google.com; s=arc-20160816; b=MFod9KrZEz9SRS9eP3EUTvLMVRZl7Z6+GKW5yHHDRYSn46skGTajekDo1LRS8cj9J7 IsD8XI03U2X03WH6Kk0qSVm5Kq9OXWNNYWdt4ZOFPhP7Z8o8WCPT/uXukH8nOLs1PnJW F4Q3cTIiOqk78ICLhmxR/pfwH+w5gWaovI2p1xON5llzsWULb+fABhgdd3AMyTcJUapD EkwvBzzcGP70gR8bX6gre0ETpap1KDzPfKtO8Zlq/xeZ6QjD40/2db2B2cm48fMFiRv7 QNx9Z3Fg80LwZhpzsUQx+6/XNzo4V9aysU7GfL+5KKplbxpQk40c04vkCwdnpCk1I92O yVPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from; bh=7MD+5z9PK51kfue6gzlPYMMj46St1h9eCOo0VsS/iOA=; b=TFWqMuX3qhlFEU6at0CARLPqEm5dzXWp2YPl55enKNyf2ZMmqBFJOsN27aJa5r+1LI gpPbKYi3gefzPZk25RqAdNHJbfKBONR/TTpwjrHMQ3faADd7PjqIfxtU6n+7Z9FsNBAN k/WarkF3KVtnAravS/d819n8OAkHUNx3YjSveK6PUOGPlN2JGdy1cXf1c4imRhnYU1j6 +jq/ZGcSJlCvb/2zDMz1Wpys+T7Po99SFLpTFrpAuKD9/dkVQ3SfzCsPAV8prDjD5ps5 xdX6XwAHBy9YOk/YTNlP3jva/2KMnwdCMykvSs8JCU7z4En5Tann4Y8TdJrYUhGPALJD eDDg== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d34-20020a631d22000000b00476f947575esi8449159pgd.329.2022.12.18.06.11.01; Sun, 18 Dec 2022 06:11:28 -0800 (PST) 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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230255AbiLRNeV (ORCPT + 99 others); Sun, 18 Dec 2022 08:34:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40358 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229509AbiLRNeR (ORCPT ); Sun, 18 Dec 2022 08:34:17 -0500 Received: from zju.edu.cn (spam.zju.edu.cn [61.164.42.155]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id A4240B1E9 for ; Sun, 18 Dec 2022 05:34:14 -0800 (PST) Received: from ubuntu.localdomain (unknown [10.162.98.155]) by mail-app4 (Coremail) with SMTP id cS_KCgCHGt3IFp9j82ZnCQ--.42703S2; Sun, 18 Dec 2022 21:34:08 +0800 (CST) From: Duoming Zhou To: gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, laforge@gnumonks.org, Duoming Zhou Subject: [PATCH v2] Revert "char: pcmcia: cm4000_cs: Replace mdelay with usleep_range in set_protocol" Date: Sun, 18 Dec 2022 21:34:00 +0800 Message-Id: <20221218133400.99581-1-duoming@zju.edu.cn> X-Mailer: git-send-email 2.17.1 X-CM-TRANSID: cS_KCgCHGt3IFp9j82ZnCQ--.42703S2 X-Coremail-Antispam: 1UD129KBjvJXoW7Zr4fJr1UXw4rZFWUJry8Grg_yoW8Wr4UpF 4FkF90yF48G39av3WDAa10934YgaySq34xKF4fG3s8ZF9Yq3WDKrykJFW3Kr1DXrZ5Jw1S v3Waqay3KF4jkrUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUka1xkIjI8I6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AE w4v_Jr0_Jr4l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2 IY67AKxVWDJVCq3wA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2 z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcV Aq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j 6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64 vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7MxAIw28IcxkI7VAKI48JMxAIw28IcVCjz48v 1sIEY20_GFWkJr1UJwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r 18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vI r41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr 1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvE x4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0JUdHUDUUUUU= X-CM-SenderInfo: qssqjiasttq6lmxovvfxof0/1tbiAgwIAVZdtc6XkAAAsw X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_PASS, 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?1750717696406401804?= X-GMAIL-MSGID: =?utf-8?q?1752561288515105007?= This reverts commit be826ada52f1fcabed5b5217c94609ebf5967211. The function monitor_card() is a timer handler that runs in an atomic context, but it calls usleep_range() that can sleep. As a result, the sleep-in-atomic-context bugs will happen. The process is shown below: (atomic context) monitor_card() set_protocol() usleep_range() //sleep The origin commit c1986ee9bea3 ("[PATCH] New Omnikey Cardman 4000 driver") works fine. Fixes: be826ada52f1 ("char: pcmcia: cm4000_cs: Replace mdelay with usleep_range in set_protocol") Signed-off-by: Duoming Zhou --- Changes in v2: - Add comments so that this will not be changed again in the future. drivers/char/pcmcia/cm4000_cs.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c index adaec8fd4b1..e656f42a28a 100644 --- a/drivers/char/pcmcia/cm4000_cs.c +++ b/drivers/char/pcmcia/cm4000_cs.c @@ -529,7 +529,8 @@ static int set_protocol(struct cm4000_dev *dev, struct ptsreq *ptsreq) DEBUGP(5, dev, "NumRecBytes is valid\n"); break; } - usleep_range(10000, 11000); + /* can not sleep as this is in atomic context */ + mdelay(10); } if (i == 100) { DEBUGP(5, dev, "Timeout waiting for NumRecBytes getting " @@ -549,7 +550,8 @@ static int set_protocol(struct cm4000_dev *dev, struct ptsreq *ptsreq) } break; } - usleep_range(10000, 11000); + /* can not sleep as this is in atomic context */ + mdelay(10); } /* check whether it is a short PTS reply? */