From patchwork Thu May 10 10:24:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Matt Redfearn X-Patchwork-Id: 10391613 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 725D560153 for ; Thu, 10 May 2018 10:24:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 63BEF289D2 for ; Thu, 10 May 2018 10:24:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 583A8289DA; Thu, 10 May 2018 10:24:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F3734289D2 for ; Thu, 10 May 2018 10:24:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935090AbeEJKYg convert rfc822-to-8bit (ORCPT ); Thu, 10 May 2018 06:24:36 -0400 Received: from 9pmail.ess.barracuda.com ([64.235.154.210]:50321 "EHLO 9pmail.ess.barracuda.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934760AbeEJKYb (ORCPT ); Thu, 10 May 2018 06:24:31 -0400 Received: from mipsdag02.mipstec.com (mail2.mips.com [12.201.5.32]) by mx1414.ess.rzc.cudaops.com (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA256 bits=128 verify=NO); Thu, 10 May 2018 10:24:22 +0000 Received: from [192.168.155.41] (192.168.155.41) by mipsdag02.mipstec.com (10.20.40.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1415.2; Thu, 10 May 2018 03:24:14 -0700 Subject: Re: Regression caused by commit 882164a4a928 To: =?UTF-8?Q?Michael_B=c3=bcsch?= CC: Larry Finger , =?UTF-8?B?UmFmYcWCIE1pxYJlY2tp?= , Kalle Valo , linux-wireless , LKML References: <7bbc067a-c412-3d2e-174a-abc31b46e246@lwfinger.net> <372d149c-c34c-56a0-4e1a-5ab2c1e16e73@mips.com> <20180509182756.6f36cc05@wiggum> From: Matt Redfearn Message-ID: Date: Thu, 10 May 2018 11:24:12 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: <20180509182756.6f36cc05@wiggum> Content-Language: en-US X-Originating-IP: [192.168.155.41] X-ClientProxiedBy: mipsdag02.mipstec.com (10.20.40.47) To mipsdag02.mipstec.com (10.20.40.47) X-BESS-ID: 1525947862-531716-13881-555844-1 X-BESS-VER: 2018.5-r1804261738 X-BESS-Apparent-Source-IP: 12.201.5.32 X-BESS-Outbound-Spam-Score: 0.00 X-BESS-Outbound-Spam-Report: Code version 3.2, rules version 3.2.2.192871 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------- 0.00 BSF_BESS_OUTBOUND META: BESS Outbound X-BESS-Outbound-Spam-Status: SCORE=0.00 using account:ESS59374 scores of KILL_LEVEL=7.0 tests=BSF_BESS_OUTBOUND X-BESS-BRTS-Status: 1 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi Michael, On 09/05/18 17:27, Michael Büsch wrote: > On Wed, 9 May 2018 13:55:43 +0100 > Matt Redfearn wrote: > >> Hi Larry >> >> On 07/05/18 16:44, Larry Finger wrote: >>> Matt, >>> >>> Although commit 882164a4a928 ("ssb: Prevent build of PCI host features >>> in module") appeared to be harmless, it leads to complete failure of >>> drivers b43. and b43legacy, and likely affects b44 as well. The problem >>> is that CONFIG_SSB_PCIHOST is undefined, which prevents the compilation >>> of the code that controls the PCI cores of the device. See >>> https://bugzilla.redhat.com/show_bug.cgi?id=1572349 for details. >> >> Sorry for the breakage :-/ >> >>> >>> As the underlying errors ("pcibios_enable_device" undefined, and >>> "register_pci_controller" undefined) do not appear on the architectures >>> that I have tested (x86_64, x86, and ppc), I suspect something in the >>> arch-specific code for your setup (MIPS?). As I have no idea on how to >>> fix that problem, would the following patch work for you? >>> >>> diff --git a/drivers/ssb/Kconfig b/drivers/ssb/Kconfig >>> index 9371651d8017..3743533c8057 100644 >>> --- a/drivers/ssb/Kconfig >>> +++ b/drivers/ssb/Kconfig >>> @@ -117,7 +117,7 @@ config SSB_SERIAL >>> >>>  config SSB_DRIVER_PCICORE_POSSIBLE >>>         bool >>> -       depends on SSB_PCIHOST && SSB = y >>> +       depends on SSB_PCIHOST && (SSB = y || !MIPS) >>>         default y >>> >>>  config SSB_DRIVER_PCICORE >> >> I believe that the problem stems from these drivers being used for some >> wireless AP functionality built into some MIPS based SoCs. The Kconfig >> rules sort out building this additional functionality when configured >> for MIPS (in a round about sort of way), but it allowed it even when SSB >> is a module, leading to build failures. My patch was intended to prevent >> that. >> >> There was a similar issue in the same Kconfig file, introduced by >> c5611df96804 and fixed by a9e6d44ddecc. It was fixed the same way as you >> suggest. I've tested the above patch and it does work for MIPS >> (preventing the PCICORE being built into the module). >> >> Tested-by: Matt Redfearn > > > Could you please try this? > > config SSB_DRIVER_PCICORE_POSSIBLE > depends on SSB_PCIHOST > > config SSB_PCICORE_HOSTMODE > depends on SSB_DRIVER_PCICORE && SSB_DRIVER_MIPS && (SSB = y) && PCI_DRIVERS_LEGACY > > > The affected API pcibios_enable_device() and register_pci_controller() > is only used in HOSTMODE. So I think it makes sense to make HOSTMODE > depend on SSB=y and PCI_DRIVERS_LEGACY. > > PCICore itself does not use the API, if hostmode is disabled. > Sure - I've tested the patch: And this seems to work for MIPS, we don't get the build error from building the SSB module under nec_markeins allmodconfig, and SSB_PCICORE_HOSTMODE=y for bcm47xx allmodconfig, which selects SSB=y. So this looks like a good fix for MIPS, at least. Tested-by: Matt Redfearn Thanks, Matt --- a/drivers/ssb/Kconfig +++ b/drivers/ssb/Kconfig @@ -117,7 +117,7 @@ config SSB_SERIAL config SSB_DRIVER_PCICORE_POSSIBLE bool - depends on SSB_PCIHOST && SSB = y + depends on SSB_PCIHOST default y config SSB_DRIVER_PCICORE @@ -131,7 +131,7 @@ config SSB_DRIVER_PCICORE config SSB_PCICORE_HOSTMODE bool "Hostmode support for SSB PCI core" - depends on SSB_DRIVER_PCICORE && SSB_DRIVER_MIPS + depends on SSB_DRIVER_PCICORE && SSB_DRIVER_MIPS && (SSB = y) && PCI_DRIVERS_LEGACY help PCIcore hostmode operation (external PCI bus).