Skip to contentSkip to conversation

Assign IRQs to HPET Timers

PATCH Superseded Balaji Rao 3 participants 4 messages Jan 11, 2008 – Jan 14, 2008

Subsystems (4)
lore
Share & tools
lore

Balaji Rao

author
#0 lore raw

PATCH 1/1 Assign IRQs to HPET Timers

Assign an IRQ to HPET Timer devices when interrupt enable is requested. This now makes the HPET userspace API work.

drivers/char/hpet.c | 31 +++++++++++++++++++++++++++++--
include/linux/hpet.h | 2 +-

2 files changed, 30 insertions(+), 3 deletions(-)
drivers/char/hpet.c +29 -2
index 4c16778..92bd889 100644
@@ -390,7 +390,8 @@ static int hpet_ioctl_ieon(struct hpet_dev *devp)
 	struct hpets *hpetp;
 	int irq;
 	unsigned long g, v, t, m;
-	unsigned long flags, isr;
+	unsigned long flags, isr, irq_bitmap;
+	u64 hpet_config;
 
 	timer = devp->hd_timer;
 	hpet = devp->hd_hpet;
@@ -412,7 +413,29 @@ static int hpet_ioctl_ieon(struct hpet_dev *devp)
 		devp->hd_flags |= HPET_SHARED_IRQ;
 	spin_unlock_irq(&hpet_lock);
 
-	irq = devp->hd_hdwirq;
+	/* Assign an IRQ to the timer */
+	hpet_config = readq(&timer->hpet_config);
+	irq_bitmap =
+		(hpet_config & Tn_INT_ROUTE_CAP_MASK) >> Tn_INT_ROUTE_CAP_SHIFT;
+	if (!irq_bitmap)
+		irq = 0;	/* No IRQ Assignable */
+	else {
+		irq = find_first_bit(&irq_bitmap, 32);
+		do {
+			hpet_config |= irq << Tn_INT_ROUTE_CNF_SHIFT;
+			writeq(hpet_config, &timer->hpet_config);
+
+			/* Check whether we wrote a valid IRQ
+			 * number by reading back the field
+			 */
+			hpet_config = readq(&timer->hpet_config);
+			if (irq == (hpet_config & Tn_INT_ROUTE_CNF_MASK)
+					>> Tn_INT_ROUTE_CNF_SHIFT) {
+				devp->hd_hdwirq = irq;
+				break;	/* Success */
+			}
+		} while ((irq = (find_next_bit(&irq_bitmap, 32, irq))));
+	}
 
 	if (irq) {
 		unsigned long irq_flags;
@@ -509,6 +532,10 @@ hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg, int kernel)
 			break;
 		v = readq(&timer->hpet_config);
 		v &= ~Tn_INT_ENB_CNF_MASK;
+
+		/* Zero out the IRQ field*/
+		v &= ~Tn_INT_ROUTE_CNF_MASK;
+
 		writeq(v, &timer->hpet_config);
 		if (devp->hd_irq) {
 			free_irq(devp->hd_irq, devp);
include/linux/hpet.h +1 -1
index 707f7cb..e3c0b2a 100644
@@ -64,7 +64,7 @@ struct hpet {
  */
 
 #define	Tn_INT_ROUTE_CAP_MASK		(0xffffffff00000000ULL)
-#define	Tn_INI_ROUTE_CAP_SHIFT		(32UL)
+#define	Tn_INT_ROUTE_CAP_SHIFT		(32UL)
 #define	Tn_FSB_INT_DELCAP_MASK		(0x8000UL)
 #define	Tn_FSB_INT_DELCAP_SHIFT		(15)
 #define	Tn_FSB_EN_CNF_MASK		(0x4000UL)
#1 lore raw
Quoted 3 lines · Balaji Rao

Assign an IRQ to HPET Timer devices when interrupt enable is requested. This now makes the HPET userspace API work.

A more detailed changelog will better help understand the nature and origin of the problem and how to reproduce it.

Quoted 21 lines

drivers/char/hpet.c | 31 +++++++++++++++++++++++++++++--
include/linux/hpet.h | 2 +-

2 files changed, 30 insertions(+), 3 deletions(-)
drivers/char/hpet.c +2 -1
index 4c16778..92bd889 100644
@@ -390,7 +390,8 @@ static int hpet_ioctl_ieon(struct hpet_dev *devp)
 	struct hpets *hpetp;
 	int irq;
 	unsigned long g, v, t, m;
-	unsigned long flags, isr;
+	unsigned long flags, isr, irq_bitmap;
+	u64 hpet_config;
 
 	timer = devp->hd_timer;
 	hpet = devp->hd_hpet;

drivers/char/hpet.c static int hpet_ioctl_ieon(struct hpet_dev *devp) · line 419

Quoted 8 lines
drivers/char/hpet.c +4 -1
@@ -412,7 +413,29 @@ static int hpet_ioctl_ieon(struct hpet_dev *devp)
 		devp->hd_flags |= HPET_SHARED_IRQ;
 	spin_unlock_irq(&hpet_lock);
 
-	irq = devp->hd_hdwirq;
+	/* Assign an IRQ to the timer */
+	hpet_config = readq(&timer->hpet_config);
+	irq_bitmap =
+		(hpet_config & Tn_INT_ROUTE_CAP_MASK) >> Tn_INT_ROUTE_CAP_SHIFT;

Should we check if the interrupts are being delivered via FSB, prior to doing this?

Quoted 10 lines
drivers/char/hpet.c +9 -0
+	if (!irq_bitmap)
+		irq = 0;	/* No IRQ Assignable */
+	else {
+		irq = find_first_bit(&irq_bitmap, 32);
 
+		do {
+			hpet_config |= irq << Tn_INT_ROUTE_CNF_SHIFT;
+			writeq(hpet_config, &timer->hpet_config);
+
+			/* Check whether we wrote a valid IRQ

drivers/char/hpet.c static int hpet_ioctl_ieon(struct hpet_dev *devp) · line 439

Quoted 10 lines
drivers/char/hpet.c +10 -0
+			 * number by reading back the field
+			 */
+			hpet_config = readq(&timer->hpet_config);
+			if (irq == (hpet_config & Tn_INT_ROUTE_CNF_MASK)
+					>> Tn_INT_ROUTE_CNF_SHIFT) {
+				devp->hd_hdwirq = irq;
+				break;	/* Success */
+			}
+		} while ((irq = (find_next_bit(&irq_bitmap, 32, irq))));
+	}

Shouldn't we do this at hpet_alloc() time?

Quoted 19 lines
drivers/char/hpet.c +4 -0
 	if (irq) {
 		unsigned long irq_flags;
@@ -509,6 +532,10 @@ hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg, int kernel)
 			break;
 		v = readq(&timer->hpet_config);
 		v &= ~Tn_INT_ENB_CNF_MASK;
+
+		/* Zero out the IRQ field*/
+		v &= ~Tn_INT_ROUTE_CNF_MASK;
+
 		writeq(v, &timer->hpet_config);
 		if (devp->hd_irq) {
 			free_irq(devp->hd_irq, devp);
include/linux/hpet.h +0 -0
index 707f7cb..e3c0b2a 100644

include/linux/hpet.h struct hpet { · line 70

Quoted 8 lines
include/linux/hpet.h +1 -1
@@ -64,7 +64,7 @@ struct hpet {
  */
 
 #define	Tn_INT_ROUTE_CAP_MASK		(0xffffffff00000000ULL)
-#define	Tn_INI_ROUTE_CAP_SHIFT		(32UL)
+#define	Tn_INT_ROUTE_CAP_SHIFT		(32UL)
 #define	Tn_FSB_INT_DELCAP_MASK		(0x8000UL)
 #define	Tn_FSB_INT_DELCAP_SHIFT		(15)
 #define	Tn_FSB_EN_CNF_MASK		(0x4000UL)

The patch looks good overall!

Signature · 4 lines
	Warm Regards,
	Balbir Singh
	Linux Technology Center
	IBM, ISTL
author
#2 lore raw

PATCH RESEND 1/1 Assign IRQs to HPET Timers

The userspace API for the HPET (see Documentation/hpet.txt) did not work. The HPET_IE_ON ioctl was failing as there was no IRQ assigned to the timer device. This patch fixes it by allocating IRQs to timer blocks in the HPET.

arch/x86/kernel/hpet.c |   13 +++++--------
drivers/char/hpet.c    |   45 ++++++++++++++++++++++++++++++++++++++-------
include/linux/hpet.h   |    2 +-
3 files changed, 44 insertions(+), 16 deletions(-)
arch/x86/kernel/hpet.c +1 -2
index 4a86ffd..08ee998 100644
@@ -116,8 +116,7 @@ int is_hpet_enabled(void)
 static void hpet_reserve_platform_timers(unsigned long id)
 {
 	struct hpet __iomem *hpet = hpet_virt_address;
-	struct hpet_timer __iomem *timer = &hpet->hpet_timers[2];
-	unsigned int nrtimers, i;
+	unsigned int nrtimers;
 	struct hpet_data hd;
 
 	nrtimers = ((id & HPET_ID_NUMBER) >> HPET_ID_NUMBER_SHIFT) + 1;
@@ -132,16 +131,14 @@ static void hpet_reserve_platform_timers(unsigned long 

id)
#ifdef CONFIG_HPET_EMULATE_RTC
hpet_reserve_timer(&hd, 1);
#endif
-
hd.hd_irq[0] = HPET_LEGACY_8254;
hd.hd_irq[1] = HPET_LEGACY_RTC;

- for (i = 2; i < nrtimers; timer++, i++)
- hd.hd_irq[i] = (timer->hpet_config & Tn_INT_ROUTE_CNF_MASK) >>
- Tn_INT_ROUTE_CNF_SHIFT;
-
+ /*
+ * IRQs for the other timers are assigned dynamically
+ * in hpet_alloc
+ */
hpet_alloc(&hd);
-
}
#else
static void hpet_reserve_platform_timers(unsigned long id) { }

drivers/char/hpet.c +38 -7

70 lines not on this page · raw message

include/linux/hpet.h +1 -1
index 707f7cb..e3c0b2a 100644
@@ -64,7 +64,7 @@ struct hpet {
  */
 
 #define	Tn_INT_ROUTE_CAP_MASK		(0xffffffff00000000ULL)
-#define	Tn_INI_ROUTE_CAP_SHIFT		(32UL)
+#define	Tn_INT_ROUTE_CAP_SHIFT		(32UL)
 #define	Tn_FSB_INT_DELCAP_MASK		(0x8000UL)
 #define	Tn_FSB_INT_DELCAP_SHIFT		(15)
 #define	Tn_FSB_EN_CNF_MASK		(0x4000UL)

---

Applied
#3 lore raw
Quoted 4 lines · Balaji Rao

The userspace API for the HPET (see Documentation/hpet.txt) did not work. The HPET_IE_ON ioctl was failing as there was no IRQ assigned to the timer device. This patch fixes it by allocating IRQs to timer blocks in the HPET.

thanks, applied to x86.git. (sidenote: your patch was linewrapped, fixed that up. See Documentation/email-clients.txt)

Ingo