Skip to contentSkip to conversation

STAGING patches for 2.6-git

PATCH New Greg KH 2 participants 7 messages Feb 9, 2009 Staging

lore
Share & tools
lore

Greg KH

author
#0 lore raw

PATCH 1/1 STAGING patches for 2.6-git

Here are some tiny staging patches fixing some build errors and Kconfig problems that people have reported.

And there's also a big patch in here that is a revert of a patch that went into 2.6.29-rc1 for the at76_usb driver. The linux-wireless developers asked that I revert it as it is conflicting with some work that they are currently doing. The revert wasn't a straight git-revert due to patches that had been made afterward, hence the by-hand revert.

Please pull from:
master.kernel.org:/pub/scm/linux/kernel/git/gregkh/staging-2.6.git/

All of these have been in the -next releases with no known build errors.

The patches will be sent as a follow-on to this message to lkml for people to see.

thanks,

greg k-h

--------------

 drivers/staging/android/Kconfig       |    1 +
 drivers/staging/android/ram_console.c |   14 +
 drivers/staging/android/timed_gpio.c  |    2 +-
 drivers/staging/at76_usb/Kconfig      |    2 +-
 drivers/staging/at76_usb/at76_usb.c   | 4620 ++++++++++++++++++++++++++-------
 drivers/staging/at76_usb/at76_usb.h   |  227 ++-
 drivers/staging/panel/panel.c         |   10 +-
 7 files changed, 3903 insertions(+), 973 deletions(-)

---------------

Arve Hjønnevåg (1):
Staging: android: ram_console: Disable ECC when early init is enabled and validate buffer size

Greg Kroah-Hartman (2):
Revert Staging: at76_usb: update drivers/staging/at76_usb w/ mac80211 port
Staging: android: fix up units in timed_gpio

Jamie Lentin (1):
Staging: at76_usb: Add support for OQO Model 01+

Jason Andryuk (1):
Staging: at76_usb: fix bugs introduced by "Staging: at76_usb: cleanup dma on stack issues"

Sachin P. Sant (1):
Staging: panel: fix lcd panel driver build failure

#1 lore raw

PATCH 1/6 Revert Staging: at76_usb: update drivers/staging/at76_usb w/ mac80211 port

Reverts 02227c28391b5059a7710d6039c52912b0ee2c1d
(Had to be done by hand due to other patches that had come after this.)

Turns out that we don't want the mac80211 port of this driver just yet, as there is a different driver working on adding this support.

So keep things old and different for now.

This is being reverted at the request of the linux-wireless developers.

Cc Kalle Valo <[email protected]>
Cc John W. Linville <[email protected]>
---
 drivers/staging/at76_usb/Kconfig    |    2 +-
 drivers/staging/at76_usb/at76_usb.c | 4614 ++++++++++++++++++++++++++++-------
 drivers/staging/at76_usb/at76_usb.h |  227 ++-
 3 files changed, 3878 insertions(+), 965 deletions(-)
drivers/staging/at76_usb/Kconfig +1 -1
index 4c0e55e..8606f96 100644
@@ -1,6 +1,6 @@
 config USB_ATMEL
 	tristate "Atmel at76c503/at76c505/at76c505a USB cards"
-	depends on MAC80211 && WLAN_80211 && USB
+	depends on WLAN_80211 && USB
 	default N
 	select FW_LOADER
 	---help---
drivers/staging/at76_usb/at76_usb.c +3708 -906

2,993 lines not on this page · raw message

drivers/staging/at76_usb/at76_usb.h +169 -58

227 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
1.6.0.2

Part of the diff is not shown here. View the raw message.

#2 lore raw

PATCH 2/6 Staging: at76_usb: fix bugs introduced by "Staging: at76_usb: cleanup dma on stack issues"

In reply to Greg KH

From: Jason Andryuk <[email protected]>

Tracking down the firmware loading problem led to this commit.

$ git bisect bad
0d1d1424330cc1934f2b2742f0cfa2c31e6a250b is first bad commit
commit 0d1d1424330cc1934f2b2742f0cfa2c31e6a250b
Author: Oliver Neukum <[email protected]>
Date:   Thu Dec 18 13:16:40 2008 +0100

Staging: at76_usb: cleanup dma on stack issues

- no DMA on stack
- cleanup unclear endianness issue

:040000 040000 c4fee9ea0fef25926229d810d19dc2f89cca9401
8b165a35d16280d2413b2700a6080ef290ca1009 M drivers

The "no DMA on stack" conversion was incomplete with respect to updating the arguments passed to usb_control_msg. The value 40 is hardcoded as it was prior to conversion.

The driver can now load firmware, but is not fully functional.

---
 drivers/staging/at76_usb/at76_usb.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/at76_usb/at76_usb.c +2 -2
index 9195ee9..06ae163 100644
@@ -649,7 +649,7 @@ static int at76_get_op_mode(struct usb_device *udev)
 		return -ENOMEM;
 	ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 0x33,
 			      USB_TYPE_VENDOR | USB_DIR_IN |
-			      USB_RECIP_INTERFACE, 0x01, 0, &op_mode, 1,
+			      USB_RECIP_INTERFACE, 0x01, 0, op_mode, 1,
 			      USB_CTRL_GET_TIMEOUT);
 	saved = *op_mode;
 	kfree(op_mode);
@@ -782,7 +782,7 @@ static inline int at76_get_cmd_status(struct usb_device *udev, u8 cmd)
 	ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 0x22,
 			      USB_TYPE_VENDOR | USB_DIR_IN |
 			      USB_RECIP_INTERFACE, cmd, 0, stat_buf,
-			      sizeof(stat_buf), USB_CTRL_GET_TIMEOUT);
+			      40, USB_CTRL_GET_TIMEOUT);
 	if (ret >= 0)
 		ret = stat_buf[5];
 	kfree(stat_buf);
Signature · 1 line
1.6.0.2
#3 lore raw

PATCH 3/6 Staging: at76_usb: Add support for OQO Model 01+

In reply to Greg KH

From: Jamie Lentin <[email protected]>

Add USB device ID for OQO 01+'s internal wireless LAN

An OQO employee mentions the chip's true identity here:-
ftp://ftp.oqo.com/unsupported/linux/OQOLinux.html

---
 drivers/staging/at76_usb/at76_usb.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
drivers/staging/at76_usb/at76_usb.c +2 -0
index 06ae163..c8e4d31 100644
@@ -231,6 +231,8 @@ static struct usb_device_id dev_table[] = {
 	{USB_DEVICE(0x03eb, 0x7617), USB_DEVICE_DATA(BOARD_505A)},
 	/* Siemens Gigaset USB WLAN Adapter 11 */
 	{USB_DEVICE(0x1690, 0x0701), USB_DEVICE_DATA(BOARD_505A)},
+	/* OQO Model 01+ Internal Wi-Fi */
+	{USB_DEVICE(0x1557, 0x0002), USB_DEVICE_DATA(BOARD_505A)},
 	/*
 	 * at76c505amx-rfmd
 	 */
Signature · 1 line
1.6.0.2
#4 lore raw

PATCH 4/6 Staging: android: ram_console: Disable ECC when early init is enabled and validate buffer size

In reply to Greg KH

From: Arve Hjønnevåg <[email protected]>

---
 drivers/staging/android/Kconfig       |    1 +
 drivers/staging/android/ram_console.c |   14 ++++++++++++++
 2 files changed, 15 insertions(+), 0 deletions(-)
drivers/staging/android/Kconfig +1 -0
index 6b996db..604bd1e 100644
@@ -27,6 +27,7 @@ menuconfig ANDROID_RAM_CONSOLE_ERROR_CORRECTION
 	bool "Android RAM Console Enable error correction"
 	default n
 	depends on ANDROID_RAM_CONSOLE
+	depends on !ANDROID_RAM_CONSOLE_EARLY_INIT
 	select REED_SOLOMON
 	select REED_SOLOMON_ENC8
 	select REED_SOLOMON_DEC8
drivers/staging/android/ram_console.c +14 -0
index bf00685..643ac5c 100644
@@ -224,9 +224,23 @@ static int __init ram_console_init(struct ram_console_buffer *buffer,
 	ram_console_buffer_size =
 		buffer_size - sizeof(struct ram_console_buffer);
 
+	if (ram_console_buffer_size > buffer_size) {
+		pr_err("ram_console: buffer %p, invalid size %d, datasize %d\n",
+		       buffer, buffer_size, ram_console_buffer_size);
+		return 0;
+	}
+
 #ifdef CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION
 	ram_console_buffer_size -= (DIV_ROUND_UP(ram_console_buffer_size,
 						ECC_BLOCK_SIZE) + 1) * ECC_SIZE;
+
+	if (ram_console_buffer_size > buffer_size) {
+		pr_err("ram_console: buffer %p, invalid size %d, "
+		       "non-ecc datasize %d\n",
+		       buffer, buffer_size, ram_console_buffer_size);
+		return 0;
+	}
+
 	ram_console_par_buffer = buffer->data + ram_console_buffer_size;
 
 
Signature · 1 line
1.6.0.2
#5 lore raw

PATCH 5/6 Staging: android: fix up units in timed_gpio

In reply to Greg KH

The last build fix I did messed up the units of the sysfs file.

This puts them back to be milliseconds, like they originally were.

Thanks to Juha Motorsportcom for pointing this out.

---
 drivers/staging/android/timed_gpio.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/staging/android/timed_gpio.c +1 -1
index 903270c..33daff0 100644
@@ -50,7 +50,7 @@ static ssize_t gpio_enable_show(struct device *dev, struct device_attribute *att
 	if (hrtimer_active(&gpio_data->timer)) {
 		ktime_t r = hrtimer_get_remaining(&gpio_data->timer);
 		struct timeval t = ktime_to_timeval(r);
-		remaining = t.tv_sec * 1000 + t.tv_usec;
+		remaining = t.tv_sec * 1000 + t.tv_usec / 1000;
 	} else
 		remaining = 0;
 
Signature · 1 line
1.6.0.2
#6 lore raw

PATCH 6/6 Staging: panel: fix lcd panel driver build failure

In reply to Greg KH

From: Sachin P. Sant <[email protected]>

* Fix build break for lcd panel driver.

---
 drivers/staging/panel/panel.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
drivers/staging/panel/panel.c +5 -5
index 5ffe269..ab69c1b 100644
@@ -622,7 +622,7 @@ static int set_ctrl_bits(void)
 }
 
 /* sets ctrl & data port bits according to current signals values */
-static void set_bits(void)
+static void panel_set_bits(void)
 {
 	set_data_bits();
 	set_ctrl_bits();
@@ -707,12 +707,12 @@ static void lcd_send_serial(int byte)
 	 */
 	for (bit = 0; bit < 8; bit++) {
 		bits.cl = BIT_CLR;	/* CLK low */
-		set_bits();
+		panel_set_bits();
 		bits.da = byte & 1;
-		set_bits();
+		panel_set_bits();
 		udelay(2);	/* maintain the data during 2 us before CLK up */
 		bits.cl = BIT_SET;	/* CLK high */
-		set_bits();
+		panel_set_bits();
 		udelay(1);	/* maintain the strobe during 1 us */
 		byte >>= 1;
 	}
@@ -727,7 +727,7 @@ static void lcd_backlight(int on)
 	/* The backlight is activated by seting the AUTOFEED line to +5V  */
 	spin_lock(&pprt_lock);
 	bits.bl = on;
-	set_bits();
+	panel_set_bits();
 	spin_unlock(&pprt_lock);
 }
 
Signature · 1 line
1.6.0.2