Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp8109656imu; Tue, 4 Dec 2018 03:09:56 -0800 (PST) X-Google-Smtp-Source: AFSGD/WDryIiqhXD0x5DVuFiE5RU1yc6IbOuDM9KmxLHBanuEcGE9PoCvML9X9wywRRILVG9rPTp X-Received: by 2002:a17:902:33c1:: with SMTP id b59mr19403590plc.220.1543921796937; Tue, 04 Dec 2018 03:09:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543921796; cv=none; d=google.com; s=arc-20160816; b=wL+iduC8RinOx5o2vBIYjzCWtx7WSvK0EXLT0uLjavfu+hO74z5Mm2GeZWjYJ6YEpW lNvOle/v9UOeIuKXDX2x9h04zH7+Z8AWkB4m6hdwI3BSiHxsb6P9ND7z2GgktD7CJt5G NrRFVrIl9iOPGRH/rxCT+JVVNM/zkWHyI4QdBws06rlXqDD0ezYsaaRtlrNRBjrtrITs 4ICSn2K6k44uMBGtoYKmKiBC8JKjs9ISVhC8KCsgWW3imeWiVIyy/79WS9AEerSeJqkV e7ZaIkjIeH2klf39ptggFcv54FhGvZpJxwHHvw5EfsRUoa6+0VBSU7y4z7QSHMeLiaeY j3ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=dIrNr7Tq+BxZEqX0h6Ggj0smHiJO0NeSbcqVa/VsWE4=; b=eLFKg3q8kxn4SX9CLzM1Yv2Yka6KxNqn2Kv8Pkbdtaz/mGzUNigGMTUBOeokO6Vqj5 3XpRJzqeLKOK95YRygxR00Ctuu7b/DeWzNSZrUoZLpBIj+vmWrLvHX6caxRBWDJyTpBE aOzuiDr4dKlPzcDlY8Y8WRQIVScq8JzmpOkcsTdJ1PmN81/pFb1kCCM3TAB0fcbVMc5o hcXqavZlBqftGhNNL8ujfX7IMq3kZv+TrP8zVN4t614BtdezOD6y5iqh6bKQxA/kDyq6 Kb45XI2YW2edjd6rCivmR4Rhhl2dkEyJUrhUD4/0a8T2jrflEzQKYMK5TwdINc8X99Y/ prRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=vflmU9WQ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 11si15015839pgs.126.2018.12.04.03.09.42; Tue, 04 Dec 2018 03:09:56 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=vflmU9WQ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728515AbeLDLHw (ORCPT + 99 others); Tue, 4 Dec 2018 06:07:52 -0500 Received: from mail.kernel.org ([198.145.29.99]:57036 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728514AbeLDLHt (ORCPT ); Tue, 4 Dec 2018 06:07:49 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 28F5321508; Tue, 4 Dec 2018 11:07:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1543921668; bh=AB1RK8QOX/zfHJYlfHT0l4TK8UK6+nGii10bFU+mTM4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vflmU9WQ+NxmgBZAA/1lRrt6NuCy0BdvpWXr96PjraLD/to6VTlK7iGZMdqY6S3Wz 5AKYuedKUTCYrtHm1/veJ46chqQYCX8F0F7HNKnI3/TjU2iGWclNTR6G5TWGnG/lbN D5/Y2l7GH2UZkJs8YLuZb7d0R2mDJT7IeU/TaKHk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sasha Levin Subject: [PATCH 4.9 14/50] Revert "wlcore: Add missing PM call for wlcore_cmd_wait_for_event_or_timeout()" Date: Tue, 4 Dec 2018 11:50:09 +0100 Message-Id: <20181204103715.246691675@linuxfoundation.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181204103714.485546262@linuxfoundation.org> References: <20181204103714.485546262@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ This reverts commit afeeecc764436f31d4447575bb9007732333818c which was upstream commit 4ec7cece87b3ed21ffcd407c62fb2f151a366bc1. >From Dietmar May's report on the stable mailing list (https://www.spinics.net/lists/stable/msg272201.html): > I've run into some problems which appear due to (a) recent patch(es) on > the wlcore wifi driver. > > 4.4.160 - commit 3fdd34643ffc378b5924941fad40352c04610294 > 4.9.131 - commit afeeecc764436f31d4447575bb9007732333818c > > Earlier versions (4.9.130 and 4.4.159 - tested back to 4.4.49) do not > exhibit this problem. It is still present in 4.9.141. > > master as of 4.20.0-rc4 does not exhibit this problem. > > Basically, during client association when in AP mode (running hostapd), > handshake may or may not complete following a noticeable delay. If > successful, then the driver fails consistently in warn_slowpath_null > during disassociation. If unsuccessful, the wifi client attempts multiple > times, sometimes failing repeatedly. I've had clients unable to connect > for 3-5 minutes during testing, with the syslog filled with dozens of > backtraces. syslog details are below. > > I'm working on an embedded device with a TI 3352 ARM processor and a > murata wl1271 module in sdio mode. We're running a fully patched ubuntu > 18.04 ARM build, with a kernel built from kernel.org's stable/linux repo . > Relevant parts of the kernel config are included below. > > The commit message states: > > > /I've only seen this few times with the runtime PM patches enabled so > > this one is probably not needed before that. This seems to work > > currently based on the current PM implementation timer. Let's apply > > this separately though in case others are hitting this issue./ > We're not doing anything explicit with power management. The device is an > IoT edge gateway with battery backup, normally running on wall power. The > battery is currently used solely to shut down the system cleanly to avoid > filesystem corruption. > > The device tree is configured to keep power in suspend; but the device > should never suspend, so in our case, there is no need to call > wl1271_ps_elp_wakeup() or wl1271_ps_elp_sleep(), as occurs in the patch. Signed-off-by: Sasha Levin --- drivers/net/wireless/ti/wlcore/cmd.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/net/wireless/ti/wlcore/cmd.c b/drivers/net/wireless/ti/wlcore/cmd.c index 96f83f09b8c5..7f4da727bb7b 100644 --- a/drivers/net/wireless/ti/wlcore/cmd.c +++ b/drivers/net/wireless/ti/wlcore/cmd.c @@ -35,7 +35,6 @@ #include "wl12xx_80211.h" #include "cmd.h" #include "event.h" -#include "ps.h" #include "tx.h" #include "hw_ops.h" @@ -192,10 +191,6 @@ int wlcore_cmd_wait_for_event_or_timeout(struct wl1271 *wl, timeout_time = jiffies + msecs_to_jiffies(WL1271_EVENT_TIMEOUT); - ret = wl1271_ps_elp_wakeup(wl); - if (ret < 0) - return ret; - do { if (time_after(jiffies, timeout_time)) { wl1271_debug(DEBUG_CMD, "timeout waiting for event %d", @@ -227,7 +222,6 @@ int wlcore_cmd_wait_for_event_or_timeout(struct wl1271 *wl, } while (!event); out: - wl1271_ps_elp_sleep(wl); kfree(events_vector); return ret; } -- 2.17.1