From patchwork Thu May 4 20:52:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98580 Delivered-To: patch@linaro.org Received: by 10.140.89.200 with SMTP id v66csp806397qgd; Thu, 4 May 2017 13:52:30 -0700 (PDT) X-Received: by 10.84.231.206 with SMTP id g14mr59629463pln.152.1493931150616; Thu, 04 May 2017 13:52:30 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x7si3136031pls.89.2017.05.04.13.52.30; Thu, 04 May 2017 13:52:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751428AbdEDUw3 (ORCPT + 6 others); Thu, 4 May 2017 16:52:29 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:53820 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751453AbdEDUw2 (ORCPT ); Thu, 4 May 2017 16:52:28 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.129]) with ESMTPA (Nemesis) id 0M8u2m-1dE7Vg22kG-00C8aL; Thu, 04 May 2017 22:52:20 +0200 From: Arnd Bergmann To: gregkh@linuxfoundation.org Cc: stable@vger.kernel.org, Arnd Bergmann , "David S . Miller" Subject: [PATCH 11/13] [3.18-stable] mISDN: avoid arch specific __builtin_return_address call Date: Thu, 4 May 2017 22:52:07 +0200 Message-Id: <20170504205209.498721-12-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170504205209.498721-1-arnd@arndb.de> References: <20170504205209.498721-1-arnd@arndb.de> X-Provags-ID: V03:K0:u3kNEj5j1uLSZMxYpU3cmRdM2cEe57UOPs+LCiqOMALDLEe3ATM CaqqqpkESzfgDxScPwhD4wu2ZwlWRtL3mmBAq6uepae4tVJs7TcJHCnO3K4HpoGMYzHNkMi ur7U/j3dF9dKID5tCjfR2RKEGZ3FclNRgPtWbPveACpzsKf4b+CEI2+6lnCTioKrWXIAljn zQUkF0d2rzkiSfMSFX76w== X-UI-Out-Filterresults: notjunk:1; V01:K0:FlMaDeA2bGw=:6LEnAsPIiMIXvQpNkcK9ry j9BP63ypTClT7LEjwYOtO/fbyeCtVQLLWKdc2fq7RnYW137GoOrjoWUxUYW+YygEwtw/afARt nb6ZK31OuTWHNfkJZ5/NjUGNmeARZ8H991h+N4JYUr4A1ZFty8CWQkVWCv1/FwT0numbfcXI/ bIIHKBAj7z1vUZALYKLowchjKbEfaFUstCIW5HDJlVzs3/zDOzRh9NUEC3kRhoMhvEtfWADK9 f9THU1poR5m0BOIpvSB8x/xV93UAtcEdmRO93Iu/qSmKGk7e73RDgJfWX6UWnrYJMV8aFHy6F GZTjBz/h7girksvVk6tVjED2aVhO4inp6VNDt13QdVE+z5Hst3dJ32YbR4DtoQbG39YpZvQOr vUSe+iDR4uZ7wEvX39fwdhzp3jbNsrZNNkVBCWQahLtzuu25xZpcea9l5n0BlPuKAk9h9q9gW AC+2K+1po7V2EsxWumD5Yqxus8+MtuPfHIgbfaCPoXHfzrJtxMcTKsMsTqlr51dCw2iQAIofA LDLsalC13tM+ZMKQTJQDcXNuq1Z2buKMIezb0DHH8fgm8ov2ZzNdKBPppX1boSgzv9JeOtDRH WDzjC1Mk/ZpBNNHetY8srWKgKzCAhAFq0EdCo5ufh9KwVyuzY9ayBJkhL+lb2NKpg/Glc0pnT CQB4BpqkJBo98/baOcMG+nNKCKLFMLT0SIZt//Dt6aHP3QcYzm/aj81U6DRtayUIG6Z4= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Commit 3e7a8716e20b759eec0ad88145255bb33174f0c8 upstream. Not all architectures are able to call __builtin_return_address(). On ARM, the mISDN code produces this warning: hardware/mISDN/w6692.c: In function 'w6692_dctrl': hardware/mISDN/w6692.c:1181:75: warning: unsupported argument to '__builtin_return_address' pr_debug("%s: %s dev(%d) open from %p\n", card->name, __func__, ^ hardware/mISDN/mISDNipac.c: In function 'open_dchannel': hardware/mISDN/mISDNipac.c:759:75: warning: unsupported argument to '__builtin_return_address' pr_debug("%s: %s dev(%d) open from %p\n", isac->name, __func__, ^ In a lot of cases, this is relatively easy to work around by passing the value of __builtin_return_address(0) from the callers into the functions that want it. One exception is the indirect 'open' function call in struct isac_hw. While it would be possible to fix this as well, this patch only addresses the other callers properly and lets this one return the direct parent function, which should be good enough. Signed-off-by: Arnd Bergmann Signed-off-by: David S. Miller Signed-off-by: Arnd Bergmann --- drivers/isdn/hardware/mISDN/mISDNipac.c | 12 +++++++++--- drivers/isdn/hardware/mISDN/w6692.c | 6 +++--- 2 files changed, 12 insertions(+), 6 deletions(-) -- 2.9.0 diff --git a/drivers/isdn/hardware/mISDN/mISDNipac.c b/drivers/isdn/hardware/mISDN/mISDNipac.c index ccd7d851be26..a77eea594b69 100644 --- a/drivers/isdn/hardware/mISDN/mISDNipac.c +++ b/drivers/isdn/hardware/mISDN/mISDNipac.c @@ -754,10 +754,10 @@ dbusy_timer_handler(struct isac_hw *isac) } static int -open_dchannel(struct isac_hw *isac, struct channel_req *rq) +open_dchannel_caller(struct isac_hw *isac, struct channel_req *rq, void *caller) { pr_debug("%s: %s dev(%d) open from %p\n", isac->name, __func__, - isac->dch.dev.id, __builtin_return_address(1)); + isac->dch.dev.id, caller); if (rq->protocol != ISDN_P_TE_S0) return -EINVAL; if (rq->adr.channel == 1) @@ -771,6 +771,12 @@ open_dchannel(struct isac_hw *isac, struct channel_req *rq) return 0; } +static int +open_dchannel(struct isac_hw *isac, struct channel_req *rq) +{ + return open_dchannel_caller(isac, rq, __builtin_return_address(0)); +} + static const char *ISACVer[] = {"2086/2186 V1.1", "2085 B1", "2085 B2", "2085 V2.3"}; @@ -1548,7 +1554,7 @@ ipac_dctrl(struct mISDNchannel *ch, u32 cmd, void *arg) case OPEN_CHANNEL: rq = arg; if (rq->protocol == ISDN_P_TE_S0) - err = open_dchannel(isac, rq); + err = open_dchannel_caller(isac, rq, __builtin_return_address(0)); else err = open_bchannel(ipac, rq); if (err) diff --git a/drivers/isdn/hardware/mISDN/w6692.c b/drivers/isdn/hardware/mISDN/w6692.c index de69f6828c76..741675525b53 100644 --- a/drivers/isdn/hardware/mISDN/w6692.c +++ b/drivers/isdn/hardware/mISDN/w6692.c @@ -1176,10 +1176,10 @@ w6692_l1callback(struct dchannel *dch, u32 cmd) } static int -open_dchannel(struct w6692_hw *card, struct channel_req *rq) +open_dchannel(struct w6692_hw *card, struct channel_req *rq, void *caller) { pr_debug("%s: %s dev(%d) open from %p\n", card->name, __func__, - card->dch.dev.id, __builtin_return_address(1)); + card->dch.dev.id, caller); if (rq->protocol != ISDN_P_TE_S0) return -EINVAL; if (rq->adr.channel == 1) @@ -1207,7 +1207,7 @@ w6692_dctrl(struct mISDNchannel *ch, u32 cmd, void *arg) case OPEN_CHANNEL: rq = arg; if (rq->protocol == ISDN_P_TE_S0) - err = open_dchannel(card, rq); + err = open_dchannel(card, rq, __builtin_return_address(0)); else err = open_bchannel(card, rq); if (err)