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=-13.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 0897FC4361B for ; Wed, 9 Dec 2020 01:18:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BF0D723B4B for ; Wed, 9 Dec 2020 01:18:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726012AbgLIBSV (ORCPT ); Tue, 8 Dec 2020 20:18:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56048 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725942AbgLIBSU (ORCPT ); Tue, 8 Dec 2020 20:18:20 -0500 Received: from mail-ed1-x542.google.com (mail-ed1-x542.google.com [IPv6:2a00:1450:4864:20::542]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E56C1C061794 for ; Tue, 8 Dec 2020 17:17:39 -0800 (PST) Received: by mail-ed1-x542.google.com with SMTP id q16so221046edv.10 for ; Tue, 08 Dec 2020 17:17:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=7fIOzCvpd6aSP3MBc1QUX2SNDA47p2Jnl5uGB646gB4=; b=swFJsHPTureZg+ccHNrZKz0Ay6MPRyHrYK561JfYX8lByhLMlQt/+fMH6u8y4qqbEw VYmoZB25A6sG0S2neeGtA6Gc407XbR8j8yVhJmpqypbPJYSH1qdo/njjEKYWtjNWxqhu Wao+dMIbW/kdfe0UmeYmX6XdyVZotXSdPYuf5io+ZsxETGDvxdkE0hPA0cBd5Jq4f4Ud bM9LawcpsCm13fCdas2EBJ3ZQH2lxCPm9DT8sQdYzvuWQgNOmce6A8OGOEc2pyMxBCa0 wyeHZoCqxkacBcxMGHzxgw2nsknYfYOnmQA/Is/6FqI6b1OV79guRBXGSZPNlumpM+Ha AW4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=7fIOzCvpd6aSP3MBc1QUX2SNDA47p2Jnl5uGB646gB4=; b=jZzdYlZe8K6xigLAFwPG13jKACtFRBTQRg8zEaqBjwU7rJaAdC9c22SaxMRv6dTPFQ 9qYmAna0KK4HxxB07upiYIdyVP8pfWuYl1uaMftPqkuH6lPKsxfPPG/N3nrj9vwJFTue ZnOLR3ky40d5CLtw5Zm9dHuuzbDM74Zi+NQOhq3fX4RacVlBkiEoEorV6o/YCbfCIaQJ 1x3lOuZ6kMZtctkLaPWSNI0/3RlXDMOzU8pZJ2YhTi5LHslSHqOFvDAfcUBH5WFexljo pskXNW6Pb80v68zm+kx20Z8ef/HaVhZCJA8NU49Jhg90Fpq5OCYZ8CPs80kY5+91nOd/ p3pw== X-Gm-Message-State: AOAM532VkutXsIHcjSrYicvnRdeVI+hTWqaeLlm5JzqgrQAj396KO9NR E015HlStVmYT4NgU0pBzQfXUE4G2GEbW1ORUtTytWw== X-Google-Smtp-Source: ABdhPJzxVnQtRyJI4S2IHeWKfYBJCVMTSxNCGUnGWc8AdVYhwvSrNC/IyV+FIez7TrBAryxGqC3ACKxHaNpVNQOeJSU= X-Received: by 2002:a50:e0ce:: with SMTP id j14mr652719edl.18.1607476658534; Tue, 08 Dec 2020 17:17:38 -0800 (PST) MIME-Version: 1.0 References: <20201209002418.1976362-1-ben.widawsky@intel.com> <20201209002418.1976362-13-ben.widawsky@intel.com> In-Reply-To: <20201209002418.1976362-13-ben.widawsky@intel.com> From: Dan Williams Date: Tue, 8 Dec 2020 17:17:36 -0800 Message-ID: Subject: Re: [RFC PATCH 12/14] cxl: Add basic debugging To: Ben Widawsky Cc: linux-cxl@vger.kernel.org, Linux Kernel Mailing List , Linux PCI , Linux ACPI , Ira Weiny , Vishal Verma , "Kelley, Sean V" , Rafael Wysocki , Bjorn Helgaas , Jonathan Cameron , Jon Masters , Chris Browy , Randy Dunlap , Christoph Hellwig Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Dec 8, 2020 at 4:24 PM Ben Widawsky wrote: > > Provide a standard debug function for use throughout the driver. > > Signed-off-by: Ben Widawsky > --- > drivers/cxl/cxl.h | 3 +++ > drivers/cxl/mem.c | 26 +++++++++++++++++++++++++- > 2 files changed, 28 insertions(+), 1 deletion(-) > > diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h > index 77c2dee6843c..e5afb89dab0b 100644 > --- a/drivers/cxl/cxl.h > +++ b/drivers/cxl/cxl.h > @@ -9,6 +9,9 @@ > #include > #include > > +#define cxl_debug(fmt, ...) \ > + pr_debug("CXL DEBUG: %s: " fmt, __func__, ##__VA_ARGS__) > + This should be dev_dbg(), then you don't need the CXL DEBUG prefix. In fact you don't need a cxl_debug() macro at all in that case. cxl_mem might need a ->dev attribute for this purpose. > #define CXL_SET_FIELD(value, field) \ > ({ \ > WARN_ON(!FIELD_FIT(field##_MASK, value)); \ > diff --git a/drivers/cxl/mem.c b/drivers/cxl/mem.c > index a2cea7ac7cc6..6b2f8d3776b5 100644 > --- a/drivers/cxl/mem.c > +++ b/drivers/cxl/mem.c > @@ -122,9 +122,12 @@ static int cxl_mem_wait_for_doorbell(struct cxl_mem *cxlm) > { > const int timeout = msecs_to_jiffies(2000); > const unsigned long start = jiffies; > + unsigned long end = start; > > while (cxl_doorbell_busy(cxlm)) { > - if (time_after(jiffies, start + timeout)) { > + end = jiffies; > + > + if (time_after(end, start + timeout)) { > /* Check again in case preempted before timeout test */ > if (!cxl_doorbell_busy(cxlm)) > break; > @@ -133,6 +136,8 @@ static int cxl_mem_wait_for_doorbell(struct cxl_mem *cxlm) > cpu_relax(); > } > > + cxl_debug("Doorbell wait took %dms", > + jiffies_to_msecs(end) - jiffies_to_msecs(start)); > return 0; > } > > @@ -180,6 +185,8 @@ static int cxl_mem_mbox_send_cmd(struct cxl_mem *cxlm, > } > > /* #4 */ > + cxl_debug("Sending command to %s\n", > + dev_driver_string(&cxlm->pdev->dev)); dev_dbg() already includes dev_driver_string(). > cxl_write_mbox_reg32(cxlm, CXLDEV_MB_CTRL_OFFSET, > CXLDEV_MB_CTRL_DOORBELL); > > @@ -308,6 +315,8 @@ static int cxl_mem_open(struct inode *inode, struct file *file) > if (!cxlmd) > return -ENXIO; > > + cxl_debug("Opened %pD\n", file); > + > file->private_data = cxlmd; > > return 0; > @@ -383,6 +392,10 @@ static int handle_mailbox_cmd_from_user(struct cxl_memdev *cxlmd, > .size_in = cmd->info.size_in, > .size_out = size_out, > }; > + cxl_debug("Submitting command for user\n" > + "\topcode: %x\n" > + "\tsize: %zub/%zub\n", > + mbox_cmd.opcode, mbox_cmd.size_in, mbox_cmd.size_out); > rc = cxl_mem_mbox_send_cmd(cxlmd->cxlm, &mbox_cmd); > cxl_mem_mbox_put(cxlmd->cxlm); > if (rc) > @@ -479,6 +492,8 @@ static long cxl_mem_ioctl(struct file *file, unsigned int cmd, unsigned long arg > u32 n_commands; > int i, j; > > + cxl_debug("Query IOCTL\n"); > + > if (get_user(n_commands, (u32 __user *)arg)) > return -EFAULT; > > @@ -511,6 +526,8 @@ static long cxl_mem_ioctl(struct file *file, unsigned int cmd, unsigned long arg > struct cxl_mem_command c; > int rc; > > + cxl_debug("Send IOCTL\n"); > + > rc = cxl_validate_cmd_from_user(u, &c); > if (rc) > return rc; > @@ -843,6 +860,13 @@ static int cxl_mem_identify(struct cxl_mem *cxlm) > > id = (struct cxl_mbox_identify *)mbox_cmd.payload; > > + cxl_debug("Driver identify command\n" > + "\tFirmware Version: %s\n" > + "\tTotal Capacity: %llu (%llu persistent)\n" > + "\tLSA size: %u\n", > + id->fw_revision, id->total_capacity, id->persistent_capacity, > + id->lsa_size); > + Seems not necessary for details that are published in sysfs?