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=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 09567C352AA for ; Tue, 1 Oct 2019 19:07:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C8875215EA for ; Tue, 1 Oct 2019 19:07:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="sGcqh9tj" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726114AbfJATHM (ORCPT ); Tue, 1 Oct 2019 15:07:12 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:44581 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725844AbfJATHL (ORCPT ); Tue, 1 Oct 2019 15:07:11 -0400 Received: by mail-wr1-f67.google.com with SMTP id z9so3693279wrl.11 for ; Tue, 01 Oct 2019 12:07:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=duvmQrLASend+2POPpxhDdqpGtPPwbHVJC0F3HaMz9k=; b=sGcqh9tjpxLiU03vB9j2nQItdyjnHSoihXtWuQYfMwe/rAF1bi7mETZPifRVrnLy3l 1D6tea6oqlNf4CwLsWP0WC/I7GKzEch64HGbwuXgnISlGJm3emHQnDfaFsrACoxnSAQD /Dw74qfW4IHjDE/X0AqTpYjc0mnopglLwFUb0xWlw10NHJWE5uo50IYU+VWGpxVT/6zx cC5Nlcmkj1gYTCar5BH+GyO3R+vygoo9xY3fw+j/WbHEdgaHzytiKShXf7/YHixbkKoK hz7wmXmxc1LfVv5Rahfy9Qnnqc1HM22uEGnQQZIrd2P6D9ERDJJVembmqRjTOAEKdMa+ oguw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=duvmQrLASend+2POPpxhDdqpGtPPwbHVJC0F3HaMz9k=; b=rI4aMl8FXgMsTOeeYIcdCydwXy0kgfgXgz19INDCoklFfGQsyz/TPe6VLpdrn2Nfn0 9hMv0AU22tkNBo2PwulrvIw7F39Uk8WJd0dMDw+Pkvma5alvBREsaTYtovUz8U0knojH xnaJF5Tc6C5hMZzPta2wf70rZrMJrh82cpZNjXtUzF6X0mlTccjKM0rH30FA3JEGS9Bu uOegNQpSj8RbCmSv+BOKNS6EW+zHpZ4rw2ghdZIivWoDVpgzhzl3X92eDATQMLxIpMfp 0RR+Y6Kw28SkY9Rmbipgs5uCiWrKmy3AfKjb/JGTw0mgI9iZCzK5lrz9MBto+y4VEd85 Z4Cw== X-Gm-Message-State: APjAAAWGsmo3gwJwuVP6n40PCNJE/DASwXtMaNLVpK0n0t3OqFCUTgtU ktvDFRjYaR3u68SDdEvmgmtwEn2A X-Google-Smtp-Source: APXvYqyOd1xSPf0Q+b99SKvPeyPSjYZlqHI9+h7ovdUWJnI1/UPW/tRPbFPdv/A2gDruIYd+pb07eg== X-Received: by 2002:a5d:6943:: with SMTP id r3mr18666142wrw.21.1569956829543; Tue, 01 Oct 2019 12:07:09 -0700 (PDT) Received: from localhost.localdomain ([86.124.196.40]) by smtp.gmail.com with ESMTPSA id s12sm36648477wra.82.2019.10.01.12.07.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Oct 2019 12:07:08 -0700 (PDT) From: Vladimir Oltean To: richardcochran@gmail.com, yangbo.lu@nxp.com, davem@davemloft.net Cc: netdev@vger.kernel.org, Vladimir Oltean Subject: [PATCH v2 net] ptp_qoriq: Initialize the registers' spinlock before calling ptp_qoriq_settime Date: Tue, 1 Oct 2019 22:07:01 +0300 Message-Id: <20191001190701.5754-1-olteanv@gmail.com> X-Mailer: git-send-email 2.17.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Because ptp_qoriq_settime is being called prior to spin_lock_init, the following stack trace can be seen at driver probe time: [ 2.269117] the code is fine but needs lockdep annotation. [ 2.274569] turning off the locking correctness validator. [ 2.280027] CPU: 1 PID: 1 Comm: swapper/0 Not tainted 5.3.0-rc7-01478-g01eaa67a4797 #263 [ 2.288073] Hardware name: Freescale LS1021A [ 2.292337] [] (unwind_backtrace) from [] (show_stack+0x10/0x14) [ 2.300045] [] (show_stack) from [] (dump_stack+0xcc/0xf8) [ 2.307235] [] (dump_stack) from [] (register_lock_class+0x730/0x73c) [ 2.315372] [] (register_lock_class) from [] (__lock_acquire+0x78/0x270c) [ 2.323856] [] (__lock_acquire) from [] (lock_acquire+0xe0/0x22c) [ 2.331649] [] (lock_acquire) from [] (_raw_spin_lock_irqsave+0x54/0x68) [ 2.340048] [] (_raw_spin_lock_irqsave) from [] (ptp_qoriq_settime+0x38/0x80) [ 2.348878] [] (ptp_qoriq_settime) from [] (ptp_qoriq_init+0x1f8/0x484) [ 2.357189] [] (ptp_qoriq_init) from [] (ptp_qoriq_probe+0xd0/0x184) [ 2.365243] [] (ptp_qoriq_probe) from [] (platform_drv_probe+0x48/0x9c) [ 2.373555] [] (platform_drv_probe) from [] (really_probe+0x1c4/0x400) [ 2.381779] [] (really_probe) from [] (driver_probe_device+0x78/0x1b8) [ 2.390003] [] (driver_probe_device) from [] (device_driver_attach+0x58/0x60) [ 2.398832] [] (device_driver_attach) from [] (__driver_attach+0xfc/0x160) [ 2.407402] [] (__driver_attach) from [] (bus_for_each_dev+0x68/0xb4) [ 2.415539] [] (bus_for_each_dev) from [] (bus_add_driver+0x104/0x20c) [ 2.423763] [] (bus_add_driver) from [] (driver_register+0x78/0x10c) [ 2.431815] [] (driver_register) from [] (do_one_initcall+0x8c/0x3ac) [ 2.439954] [] (do_one_initcall) from [] (kernel_init_freeable+0x468/0x548) [ 2.448610] [] (kernel_init_freeable) from [] (kernel_init+0x8/0x10c) [ 2.456745] [] (kernel_init) from [] (ret_from_fork+0x14/0x20) [ 2.464273] Exception stack(0xea89ffb0 to 0xea89fff8) [ 2.469297] ffa0: 00000000 00000000 00000000 00000000 [ 2.477432] ffc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 [ 2.485566] ffe0: 00000000 00000000 00000000 00000000 00000013 00000000 Fixes: ff54571a747b ("ptp_qoriq: convert to use ptp_qoriq_init/free") Signed-off-by: Vladimir Oltean --- Changes in v2: - Followed Richard Cochran's feedback: Please fix the actual bug, the spin lock issue, and don't worry about changing the initial value. drivers/ptp/ptp_qoriq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/ptp/ptp_qoriq.c b/drivers/ptp/ptp_qoriq.c index c61f00b72e15..a577218d1ab7 100644 --- a/drivers/ptp/ptp_qoriq.c +++ b/drivers/ptp/ptp_qoriq.c @@ -507,6 +507,8 @@ int ptp_qoriq_init(struct ptp_qoriq *ptp_qoriq, void __iomem *base, ptp_qoriq->regs.etts_regs = base + ETTS_REGS_OFFSET; } + spin_lock_init(&ptp_qoriq->lock); + ktime_get_real_ts64(&now); ptp_qoriq_settime(&ptp_qoriq->caps, &now); @@ -514,7 +516,6 @@ int ptp_qoriq_init(struct ptp_qoriq *ptp_qoriq, void __iomem *base, (ptp_qoriq->tclk_period & TCLK_PERIOD_MASK) << TCLK_PERIOD_SHIFT | (ptp_qoriq->cksel & CKSEL_MASK) << CKSEL_SHIFT; - spin_lock_init(&ptp_qoriq->lock); spin_lock_irqsave(&ptp_qoriq->lock, flags); regs = &ptp_qoriq->regs; -- 2.17.1