Commit d7e9660a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1623 commits)
  netxen: update copyright
  netxen: fix tx timeout recovery
  netxen: fix file firmware leak
  netxen: improve pci memory access
  netxen: change firmware write size
  tg3: Fix return ring size breakage
  netxen: build fix for INET=n
  cdc-phonet: autoconfigure Phonet address
  Phonet: back-end for autoconfigured addresses
  Phonet: fix netlink address dump error handling
  ipv6: Add IFA_F_DADFAILED flag
  net: Add DEVTYPE support for Ethernet based devices
  mv643xx_eth.c: remove unused txq_set_wrr()
  ucc_geth: Fix hangs after switching from full to half duplex
  ucc_geth: Rearrange some code to avoid forward declarations
  phy/marvell: Make non-aneg speed/duplex forcing work for 88E1111 PHYs
  drivers/net/phy: introduce missing kfree
  drivers/net/wan: introduce missing kfree
  net: force bridge module(s) to be GPL
  Subject: [PATCH] appletalk: Fix skb leak when ipddp interface is not loaded
  ...

Fixed up trivial conflicts:

 - arch/x86/include/asm/socket.h

   converted to <asm-generic/socket.h> in the x86 tree.  The generic
   header has the same new #define's, so that works out fine.

 - drivers/net/tun.c

   fix conflict between 89f56d1e ("tun: reuse struct sock fields") that
   switched over to using 'tun->socket.sk' instead of the redundantly
   available (and thus removed) 'tun->sk', and 2b980dbd ("lsm: Add hooks
   to the TUN driver") which added a new 'tun->sk' use.

   Noted in 'next' by Stephen Rothwell.
parents b8cb48aa 13af7a6e

Documentation/00-INDEX

+2 −0
Original line number Diff line number Diff line
@@ -82,6 +82,8 @@ block/ 
	- info on the Block I/O (BIO) layer.

blockdev/

	- info on block devices & drivers

btmrvl.txt

	- info on Marvell Bluetooth driver usage.

cachetlb.txt

	- describes the cache/TLB flushing interfaces Linux uses.

cdrom/

Documentation/btmrvl.txt

0 → 100644
+119 −0
Original line number Diff line number Diff line 
=======================================================================

		README for btmrvl driver

=======================================================================





All commands are used via debugfs interface.



=====================

Set/get driver configurations:



Path:	/debug/btmrvl/config/



gpiogap=[n]

hscfgcmd

	These commands are used to configure the host sleep parameters.

	bit 8:0  -- Gap

	bit 16:8 -- GPIO



	where GPIO is the pin number of GPIO used to wake up the host.

	It could be any valid GPIO pin# (e.g. 0-7) or 0xff (SDIO interface

	wakeup will be used instead).



	where Gap is the gap in milli seconds between wakeup signal and

	wakeup event, or 0xff for special host sleep setting.



	Usage:

		# Use SDIO interface to wake up the host and set GAP to 0x80:

		echo 0xff80 > /debug/btmrvl/config/gpiogap

		echo 1 > /debug/btmrvl/config/hscfgcmd



		# Use GPIO pin #3 to wake up the host and set GAP to 0xff:

		echo 0x03ff >  /debug/btmrvl/config/gpiogap

		echo 1 > /debug/btmrvl/config/hscfgcmd



psmode=[n]

pscmd

	These commands are used to enable/disable auto sleep mode



	where the option is:

			1 	-- Enable auto sleep mode

			0 	-- Disable auto sleep mode



	Usage:

		# Enable auto sleep mode

		echo 1 > /debug/btmrvl/config/psmode

		echo 1 > /debug/btmrvl/config/pscmd



		# Disable auto sleep mode

		echo 0 > /debug/btmrvl/config/psmode

		echo 1 > /debug/btmrvl/config/pscmd





hsmode=[n]

hscmd

	These commands are used to enable host sleep or wake up firmware



	where the option is:

			1	-- Enable host sleep

			0	-- Wake up firmware



	Usage:

		# Enable host sleep

		echo 1 > /debug/btmrvl/config/hsmode

		echo 1 > /debug/btmrvl/config/hscmd



		# Wake up firmware

		echo 0 > /debug/btmrvl/config/hsmode

		echo 1 > /debug/btmrvl/config/hscmd





======================

Get driver status:



Path:	/debug/btmrvl/status/



Usage:

	cat /debug/btmrvl/status/<args>



where the args are:



curpsmode

	This command displays current auto sleep status.



psstate

	This command display the power save state.



hsstate

	This command display the host sleep state.



txdnldrdy

	This command displays the value of Tx download ready flag.





=====================



Use hcitool to issue raw hci command, refer to hcitool manual



	Usage: Hcitool cmd <ogf> <ocf> [Parameters]



	Interface Control Command

	hcitool cmd 0x3f 0x5b 0xf5 0x01 0x00    --Enable All interface

	hcitool cmd 0x3f 0x5b 0xf5 0x01 0x01    --Enable Wlan interface

	hcitool cmd 0x3f 0x5b 0xf5 0x01 0x02    --Enable BT interface

	hcitool cmd 0x3f 0x5b 0xf5 0x00 0x00    --Disable All interface

	hcitool cmd 0x3f 0x5b 0xf5 0x00 0x01    --Disable Wlan interface

	hcitool cmd 0x3f 0x5b 0xf5 0x00 0x02    --Disable BT interface



=======================================================================





SD8688 firmware:



/lib/firmware/sd8688_helper.bin

/lib/firmware/sd8688.bin





The images can be downloaded from:



git.infradead.org/users/dwmw2/linux-firmware.git/libertas/

Documentation/connector/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -9,3 +9,8 @@ hostprogs-y := ucon 
always := $(hostprogs-y)



HOSTCFLAGS_ucon.o += -I$(objtree)/usr/include



all: modules



modules clean:

	$(MAKE) -C ../.. SUBDIRS=$(PWD) $@

Documentation/connector/cn_test.c

+18 −15
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */



#define pr_fmt(fmt) "cn_test: " fmt



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/moduleparam.h>
@@ -27,18 +29,17 @@ 


#include <linux/connector.h>



static struct cb_id cn_test_id = { 0x123, 0x456 };

static struct cb_id cn_test_id = { CN_NETLINK_USERS + 3, 0x456 };

static char cn_test_name[] = "cn_test";

static struct sock *nls;

static struct timer_list cn_test_timer;



void cn_test_callback(void *data)

static void cn_test_callback(struct cn_msg *msg)

{

	struct cn_msg *msg = (struct cn_msg *)data;



	printk("%s: %lu: idx=%x, val=%x, seq=%u, ack=%u, len=%d: %s.\n",

	pr_info("%s: %lu: idx=%x, val=%x, seq=%u, ack=%u, len=%d: %s.\n",

	        __func__, jiffies, msg->id.idx, msg->id.val,

	       msg->seq, msg->ack, msg->len, (char *)msg->data);

	        msg->seq, msg->ack, msg->len,

	        msg->len ? (char *)msg->data : "");

}



/*
@@ -63,9 +64,7 @@ static int cn_test_want_notify(void) 


	skb = alloc_skb(size, GFP_ATOMIC);

	if (!skb) {

		printk(KERN_ERR "Failed to allocate new skb with size=%u.\n",

		       size);



		pr_err("failed to allocate new skb with size=%u\n", size);

		return -ENOMEM;

	}
@@ -114,12 +113,12 @@ static int cn_test_want_notify(void) 
	//netlink_broadcast(nls, skb, 0, ctl->group, GFP_ATOMIC);

	netlink_unicast(nls, skb, 0, 0);



	printk(KERN_INFO "Request was sent. Group=0x%x.\n", ctl->group);

	pr_info("request was sent: group=0x%x\n", ctl->group);



	return 0;



nlmsg_failure:

	printk(KERN_ERR "Failed to send %u.%u\n", msg->seq, msg->ack);

	pr_err("failed to send %u.%u\n", msg->seq, msg->ack);

	kfree_skb(skb);

	return -EINVAL;

}
@@ -131,6 +130,8 @@ static void cn_test_timer_func(unsigned long __data) 
	struct cn_msg *m;

	char data[32];



	pr_debug("%s: timer fired with data %lu\n", __func__, __data);



	m = kzalloc(sizeof(*m) + sizeof(data), GFP_ATOMIC);

	if (m) {
@@ -150,7 +151,7 @@ static void cn_test_timer_func(unsigned long __data) 


	cn_test_timer_counter++;



	mod_timer(&cn_test_timer, jiffies + HZ);

	mod_timer(&cn_test_timer, jiffies + msecs_to_jiffies(1000));

}



static int cn_test_init(void)
@@ -168,8 +169,10 @@ static int cn_test_init(void) 
	}



	setup_timer(&cn_test_timer, cn_test_timer_func, 0);

	cn_test_timer.expires = jiffies + HZ;

	add_timer(&cn_test_timer);

	mod_timer(&cn_test_timer, jiffies + msecs_to_jiffies(1000));



	pr_info("initialized with id={%u.%u}\n",

		cn_test_id.idx, cn_test_id.val);



	return 0;

Documentation/connector/connector.txt

+61 −58
Original line number Diff line number Diff line
@@ -5,10 +5,10 @@ Kernel Connector. 
Kernel connector - new netlink based userspace <-> kernel space easy

to use communication module.



Connector driver adds possibility to connect various agents using

netlink based network.  One must register callback and

identifier. When driver receives special netlink message with

appropriate identifier, appropriate callback will be called.

The Connector driver makes it easy to connect various agents using a

netlink based network.  One must register a callback and an identifier.

When the driver receives a special netlink message with the appropriate

identifier, the appropriate callback will be called.



From the userspace point of view it's quite straightforward:
@@ -17,10 +17,10 @@ From the userspace point of view it's quite straightforward: 
	send();

	recv();



But if kernelspace want to use full power of such connections, driver

writer must create special sockets, must know about struct sk_buff

handling...  Connector allows any kernelspace agents to use netlink

based networking for inter-process communication in a significantly

But if kernelspace wants to use the full power of such connections, the

driver writer must create special sockets, must know about struct sk_buff

handling, etc...  The Connector driver allows any kernelspace agents to use

netlink based networking for inter-process communication in a significantly

easier way:



int cn_add_callback(struct cb_id *id, char *name, void (*callback) (void *));
@@ -32,10 +32,10 @@ struct cb_id 
	__u32			val;

};



idx and val are unique identifiers which must be registered in

connector.h for in-kernel usage.  void (*callback) (void *) - is a

callback function which will be called when message with above idx.val

will be received by connector core.  Argument for that function must

idx and val are unique identifiers which must be registered in the

connector.h header for in-kernel usage.  void (*callback) (void *) is a

callback function which will be called when a message with above idx.val

is received by the connector core.  The argument for that function must

be dereferenced to struct cn_msg *.



struct cn_msg
@@ -63,12 +63,14 @@ char *name - connector's callback symbolic name. 
 void (*callback) (void *)	- connector's callback.

				  Argument must be dereferenced to struct cn_msg *.





void cn_del_callback(struct cb_id *id);



 Unregisters new callback with connector core.



 struct cb_id *id		- unique connector's user identifier.





int cn_netlink_send(struct cn_msg *msg, u32 __groups, int gfp_mask);



 Sends message to the specified groups.  It can be safely called from
@@ -92,55 +94,56 @@ netlink group to the user which is equal to it's id.idx. 
Protocol description.

/*****************************************/



Current offers transport layer with fixed header.  Recommended

protocol which uses such header is following:

The current framework offers a transport layer with fixed headers.  The

recommended protocol which uses such a header is as following:



msg->seq and msg->ack are used to determine message genealogy.  When

someone sends message it puts there locally unique sequence and random

acknowledge numbers.  Sequence number may be copied into

someone sends a message, they use a locally unique sequence and random

acknowledge number.  The sequence number may be copied into

nlmsghdr->nlmsg_seq too.



Sequence number is incremented with each message to be sent.

The sequence number is incremented with each message sent.



If we expect reply to our message, then sequence number in received

message MUST be the same as in original message, and acknowledge

number MUST be the same + 1.

If you expect a reply to the message, then the sequence number in the

received message MUST be the same as in the original message, and the

acknowledge number MUST be the same + 1.



If we receive message and it's sequence number is not equal to one we

are expecting, then it is new message.  If we receive message and it's

sequence number is the same as one we are expecting, but it's

acknowledge is not equal acknowledge number in original message + 1,

then it is new message.

If we receive a message and its sequence number is not equal to one we

are expecting, then it is a new message.  If we receive a message and

its sequence number is the same as one we are expecting, but its

acknowledge is not equal to the acknowledge number in the original

message + 1, then it is a new message.



Obviously, protocol header contains above id.

Obviously, the protocol header contains the above id.



connector allows event notification in the following form: kernel

The connector allows event notification in the following form: kernel

driver or userspace process can ask connector to notify it when

selected id's will be turned on or off(registered or unregistered it's

callback). It is done by sending special command to connector

selected ids will be turned on or off (registered or unregistered its

callback).  It is done by sending a special command to the connector

driver (it also registers itself with id={-1, -1}).



As example of usage Documentation/connector now contains cn_test.c -

testing module which uses connector to request notification and to

send messages.

As example of this usage can be found in the cn_test.c module which

uses the connector to request notification and to send messages.



/*****************************************/

Reliability.

/*****************************************/



Netlink itself is not reliable protocol, that means that messages can

Netlink itself is not a reliable protocol.  That means that messages can

be lost due to memory pressure or process' receiving queue overflowed,

so caller is warned must be prepared. That is why struct cn_msg [main

connector's message header] contains u32 seq and u32 ack fields.

so caller is warned that it must be prepared.  That is why the struct

cn_msg [main connector's message header] contains u32 seq and u32 ack

fields.



/*****************************************/

Userspace usage.

/*****************************************/



2.6.14 has a new netlink socket implementation, which by default does not

allow to send data to netlink groups other than 1.

So, if to use netlink socket (for example using connector) 

with different group number userspace application must subscribe to 

that group. It can be achieved by following pseudocode:

allow people to send data to netlink groups other than 1.

So, if you wish to use a netlink socket (for example using connector)

with a different group number, the userspace application must subscribe to

that group first.  It can be achieved by the following pseudocode:



s = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_CONNECTOR);
@@ -160,8 +163,8 @@ if (bind(s, (struct sockaddr *)&l_local, sizeof(struct sockaddr_nl)) == -1) { 
}



Where 270 above is SOL_NETLINK, and 1 is a NETLINK_ADD_MEMBERSHIP socket

option. To drop multicast subscription one should call above socket option

with NETLINK_DROP_MEMBERSHIP parameter which is defined as 0.

option.  To drop a multicast subscription, one should call the above socket

option with the NETLINK_DROP_MEMBERSHIP parameter which is defined as 0.



2.6.14 netlink code only allows to select a group which is less or equal to

the maximum group number, which is used at netlink_kernel_create() time.

CRA Git | Maintained and supported by SUSTech CRA and CCSE