From patchwork Mon Sep 25 01:13:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Levin, Alexander \(Sasha Levin\)" X-Patchwork-Id: 114161 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp2054449qgf; Sun, 24 Sep 2017 18:23:09 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCmOL4o1RTmSmV7stTQ3Y5xU5PELuf7TJhH4rQNwUIxlr19lF6ts7yL8U8IfkHkb9rYyvFV X-Received: by 10.84.238.135 with SMTP id v7mr6086095plk.276.1506302589909; Sun, 24 Sep 2017 18:23:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506302589; cv=none; d=google.com; s=arc-20160816; b=qWE+EvVPIG6S9wJIfgbiEVL1d/RHAOCMjHRouaOrcUwkxPa9VGD7fs2ulj/E78ikcN leQjbj9YxBbAColpHiqF+JDCsSlSM/3KtXZYicRblDtNvVknJxmxZSF4KP2TDOIih0wa gJFwlLMDpgDke8hFvBMdIUAleGwFgZptxn6JpFN3kTeFFUmlKeQUTgYZ3VmwRKPZf8g4 Y9CRDTBpJnzQVJfi/hYBN3l7bumloyvltFaA6CX54KnAXVGceqgfGFKeatVFYlYsQfF2 4UsmvGHPPysKaUr4cBGihd0/0JETFydiLMwD+B6R5dHjeMbg9ZcGJogJVn7ELZ3BpErb yMjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :content-language:accept-language:in-reply-to:references:message-id :date:thread-index:thread-topic:subject:to:dkim-signature :dkim-signature:cc:from:dkim-signature:arc-authentication-results; bh=DoQNDrHs21L2R1M+oEbKDV5xONLSiFk3Ijd1ZlacJ1A=; b=dz5BwRrLP3j5Up5iRgvjnRP1Kb2ECO9VRZFb7ld5Q03+EmIUSDGyU0Rij5TeRqZP2U PMHwBCLy/D/zE9to9LzlJvDDHzNUR3i4Yz97G9zturT71hTtWdvG5EpfFnoBG+cMc5TW N51jtiIeUZvq5nF3xd8nmJwygmmiBRm/hCZOP/hmAe7rgHHntDDcE+zXyFCFaf76VNgj ILXFHIgx6Jer7QEmrLoR7cZJFttwu0pAIkd0t1HUQzDYEOyriV3hZov9pz+IIXrXhPDe U1tMHtYWk2khikxcJDiNPiITS/fSM3hlSDJ7HXWEBj63u3kFSY7bs3EW3N4e5d/72WGs FDtA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@verizon.com header.s=corp header.b=F+/1O+2H; dkim=fail header.i=@verizon.com header.s=corp header.b=OGB0qlm8; dkim=fail header.i=@verizon.com header.s=corp header.b=OGB0qlm8; 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; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=verizon.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x11si3316186pgq.460.2017.09.24.18.23.09; Sun, 24 Sep 2017 18:23:09 -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=@verizon.com header.s=corp header.b=F+/1O+2H; dkim=fail header.i=@verizon.com header.s=corp header.b=OGB0qlm8; dkim=fail header.i=@verizon.com header.s=corp header.b=OGB0qlm8; 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; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=verizon.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753773AbdIYBXF (ORCPT + 26 others); Sun, 24 Sep 2017 21:23:05 -0400 Received: from fldsmtpe03.verizon.com ([140.108.26.142]:37517 "EHLO fldsmtpe03.verizon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933644AbdIYBOl (ORCPT ); Sun, 24 Sep 2017 21:14:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1506302081; x=1537838081; h=from:cc:to:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=+vbFhozLSgUhGP9nQxScswf3FyYEjI1PgSXROnFEFJU=; b=F+/1O+2HVqQZPJVNxZ5rGVieODJ7aatl+xOD2wRyoiSjIMWC1Jsa6qR2 TV2aRNeYgJxuJI5Q+9U8kygDuojWYstvYFyCCcNbM3HxBLimvvIx2DG+J RJ4b424ktfd5Uv6vHA7haO6QLINN6CuYAMjUD9WMHEcuwUwQc+BwO8Uwp g=; Received: from unknown (HELO fldsmtpi02.verizon.com) ([166.68.71.144]) by fldsmtpe03.verizon.com with ESMTP; 25 Sep 2017 01:14:06 +0000 From: "Levin, Alexander (Sasha Levin)" Cc: Arnd Bergmann , Guenter Roeck , "Levin, Alexander (Sasha Levin)" Received: from rogue-10-255-192-101.rogue.vzwcorp.com (HELO apollo.verizonwireless.com) ([10.255.192.101]) by fldsmtpi02.verizon.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 25 Sep 2017 01:13:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1506302034; x=1537838034; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=+vbFhozLSgUhGP9nQxScswf3FyYEjI1PgSXROnFEFJU=; b=OGB0qlm8ruFh2VLq6co+l3z5BtF67BYnRb0CdXdyab3JlMym/dZSHHI+ hip72GydWvhkcae6PaGMPUrp8bcvZrWkFvEdQMs7sVHIog2bUE58mQip0 1xrnEsPoWZzMgD202V3lmse4YE6frOqC9jQRyCciu92jBzfoOCV/QnXV3 0=; Received: from discovery.odc.vzwcorp.com (HELO mercury.verizonwireless.com) ([10.255.240.25]) by apollo.verizonwireless.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 24 Sep 2017 21:13:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1506302034; x=1537838034; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=+vbFhozLSgUhGP9nQxScswf3FyYEjI1PgSXROnFEFJU=; b=OGB0qlm8ruFh2VLq6co+l3z5BtF67BYnRb0CdXdyab3JlMym/dZSHHI+ hip72GydWvhkcae6PaGMPUrp8bcvZrWkFvEdQMs7sVHIog2bUE58mQip0 1xrnEsPoWZzMgD202V3lmse4YE6frOqC9jQRyCciu92jBzfoOCV/QnXV3 0=; X-Host: discovery.odc.vzwcorp.com Received: from casac1exh002.uswin.ad.vzwcorp.com ([10.11.218.44]) by mercury.verizonwireless.com with ESMTP/TLS/AES128-SHA256; 25 Sep 2017 01:13:53 +0000 Received: from scwexch21apd.uswin.ad.vzwcorp.com (153.114.130.40) by CASAC1EXH002.uswin.ad.vzwcorp.com (10.11.218.44) with Microsoft SMTP Server (TLS) id 14.3.248.2; Sun, 24 Sep 2017 18:13:53 -0700 Received: from OMZP1LUMXCA13.uswin.ad.vzwcorp.com (144.8.22.188) by scwexch21apd.uswin.ad.vzwcorp.com (153.114.130.40) with Microsoft SMTP Server (TLS) id 15.0.1263.5; Sun, 24 Sep 2017 18:13:52 -0700 Received: from OMZP1LUMXCA17.uswin.ad.vzwcorp.com (144.8.22.195) by OMZP1LUMXCA13.uswin.ad.vzwcorp.com (144.8.22.188) with Microsoft SMTP Server (TLS) id 15.0.1263.5; Sun, 24 Sep 2017 20:13:41 -0500 Received: from OMZP1LUMXCA17.uswin.ad.vzwcorp.com ([144.8.22.195]) by OMZP1LUMXCA17.uswin.ad.vzwcorp.com ([144.8.22.195]) with mapi id 15.00.1263.000; Sun, 24 Sep 2017 20:13:41 -0500 To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" Subject: [PATCH review for 4.4 02/26] watchdog: kempld: fix gcc-4.3 build Thread-Topic: [PATCH review for 4.4 02/26] watchdog: kempld: fix gcc-4.3 build Thread-Index: AQHTNZuBXlWfohqJH0WUbZ/k8uMBow== Date: Mon, 25 Sep 2017 01:13:34 +0000 Message-ID: <20170925011322.10133-2-alexander.levin@verizon.com> References: <20170925011322.10133-1-alexander.levin@verizon.com> In-Reply-To: <20170925011322.10133-1-alexander.levin@verizon.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [10.144.60.250] MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann [ Upstream commit 3736d4eb6af37492aeded7fec0072dedd959c842 ] gcc-4.3 can't decide whether the constant value in kempld_prescaler[PRESCALER_21] is built-time constant or not, and gets confused by the logic in do_div(): drivers/watchdog/kempld_wdt.o: In function `kempld_wdt_set_stage_timeout': kempld_wdt.c:(.text.kempld_wdt_set_stage_timeout+0x130): undefined reference to `__aeabi_uldivmod' This adds a call to ACCESS_ONCE() to force it to not consider it to be constant, and leaves the more efficient normal case in place for modern compilers, using an #ifdef to annotate why we do this hack. Signed-off-by: Arnd Bergmann Signed-off-by: Guenter Roeck Signed-off-by: Sasha Levin --- drivers/watchdog/kempld_wdt.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) -- 2.11.0 diff --git a/drivers/watchdog/kempld_wdt.c b/drivers/watchdog/kempld_wdt.c index 5bf931ce1353..978098f71761 100644 --- a/drivers/watchdog/kempld_wdt.c +++ b/drivers/watchdog/kempld_wdt.c @@ -140,12 +140,19 @@ static int kempld_wdt_set_stage_timeout(struct kempld_wdt_data *wdt_data, unsigned int timeout) { struct kempld_device_data *pld = wdt_data->pld; - u32 prescaler = kempld_prescaler[PRESCALER_21]; + u32 prescaler; u64 stage_timeout64; u32 stage_timeout; u32 remainder; u8 stage_cfg; +#if GCC_VERSION < 40400 + /* work around a bug compiling do_div() */ + prescaler = READ_ONCE(kempld_prescaler[PRESCALER_21]); +#else + prescaler = kempld_prescaler[PRESCALER_21]; +#endif + if (!stage) return -EINVAL;