From patchwork Wed Jan 2 12:51:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 10746315 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B32C31399 for ; Wed, 2 Jan 2019 12:52:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A0030287FF for ; Wed, 2 Jan 2019 12:52:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8709528807; Wed, 2 Jan 2019 12:52:23 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham 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 BFEFA287FF for ; Wed, 2 Jan 2019 12:52:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729507AbfABMwS (ORCPT ); Wed, 2 Jan 2019 07:52:18 -0500 Received: from mail-lj1-f193.google.com ([209.85.208.193]:38181 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726772AbfABMwS (ORCPT ); Wed, 2 Jan 2019 07:52:18 -0500 Received: by mail-lj1-f193.google.com with SMTP id c19-v6so26909827lja.5; Wed, 02 Jan 2019 04:52:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=i5ZkuLL0YkEz2DgdlKRmCxBUwyCwpZqWs3VUjxD9AU4=; b=pc7SSV7U0+XOIxyIDesBH4G8hiVbMXhZ6tzz0krUP/MHa6Ygrq3aFqb7Dov/IJ73kr dgrykbcAoCHS5SjUMmMwxKBubHaS5DDwH5K5rvYHpIAznPBR9FvsvUhWLu2lF1jOgB5K CberImji/XSdTMcbKrhZ0kJl1R5jxjXlmXXUKBGejVvInGD64PifWDAyGSPymno9hrLe nii5YhgT11vkA+k0VuawtkoK+2LNAB6TVf0JU04o7OQGw9HUM4Gn1a+lBHraCYgGNmbl +O/FmY5qiDTuYkfNvwCOvbOCd5wi9EUNjNY7cy59mB9vE52D10fSp0Jh+5xq0VR1bHOG F9oQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=i5ZkuLL0YkEz2DgdlKRmCxBUwyCwpZqWs3VUjxD9AU4=; b=B4qSTo83Lmxn+pUDTnEUgN6cHLSgZRtWhdEuH83GqEcNrrcUULXtE30070jxGh/bmG TE7jfAXnYKWWKWfiHZM7DUWNnbaO23wW0YN4u9lSTQ80MDxkSPN6CLzeFtAf7xCmTbxC qOWo0tL+XXbqj2EmbwDFo6nWMCvXy94/a+5wtEZsmYyJ4yHGNZAGGn+3Pi3rjV4wxpxT 5Zvxnm7JKZlRDVBfdm6Qmiz0Ny/ZF8aRfcd6bX9sJri4ZnaVatih3woSGwtgnlRsS6Tt TfYmYndgUliBokkVHCOeh5bd2aEKrong8kHxLk/yP80hmCUgmKFi5HFjvvAvGhmw61R8 w8tA== X-Gm-Message-State: AJcUukf2KXQNr+7M7EadZfCaWk2kkTB2ovnfLkix0dqWlQRgrBmgz/Q7 m/9YG98wR1JpQqcLpRtjSzs= X-Google-Smtp-Source: ALg8bN6AnXCFckGJI9kfiwRGJQYPzhzLXsmIuYFWGfarEihcYASL3thokEr6gf84u6oaE6ujiW1rXA== X-Received: by 2002:a2e:3e04:: with SMTP id l4-v6mr23521946lja.148.1546433534378; Wed, 02 Jan 2019 04:52:14 -0800 (PST) Received: from linux-veee.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id g3-v6sm11395432lje.50.2019.01.02.04.52.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 02 Jan 2019 04:52:13 -0800 (PST) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: Paul Burton Cc: Ralf Baechle , James Hogan , Christoph Hellwig , Linus Walleij , Hauke Mehrtens , linux-mips@linux-mips.org, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= Subject: [PATCH mips-fixes] MIPS: BCM47XX: Setup struct device for the SoC Date: Wed, 2 Jan 2019 13:51:47 +0100 Message-Id: <20190102125147.3282-1-zajec5@gmail.com> X-Mailer: git-send-email 2.13.7 MIME-Version: 1.0 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 From: Rafał Miłecki So far we never had any device registered for the SoC. This resulted in some small issues that we kept ignoring like: 1) Not working GPIOLIB_IRQCHIP (gpiochip_irqchip_add_key() failing) 2) Lack of proper tree in the /sys/devices/ 3) mips_dma_alloc_coherent() silently handling empty coherent_dma_mask Kernel 4.19 came with a lot of DMA changes and caused a regression on bcm47xx. Starting with the commit f8c55dc6e828 ("MIPS: use generic dma noncoherent ops for simple noncoherent platforms") DMA coherent allocations just fail. Example: [ 1.114914] bgmac_bcma bcma0:2: Allocation of TX ring 0x200 failed [ 1.121215] bgmac_bcma bcma0:2: Unable to alloc memory for DMA [ 1.127626] bgmac_bcma: probe of bcma0:2 failed with error -12 [ 1.133838] bgmac_bcma: Broadcom 47xx GBit MAC driver loaded The bgmac driver also triggers a WARNING: [ 0.959486] ------------[ cut here ]------------ [ 0.964387] WARNING: CPU: 0 PID: 1 at ./include/linux/dma-mapping.h:516 bgmac_enet_probe+0x1b4/0x5c4 [ 0.973751] Modules linked in: [ 0.976913] CPU: 0 PID: 1 Comm: swapper Not tainted 4.19.9 #0 [ 0.982750] Stack : 804a0000 804597c4 00000000 00000000 80458fd8 8381bc2c 838282d4 80481a47 [ 0.991367] 8042e3ec 00000001 804d38f0 00000204 83980000 00000065 8381bbe0 6f55b24f [ 0.999975] 00000000 00000000 80520000 00002018 00000000 00000075 00000007 00000000 [ 1.008583] 00000000 80480000 000ee811 00000000 00000000 00000000 80432c00 80248db8 [ 1.017196] 00000009 00000204 83980000 803ad7b0 00000000 801feeec 00000000 804d0000 [ 1.025804] ... [ 1.028325] Call Trace: [ 1.030875] [<8000aef8>] show_stack+0x58/0x100 [ 1.035513] [<8001f8b4>] __warn+0xe4/0x118 [ 1.039708] [<8001f9a4>] warn_slowpath_null+0x48/0x64 [ 1.044935] [<80248db8>] bgmac_enet_probe+0x1b4/0x5c4 [ 1.050101] [<802498e0>] bgmac_probe+0x558/0x590 [ 1.054906] [<80252fd0>] bcma_device_probe+0x38/0x70 [ 1.060017] [<8020e1e8>] really_probe+0x170/0x2e8 [ 1.064891] [<8020e714>] __driver_attach+0xa4/0xec [ 1.069784] [<8020c1e0>] bus_for_each_dev+0x58/0xb0 [ 1.074833] [<8020d590>] bus_add_driver+0xf8/0x218 [ 1.079731] [<8020ef24>] driver_register+0xcc/0x11c [ 1.084804] [<804b54cc>] bgmac_init+0x1c/0x44 [ 1.089258] [<8000121c>] do_one_initcall+0x7c/0x1a0 [ 1.094343] [<804a1d34>] kernel_init_freeable+0x150/0x218 [ 1.099886] [<803a082c>] kernel_init+0x10/0x104 [ 1.104583] [<80005878>] ret_from_kernel_thread+0x14/0x1c [ 1.110107] ---[ end trace f441c0d873d1fb5b ]--- This patch setups a "struct device" (and passes it to the bcma) which allows fixing all the mentioned problems. It'll also require a tiny bcma patch which will follow through the wireless tree & its maintainer. Fixes: f8c55dc6e828 ("MIPS: use generic dma noncoherent ops for simple noncoherent platforms") Cc: Christoph Hellwig Cc: stable@vger.kernel.org # v4.19+ Signed-off-by: Rafał Miłecki Acked-by: Hauke Mehrtens --- arch/mips/bcm47xx/setup.c | 30 ++++++++++++++++++++++++++++++ include/linux/bcma/bcma_soc.h | 1 + 2 files changed, 31 insertions(+) diff --git a/arch/mips/bcm47xx/setup.c b/arch/mips/bcm47xx/setup.c index 6054d49e608e..9339a31a0a87 100644 --- a/arch/mips/bcm47xx/setup.c +++ b/arch/mips/bcm47xx/setup.c @@ -173,6 +173,31 @@ void __init plat_mem_setup(void) pm_power_off = bcm47xx_machine_halt; } +#ifdef CONFIG_BCM47XX_BCMA +static struct device * __init bcm47xx_setup_device(void) +{ + struct device *dev; + int err; + + dev = kzalloc(sizeof(*dev), GFP_KERNEL); + if (!dev) + return NULL; + + err = dev_set_name(dev, "bcm47xx_soc"); + if (err) { + pr_err("Failed to set SoC device name: %d\n", err); + kfree(dev); + return NULL; + } + + err = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(32)); + if (err) + pr_err("Failed to set SoC DMA mask: %d\n", err); + + return dev; +} +#endif + /* * This finishes bus initialization doing things that were not possible without * kmalloc. Make sure to call it late enough (after mm_init). @@ -183,6 +208,10 @@ void __init bcm47xx_bus_setup(void) if (bcm47xx_bus_type == BCM47XX_BUS_TYPE_BCMA) { int err; + bcm47xx_bus.bcma.dev = bcm47xx_setup_device(); + if (!bcm47xx_bus.bcma.dev) + panic("Failed to setup SoC device\n"); + err = bcma_host_soc_init(&bcm47xx_bus.bcma); if (err) panic("Failed to initialize BCMA bus (err %d)", err); @@ -235,6 +264,7 @@ static int __init bcm47xx_register_bus_complete(void) #endif #ifdef CONFIG_BCM47XX_BCMA case BCM47XX_BUS_TYPE_BCMA: + device_register(bcm47xx_bus.bcma.dev); bcma_bus_register(&bcm47xx_bus.bcma.bus); break; #endif diff --git a/include/linux/bcma/bcma_soc.h b/include/linux/bcma/bcma_soc.h index 7cca5f859a90..72a9a5cf962b 100644 --- a/include/linux/bcma/bcma_soc.h +++ b/include/linux/bcma/bcma_soc.h @@ -5,6 +5,7 @@ #include struct bcma_soc { + struct device *dev; struct bcma_bus bus; };