From patchwork Thu Feb 8 16:58:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 198528 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:50ea:b0:106:860b:bbdd with SMTP id r10csp372823dyd; Thu, 8 Feb 2024 10:37:11 -0800 (PST) X-Google-Smtp-Source: AGHT+IERomNj7QzzKi9QAUgCJKz3besoA2e8RAw0lSuIXCdWp4+yzbRS4bGClkXgtFaKtJfKkiYZ X-Received: by 2002:aa7:da4c:0:b0:55f:f73d:c63b with SMTP id w12-20020aa7da4c000000b0055ff73dc63bmr70639eds.20.1707417431442; Thu, 08 Feb 2024 10:37:11 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707417431; cv=pass; d=google.com; s=arc-20160816; b=F8DrytearqzDL/BtBQXtzQvXVA5fohFu/EPb2phr3+e8f7o3vx0RyNVHsA/AExLVc6 VfOlF9uIx4/ivEwEd+oF6p8ky16FMI6YmYiWEOXFT3DtAlRAiRKwo7JaA30edFvFcBKD CewODfOYVQg0XSsbn+TqDJbexFKHzGoKi/lQyOffHUrW96YSkMcREhfd2qW51+Vp0tpP a+CxEp4pjCxqSO0mKcFWVD6xmLDt0VwuXqBiWU61a5B1ePPdaRUS/Ik35RehITTUSkLr +AQbqQQ5vU5ivxkusEMvDpBtWGltoPmhsLBQt1cp8RbzZX3533AXd0HvXnVn5F34eXqd ga2w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=ci8+yPmYIAEycgOmeyBYkSA3AVyOrdAO+npl1p35NmM=; fh=xC53Pxqkjj6vZ4JnH34JjzRG2xl82TNhwvoazYdR+x8=; b=J8nQ+0e0T9/xtAqWa3vJ8A+3AE08jU5bahCSFvHTaDz/aIpaI/2E+I6XqaVfisHnUz dyl9dci44nMgQakTrM19C8elqC0VWjdA52xshhdCVSX/mpoQ/8ZZl3VoV6z5Plag/IAa xZRjcV/keM/KnZLSeQ3a3F/gtW2LhCB1fVsFChaNeQoS/Ov8Y8ir6bJ5XQu6aHODUujk U5EjYA1uqGeNfKoW70R69vGqsLbMaqGVfJH6NkpBkgZ2HnvmvAYHVxzoBp7XhIcXRyLC ghF3nuVHFPF8SHQ/0qIRa9zoImMcpVGhu3Nyc475ACUcmaCQIIs0U4mLIdacC+jHv2af Q57g==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=jqWqYyXw; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-58441-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-58441-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Forwarded-Encrypted: i=2; AJvYcCXiSiied30WFhFoo5vE4K3MWMNzIPOPuSuLcc7PZ8qcFX8yl4RHa2m+1rD0KcJ1Oqct9OtGnxpKD/8qmAvj5qS0GGZcgw== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id b10-20020aa7c6ca000000b0056006ea87b5si1118277eds.422.2024.02.08.10.37.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Feb 2024 10:37:11 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-58441-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=jqWqYyXw; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-58441-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-58441-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 201F11F2A6C0 for ; Thu, 8 Feb 2024 17:20:30 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4E38F129A81; Thu, 8 Feb 2024 17:17:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="jqWqYyXw" Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B97EC86ADD; Thu, 8 Feb 2024 17:17:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.16 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707412658; cv=none; b=uKP19JLb8rHmrFamca7c7a9AYFwa76vm6KporXclgOwscpCrAXstcOkDlZup5EGDkpHTnzv5Z0vvug4WXsADSDDr436Znv89nWDbwwmMxx2XCWRqCDHGuIoA0i/6SSe/czxb0uTbUuDAo7TfN+Qh0J5KcMUEjNC/skypgqm2v3I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707412658; c=relaxed/simple; bh=D9KNXApzrQn/zL4buEhPq3QKCgL53LOywh6Etg3+aBQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bFjHG7AXVWPFdeY0F2LrNkpLTT4cMpkYwz0bMCvrDfihil4H4ArjpY0KeUYq0tP4ulK3dxTXkSjw3zMPgpA5eCYIxjwY2C3hKSxo4bEkr4KRj6ocoBKDyynCwjtlNG/grjSk4sa0SBY2aIIqGHK/iSgF96q9h1NbN0rcSt4tKBA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=jqWqYyXw; arc=none smtp.client-ip=192.198.163.16 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1707412656; x=1738948656; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=D9KNXApzrQn/zL4buEhPq3QKCgL53LOywh6Etg3+aBQ=; b=jqWqYyXwWSP71CQMfpDYLvg+aC3x2Q36JEMsA/WUkXexpXNwh9YPrBA4 vv1IWfPY3vNlLtEHG6I4bpDbMwjn9VxcM4abHcvzc4+0S6JFncNKnBDqq Y+uSdSs3dPVew9z+7AHmffkEt83Jw+aKS1RcpzADeyJKWoxCg+t/znp6W +OHgSpGPrtKgviktA/vTMJGo56VXX8bbffCOjjqeaBKoWVFRfRuO+Bv+Q 1OWhY9oz7LqkebMJ1ON06FHNujNuMCbhwj9dxiZtLIH24rbRO7c8ePHw1 z3aTO9zt3ae9cEDmCcHYyIkWKBbKC+g5Gu2v4HudBbwj7GKlkknXAXGAR w==; X-IronPort-AV: E=McAfee;i="6600,9927,10978"; a="1565691" X-IronPort-AV: E=Sophos;i="6.05,254,1701158400"; d="scan'208";a="1565691" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2024 09:17:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10978"; a="934195384" X-IronPort-AV: E=Sophos;i="6.05,254,1701158400"; d="scan'208";a="934195384" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 08 Feb 2024 09:17:32 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 6ED341529; Thu, 8 Feb 2024 18:59:41 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Miguel Ojeda , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Robin van der Gracht , Paul Burton , Geert Uytterhoeven Subject: [PATCH v1 09/15] auxdisplay: linedisp: Add support for overriding character mapping Date: Thu, 8 Feb 2024 18:58:52 +0200 Message-ID: <20240208165937.2221193-10-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1.gbec44491f096 In-Reply-To: <20240208165937.2221193-1-andriy.shevchenko@linux.intel.com> References: <20240208165937.2221193-1-andriy.shevchenko@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790356940402275637 X-GMAIL-MSGID: 1790356940402275637 There is already the driver using character mapping table for 7 or 14 segment display. It is possible to override it. Make the similar in the line display library to allow other drivers to utilise the same functionality. Signed-off-by: Andy Shevchenko --- drivers/auxdisplay/line-display.c | 111 +++++++++++++++++++++++++++++- drivers/auxdisplay/line-display.h | 31 +++++++++ 2 files changed, 140 insertions(+), 2 deletions(-) diff --git a/drivers/auxdisplay/line-display.c b/drivers/auxdisplay/line-display.c index 62e8a911bb12..da47fc59f6cb 100644 --- a/drivers/auxdisplay/line-display.c +++ b/drivers/auxdisplay/line-display.c @@ -22,6 +22,9 @@ #include #include +#include +#include + #include "line-display.h" #define DEFAULT_SCROLL_RATE (HZ / 2) @@ -188,12 +191,71 @@ static ssize_t scroll_step_ms_store(struct device *dev, static DEVICE_ATTR_RW(scroll_step_ms); +static ssize_t map_seg_show(struct device *dev, struct device_attribute *attr, char *buf) +{ + struct linedisp *linedisp = container_of(dev, struct linedisp, dev); + struct linedisp_map *map = linedisp->map; + + memcpy(buf, &map->map, map->size); + return map->size; +} + +static ssize_t map_seg_store(struct device *dev, struct device_attribute *attr, + const char *buf, size_t count) +{ + struct linedisp *linedisp = container_of(dev, struct linedisp, dev); + struct linedisp_map *map = linedisp->map; + + if (count != map->size) + return -EINVAL; + + memcpy(&map->map, buf, count); + return count; +} + +static const SEG7_DEFAULT_MAP(initial_map_seg7); +static DEVICE_ATTR(map_seg7, 0644, map_seg_show, map_seg_store); + +static const SEG14_DEFAULT_MAP(initial_map_seg14); +static DEVICE_ATTR(map_seg14, 0644, map_seg_show, map_seg_store); + static struct attribute *linedisp_attrs[] = { &dev_attr_message.attr, &dev_attr_scroll_step_ms.attr, - NULL, + &dev_attr_map_seg7.attr, + &dev_attr_map_seg14.attr, + NULL }; -ATTRIBUTE_GROUPS(linedisp); + +static umode_t linedisp_attr_is_visible(struct kobject *kobj, struct attribute *attr, int n) +{ + struct device *dev = kobj_to_dev(kobj); + struct linedisp *linedisp = container_of(dev, struct linedisp, dev); + struct linedisp_map *map = linedisp->map; + umode_t mode = attr->mode; + + if (attr == &dev_attr_map_seg7.attr) { + if (!map) + return 0; + if (map->type != LINEDISP_MAP_SEG7) + return 0; + } + + if (attr == &dev_attr_map_seg14.attr) { + if (!map) + return 0; + if (map->type != LINEDISP_MAP_SEG14) + return 0; + } + + return mode; +}; + +static const struct attribute_group linedisp_group = { + .is_visible = linedisp_attr_is_visible, + .attrs = linedisp_attrs, +}; +__ATTRIBUTE_GROUPS(linedisp); static DEFINE_IDA(linedisp_id); @@ -201,6 +263,7 @@ static void linedisp_release(struct device *dev) { struct linedisp *linedisp = container_of(dev, struct linedisp, dev); + kfree(linedisp->map); kfree(linedisp->message); ida_free(&linedisp_id, linedisp->id); } @@ -210,6 +273,44 @@ static const struct device_type linedisp_type = { .release = linedisp_release, }; +static int linedisp_init_map(struct linedisp *linedisp) +{ + struct linedisp_map *map; + int err; + + if (!linedisp->ops->get_map_type) + return 0; + + err = linedisp->ops->get_map_type(linedisp); + if (err < 0) + return err; + + map = kmalloc(sizeof(*map), GFP_KERNEL); + if (!map) + return -ENOMEM; + + map->type = err; + + /* assign initial mapping */ + switch (map->type) { + case LINEDISP_MAP_SEG7: + map->map.seg7 = initial_map_seg7; + map->size = sizeof(map->map.seg7); + break; + case LINEDISP_MAP_SEG14: + map->map.seg14 = initial_map_seg14; + map->size = sizeof(map->map.seg14); + break; + default: + kfree(map); + return -EINVAL; + } + + linedisp->map = map; + + return 0; +} + /** * linedisp_register - register a character line display * @linedisp: pointer to character line display structure @@ -241,6 +342,11 @@ int linedisp_register(struct linedisp *linedisp, struct device *parent, device_initialize(&linedisp->dev); dev_set_name(&linedisp->dev, "linedisp.%u", linedisp->id); + /* initialise a character mapping, if required */ + err = linedisp_init_map(linedisp); + if (err) + goto out_put_device; + /* initialise a timer for scrolling the message */ timer_setup(&linedisp->timer, linedisp_scroll, 0); @@ -259,6 +365,7 @@ int linedisp_register(struct linedisp *linedisp, struct device *parent, device_del(&linedisp->dev); out_del_timer: del_timer_sync(&linedisp->timer); +out_put_device: put_device(&linedisp->dev); return err; } diff --git a/drivers/auxdisplay/line-display.h b/drivers/auxdisplay/line-display.h index a4f0d1bf5848..65d782111f53 100644 --- a/drivers/auxdisplay/line-display.h +++ b/drivers/auxdisplay/line-display.h @@ -14,13 +14,43 @@ #include #include +#include +#include + struct linedisp; +/** + * enum linedisp_map_type - type of the character mapping + * @LINEDISP_MAP_SEG7: Map characters to 7 segment display + * @LINEDISP_MAP_SEG14: Map characters to 14 segment display + */ +enum linedisp_map_type { + LINEDISP_MAP_SEG7, + LINEDISP_MAP_SEG14, +}; + +/** + * struct linedisp_map - character mapping + * @type: type of the character mapping + * @map: conversion character mapping + * @size: size of the @map + */ +struct linedisp_map { + enum linedisp_map_type type; + union { + struct seg7_conversion_map seg7; + struct seg14_conversion_map seg14; + } map; + unsigned int size; +}; + /** * struct linedisp_ops - character line display operations + * @get_map_type: Function called to get the character mapping, if required * @update: Function called to update the display. This must not sleep! */ struct linedisp_ops { + int (*get_map_type)(struct linedisp *linedisp); void (*update)(struct linedisp *linedisp); }; @@ -42,6 +72,7 @@ struct linedisp { unsigned int id; struct timer_list timer; const struct linedisp_ops *ops; + struct linedisp_map *map; char *buf; char *message; unsigned int num_chars;