public inbox for linux-arch@vger.kernel.org
 help / color / mirror / Atom feed
From: Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>
To: Alexandre Belloni
	<alexandre.belloni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
Cc: Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>,
	geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org,
	gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org,
	deller-Mmb7MZpHnFY@public.gmane.org,
	benh-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org,
	mpe-Gsx/Oe8HsFggBc27wqDAHg@public.gmane.org,
	dalias-8zAoT0mYgF4@public.gmane.org,
	dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org,
	linux-alpha-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	a.zummo-BfzFCNDTiLLj+vYz1yj4TQ@public.gmane.org,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-parisc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org,
	linux-sh-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-m68k-cunTk1MwBs8S/qaLPR03pWD2FQJk+8+b@public.gmane.org,
	rtc-linux-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org,
	linux-arch-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: [PATCH v4 10/16] rtc: m68k: provide ioctl for q40
Date: Mon, 30 May 2016 20:57:58 +0200	[thread overview]
Message-ID: <1464634684-1248135-11-git-send-email-arnd@arndb.de> (raw)
In-Reply-To: <1464634684-1248135-1-git-send-email-arnd-r2nGTMty4D4@public.gmane.org>

The q40 platform is the only machine in the kernel that provides
RTC_PLL_GET/RTC_PLL_SET ioctl commands in its rtc through the
mach_get_rtc_pll/mach_set_rtc_pll callbacks.

However, this currenctly works only in the old-style genrtc
driver, not the (somewhat) modern rtc-generic driver replacing
it. This adds an ioctl implementation to the m68k generic_rtc_ops
in order to let both drivers provide the same API.

After this, we should be able to remove support for genrtc
from the m68k architecture.

Signed-off-by: Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>
---
 arch/m68k/kernel/time.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c
index bd6417d38d5a..4e5aa2f4f522 100644
--- a/arch/m68k/kernel/time.c
+++ b/arch/m68k/kernel/time.c
@@ -100,7 +100,32 @@ static int rtc_generic_set_time(struct device *dev, struct rtc_time *tm)
 	return 0;
 }
 
+static int rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)
+{
+	struct rtc_pll_info pll;
+	struct rtc_pll_info __user *argp = (void __user *)arg;
+
+	switch (cmd) {
+	case RTC_PLL_GET:
+		if (!mach_get_rtc_pll || mach_get_rtc_pll(&pll))
+			return -EINVAL;
+		return copy_to_user(argp, &pll, sizeof pll) ? -EFAULT : 0;
+
+	case RTC_PLL_SET:
+		if (!mach_set_rtc_pll)
+			return -EINVAL;
+		if (!capable(CAP_SYS_TIME))
+			return -EACCES;
+		if (copy_from_user(&pll, argp, sizeof(pll)))
+			return -EFAULT;
+		return mach_set_rtc_pll(&pll);
+	}
+
+	return -ENOIOCTLCMD;
+}
+
 static const struct rtc_class_ops generic_rtc_ops = {
+	.ioctl = rtc_ioctl,
 	.read_time = rtc_generic_get_time,
 	.set_time = rtc_generic_set_time,
 };
-- 
2.7.0

-- 
You received this message because you are subscribed to "rtc-linux".
Membership options at http://groups.google.com/group/rtc-linux .
Please read http://groups.google.com/group/rtc-linux/web/checklist
before submitting a driver.
--- 
You received this message because you are subscribed to the Google Groups "rtc-linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to rtc-linux+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org
For more options, visit https://groups.google.com/d/optout.

WARNING: multiple messages have this Message-ID (diff)
From: Arnd Bergmann <arnd@arndb.de>
To: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Cc: Arnd Bergmann <arnd@arndb.de>,
	geert@linux-m68k.org, gregkh@linuxfoundation.org, deller@gmx.de,
	benh@kernel.crashing.org, mpe@ellerman.id.au, dalias@libc.org,
	dhowells@redhat.com, linux-alpha@vger.kernel.org,
	a.zummo@towertech.it, linux-kernel@vger.kernel.org,
	linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
	linux-sh@vger.kernel.org, linux-m68k@lists.linux-m68k.org,
	rtc-linux@googlegroups.com, linux-arch@vger.kernel.org
Subject: [PATCH v4 10/16] rtc: m68k: provide ioctl for q40
Date: Mon, 30 May 2016 20:57:58 +0200	[thread overview]
Message-ID: <1464634684-1248135-11-git-send-email-arnd@arndb.de> (raw)
Message-ID: <20160530185758.ZEdwM9teYAyMZjQPovqmQ0K0kUjB38IiFtwOaTzHxgk@z> (raw)
In-Reply-To: <1464634684-1248135-1-git-send-email-arnd@arndb.de>

The q40 platform is the only machine in the kernel that provides
RTC_PLL_GET/RTC_PLL_SET ioctl commands in its rtc through the
mach_get_rtc_pll/mach_set_rtc_pll callbacks.

However, this currenctly works only in the old-style genrtc
driver, not the (somewhat) modern rtc-generic driver replacing
it. This adds an ioctl implementation to the m68k generic_rtc_ops
in order to let both drivers provide the same API.

After this, we should be able to remove support for genrtc
from the m68k architecture.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 arch/m68k/kernel/time.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c
index bd6417d38d5a..4e5aa2f4f522 100644
--- a/arch/m68k/kernel/time.c
+++ b/arch/m68k/kernel/time.c
@@ -100,7 +100,32 @@ static int rtc_generic_set_time(struct device *dev, struct rtc_time *tm)
 	return 0;
 }
 
+static int rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)
+{
+	struct rtc_pll_info pll;
+	struct rtc_pll_info __user *argp = (void __user *)arg;
+
+	switch (cmd) {
+	case RTC_PLL_GET:
+		if (!mach_get_rtc_pll || mach_get_rtc_pll(&pll))
+			return -EINVAL;
+		return copy_to_user(argp, &pll, sizeof pll) ? -EFAULT : 0;
+
+	case RTC_PLL_SET:
+		if (!mach_set_rtc_pll)
+			return -EINVAL;
+		if (!capable(CAP_SYS_TIME))
+			return -EACCES;
+		if (copy_from_user(&pll, argp, sizeof(pll)))
+			return -EFAULT;
+		return mach_set_rtc_pll(&pll);
+	}
+
+	return -ENOIOCTLCMD;
+}
+
 static const struct rtc_class_ops generic_rtc_ops = {
+	.ioctl = rtc_ioctl,
 	.read_time = rtc_generic_get_time,
 	.set_time = rtc_generic_set_time,
 };
-- 
2.7.0


  parent reply	other threads:[~2016-05-30 18:57 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-30 18:57 [PATCH v4 00/16] genrtc removal Arnd Bergmann
2016-05-30 18:57 ` Arnd Bergmann
     [not found] ` <1464634684-1248135-1-git-send-email-arnd-r2nGTMty4D4@public.gmane.org>
2016-05-30 18:57   ` [PATCH v4 01/16] rtc: cmos: remove empty asm/mc146818rtc.h files Arnd Bergmann
2016-05-30 18:57     ` Arnd Bergmann
2016-05-30 18:57   ` [PATCH v4 02/16] rtc: cmos: move mc146818rtc code out of asm-generic/rtc.h Arnd Bergmann
2016-05-30 18:57     ` Arnd Bergmann
2016-05-30 18:57   ` [PATCH v4 03/16] char/genrtc: x86: remove remnants of asm/rtc.h Arnd Bergmann
2016-05-30 18:57     ` Arnd Bergmann
2016-05-30 18:57   ` [PATCH v4 04/16] rtc: sh: provide rtc_class_ops directly Arnd Bergmann
2016-05-30 18:57     ` Arnd Bergmann
     [not found]     ` <1464634684-1248135-5-git-send-email-arnd-r2nGTMty4D4@public.gmane.org>
2016-06-01 21:58       ` Rich Felker
2016-06-01 21:58         ` Rich Felker
2016-05-30 18:57   ` [PATCH v4 05/16] char/genrtc: remove alpha support Arnd Bergmann
2016-05-30 18:57     ` Arnd Bergmann
2016-05-30 18:57   ` [PATCH v4 06/16] char/genrtc: remove mn10300 support Arnd Bergmann
2016-05-30 18:57     ` Arnd Bergmann
2016-05-30 18:57   ` [PATCH v4 07/16] rtc: parisc: provide rtc_class_ops directly Arnd Bergmann
2016-05-30 18:57     ` Arnd Bergmann
2016-05-30 18:57   ` [PATCH v4 08/16] char/genrtc: remove parisc support Arnd Bergmann
2016-05-30 18:57     ` Arnd Bergmann
2016-05-30 18:57   ` [PATCH v4 09/16] rtc: m68k: provide rtc_class_ops directly Arnd Bergmann
2016-05-30 18:57     ` Arnd Bergmann
2016-05-30 18:57   ` Arnd Bergmann [this message]
2016-05-30 18:57     ` [PATCH v4 10/16] rtc: m68k: provide ioctl for q40 Arnd Bergmann
2016-05-30 18:57   ` [PATCH v4 11/16] char/genrtc: remove m68k support Arnd Bergmann
2016-05-30 18:57     ` Arnd Bergmann
2016-05-30 18:58   ` [PATCH v4 12/16] rtc: powerpc: provide rtc_class_ops directly Arnd Bergmann
2016-05-30 18:58     ` Arnd Bergmann
2016-05-30 18:58   ` [PATCH v4 13/16] char/genrtc: remove powerpc support Arnd Bergmann
2016-05-30 18:58     ` Arnd Bergmann
2016-05-30 18:58   ` [PATCH v4 14/16] rtc: generic: remove get_rtc_time/set_rtc_time wrappers Arnd Bergmann
2016-05-30 18:58     ` Arnd Bergmann
2016-05-30 18:58   ` [PATCH v4 15/16] char/genrtc: remove asm-generic/rtc.h from mips Arnd Bergmann
2016-05-30 18:58     ` Arnd Bergmann
2016-05-30 18:58   ` [PATCH v4 16/16] char/genrtc: remove the rest of the driver Arnd Bergmann
2016-05-30 18:58     ` Arnd Bergmann
2016-05-30 20:32   ` [PATCH v4 00/16] genrtc removal Alexandre Belloni
2016-05-30 20:32     ` Alexandre Belloni
     [not found]     ` <20160530203207.GY3451-m++hUPXGwpdeoWH0uzbU5w@public.gmane.org>
2016-05-31  6:56       ` Geert Uytterhoeven
2016-05-31  6:56         ` Geert Uytterhoeven

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=1464634684-1248135-11-git-send-email-arnd@arndb.de \
    --to=arnd-r2ngtmty4d4@public.gmane.org \
    --cc=a.zummo-BfzFCNDTiLLj+vYz1yj4TQ@public.gmane.org \
    --cc=alexandre.belloni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org \
    --cc=benh-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org \
    --cc=dalias-8zAoT0mYgF4@public.gmane.org \
    --cc=deller-Mmb7MZpHnFY@public.gmane.org \
    --cc=dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
    --cc=geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org \
    --cc=gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org \
    --cc=linux-alpha-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-arch-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-m68k-cunTk1MwBs8S/qaLPR03pWD2FQJk+8+b@public.gmane.org \
    --cc=linux-parisc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-sh-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org \
    --cc=mpe-Gsx/Oe8HsFggBc27wqDAHg@public.gmane.org \
    --cc=rtc-linux-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org \
    /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