Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp247589yba; Sat, 20 Apr 2019 01:31:40 -0700 (PDT) X-Google-Smtp-Source: APXvYqzyksup2iChffFoSpOeP+xng2LcXAu6IdEKEkWbuFLe5iYDJ9rmD6kT4F2KcLXUu/5p6vPA X-Received: by 2002:a65:484a:: with SMTP id i10mr8239055pgs.408.1555749100556; Sat, 20 Apr 2019 01:31:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555749100; cv=none; d=google.com; s=arc-20160816; b=bY3tSVOEV60E9QusIpSBYaBLQFhEB97is1HQ3w+OfjaSUyGkQHKkflKGK0lHWxjfD8 ONkHknD/rAAVca3N4ennLaB/Y6COwzbs04HPR6EPjfr5RyzNr9Q5Ner+zB0mrFpcQhRz ErggRf0aGHsRIZ9j17oeY/6K61dSupvvdK/Oyc6QbG9m6jm/cIYB5x/cBIMfXzuCYXCj biht7KZFZKvujNWYR3etNlv+AcV4fNhTJLRUAxcDCS5Nkjv7m/AGkfo/urAZNbUtgQr8 075RDHx7WbgzahIbN2WbBF/tVr9dqR0yyjL7J8r4YrL9M0SG2aPpWMJ+6SGeuN/FJnBl JpZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:content-disposition :mime-version:message-id:subject:cc:to:from:date:dkim-signature; bh=uaV8whvNNGJ9yRXkIBcccf8aZcYo9WFgdR7/P73PO9Y=; b=gcnrBVFQBPtyRgfL7M/Sp4t7vPbu3tY6u+Hy1IV1Eft2iWk7Kok8JGy4IEFQ14xsYg NFYyuk+IEfeG6GGRLxCRkRNtp0gLVPO8zsjae/I0F5j2tpMxpZOzVa9WbALR/eHbt8vk RTUhfujjntSRh5d4xM7gSWgttiL820dZw7c9epD/ZCNt9dDhpd659YZo/SNzQ5tsK3Ax t000RS1hS8JxfTo8YjQ9J7UJZjmpksuwh2OxSmTWC2y7sOfOpeX5xBMtFn+H+2Qr9puH V/azSsS96Rzw7PhKdq03CPXu7T2vXAKKt6tYi5EVe6gpRdkilEHeI7A2CS7cPtsd7ysK OHjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mrns.nl header.s=mail header.b=X8IbzBiz; 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 d1si569592plo.9.2019.04.20.01.31.24; Sat, 20 Apr 2019 01:31:40 -0700 (PDT) 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=@mrns.nl header.s=mail header.b=X8IbzBiz; 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 S1726358AbfDTIac (ORCPT + 99 others); Sat, 20 Apr 2019 04:30:32 -0400 Received: from smtpq4.tb.mail.iss.as9143.net ([212.54.42.167]:55596 "EHLO smtpq4.tb.mail.iss.as9143.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725911AbfDTIab (ORCPT ); Sat, 20 Apr 2019 04:30:31 -0400 X-Greylist: delayed 1212 seconds by postgrey-1.27 at vger.kernel.org; Sat, 20 Apr 2019 04:30:30 EDT Received: from [212.54.42.137] (helo=smtp6.tb.mail.iss.as9143.net) by smtpq4.tb.mail.iss.as9143.net with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1hHl4i-0000eN-5Q; Sat, 20 Apr 2019 10:10:16 +0200 Received: from ip-213-127-67-73.ip.prioritytelecom.net ([213.127.67.73] helo=routi.mrns.nl) by smtp6.tb.mail.iss.as9143.net with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.86_2) (envelope-from ) id 1hHl4h-0005OY-2E; Sat, 20 Apr 2019 10:10:16 +0200 Received: by routi.mrns.nl (sSMTP sendmail emulation); Sat, 20 Apr 2019 10:10:14 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mrns.nl; i=@mrns.nl; q=dns/txt; s=mail; t=1555747814; h=date : from : to : cc : subject : message-id : mime-version : content-type : from; bh=znwOSSSBdKg6HYBzdnX6GCpeT7U3Py2XItMkuRtGaUc=; b=X8IbzBizj6IzLqViUvswcW83xgHMZBfLB1iYVsHktepyuCFqF0Lot2g7j655o2hQK05OH CreRWnflSH5uijLQaE7ZMOxoltR8RKYTcCKGTC0rpG+PjM5Y4Ty6jUZ7NJq4W7/sxac5S3+ +u5dB2NGRFauPnYuvunmmV5zqMexrfU= Date: Sat, 20 Apr 2019 10:10:14 +0200 From: Dick Marinus To: linux-kernel@vger.kernel.org Cc: wens@csie.org Subject: Re: [PATCH] Bluetooth: hci_bcm: Fix empty regulator supplies for Intel Macs Message-ID: <20190420081014.nmgjyrekngga4ncl@routi.mrns.nl> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: NeoMutt/20180716 X-SourceIP: 213.127.67.73 X-Authenticated-Sender: boeierlaan60@ziggo.nl (via SMTP) X-Ziggo-spambar: / X-Ziggo-spamscore: 0.0 X-Ziggo-spamreport: CMAE Analysis: v=2.3 cv=ENp4LGRC c=1 sm=1 tr=0 a=0nvI0T6MiNaq20ZY2X3xbg==:17 a=9+rZDBEiDlHhcck0kWbJtElFXBc=:19 a=kj9zAlcOel0A:10 a=oexKYjalfGEA:10 a=zu6OG0ZhAAAA:8 a=VwQbUJbxAAAA:8 a=vYmT8LKSE7Qjc22oWjAA:9 a=ZDFt9QSJGRoUNatP:21 a=YSwbCBWV7iuL550X:21 a=CjuIK1q_8ugA:10 a=pAN39diAhXWuPx0-Vjn3:22 a=AjGcO6oz07-iQ99wixmX:22 X-Ziggo-Spam-Status: No X-Spam-Status: No X-Spam-Flag: No Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This fixes the issue for hanging at modprobe intel-lpss-pci on my macbook pro 13,3 2016. Error in dmesg: BUG: unable to handle kernel NULL pointer dereference at 0000000000000090 Thanks a lot! Tested-by: Dick Marinus > From: Chen-Yu Tsai > > The code path for Macs goes through bcm_apple_get_resources(), which > skips over the code that sets up the regulator supplies. As a result, > the call to regulator_bulk_enable() / regulator_bulk_disable() results > in a NULL pointer dereference. > > This was reported on the kernel.org Bugzilla, bug 202963. > > Unbreak Broadcom Bluetooth support on Intel Macs by checking if the > supplies were set up before enabling or disabling them. > > The same does not need to be done for the clocks, as the common clock > framework API checks for NULL pointers. > > Fixes: 75d11676dccb ("Bluetooth: hci_bcm: Add support for regulator supplies") > Cc: # 5.0.x > Signed-off-by: Chen-Yu Tsai > --- > > I do not own a Mac, so this needs to be tested by someone else. > > --- > drivers/bluetooth/hci_bcm.c | 20 ++++++++++++++++---- > 1 file changed, 16 insertions(+), 4 deletions(-) > > diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c > index ddbe518c3e5b..b5d31d583d60 100644 > --- a/drivers/bluetooth/hci_bcm.c > +++ b/drivers/bluetooth/hci_bcm.c > @@ -228,9 +228,15 @@ static int bcm_gpio_set_power(struct bcm_device *dev, bool powered) > int err; > > if (powered && !dev->res_enabled) { > - err = regulator_bulk_enable(BCM_NUM_SUPPLIES, dev->supplies); > - if (err) > - return err; > + /* Intel Macs use bcm_apple_get_resources() and don't > + * have regulator supplies configured. > + */ > + if (dev->supplies[0].supply) { > + err = regulator_bulk_enable(BCM_NUM_SUPPLIES, > + dev->supplies); > + if (err) > + return err; > + } > > /* LPO clock needs to be 32.768 kHz */ > err = clk_set_rate(dev->lpo_clk, 32768); > @@ -259,7 +265,13 @@ static int bcm_gpio_set_power(struct bcm_device *dev, bool powered) > if (!powered && dev->res_enabled) { > clk_disable_unprepare(dev->txco_clk); > clk_disable_unprepare(dev->lpo_clk); > - regulator_bulk_disable(BCM_NUM_SUPPLIES, dev->supplies); > + > + /* Intel Macs use bcm_apple_get_resources() and don't > + * have regulator supplies configured. > + */ > + if (dev->supplies[0].supply) > + regulator_bulk_disable(BCM_NUM_SUPPLIES, > + dev->supplies); > } > > /* wait for device to power on and come out of reset */ > -- > 2.20.1