From patchwork Wed May 13 05:36:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 6393761 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1EF809F32B for ; Wed, 13 May 2015 05:37:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 485B4203F3 for ; Wed, 13 May 2015 05:37:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6052120376 for ; Wed, 13 May 2015 05:37:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751930AbbEMFhS (ORCPT ); Wed, 13 May 2015 01:37:18 -0400 Received: from mail-wi0-f181.google.com ([209.85.212.181]:34831 "EHLO mail-wi0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750909AbbEMFhQ (ORCPT ); Wed, 13 May 2015 01:37:16 -0400 Received: by widdi4 with SMTP id di4so182588058wid.0 for ; Tue, 12 May 2015 22:37:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=8Xg8nULpzUvhDDg4U6epE0K5AMxnjspWx3yif36muTU=; b=KNxPWsYgOi1IbMR/YcqTIcZ3OAMU7J20ezbCIl/GDKDF8pCCsJd+K5SK1LkoofhBK5 W6pfJBbaYKxR+j918zsLzNvMVeuCR9WzcJYLdkBF7o9dvcPXS/P0cjSE09aCvwePhEQl sRJIU45Q6ph5X48qn64H8klzxJUL4CIA+c6NlOIZiTLeCiP6wEmbk7pgkMzjNrcNEkII 6cY2ohOPPKsul+8mve3hs/cUaPs8pZ0282CJM5m7EtsmJG1uMbqnrf3l/pZIph7EstdV 082P6i3+KI2481EsUn3GGBvJ8ODsAHvgO9IqjTUE2gq6xIT+UIvZXeNYD+n3OZoQCmBg bFMQ== X-Received: by 10.181.13.198 with SMTP id fa6mr36296066wid.41.1431495435437; Tue, 12 May 2015 22:37:15 -0700 (PDT) Received: from linux-tdhb.lan ([89.174.37.6]) by mx.google.com with ESMTPSA id em18sm31004811wjd.19.2015.05.12.22.37.14 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 May 2015 22:37:14 -0700 (PDT) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: Kalle Valo , linux-wireless@vger.kernel.org Cc: Hauke Mehrtens , Daniel Gimpelevich , =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Subject: [PATCH FIX] ssb: extend fix for PCI related silent reboots to all chipsets Date: Wed, 13 May 2015 07:36:38 +0200 Message-Id: <1431495398-15238-1-git-send-email-zajec5@gmail.com> X-Mailer: git-send-email 1.8.4.5 MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Recent fix for BCM4704 reboots has to be extended as the same problem affects Linksys WRT350N v1 (BCM4705). Signed-off-by: Rafa? Mi?ecki Reported-by: Daniel Gimpelevich --- Kalle: it's quite trivial, you may consider taking it for 4.1. --- drivers/ssb/driver_pcicore.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/ssb/driver_pcicore.c b/drivers/ssb/driver_pcicore.c index 15a7ee3..5fe1c22 100644 --- a/drivers/ssb/driver_pcicore.c +++ b/drivers/ssb/driver_pcicore.c @@ -359,12 +359,13 @@ static void ssb_pcicore_init_hostmode(struct ssb_pcicore *pc) /* * Accessing PCI config without a proper delay after devices reset (not - * GPIO reset) was causing reboots on WRT300N v1.0. + * GPIO reset) was causing reboots on WRT300N v1.0 (BCM4704). * Tested delay 850 us lowered reboot chance to 50-80%, 1000 us fixed it * completely. Flushing all writes was also tested but with no luck. + * The same problem was reported for WRT350N v1 (BCM4705), so we just + * sleep here unconditionally. */ - if (pc->dev->bus->chip_id == 0x4704) - usleep_range(1000, 2000); + usleep_range(1000, 2000); /* Enable PCI bridge BAR0 prefetch and burst */ val = PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY;