From patchwork Thu Mar 8 04:57:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130958 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp6117338lja; Wed, 7 Mar 2018 22:52:36 -0800 (PST) X-Google-Smtp-Source: AG47ELt7nw6/h2VvzGaRAkhVC9f+zqV3KkTlBgJaGZxRRtj5FXuemzb9FILN/N/Pg7OOHGPvKxXK X-Received: by 2002:a17:902:b101:: with SMTP id q1-v6mr23177015plr.287.1520491956384; Wed, 07 Mar 2018 22:52:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520491956; cv=none; d=google.com; s=arc-20160816; b=Vi9NXev8qL0C1plaEQgCgWC2Fg5WaDhncWzj+Yi53lx35scpZwA1CEtFzoxCem6apT MY2e6YPkKXxNfvOJ9h1f2tcmhw23LfF9rQYSBN+4Ta5wCqvxmOQCX16CAIffXvUWp6e8 4kKe0HQkBaYgavCqw3TvRDRPpqct89ojvOYb4nwXlMGzebWOiHDMXfVjIFS3NtSLw6Ms eCqXHIrz6KLgIFTgbLc76KHoSCbMVxhdXo9+icre6llSloGQnsynI8cjqfsLK32HdTgG 4Zz6rCo3ftQQLDxb+JTfFi5HEbVILwJZyHRwmItp4LzoOCIs+4RYMXGqklTsXfqxoKzs xp1A== 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:message-id:date:thread-index:thread-topic:subject :cc:to:from:dkim-signature:arc-authentication-results; bh=ibxZ/A1vRk5ZdYwWOH0g3r7FtKrkwanG/yCsiuWOqbU=; b=aC9ihqCWIxLQvopmlG6LcNjmBjCbCXyyDkB4NI9jJnOHWobGKODRBb+WK/yBva2HR4 Yq2Jzw8bj1OiqenZxmkhm5KvwIeJjqJVdtbwRO320GqD5qJSB1pEPDk6XGG0OwrOWEFe QpZIK6u7W9v8sij+gUeplfNjj35iDFD0Ca/JbEAIdF72yoYXVQdIkJB9rXNFqHyeNgEx C0l8qQQoJmIPKKWHsKPQkvdkujEABHceDqqKeSQRF6Sx4ddnzBT9mp75t2iCG8RdFHu2 UGxATI3HqXNsnGeOAq7HjqQc94cSe63FD1kHy2xW/10j7U/i4f9G1Wdo0PAkqQxQquDE EQnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=jVDvxt/a; 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=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 c2-v6si9905358pli.388.2018.03.07.22.52.35; Wed, 07 Mar 2018 22:52:36 -0800 (PST) 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=@microsoft.com header.s=selector1 header.b=jVDvxt/a; 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=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965517AbeCHGvZ (ORCPT + 28 others); Thu, 8 Mar 2018 01:51:25 -0500 Received: from mail-sn1nam02on0119.outbound.protection.outlook.com ([104.47.36.119]:48736 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S935223AbeCHE6J (ORCPT ); Wed, 7 Mar 2018 23:58:09 -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=ibxZ/A1vRk5ZdYwWOH0g3r7FtKrkwanG/yCsiuWOqbU=; b=jVDvxt/ag8sepRo1EFuDlC3m8Fm/hr4Xy1aLlyUPKzp1NR41R+1FMqHTDBuMjJQbMPIaWVHbFmqScMbGqpE7/jPQOybJ4qlNHm6BZR1l+QZvjMQno4yansBzUCmWR/lWLWD23t8BOg5Agep1j9iVpVvo7S3eiV0mXDj8zBSwv84= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0936.namprd21.prod.outlook.com (52.132.131.166) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.588.3; Thu, 8 Mar 2018 04:58:02 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446%2]) with mapi id 15.20.0588.008; Thu, 8 Mar 2018 04:58:02 +0000 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Loic Poulain , Marcel Holtmann , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 01/67] Bluetooth: hci_qca: Avoid setup failure on missing rampatch Thread-Topic: [PATCH AUTOSEL for 4.14 01/67] Bluetooth: hci_qca: Avoid setup failure on missing rampatch Thread-Index: AQHTtpn32kyTTqIXREy0QBJ0JmxEJA== Date: Thu, 8 Mar 2018 04:57:31 +0000 Message-ID: <20180308045641.7814-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB0936; 7:tT6Zvb9166DUefR+mVRXQTSh7JbNMY4RDLZfLOEOhEsQAs1m4cY6zHrcVt8b9ruvjoZwf91WxbLVOK4Aovi5EAxg607H61jZ9GIbx1DtGy57b2IPzXU54K46v1/fntwbNonGnYW4EnPUN0JNUZWpbaB/kpfLGcs2478dIY94j2ZQLzoVJb8zHMRDJgoEtjH4UdLXSOTLol3tkTYsrQFU3dFReZe23xNoQjCrwWHtV3JG4O0ykTRBKZgwqr+B/h+Q; 20:0RpyGHNnNpzc8di4Uae4Xds9NeDvfZqYMsMurBvc6ctVRxhQvXmuqVmYarccueB9qlQk8OIhWMC8LerC8Dq6jPwju09WkYmern1QQSoMcW/mXlvGD17H/QUFrKnF8ia7gctIGTWpaKx/mSS1WetUo9Z9ICvhFvwzF6bOUS8zF3Y= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: d125231f-5e04-4f9d-c4e4-08d584b12bd9 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB0936; x-ms-traffictypediagnostic: DM5PR2101MB0936: 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:(8211001083)(61425038)(6040501)(2401047)(8121501046)(5005006)(93006095)(93001095)(3231220)(944501244)(52105095)(10201501046)(3002001)(6055026)(61426038)(61427038)(6041288)(20161123558120)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011); SRVR:DM5PR2101MB0936; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB0936; x-forefront-prvs: 060503E79B x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(979002)(366004)(396003)(39860400002)(39380400002)(346002)(376002)(199004)(189003)(478600001)(99286004)(575784001)(6506007)(3660700001)(36756003)(86362001)(54906003)(6116002)(110136005)(102836004)(1076002)(3846002)(6486002)(3280700002)(10090500001)(10290500003)(305945005)(72206003)(6436002)(6666003)(26005)(5250100002)(2906002)(186003)(2501003)(105586002)(66066001)(7736002)(68736007)(25786009)(6512007)(106356001)(86612001)(8936002)(107886003)(81166006)(2900100001)(5660300001)(4326008)(81156014)(53936002)(14454004)(97736004)(316002)(22452003)(8676002)(22906009)(217873001)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB0936; 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: xg/Ev9FhAvBwOnmf4CMjU8DjtiAmwKAJk2Fl63Rp4GWH/iU7zggSgJetiDaLhGgCttlkSOSwNu0jDsIQoZ3gCqFisIiQKDqj2M9Slas9/r5JDOwWFXwTkuc1EH20xoae30tGKHVfu9kbk+u6TOAGewc9kg6j+hnZYQHe3WWZacNUF6JMvus8qXS7++YSTFVMasjBVAHT4xyNrZQcq5M3zrc3lt/RbTpoecjo5uigfCRF8pjOFuU7lvqSPb/HkEgJlyKVwKfaET9VClLrBhb785lCqz2X+wHCRpScH5gUS7axeLrbuIsU+qpTEPrtTL1GRBj+i8yFp4fny1IAPKdCOA== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: d125231f-5e04-4f9d-c4e4-08d584b12bd9 X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Mar 2018 04:57:31.8420 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0936 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Loic Poulain [ Upstream commit ba8f3597900291a93604643017fff66a14546015 ] Assuming that the original code idea was to enable in-band sleeping only if the setup_rome method returns succes and run in 'standard' mode otherwise, we should not return setup_rome return value which makes qca_setup fail if no rampatch/nvm file found. This fixes BT issue on the dragonboard-820C p4 which includes the following QCA controller: hci0: Product:0x00000008 hci0: Patch :0x00000111 hci0: ROM :0x00000302 hci0: SOC :0x00000044 Since there is no rampatch for this controller revision, just make it work as is. Signed-off-by: Loic Poulain Signed-off-by: Marcel Holtmann Signed-off-by: Sasha Levin --- drivers/bluetooth/hci_qca.c | 3 +++ 1 file changed, 3 insertions(+) -- 2.14.1 diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c index 392f412b4575..c9f0ac083a3e 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -933,6 +933,9 @@ static int qca_setup(struct hci_uart *hu) if (!ret) { set_bit(STATE_IN_BAND_SLEEP_ENABLED, &qca->flags); qca_debugfs_init(hdev); + } else if (ret == -ENOENT) { + /* No patch/nvm-config found, run with original fw/config */ + ret = 0; } /* Setup bdaddr */ From patchwork Thu Mar 8 04:57:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130956 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp6116263lja; Wed, 7 Mar 2018 22:51:05 -0800 (PST) X-Google-Smtp-Source: AG47ELsKFvfqRGfBZfT92PFzOJewIw8EhZmvqYf/wWSOPReXBfulxuiRYV5SdDyDfJoB2qXRuYUQ X-Received: by 10.101.74.135 with SMTP id b7mr20418698pgu.260.1520491865504; Wed, 07 Mar 2018 22:51:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520491865; cv=none; d=google.com; s=arc-20160816; b=LTMRNjWhQv0qluDp2FWV7OtH/dKUi04fKMAI9ROLKT8H380J5RS8ykHh46aNzsNI1k DmWO9xYVg7naLaXPvu3E+RpFKb3ltFvFOg2tCzowemYBshLEpGympRGTZJRtU6R0vKUb JrwxpRmhGy92G0/8+nzsIDdr6Dpof3vsgjIm4AODSCzDHtjIruaRAeC74DmeAikXMezU UET4sSxDZQOb23VZO8xFPTq5qtSZfrul2JhrFghGTF9XYZL1K+XJ1PYPo4B9NwWyaSnw OFLyuS9nutH01IvMStpFsDGKoWGFki/pNT0leN+1/fiykjeYhEjwYceZ4VXq6rUH2q/e Nyxg== 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=D+/Z0cRVucYBrhPRdFtRKszMlyIWYz1bsRb6IQsIT5k=; b=QRS+Vnw07DAdS0YWN2vZ9++Z+IJBxm3bAWm0bbDpcO8Lk/nveRKa9z3V4ObGmKGPUL MJqwnHWg0kn/p7Tf7U9ygKVPpggKV97s3UUDMtgpke3kZibyzSMBlXr2/1O4cvSHwJSh FjRRSmeXCPH+MXj5LJpcI/CNR6wp61OFh5/Lbofg3K2Xv6po9ChgQwJQ9QxHmlXx9HMm +Ab+u0hgqfMt+kctawW1nreEABoJs+A7PxjAsoNzcoa9CcFw5NArzm6saAKPAm67vdyI o3V04RlYHLR5sY5nRHAg6eQGZ+VmFFMc4rXcz9X7DzT98thLRxxFyoytfKDuuS1Otk8W 9vHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=PukEOARZ; 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=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 l3si15258083pfb.377.2018.03.07.22.51.05; Wed, 07 Mar 2018 22:51:05 -0800 (PST) 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=@microsoft.com header.s=selector1 header.b=PukEOARZ; 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=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965040AbeCHGvB (ORCPT + 28 others); Thu, 8 Mar 2018 01:51:01 -0500 Received: from mail-by2nam03on0117.outbound.protection.outlook.com ([104.47.42.117]:8510 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965023AbeCHE6K (ORCPT ); Wed, 7 Mar 2018 23:58:10 -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=D+/Z0cRVucYBrhPRdFtRKszMlyIWYz1bsRb6IQsIT5k=; b=PukEOARZs2whVqpq3ZeEmtP6FWUsojdQeIpn+E1jRgpn9kyncVUG6SC16w5WWRXYfkRhrqZxB8z7+gfn+O1SgYIgqddFpAKLg4aRJI94c8vlINg/5WHnYrzCffjUerQ95MRMXJNRAkTWH/vqg01WXaeuX2GXabR3dMukzaPY1Hw= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0936.namprd21.prod.outlook.com (52.132.131.166) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.588.3; Thu, 8 Mar 2018 04:58:02 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446%2]) with mapi id 15.20.0588.008; Thu, 8 Mar 2018 04:58:02 +0000 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Loic Poulain , Marcel Holtmann , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 02/67] Bluetooth: btqcomsmd: Fix skb double free corruption Thread-Topic: [PATCH AUTOSEL for 4.14 02/67] Bluetooth: btqcomsmd: Fix skb double free corruption Thread-Index: AQHTtpn3tMkFzIjO7k6dDHfWXTkRJA== Date: Thu, 8 Mar 2018 04:57:32 +0000 Message-ID: <20180308045641.7814-2-alexander.levin@microsoft.com> References: <20180308045641.7814-1-alexander.levin@microsoft.com> In-Reply-To: <20180308045641.7814-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB0936; 20:bkP3XNSLyvxcqzT/qLdefO9/3Kfj6Me+4laeDdj9PupuDndSGU0p2+BqhpuzXBkCmhTvoDdBbUPlMm6r5jGrNy5yYlwcvljbTRKtQDnNgNTsBVjql24p27oSh7JTLoYNtG5UNRRzyfXU4E2VMF4kif0cmp48ZNbW7UV9M2E0jVc= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: f7a862e0-7d32-4d95-0f38-08d584b12c0f x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB0936; x-ms-traffictypediagnostic: DM5PR2101MB0936: 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:(8211001083)(61425038)(6040501)(2401047)(8121501046)(5005006)(93006095)(93001095)(3231220)(944501244)(52105095)(10201501046)(3002001)(6055026)(61426038)(61427038)(6041288)(20161123558120)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011); SRVR:DM5PR2101MB0936; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB0936; x-forefront-prvs: 060503E79B x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(366004)(396003)(39860400002)(39380400002)(346002)(376002)(199004)(189003)(478600001)(99286004)(575784001)(6506007)(59450400001)(3660700001)(36756003)(86362001)(54906003)(6116002)(110136005)(2950100002)(102836004)(1076002)(3846002)(6486002)(3280700002)(10090500001)(10290500003)(305945005)(72206003)(6436002)(6666003)(26005)(5250100002)(2906002)(186003)(2501003)(105586002)(76176011)(66066001)(7736002)(68736007)(25786009)(6512007)(106356001)(86612001)(8936002)(107886003)(81166006)(2900100001)(5660300001)(4326008)(81156014)(53936002)(14454004)(97736004)(316002)(22452003)(8676002)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB0936; 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: a5Eu53pdAizaCSB1AfKIJIqCVzxOqoyHXcY1jS/xP91sNmMtvpvIaX+GSJu5BLZK4cu19DpeDJ3z0tmcpPxsFkI4lXNtdeOamfUDgc1Dz5e10uiDE6lciEbeFRXrrUq2Z/h4pJLCXMCQV/5c6cZ+YCGcaKaQothpOXGKUcSjw4pBIVOZqlQ8MTSXcZOkohjQtPeMa8FeLgDYEFg5Gz7y065JyWwPxMgUxf+i2S9kw6dUJFfanwGem4YEGaxL5wcn+vamOt49dRMAyD4ImKhHB1kf4pe8mI/VI5dqGpNq0ovTy52DqHSlYsn/BdBmy8+ZRijhJUvkhYqqY2F4vwH4hA== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: f7a862e0-7d32-4d95-0f38-08d584b12c0f X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Mar 2018 04:57:32.2583 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0936 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Loic Poulain [ Upstream commit 67b8fbead4685b36d290a0ef91c6ddffc4920ec9 ] In case of hci send frame failure, skb is still owned by the caller (hci_core) and then should not be freed. This fixes crash on dragonboard-410c when sending SCO packet. skb is freed by both btqcomsmd and hci_core. Fixes: 1511cc750c3d ("Bluetooth: Introduce Qualcomm WCNSS SMD based HCI driver") Signed-off-by: Loic Poulain Signed-off-by: Marcel Holtmann Signed-off-by: Sasha Levin --- drivers/bluetooth/btqcomsmd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.14.1 diff --git a/drivers/bluetooth/btqcomsmd.c b/drivers/bluetooth/btqcomsmd.c index bd810d01538a..093fd096f0c8 100644 --- a/drivers/bluetooth/btqcomsmd.c +++ b/drivers/bluetooth/btqcomsmd.c @@ -86,7 +86,8 @@ static int btqcomsmd_send(struct hci_dev *hdev, struct sk_buff *skb) break; } - kfree_skb(skb); + if (!ret) + kfree_skb(skb); return ret; } From patchwork Thu Mar 8 04:57:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130954 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp6111266lja; Wed, 7 Mar 2018 22:44:33 -0800 (PST) X-Google-Smtp-Source: AG47ELsgzGiZKemqp0lR4MQP4+GxeZycdMnmoTdnUH74QG8F7ThicXjvLdbKLX3s7f6n8pgPC9Lj X-Received: by 2002:a17:902:aa43:: with SMTP id c3-v6mr23194572plr.357.1520491473282; Wed, 07 Mar 2018 22:44:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520491473; cv=none; d=google.com; s=arc-20160816; b=Wp+6WMWEqCg35dN5Tz2WJq4tofIDvTUmkoNuoJLka/BKxqbkZv27wiRxCy3scbzwtJ dZdkgrT8EuP06L/eOxUb0ENYSyhUYrwkG1iY08LEhfRjGUXuIqmuSyUT/AC0EulPxhZ/ PyRCFMnTT2m+42VGT5UgcFJITFv/rSaD9Kcdi7T+MGqWk0H6LPMJeV341l3jqgtqN7RF qODPsGqqQUE0WX/t31GQKI0HFUtWO8I/KFcM+H4QL1sDiKkh7I/DQcSgnGGrrTTpElb6 VEy1E62eFmxY7UcK02G3KiR4LHSFy+nzsAUnlVi1UesNMhmfCo1hx5Dg+GqmY0rqVfys d64A== 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=CfDgM3ffS9q7yBULnRbax/VLYMGu2rMpaIoCQ0XLERk=; b=e0bGMayj65HCLo0A9qkKuH0RFZNlk5mdme1dvuWqTvZ/FQ6/H7SNqpPJXOZhe8YcKU k/tbChIjGp/s04JMaSHtQTBfMAm/OqgERJWzucf4rjFlP4gARAF7ssCjjWaKlYlzo4Ys Rx0UaixBwtq5eqFlPaBa0N4Lu6tOvlJ58iNiYXkJafAfl3d7l0z7Tju33o2YrbgGC4Cv jzKLNAOQfqDYL2Jy70whkFSXpoYH5EmZjylzXl1LhnB1rwr7nT99aLxtbemBvbxdrMo/ 15YFk/NUN/OB6VH32QAJvbyANEevkS1RYZNtMQrNzt15BfoTHT6SrJY3md6Tt/jY+y6R 9f8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=BbjpEOKm; 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=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 t14si13097576pfa.170.2018.03.07.22.44.33; Wed, 07 Mar 2018 22:44:33 -0800 (PST) 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=@microsoft.com header.s=selector1 header.b=BbjpEOKm; 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=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935323AbeCHE6d (ORCPT + 28 others); Wed, 7 Mar 2018 23:58:33 -0500 Received: from mail-sn1nam02on0119.outbound.protection.outlook.com ([104.47.36.119]:48736 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965035AbeCHE6L (ORCPT ); Wed, 7 Mar 2018 23:58:11 -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=CfDgM3ffS9q7yBULnRbax/VLYMGu2rMpaIoCQ0XLERk=; b=BbjpEOKmXofmlDMPwUFQ5PgNMw6a4qTJREuwyVcyWTjc1r1E6rPVm35/9y47wKcblsJopGJpjnWT6JZDasIeUFCkQlMxHBIZ39tWqwpx9yhXcJS3xdyaj0ZFYHgqannmgYfSvifxOaQWAyORyfUFTpoi1jGpHY5MpAOixCex8do= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0936.namprd21.prod.outlook.com (52.132.131.166) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.588.3; Thu, 8 Mar 2018 04:58:03 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446%2]) with mapi id 15.20.0588.008; Thu, 8 Mar 2018 04:58:03 +0000 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Viresh Kumar , "Rafael J . Wysocki" , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 03/67] cpufreq: longhaul: Revert transition_delay_us to 200 ms Thread-Topic: [PATCH AUTOSEL for 4.14 03/67] cpufreq: longhaul: Revert transition_delay_us to 200 ms Thread-Index: AQHTtpn3xwfsJ23HnECNJ1fyWoAn9g== Date: Thu, 8 Mar 2018 04:57:32 +0000 Message-ID: <20180308045641.7814-3-alexander.levin@microsoft.com> References: <20180308045641.7814-1-alexander.levin@microsoft.com> In-Reply-To: <20180308045641.7814-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB0936; 7:N4PYFMpu9ITjk6/t1gnmGQc4xxbKSZDw5DuWVxyDSD+npIczUNZVHNcUo7P73B55iN4QP5tbsdFeBeadVwavjexWzgD/NyXOWSqIvv+7ur5pNg2LOsEsmCha7WAmjfoL3lckWL6BUxzmW+qGQ8DLmIfNbz6fmKy3H+uf2BqcaRa1WnlgFHlBU+tnuZeMN0dFwh74bhkKNfGfbOAteXgiINQ2Q4jR92n0B+MFLK4azz2fojBw/AIty/6toupAlpg0; 20:+4+czdFM67MiSJP4knfm4H8IXM8RobjsAOmP5PC15TE4eqRmadP4YiMzs8yVwqSOviQgYCi3ViF7U47EVJJDnw4gw6ENViDmRY8CfrWiD/AWcy+QB1SHua+Tqbesya73GSAeAxmKUIoleNDe9nNaIirax+qvgisaPG0Ji0pxK+w= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 42561d2a-962c-46bd-fa82-08d584b12c56 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB0936; x-ms-traffictypediagnostic: DM5PR2101MB0936: 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)(228905959029699); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040501)(2401047)(8121501046)(5005006)(93006095)(93001095)(3231220)(944501244)(52105095)(10201501046)(3002001)(6055026)(61426038)(61427038)(6041288)(20161123558120)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011); SRVR:DM5PR2101MB0936; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB0936; x-forefront-prvs: 060503E79B x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(366004)(396003)(39860400002)(39380400002)(346002)(376002)(199004)(189003)(478600001)(99286004)(575784001)(6506007)(59450400001)(3660700001)(36756003)(86362001)(54906003)(6116002)(110136005)(2950100002)(102836004)(1076002)(3846002)(6486002)(3280700002)(10090500001)(10290500003)(305945005)(72206003)(6436002)(6666003)(26005)(5250100002)(2906002)(186003)(2501003)(105586002)(76176011)(66066001)(7736002)(68736007)(25786009)(6512007)(106356001)(86612001)(8936002)(107886003)(81166006)(2900100001)(5660300001)(4326008)(81156014)(53936002)(14454004)(97736004)(316002)(22452003)(8676002)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB0936; 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: Xj9vew7cdAxHvl1Ip2T5B17PJ7wvabevldEJcG6qctlvmRHdYUo27XMsq10FhU9r9oBk9/DJUnDOub+0wPUfBPejLzj/88UMK7PppcA1wIcj2os9MANbWp4qATlKSTSPxuWYJrxCBe6mriUa3EGepAvKvWL9x9FzOsFQr6M9KU8mIeVNAwJuJ4QWJsIuuXmVFyrP8iamyvj6/YDC51OSkKgEfUPHhyOt/ScLojLUENdNXBlQcEXnYiXTkDgrHCJU6kQCEGiPsMF0TldfeB+CzQP0buk7C4bJs4EzNvEsoEolDaZsxp4KB1WCawYDBbtprj0xGtsN/PX50NiTX+d5FQ== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 42561d2a-962c-46bd-fa82-08d584b12c56 X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Mar 2018 04:57:32.6726 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0936 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Viresh Kumar [ Upstream commit 1d0d064307cbfd8546841f6e9d94d02c55e45e1e ] The commit e948bc8fbee0 ("cpufreq: Cap the default transition delay value to 10 ms") caused a regression on EPIA-M min-ITX computer where shutdown or reboot hangs occasionally with a print message like: longhaul: Warning: Timeout while waiting for idle PCI bus cpufreq: __target_index: Failed to change cpu frequency: -16 This probably happens because the cpufreq governor tries to change the frequency of the CPU faster than allowed by the hardware. Before the above commit, the default transition delay was set to 200 ms for a transition_latency of 200000 ns. Lets revert back to that transition delay value to fix it. Note that several other transition delay values were tested like 20 ms and 30 ms and none of them have resolved system hang issue completely. Fixes: e948bc8fbee0 (cpufreq: Cap the default transition delay value to 10 ms) Reported-by: Meelis Roos Suggested-by: Rafael J. Wysocki Signed-off-by: Viresh Kumar Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- drivers/cpufreq/longhaul.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.14.1 diff --git a/drivers/cpufreq/longhaul.c b/drivers/cpufreq/longhaul.c index d5e27bc7585a..859a62ea6120 100644 --- a/drivers/cpufreq/longhaul.c +++ b/drivers/cpufreq/longhaul.c @@ -894,7 +894,7 @@ static int longhaul_cpu_init(struct cpufreq_policy *policy) if ((longhaul_version != TYPE_LONGHAUL_V1) && (scale_voltage != 0)) longhaul_setup_voltagescaling(); - policy->cpuinfo.transition_latency = 200000; /* nsec */ + policy->transition_delay_us = 200000; /* usec */ return cpufreq_table_validate_and_show(policy, longhaul_table); } From patchwork Thu Mar 8 04:57:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130955 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp6114356lja; Wed, 7 Mar 2018 22:48:39 -0800 (PST) X-Google-Smtp-Source: AG47ELsNa7nhdNhw5MqRzBC7ydguG9rZME6Uy5fFotkc+VFpBS4SKC34HMg/07+POoSoBqKR70mK X-Received: by 10.98.162.26 with SMTP id m26mr25313015pff.217.1520491719483; Wed, 07 Mar 2018 22:48:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520491719; cv=none; d=google.com; s=arc-20160816; b=C+0QNFV4Lk35rgRxHihEDRcDf1IzG8NKuNEBaEwy0HN5hNHbuktybGeTCBiAPheBp9 VtEtTIwVVRTUl2l5kuR+RwmsfNCIgbaX9EsU13Bdu9Mryi/WvZYxpSeCWNVpoKT+4rKr GbzY/MEbLzMovDd8SQYY0ZEpSWaxgWvK8aDTyTZ8/ZRCYTIRFQKm3BGUxiqrqtWragdj WsM4VzSgGIcJzzW+cvP1TB6IAVveWk+Hm8UOs5UqbDKPFLo2rLKd6kCeuwTOBP/+wjOk /5MccV3vADMTmuEm8c50dt3O7UiEkhjDn+NDXWasmFKM79E6q6W+B7u96u8LzoXxyBzV KQiw== 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=AkJhVfJ1nAur6Od7PlwDuH0UJiq+I5seQQeV+TnQWkY=; b=YuY+WidE1ECsUfQokywZV/lVp8c83KGIgLkf+j4zEQhEa+2xNWJcgSqxFjbCco10to CEFwox5SSHN3YvkO/JvuHJRRWvB+seauRfztM9a92A7S13DfNMCIwJpH33Kyd9j/GbCn YEj7pApNlj8iVKe1jCUT2dXwqqi3OPKJZ7JTMAWdzH7eAn5NdNLozDtSISfxgEfvACpm 7pfH3f9ZphfA0oXArmMMJ2ZXdS3JN4os1YVzaCZ1Nl52GG7DPqpejZ9BbRQ6KpUOacMd /0lQz51GUkPNfrRujRpDqnCXVK/wKNmq3tvXSDWzanxopArFi0OySESB7zt2VGlT0jX7 B0ug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=nai6UNSw; 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=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 f89-v6si14342786plb.344.2018.03.07.22.48.39; Wed, 07 Mar 2018 22:48:39 -0800 (PST) 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=@microsoft.com header.s=selector1 header.b=nai6UNSw; 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=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965331AbeCHGse (ORCPT + 28 others); Thu, 8 Mar 2018 01:48:34 -0500 Received: from mail-by2nam03on0100.outbound.protection.outlook.com ([104.47.42.100]:51511 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965081AbeCHE6Q (ORCPT ); Wed, 7 Mar 2018 23:58: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=AkJhVfJ1nAur6Od7PlwDuH0UJiq+I5seQQeV+TnQWkY=; b=nai6UNSwzzlxoN0zECHxwxDWoBQn7H5mxk+1kBnvL3FlzTiTRS8CZlTTDhzN1QiVcnNrhwTMeXoA58pK8dNJ64MbVvj/LhiQRH1g8kU2GtCUOPfVUnRFHAQj8hL2KncXCV/TTORBIBKz4ZjxqS68igHzSjbdH70kEuwyx8HZAoI= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1080.namprd21.prod.outlook.com (52.132.130.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.588.3; Thu, 8 Mar 2018 04:58:14 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446%2]) with mapi id 15.20.0588.008; Thu, 8 Mar 2018 04:58:14 +0000 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Arnd Bergmann , Benson Leung , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 22/67] cros_ec: fix nul-termination for firmware build info Thread-Topic: [PATCH AUTOSEL for 4.14 22/67] cros_ec: fix nul-termination for firmware build info Thread-Index: AQHTtpn8NZfzmEJMo0mQQ6AKYueXJw== Date: Thu, 8 Mar 2018 04:57:41 +0000 Message-ID: <20180308045641.7814-22-alexander.levin@microsoft.com> References: <20180308045641.7814-1-alexander.levin@microsoft.com> In-Reply-To: <20180308045641.7814-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB1080; 20:eLYrs0UkF7kdJ6oUlB9WdA/nlwqEVFa59/0UInfUnHQ+tMjNsCehByHCEbRV732FjPmPb5PQYzRlMvThMvKAg2oWVQtU4mlZBV3ln/reWzqD2LAHc3yU6Po+zc1yxPTH+TLriTuYYriVWIDCeETPzyaUh9WKlVDnmMOd7LZvsD8= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 67921cd6-1585-4abe-252b-08d584b1331b x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB1080; x-ms-traffictypediagnostic: DM5PR2101MB1080: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(20558992708506)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040501)(2401047)(8121501046)(5005006)(3231220)(944501244)(52105095)(93006095)(93001095)(10201501046)(3002001)(6055026)(61426038)(61427038)(6041288)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123560045)(6072148)(201708071742011); SRVR:DM5PR2101MB1080; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1080; x-forefront-prvs: 060503E79B x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(396003)(376002)(366004)(39380400002)(346002)(39860400002)(189003)(199004)(6116002)(1076002)(5250100002)(26005)(102836004)(2501003)(3846002)(59450400001)(186003)(6506007)(25786009)(3280700002)(4326008)(2906002)(68736007)(66066001)(86612001)(3660700001)(22452003)(6486002)(6436002)(14454004)(8676002)(81166006)(2900100001)(72206003)(81156014)(8936002)(478600001)(10090500001)(105586002)(10290500003)(53936002)(6512007)(6666003)(107886003)(2950100002)(106356001)(76176011)(316002)(7736002)(86362001)(575784001)(36756003)(97736004)(54906003)(110136005)(5660300001)(99286004)(305945005)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1080; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: Y8h066lhHBk7M/vcEULl7yxZtCA4jWDszoBsN28ELDXYyT9+5QCwpEY9z7dxqr5cy+JSGFxl0KrG8JQcR/lIeOw24eRId/mWQ0poscun4Ia1ENy+p4662djOPasCxujbVHNv4Ts8L743pwcDc90GPp2/QQbaI4F3PcSfbIg1Bir/wKBfth0zJzSMOBDtdVWxwSCisofugh8ibm8K70yjgTvHNahqpVXBv/UsQLWxmhh4HGctXEXyexL/wc91SBeUUJz98QxR1rasqGmxMfYt8+Q5wAJ0sICe9jJBQRrcQ2/SvP4cPgcXbw8k/qHxvcDCbJFNSiTwrUC1kkUiWINNCw== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 67921cd6-1585-4abe-252b-08d584b1331b X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Mar 2018 04:57:41.0655 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1080 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann [ Upstream commit 50a0d71a5d20e1d3eff1d974fdc8559ad6d74892 ] As gcc-8 reports, we zero out the wrong byte: drivers/platform/chrome/cros_ec_sysfs.c: In function 'show_ec_version': drivers/platform/chrome/cros_ec_sysfs.c:190:12: error: array subscript 4294967295 is above array bounds of 'uint8_t[]' [-Werror=array-bounds] This changes the code back to what it did before changing to a zero-length array structure. Fixes: a841178445bb ("mfd: cros_ec: Use a zero-length array for command data") Signed-off-by: Arnd Bergmann Signed-off-by: Benson Leung Signed-off-by: Sasha Levin --- drivers/platform/chrome/cros_ec_sysfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.14.1 diff --git a/drivers/platform/chrome/cros_ec_sysfs.c b/drivers/platform/chrome/cros_ec_sysfs.c index f3baf9973989..24f1630a8b3f 100644 --- a/drivers/platform/chrome/cros_ec_sysfs.c +++ b/drivers/platform/chrome/cros_ec_sysfs.c @@ -187,7 +187,7 @@ static ssize_t show_ec_version(struct device *dev, count += scnprintf(buf + count, PAGE_SIZE - count, "Build info: EC error %d\n", msg->result); else { - msg->data[sizeof(msg->data) - 1] = '\0'; + msg->data[EC_HOST_PARAM_SIZE - 1] = '\0'; count += scnprintf(buf + count, PAGE_SIZE - count, "Build info: %s\n", msg->data); } From patchwork Thu Mar 8 04:57:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130953 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp6109393lja; Wed, 7 Mar 2018 22:41:58 -0800 (PST) X-Google-Smtp-Source: AG47ELu4+2G8WwKzcaTLDU4Al5e8hM+lyEyN6BYrKnuc+uPx6Hij9ub34o7IZMElRXycCQImgn+4 X-Received: by 2002:a17:902:9a08:: with SMTP id v8-v6mr15495726plp.252.1520491317899; Wed, 07 Mar 2018 22:41:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520491317; cv=none; d=google.com; s=arc-20160816; b=Wd4jFXscibcowvGEVMINgMAzS0TNGKdWEPequF2EAWH2vHIko6Wzp/M4o73pdb6FQR +6wq5KXvrO7ljZQFzBW12WUw8WVshtv32RAeCgI7ipZDP/gyCkREpcsIkdsD5oCcyoZe 7mVlP7lu10pTXEbmMaL6pzJfsy6txrMd5yyG/J+9iradaZ6IS9TjqfWdlQ0055pgawMJ MrYY0+0zXqca3USEDvk04Hp4pCDFi+2R8Nw0xY0ZAEA8p0RgPzXSnWJM/torMASwnKQg I5UsNTckZdTiifszBLPjywshXqU7Wi12luX4bKXudP6HauDNr+7DKHgpAcrUMJpAa5Fo iGOA== 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=4AokKIr66tmXAwVEyJYDUBrmRZfS6IwstzeiGnlskqc=; b=CbAbVvi89dnguII2IGHPgoLNJhw9NAEIQJb5hSJBx0iXsq0vg94fh0TXzC1GjiMfOI ktKX0vxtZv48hNuG+0qlkLl2qz/DAwd458gbwGrcV+BDMJSqCP9W0tHFaU5GUYqi5t5e JRr9h3k52shL1hUFCExy3FnaO5suaJaKb6Yjibd0I358mGEDkEWgtg9ij7CKmdcdJK2U 9KyKdQPsiC7997kkkk0BB0oucp9RGbrcr8kvktNT8pP7mad0yx86f7fdVbk9ykFbftCa bdbhvXHsRHnjuCnpnDOC+bl/qV2lmKRyRMriwIWzs39uxXU5MxLKBbfg2hwiiVU1bb84 KosQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=jYmdjRsx; 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=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 g3-v6si14808349pln.755.2018.03.07.22.41.57; Wed, 07 Mar 2018 22:41:57 -0800 (PST) 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=@microsoft.com header.s=selector1 header.b=jYmdjRsx; 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=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965276AbeCHE7D (ORCPT + 28 others); Wed, 7 Mar 2018 23:59:03 -0500 Received: from mail-co1nam03on0132.outbound.protection.outlook.com ([104.47.40.132]:62208 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S934966AbeCHE6z (ORCPT ); Wed, 7 Mar 2018 23:58:55 -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=4AokKIr66tmXAwVEyJYDUBrmRZfS6IwstzeiGnlskqc=; b=jYmdjRsxQISbRCkEqDLQh+I78Fa1s6FrtGPDnsovsqWPUzEGHv7L6+KF4m0qEX7hrlRTrfvCuZ7Mv5GFbkDaMQCDPwIlel2v/VN6tl8D/OcRe/C6cXZ9wJWjHNHolIu2g9eLxy6evm5wJjW61J8rU416TaefNMhsw+DcxLS0dqg= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0999.namprd21.prod.outlook.com (52.132.133.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.588.7; Thu, 8 Mar 2018 04:58:53 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446%2]) with mapi id 15.20.0588.008; Thu, 8 Mar 2018 04:58:53 +0000 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Jerome Brunet , "David S . Miller" , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 31/67] net: phy: meson-gxl: check phy_write return value Thread-Topic: [PATCH AUTOSEL for 4.14 31/67] net: phy: meson-gxl: check phy_write return value Thread-Index: AQHTtpn/0rpeOFkckkCFrTyhejy4jg== Date: Thu, 8 Mar 2018 04:57:45 +0000 Message-ID: <20180308045641.7814-31-alexander.levin@microsoft.com> References: <20180308045641.7814-1-alexander.levin@microsoft.com> In-Reply-To: <20180308045641.7814-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB0999; 7:+ibYY1qKdkvRtCfMEDRHcRHryI94mcyuCBLzTZBkXcAEvZ9y2XSZZtEIYqvDzCqJpPKmWJePo6JBfRea+qVBmhmxk3JsIIKjyHJWFoyqHok8fkMNtkFyPA8a3xMO9JUil9uOd/shYDMsl0z/0qCe8Dk4e/Sp9GpO2pN34j73BbD/ElPoF1gv/WUyABqCYM4eqEtlAy6k0nIMqvRerfXDSdgONUjwpphhKVyy4102IrWZ+fbhaxHe4iQagPKrdiom; 20:pKDNFZxV9hZy/+L3zGb0i2Q0ktqw0LuUgdFteJtqRLMlkPZhRXr3JjE0gyK7bWWhD0QGe0BGY5hWAheP53u/R0tAv6Hb/TAdHcIJbDWcnPsz14zCHyPRknHQlNaWj4WaswPoakYLt6K27qoDvOJsxkoWVdxu3UAuXTBXDL2kT58= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: c1d9f7e9-04e2-4593-8efd-08d584b14a19 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB0999; x-ms-traffictypediagnostic: DM5PR2101MB0999: 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:(8211001083)(61425038)(6040501)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3002001)(3231220)(944501244)(52105095)(6055026)(61426038)(61427038)(6041288)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(6072148)(201708071742011); SRVR:DM5PR2101MB0999; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB0999; x-forefront-prvs: 060503E79B x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(366004)(39860400002)(39380400002)(376002)(396003)(346002)(189003)(199004)(72206003)(3846002)(106356001)(8676002)(6116002)(1076002)(6512007)(14454004)(81156014)(66066001)(2906002)(3660700001)(478600001)(10290500003)(8936002)(6486002)(305945005)(7736002)(36756003)(2900100001)(81166006)(4326008)(25786009)(6436002)(5250100002)(105586002)(54906003)(22452003)(76176011)(5660300001)(10090500001)(110136005)(316002)(6506007)(86362001)(575784001)(186003)(2950100002)(97736004)(3280700002)(102836004)(99286004)(107886003)(59450400001)(68736007)(86612001)(53936002)(26005)(6666003)(2501003)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB0999; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: 5EUMjFWl7AfYAHde/mfO1DiZDnIFiWlDdZZfs5k58pwusuz/X+X4/I6TuHS+2ugIXd5pxCuzX3lRpV3ifEALdEjZQYK39w3tkZetldTcSBMk/ybk9Cs1nIM9jry4rlpz04upV3DzN3A0NKOwGgl9GxzixYPb1GYSQs78909pRyGM9NxBItILH0l9EaQ98cGIhmWLTmKl+HcgAsyv/CupkmkZY0tSLBPWm6Z8uKMZUbiL8diRlZasVeKjIHUrgs/gbqGXban7fcUsR9Cue5Rw2RCVOWQ6TVBJIn5zodkKm7wrVoszWhwGqTorKo7bDiu5naGMDCzrKjYtvlXKjaZIIg== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: c1d9f7e9-04e2-4593-8efd-08d584b14a19 X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Mar 2018 04:57:45.1263 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0999 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jerome Brunet [ Upstream commit 9042b46eda33ef5db3cdfc9e12b3c8cabb196141 ] Always check phy_write return values. Better to be safe than sorry Reviewed-by: Andrew Lunn Signed-off-by: Jerome Brunet Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/phy/meson-gxl.c | 50 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 12 deletions(-) -- 2.14.1 diff --git a/drivers/net/phy/meson-gxl.c b/drivers/net/phy/meson-gxl.c index 1ea69b7585d9..7ddb709f69fc 100644 --- a/drivers/net/phy/meson-gxl.c +++ b/drivers/net/phy/meson-gxl.c @@ -25,27 +25,53 @@ static int meson_gxl_config_init(struct phy_device *phydev) { + int ret; + /* Enable Analog and DSP register Bank access by */ - phy_write(phydev, 0x14, 0x0000); - phy_write(phydev, 0x14, 0x0400); - phy_write(phydev, 0x14, 0x0000); - phy_write(phydev, 0x14, 0x0400); + ret = phy_write(phydev, 0x14, 0x0000); + if (ret) + return ret; + ret = phy_write(phydev, 0x14, 0x0400); + if (ret) + return ret; + ret = phy_write(phydev, 0x14, 0x0000); + if (ret) + return ret; + ret = phy_write(phydev, 0x14, 0x0400); + if (ret) + return ret; /* Write Analog register 23 */ - phy_write(phydev, 0x17, 0x8E0D); - phy_write(phydev, 0x14, 0x4417); + ret = phy_write(phydev, 0x17, 0x8E0D); + if (ret) + return ret; + ret = phy_write(phydev, 0x14, 0x4417); + if (ret) + return ret; /* Enable fractional PLL */ - phy_write(phydev, 0x17, 0x0005); - phy_write(phydev, 0x14, 0x5C1B); + ret = phy_write(phydev, 0x17, 0x0005); + if (ret) + return ret; + ret = phy_write(phydev, 0x14, 0x5C1B); + if (ret) + return ret; /* Program fraction FR_PLL_DIV1 */ - phy_write(phydev, 0x17, 0x029A); - phy_write(phydev, 0x14, 0x5C1D); + ret = phy_write(phydev, 0x17, 0x029A); + if (ret) + return ret; + ret = phy_write(phydev, 0x14, 0x5C1D); + if (ret) + return ret; /* Program fraction FR_PLL_DIV1 */ - phy_write(phydev, 0x17, 0xAAAA); - phy_write(phydev, 0x14, 0x5C1C); + ret = phy_write(phydev, 0x17, 0xAAAA); + if (ret) + return ret; + ret = phy_write(phydev, 0x14, 0x5C1C); + if (ret) + return ret; return 0; } From patchwork Thu Mar 8 04:57:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130952 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp6108808lja; Wed, 7 Mar 2018 22:41:05 -0800 (PST) X-Google-Smtp-Source: AG47ELsJQr1cnmxHFQLdJIKOl7GBeUW9JLgyvj3JD9p5pghu0hIZVE0yFeQdRYTqg1CfAC4N9kx7 X-Received: by 10.99.119.130 with SMTP id s124mr6056491pgc.337.1520491265647; Wed, 07 Mar 2018 22:41:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520491265; cv=none; d=google.com; s=arc-20160816; b=z7VpmebpD383v2AnFiih5aag3UfymsEK7LzzHx37VzuNokbqiE3/5e3NOUucsDEaKl l7vc0bwM0R3d3AHbC7KDDx/T19RgSlCXJcYCCgvekUnKDdA09KarHl3/Eweh+tAa0TNb fqgQWNqvkT4YmQSgJuS+RTYY4HEW60K0TYdSptZsTQs6TDtULFU3RQdXdO4rlV2HB0Ox NT1/BkCJ2sAPH9trlGEtanEg9clMn4me2BLqttMEU1TUxWEEWFIhlE6SO03cZ6Zt2eeT 6cjpA2W7MmERm6Jmbp/5svCUBYELSuvOCmmOI95926HP43FePdi4RijSRbRqZtXCPXCi +sRw== 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=Wf2jXcVZOT2Z9mBzrfGCRvJb5+7RE+3B4jxCzN4Z4G8=; b=Gkd2BNU6cLy2uRtZ204J/CAf7wapIoE7kxFzy2u7tJFkBEQbkD2xalxr15MUUIZW/4 7tNlZCI8ApohM7RIxPPyjqZgXEJS2fq+u4+DtLLexPq64SarKxyFLUUDWf5tdFPTtXWx 2232gwuUBsuPSecZ3fymSImmystqdd43QuMQYcyYp46WuY/gDyq8Qv1/ky9OURVf5LHb PyRXXaZ//XLSh/LTSKqCxPQ8+JtTh5XxDtelLVG7gB4ePvjpzJLak7T7Hfqnw7Jo6Tbp 7sLy8LRzZjNnTMQOmSRly0NEQZOl20+R3e3y3+cPZBHVp50yB3JDa9K+OZHmQ1dpsc1l GdWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=VeA9e1rX; 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=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 a9si10702880pgf.172.2018.03.07.22.41.05; Wed, 07 Mar 2018 22:41:05 -0800 (PST) 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=@microsoft.com header.s=selector1 header.b=VeA9e1rX; 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=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965479AbeCHGlB (ORCPT + 28 others); Thu, 8 Mar 2018 01:41:01 -0500 Received: from mail-sn1nam01on0106.outbound.protection.outlook.com ([104.47.32.106]:14491 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S935349AbeCHE7I (ORCPT ); Wed, 7 Mar 2018 23:59:08 -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=Wf2jXcVZOT2Z9mBzrfGCRvJb5+7RE+3B4jxCzN4Z4G8=; b=VeA9e1rXv0zNTBR0nKFvMcPyRrWW949olF1KoCkJlCzdyqw1uo/hk2znxz9GGpxsF8HY4te/wxxmiUb+SsV+c54dfrxt4op/rDYBmTq21kDNDjRKzllAQ+c9EHYwjRx22JQTFR8WN7qBeehYCAPQ6USQ6vhbkmj/IBchehPIRTg= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1015.namprd21.prod.outlook.com (52.132.133.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.588.3; Thu, 8 Mar 2018 04:59:06 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446%2]) with mapi id 15.20.0588.008; Thu, 8 Mar 2018 04:59:06 +0000 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Kishon Vijay Abraham I , Lorenzo Pieralisi , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 46/67] PCI: designware-ep: Fix ->get_msi() to check MSI_EN bit Thread-Topic: [PATCH AUTOSEL for 4.14 46/67] PCI: designware-ep: Fix ->get_msi() to check MSI_EN bit Thread-Index: AQHTtpoD22YSCWqcKkGq95a3r9pRaQ== Date: Thu, 8 Mar 2018 04:57:51 +0000 Message-ID: <20180308045641.7814-46-alexander.levin@microsoft.com> References: <20180308045641.7814-1-alexander.levin@microsoft.com> In-Reply-To: <20180308045641.7814-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB1015; 7:n9f4aRxPLeHHs0Sr0Vfii0jExhhOKVOJuXgPaKWXnnLCKZYw8jL5VqY0X5ayOi6iU9EuFOPJl4tn9zNN6O4QYHZbahVS7nubXmdPcwQk7CPiPk4OizesCxzFLfrWidZzt63GJ979YmZkggigOSp7XZyqLOisryzRH27yVok7n0txVBTXk29Blpkr6F5WknjXS8XPQljaWBmBvejCn9ZIntOTzX7mESLD1c/4ks+StMfogL293zwQ8HNHXYugT94E; 20:wodZgjXzIQ+ZjTtRZvpectog2C21fwWFF9isVNFtuwO60e3wacnbX0+NTLCiRTxIX/lEiLd/jGS2YuCdyXc9RQF5lxo14ZMKlcEamXBPfS11YfP4UVX9+9OoneoyavyaxDg0meCwCgtFw1ClQdmUq26Kwp72Ruqaua78ySK3SJI= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 8397f4a7-2151-4f86-d925-08d584b15201 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB1015; x-ms-traffictypediagnostic: DM5PR2101MB1015: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(180628864354917)(31051911155226)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040501)(2401047)(8121501046)(5005006)(93006095)(93001095)(3231220)(944501244)(52105095)(10201501046)(3002001)(6055026)(61426038)(61427038)(6041288)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(6072148)(201708071742011); SRVR:DM5PR2101MB1015; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1015; x-forefront-prvs: 060503E79B x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(376002)(396003)(366004)(39860400002)(39380400002)(346002)(189003)(199004)(6116002)(53936002)(1076002)(107886003)(3846002)(3660700001)(10090500001)(6666003)(2950100002)(2906002)(6512007)(99286004)(8936002)(6486002)(76176011)(6506007)(68736007)(316002)(110136005)(81156014)(81166006)(8676002)(54906003)(3280700002)(2900100001)(6436002)(97736004)(72206003)(25786009)(10290500003)(86612001)(4326008)(305945005)(7736002)(66066001)(22452003)(478600001)(5660300001)(86362001)(575784001)(14454004)(106356001)(36756003)(102836004)(5250100002)(105586002)(26005)(2501003)(186003)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1015; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: UM7ZhY8hK0uJ8qX527m+e2DLIokQI8bLwEHoo53C3wZdTDErnUzPcTj6z5/I7vgDpKhWqWtbWdjk+RgTVtfvgHRFTCOtvcuYdEA3SCK0jWXGswAq5NHWV1R3aneLvFjVMsa/uKXgc9aMrkkSf1QmGaxzLVkmUt+sXC4GQHzeAhH7PFRSnr1OHAfYD/zivtkW6JzgSwDJPc83qJPiIvjxsLZf7x/p+cn+hIIk9cv7h7qe4bSp9RNR61BQY7YET++WMuagO/oRaF5CBhScTvn9kI4WpqF5O8pWUEduTwLgpTYCEuwEYrt7Ye1yzZiwjLTTABdxNf3V0/W0HWi7pMJkMQ== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8397f4a7-2151-4f86-d925-08d584b15201 X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Mar 2018 04:57:51.6038 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1015 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kishon Vijay Abraham I [ Upstream commit a134a457ed985dca8cce7ac4ea66129ea70eba73 ] ->get_msi() now checks MSI_EN bit in the MSI CAPABILITY register to find whether the host supports MSI instead of using the MSI ADDRESS in the MSI CAPABILITY register. This fixes the issue with the following sequence 'modprobe pci_endpoint_test' enables MSI 'rmmod pci_endpoint_test' disables MSI but MSI address (in EP's capability register) has a valid value 'modprobe pci_endpoint_test no_msi=1' - Since MSI address (in EP's capability register) has a valid value (set during the previous insertion of the module), EP thinks host supports MSI. Fixes: f8aed6ec624f ("PCI: dwc: designware: Add EP mode support") Signed-off-by: Kishon Vijay Abraham I Signed-off-by: Lorenzo Pieralisi Signed-off-by: Sasha Levin --- drivers/pci/dwc/pcie-designware-ep.c | 12 +++--------- drivers/pci/dwc/pcie-designware.h | 1 + 2 files changed, 4 insertions(+), 9 deletions(-) -- 2.14.1 diff --git a/drivers/pci/dwc/pcie-designware-ep.c b/drivers/pci/dwc/pcie-designware-ep.c index d53d5f168363..7c621877a939 100644 --- a/drivers/pci/dwc/pcie-designware-ep.c +++ b/drivers/pci/dwc/pcie-designware-ep.c @@ -197,20 +197,14 @@ static int dw_pcie_ep_map_addr(struct pci_epc *epc, phys_addr_t addr, static int dw_pcie_ep_get_msi(struct pci_epc *epc) { int val; - u32 lower_addr; - u32 upper_addr; struct dw_pcie_ep *ep = epc_get_drvdata(epc); struct dw_pcie *pci = to_dw_pcie_from_ep(ep); - val = dw_pcie_readb_dbi(pci, MSI_MESSAGE_CONTROL); - val = (val & MSI_CAP_MME_MASK) >> MSI_CAP_MME_SHIFT; - - lower_addr = dw_pcie_readl_dbi(pci, MSI_MESSAGE_ADDR_L32); - upper_addr = dw_pcie_readl_dbi(pci, MSI_MESSAGE_ADDR_U32); - - if (!(lower_addr || upper_addr)) + val = dw_pcie_readw_dbi(pci, MSI_MESSAGE_CONTROL); + if (!(val & MSI_CAP_MSI_EN_MASK)) return -EINVAL; + val = (val & MSI_CAP_MME_MASK) >> MSI_CAP_MME_SHIFT; return val; } diff --git a/drivers/pci/dwc/pcie-designware.h b/drivers/pci/dwc/pcie-designware.h index e5d9d77b778e..cb493bcae8b4 100644 --- a/drivers/pci/dwc/pcie-designware.h +++ b/drivers/pci/dwc/pcie-designware.h @@ -101,6 +101,7 @@ #define MSI_MESSAGE_CONTROL 0x52 #define MSI_CAP_MMC_SHIFT 1 #define MSI_CAP_MME_SHIFT 4 +#define MSI_CAP_MSI_EN_MASK 0x1 #define MSI_CAP_MME_MASK (7 << MSI_CAP_MME_SHIFT) #define MSI_MESSAGE_ADDR_L32 0x54 #define MSI_MESSAGE_ADDR_U32 0x58 From patchwork Thu Mar 8 04:57:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130951 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp6105821lja; Wed, 7 Mar 2018 22:37:12 -0800 (PST) X-Google-Smtp-Source: AG47ELvzLnHS3+GGJmXhrkhKQhDgpSdYOexOTbyOc25OflLPiWN8Nk8uUkT6e/W9OQQrErmymO1h X-Received: by 10.99.143.88 with SMTP id r24mr20061126pgn.160.1520491032585; Wed, 07 Mar 2018 22:37:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520491032; cv=none; d=google.com; s=arc-20160816; b=dydYujOL/oA84Kxstjvee9vUksVCXpLmV8NS092yaiFd6kDcq9kNezB0bta1QApONw tdzGqC0ZepMq/3YYZfe2CIeU490z9VbklfYBxCjlRESKNpUdKcd2VIRpu7izZqGfcSAV muY7Yv5XoTYiNFUZ2t2+Ufg7uh0OSAfAaai+R5l0JULhQoVDlqRhDk52Ufr4W5spNzBn agO5DEV19lpE4fOByxfANsIOvmNWqppV27Bwi0EqwhhlmYRFM/Mf7VadNlAM1gDfwsnZ 099gXHC+m7mdxwNHfeYJ6D9DMGXiLg2QCF5BIERYXDSIhg8qN5M6GDT8ycqkgpBUgzlc 9okg== 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=lxHH5KEboN7OSE1SCiclVsrt9zM0LJ/t0+Y9r58nrvI=; b=ZDWk4uu0pcn2tJ4j0WjhW/PceQLSEcsf888HMH+BfCZTpj4vYZZ6iKsMRiQdRaUMO2 mHfyhqxRbDYtvNMDOONmEq0/F63wIZkuKA6u8OFfGcbT2AILtXE2w6gq25fPwD3ucAjD B0KRTW7J+gR1zYVc4fAt4gwu+ismAxrTYVsCvqzYpPa2SsYwzKTx1CzX1omTSQ1kzokh bGz7XXK1abTHBzu//U7gf7DrdS3hYqiw7BKt+pzG1tBVGcyUF2oq+BOwzQ0TcznPbgAk 3/CZA6WyznEmnx2oZt+fWdAZLVVIvtKHjtUBAvraC+fmCx28OerNvh6J2a+kv5G6DZXj h48Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=V0DTVDVi; 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=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 y131si15209870pfg.44.2018.03.07.22.37.12; Wed, 07 Mar 2018 22:37:12 -0800 (PST) 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=@microsoft.com header.s=selector1 header.b=V0DTVDVi; 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=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755555AbeCHGhJ (ORCPT + 28 others); Thu, 8 Mar 2018 01:37:09 -0500 Received: from mail-co1nam03on0126.outbound.protection.outlook.com ([104.47.40.126]:14720 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965365AbeCHE7S (ORCPT ); Wed, 7 Mar 2018 23:59:18 -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=lxHH5KEboN7OSE1SCiclVsrt9zM0LJ/t0+Y9r58nrvI=; b=V0DTVDVi16cr/HUDGK4QfdwQRZGLFF3GPKNtmEFoZAoitPNZN8ppKuVVNe1kyBPrqQkXysM3yHt4RAyfbXEUcdfTRQuAz3qnLADOt2NNy/SoVw1atGdKk5mQUEqFQG8wlaPOn5d2o/iXLk5r8fw/GGihtoPU6Of5CEO5X0BYezw= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0999.namprd21.prod.outlook.com (52.132.133.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.588.7; Thu, 8 Mar 2018 04:59:13 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446%2]) with mapi id 15.20.0588.008; Thu, 8 Mar 2018 04:59:13 +0000 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Joel Stanley , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 60/67] ARM: dts: aspeed-evb: Add unit name to memory node Thread-Topic: [PATCH AUTOSEL for 4.14 60/67] ARM: dts: aspeed-evb: Add unit name to memory node Thread-Index: AQHTtpoHDIWDmkjook2W2Xwau3m8MQ== Date: Thu, 8 Mar 2018 04:57:58 +0000 Message-ID: <20180308045641.7814-60-alexander.levin@microsoft.com> References: <20180308045641.7814-1-alexander.levin@microsoft.com> In-Reply-To: <20180308045641.7814-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB0999; 7:mg9EecrcC2vAukIIJTz/7z6SYxyB8IUw+cdIGvYejxjlSznnkpC2E99OoCiEFeXOzVfekEgh7BeB5DpjKdKeIFYHc+y2Ta/Zkm0ePmHqwJhZ4fTioiCtpEY45XE3KR9uQtqSFjyuxxVx4qWcglXglY+Ov6qPJzMMPRZ6vvW6E1P+W6jBgc13fDQG/AgtZoM9+HHot80dYOz4wTuNjaXbvsOabOYrJKNbn1FgGrtC1untnEvj+wiPgT7+VruqqbwH; 20:6p7D3rvJTJ7E5ppiTVtnULQ//hhuE+Bbit51EG/Xv2VxNPQaOb/QOdSp9SU4IdbRpUPiJc3vnZClHe/GqWVFt3EJjZ2tGnCOYfwip3Zh7wxdFFTfyitHcCqaEyamHOOSRdkQbsb9J68eIToqbaD1/VyClVaj7M+AZjbyeJCgJCE= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: e871f0bc-ad9a-4c82-ea14-08d584b15614 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB0999; x-ms-traffictypediagnostic: DM5PR2101MB0999: 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:(8211001083)(61425038)(6040501)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3002001)(3231220)(944501244)(52105095)(6055026)(61426038)(61427038)(6041288)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(6072148)(201708071742011); SRVR:DM5PR2101MB0999; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB0999; x-forefront-prvs: 060503E79B x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(366004)(39860400002)(39380400002)(376002)(396003)(346002)(189003)(199004)(72206003)(3846002)(106356001)(8676002)(6116002)(1076002)(6512007)(14454004)(81156014)(66066001)(2906002)(3660700001)(478600001)(10290500003)(8936002)(6486002)(305945005)(7736002)(36756003)(2900100001)(81166006)(4326008)(25786009)(6436002)(5250100002)(105586002)(54906003)(22452003)(76176011)(5660300001)(10090500001)(110136005)(316002)(6506007)(86362001)(186003)(2950100002)(97736004)(3280700002)(102836004)(99286004)(107886003)(59450400001)(68736007)(86612001)(53936002)(26005)(6666003)(2501003)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB0999; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: kJ2LYxKECRo0oAWASzSvG+6/UnFA1Sr6/IVMaibAWjVir2/joWoW/T25hk8SjdtgirMz/8Ylhgbk2orCX7FE9gf68rOikeo6lmhAEF2DW1WlJPIHNcyHguyXNAJ9xd3y3iGrA9QFQtcesLTFtbm4Wi5cJ/BxtE5xOvabnwdmQXNbRKmG2gcAKHT7FO+EYpXCDYduh5uT+M0nsZJVb6fq9oaY5ni+iQ7bCmto3wgAwbMG5gtM8wVSUZAtXCUyyYTRfwcot95L/rkxXfWxE1qNs9PbDJKANUfirnsKXL17Gd6uI1mPOGktBxZAbW3151eo58ntlB2eKxvygQSbM9orBw== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: e871f0bc-ad9a-4c82-ea14-08d584b15614 X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Mar 2018 04:57:58.6077 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0999 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Joel Stanley [ Upstream commit e40ed274489a5f516da120186578eb379b452ac6 ] Fixes a warning when building with W=1. All of the ASPEED device trees build without warnings now. Signed-off-by: Joel Stanley Signed-off-by: Sasha Levin --- arch/arm/boot/dts/aspeed-ast2500-evb.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.14.1 diff --git a/arch/arm/boot/dts/aspeed-ast2500-evb.dts b/arch/arm/boot/dts/aspeed-ast2500-evb.dts index f53e89d63477..c971cc93f42d 100644 --- a/arch/arm/boot/dts/aspeed-ast2500-evb.dts +++ b/arch/arm/boot/dts/aspeed-ast2500-evb.dts @@ -16,7 +16,7 @@ bootargs = "console=ttyS4,115200 earlyprintk"; }; - memory { + memory@80000000 { reg = <0x80000000 0x20000000>; }; };