From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 04DFAECE563 for ; Mon, 17 Sep 2018 03:07:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A2DDD214C2 for ; Mon, 17 Sep 2018 03:07:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=microsoft.com header.i=@microsoft.com header.b="kFNidDzj" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A2DDD214C2 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=microsoft.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731102AbeIQIcS (ORCPT ); Mon, 17 Sep 2018 04:32:18 -0400 Received: from mail-cys01nam02on0126.outbound.protection.outlook.com ([104.47.37.126]:15104 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729631AbeIQIb6 (ORCPT ); Mon, 17 Sep 2018 04:31:58 -0400 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:X-MS-Exchange-SenderADCheck; bh=Y+YUT/I62FRRTSTCAp+jzilbOTQBz2n2Bk6JmRiTjYc=; b=kFNidDzjLbswO5gN5XBOs1dQzTXFNKs+49wg0eJipqYQXUeGIi2z1viPlnXKZit2QC4RzTWa19asfcc8JYYbU0VXJ5rTDs8JV9fQ9tBxVYYX6HkFVlZ2yF08bCi0qD0Vc7LIJ4pXx7xKDYe/fPk1divqKJLL8RrEblym17M4uW4= Received: from CY4PR21MB0776.namprd21.prod.outlook.com (10.173.192.22) by CY4PR21MB0742.namprd21.prod.outlook.com (10.173.189.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.6; Mon, 17 Sep 2018 03:06:24 +0000 Received: from CY4PR21MB0776.namprd21.prod.outlook.com ([fe80::54e2:88e0:b622:b36]) by CY4PR21MB0776.namprd21.prod.outlook.com ([fe80::54e2:88e0:b622:b36%5]) with mapi id 15.20.1185.003; Mon, 17 Sep 2018 03:06:24 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Shivasharan S , "Martin K . Petersen" , Sasha Levin Subject: [PATCH AUTOSEL 4.9 50/57] scsi: megaraid_sas: Update controller info during resume Thread-Topic: [PATCH AUTOSEL 4.9 50/57] scsi: megaraid_sas: Update controller info during resume Thread-Index: AQHUTjMdiLdXRmRUi0y9YL5FcQqquA== Date: Mon, 17 Sep 2018 03:04:14 +0000 Message-ID: <20180917030340.378-50-alexander.levin@microsoft.com> References: <20180917030340.378-1-alexander.levin@microsoft.com> In-Reply-To: <20180917030340.378-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;CY4PR21MB0742;6:LErh09CZPQKsmPt3qWKGrwndoDVPLpNjtNakvyko3cW1S1UXSyi8bpvyt0GlSYdARxhSV+DkDjYXqVao6sfJ4dDl3gVwgw/UKnZ3h9q9JiUwVjE4Co9ZDYme0sC5WOqMrTqbmT7Igls66CEu0BsATeEW8K7pCGJHc3lEQGOeQqW3Zsbghe1ct0yKWFITWypYemao13rcKUo9nR/R8otsmlBn1JFPzaR95rSOvLlTo+NjJ6bSx0wdfV9DOpSsqi6TLePJfLLUJ7Z+BcWqb6N3pUbQCCFIEBaz2ueqtcb4yTOUe0sf56gHWlmsvGxh7KXPztbOv4ItS5ez+ITC2sUhHrl8Gqf2Jzrze8SYwrYqYseF41Mytr3dOA6yPuEBN69m8/pzrZCjzB9FpIdyy0tkthh5KNnrPDPKAZFCKEBrgZ3bI42Unjcl8UlCdKKjXDP3Qh74tusfpgHlyUnDVdthkQ==;5:W6dqSXcoLmb4GVqeYy3YcNZEumMrkoRbgmPunBBmx0csjRkiNJnwpUnFE/5qDs3XNk+eqhnFfvP7Bu/PIrcSvWYPLbSBhpeuwY32JCwebf8Vmhf2aonRH0WP9/9cDongRW8G6hjZOG5b2IyvJTBcuEFdzmq/ctWjOpCbK/Wi1q4=;7:DRHOf+Rg8Mps7zj/fN2XembJgGBNEj3xqIRq9+yUZJ03yN+aY/HeXoOgXti5fahuPRHVH2ouKbveMQYL+299RIiFrOUWmJodSUAIpnAnYvhMeiq5568USaa3LIySGTICQwo+E0jIVA+PGhIATWJYCBIJLMOALFAMXuqlllFVLp2+WFApyKxFjNrpkcNHt6z4CQxF7ozglNaIlfCSTtG7aHQTKr3mDKyTBp4mHEEXZHAXrNRS+YI4TuF0zgwabfRu x-ms-office365-filtering-correlation-id: 1967062f-439d-4ecc-13dc-08d61c4a8d69 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7193020);SRVR:CY4PR21MB0742; x-ms-traffictypediagnostic: CY4PR21MB0742: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(208715162771679)(146099531331640)(28532068793085)(89211679590171); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(10201501046)(3002001)(3231355)(944501410)(52105095)(2018427008)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(201708071742011)(7699050)(76991041);SRVR:CY4PR21MB0742;BCL:0;PCL:0;RULEID:;SRVR:CY4PR21MB0742; x-forefront-prvs: 0798146F16 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(39860400002)(136003)(346002)(366004)(396003)(376002)(199004)(189003)(6486002)(6436002)(6512007)(53936002)(15650500001)(4326008)(3846002)(217873002)(25786009)(2616005)(1076002)(14444005)(6506007)(186003)(6346003)(11346002)(446003)(26005)(2900100001)(6116002)(486006)(102836004)(256004)(107886003)(476003)(86612001)(86362001)(2501003)(14454004)(97736004)(66066001)(76176011)(6666003)(316002)(54906003)(110136005)(99286004)(68736007)(10090500001)(22452003)(81156014)(2906002)(36756003)(8676002)(8936002)(81166006)(7736002)(305945005)(105586002)(5660300001)(106356001)(10290500003)(478600001)(72206003)(5250100002);DIR:OUT;SFP:1102;SCL:1;SRVR:CY4PR21MB0742;H:CY4PR21MB0776.namprd21.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: siuQZdCH9nMhDqcx+LcoTovukDZvFGQlHl9V5NJb2gsFRQejq4eh7TAkgSv1F3175TjBPUdLcVu9wAm7fT4JNOfTol2RBwZoeDH5rGTk8rPudfwKuTV7PcJEpRUH6Vkzc1RglUwaO4zGaL3dOx82X5KTTYnmI/JgM8BlPTRDwqq9BGFqWvJVclgQ2JQ2I3n4UZZ63f9YAcvQ3aAmmYdY8zVl5wGptzc7af1GNUJQ/LOuXQBjoA2JD55N/I3uAfWQdKCsVWOi22fpuHQfn+yJQDwiR3Dp7N6kWAF0mwgzTH0h881DZIe89A/nlpefd5Ey5eEZ1Xg5owCEb0iH/fwnyyK1Y92LHKdnKXZTKb6JRLg= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1967062f-439d-4ecc-13dc-08d61c4a8d69 X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Sep 2018 03:04:14.1801 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR21MB0742 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Shivasharan S [ Upstream commit c3b10a55abc943a526aaecd7e860b15671beb906 ] There is a possibility that firmware on the controller was upgraded before system was suspended. During resume, driver needs to read updated controller properties. Signed-off-by: Shivasharan S Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/megaraid/megaraid_sas_base.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megar= aid/megaraid_sas_base.c index 35cbd36f8d3b..090fdcdd15c9 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c @@ -6193,6 +6193,9 @@ megasas_resume(struct pci_dev *pdev) goto fail_init_mfi; } =20 + if (megasas_get_ctrl_info(instance) !=3D DCMD_SUCCESS) + goto fail_init_mfi; + tasklet_init(&instance->isr_tasklet, instance->instancet->tasklet, (unsigned long)instance); =20 --=20 2.17.1