From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3752604-1523238376-2-11218990041567060655 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, MAILING_LIST_MULTI -1, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=fm2; t= 1523238375; b=hG5qrbwhLGZ2lV4EcNHyu7khRbIjuS7NKkFkMDg62EBAsMzqp4 0SlTQ6gVVQ7b5ZcTh8GfzXBQ+aMdHwMkF9/imlRZKBIXsJuFRoJjLwNk/3HGFr6x E2ui2kUbQXiQq7E7PjyKjr3Y83IbrgIS7cXDIE8IfO9kC6XAZmzEYPI1kX2g6izp RQ4dZ8UwIPzkupC0G+Fi4le8ieodENPHFyD/tu8Fqigpx7mvZzdXdLh6A/WDo2SZ BzMRCPGGcH2QzWIlhkOEnZnYKRP2b7itpb6n5dzasRZJeE49DhNmJ8M5I4zz1O4k 23+Je7KXzy8Rzaf0xNCLGGKRooGhkhKqjflA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=fm2; t=1523238375; bh=abk/t97z6o tuh2ezEBD2jA/G4fkHfRpZr1K5KX2I8DY=; b=YmgsyNe0qe8cbTh6D39aSOgyCW pOG7RM3rvfiXLmMzzGRglpOxUNbOUXAPvvbBAP0cOGLV/KGZCH8NgwwMBuaB1w1N pbiVc4/SyN+tEBd77EaLPenkbgTfstPyvO11kGUkQ8AKd6cSQn4OjcyCAtVPBSFc yJRdzRQ+u2MnXNQ6bQqa+4zbuxYDrJw5ag1Jj/04Sw0MEbV4Wyl0zAKRVJ0HP5lp 8vWaXYsKX+Qlp2QTXCQ921LK3JP5mvO2vZhoPmgBHg2IUhFxQsjjij6/0bD0fU0a igdsV8h+6ohPiilZzrmSa/xFXKvoTds4Jjr1/GIizA16yWY5L+UaaohMYXVg== ARC-Authentication-Results: i=1; mx1.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=XQBIaOD+ x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 Authentication-Results: mx1.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=XQBIaOD+ x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfB2GzRxA7W8eOMOR/aO5R/p7uQ5pFvlX37HbjCFy5mojcSqb+7WnvPPQyy2uwwC2DhTlnVHyNJ68XoJZXf7PmJprqagMkWriU+/hy05wa3T0IZtIp7NU xBc9S/c3XOz8WnJ9Xoca5tXg+ZSBUjNJCBbMPjqZJsM8eTIHfYjDjkMgLQLojPo7R14k7rlPP5q+GRcllkzSLKhifuQtYbcxPdz/Q7mdsn6tuLRpwBuFxzKK X-CM-Analysis: v=2.3 cv=WaUilXpX c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=wRwT6uffUbIA:10 a=t_PdEiP4ckcA:10 a=mw6kJ3eo-EIA:10 a=8nJEP1OIZ-IA:10 a=xqWC_Br6kY4A:10 a=Kd1tUaAdevIA:10 a=Lf-vpJhqX20A:10 a=VwQbUJbxAAAA:8 a=gPJu0pBYAAAA:8 a=WPyIoOwQAAAA:8 a=yMhMjlubAAAA:8 a=NfJ-nOMBdCiM8OP8BF8A:9 a=wPNLvfGTeEIA:10 a=AjGcO6oz07-iQ99wixmX:22 a=AlIIF0cMT2hfDT4axODj:22 a=S-HzPIwwDS8t1QcwSuWs:22 X-ME-CMScore: 0 X-ME-CMCategory: none Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755963AbeDIBp7 (ORCPT ); Sun, 8 Apr 2018 21:45:59 -0400 Received: from mail-bl2nam02on0118.outbound.protection.outlook.com ([104.47.38.118]:14317 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932473AbeDIAek (ORCPT ); Sun, 8 Apr 2018 20:34:40 -0400 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: James Hogan , Ralf Baechle , "linux-mips@linux-mips.org" , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 273/293] MIPS: generic: Fix machine compatible matching Thread-Topic: [PATCH AUTOSEL for 4.9 273/293] MIPS: generic: Fix machine compatible matching Thread-Index: AQHTz5lmdt4YVIsUjU+kcyHKjtv2vQ== Date: Mon, 9 Apr 2018 00:26:28 +0000 Message-ID: <20180409002239.163177-273-alexander.levin@microsoft.com> References: <20180409002239.163177-1-alexander.levin@microsoft.com> In-Reply-To: <20180409002239.163177-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;DM5PR2101MB0984;7:UVUruND/xWV4TnLZPpWOu7Mw5y8CrrD7qcNIzZXEzgu4hX+UZDg/utGRnbbkx0dldxbYH25daLaE4ASxUj+7iFYABnzfWRQjM40XK/ynvxocX7lWjzYNCLAzuNRd6XacufCgJzQPC9gOhSta3u3WFI2MVOm/qlk0CBQAoYqZvt3szyZECO048J7cbZVFjip1B5bfIURO886XIoFOnyE3KLuriF1RLajdf4aKZRGYPO5R0j9rdvdVTAskaDv9I/3r;20:Rqul0AISHVng6xU0RJMqMC7MghCXUqAWT0VU+Bh9u7VAkx2GIFgMFLht4M9O9OJ5mzy3sax0nzIVWEYkEUvoDOKgVuJtxpP6B0A2yGbRnzQf5H/EjWMkWXiDmAUAjv6OP9TjrM4qOihjcc/DYB0w5+vJ7jx/1Vc6iegEa6arSkU= x-ms-office365-filtering-ht: Tenant X-MS-Office365-Filtering-Correlation-Id: 8bf8880a-d21f-46e8-88d3-08d59db1ac26 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020);SRVR:DM5PR2101MB0984; x-ms-traffictypediagnostic: DM5PR2101MB0984: 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)(6040522)(2401047)(8121501046)(5005006)(93006095)(93001095)(3231221)(944501327)(52105095)(3002001)(10201501046)(6055026)(61426038)(61427038)(6041310)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123560045)(6072148)(201708071742011);SRVR:DM5PR2101MB0984;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB0984; x-forefront-prvs: 0637FCE711 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(396003)(39860400002)(366004)(39380400002)(346002)(376002)(199004)(189003)(26005)(99286004)(2906002)(14454004)(97736004)(59450400001)(8676002)(81156014)(81166006)(8936002)(6512007)(106356001)(76176011)(186003)(3280700002)(10090500001)(36756003)(6506007)(66066001)(3660700001)(72206003)(478600001)(6666003)(53936002)(2900100001)(105586002)(102836004)(966005)(2501003)(110136005)(54906003)(5250100002)(486006)(1076002)(25786009)(6116002)(6436002)(11346002)(6486002)(22452003)(4326008)(446003)(7736002)(575784001)(86362001)(305945005)(2616005)(476003)(6306002)(68736007)(3846002)(86612001)(5660300001)(10290500003)(107886003)(316002)(22906009)(41533002)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB0984;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; x-microsoft-antispam-message-info: bvd0C0rkVCR9Mf1fs+U80JCF/gVE9ubLEiHT1bBbJY8SGHoDDIQzXMtrgdvaHar35shBIC7zhr9gU9rnEsv1kQSTSlwtwkRfl9FqlAPJDXUqmUuiQrIe7VaF9xIVuCbTTcZbIM4mM/VfX2EHuwN8d0LIjkdadqjZmf37JcQ4SB1YKeVFD7peMe6d/Sm3ZCq4yOfpp3ouZR8LRkY1wqmpe5XfKQ60CCtI6oGIpw2+Ex54uWcayl0kDoOFWVG+9rnlDp69O4gXyZa9LTp74npi93OOzdRRX/23x4sHGT1uG+n+HmmzN0ELXej/xemIUgLSjUl2PQ7BU1MsrEPv9rCRDFTo043X60AKDsLa905CWeLXtHxmJVB68CpvMVPbPmvVDK6oRuxw6NYG2X6yHguP6l6svX6+d8DbpWViv9TJzDE= 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: 8bf8880a-d21f-46e8-88d3-08d59db1ac26 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Apr 2018 00:26:28.7539 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0984 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: James Hogan [ Upstream commit 9a9ab3078e2744a1a55163cfaec73a5798aae33e ] We now have a platform (Ranchu) in the "generic" platform which matches based on the FDT compatible string using mips_machine_is_compatible(), however that function doesn't stop at a blank struct of_device_id::compatible as that is an array in the struct, not a pointer to a string. Fix the loop completion to check the first byte of the compatible array rather than the address of the compatible array in the struct. Fixes: eed0eabd12ef ("MIPS: generic: Introduce generic DT-based board suppo= rt") Signed-off-by: James Hogan Reviewed-by: Paul Burton Reviewed-by: Matt Redfearn Cc: Ralf Baechle Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/18580/ Signed-off-by: Sasha Levin --- arch/mips/include/asm/machine.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/mips/include/asm/machine.h b/arch/mips/include/asm/machin= e.h index 6b444cd9526f..db930cdc715f 100644 --- a/arch/mips/include/asm/machine.h +++ b/arch/mips/include/asm/machine.h @@ -52,7 +52,7 @@ mips_machine_is_compatible(const struct mips_machine *mac= h, const void *fdt) if (!mach->matches) return NULL; =20 - for (match =3D mach->matches; match->compatible; match++) { + for (match =3D mach->matches; match->compatible[0]; match++) { if (fdt_node_check_compatible(fdt, 0, match->compatible) =3D=3D 0) return match; } --=20 2.15.1