diff options
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/HOWTO | 32 | ||||
| -rw-r--r-- | Documentation/kernel-parameters.txt | 5 | ||||
| -rw-r--r-- | Documentation/networking/ip-sysctl.txt | 4 | ||||
| -rw-r--r-- | Documentation/stable_kernel_rules.txt | 25 | ||||
| -rw-r--r-- | Documentation/trace/postprocess/trace-vmscan-postprocess.pl | 8 | ||||
| -rw-r--r-- | Documentation/usb/s3c-otg-host.txt | 83 |
6 files changed, 130 insertions, 27 deletions
diff --git a/Documentation/HOWTO b/Documentation/HOWTO index f7ade3b..59c080f 100644 --- a/Documentation/HOWTO +++ b/Documentation/HOWTO @@ -218,16 +218,16 @@ The development process Linux kernel development process currently consists of a few different main kernel "branches" and lots of different subsystem-specific kernel branches. These different branches are: - - main 2.6.x kernel tree - - 2.6.x.y -stable kernel tree - - 2.6.x -git kernel patches + - main 3.x kernel tree + - 3.x.y -stable kernel tree + - 3.x -git kernel patches - subsystem specific kernel trees and patches - - the 2.6.x -next kernel tree for integration tests + - the 3.x -next kernel tree for integration tests -2.6.x kernel tree +3.x kernel tree ----------------- -2.6.x kernels are maintained by Linus Torvalds, and can be found on -kernel.org in the pub/linux/kernel/v2.6/ directory. Its development +3.x kernels are maintained by Linus Torvalds, and can be found on +kernel.org in the pub/linux/kernel/v3.x/ directory. Its development process is as follows: - As soon as a new kernel is released a two weeks window is open, during this period of time maintainers can submit big diffs to @@ -262,20 +262,20 @@ mailing list about kernel releases: released according to perceived bug status, not according to a preconceived timeline." -2.6.x.y -stable kernel tree +3.x.y -stable kernel tree --------------------------- -Kernels with 4-part versions are -stable kernels. They contain +Kernels with 3-part versions are -stable kernels. They contain relatively small and critical fixes for security problems or significant -regressions discovered in a given 2.6.x kernel. +regressions discovered in a given 3.x kernel. This is the recommended branch for users who want the most recent stable kernel and are not interested in helping test development/experimental versions. -If no 2.6.x.y kernel is available, then the highest numbered 2.6.x +If no 3.x.y kernel is available, then the highest numbered 3.x kernel is the current stable kernel. -2.6.x.y are maintained by the "stable" team <stable@vger.kernel.org>, and +3.x.y are maintained by the "stable" team <stable@vger.kernel.org>, and are released as needs dictate. The normal release period is approximately two weeks, but it can be longer if there are no pressing problems. A security-related problem, instead, can cause a release to happen almost @@ -285,7 +285,7 @@ The file Documentation/stable_kernel_rules.txt in the kernel tree documents what kinds of changes are acceptable for the -stable tree, and how the release process works. -2.6.x -git patches +3.x -git patches ------------------ These are daily snapshots of Linus' kernel tree which are managed in a git repository (hence the name.) These patches are usually released @@ -317,13 +317,13 @@ revisions to it, and maintainers can mark patches as under review, accepted, or rejected. Most of these patchwork sites are listed at http://patchwork.kernel.org/. -2.6.x -next kernel tree for integration tests +3.x -next kernel tree for integration tests --------------------------------------------- -Before updates from subsystem trees are merged into the mainline 2.6.x +Before updates from subsystem trees are merged into the mainline 3.x tree, they need to be integration-tested. For this purpose, a special testing repository exists into which virtually all subsystem trees are pulled on an almost daily basis: - http://git.kernel.org/?p=linux/kernel/git/sfr/linux-next.git + http://git.kernel.org/?p=linux/kernel/git/next/linux-next.git http://linux.f-seidel.de/linux-next/pmwiki/ This way, the -next kernel gives a summary outlook onto what will be diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index aa47be7..397ee05 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -1764,6 +1764,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted. noresidual [PPC] Don't use residual data on PReP machines. + nordrand [X86] Disable the direct use of the RDRAND + instruction even if it is supported by the + processor. RDRAND is still available to user + space applications. + noresume [SWSUSP] Disables resume and restores original swap space. diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt index bfe9242..7d4ecaa 100644 --- a/Documentation/networking/ip-sysctl.txt +++ b/Documentation/networking/ip-sysctl.txt @@ -147,7 +147,7 @@ tcp_adv_win_scale - INTEGER (if tcp_adv_win_scale > 0) or bytes-bytes/2^(-tcp_adv_win_scale), if it is <= 0. Possible values are [-31, 31], inclusive. - Default: 2 + Default: 1 tcp_allowed_congestion_control - STRING Show/set the congestion control choices available to non-privileged @@ -407,7 +407,7 @@ tcp_rmem - vector of 3 INTEGERs: min, default, max net.core.rmem_max. Calling setsockopt() with SO_RCVBUF disables automatic tuning of that socket's receive buffer size, in which case this value is ignored. - Default: between 87380B and 4MB, depending on RAM size. + Default: between 87380B and 6MB, depending on RAM size. tcp_sack - BOOLEAN Enable select acknowledgments (SACKS). diff --git a/Documentation/stable_kernel_rules.txt b/Documentation/stable_kernel_rules.txt index 21fd05c..22bf11b 100644 --- a/Documentation/stable_kernel_rules.txt +++ b/Documentation/stable_kernel_rules.txt @@ -1,4 +1,4 @@ -Everything you ever wanted to know about Linux 2.6 -stable releases. +Everything you ever wanted to know about Linux -stable releases. Rules on what kind of patches are accepted, and which ones are not, into the "-stable" tree: @@ -12,6 +12,12 @@ Rules on what kind of patches are accepted, and which ones are not, into the marked CONFIG_BROKEN), an oops, a hang, data corruption, a real security issue, or some "oh, that's not good" issue. In short, something critical. + - Serious issues as reported by a user of a distribution kernel may also + be considered if they fix a notable performance or interactivity issue. + As these fixes are not as obvious and have a higher risk of a subtle + regression they should only be submitted by a distribution kernel + maintainer and include an addendum linking to a bugzilla entry if it + exists and additional information on the user-visible impact. - New device IDs and quirks are also accepted. - No "theoretical race condition" issues, unless an explanation of how the race can be exploited is also provided. @@ -35,10 +41,10 @@ Procedure for submitting patches to the -stable tree: cherry-picked than this can be specified in the following format in the sign-off area: - Cc: <stable@vger.kernel.org> # .32.x: a1f84a3: sched: Check for idle - Cc: <stable@vger.kernel.org> # .32.x: 1b9508f: sched: Rate-limit newidle - Cc: <stable@vger.kernel.org> # .32.x: fd21073: sched: Fix affinity logic - Cc: <stable@vger.kernel.org> # .32.x + Cc: <stable@vger.kernel.org> # 3.3.x: a1f84a3: sched: Check for idle + Cc: <stable@vger.kernel.org> # 3.3.x: 1b9508f: sched: Rate-limit newidle + Cc: <stable@vger.kernel.org> # 3.3.x: fd21073: sched: Fix affinity logic + Cc: <stable@vger.kernel.org> # 3.3.x Signed-off-by: Ingo Molnar <mingo@elte.hu> The tag sequence has the meaning of: @@ -72,6 +78,15 @@ Review cycle: security kernel team, and not go through the normal review cycle. Contact the kernel security team for more details on this procedure. +Trees: + + - The queues of patches, for both completed versions and in progress + versions can be found at: + http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git + - The finalized and tagged releases of all stable kernels can be found + in separate branches per version at: + http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git + Review committee: diff --git a/Documentation/trace/postprocess/trace-vmscan-postprocess.pl b/Documentation/trace/postprocess/trace-vmscan-postprocess.pl index 12cecc8..4a37c47 100644 --- a/Documentation/trace/postprocess/trace-vmscan-postprocess.pl +++ b/Documentation/trace/postprocess/trace-vmscan-postprocess.pl @@ -379,10 +379,10 @@ EVENT_PROCESS: # To closer match vmstat scanning statistics, only count isolate_both # and isolate_inactive as scanning. isolate_active is rotation - # isolate_inactive == 0 - # isolate_active == 1 - # isolate_both == 2 - if ($isolate_mode != 1) { + # isolate_inactive == 1 + # isolate_active == 2 + # isolate_both == 3 + if ($isolate_mode != 2) { $perprocesspid{$process_pid}->{HIGH_NR_SCANNED} += $nr_scanned; } $perprocesspid{$process_pid}->{HIGH_NR_CONTIG_DIRTY} += $nr_contig_dirty; diff --git a/Documentation/usb/s3c-otg-host.txt b/Documentation/usb/s3c-otg-host.txt new file mode 100644 index 0000000..97e7f91 --- /dev/null +++ b/Documentation/usb/s3c-otg-host.txt @@ -0,0 +1,83 @@ +This file is a collection of notes on using the USB OTG port of the Samsung Galaxy Tab in HOST mode. + +1/17/12 - Zsolt Sz. Sztupak, mail@sztupy.hu, http://android.sztupy.hu + +Kevin's patch to the kernel was great, but it had some problems, namely: +* it was based on an old Froyo (or Eclair?) branch of the kernel, which still had a lot of old code, and methods + that were deprecated in later kernel versions +* the actual client/host changing code was put inside the 30pin connector file, which only exists in the Galaxy + Tab based Kernels + +The changes I've made are the following: +* port some of the deprecated code to kernel version 3.x +* change the otg detector/switcher code from the 30 pin connector module to the s3c otg gadget (client mode) module + +There is still a lof code not ported from the old kernel branch as it uses a lot of ugly old samsung kernel code, +which are non existent in later kernel versions. These include interrupt, LDO and clock switchings, which might +be the case of some of the hangups. + +8/24/11 - Kevin Hester, kevin@ridemission.com + +I'm writing this document to capture both the software and hardware changes needed for this device in one place. +If you are a brave Android kernel hacker, please try these changes out and send pull requests to github with any +fixes you add. I have been unable to find a 'master' github site where hobbyists are maintaining a master Samsung +kernel and Android OS, if you have such a site feel free to include my fixes (though credit would be appreciated). +These fixes are provided 'as-is' and you could bust your device or do any number of bad things. + +I'm going to post these notes on the xda forums, but for the latest code and documentation please see my github site. + +History: The Samsung open source kernel files (from opensource.samsung.com) contained a USB host mode driver for the +S5PC110 chipset. These drivers were located in drivers/usb/host/s3c-otg. The driver contained a number of bugs which +I've fixed and it now seems to work reasonably well for USB serial ports, flash drives etc. + +Hardware: To use USB host mode on your samsung tablet _external 5V DC seems to be required_. I have not found +turning any of the samsung LDOs on to make the unit provide USB power (if you find different, please let me know). + +To wire up a USB host mode cable you'll need the following pinout (found on a web forum): +1 Gnd P +2 Gnd P +3 USB_DP_CON I/O +4 USB_DM_CON I/O +5 IF_CON_SENSE I +6 V_ACCESSORY_5.0V P +7 V_BUS_1 P +8 V_BUS_1 P +9 VOUT_CHARGER P (gives out 4v when checked with a multimeter) +10 VOUT_CHARGER P (gives out 4v when checked with a multimeter) +11 --- -- +12 --- -- +13 ACCESSORY_ID / USB_ID I +14 ACCESSORY_INT I +15 Gnd P +16 Gnd P +17 MHL_DP I/O +18 MHL_DM I/O +19 MHL_ID I +20 IF_RXD I +21 IF_TXD O +22 --- -- +23 AP_TV_OUT O +24 REMOTE_SENSE I +25 --- -- +26 --- -- +27 EAR_L_CRADLE O +28 EAR_R_CRADLE O +29 3.5_INT_TEST I +30 Gnd P + +Your cable will need to connect the following five pins: +1 Gnd +3 USB_DP +4 USB_DM +8 5V+ (at least 1A if you want to support high speed charging of the tablet) +13 Host mode (attach to ground to run tablet as a host, or leave disconnected to run tablet as a USB target) + +A summary of my driver changes: +* Fix a nubmer of cases where TDs would be used after delete_td and the associated storage was freed (caused kernel +heap corruption) +* Allow a bit more time for some mystery Samsung LDO to power up before switching to host mode (caused failure in device detect) +* Wait for channel disabled interrupt when cancelling transactions (prevents a race condition with the ISR) +* Properly switch into USB host mode when a host mode cable is detected (see 30pin_con.c) +* Mark transfers as done when cancel_to_transfer_td is called (prevents rescheduling transactions we have freed) +* do not force is_need_to_insert_scheduler true in cancel_transfer, this caused list corruption in the ed list + |