From: rkir@google.com
To: gregkh@linuxfoundation.org
Cc: linux-kernel@vger.kernel.org, tkjos@google.com,
Roman Kiryanov <rkir@google.com>
Subject: [PATCH v3 14/15] platform: goldfish: pipe: Rename PIPE_REG to PIPE_V2_REG
Date: Wed, 3 Oct 2018 10:17:19 -0700 [thread overview]
Message-ID: <20181003171720.169953-14-rkir@google.com> (raw)
In-Reply-To: <20181003171720.169953-1-rkir@google.com>
From: Roman Kiryanov <rkir@google.com>
PIPE_V1_REG will be introduced later for v1 support.
Signed-off-by: Roman Kiryanov <rkir@google.com>
---
Changes in v3:
- No change.
Changes in v2:
- No change.
drivers/platform/goldfish/goldfish_pipe.c | 4 ++--
drivers/platform/goldfish/goldfish_pipe_qemu.h | 18 +++++++++---------
drivers/platform/goldfish/goldfish_pipe_v2.c | 16 ++++++++--------
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/drivers/platform/goldfish/goldfish_pipe.c b/drivers/platform/goldfish/goldfish_pipe.c
index 7b0920e962eb..353f7ce94aa7 100644
--- a/drivers/platform/goldfish/goldfish_pipe.c
+++ b/drivers/platform/goldfish/goldfish_pipe.c
@@ -81,8 +81,8 @@ static int goldfish_pipe_probe(struct platform_device *pdev)
* reading device version back: this allows the host implementation to
* detect the old driver (if there was no version write before read).
*/
- writel(PIPE_DRIVER_VERSION, base + PIPE_REG_VERSION);
- version = readl(base + PIPE_REG_VERSION);
+ writel(PIPE_DRIVER_VERSION, base + PIPE_V2_REG_VERSION);
+ version = readl(base + PIPE_V2_REG_VERSION);
if (WARN_ON(version < PIPE_CURRENT_DEVICE_VERSION))
return -EINVAL;
diff --git a/drivers/platform/goldfish/goldfish_pipe_qemu.h b/drivers/platform/goldfish/goldfish_pipe_qemu.h
index b4d78c108afd..24b02710769f 100644
--- a/drivers/platform/goldfish/goldfish_pipe_qemu.h
+++ b/drivers/platform/goldfish/goldfish_pipe_qemu.h
@@ -62,19 +62,19 @@ enum PipeFlagsBits {
BIT_WAKE_ON_READ = 2, /* want to be woken on reads */
};
-enum PipeRegs {
- PIPE_REG_CMD = 0,
+enum PipeV2Regs {
+ PIPE_V2_REG_CMD = 0,
- PIPE_REG_SIGNAL_BUFFER_HIGH = 4,
- PIPE_REG_SIGNAL_BUFFER = 8,
- PIPE_REG_SIGNAL_BUFFER_COUNT = 12,
+ PIPE_V2_REG_SIGNAL_BUFFER_HIGH = 4,
+ PIPE_V2_REG_SIGNAL_BUFFER = 8,
+ PIPE_V2_REG_SIGNAL_BUFFER_COUNT = 12,
- PIPE_REG_OPEN_BUFFER_HIGH = 20,
- PIPE_REG_OPEN_BUFFER = 24,
+ PIPE_V2_REG_OPEN_BUFFER_HIGH = 20,
+ PIPE_V2_REG_OPEN_BUFFER = 24,
- PIPE_REG_VERSION = 36,
+ PIPE_V2_REG_VERSION = 36,
- PIPE_REG_GET_SIGNALLED = 48,
+ PIPE_V2_REG_GET_SIGNALLED = 48,
};
enum PipeCmdCode {
diff --git a/drivers/platform/goldfish/goldfish_pipe_v2.c b/drivers/platform/goldfish/goldfish_pipe_v2.c
index 0e2a62322477..c99317548128 100644
--- a/drivers/platform/goldfish/goldfish_pipe_v2.c
+++ b/drivers/platform/goldfish/goldfish_pipe_v2.c
@@ -197,7 +197,7 @@ static int goldfish_pipe_cmd_locked(struct goldfish_pipe *pipe,
pipe->command_buffer->cmd = cmd;
/* failure by default */
pipe->command_buffer->status = PIPE_ERROR_INVAL;
- writel(pipe->id, pipe->dev->base + PIPE_REG_CMD);
+ writel(pipe->id, pipe->dev->base + PIPE_V2_REG_CMD);
return pipe->command_buffer->status;
}
@@ -214,7 +214,7 @@ static int goldfish_pipe_cmd(struct goldfish_pipe *pipe, enum PipeCmdCode cmd)
/*
* This function converts an error code returned by the emulator through
- * the PIPE_REG_STATUS i/o register into a valid negative errno value.
+ * the PIPE_V2_REG_STATUS i/o register into a valid negative errno value.
*/
static int goldfish_pipe_error_convert(int status)
{
@@ -611,7 +611,7 @@ static irqreturn_t goldfish_pipe_interrupt(int irq, void *dev_id)
/* Request the signalled pipes from the device */
spin_lock_irqsave(&dev->lock, flags);
- count = readl(dev->base + PIPE_REG_GET_SIGNALLED);
+ count = readl(dev->base + PIPE_V2_REG_GET_SIGNALLED);
if (count == 0) {
spin_unlock_irqrestore(&dev->lock, flags);
return IRQ_NONE;
@@ -847,15 +847,15 @@ int goldfish_pipe_device_v2_init(struct platform_device *pdev,
/* Send the buffer addresses to the host */
write_pa_addr(&dev->buffers->signalled_pipe_buffers,
- dev->base + PIPE_REG_SIGNAL_BUFFER,
- dev->base + PIPE_REG_SIGNAL_BUFFER_HIGH);
+ dev->base + PIPE_V2_REG_SIGNAL_BUFFER,
+ dev->base + PIPE_V2_REG_SIGNAL_BUFFER_HIGH);
writel(MAX_SIGNALLED_PIPES,
- dev->base + PIPE_REG_SIGNAL_BUFFER_COUNT);
+ dev->base + PIPE_V2_REG_SIGNAL_BUFFER_COUNT);
write_pa_addr(&dev->buffers->open_command_params,
- dev->base + PIPE_REG_OPEN_BUFFER,
- dev->base + PIPE_REG_OPEN_BUFFER_HIGH);
+ dev->base + PIPE_V2_REG_OPEN_BUFFER,
+ dev->base + PIPE_V2_REG_OPEN_BUFFER_HIGH);
platform_set_drvdata(pdev, dev);
return 0;
--
2.19.0.605.g01d371f741-goog
next prev parent reply other threads:[~2018-10-03 17:18 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-03 17:17 [PATCH v3 01/15] platform: goldfish: pipe: Move the file-scope goldfish_interrupt_tasklet variable into the driver state rkir
2018-10-03 17:17 ` [PATCH v3 02/15] platform: goldfish: pipe: Move the file-scope goldfish_pipe_miscdev " rkir
2018-10-03 17:17 ` [PATCH v3 03/15] platform: goldfish: pipe: Move the file-scope goldfish_pipe_dev " rkir
2018-10-03 17:17 ` [PATCH v3 04/15] platform: goldfish: pipe: Call misc_deregister if init fails rkir
2018-10-03 17:17 ` [PATCH v3 05/15] platform: goldfish: pipe: Remove redundant casting rkir
2018-10-03 17:17 ` [PATCH v3 06/15] platform: goldfish: pipe: Move memory allocation from probe to init rkir
2018-10-15 18:34 ` Greg KH
2018-10-15 18:48 ` Roman Kiryanov
2018-10-15 18:56 ` Greg KH
2018-10-15 19:06 ` Roman Kiryanov
2018-10-16 6:27 ` Greg KH
2018-10-16 20:48 ` Roman Kiryanov
2018-10-03 17:17 ` [PATCH v3 07/15] platform: goldfish: pipe: Return status from "deinit" since "remove" does not do much rkir
2018-10-15 18:36 ` Greg KH
2018-10-15 22:04 ` Roman Kiryanov
2018-10-16 6:30 ` Greg KH
2018-10-03 17:17 ` [PATCH v3 08/15] platform: goldfish: pipe: Add a blank line to separate varibles and code rkir
2018-10-03 17:17 ` [PATCH v3 09/15] platform: goldfish: pipe: Move goldfish_pipe to goldfish_pipe_v2 rkir
2018-10-15 18:38 ` Greg KH
2018-10-15 18:55 ` Roman Kiryanov
2018-10-15 19:01 ` Greg KH
2018-10-15 20:23 ` Roman Kiryanov
2018-10-16 6:29 ` Greg KH
2018-10-16 21:02 ` Roman Kiryanov
2018-10-03 17:17 ` [PATCH v3 10/15] platform: goldfish: pipe: Remove the license boilerplate rkir
2018-10-03 17:17 ` [PATCH v3 11/15] platform: goldfish: pipe: Split the driver to v2 specific and the rest rkir
2018-10-03 17:17 ` [PATCH v3 12/15] platform: goldfish: pipe: Rename the init function (add "v2") rkir
2018-10-03 17:17 ` [PATCH v3 13/15] platform: goldfish: pipe: Add a dedicated constant for the device name rkir
2018-10-03 17:17 ` rkir [this message]
2018-10-03 17:17 ` [PATCH v3 15/15] platform: goldfish: pipe: Add the goldfish_pipe_v1 driver rkir
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=20181003171720.169953-14-rkir@google.com \
--to=rkir@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tkjos@google.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).