From nobody Fri Mar 29 13:10:54 2024 Delivered-To: importer2@patchew.org Received-SPF: pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; envelope-from=linux-kernel-owner@vger.kernel.org; helo=vger.kernel.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mx.zohomail.com with SMTP id 1643740681173754.010380099178; Tue, 1 Feb 2022 10:38:01 -0800 (PST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241980AbiBASh7 (ORCPT ); Tue, 1 Feb 2022 13:37:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55268 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238965AbiBASh6 (ORCPT ); Tue, 1 Feb 2022 13:37:58 -0500 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D0081C06173D; Tue, 1 Feb 2022 10:37:57 -0800 (PST) Received: by mail-wr1-x42a.google.com with SMTP id w11so33710994wra.4; Tue, 01 Feb 2022 10:37:57 -0800 (PST) Received: from X1C7EK5.wind3.hub ([151.40.130.120]) by smtp.gmail.com with ESMTPSA id j19sm3097477wmq.17.2022.02.01.10.37.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 10:37:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mTPqlhhB+UUccQIbp0fredYWb11sSmi/twfR9ws8prM=; b=VavFXF7Zlsm+7RjnonlmJD05O+DBfUTcjqDlgdJ1/futzKR5s7412RVaoiIZGf3S6s 6aSStvMsBLcjyPX8MEAdqWfcWrlvt5rMHjGs1gaib/mvPSnh0VKZi0MTrkCYYWSSO9jK NHDn1BfKGEH4SFzcfA0JBM4lY1xsXRLHUSPe0TnEMZasrVQKfgZfPCc8+JV9N6HdfydC +GT6Oz873O2eVs+93jKJnRgzUA79fjIvYu2y2qs2gp8FHHwFBsIy06E+EZYFER0sD9ut pi1Fl2W6iSi7JN+dklFDOFWYhHDqzs2w8CfYqFFJ5WIxXs5yeyn9eeuIqxlcAxlbkiec yCfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mTPqlhhB+UUccQIbp0fredYWb11sSmi/twfR9ws8prM=; b=qsCUQP+xEvJpPS7eyAt+ykaEzoEwzzmyD1QOSNC58nhhzybLrRtOS8k6ZbrwUhuvaf pEEMf3QB3/Pj6AP79MCfCEB1ve+BqtQnSX6+6ZzfVZbqAE5WXDoaPSoDmTL3nScKKVox IB2WUjXkKJqzgeTsLTnQAqhIa6yFykajTpWk0JHLjMTnbtYgxXsIlV+N7StOmk6Fdszf YR2vY/0bUfgMTyK+eAzgBcWSQC+B4qoa8bDu+uJbRvgzUHFNMOP11DVuKBJAU2l+260U R03onWiqbTfnM6Vrz/q9EA16KsNXCZnb2x9hhBuqyFJhWVWExz1TtLWiPJSPwvwVBzv3 PxGw== X-Gm-Message-State: AOAM532e2M6zMO4YZfLVQfxNVVUhJiLK44eX+syTYx5+2LJ4Dh0LxdoY jCUD1HQHcOyjKbGM9UrbjNA= X-Google-Smtp-Source: ABdhPJxJTGqiV6C6l+6DGjLpkeHxAzk54Se2W7a49qz91GW8oXSGAMlG/rOahvMJxb8vEBbN7SOc3g== X-Received: by 2002:adf:e307:: with SMTP id b7mr23317794wrj.339.1643740676200; Tue, 01 Feb 2022 10:37:56 -0800 (PST) From: ektor5 Cc: Hans Verkuil , Mauro Carvalho Chehab , Ettore Chimenti , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linuxfancy@googlegroups.com Subject: [PATCH 1/2] media: cec: add SECO MEC-based cec driver Date: Tue, 1 Feb 2022 19:37:33 +0100 Message-Id: <20220201183734.224756-2-ek5.chimenti@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220201183734.224756-1-ek5.chimenti@gmail.com> References: <20220201183734.224756-1-ek5.chimenti@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643740683560100001 Content-Type: text/plain; charset="utf-8" From: Ettore Chimenti This patch adds support to the CEC device implemented with a Microchip MEC microcontroller in SECO Boards, including UDOO BOLT and UDOO Vision. The communication is achieved via Mailbox protocol. The driver use direct access to the PCI addresses. The firmware implementation also supports resuming from suspend by sending physical address to EC and waiting for a SET_STREAM_PATH command that matches the provided physical address. The basic functionalities are tested with success with cec-ctl and cec-compliance. Inspired by previous seco-cec implementation, attaches to i915 driver cec-notifier. Signed-off-by: Ettore Chimenti --- MAINTAINERS | 2 + drivers/media/cec/platform/Kconfig | 22 +- drivers/media/cec/platform/seco/Makefile | 3 +- drivers/media/cec/platform/seco/seco-meccec.c | 821 ++++++++++++++++++ drivers/media/cec/platform/seco/seco-meccec.h | 130 +++ 5 files changed, 975 insertions(+), 3 deletions(-) create mode 100644 drivers/media/cec/platform/seco/seco-meccec.c create mode 100644 drivers/media/cec/platform/seco/seco-meccec.h diff --git a/MAINTAINERS b/MAINTAINERS index f41088418aae..0e330c1dfe49 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -17273,6 +17273,8 @@ M: Ettore Chimenti S: Maintained F: drivers/media/cec/platform/seco/seco-cec.c F: drivers/media/cec/platform/seco/seco-cec.h +F: drivers/media/cec/platform/seco/seco-meccec.c +F: drivers/media/cec/platform/seco/seco-meccec.h =20 SECURE COMPUTING M: Kees Cook diff --git a/drivers/media/cec/platform/Kconfig b/drivers/media/cec/platfor= m/Kconfig index b672d3142eb7..da92b22d0775 100644 --- a/drivers/media/cec/platform/Kconfig +++ b/drivers/media/cec/platform/Kconfig @@ -98,7 +98,11 @@ config CEC_TEGRA between compatible devices. =20 config CEC_SECO - tristate "SECO Boards HDMI CEC driver" + bool "SECO Boards HDMI CEC drivers" + +config CEC_SECO_LEGACY + tristate "SECO Legacy Boards HDMI CEC driver" + depends on CEC_SECO depends on (X86 || IA64) || COMPILE_TEST depends on PCI && DMI select CEC_CORE @@ -109,9 +113,23 @@ config CEC_SECO CEC bus is present in the HDMI connector and enables communication between compatible devices. =20 +config CEC_SECO_MEC + tristate "SECO MEC-Based Boards HDMI CEC driver" + depends on CEC_SECO + depends on (X86 || IA64) || COMPILE_TEST + depends on PCI && DMI + select CEC_CORE + select CEC_NOTIFIER + help + This is a driver for SECO MEC-Based Boards integrated CEC interface. + Selecting it will enable support for this device. + CEC bus is present in the HDMI connectors and enables communication + between compatible devices. + + config CEC_SECO_RC bool "SECO Boards IR RC5 support" - depends on CEC_SECO + depends on CEC_SECO_LEGACY depends on RC_CORE=3Dy || RC_CORE =3D CEC_SECO help If you say yes here you will get support for the diff --git a/drivers/media/cec/platform/seco/Makefile b/drivers/media/cec/p= latform/seco/Makefile index aa1ca8ccdb8b..ccd51dc4c5ac 100644 --- a/drivers/media/cec/platform/seco/Makefile +++ b/drivers/media/cec/platform/seco/Makefile @@ -1,2 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-$(CONFIG_CEC_SECO) +=3D seco-cec.o +obj-$(CONFIG_CEC_SECO_LEGACY) +=3D seco-cec.o +obj-$(CONFIG_CEC_SECO_MEC) +=3D seco-meccec.o diff --git a/drivers/media/cec/platform/seco/seco-meccec.c b/drivers/media/= cec/platform/seco/seco-meccec.c new file mode 100644 index 000000000000..5e761427c413 --- /dev/null +++ b/drivers/media/cec/platform/seco/seco-meccec.c @@ -0,0 +1,821 @@ +// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause +/* + * CEC driver for SECO MEC-based Boards + * + * Author: Ettore Chimenti + * Copyright (C) 2022, SECO SpA. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* CEC Framework */ +#include + +#include "seco-meccec.h" + +#define SECO_MECCEC_DEV_NAME "seco_meccec" +#define MECCEC_MAX_CEC_ADAP 4 +#define MECCEC_MAX_ADDRS 1 +#define MECCEC_MAX_STATUS_RETRIES 10 + +static DEFINE_MUTEX(ec_mutex); + +struct seco_meccec_data { + struct device *dev; + struct platform_device *pdev; + struct cec_adapter *cec_adap[MECCEC_MAX_CEC_ADAP]; + struct cec_notifier *notifier[MECCEC_MAX_CEC_ADAP]; + u8 channels; /* bitmask */ + int irq; +}; + +struct seco_meccec_adap_data { + struct seco_meccec_data *cec; + int idx; +}; + +static int ec_reg_byte_op(u8 reg, u8 operation, u8 data, u8 *result) +{ + int res; + + /* Check still active */ + res =3D inb(MBX_RESOURCE_REGISTER) & AGENT_ACTIVE(AGENT_USER); + if (!res) + return -EBUSY; + + /* Set the register index */ + outb(reg, EC_REGISTER_INDEX); + + /* Check still active */ + res =3D inb(MBX_RESOURCE_REGISTER) & AGENT_ACTIVE(AGENT_USER); + if (!res) + return -EBUSY; + + if (operation =3D=3D READ) { + if (!result) + return -EINVAL; + + /* Read the data value */ + *result =3D inb(EC_REGISTER_DATA); + + } else if (operation =3D=3D WRITE) { + /* Write the data value */ + outb(data, EC_REGISTER_DATA); + } + + /* Check still active */ + res =3D inb(MBX_RESOURCE_REGISTER) & AGENT_ACTIVE(AGENT_USER); + if (!res) + return -EBUSY; + + return 0; +} + +#define ec_reg_byte_rd(reg, res) ec_reg_byte_op(reg, READ, 0, res) +#define ec_reg_byte_wr(reg, val) ec_reg_byte_op(reg, WRITE, val, NULL) + +static int ec_waitstatus(u8 status, u8 cmd) +{ + int idx; + + /* Loop until time-out or Status */ + for (idx =3D 0; idx < EC_CMD_TIMEOUT; idx++) { + u8 res =3D inb(MBX_RESOURCE_REGISTER); + + /* If status, done */ + if ((res & AGENT_MASK(AGENT_USER)) =3D=3D status) + return 0; + + /* Send command if needed */ + if (!cmd) + continue; + + /* Retry sending command when mailbox is free */ + for ( ; idx < EC_CMD_TIMEOUT; idx++) { + /* Check busy bit */ + res =3D inb(MBX_BUSY_REGISTER) & EC_STATUS_REGISTER; + + if (!res) { + /* Send command */ + outb_p(cmd, MBX_BUSY_REGISTER); + break; + } + } + } + + /* Time-out expired */ + return -EAGAIN; +} + +static int ec_send_command(const struct platform_device *pdev, u8 cmd, + void *tx_buf, u8 tx_size, + void *rx_buf, u8 rx_size) +{ + struct seco_meccec_data *meccec =3D platform_get_drvdata(pdev); + const struct device *dev =3D meccec->dev; + + int status; + u8 *buf; + u8 idx; + u8 res; + + mutex_lock(&ec_mutex); + + /* Wait for BIOS agent idle */ + status =3D ec_waitstatus(AGENT_IDLE(AGENT_USER), 0); + if (status) { + dev_err(dev, "Mailbox agent not available\n"); + goto err; + } + + /* BIOS agent is idle: we can request access */ + status =3D ec_waitstatus(AGENT_ACTIVE(AGENT_USER), + REQUEST_MBX_ACCESS(AGENT_USER)); + if (status) { + dev_err(dev, "Request mailbox agent failed\n"); + goto err; + } + + /* Prepare MBX data */ + for (buf =3D (uint8_t *)tx_buf, idx =3D 0; (!status) && idx < tx_size; id= x++) + status =3D ec_reg_byte_wr(EC_MBX_REGISTER + idx, buf[idx]); + + if (status) { + dev_err(dev, "Mailbox buffer write failed\n"); + goto err; + } + + /* Send command */ + status =3D ec_reg_byte_wr(EC_COMMAND_REGISTER, cmd); + if (status) { + dev_err(dev, "Command write failed\n"); + goto err; + } + + /* Wait for completion */ + status =3D ec_waitstatus(AGENT_DONE(AGENT_USER), 0); + if (status) { + dev_err(dev, "Mailbox did not complete after command write\n"); + goto err; + } + + /* Get result code */ + status =3D ec_reg_byte_rd(EC_RESULT_REGISTER, &res); + if (status) { + dev_err(dev, "Result read failed\n"); + goto err; + } + + /* Get result code and translate it */ + switch (res) { + case EC_NO_ERROR: + status =3D 0; + break; + + case EC_UNKNOWN_COMMAND_ERROR: + status =3D -EPERM; + break; + + case EC_INVALID_ARGUMENT_ERROR: + status =3D -EINVAL; + break; + + case EC_TIMEOUT_ERROR: + status =3D -EAGAIN; + break; + + default: + status =3D -EIO; + break; + } + if (status) { + dev_err(dev, "Command failed\n"); + goto err; + } + + /* Read return data */ + for (buf =3D (uint8_t *)rx_buf, idx =3D 0; !status && idx < rx_size; idx+= +) + status =3D ec_reg_byte_rd(EC_MBX_REGISTER + idx, &buf[idx]); + + if (status) { + dev_err(dev, "Mailbox read failed\n"); + goto err; + } + +err: + /* Release access, ignoring eventual time-out */ + ec_waitstatus(AGENT_IDLE(AGENT_USER), RELEASE_MBX_ACCESS(AGENT_USER)); + + mutex_unlock(&ec_mutex); + return status; +} + +static int ec_get_version(struct seco_meccec_data *cec) +{ + const struct device *dev =3D cec->dev; + const struct platform_device *pdev =3D cec->pdev; + struct version_msg_t version; + int status; + + status =3D ec_send_command(pdev, GET_FIRMWARE_VERSION_CMD, + NULL, 0, + &version, sizeof(struct version_msg_t)); + + if (status) + return status; + + dev_dbg(dev, "Firmware version %X.%02X / %X.%02X\n", + version.fw.major, + version.fw.minor, + version.lib.major, + version.lib.minor); + + return 0; +} + +static int ec_cec_status(struct seco_meccec_data *cec, + struct seco_meccec_status_t *result) +{ + const struct device *dev =3D cec->dev; + const struct platform_device *pdev =3D cec->pdev; + struct seco_meccec_status_t buf =3D { 0 }; + int ret, i; + + /* retry until get status or interrupt will not reset */ + for (i =3D 0; i < MECCEC_MAX_STATUS_RETRIES; i++) { + ret =3D ec_send_command(pdev, GET_CEC_STATUS_CMD, + &buf, sizeof(struct seco_meccec_status_t), + &buf, sizeof(struct seco_meccec_status_t)); + if (ret) { + dev_dbg(dev, "Status: Mailbox is busy. Retrying.\n"); + continue; + } + break; + } + + if (ret) + return ret; + + dev_dbg(dev, "CEC Status:\n"); + dev_dbg(dev, "ch0: 0x%02x\n", buf.status_ch0); + dev_dbg(dev, "ch1: 0x%02x\n", buf.status_ch1); + dev_dbg(dev, "ch2: 0x%02x\n", buf.status_ch2); + dev_dbg(dev, "ch3: 0x%02x\n", buf.status_ch3); + + if (result) + *result =3D buf; + + return 0; +} + +static int meccec_adap_phys_addr(struct cec_adapter *adap, u16 phys_addr) +{ + struct seco_meccec_adap_data *adap_data =3D cec_get_drvdata(adap); + struct seco_meccec_data *cec =3D adap_data->cec; + const struct platform_device *pdev =3D cec->pdev; + const struct device *dev =3D cec->dev; + struct seco_meccec_phyaddr_t buf =3D { }; + int status; + + buf.bus =3D adap_data->idx; + buf.addr =3D phys_addr; + + /* Need to tell physical address to wake up while standby */ + status =3D ec_send_command(pdev, SET_CEC_PHYADDR_CMD, + &buf, sizeof(struct seco_meccec_phyaddr_t), + NULL, 0); + dev_dbg(dev, "Physical address 0x%04x\n", phys_addr); + + return status; +} + +static int meccec_adap_log_addr(struct cec_adapter *adap, u8 logical_addr) +{ + struct seco_meccec_adap_data *adap_data =3D cec_get_drvdata(adap); + struct seco_meccec_data *cec =3D adap_data->cec; + struct platform_device *pdev =3D cec->pdev; + const struct device *dev =3D cec->dev; + struct seco_meccec_logaddr_t buf =3D { }; + int status; + + buf.bus =3D adap_data->idx; + buf.addr =3D logical_addr & 0x0f; + + status =3D ec_send_command(pdev, SET_CEC_LOGADDR_CMD, + &buf, sizeof(struct seco_meccec_logaddr_t), + NULL, 0); + dev_dbg(dev, "Logical address 0x%02x\n", logical_addr); + + /* Physical address is sent to MEC to be stored for replying + * autonomously to GIVE_PHYSICAL_ADDR and matching SET_STREAM_PATH when + * the CPU is sleeping. If PA match with a SET_STREAM_PATH message, it + * will resume the CPU. + * + * When setting LA, adap has valid physical address + */ + status =3D meccec_adap_phys_addr(adap, adap->phys_addr); + if (status) + dev_err(dev, "Set physical address failed %d\n", status); + + return status; +} + +static int meccec_adap_enable(struct cec_adapter *adap, bool enable) +{ + struct seco_meccec_adap_data *adap_data =3D cec_get_drvdata(adap); + struct seco_meccec_data *cec =3D adap_data->cec; + const struct device *dev =3D cec->dev; + int ret; + + /* reset status register */ + ret =3D ec_cec_status(cec, NULL); + if (ret) + dev_err(dev, "enable: status operation failed %d\n", ret); + + if (enable) { + dev_dbg(dev, "Device enabled\n"); + } else { + dev_dbg(dev, "Device disabled\n"); + + /* When the adapter is disabled, setting the physical address to + * invalid prevents the MEC firmware to wake up the CPU. + */ + ret =3D meccec_adap_phys_addr(adap, CEC_PHYS_ADDR_INVALID); + if (ret) { + dev_err(dev, "enable: set physical address failed %d\n", ret); + return ret; + } + } + + return 0; +} + +static int meccec_adap_transmit(struct cec_adapter *adap, u8 attempts, + u32 signal_free_time, struct cec_msg *msg) +{ + struct seco_meccec_adap_data *adap_data =3D cec_get_drvdata(adap); + struct seco_meccec_data *cec =3D adap_data->cec; + struct platform_device *pdev =3D cec->pdev; + const struct device *dev =3D cec->dev; + struct seco_meccec_msg_t buf =3D { }; + int status; + + dev_dbg(dev, "Device transmitting\n"); + + buf.bus =3D adap_data->idx; + buf.send =3D (msg->msg[0] & 0xf0) >> 4; + buf.dest =3D msg->msg[0] & 0x0f; + buf.size =3D msg->len - 1; + memcpy(buf.data, msg->msg + 1, buf.size); + + status =3D ec_send_command(pdev, CEC_WRITE_CMD, + &buf, sizeof(struct seco_meccec_msg_t), + NULL, 0); + + return status; +} + +static void meccec_tx_done(struct seco_meccec_data *cec, int adap_idx, u8 = status_val) +{ + struct cec_adapter *adap =3D cec->cec_adap[adap_idx]; + + if (status_val & SECOCEC_STATUS_TX_ERROR_MASK) { + if (status_val & SECOCEC_STATUS_TX_NACK_ERROR) + cec_transmit_attempt_done(adap, CEC_TX_STATUS_NACK); + else + cec_transmit_attempt_done(adap, CEC_TX_STATUS_ERROR); + } else { + cec_transmit_attempt_done(adap, CEC_TX_STATUS_OK); + } +} + +static void meccec_rx_done(struct seco_meccec_data *cec, int adap_idx, u8 = status_val) +{ + struct device *dev =3D cec->dev; + struct platform_device *pdev =3D cec->pdev; + struct cec_adapter *adap =3D cec->cec_adap[adap_idx]; + struct seco_meccec_msg_t buf =3D { .bus =3D adap_idx }; + struct cec_msg msg =3D { }; + int status; + + if (status_val & SECOCEC_STATUS_RX_OVERFLOW_MASK) + dev_warn(dev, "Received more than 16 bytes. Discarding\n"); + + if (status_val & SECOCEC_STATUS_RX_ERROR_MASK) { + dev_warn(dev, "Message received with errors. Discarding\n"); + status =3D -EIO; + goto rxerr; + } + /* Read message buffer */ + status =3D ec_send_command(pdev, CEC_READ_CMD, + &buf, sizeof(struct seco_meccec_msg_t), + &buf, sizeof(struct seco_meccec_msg_t)); + if (status) + return; + + /* Device msg len already accounts for the header */ + msg.len =3D min(buf.size + 1, CEC_MAX_MSG_SIZE); + + /* Read logical address */ + msg.msg[0] =3D buf.dest & 0x0f; + msg.msg[0] |=3D (buf.send & 0x0f) << 4; + + memcpy(msg.msg + 1, buf.data, buf.size); + + cec_received_msg(adap, &msg); + dev_dbg(dev, "Message received successfully\n"); + +rxerr: + return; +} + +static int get_status_ch(struct seco_meccec_status_t *s, + int ch) +{ + if (!s) + return -1; + + switch (ch) { + case 0: return s->status_ch0; + case 1: return s->status_ch1; + case 2: return s->status_ch2; + case 3: return s->status_ch3; + default: return -1; + } +} + +static irqreturn_t seco_meccec_irq_handler(int irq, void *priv) +{ + struct seco_meccec_data *cec =3D priv; + struct device *dev =3D cec->dev; + struct seco_meccec_status_t status; + bool interrupt_served =3D false; + int ret, idx; + + dev_dbg(dev, "Interrupt Called!\n"); + + ret =3D ec_cec_status(cec, &status); + if (ret) { + dev_warn(dev, "IRQ: status cmd failed %d\n", ret); + goto err; + } + + for (idx =3D 0; idx < MECCEC_MAX_CEC_ADAP; idx++) { + if (cec->channels & BIT_MASK(idx)) { + int cec_val =3D get_status_ch(&status, idx); + + if (cec_val < 0) + continue; + + if (cec_val & SECOCEC_STATUS_MSG_RECEIVED_MASK) + meccec_rx_done(cec, idx, cec_val); + if (cec_val & SECOCEC_STATUS_MSG_SENT_MASK) + meccec_tx_done(cec, idx, cec_val); + + if (cec_val & (SECOCEC_STATUS_MSG_SENT_MASK | + SECOCEC_STATUS_MSG_RECEIVED_MASK)) + interrupt_served =3D true; + } + } + if (!interrupt_served) + dev_warn(dev, "Message not received or sent, but interrupt fired\n"); + + return IRQ_HANDLED; +err: + /* reset status register */ + ret =3D ec_cec_status(cec, NULL); + if (ret) + dev_err(dev, "IRQ: status cmd failed twice %d\n", ret); + + return IRQ_HANDLED; +} + +struct cec_dmi_match { + const char *sys_vendor; + const char *product_name; + const char *devname; + const char *conn[MECCEC_MAX_CEC_ADAP]; +}; + +static const struct cec_dmi_match secocec_dmi_match_table[] =3D { + /* UDOO BOLT */ + { "Seco", "0C60", "0000:05:00.0", {"Port B", "Port C"} }, + /* UDOO Vision */ + { "Seco", "0D02", "0000:00:02.0", {"Port B"} }, + /* SECO SBC-D61 */ + { "Seco", "0D61", "0000:00:02.0", {"Port B", "Port C"} }, +}; + +static struct device *seco_meccec_find_hdmi_dev(struct device *dev, + const char * const **conn_ptr) +{ + int i; + + for (i =3D 0 ; i < ARRAY_SIZE(secocec_dmi_match_table) ; ++i) { + const struct cec_dmi_match *m =3D &secocec_dmi_match_table[i]; + + if (dmi_match(DMI_SYS_VENDOR, m->sys_vendor) && + dmi_match(DMI_PRODUCT_NAME, m->product_name)) { + struct device *d; + + /* Find the device, bail out if not yet registered */ + d =3D bus_find_device_by_name(&pci_bus_type, NULL, + m->devname); + if (!d) + return ERR_PTR(-EPROBE_DEFER); + + put_device(d); + + if (!conn_ptr) + return ERR_PTR(-EFAULT); + + *conn_ptr =3D m->conn; + + return d; + } + } + + return ERR_PTR(-EINVAL); +} + +static int seco_meccec_acpi_probe(struct seco_meccec_data *sdev) +{ + struct device *dev =3D sdev->dev; + const struct acpi_device *adev =3D ACPI_COMPANION(dev); + const union acpi_object *obj; + struct gpio_desc *gpio; + int irq =3D 0; + int ret; + + gpio =3D devm_gpiod_get(dev, "notify", GPIOF_IN); + if (IS_ERR(gpio)) { + dev_err(dev, "Cannot request interrupt gpio\n"); + return PTR_ERR(gpio); + } + + irq =3D gpiod_to_irq(gpio); + if (irq < 0) { + dev_err(dev, "Cannot find valid irq\n"); + return -ENODEV; + } + dev_dbg(dev, "irq-gpio is bound to IRQ %d\n", irq); + sdev->irq =3D irq; + + /* Get info from ACPI about channels capabilities */ + ret =3D acpi_dev_get_property(adev, "av-channels", ACPI_TYPE_INTEGER, &o= bj); + if (ret < 0) { + dev_err(dev, "Cannot retrieve channel properties\n"); + return ret; + } + dev_dbg(dev, "ACPI property: av-channels -> %x\n", (int)obj->integer.valu= e); + sdev->channels =3D (int)obj->integer.value; + + return 0; +} + +static const struct cec_adap_ops meccec_cec_adap_ops =3D { + /* Low-level callbacks */ + .adap_enable =3D meccec_adap_enable, + .adap_log_addr =3D meccec_adap_log_addr, + .adap_transmit =3D meccec_adap_transmit, +}; + +static int meccec_create_adapter(struct seco_meccec_data *cec, int idx) +{ + struct seco_meccec_adap_data *adap_data; + struct device *dev =3D cec->dev; + struct cec_adapter *acec; + char adap_name[32]; + + if (!cec) + return -EINVAL; + + adap_data =3D devm_kzalloc(dev, sizeof(*adap_data), GFP_KERNEL); + if (!adap_data) + return -ENOMEM; + + adap_data->cec =3D cec; + adap_data->idx =3D idx; + + sprintf(adap_name, "%s-%d", dev_name(dev), idx); + + /* Allocate CEC adapter */ + acec =3D cec_allocate_adapter(&meccec_cec_adap_ops, + adap_data, + adap_name, + CEC_CAP_DEFAULTS | + CEC_CAP_CONNECTOR_INFO, + MECCEC_MAX_ADDRS); + + if (IS_ERR(acec)) + return PTR_ERR(acec); + + /* Assign to data */ + cec->cec_adap[idx] =3D acec; + + return 0; +} + +static int seco_meccec_probe(struct platform_device *pdev) +{ + struct seco_meccec_data *meccec; + struct device *dev =3D &pdev->dev; + struct device *hdmi_dev; + const char * const *conn; + int ret, idx; + int adaps, notifs =3D 0; + + meccec =3D devm_kzalloc(dev, sizeof(*meccec), GFP_KERNEL); + if (!meccec) + return -ENOMEM; + + dev_set_drvdata(dev, meccec); + + meccec->pdev =3D pdev; + meccec->dev =3D dev; + + ret =3D ec_get_version(meccec); + if (ret) { + dev_err(dev, "Get version failed\n"); + goto err; + } + + if (!has_acpi_companion(dev)) { + dev_err(dev, "Cannot find any ACPI companion\n"); + ret =3D -ENODEV; + goto err; + } + + ret =3D seco_meccec_acpi_probe(meccec); + if (ret) { + dev_err(dev, "ACPI probe failed\n"); + goto err; + } + + ret =3D devm_request_threaded_irq(dev, + meccec->irq, + NULL, + seco_meccec_irq_handler, + IRQF_TRIGGER_RISING | IRQF_ONESHOT, + dev_name(&pdev->dev), meccec); + + if (ret) { + dev_err(dev, "Cannot request IRQ %d\n", meccec->irq); + ret =3D -EIO; + goto err; + } + + hdmi_dev =3D seco_meccec_find_hdmi_dev(&pdev->dev, &conn); + if (IS_ERR(hdmi_dev)) { + dev_err(dev, "Cannot find HDMI Device\n"); + return PTR_ERR(hdmi_dev); + } + dev_dbg(dev, "HDMI device found\n"); + + for (idx =3D 0; idx < MECCEC_MAX_CEC_ADAP; idx++) { + if (meccec->channels & BIT_MASK(idx)) { + ret =3D meccec_create_adapter(meccec, idx); + if (ret) + goto err_delete_adapter; + dev_dbg(dev, "CEC adapter #%d allocated\n", idx); + } + } + + for (idx =3D 0; idx < MECCEC_MAX_CEC_ADAP; idx++) { + if (meccec->channels & BIT_MASK(idx)) { + struct cec_adapter *acec =3D meccec->cec_adap[idx]; + struct cec_notifier *ncec; + + if (!acec) { + ret =3D -EINVAL; + goto err_notifier; + } + + ncec =3D cec_notifier_cec_adap_register(hdmi_dev, + conn[idx], acec); + + dev_dbg(dev, "CEC notifier #%d allocated %s\n", idx, conn[idx]); + + if (IS_ERR(ncec)) { + ret =3D PTR_ERR(ncec); + goto err_notifier; + } + + meccec->notifier[idx] =3D ncec; + notifs++; + } + } + + for (idx =3D 0; idx < MECCEC_MAX_CEC_ADAP; idx++) { + if (meccec->channels & BIT_MASK(idx)) { + ret =3D cec_register_adapter(meccec->cec_adap[idx], dev); + if (ret) + goto err_notifier; + + dev_dbg(dev, "CEC adapter #%d registered\n", idx); + } + } + + platform_set_drvdata(pdev, meccec); + dev_dbg(dev, "Device registered\n"); + + return ret; + +err_notifier: + for (idx =3D 0; idx < MECCEC_MAX_CEC_ADAP; idx++) { + if (meccec->channels & BIT_MASK(idx)) { + if (adaps--) + return ret; + + cec_notifier_cec_adap_unregister(meccec->notifier[idx], + meccec->cec_adap[idx]); + } + } +err_delete_adapter: + for (idx =3D 0; idx < MECCEC_MAX_CEC_ADAP; idx++) { + if (meccec->channels & BIT_MASK(idx)) { + if (notifs--) + return ret; + + cec_delete_adapter(meccec->cec_adap[idx]); + } + } +err: + dev_err(dev, "%s device probe failed: %d\n", dev_name(dev), ret); + + return ret; +} + +static int seco_meccec_remove(struct platform_device *pdev) +{ + struct seco_meccec_data *meccec =3D platform_get_drvdata(pdev); + int idx; + + for (idx =3D 0; idx < MECCEC_MAX_CEC_ADAP; idx++) { + if (meccec->channels && BIT_MASK(idx)) { + cec_notifier_cec_adap_unregister(meccec->notifier[idx], + meccec->cec_adap[idx]); + + cec_unregister_adapter(meccec->cec_adap[idx]); + } + } + + dev_dbg(&pdev->dev, "CEC device removed\n"); + + return 0; +} + +#ifdef CONFIG_PM_SLEEP +static int seco_meccec_resume(struct device *dev) +{ + struct seco_meccec_data *cec =3D dev_get_drvdata(dev); + int ret; + + dev_dbg(dev, "Device resumed from suspend\n"); + + /* reset status register */ + ret =3D ec_cec_status(cec, NULL); + if (ret) + dev_err(dev, "resume: status operation failed %d\n", ret); + + return ret; +} + +static SIMPLE_DEV_PM_OPS(seco_meccec_pm_ops, NULL, seco_meccec_resume); +#define SECO_MECCEC_PM_OPS (&seco_meccec_pm_ops) +#else +#define SECO_MECCEC_PM_OPS NULL +#endif + +#ifdef CONFIG_ACPI +static const struct acpi_device_id seco_meccec_acpi_match[] =3D { + {"CEC00002", 0}, + {}, +}; + +MODULE_DEVICE_TABLE(acpi, seco_meccec_acpi_match); +#endif + +static struct platform_driver seco_meccec_driver =3D { + .driver =3D { + .name =3D SECO_MECCEC_DEV_NAME, + .acpi_match_table =3D ACPI_PTR(seco_meccec_acpi_match), + .pm =3D SECO_MECCEC_PM_OPS, + }, + .probe =3D seco_meccec_probe, + .remove =3D seco_meccec_remove, +}; + +module_platform_driver(seco_meccec_driver); + +MODULE_DESCRIPTION("SECO MEC CEC Driver"); +MODULE_AUTHOR("Ettore Chimenti "); +MODULE_LICENSE("Dual BSD/GPL"); diff --git a/drivers/media/cec/platform/seco/seco-meccec.h b/drivers/media/= cec/platform/seco/seco-meccec.h new file mode 100644 index 000000000000..6f7fc9e13e30 --- /dev/null +++ b/drivers/media/cec/platform/seco/seco-meccec.h @@ -0,0 +1,130 @@ +/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause + * CEC driver for SECO MEC-based Boards + * + * Author: Ettore Chimenti + * Copyright (C) 2022, SECO SpA. + */ + +/* MailBox definitions */ +#define MBX_RESERVED_SIZE 0x10 +#define MBX_RESERVED_BASE 0x2b0 + +#define BAR_FROM_MBX_BASE(x) (x + MBX_RESERVED_BASE) + +#define RES_BAR_OFFSET 0 +#define BSY_BAR_OFFSET 4 +#define MBX_BAR_OFFSET 0xc + +#define MBX_RESOURCE_REGISTER BAR_FROM_MBX_BASE(RES_BAR_OFFSET) +#define MBX_BUSY_REGISTER BAR_FROM_MBX_BASE(BSY_BAR_OFFSET) +#define MBX_ACCESS_BAR BAR_FROM_MBX_BASE(MBX_BAR_OFFSET) + +#define EC_REGISTER_INDEX MBX_ACCESS_BAR +#define EC_REGISTER_DATA (EC_REGISTER_INDEX + 1) +#define EC_MBX_SIZE 0x20 + +#define EC_COMMAND_REGISTER 0 +#define EC_RESULT_REGISTER 1 +#define EC_STATUS_REGISTER 2 +#define EC_MBX_REGISTER 0x10 + +#define EC_CMD_TIMEOUT 0x30000 /* Maximum wait loop */ + +/* Firmware version data struct and definitions */ +#define FIRMWARE_TIME_STAMP_SIZE (EC_MBX_SIZE - sizeof(u32)) + +struct version_t { + u8 minor; + u8 major; +}; + +struct version_msg_t { + struct version_t fw; + struct version_t lib; + u8 firmware_ts[FIRMWARE_TIME_STAMP_SIZE]; +}; + +/* CEC data structs and constant definitions */ +#define MECCEC_MAX_MSG_SIZE 16 + +struct seco_meccec_msg_t { + u8 bus; + u8 send; + u8 dest; + u8 data[MECCEC_MAX_MSG_SIZE]; + u8 size; +}; + +struct seco_meccec_logaddr_t { + u8 bus; + u8 addr; +}; + +struct seco_meccec_phyaddr_t { + u16 bus; + u16 addr; +}; + +struct seco_meccec_status_t { + u8 status_ch0; + u8 status_ch1; + u8 status_ch2; + u8 status_ch3; +}; + +/* Status data */ +#define SECOCEC_STATUS_MSG_RECEIVED_MASK BIT(0) +#define SECOCEC_STATUS_RX_ERROR_MASK BIT(1) +#define SECOCEC_STATUS_MSG_SENT_MASK BIT(2) +#define SECOCEC_STATUS_TX_ERROR_MASK BIT(3) + +#define SECOCEC_STATUS_TX_NACK_ERROR BIT(4) +#define SECOCEC_STATUS_RX_OVERFLOW_MASK BIT(5) + +/* MBX Status bitmap values from EC to Host */ +enum MBX_STATUS { + MBX_OFF =3D 0, /* Disable MBX Interface */ + MBX_ON =3D 1, /* Enable MBX Interface */ + MBX_ACTIVE0 =3D (1 << 6), /* MBX AGENT 0 active */ + MBX_QUEUED0 =3D (1 << 7), /* MBX AGENT 0 idle */ +}; + +#define AGENT_IDLE(x) 0 +#define AGENT_QUEUED(x) (MBX_QUEUED0 >> (2 * x)) +#define AGENT_ACTIVE(x) (MBX_ACTIVE0 >> (2 * x)) +#define AGENT_MASK(x) (AGENT_QUEUED(x) + AGENT_ACTIVE(x)) +#define AGENT_DONE(x) AGENT_MASK(x) +#define MBX_STATUS_DEFAULT 0 + +/* MBX user IDs */ +enum AGENT_IDS { + AGENT_BIOS, /* BIOS AGENT */ + AGENT_ACPI, /* ACPI AGENT */ + AGENT_EAPI, /* EAPI AGENT */ + AGENT_USER, /* USER AGENT */ + AGENT_NONE, /* No AGENT */ +}; + +/* MBX command results */ +enum CMD_RESULT { + EC_NO_ERROR =3D 0, /* Success */ + EC_UNKNOWN_COMMAND_ERROR, /* Unknown command */ + EC_INVALID_ARGUMENT_ERROR, /* Invalid argument */ + EC_TIMEOUT_ERROR, /* Waiting Time-out */ + EC_DEVICE_ERROR, /* Device error */ +}; + +/* MBX commands */ +enum MBX_CMDS { + GET_FIRMWARE_VERSION_CMD =3D 0, /* Get firmware version record */ + CEC_WRITE_CMD =3D 0x80, /* Write CEC command */ + CEC_READ_CMD =3D 0x81, /* Read CEC command */ + GET_CEC_STATUS_CMD =3D 0x82, /* Get CEC status regisers */ + SET_CEC_LOGADDR_CMD =3D 0x83, /* Set CEC Logical Address */ + SET_CEC_PHYADDR_CMD =3D 0x84, /* Set CEC Physical Address */ + REQUEST_MBX_ACCESS_CMD =3D 0xf0, /* First request access command */ + RELEASE_MBX_ACCESS_CMD =3D 0xf8, /* First release access command */ +}; + +#define REQUEST_MBX_ACCESS(x) (REQUEST_MBX_ACCESS_CMD + x) +#define RELEASE_MBX_ACCESS(x) (RELEASE_MBX_ACCESS_CMD + x) --=20 2.17.1 From nobody Fri Mar 29 13:10:54 2024 Delivered-To: importer2@patchew.org Received-SPF: pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; envelope-from=linux-kernel-owner@vger.kernel.org; helo=vger.kernel.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mx.zohomail.com with SMTP id 1643740683925328.3361855148945; Tue, 1 Feb 2022 10:38:03 -0800 (PST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242009AbiBASiB (ORCPT ); Tue, 1 Feb 2022 13:38:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55278 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240143AbiBASiA (ORCPT ); Tue, 1 Feb 2022 13:38:00 -0500 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C5DA0C061714; Tue, 1 Feb 2022 10:37:59 -0800 (PST) Received: by mail-wm1-x32b.google.com with SMTP id j5-20020a05600c1c0500b0034d2e956aadso2238497wms.4; Tue, 01 Feb 2022 10:37:59 -0800 (PST) Received: from X1C7EK5.wind3.hub ([151.40.130.120]) by smtp.gmail.com with ESMTPSA id j19sm3097477wmq.17.2022.02.01.10.37.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 10:37:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ve8tBclI5IMrrMI15B03jvD+eu/iK6m1qrk9Pz//fBI=; b=lFfSrnIIiNiQ9HzJ7/WifUaPADKRkkv+F3hqEDj0Jn9XW84XpBgFQbIMqpTr7/urD+ YO6bYyWaiAOVo0Mun2QQ3wXa/eJFfmhy+GjW0FNeD5y8ZrTQC4PWkJhxHRmoLWIn8gfI sxewSoTkQHlDS36c6E8dYKP8E+0noOceVjOoUu5CxKvs6bO9GYmjWijoO9FvJKzrb7At CdrlfBmKwnxraAm2WQX5r+N+4hNai/jUk4G+NHJ1jXejeeuJxZNjdg8/OnCqZYa1/u2E 85I/KW9EX0/SfGgISkhYMMANYaoxEgsLhmMLMC1B0B7OppI62gL83WZOreOXz3ulLF1K IuAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ve8tBclI5IMrrMI15B03jvD+eu/iK6m1qrk9Pz//fBI=; b=daRtCnFYkgNMw4fM/7nQLoTcZb+mJYzd02P+uNNtVDmBzlUgGkGS9pCIhYmEQm42JY 1CwZmRL8SsmleLF0fXZJt2fiCYo3oQOjgDkXJFaMwATzS7VJCiHQRgZHYD5VX5Ew8VL8 PWXJothBBCJ/RwV5zphrmZZe68Og97cywd0qHZnXBiDhLjwrSvMjP9An3Fn//ThKxqgl gl6nolmDnaURPF8iYs3fNpr3hchM1q0ZwanZfDKRQmyk9mOtF6zPswcOSfA3X5BMu/jz BEhaUHMRq4EGX6YmirjOS9pyLrEicuSrkV9Lk/RTVmbUfNXEpYPQrcIDSZ7WOgjxSrTe cT+w== X-Gm-Message-State: AOAM5336lsovmmw2MjlxK26wASeUrphZ7mQXZkG9FmuopswvVzMD/+Sh s/y34+yPLAuMtOoHtBA56zPahvy+efrpdw== X-Google-Smtp-Source: ABdhPJwI6E3HElHpzSsZnZmMM8bQrF62l2ToUjMY8b8KAp0cybrgUDH9guSk/WKKQnqpcg75zMvrzQ== X-Received: by 2002:a05:600c:3505:: with SMTP id h5mr2978052wmq.122.1643740678276; Tue, 01 Feb 2022 10:37:58 -0800 (PST) From: ektor5 Cc: Hans Verkuil , Mauro Carvalho Chehab , Ettore Chimenti , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linuxfancy@googlegroups.com Subject: [PATCH 2/2] media: cec: seco: add newlines in debug messages Date: Tue, 1 Feb 2022 19:37:34 +0100 Message-Id: <20220201183734.224756-3-ek5.chimenti@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220201183734.224756-1-ek5.chimenti@gmail.com> References: <20220201183734.224756-1-ek5.chimenti@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643740686282100001 Content-Type: text/plain; charset="utf-8" From: Ettore Chimenti Newlines were missing in almost all regular and debug printk. Signed-off-by: Ettore Chimenti --- drivers/media/cec/platform/seco/seco-cec.c | 54 +++++++++++----------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/drivers/media/cec/platform/seco/seco-cec.c b/drivers/media/cec= /platform/seco/seco-cec.c index ae138cc253fd..78856a55e637 100644 --- a/drivers/media/cec/platform/seco/seco-cec.c +++ b/drivers/media/cec/platform/seco/seco-cec.c @@ -129,7 +129,7 @@ static int secocec_adap_enable(struct cec_adapter *adap= , bool enable) if (status) goto err; =20 - dev_dbg(dev, "Device enabled"); + dev_dbg(dev, "Device enabled\n"); } else { /* Clear the status register */ status =3D smb_rd16(SECOCEC_STATUS_REG_1, &val); @@ -141,7 +141,7 @@ static int secocec_adap_enable(struct cec_adapter *adap= , bool enable) ~SECOCEC_ENABLE_REG_1_CEC & ~SECOCEC_ENABLE_REG_1_IR); =20 - dev_dbg(dev, "Device disabled"); + dev_dbg(dev, "Device disabled\n"); } =20 return 0; @@ -264,12 +264,12 @@ static void secocec_rx_done(struct cec_adapter *adap,= u16 status_val) =20 if (status_val & SECOCEC_STATUS_RX_OVERFLOW_MASK) { /* NOTE: Untested, it also might not be necessary */ - dev_warn(dev, "Received more than 16 bytes. Discarding"); + dev_warn(dev, "Received more than 16 bytes. Discarding\n"); flag_overflow =3D true; } =20 if (status_val & SECOCEC_STATUS_RX_ERROR_MASK) { - dev_warn(dev, "Message received with errors. Discarding"); + dev_warn(dev, "Message received with errors. Discarding\n"); status =3D -EIO; goto rxerr; } @@ -390,12 +390,12 @@ static int secocec_ir_probe(void *priv) if (status !=3D 0) goto err; =20 - dev_dbg(dev, "IR enabled"); + dev_dbg(dev, "IR enabled\n"); =20 status =3D devm_rc_register_device(dev, cec->ir); =20 if (status) { - dev_err(dev, "Failed to prepare input device"); + dev_err(dev, "Failed to prepare input device\n"); cec->ir =3D NULL; goto err; } @@ -408,7 +408,7 @@ static int secocec_ir_probe(void *priv) smb_wr16(SECOCEC_ENABLE_REG_1, val & ~SECOCEC_ENABLE_REG_1_IR); =20 - dev_dbg(dev, "IR disabled"); + dev_dbg(dev, "IR disabled\n"); return status; } =20 @@ -431,13 +431,13 @@ static int secocec_ir_rx(struct secocec_data *priv) =20 rc_keydown(cec->ir, RC_PROTO_RC5, RC_SCANCODE_RC5(addr, key), toggle); =20 - dev_dbg(dev, "IR key pressed: 0x%02x addr 0x%02x toggle 0x%02x", key, + dev_dbg(dev, "IR key pressed: 0x%02x addr 0x%02x toggle 0x%02x\n", key, addr, toggle); =20 return 0; =20 err: - dev_err(dev, "IR Receive message failed (%d)", status); + dev_err(dev, "IR Receive message failed (%d)\n", status); return -EIO; } #else @@ -497,7 +497,7 @@ static irqreturn_t secocec_irq_handler(int irq, void *p= riv) return IRQ_HANDLED; =20 err: - dev_err_once(dev, "IRQ: R/W SMBus operation failed (%d)", status); + dev_err_once(dev, "IRQ: R/W SMBus operation failed %d\n", status); =20 /* Reset status register */ val =3D SECOCEC_STATUS_REG_1_CEC | SECOCEC_STATUS_REG_1_IR; @@ -553,16 +553,16 @@ static int secocec_acpi_probe(struct secocec_data *sd= ev) =20 gpio =3D devm_gpiod_get(dev, NULL, GPIOF_IN); if (IS_ERR(gpio)) { - dev_err(dev, "Cannot request interrupt gpio"); + dev_err(dev, "Cannot request interrupt gpio\n"); return PTR_ERR(gpio); } =20 irq =3D gpiod_to_irq(gpio); if (irq < 0) { - dev_err(dev, "Cannot find valid irq"); + dev_err(dev, "Cannot find valid irq\n"); return -ENODEV; } - dev_dbg(dev, "irq-gpio is bound to IRQ %d", irq); + dev_dbg(dev, "irq-gpio is bound to IRQ %d\n", irq); =20 sdev->irq =3D irq; =20 @@ -590,7 +590,7 @@ static int secocec_probe(struct platform_device *pdev) =20 /* Request SMBus regions */ if (!request_muxed_region(BRA_SMB_BASE_ADDR, 7, "CEC00001")) { - dev_err(dev, "Request memory region failed"); + dev_err(dev, "Request memory region failed\n"); return -ENXIO; } =20 @@ -598,14 +598,14 @@ static int secocec_probe(struct platform_device *pdev) secocec->dev =3D dev; =20 if (!has_acpi_companion(dev)) { - dev_dbg(dev, "Cannot find any ACPI companion"); + dev_dbg(dev, "Cannot find any ACPI companion\n"); ret =3D -ENODEV; goto err; } =20 ret =3D secocec_acpi_probe(secocec); if (ret) { - dev_err(dev, "Cannot assign gpio to IRQ"); + dev_err(dev, "Cannot assign gpio to IRQ\n"); ret =3D -ENODEV; goto err; } @@ -613,11 +613,11 @@ static int secocec_probe(struct platform_device *pdev) /* Firmware version check */ ret =3D smb_rd16(SECOCEC_VERSION, &val); if (ret) { - dev_err(dev, "Cannot check fw version"); + dev_err(dev, "Cannot check fw version\n"); goto err; } if (val < SECOCEC_LATEST_FW) { - dev_err(dev, "CEC Firmware not supported (v.%04x). Use ver > v.%04x", + dev_err(dev, "CEC Firmware not supported (v.%04x). Use ver > v.%04x\n", val, SECOCEC_LATEST_FW); ret =3D -EINVAL; goto err; @@ -631,7 +631,7 @@ static int secocec_probe(struct platform_device *pdev) dev_name(&pdev->dev), secocec); =20 if (ret) { - dev_err(dev, "Cannot request IRQ %d", secocec->irq); + dev_err(dev, "Cannot request IRQ %d\n", secocec->irq); ret =3D -EIO; goto err; } @@ -666,7 +666,7 @@ static int secocec_probe(struct platform_device *pdev) =20 platform_set_drvdata(pdev, secocec); =20 - dev_dbg(dev, "Device registered"); + dev_dbg(dev, "Device registered\n"); =20 return ret; =20 @@ -691,14 +691,14 @@ static int secocec_remove(struct platform_device *pde= v) =20 smb_wr16(SECOCEC_ENABLE_REG_1, val & ~SECOCEC_ENABLE_REG_1_IR); =20 - dev_dbg(&pdev->dev, "IR disabled"); + dev_dbg(&pdev->dev, "IR disabled\n"); } cec_notifier_cec_adap_unregister(secocec->notifier, secocec->cec_adap); cec_unregister_adapter(secocec->cec_adap); =20 release_region(BRA_SMB_BASE_ADDR, 7); =20 - dev_dbg(&pdev->dev, "CEC device removed"); + dev_dbg(&pdev->dev, "CEC device removed\n"); =20 return 0; } @@ -709,7 +709,7 @@ static int secocec_suspend(struct device *dev) int status; u16 val; =20 - dev_dbg(dev, "Device going to suspend, disabling"); + dev_dbg(dev, "Device going to suspend, disabling\n"); =20 /* Clear the status register */ status =3D smb_rd16(SECOCEC_STATUS_REG_1, &val); @@ -733,7 +733,7 @@ static int secocec_suspend(struct device *dev) return 0; =20 err: - dev_err(dev, "Suspend failed (err: %d)", status); + dev_err(dev, "Suspend failed: %d\n", status); return status; } =20 @@ -742,7 +742,7 @@ static int secocec_resume(struct device *dev) int status; u16 val; =20 - dev_dbg(dev, "Resuming device from suspend"); + dev_dbg(dev, "Resuming device from suspend\n"); =20 /* Clear the status register */ status =3D smb_rd16(SECOCEC_STATUS_REG_1, &val); @@ -762,12 +762,12 @@ static int secocec_resume(struct device *dev) if (status) goto err; =20 - dev_dbg(dev, "Device resumed from suspend"); + dev_dbg(dev, "Device resumed from suspend\n"); =20 return 0; =20 err: - dev_err(dev, "Resume failed (err: %d)", status); + dev_err(dev, "Resume failed: %d\n", status); return status; } =20 --=20 2.17.1