From: Johannes Zink <j.zink@pengutronix.de>
To: linux-fpga@vger.kernel.org
Cc: devicetree@vger.kernel.org, Rob Herring <robh+dt@kernel.org>,
Moritz Fischer <mdf@kernel.org>, Wu Hao <hao.wu@intel.com>,
Xu Yilun <yilun.xu@intel.com>,
kernel@pengutronix.de, Johannes Zink <j.zink@pengutronix.de>
Subject: [PATCH 12/16] fpga: machxo2: improve status register dump
Date: Thu, 25 Aug 2022 16:13:39 +0200 [thread overview]
Message-ID: <20220825141343.1375690-13-j.zink@pengutronix.de> (raw)
In-Reply-To: <20220825141343.1375690-1-j.zink@pengutronix.de>
Since the previous patches introduce a priv datastructure, the dev
pointer can now be stored upon init. This allows the dump_status_reg
function to use dev_dbg instead of a raw pr_debug.
No functional changes.
Signed-off-by: Johannes Zink <j.zink@pengutronix.de>
---
drivers/fpga/machxo2-common.c | 28 +++++++++++++++-------------
drivers/fpga/machxo2-common.h | 1 +
2 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/drivers/fpga/machxo2-common.c b/drivers/fpga/machxo2-common.c
index 33127ee67d19..71f886a60cba 100644
--- a/drivers/fpga/machxo2-common.c
+++ b/drivers/fpga/machxo2-common.c
@@ -63,12 +63,12 @@ static const char *get_err_string(u8 err)
return "Unknown";
}
-static void dump_status_reg(u32 status)
+static void dump_status_reg(struct device *dev, u32 status)
{
- pr_debug("machxo2 status: 0x%08X - done=%d, cfgena=%d, busy=%d, fail=%d, devver=%d, err=%s\n",
- status, !!FIELD_GET(MACHXO2_DONE, status), !!FIELD_GET(MACHXO2_ENAB, status),
- !!FIELD_GET(MACHXO2_BUSY, status), !!FIELD_GET(MACHXO2_FAIL, status),
- !!FIELD_GET(MACHXO2_DVER, status), get_err_string(get_err(status)));
+ dev_dbg(dev, "0x%08X - done=%d, cfgena=%d, busy=%d, fail=%d, devver=%d, err=%s\n",
+ status, !!FIELD_GET(MACHXO2_DONE, status), !!FIELD_GET(MACHXO2_ENAB, status),
+ !!FIELD_GET(MACHXO2_BUSY, status), !!FIELD_GET(MACHXO2_FAIL, status),
+ !!FIELD_GET(MACHXO2_DVER, status), get_err_string(get_err(status)));
}
static int machxo2_wait_until_not_busy(struct machxo2_common_priv *priv)
@@ -156,7 +156,7 @@ static int machxo2_write_init(struct fpga_manager *mgr,
}
priv->get_status(priv, &status);
- dump_status_reg(status);
+ dump_status_reg(priv->dev, status);
cmd[0].cmd = enable;
cmd[0].cmd_len = sizeof(enable);
@@ -177,7 +177,7 @@ static int machxo2_write_init(struct fpga_manager *mgr,
ret = -EINVAL;
goto fail;
}
- dump_status_reg(status);
+ dump_status_reg(priv->dev, status);
cmd[0].cmd = initaddr;
cmd[0].cmd_len = sizeof(initaddr);
@@ -186,7 +186,7 @@ static int machxo2_write_init(struct fpga_manager *mgr,
goto fail;
priv->get_status(priv, &status);
- dump_status_reg(status);
+ dump_status_reg(priv->dev, status);
return 0;
fail:
@@ -210,7 +210,7 @@ static int machxo2_write(struct fpga_manager *mgr, const char *buf,
return -EINVAL;
}
priv->get_status(priv, &status);
- dump_status_reg(status);
+ dump_status_reg(priv->dev, status);
cmd.cmd = payload;
cmd.cmd_len = MACHXO2_BUF_SIZE;
cmd.delay_us = MACHXO2_HIGH_DELAY_USEC;
@@ -229,7 +229,7 @@ static int machxo2_write(struct fpga_manager *mgr, const char *buf,
}
}
priv->get_status(priv, &status);
- dump_status_reg(status);
+ dump_status_reg(priv->dev, status);
return 0;
}
@@ -254,7 +254,7 @@ static int machxo2_write_complete(struct fpga_manager *mgr,
goto fail;
priv->get_status(priv, &status);
- dump_status_reg(status);
+ dump_status_reg(priv->dev, status);
if (!(status & MACHXO2_DONE)) {
machxo2_cleanup(mgr);
ret = -EINVAL;
@@ -272,7 +272,7 @@ static int machxo2_write_complete(struct fpga_manager *mgr,
/* check refresh status */
priv->get_status(priv, &status);
- dump_status_reg(status);
+ dump_status_reg(priv->dev, status);
if (machxo2_status_done(status))
break;
if (++refreshloop == MACHXO2_MAX_REFRESH_LOOP) {
@@ -283,7 +283,7 @@ static int machxo2_write_complete(struct fpga_manager *mgr,
} while (1);
priv->get_status(priv, &status);
- dump_status_reg(status);
+ dump_status_reg(priv->dev, status);
return 0;
fail:
@@ -303,6 +303,8 @@ int machxo2_common_init(struct machxo2_common_priv *priv, struct device *dev)
{
struct fpga_manager *mgr;
+ priv->dev = dev;
+
mgr = devm_fpga_mgr_register(dev, "Lattice MachXO2 SPI FPGA Manager",
&machxo2_ops, priv);
diff --git a/drivers/fpga/machxo2-common.h b/drivers/fpga/machxo2-common.h
index 908203644209..a16060602a3f 100644
--- a/drivers/fpga/machxo2-common.h
+++ b/drivers/fpga/machxo2-common.h
@@ -30,6 +30,7 @@ struct machxo2_common_priv {
int (*write_commands)(struct machxo2_common_priv *priv,
struct machxo2_cmd *cmds, size_t cmd_count);
int (*get_status)(struct machxo2_common_priv *priv, u32 *status);
+ struct device *dev;
};
int machxo2_common_init(struct machxo2_common_priv *priv, struct device *dev);
--
2.30.2
next prev parent reply other threads:[~2022-08-25 14:20 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-25 14:13 [PATCH 00/16] Add support for Lattice MachXO2 programming via I2C Johannes Zink
2022-08-25 14:13 ` [PATCH 01/16] dt-bindings: fpga: convert Lattice MachXO2 Slave binding to YAML Johannes Zink
2022-08-30 20:30 ` Rob Herring
2022-08-31 7:12 ` Johannes Zink
2022-08-25 14:13 ` [PATCH 02/16] dt-bindings: fpga: machxo2-slave: add erasure properties Johannes Zink
2022-08-29 7:39 ` Xu Yilun
[not found] ` <9d5512768acb4d57f339942007402a9ed9483e84.camel@pengutronix.de>
[not found] ` <YwzWt8KjyfdyqehI@yilunxu-OptiPlex-7050>
2022-08-31 7:38 ` Johannes Zink
2022-09-03 14:49 ` Xu Yilun
2022-08-30 20:36 ` Rob Herring
2022-08-31 7:07 ` Johannes Zink
2022-08-25 14:13 ` [PATCH 03/16] dt-bindings: fpga: machxo2-slave: add pin for program sequence init Johannes Zink
2022-08-25 18:51 ` Rob Herring
2022-08-26 7:56 ` Johannes Zink
2022-08-29 7:45 ` Xu Yilun
[not found] ` <a42d72cd71c96ca675f5bb0cf59128c7f1cb04bb.camel@pengutronix.de>
[not found] ` <YwzZYM6GU0GiqBiq@yilunxu-OptiPlex-7050>
2022-08-31 7:51 ` Johannes Zink
2022-08-31 8:08 ` Johannes Zink
2022-08-25 14:13 ` [PATCH 04/16] dt-bindings: fpga: machxo2-slave: add lattice,machxo2-slave-i2c compatible Johannes Zink
2022-08-30 20:40 ` Rob Herring
2022-08-31 7:10 ` Johannes Zink
2022-08-25 14:13 ` [PATCH 05/16] fpga: machxo2-spi: remove #ifdef DEBUG Johannes Zink
2022-08-25 14:13 ` [PATCH 06/16] fpga: machxo2-spi: factor out status check for readability Johannes Zink
2022-08-25 14:13 ` [PATCH 07/16] fpga: machxo2-spi: fix big-endianness incompatibility Johannes Zink
2022-08-29 8:19 ` Xu Yilun
2022-08-29 10:41 ` Johannes Zink
2022-08-25 14:13 ` [PATCH 08/16] fpga: machxo2-spi: simplify with spi_sync_transfer() Johannes Zink
2022-08-25 14:13 ` [PATCH 09/16] fpga: machxo2-spi: simplify spi write commands Johannes Zink
2022-08-25 14:13 ` [PATCH 10/16] fpga: machxo2-spi: prepare extraction of common code Johannes Zink
2022-08-25 14:13 ` [PATCH 11/16] fpga: machxo2: move non-spi-related functionality to " Johannes Zink
2022-08-25 14:13 ` Johannes Zink [this message]
2022-08-25 14:13 ` [PATCH 13/16] fpga: machxo2: add optional additional flash areas to be erased Johannes Zink
2022-08-25 14:13 ` [PATCH 14/16] fpga: machxo2: add program initialization signalling via gpio Johannes Zink
2022-08-25 14:13 ` [PATCH 15/16] fpga: machxo2: extend erase timeout for machxo2 FPGA Johannes Zink
2022-08-29 9:26 ` Xu Yilun
2022-08-29 10:51 ` Johannes Zink
2022-08-29 14:57 ` Xu Yilun
2022-08-31 7:56 ` Johannes Zink
2022-08-25 14:13 ` [PATCH 16/16] fpga: machxo2: add configuration over i2c Johannes Zink
2022-08-29 9:47 ` Xu Yilun
2022-08-29 13:21 ` Johannes Zink
2022-08-29 14:45 ` Xu Yilun
2022-08-31 16:07 ` Johannes Zink
2022-08-25 15:25 ` [PATCH 00/16] Add support for Lattice MachXO2 programming via I2C Ivan Bornyakov
2022-08-26 6:32 ` Johannes Zink
2022-08-26 8:15 ` Ivan Bornyakov
2022-08-26 8:25 ` Sascha Hauer
2022-08-26 9:00 ` Ivan Bornyakov
2022-08-26 9:19 ` Ivan Bornyakov
2022-08-26 15:26 ` Xu Yilun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220825141343.1375690-13-j.zink@pengutronix.de \
--to=j.zink@pengutronix.de \
--cc=devicetree@vger.kernel.org \
--cc=hao.wu@intel.com \
--cc=kernel@pengutronix.de \
--cc=linux-fpga@vger.kernel.org \
--cc=mdf@kernel.org \
--cc=robh+dt@kernel.org \
--cc=yilun.xu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).