From patchwork Tue Apr 2 10:32:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Gladkov X-Patchwork-Id: 13613681 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 3AFFF5FDA5; Tue, 2 Apr 2024 10:33:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712054040; cv=none; b=TdkycNDLJM1GWG60W5wyCOriGyA3DBSoCFYpgRfIN81hN0OfYIBB6aVg+Hz+KnYKsKD4VnSXynE72bBiu1ccHq6DtjpnU3hC2bQRDhAJys89dFwwHq3BN8rEab16Y+E8s2tQE7WYub0k6GeyAkQHve/ouMMb+iBe0beo2ovxlvk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712054040; c=relaxed/simple; bh=rx4kXENAoMN7a/6wumwa5OJ0UaeWsUJLNDK7qwqHqog=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IR2RR6ICMECa6HiRpOCSpBmiNwH4fhDhjtTVM6XponZ/AvAvl/j1R8+TQ/GUcMT5xuq7pzic5EVvlCwqf3G6z/z1DUv9MEKSvHX5Uch8jvs34i3bjWUs5ABsnHEmPbpYIqF61uW7MaBKWhZykC5sRASTYt+4bfVcbZiMGM2b5po= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gC5Gfw8N; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="gC5Gfw8N" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F1327C43399; Tue, 2 Apr 2024 10:33:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1712054039; bh=rx4kXENAoMN7a/6wumwa5OJ0UaeWsUJLNDK7qwqHqog=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gC5Gfw8Nyh5VbrglWgmVJeSL/WlDAnThzoMGdXgAUvcTUCEZwZjtqL1LS4XOazeH9 h4Zt0ln2b78it8DcGXCdyCCl4CKiOyT1rN2RM8GmYUO5b3mXI/rj2mLTU2A7k/3CPu 9eB3njXNA5Cv6ViNuyhPBnCIOJb97x2RCgjgwITezpIAWHmvAXmlSD97yMkQetzvns vTYvRfP4sxwrfVVuvkf79iMhfpMBPWClfAZ0/y//d9jhQtgvKW25CEvR3jS20quJaV mQym7FaaiVYh073MuDjGGu+wRWt4f1B2mfjYNOKPo4/F7nlUZqyfWw7lHOtJzAGQBl B+0FZzrEnKZtg== From: Alexey Gladkov To: Greg Kroah-Hartman , Jiri Slaby Cc: LKML , kbd@lists.linux.dev, linux-api@vger.kernel.org, linux-fbdev@vger.kernel.org, linux-serial@vger.kernel.org, Helge Deller Subject: [RESEND PATCH v3 1/2] VT: Add KDFONTINFO ioctl Date: Tue, 2 Apr 2024 12:32:56 +0200 Message-ID: X-Mailer: git-send-email 2.44.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-fbdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Each driver has its own restrictions on font size. There is currently no way to understand what the requirements are. The new ioctl allows userspace to get the minmum and maximum font size values. Acked-by: Helge Deller Signed-off-by: Alexey Gladkov --- drivers/tty/vt/vt.c | 24 ++++++++++++++++++++++++ drivers/tty/vt/vt_ioctl.c | 13 +++++++++++++ include/linux/console.h | 2 ++ include/linux/vt_kern.h | 1 + include/uapi/linux/kd.h | 13 ++++++++++++- 5 files changed, 52 insertions(+), 1 deletion(-) diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c index 156efda7c80d..8c2a3d98b5ec 100644 --- a/drivers/tty/vt/vt.c +++ b/drivers/tty/vt/vt.c @@ -4680,6 +4680,30 @@ int con_font_op(struct vc_data *vc, struct console_font_op *op) return -ENOSYS; } +int con_font_info(struct vc_data *vc, struct console_font_info *info) +{ + int rc = -EINVAL; + + info->min_height = 0; + info->max_height = max_font_height; + + info->min_width = 0; + info->max_width = max_font_width; + + info->flags = KD_FONT_INFO_FLAG_LOW_SIZE | KD_FONT_INFO_FLAG_HIGH_SIZE; + + console_lock(); + if (vc->vc_mode != KD_TEXT) + rc = -EINVAL; + else if (vc->vc_sw->con_font_info) + rc = vc->vc_sw->con_font_info(vc, info); + else + rc = -ENOSYS; + console_unlock(); + + return rc; +} + /* * Interface exported to selection and vcs. */ diff --git a/drivers/tty/vt/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c index 8c685b501404..b3b4e4b69366 100644 --- a/drivers/tty/vt/vt_ioctl.c +++ b/drivers/tty/vt/vt_ioctl.c @@ -479,6 +479,19 @@ static int vt_k_ioctl(struct tty_struct *tty, unsigned int cmd, break; } + case KDFONTINFO: { + struct console_font_info fnt_info; + + if (copy_from_user(&fnt_info, up, sizeof(fnt_info))) + return -EFAULT; + ret = con_font_info(vc, &fnt_info); + if (ret) + return ret; + if (copy_to_user(up, &fnt_info, sizeof(fnt_info))) + return -EFAULT; + break; + } + default: return -ENOIOCTLCMD; } diff --git a/include/linux/console.h b/include/linux/console.h index 779d388af8a0..5bea6f6c2042 100644 --- a/include/linux/console.h +++ b/include/linux/console.h @@ -20,6 +20,7 @@ #include struct vc_data; +struct console_font_info; struct console_font_op; struct console_font; struct module; @@ -59,6 +60,7 @@ struct consw { unsigned int lines); int (*con_switch)(struct vc_data *vc); int (*con_blank)(struct vc_data *vc, int blank, int mode_switch); + int (*con_font_info)(struct vc_data *vc, struct console_font_info *info); int (*con_font_set)(struct vc_data *vc, struct console_font *font, unsigned int vpitch, unsigned int flags); int (*con_font_get)(struct vc_data *vc, struct console_font *font, diff --git a/include/linux/vt_kern.h b/include/linux/vt_kern.h index c1f5aebef170..6bda4cc1fe6f 100644 --- a/include/linux/vt_kern.h +++ b/include/linux/vt_kern.h @@ -32,6 +32,7 @@ void do_blank_screen(int entering_gfx); void do_unblank_screen(int leaving_gfx); void poke_blanked_console(void); int con_font_op(struct vc_data *vc, struct console_font_op *op); +int con_font_info(struct vc_data *vc, struct console_font_info *info); int con_set_cmap(unsigned char __user *cmap); int con_get_cmap(unsigned char __user *cmap); void scrollback(struct vc_data *vc); diff --git a/include/uapi/linux/kd.h b/include/uapi/linux/kd.h index 6b384065c013..781e086e55bf 100644 --- a/include/uapi/linux/kd.h +++ b/include/uapi/linux/kd.h @@ -183,8 +183,19 @@ struct console_font { #define KD_FONT_FLAG_DONT_RECALC 1 /* Don't recalculate hw charcell size [compat] */ +#define KDFONTINFO 0x4B73 /* font information */ + +#define KD_FONT_INFO_FLAG_LOW_SIZE (1U << 0) /* 256 */ +#define KD_FONT_INFO_FLAG_HIGH_SIZE (1U << 1) /* 512 */ + +struct console_font_info { + unsigned int min_width, min_height; /* minimal font size */ + unsigned int max_width, max_height; /* maximum font size */ + unsigned int flags; /* KD_FONT_INFO_FLAG_* */ +}; + /* note: 0x4B00-0x4B4E all have had a value at some time; don't reuse for the time being */ -/* note: 0x4B60-0x4B6D, 0x4B70-0x4B72 used above */ +/* note: 0x4B60-0x4B6D, 0x4B70-0x4B73 used above */ #endif /* _UAPI_LINUX_KD_H */