From: Dave Stevenson <dave.stevenson@raspberrypi.com>
To: Maxime Ripard <maxime@cerno.tech>
Cc: Eric Anholt <eric@anholt.net>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Thomas Zimmermann <tzimmermann@suse.de>,
Daniel Vetter <daniel.vetter@intel.com>,
David Airlie <airlied@linux.ie>,
Jason Cooper <jason@lakedaemon.net>,
bcm-kernel-feedback-list@broadcom.com,
linux-arm-kernel@lists.infradead.org,
Marc Zyngier <maz@kernel.org>,
Linux Media Mailing List <linux-media@vger.kernel.org>,
Hans Verkuil <hverkuil-cisco@xs4all.nl>,
LKML <linux-kernel@vger.kernel.org>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
linux-rpi-kernel@lists.infradead.org,
DRI Development <dri-devel@lists.freedesktop.org>,
Dom Cobley <popcornmix@gmail.com>
Subject: Re: [PATCH 03/15] drm/vc4: hdmi: Fix register offset with longer CEC messages
Date: Tue, 15 Dec 2020 11:23:22 +0000 [thread overview]
Message-ID: <CAPY8ntAijv1qdOz8qWkofXSpCa85cEOPSiuUacLrM2xOSkjWYw@mail.gmail.com> (raw)
In-Reply-To: <20201210134648.272857-4-maxime@cerno.tech>
Hi Dom & Maxime
On Thu, 10 Dec 2020 at 13:46, Maxime Ripard <maxime@cerno.tech> wrote:
>
> From: Dom Cobley <popcornmix@gmail.com>
>
> The code prior to 311e305fdb4e ("drm/vc4: hdmi: Implement a register
> layout abstraction") was relying on the fact that the register offset
> was incremented by 4 for each readl call. That worked since the register
> width is 4 bytes.
>
> However, since that commit the HDMI_READ macro is now taking an enum,
> and the offset doesn't increment by 4 but 1 now. Divide the index by 4
> to fix this.
>
> Fixes: 311e305fdb4e ("drm/vc4: hdmi: Implement a register layout abstraction")
> Signed-off-by: Dom Cobley <popcornmix@gmail.com>
> Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
> ---
> drivers/gpu/drm/vc4/vc4_hdmi.c | 17 +++++++++++++++--
> 1 file changed, 15 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
> index 3df1747dd917..28b78ea885ea 100644
> --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
> +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
> @@ -1434,13 +1434,20 @@ static irqreturn_t vc4_cec_irq_handler_thread(int irq, void *priv)
>
> static void vc4_cec_read_msg(struct vc4_hdmi *vc4_hdmi, u32 cntrl1)
> {
> + struct drm_device *dev = vc4_hdmi->connector.dev;
> struct cec_msg *msg = &vc4_hdmi->cec_rx_msg;
> unsigned int i;
>
> msg->len = 1 + ((cntrl1 & VC4_HDMI_CEC_REC_WRD_CNT_MASK) >>
> VC4_HDMI_CEC_REC_WRD_CNT_SHIFT);
> +
> + if (msg->len > 16) {
> + drm_err(dev, "Attempting to read too much data (%d)\n", msg->len);
> + return;
> + }
> +
> for (i = 0; i < msg->len; i += 4) {
> - u32 val = HDMI_READ(HDMI_CEC_RX_DATA_1 + i);
> + u32 val = HDMI_READ(HDMI_CEC_RX_DATA_1 + (i >> 2));
>
> msg->msg[i] = val & 0xff;
> msg->msg[i + 1] = (val >> 8) & 0xff;
> @@ -1533,11 +1540,17 @@ static int vc4_hdmi_cec_adap_transmit(struct cec_adapter *adap, u8 attempts,
> u32 signal_free_time, struct cec_msg *msg)
> {
> struct vc4_hdmi *vc4_hdmi = cec_get_drvdata(adap);
> + struct drm_device *dev = vc4_hdmi->connector.dev;
> u32 val;
> unsigned int i;
>
> + if (msg->len > 16) {
> + drm_err(dev, "Attempting to transmit too much data (%d)\n", msg->len);
> + return -ENOMEM;
> + }
> +
> for (i = 0; i < msg->len; i += 4)
> - HDMI_WRITE(HDMI_CEC_TX_DATA_1 + i,
> + HDMI_WRITE(HDMI_CEC_TX_DATA_1 + (i >> 2),
> (msg->msg[i]) |
> (msg->msg[i + 1] << 8) |
> (msg->msg[i + 2] << 16) |
> --
> 2.28.0
>
next prev parent reply other threads:[~2020-12-15 11:25 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-10 13:46 [PATCH 00/15] drm/vc4: hdmi: Add CEC support for the BCM2711 Maxime Ripard
2020-12-10 13:46 ` [PATCH 01/15] irqchip: Allow to compile bcmstb on other platforms Maxime Ripard
2020-12-10 17:33 ` Florian Fainelli
2020-12-10 17:59 ` Marc Zyngier
2020-12-14 15:27 ` Maxime Ripard
2020-12-14 16:20 ` Marc Zyngier
2020-12-10 13:46 ` [PATCH 02/15] drm/vc4: hdmi: Move hdmi reset to bind Maxime Ripard
2020-12-18 11:20 ` Dave Stevenson
2020-12-10 13:46 ` [PATCH 03/15] drm/vc4: hdmi: Fix register offset with longer CEC messages Maxime Ripard
2020-12-15 11:23 ` Dave Stevenson [this message]
2020-12-10 13:46 ` [PATCH 04/15] drm/vc4: hdmi: Fix up CEC registers Maxime Ripard
2020-12-18 11:21 ` Dave Stevenson
2020-12-10 13:46 ` [PATCH 05/15] drm/vc4: hdmi: Restore cec physical address on reconnect Maxime Ripard
2020-12-18 14:21 ` Dave Stevenson
2020-12-18 14:45 ` Dave Stevenson
2021-01-11 10:29 ` Maxime Ripard
2020-12-10 13:46 ` [PATCH 06/15] drm/vc4: hdmi: Compute the CEC clock divider from the clock rate Maxime Ripard
2020-12-18 11:30 ` Dave Stevenson
2020-12-10 13:46 ` [PATCH 07/15] drm/vc4: hdmi: Update the CEC clock divider on HSM rate change Maxime Ripard
2020-12-18 14:26 ` Dave Stevenson
2020-12-10 13:46 ` [PATCH 08/15] drm/vc4: hdmi: Introduce a CEC clock Maxime Ripard
2020-12-18 11:37 ` Dave Stevenson
2020-12-18 12:23 ` Maxime Ripard
2020-12-18 12:25 ` Dave Stevenson
2020-12-10 13:46 ` [PATCH 09/15] drm/vc4: hdmi: Split the interrupt handlers Maxime Ripard
2020-12-10 13:46 ` [PATCH 10/15] drm/vc4: hdmi: Support BCM2711 CEC interrupt setup Maxime Ripard
2020-12-10 13:46 ` [PATCH 11/15] drm/vc4: hdmi: Remove cec_available flag Maxime Ripard
2020-12-18 14:30 ` Dave Stevenson
2020-12-10 13:46 ` [PATCH 12/15] drm/vc4: hdmi: Don't register the CEC adapter if there's no interrupts Maxime Ripard
2020-12-18 14:29 ` Dave Stevenson
2020-12-10 13:46 ` [PATCH 13/15] dt-binding: display: bcm2711-hdmi: Add CEC and hotplug interrupts Maxime Ripard
2020-12-10 13:46 ` [PATCH 14/15] ARM: dts: bcm2711: Add the BSC interrupt controller Maxime Ripard
2020-12-10 17:41 ` Florian Fainelli
2020-12-10 13:46 ` [PATCH 15/15] ARM: dts: bcm2711: Add the CEC " Maxime Ripard
2020-12-10 17:42 ` Florian Fainelli
2020-12-16 12:35 ` [PATCH 00/15] drm/vc4: hdmi: Add CEC support for the BCM2711 Hans Verkuil
2020-12-17 10:49 ` Maxime Ripard
2020-12-17 10:53 ` Hans Verkuil
2020-12-17 12:59 ` Maxime Ripard
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=CAPY8ntAijv1qdOz8qWkofXSpCa85cEOPSiuUacLrM2xOSkjWYw@mail.gmail.com \
--to=dave.stevenson@raspberrypi.com \
--cc=airlied@linux.ie \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=eric@anholt.net \
--cc=hverkuil-cisco@xs4all.nl \
--cc=jason@lakedaemon.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=maxime@cerno.tech \
--cc=maz@kernel.org \
--cc=mchehab@kernel.org \
--cc=popcornmix@gmail.com \
--cc=tglx@linutronix.de \
--cc=tzimmermann@suse.de \
/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).