Skip to contentSkip to conversation

b43: Add mask/set capability to debugfs MMIO interface

PATCH New Michael Buesch 1 participant 1 message Jun 19, 2008 Networking drivers (wireless)

lore
Share & tools
lore

Michael Buesch

author
#0 lore raw

PATCH 1/1 b43: Add mask/set capability to debugfs MMIO interface

This adds an atomic mask/set capability to the debugfs MMIO interface. This is needed to support mask and/or set operations from the userspace debugging tools.

Signed-off-by Michael Buesch <[email protected]>

---

John, please queue this for 2.6.27

drivers/net/wireless/b43/debugfs.c +30 -8
Index: wireless-testing/drivers/net/wireless/b43/debugfs.c
===================================================================
@@ -264,32 +264,43 @@ static int mmio16read__write_file(struct
 
 	res = sscanf(buf, "0x%X", &addr);
 	if (res != 1)
 		return -EINVAL;
 	if (addr > B43_MAX_MMIO_ACCESS)
 		return -EADDRNOTAVAIL;
+	if ((addr % 2) != 0)
+		return -EINVAL;
 
 	dev->dfsentry->mmio16read_next = addr;
 
 	return 0;
 }
 
 static int mmio16write__write_file(struct b43_wldev *dev,
 				   const char *buf, size_t count)
 {
-	unsigned int addr, val;
+	unsigned int addr, mask, set;
 	int res;
+	u16 val;
 
-	res = sscanf(buf, "0x%X = 0x%X", &addr, &val);
-	if (res != 2)
+	res = sscanf(buf, "0x%X 0x%X 0x%X", &addr, &mask, &set);
+	if (res != 3)
 		return -EINVAL;
 	if (addr > B43_MAX_MMIO_ACCESS)
 		return -EADDRNOTAVAIL;
-	if (val > 0xFFFF)
+	if ((mask > 0xFFFF) || (set > 0xFFFF))
 		return -E2BIG;
+	if ((addr % 2) != 0)
+		return -EINVAL;
 
+	if (mask == 0)
+		val = 0;
+	else
+		val = b43_read16(dev, addr);
+	val &= mask;
+	val |= set;
 	b43_write16(dev, addr, val);
 
 	return 0;
 }
 
 static ssize_t mmio32read__read_file(struct b43_wldev *dev,

@@ -317,32 +328,43 @@ static int mmio32read__write_file(struct
 
 	res = sscanf(buf, "0x%X", &addr);
 	if (res != 1)
 		return -EINVAL;
 	if (addr > B43_MAX_MMIO_ACCESS)
 		return -EADDRNOTAVAIL;
+	if ((addr % 4) != 0)
+		return -EINVAL;
 
 	dev->dfsentry->mmio32read_next = addr;
 
 	return 0;
 }
 
 static int mmio32write__write_file(struct b43_wldev *dev,
 				   const char *buf, size_t count)
 {
-	unsigned int addr, val;
+	unsigned int addr, mask, set;
 	int res;
+	u32 val;
 
-	res = sscanf(buf, "0x%X = 0x%X", &addr, &val);
-	if (res != 2)
+	res = sscanf(buf, "0x%X 0x%X 0x%X", &addr, &mask, &set);
+	if (res != 3)
 		return -EINVAL;
 	if (addr > B43_MAX_MMIO_ACCESS)
 		return -EADDRNOTAVAIL;
-	if (val > 0xFFFFFFFF)
+	if ((mask > 0xFFFFFFFF) || (set > 0xFFFFFFFF))
 		return -E2BIG;
+	if ((addr % 4) != 0)
+		return -EINVAL;
 
+	if (mask == 0)
+		val = 0;
+	else
+		val = b43_read32(dev, addr);
+	val &= mask;
+	val |= set;
 	b43_write32(dev, addr, val);
 
 	return 0;
 }
 
 /* wl->irq_lock is locked */