From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754134AbdBNPcr (ORCPT ); Tue, 14 Feb 2017 10:32:47 -0500 Received: from mail-by2nam03on0050.outbound.protection.outlook.com ([104.47.42.50]:27872 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752244AbdBNPcg (ORCPT ); Tue, 14 Feb 2017 10:32:36 -0500 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com;nxp.com; dkim=none (message not signed) header.d=none; From: Leonard Crestez To: Mark Brown , Liam Girdwood , Heiko Stuebner , CC: Leonard Crestez , Octavian Purdila Subject: [PATCH] regulator: Fix regulator_summary for deviceless consumers Date: Tue, 14 Feb 2017 17:31:03 +0200 Message-ID: X-Mailer: git-send-email 2.7.4 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131315599540776829;(91ab9b29-cfa4-454e-5278-08d120cd25b8);() X-Forefront-Antispam-Report: CIP:192.88.158.2;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(7916002)(336005)(39400400002)(39850400002)(39860400002)(39410400002)(39380400002)(39840400002)(39450400003)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(97736004)(8936002)(50226002)(8676002)(81156014)(81166006)(92566002)(118296001)(47776003)(50986999)(104016004)(189998001)(77096006)(4326007)(2906002)(8656002)(68736007)(626004)(36756003)(54906002)(86362001)(5660300001)(38730400002)(5003940100001)(356003)(305945005)(48376002)(50466002)(6666003)(85426001)(106466001)(33646002)(53936002)(69596002)(105606002)(39060400002)(81003);DIR:OUT;SFP:1101;SCL:1;SRVR:BN1PR0301MB0724;H:az84smr01.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11FD025;1:RLVqSNeVlpKtpCzxcm2x8tuivG1LMF1LZ8GT5xc5f7ClL32kBJc5jJ0VaAu5yeac8mSPtU4ySabp9YueOCvCURt0io4MFAeqkaibQZAPaYJXvBe1fAssYRG+5h1MC8YDtvB/jCZtetnPfjjSREIjka4ErVsNeXx2eeNUfRozW9TSQt1SSpbOIuk3MjwESrTK3rVY/Z1DJyx6XVoXVmBJSBN8s093uWmdBfyUDBOWX+NmaojUKlv/4TAr5jXWj28S3UVVix9k317IB0v0ecaSi0pIaNDKUIxRrMNAImg8+GZsUUPF06DS+8LtzlyEy1gDOkRg+1rBcrdguk+2suWIXhbZTWKQfLsJvjz1IcYokwK4APT5dc2WLLGsiuvAADMijD1HfcBABVqe0yewX+zf0ScpZmr/c8dCY4IP38UuWfbw4fROBXJs3fOj+oGWykNnitdni738L/Cbouay8oTJBeqvoA0ZTx/20qVcurdM3wvHADu3S8tFd9CVo7MyLeFwgAn17xgoFtjDbhMfQGha9w3WgJgEIxc0qlr9uLCN/K7QLnnKgGaxK++O6fQjKoFWuT/eCbw9GsFJtPSz3jM8kSxkmRbbbGGEPHS7lc90t4ytmxW8S4sgNvU7lFG7dDTdSC3ZxCawjeQLLswWPhl95Mm0tbiYP/2cuH5fL2vzXoATXhRzhbAH9G2vXwqmfFsnKWc0Yxd5SRVd49jznKrRxA== MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: ba1ac07e-dd91-4437-6f7d-08d454eeb28f X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:BN1PR0301MB0724; X-Microsoft-Exchange-Diagnostics: 1;BN1PR0301MB0724;3:XWY3/hftogL2kD3L699w5iqawWH8aiNZPxU5ME9wcu8o2OokyiJl5To/hqSb2AasIFQHhR53mN+a5xeUypFuJ3Hah+R89Et2lX/4FV5oN/VEu3s8dB0f00VtdiLm1I0WxAyID2t0OFGk1BgF5CBG7G4hpiav4R178HFD/ReUfbEqPrTWD3VTGIydQ0MMyQEJtrkC+Gf3FkRwIrPhdajOw/cNUhVhC7sKbfiQYlra/0HWr/vNWW2zBF7ogYzl2AAJRkQX01SvsB8ljbnaHf1bTUlTit1kVwaXdmcHkjtsTzNEJKbaZAbtw0V4e521UbGf/9VOK0shL7wglzKxW6Pmki1xMldxJD/Nt7wrH3mmi0s0BAn4zsD9djTQCUKYbRqQ;25:ZNG5k3yDDW7Kj6So2z7izist8KNij/InMU9afHxr5OpRTm809LJIVMiDxezJpjiuj7x/yu7Yd0vo88He0t6Ffs7Rf8xWcJ0ZkK4dgeM9sTg8xC3irGkGfBI3YKz+r5belRFjpX8De8LxJeySsSdDW0gF7I+QSLcN+5k1O5UuSepMvLtNLsRJ/0EofWxAmBQhexfSXJsOzrzRlxhB0DEDqwb3yUH4Uk1AOiDmDFsYnRJG9OMrYx4aTkFuiBDMZGZCd6YTog7+fO4iaqBvvb0wgzI7RJbr50gYKqWkLl7FTwEE/HWAuv/ng6q+c4ujIWQS3O8kxajhi2AVEBOISE7w791QXj36SGcxGVXlOi2YtAYcVX+d3sITyu5WxTdtiPI4jxOk57J+ftfEEFjQt+ZB9ZzQZpEXCOY30ZFCwAax13bd+a4NJ+Wq9Vj6/CnuNesgXhSc+CmXQtWMQtF0WryU3A== X-Microsoft-Exchange-Diagnostics: 1;BN1PR0301MB0724;31:J/mUXdzui/uyIjhhFokEBNv1947Uw4WLCDK/R8ZJ6NhMB0fEgL3mzDmJfKqhHqV0Y0gZlmQf+rmZ1FDmaSJKwN2pPamH0hVqEXi5VDCFPiTBJvj74qhNGtSPHzHEvW8Y/G9ijdrE3+O/tg5t2onl7X5FJXTpsYfj+vHeiHCefunNE7bhTOBTlCduIKJvIwl6BlNHYp+dFrefs5FByTwlxzt/nB12drhZxOlBg7NhLnvc1MkWBw9ccRY1+lOqRXVRvKrkIoxuzpb4rzxyKoHIyl1ckXU4TjkGo7wGCDyXgfI= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6095060)(601004)(2401047)(13023025)(13017025)(13015025)(5005006)(8121501046)(13024025)(13018025)(3002001)(10201501046)(6055026)(6096035)(20161123563025)(20161123561025)(20161123565025)(20161123559025)(20161123556025);SRVR:BN1PR0301MB0724;BCL:0;PCL:0;RULEID:(400006);SRVR:BN1PR0301MB0724; X-Microsoft-Exchange-Diagnostics: 1;BN1PR0301MB0724;4:nNDVEguWNkQXZKkwqu6T29csuataV8w9eI/96umY8lpUTpBWPGXKzhk3iFgjN7fbrzQg+mCKjaYNg9gLDhIyZmXGRO5EP0Z3sH0unke3i7eYPOGT3kivCBWDcLeB3RDLjOUFhouq3HBwHqPhejaKFXwAoJDV9O5u7cceKIWUPm99atW+7wu0uQ6aYv/ZIyVIXqHP7+0i119rBfgM163urw8nLMD8D9IMkDLWhobM+YvE/Q+vPThtAG+z+rzLECcrmg7dIUiRRW1Tv+k3WxP3rW5TQdlID4TAVxLNI+QWfsI3yMx+/n2RScHyrrXcM3CxUgucUtb3OuGzPPY4vplJ3Y0u+5vr5QMj/26Bg+oonrA+v1EoJYW4KryZUaZcCfEdXcYCRbEUtIr3IFn+2J+vRXZeI8xvzOQatEf19/OgbIX8oBAC1Ce2fIDXcJMqUKJRw/NvzuCx7vPUVc0IkfT5NYgsVd12yy/ES8DY7OtxawHGxmQafQ0qt5IzVtGogAsXSkqIkmVN5OaT5wkdjdAViBqv10YR99MvO1ifgoKTGh2VsSNoGP6+CpfFT/blggnNNSrzRmYg6IJ3LoEV29NZj0mHdenfZ61gSInmgXOUcioKu+GTZiGaI+OPsWXo86ud3Wx0xIqwr6KhRvtKYkCgY1TDmeMDxqS8GQdm04yAodWWu0U5x4p2txH7hR8ZClLbvSSVhEs3piGw+ZIxAqF8PKV99LNILYG2Ag4kvCJi7tIZF5xyf8jAHjNTpkjaYe3y X-Forefront-PRVS: 0218A015FA X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BN1PR0301MB0724;23:0pPznS+Fs0NB8CpTAYyI4776hfPQp7uKCom5s7H?= =?us-ascii?Q?T6NAht0lMCVwetgwY4Cm12zQMMvDh5uBKp+oROk/pOhD/zDvoVb5g+/gHu+i?= =?us-ascii?Q?gLCZi/ecaAjOy3ypYqfMvQ5UnX1tsMasQe9Tlc2nL7O0JnPoUkf6uYDGHNdZ?= =?us-ascii?Q?sVSl0yL8nKaylw0pauYl1FxMZLFSs0xOu7A+6NG9VBgLsoB81cZM0iR/bM98?= =?us-ascii?Q?zss5qAZlSlavwOX9tjWisZ7tKHF84HPKbGNL9O7xKQrib+h1jitdHxMSB5wt?= =?us-ascii?Q?E/4oyJQtavmad7SGHEQ2i1wVUZ5+8ivItK5MsQteoo5lb0Vw+Y3TuSqfbDtm?= =?us-ascii?Q?a9Gr4fWDvi+YR8wqneBGskxAlH9RdYLO5PO253SxmokzRcGIlt/4dS7S8sBv?= =?us-ascii?Q?v7UtaRrjmNwu/n2RXXAbZalFs4dyZ5+igxqaLTcMBQVnI4h6gLaou/sLrsSn?= =?us-ascii?Q?3ce8cGZ3IdvI00NP+3wxdn0b2l1AbRK3D2Ob7d2EfQTBSLhZboV/ic2Ya5lU?= =?us-ascii?Q?+Lha9RhJJIXv2fmLULv/+FrnoLiVGjm4koEKhJogXiUssoNFkYa8dId7SHQu?= =?us-ascii?Q?/ySn6NvKmCNPZ/eP2UZuRB2nEtfFPT39cNzM4xEXlDIBD9KOV58oJitxMARb?= =?us-ascii?Q?pcsBzdRkHuFSwMLXbzoppwJu/p/tHuyhcKhYBY6xB9dNrZ+fLG9FLiY1+WTd?= =?us-ascii?Q?m1TCemFiwGxRQ7rBprFONvLtz9s0eDRmQso2iO3wMRey7ZWq01FCZR4CoKov?= =?us-ascii?Q?3iEEaQof8EJAM6jqEm/Jv2UHRzJVg/OHGJi8nMxH4oM59yEIADaIiyO+4OEo?= =?us-ascii?Q?Zap2mMDXZRr4+jATzcxLne5wKSeP1LAdjsZtH6/yHTR2eDn9xyCmK4LirreF?= =?us-ascii?Q?FfMnsGO5ssaeF0CVJdTkk4rcglJZB10IGOf1XdCiYiDOrCMwVw7iWZ6d+v2u?= =?us-ascii?Q?bg+nUYqkIeUG1WVYgCp3y/oWaWaAbxcrvEPwSKS6+VECOPJ7XQi0rSpiidgl?= =?us-ascii?Q?IhTh6lpcNP5j7FCW7P3zyM5mbqjO47JQtlkxSU3mPbCM3hxOT+sIETkg5Erx?= =?us-ascii?Q?HDgfyA2rjx5NaFuTopjIS6AftGtPENGTGQtDt939z5DQofPepdDy8RI+x1RD?= =?us-ascii?Q?pw5wUS19TSgdyJzTPnLCEhRDJ6VvgGx+JuGi4E1ga+1yNqxnhqilvVYXV7aX?= =?us-ascii?Q?rjkVGM953Yl/dj8JBRyRcpZ/dTFouW/OrmzkDyUaw7TgJKKOmGDSo1g3vmFU?= =?us-ascii?Q?7ibbibp6T4X+5ZZqAMsj5Vm28d9BOmN5ytRXcObP3A6+MmvMhLHRYaRtoonz?= =?us-ascii?Q?chg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;BN1PR0301MB0724;6:L45WlM49l5UMOzZd2jyD46UmMR/6PORSIrTktrMileuFDFNePzrzfS8wvriw9h90KVbEKJNBpud/x1LGn4P++CbeP6Wr7GPAw7u6RsJW3qCx36n9z11jHWZRsJLcTIj7c9IeuNrz+Ps1H9HEfk3r2yKOMpttshAAosEPXtrBoyGQ3AiaijOqOddeY591QUuJg56NJOeVyq8hcYrZLRna4s7Xy7bzRStvGIDjEWxSOeWUPXuSlDsYWd+66S7ZaDRktvCw1XdFn4hC1300IFmEO0/qPdNZfPv/n7n4HhQL8ZiHHQiJX4Rv3FXLtu/zc2xGJei3mB3FLGoaGLf3+cIHllHtdpz/L0Nz+HgdhcAmdc9r43Q/nH4aX51xFafSgCPpk6bJ5pXmz9Z05LhQKRM8jW1ZoxlElDwdea05jlTeeaw=;5:7rNDqXu1LcKZLnagEf3qWK/Aru+qeY2uleO0KR3zRL7VtwQgU/ok9b9oGgmxan0dmo0spySAnfn48tn86GzTh45TyZ51gv2d8eoJNHeTJnaBAEAu+hytym53bRl80cG6BpJoYjmp+Yq/lG8DtmgTFfQTRwSbWsdu+u3KgtmTpPHKdYJ8WwFDkA0a2ePrdsqH;24:hcD2zZonkvp+696lFZpms4p4YSXSAGcnXTE9B7yRTdh4rov/KezaedilW2oPJcB/cUZdGa8zPdYxXOW+5t1tk00ZRV56CsVvq8+poyuYYqE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;BN1PR0301MB0724;7:V6kSjb6N8DDd+Thb9Mqx9YWKbaiLyIZ9/bO3Grjahwa8gE6vxpQ01Iaz3x/HTNVZdqkMVZcpaNfX3g0tHTc/YM0d/gW+H/43jP8NEkVvLVKznln4n9S2/3GkPmsYYtC9J7K1DyK+n1cwJslhW0PwTLS1cUpiH64qJaVa5J1XcgpJGfELG94HLgas9Nk8Ychb3iW+jjSC79yOti+aqqaNitlHZmvGSoiYzBC8RBTUu/6ONe/SmFuB+5kuSJR+lo2fkNJ1CTNXmWEhS0erXV0KwHyzGj6tXfhdM6kNMm/d1b4Verd6G2ckP/uxqzBy75lq/34snOjNTMgqO+C1nITa8q7XVxeykdKcnIdFq0eK9ORhHY2N4BW6vrtEVoV0ObaNmWB4i7tFanjjbkpsFP9gzBnCb5p3ZGUXIhnC8EWR+IeC2TSvm9waWAywjtKWYCpnFvwzGM+oMKjjtGGgtneDzeWfnoPIe+B/2PvWvUOFxIlTseCOT1rJRAFb0jydXM2R1NPQFc7Xiq+iY9P/9tkp6w== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2017 15:32:33.9684 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e;Ip=[192.88.158.2];Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN1PR0301MB0724 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It is allowed to call regulator_get with a NULL dev argument (_regulator_get explicitly checks for it) but this causes an error later when printing /sys/kernel/debug/regulator_summary. Fix this by explicitly handling "deviceless" consumers in the debugfs code. This fixes errors like this: root@leonard-imx6:~# cat /sys/kernel/debug/regulator/regulator_summary Unable to handle kernel NULL pointer dereference at virtual address 0000015c pgd = a8bd4000 [0000015c] *pgd=a8c15831, *pte=00000000, *ppte=00000000 Internal error: Oops: 17 [#2] PREEMPT SMP ARM Modules linked in: CPU: 0 PID: 673 Comm: cat Tainted: G D 4.9.5-01680-g3d4992e #18 Hardware name: Freescale i.MX6 SoloLite (Device Tree) task: a8e07700 task.stack: a8c2a000 PC is at regulator_summary_show_subtree+0x1b4/0x274 LR is at seq_puts+0x48/0x58 pc : [<8044eb90>] lr : [<8021f82c>] psr: 800e0013 sp : a8c2bdf0 ip : 00000000 fp : 80c52720 r10: 80c21fc0 r9 : 00000004 r8 : 80f253a4 r7 : a821601c r6 : a874d400 r5 : a8216000 r4 : a8b1c000 r3 : 80c21fc0 r2 : 00000004 r1 : 80c52720 r0 : a8b1c000 Flags: Nzcv IRQs on FIQs on Mode SVC_32 ISA ARM Segment user Control: 10c53c7d Table: a8bd404a DAC: 00000055 Process cat (pid: 673, stack limit = 0xa8c2a210) Stack: (0xa8c2bdf0 to 0xa8c2c000) bde0: 0000001e 80c167f0 00000001 00000002 be00: 00000000 00000000 00000004 0000001b 10624dd3 00000000 a80ca35c a8c2be64 be20: 8044ec50 a8190dac 00020000 a8216060 a8b1c000 8044ec50 a8c2bf80 00000001 be40: 00000000 a8c2be98 00020000 8044ec78 a8216060 804b942c 80c524f8 a8c2bf80 be60: 00000001 a80ca35c a82161ac 00000000 a8b1c000 a87cd240 a87cd240 8044dc6c be80: a8b1c000 8021efc4 a8bd5db8 76e73000 a8b1c030 00000000 00000000 00000000 bea0: a8c2bf80 80177644 a60017f8 8021ee2c a87cd240 76e73000 00020000 a8c2bf80 bec0: 80a48d9c 00000000 00020000 80356080 a8bd3bc0 00000001 00000800 a87cd240 bee0: 80356034 00020000 a8c2bf80 00000000 00020000 801fbf4c 76e72004 a8c2bfb0 bf00: 00002710 76fca000 76faed14 801012b0 00000000 80114820 00022000 00022000 bf20: a8c2bf8c 00000003 00000000 a8b488c0 76e72000 00000022 00000073 801e44a4 bf40: 00076e72 a87cd240 76e73000 00020000 a8c2bf80 00000000 00020000 801fcd08 bf60: 00022000 00000003 a87cd240 a87cd240 00000000 00000000 76e73000 801fdb00 bf80: 00000000 00000000 00000000 00020000 00020000 76e73000 00000003 80107724 bfa0: a8c2a000 80107580 00020000 00020000 00000003 76e73000 00020000 0002a3fc bfc0: 00020000 00020000 76e73000 00000003 7fffe000 00000000 76ffe000 00020000 bfe0: 00000000 7ea10b64 00014b14 76f52770 600e0010 00000003 00000000 00000000 [<8044eb90>] (regulator_summary_show_subtree) from [<8044ec78>] (regulator_summary_show_roots+0x28/0x30) [<8044ec78>] (regulator_summary_show_roots) from [<804b942c>] (class_for_each_device+0x4c/0xb4) [<804b942c>] (class_for_each_device) from [<8044dc6c>] (regulator_summary_show+0x3c/0x48) [<8044dc6c>] (regulator_summary_show) from [<8021efc4>] (seq_read+0x198/0x4a0) [<8021efc4>] (seq_read) from [<80356080>] (full_proxy_read+0x4c/0x6c) [<80356080>] (full_proxy_read) from [<801fbf4c>] (__vfs_read+0x1c/0x10c) [<801fbf4c>] (__vfs_read) from [<801fcd08>] (vfs_read+0x8c/0x118) [<801fcd08>] (vfs_read) from [<801fdb00>] (SyS_read+0x3c/0x90) [<801fdb00>] (SyS_read) from [<80107580>] (ret_fast_syscall+0x0/0x34) Code: e59f80c4 e1a0100b e59d2018 e1a00004 (e59ce15c) ---[ end trace eca2c2e6d835da26 ]--- Signed-off-by: Leonard Crestez --- drivers/regulator/core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) Some quick grepping only finds a very small number of users for regulator_get(NULL, ...), it might make more sense to simply require always passing a device pointer. I found this because there was a patch in the freescale imx tree which did this and in our case it was easier to just fix the consumer. Here are the current obvious upstream users: $ git grep 'regulator_get(NULL' arch/arm/mach-davinci/da850.c: cvdd = regulator_get(NULL, "cvdd"); arch/arm/mach-pxa/em-x270.c: em_x270_usb_ldo = regulator_get(NULL, "vcc usb"); drivers/cpufreq/pxa2xx-cpufreq.c: vcc_core = regulator_get(NULL, "vcc_core"); drivers/cpufreq/s3c2416-cpufreq.c: s3c_freq->vddarm = regulator_get(NULL, "vddarm"); drivers/cpufreq/s3c64xx-cpufreq.c: vddarm = regulator_get(NULL, "vddarm"); drivers/cpufreq/s5pv210-cpufreq.c: arm_regulator = regulator_get(NULL, "vddarm"); drivers/cpufreq/s5pv210-cpufreq.c: int_regulator = regulator_get(NULL, "vddint"); diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 04baac9..6631954 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -4391,12 +4391,13 @@ static void regulator_summary_show_subtree(struct seq_file *s, seq_puts(s, "\n"); list_for_each_entry(consumer, &rdev->consumer_list, list) { - if (consumer->dev->class == ®ulator_class) + if (consumer->dev && consumer->dev->class == ®ulator_class) continue; seq_printf(s, "%*s%-*s ", (level + 1) * 3 + 1, "", - 30 - (level + 1) * 3, dev_name(consumer->dev)); + 30 - (level + 1) * 3, + consumer->dev ? dev_name(consumer->dev) : "deviceless"); switch (rdev->desc->type) { case REGULATOR_VOLTAGE: -- 2.7.4