From patchwork Thu Jan 18 21:02:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 125049 Delivered-To: patch@linaro.org Received: by 10.46.64.27 with SMTP id n27csp297845lja; Thu, 18 Jan 2018 13:08:03 -0800 (PST) X-Google-Smtp-Source: ACJfBoux077ARoTVgZPjwklqLr0cYU7rZUrrjv1KzO3yaMb5isNGxTDy2kUCm2RIhztVMpHdKgdL X-Received: by 2002:a17:902:7883:: with SMTP id q3-v6mr415154pll.5.1516309683029; Thu, 18 Jan 2018 13:08:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516309683; cv=none; d=google.com; s=arc-20160816; b=bqEQHCDbKFeau7DQg6eEJWHHf2Dgen3cFYFjBdkkJBIAJ9wG9/KJ94AiDIVk51eZCr h3cXfLDtKfOSvtp9dRgY3X4s5Hr5R3F2qhJV8C/z7ElhiJc7OhK1U2gzFNAiaztgD5eV ZhnOS/XP0v3Q3M/2YlGiYUU4kKwGJAozd2Yq0/YdK4xHSm0FHfXEPA2iIO3oQMjelyuN tFDtogCP+0KmBvqdrMqYsUZizox7URZ4R7pXbYGoSxFbPjN8jqcwTxComCYs+AwNnMzz K6u8x/AVrsWJOipCq5edk3tjxRxsahK9ih9u07iqsewU50ohLV3nVs/j2orWvYXwPpzK gGsw== 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 :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=fIaYUb66cgEzole0zxZ5WQEjWCIvGqBhbHBFi3ES7Wc=; b=0bPML1aWvKoEFJRZjgruTXfdCOiOZoOvtxL3ZEMmlZLB6UAKH4mM5VcOyZTn2rAN4O mYgG+lLEwdbeGWuLI1d85fX93EbYYxjtb1oNbBE8XlYvKFJgluf2L6DljljuWaRDPZrs pdOrnZjD3I1pJ9X2JDwkj1OnDEgRbK1SWbggveNk2TrX4e+61C4eyLvlp1HO7kmUzt1a tRb0Eh82smsfngtI4FUNv/JhwGmKHEvD7mIQWtTVCS7tCsxCgkaZhF+Fy5aJyC1KK7Gb 3ORJlQuNVfqvldXZU8zVrB8/iUd+y2QUfsxLyjF5lqe/IPDPTFyYVQO2FvVhsa8FxyAg B/EA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=Boeaps+S; 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; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i1si6559673pgq.829.2018.01.18.13.08.02; Thu, 18 Jan 2018 13:08:03 -0800 (PST) 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; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=Boeaps+S; 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; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932716AbeARVH7 (ORCPT + 10 others); Thu, 18 Jan 2018 16:07:59 -0500 Received: from mail-co1nam03on0096.outbound.protection.outlook.com ([104.47.40.96]:4313 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753956AbeARVHQ (ORCPT ); Thu, 18 Jan 2018 16:07:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=fIaYUb66cgEzole0zxZ5WQEjWCIvGqBhbHBFi3ES7Wc=; b=Boeaps+SSboWMeKwIU9wN/wnxsqBC9xX1+Y2nDhG3BZ+c+34VRA4Dnu6bklFFTaFybBwb2r1q4ctpjNOyf/B/q9Z8sao1CzTP1RA3sSmwSlCE51wb6JnWE+6klX7ahIw/mmIfof1++xWV8N7C4HePAG0KpsXUhFxLP6yb2V5hfU= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0885.namprd21.prod.outlook.com (52.132.132.154) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.428.9; Thu, 18 Jan 2018 21:07:09 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::6485:b98:d15e:9da7]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::6485:b98:d15e:9da7%2]) with mapi id 15.20.0428.008; Thu, 18 Jan 2018 21:07:09 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "stable-commits@vger.kernel.org" CC: Arnd Bergmann , "David S . Miller" , Sasha Levin Subject: [added to the 4.1 stable tree] irda: fix overly long udelay() Thread-Topic: [added to the 4.1 stable tree] irda: fix overly long udelay() Thread-Index: AQHTkJ+WWO98tWbXFk24jYwEvgQ52w== Date: Thu, 18 Jan 2018 21:02:01 +0000 Message-ID: <20180118205908.3220-293-alexander.levin@microsoft.com> References: <20180118205908.3220-1-alexander.levin@microsoft.com> In-Reply-To: <20180118205908.3220-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [167.220.60.9] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB0885; 7:8FJtrgdnAT6tgL13Ar63NJL87gjBbSy6sJh5um4VncQjtsMrDLMnn1yMQ6d82wZ6EGn8n+tOjsITa6FYIygS70jbITmhU2WPROJbgZjuA9Mm9fHyKVbYnjhjVFjIuppmTwcGn/JWMLb7oF0BcQU33S3FHEP6/SVBovaTyOnl4BNjQEDDpK7jnLM4srLOeBL5tYiDCwKJxmMIob8dtVlbeZuTHWsDL++jMSgTVe8nyoDjWqci0kh7arSQJux7hTgw x-ms-office365-filtering-correlation-id: 57cf3b87-618a-412c-4dae-08d55eb76fef x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(3008032)(4534125)(4602075)(4627221)(201703031133081)(201702281549075)(48565401081)(2017052603307)(7193020); SRVR:DM5PR2101MB0885; x-ms-traffictypediagnostic: DM5PR2101MB0885: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(61425038)(6040495)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(10201501046)(3231046)(2400067)(944501161)(6055026)(61426038)(61427038)(6041282)(20161123564045)(20161123558120)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011); SRVR:DM5PR2101MB0885; BCL:0; PCL:0; RULEID:(100000803126)(100110400120); SRVR:DM5PR2101MB0885; x-forefront-prvs: 05568D1FF7 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(979002)(396003)(346002)(39860400002)(39380400002)(376002)(366004)(199004)(189003)(316002)(76176011)(106356001)(8676002)(8936002)(3660700001)(6506007)(25786009)(105586002)(14454004)(68736007)(3280700002)(36756003)(2501003)(110136005)(54906003)(81166006)(81156014)(5250100002)(6486002)(26005)(305945005)(7736002)(478600001)(99286004)(102836004)(6666003)(2950100002)(59450400001)(66066001)(3846002)(10090500001)(22452003)(86612001)(2906002)(1076002)(10290500003)(5660300001)(6116002)(575784001)(86362001)(2900100001)(107886003)(6512007)(6436002)(97736004)(4326008)(53936002)(72206003)(22906009)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB0885; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: TjUff4KOrtDUEfqcQw6n5pd73hW0Drt6DM76n9ri3A5YZ8Z4qmwCxMwnPZp971bf54OKebT82cEY5plKHYS68w== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 57cf3b87-618a-412c-4dae-08d55eb76fef X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Jan 2018 21:02:01.7423 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0885 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann This patch has been added to the stable tree. If you have any objections, please let us know. -- 2.11.0 =============== [ Upstream commit c9bd28233b6d0d82ac3ba0215723be0a8262c39c ] irda_get_mtt() returns a hardcoded '10000' in some cases, and with gcc-7, we get a build error because this triggers a compile-time check in udelay(): drivers/net/irda/w83977af_ir.o: In function `w83977af_hard_xmit': w83977af_ir.c:(.text.w83977af_hard_xmit+0x14c): undefined reference to `__bad_udelay' Older compilers did not run into this because they either did not completely inline the irda_get_mtt() or did not consider the 10000 value a constant expression. The code has been wrong since the start of git history. Signed-off-by: Arnd Bergmann Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/irda/w83977af_ir.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/irda/w83977af_ir.c b/drivers/net/irda/w83977af_ir.c index 4e3d2e7c697c..e8c3a8c32534 100644 --- a/drivers/net/irda/w83977af_ir.c +++ b/drivers/net/irda/w83977af_ir.c @@ -518,7 +518,9 @@ static netdev_tx_t w83977af_hard_xmit(struct sk_buff *skb, mtt = irda_get_mtt(skb); pr_debug("%s(%ld), mtt=%d\n", __func__ , jiffies, mtt); - if (mtt) + if (mtt > 1000) + mdelay(mtt/1000); + else if (mtt) udelay(mtt); /* Enable DMA interrupt */