From patchwork Tue Jun 5 01:46:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rex Zhu X-Patchwork-Id: 925279 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="iUni1oh+"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 410F7D44Plz9rxs for ; Tue, 5 Jun 2018 11:47:52 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751303AbeFEBrv (ORCPT ); Mon, 4 Jun 2018 21:47:51 -0400 Received: from mail-co1nam03on0040.outbound.protection.outlook.com ([104.47.40.40]:23119 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750899AbeFEBru (ORCPT ); Mon, 4 Jun 2018 21:47:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fulZfjAAN01DPGH8cIDzMb1GPBXXOxIPkHZT8CVZdYg=; b=iUni1oh+dmPpgURv2A7NJ7VPk5S+gWJ683o0j51Psu27kBScNarkZrNb3/Qtq62BawWCnMYxopzKINOy10jk1f0MGSy8iRtPxGkppug/4cVlTwFHc/0HhoyryMvcb2qNfXo4aYgkfy5t2sQlD2Oe1e1eX1RR2GRao/9KnqNq9Q0= Received: from MWHPR12CA0057.namprd12.prod.outlook.com (2603:10b6:300:103::19) by DM5PR12MB2422.namprd12.prod.outlook.com (2603:10b6:4:b4::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.841.13; Tue, 5 Jun 2018 01:47:48 +0000 Received: from CO1NAM03FT033.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e48::200) by MWHPR12CA0057.outlook.office365.com (2603:10b6:300:103::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.776.11 via Frontend Transport; Tue, 5 Jun 2018 01:47:48 +0000 Authentication-Results: spf=none (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=permerror action=none header.from=amd.com; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV01.amd.com (165.204.84.17) by CO1NAM03FT033.mail.protection.outlook.com (10.152.80.175) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.841.10 via Frontend Transport; Tue, 5 Jun 2018 01:47:48 +0000 Received: from rexzhu.amd.com (10.34.1.3) by SATLEXCHOV01.amd.com (10.181.40.71) with Microsoft SMTP Server id 14.3.382.0; Mon, 4 Jun 2018 20:47:47 -0500 From: Rex Zhu To: , , , CC: Rex Zhu Subject: [PATCH 2/2] PCI: Add check code for last image indicator not set Date: Tue, 5 Jun 2018 09:46:46 +0800 Message-ID: <1528163206-4136-2-git-send-email-Rex.Zhu@amd.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1528163206-4136-1-git-send-email-Rex.Zhu@amd.com> References: <1528163206-4136-1-git-send-email-Rex.Zhu@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:165.204.84.17; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(39380400002)(39860400002)(396003)(376002)(346002)(2980300002)(428003)(189003)(199004)(305945005)(4326008)(97736004)(5660300001)(356003)(68736007)(316002)(8676002)(16586007)(81156014)(47776003)(186003)(77096007)(26005)(486006)(476003)(126002)(2616005)(104016004)(11346002)(2906002)(446003)(106466001)(86362001)(51416003)(105586002)(76176011)(2201001)(50466002)(426003)(53416004)(48376002)(81166006)(110136005)(50226002)(478600001)(7696005)(336012)(8936002)(72206003)(36756003)(53936002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR12MB2422; H:SATLEXCHOV01.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: 1; CO1NAM03FT033; 1:LYCraNjd5rg7o+EuGBv8MKbEYxaHQ25UMiN785OMZkAk8Y0FmTiuik96t0FhVwfv0kek+W7yfEt+QwkX5ke/uLdMtwC959BMEHJ4wjn/wfY6/e79D3tpuve1afiX+/zT X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060); SRVR:DM5PR12MB2422; X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2422; 3:rO3csZwlKDScrhzmnrCQoZdmbYxKX5vXgeV8B9PPPjxBh/tk/UwOvPrOixzoSoE+uwShz6he80eAmA4u0hw7xL4uHEIt0adq/pZq0aftBAJlnGxH2oPxURHNgIGqgRWkzE8DSEGQishEpvaDF494QmOywFYZ82x53cgGi0NwkxLKc+BSoIMMf9GyDa9hqNcjTkcpsincOQoZ97B6gqyRGiEiD3TiehF9gT8561tCf/drWV/wuPk+CyS120Wa2yLzsm93uXh9iBsTXzzw3EE0cja2jkOQVlSdHwmpPE2fZiasjUUrJQONnprjS+MYJkH0Lb7ysoKwoauSYHsIXNTm47JhYfg+0mmEllZgE0nUpZ0=; 25:OU7u1NeCglKJu1FY4KmbcySHXr2aQUn4xu6J9xZkVHQj7BVralm53iqoaPDwNodLZfXl/1twz3amw00bP/oaj6Ky15V0+K9ObjBh/5wG8/gtO5HgE5pSH8G+2/UlQQtRH0GX5CZa9ob7VECZvGSxFe/JgQr82OUKhzLyaYwDhscySwUEeRoPWenCH9IK9RIX1vYbRvb+JqqTlKnB4BbJeVjP+qGS4iSMheIZsWoCuoJ3yl4QpznGV6tRfwel6Xab1NOjFCRuhMbTBE20UkihlTaYaGm9i1nynfzS/T/xTvep2cGhtoZtHGwVPh3Co2WVCUDm57hNhymOVe+NKGyEhg== X-MS-TrafficTypeDiagnostic: DM5PR12MB2422: X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2422; 31:q+Csdy0lrCljKRuM5Ikf962TYdkgGKZw8IKC5o5tmfH9fiMLkcQhXjzzTu/epIRO8OwIldhoFek0hq8/KLz++AWOdH7WaXcMz3DmVmCJK/lsa4NTXIUMef+dPijH5lu5eR8Cn8BGxuYdam4jK2JN2vCzHqSyAPrlVndY7+FStyGI8krELGbqeZu8Ezzt79FjGFA5qOhG9YphS5ubDAVSrrmnq83/bd0xvwkWe9eIWvs=; 20:BgNaNa7pY6uL1Riar8L7K8iH3NTTGZE+dt5ixj0TIjf3qI9HCf369TJCRgsIbiNJdot7/5XQlCZuttkfuXPgYaM+caq/pRYcfOoep28ZGYQg0wCJUzrqBej6YvWPimQ8AuCMtGIQ+xaavUZdLrCP1dm5V1qo5j0Ocb35fo4iObIWwknwXGe8A/JkqJvQRlzeQqT/ughSSZsHNUjR7awIObccCpzV5PwcmOQ8s3LZldjuBYR8MGJyv3CqSt9vyRYg+dAtnBVXEaRvnvt8tgK1PzgC5EybU4INhBpO2/hFZY0n5/hO/H87PrK6/tzuBe05Lcc04iI/hROWk4/6fmPYbcHuMUvo6lZAgwjJd+5q36NNXvnJ9Cd0cd6LPFQ6LkJ2iBTmcPu87FfZT++4wZwEYDbof526MQArkcR0zDnhDzt7WwCvDWuHTATuTkzYLejqGHu3IuzeVPZSkIOoZ0Ebqgwrj1iDITdEUJ0G1sOLFW5TUX8y1HgAM3SD0QuySLET X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231254)(944501410)(52105095)(93006095)(93003095)(10201501046)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:DM5PR12MB2422; BCL:0; PCL:0; RULEID:; SRVR:DM5PR12MB2422; X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2422; 4:XqArN0sfqnr533RMWySTyA16sUR7fv0HKAKOCzRL3zbO/q+OVgTqnAekWrC2nyfHMyS8WpTf8A9C/1lz69vLoL3sVHL+QXBFX8CQzzGOssEARW5U2ua+Jwf7mlsaAenWTLWYbXyS0UexJDu+0Xj5BOS3hMkEKDGB/Gby424HKy4MF+8aCrwWOMnJz3SUYFd9BO69EHk8/52trkndiH+Nh1HxnKLzv5ScMl/JvCR5OaRJWGY45OROABGK+i9wkO6FjX2bBsmqUacAQJWUECnBTHh7ctlSPK9XQdQrJtmzEy+kZj4OFyplcQpwJHHAQLyY X-Forefront-PRVS: 0694C54398 X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2422; 23:12QZzoZuk+wzwz9AGgcMnHYeCggh6epUOuTBkyrUoYe8WxxVW8TjMjXv3lAVBcJ0DTAlpOOJbO+qqUj74l1nBiq8lHeS3c1iD6PQg+NQPvPS1EUyG9/NFDsMG8lZk1AOrUhUoVVafsPjj+mhzwdRb44ZDiekPlI3h2UgU+h/deCpWr/nsJ7uBCSq6sXQPpYHAaXKrQXr665XaT3tSbqqCJuZtH06JE53b4zeY6HHM6stkgLfhmS0RgfnOARhYaIMP0UqaFh1WU9GKzoEFEmoC23rldY/Q1+w5hMlnnHvb17JoCxmRPUtTN9OQjPbNNQtq/QiCgL4mGBHdL3ad+mb6hGo/pfd6iYMsl7clHo5L8vEu6glAIzCPWukdYiK/Kq3wxIEK04etGs5t0+cpZlMtaiyCV1b8qv8tYsFxoGm2re1LWByxxCh3exP9uFVSGNtOgKqr7RDXBGEI/K3ZYRGJZO0d7jvu4wQUR+lerBRbeO9ub5mSqmRL4imFXYJED2KfM89N1BCoJbyGXtkRA8bfOx3l9FMiMaR7+Z7SsgF2Ej0J+Pc6DhHydZYM2cirUMzuxphNfn68OO8GCIzjjOAST27jvukNh77DVW0YgUdNLUFnikhxg/QPhFdaZCm18oIkpS5dOrytnUAZ5BgXqjzOKIGaMIPeclJof0UqR1PnjD8daVs6I9rULiOt2UOTy3poMD8BayKTsqj1hD+y1gh1Q8IcfTEwsA/l8k8XQjxAYIikMSTJ6CpuBzK43Ioaaf/7vKD/owbqhOIdtfOPueeLAPzeyFbA1alHuh+FJFyNpzczo8CVYCRqClIg5JtwApkMCojdsy8AGIYVdK22fpoSqZqr9DuCPXg+ue9KfPEkUWEFw4pGp2g1GauuLm6xdkIePwL2p6bElJBxYHbTuEZwT/AkqSh53UBs+xL6zJV71/hPm8eDjczkRkTIN8J7UEmJ11tlwW3QPAh5lRU6NZu8Tu/70annqKvXl85oLv+R/OwqrDLduB9VD6F2DqQMFMTgB7F7YOPhTEvkyNlpf3LniQCefRWG5sFKAoHaoSA4LHKBiEGuBUNkg80A3Kc/78RfoMOOZh3vQw3mr46+GKZuQW9/9Ou0Pk8JM1v07x25c1kMj+jazhzrNjhR/vi1thW X-Microsoft-Antispam-Message-Info: BqXZc97IdHCTOxG4UPCiYUi6VAsBlO6OBPiNf9z9CZQj7MkXJiWHjispcnL1Pnzzjq2+hSdKIv3je/jnHDq0Y+WeX9uVSJmk7BejO4BGIbPlDDLQoWEqsXh3KmgvHLeBfVkwk7yYTzb77Tvj0n8LPwD/ABOeCM7i0Y0tOVcWumLZlaWJxTdAijvooJ+Gp13x X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2422; 6:oMwemptuJs8TaQvCEmXgH3/BxtPzRvLnPmiX6oYumfo0tdCItcVXsuSu4dTP72kxp6WlXlT0XVfFXwMXCPgjskt1IbLUn81ewyLSa7MM/tDw269phfzxEyO80KAbVH2VFfCK60fEDmRGVZOX2XXmIeYG3u7jxdvNwuf+pDgTugxw9ML5YOtVzkLXzFjVpf9j8HDMqzNGwMjEFqCFV+DafBkN/uUjwhj+3/bfOnCjNfwXPnq32HKf3joZTKtqND6exwWDPlVCZcAaDhp6HjzPfa8Uld8yukzkVxYWItk08awBGGmnXHdggj+y17UtAq29Yhg0U6I3iPm33App/hiZ1gWiZl4x/nkbomsbzlBv42FWCQPVLieWmZtDD34gUZzYe0UsGHWCzxekx6lYiNJXQjn+U2dfV3JenI/lOBuZQWaW6X/BtJjffJOYyLQ2VeUFxOSbpsV2nrvHzBowmdJbmw==; 5:FpubPX+witokFQaaqRedzWomjpfNubAuDyNJjPTVlhfrjDJO4j4ADeoOU1aGIsCQMwRrwRPoIAEIQOWNbCZQzxjkktx+nF7LH4mRV402EmZVlCnlvmuBSrTy7C6MQfMNoK0YjKrpGHjL+fb5U7XVWNxhApY3XHbx+7bGVRLLkMI=; 24:j1XJqTJpq4qsrKfQmQnEjhp4FHcO49I30zP3mGG6n9I5xmzeuwApN6ThUhqwtYIcgwoBUHz/Aybc7J9tbx/VWdm/e6GgBfovYrPK8hZyz5U= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB2422; 7:DYkmmI8ZgY6l75nHeX0aux4nfUzqHbDXUt7rHe3ja8Viyzo+3fBh7+7R72tQyHyPUfDqBpbgAj7bU4cjntEuRufBK58VtMDCpirM+NBmQF20RV3tlPRL1NUF0c7KCkSRfyQ0XLkVITvougeSzylS4PGFMhSGw8/CrsxFQ3Y1wzEaK4yg47QLFe4WhylR2EaOZPqYGTg6xBbi5NmjZFwbbExylcBctw0F0dBJah8eNxKSlAAtpx4/uO5tQwfWeUn1; 20:5zLcTolN6NpjvGVnBuAl5mNNh64W+CHkLIH+YozwFMl4UYBRnRAYARUc04mGjcr9+9UU6W/VPSE7VezRY3JNya8/NI8Ee4L2aGi4dFY+KYZiv3Sy1KfmarvVb87wFfacoXJCoPvW7pQcfapkThNjzkdKXgdR7u/ksEuGYA8/9Fy6MYN++DXSxPEN3ILO6c1ByQmykCMTl37t/ab4Jg61zvEY9eEE3Pnf2l8itUmKykd3cMQT3x637YqyEdp+QYhf X-MS-Office365-Filtering-Correlation-Id: c780a1c0-92e1-4a5d-c493-08d5ca865765 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2018 01:47:48.0852 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c780a1c0-92e1-4a5d-c493-08d5ca865765 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXCHOV01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB2422 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org if last image indicator was not set in the PCI data struct, print out "No more image in the PCI ROM" instand of loop back and print "Invalid PCI ROM header signature" info. Signed-off-by: Rex Zhu --- drivers/pci/rom.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/pci/rom.c b/drivers/pci/rom.c index a5c6016..a8b916b 100644 --- a/drivers/pci/rom.c +++ b/drivers/pci/rom.c @@ -110,6 +110,12 @@ size_t pci_get_rom_size(struct pci_dev *pdev, void __iomem *rom, size_t size) /* Avoid iterating through memory outside the resource window */ if (image >= rom + size) break; + if (!last_image) { + if (readw(image) != 0xAA55) { + pci_info(pdev, "No more image in the PCI ROM\n"); + break; + } + } } while (length && !last_image); /* never return a size larger than the PCI resource window */