diff options
442 files changed, 14658 insertions, 3381 deletions
diff --git a/.gitignore b/.gitignore index a2939fc10b2..8faa6c02b39 100644 --- a/.gitignore +++ b/.gitignore | |||
@@ -28,6 +28,7 @@ modules.builtin | |||
28 | *.gz | 28 | *.gz |
29 | *.bz2 | 29 | *.bz2 |
30 | *.lzma | 30 | *.lzma |
31 | *.lzo | ||
31 | *.patch | 32 | *.patch |
32 | *.gcno | 33 | *.gcno |
33 | 34 | ||
diff --git a/Documentation/.gitignore b/Documentation/.gitignore new file mode 100644 index 00000000000..bcd907b4141 --- /dev/null +++ b/Documentation/.gitignore | |||
@@ -0,0 +1,7 @@ | |||
1 | filesystems/dnotify_test | ||
2 | laptops/dslm | ||
3 | timers/hpet_example | ||
4 | vm/hugepage-mmap | ||
5 | vm/hugepage-shm | ||
6 | vm/map_hugetlb | ||
7 | |||
diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl index 7583dc7cf64..910c923a9b8 100644 --- a/Documentation/DocBook/drm.tmpl +++ b/Documentation/DocBook/drm.tmpl | |||
@@ -389,7 +389,7 @@ | |||
389 | </para> | 389 | </para> |
390 | <para> | 390 | <para> |
391 | If your driver supports memory management (it should!), you'll | 391 | If your driver supports memory management (it should!), you'll |
392 | need to set that up at load time as well. How you intialize | 392 | need to set that up at load time as well. How you initialize |
393 | it depends on which memory manager you're using, TTM or GEM. | 393 | it depends on which memory manager you're using, TTM or GEM. |
394 | </para> | 394 | </para> |
395 | <sect3> | 395 | <sect3> |
@@ -399,7 +399,7 @@ | |||
399 | aperture space for graphics devices. TTM supports both UMA devices | 399 | aperture space for graphics devices. TTM supports both UMA devices |
400 | and devices with dedicated video RAM (VRAM), i.e. most discrete | 400 | and devices with dedicated video RAM (VRAM), i.e. most discrete |
401 | graphics devices. If your device has dedicated RAM, supporting | 401 | graphics devices. If your device has dedicated RAM, supporting |
402 | TTM is desireable. TTM also integrates tightly with your | 402 | TTM is desirable. TTM also integrates tightly with your |
403 | driver specific buffer execution function. See the radeon | 403 | driver specific buffer execution function. See the radeon |
404 | driver for examples. | 404 | driver for examples. |
405 | </para> | 405 | </para> |
@@ -443,7 +443,7 @@ | |||
443 | likely eventually calling ttm_bo_global_init and | 443 | likely eventually calling ttm_bo_global_init and |
444 | ttm_bo_global_release, respectively. Also like the previous | 444 | ttm_bo_global_release, respectively. Also like the previous |
445 | object, ttm_global_item_ref is used to create an initial reference | 445 | object, ttm_global_item_ref is used to create an initial reference |
446 | count for the TTM, which will call your initalization function. | 446 | count for the TTM, which will call your initialization function. |
447 | </para> | 447 | </para> |
448 | </sect3> | 448 | </sect3> |
449 | <sect3> | 449 | <sect3> |
@@ -557,7 +557,7 @@ void intel_crt_init(struct drm_device *dev) | |||
557 | CRT connector and encoder combination is created. A device | 557 | CRT connector and encoder combination is created. A device |
558 | specific i2c bus is also created, for fetching EDID data and | 558 | specific i2c bus is also created, for fetching EDID data and |
559 | performing monitor detection. Once the process is complete, | 559 | performing monitor detection. Once the process is complete, |
560 | the new connector is regsitered with sysfs, to make its | 560 | the new connector is registered with sysfs, to make its |
561 | properties available to applications. | 561 | properties available to applications. |
562 | </para> | 562 | </para> |
563 | <sect4> | 563 | <sect4> |
@@ -581,12 +581,12 @@ void intel_crt_init(struct drm_device *dev) | |||
581 | <para> | 581 | <para> |
582 | For each encoder, CRTC and connector, several functions must | 582 | For each encoder, CRTC and connector, several functions must |
583 | be provided, depending on the object type. Encoder objects | 583 | be provided, depending on the object type. Encoder objects |
584 | need should provide a DPMS (basically on/off) function, mode fixup | 584 | need to provide a DPMS (basically on/off) function, mode fixup |
585 | (for converting requested modes into native hardware timings), | 585 | (for converting requested modes into native hardware timings), |
586 | and prepare, set and commit functions for use by the core DRM | 586 | and prepare, set and commit functions for use by the core DRM |
587 | helper functions. Connector helpers need to provide mode fetch and | 587 | helper functions. Connector helpers need to provide mode fetch and |
588 | validity functions as well as an encoder matching function for | 588 | validity functions as well as an encoder matching function for |
589 | returing an ideal encoder for a given connector. The core | 589 | returning an ideal encoder for a given connector. The core |
590 | connector functions include a DPMS callback, (deprecated) | 590 | connector functions include a DPMS callback, (deprecated) |
591 | save/restore routines, detection, mode probing, property handling, | 591 | save/restore routines, detection, mode probing, property handling, |
592 | and cleanup functions. | 592 | and cleanup functions. |
diff --git a/Documentation/i2c/busses/i2c-ali1535 b/Documentation/i2c/busses/i2c-ali1535 index 0db3b4c74ad..acbc65a0809 100644 --- a/Documentation/i2c/busses/i2c-ali1535 +++ b/Documentation/i2c/busses/i2c-ali1535 | |||
@@ -6,12 +6,12 @@ Supported adapters: | |||
6 | http://www.ali.com.tw/eng/support/datasheet_request.php | 6 | http://www.ali.com.tw/eng/support/datasheet_request.php |
7 | 7 | ||
8 | Authors: | 8 | Authors: |
9 | Frodo Looijaard <frodol@dds.nl>, | 9 | Frodo Looijaard <frodol@dds.nl>, |
10 | Philip Edelbrock <phil@netroedge.com>, | 10 | Philip Edelbrock <phil@netroedge.com>, |
11 | Mark D. Studebaker <mdsxyz123@yahoo.com>, | 11 | Mark D. Studebaker <mdsxyz123@yahoo.com>, |
12 | Dan Eaton <dan.eaton@rocketlogix.com>, | 12 | Dan Eaton <dan.eaton@rocketlogix.com>, |
13 | Stephen Rousset<stephen.rousset@rocketlogix.com> | 13 | Stephen Rousset<stephen.rousset@rocketlogix.com> |
14 | 14 | ||
15 | Description | 15 | Description |
16 | ----------- | 16 | ----------- |
17 | 17 | ||
diff --git a/Documentation/i2c/busses/i2c-ali1563 b/Documentation/i2c/busses/i2c-ali1563 index 99ad4b9bcc3..54691698d2d 100644 --- a/Documentation/i2c/busses/i2c-ali1563 +++ b/Documentation/i2c/busses/i2c-ali1563 | |||
@@ -18,7 +18,7 @@ For an overview of these chips see http://www.acerlabs.com | |||
18 | The M1563 southbridge is deceptively similar to the M1533, with a few | 18 | The M1563 southbridge is deceptively similar to the M1533, with a few |
19 | notable exceptions. One of those happens to be the fact they upgraded the | 19 | notable exceptions. One of those happens to be the fact they upgraded the |
20 | i2c core to be SMBus 2.0 compliant, and happens to be almost identical to | 20 | i2c core to be SMBus 2.0 compliant, and happens to be almost identical to |
21 | the i2c controller found in the Intel 801 south bridges. | 21 | the i2c controller found in the Intel 801 south bridges. |
22 | 22 | ||
23 | Features | 23 | Features |
24 | -------- | 24 | -------- |
diff --git a/Documentation/i2c/busses/i2c-ali15x3 b/Documentation/i2c/busses/i2c-ali15x3 index ff28d381beb..600da90b8f1 100644 --- a/Documentation/i2c/busses/i2c-ali15x3 +++ b/Documentation/i2c/busses/i2c-ali15x3 | |||
@@ -6,8 +6,8 @@ Supported adapters: | |||
6 | http://www.ali.com.tw/eng/support/datasheet_request.php | 6 | http://www.ali.com.tw/eng/support/datasheet_request.php |
7 | 7 | ||
8 | Authors: | 8 | Authors: |
9 | Frodo Looijaard <frodol@dds.nl>, | 9 | Frodo Looijaard <frodol@dds.nl>, |
10 | Philip Edelbrock <phil@netroedge.com>, | 10 | Philip Edelbrock <phil@netroedge.com>, |
11 | Mark D. Studebaker <mdsxyz123@yahoo.com> | 11 | Mark D. Studebaker <mdsxyz123@yahoo.com> |
12 | 12 | ||
13 | Module Parameters | 13 | Module Parameters |
@@ -40,10 +40,10 @@ M1541 and M1543C South Bridges. | |||
40 | The M1543C is a South bridge for desktop systems. | 40 | The M1543C is a South bridge for desktop systems. |
41 | The M1541 is a South bridge for portable systems. | 41 | The M1541 is a South bridge for portable systems. |
42 | They are part of the following ALI chipsets: | 42 | They are part of the following ALI chipsets: |
43 | 43 | ||
44 | * "Aladdin Pro 2" includes the M1621 Slot 1 North bridge with AGP and | 44 | * "Aladdin Pro 2" includes the M1621 Slot 1 North bridge with AGP and |
45 | 100MHz CPU Front Side bus | 45 | 100MHz CPU Front Side bus |
46 | * "Aladdin V" includes the M1541 Socket 7 North bridge with AGP and 100MHz | 46 | * "Aladdin V" includes the M1541 Socket 7 North bridge with AGP and 100MHz |
47 | CPU Front Side bus | 47 | CPU Front Side bus |
48 | Some Aladdin V motherboards: | 48 | Some Aladdin V motherboards: |
49 | Asus P5A | 49 | Asus P5A |
@@ -77,7 +77,7 @@ output of lspci will show something similar to the following: | |||
77 | ** then run lspci. | 77 | ** then run lspci. |
78 | ** If you see the 1533 and 5229 devices but NOT the 7101 device, | 78 | ** If you see the 1533 and 5229 devices but NOT the 7101 device, |
79 | ** then you must enable ACPI, the PMU, SMB, or something similar | 79 | ** then you must enable ACPI, the PMU, SMB, or something similar |
80 | ** in the BIOS. | 80 | ** in the BIOS. |
81 | ** The driver won't work if it can't find the M7101 device. | 81 | ** The driver won't work if it can't find the M7101 device. |
82 | 82 | ||
83 | The SMB controller is part of the M7101 device, which is an ACPI-compliant | 83 | The SMB controller is part of the M7101 device, which is an ACPI-compliant |
@@ -87,8 +87,8 @@ The whole M7101 device has to be enabled for the SMB to work. You can't | |||
87 | just enable the SMB alone. The SMB and the ACPI have separate I/O spaces. | 87 | just enable the SMB alone. The SMB and the ACPI have separate I/O spaces. |
88 | We make sure that the SMB is enabled. We leave the ACPI alone. | 88 | We make sure that the SMB is enabled. We leave the ACPI alone. |
89 | 89 | ||
90 | Features | 90 | Features |
91 | -------- | 91 | -------- |
92 | 92 | ||
93 | This driver controls the SMB Host only. The SMB Slave | 93 | This driver controls the SMB Host only. The SMB Slave |
94 | controller on the M15X3 is not enabled. This driver does not use | 94 | controller on the M15X3 is not enabled. This driver does not use |
diff --git a/Documentation/i2c/busses/i2c-pca-isa b/Documentation/i2c/busses/i2c-pca-isa index 6fc8f4c27c3..b044e526548 100644 --- a/Documentation/i2c/busses/i2c-pca-isa +++ b/Documentation/i2c/busses/i2c-pca-isa | |||
@@ -1,10 +1,10 @@ | |||
1 | Kernel driver i2c-pca-isa | 1 | Kernel driver i2c-pca-isa |
2 | 2 | ||
3 | Supported adapters: | 3 | Supported adapters: |
4 | This driver supports ISA boards using the Philips PCA 9564 | 4 | This driver supports ISA boards using the Philips PCA 9564 |
5 | Parallel bus to I2C bus controller | 5 | Parallel bus to I2C bus controller |
6 | 6 | ||
7 | Author: Ian Campbell <icampbell@arcom.com>, Arcom Control Systems | 7 | Author: Ian Campbell <icampbell@arcom.com>, Arcom Control Systems |
8 | 8 | ||
9 | Module Parameters | 9 | Module Parameters |
10 | ----------------- | 10 | ----------------- |
@@ -12,12 +12,12 @@ Module Parameters | |||
12 | * base int | 12 | * base int |
13 | I/O base address | 13 | I/O base address |
14 | * irq int | 14 | * irq int |
15 | IRQ interrupt | 15 | IRQ interrupt |
16 | * clock int | 16 | * clock int |
17 | Clock rate as described in table 1 of PCA9564 datasheet | 17 | Clock rate as described in table 1 of PCA9564 datasheet |
18 | 18 | ||
19 | Description | 19 | Description |
20 | ----------- | 20 | ----------- |
21 | 21 | ||
22 | This driver supports ISA boards using the Philips PCA 9564 | 22 | This driver supports ISA boards using the Philips PCA 9564 |
23 | Parallel bus to I2C bus controller | 23 | Parallel bus to I2C bus controller |
diff --git a/Documentation/i2c/busses/i2c-sis5595 b/Documentation/i2c/busses/i2c-sis5595 index cc47db7d00a..ecd21fb49a8 100644 --- a/Documentation/i2c/busses/i2c-sis5595 +++ b/Documentation/i2c/busses/i2c-sis5595 | |||
@@ -1,41 +1,41 @@ | |||
1 | Kernel driver i2c-sis5595 | 1 | Kernel driver i2c-sis5595 |
2 | 2 | ||
3 | Authors: | 3 | Authors: |
4 | Frodo Looijaard <frodol@dds.nl>, | 4 | Frodo Looijaard <frodol@dds.nl>, |
5 | Mark D. Studebaker <mdsxyz123@yahoo.com>, | 5 | Mark D. Studebaker <mdsxyz123@yahoo.com>, |
6 | Philip Edelbrock <phil@netroedge.com> | 6 | Philip Edelbrock <phil@netroedge.com> |
7 | 7 | ||
8 | Supported adapters: | 8 | Supported adapters: |
9 | * Silicon Integrated Systems Corp. SiS5595 Southbridge | 9 | * Silicon Integrated Systems Corp. SiS5595 Southbridge |
10 | Datasheet: Publicly available at the Silicon Integrated Systems Corp. site. | 10 | Datasheet: Publicly available at the Silicon Integrated Systems Corp. site. |
11 | 11 | ||
12 | Note: all have mfr. ID 0x1039. | 12 | Note: all have mfr. ID 0x1039. |
13 | 13 | ||
14 | SUPPORTED PCI ID | 14 | SUPPORTED PCI ID |
15 | 5595 0008 | 15 | 5595 0008 |
16 | 16 | ||
17 | Note: these chips contain a 0008 device which is incompatible with the | 17 | Note: these chips contain a 0008 device which is incompatible with the |
18 | 5595. We recognize these by the presence of the listed | 18 | 5595. We recognize these by the presence of the listed |
19 | "blacklist" PCI ID and refuse to load. | 19 | "blacklist" PCI ID and refuse to load. |
20 | 20 | ||
21 | NOT SUPPORTED PCI ID BLACKLIST PCI ID | 21 | NOT SUPPORTED PCI ID BLACKLIST PCI ID |
22 | 540 0008 0540 | 22 | 540 0008 0540 |
23 | 550 0008 0550 | 23 | 550 0008 0550 |
24 | 5513 0008 5511 | 24 | 5513 0008 5511 |
25 | 5581 0008 5597 | 25 | 5581 0008 5597 |
26 | 5582 0008 5597 | 26 | 5582 0008 5597 |
27 | 5597 0008 5597 | 27 | 5597 0008 5597 |
28 | 5598 0008 5597/5598 | 28 | 5598 0008 5597/5598 |
29 | 630 0008 0630 | 29 | 630 0008 0630 |
30 | 645 0008 0645 | 30 | 645 0008 0645 |
31 | 646 0008 0646 | 31 | 646 0008 0646 |
32 | 648 0008 0648 | 32 | 648 0008 0648 |
33 | 650 0008 0650 | 33 | 650 0008 0650 |
34 | 651 0008 0651 | 34 | 651 0008 0651 |
35 | 730 0008 0730 | 35 | 730 0008 0730 |
36 | 735 0008 0735 | 36 | 735 0008 0735 |
37 | 745 0008 0745 | 37 | 745 0008 0745 |
38 | 746 0008 0746 | 38 | 746 0008 0746 |
39 | 39 | ||
40 | Module Parameters | 40 | Module Parameters |
41 | ----------------- | 41 | ----------------- |
diff --git a/Documentation/i2c/busses/i2c-sis630 b/Documentation/i2c/busses/i2c-sis630 index 9aca6889f74..629ea2c356f 100644 --- a/Documentation/i2c/busses/i2c-sis630 +++ b/Documentation/i2c/busses/i2c-sis630 | |||
@@ -14,9 +14,9 @@ Module Parameters | |||
14 | * force = [1|0] Forcibly enable the SIS630. DANGEROUS! | 14 | * force = [1|0] Forcibly enable the SIS630. DANGEROUS! |
15 | This can be interesting for chipsets not named | 15 | This can be interesting for chipsets not named |
16 | above to check if it works for you chipset, but DANGEROUS! | 16 | above to check if it works for you chipset, but DANGEROUS! |
17 | 17 | ||
18 | * high_clock = [1|0] Forcibly set Host Master Clock to 56KHz (default, | 18 | * high_clock = [1|0] Forcibly set Host Master Clock to 56KHz (default, |
19 | what your BIOS use). DANGEROUS! This should be a bit | 19 | what your BIOS use). DANGEROUS! This should be a bit |
20 | faster, but freeze some systems (i.e. my Laptop). | 20 | faster, but freeze some systems (i.e. my Laptop). |
21 | 21 | ||
22 | 22 | ||
@@ -44,6 +44,6 @@ Philip Edelbrock <phil@netroedge.com> | |||
44 | - testing SiS730 support | 44 | - testing SiS730 support |
45 | Mark M. Hoffman <mhoffman@lightlink.com> | 45 | Mark M. Hoffman <mhoffman@lightlink.com> |
46 | - bug fixes | 46 | - bug fixes |
47 | 47 | ||
48 | To anyone else which I forgot here ;), thanks! | 48 | To anyone else which I forgot here ;), thanks! |
49 | 49 | ||
diff --git a/Documentation/i2c/ten-bit-addresses b/Documentation/i2c/ten-bit-addresses index 200074f8136..e9890709c50 100644 --- a/Documentation/i2c/ten-bit-addresses +++ b/Documentation/i2c/ten-bit-addresses | |||
@@ -1,17 +1,17 @@ | |||
1 | The I2C protocol knows about two kinds of device addresses: normal 7 bit | 1 | The I2C protocol knows about two kinds of device addresses: normal 7 bit |
2 | addresses, and an extended set of 10 bit addresses. The sets of addresses | 2 | addresses, and an extended set of 10 bit addresses. The sets of addresses |
3 | do not intersect: the 7 bit address 0x10 is not the same as the 10 bit | 3 | do not intersect: the 7 bit address 0x10 is not the same as the 10 bit |
4 | address 0x10 (though a single device could respond to both of them). You | 4 | address 0x10 (though a single device could respond to both of them). You |
5 | select a 10 bit address by adding an extra byte after the address | 5 | select a 10 bit address by adding an extra byte after the address |
6 | byte: | 6 | byte: |
7 | S Addr7 Rd/Wr .... | 7 | S Addr7 Rd/Wr .... |
8 | becomes | 8 | becomes |
9 | S 11110 Addr10 Rd/Wr | 9 | S 11110 Addr10 Rd/Wr |
10 | S is the start bit, Rd/Wr the read/write bit, and if you count the number | 10 | S is the start bit, Rd/Wr the read/write bit, and if you count the number |
11 | of bits, you will see the there are 8 after the S bit for 7 bit addresses, | 11 | of bits, you will see the there are 8 after the S bit for 7 bit addresses, |
12 | and 16 after the S bit for 10 bit addresses. | 12 | and 16 after the S bit for 10 bit addresses. |
13 | 13 | ||
14 | WARNING! The current 10 bit address support is EXPERIMENTAL. There are | 14 | WARNING! The current 10 bit address support is EXPERIMENTAL. There are |
15 | several places in the code that will cause SEVERE PROBLEMS with 10 bit | 15 | several places in the code that will cause SEVERE PROBLEMS with 10 bit |
16 | addresses, even though there is some basic handling and hooks. Also, | 16 | addresses, even though there is some basic handling and hooks. Also, |
17 | almost no supported adapter handles the 10 bit addresses correctly. | 17 | almost no supported adapter handles the 10 bit addresses correctly. |
diff --git a/Documentation/kbuild/kbuild.txt b/Documentation/kbuild/kbuild.txt index 6f8c1cabbc5..634c625da8c 100644 --- a/Documentation/kbuild/kbuild.txt +++ b/Documentation/kbuild/kbuild.txt | |||
@@ -65,7 +65,7 @@ CROSS_COMPILE | |||
65 | Specify an optional fixed part of the binutils filename. | 65 | Specify an optional fixed part of the binutils filename. |
66 | CROSS_COMPILE can be a part of the filename or the full path. | 66 | CROSS_COMPILE can be a part of the filename or the full path. |
67 | 67 | ||
68 | CROSS_COMPILE is also used for ccache is some setups. | 68 | CROSS_COMPILE is also used for ccache in some setups. |
69 | 69 | ||
70 | CF | 70 | CF |
71 | -------------------------------------------------- | 71 | -------------------------------------------------- |
@@ -162,3 +162,7 @@ For tags/TAGS/cscope targets, you can specify more than one arch | |||
162 | to be included in the databases, separated by blank space. E.g.: | 162 | to be included in the databases, separated by blank space. E.g.: |
163 | 163 | ||
164 | $ make ALLSOURCE_ARCHS="x86 mips arm" tags | 164 | $ make ALLSOURCE_ARCHS="x86 mips arm" tags |
165 | |||
166 | To get all available archs you can also specify all. E.g.: | ||
167 | |||
168 | $ make ALLSOURCE_ARCHS=all tags | ||
diff --git a/Documentation/mutex-design.txt b/Documentation/mutex-design.txt index aa60d1f627e..c91ccc0720f 100644 --- a/Documentation/mutex-design.txt +++ b/Documentation/mutex-design.txt | |||
@@ -66,14 +66,14 @@ of advantages of mutexes: | |||
66 | 66 | ||
67 | c0377ccb <mutex_lock>: | 67 | c0377ccb <mutex_lock>: |
68 | c0377ccb: f0 ff 08 lock decl (%eax) | 68 | c0377ccb: f0 ff 08 lock decl (%eax) |
69 | c0377cce: 78 0e js c0377cde <.text.lock.mutex> | 69 | c0377cce: 78 0e js c0377cde <.text..lock.mutex> |
70 | c0377cd0: c3 ret | 70 | c0377cd0: c3 ret |
71 | 71 | ||
72 | the unlocking fastpath is equally tight: | 72 | the unlocking fastpath is equally tight: |
73 | 73 | ||
74 | c0377cd1 <mutex_unlock>: | 74 | c0377cd1 <mutex_unlock>: |
75 | c0377cd1: f0 ff 00 lock incl (%eax) | 75 | c0377cd1: f0 ff 00 lock incl (%eax) |
76 | c0377cd4: 7e 0f jle c0377ce5 <.text.lock.mutex+0x7> | 76 | c0377cd4: 7e 0f jle c0377ce5 <.text..lock.mutex+0x7> |
77 | c0377cd6: c3 ret | 77 | c0377cd6: c3 ret |
78 | 78 | ||
79 | - 'struct mutex' semantics are well-defined and are enforced if | 79 | - 'struct mutex' semantics are well-defined and are enforced if |
diff --git a/Documentation/timers/Makefile b/Documentation/timers/Makefile index c85625f4ab2..73f75f8a87d 100644 --- a/Documentation/timers/Makefile +++ b/Documentation/timers/Makefile | |||
@@ -2,7 +2,7 @@ | |||
2 | obj- := dummy.o | 2 | obj- := dummy.o |
3 | 3 | ||
4 | # List of programs to build | 4 | # List of programs to build |
5 | hostprogs-y := hpet_example | 5 | hostprogs-$(CONFIG_X86) := hpet_example |
6 | 6 | ||
7 | # Tell kbuild to always build the programs | 7 | # Tell kbuild to always build the programs |
8 | always := $(hostprogs-y) | 8 | always := $(hostprogs-y) |
diff --git a/MAINTAINERS b/MAINTAINERS index 13608bd2e79..a73dd8030af 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -3242,7 +3242,7 @@ L: autofs@linux.kernel.org | |||
3242 | S: Maintained | 3242 | S: Maintained |
3243 | F: fs/autofs4/ | 3243 | F: fs/autofs4/ |
3244 | 3244 | ||
3245 | KERNEL BUILD | 3245 | KERNEL BUILD + files below scripts/ (unless maintained elsewhere) |
3246 | M: Michal Marek <mmarek@suse.cz> | 3246 | M: Michal Marek <mmarek@suse.cz> |
3247 | T: git git://repo.or.cz/linux-kbuild.git for-next | 3247 | T: git git://repo.or.cz/linux-kbuild.git for-next |
3248 | T: git git://repo.or.cz/linux-kbuild.git for-linus | 3248 | T: git git://repo.or.cz/linux-kbuild.git for-linus |
@@ -3251,6 +3251,9 @@ S: Maintained | |||
3251 | F: Documentation/kbuild/ | 3251 | F: Documentation/kbuild/ |
3252 | F: Makefile | 3252 | F: Makefile |
3253 | F: scripts/Makefile.* | 3253 | F: scripts/Makefile.* |
3254 | F: scripts/basic/ | ||
3255 | F: scripts/mk* | ||
3256 | F: scripts/package/ | ||
3254 | 3257 | ||
3255 | KERNEL JANITORS | 3258 | KERNEL JANITORS |
3256 | L: kernel-janitors@vger.kernel.org | 3259 | L: kernel-janitors@vger.kernel.org |
@@ -3500,9 +3503,8 @@ F: arch/powerpc/platforms/83xx/ | |||
3500 | 3503 | ||
3501 | LINUX FOR POWERPC PA SEMI PWRFICIENT | 3504 | LINUX FOR POWERPC PA SEMI PWRFICIENT |
3502 | M: Olof Johansson <olof@lixom.net> | 3505 | M: Olof Johansson <olof@lixom.net> |
3503 | W: http://www.pasemi.com/ | ||
3504 | L: linuxppc-dev@ozlabs.org | 3506 | L: linuxppc-dev@ozlabs.org |
3505 | S: Supported | 3507 | S: Maintained |
3506 | F: arch/powerpc/platforms/pasemi/ | 3508 | F: arch/powerpc/platforms/pasemi/ |
3507 | F: drivers/*/*pasemi* | 3509 | F: drivers/*/*pasemi* |
3508 | F: drivers/*/*/*pasemi* | 3510 | F: drivers/*/*/*pasemi* |
@@ -183,11 +183,14 @@ SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ | |||
183 | # CROSS_COMPILE can be set on the command line | 183 | # CROSS_COMPILE can be set on the command line |
184 | # make CROSS_COMPILE=ia64-linux- | 184 | # make CROSS_COMPILE=ia64-linux- |
185 | # Alternatively CROSS_COMPILE can be set in the environment. | 185 | # Alternatively CROSS_COMPILE can be set in the environment. |
186 | # A third alternative is to store a setting in .config so that plain | ||
187 | # "make" in the configured kernel build directory always uses that. | ||
186 | # Default value for CROSS_COMPILE is not to prefix executables | 188 | # Default value for CROSS_COMPILE is not to prefix executables |
187 | # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile | 189 | # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile |
188 | export KBUILD_BUILDHOST := $(SUBARCH) | 190 | export KBUILD_BUILDHOST := $(SUBARCH) |
189 | ARCH ?= $(SUBARCH) | 191 | ARCH ?= $(SUBARCH) |
190 | CROSS_COMPILE ?= | 192 | CROSS_COMPILE ?= |
193 | CROSS_COMPILE ?= $(CONFIG_CROSS_COMPILE:"%"=%) | ||
191 | 194 | ||
192 | # Architecture as present in compile.h | 195 | # Architecture as present in compile.h |
193 | UTS_MACHINE := $(ARCH) | 196 | UTS_MACHINE := $(ARCH) |
@@ -576,9 +579,6 @@ KBUILD_CFLAGS += $(call cc-option,-Wno-pointer-sign,) | |||
576 | # disable invalid "can't wrap" optimizations for signed / pointers | 579 | # disable invalid "can't wrap" optimizations for signed / pointers |
577 | KBUILD_CFLAGS += $(call cc-option,-fno-strict-overflow) | 580 | KBUILD_CFLAGS += $(call cc-option,-fno-strict-overflow) |
578 | 581 | ||
579 | # revert to pre-gcc-4.4 behaviour of .eh_frame | ||
580 | KBUILD_CFLAGS += $(call cc-option,-fno-dwarf2-cfi-asm) | ||
581 | |||
582 | # conserve stack if available | 582 | # conserve stack if available |
583 | KBUILD_CFLAGS += $(call cc-option,-fconserve-stack) | 583 | KBUILD_CFLAGS += $(call cc-option,-fconserve-stack) |
584 | 584 | ||
@@ -882,9 +882,6 @@ $(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): $(vmlinux-dirs) ; | |||
882 | PHONY += $(vmlinux-dirs) | 882 | PHONY += $(vmlinux-dirs) |
883 | $(vmlinux-dirs): prepare scripts | 883 | $(vmlinux-dirs): prepare scripts |
884 | $(Q)$(MAKE) $(build)=$@ | 884 | $(Q)$(MAKE) $(build)=$@ |
885 | ifdef CONFIG_MODULES | ||
886 | $(Q)$(MAKE) $(modbuiltin)=$@ | ||
887 | endif | ||
888 | 885 | ||
889 | # Build the kernel release string | 886 | # Build the kernel release string |
890 | # | 887 | # |
@@ -907,14 +904,19 @@ endif | |||
907 | # $(localver) | 904 | # $(localver) |
908 | # localversion* (files without backups, containing '~') | 905 | # localversion* (files without backups, containing '~') |
909 | # $(CONFIG_LOCALVERSION) (from kernel config setting) | 906 | # $(CONFIG_LOCALVERSION) (from kernel config setting) |
910 | # $(localver-auto) (only if CONFIG_LOCALVERSION_AUTO is set) | 907 | # $(LOCALVERSION) (from make command line, if provided) |
911 | # ./scripts/setlocalversion (SCM tag, if one exists) | 908 | # $(localver-extra) |
912 | # $(LOCALVERSION) (from make command line if provided) | 909 | # $(scm-identifier) (unique SCM tag, if one exists) |
910 | # ./scripts/setlocalversion (only with CONFIG_LOCALVERSION_AUTO) | ||
911 | # .scmversion (only with CONFIG_LOCALVERSION_AUTO) | ||
912 | # + (only without CONFIG_LOCALVERSION_AUTO | ||
913 | # and without LOCALVERSION= and | ||
914 | # repository is at non-tagged commit) | ||
913 | # | 915 | # |
914 | # Note how the final $(localver-auto) string is included *only* if the | 916 | # For kernels without CONFIG_LOCALVERSION_AUTO compiled from an SCM that has |
915 | # kernel config option CONFIG_LOCALVERSION_AUTO is selected. Also, at the | 917 | # been revised beyond a tagged commit, `+' is appended to the version string |
916 | # moment, only git is supported but other SCMs can edit the script | 918 | # when not overridden by using "make LOCALVERSION=". This indicates that the |
917 | # scripts/setlocalversion and add the appropriate checks as needed. | 919 | # kernel is not a vanilla release version and has been modified. |
918 | 920 | ||
919 | pattern = ".*/localversion[^~]*" | 921 | pattern = ".*/localversion[^~]*" |
920 | string = $(shell cat /dev/null \ | 922 | string = $(shell cat /dev/null \ |
@@ -923,26 +925,32 @@ string = $(shell cat /dev/null \ | |||
923 | localver = $(subst $(space),, $(string) \ | 925 | localver = $(subst $(space),, $(string) \ |
924 | $(patsubst "%",%,$(CONFIG_LOCALVERSION))) | 926 | $(patsubst "%",%,$(CONFIG_LOCALVERSION))) |
925 | 927 | ||
926 | # If CONFIG_LOCALVERSION_AUTO is set scripts/setlocalversion is called | 928 | # scripts/setlocalversion is called to create a unique identifier if the source |
927 | # and if the SCM is know a tag from the SCM is appended. | 929 | # is managed by a known SCM and the repository has been revised since the last |
928 | # The appended tag is determined by the SCM used. | 930 | # tagged (release) commit. The format of the identifier is determined by the |
931 | # SCM's implementation. | ||
929 | # | 932 | # |
930 | # .scmversion is used when generating rpm packages so we do not loose | 933 | # .scmversion is used when generating rpm packages so we do not loose |
931 | # the version information from the SCM when we do the build of the kernel | 934 | # the version information from the SCM when we do the build of the kernel |
932 | # from the copied source | 935 | # from the copied source |
933 | ifdef CONFIG_LOCALVERSION_AUTO | ||
934 | |||
935 | ifeq ($(wildcard .scmversion),) | 936 | ifeq ($(wildcard .scmversion),) |
936 | _localver-auto = $(shell $(CONFIG_SHELL) \ | 937 | scm-identifier = $(shell $(CONFIG_SHELL) \ |
937 | $(srctree)/scripts/setlocalversion $(srctree)) | 938 | $(srctree)/scripts/setlocalversion $(srctree)) |
938 | else | 939 | else |
939 | _localver-auto = $(shell cat .scmversion 2> /dev/null) | 940 | scm-identifier = $(shell cat .scmversion 2> /dev/null) |
940 | endif | 941 | endif |
941 | 942 | ||
942 | localver-auto = $(LOCALVERSION)$(_localver-auto) | 943 | ifdef CONFIG_LOCALVERSION_AUTO |
944 | localver-extra = $(scm-identifier) | ||
945 | else | ||
946 | ifneq ($(scm-identifier),) | ||
947 | ifeq ($(LOCALVERSION),) | ||
948 | localver-extra = + | ||
949 | endif | ||
950 | endif | ||
943 | endif | 951 | endif |
944 | 952 | ||
945 | localver-full = $(localver)$(localver-auto) | 953 | localver-full = $(localver)$(LOCALVERSION)$(localver-extra) |
946 | 954 | ||
947 | # Store (new) KERNELRELASE string in include/config/kernel.release | 955 | # Store (new) KERNELRELASE string in include/config/kernel.release |
948 | kernelrelease = $(KERNELVERSION)$(localver-full) | 956 | kernelrelease = $(KERNELVERSION)$(localver-full) |
@@ -1089,11 +1097,16 @@ all: modules | |||
1089 | PHONY += modules | 1097 | PHONY += modules |
1090 | modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) | 1098 | modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) |
1091 | $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order | 1099 | $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order |
1092 | $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.builtin) > $(objtree)/modules.builtin | ||
1093 | @$(kecho) ' Building modules, stage 2.'; | 1100 | @$(kecho) ' Building modules, stage 2.'; |
1094 | $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost | 1101 | $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost |
1095 | $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modbuild | 1102 | $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modbuild |
1096 | 1103 | ||
1104 | modules.builtin: $(vmlinux-dirs:%=%/modules.builtin) | ||
1105 | $(Q)$(AWK) '!x[$$0]++' $^ > $(objtree)/modules.builtin | ||
1106 | |||
1107 | %/modules.builtin: include/config/auto.conf | ||
1108 | $(Q)$(MAKE) $(modbuiltin)=$* | ||
1109 | |||
1097 | 1110 | ||
1098 | # Target to prepare building external modules | 1111 | # Target to prepare building external modules |
1099 | PHONY += modules_prepare | 1112 | PHONY += modules_prepare |
@@ -1104,7 +1117,7 @@ PHONY += modules_install | |||
1104 | modules_install: _modinst_ _modinst_post | 1117 | modules_install: _modinst_ _modinst_post |
1105 | 1118 | ||
1106 | PHONY += _modinst_ | 1119 | PHONY += _modinst_ |
1107 | _modinst_: | 1120 | _modinst_: modules.builtin |
1108 | @if [ -z "`$(DEPMOD) -V 2>/dev/null | grep module-init-tools`" ]; then \ | 1121 | @if [ -z "`$(DEPMOD) -V 2>/dev/null | grep module-init-tools`" ]; then \ |
1109 | echo "Warning: you may need to install module-init-tools"; \ | 1122 | echo "Warning: you may need to install module-init-tools"; \ |
1110 | echo "See http://www.codemonkey.org.uk/docs/post-halloween-2.6.txt";\ | 1123 | echo "See http://www.codemonkey.org.uk/docs/post-halloween-2.6.txt";\ |
@@ -1247,7 +1260,9 @@ help: | |||
1247 | @echo ' firmware_install- Install all firmware to INSTALL_FW_PATH' | 1260 | @echo ' firmware_install- Install all firmware to INSTALL_FW_PATH' |
1248 | @echo ' (default: $$(INSTALL_MOD_PATH)/lib/firmware)' | 1261 | @echo ' (default: $$(INSTALL_MOD_PATH)/lib/firmware)' |
1249 | @echo ' dir/ - Build all files in dir and below' | 1262 | @echo ' dir/ - Build all files in dir and below' |
1250 | @echo ' dir/file.[ois] - Build specified target only' | 1263 | @echo ' dir/file.[oisS] - Build specified target only' |
1264 | @echo ' dir/file.lst - Build specified mixed source/assembly target only' | ||
1265 | @echo ' (requires a recent binutils and recent build (System.map))' | ||
1251 | @echo ' dir/file.ko - Build module including final link' | 1266 | @echo ' dir/file.ko - Build module including final link' |
1252 | @echo ' modules_prepare - Set up for building external modules' | 1267 | @echo ' modules_prepare - Set up for building external modules' |
1253 | @echo ' tags/TAGS - Generate tags file for editors' | 1268 | @echo ' tags/TAGS - Generate tags file for editors' |
diff --git a/arch/cris/arch-v10/drivers/ds1302.c b/arch/cris/arch-v10/drivers/ds1302.c index 77630df9434..884275629ef 100644 --- a/arch/cris/arch-v10/drivers/ds1302.c +++ b/arch/cris/arch-v10/drivers/ds1302.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <linux/module.h> | 19 | #include <linux/module.h> |
20 | #include <linux/miscdevice.h> | 20 | #include <linux/miscdevice.h> |
21 | #include <linux/delay.h> | 21 | #include <linux/delay.h> |
22 | #include <linux/smp_lock.h> | ||
22 | #include <linux/bcd.h> | 23 | #include <linux/bcd.h> |
23 | #include <linux/capability.h> | 24 | #include <linux/capability.h> |
24 | 25 | ||
@@ -238,9 +239,7 @@ static unsigned char days_in_mo[] = | |||
238 | 239 | ||
239 | /* ioctl that supports RTC_RD_TIME and RTC_SET_TIME (read and set time/date). */ | 240 | /* ioctl that supports RTC_RD_TIME and RTC_SET_TIME (read and set time/date). */ |
240 | 241 | ||
241 | static int | 242 | static int rtc_ioctl(struct file *file, unsigned int cmd, unsigned long arg) |
242 | rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd, | ||
243 | unsigned long arg) | ||
244 | { | 243 | { |
245 | unsigned long flags; | 244 | unsigned long flags; |
246 | 245 | ||
@@ -354,6 +353,17 @@ rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd, | |||
354 | } | 353 | } |
355 | } | 354 | } |
356 | 355 | ||
356 | static long rtc_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | ||
357 | { | ||
358 | int ret; | ||
359 | |||
360 | lock_kernel(); | ||
361 | ret = rtc_ioctl(file, cmd, arg); | ||
362 | unlock_kernel(); | ||
363 | |||
364 | return ret; | ||
365 | } | ||
366 | |||
357 | static void | 367 | static void |
358 | print_rtc_status(void) | 368 | print_rtc_status(void) |
359 | { | 369 | { |
@@ -375,8 +385,8 @@ print_rtc_status(void) | |||
375 | /* The various file operations we support. */ | 385 | /* The various file operations we support. */ |
376 | 386 | ||
377 | static const struct file_operations rtc_fops = { | 387 | static const struct file_operations rtc_fops = { |
378 | .owner = THIS_MODULE, | 388 | .owner = THIS_MODULE, |
379 | .ioctl = rtc_ioctl, | 389 | .unlocked_ioctl = rtc_unlocked_ioctl, |
380 | }; | 390 | }; |
381 | 391 | ||
382 | /* Probe for the chip by writing something to its RAM and try reading it back. */ | 392 | /* Probe for the chip by writing something to its RAM and try reading it back. */ |
diff --git a/arch/cris/arch-v10/drivers/pcf8563.c b/arch/cris/arch-v10/drivers/pcf8563.c index 1e90c1a9c84..7dcb1f85f42 100644 --- a/arch/cris/arch-v10/drivers/pcf8563.c +++ b/arch/cris/arch-v10/drivers/pcf8563.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <linux/delay.h> | 27 | #include <linux/delay.h> |
28 | #include <linux/bcd.h> | 28 | #include <linux/bcd.h> |
29 | #include <linux/mutex.h> | 29 | #include <linux/mutex.h> |
30 | #include <linux/smp_lock.h> | ||
30 | 31 | ||
31 | #include <asm/uaccess.h> | 32 | #include <asm/uaccess.h> |
32 | #include <asm/system.h> | 33 | #include <asm/system.h> |
@@ -53,7 +54,7 @@ static DEFINE_MUTEX(rtc_lock); /* Protect state etc */ | |||
53 | static const unsigned char days_in_month[] = | 54 | static const unsigned char days_in_month[] = |
54 | { 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; | 55 | { 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; |
55 | 56 | ||
56 | int pcf8563_ioctl(struct inode *, struct file *, unsigned int, unsigned long); | 57 | static long pcf8563_unlocked_ioctl(struct file *, unsigned int, unsigned long); |
57 | 58 | ||
58 | /* Cache VL bit value read at driver init since writing the RTC_SECOND | 59 | /* Cache VL bit value read at driver init since writing the RTC_SECOND |
59 | * register clears the VL status. | 60 | * register clears the VL status. |
@@ -62,7 +63,7 @@ static int voltage_low; | |||
62 | 63 | ||
63 | static const struct file_operations pcf8563_fops = { | 64 | static const struct file_operations pcf8563_fops = { |
64 | .owner = THIS_MODULE, | 65 | .owner = THIS_MODULE, |
65 | .ioctl = pcf8563_ioctl, | 66 | .unlocked_ioctl = pcf8563_unlocked_ioctl, |
66 | }; | 67 | }; |
67 | 68 | ||
68 | unsigned char | 69 | unsigned char |
@@ -212,8 +213,7 @@ pcf8563_exit(void) | |||
212 | * ioctl calls for this driver. Why return -ENOTTY upon error? Because | 213 | * ioctl calls for this driver. Why return -ENOTTY upon error? Because |
213 | * POSIX says so! | 214 | * POSIX says so! |
214 | */ | 215 | */ |
215 | int pcf8563_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, | 216 | static int pcf8563_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) |
216 | unsigned long arg) | ||
217 | { | 217 | { |
218 | /* Some sanity checks. */ | 218 | /* Some sanity checks. */ |
219 | if (_IOC_TYPE(cmd) != RTC_MAGIC) | 219 | if (_IOC_TYPE(cmd) != RTC_MAGIC) |
@@ -339,6 +339,17 @@ int pcf8563_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, | |||
339 | return 0; | 339 | return 0; |
340 | } | 340 | } |
341 | 341 | ||
342 | static long pcf8563_unlocked_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) | ||
343 | { | ||
344 | int ret; | ||
345 | |||
346 | lock_kernel(); | ||
347 | return pcf8563_ioctl(filp, cmd, arg); | ||
348 | unlock_kernel(); | ||
349 | |||
350 | return ret; | ||
351 | } | ||
352 | |||
342 | static int __init pcf8563_register(void) | 353 | static int __init pcf8563_register(void) |
343 | { | 354 | { |
344 | if (pcf8563_init() < 0) { | 355 | if (pcf8563_init() < 0) { |
diff --git a/arch/cris/arch-v10/kernel/irq.c b/arch/cris/arch-v10/kernel/irq.c index 1a61efc1398..a0c0df8be9c 100644 --- a/arch/cris/arch-v10/kernel/irq.c +++ b/arch/cris/arch-v10/kernel/irq.c | |||
@@ -17,8 +17,8 @@ | |||
17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
19 | 19 | ||
20 | #define mask_irq(irq_nr) (*R_VECT_MASK_CLR = 1 << (irq_nr)); | 20 | #define crisv10_mask_irq(irq_nr) (*R_VECT_MASK_CLR = 1 << (irq_nr)); |
21 | #define unmask_irq(irq_nr) (*R_VECT_MASK_SET = 1 << (irq_nr)); | 21 | #define crisv10_unmask_irq(irq_nr) (*R_VECT_MASK_SET = 1 << (irq_nr)); |
22 | 22 | ||
23 | /* don't use set_int_vector, it bypasses the linux interrupt handlers. it is | 23 | /* don't use set_int_vector, it bypasses the linux interrupt handlers. it is |
24 | * global just so that the kernel gdb can use it. | 24 | * global just so that the kernel gdb can use it. |
@@ -116,12 +116,12 @@ static unsigned int startup_crisv10_irq(unsigned int irq) | |||
116 | 116 | ||
117 | static void enable_crisv10_irq(unsigned int irq) | 117 | static void enable_crisv10_irq(unsigned int irq) |
118 | { | 118 | { |
119 | unmask_irq(irq); | 119 | crisv10_unmask_irq(irq); |
120 | } | 120 | } |
121 | 121 | ||
122 | static void disable_crisv10_irq(unsigned int irq) | 122 | static void disable_crisv10_irq(unsigned int irq) |
123 | { | 123 | { |
124 | mask_irq(irq); | 124 | crisv10_mask_irq(irq); |
125 | } | 125 | } |
126 | 126 | ||
127 | static void ack_crisv10_irq(unsigned int irq) | 127 | static void ack_crisv10_irq(unsigned int irq) |
diff --git a/arch/cris/arch-v10/lib/dmacopy.c b/arch/cris/arch-v10/lib/dmacopy.c index e5fb44f505c..49f5b8ca5b4 100644 --- a/arch/cris/arch-v10/lib/dmacopy.c +++ b/arch/cris/arch-v10/lib/dmacopy.c | |||
@@ -1,5 +1,4 @@ | |||
1 | /* $Id: dmacopy.c,v 1.1 2001/12/17 13:59:27 bjornw Exp $ | 1 | /* |
2 | * | ||
3 | * memcpy for large blocks, using memory-memory DMA channels 6 and 7 in Etrax | 2 | * memcpy for large blocks, using memory-memory DMA channels 6 and 7 in Etrax |
4 | */ | 3 | */ |
5 | 4 | ||
@@ -13,11 +12,11 @@ void *dma_memcpy(void *pdst, | |||
13 | unsigned int pn) | 12 | unsigned int pn) |
14 | { | 13 | { |
15 | static etrax_dma_descr indma, outdma; | 14 | static etrax_dma_descr indma, outdma; |
16 | 15 | ||
17 | D(printk("dma_memcpy %d bytes... ", pn)); | 16 | D(printk(KERN_DEBUG "dma_memcpy %d bytes... ", pn)); |
18 | 17 | ||
19 | #if 0 | 18 | #if 0 |
20 | *R_GEN_CONFIG = genconfig_shadow = | 19 | *R_GEN_CONFIG = genconfig_shadow = |
21 | (genconfig_shadow & ~0x3c0000) | | 20 | (genconfig_shadow & ~0x3c0000) | |
22 | IO_STATE(R_GEN_CONFIG, dma6, intdma7) | | 21 | IO_STATE(R_GEN_CONFIG, dma6, intdma7) | |
23 | IO_STATE(R_GEN_CONFIG, dma7, intdma6); | 22 | IO_STATE(R_GEN_CONFIG, dma7, intdma6); |
@@ -32,11 +31,11 @@ void *dma_memcpy(void *pdst, | |||
32 | *R_DMA_CH7_FIRST = &outdma; | 31 | *R_DMA_CH7_FIRST = &outdma; |
33 | *R_DMA_CH6_CMD = IO_STATE(R_DMA_CH6_CMD, cmd, start); | 32 | *R_DMA_CH6_CMD = IO_STATE(R_DMA_CH6_CMD, cmd, start); |
34 | *R_DMA_CH7_CMD = IO_STATE(R_DMA_CH7_CMD, cmd, start); | 33 | *R_DMA_CH7_CMD = IO_STATE(R_DMA_CH7_CMD, cmd, start); |
35 | |||
36 | while(*R_DMA_CH7_CMD == 1) /* wait for completion */ ; | ||
37 | 34 | ||
38 | D(printk("done\n")); | 35 | while (*R_DMA_CH7_CMD == 1) |
36 | /* wait for completion */; | ||
39 | 37 | ||
38 | D(printk(KERN_DEBUG "done\n")); | ||
40 | } | 39 | } |
41 | 40 | ||
42 | 41 | ||
diff --git a/arch/cris/arch-v10/lib/hw_settings.S b/arch/cris/arch-v10/lib/hw_settings.S index 56905aaa7b6..c09f19f478a 100644 --- a/arch/cris/arch-v10/lib/hw_settings.S +++ b/arch/cris/arch-v10/lib/hw_settings.S | |||
@@ -1,13 +1,11 @@ | |||
1 | /* | 1 | /* |
2 | * $Id: hw_settings.S,v 1.1 2001/12/17 13:59:27 bjornw Exp $ | ||
3 | * | ||
4 | * This table is used by some tools to extract hardware parameters. | 2 | * This table is used by some tools to extract hardware parameters. |
5 | * The table should be included in the kernel and the decompressor. | 3 | * The table should be included in the kernel and the decompressor. |
6 | * Don't forget to update the tools if you change this table. | 4 | * Don't forget to update the tools if you change this table. |
7 | * | 5 | * |
8 | * Copyright (C) 2001 Axis Communications AB | 6 | * Copyright (C) 2001 Axis Communications AB |
9 | * | 7 | * |
10 | * Authors: Mikael Starvik (starvik@axis.com) | 8 | * Authors: Mikael Starvik (starvik@axis.com) |
11 | */ | 9 | */ |
12 | 10 | ||
13 | #define PA_SET_VALUE ((CONFIG_ETRAX_DEF_R_PORT_PA_DIR << 8) | \ | 11 | #define PA_SET_VALUE ((CONFIG_ETRAX_DEF_R_PORT_PA_DIR << 8) | \ |
@@ -15,13 +13,13 @@ | |||
15 | #define PB_SET_VALUE ((CONFIG_ETRAX_DEF_R_PORT_PB_CONFIG << 16) | \ | 13 | #define PB_SET_VALUE ((CONFIG_ETRAX_DEF_R_PORT_PB_CONFIG << 16) | \ |
16 | (CONFIG_ETRAX_DEF_R_PORT_PB_DIR << 8) | \ | 14 | (CONFIG_ETRAX_DEF_R_PORT_PB_DIR << 8) | \ |
17 | (CONFIG_ETRAX_DEF_R_PORT_PB_DATA)) | 15 | (CONFIG_ETRAX_DEF_R_PORT_PB_DATA)) |
18 | 16 | ||
19 | .ascii "HW_PARAM_MAGIC" ; Magic number | 17 | .ascii "HW_PARAM_MAGIC" ; Magic number |
20 | .dword 0xc0004000 ; Kernel start address | 18 | .dword 0xc0004000 ; Kernel start address |
21 | 19 | ||
22 | ; Debug port | 20 | ; Debug port |
23 | #ifdef CONFIG_ETRAX_DEBUG_PORT0 | 21 | #ifdef CONFIG_ETRAX_DEBUG_PORT0 |
24 | .dword 0 | 22 | .dword 0 |
25 | #elif defined(CONFIG_ETRAX_DEBUG_PORT1) | 23 | #elif defined(CONFIG_ETRAX_DEBUG_PORT1) |
26 | .dword 1 | 24 | .dword 1 |
27 | #elif defined(CONFIG_ETRAX_DEBUG_PORT2) | 25 | #elif defined(CONFIG_ETRAX_DEBUG_PORT2) |
@@ -30,7 +28,7 @@ | |||
30 | .dword 3 | 28 | .dword 3 |
31 | #else | 29 | #else |
32 | .dword 4 ; No debug | 30 | .dword 4 ; No debug |
33 | #endif | 31 | #endif |
34 | 32 | ||
35 | ; SDRAM or EDO DRAM? | 33 | ; SDRAM or EDO DRAM? |
36 | #ifdef CONFIG_ETRAX_SDRAM | 34 | #ifdef CONFIG_ETRAX_SDRAM |
@@ -39,7 +37,7 @@ | |||
39 | .dword 0 | 37 | .dword 0 |
40 | #endif | 38 | #endif |
41 | 39 | ||
42 | ; Register values | 40 | ; Register values |
43 | .dword R_WAITSTATES | 41 | .dword R_WAITSTATES |
44 | .dword CONFIG_ETRAX_DEF_R_WAITSTATES | 42 | .dword CONFIG_ETRAX_DEF_R_WAITSTATES |
45 | .dword R_BUS_CONFIG | 43 | .dword R_BUS_CONFIG |
@@ -56,7 +54,7 @@ | |||
56 | .dword CONFIG_ETRAX_DEF_R_DRAM_TIMING | 54 | .dword CONFIG_ETRAX_DEF_R_DRAM_TIMING |
57 | #endif | 55 | #endif |
58 | .dword R_PORT_PA_SET | 56 | .dword R_PORT_PA_SET |
59 | .dword PA_SET_VALUE | 57 | .dword PA_SET_VALUE |
60 | .dword R_PORT_PB_SET | 58 | .dword R_PORT_PB_SET |
61 | .dword PB_SET_VALUE | 59 | .dword PB_SET_VALUE |
62 | .dword 0 ; No more register values | 60 | .dword 0 ; No more register values |
diff --git a/arch/cris/arch-v32/drivers/Kconfig b/arch/cris/arch-v32/drivers/Kconfig index b9e328e688b..a2dd740c590 100644 --- a/arch/cris/arch-v32/drivers/Kconfig +++ b/arch/cris/arch-v32/drivers/Kconfig | |||
@@ -360,24 +360,10 @@ config ETRAX_SER4_DSR_BIT | |||
360 | string "Ser 4 DSR bit (empty = not used)" | 360 | string "Ser 4 DSR bit (empty = not used)" |
361 | depends on ETRAX_SERIAL_PORT4 | 361 | depends on ETRAX_SERIAL_PORT4 |
362 | 362 | ||
363 | config ETRAX_SER3_CD_BIT | 363 | config ETRAX_SER4_CD_BIT |
364 | string "Ser 4 CD bit (empty = not used)" | 364 | string "Ser 4 CD bit (empty = not used)" |
365 | depends on ETRAX_SERIAL_PORT4 | 365 | depends on ETRAX_SERIAL_PORT4 |
366 | 366 | ||
367 | config ETRAX_RS485 | ||
368 | bool "RS-485 support" | ||
369 | depends on ETRAXFS_SERIAL | ||
370 | help | ||
371 | Enables support for RS-485 serial communication. For a primer on | ||
372 | RS-485, see <http://www.hw.cz/english/docs/rs485/rs485.html>. | ||
373 | |||
374 | config ETRAX_RS485_DISABLE_RECEIVER | ||
375 | bool "Disable serial receiver" | ||
376 | depends on ETRAX_RS485 | ||
377 | help | ||
378 | It is necessary to disable the serial receiver to avoid serial | ||
379 | loopback. Not all products are able to do this in software only. | ||
380 | |||
381 | config ETRAX_SYNCHRONOUS_SERIAL | 367 | config ETRAX_SYNCHRONOUS_SERIAL |
382 | bool "Synchronous serial-port support" | 368 | bool "Synchronous serial-port support" |
383 | depends on ETRAX_ARCH_V32 | 369 | depends on ETRAX_ARCH_V32 |
diff --git a/arch/cris/arch-v32/drivers/i2c.c b/arch/cris/arch-v32/drivers/i2c.c index 506826399ae..2fd6a740d89 100644 --- a/arch/cris/arch-v32/drivers/i2c.c +++ b/arch/cris/arch-v32/drivers/i2c.c | |||
@@ -649,10 +649,10 @@ i2c_release(struct inode *inode, struct file *filp) | |||
649 | /* Main device API. ioctl's to write or read to/from i2c registers. | 649 | /* Main device API. ioctl's to write or read to/from i2c registers. |
650 | */ | 650 | */ |
651 | 651 | ||
652 | static int | 652 | static long |
653 | i2c_ioctl(struct inode *inode, struct file *file, | 653 | i2c_ioctl(struct file *file, unsigned int cmd, unsigned long arg) |
654 | unsigned int cmd, unsigned long arg) | ||
655 | { | 654 | { |
655 | int ret; | ||
656 | if(_IOC_TYPE(cmd) != ETRAXI2C_IOCTYPE) { | 656 | if(_IOC_TYPE(cmd) != ETRAXI2C_IOCTYPE) { |
657 | return -ENOTTY; | 657 | return -ENOTTY; |
658 | } | 658 | } |
@@ -665,9 +665,13 @@ i2c_ioctl(struct inode *inode, struct file *file, | |||
665 | I2C_ARGREG(arg), | 665 | I2C_ARGREG(arg), |
666 | I2C_ARGVALUE(arg))); | 666 | I2C_ARGVALUE(arg))); |
667 | 667 | ||
668 | return i2c_writereg(I2C_ARGSLAVE(arg), | 668 | lock_kernel(); |
669 | ret = i2c_writereg(I2C_ARGSLAVE(arg), | ||
669 | I2C_ARGREG(arg), | 670 | I2C_ARGREG(arg), |
670 | I2C_ARGVALUE(arg)); | 671 | I2C_ARGVALUE(arg)); |
672 | unlock_kernel(); | ||
673 | return ret; | ||
674 | |||
671 | case I2C_READREG: | 675 | case I2C_READREG: |
672 | { | 676 | { |
673 | unsigned char val; | 677 | unsigned char val; |
@@ -675,7 +679,9 @@ i2c_ioctl(struct inode *inode, struct file *file, | |||
675 | D(printk("i2cr %d %d ", | 679 | D(printk("i2cr %d %d ", |
676 | I2C_ARGSLAVE(arg), | 680 | I2C_ARGSLAVE(arg), |
677 | I2C_ARGREG(arg))); | 681 | I2C_ARGREG(arg))); |
682 | lock_kernel(); | ||
678 | val = i2c_readreg(I2C_ARGSLAVE(arg), I2C_ARGREG(arg)); | 683 | val = i2c_readreg(I2C_ARGSLAVE(arg), I2C_ARGREG(arg)); |
684 | unlock_kernel(); | ||
679 | D(printk("= %d\n", val)); | 685 | D(printk("= %d\n", val)); |
680 | return val; | 686 | return val; |
681 | } | 687 | } |
@@ -688,10 +694,10 @@ i2c_ioctl(struct inode *inode, struct file *file, | |||
688 | } | 694 | } |
689 | 695 | ||
690 | static const struct file_operations i2c_fops = { | 696 | static const struct file_operations i2c_fops = { |
691 | .owner = THIS_MODULE, | 697 | .owner = THIS_MODULE, |
692 | .ioctl = i2c_ioctl, | 698 | .unlocked_ioctl = i2c_ioctl, |
693 | .open = i2c_open, | 699 | .open = i2c_open, |
694 | .release = i2c_release, | 700 | .release = i2c_release, |
695 | }; | 701 | }; |
696 | 702 | ||
697 | static int __init i2c_init(void) | 703 | static int __init i2c_init(void) |
diff --git a/arch/cris/arch-v32/drivers/pcf8563.c b/arch/cris/arch-v32/drivers/pcf8563.c index f4478506e52..bef6eb53b15 100644 --- a/arch/cris/arch-v32/drivers/pcf8563.c +++ b/arch/cris/arch-v32/drivers/pcf8563.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <linux/init.h> | 24 | #include <linux/init.h> |
25 | #include <linux/fs.h> | 25 | #include <linux/fs.h> |
26 | #include <linux/ioctl.h> | 26 | #include <linux/ioctl.h> |
27 | #include <linux/smp_lock.h> | ||
27 | #include <linux/delay.h> | 28 | #include <linux/delay.h> |
28 | #include <linux/bcd.h> | 29 | #include <linux/bcd.h> |
29 | #include <linux/mutex.h> | 30 | #include <linux/mutex.h> |
@@ -49,7 +50,7 @@ static DEFINE_MUTEX(rtc_lock); /* Protect state etc */ | |||
49 | static const unsigned char days_in_month[] = | 50 | static const unsigned char days_in_month[] = |
50 | { 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; | 51 | { 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; |
51 | 52 | ||
52 | int pcf8563_ioctl(struct inode *, struct file *, unsigned int, unsigned long); | 53 | static long pcf8563_unlocked_ioctl(struct file *filp, unsigned int cmd, unsigned long arg); |
53 | 54 | ||
54 | /* Cache VL bit value read at driver init since writing the RTC_SECOND | 55 | /* Cache VL bit value read at driver init since writing the RTC_SECOND |
55 | * register clears the VL status. | 56 | * register clears the VL status. |
@@ -57,8 +58,8 @@ int pcf8563_ioctl(struct inode *, struct file *, unsigned int, unsigned long); | |||
57 | static int voltage_low; | 58 | static int voltage_low; |
58 | 59 | ||
59 | static const struct file_operations pcf8563_fops = { | 60 | static const struct file_operations pcf8563_fops = { |
60 | .owner = THIS_MODULE, | 61 | .owner = THIS_MODULE, |
61 | .ioctl = pcf8563_ioctl | 62 | .unlocked_ioctl = pcf8563_unlocked_ioctl, |
62 | }; | 63 | }; |
63 | 64 | ||
64 | unsigned char | 65 | unsigned char |
@@ -208,8 +209,7 @@ pcf8563_exit(void) | |||
208 | * ioctl calls for this driver. Why return -ENOTTY upon error? Because | 209 | * ioctl calls for this driver. Why return -ENOTTY upon error? Because |
209 | * POSIX says so! | 210 | * POSIX says so! |
210 | */ | 211 | */ |
211 | int pcf8563_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, | 212 | static int pcf8563_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) |
212 | unsigned long arg) | ||
213 | { | 213 | { |
214 | /* Some sanity checks. */ | 214 | /* Some sanity checks. */ |
215 | if (_IOC_TYPE(cmd) != RTC_MAGIC) | 215 | if (_IOC_TYPE(cmd) != RTC_MAGIC) |
@@ -335,6 +335,17 @@ int pcf8563_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, | |||
335 | return 0; | 335 | return 0; |
336 | } | 336 | } |
337 | 337 | ||
338 | static long pcf8563_unlocked_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) | ||
339 | { | ||
340 | int ret; | ||
341 | |||
342 | lock_kernel(); | ||
343 | return pcf8563_ioctl(filp, cmd, arg); | ||
344 | unlock_kernel(); | ||
345 | |||
346 | return ret; | ||
347 | } | ||
348 | |||
338 | static int __init pcf8563_register(void) | 349 | static int __init pcf8563_register(void) |
339 | { | 350 | { |
340 | if (pcf8563_init() < 0) { | 351 | if (pcf8563_init() < 0) { |
diff --git a/arch/cris/arch-v32/kernel/crisksyms.c b/arch/cris/arch-v32/kernel/crisksyms.c index 64933e2c0f5..bde8d1a10ca 100644 --- a/arch/cris/arch-v32/kernel/crisksyms.c +++ b/arch/cris/arch-v32/kernel/crisksyms.c | |||
@@ -24,5 +24,5 @@ EXPORT_SYMBOL(crisv32_io_get_name); | |||
24 | EXPORT_SYMBOL(crisv32_io_get); | 24 | EXPORT_SYMBOL(crisv32_io_get); |
25 | 25 | ||
26 | /* Functions masking/unmasking interrupts */ | 26 | /* Functions masking/unmasking interrupts */ |
27 | EXPORT_SYMBOL(mask_irq); | 27 | EXPORT_SYMBOL(crisv32_mask_irq); |
28 | EXPORT_SYMBOL(unmask_irq); | 28 | EXPORT_SYMBOL(crisv32_unmask_irq); |
diff --git a/arch/cris/arch-v32/kernel/irq.c b/arch/cris/arch-v32/kernel/irq.c index b6241198fb9..0b1febe44aa 100644 --- a/arch/cris/arch-v32/kernel/irq.c +++ b/arch/cris/arch-v32/kernel/irq.c | |||
@@ -280,8 +280,7 @@ out: | |||
280 | return cpu; | 280 | return cpu; |
281 | } | 281 | } |
282 | 282 | ||
283 | void | 283 | void crisv32_mask_irq(int irq) |
284 | mask_irq(int irq) | ||
285 | { | 284 | { |
286 | int cpu; | 285 | int cpu; |
287 | 286 | ||
@@ -289,8 +288,7 @@ mask_irq(int irq) | |||
289 | block_irq(irq, cpu); | 288 | block_irq(irq, cpu); |
290 | } | 289 | } |
291 | 290 | ||
292 | void | 291 | void crisv32_unmask_irq(int irq) |
293 | unmask_irq(int irq) | ||
294 | { | 292 | { |
295 | unblock_irq(irq, irq_cpu(irq)); | 293 | unblock_irq(irq, irq_cpu(irq)); |
296 | } | 294 | } |
@@ -298,23 +296,23 @@ unmask_irq(int irq) | |||
298 | 296 | ||
299 | static unsigned int startup_crisv32_irq(unsigned int irq) | 297 | static unsigned int startup_crisv32_irq(unsigned int irq) |
300 | { | 298 | { |
301 | unmask_irq(irq); | 299 | crisv32_unmask_irq(irq); |
302 | return 0; | 300 | return 0; |
303 | } | 301 | } |
304 | 302 | ||
305 | static void shutdown_crisv32_irq(unsigned int irq) | 303 | static void shutdown_crisv32_irq(unsigned int irq) |
306 | { | 304 | { |
307 | mask_irq(irq); | 305 | crisv32_mask_irq(irq); |
308 | } | 306 | } |
309 | 307 | ||
310 | static void enable_crisv32_irq(unsigned int irq) | 308 | static void enable_crisv32_irq(unsigned int irq) |
311 | { | 309 | { |
312 | unmask_irq(irq); | 310 | crisv32_unmask_irq(irq); |
313 | } | 311 | } |
314 | 312 | ||
315 | static void disable_crisv32_irq(unsigned int irq) | 313 | static void disable_crisv32_irq(unsigned int irq) |
316 | { | 314 | { |
317 | mask_irq(irq); | 315 | crisv32_mask_irq(irq); |
318 | } | 316 | } |
319 | 317 | ||
320 | static void ack_crisv32_irq(unsigned int irq) | 318 | static void ack_crisv32_irq(unsigned int irq) |
diff --git a/arch/cris/arch-v32/kernel/smp.c b/arch/cris/arch-v32/kernel/smp.c index 058adddf4e4..84fed3b4b07 100644 --- a/arch/cris/arch-v32/kernel/smp.c +++ b/arch/cris/arch-v32/kernel/smp.c | |||
@@ -168,8 +168,8 @@ void __init smp_callin(void) | |||
168 | 168 | ||
169 | /* Enable IRQ and idle */ | 169 | /* Enable IRQ and idle */ |
170 | REG_WR(intr_vect, irq_regs[cpu], rw_mask, vect_mask); | 170 | REG_WR(intr_vect, irq_regs[cpu], rw_mask, vect_mask); |
171 | unmask_irq(IPI_INTR_VECT); | 171 | crisv32_unmask_irq(IPI_INTR_VECT); |
172 | unmask_irq(TIMER0_INTR_VECT); | 172 | crisv32_unmask_irq(TIMER0_INTR_VECT); |
173 | preempt_disable(); | 173 | preempt_disable(); |
174 | notify_cpu_starting(cpu); | 174 | notify_cpu_starting(cpu); |
175 | local_irq_enable(); | 175 | local_irq_enable(); |
diff --git a/arch/cris/include/arch-v10/arch/irq.h b/arch/cris/include/arch-v10/arch/irq.h index 6248004eca1..7d345947b3e 100644 --- a/arch/cris/include/arch-v10/arch/irq.h +++ b/arch/cris/include/arch-v10/arch/irq.h | |||
@@ -93,15 +93,16 @@ void set_break_vector(int n, irqvectptr addr); | |||
93 | "push $r10\n\t" /* push orig_r10 */ \ | 93 | "push $r10\n\t" /* push orig_r10 */ \ |
94 | "clear.d [$sp=$sp-4]\n\t" /* frametype - this is a normal stackframe */ | 94 | "clear.d [$sp=$sp-4]\n\t" /* frametype - this is a normal stackframe */ |
95 | 95 | ||
96 | /* BLOCK_IRQ and UNBLOCK_IRQ do the same as mask_irq and unmask_irq */ | 96 | /* BLOCK_IRQ and UNBLOCK_IRQ do the same as |
97 | * crisv10_mask_irq and crisv10_unmask_irq */ | ||
97 | 98 | ||
98 | #define BLOCK_IRQ(mask,nr) \ | 99 | #define BLOCK_IRQ(mask,nr) \ |
99 | "move.d " #mask ",$r0\n\t" \ | 100 | "move.d " #mask ",$r0\n\t" \ |
100 | "move.d $r0,[0xb00000d8]\n\t" | 101 | "move.d $r0,[0xb00000d8]\n\t" |
101 | 102 | ||
102 | #define UNBLOCK_IRQ(mask) \ | 103 | #define UNBLOCK_IRQ(mask) \ |
103 | "move.d " #mask ",$r0\n\t" \ | 104 | "move.d " #mask ",$r0\n\t" \ |
104 | "move.d $r0,[0xb00000dc]\n\t" | 105 | "move.d $r0,[0xb00000dc]\n\t" |
105 | 106 | ||
106 | #define IRQ_NAME2(nr) nr##_interrupt(void) | 107 | #define IRQ_NAME2(nr) nr##_interrupt(void) |
107 | #define IRQ_NAME(nr) IRQ_NAME2(IRQ##nr) | 108 | #define IRQ_NAME(nr) IRQ_NAME2(IRQ##nr) |
diff --git a/arch/cris/include/arch-v32/arch/irq.h b/arch/cris/include/arch-v32/arch/irq.h index 9e4c9fbdfdd..b31e9984f84 100644 --- a/arch/cris/include/arch-v32/arch/irq.h +++ b/arch/cris/include/arch-v32/arch/irq.h | |||
@@ -23,8 +23,8 @@ struct etrax_interrupt_vector { | |||
23 | 23 | ||
24 | extern struct etrax_interrupt_vector *etrax_irv; /* head.S */ | 24 | extern struct etrax_interrupt_vector *etrax_irv; /* head.S */ |
25 | 25 | ||
26 | void mask_irq(int irq); | 26 | void crisv32_mask_irq(int irq); |
27 | void unmask_irq(int irq); | 27 | void crisv32_unmask_irq(int irq); |
28 | 28 | ||
29 | void set_exception_vector(int n, irqvectptr addr); | 29 | void set_exception_vector(int n, irqvectptr addr); |
30 | 30 | ||
diff --git a/arch/cris/include/asm/param.h b/arch/cris/include/asm/param.h index 0e47994e40b..484fcf8667c 100644 --- a/arch/cris/include/asm/param.h +++ b/arch/cris/include/asm/param.h | |||
@@ -2,22 +2,9 @@ | |||
2 | #define _ASMCRIS_PARAM_H | 2 | #define _ASMCRIS_PARAM_H |
3 | 3 | ||
4 | /* Currently we assume that HZ=100 is good for CRIS. */ | 4 | /* Currently we assume that HZ=100 is good for CRIS. */ |
5 | #ifdef __KERNEL__ | ||
6 | # define HZ CONFIG_HZ /* Internal kernel timer frequency */ | ||
7 | # define USER_HZ 100 /* .. some user interfaces are in "ticks" */ | ||
8 | # define CLOCKS_PER_SEC (USER_HZ) /* like times() */ | ||
9 | #endif | ||
10 | |||
11 | #ifndef HZ | ||
12 | #define HZ 100 | ||
13 | #endif | ||
14 | 5 | ||
15 | #define EXEC_PAGESIZE 8192 | 6 | #define EXEC_PAGESIZE 8192 |
16 | 7 | ||
17 | #ifndef NOGROUP | 8 | #include <asm-generic/param.h> |
18 | #define NOGROUP (-1) | ||
19 | #endif | ||
20 | |||
21 | #define MAXHOSTNAMELEN 64 /* max length of hostname */ | ||
22 | 9 | ||
23 | #endif | 10 | #endif /* _ASMCRIS_PARAM_H */ |
diff --git a/arch/frv/kernel/break.S b/arch/frv/kernel/break.S index bd0bdf908d9..cbb6958a314 100644 --- a/arch/frv/kernel/break.S +++ b/arch/frv/kernel/break.S | |||
@@ -21,7 +21,7 @@ | |||
21 | # | 21 | # |
22 | # the break handler has its own stack | 22 | # the break handler has its own stack |
23 | # | 23 | # |
24 | .section .bss.stack | 24 | .section .bss..stack |
25 | .globl __break_user_context | 25 | .globl __break_user_context |
26 | .balign THREAD_SIZE | 26 | .balign THREAD_SIZE |
27 | __break_stack: | 27 | __break_stack: |
@@ -63,7 +63,7 @@ __break_trace_through_exceptions: | |||
63 | # entry point for Break Exceptions/Interrupts | 63 | # entry point for Break Exceptions/Interrupts |
64 | # | 64 | # |
65 | ############################################################################### | 65 | ############################################################################### |
66 | .section .text.break | 66 | .section .text..break |
67 | .balign 4 | 67 | .balign 4 |
68 | .globl __entry_break | 68 | .globl __entry_break |
69 | __entry_break: | 69 | __entry_break: |
diff --git a/arch/frv/kernel/entry.S b/arch/frv/kernel/entry.S index 189397ec012..63d579bf1c2 100644 --- a/arch/frv/kernel/entry.S +++ b/arch/frv/kernel/entry.S | |||
@@ -38,7 +38,7 @@ | |||
38 | 38 | ||
39 | #define nr_syscalls ((syscall_table_size)/4) | 39 | #define nr_syscalls ((syscall_table_size)/4) |
40 | 40 | ||
41 | .section .text.entry | 41 | .section .text..entry |
42 | .balign 4 | 42 | .balign 4 |
43 | 43 | ||
44 | .macro LEDS val | 44 | .macro LEDS val |
diff --git a/arch/frv/kernel/head.S b/arch/frv/kernel/head.S index b825ef3f2d5..e9a8cc63ac9 100644 --- a/arch/frv/kernel/head.S +++ b/arch/frv/kernel/head.S | |||
@@ -542,7 +542,7 @@ __head_end: | |||
542 | .size _boot, .-_boot | 542 | .size _boot, .-_boot |
543 | 543 | ||
544 | # provide a point for GDB to place a break | 544 | # provide a point for GDB to place a break |
545 | .section .text.start,"ax" | 545 | .section .text..start,"ax" |
546 | .globl _start | 546 | .globl _start |
547 | .balign 4 | 547 | .balign 4 |
548 | _start: | 548 | _start: |
diff --git a/arch/frv/kernel/vmlinux.lds.S b/arch/frv/kernel/vmlinux.lds.S index cbe811fccfc..8b973f3cc90 100644 --- a/arch/frv/kernel/vmlinux.lds.S +++ b/arch/frv/kernel/vmlinux.lds.S | |||
@@ -57,10 +57,10 @@ SECTIONS | |||
57 | _text = .; | 57 | _text = .; |
58 | _stext = .; | 58 | _stext = .; |
59 | .text : { | 59 | .text : { |
60 | *(.text.start) | 60 | *(.text..start) |
61 | *(.text.entry) | 61 | *(.text..entry) |
62 | *(.text.break) | 62 | *(.text..break) |
63 | *(.text.tlbmiss) | 63 | *(.text..tlbmiss) |
64 | TEXT_TEXT | 64 | TEXT_TEXT |
65 | SCHED_TEXT | 65 | SCHED_TEXT |
66 | LOCK_TEXT | 66 | LOCK_TEXT |
@@ -114,7 +114,7 @@ SECTIONS | |||
114 | 114 | ||
115 | .sbss : { *(.sbss .sbss.*) } | 115 | .sbss : { *(.sbss .sbss.*) } |
116 | .bss : { *(.bss .bss.*) } | 116 | .bss : { *(.bss .bss.*) } |
117 | .bss.stack : { *(.bss) } | 117 | .bss..stack : { *(.bss) } |
118 | 118 | ||
119 | __bss_stop = .; | 119 | __bss_stop = .; |
120 | _end = . ; | 120 | _end = . ; |
diff --git a/arch/frv/mm/tlb-miss.S b/arch/frv/mm/tlb-miss.S index 7f392bc651a..f3ac019bb18 100644 --- a/arch/frv/mm/tlb-miss.S +++ b/arch/frv/mm/tlb-miss.S | |||
@@ -15,7 +15,7 @@ | |||
15 | #include <asm/pgtable.h> | 15 | #include <asm/pgtable.h> |
16 | #include <asm/spr-regs.h> | 16 | #include <asm/spr-regs.h> |
17 | 17 | ||
18 | .section .text.tlbmiss | 18 | .section .text..tlbmiss |
19 | .balign 4 | 19 | .balign 4 |
20 | 20 | ||
21 | .globl __entry_insn_mmu_miss | 21 | .globl __entry_insn_mmu_miss |
diff --git a/arch/h8300/boot/compressed/head.S b/arch/h8300/boot/compressed/head.S index 985a81a2435..10e9a2d1cc6 100644 --- a/arch/h8300/boot/compressed/head.S +++ b/arch/h8300/boot/compressed/head.S | |||
@@ -9,7 +9,7 @@ | |||
9 | 9 | ||
10 | #define SRAM_START 0xff4000 | 10 | #define SRAM_START 0xff4000 |
11 | 11 | ||
12 | .section .text.startup | 12 | .section .text..startup |
13 | .global startup | 13 | .global startup |
14 | startup: | 14 | startup: |
15 | mov.l #SRAM_START+0x8000, sp | 15 | mov.l #SRAM_START+0x8000, sp |
diff --git a/arch/h8300/boot/compressed/vmlinux.lds b/arch/h8300/boot/compressed/vmlinux.lds index 65e2a0d1ae3..a0a3a0ed54e 100644 --- a/arch/h8300/boot/compressed/vmlinux.lds +++ b/arch/h8300/boot/compressed/vmlinux.lds | |||
@@ -4,7 +4,7 @@ SECTIONS | |||
4 | { | 4 | { |
5 | __stext = . ; | 5 | __stext = . ; |
6 | __text = .; | 6 | __text = .; |
7 | *(.text.startup) | 7 | *(.text..startup) |
8 | *(.text) | 8 | *(.text) |
9 | __etext = . ; | 9 | __etext = . ; |
10 | } | 10 | } |
diff --git a/arch/ia64/include/asm/asmmacro.h b/arch/ia64/include/asm/asmmacro.h index c1642fd6402..3ab6d75aa3d 100644 --- a/arch/ia64/include/asm/asmmacro.h +++ b/arch/ia64/include/asm/asmmacro.h | |||
@@ -70,12 +70,12 @@ name: | |||
70 | * path (ivt.S - TLB miss processing) or in places where it might not be | 70 | * path (ivt.S - TLB miss processing) or in places where it might not be |
71 | * safe to use a "tpa" instruction (mca_asm.S - error recovery). | 71 | * safe to use a "tpa" instruction (mca_asm.S - error recovery). |
72 | */ | 72 | */ |
73 | .section ".data.patch.vtop", "a" // declare section & section attributes | 73 | .section ".data..patch.vtop", "a" // declare section & section attributes |
74 | .previous | 74 | .previous |
75 | 75 | ||
76 | #define LOAD_PHYSICAL(pr, reg, obj) \ | 76 | #define LOAD_PHYSICAL(pr, reg, obj) \ |
77 | [1:](pr)movl reg = obj; \ | 77 | [1:](pr)movl reg = obj; \ |
78 | .xdata4 ".data.patch.vtop", 1b-. | 78 | .xdata4 ".data..patch.vtop", 1b-. |
79 | 79 | ||
80 | /* | 80 | /* |
81 | * For now, we always put in the McKinley E9 workaround. On CPUs that don't need it, | 81 | * For now, we always put in the McKinley E9 workaround. On CPUs that don't need it, |
@@ -84,11 +84,11 @@ name: | |||
84 | #define DO_MCKINLEY_E9_WORKAROUND | 84 | #define DO_MCKINLEY_E9_WORKAROUND |
85 | 85 | ||
86 | #ifdef DO_MCKINLEY_E9_WORKAROUND | 86 | #ifdef DO_MCKINLEY_E9_WORKAROUND |
87 | .section ".data.patch.mckinley_e9", "a" | 87 | .section ".data..patch.mckinley_e9", "a" |
88 | .previous | 88 | .previous |
89 | /* workaround for Itanium 2 Errata 9: */ | 89 | /* workaround for Itanium 2 Errata 9: */ |
90 | # define FSYS_RETURN \ | 90 | # define FSYS_RETURN \ |
91 | .xdata4 ".data.patch.mckinley_e9", 1f-.; \ | 91 | .xdata4 ".data..patch.mckinley_e9", 1f-.; \ |
92 | 1:{ .mib; \ | 92 | 1:{ .mib; \ |
93 | nop.m 0; \ | 93 | nop.m 0; \ |
94 | mov r16=ar.pfs; \ | 94 | mov r16=ar.pfs; \ |
@@ -107,11 +107,11 @@ name: | |||
107 | * If physical stack register size is different from DEF_NUM_STACK_REG, | 107 | * If physical stack register size is different from DEF_NUM_STACK_REG, |
108 | * dynamically patch the kernel for correct size. | 108 | * dynamically patch the kernel for correct size. |
109 | */ | 109 | */ |
110 | .section ".data.patch.phys_stack_reg", "a" | 110 | .section ".data..patch.phys_stack_reg", "a" |
111 | .previous | 111 | .previous |
112 | #define LOAD_PHYS_STACK_REG_SIZE(reg) \ | 112 | #define LOAD_PHYS_STACK_REG_SIZE(reg) \ |
113 | [1:] adds reg=IA64_NUM_PHYS_STACK_REG*8+8,r0; \ | 113 | [1:] adds reg=IA64_NUM_PHYS_STACK_REG*8+8,r0; \ |
114 | .xdata4 ".data.patch.phys_stack_reg", 1b-. | 114 | .xdata4 ".data..patch.phys_stack_reg", 1b-. |
115 | 115 | ||
116 | /* | 116 | /* |
117 | * Up until early 2004, use of .align within a function caused bad unwind info. | 117 | * Up until early 2004, use of .align within a function caused bad unwind info. |
diff --git a/arch/ia64/include/asm/cache.h b/arch/ia64/include/asm/cache.h index e7482bd628f..988254a7d34 100644 --- a/arch/ia64/include/asm/cache.h +++ b/arch/ia64/include/asm/cache.h | |||
@@ -24,6 +24,6 @@ | |||
24 | # define SMP_CACHE_BYTES (1 << 3) | 24 | # define SMP_CACHE_BYTES (1 << 3) |
25 | #endif | 25 | #endif |
26 | 26 | ||
27 | #define __read_mostly __attribute__((__section__(".data.read_mostly"))) | 27 | #define __read_mostly __attribute__((__section__(".data..read_mostly"))) |
28 | 28 | ||
29 | #endif /* _ASM_IA64_CACHE_H */ | 29 | #endif /* _ASM_IA64_CACHE_H */ |
diff --git a/arch/ia64/include/asm/percpu.h b/arch/ia64/include/asm/percpu.h index 1bd40826569..14aa1c58912 100644 --- a/arch/ia64/include/asm/percpu.h +++ b/arch/ia64/include/asm/percpu.h | |||
@@ -31,7 +31,7 @@ extern void *per_cpu_init(void); | |||
31 | 31 | ||
32 | #endif /* SMP */ | 32 | #endif /* SMP */ |
33 | 33 | ||
34 | #define PER_CPU_BASE_SECTION ".data.percpu" | 34 | #define PER_CPU_BASE_SECTION ".data..percpu" |
35 | 35 | ||
36 | /* | 36 | /* |
37 | * Be extremely careful when taking the address of this variable! Due to virtual | 37 | * Be extremely careful when taking the address of this variable! Due to virtual |
diff --git a/arch/ia64/kernel/Makefile.gate b/arch/ia64/kernel/Makefile.gate index ab9b03a9adc..ceeffc50976 100644 --- a/arch/ia64/kernel/Makefile.gate +++ b/arch/ia64/kernel/Makefile.gate | |||
@@ -21,7 +21,7 @@ GATECFLAGS_gate-syms.o = -r | |||
21 | $(obj)/gate-syms.o: $(obj)/gate.lds $(obj)/gate.o FORCE | 21 | $(obj)/gate-syms.o: $(obj)/gate.lds $(obj)/gate.o FORCE |
22 | $(call if_changed,gate) | 22 | $(call if_changed,gate) |
23 | 23 | ||
24 | # gate-data.o contains the gate DSO image as data in section .data.gate. | 24 | # gate-data.o contains the gate DSO image as data in section .data..gate. |
25 | # We must build gate.so before we can assemble it. | 25 | # We must build gate.so before we can assemble it. |
26 | # Note: kbuild does not track this dependency due to usage of .incbin | 26 | # Note: kbuild does not track this dependency due to usage of .incbin |
27 | $(obj)/gate-data.o: $(obj)/gate.so | 27 | $(obj)/gate-data.o: $(obj)/gate.so |
diff --git a/arch/ia64/kernel/gate-data.S b/arch/ia64/kernel/gate-data.S index 258c0a3238f..b3ef1c72e13 100644 --- a/arch/ia64/kernel/gate-data.S +++ b/arch/ia64/kernel/gate-data.S | |||
@@ -1,3 +1,3 @@ | |||
1 | .section .data.gate, "aw" | 1 | .section .data..gate, "aw" |
2 | 2 | ||
3 | .incbin "arch/ia64/kernel/gate.so" | 3 | .incbin "arch/ia64/kernel/gate.so" |
diff --git a/arch/ia64/kernel/gate.S b/arch/ia64/kernel/gate.S index cf5e0a105e1..245d3e1ec7e 100644 --- a/arch/ia64/kernel/gate.S +++ b/arch/ia64/kernel/gate.S | |||
@@ -21,18 +21,18 @@ | |||
21 | * to targets outside the shared object) and to avoid multi-phase kernel builds, we | 21 | * to targets outside the shared object) and to avoid multi-phase kernel builds, we |
22 | * simply create minimalistic "patch lists" in special ELF sections. | 22 | * simply create minimalistic "patch lists" in special ELF sections. |
23 | */ | 23 | */ |
24 | .section ".data.patch.fsyscall_table", "a" | 24 | .section ".data..patch.fsyscall_table", "a" |
25 | .previous | 25 | .previous |
26 | #define LOAD_FSYSCALL_TABLE(reg) \ | 26 | #define LOAD_FSYSCALL_TABLE(reg) \ |
27 | [1:] movl reg=0; \ | 27 | [1:] movl reg=0; \ |
28 | .xdata4 ".data.patch.fsyscall_table", 1b-. | 28 | .xdata4 ".data..patch.fsyscall_table", 1b-. |
29 | 29 | ||
30 | .section ".data.patch.brl_fsys_bubble_down", "a" | 30 | .section ".data..patch.brl_fsys_bubble_down", "a" |
31 | .previous | 31 | .previous |
32 | #define BRL_COND_FSYS_BUBBLE_DOWN(pr) \ | 32 | #define BRL_COND_FSYS_BUBBLE_DOWN(pr) \ |
33 | [1:](pr)brl.cond.sptk 0; \ | 33 | [1:](pr)brl.cond.sptk 0; \ |
34 | ;; \ | 34 | ;; \ |
35 | .xdata4 ".data.patch.brl_fsys_bubble_down", 1b-. | 35 | .xdata4 ".data..patch.brl_fsys_bubble_down", 1b-. |
36 | 36 | ||
37 | GLOBAL_ENTRY(__kernel_syscall_via_break) | 37 | GLOBAL_ENTRY(__kernel_syscall_via_break) |
38 | .prologue | 38 | .prologue |
diff --git a/arch/ia64/kernel/gate.lds.S b/arch/ia64/kernel/gate.lds.S index 88c64ed47c3..d32b0855110 100644 --- a/arch/ia64/kernel/gate.lds.S +++ b/arch/ia64/kernel/gate.lds.S | |||
@@ -33,21 +33,21 @@ SECTIONS | |||
33 | */ | 33 | */ |
34 | . = GATE_ADDR + 0x600; | 34 | . = GATE_ADDR + 0x600; |
35 | 35 | ||
36 | .data.patch : { | 36 | .data..patch : { |
37 | __paravirt_start_gate_mckinley_e9_patchlist = .; | 37 | __paravirt_start_gate_mckinley_e9_patchlist = .; |
38 | *(.data.patch.mckinley_e9) | 38 | *(.data..patch.mckinley_e9) |
39 | __paravirt_end_gate_mckinley_e9_patchlist = .; | 39 | __paravirt_end_gate_mckinley_e9_patchlist = .; |
40 | 40 | ||
41 | __paravirt_start_gate_vtop_patchlist = .; | 41 | __paravirt_start_gate_vtop_patchlist = .; |
42 | *(.data.patch.vtop) | 42 | *(.data..patch.vtop) |
43 | __paravirt_end_gate_vtop_patchlist = .; | 43 | __paravirt_end_gate_vtop_patchlist = .; |
44 | 44 | ||
45 | __paravirt_start_gate_fsyscall_patchlist = .; | 45 | __paravirt_start_gate_fsyscall_patchlist = .; |
46 | *(.data.patch.fsyscall_table) | 46 | *(.data..patch.fsyscall_table) |
47 | __paravirt_end_gate_fsyscall_patchlist = .; | 47 | __paravirt_end_gate_fsyscall_patchlist = .; |
48 | 48 | ||
49 | __paravirt_start_gate_brl_fsys_bubble_down_patchlist = .; | 49 | __paravirt_start_gate_brl_fsys_bubble_down_patchlist = .; |
50 | *(.data.patch.brl_fsys_bubble_down) | 50 | *(.data..patch.brl_fsys_bubble_down) |
51 | __paravirt_end_gate_brl_fsys_bubble_down_patchlist = .; | 51 | __paravirt_end_gate_brl_fsys_bubble_down_patchlist = .; |
52 | } :readable | 52 | } :readable |
53 | 53 | ||
diff --git a/arch/ia64/kernel/init_task.c b/arch/ia64/kernel/init_task.c index e253ab8fcbc..f9efe9739d3 100644 --- a/arch/ia64/kernel/init_task.c +++ b/arch/ia64/kernel/init_task.c | |||
@@ -23,7 +23,7 @@ static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | |||
23 | * Initial task structure. | 23 | * Initial task structure. |
24 | * | 24 | * |
25 | * We need to make sure that this is properly aligned due to the way process stacks are | 25 | * We need to make sure that this is properly aligned due to the way process stacks are |
26 | * handled. This is done by having a special ".data.init_task" section... | 26 | * handled. This is done by having a special ".data..init_task" section... |
27 | */ | 27 | */ |
28 | #define init_thread_info init_task_mem.s.thread_info | 28 | #define init_thread_info init_task_mem.s.thread_info |
29 | 29 | ||
diff --git a/arch/ia64/kernel/ivt.S b/arch/ia64/kernel/ivt.S index 179fd122e83..d93e396bf59 100644 --- a/arch/ia64/kernel/ivt.S +++ b/arch/ia64/kernel/ivt.S | |||
@@ -82,7 +82,7 @@ | |||
82 | mov r19=n;; /* prepare to save predicates */ \ | 82 | mov r19=n;; /* prepare to save predicates */ \ |
83 | br.sptk.many dispatch_to_fault_handler | 83 | br.sptk.many dispatch_to_fault_handler |
84 | 84 | ||
85 | .section .text.ivt,"ax" | 85 | .section .text..ivt,"ax" |
86 | 86 | ||
87 | .align 32768 // align on 32KB boundary | 87 | .align 32768 // align on 32KB boundary |
88 | .global ia64_ivt | 88 | .global ia64_ivt |
diff --git a/arch/ia64/kernel/minstate.h b/arch/ia64/kernel/minstate.h index 292e214a3b8..d56753a1163 100644 --- a/arch/ia64/kernel/minstate.h +++ b/arch/ia64/kernel/minstate.h | |||
@@ -16,7 +16,7 @@ | |||
16 | #define ACCOUNT_SYS_ENTER | 16 | #define ACCOUNT_SYS_ENTER |
17 | #endif | 17 | #endif |
18 | 18 | ||
19 | .section ".data.patch.rse", "a" | 19 | .section ".data..patch.rse", "a" |
20 | .previous | 20 | .previous |
21 | 21 | ||
22 | /* | 22 | /* |
@@ -215,7 +215,7 @@ | |||
215 | (pUStk) extr.u r17=r18,3,6; \ | 215 | (pUStk) extr.u r17=r18,3,6; \ |
216 | (pUStk) sub r16=r18,r22; \ | 216 | (pUStk) sub r16=r18,r22; \ |
217 | [1:](pKStk) br.cond.sptk.many 1f; \ | 217 | [1:](pKStk) br.cond.sptk.many 1f; \ |
218 | .xdata4 ".data.patch.rse",1b-. \ | 218 | .xdata4 ".data..patch.rse",1b-. \ |
219 | ;; \ | 219 | ;; \ |
220 | cmp.ge p6,p7 = 33,r17; \ | 220 | cmp.ge p6,p7 = 33,r17; \ |
221 | ;; \ | 221 | ;; \ |
diff --git a/arch/ia64/kernel/paravirtentry.S b/arch/ia64/kernel/paravirtentry.S index 6158560d7f1..92d880c4d3d 100644 --- a/arch/ia64/kernel/paravirtentry.S +++ b/arch/ia64/kernel/paravirtentry.S | |||
@@ -28,7 +28,7 @@ | |||
28 | #include "entry.h" | 28 | #include "entry.h" |
29 | 29 | ||
30 | #define DATA8(sym, init_value) \ | 30 | #define DATA8(sym, init_value) \ |
31 | .pushsection .data.read_mostly ; \ | 31 | .pushsection .data..read_mostly ; \ |
32 | .align 8 ; \ | 32 | .align 8 ; \ |
33 | .global sym ; \ | 33 | .global sym ; \ |
34 | sym: ; \ | 34 | sym: ; \ |
diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S index 1295ba327f6..e07218a2577 100644 --- a/arch/ia64/kernel/vmlinux.lds.S +++ b/arch/ia64/kernel/vmlinux.lds.S | |||
@@ -8,7 +8,7 @@ | |||
8 | 8 | ||
9 | #define IVT_TEXT \ | 9 | #define IVT_TEXT \ |
10 | VMLINUX_SYMBOL(__start_ivt_text) = .; \ | 10 | VMLINUX_SYMBOL(__start_ivt_text) = .; \ |
11 | *(.text.ivt) \ | 11 | *(.text..ivt) \ |
12 | VMLINUX_SYMBOL(__end_ivt_text) = .; | 12 | VMLINUX_SYMBOL(__end_ivt_text) = .; |
13 | 13 | ||
14 | OUTPUT_FORMAT("elf64-ia64-little") | 14 | OUTPUT_FORMAT("elf64-ia64-little") |
@@ -54,8 +54,8 @@ SECTIONS | |||
54 | .text2 : AT(ADDR(.text2) - LOAD_OFFSET) | 54 | .text2 : AT(ADDR(.text2) - LOAD_OFFSET) |
55 | { *(.text2) } | 55 | { *(.text2) } |
56 | #ifdef CONFIG_SMP | 56 | #ifdef CONFIG_SMP |
57 | .text.lock : AT(ADDR(.text.lock) - LOAD_OFFSET) | 57 | .text..lock : AT(ADDR(.text..lock) - LOAD_OFFSET) |
58 | { *(.text.lock) } | 58 | { *(.text..lock) } |
59 | #endif | 59 | #endif |
60 | _etext = .; | 60 | _etext = .; |
61 | 61 | ||
@@ -75,10 +75,10 @@ SECTIONS | |||
75 | __stop___mca_table = .; | 75 | __stop___mca_table = .; |
76 | } | 76 | } |
77 | 77 | ||
78 | .data.patch.phys_stack_reg : AT(ADDR(.data.patch.phys_stack_reg) - LOAD_OFFSET) | 78 | .data..patch.phys_stack_reg : AT(ADDR(.data..patch.phys_stack_reg) - LOAD_OFFSET) |
79 | { | 79 | { |
80 | __start___phys_stack_reg_patchlist = .; | 80 | __start___phys_stack_reg_patchlist = .; |
81 | *(.data.patch.phys_stack_reg) | 81 | *(.data..patch.phys_stack_reg) |
82 | __end___phys_stack_reg_patchlist = .; | 82 | __end___phys_stack_reg_patchlist = .; |
83 | } | 83 | } |
84 | 84 | ||
@@ -110,24 +110,24 @@ SECTIONS | |||
110 | INIT_TEXT_SECTION(PAGE_SIZE) | 110 | INIT_TEXT_SECTION(PAGE_SIZE) |
111 | INIT_DATA_SECTION(16) | 111 | INIT_DATA_SECTION(16) |
112 | 112 | ||
113 | .data.patch.vtop : AT(ADDR(.data.patch.vtop) - LOAD_OFFSET) | 113 | .data..patch.vtop : AT(ADDR(.data..patch.vtop) - LOAD_OFFSET) |
114 | { | 114 | { |
115 | __start___vtop_patchlist = .; | 115 | __start___vtop_patchlist = .; |
116 | *(.data.patch.vtop) | 116 | *(.data..patch.vtop) |
117 | __end___vtop_patchlist = .; | 117 | __end___vtop_patchlist = .; |
118 | } | 118 | } |
119 | 119 | ||
120 | .data.patch.rse : AT(ADDR(.data.patch.rse) - LOAD_OFFSET) | 120 | .data..patch.rse : AT(ADDR(.data..patch.rse) - LOAD_OFFSET) |
121 | { | 121 | { |
122 | __start___rse_patchlist = .; | 122 | __start___rse_patchlist = .; |
123 | *(.data.patch.rse) | 123 | *(.data..patch.rse) |
124 | __end___rse_patchlist = .; | 124 | __end___rse_patchlist = .; |
125 | } | 125 | } |
126 | 126 | ||
127 | .data.patch.mckinley_e9 : AT(ADDR(.data.patch.mckinley_e9) - LOAD_OFFSET) | 127 | .data..patch.mckinley_e9 : AT(ADDR(.data..patch.mckinley_e9) - LOAD_OFFSET) |
128 | { | 128 | { |
129 | __start___mckinley_e9_bundles = .; | 129 | __start___mckinley_e9_bundles = .; |
130 | *(.data.patch.mckinley_e9) | 130 | *(.data..patch.mckinley_e9) |
131 | __end___mckinley_e9_bundles = .; | 131 | __end___mckinley_e9_bundles = .; |
132 | } | 132 | } |
133 | 133 | ||
@@ -175,17 +175,17 @@ SECTIONS | |||
175 | . = ALIGN(PAGE_SIZE); | 175 | . = ALIGN(PAGE_SIZE); |
176 | __init_end = .; | 176 | __init_end = .; |
177 | 177 | ||
178 | .data.page_aligned : AT(ADDR(.data.page_aligned) - LOAD_OFFSET) | 178 | .data..page_aligned : AT(ADDR(.data..page_aligned) - LOAD_OFFSET) |
179 | { | 179 | { |
180 | PAGE_ALIGNED_DATA(PAGE_SIZE) | 180 | PAGE_ALIGNED_DATA(PAGE_SIZE) |
181 | . = ALIGN(PAGE_SIZE); | 181 | . = ALIGN(PAGE_SIZE); |
182 | __start_gate_section = .; | 182 | __start_gate_section = .; |
183 | *(.data.gate) | 183 | *(.data..gate) |
184 | __stop_gate_section = .; | 184 | __stop_gate_section = .; |
185 | #ifdef CONFIG_XEN | 185 | #ifdef CONFIG_XEN |
186 | . = ALIGN(PAGE_SIZE); | 186 | . = ALIGN(PAGE_SIZE); |
187 | __xen_start_gate_section = .; | 187 | __xen_start_gate_section = .; |
188 | *(.data.gate.xen) | 188 | *(.data..gate.xen) |
189 | __xen_stop_gate_section = .; | 189 | __xen_stop_gate_section = .; |
190 | #endif | 190 | #endif |
191 | } | 191 | } |
diff --git a/arch/ia64/kvm/vmm_ivt.S b/arch/ia64/kvm/vmm_ivt.S index 40920c63064..24018484c6e 100644 --- a/arch/ia64/kvm/vmm_ivt.S +++ b/arch/ia64/kvm/vmm_ivt.S | |||
@@ -104,7 +104,7 @@ GLOBAL_ENTRY(kvm_vmm_panic) | |||
104 | br.call.sptk.many b6=vmm_panic_handler; | 104 | br.call.sptk.many b6=vmm_panic_handler; |
105 | END(kvm_vmm_panic) | 105 | END(kvm_vmm_panic) |
106 | 106 | ||
107 | .section .text.ivt,"ax" | 107 | .section .text..ivt,"ax" |
108 | 108 | ||
109 | .align 32768 // align on 32KB boundary | 109 | .align 32768 // align on 32KB boundary |
110 | .global kvm_ia64_ivt | 110 | .global kvm_ia64_ivt |
diff --git a/arch/ia64/scripts/unwcheck.py b/arch/ia64/scripts/unwcheck.py index c27849889e1..2bfd941ff7c 100644 --- a/arch/ia64/scripts/unwcheck.py +++ b/arch/ia64/scripts/unwcheck.py | |||
@@ -1,4 +1,4 @@ | |||
1 | #!/usr/bin/env python | 1 | #!/usr/bin/python |
2 | # | 2 | # |
3 | # Usage: unwcheck.py FILE | 3 | # Usage: unwcheck.py FILE |
4 | # | 4 | # |
diff --git a/arch/ia64/xen/gate-data.S b/arch/ia64/xen/gate-data.S index 7d4830afc91..6f95b6b32a4 100644 --- a/arch/ia64/xen/gate-data.S +++ b/arch/ia64/xen/gate-data.S | |||
@@ -1,3 +1,3 @@ | |||
1 | .section .data.gate.xen, "aw" | 1 | .section .data..gate.xen, "aw" |
2 | 2 | ||
3 | .incbin "arch/ia64/xen/gate.so" | 3 | .incbin "arch/ia64/xen/gate.so" |
diff --git a/arch/ia64/xen/xensetup.S b/arch/ia64/xen/xensetup.S index aff8346ea19..b820ed02ab9 100644 --- a/arch/ia64/xen/xensetup.S +++ b/arch/ia64/xen/xensetup.S | |||
@@ -14,7 +14,7 @@ | |||
14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
15 | #include <xen/interface/elfnote.h> | 15 | #include <xen/interface/elfnote.h> |
16 | 16 | ||
17 | .section .data.read_mostly | 17 | .section .data..read_mostly |
18 | .align 8 | 18 | .align 8 |
19 | .global xen_domain_type | 19 | .global xen_domain_type |
20 | xen_domain_type: | 20 | xen_domain_type: |
diff --git a/arch/m68knommu/kernel/vmlinux.lds.S b/arch/m68knommu/kernel/vmlinux.lds.S index 9f1784f586b..a91b2713451 100644 --- a/arch/m68knommu/kernel/vmlinux.lds.S +++ b/arch/m68knommu/kernel/vmlinux.lds.S | |||
@@ -57,7 +57,7 @@ SECTIONS { | |||
57 | .romvec : { | 57 | .romvec : { |
58 | __rom_start = . ; | 58 | __rom_start = . ; |
59 | _romvec = .; | 59 | _romvec = .; |
60 | *(.data.initvect) | 60 | *(.data..initvect) |
61 | } > romvec | 61 | } > romvec |
62 | #endif | 62 | #endif |
63 | 63 | ||
@@ -68,7 +68,7 @@ SECTIONS { | |||
68 | TEXT_TEXT | 68 | TEXT_TEXT |
69 | SCHED_TEXT | 69 | SCHED_TEXT |
70 | LOCK_TEXT | 70 | LOCK_TEXT |
71 | *(.text.lock) | 71 | *(.text..lock) |
72 | 72 | ||
73 | . = ALIGN(16); /* Exception table */ | 73 | . = ALIGN(16); /* Exception table */ |
74 | __start___ex_table = .; | 74 | __start___ex_table = .; |
diff --git a/arch/m68knommu/platform/68360/head-ram.S b/arch/m68knommu/platform/68360/head-ram.S index 2ef06242398..8eb94fb6b97 100644 --- a/arch/m68knommu/platform/68360/head-ram.S +++ b/arch/m68knommu/platform/68360/head-ram.S | |||
@@ -280,7 +280,7 @@ _dprbase: | |||
280 | * and then overwritten as needed. | 280 | * and then overwritten as needed. |
281 | */ | 281 | */ |
282 | 282 | ||
283 | .section ".data.initvect","awx" | 283 | .section ".data..initvect","awx" |
284 | .long RAMEND /* Reset: Initial Stack Pointer - 0. */ | 284 | .long RAMEND /* Reset: Initial Stack Pointer - 0. */ |
285 | .long _start /* Reset: Initial Program Counter - 1. */ | 285 | .long _start /* Reset: Initial Program Counter - 1. */ |
286 | .long buserr /* Bus Error - 2. */ | 286 | .long buserr /* Bus Error - 2. */ |
diff --git a/arch/m68knommu/platform/68360/head-rom.S b/arch/m68knommu/platform/68360/head-rom.S index 62ecf4144b3..97510e55b80 100644 --- a/arch/m68knommu/platform/68360/head-rom.S +++ b/arch/m68knommu/platform/68360/head-rom.S | |||
@@ -291,7 +291,7 @@ _dprbase: | |||
291 | * and then overwritten as needed. | 291 | * and then overwritten as needed. |
292 | */ | 292 | */ |
293 | 293 | ||
294 | .section ".data.initvect","awx" | 294 | .section ".data..initvect","awx" |
295 | .long RAMEND /* Reset: Initial Stack Pointer - 0. */ | 295 | .long RAMEND /* Reset: Initial Stack Pointer - 0. */ |
296 | .long _start /* Reset: Initial Program Counter - 1. */ | 296 | .long _start /* Reset: Initial Program Counter - 1. */ |
297 | .long buserr /* Bus Error - 2. */ | 297 | .long buserr /* Bus Error - 2. */ |
diff --git a/arch/mips/lasat/image/head.S b/arch/mips/lasat/image/head.S index efb95f2609c..e0ecda92c40 100644 --- a/arch/mips/lasat/image/head.S +++ b/arch/mips/lasat/image/head.S | |||
@@ -1,7 +1,7 @@ | |||
1 | #include <asm/lasat/head.h> | 1 | #include <asm/lasat/head.h> |
2 | 2 | ||
3 | .text | 3 | .text |
4 | .section .text.start, "ax" | 4 | .section .text..start, "ax" |
5 | .set noreorder | 5 | .set noreorder |
6 | .set mips3 | 6 | .set mips3 |
7 | 7 | ||
diff --git a/arch/mips/lasat/image/romscript.normal b/arch/mips/lasat/image/romscript.normal index 988f8ad189c..0864c963e18 100644 --- a/arch/mips/lasat/image/romscript.normal +++ b/arch/mips/lasat/image/romscript.normal | |||
@@ -4,7 +4,7 @@ SECTIONS | |||
4 | { | 4 | { |
5 | .text : | 5 | .text : |
6 | { | 6 | { |
7 | *(.text.start) | 7 | *(.text..start) |
8 | } | 8 | } |
9 | 9 | ||
10 | /* Data in ROM */ | 10 | /* Data in ROM */ |
diff --git a/arch/parisc/include/asm/cache.h b/arch/parisc/include/asm/cache.h index 32c2cca7434..45effe6978f 100644 --- a/arch/parisc/include/asm/cache.h +++ b/arch/parisc/include/asm/cache.h | |||
@@ -28,7 +28,7 @@ | |||
28 | 28 | ||
29 | #define SMP_CACHE_BYTES L1_CACHE_BYTES | 29 | #define SMP_CACHE_BYTES L1_CACHE_BYTES |
30 | 30 | ||
31 | #define __read_mostly __attribute__((__section__(".data.read_mostly"))) | 31 | #define __read_mostly __attribute__((__section__(".data..read_mostly"))) |
32 | 32 | ||
33 | void parisc_cache_init(void); /* initializes cache-flushing */ | 33 | void parisc_cache_init(void); /* initializes cache-flushing */ |
34 | void disable_sr_hashing_asm(int); /* low level support for above */ | 34 | void disable_sr_hashing_asm(int); /* low level support for above */ |
diff --git a/arch/parisc/include/asm/system.h b/arch/parisc/include/asm/system.h index 4653c77bf9d..2ab4af58ecb 100644 --- a/arch/parisc/include/asm/system.h +++ b/arch/parisc/include/asm/system.h | |||
@@ -174,7 +174,7 @@ static inline void set_eiem(unsigned long val) | |||
174 | }) | 174 | }) |
175 | 175 | ||
176 | #ifdef CONFIG_SMP | 176 | #ifdef CONFIG_SMP |
177 | # define __lock_aligned __attribute__((__section__(".data.lock_aligned"))) | 177 | # define __lock_aligned __attribute__((__section__(".data..lock_aligned"))) |
178 | #endif | 178 | #endif |
179 | 179 | ||
180 | #define arch_align_stack(x) (x) | 180 | #define arch_align_stack(x) (x) |
diff --git a/arch/parisc/kernel/head.S b/arch/parisc/kernel/head.S index 0e3d9f9b9e3..4dbdf0ed6fa 100644 --- a/arch/parisc/kernel/head.S +++ b/arch/parisc/kernel/head.S | |||
@@ -345,7 +345,7 @@ smp_slave_stext: | |||
345 | ENDPROC(stext) | 345 | ENDPROC(stext) |
346 | 346 | ||
347 | #ifndef CONFIG_64BIT | 347 | #ifndef CONFIG_64BIT |
348 | .section .data.read_mostly | 348 | .section .data..read_mostly |
349 | 349 | ||
350 | .align 4 | 350 | .align 4 |
351 | .export $global$,data | 351 | .export $global$,data |
diff --git a/arch/parisc/kernel/init_task.c b/arch/parisc/kernel/init_task.c index d020eae6525..4a91e433416 100644 --- a/arch/parisc/kernel/init_task.c +++ b/arch/parisc/kernel/init_task.c | |||
@@ -53,11 +53,11 @@ union thread_union init_thread_union __init_task_data | |||
53 | * guarantee that global objects will be laid out in memory in the same order | 53 | * guarantee that global objects will be laid out in memory in the same order |
54 | * as the order of declaration, so put these in different sections and use | 54 | * as the order of declaration, so put these in different sections and use |
55 | * the linker script to order them. */ | 55 | * the linker script to order them. */ |
56 | pmd_t pmd0[PTRS_PER_PMD] __attribute__ ((__section__ (".data.vm0.pmd"), aligned(PAGE_SIZE))); | 56 | pmd_t pmd0[PTRS_PER_PMD] __attribute__ ((__section__ (".data..vm0.pmd"), aligned(PAGE_SIZE))); |
57 | #endif | 57 | #endif |
58 | 58 | ||
59 | pgd_t swapper_pg_dir[PTRS_PER_PGD] __attribute__ ((__section__ (".data.vm0.pgd"), aligned(PAGE_SIZE))); | 59 | pgd_t swapper_pg_dir[PTRS_PER_PGD] __attribute__ ((__section__ (".data..vm0.pgd"), aligned(PAGE_SIZE))); |
60 | pte_t pg0[PT_INITIAL * PTRS_PER_PTE] __attribute__ ((__section__ (".data.vm0.pte"), aligned(PAGE_SIZE))); | 60 | pte_t pg0[PT_INITIAL * PTRS_PER_PTE] __attribute__ ((__section__ (".data..vm0.pte"), aligned(PAGE_SIZE))); |
61 | 61 | ||
62 | /* | 62 | /* |
63 | * Initial task structure. | 63 | * Initial task structure. |
diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S index 9dab4a4e09f..d64a6bbec2a 100644 --- a/arch/parisc/kernel/vmlinux.lds.S +++ b/arch/parisc/kernel/vmlinux.lds.S | |||
@@ -94,8 +94,8 @@ SECTIONS | |||
94 | 94 | ||
95 | /* PA-RISC locks requires 16-byte alignment */ | 95 | /* PA-RISC locks requires 16-byte alignment */ |
96 | . = ALIGN(16); | 96 | . = ALIGN(16); |
97 | .data.lock_aligned : { | 97 | .data..lock_aligned : { |
98 | *(.data.lock_aligned) | 98 | *(.data..lock_aligned) |
99 | } | 99 | } |
100 | 100 | ||
101 | /* End of data section */ | 101 | /* End of data section */ |
@@ -105,10 +105,10 @@ SECTIONS | |||
105 | __bss_start = .; | 105 | __bss_start = .; |
106 | /* page table entries need to be PAGE_SIZE aligned */ | 106 | /* page table entries need to be PAGE_SIZE aligned */ |
107 | . = ALIGN(PAGE_SIZE); | 107 | . = ALIGN(PAGE_SIZE); |
108 | .data.vmpages : { | 108 | .data..vmpages : { |
109 | *(.data.vm0.pmd) | 109 | *(.data..vm0.pmd) |
110 | *(.data.vm0.pgd) | 110 | *(.data..vm0.pgd) |
111 | *(.data.vm0.pte) | 111 | *(.data..vm0.pte) |
112 | } | 112 | } |
113 | .bss : { | 113 | .bss : { |
114 | *(.bss) | 114 | *(.bss) |
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 66a315e06dc..328774bd41e 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -351,7 +351,7 @@ config ARCH_ENABLE_MEMORY_HOTREMOVE | |||
351 | 351 | ||
352 | config KEXEC | 352 | config KEXEC |
353 | bool "kexec system call (EXPERIMENTAL)" | 353 | bool "kexec system call (EXPERIMENTAL)" |
354 | depends on PPC_BOOK3S && EXPERIMENTAL | 354 | depends on (PPC_BOOK3S || (FSL_BOOKE && !SMP)) && EXPERIMENTAL |
355 | help | 355 | help |
356 | kexec is a system call that implements the ability to shutdown your | 356 | kexec is a system call that implements the ability to shutdown your |
357 | current kernel, and to start another kernel. It is like a reboot | 357 | current kernel, and to start another kernel. It is like a reboot |
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile index 1a54a3b3a3f..42dcd3f4ad7 100644 --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile | |||
@@ -112,6 +112,11 @@ KBUILD_CFLAGS += $(call cc-option,-mspe=no) | |||
112 | # kernel considerably. | 112 | # kernel considerably. |
113 | KBUILD_CFLAGS += $(call cc-option,-funit-at-a-time) | 113 | KBUILD_CFLAGS += $(call cc-option,-funit-at-a-time) |
114 | 114 | ||
115 | # FIXME: the module load should be taught about the additional relocs | ||
116 | # generated by this. | ||
117 | # revert to pre-gcc-4.4 behaviour of .eh_frame | ||
118 | KBUILD_CFLAGS += $(call cc-option,-fno-dwarf2-cfi-asm) | ||
119 | |||
115 | # Never use string load/store instructions as they are | 120 | # Never use string load/store instructions as they are |
116 | # often slow when they are implemented at all | 121 | # often slow when they are implemented at all |
117 | KBUILD_CFLAGS += -mno-string | 122 | KBUILD_CFLAGS += -mno-string |
diff --git a/arch/powerpc/boot/4xx.c b/arch/powerpc/boot/4xx.c index 27db8938827..9d3bd4c45a2 100644 --- a/arch/powerpc/boot/4xx.c +++ b/arch/powerpc/boot/4xx.c | |||
@@ -519,7 +519,7 @@ void ibm440ep_fixup_clocks(unsigned int sys_clk, | |||
519 | { | 519 | { |
520 | unsigned int plb_clk = __ibm440eplike_fixup_clocks(sys_clk, tmr_clk, 0); | 520 | unsigned int plb_clk = __ibm440eplike_fixup_clocks(sys_clk, tmr_clk, 0); |
521 | 521 | ||
522 | /* serial clocks beed fixup based on int/ext */ | 522 | /* serial clocks need fixup based on int/ext */ |
523 | eplike_fixup_uart_clk(0, "/plb/opb/serial@ef600300", ser_clk, plb_clk); | 523 | eplike_fixup_uart_clk(0, "/plb/opb/serial@ef600300", ser_clk, plb_clk); |
524 | eplike_fixup_uart_clk(1, "/plb/opb/serial@ef600400", ser_clk, plb_clk); | 524 | eplike_fixup_uart_clk(1, "/plb/opb/serial@ef600400", ser_clk, plb_clk); |
525 | eplike_fixup_uart_clk(2, "/plb/opb/serial@ef600500", ser_clk, plb_clk); | 525 | eplike_fixup_uart_clk(2, "/plb/opb/serial@ef600500", ser_clk, plb_clk); |
@@ -532,7 +532,7 @@ void ibm440gx_fixup_clocks(unsigned int sys_clk, | |||
532 | { | 532 | { |
533 | unsigned int plb_clk = __ibm440eplike_fixup_clocks(sys_clk, tmr_clk, 1); | 533 | unsigned int plb_clk = __ibm440eplike_fixup_clocks(sys_clk, tmr_clk, 1); |
534 | 534 | ||
535 | /* serial clocks beed fixup based on int/ext */ | 535 | /* serial clocks need fixup based on int/ext */ |
536 | eplike_fixup_uart_clk(0, "/plb/opb/serial@40000200", ser_clk, plb_clk); | 536 | eplike_fixup_uart_clk(0, "/plb/opb/serial@40000200", ser_clk, plb_clk); |
537 | eplike_fixup_uart_clk(1, "/plb/opb/serial@40000300", ser_clk, plb_clk); | 537 | eplike_fixup_uart_clk(1, "/plb/opb/serial@40000300", ser_clk, plb_clk); |
538 | } | 538 | } |
@@ -543,10 +543,10 @@ void ibm440spe_fixup_clocks(unsigned int sys_clk, | |||
543 | { | 543 | { |
544 | unsigned int plb_clk = __ibm440eplike_fixup_clocks(sys_clk, tmr_clk, 1); | 544 | unsigned int plb_clk = __ibm440eplike_fixup_clocks(sys_clk, tmr_clk, 1); |
545 | 545 | ||
546 | /* serial clocks beed fixup based on int/ext */ | 546 | /* serial clocks need fixup based on int/ext */ |
547 | eplike_fixup_uart_clk(0, "/plb/opb/serial@10000200", ser_clk, plb_clk); | 547 | eplike_fixup_uart_clk(0, "/plb/opb/serial@f0000200", ser_clk, plb_clk); |
548 | eplike_fixup_uart_clk(1, "/plb/opb/serial@10000300", ser_clk, plb_clk); | 548 | eplike_fixup_uart_clk(1, "/plb/opb/serial@f0000300", ser_clk, plb_clk); |
549 | eplike_fixup_uart_clk(2, "/plb/opb/serial@10000600", ser_clk, plb_clk); | 549 | eplike_fixup_uart_clk(2, "/plb/opb/serial@f0000600", ser_clk, plb_clk); |
550 | } | 550 | } |
551 | 551 | ||
552 | void ibm405gp_fixup_clocks(unsigned int sys_clk, unsigned int ser_clk) | 552 | void ibm405gp_fixup_clocks(unsigned int sys_clk, unsigned int ser_clk) |
diff --git a/arch/powerpc/boot/dts/icon.dts b/arch/powerpc/boot/dts/icon.dts new file mode 100644 index 00000000000..abcd0caecca --- /dev/null +++ b/arch/powerpc/boot/dts/icon.dts | |||
@@ -0,0 +1,447 @@ | |||
1 | /* | ||
2 | * Device Tree Source for Mosaix Technologies, Inc. ICON board | ||
3 | * | ||
4 | * Copyright 2010 DENX Software Engineering, Stefan Roese <sr@denx.de> | ||
5 | * | ||
6 | * This file is licensed under the terms of the GNU General Public | ||
7 | * License version 2. This program is licensed "as is" without | ||
8 | * any warranty of any kind, whether express or implied. | ||
9 | */ | ||
10 | |||
11 | /dts-v1/; | ||
12 | |||
13 | / { | ||
14 | #address-cells = <2>; | ||
15 | #size-cells = <2>; | ||
16 | model = "mosaixtech,icon"; | ||
17 | compatible = "mosaixtech,icon"; | ||
18 | dcr-parent = <&{/cpus/cpu@0}>; | ||
19 | |||
20 | aliases { | ||
21 | ethernet0 = &EMAC0; | ||
22 | serial0 = &UART0; | ||
23 | serial1 = &UART1; | ||
24 | serial2 = &UART2; | ||
25 | }; | ||
26 | |||
27 | cpus { | ||
28 | #address-cells = <1>; | ||
29 | #size-cells = <0>; | ||
30 | |||
31 | cpu@0 { | ||
32 | device_type = "cpu"; | ||
33 | model = "PowerPC,440SPe"; | ||
34 | reg = <0x00000000>; | ||
35 | clock-frequency = <0>; /* Filled in by U-Boot */ | ||
36 | timebase-frequency = <0>; /* Filled in by U-Boot */ | ||
37 | i-cache-line-size = <32>; | ||
38 | d-cache-line-size = <32>; | ||
39 | i-cache-size = <32768>; | ||
40 | d-cache-size = <32768>; | ||
41 | dcr-controller; | ||
42 | dcr-access-method = "native"; | ||
43 | reset-type = <2>; /* Use chip-reset */ | ||
44 | }; | ||
45 | }; | ||
46 | |||
47 | memory { | ||
48 | device_type = "memory"; | ||
49 | reg = <0x0 0x00000000 0x0 0x00000000>; /* Filled in by U-Boot */ | ||
50 | }; | ||
51 | |||
52 | UIC0: interrupt-controller0 { | ||
53 | compatible = "ibm,uic-440spe","ibm,uic"; | ||
54 | interrupt-controller; | ||
55 | cell-index = <0>; | ||
56 | dcr-reg = <0x0c0 0x009>; | ||
57 | #address-cells = <0>; | ||
58 | #size-cells = <0>; | ||
59 | #interrupt-cells = <2>; | ||
60 | }; | ||
61 | |||
62 | UIC1: interrupt-controller1 { | ||
63 | compatible = "ibm,uic-440spe","ibm,uic"; | ||
64 | interrupt-controller; | ||
65 | cell-index = <1>; | ||
66 | dcr-reg = <0x0d0 0x009>; | ||
67 | #address-cells = <0>; | ||
68 | #size-cells = <0>; | ||
69 | #interrupt-cells = <2>; | ||
70 | interrupts = <0x1e 0x4 0x1f 0x4>; /* cascade */ | ||
71 | interrupt-parent = <&UIC0>; | ||
72 | }; | ||
73 | |||
74 | UIC2: interrupt-controller2 { | ||
75 | compatible = "ibm,uic-440spe","ibm,uic"; | ||
76 | interrupt-controller; | ||
77 | cell-index = <2>; | ||
78 | dcr-reg = <0x0e0 0x009>; | ||
79 | #address-cells = <0>; | ||
80 | #size-cells = <0>; | ||
81 | #interrupt-cells = <2>; | ||
82 | interrupts = <0xa 0x4 0xb 0x4>; /* cascade */ | ||
83 | interrupt-parent = <&UIC0>; | ||
84 | }; | ||
85 | |||
86 | UIC3: interrupt-controller3 { | ||
87 | compatible = "ibm,uic-440spe","ibm,uic"; | ||
88 | interrupt-controller; | ||
89 | cell-index = <3>; | ||
90 | dcr-reg = <0x0f0 0x009>; | ||
91 | #address-cells = <0>; | ||
92 | #size-cells = <0>; | ||
93 | #interrupt-cells = <2>; | ||
94 | interrupts = <0x10 0x4 0x11 0x4>; /* cascade */ | ||
95 | interrupt-parent = <&UIC0>; | ||
96 | }; | ||
97 | |||
98 | SDR0: sdr { | ||
99 | compatible = "ibm,sdr-440spe"; | ||
100 | dcr-reg = <0x00e 0x002>; | ||
101 | }; | ||
102 | |||
103 | CPR0: cpr { | ||
104 | compatible = "ibm,cpr-440spe"; | ||
105 | dcr-reg = <0x00c 0x002>; | ||
106 | }; | ||
107 | |||
108 | MQ0: mq { | ||
109 | compatible = "ibm,mq-440spe"; | ||
110 | dcr-reg = <0x040 0x020>; | ||
111 | }; | ||
112 | |||
113 | plb { | ||
114 | compatible = "ibm,plb-440spe", "ibm,plb-440gp", "ibm,plb4"; | ||
115 | #address-cells = <2>; | ||
116 | #size-cells = <1>; | ||
117 | /* addr-child addr-parent size */ | ||
118 | ranges = <0x4 0x00100000 0x4 0x00100000 0x00001000 | ||
119 | 0x4 0x00200000 0x4 0x00200000 0x00000400 | ||
120 | 0x4 0xe0000000 0x4 0xe0000000 0x20000000 | ||
121 | 0xc 0x00000000 0xc 0x00000000 0x20000000 | ||
122 | 0xd 0x00000000 0xd 0x00000000 0x80000000 | ||
123 | 0xd 0x80000000 0xd 0x80000000 0x80000000 | ||
124 | 0xe 0x00000000 0xe 0x00000000 0x80000000 | ||
125 | 0xe 0x80000000 0xe 0x80000000 0x80000000 | ||
126 | 0xf 0x00000000 0xf 0x00000000 0x80000000 | ||
127 | 0xf 0x80000000 0xf 0x80000000 0x80000000>; | ||
128 | clock-frequency = <0>; /* Filled in by U-Boot */ | ||
129 | |||
130 | SDRAM0: sdram { | ||
131 | compatible = "ibm,sdram-440spe", "ibm,sdram-405gp"; | ||
132 | dcr-reg = <0x010 0x002>; | ||
133 | }; | ||
134 | |||
135 | MAL0: mcmal { | ||
136 | compatible = "ibm,mcmal-440spe", "ibm,mcmal2"; | ||
137 | dcr-reg = <0x180 0x062>; | ||
138 | num-tx-chans = <2>; | ||
139 | num-rx-chans = <1>; | ||
140 | interrupt-parent = <&MAL0>; | ||
141 | interrupts = <0x0 0x1 0x2 0x3 0x4>; | ||
142 | #interrupt-cells = <1>; | ||
143 | #address-cells = <0>; | ||
144 | #size-cells = <0>; | ||
145 | interrupt-map = </*TXEOB*/ 0x0 &UIC1 0x6 0x4 | ||
146 | /*RXEOB*/ 0x1 &UIC1 0x7 0x4 | ||
147 | /*SERR*/ 0x2 &UIC1 0x1 0x4 | ||
148 | /*TXDE*/ 0x3 &UIC1 0x2 0x4 | ||
149 | /*RXDE*/ 0x4 &UIC1 0x3 0x4>; | ||
150 | }; | ||
151 | |||
152 | POB0: opb { | ||
153 | compatible = "ibm,opb-440spe", "ibm,opb-440gp", "ibm,opb"; | ||
154 | #address-cells = <1>; | ||
155 | #size-cells = <1>; | ||
156 | ranges = <0xe0000000 0x00000004 0xe0000000 0x20000000>; | ||
157 | clock-frequency = <0>; /* Filled in by U-Boot */ | ||
158 | |||
159 | EBC0: ebc { | ||
160 | compatible = "ibm,ebc-440spe", "ibm,ebc-440gp", "ibm,ebc"; | ||
161 | dcr-reg = <0x012 0x002>; | ||
162 | #address-cells = <2>; | ||
163 | #size-cells = <1>; | ||
164 | clock-frequency = <0>; /* Filled in by U-Boot */ | ||
165 | /* ranges property is supplied by U-Boot */ | ||
166 | interrupts = <0x5 0x1>; | ||
167 | interrupt-parent = <&UIC1>; | ||
168 | |||
169 | nor_flash@0,0 { | ||
170 | compatible = "cfi-flash"; | ||
171 | bank-width = <2>; | ||
172 | reg = <0x00000000 0x00000000 0x01000000>; | ||
173 | #address-cells = <1>; | ||
174 | #size-cells = <1>; | ||
175 | partition@0 { | ||
176 | label = "kernel"; | ||
177 | reg = <0x00000000 0x001e0000>; | ||
178 | }; | ||
179 | partition@1e0000 { | ||
180 | label = "dtb"; | ||
181 | reg = <0x001e0000 0x00020000>; | ||
182 | }; | ||
183 | partition@200000 { | ||
184 | label = "root"; | ||
185 | reg = <0x00200000 0x00200000>; | ||
186 | }; | ||
187 | partition@400000 { | ||
188 | label = "user"; | ||
189 | reg = <0x00400000 0x00b60000>; | ||
190 | }; | ||
191 | partition@f60000 { | ||
192 | label = "env"; | ||
193 | reg = <0x00f60000 0x00040000>; | ||
194 | }; | ||
195 | partition@fa0000 { | ||
196 | label = "u-boot"; | ||
197 | reg = <0x00fa0000 0x00060000>; | ||
198 | }; | ||
199 | }; | ||
200 | |||
201 | SysACE_CompactFlash: sysace@1,0 { | ||
202 | compatible = "xlnx,sysace"; | ||
203 | interrupt-parent = <&UIC2>; | ||
204 | interrupts = <24 0x4>; | ||
205 | reg = <0x00000001 0x00000000 0x10000>; | ||
206 | }; | ||
207 | }; | ||
208 | |||
209 | UART0: serial@f0000200 { | ||
210 | device_type = "serial"; | ||
211 | compatible = "ns16550"; | ||
212 | reg = <0xf0000200 0x00000008>; | ||
213 | virtual-reg = <0xa0000200>; | ||
214 | clock-frequency = <0>; /* Filled in by U-Boot */ | ||
215 | current-speed = <115200>; | ||
216 | interrupt-parent = <&UIC0>; | ||
217 | interrupts = <0x0 0x4>; | ||
218 | }; | ||
219 | |||
220 | UART1: serial@f0000300 { | ||
221 | device_type = "serial"; | ||
222 | compatible = "ns16550"; | ||
223 | reg = <0xf0000300 0x00000008>; | ||
224 | virtual-reg = <0xa0000300>; | ||
225 | clock-frequency = <0>; | ||
226 | current-speed = <0>; | ||
227 | interrupt-parent = <&UIC0>; | ||
228 | interrupts = <0x1 0x4>; | ||
229 | }; | ||
230 | |||
231 | |||
232 | UART2: serial@f0000600 { | ||
233 | device_type = "serial"; | ||
234 | compatible = "ns16550"; | ||
235 | reg = <0xf0000600 0x00000008>; | ||
236 | virtual-reg = <0xa0000600>; | ||
237 | clock-frequency = <0>; | ||
238 | current-speed = <0>; | ||
239 | interrupt-parent = <&UIC1>; | ||
240 | interrupts = <0x5 0x4>; | ||
241 | }; | ||
242 | |||
243 | IIC0: i2c@f0000400 { | ||
244 | compatible = "ibm,iic-440spe", "ibm,iic-440gp", "ibm,iic"; | ||
245 | reg = <0xf0000400 0x00000014>; | ||
246 | interrupt-parent = <&UIC0>; | ||
247 | interrupts = <0x2 0x4>; | ||
248 | }; | ||
249 | |||
250 | IIC1: i2c@f0000500 { | ||
251 | compatible = "ibm,iic-440spe", "ibm,iic-440gp", "ibm,iic"; | ||
252 | reg = <0xf0000500 0x00000014>; | ||
253 | interrupt-parent = <&UIC0>; | ||
254 | interrupts = <0x3 0x4>; | ||
255 | #address-cells = <1>; | ||
256 | #size-cells = <0>; | ||
257 | |||
258 | rtc@68 { | ||
259 | compatible = "stm,m41t00"; | ||
260 | reg = <0x68>; | ||
261 | }; | ||
262 | }; | ||
263 | |||
264 | EMAC0: ethernet@f0000800 { | ||
265 | linux,network-index = <0x0>; | ||
266 | device_type = "network"; | ||
267 | compatible = "ibm,emac-440spe", "ibm,emac4"; | ||
268 | interrupt-parent = <&UIC1>; | ||
269 | interrupts = <0x1c 0x4 0x1d 0x4>; | ||
270 | reg = <0xf0000800 0x00000074>; | ||
271 | local-mac-address = [000000000000]; | ||
272 | mal-device = <&MAL0>; | ||
273 | mal-tx-channel = <0>; | ||
274 | mal-rx-channel = <0>; | ||
275 | cell-index = <0>; | ||
276 | max-frame-size = <9000>; | ||
277 | rx-fifo-size = <4096>; | ||
278 | tx-fifo-size = <2048>; | ||
279 | phy-mode = "gmii"; | ||
280 | phy-map = <0x00000000>; | ||
281 | has-inverted-stacr-oc; | ||
282 | has-new-stacr-staopc; | ||
283 | }; | ||
284 | }; | ||
285 | |||
286 | PCIX0: pci@c0ec00000 { | ||
287 | device_type = "pci"; | ||
288 | #interrupt-cells = <1>; | ||
289 | #size-cells = <2>; | ||
290 | #address-cells = <3>; | ||
291 | compatible = "ibm,plb-pcix-440spe", "ibm,plb-pcix"; | ||
292 | primary; | ||
293 | large-inbound-windows; | ||
294 | enable-msi-hole; | ||
295 | reg = <0x0000000c 0x0ec00000 0x00000008 /* Config space access */ | ||
296 | 0x00000000 0x00000000 0x00000000 /* no IACK cycles */ | ||
297 | 0x0000000c 0x0ed00000 0x00000004 /* Special cycles */ | ||
298 | 0x0000000c 0x0ec80000 0x00000100 /* Internal registers */ | ||
299 | 0x0000000c 0x0ec80100 0x000000fc>; /* Internal messaging registers */ | ||
300 | |||
301 | /* Outbound ranges, one memory and one IO, | ||
302 | * later cannot be changed | ||
303 | */ | ||
304 | ranges = <0x02000000 0x00000000 0x80000000 0x0000000d 0x80000000 0x00000000 0x80000000 | ||
305 | 0x01000000 0x00000000 0x00000000 0x0000000c 0x08000000 0x00000000 0x00010000>; | ||
306 | |||
307 | /* Inbound 4GB range starting at 0 */ | ||
308 | dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x1 0x00000000>; | ||
309 | |||
310 | /* This drives busses 0 to 0xf */ | ||
311 | bus-range = <0x0 0xf>; | ||
312 | |||
313 | /* PCI-X interrupt (SM502) is routed to extIRQ10 (UIC1, 19) */ | ||
314 | interrupt-map-mask = <0x0 0x0 0x0 0x0>; | ||
315 | interrupt-map = <0x0 0x0 0x0 0x0 &UIC1 19 0x8>; | ||
316 | }; | ||
317 | |||
318 | PCIE0: pciex@d00000000 { | ||
319 | device_type = "pci"; | ||
320 | #interrupt-cells = <1>; | ||
321 | #size-cells = <2>; | ||
322 | #address-cells = <3>; | ||
323 | compatible = "ibm,plb-pciex-440spe", "ibm,plb-pciex"; | ||
324 | primary; | ||
325 | port = <0x0>; /* port number */ | ||
326 | reg = <0x0000000d 0x00000000 0x20000000 /* Config space access */ | ||
327 | 0x0000000c 0x10000000 0x00001000>; /* Registers */ | ||
328 | dcr-reg = <0x100 0x020>; | ||
329 | sdr-base = <0x300>; | ||
330 | |||
331 | /* Outbound ranges, one memory and one IO, | ||
332 | * later cannot be changed | ||
333 | */ | ||
334 | ranges = <0x02000000 0x00000000 0x80000000 0x0000000e 0x00000000 0x00000000 0x80000000 | ||
335 | 0x01000000 0x00000000 0x00000000 0x0000000f 0x80000000 0x00000000 0x00010000>; | ||
336 | |||
337 | /* Inbound 4GB range starting at 0 */ | ||
338 | dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x1 0x00000000>; | ||
339 | |||
340 | /* This drives busses 0x10 to 0x1f */ | ||
341 | bus-range = <0x10 0x1f>; | ||
342 | |||
343 | /* Legacy interrupts (note the weird polarity, the bridge seems | ||
344 | * to invert PCIe legacy interrupts). | ||
345 | * We are de-swizzling here because the numbers are actually for | ||
346 | * port of the root complex virtual P2P bridge. But I want | ||
347 | * to avoid putting a node for it in the tree, so the numbers | ||
348 | * below are basically de-swizzled numbers. | ||
349 | * The real slot is on idsel 0, so the swizzling is 1:1 | ||
350 | */ | ||
351 | interrupt-map-mask = <0x0 0x0 0x0 0x7>; | ||
352 | interrupt-map = < | ||
353 | 0x0 0x0 0x0 0x1 &UIC3 0x0 0x4 /* swizzled int A */ | ||
354 | 0x0 0x0 0x0 0x2 &UIC3 0x1 0x4 /* swizzled int B */ | ||
355 | 0x0 0x0 0x0 0x3 &UIC3 0x2 0x4 /* swizzled int C */ | ||
356 | 0x0 0x0 0x0 0x4 &UIC3 0x3 0x4 /* swizzled int D */>; | ||
357 | }; | ||
358 | |||
359 | PCIE1: pciex@d20000000 { | ||
360 | device_type = "pci"; | ||
361 | #interrupt-cells = <1>; | ||
362 | #size-cells = <2>; | ||
363 | #address-cells = <3>; | ||
364 | compatible = "ibm,plb-pciex-440spe", "ibm,plb-pciex"; | ||
365 | primary; | ||
366 | port = <0x1>; /* port number */ | ||
367 | reg = <0x0000000d 0x20000000 0x20000000 /* Config space access */ | ||
368 | 0x0000000c 0x10001000 0x00001000>; /* Registers */ | ||
369 | dcr-reg = <0x120 0x020>; | ||
370 | sdr-base = <0x340>; | ||
371 | |||
372 | /* Outbound ranges, one memory and one IO, | ||
373 | * later cannot be changed | ||
374 | */ | ||
375 | ranges = <0x02000000 0x00000000 0x80000000 0x0000000e 0x80000000 0x00000000 0x80000000 | ||
376 | 0x01000000 0x00000000 0x00000000 0x0000000f 0x80010000 0x00000000 0x00010000>; | ||
377 | |||
378 | /* Inbound 4GB range starting at 0 */ | ||
379 | dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x1 0x00000000>; | ||
380 | |||
381 | /* This drives busses 0x20 to 0x2f */ | ||
382 | bus-range = <0x20 0x2f>; | ||
383 | |||
384 | /* Legacy interrupts (note the weird polarity, the bridge seems | ||
385 | * to invert PCIe legacy interrupts). | ||
386 | * We are de-swizzling here because the numbers are actually for | ||
387 | * port of the root complex virtual P2P bridge. But I want | ||
388 | * to avoid putting a node for it in the tree, so the numbers | ||
389 | * below are basically de-swizzled numbers. | ||
390 | * The real slot is on idsel 0, so the swizzling is 1:1 | ||
391 | */ | ||
392 | interrupt-map-mask = <0x0 0x0 0x0 0x7>; | ||
393 | interrupt-map = < | ||
394 | 0x0 0x0 0x0 0x1 &UIC3 0x4 0x4 /* swizzled int A */ | ||
395 | 0x0 0x0 0x0 0x2 &UIC3 0x5 0x4 /* swizzled int B */ | ||
396 | 0x0 0x0 0x0 0x3 &UIC3 0x6 0x4 /* swizzled int C */ | ||
397 | 0x0 0x0 0x0 0x4 &UIC3 0x7 0x4 /* swizzled int D */>; | ||
398 | }; | ||
399 | |||
400 | I2O: i2o@400100000 { | ||
401 | compatible = "ibm,i2o-440spe"; | ||
402 | reg = <0x00000004 0x00100000 0x100>; | ||
403 | dcr-reg = <0x060 0x020>; | ||
404 | }; | ||
405 | |||
406 | DMA0: dma0@400100100 { | ||
407 | compatible = "ibm,dma-440spe"; | ||
408 | cell-index = <0>; | ||
409 | reg = <0x00000004 0x00100100 0x100>; | ||
410 | dcr-reg = <0x060 0x020>; | ||
411 | interrupt-parent = <&DMA0>; | ||
412 | interrupts = <0 1>; | ||
413 | #interrupt-cells = <1>; | ||
414 | #address-cells = <0>; | ||
415 | #size-cells = <0>; | ||
416 | interrupt-map = < | ||
417 | 0 &UIC0 0x14 4 | ||
418 | 1 &UIC1 0x16 4>; | ||
419 | }; | ||
420 | |||
421 | DMA1: dma1@400100200 { | ||
422 | compatible = "ibm,dma-440spe"; | ||
423 | cell-index = <1>; | ||
424 | reg = <0x00000004 0x00100200 0x100>; | ||
425 | dcr-reg = <0x060 0x020>; | ||
426 | interrupt-parent = <&DMA1>; | ||
427 | interrupts = <0 1>; | ||
428 | #interrupt-cells = <1>; | ||
429 | #address-cells = <0>; | ||
430 | #size-cells = <0>; | ||
431 | interrupt-map = < | ||
432 | 0 &UIC0 0x16 4 | ||
433 | 1 &UIC1 0x16 4>; | ||
434 | }; | ||
435 | |||
436 | xor-accel@400200000 { | ||
437 | compatible = "amcc,xor-accelerator"; | ||
438 | reg = <0x00000004 0x00200000 0x400>; | ||
439 | interrupt-parent = <&UIC1>; | ||
440 | interrupts = <0x1f 4>; | ||
441 | }; | ||
442 | }; | ||
443 | |||
444 | chosen { | ||
445 | linux,stdout-path = "/plb/opb/serial@f0000200"; | ||
446 | }; | ||
447 | }; | ||
diff --git a/arch/powerpc/boot/dts/katmai.dts b/arch/powerpc/boot/dts/katmai.dts index 8cf2c0c88c0..7c3be5e4574 100644 --- a/arch/powerpc/boot/dts/katmai.dts +++ b/arch/powerpc/boot/dts/katmai.dts | |||
@@ -44,6 +44,7 @@ | |||
44 | d-cache-size = <32768>; | 44 | d-cache-size = <32768>; |
45 | dcr-controller; | 45 | dcr-controller; |
46 | dcr-access-method = "native"; | 46 | dcr-access-method = "native"; |
47 | reset-type = <2>; /* Use chip-reset */ | ||
47 | }; | 48 | }; |
48 | }; | 49 | }; |
49 | 50 | ||
diff --git a/arch/powerpc/boot/dts/mpc8548cds.dts b/arch/powerpc/boot/dts/mpc8548cds.dts index 4173af387c6..0f526245268 100644 --- a/arch/powerpc/boot/dts/mpc8548cds.dts +++ b/arch/powerpc/boot/dts/mpc8548cds.dts | |||
@@ -20,10 +20,8 @@ | |||
20 | aliases { | 20 | aliases { |
21 | ethernet0 = &enet0; | 21 | ethernet0 = &enet0; |
22 | ethernet1 = &enet1; | 22 | ethernet1 = &enet1; |
23 | /* | ||
24 | ethernet2 = &enet2; | 23 | ethernet2 = &enet2; |
25 | ethernet3 = &enet3; | 24 | ethernet3 = &enet3; |
26 | */ | ||
27 | serial0 = &serial0; | 25 | serial0 = &serial0; |
28 | serial1 = &serial1; | 26 | serial1 = &serial1; |
29 | pci0 = &pci0; | 27 | pci0 = &pci0; |
@@ -254,7 +252,6 @@ | |||
254 | }; | 252 | }; |
255 | }; | 253 | }; |
256 | 254 | ||
257 | /* eTSEC 3/4 are currently broken | ||
258 | enet2: ethernet@26000 { | 255 | enet2: ethernet@26000 { |
259 | #address-cells = <1>; | 256 | #address-cells = <1>; |
260 | #size-cells = <1>; | 257 | #size-cells = <1>; |
@@ -310,7 +307,6 @@ | |||
310 | }; | 307 | }; |
311 | }; | 308 | }; |
312 | }; | 309 | }; |
313 | */ | ||
314 | 310 | ||
315 | serial0: serial@4500 { | 311 | serial0: serial@4500 { |
316 | cell-index = <0>; | 312 | cell-index = <0>; |
diff --git a/arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts b/arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts index 5bd1011fde9..3375c2ab0c3 100644 --- a/arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts +++ b/arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts | |||
@@ -215,6 +215,18 @@ | |||
215 | clock-frequency = <0>; | 215 | clock-frequency = <0>; |
216 | }; | 216 | }; |
217 | 217 | ||
218 | msi@41600 { | ||
219 | compatible = "fsl,mpc8572-msi", "fsl,mpic-msi"; | ||
220 | reg = <0x41600 0x80>; | ||
221 | msi-available-ranges = <0 0x80>; | ||
222 | interrupts = < | ||
223 | 0xe0 0 | ||
224 | 0xe1 0 | ||
225 | 0xe2 0 | ||
226 | 0xe3 0>; | ||
227 | interrupt-parent = <&mpic>; | ||
228 | }; | ||
229 | |||
218 | global-utilities@e0000 { //global utilities block | 230 | global-utilities@e0000 { //global utilities block |
219 | compatible = "fsl,mpc8572-guts"; | 231 | compatible = "fsl,mpc8572-guts"; |
220 | reg = <0xe0000 0x1000>; | 232 | reg = <0xe0000 0x1000>; |
@@ -243,8 +255,7 @@ | |||
243 | protected-sources = < | 255 | protected-sources = < |
244 | 31 32 33 37 38 39 /* enet2 enet3 */ | 256 | 31 32 33 37 38 39 /* enet2 enet3 */ |
245 | 76 77 78 79 26 42 /* dma2 pci2 serial*/ | 257 | 76 77 78 79 26 42 /* dma2 pci2 serial*/ |
246 | 0xe0 0xe1 0xe2 0xe3 /* msi */ | 258 | 0xe4 0xe5 0xe6 0xe7 /* msi */ |
247 | 0xe4 0xe5 0xe6 0xe7 | ||
248 | >; | 259 | >; |
249 | }; | 260 | }; |
250 | }; | 261 | }; |
diff --git a/arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts b/arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts index 0efc3456e29..e7b477f6a3f 100644 --- a/arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts +++ b/arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts | |||
@@ -154,12 +154,8 @@ | |||
154 | msi@41600 { | 154 | msi@41600 { |
155 | compatible = "fsl,mpc8572-msi", "fsl,mpic-msi"; | 155 | compatible = "fsl,mpc8572-msi", "fsl,mpic-msi"; |
156 | reg = <0x41600 0x80>; | 156 | reg = <0x41600 0x80>; |
157 | msi-available-ranges = <0 0x100>; | 157 | msi-available-ranges = <0x80 0x80>; |
158 | interrupts = < | 158 | interrupts = < |
159 | 0xe0 0 | ||
160 | 0xe1 0 | ||
161 | 0xe2 0 | ||
162 | 0xe3 0 | ||
163 | 0xe4 0 | 159 | 0xe4 0 |
164 | 0xe5 0 | 160 | 0xe5 0 |
165 | 0xe6 0 | 161 | 0xe6 0 |
@@ -190,6 +186,7 @@ | |||
190 | 0x1 0x2 0x3 0x4 /* pci slot */ | 186 | 0x1 0x2 0x3 0x4 /* pci slot */ |
191 | 0x9 0xa 0xb 0xc /* usb */ | 187 | 0x9 0xa 0xb 0xc /* usb */ |
192 | 0x6 0x7 0xe 0x5 /* Audio elgacy SATA */ | 188 | 0x6 0x7 0xe 0x5 /* Audio elgacy SATA */ |
189 | 0xe0 0xe1 0xe2 0xe3 /* msi */ | ||
193 | >; | 190 | >; |
194 | }; | 191 | }; |
195 | }; | 192 | }; |
diff --git a/arch/powerpc/boot/dts/p1021mds.dts b/arch/powerpc/boot/dts/p1021mds.dts new file mode 100644 index 00000000000..7fad2df2598 --- /dev/null +++ b/arch/powerpc/boot/dts/p1021mds.dts | |||
@@ -0,0 +1,698 @@ | |||
1 | /* | ||
2 | * P1021 MDS Device Tree Source | ||
3 | * | ||
4 | * Copyright 2010 Freescale Semiconductor Inc. | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify it | ||
7 | * under the terms of the GNU General Public License as published by the | ||
8 | * Free Software Foundation; either version 2 of the License, or (at your | ||
9 | * option) any later version. | ||
10 | */ | ||
11 | |||
12 | /dts-v1/; | ||
13 | / { | ||
14 | model = "fsl,P1021"; | ||
15 | compatible = "fsl,P1021MDS"; | ||
16 | #address-cells = <2>; | ||
17 | #size-cells = <2>; | ||
18 | |||
19 | aliases { | ||
20 | serial0 = &serial0; | ||
21 | serial1 = &serial1; | ||
22 | ethernet0 = &enet0; | ||
23 | ethernet1 = &enet1; | ||
24 | ethernet2 = &enet2; | ||
25 | ethernet3 = &enet3; | ||
26 | ethernet4 = &enet4; | ||
27 | pci0 = &pci0; | ||
28 | pci1 = &pci1; | ||
29 | }; | ||
30 | |||
31 | cpus { | ||
32 | #address-cells = <1>; | ||
33 | #size-cells = <0>; | ||
34 | |||
35 | PowerPC,P1021@0 { | ||
36 | device_type = "cpu"; | ||
37 | reg = <0x0>; | ||
38 | next-level-cache = <&L2>; | ||
39 | }; | ||
40 | |||
41 | PowerPC,P1021@1 { | ||
42 | device_type = "cpu"; | ||
43 | reg = <0x1>; | ||
44 | next-level-cache = <&L2>; | ||
45 | }; | ||
46 | }; | ||
47 | |||
48 | memory { | ||
49 | device_type = "memory"; | ||
50 | }; | ||
51 | |||
52 | localbus@ffe05000 { | ||
53 | #address-cells = <2>; | ||
54 | #size-cells = <1>; | ||
55 | compatible = "fsl,p1021-elbc", "fsl,elbc", "simple-bus"; | ||
56 | reg = <0 0xffe05000 0 0x1000>; | ||
57 | interrupts = <19 2>; | ||
58 | interrupt-parent = <&mpic>; | ||
59 | |||
60 | /* NAND Flash, BCSR, PMC0/1*/ | ||
61 | ranges = <0x0 0x0 0x0 0xfc000000 0x02000000 | ||
62 | 0x1 0x0 0x0 0xf8000000 0x00008000 | ||
63 | 0x2 0x0 0x0 0xf8010000 0x00020000 | ||
64 | 0x3 0x0 0x0 0xf8020000 0x00020000>; | ||
65 | |||
66 | nand@0,0 { | ||
67 | #address-cells = <1>; | ||
68 | #size-cells = <1>; | ||
69 | compatible = "fsl,p1021-fcm-nand", | ||
70 | "fsl,elbc-fcm-nand"; | ||
71 | reg = <0x0 0x0 0x40000>; | ||
72 | |||
73 | partition@0 { | ||
74 | /* This location must not be altered */ | ||
75 | /* 1MB for u-boot Bootloader Image */ | ||
76 | reg = <0x0 0x00100000>; | ||
77 | label = "NAND (RO) U-Boot Image"; | ||
78 | read-only; | ||
79 | }; | ||
80 | |||
81 | partition@100000 { | ||
82 | /* 1MB for DTB Image */ | ||
83 | reg = <0x00100000 0x00100000>; | ||
84 | label = "NAND (RO) DTB Image"; | ||
85 | read-only; | ||
86 | }; | ||
87 | |||
88 | partition@200000 { | ||
89 | /* 4MB for Linux Kernel Image */ | ||
90 | reg = <0x00200000 0x00400000>; | ||
91 | label = "NAND (RO) Linux Kernel Image"; | ||
92 | read-only; | ||
93 | }; | ||
94 | |||
95 | partition@600000 { | ||
96 | /* 5MB for Compressed Root file System Image */ | ||
97 | reg = <0x00600000 0x00500000>; | ||
98 | label = "NAND (RO) Compressed RFS Image"; | ||
99 | read-only; | ||
100 | }; | ||
101 | |||
102 | partition@b00000 { | ||
103 | /* 6MB for JFFS2 based Root file System */ | ||
104 | reg = <0x00a00000 0x00600000>; | ||
105 | label = "NAND (RW) JFFS2 Root File System"; | ||
106 | }; | ||
107 | |||
108 | partition@1100000 { | ||
109 | /* 14MB for JFFS2 based Root file System */ | ||
110 | reg = <0x01100000 0x00e00000>; | ||
111 | label = "NAND (RW) Writable User area"; | ||
112 | }; | ||
113 | |||
114 | partition@1f00000 { | ||
115 | /* 1MB for microcode */ | ||
116 | reg = <0x01f00000 0x00100000>; | ||
117 | label = "NAND (RO) QE Ucode"; | ||
118 | read-only; | ||
119 | }; | ||
120 | }; | ||
121 | |||
122 | bcsr@1,0 { | ||
123 | #address-cells = <1>; | ||
124 | #size-cells = <1>; | ||
125 | compatible = "fsl,p1021mds-bcsr"; | ||
126 | reg = <1 0 0x8000>; | ||
127 | ranges = <0 1 0 0x8000>; | ||
128 | }; | ||
129 | |||
130 | pib@2,0 { | ||
131 | compatible = "fsl,p1021mds-pib"; | ||
132 | reg = <2 0 0x10000>; | ||
133 | }; | ||
134 | |||
135 | pib@3,0 { | ||
136 | compatible = "fsl,p1021mds-pib"; | ||
137 | reg = <3 0 0x10000>; | ||
138 | }; | ||
139 | }; | ||
140 | |||
141 | soc@ffe00000 { | ||
142 | |||
143 | #address-cells = <1>; | ||
144 | #size-cells = <1>; | ||
145 | device_type = "soc"; | ||
146 | compatible = "fsl,p1021-immr", "simple-bus"; | ||
147 | ranges = <0x0 0x0 0xffe00000 0x100000>; | ||
148 | bus-frequency = <0>; // Filled out by uboot. | ||
149 | |||
150 | ecm-law@0 { | ||
151 | compatible = "fsl,ecm-law"; | ||
152 | reg = <0x0 0x1000>; | ||
153 | fsl,num-laws = <12>; | ||
154 | }; | ||
155 | |||
156 | ecm@1000 { | ||
157 | compatible = "fsl,p1021-ecm", "fsl,ecm"; | ||
158 | reg = <0x1000 0x1000>; | ||
159 | interrupts = <16 2>; | ||
160 | interrupt-parent = <&mpic>; | ||
161 | }; | ||
162 | |||
163 | memory-controller@2000 { | ||
164 | compatible = "fsl,p1021-memory-controller"; | ||
165 | reg = <0x2000 0x1000>; | ||
166 | interrupt-parent = <&mpic>; | ||
167 | interrupts = <16 2>; | ||
168 | }; | ||
169 | |||
170 | i2c@3000 { | ||
171 | #address-cells = <1>; | ||
172 | #size-cells = <0>; | ||
173 | cell-index = <0>; | ||
174 | compatible = "fsl-i2c"; | ||
175 | reg = <0x3000 0x100>; | ||
176 | interrupts = <43 2>; | ||
177 | interrupt-parent = <&mpic>; | ||
178 | dfsrr; | ||
179 | rtc@68 { | ||
180 | compatible = "dallas,ds1374"; | ||
181 | reg = <0x68>; | ||
182 | }; | ||
183 | }; | ||
184 | |||
185 | i2c@3100 { | ||
186 | #address-cells = <1>; | ||
187 | #size-cells = <0>; | ||
188 | cell-index = <1>; | ||
189 | compatible = "fsl-i2c"; | ||
190 | reg = <0x3100 0x100>; | ||
191 | interrupts = <43 2>; | ||
192 | interrupt-parent = <&mpic>; | ||
193 | dfsrr; | ||
194 | }; | ||
195 | |||
196 | serial0: serial@4500 { | ||
197 | cell-index = <0>; | ||
198 | device_type = "serial"; | ||
199 | compatible = "ns16550"; | ||
200 | reg = <0x4500 0x100>; | ||
201 | clock-frequency = <0>; | ||
202 | interrupts = <42 2>; | ||
203 | interrupt-parent = <&mpic>; | ||
204 | }; | ||
205 | |||
206 | serial1: serial@4600 { | ||
207 | cell-index = <1>; | ||
208 | device_type = "serial"; | ||
209 | compatible = "ns16550"; | ||
210 | reg = <0x4600 0x100>; | ||
211 | clock-frequency = <0>; | ||
212 | interrupts = <42 2>; | ||
213 | interrupt-parent = <&mpic>; | ||
214 | }; | ||
215 | |||
216 | spi@7000 { | ||
217 | cell-index = <0>; | ||
218 | #address-cells = <1>; | ||
219 | #size-cells = <0>; | ||
220 | compatible = "fsl,espi"; | ||
221 | reg = <0x7000 0x1000>; | ||
222 | interrupts = <59 0x2>; | ||
223 | interrupt-parent = <&mpic>; | ||
224 | espi,num-ss-bits = <4>; | ||
225 | mode = "cpu"; | ||
226 | |||
227 | fsl_m25p80@0 { | ||
228 | #address-cells = <1>; | ||
229 | #size-cells = <1>; | ||
230 | compatible = "fsl,espi-flash"; | ||
231 | reg = <0>; | ||
232 | linux,modalias = "fsl_m25p80"; | ||
233 | spi-max-frequency = <40000000>; /* input clock */ | ||
234 | partition@u-boot { | ||
235 | label = "u-boot-spi"; | ||
236 | reg = <0x00000000 0x00100000>; | ||
237 | read-only; | ||
238 | }; | ||
239 | partition@kernel { | ||
240 | label = "kernel-spi"; | ||
241 | reg = <0x00100000 0x00500000>; | ||
242 | read-only; | ||
243 | }; | ||
244 | partition@dtb { | ||
245 | label = "dtb-spi"; | ||
246 | reg = <0x00600000 0x00100000>; | ||
247 | read-only; | ||
248 | }; | ||
249 | partition@fs { | ||
250 | label = "file system-spi"; | ||
251 | reg = <0x00700000 0x00900000>; | ||
252 | }; | ||
253 | }; | ||
254 | }; | ||
255 | |||
256 | gpio: gpio-controller@f000 { | ||
257 | #gpio-cells = <2>; | ||
258 | compatible = "fsl,mpc8572-gpio"; | ||
259 | reg = <0xf000 0x100>; | ||
260 | interrupts = <47 0x2>; | ||
261 | interrupt-parent = <&mpic>; | ||
262 | gpio-controller; | ||
263 | }; | ||
264 | |||
265 | L2: l2-cache-controller@20000 { | ||
266 | compatible = "fsl,p1021-l2-cache-controller"; | ||
267 | reg = <0x20000 0x1000>; | ||
268 | cache-line-size = <32>; // 32 bytes | ||
269 | cache-size = <0x40000>; // L2,256K | ||
270 | interrupt-parent = <&mpic>; | ||
271 | interrupts = <16 2>; | ||
272 | }; | ||
273 | |||
274 | dma@21300 { | ||
275 | #address-cells = <1>; | ||
276 | #size-cells = <1>; | ||
277 | compatible = "fsl,eloplus-dma"; | ||
278 | reg = <0x21300 0x4>; | ||
279 | ranges = <0x0 0x21100 0x200>; | ||
280 | cell-index = <0>; | ||
281 | dma-channel@0 { | ||
282 | compatible = "fsl,eloplus-dma-channel"; | ||
283 | reg = <0x0 0x80>; | ||
284 | cell-index = <0>; | ||
285 | interrupt-parent = <&mpic>; | ||
286 | interrupts = <20 2>; | ||
287 | }; | ||
288 | dma-channel@80 { | ||
289 | compatible = "fsl,eloplus-dma-channel"; | ||
290 | reg = <0x80 0x80>; | ||
291 | cell-index = <1>; | ||
292 | interrupt-parent = <&mpic>; | ||
293 | interrupts = <21 2>; | ||
294 | }; | ||
295 | dma-channel@100 { | ||
296 | compatible = "fsl,eloplus-dma-channel"; | ||
297 | reg = <0x100 0x80>; | ||
298 | cell-index = <2>; | ||
299 | interrupt-parent = <&mpic>; | ||
300 | interrupts = <22 2>; | ||
301 | }; | ||
302 | dma-channel@180 { | ||
303 | compatible = "fsl,eloplus-dma-channel"; | ||
304 | reg = <0x180 0x80>; | ||
305 | cell-index = <3>; | ||
306 | interrupt-parent = <&mpic>; | ||
307 | interrupts = <23 2>; | ||
308 | }; | ||
309 | }; | ||
310 | |||
311 | usb@22000 { | ||
312 | #address-cells = <1>; | ||
313 | #size-cells = <0>; | ||
314 | compatible = "fsl-usb2-dr"; | ||
315 | reg = <0x22000 0x1000>; | ||
316 | interrupt-parent = <&mpic>; | ||
317 | interrupts = <28 0x2>; | ||
318 | phy_type = "ulpi"; | ||
319 | }; | ||
320 | |||
321 | mdio@24000 { | ||
322 | #address-cells = <1>; | ||
323 | #size-cells = <0>; | ||
324 | compatible = "fsl,etsec2-mdio"; | ||
325 | reg = <0x24000 0x1000 0xb0030 0x4>; | ||
326 | |||
327 | phy0: ethernet-phy@0 { | ||
328 | interrupt-parent = <&mpic>; | ||
329 | interrupts = <1 1>; | ||
330 | reg = <0x0>; | ||
331 | }; | ||
332 | phy1: ethernet-phy@1 { | ||
333 | interrupt-parent = <&mpic>; | ||
334 | interrupts = <2 1>; | ||
335 | reg = <0x1>; | ||
336 | }; | ||
337 | phy4: ethernet-phy@4 { | ||
338 | interrupt-parent = <&mpic>; | ||
339 | reg = <0x4>; | ||
340 | }; | ||
341 | }; | ||
342 | |||
343 | mdio@25000 { | ||
344 | #address-cells = <1>; | ||
345 | #size-cells = <0>; | ||
346 | compatible = "fsl,etsec2-tbi"; | ||
347 | reg = <0x25000 0x1000 0xb1030 0x4>; | ||
348 | tbi0: tbi-phy@11 { | ||
349 | reg = <0x11>; | ||
350 | device_type = "tbi-phy"; | ||
351 | }; | ||
352 | }; | ||
353 | |||
354 | enet0: ethernet@B0000 { | ||
355 | #address-cells = <1>; | ||
356 | #size-cells = <1>; | ||
357 | cell-index = <0>; | ||
358 | device_type = "network"; | ||
359 | model = "eTSEC"; | ||
360 | compatible = "fsl,etsec2"; | ||
361 | fsl,num_rx_queues = <0x8>; | ||
362 | fsl,num_tx_queues = <0x8>; | ||
363 | local-mac-address = [ 00 00 00 00 00 00 ]; | ||
364 | interrupt-parent = <&mpic>; | ||
365 | phy-handle = <&phy0>; | ||
366 | phy-connection-type = "rgmii-id"; | ||
367 | queue-group@0{ | ||
368 | #address-cells = <1>; | ||
369 | #size-cells = <1>; | ||
370 | reg = <0xB0000 0x1000>; | ||
371 | interrupts = <29 2 30 2 34 2>; | ||
372 | }; | ||
373 | queue-group@1{ | ||
374 | #address-cells = <1>; | ||
375 | #size-cells = <1>; | ||
376 | reg = <0xB4000 0x1000>; | ||
377 | interrupts = <17 2 18 2 24 2>; | ||
378 | }; | ||
379 | }; | ||
380 | |||
381 | enet1: ethernet@B1000 { | ||
382 | #address-cells = <1>; | ||
383 | #size-cells = <1>; | ||
384 | cell-index = <0>; | ||
385 | device_type = "network"; | ||
386 | model = "eTSEC"; | ||
387 | compatible = "fsl,etsec2"; | ||
388 | fsl,num_rx_queues = <0x8>; | ||
389 | fsl,num_tx_queues = <0x8>; | ||
390 | local-mac-address = [ 00 00 00 00 00 00 ]; | ||
391 | interrupt-parent = <&mpic>; | ||
392 | phy-handle = <&phy4>; | ||
393 | tbi-handle = <&tbi0>; | ||
394 | phy-connection-type = "sgmii"; | ||
395 | queue-group@0{ | ||
396 | #address-cells = <1>; | ||
397 | #size-cells = <1>; | ||
398 | reg = <0xB1000 0x1000>; | ||
399 | interrupts = <35 2 36 2 40 2>; | ||
400 | }; | ||
401 | queue-group@1{ | ||
402 | #address-cells = <1>; | ||
403 | #size-cells = <1>; | ||
404 | reg = <0xB5000 0x1000>; | ||
405 | interrupts = <51 2 52 2 67 2>; | ||
406 | }; | ||
407 | }; | ||
408 | |||
409 | enet2: ethernet@B2000 { | ||
410 | #address-cells = <1>; | ||
411 | #size-cells = <1>; | ||
412 | cell-index = <0>; | ||
413 | device_type = "network"; | ||
414 | model = "eTSEC"; | ||
415 | compatible = "fsl,etsec2"; | ||
416 | fsl,num_rx_queues = <0x8>; | ||
417 | fsl,num_tx_queues = <0x8>; | ||
418 | local-mac-address = [ 00 00 00 00 00 00 ]; | ||
419 | interrupt-parent = <&mpic>; | ||
420 | phy-handle = <&phy1>; | ||
421 | phy-connection-type = "rgmii-id"; | ||
422 | queue-group@0{ | ||
423 | #address-cells = <1>; | ||
424 | #size-cells = <1>; | ||
425 | reg = <0xB2000 0x1000>; | ||
426 | interrupts = <31 2 32 2 33 2>; | ||
427 | }; | ||
428 | queue-group@1{ | ||
429 | #address-cells = <1>; | ||
430 | #size-cells = <1>; | ||
431 | reg = <0xB6000 0x1000>; | ||
432 | interrupts = <25 2 26 2 27 2>; | ||
433 | }; | ||
434 | }; | ||
435 | |||
436 | sdhci@2e000 { | ||
437 | compatible = "fsl,p1021-esdhc", "fsl,esdhc"; | ||
438 | reg = <0x2e000 0x1000>; | ||
439 | interrupts = <72 0x2>; | ||
440 | interrupt-parent = <&mpic>; | ||
441 | /* Filled in by U-Boot */ | ||
442 | clock-frequency = <0>; | ||
443 | }; | ||
444 | |||
445 | crypto@30000 { | ||
446 | compatible = "fsl,sec3.3", "fsl,sec3.1", | ||
447 | "fsl,sec3.0", "fsl,sec2.4", | ||
448 | "fsl,sec2.2", "fsl,sec2.1", "fsl,sec2.0"; | ||
449 | reg = <0x30000 0x10000>; | ||
450 | interrupts = <45 2 58 2>; | ||
451 | interrupt-parent = <&mpic>; | ||
452 | fsl,num-channels = <4>; | ||
453 | fsl,channel-fifo-len = <24>; | ||
454 | fsl,exec-units-mask = <0x97c>; | ||
455 | fsl,descriptor-types-mask = <0x3a30abf>; | ||
456 | }; | ||
457 | |||
458 | mpic: pic@40000 { | ||
459 | interrupt-controller; | ||
460 | #address-cells = <0>; | ||
461 | #interrupt-cells = <2>; | ||
462 | reg = <0x40000 0x40000>; | ||
463 | compatible = "chrp,open-pic"; | ||
464 | device_type = "open-pic"; | ||
465 | }; | ||
466 | |||
467 | msi@41600 { | ||
468 | compatible = "fsl,p1021-msi", "fsl,mpic-msi"; | ||
469 | reg = <0x41600 0x80>; | ||
470 | msi-available-ranges = <0 0x100>; | ||
471 | interrupts = < | ||
472 | 0xe0 0 | ||
473 | 0xe1 0 | ||
474 | 0xe2 0 | ||
475 | 0xe3 0 | ||
476 | 0xe4 0 | ||
477 | 0xe5 0 | ||
478 | 0xe6 0 | ||
479 | 0xe7 0>; | ||
480 | interrupt-parent = <&mpic>; | ||
481 | }; | ||
482 | |||
483 | global-utilities@e0000 { //global utilities block | ||
484 | compatible = "fsl,p1021-guts"; | ||
485 | reg = <0xe0000 0x1000>; | ||
486 | fsl,has-rstcr; | ||
487 | }; | ||
488 | |||
489 | par_io@e0100 { | ||
490 | #address-cells = <1>; | ||
491 | #size-cells = <1>; | ||
492 | reg = <0xe0100 0x60>; | ||
493 | ranges = <0x0 0xe0100 0x60>; | ||
494 | device_type = "par_io"; | ||
495 | num-ports = <3>; | ||
496 | pio1: ucc_pin@01 { | ||
497 | pio-map = < | ||
498 | /* port pin dir open_drain assignment has_irq */ | ||
499 | 0x1 0x13 0x1 0x0 0x1 0x0 /* QE_MUX_MDC */ | ||
500 | 0x1 0x14 0x3 0x0 0x1 0x0 /* QE_MUX_MDIO */ | ||
501 | 0x0 0x17 0x2 0x0 0x2 0x0 /* CLK12 */ | ||
502 | 0x0 0x18 0x2 0x0 0x1 0x0 /* CLK9 | ||
503 | */ | ||
504 | 0x0 0x7 0x1 0x0 0x2 0x0 /* ENET1_TXD0_SER1_TXD0 */ | ||
505 | 0x0 0x9 0x1 0x0 0x2 0x0 /* ENET1_TXD1_SER1_TXD1 */ | ||
506 | 0x0 0xb 0x1 0x0 0x2 0x0 /* ENET1_TXD2_SER1_TXD2 */ | ||
507 | 0x0 0xc 0x1 0x0 0x2 0x0 /* ENET1_TXD3_SER1_TXD3 */ | ||
508 | 0x0 0x6 0x2 0x0 0x2 0x0 /* ENET1_RXD0_SER1_RXD0 */ | ||
509 | 0x0 0xa 0x2 0x0 0x2 0x0 /* ENET1_RXD1_SER1_RXD1 */ | ||
510 | 0x0 0xe 0x2 0x0 0x2 0x0 /* ENET1_RXD2_SER1_RXD2 */ | ||
511 | 0x0 0xf 0x2 0x0 0x2 0x0 /* ENET1_RXD3_SER1_RXD3 */ | ||
512 | 0x0 0x5 0x1 0x0 0x2 0x0 /* ENET1_TX_EN_SER1_RTS_B */ | ||
513 | 0x0 0xd 0x1 0x0 0x2 0x0 /* ENET1_TX_ER */ | ||
514 | 0x0 0x4 0x2 0x0 0x2 0x0 /* ENET1_RX_DV_SER1_CTS_B */ | ||
515 | 0x0 0x8 0x2 0x0 0x2 0x0 /* ENET1_RX_ER_SER1_CD_B */ | ||
516 | 0x0 0x11 0x2 0x0 0x2 0x0 /* ENET1_CRS */ | ||
517 | 0x0 0x10 0x2 0x0 0x2 0x0>; /* ENET1_COL */ | ||
518 | }; | ||
519 | |||
520 | pio2: ucc_pin@02 { | ||
521 | pio-map = < | ||
522 | /* port pin dir open_drain assignment has_irq */ | ||
523 | 0x1 0x13 0x1 0x0 0x1 0x0 /* QE_MUX_MDC */ | ||
524 | 0x1 0x14 0x3 0x0 0x1 0x0 /* QE_MUX_MDIO */ | ||
525 | 0x1 0xb 0x2 0x0 0x1 0x0 /* CLK13 */ | ||
526 | 0x1 0x7 0x1 0x0 0x2 0x0 /* ENET5_TXD0_SER5_TXD0 */ | ||
527 | 0x1 0xa 0x1 0x0 0x2 0x0 /* ENET5_TXD1_SER5_TXD1 */ | ||
528 | 0x1 0x6 0x2 0x0 0x2 0x0 /* ENET5_RXD0_SER5_RXD0 */ | ||
529 | 0x1 0x9 0x2 0x0 0x2 0x0 /* ENET5_RXD1_SER5_RXD1 */ | ||
530 | 0x1 0x5 0x1 0x0 0x2 0x0 /* ENET5_TX_EN_SER5_RTS_B */ | ||
531 | 0x1 0x4 0x2 0x0 0x2 0x0 /* ENET5_RX_DV_SER5_CTS_B */ | ||
532 | 0x1 0x8 0x2 0x0 0x2 0x0>; /* ENET5_RX_ER_SER5_CD_B */ | ||
533 | }; | ||
534 | }; | ||
535 | }; | ||
536 | |||
537 | pci0: pcie@ffe09000 { | ||
538 | compatible = "fsl,mpc8548-pcie"; | ||
539 | device_type = "pci"; | ||
540 | #interrupt-cells = <1>; | ||
541 | #size-cells = <2>; | ||
542 | #address-cells = <3>; | ||
543 | reg = <0 0xffe09000 0 0x1000>; | ||
544 | bus-range = <0 255>; | ||
545 | ranges = <0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x20000000 | ||
546 | 0x1000000 0x0 0x00000000 0 0xffc10000 0x0 0x10000>; | ||
547 | clock-frequency = <33333333>; | ||
548 | interrupt-parent = <&mpic>; | ||
549 | interrupts = <16 2>; | ||
550 | interrupt-map-mask = <0xf800 0 0 7>; | ||
551 | interrupt-map = < | ||
552 | /* IDSEL 0x0 */ | ||
553 | 0000 0 0 1 &mpic 4 1 | ||
554 | 0000 0 0 2 &mpic 5 1 | ||
555 | 0000 0 0 3 &mpic 6 1 | ||
556 | 0000 0 0 4 &mpic 7 1 | ||
557 | >; | ||
558 | pcie@0 { | ||
559 | reg = <0x0 0x0 0x0 0x0 0x0>; | ||
560 | #size-cells = <2>; | ||
561 | #address-cells = <3>; | ||
562 | device_type = "pci"; | ||
563 | ranges = <0x2000000 0x0 0xa0000000 | ||
564 | 0x2000000 0x0 0xa0000000 | ||
565 | 0x0 0x20000000 | ||
566 | |||
567 | 0x1000000 0x0 0x0 | ||
568 | 0x1000000 0x0 0x0 | ||
569 | 0x0 0x100000>; | ||
570 | }; | ||
571 | }; | ||
572 | |||
573 | pci1: pcie@ffe0a000 { | ||
574 | compatible = "fsl,mpc8548-pcie"; | ||
575 | device_type = "pci"; | ||
576 | #interrupt-cells = <1>; | ||
577 | #size-cells = <2>; | ||
578 | #address-cells = <3>; | ||
579 | reg = <0 0xffe0a000 0 0x1000>; | ||
580 | bus-range = <0 255>; | ||
581 | ranges = <0x2000000 0x0 0xc0000000 0 0xc0000000 0x0 0x20000000 | ||
582 | 0x1000000 0x0 0x00000000 0 0xffc20000 0x0 0x10000>; | ||
583 | clock-frequency = <33333333>; | ||
584 | interrupt-parent = <&mpic>; | ||
585 | interrupts = <16 2>; | ||
586 | interrupt-map-mask = <0xf800 0 0 7>; | ||
587 | interrupt-map = < | ||
588 | /* IDSEL 0x0 */ | ||
589 | 0000 0 0 1 &mpic 0 1 | ||
590 | 0000 0 0 2 &mpic 1 1 | ||
591 | 0000 0 0 3 &mpic 2 1 | ||
592 | 0000 0 0 4 &mpic 3 1 | ||
593 | >; | ||
594 | pcie@0 { | ||
595 | reg = <0x0 0x0 0x0 0x0 0x0>; | ||
596 | #size-cells = <2>; | ||
597 | #address-cells = <3>; | ||
598 | device_type = "pci"; | ||
599 | ranges = <0x2000000 0x0 0xc0000000 | ||
600 | 0x2000000 0x0 0xc0000000 | ||
601 | 0x0 0x20000000 | ||
602 | |||
603 | 0x1000000 0x0 0x0 | ||
604 | 0x1000000 0x0 0x0 | ||
605 | 0x0 0x100000>; | ||
606 | }; | ||
607 | }; | ||
608 | |||
609 | qe@ffe80000 { | ||
610 | #address-cells = <1>; | ||
611 | #size-cells = <1>; | ||
612 | device_type = "qe"; | ||
613 | compatible = "fsl,qe"; | ||
614 | ranges = <0x0 0x0 0xffe80000 0x40000>; | ||
615 | reg = <0 0xffe80000 0 0x480>; | ||
616 | brg-frequency = <0>; | ||
617 | bus-frequency = <0>; | ||
618 | fsl,qe-num-riscs = <1>; | ||
619 | fsl,qe-num-snums = <28>; | ||
620 | |||
621 | qeic: interrupt-controller@80 { | ||
622 | interrupt-controller; | ||
623 | compatible = "fsl,qe-ic"; | ||
624 | #address-cells = <0>; | ||
625 | #interrupt-cells = <1>; | ||
626 | reg = <0x80 0x80>; | ||
627 | interrupts = <63 2 60 2>; //high:47 low:44 | ||
628 | interrupt-parent = <&mpic>; | ||
629 | }; | ||
630 | |||
631 | enet3: ucc@2000 { | ||
632 | device_type = "network"; | ||
633 | compatible = "ucc_geth"; | ||
634 | cell-index = <1>; | ||
635 | reg = <0x2000 0x200>; | ||
636 | interrupts = <32>; | ||
637 | interrupt-parent = <&qeic>; | ||
638 | local-mac-address = [ 00 00 00 00 00 00 ]; | ||
639 | rx-clock-name = "clk12"; | ||
640 | tx-clock-name = "clk9"; | ||
641 | pio-handle = <&pio1>; | ||
642 | phy-handle = <&qe_phy0>; | ||
643 | phy-connection-type = "mii"; | ||
644 | }; | ||
645 | |||
646 | mdio@2120 { | ||
647 | #address-cells = <1>; | ||
648 | #size-cells = <0>; | ||
649 | reg = <0x2120 0x18>; | ||
650 | compatible = "fsl,ucc-mdio"; | ||
651 | |||
652 | qe_phy0: ethernet-phy@0 { | ||
653 | interrupt-parent = <&mpic>; | ||
654 | interrupts = <4 1>; | ||
655 | reg = <0x0>; | ||
656 | device_type = "ethernet-phy"; | ||
657 | }; | ||
658 | qe_phy1: ethernet-phy@03 { | ||
659 | interrupt-parent = <&mpic>; | ||
660 | interrupts = <5 1>; | ||
661 | reg = <0x3>; | ||
662 | device_type = "ethernet-phy"; | ||
663 | }; | ||
664 | tbi-phy@11 { | ||
665 | reg = <0x11>; | ||
666 | device_type = "tbi-phy"; | ||
667 | }; | ||
668 | }; | ||
669 | |||
670 | enet4: ucc@2400 { | ||
671 | device_type = "network"; | ||
672 | compatible = "ucc_geth"; | ||
673 | cell-index = <5>; | ||
674 | reg = <0x2400 0x200>; | ||
675 | interrupts = <40>; | ||
676 | interrupt-parent = <&qeic>; | ||
677 | local-mac-address = [ 00 00 00 00 00 00 ]; | ||
678 | rx-clock-name = "none"; | ||
679 | tx-clock-name = "clk13"; | ||
680 | pio-handle = <&pio2>; | ||
681 | phy-handle = <&qe_phy1>; | ||
682 | phy-connection-type = "rmii"; | ||
683 | }; | ||
684 | |||
685 | muram@10000 { | ||
686 | #address-cells = <1>; | ||
687 | #size-cells = <1>; | ||
688 | compatible = "fsl,qe-muram", "fsl,cpm-muram"; | ||
689 | ranges = <0x0 0x10000 0x6000>; | ||
690 | |||
691 | data-only@0 { | ||
692 | compatible = "fsl,qe-muram-data", | ||
693 | "fsl,cpm-muram-data"; | ||
694 | reg = <0x0 0x6000>; | ||
695 | }; | ||
696 | }; | ||
697 | }; | ||
698 | }; | ||
diff --git a/arch/powerpc/boot/dts/redwood.dts b/arch/powerpc/boot/dts/redwood.dts index d2af32e2bf7..81636c01d90 100644 --- a/arch/powerpc/boot/dts/redwood.dts +++ b/arch/powerpc/boot/dts/redwood.dts | |||
@@ -234,10 +234,132 @@ | |||
234 | has-inverted-stacr-oc; | 234 | has-inverted-stacr-oc; |
235 | has-new-stacr-staopc; | 235 | has-new-stacr-staopc; |
236 | }; | 236 | }; |
237 | }; | ||
238 | PCIE0: pciex@d00000000 { | ||
239 | device_type = "pci"; | ||
240 | #interrupt-cells = <1>; | ||
241 | #size-cells = <2>; | ||
242 | #address-cells = <3>; | ||
243 | compatible = "ibm,plb-pciex-460sx", "ibm,plb-pciex"; | ||
244 | primary; | ||
245 | port = <0x0>; /* port number */ | ||
246 | reg = <0x0000000d 0x00000000 0x20000000 /* Config space access */ | ||
247 | 0x0000000c 0x10000000 0x00001000>; /* Registers */ | ||
248 | dcr-reg = <0x100 0x020>; | ||
249 | sdr-base = <0x300>; | ||
250 | |||
251 | /* Outbound ranges, one memory and one IO, | ||
252 | * later cannot be changed | ||
253 | */ | ||
254 | ranges = <0x02000000 0x00000000 0x80000000 0x0000000e 0x00000000 0x00000000 0x80000000 | ||
255 | 0x01000000 0x00000000 0x00000000 0x0000000f 0x80000000 0x00000000 0x00010000>; | ||
256 | |||
257 | /* Inbound 2GB range starting at 0 */ | ||
258 | dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>; | ||
237 | 259 | ||
260 | /* This drives busses 10 to 0x1f */ | ||
261 | bus-range = <0x10 0x1f>; | ||
262 | |||
263 | /* Legacy interrupts (note the weird polarity, the bridge seems | ||
264 | * to invert PCIe legacy interrupts). | ||
265 | * We are de-swizzling here because the numbers are actually for | ||
266 | * port of the root complex virtual P2P bridge. But I want | ||
267 | * to avoid putting a node for it in the tree, so the numbers | ||
268 | * below are basically de-swizzled numbers. | ||
269 | * The real slot is on idsel 0, so the swizzling is 1:1 | ||
270 | */ | ||
271 | interrupt-map-mask = <0x0 0x0 0x0 0x7>; | ||
272 | interrupt-map = < | ||
273 | 0x0 0x0 0x0 0x1 &UIC3 0x0 0x4 /* swizzled int A */ | ||
274 | 0x0 0x0 0x0 0x2 &UIC3 0x1 0x4 /* swizzled int B */ | ||
275 | 0x0 0x0 0x0 0x3 &UIC3 0x2 0x4 /* swizzled int C */ | ||
276 | 0x0 0x0 0x0 0x4 &UIC3 0x3 0x4 /* swizzled int D */>; | ||
277 | }; | ||
278 | |||
279 | PCIE1: pciex@d20000000 { | ||
280 | device_type = "pci"; | ||
281 | #interrupt-cells = <1>; | ||
282 | #size-cells = <2>; | ||
283 | #address-cells = <3>; | ||
284 | compatible = "ibm,plb-pciex-460sx", "ibm,plb-pciex"; | ||
285 | primary; | ||
286 | port = <0x1>; /* port number */ | ||
287 | reg = <0x0000000d 0x20000000 0x20000000 /* Config space access */ | ||
288 | 0x0000000c 0x10001000 0x00001000>; /* Registers */ | ||
289 | dcr-reg = <0x120 0x020>; | ||
290 | sdr-base = <0x340>; | ||
291 | |||
292 | /* Outbound ranges, one memory and one IO, | ||
293 | * later cannot be changed | ||
294 | */ | ||
295 | ranges = <0x02000000 0x00000000 0x80000000 0x0000000e 0x80000000 0x00000000 0x80000000 | ||
296 | 0x01000000 0x00000000 0x00000000 0x0000000f 0x80010000 0x00000000 0x00010000>; | ||
297 | |||
298 | /* Inbound 2GB range starting at 0 */ | ||
299 | dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>; | ||
300 | |||
301 | /* This drives busses 10 to 0x1f */ | ||
302 | bus-range = <0x20 0x2f>; | ||
303 | |||
304 | /* Legacy interrupts (note the weird polarity, the bridge seems | ||
305 | * to invert PCIe legacy interrupts). | ||
306 | * We are de-swizzling here because the numbers are actually for | ||
307 | * port of the root complex virtual P2P bridge. But I want | ||
308 | * to avoid putting a node for it in the tree, so the numbers | ||
309 | * below are basically de-swizzled numbers. | ||
310 | * The real slot is on idsel 0, so the swizzling is 1:1 | ||
311 | */ | ||
312 | interrupt-map-mask = <0x0 0x0 0x0 0x7>; | ||
313 | interrupt-map = < | ||
314 | 0x0 0x0 0x0 0x1 &UIC3 0x4 0x4 /* swizzled int A */ | ||
315 | 0x0 0x0 0x0 0x2 &UIC3 0x5 0x4 /* swizzled int B */ | ||
316 | 0x0 0x0 0x0 0x3 &UIC3 0x6 0x4 /* swizzled int C */ | ||
317 | 0x0 0x0 0x0 0x4 &UIC3 0x7 0x4 /* swizzled int D */>; | ||
318 | }; | ||
319 | |||
320 | PCIE2: pciex@d40000000 { | ||
321 | device_type = "pci"; | ||
322 | #interrupt-cells = <1>; | ||
323 | #size-cells = <2>; | ||
324 | #address-cells = <3>; | ||
325 | compatible = "ibm,plb-pciex-460sx", "ibm,plb-pciex"; | ||
326 | primary; | ||
327 | port = <0x2>; /* port number */ | ||
328 | reg = <0x0000000d 0x40000000 0x20000000 /* Config space access */ | ||
329 | 0x0000000c 0x10002000 0x00001000>; /* Registers */ | ||
330 | dcr-reg = <0x140 0x020>; | ||
331 | sdr-base = <0x370>; | ||
332 | |||
333 | /* Outbound ranges, one memory and one IO, | ||
334 | * later cannot be changed | ||
335 | */ | ||
336 | ranges = <0x02000000 0x00000000 0x80000000 0x0000000f 0x00000000 0x00000000 0x80000000 | ||
337 | 0x01000000 0x00000000 0x00000000 0x0000000f 0x80020000 0x00000000 0x00010000>; | ||
338 | |||
339 | /* Inbound 2GB range starting at 0 */ | ||
340 | dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>; | ||
341 | |||
342 | /* This drives busses 10 to 0x1f */ | ||
343 | bus-range = <0x30 0x3f>; | ||
344 | |||
345 | /* Legacy interrupts (note the weird polarity, the bridge seems | ||
346 | * to invert PCIe legacy interrupts). | ||
347 | * We are de-swizzling here because the numbers are actually for | ||
348 | * port of the root complex virtual P2P bridge. But I want | ||
349 | * to avoid putting a node for it in the tree, so the numbers | ||
350 | * below are basically de-swizzled numbers. | ||
351 | * The real slot is on idsel 0, so the swizzling is 1:1 | ||
352 | */ | ||
353 | interrupt-map-mask = <0x0 0x0 0x0 0x7>; | ||
354 | interrupt-map = < | ||
355 | 0x0 0x0 0x0 0x1 &UIC3 0x8 0x4 /* swizzled int A */ | ||
356 | 0x0 0x0 0x0 0x2 &UIC3 0x9 0x4 /* swizzled int B */ | ||
357 | 0x0 0x0 0x0 0x3 &UIC3 0xa 0x4 /* swizzled int C */ | ||
358 | 0x0 0x0 0x0 0x4 &UIC3 0xb 0x4 /* swizzled int D */>; | ||
238 | }; | 359 | }; |
239 | 360 | ||
240 | }; | 361 | }; |
362 | |||
241 | chosen { | 363 | chosen { |
242 | linux,stdout-path = "/plb/opb/serial@ef600200"; | 364 | linux,stdout-path = "/plb/opb/serial@ef600200"; |
243 | }; | 365 | }; |
diff --git a/arch/powerpc/configs/44x/icon_defconfig b/arch/powerpc/configs/44x/icon_defconfig new file mode 100644 index 00000000000..277f88c2750 --- /dev/null +++ b/arch/powerpc/configs/44x/icon_defconfig | |||
@@ -0,0 +1,1451 @@ | |||
1 | # | ||
2 | # Automatically generated make config: don't edit | ||
3 | # Linux kernel version: 2.6.34-rc7 | ||
4 | # Fri May 21 17:40:22 2010 | ||
5 | # | ||
6 | # CONFIG_PPC64 is not set | ||
7 | |||
8 | # | ||
9 | # Processor support | ||
10 | # | ||
11 | # CONFIG_PPC_BOOK3S_32 is not set | ||
12 | # CONFIG_PPC_85xx is not set | ||
13 | # CONFIG_PPC_8xx is not set | ||
14 | # CONFIG_40x is not set | ||
15 | CONFIG_44x=y | ||
16 | # CONFIG_E200 is not set | ||
17 | CONFIG_4xx=y | ||
18 | CONFIG_BOOKE=y | ||
19 | CONFIG_PTE_64BIT=y | ||
20 | CONFIG_PHYS_64BIT=y | ||
21 | CONFIG_PPC_MMU_NOHASH=y | ||
22 | CONFIG_PPC_MMU_NOHASH_32=y | ||
23 | # CONFIG_PPC_MM_SLICES is not set | ||
24 | CONFIG_NOT_COHERENT_CACHE=y | ||
25 | CONFIG_PPC32=y | ||
26 | CONFIG_WORD_SIZE=32 | ||
27 | CONFIG_ARCH_PHYS_ADDR_T_64BIT=y | ||
28 | CONFIG_MMU=y | ||
29 | CONFIG_GENERIC_CMOS_UPDATE=y | ||
30 | CONFIG_GENERIC_TIME=y | ||
31 | CONFIG_GENERIC_TIME_VSYSCALL=y | ||
32 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
33 | CONFIG_GENERIC_HARDIRQS=y | ||
34 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
35 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | ||
36 | # CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set | ||
37 | CONFIG_IRQ_PER_CPU=y | ||
38 | CONFIG_NR_IRQS=512 | ||
39 | CONFIG_STACKTRACE_SUPPORT=y | ||
40 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
41 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
42 | CONFIG_LOCKDEP_SUPPORT=y | ||
43 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | ||
44 | CONFIG_ARCH_HAS_ILOG2_U32=y | ||
45 | CONFIG_GENERIC_HWEIGHT=y | ||
46 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
47 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | ||
48 | CONFIG_PPC=y | ||
49 | CONFIG_EARLY_PRINTK=y | ||
50 | CONFIG_GENERIC_NVRAM=y | ||
51 | CONFIG_SCHED_OMIT_FRAME_POINTER=y | ||
52 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | ||
53 | CONFIG_PPC_OF=y | ||
54 | CONFIG_OF=y | ||
55 | CONFIG_PPC_UDBG_16550=y | ||
56 | # CONFIG_GENERIC_TBSYNC is not set | ||
57 | CONFIG_AUDIT_ARCH=y | ||
58 | CONFIG_GENERIC_BUG=y | ||
59 | CONFIG_DTC=y | ||
60 | # CONFIG_DEFAULT_UIMAGE is not set | ||
61 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
62 | CONFIG_PPC_DCR_NATIVE=y | ||
63 | # CONFIG_PPC_DCR_MMIO is not set | ||
64 | CONFIG_PPC_DCR=y | ||
65 | CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y | ||
66 | CONFIG_PPC_ADV_DEBUG_REGS=y | ||
67 | CONFIG_PPC_ADV_DEBUG_IACS=4 | ||
68 | CONFIG_PPC_ADV_DEBUG_DACS=2 | ||
69 | CONFIG_PPC_ADV_DEBUG_DVCS=2 | ||
70 | CONFIG_PPC_ADV_DEBUG_DAC_RANGE=y | ||
71 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
72 | CONFIG_CONSTRUCTORS=y | ||
73 | |||
74 | # | ||
75 | # General setup | ||
76 | # | ||
77 | CONFIG_EXPERIMENTAL=y | ||
78 | CONFIG_BROKEN_ON_SMP=y | ||
79 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
80 | CONFIG_LOCALVERSION="" | ||
81 | CONFIG_LOCALVERSION_AUTO=y | ||
82 | CONFIG_SWAP=y | ||
83 | CONFIG_SYSVIPC=y | ||
84 | CONFIG_SYSVIPC_SYSCTL=y | ||
85 | CONFIG_POSIX_MQUEUE=y | ||
86 | CONFIG_POSIX_MQUEUE_SYSCTL=y | ||
87 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
88 | # CONFIG_TASKSTATS is not set | ||
89 | # CONFIG_AUDIT is not set | ||
90 | |||
91 | # | ||
92 | # RCU Subsystem | ||
93 | # | ||
94 | CONFIG_TREE_RCU=y | ||
95 | # CONFIG_TREE_PREEMPT_RCU is not set | ||
96 | # CONFIG_TINY_RCU is not set | ||
97 | # CONFIG_RCU_TRACE is not set | ||
98 | CONFIG_RCU_FANOUT=32 | ||
99 | # CONFIG_RCU_FANOUT_EXACT is not set | ||
100 | # CONFIG_TREE_RCU_TRACE is not set | ||
101 | # CONFIG_IKCONFIG is not set | ||
102 | CONFIG_LOG_BUF_SHIFT=14 | ||
103 | # CONFIG_CGROUPS is not set | ||
104 | CONFIG_SYSFS_DEPRECATED=y | ||
105 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
106 | # CONFIG_RELAY is not set | ||
107 | # CONFIG_NAMESPACES is not set | ||
108 | CONFIG_BLK_DEV_INITRD=y | ||
109 | CONFIG_INITRAMFS_SOURCE="" | ||
110 | CONFIG_RD_GZIP=y | ||
111 | # CONFIG_RD_BZIP2 is not set | ||
112 | # CONFIG_RD_LZMA is not set | ||
113 | # CONFIG_RD_LZO is not set | ||
114 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
115 | CONFIG_SYSCTL=y | ||
116 | CONFIG_ANON_INODES=y | ||
117 | CONFIG_EMBEDDED=y | ||
118 | CONFIG_SYSCTL_SYSCALL=y | ||
119 | CONFIG_KALLSYMS=y | ||
120 | # CONFIG_KALLSYMS_ALL is not set | ||
121 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
122 | CONFIG_HOTPLUG=y | ||
123 | CONFIG_PRINTK=y | ||
124 | # CONFIG_LOGBUFFER is not set | ||
125 | CONFIG_BUG=y | ||
126 | CONFIG_ELF_CORE=y | ||
127 | CONFIG_BASE_FULL=y | ||
128 | CONFIG_FUTEX=y | ||
129 | CONFIG_EPOLL=y | ||
130 | CONFIG_SIGNALFD=y | ||
131 | CONFIG_TIMERFD=y | ||
132 | CONFIG_EVENTFD=y | ||
133 | CONFIG_SHMEM=y | ||
134 | CONFIG_AIO=y | ||
135 | CONFIG_HAVE_PERF_EVENTS=y | ||
136 | |||
137 | # | ||
138 | # Kernel Performance Events And Counters | ||
139 | # | ||
140 | # CONFIG_PERF_EVENTS is not set | ||
141 | # CONFIG_PERF_COUNTERS is not set | ||
142 | CONFIG_VM_EVENT_COUNTERS=y | ||
143 | CONFIG_PCI_QUIRKS=y | ||
144 | CONFIG_SLUB_DEBUG=y | ||
145 | CONFIG_COMPAT_BRK=y | ||
146 | # CONFIG_SLAB is not set | ||
147 | CONFIG_SLUB=y | ||
148 | # CONFIG_SLOB is not set | ||
149 | # CONFIG_PROFILING is not set | ||
150 | CONFIG_HAVE_OPROFILE=y | ||
151 | # CONFIG_KPROBES is not set | ||
152 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
153 | CONFIG_HAVE_IOREMAP_PROT=y | ||
154 | CONFIG_HAVE_KPROBES=y | ||
155 | CONFIG_HAVE_KRETPROBES=y | ||
156 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
157 | CONFIG_HAVE_DMA_ATTRS=y | ||
158 | CONFIG_HAVE_DMA_API_DEBUG=y | ||
159 | |||
160 | # | ||
161 | # GCOV-based kernel profiling | ||
162 | # | ||
163 | # CONFIG_SLOW_WORK is not set | ||
164 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
165 | CONFIG_SLABINFO=y | ||
166 | CONFIG_RT_MUTEXES=y | ||
167 | CONFIG_BASE_SMALL=0 | ||
168 | CONFIG_MODULES=y | ||
169 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
170 | CONFIG_MODULE_UNLOAD=y | ||
171 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
172 | # CONFIG_MODVERSIONS is not set | ||
173 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
174 | CONFIG_BLOCK=y | ||
175 | CONFIG_LBDAF=y | ||
176 | # CONFIG_BLK_DEV_BSG is not set | ||
177 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
178 | |||
179 | # | ||
180 | # IO Schedulers | ||
181 | # | ||
182 | CONFIG_IOSCHED_NOOP=y | ||
183 | CONFIG_IOSCHED_DEADLINE=y | ||
184 | CONFIG_IOSCHED_CFQ=y | ||
185 | # CONFIG_DEFAULT_DEADLINE is not set | ||
186 | CONFIG_DEFAULT_CFQ=y | ||
187 | # CONFIG_DEFAULT_NOOP is not set | ||
188 | CONFIG_DEFAULT_IOSCHED="cfq" | ||
189 | # CONFIG_INLINE_SPIN_TRYLOCK is not set | ||
190 | # CONFIG_INLINE_SPIN_TRYLOCK_BH is not set | ||
191 | # CONFIG_INLINE_SPIN_LOCK is not set | ||
192 | # CONFIG_INLINE_SPIN_LOCK_BH is not set | ||
193 | # CONFIG_INLINE_SPIN_LOCK_IRQ is not set | ||
194 | # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set | ||
195 | CONFIG_INLINE_SPIN_UNLOCK=y | ||
196 | # CONFIG_INLINE_SPIN_UNLOCK_BH is not set | ||
197 | CONFIG_INLINE_SPIN_UNLOCK_IRQ=y | ||
198 | # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set | ||
199 | # CONFIG_INLINE_READ_TRYLOCK is not set | ||
200 | # CONFIG_INLINE_READ_LOCK is not set | ||
201 | # CONFIG_INLINE_READ_LOCK_BH is not set | ||
202 | # CONFIG_INLINE_READ_LOCK_IRQ is not set | ||
203 | # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set | ||
204 | CONFIG_INLINE_READ_UNLOCK=y | ||
205 | # CONFIG_INLINE_READ_UNLOCK_BH is not set | ||
206 | CONFIG_INLINE_READ_UNLOCK_IRQ=y | ||
207 | # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set | ||
208 | # CONFIG_INLINE_WRITE_TRYLOCK is not set | ||
209 | # CONFIG_INLINE_WRITE_LOCK is not set | ||
210 | # CONFIG_INLINE_WRITE_LOCK_BH is not set | ||
211 | # CONFIG_INLINE_WRITE_LOCK_IRQ is not set | ||
212 | # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set | ||
213 | CONFIG_INLINE_WRITE_UNLOCK=y | ||
214 | # CONFIG_INLINE_WRITE_UNLOCK_BH is not set | ||
215 | CONFIG_INLINE_WRITE_UNLOCK_IRQ=y | ||
216 | # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set | ||
217 | # CONFIG_MUTEX_SPIN_ON_OWNER is not set | ||
218 | # CONFIG_FREEZER is not set | ||
219 | CONFIG_PPC4xx_PCI_EXPRESS=y | ||
220 | |||
221 | # | ||
222 | # Platform support | ||
223 | # | ||
224 | # CONFIG_PPC_CELL is not set | ||
225 | # CONFIG_PPC_CELL_NATIVE is not set | ||
226 | # CONFIG_PQ2ADS is not set | ||
227 | # CONFIG_BAMBOO is not set | ||
228 | # CONFIG_EBONY is not set | ||
229 | # CONFIG_SAM440EP is not set | ||
230 | # CONFIG_SEQUOIA is not set | ||
231 | # CONFIG_TAISHAN is not set | ||
232 | # CONFIG_KATMAI is not set | ||
233 | # CONFIG_RAINIER is not set | ||
234 | # CONFIG_WARP is not set | ||
235 | # CONFIG_ARCHES is not set | ||
236 | # CONFIG_CANYONLANDS is not set | ||
237 | # CONFIG_GLACIER is not set | ||
238 | # CONFIG_REDWOOD is not set | ||
239 | # CONFIG_EIGER is not set | ||
240 | # CONFIG_YOSEMITE is not set | ||
241 | CONFIG_ICON=y | ||
242 | # CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set | ||
243 | CONFIG_PPC44x_SIMPLE=y | ||
244 | # CONFIG_PPC4xx_GPIO is not set | ||
245 | CONFIG_440SPe=y | ||
246 | CONFIG_STDBINUTILS=y | ||
247 | # CONFIG_IPIC is not set | ||
248 | # CONFIG_MPIC is not set | ||
249 | # CONFIG_MPIC_WEIRD is not set | ||
250 | # CONFIG_PPC_I8259 is not set | ||
251 | # CONFIG_PPC_RTAS is not set | ||
252 | # CONFIG_MMIO_NVRAM is not set | ||
253 | # CONFIG_PPC_MPC106 is not set | ||
254 | # CONFIG_PPC_970_NAP is not set | ||
255 | # CONFIG_PPC_INDIRECT_IO is not set | ||
256 | # CONFIG_GENERIC_IOMAP is not set | ||
257 | # CONFIG_CPU_FREQ is not set | ||
258 | # CONFIG_FSL_ULI1575 is not set | ||
259 | # CONFIG_SIMPLE_GPIO is not set | ||
260 | |||
261 | # | ||
262 | # Kernel options | ||
263 | # | ||
264 | CONFIG_HIGHMEM=y | ||
265 | # CONFIG_NO_HZ is not set | ||
266 | # CONFIG_HIGH_RES_TIMERS is not set | ||
267 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
268 | # CONFIG_HZ_100 is not set | ||
269 | CONFIG_HZ_250=y | ||
270 | # CONFIG_HZ_300 is not set | ||
271 | # CONFIG_HZ_1000 is not set | ||
272 | CONFIG_HZ=250 | ||
273 | # CONFIG_SCHED_HRTICK is not set | ||
274 | CONFIG_PREEMPT_NONE=y | ||
275 | # CONFIG_PREEMPT_VOLUNTARY is not set | ||
276 | # CONFIG_PREEMPT is not set | ||
277 | CONFIG_BINFMT_ELF=y | ||
278 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
279 | # CONFIG_HAVE_AOUT is not set | ||
280 | # CONFIG_BINFMT_MISC is not set | ||
281 | # CONFIG_MATH_EMULATION is not set | ||
282 | # CONFIG_IOMMU_HELPER is not set | ||
283 | # CONFIG_SWIOTLB is not set | ||
284 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | ||
285 | CONFIG_ARCH_HAS_WALK_MEMORY=y | ||
286 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | ||
287 | CONFIG_SPARSE_IRQ=y | ||
288 | CONFIG_MAX_ACTIVE_REGIONS=32 | ||
289 | CONFIG_ARCH_FLATMEM_ENABLE=y | ||
290 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
291 | CONFIG_SELECT_MEMORY_MODEL=y | ||
292 | CONFIG_FLATMEM_MANUAL=y | ||
293 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
294 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
295 | CONFIG_FLATMEM=y | ||
296 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
297 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
298 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
299 | CONFIG_MIGRATION=y | ||
300 | CONFIG_PHYS_ADDR_T_64BIT=y | ||
301 | CONFIG_ZONE_DMA_FLAG=1 | ||
302 | CONFIG_BOUNCE=y | ||
303 | CONFIG_VIRT_TO_BUS=y | ||
304 | # CONFIG_KSM is not set | ||
305 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 | ||
306 | CONFIG_PPC_4K_PAGES=y | ||
307 | # CONFIG_PPC_16K_PAGES is not set | ||
308 | # CONFIG_PPC_64K_PAGES is not set | ||
309 | # CONFIG_PPC_256K_PAGES is not set | ||
310 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
311 | CONFIG_PROC_DEVICETREE=y | ||
312 | CONFIG_CMDLINE_BOOL=y | ||
313 | CONFIG_CMDLINE="" | ||
314 | CONFIG_EXTRA_TARGETS="" | ||
315 | # CONFIG_ARCH_HAS_NMI_WATCHDOG is not set | ||
316 | CONFIG_SECCOMP=y | ||
317 | CONFIG_ISA_DMA_API=y | ||
318 | |||
319 | # | ||
320 | # Bus options | ||
321 | # | ||
322 | CONFIG_ZONE_DMA=y | ||
323 | CONFIG_NEED_DMA_MAP_STATE=y | ||
324 | CONFIG_PPC_INDIRECT_PCI=y | ||
325 | CONFIG_4xx_SOC=y | ||
326 | CONFIG_PPC_PCI_CHOICE=y | ||
327 | CONFIG_PCI=y | ||
328 | CONFIG_PCI_DOMAINS=y | ||
329 | CONFIG_PCI_SYSCALL=y | ||
330 | CONFIG_PCIEPORTBUS=y | ||
331 | CONFIG_PCIEAER=y | ||
332 | # CONFIG_PCIE_ECRC is not set | ||
333 | # CONFIG_PCIEAER_INJECT is not set | ||
334 | # CONFIG_PCIEASPM is not set | ||
335 | CONFIG_ARCH_SUPPORTS_MSI=y | ||
336 | # CONFIG_PCI_MSI is not set | ||
337 | # CONFIG_PCI_DEBUG is not set | ||
338 | # CONFIG_PCI_STUB is not set | ||
339 | # CONFIG_PCI_IOV is not set | ||
340 | # CONFIG_PCCARD is not set | ||
341 | # CONFIG_HOTPLUG_PCI is not set | ||
342 | # CONFIG_HAS_RAPIDIO is not set | ||
343 | |||
344 | # | ||
345 | # Advanced setup | ||
346 | # | ||
347 | # CONFIG_ADVANCED_OPTIONS is not set | ||
348 | |||
349 | # | ||
350 | # Default settings for advanced configuration options are used | ||
351 | # | ||
352 | CONFIG_LOWMEM_SIZE=0x30000000 | ||
353 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
354 | CONFIG_KERNEL_START=0xc0000000 | ||
355 | CONFIG_PHYSICAL_START=0x00000000 | ||
356 | CONFIG_TASK_SIZE=0xc0000000 | ||
357 | CONFIG_CONSISTENT_SIZE=0x00200000 | ||
358 | CONFIG_NET=y | ||
359 | |||
360 | # | ||
361 | # Networking options | ||
362 | # | ||
363 | CONFIG_PACKET=y | ||
364 | CONFIG_UNIX=y | ||
365 | # CONFIG_NET_KEY is not set | ||
366 | CONFIG_INET=y | ||
367 | # CONFIG_IP_MULTICAST is not set | ||
368 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
369 | CONFIG_IP_FIB_HASH=y | ||
370 | CONFIG_IP_PNP=y | ||
371 | CONFIG_IP_PNP_DHCP=y | ||
372 | CONFIG_IP_PNP_BOOTP=y | ||
373 | # CONFIG_IP_PNP_RARP is not set | ||
374 | # CONFIG_NET_IPIP is not set | ||
375 | # CONFIG_NET_IPGRE is not set | ||
376 | # CONFIG_ARPD is not set | ||
377 | # CONFIG_SYN_COOKIES is not set | ||
378 | # CONFIG_INET_AH is not set | ||
379 | # CONFIG_INET_ESP is not set | ||
380 | # CONFIG_INET_IPCOMP is not set | ||
381 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
382 | # CONFIG_INET_TUNNEL is not set | ||
383 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | ||
384 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | ||
385 | # CONFIG_INET_XFRM_MODE_BEET is not set | ||
386 | # CONFIG_INET_LRO is not set | ||
387 | CONFIG_INET_DIAG=y | ||
388 | CONFIG_INET_TCP_DIAG=y | ||
389 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
390 | CONFIG_TCP_CONG_CUBIC=y | ||
391 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
392 | # CONFIG_TCP_MD5SIG is not set | ||
393 | # CONFIG_IPV6 is not set | ||
394 | # CONFIG_NETWORK_SECMARK is not set | ||
395 | # CONFIG_NETFILTER is not set | ||
396 | # CONFIG_IP_DCCP is not set | ||
397 | # CONFIG_IP_SCTP is not set | ||
398 | # CONFIG_RDS is not set | ||
399 | # CONFIG_TIPC is not set | ||
400 | # CONFIG_ATM is not set | ||
401 | # CONFIG_BRIDGE is not set | ||
402 | # CONFIG_NET_DSA is not set | ||
403 | # CONFIG_VLAN_8021Q is not set | ||
404 | # CONFIG_DECNET is not set | ||
405 | # CONFIG_LLC2 is not set | ||
406 | # CONFIG_IPX is not set | ||
407 | # CONFIG_ATALK is not set | ||
408 | # CONFIG_X25 is not set | ||
409 | # CONFIG_LAPB is not set | ||
410 | # CONFIG_ECONET is not set | ||
411 | # CONFIG_WAN_ROUTER is not set | ||
412 | # CONFIG_PHONET is not set | ||
413 | # CONFIG_IEEE802154 is not set | ||
414 | # CONFIG_NET_SCHED is not set | ||
415 | # CONFIG_DCB is not set | ||
416 | |||
417 | # | ||
418 | # Network testing | ||
419 | # | ||
420 | # CONFIG_NET_PKTGEN is not set | ||
421 | # CONFIG_HAMRADIO is not set | ||
422 | # CONFIG_CAN is not set | ||
423 | # CONFIG_IRDA is not set | ||
424 | # CONFIG_BT is not set | ||
425 | # CONFIG_AF_RXRPC is not set | ||
426 | CONFIG_WIRELESS=y | ||
427 | # CONFIG_CFG80211 is not set | ||
428 | # CONFIG_LIB80211 is not set | ||
429 | |||
430 | # | ||
431 | # CFG80211 needs to be enabled for MAC80211 | ||
432 | # | ||
433 | # CONFIG_WIMAX is not set | ||
434 | # CONFIG_RFKILL is not set | ||
435 | # CONFIG_NET_9P is not set | ||
436 | |||
437 | # | ||
438 | # Device Drivers | ||
439 | # | ||
440 | |||
441 | # | ||
442 | # Generic Driver Options | ||
443 | # | ||
444 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
445 | # CONFIG_DEVTMPFS is not set | ||
446 | CONFIG_STANDALONE=y | ||
447 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
448 | CONFIG_FW_LOADER=y | ||
449 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
450 | CONFIG_EXTRA_FIRMWARE="" | ||
451 | # CONFIG_DEBUG_DRIVER is not set | ||
452 | # CONFIG_DEBUG_DEVRES is not set | ||
453 | # CONFIG_SYS_HYPERVISOR is not set | ||
454 | CONFIG_CONNECTOR=y | ||
455 | CONFIG_PROC_EVENTS=y | ||
456 | CONFIG_MTD=y | ||
457 | # CONFIG_MTD_DEBUG is not set | ||
458 | # CONFIG_MTD_TESTS is not set | ||
459 | # CONFIG_MTD_CONCAT is not set | ||
460 | CONFIG_MTD_PARTITIONS=y | ||
461 | # CONFIG_MTD_REDBOOT_PARTS is not set | ||
462 | CONFIG_MTD_CMDLINE_PARTS=y | ||
463 | CONFIG_MTD_OF_PARTS=y | ||
464 | # CONFIG_MTD_AR7_PARTS is not set | ||
465 | |||
466 | # | ||
467 | # User Modules And Translation Layers | ||
468 | # | ||
469 | CONFIG_MTD_CHAR=y | ||
470 | CONFIG_MTD_BLKDEVS=y | ||
471 | CONFIG_MTD_BLOCK=y | ||
472 | # CONFIG_FTL is not set | ||
473 | # CONFIG_NFTL is not set | ||
474 | # CONFIG_INFTL is not set | ||
475 | # CONFIG_RFD_FTL is not set | ||
476 | # CONFIG_SSFDC is not set | ||
477 | # CONFIG_MTD_OOPS is not set | ||
478 | |||
479 | # | ||
480 | # RAM/ROM/Flash chip drivers | ||
481 | # | ||
482 | CONFIG_MTD_CFI=y | ||
483 | # CONFIG_MTD_JEDECPROBE is not set | ||
484 | CONFIG_MTD_GEN_PROBE=y | ||
485 | # CONFIG_MTD_CFI_ADV_OPTIONS is not set | ||
486 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | ||
487 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
488 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | ||
489 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
490 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
491 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
492 | CONFIG_MTD_CFI_I1=y | ||
493 | CONFIG_MTD_CFI_I2=y | ||
494 | # CONFIG_MTD_CFI_I4 is not set | ||
495 | # CONFIG_MTD_CFI_I8 is not set | ||
496 | # CONFIG_MTD_CFI_INTELEXT is not set | ||
497 | CONFIG_MTD_CFI_AMDSTD=y | ||
498 | # CONFIG_MTD_CFI_STAA is not set | ||
499 | CONFIG_MTD_CFI_UTIL=y | ||
500 | # CONFIG_MTD_RAM is not set | ||
501 | # CONFIG_MTD_ROM is not set | ||
502 | # CONFIG_MTD_ABSENT is not set | ||
503 | |||
504 | # | ||
505 | # Mapping drivers for chip access | ||
506 | # | ||
507 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | ||
508 | # CONFIG_MTD_PHYSMAP is not set | ||
509 | CONFIG_MTD_PHYSMAP_OF=y | ||
510 | # CONFIG_MTD_INTEL_VR_NOR is not set | ||
511 | # CONFIG_MTD_PLATRAM is not set | ||
512 | |||
513 | # | ||
514 | # Self-contained MTD device drivers | ||
515 | # | ||
516 | # CONFIG_MTD_PMC551 is not set | ||
517 | # CONFIG_MTD_SLRAM is not set | ||
518 | # CONFIG_MTD_PHRAM is not set | ||
519 | # CONFIG_MTD_MTDRAM is not set | ||
520 | # CONFIG_MTD_BLOCK2MTD is not set | ||
521 | |||
522 | # | ||
523 | # Disk-On-Chip Device Drivers | ||
524 | # | ||
525 | # CONFIG_MTD_DOC2000 is not set | ||
526 | # CONFIG_MTD_DOC2001 is not set | ||
527 | # CONFIG_MTD_DOC2001PLUS is not set | ||
528 | # CONFIG_MTD_NAND is not set | ||
529 | # CONFIG_MTD_ONENAND is not set | ||
530 | |||
531 | # | ||
532 | # LPDDR flash memory drivers | ||
533 | # | ||
534 | # CONFIG_MTD_LPDDR is not set | ||
535 | |||
536 | # | ||
537 | # UBI - Unsorted block images | ||
538 | # | ||
539 | # CONFIG_MTD_UBI is not set | ||
540 | CONFIG_OF_FLATTREE=y | ||
541 | CONFIG_OF_DYNAMIC=y | ||
542 | CONFIG_OF_DEVICE=y | ||
543 | CONFIG_OF_I2C=y | ||
544 | # CONFIG_PARPORT is not set | ||
545 | CONFIG_BLK_DEV=y | ||
546 | # CONFIG_BLK_DEV_FD is not set | ||
547 | # CONFIG_BLK_CPQ_DA is not set | ||
548 | # CONFIG_BLK_CPQ_CISS_DA is not set | ||
549 | # CONFIG_BLK_DEV_DAC960 is not set | ||
550 | # CONFIG_BLK_DEV_UMEM is not set | ||
551 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
552 | # CONFIG_BLK_DEV_LOOP is not set | ||
553 | # CONFIG_BLK_DEV_DRBD is not set | ||
554 | # CONFIG_BLK_DEV_NBD is not set | ||
555 | # CONFIG_BLK_DEV_SX8 is not set | ||
556 | CONFIG_BLK_DEV_RAM=y | ||
557 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
558 | CONFIG_BLK_DEV_RAM_SIZE=35000 | ||
559 | # CONFIG_BLK_DEV_XIP is not set | ||
560 | # CONFIG_CDROM_PKTCDVD is not set | ||
561 | # CONFIG_ATA_OVER_ETH is not set | ||
562 | CONFIG_XILINX_SYSACE=y | ||
563 | # CONFIG_BLK_DEV_HD is not set | ||
564 | # CONFIG_MISC_DEVICES is not set | ||
565 | CONFIG_HAVE_IDE=y | ||
566 | # CONFIG_IDE is not set | ||
567 | |||
568 | # | ||
569 | # SCSI device support | ||
570 | # | ||
571 | CONFIG_SCSI_MOD=y | ||
572 | # CONFIG_RAID_ATTRS is not set | ||
573 | CONFIG_SCSI=y | ||
574 | CONFIG_SCSI_DMA=y | ||
575 | # CONFIG_SCSI_TGT is not set | ||
576 | # CONFIG_SCSI_NETLINK is not set | ||
577 | CONFIG_SCSI_PROC_FS=y | ||
578 | |||
579 | # | ||
580 | # SCSI support type (disk, tape, CD-ROM) | ||
581 | # | ||
582 | CONFIG_BLK_DEV_SD=y | ||
583 | # CONFIG_CHR_DEV_ST is not set | ||
584 | # CONFIG_CHR_DEV_OSST is not set | ||
585 | # CONFIG_BLK_DEV_SR is not set | ||
586 | # CONFIG_CHR_DEV_SG is not set | ||
587 | # CONFIG_CHR_DEV_SCH is not set | ||
588 | # CONFIG_SCSI_MULTI_LUN is not set | ||
589 | CONFIG_SCSI_CONSTANTS=y | ||
590 | CONFIG_SCSI_LOGGING=y | ||
591 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
592 | CONFIG_SCSI_WAIT_SCAN=m | ||
593 | |||
594 | # | ||
595 | # SCSI Transports | ||
596 | # | ||
597 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
598 | # CONFIG_SCSI_FC_ATTRS is not set | ||
599 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
600 | CONFIG_SCSI_SAS_ATTRS=y | ||
601 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
602 | # CONFIG_SCSI_SRP_ATTRS is not set | ||
603 | # CONFIG_SCSI_LOWLEVEL is not set | ||
604 | # CONFIG_SCSI_DH is not set | ||
605 | # CONFIG_SCSI_OSD_INITIATOR is not set | ||
606 | # CONFIG_ATA is not set | ||
607 | # CONFIG_MD is not set | ||
608 | CONFIG_FUSION=y | ||
609 | # CONFIG_FUSION_SPI is not set | ||
610 | # CONFIG_FUSION_FC is not set | ||
611 | CONFIG_FUSION_SAS=y | ||
612 | CONFIG_FUSION_MAX_SGE=128 | ||
613 | CONFIG_FUSION_CTL=y | ||
614 | CONFIG_FUSION_LOGGING=y | ||
615 | |||
616 | # | ||
617 | # IEEE 1394 (FireWire) support | ||
618 | # | ||
619 | |||
620 | # | ||
621 | # You can enable one or both FireWire driver stacks. | ||
622 | # | ||
623 | |||
624 | # | ||
625 | # The newer stack is recommended. | ||
626 | # | ||
627 | # CONFIG_FIREWIRE is not set | ||
628 | # CONFIG_IEEE1394 is not set | ||
629 | # CONFIG_I2O is not set | ||
630 | # CONFIG_MACINTOSH_DRIVERS is not set | ||
631 | CONFIG_NETDEVICES=y | ||
632 | # CONFIG_DUMMY is not set | ||
633 | # CONFIG_BONDING is not set | ||
634 | # CONFIG_MACVLAN is not set | ||
635 | # CONFIG_EQUALIZER is not set | ||
636 | # CONFIG_TUN is not set | ||
637 | # CONFIG_VETH is not set | ||
638 | # CONFIG_ARCNET is not set | ||
639 | # CONFIG_PHYLIB is not set | ||
640 | CONFIG_NET_ETHERNET=y | ||
641 | # CONFIG_MII is not set | ||
642 | # CONFIG_HAPPYMEAL is not set | ||
643 | # CONFIG_SUNGEM is not set | ||
644 | # CONFIG_CASSINI is not set | ||
645 | # CONFIG_NET_VENDOR_3COM is not set | ||
646 | # CONFIG_ETHOC is not set | ||
647 | # CONFIG_DNET is not set | ||
648 | # CONFIG_NET_TULIP is not set | ||
649 | # CONFIG_HP100 is not set | ||
650 | CONFIG_IBM_NEW_EMAC=y | ||
651 | CONFIG_IBM_NEW_EMAC_RXB=128 | ||
652 | CONFIG_IBM_NEW_EMAC_TXB=64 | ||
653 | CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32 | ||
654 | CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256 | ||
655 | CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0 | ||
656 | # CONFIG_IBM_NEW_EMAC_DEBUG is not set | ||
657 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
658 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
659 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
660 | CONFIG_IBM_NEW_EMAC_EMAC4=y | ||
661 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
662 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
663 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
664 | # CONFIG_NET_PCI is not set | ||
665 | # CONFIG_B44 is not set | ||
666 | # CONFIG_KS8842 is not set | ||
667 | # CONFIG_KS8851_MLL is not set | ||
668 | # CONFIG_ATL2 is not set | ||
669 | # CONFIG_XILINX_EMACLITE is not set | ||
670 | # CONFIG_NETDEV_1000 is not set | ||
671 | # CONFIG_NETDEV_10000 is not set | ||
672 | # CONFIG_TR is not set | ||
673 | # CONFIG_WLAN is not set | ||
674 | |||
675 | # | ||
676 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
677 | # | ||
678 | # CONFIG_WAN is not set | ||
679 | # CONFIG_FDDI is not set | ||
680 | # CONFIG_HIPPI is not set | ||
681 | # CONFIG_PPP is not set | ||
682 | # CONFIG_SLIP is not set | ||
683 | # CONFIG_NET_FC is not set | ||
684 | # CONFIG_NETCONSOLE is not set | ||
685 | # CONFIG_NETPOLL is not set | ||
686 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
687 | # CONFIG_VMXNET3 is not set | ||
688 | # CONFIG_ISDN is not set | ||
689 | # CONFIG_PHONE is not set | ||
690 | |||
691 | # | ||
692 | # Input device support | ||
693 | # | ||
694 | CONFIG_INPUT=y | ||
695 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
696 | # CONFIG_INPUT_POLLDEV is not set | ||
697 | # CONFIG_INPUT_SPARSEKMAP is not set | ||
698 | |||
699 | # | ||
700 | # Userland interfaces | ||
701 | # | ||
702 | CONFIG_INPUT_MOUSEDEV=y | ||
703 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | ||
704 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=640 | ||
705 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480 | ||
706 | # CONFIG_INPUT_JOYDEV is not set | ||
707 | # CONFIG_INPUT_EVDEV is not set | ||
708 | # CONFIG_INPUT_EVBUG is not set | ||
709 | |||
710 | # | ||
711 | # Input Device Drivers | ||
712 | # | ||
713 | CONFIG_INPUT_KEYBOARD=y | ||
714 | # CONFIG_KEYBOARD_ADP5588 is not set | ||
715 | CONFIG_KEYBOARD_ATKBD=y | ||
716 | # CONFIG_QT2160 is not set | ||
717 | # CONFIG_KEYBOARD_LKKBD is not set | ||
718 | # CONFIG_KEYBOARD_MAX7359 is not set | ||
719 | # CONFIG_KEYBOARD_NEWTON is not set | ||
720 | # CONFIG_KEYBOARD_OPENCORES is not set | ||
721 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
722 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
723 | # CONFIG_KEYBOARD_XTKBD is not set | ||
724 | CONFIG_INPUT_MOUSE=y | ||
725 | CONFIG_MOUSE_PS2=y | ||
726 | # CONFIG_MOUSE_PS2_ALPS is not set | ||
727 | # CONFIG_MOUSE_PS2_LOGIPS2PP is not set | ||
728 | # CONFIG_MOUSE_PS2_SYNAPTICS is not set | ||
729 | # CONFIG_MOUSE_PS2_TRACKPOINT is not set | ||
730 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
731 | # CONFIG_MOUSE_PS2_SENTELIC is not set | ||
732 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | ||
733 | # CONFIG_MOUSE_SERIAL is not set | ||
734 | # CONFIG_MOUSE_VSXXXAA is not set | ||
735 | # CONFIG_MOUSE_SYNAPTICS_I2C is not set | ||
736 | # CONFIG_INPUT_JOYSTICK is not set | ||
737 | # CONFIG_INPUT_TABLET is not set | ||
738 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
739 | # CONFIG_INPUT_MISC is not set | ||
740 | |||
741 | # | ||
742 | # Hardware I/O ports | ||
743 | # | ||
744 | CONFIG_SERIO=y | ||
745 | CONFIG_SERIO_I8042=y | ||
746 | CONFIG_SERIO_SERPORT=y | ||
747 | # CONFIG_SERIO_PCIPS2 is not set | ||
748 | CONFIG_SERIO_LIBPS2=y | ||
749 | # CONFIG_SERIO_RAW is not set | ||
750 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set | ||
751 | # CONFIG_SERIO_ALTERA_PS2 is not set | ||
752 | # CONFIG_GAMEPORT is not set | ||
753 | |||
754 | # | ||
755 | # Character devices | ||
756 | # | ||
757 | CONFIG_VT=y | ||
758 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
759 | CONFIG_VT_CONSOLE=y | ||
760 | CONFIG_HW_CONSOLE=y | ||
761 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
762 | CONFIG_DEVKMEM=y | ||
763 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
764 | # CONFIG_NOZOMI is not set | ||
765 | |||
766 | # | ||
767 | # Serial drivers | ||
768 | # | ||
769 | CONFIG_SERIAL_8250=y | ||
770 | CONFIG_SERIAL_8250_CONSOLE=y | ||
771 | # CONFIG_SERIAL_8250_PCI is not set | ||
772 | CONFIG_SERIAL_8250_NR_UARTS=4 | ||
773 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
774 | CONFIG_SERIAL_8250_EXTENDED=y | ||
775 | # CONFIG_SERIAL_8250_MANY_PORTS is not set | ||
776 | CONFIG_SERIAL_8250_SHARE_IRQ=y | ||
777 | # CONFIG_SERIAL_8250_DETECT_IRQ is not set | ||
778 | # CONFIG_SERIAL_8250_RSA is not set | ||
779 | |||
780 | # | ||
781 | # Non-8250 serial port support | ||
782 | # | ||
783 | # CONFIG_SERIAL_UARTLITE is not set | ||
784 | CONFIG_SERIAL_CORE=y | ||
785 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
786 | # CONFIG_SERIAL_JSM is not set | ||
787 | CONFIG_SERIAL_OF_PLATFORM=y | ||
788 | # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set | ||
789 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
790 | # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set | ||
791 | CONFIG_UNIX98_PTYS=y | ||
792 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | ||
793 | CONFIG_LEGACY_PTYS=y | ||
794 | CONFIG_LEGACY_PTY_COUNT=256 | ||
795 | # CONFIG_HVC_UDBG is not set | ||
796 | # CONFIG_IPMI_HANDLER is not set | ||
797 | # CONFIG_HW_RANDOM is not set | ||
798 | # CONFIG_NVRAM is not set | ||
799 | # CONFIG_R3964 is not set | ||
800 | # CONFIG_APPLICOM is not set | ||
801 | # CONFIG_RAW_DRIVER is not set | ||
802 | # CONFIG_BOOTCOUNT is not set | ||
803 | # CONFIG_DISPLAY_PDSP1880 is not set | ||
804 | # CONFIG_MUCMC52_IO is not set | ||
805 | # CONFIG_UC101_IO is not set | ||
806 | # CONFIG_SRAM is not set | ||
807 | # CONFIG_TCG_TPM is not set | ||
808 | CONFIG_DEVPORT=y | ||
809 | CONFIG_I2C=y | ||
810 | CONFIG_I2C_BOARDINFO=y | ||
811 | CONFIG_I2C_COMPAT=y | ||
812 | CONFIG_I2C_CHARDEV=y | ||
813 | CONFIG_I2C_HELPER_AUTO=y | ||
814 | |||
815 | # | ||
816 | # I2C Hardware Bus support | ||
817 | # | ||
818 | |||
819 | # | ||
820 | # PC SMBus host controller drivers | ||
821 | # | ||
822 | # CONFIG_I2C_ALI1535 is not set | ||
823 | # CONFIG_I2C_ALI1563 is not set | ||
824 | # CONFIG_I2C_ALI15X3 is not set | ||
825 | # CONFIG_I2C_AMD756 is not set | ||
826 | # CONFIG_I2C_AMD8111 is not set | ||
827 | # CONFIG_I2C_I801 is not set | ||
828 | # CONFIG_I2C_ISCH is not set | ||
829 | # CONFIG_I2C_PIIX4 is not set | ||
830 | # CONFIG_I2C_NFORCE2 is not set | ||
831 | # CONFIG_I2C_SIS5595 is not set | ||
832 | # CONFIG_I2C_SIS630 is not set | ||
833 | # CONFIG_I2C_SIS96X is not set | ||
834 | # CONFIG_I2C_VIA is not set | ||
835 | # CONFIG_I2C_VIAPRO is not set | ||
836 | |||
837 | # | ||
838 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
839 | # | ||
840 | CONFIG_I2C_IBM_IIC=y | ||
841 | # CONFIG_I2C_MPC is not set | ||
842 | # CONFIG_I2C_OCORES is not set | ||
843 | # CONFIG_I2C_SIMTEC is not set | ||
844 | # CONFIG_I2C_XILINX is not set | ||
845 | |||
846 | # | ||
847 | # External I2C/SMBus adapter drivers | ||
848 | # | ||
849 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
850 | # CONFIG_I2C_TAOS_EVM is not set | ||
851 | |||
852 | # | ||
853 | # Other I2C/SMBus bus drivers | ||
854 | # | ||
855 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
856 | # CONFIG_I2C_STUB is not set | ||
857 | # CONFIG_I2C_DEBUG_CORE is not set | ||
858 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
859 | # CONFIG_I2C_DEBUG_BUS is not set | ||
860 | # CONFIG_SPI is not set | ||
861 | |||
862 | # | ||
863 | # PPS support | ||
864 | # | ||
865 | # CONFIG_PPS is not set | ||
866 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
867 | # CONFIG_GPIOLIB is not set | ||
868 | # CONFIG_W1 is not set | ||
869 | # CONFIG_POWER_SUPPLY is not set | ||
870 | # CONFIG_HWMON is not set | ||
871 | # CONFIG_THERMAL is not set | ||
872 | # CONFIG_WATCHDOG is not set | ||
873 | CONFIG_SSB_POSSIBLE=y | ||
874 | |||
875 | # | ||
876 | # Sonics Silicon Backplane | ||
877 | # | ||
878 | # CONFIG_SSB is not set | ||
879 | |||
880 | # | ||
881 | # Multifunction device drivers | ||
882 | # | ||
883 | # CONFIG_MFD_CORE is not set | ||
884 | # CONFIG_MFD_88PM860X is not set | ||
885 | CONFIG_MFD_SM501=y | ||
886 | # CONFIG_HTC_PASIC3 is not set | ||
887 | # CONFIG_TWL4030_CORE is not set | ||
888 | # CONFIG_MFD_TMIO is not set | ||
889 | # CONFIG_PMIC_DA903X is not set | ||
890 | # CONFIG_PMIC_ADP5520 is not set | ||
891 | # CONFIG_MFD_MAX8925 is not set | ||
892 | # CONFIG_MFD_WM8400 is not set | ||
893 | # CONFIG_MFD_WM831X is not set | ||
894 | # CONFIG_MFD_WM8350_I2C is not set | ||
895 | # CONFIG_MFD_WM8994 is not set | ||
896 | # CONFIG_MFD_PCF50633 is not set | ||
897 | # CONFIG_AB3100_CORE is not set | ||
898 | # CONFIG_LPC_SCH is not set | ||
899 | # CONFIG_REGULATOR is not set | ||
900 | # CONFIG_MEDIA_SUPPORT is not set | ||
901 | |||
902 | # | ||
903 | # Graphics support | ||
904 | # | ||
905 | # CONFIG_AGP is not set | ||
906 | CONFIG_VGA_ARB=y | ||
907 | CONFIG_VGA_ARB_MAX_GPUS=16 | ||
908 | # CONFIG_DRM is not set | ||
909 | # CONFIG_VGASTATE is not set | ||
910 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
911 | CONFIG_FB=y | ||
912 | # CONFIG_FIRMWARE_EDID is not set | ||
913 | # CONFIG_FB_DDC is not set | ||
914 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
915 | CONFIG_FB_CFB_FILLRECT=y | ||
916 | CONFIG_FB_CFB_COPYAREA=y | ||
917 | CONFIG_FB_CFB_IMAGEBLIT=y | ||
918 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
919 | # CONFIG_FB_SYS_FILLRECT is not set | ||
920 | # CONFIG_FB_SYS_COPYAREA is not set | ||
921 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
922 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
923 | # CONFIG_FB_SYS_FOPS is not set | ||
924 | # CONFIG_FB_SVGALIB is not set | ||
925 | # CONFIG_FB_MACMODES is not set | ||
926 | # CONFIG_FB_BACKLIGHT is not set | ||
927 | # CONFIG_FB_MODE_HELPERS is not set | ||
928 | # CONFIG_FB_TILEBLITTING is not set | ||
929 | |||
930 | # | ||
931 | # Frame buffer hardware drivers | ||
932 | # | ||
933 | # CONFIG_FB_CIRRUS is not set | ||
934 | # CONFIG_FB_PM2 is not set | ||
935 | # CONFIG_FB_CYBER2000 is not set | ||
936 | # CONFIG_FB_OF is not set | ||
937 | # CONFIG_FB_CT65550 is not set | ||
938 | # CONFIG_FB_ASILIANT is not set | ||
939 | # CONFIG_FB_IMSTT is not set | ||
940 | # CONFIG_FB_VGA16 is not set | ||
941 | # CONFIG_FB_UVESA is not set | ||
942 | # CONFIG_FB_S1D13XXX is not set | ||
943 | # CONFIG_FB_NVIDIA is not set | ||
944 | # CONFIG_FB_RIVA is not set | ||
945 | # CONFIG_FB_MATROX is not set | ||
946 | # CONFIG_FB_RADEON is not set | ||
947 | # CONFIG_FB_ATY128 is not set | ||
948 | # CONFIG_FB_ATY is not set | ||
949 | # CONFIG_FB_S3 is not set | ||
950 | # CONFIG_FB_SAVAGE is not set | ||
951 | # CONFIG_FB_SIS is not set | ||
952 | # CONFIG_FB_VIA is not set | ||
953 | # CONFIG_FB_NEOMAGIC is not set | ||
954 | # CONFIG_FB_KYRO is not set | ||
955 | # CONFIG_FB_3DFX is not set | ||
956 | # CONFIG_FB_VOODOO1 is not set | ||
957 | # CONFIG_FB_VT8623 is not set | ||
958 | # CONFIG_FB_TRIDENT is not set | ||
959 | # CONFIG_FB_ARK is not set | ||
960 | # CONFIG_FB_PM3 is not set | ||
961 | # CONFIG_FB_CARMINE is not set | ||
962 | CONFIG_FB_SM501=y | ||
963 | # CONFIG_FB_IBM_GXT4500 is not set | ||
964 | # CONFIG_FB_VIRTUAL is not set | ||
965 | # CONFIG_FB_METRONOME is not set | ||
966 | # CONFIG_FB_MB862XX is not set | ||
967 | # CONFIG_FB_BROADSHEET is not set | ||
968 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
969 | |||
970 | # | ||
971 | # Display device support | ||
972 | # | ||
973 | # CONFIG_DISPLAY_SUPPORT is not set | ||
974 | |||
975 | # | ||
976 | # Console display driver support | ||
977 | # | ||
978 | CONFIG_DUMMY_CONSOLE=y | ||
979 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
980 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
981 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
982 | # CONFIG_FONTS is not set | ||
983 | CONFIG_FONT_8x8=y | ||
984 | CONFIG_FONT_8x16=y | ||
985 | CONFIG_LOGO=y | ||
986 | # CONFIG_LOGO_LINUX_MONO is not set | ||
987 | # CONFIG_LOGO_LINUX_VGA16 is not set | ||
988 | CONFIG_LOGO_LINUX_CLUT224=y | ||
989 | # CONFIG_SOUND is not set | ||
990 | CONFIG_HID_SUPPORT=y | ||
991 | CONFIG_HID=y | ||
992 | # CONFIG_HIDRAW is not set | ||
993 | # CONFIG_HID_PID is not set | ||
994 | |||
995 | # | ||
996 | # Special HID drivers | ||
997 | # | ||
998 | # CONFIG_USB_SUPPORT is not set | ||
999 | # CONFIG_UWB is not set | ||
1000 | # CONFIG_MMC is not set | ||
1001 | # CONFIG_MEMSTICK is not set | ||
1002 | # CONFIG_NEW_LEDS is not set | ||
1003 | # CONFIG_ACCESSIBILITY is not set | ||
1004 | # CONFIG_INFINIBAND is not set | ||
1005 | # CONFIG_EDAC is not set | ||
1006 | CONFIG_RTC_LIB=y | ||
1007 | CONFIG_RTC_CLASS=y | ||
1008 | CONFIG_RTC_HCTOSYS=y | ||
1009 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
1010 | # CONFIG_RTC_DEBUG is not set | ||
1011 | |||
1012 | # | ||
1013 | # RTC interfaces | ||
1014 | # | ||
1015 | CONFIG_RTC_INTF_SYSFS=y | ||
1016 | CONFIG_RTC_INTF_PROC=y | ||
1017 | CONFIG_RTC_INTF_DEV=y | ||
1018 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
1019 | # CONFIG_RTC_DRV_TEST is not set | ||
1020 | |||
1021 | # | ||
1022 | # I2C RTC drivers | ||
1023 | # | ||
1024 | CONFIG_RTC_DRV_DS1307=y | ||
1025 | # CONFIG_RTC_DRV_DS1374 is not set | ||
1026 | # CONFIG_RTC_DRV_DS1672 is not set | ||
1027 | # CONFIG_RTC_DRV_MAX6900 is not set | ||
1028 | # CONFIG_RTC_DRV_RS5C372 is not set | ||
1029 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
1030 | # CONFIG_RTC_DRV_X1205 is not set | ||
1031 | # CONFIG_RTC_DRV_PCF8563 is not set | ||
1032 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
1033 | # CONFIG_RTC_DRV_M41T80 is not set | ||
1034 | # CONFIG_RTC_DRV_BQ32K is not set | ||
1035 | # CONFIG_RTC_DRV_S35390A is not set | ||
1036 | # CONFIG_RTC_DRV_FM3130 is not set | ||
1037 | # CONFIG_RTC_DRV_RX8581 is not set | ||
1038 | # CONFIG_RTC_DRV_RX8025 is not set | ||
1039 | |||
1040 | # | ||
1041 | # SPI RTC drivers | ||
1042 | # | ||
1043 | |||
1044 | # | ||
1045 | # Platform RTC drivers | ||
1046 | # | ||
1047 | # CONFIG_RTC_DRV_CMOS is not set | ||
1048 | # CONFIG_RTC_DRV_DS1286 is not set | ||
1049 | # CONFIG_RTC_DRV_DS1511 is not set | ||
1050 | # CONFIG_RTC_DRV_DS1553 is not set | ||
1051 | # CONFIG_RTC_DRV_DS1742 is not set | ||
1052 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
1053 | # CONFIG_RTC_DRV_M48T86 is not set | ||
1054 | # CONFIG_RTC_DRV_M48T35 is not set | ||
1055 | # CONFIG_RTC_DRV_M48T59 is not set | ||
1056 | # CONFIG_RTC_DRV_MSM6242 is not set | ||
1057 | # CONFIG_RTC_DRV_BQ4802 is not set | ||
1058 | # CONFIG_RTC_DRV_RP5C01 is not set | ||
1059 | # CONFIG_RTC_DRV_V3020 is not set | ||
1060 | |||
1061 | # | ||
1062 | # on-CPU RTC drivers | ||
1063 | # | ||
1064 | # CONFIG_RTC_DRV_GENERIC is not set | ||
1065 | # CONFIG_DMADEVICES is not set | ||
1066 | # CONFIG_AUXDISPLAY is not set | ||
1067 | # CONFIG_UIO is not set | ||
1068 | |||
1069 | # | ||
1070 | # TI VLYNQ | ||
1071 | # | ||
1072 | # CONFIG_STAGING is not set | ||
1073 | |||
1074 | # | ||
1075 | # File systems | ||
1076 | # | ||
1077 | CONFIG_EXT2_FS=y | ||
1078 | # CONFIG_EXT2_FS_XATTR is not set | ||
1079 | # CONFIG_EXT2_FS_XIP is not set | ||
1080 | CONFIG_EXT3_FS=y | ||
1081 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | ||
1082 | CONFIG_EXT3_FS_XATTR=y | ||
1083 | # CONFIG_EXT3_FS_POSIX_ACL is not set | ||
1084 | # CONFIG_EXT3_FS_SECURITY is not set | ||
1085 | # CONFIG_EXT4_FS is not set | ||
1086 | CONFIG_JBD=y | ||
1087 | CONFIG_FS_MBCACHE=y | ||
1088 | # CONFIG_REISERFS_FS is not set | ||
1089 | # CONFIG_JFS_FS is not set | ||
1090 | # CONFIG_FS_POSIX_ACL is not set | ||
1091 | # CONFIG_XFS_FS is not set | ||
1092 | # CONFIG_GFS2_FS is not set | ||
1093 | # CONFIG_OCFS2_FS is not set | ||
1094 | # CONFIG_BTRFS_FS is not set | ||
1095 | # CONFIG_NILFS2_FS is not set | ||
1096 | CONFIG_FILE_LOCKING=y | ||
1097 | CONFIG_FSNOTIFY=y | ||
1098 | CONFIG_DNOTIFY=y | ||
1099 | CONFIG_INOTIFY=y | ||
1100 | CONFIG_INOTIFY_USER=y | ||
1101 | # CONFIG_QUOTA is not set | ||
1102 | # CONFIG_AUTOFS_FS is not set | ||
1103 | # CONFIG_AUTOFS4_FS is not set | ||
1104 | # CONFIG_FUSE_FS is not set | ||
1105 | |||
1106 | # | ||
1107 | # Caches | ||
1108 | # | ||
1109 | # CONFIG_FSCACHE is not set | ||
1110 | |||
1111 | # | ||
1112 | # CD-ROM/DVD Filesystems | ||
1113 | # | ||
1114 | # CONFIG_ISO9660_FS is not set | ||
1115 | # CONFIG_UDF_FS is not set | ||
1116 | |||
1117 | # | ||
1118 | # DOS/FAT/NT Filesystems | ||
1119 | # | ||
1120 | CONFIG_FAT_FS=y | ||
1121 | # CONFIG_MSDOS_FS is not set | ||
1122 | CONFIG_VFAT_FS=y | ||
1123 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
1124 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
1125 | # CONFIG_NTFS_FS is not set | ||
1126 | |||
1127 | # | ||
1128 | # Pseudo filesystems | ||
1129 | # | ||
1130 | CONFIG_PROC_FS=y | ||
1131 | CONFIG_PROC_KCORE=y | ||
1132 | CONFIG_PROC_SYSCTL=y | ||
1133 | CONFIG_PROC_PAGE_MONITOR=y | ||
1134 | CONFIG_SYSFS=y | ||
1135 | CONFIG_TMPFS=y | ||
1136 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
1137 | # CONFIG_HUGETLB_PAGE is not set | ||
1138 | # CONFIG_CONFIGFS_FS is not set | ||
1139 | CONFIG_MISC_FILESYSTEMS=y | ||
1140 | # CONFIG_ADFS_FS is not set | ||
1141 | # CONFIG_AFFS_FS is not set | ||
1142 | # CONFIG_HFS_FS is not set | ||
1143 | # CONFIG_HFSPLUS_FS is not set | ||
1144 | # CONFIG_BEFS_FS is not set | ||
1145 | # CONFIG_BFS_FS is not set | ||
1146 | # CONFIG_EFS_FS is not set | ||
1147 | # CONFIG_JFFS2_FS is not set | ||
1148 | # CONFIG_YAFFS_FS is not set | ||
1149 | # CONFIG_LOGFS is not set | ||
1150 | CONFIG_CRAMFS=y | ||
1151 | # CONFIG_SQUASHFS is not set | ||
1152 | # CONFIG_VXFS_FS is not set | ||
1153 | # CONFIG_MINIX_FS is not set | ||
1154 | # CONFIG_OMFS_FS is not set | ||
1155 | # CONFIG_HPFS_FS is not set | ||
1156 | # CONFIG_QNX4FS_FS is not set | ||
1157 | # CONFIG_ROMFS_FS is not set | ||
1158 | # CONFIG_SYSV_FS is not set | ||
1159 | # CONFIG_UFS_FS is not set | ||
1160 | CONFIG_NETWORK_FILESYSTEMS=y | ||
1161 | CONFIG_NFS_FS=y | ||
1162 | CONFIG_NFS_V3=y | ||
1163 | # CONFIG_NFS_V3_ACL is not set | ||
1164 | # CONFIG_NFS_V4 is not set | ||
1165 | CONFIG_ROOT_NFS=y | ||
1166 | # CONFIG_NFSD is not set | ||
1167 | CONFIG_LOCKD=y | ||
1168 | CONFIG_LOCKD_V4=y | ||
1169 | CONFIG_NFS_COMMON=y | ||
1170 | CONFIG_SUNRPC=y | ||
1171 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
1172 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
1173 | # CONFIG_SMB_FS is not set | ||
1174 | # CONFIG_CEPH_FS is not set | ||
1175 | # CONFIG_CIFS is not set | ||
1176 | # CONFIG_NCP_FS is not set | ||
1177 | # CONFIG_CODA_FS is not set | ||
1178 | # CONFIG_AFS_FS is not set | ||
1179 | |||
1180 | # | ||
1181 | # Partition Types | ||
1182 | # | ||
1183 | # CONFIG_PARTITION_ADVANCED is not set | ||
1184 | CONFIG_MSDOS_PARTITION=y | ||
1185 | CONFIG_NLS=y | ||
1186 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
1187 | CONFIG_NLS_CODEPAGE_437=y | ||
1188 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
1189 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
1190 | CONFIG_NLS_CODEPAGE_850=y | ||
1191 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
1192 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
1193 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
1194 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
1195 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
1196 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
1197 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
1198 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
1199 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
1200 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
1201 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
1202 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
1203 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
1204 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
1205 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
1206 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
1207 | # CONFIG_NLS_ISO8859_8 is not set | ||
1208 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
1209 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
1210 | # CONFIG_NLS_ASCII is not set | ||
1211 | CONFIG_NLS_ISO8859_1=y | ||
1212 | # CONFIG_NLS_ISO8859_2 is not set | ||
1213 | # CONFIG_NLS_ISO8859_3 is not set | ||
1214 | # CONFIG_NLS_ISO8859_4 is not set | ||
1215 | # CONFIG_NLS_ISO8859_5 is not set | ||
1216 | # CONFIG_NLS_ISO8859_6 is not set | ||
1217 | # CONFIG_NLS_ISO8859_7 is not set | ||
1218 | # CONFIG_NLS_ISO8859_9 is not set | ||
1219 | # CONFIG_NLS_ISO8859_13 is not set | ||
1220 | # CONFIG_NLS_ISO8859_14 is not set | ||
1221 | CONFIG_NLS_ISO8859_15=y | ||
1222 | # CONFIG_NLS_KOI8_R is not set | ||
1223 | # CONFIG_NLS_KOI8_U is not set | ||
1224 | # CONFIG_NLS_UTF8 is not set | ||
1225 | # CONFIG_DLM is not set | ||
1226 | # CONFIG_BINARY_PRINTF is not set | ||
1227 | |||
1228 | # | ||
1229 | # Library routines | ||
1230 | # | ||
1231 | CONFIG_BITREVERSE=y | ||
1232 | CONFIG_GENERIC_FIND_LAST_BIT=y | ||
1233 | # CONFIG_CRC_CCITT is not set | ||
1234 | # CONFIG_CRC16 is not set | ||
1235 | # CONFIG_CRC_T10DIF is not set | ||
1236 | # CONFIG_CRC_ITU_T is not set | ||
1237 | CONFIG_CRC32=y | ||
1238 | # CONFIG_CRC7 is not set | ||
1239 | # CONFIG_LIBCRC32C is not set | ||
1240 | CONFIG_ZLIB_INFLATE=y | ||
1241 | CONFIG_DECOMPRESS_GZIP=y | ||
1242 | CONFIG_HAS_IOMEM=y | ||
1243 | CONFIG_HAS_IOPORT=y | ||
1244 | CONFIG_HAS_DMA=y | ||
1245 | CONFIG_HAVE_LMB=y | ||
1246 | CONFIG_NLATTR=y | ||
1247 | CONFIG_GENERIC_ATOMIC64=y | ||
1248 | |||
1249 | # | ||
1250 | # Kernel hacking | ||
1251 | # | ||
1252 | # CONFIG_PRINTK_TIME is not set | ||
1253 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
1254 | CONFIG_ENABLE_MUST_CHECK=y | ||
1255 | CONFIG_FRAME_WARN=1024 | ||
1256 | CONFIG_MAGIC_SYSRQ=y | ||
1257 | # CONFIG_STRIP_ASM_SYMS is not set | ||
1258 | # CONFIG_UNUSED_SYMBOLS is not set | ||
1259 | # CONFIG_DEBUG_FS is not set | ||
1260 | # CONFIG_HEADERS_CHECK is not set | ||
1261 | CONFIG_DEBUG_KERNEL=y | ||
1262 | # CONFIG_DEBUG_SHIRQ is not set | ||
1263 | CONFIG_DETECT_SOFTLOCKUP=y | ||
1264 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
1265 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
1266 | CONFIG_DETECT_HUNG_TASK=y | ||
1267 | # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set | ||
1268 | CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 | ||
1269 | CONFIG_SCHED_DEBUG=y | ||
1270 | # CONFIG_SCHEDSTATS is not set | ||
1271 | # CONFIG_TIMER_STATS is not set | ||
1272 | # CONFIG_DEBUG_OBJECTS is not set | ||
1273 | # CONFIG_SLUB_DEBUG_ON is not set | ||
1274 | # CONFIG_SLUB_STATS is not set | ||
1275 | # CONFIG_DEBUG_KMEMLEAK is not set | ||
1276 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
1277 | # CONFIG_RT_MUTEX_TESTER is not set | ||
1278 | # CONFIG_DEBUG_SPINLOCK is not set | ||
1279 | # CONFIG_DEBUG_MUTEXES is not set | ||
1280 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1281 | # CONFIG_PROVE_LOCKING is not set | ||
1282 | # CONFIG_LOCK_STAT is not set | ||
1283 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
1284 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
1285 | # CONFIG_DEBUG_KOBJECT is not set | ||
1286 | # CONFIG_DEBUG_HIGHMEM is not set | ||
1287 | # CONFIG_DEBUG_BUGVERBOSE is not set | ||
1288 | # CONFIG_DEBUG_INFO is not set | ||
1289 | # CONFIG_DEBUG_VM is not set | ||
1290 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
1291 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
1292 | # CONFIG_DEBUG_LIST is not set | ||
1293 | # CONFIG_DEBUG_SG is not set | ||
1294 | # CONFIG_DEBUG_NOTIFIERS is not set | ||
1295 | # CONFIG_DEBUG_CREDENTIALS is not set | ||
1296 | # CONFIG_RCU_TORTURE_TEST is not set | ||
1297 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
1298 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
1299 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | ||
1300 | # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set | ||
1301 | # CONFIG_FAULT_INJECTION is not set | ||
1302 | # CONFIG_LATENCYTOP is not set | ||
1303 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1304 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
1305 | CONFIG_HAVE_FUNCTION_TRACER=y | ||
1306 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | ||
1307 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1308 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y | ||
1309 | CONFIG_TRACING_SUPPORT=y | ||
1310 | CONFIG_FTRACE=y | ||
1311 | # CONFIG_FUNCTION_TRACER is not set | ||
1312 | # CONFIG_IRQSOFF_TRACER is not set | ||
1313 | # CONFIG_SCHED_TRACER is not set | ||
1314 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set | ||
1315 | # CONFIG_BOOT_TRACER is not set | ||
1316 | CONFIG_BRANCH_PROFILE_NONE=y | ||
1317 | # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set | ||
1318 | # CONFIG_PROFILE_ALL_BRANCHES is not set | ||
1319 | # CONFIG_STACK_TRACER is not set | ||
1320 | # CONFIG_KMEMTRACE is not set | ||
1321 | # CONFIG_WORKQUEUE_TRACER is not set | ||
1322 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
1323 | # CONFIG_DMA_API_DEBUG is not set | ||
1324 | # CONFIG_SAMPLES is not set | ||
1325 | CONFIG_HAVE_ARCH_KGDB=y | ||
1326 | # CONFIG_KGDB is not set | ||
1327 | # CONFIG_PPC_DISABLE_WERROR is not set | ||
1328 | CONFIG_PPC_WERROR=y | ||
1329 | CONFIG_PRINT_STACK_DEPTH=64 | ||
1330 | # CONFIG_DEBUG_STACKOVERFLOW is not set | ||
1331 | # CONFIG_DEBUG_STACK_USAGE is not set | ||
1332 | # CONFIG_CODE_PATCHING_SELFTEST is not set | ||
1333 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
1334 | # CONFIG_MSI_BITMAP_SELFTEST is not set | ||
1335 | # CONFIG_XMON is not set | ||
1336 | # CONFIG_IRQSTACKS is not set | ||
1337 | # CONFIG_BDI_SWITCH is not set | ||
1338 | # CONFIG_PPC_EARLY_DEBUG is not set | ||
1339 | |||
1340 | # | ||
1341 | # Security options | ||
1342 | # | ||
1343 | # CONFIG_KEYS is not set | ||
1344 | # CONFIG_SECURITY is not set | ||
1345 | # CONFIG_SECURITYFS is not set | ||
1346 | # CONFIG_DEFAULT_SECURITY_SELINUX is not set | ||
1347 | # CONFIG_DEFAULT_SECURITY_SMACK is not set | ||
1348 | # CONFIG_DEFAULT_SECURITY_TOMOYO is not set | ||
1349 | CONFIG_DEFAULT_SECURITY_DAC=y | ||
1350 | CONFIG_DEFAULT_SECURITY="" | ||
1351 | CONFIG_CRYPTO=y | ||
1352 | |||
1353 | # | ||
1354 | # Crypto core or helper | ||
1355 | # | ||
1356 | CONFIG_CRYPTO_ALGAPI=y | ||
1357 | CONFIG_CRYPTO_ALGAPI2=y | ||
1358 | CONFIG_CRYPTO_AEAD2=y | ||
1359 | CONFIG_CRYPTO_BLKCIPHER=y | ||
1360 | CONFIG_CRYPTO_BLKCIPHER2=y | ||
1361 | CONFIG_CRYPTO_HASH=y | ||
1362 | CONFIG_CRYPTO_HASH2=y | ||
1363 | CONFIG_CRYPTO_RNG2=y | ||
1364 | CONFIG_CRYPTO_PCOMP=y | ||
1365 | CONFIG_CRYPTO_MANAGER=y | ||
1366 | CONFIG_CRYPTO_MANAGER2=y | ||
1367 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1368 | # CONFIG_CRYPTO_NULL is not set | ||
1369 | CONFIG_CRYPTO_WORKQUEUE=y | ||
1370 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1371 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1372 | # CONFIG_CRYPTO_TEST is not set | ||
1373 | |||
1374 | # | ||
1375 | # Authenticated Encryption with Associated Data | ||
1376 | # | ||
1377 | # CONFIG_CRYPTO_CCM is not set | ||
1378 | # CONFIG_CRYPTO_GCM is not set | ||
1379 | # CONFIG_CRYPTO_SEQIV is not set | ||
1380 | |||
1381 | # | ||
1382 | # Block modes | ||
1383 | # | ||
1384 | CONFIG_CRYPTO_CBC=y | ||
1385 | # CONFIG_CRYPTO_CTR is not set | ||
1386 | # CONFIG_CRYPTO_CTS is not set | ||
1387 | CONFIG_CRYPTO_ECB=y | ||
1388 | # CONFIG_CRYPTO_LRW is not set | ||
1389 | CONFIG_CRYPTO_PCBC=y | ||
1390 | # CONFIG_CRYPTO_XTS is not set | ||
1391 | |||
1392 | # | ||
1393 | # Hash modes | ||
1394 | # | ||
1395 | # CONFIG_CRYPTO_HMAC is not set | ||
1396 | # CONFIG_CRYPTO_XCBC is not set | ||
1397 | # CONFIG_CRYPTO_VMAC is not set | ||
1398 | |||
1399 | # | ||
1400 | # Digest | ||
1401 | # | ||
1402 | # CONFIG_CRYPTO_CRC32C is not set | ||
1403 | # CONFIG_CRYPTO_GHASH is not set | ||
1404 | # CONFIG_CRYPTO_MD4 is not set | ||
1405 | CONFIG_CRYPTO_MD5=y | ||
1406 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1407 | # CONFIG_CRYPTO_RMD128 is not set | ||
1408 | # CONFIG_CRYPTO_RMD160 is not set | ||
1409 | # CONFIG_CRYPTO_RMD256 is not set | ||
1410 | # CONFIG_CRYPTO_RMD320 is not set | ||
1411 | # CONFIG_CRYPTO_SHA1 is not set | ||
1412 | # CONFIG_CRYPTO_SHA256 is not set | ||
1413 | # CONFIG_CRYPTO_SHA512 is not set | ||
1414 | # CONFIG_CRYPTO_TGR192 is not set | ||
1415 | # CONFIG_CRYPTO_WP512 is not set | ||
1416 | |||
1417 | # | ||
1418 | # Ciphers | ||
1419 | # | ||
1420 | # CONFIG_CRYPTO_AES is not set | ||
1421 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1422 | # CONFIG_CRYPTO_ARC4 is not set | ||
1423 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1424 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1425 | # CONFIG_CRYPTO_CAST5 is not set | ||
1426 | # CONFIG_CRYPTO_CAST6 is not set | ||
1427 | CONFIG_CRYPTO_DES=y | ||
1428 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1429 | # CONFIG_CRYPTO_KHAZAD is not set | ||
1430 | # CONFIG_CRYPTO_SALSA20 is not set | ||
1431 | # CONFIG_CRYPTO_SEED is not set | ||
1432 | # CONFIG_CRYPTO_SERPENT is not set | ||
1433 | # CONFIG_CRYPTO_TEA is not set | ||
1434 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1435 | |||
1436 | # | ||
1437 | # Compression | ||
1438 | # | ||
1439 | # CONFIG_CRYPTO_DEFLATE is not set | ||
1440 | # CONFIG_CRYPTO_ZLIB is not set | ||
1441 | # CONFIG_CRYPTO_LZO is not set | ||
1442 | |||
1443 | # | ||
1444 | # Random Number Generation | ||
1445 | # | ||
1446 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
1447 | CONFIG_CRYPTO_HW=y | ||
1448 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | ||
1449 | # CONFIG_CRYPTO_DEV_PPC4XX is not set | ||
1450 | # CONFIG_PPC_CLOCK is not set | ||
1451 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h index 725634fc18c..4b509411ad8 100644 --- a/arch/powerpc/include/asm/cache.h +++ b/arch/powerpc/include/asm/cache.h | |||
@@ -42,7 +42,7 @@ extern struct ppc64_caches ppc64_caches; | |||
42 | #endif /* __powerpc64__ && ! __ASSEMBLY__ */ | 42 | #endif /* __powerpc64__ && ! __ASSEMBLY__ */ |
43 | 43 | ||
44 | #if !defined(__ASSEMBLY__) | 44 | #if !defined(__ASSEMBLY__) |
45 | #define __read_mostly __attribute__((__section__(".data.read_mostly"))) | 45 | #define __read_mostly __attribute__((__section__(".data..read_mostly"))) |
46 | #endif | 46 | #endif |
47 | 47 | ||
48 | #endif /* __KERNEL__ */ | 48 | #endif /* __KERNEL__ */ |
diff --git a/arch/powerpc/include/asm/cputable.h b/arch/powerpc/include/asm/cputable.h index e3cba4e1eb3..b0b21134f61 100644 --- a/arch/powerpc/include/asm/cputable.h +++ b/arch/powerpc/include/asm/cputable.h | |||
@@ -70,6 +70,7 @@ struct pt_regs; | |||
70 | extern int machine_check_generic(struct pt_regs *regs); | 70 | extern int machine_check_generic(struct pt_regs *regs); |
71 | extern int machine_check_4xx(struct pt_regs *regs); | 71 | extern int machine_check_4xx(struct pt_regs *regs); |
72 | extern int machine_check_440A(struct pt_regs *regs); | 72 | extern int machine_check_440A(struct pt_regs *regs); |
73 | extern int machine_check_e500mc(struct pt_regs *regs); | ||
73 | extern int machine_check_e500(struct pt_regs *regs); | 74 | extern int machine_check_e500(struct pt_regs *regs); |
74 | extern int machine_check_e200(struct pt_regs *regs); | 75 | extern int machine_check_e200(struct pt_regs *regs); |
75 | extern int machine_check_47x(struct pt_regs *regs); | 76 | extern int machine_check_47x(struct pt_regs *regs); |
diff --git a/arch/powerpc/include/asm/kexec.h b/arch/powerpc/include/asm/kexec.h index a6ca6da1430..2a9cd74a841 100644 --- a/arch/powerpc/include/asm/kexec.h +++ b/arch/powerpc/include/asm/kexec.h | |||
@@ -2,6 +2,18 @@ | |||
2 | #define _ASM_POWERPC_KEXEC_H | 2 | #define _ASM_POWERPC_KEXEC_H |
3 | #ifdef __KERNEL__ | 3 | #ifdef __KERNEL__ |
4 | 4 | ||
5 | #ifdef CONFIG_FSL_BOOKE | ||
6 | |||
7 | /* | ||
8 | * On FSL-BookE we setup a 1:1 mapping which covers the first 2GiB of memory | ||
9 | * and therefore we can only deal with memory within this range | ||
10 | */ | ||
11 | #define KEXEC_SOURCE_MEMORY_LIMIT (2 * 1024 * 1024 * 1024UL) | ||
12 | #define KEXEC_DESTINATION_MEMORY_LIMIT (2 * 1024 * 1024 * 1024UL) | ||
13 | #define KEXEC_CONTROL_MEMORY_LIMIT (2 * 1024 * 1024 * 1024UL) | ||
14 | |||
15 | #else | ||
16 | |||
5 | /* | 17 | /* |
6 | * Maximum page that is mapped directly into kernel memory. | 18 | * Maximum page that is mapped directly into kernel memory. |
7 | * XXX: Since we copy virt we can use any page we allocate | 19 | * XXX: Since we copy virt we can use any page we allocate |
@@ -21,6 +33,7 @@ | |||
21 | /* TASK_SIZE, probably left over from use_mm ?? */ | 33 | /* TASK_SIZE, probably left over from use_mm ?? */ |
22 | #define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE | 34 | #define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE |
23 | #endif | 35 | #endif |
36 | #endif | ||
24 | 37 | ||
25 | #define KEXEC_CONTROL_PAGE_SIZE 4096 | 38 | #define KEXEC_CONTROL_PAGE_SIZE 4096 |
26 | 39 | ||
diff --git a/arch/powerpc/include/asm/macio.h b/arch/powerpc/include/asm/macio.h index 19a661b4cb9..675e159b5ef 100644 --- a/arch/powerpc/include/asm/macio.h +++ b/arch/powerpc/include/asm/macio.h | |||
@@ -123,10 +123,6 @@ static inline struct pci_dev *macio_get_pci_dev(struct macio_dev *mdev) | |||
123 | */ | 123 | */ |
124 | struct macio_driver | 124 | struct macio_driver |
125 | { | 125 | { |
126 | char *name; | ||
127 | struct of_device_id *match_table; | ||
128 | struct module *owner; | ||
129 | |||
130 | int (*probe)(struct macio_dev* dev, const struct of_device_id *match); | 126 | int (*probe)(struct macio_dev* dev, const struct of_device_id *match); |
131 | int (*remove)(struct macio_dev* dev); | 127 | int (*remove)(struct macio_dev* dev); |
132 | 128 | ||
diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h index bfc4e027e2a..358ff14ea25 100644 --- a/arch/powerpc/include/asm/page_64.h +++ b/arch/powerpc/include/asm/page_64.h | |||
@@ -162,14 +162,6 @@ do { \ | |||
162 | 162 | ||
163 | #endif /* !CONFIG_HUGETLB_PAGE */ | 163 | #endif /* !CONFIG_HUGETLB_PAGE */ |
164 | 164 | ||
165 | #ifdef MODULE | ||
166 | #define __page_aligned __attribute__((__aligned__(PAGE_SIZE))) | ||
167 | #else | ||
168 | #define __page_aligned \ | ||
169 | __attribute__((__aligned__(PAGE_SIZE), \ | ||
170 | __section__(".data.page_aligned"))) | ||
171 | #endif | ||
172 | |||
173 | #define VM_DATA_DEFAULT_FLAGS \ | 165 | #define VM_DATA_DEFAULT_FLAGS \ |
174 | (test_thread_flag(TIF_32BIT) ? \ | 166 | (test_thread_flag(TIF_32BIT) ? \ |
175 | VM_DATA_DEFAULT_FLAGS32 : VM_DATA_DEFAULT_FLAGS64) | 167 | VM_DATA_DEFAULT_FLAGS32 : VM_DATA_DEFAULT_FLAGS64) |
diff --git a/arch/powerpc/include/asm/reg_booke.h b/arch/powerpc/include/asm/reg_booke.h index 5304a37ba42..2360317179a 100644 --- a/arch/powerpc/include/asm/reg_booke.h +++ b/arch/powerpc/include/asm/reg_booke.h | |||
@@ -4,6 +4,12 @@ | |||
4 | * are not true Book E PowerPCs, they borrowed a number of features | 4 | * are not true Book E PowerPCs, they borrowed a number of features |
5 | * before Book E was finalized, and are included here as well. Unfortunatly, | 5 | * before Book E was finalized, and are included here as well. Unfortunatly, |
6 | * they sometimes used different locations than true Book E CPUs did. | 6 | * they sometimes used different locations than true Book E CPUs did. |
7 | * | ||
8 | * This program is free software; you can redistribute it and/or | ||
9 | * modify it under the terms of the GNU General Public License version 2 | ||
10 | * as published by the Free Software Foundation. | ||
11 | * | ||
12 | * Copyright 2009-2010 Freescale Semiconductor, Inc. | ||
7 | */ | 13 | */ |
8 | #ifdef __KERNEL__ | 14 | #ifdef __KERNEL__ |
9 | #ifndef __ASM_POWERPC_REG_BOOKE_H__ | 15 | #ifndef __ASM_POWERPC_REG_BOOKE_H__ |
@@ -88,6 +94,7 @@ | |||
88 | #define SPRN_IVOR35 0x213 /* Interrupt Vector Offset Register 35 */ | 94 | #define SPRN_IVOR35 0x213 /* Interrupt Vector Offset Register 35 */ |
89 | #define SPRN_IVOR36 0x214 /* Interrupt Vector Offset Register 36 */ | 95 | #define SPRN_IVOR36 0x214 /* Interrupt Vector Offset Register 36 */ |
90 | #define SPRN_IVOR37 0x215 /* Interrupt Vector Offset Register 37 */ | 96 | #define SPRN_IVOR37 0x215 /* Interrupt Vector Offset Register 37 */ |
97 | #define SPRN_MCARU 0x239 /* Machine Check Address Register Upper */ | ||
91 | #define SPRN_MCSRR0 0x23A /* Machine Check Save and Restore Register 0 */ | 98 | #define SPRN_MCSRR0 0x23A /* Machine Check Save and Restore Register 0 */ |
92 | #define SPRN_MCSRR1 0x23B /* Machine Check Save and Restore Register 1 */ | 99 | #define SPRN_MCSRR1 0x23B /* Machine Check Save and Restore Register 1 */ |
93 | #define SPRN_MCSR 0x23C /* Machine Check Status Register */ | 100 | #define SPRN_MCSR 0x23C /* Machine Check Status Register */ |
@@ -196,8 +203,11 @@ | |||
196 | #define PPC47x_MCSR_IPR 0x00400000 /* Imprecise Machine Check Exception */ | 203 | #define PPC47x_MCSR_IPR 0x00400000 /* Imprecise Machine Check Exception */ |
197 | 204 | ||
198 | #ifdef CONFIG_E500 | 205 | #ifdef CONFIG_E500 |
206 | /* All e500 */ | ||
199 | #define MCSR_MCP 0x80000000UL /* Machine Check Input Pin */ | 207 | #define MCSR_MCP 0x80000000UL /* Machine Check Input Pin */ |
200 | #define MCSR_ICPERR 0x40000000UL /* I-Cache Parity Error */ | 208 | #define MCSR_ICPERR 0x40000000UL /* I-Cache Parity Error */ |
209 | |||
210 | /* e500v1/v2 */ | ||
201 | #define MCSR_DCP_PERR 0x20000000UL /* D-Cache Push Parity Error */ | 211 | #define MCSR_DCP_PERR 0x20000000UL /* D-Cache Push Parity Error */ |
202 | #define MCSR_DCPERR 0x10000000UL /* D-Cache Parity Error */ | 212 | #define MCSR_DCPERR 0x10000000UL /* D-Cache Parity Error */ |
203 | #define MCSR_BUS_IAERR 0x00000080UL /* Instruction Address Error */ | 213 | #define MCSR_BUS_IAERR 0x00000080UL /* Instruction Address Error */ |
@@ -209,12 +219,20 @@ | |||
209 | #define MCSR_BUS_IPERR 0x00000002UL /* Instruction parity Error */ | 219 | #define MCSR_BUS_IPERR 0x00000002UL /* Instruction parity Error */ |
210 | #define MCSR_BUS_RPERR 0x00000001UL /* Read parity Error */ | 220 | #define MCSR_BUS_RPERR 0x00000001UL /* Read parity Error */ |
211 | 221 | ||
212 | /* e500 parts may set unused bits in MCSR; mask these off */ | 222 | /* e500mc */ |
213 | #define MCSR_MASK (MCSR_MCP | MCSR_ICPERR | MCSR_DCP_PERR | \ | 223 | #define MCSR_DCPERR_MC 0x20000000UL /* D-Cache Parity Error */ |
214 | MCSR_DCPERR | MCSR_BUS_IAERR | MCSR_BUS_RAERR | \ | 224 | #define MCSR_L2MMU_MHIT 0x04000000UL /* Hit on multiple TLB entries */ |
215 | MCSR_BUS_WAERR | MCSR_BUS_IBERR | MCSR_BUS_RBERR | \ | 225 | #define MCSR_NMI 0x00100000UL /* Non-Maskable Interrupt */ |
216 | MCSR_BUS_WBERR | MCSR_BUS_IPERR | MCSR_BUS_RPERR) | 226 | #define MCSR_MAV 0x00080000UL /* MCAR address valid */ |
227 | #define MCSR_MEA 0x00040000UL /* MCAR is effective address */ | ||
228 | #define MCSR_IF 0x00010000UL /* Instruction Fetch */ | ||
229 | #define MCSR_LD 0x00008000UL /* Load */ | ||
230 | #define MCSR_ST 0x00004000UL /* Store */ | ||
231 | #define MCSR_LDG 0x00002000UL /* Guarded Load */ | ||
232 | #define MCSR_TLBSYNC 0x00000002UL /* Multiple tlbsyncs detected */ | ||
233 | #define MCSR_BSL2_ERR 0x00000001UL /* Backside L2 cache error */ | ||
217 | #endif | 234 | #endif |
235 | |||
218 | #ifdef CONFIG_E200 | 236 | #ifdef CONFIG_E200 |
219 | #define MCSR_MCP 0x80000000UL /* Machine Check Input Pin */ | 237 | #define MCSR_MCP 0x80000000UL /* Machine Check Input Pin */ |
220 | #define MCSR_CP_PERR 0x20000000UL /* Cache Push Parity Error */ | 238 | #define MCSR_CP_PERR 0x20000000UL /* Cache Push Parity Error */ |
@@ -225,11 +243,6 @@ | |||
225 | #define MCSR_BUS_DRERR 0x00000008UL /* Read Bus Error on data load */ | 243 | #define MCSR_BUS_DRERR 0x00000008UL /* Read Bus Error on data load */ |
226 | #define MCSR_BUS_WRERR 0x00000004UL /* Write Bus Error on buffered | 244 | #define MCSR_BUS_WRERR 0x00000004UL /* Write Bus Error on buffered |
227 | store or cache line push */ | 245 | store or cache line push */ |
228 | |||
229 | /* e200 parts may set unused bits in MCSR; mask these off */ | ||
230 | #define MCSR_MASK (MCSR_MCP | MCSR_CP_PERR | MCSR_CPERR | \ | ||
231 | MCSR_EXCP_ERR | MCSR_BUS_IRERR | MCSR_BUS_DRERR | \ | ||
232 | MCSR_BUS_WRERR) | ||
233 | #endif | 246 | #endif |
234 | 247 | ||
235 | /* Bit definitions for the DBSR. */ | 248 | /* Bit definitions for the DBSR. */ |
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index 877326320e7..58d0572de6f 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile | |||
@@ -57,8 +57,12 @@ obj-$(CONFIG_CRASH_DUMP) += crash_dump.o | |||
57 | obj-$(CONFIG_E500) += idle_e500.o | 57 | obj-$(CONFIG_E500) += idle_e500.o |
58 | obj-$(CONFIG_6xx) += idle_6xx.o l2cr_6xx.o cpu_setup_6xx.o | 58 | obj-$(CONFIG_6xx) += idle_6xx.o l2cr_6xx.o cpu_setup_6xx.o |
59 | obj-$(CONFIG_TAU) += tau_6xx.o | 59 | obj-$(CONFIG_TAU) += tau_6xx.o |
60 | obj-$(CONFIG_HIBERNATION) += swsusp.o suspend.o \ | 60 | obj-$(CONFIG_HIBERNATION) += swsusp.o suspend.o |
61 | swsusp_$(CONFIG_WORD_SIZE).o | 61 | ifeq ($(CONFIG_FSL_BOOKE),y) |
62 | obj-$(CONFIG_HIBERNATION) += swsusp_booke.o | ||
63 | else | ||
64 | obj-$(CONFIG_HIBERNATION) += swsusp_$(CONFIG_WORD_SIZE).o | ||
65 | endif | ||
62 | obj64-$(CONFIG_HIBERNATION) += swsusp_asm64.o | 66 | obj64-$(CONFIG_HIBERNATION) += swsusp_asm64.o |
63 | obj-$(CONFIG_MODULES) += module.o module_$(CONFIG_WORD_SIZE).o | 67 | obj-$(CONFIG_MODULES) += module.o module_$(CONFIG_WORD_SIZE).o |
64 | obj-$(CONFIG_44x) += cpu_setup_44x.o | 68 | obj-$(CONFIG_44x) += cpu_setup_44x.o |
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c index 9556be903e9..87aa0f3c604 100644 --- a/arch/powerpc/kernel/cputable.c +++ b/arch/powerpc/kernel/cputable.c | |||
@@ -1840,7 +1840,7 @@ static struct cpu_spec __initdata cpu_specs[] = { | |||
1840 | .oprofile_cpu_type = "ppc/e500mc", | 1840 | .oprofile_cpu_type = "ppc/e500mc", |
1841 | .oprofile_type = PPC_OPROFILE_FSL_EMB, | 1841 | .oprofile_type = PPC_OPROFILE_FSL_EMB, |
1842 | .cpu_setup = __setup_cpu_e500mc, | 1842 | .cpu_setup = __setup_cpu_e500mc, |
1843 | .machine_check = machine_check_e500, | 1843 | .machine_check = machine_check_e500mc, |
1844 | .platform = "ppce500mc", | 1844 | .platform = "ppce500mc", |
1845 | }, | 1845 | }, |
1846 | { /* default match */ | 1846 | { /* default match */ |
diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c index 8c066d6a8e4..b46f2e09bd8 100644 --- a/arch/powerpc/kernel/crash.c +++ b/arch/powerpc/kernel/crash.c | |||
@@ -163,6 +163,7 @@ static void crash_kexec_prepare_cpus(int cpu) | |||
163 | } | 163 | } |
164 | 164 | ||
165 | /* wait for all the CPUs to hit real mode but timeout if they don't come in */ | 165 | /* wait for all the CPUs to hit real mode but timeout if they don't come in */ |
166 | #ifdef CONFIG_PPC_STD_MMU_64 | ||
166 | static void crash_kexec_wait_realmode(int cpu) | 167 | static void crash_kexec_wait_realmode(int cpu) |
167 | { | 168 | { |
168 | unsigned int msecs; | 169 | unsigned int msecs; |
@@ -187,6 +188,7 @@ static void crash_kexec_wait_realmode(int cpu) | |||
187 | } | 188 | } |
188 | mb(); | 189 | mb(); |
189 | } | 190 | } |
191 | #endif | ||
190 | 192 | ||
191 | /* | 193 | /* |
192 | * This function will be called by secondary cpus or by kexec cpu | 194 | * This function will be called by secondary cpus or by kexec cpu |
@@ -445,7 +447,9 @@ void default_machine_crash_shutdown(struct pt_regs *regs) | |||
445 | crash_kexec_prepare_cpus(crashing_cpu); | 447 | crash_kexec_prepare_cpus(crashing_cpu); |
446 | cpu_set(crashing_cpu, cpus_in_crash); | 448 | cpu_set(crashing_cpu, cpus_in_crash); |
447 | crash_kexec_stop_spus(); | 449 | crash_kexec_stop_spus(); |
450 | #ifdef CONFIG_PPC_STD_MMU_64 | ||
448 | crash_kexec_wait_realmode(crashing_cpu); | 451 | crash_kexec_wait_realmode(crashing_cpu); |
452 | #endif | ||
449 | if (ppc_md.kexec_cpu_down) | 453 | if (ppc_md.kexec_cpu_down) |
450 | ppc_md.kexec_cpu_down(1, 0); | 454 | ppc_md.kexec_cpu_down(1, 0); |
451 | } | 455 | } |
diff --git a/arch/powerpc/kernel/fsl_booke_entry_mapping.S b/arch/powerpc/kernel/fsl_booke_entry_mapping.S new file mode 100644 index 00000000000..beb4d78a230 --- /dev/null +++ b/arch/powerpc/kernel/fsl_booke_entry_mapping.S | |||
@@ -0,0 +1,237 @@ | |||
1 | |||
2 | /* 1. Find the index of the entry we're executing in */ | ||
3 | bl invstr /* Find our address */ | ||
4 | invstr: mflr r6 /* Make it accessible */ | ||
5 | mfmsr r7 | ||
6 | rlwinm r4,r7,27,31,31 /* extract MSR[IS] */ | ||
7 | mfspr r7, SPRN_PID0 | ||
8 | slwi r7,r7,16 | ||
9 | or r7,r7,r4 | ||
10 | mtspr SPRN_MAS6,r7 | ||
11 | tlbsx 0,r6 /* search MSR[IS], SPID=PID0 */ | ||
12 | mfspr r7,SPRN_MAS1 | ||
13 | andis. r7,r7,MAS1_VALID@h | ||
14 | bne match_TLB | ||
15 | |||
16 | mfspr r7,SPRN_MMUCFG | ||
17 | rlwinm r7,r7,21,28,31 /* extract MMUCFG[NPIDS] */ | ||
18 | cmpwi r7,3 | ||
19 | bne match_TLB /* skip if NPIDS != 3 */ | ||
20 | |||
21 | mfspr r7,SPRN_PID1 | ||
22 | slwi r7,r7,16 | ||
23 | or r7,r7,r4 | ||
24 | mtspr SPRN_MAS6,r7 | ||
25 | tlbsx 0,r6 /* search MSR[IS], SPID=PID1 */ | ||
26 | mfspr r7,SPRN_MAS1 | ||
27 | andis. r7,r7,MAS1_VALID@h | ||
28 | bne match_TLB | ||
29 | mfspr r7, SPRN_PID2 | ||
30 | slwi r7,r7,16 | ||
31 | or r7,r7,r4 | ||
32 | mtspr SPRN_MAS6,r7 | ||
33 | tlbsx 0,r6 /* Fall through, we had to match */ | ||
34 | |||
35 | match_TLB: | ||
36 | mfspr r7,SPRN_MAS0 | ||
37 | rlwinm r3,r7,16,20,31 /* Extract MAS0(Entry) */ | ||
38 | |||
39 | mfspr r7,SPRN_MAS1 /* Insure IPROT set */ | ||
40 | oris r7,r7,MAS1_IPROT@h | ||
41 | mtspr SPRN_MAS1,r7 | ||
42 | tlbwe | ||
43 | |||
44 | /* 2. Invalidate all entries except the entry we're executing in */ | ||
45 | mfspr r9,SPRN_TLB1CFG | ||
46 | andi. r9,r9,0xfff | ||
47 | li r6,0 /* Set Entry counter to 0 */ | ||
48 | 1: lis r7,0x1000 /* Set MAS0(TLBSEL) = 1 */ | ||
49 | rlwimi r7,r6,16,4,15 /* Setup MAS0 = TLBSEL | ESEL(r6) */ | ||
50 | mtspr SPRN_MAS0,r7 | ||
51 | tlbre | ||
52 | mfspr r7,SPRN_MAS1 | ||
53 | rlwinm r7,r7,0,2,31 /* Clear MAS1 Valid and IPROT */ | ||
54 | cmpw r3,r6 | ||
55 | beq skpinv /* Dont update the current execution TLB */ | ||
56 | mtspr SPRN_MAS1,r7 | ||
57 | tlbwe | ||
58 | isync | ||
59 | skpinv: addi r6,r6,1 /* Increment */ | ||
60 | cmpw r6,r9 /* Are we done? */ | ||
61 | bne 1b /* If not, repeat */ | ||
62 | |||
63 | /* Invalidate TLB0 */ | ||
64 | li r6,0x04 | ||
65 | tlbivax 0,r6 | ||
66 | TLBSYNC | ||
67 | /* Invalidate TLB1 */ | ||
68 | li r6,0x0c | ||
69 | tlbivax 0,r6 | ||
70 | TLBSYNC | ||
71 | |||
72 | /* 3. Setup a temp mapping and jump to it */ | ||
73 | andi. r5, r3, 0x1 /* Find an entry not used and is non-zero */ | ||
74 | addi r5, r5, 0x1 | ||
75 | lis r7,0x1000 /* Set MAS0(TLBSEL) = 1 */ | ||
76 | rlwimi r7,r3,16,4,15 /* Setup MAS0 = TLBSEL | ESEL(r3) */ | ||
77 | mtspr SPRN_MAS0,r7 | ||
78 | tlbre | ||
79 | |||
80 | /* grab and fixup the RPN */ | ||
81 | mfspr r6,SPRN_MAS1 /* extract MAS1[SIZE] */ | ||
82 | rlwinm r6,r6,25,27,31 | ||
83 | li r8,-1 | ||
84 | addi r6,r6,10 | ||
85 | slw r6,r8,r6 /* convert to mask */ | ||
86 | |||
87 | bl 1f /* Find our address */ | ||
88 | 1: mflr r7 | ||
89 | |||
90 | mfspr r8,SPRN_MAS3 | ||
91 | #ifdef CONFIG_PHYS_64BIT | ||
92 | mfspr r23,SPRN_MAS7 | ||
93 | #endif | ||
94 | and r8,r6,r8 | ||
95 | subfic r9,r6,-4096 | ||
96 | and r9,r9,r7 | ||
97 | |||
98 | or r25,r8,r9 | ||
99 | ori r8,r25,(MAS3_SX|MAS3_SW|MAS3_SR) | ||
100 | |||
101 | /* Just modify the entry ID and EPN for the temp mapping */ | ||
102 | lis r7,0x1000 /* Set MAS0(TLBSEL) = 1 */ | ||
103 | rlwimi r7,r5,16,4,15 /* Setup MAS0 = TLBSEL | ESEL(r5) */ | ||
104 | mtspr SPRN_MAS0,r7 | ||
105 | xori r6,r4,1 /* Setup TMP mapping in the other Address space */ | ||
106 | slwi r6,r6,12 | ||
107 | oris r6,r6,(MAS1_VALID|MAS1_IPROT)@h | ||
108 | ori r6,r6,(MAS1_TSIZE(BOOK3E_PAGESZ_4K))@l | ||
109 | mtspr SPRN_MAS1,r6 | ||
110 | mfspr r6,SPRN_MAS2 | ||
111 | li r7,0 /* temp EPN = 0 */ | ||
112 | rlwimi r7,r6,0,20,31 | ||
113 | mtspr SPRN_MAS2,r7 | ||
114 | mtspr SPRN_MAS3,r8 | ||
115 | tlbwe | ||
116 | |||
117 | xori r6,r4,1 | ||
118 | slwi r6,r6,5 /* setup new context with other address space */ | ||
119 | bl 1f /* Find our address */ | ||
120 | 1: mflr r9 | ||
121 | rlwimi r7,r9,0,20,31 | ||
122 | addi r7,r7,(2f - 1b) | ||
123 | mtspr SPRN_SRR0,r7 | ||
124 | mtspr SPRN_SRR1,r6 | ||
125 | rfi | ||
126 | 2: | ||
127 | /* 4. Clear out PIDs & Search info */ | ||
128 | li r6,0 | ||
129 | mtspr SPRN_MAS6,r6 | ||
130 | mtspr SPRN_PID0,r6 | ||
131 | |||
132 | mfspr r7,SPRN_MMUCFG | ||
133 | rlwinm r7,r7,21,28,31 /* extract MMUCFG[NPIDS] */ | ||
134 | cmpwi r7,3 | ||
135 | bne 2f /* skip if NPIDS != 3 */ | ||
136 | |||
137 | mtspr SPRN_PID1,r6 | ||
138 | mtspr SPRN_PID2,r6 | ||
139 | |||
140 | /* 5. Invalidate mapping we started in */ | ||
141 | 2: | ||
142 | lis r7,0x1000 /* Set MAS0(TLBSEL) = 1 */ | ||
143 | rlwimi r7,r3,16,4,15 /* Setup MAS0 = TLBSEL | ESEL(r3) */ | ||
144 | mtspr SPRN_MAS0,r7 | ||
145 | tlbre | ||
146 | mfspr r6,SPRN_MAS1 | ||
147 | rlwinm r6,r6,0,2,0 /* clear IPROT */ | ||
148 | mtspr SPRN_MAS1,r6 | ||
149 | tlbwe | ||
150 | /* Invalidate TLB1 */ | ||
151 | li r9,0x0c | ||
152 | tlbivax 0,r9 | ||
153 | TLBSYNC | ||
154 | |||
155 | /* The mapping only needs to be cache-coherent on SMP */ | ||
156 | #ifdef CONFIG_SMP | ||
157 | #define M_IF_SMP MAS2_M | ||
158 | #else | ||
159 | #define M_IF_SMP 0 | ||
160 | #endif | ||
161 | |||
162 | #if defined(ENTRY_MAPPING_BOOT_SETUP) | ||
163 | |||
164 | /* 6. Setup KERNELBASE mapping in TLB1[0] */ | ||
165 | lis r6,0x1000 /* Set MAS0(TLBSEL) = TLB1(1), ESEL = 0 */ | ||
166 | mtspr SPRN_MAS0,r6 | ||
167 | lis r6,(MAS1_VALID|MAS1_IPROT)@h | ||
168 | ori r6,r6,(MAS1_TSIZE(BOOK3E_PAGESZ_64M))@l | ||
169 | mtspr SPRN_MAS1,r6 | ||
170 | lis r6,MAS2_VAL(PAGE_OFFSET, BOOK3E_PAGESZ_64M, M_IF_SMP)@h | ||
171 | ori r6,r6,MAS2_VAL(PAGE_OFFSET, BOOK3E_PAGESZ_64M, M_IF_SMP)@l | ||
172 | mtspr SPRN_MAS2,r6 | ||
173 | mtspr SPRN_MAS3,r8 | ||
174 | tlbwe | ||
175 | |||
176 | /* 7. Jump to KERNELBASE mapping */ | ||
177 | lis r6,(KERNELBASE & ~0xfff)@h | ||
178 | ori r6,r6,(KERNELBASE & ~0xfff)@l | ||
179 | |||
180 | #elif defined(ENTRY_MAPPING_KEXEC_SETUP) | ||
181 | /* | ||
182 | * 6. Setup a 1:1 mapping in TLB1. Esel 0 is unsued, 1 or 2 contains the tmp | ||
183 | * mapping so we start at 3. We setup 8 mappings, each 256MiB in size. This | ||
184 | * will cover the first 2GiB of memory. | ||
185 | */ | ||
186 | |||
187 | lis r10, (MAS1_VALID|MAS1_IPROT)@h | ||
188 | ori r10,r10, (MAS1_TSIZE(BOOK3E_PAGESZ_256M))@l | ||
189 | li r11, 0 | ||
190 | li r0, 8 | ||
191 | mtctr r0 | ||
192 | |||
193 | next_tlb_setup: | ||
194 | addi r0, r11, 3 | ||
195 | rlwinm r0, r0, 16, 4, 15 // Compute esel | ||
196 | rlwinm r9, r11, 28, 0, 3 // Compute [ER]PN | ||
197 | oris r0, r0, (MAS0_TLBSEL(1))@h | ||
198 | mtspr SPRN_MAS0,r0 | ||
199 | mtspr SPRN_MAS1,r10 | ||
200 | mtspr SPRN_MAS2,r9 | ||
201 | ori r9, r9, (MAS3_SX|MAS3_SW|MAS3_SR) | ||
202 | mtspr SPRN_MAS3,r9 | ||
203 | tlbwe | ||
204 | addi r11, r11, 1 | ||
205 | bdnz+ next_tlb_setup | ||
206 | |||
207 | /* 7. Jump to our 1:1 mapping */ | ||
208 | li r6, 0 | ||
209 | |||
210 | #else | ||
211 | #error You need to specify the mapping or not use this at all. | ||
212 | #endif | ||
213 | |||
214 | lis r7,MSR_KERNEL@h | ||
215 | ori r7,r7,MSR_KERNEL@l | ||
216 | bl 1f /* Find our address */ | ||
217 | 1: mflr r9 | ||
218 | rlwimi r6,r9,0,20,31 | ||
219 | addi r6,r6,(2f - 1b) | ||
220 | add r6, r6, r25 | ||
221 | mtspr SPRN_SRR0,r6 | ||
222 | mtspr SPRN_SRR1,r7 | ||
223 | rfi /* start execution out of TLB1[0] entry */ | ||
224 | |||
225 | /* 8. Clear out the temp mapping */ | ||
226 | 2: lis r7,0x1000 /* Set MAS0(TLBSEL) = 1 */ | ||
227 | rlwimi r7,r5,16,4,15 /* Setup MAS0 = TLBSEL | ESEL(r5) */ | ||
228 | mtspr SPRN_MAS0,r7 | ||
229 | tlbre | ||
230 | mfspr r8,SPRN_MAS1 | ||
231 | rlwinm r8,r8,0,2,0 /* clear IPROT */ | ||
232 | mtspr SPRN_MAS1,r8 | ||
233 | tlbwe | ||
234 | /* Invalidate TLB1 */ | ||
235 | li r9,0x0c | ||
236 | tlbivax 0,r9 | ||
237 | TLBSYNC | ||
diff --git a/arch/powerpc/kernel/head_fsl_booke.S b/arch/powerpc/kernel/head_fsl_booke.S index edd4a57fd29..4faeba24785 100644 --- a/arch/powerpc/kernel/head_fsl_booke.S +++ b/arch/powerpc/kernel/head_fsl_booke.S | |||
@@ -94,204 +94,10 @@ _ENTRY(_start); | |||
94 | */ | 94 | */ |
95 | 95 | ||
96 | _ENTRY(__early_start) | 96 | _ENTRY(__early_start) |
97 | /* 1. Find the index of the entry we're executing in */ | ||
98 | bl invstr /* Find our address */ | ||
99 | invstr: mflr r6 /* Make it accessible */ | ||
100 | mfmsr r7 | ||
101 | rlwinm r4,r7,27,31,31 /* extract MSR[IS] */ | ||
102 | mfspr r7, SPRN_PID0 | ||
103 | slwi r7,r7,16 | ||
104 | or r7,r7,r4 | ||
105 | mtspr SPRN_MAS6,r7 | ||
106 | tlbsx 0,r6 /* search MSR[IS], SPID=PID0 */ | ||
107 | mfspr r7,SPRN_MAS1 | ||
108 | andis. r7,r7,MAS1_VALID@h | ||
109 | bne match_TLB | ||
110 | |||
111 | mfspr r7,SPRN_MMUCFG | ||
112 | rlwinm r7,r7,21,28,31 /* extract MMUCFG[NPIDS] */ | ||
113 | cmpwi r7,3 | ||
114 | bne match_TLB /* skip if NPIDS != 3 */ | ||
115 | |||
116 | mfspr r7,SPRN_PID1 | ||
117 | slwi r7,r7,16 | ||
118 | or r7,r7,r4 | ||
119 | mtspr SPRN_MAS6,r7 | ||
120 | tlbsx 0,r6 /* search MSR[IS], SPID=PID1 */ | ||
121 | mfspr r7,SPRN_MAS1 | ||
122 | andis. r7,r7,MAS1_VALID@h | ||
123 | bne match_TLB | ||
124 | mfspr r7, SPRN_PID2 | ||
125 | slwi r7,r7,16 | ||
126 | or r7,r7,r4 | ||
127 | mtspr SPRN_MAS6,r7 | ||
128 | tlbsx 0,r6 /* Fall through, we had to match */ | ||
129 | |||
130 | match_TLB: | ||
131 | mfspr r7,SPRN_MAS0 | ||
132 | rlwinm r3,r7,16,20,31 /* Extract MAS0(Entry) */ | ||
133 | |||
134 | mfspr r7,SPRN_MAS1 /* Insure IPROT set */ | ||
135 | oris r7,r7,MAS1_IPROT@h | ||
136 | mtspr SPRN_MAS1,r7 | ||
137 | tlbwe | ||
138 | |||
139 | /* 2. Invalidate all entries except the entry we're executing in */ | ||
140 | mfspr r9,SPRN_TLB1CFG | ||
141 | andi. r9,r9,0xfff | ||
142 | li r6,0 /* Set Entry counter to 0 */ | ||
143 | 1: lis r7,0x1000 /* Set MAS0(TLBSEL) = 1 */ | ||
144 | rlwimi r7,r6,16,4,15 /* Setup MAS0 = TLBSEL | ESEL(r6) */ | ||
145 | mtspr SPRN_MAS0,r7 | ||
146 | tlbre | ||
147 | mfspr r7,SPRN_MAS1 | ||
148 | rlwinm r7,r7,0,2,31 /* Clear MAS1 Valid and IPROT */ | ||
149 | cmpw r3,r6 | ||
150 | beq skpinv /* Dont update the current execution TLB */ | ||
151 | mtspr SPRN_MAS1,r7 | ||
152 | tlbwe | ||
153 | isync | ||
154 | skpinv: addi r6,r6,1 /* Increment */ | ||
155 | cmpw r6,r9 /* Are we done? */ | ||
156 | bne 1b /* If not, repeat */ | ||
157 | |||
158 | /* Invalidate TLB0 */ | ||
159 | li r6,0x04 | ||
160 | tlbivax 0,r6 | ||
161 | TLBSYNC | ||
162 | /* Invalidate TLB1 */ | ||
163 | li r6,0x0c | ||
164 | tlbivax 0,r6 | ||
165 | TLBSYNC | ||
166 | |||
167 | /* 3. Setup a temp mapping and jump to it */ | ||
168 | andi. r5, r3, 0x1 /* Find an entry not used and is non-zero */ | ||
169 | addi r5, r5, 0x1 | ||
170 | lis r7,0x1000 /* Set MAS0(TLBSEL) = 1 */ | ||
171 | rlwimi r7,r3,16,4,15 /* Setup MAS0 = TLBSEL | ESEL(r3) */ | ||
172 | mtspr SPRN_MAS0,r7 | ||
173 | tlbre | ||
174 | |||
175 | /* grab and fixup the RPN */ | ||
176 | mfspr r6,SPRN_MAS1 /* extract MAS1[SIZE] */ | ||
177 | rlwinm r6,r6,25,27,31 | ||
178 | li r8,-1 | ||
179 | addi r6,r6,10 | ||
180 | slw r6,r8,r6 /* convert to mask */ | ||
181 | |||
182 | bl 1f /* Find our address */ | ||
183 | 1: mflr r7 | ||
184 | |||
185 | mfspr r8,SPRN_MAS3 | ||
186 | #ifdef CONFIG_PHYS_64BIT | ||
187 | mfspr r23,SPRN_MAS7 | ||
188 | #endif | ||
189 | and r8,r6,r8 | ||
190 | subfic r9,r6,-4096 | ||
191 | and r9,r9,r7 | ||
192 | |||
193 | or r25,r8,r9 | ||
194 | ori r8,r25,(MAS3_SX|MAS3_SW|MAS3_SR) | ||
195 | |||
196 | /* Just modify the entry ID and EPN for the temp mapping */ | ||
197 | lis r7,0x1000 /* Set MAS0(TLBSEL) = 1 */ | ||
198 | rlwimi r7,r5,16,4,15 /* Setup MAS0 = TLBSEL | ESEL(r5) */ | ||
199 | mtspr SPRN_MAS0,r7 | ||
200 | xori r6,r4,1 /* Setup TMP mapping in the other Address space */ | ||
201 | slwi r6,r6,12 | ||
202 | oris r6,r6,(MAS1_VALID|MAS1_IPROT)@h | ||
203 | ori r6,r6,(MAS1_TSIZE(BOOK3E_PAGESZ_4K))@l | ||
204 | mtspr SPRN_MAS1,r6 | ||
205 | mfspr r6,SPRN_MAS2 | ||
206 | li r7,0 /* temp EPN = 0 */ | ||
207 | rlwimi r7,r6,0,20,31 | ||
208 | mtspr SPRN_MAS2,r7 | ||
209 | mtspr SPRN_MAS3,r8 | ||
210 | tlbwe | ||
211 | |||
212 | xori r6,r4,1 | ||
213 | slwi r6,r6,5 /* setup new context with other address space */ | ||
214 | bl 1f /* Find our address */ | ||
215 | 1: mflr r9 | ||
216 | rlwimi r7,r9,0,20,31 | ||
217 | addi r7,r7,(2f - 1b) | ||
218 | mtspr SPRN_SRR0,r7 | ||
219 | mtspr SPRN_SRR1,r6 | ||
220 | rfi | ||
221 | 2: | ||
222 | /* 4. Clear out PIDs & Search info */ | ||
223 | li r6,0 | ||
224 | mtspr SPRN_MAS6,r6 | ||
225 | mtspr SPRN_PID0,r6 | ||
226 | |||
227 | mfspr r7,SPRN_MMUCFG | ||
228 | rlwinm r7,r7,21,28,31 /* extract MMUCFG[NPIDS] */ | ||
229 | cmpwi r7,3 | ||
230 | bne 2f /* skip if NPIDS != 3 */ | ||
231 | 97 | ||
232 | mtspr SPRN_PID1,r6 | 98 | #define ENTRY_MAPPING_BOOT_SETUP |
233 | mtspr SPRN_PID2,r6 | 99 | #include "fsl_booke_entry_mapping.S" |
234 | 100 | #undef ENTRY_MAPPING_BOOT_SETUP | |
235 | /* 5. Invalidate mapping we started in */ | ||
236 | 2: | ||
237 | lis r7,0x1000 /* Set MAS0(TLBSEL) = 1 */ | ||
238 | rlwimi r7,r3,16,4,15 /* Setup MAS0 = TLBSEL | ESEL(r3) */ | ||
239 | mtspr SPRN_MAS0,r7 | ||
240 | tlbre | ||
241 | mfspr r6,SPRN_MAS1 | ||
242 | rlwinm r6,r6,0,2,0 /* clear IPROT */ | ||
243 | mtspr SPRN_MAS1,r6 | ||
244 | tlbwe | ||
245 | /* Invalidate TLB1 */ | ||
246 | li r9,0x0c | ||
247 | tlbivax 0,r9 | ||
248 | TLBSYNC | ||
249 | |||
250 | /* The mapping only needs to be cache-coherent on SMP */ | ||
251 | #ifdef CONFIG_SMP | ||
252 | #define M_IF_SMP MAS2_M | ||
253 | #else | ||
254 | #define M_IF_SMP 0 | ||
255 | #endif | ||
256 | |||
257 | /* 6. Setup KERNELBASE mapping in TLB1[0] */ | ||
258 | lis r6,0x1000 /* Set MAS0(TLBSEL) = TLB1(1), ESEL = 0 */ | ||
259 | mtspr SPRN_MAS0,r6 | ||
260 | lis r6,(MAS1_VALID|MAS1_IPROT)@h | ||
261 | ori r6,r6,(MAS1_TSIZE(BOOK3E_PAGESZ_64M))@l | ||
262 | mtspr SPRN_MAS1,r6 | ||
263 | lis r6,MAS2_VAL(PAGE_OFFSET, BOOK3E_PAGESZ_64M, M_IF_SMP)@h | ||
264 | ori r6,r6,MAS2_VAL(PAGE_OFFSET, BOOK3E_PAGESZ_64M, M_IF_SMP)@l | ||
265 | mtspr SPRN_MAS2,r6 | ||
266 | mtspr SPRN_MAS3,r8 | ||
267 | tlbwe | ||
268 | |||
269 | /* 7. Jump to KERNELBASE mapping */ | ||
270 | lis r6,(KERNELBASE & ~0xfff)@h | ||
271 | ori r6,r6,(KERNELBASE & ~0xfff)@l | ||
272 | lis r7,MSR_KERNEL@h | ||
273 | ori r7,r7,MSR_KERNEL@l | ||
274 | bl 1f /* Find our address */ | ||
275 | 1: mflr r9 | ||
276 | rlwimi r6,r9,0,20,31 | ||
277 | addi r6,r6,(2f - 1b) | ||
278 | mtspr SPRN_SRR0,r6 | ||
279 | mtspr SPRN_SRR1,r7 | ||
280 | rfi /* start execution out of TLB1[0] entry */ | ||
281 | |||
282 | /* 8. Clear out the temp mapping */ | ||
283 | 2: lis r7,0x1000 /* Set MAS0(TLBSEL) = 1 */ | ||
284 | rlwimi r7,r5,16,4,15 /* Setup MAS0 = TLBSEL | ESEL(r5) */ | ||
285 | mtspr SPRN_MAS0,r7 | ||
286 | tlbre | ||
287 | mfspr r8,SPRN_MAS1 | ||
288 | rlwinm r8,r8,0,2,0 /* clear IPROT */ | ||
289 | mtspr SPRN_MAS1,r8 | ||
290 | tlbwe | ||
291 | /* Invalidate TLB1 */ | ||
292 | li r9,0x0c | ||
293 | tlbivax 0,r9 | ||
294 | TLBSYNC | ||
295 | 101 | ||
296 | /* Establish the interrupt vector offsets */ | 102 | /* Establish the interrupt vector offsets */ |
297 | SET_IVOR(0, CriticalInput); | 103 | SET_IVOR(0, CriticalInput); |
diff --git a/arch/powerpc/kernel/kprobes.c b/arch/powerpc/kernel/kprobes.c index c533525ca56..bc47352deb1 100644 --- a/arch/powerpc/kernel/kprobes.c +++ b/arch/powerpc/kernel/kprobes.c | |||
@@ -378,17 +378,6 @@ static int __kprobes trampoline_probe_handler(struct kprobe *p, | |||
378 | * single-stepped a copy of the instruction. The address of this | 378 | * single-stepped a copy of the instruction. The address of this |
379 | * copy is p->ainsn.insn. | 379 | * copy is p->ainsn.insn. |
380 | */ | 380 | */ |
381 | static void __kprobes resume_execution(struct kprobe *p, struct pt_regs *regs) | ||
382 | { | ||
383 | int ret; | ||
384 | unsigned int insn = *p->ainsn.insn; | ||
385 | |||
386 | regs->nip = (unsigned long)p->addr; | ||
387 | ret = emulate_step(regs, insn); | ||
388 | if (ret == 0) | ||
389 | regs->nip = (unsigned long)p->addr + 4; | ||
390 | } | ||
391 | |||
392 | static int __kprobes post_kprobe_handler(struct pt_regs *regs) | 381 | static int __kprobes post_kprobe_handler(struct pt_regs *regs) |
393 | { | 382 | { |
394 | struct kprobe *cur = kprobe_running(); | 383 | struct kprobe *cur = kprobe_running(); |
@@ -406,7 +395,8 @@ static int __kprobes post_kprobe_handler(struct pt_regs *regs) | |||
406 | cur->post_handler(cur, regs, 0); | 395 | cur->post_handler(cur, regs, 0); |
407 | } | 396 | } |
408 | 397 | ||
409 | resume_execution(cur, regs); | 398 | /* Adjust nip to after the single-stepped instruction */ |
399 | regs->nip = (unsigned long)cur->addr + 4; | ||
410 | regs->msr |= kcb->kprobe_saved_msr; | 400 | regs->msr |= kcb->kprobe_saved_msr; |
411 | 401 | ||
412 | /*Restore back the original saved kprobes variables and continue. */ | 402 | /*Restore back the original saved kprobes variables and continue. */ |
diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S index 8043d1b73cf..dc66d52dcff 100644 --- a/arch/powerpc/kernel/misc_32.S +++ b/arch/powerpc/kernel/misc_32.S | |||
@@ -711,6 +711,22 @@ relocate_new_kernel: | |||
711 | /* r4 = reboot_code_buffer */ | 711 | /* r4 = reboot_code_buffer */ |
712 | /* r5 = start_address */ | 712 | /* r5 = start_address */ |
713 | 713 | ||
714 | #ifdef CONFIG_FSL_BOOKE | ||
715 | |||
716 | mr r29, r3 | ||
717 | mr r30, r4 | ||
718 | mr r31, r5 | ||
719 | |||
720 | #define ENTRY_MAPPING_KEXEC_SETUP | ||
721 | #include "fsl_booke_entry_mapping.S" | ||
722 | #undef ENTRY_MAPPING_KEXEC_SETUP | ||
723 | |||
724 | mr r3, r29 | ||
725 | mr r4, r30 | ||
726 | mr r5, r31 | ||
727 | |||
728 | li r0, 0 | ||
729 | #else | ||
714 | li r0, 0 | 730 | li r0, 0 |
715 | 731 | ||
716 | /* | 732 | /* |
@@ -727,6 +743,7 @@ relocate_new_kernel: | |||
727 | rfi | 743 | rfi |
728 | 744 | ||
729 | 1: | 745 | 1: |
746 | #endif | ||
730 | /* from this point address translation is turned off */ | 747 | /* from this point address translation is turned off */ |
731 | /* and interrupts are disabled */ | 748 | /* and interrupts are disabled */ |
732 | 749 | ||
diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c index bc9f39d2598..3b4dcc82a4c 100644 --- a/arch/powerpc/kernel/ppc_ksyms.c +++ b/arch/powerpc/kernel/ppc_ksyms.c | |||
@@ -101,7 +101,7 @@ EXPORT_SYMBOL(pci_dram_offset); | |||
101 | EXPORT_SYMBOL(start_thread); | 101 | EXPORT_SYMBOL(start_thread); |
102 | EXPORT_SYMBOL(kernel_thread); | 102 | EXPORT_SYMBOL(kernel_thread); |
103 | 103 | ||
104 | #ifndef CONFIG_BOOKE | 104 | #ifdef CONFIG_PPC_FPU |
105 | EXPORT_SYMBOL_GPL(cvt_df); | 105 | EXPORT_SYMBOL_GPL(cvt_df); |
106 | EXPORT_SYMBOL_GPL(cvt_fd); | 106 | EXPORT_SYMBOL_GPL(cvt_fd); |
107 | #endif | 107 | #endif |
diff --git a/arch/powerpc/kernel/swsusp_booke.S b/arch/powerpc/kernel/swsusp_booke.S new file mode 100644 index 00000000000..11a39307dd7 --- /dev/null +++ b/arch/powerpc/kernel/swsusp_booke.S | |||
@@ -0,0 +1,193 @@ | |||
1 | /* | ||
2 | * Based on swsusp_32.S, modified for FSL BookE by | ||
3 | * Anton Vorontsov <avorontsov@ru.mvista.com> | ||
4 | * Copyright (c) 2009-2010 MontaVista Software, LLC. | ||
5 | */ | ||
6 | |||
7 | #include <linux/threads.h> | ||
8 | #include <asm/processor.h> | ||
9 | #include <asm/page.h> | ||
10 | #include <asm/cputable.h> | ||
11 | #include <asm/thread_info.h> | ||
12 | #include <asm/ppc_asm.h> | ||
13 | #include <asm/asm-offsets.h> | ||
14 | #include <asm/mmu.h> | ||
15 | |||
16 | /* | ||
17 | * Structure for storing CPU registers on the save area. | ||
18 | */ | ||
19 | #define SL_SP 0 | ||
20 | #define SL_PC 4 | ||
21 | #define SL_MSR 8 | ||
22 | #define SL_TCR 0xc | ||
23 | #define SL_SPRG0 0x10 | ||
24 | #define SL_SPRG1 0x14 | ||
25 | #define SL_SPRG2 0x18 | ||
26 | #define SL_SPRG3 0x1c | ||
27 | #define SL_SPRG4 0x20 | ||
28 | #define SL_SPRG5 0x24 | ||
29 | #define SL_SPRG6 0x28 | ||
30 | #define SL_SPRG7 0x2c | ||
31 | #define SL_TBU 0x30 | ||
32 | #define SL_TBL 0x34 | ||
33 | #define SL_R2 0x38 | ||
34 | #define SL_CR 0x3c | ||
35 | #define SL_LR 0x40 | ||
36 | #define SL_R12 0x44 /* r12 to r31 */ | ||
37 | #define SL_SIZE (SL_R12 + 80) | ||
38 | |||
39 | .section .data | ||
40 | .align 5 | ||
41 | |||
42 | _GLOBAL(swsusp_save_area) | ||
43 | .space SL_SIZE | ||
44 | |||
45 | |||
46 | .section .text | ||
47 | .align 5 | ||
48 | |||
49 | _GLOBAL(swsusp_arch_suspend) | ||
50 | lis r11,swsusp_save_area@h | ||
51 | ori r11,r11,swsusp_save_area@l | ||
52 | |||
53 | mflr r0 | ||
54 | stw r0,SL_LR(r11) | ||
55 | mfcr r0 | ||
56 | stw r0,SL_CR(r11) | ||
57 | stw r1,SL_SP(r11) | ||
58 | stw r2,SL_R2(r11) | ||
59 | stmw r12,SL_R12(r11) | ||
60 | |||
61 | /* Save MSR & TCR */ | ||
62 | mfmsr r4 | ||
63 | stw r4,SL_MSR(r11) | ||
64 | mfspr r4,SPRN_TCR | ||
65 | stw r4,SL_TCR(r11) | ||
66 | |||
67 | /* Get a stable timebase and save it */ | ||
68 | 1: mfspr r4,SPRN_TBRU | ||
69 | stw r4,SL_TBU(r11) | ||
70 | mfspr r5,SPRN_TBRL | ||
71 | stw r5,SL_TBL(r11) | ||
72 | mfspr r3,SPRN_TBRU | ||
73 | cmpw r3,r4 | ||
74 | bne 1b | ||
75 | |||
76 | /* Save SPRGs */ | ||
77 | mfsprg r4,0 | ||
78 | stw r4,SL_SPRG0(r11) | ||
79 | mfsprg r4,1 | ||
80 | stw r4,SL_SPRG1(r11) | ||
81 | mfsprg r4,2 | ||
82 | stw r4,SL_SPRG2(r11) | ||
83 | mfsprg r4,3 | ||
84 | stw r4,SL_SPRG3(r11) | ||
85 | mfsprg r4,4 | ||
86 | stw r4,SL_SPRG4(r11) | ||
87 | mfsprg r4,5 | ||
88 | stw r4,SL_SPRG5(r11) | ||
89 | mfsprg r4,6 | ||
90 | stw r4,SL_SPRG6(r11) | ||
91 | mfsprg r4,7 | ||
92 | stw r4,SL_SPRG7(r11) | ||
93 | |||
94 | /* Call the low level suspend stuff (we should probably have made | ||
95 | * a stackframe... | ||
96 | */ | ||
97 | bl swsusp_save | ||
98 | |||
99 | /* Restore LR from the save area */ | ||
100 | lis r11,swsusp_save_area@h | ||
101 | ori r11,r11,swsusp_save_area@l | ||
102 | lwz r0,SL_LR(r11) | ||
103 | mtlr r0 | ||
104 | |||
105 | blr | ||
106 | |||
107 | _GLOBAL(swsusp_arch_resume) | ||
108 | sync | ||
109 | |||
110 | /* Load ptr the list of pages to copy in r3 */ | ||
111 | lis r11,(restore_pblist)@h | ||
112 | ori r11,r11,restore_pblist@l | ||
113 | lwz r3,0(r11) | ||
114 | |||
115 | /* Copy the pages. This is a very basic implementation, to | ||
116 | * be replaced by something more cache efficient */ | ||
117 | 1: | ||
118 | li r0,256 | ||
119 | mtctr r0 | ||
120 | lwz r5,pbe_address(r3) /* source */ | ||
121 | lwz r6,pbe_orig_address(r3) /* destination */ | ||
122 | 2: | ||
123 | lwz r8,0(r5) | ||
124 | lwz r9,4(r5) | ||
125 | lwz r10,8(r5) | ||
126 | lwz r11,12(r5) | ||
127 | addi r5,r5,16 | ||
128 | stw r8,0(r6) | ||
129 | stw r9,4(r6) | ||
130 | stw r10,8(r6) | ||
131 | stw r11,12(r6) | ||
132 | addi r6,r6,16 | ||
133 | bdnz 2b | ||
134 | lwz r3,pbe_next(r3) | ||
135 | cmpwi 0,r3,0 | ||
136 | bne 1b | ||
137 | |||
138 | bl flush_dcache_L1 | ||
139 | bl flush_instruction_cache | ||
140 | |||
141 | lis r11,swsusp_save_area@h | ||
142 | ori r11,r11,swsusp_save_area@l | ||
143 | |||
144 | lwz r4,SL_SPRG0(r11) | ||
145 | mtsprg 0,r4 | ||
146 | lwz r4,SL_SPRG1(r11) | ||
147 | mtsprg 1,r4 | ||
148 | lwz r4,SL_SPRG2(r11) | ||
149 | mtsprg 2,r4 | ||
150 | lwz r4,SL_SPRG3(r11) | ||
151 | mtsprg 3,r4 | ||
152 | lwz r4,SL_SPRG4(r11) | ||
153 | mtsprg 4,r4 | ||
154 | lwz r4,SL_SPRG5(r11) | ||
155 | mtsprg 5,r4 | ||
156 | lwz r4,SL_SPRG6(r11) | ||
157 | mtsprg 6,r4 | ||
158 | lwz r4,SL_SPRG7(r11) | ||
159 | mtsprg 7,r4 | ||
160 | |||
161 | /* restore the MSR */ | ||
162 | lwz r3,SL_MSR(r11) | ||
163 | mtmsr r3 | ||
164 | |||
165 | /* Restore TB */ | ||
166 | li r3,0 | ||
167 | mtspr SPRN_TBWL,r3 | ||
168 | lwz r3,SL_TBU(r11) | ||
169 | lwz r4,SL_TBL(r11) | ||
170 | mtspr SPRN_TBWU,r3 | ||
171 | mtspr SPRN_TBWL,r4 | ||
172 | |||
173 | /* Restore TCR and clear any pending bits in TSR. */ | ||
174 | lwz r4,SL_TCR(r11) | ||
175 | mtspr SPRN_TCR,r4 | ||
176 | lis r4, (TSR_ENW | TSR_WIS | TSR_DIS | TSR_FIS)@h | ||
177 | mtspr SPRN_TSR,r4 | ||
178 | |||
179 | /* Kick decrementer */ | ||
180 | li r0,1 | ||
181 | mtdec r0 | ||
182 | |||
183 | /* Restore the callee-saved registers and return */ | ||
184 | lwz r0,SL_CR(r11) | ||
185 | mtcr r0 | ||
186 | lwz r2,SL_R2(r11) | ||
187 | lmw r12,SL_R12(r11) | ||
188 | lwz r1,SL_SP(r11) | ||
189 | lwz r0,SL_LR(r11) | ||
190 | mtlr r0 | ||
191 | |||
192 | li r3,0 | ||
193 | blr | ||
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index 3031fc712ad..25fc33984c2 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c | |||
@@ -1,5 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 1995-1996 Gary Thomas (gdt@linuxppc.org) | 2 | * Copyright (C) 1995-1996 Gary Thomas (gdt@linuxppc.org) |
3 | * Copyright 2007-2010 Freescale Semiconductor, Inc. | ||
3 | * | 4 | * |
4 | * This program is free software; you can redistribute it and/or | 5 | * This program is free software; you can redistribute it and/or |
5 | * modify it under the terms of the GNU General Public License | 6 | * modify it under the terms of the GNU General Public License |
@@ -305,7 +306,7 @@ static inline int check_io_access(struct pt_regs *regs) | |||
305 | #ifndef CONFIG_FSL_BOOKE | 306 | #ifndef CONFIG_FSL_BOOKE |
306 | #define get_mc_reason(regs) ((regs)->dsisr) | 307 | #define get_mc_reason(regs) ((regs)->dsisr) |
307 | #else | 308 | #else |
308 | #define get_mc_reason(regs) (mfspr(SPRN_MCSR) & MCSR_MASK) | 309 | #define get_mc_reason(regs) (mfspr(SPRN_MCSR)) |
309 | #endif | 310 | #endif |
310 | #define REASON_FP ESR_FP | 311 | #define REASON_FP ESR_FP |
311 | #define REASON_ILLEGAL (ESR_PIL | ESR_PUO) | 312 | #define REASON_ILLEGAL (ESR_PIL | ESR_PUO) |
@@ -421,6 +422,91 @@ int machine_check_47x(struct pt_regs *regs) | |||
421 | return 0; | 422 | return 0; |
422 | } | 423 | } |
423 | #elif defined(CONFIG_E500) | 424 | #elif defined(CONFIG_E500) |
425 | int machine_check_e500mc(struct pt_regs *regs) | ||
426 | { | ||
427 | unsigned long mcsr = mfspr(SPRN_MCSR); | ||
428 | unsigned long reason = mcsr; | ||
429 | int recoverable = 1; | ||
430 | |||
431 | printk("Machine check in kernel mode.\n"); | ||
432 | printk("Caused by (from MCSR=%lx): ", reason); | ||
433 | |||
434 | if (reason & MCSR_MCP) | ||
435 | printk("Machine Check Signal\n"); | ||
436 | |||
437 | if (reason & MCSR_ICPERR) { | ||
438 | printk("Instruction Cache Parity Error\n"); | ||
439 | |||
440 | /* | ||
441 | * This is recoverable by invalidating the i-cache. | ||
442 | */ | ||
443 | mtspr(SPRN_L1CSR1, mfspr(SPRN_L1CSR1) | L1CSR1_ICFI); | ||
444 | while (mfspr(SPRN_L1CSR1) & L1CSR1_ICFI) | ||
445 | ; | ||
446 | |||
447 | /* | ||
448 | * This will generally be accompanied by an instruction | ||
449 | * fetch error report -- only treat MCSR_IF as fatal | ||
450 | * if it wasn't due to an L1 parity error. | ||
451 | */ | ||
452 | reason &= ~MCSR_IF; | ||
453 | } | ||
454 | |||
455 | if (reason & MCSR_DCPERR_MC) { | ||
456 | printk("Data Cache Parity Error\n"); | ||
457 | recoverable = 0; | ||
458 | } | ||
459 | |||
460 | if (reason & MCSR_L2MMU_MHIT) { | ||
461 | printk("Hit on multiple TLB entries\n"); | ||
462 | recoverable = 0; | ||
463 | } | ||
464 | |||
465 | if (reason & MCSR_NMI) | ||
466 | printk("Non-maskable interrupt\n"); | ||
467 | |||
468 | if (reason & MCSR_IF) { | ||
469 | printk("Instruction Fetch Error Report\n"); | ||
470 | recoverable = 0; | ||
471 | } | ||
472 | |||
473 | if (reason & MCSR_LD) { | ||
474 | printk("Load Error Report\n"); | ||
475 | recoverable = 0; | ||
476 | } | ||
477 | |||
478 | if (reason & MCSR_ST) { | ||
479 | printk("Store Error Report\n"); | ||
480 | recoverable = 0; | ||
481 | } | ||
482 | |||
483 | if (reason & MCSR_LDG) { | ||
484 | printk("Guarded Load Error Report\n"); | ||
485 | recoverable = 0; | ||
486 | } | ||
487 | |||
488 | if (reason & MCSR_TLBSYNC) | ||
489 | printk("Simultaneous tlbsync operations\n"); | ||
490 | |||
491 | if (reason & MCSR_BSL2_ERR) { | ||
492 | printk("Level 2 Cache Error\n"); | ||
493 | recoverable = 0; | ||
494 | } | ||
495 | |||
496 | if (reason & MCSR_MAV) { | ||
497 | u64 addr; | ||
498 | |||
499 | addr = mfspr(SPRN_MCAR); | ||
500 | addr |= (u64)mfspr(SPRN_MCARU) << 32; | ||
501 | |||
502 | printk("Machine Check %s Address: %#llx\n", | ||
503 | reason & MCSR_MEA ? "Effective" : "Physical", addr); | ||
504 | } | ||
505 | |||
506 | mtspr(SPRN_MCSR, mcsr); | ||
507 | return mfspr(SPRN_MCSR) == 0 && recoverable; | ||
508 | } | ||
509 | |||
424 | int machine_check_e500(struct pt_regs *regs) | 510 | int machine_check_e500(struct pt_regs *regs) |
425 | { | 511 | { |
426 | unsigned long reason = get_mc_reason(regs); | 512 | unsigned long reason = get_mc_reason(regs); |
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S index dcd01c82e70..8a0deefac08 100644 --- a/arch/powerpc/kernel/vmlinux.lds.S +++ b/arch/powerpc/kernel/vmlinux.lds.S | |||
@@ -223,19 +223,17 @@ SECTIONS | |||
223 | #endif | 223 | #endif |
224 | 224 | ||
225 | /* The initial task and kernel stack */ | 225 | /* The initial task and kernel stack */ |
226 | .data.init_task : AT(ADDR(.data.init_task) - LOAD_OFFSET) { | 226 | INIT_TASK_DATA_SECTION(THREAD_SIZE) |
227 | INIT_TASK_DATA(THREAD_SIZE) | ||
228 | } | ||
229 | 227 | ||
230 | .data.page_aligned : AT(ADDR(.data.page_aligned) - LOAD_OFFSET) { | 228 | .data..page_aligned : AT(ADDR(.data..page_aligned) - LOAD_OFFSET) { |
231 | PAGE_ALIGNED_DATA(PAGE_SIZE) | 229 | PAGE_ALIGNED_DATA(PAGE_SIZE) |
232 | } | 230 | } |
233 | 231 | ||
234 | .data.cacheline_aligned : AT(ADDR(.data.cacheline_aligned) - LOAD_OFFSET) { | 232 | .data..cacheline_aligned : AT(ADDR(.data..cacheline_aligned) - LOAD_OFFSET) { |
235 | CACHELINE_ALIGNED_DATA(L1_CACHE_BYTES) | 233 | CACHELINE_ALIGNED_DATA(L1_CACHE_BYTES) |
236 | } | 234 | } |
237 | 235 | ||
238 | .data.read_mostly : AT(ADDR(.data.read_mostly) - LOAD_OFFSET) { | 236 | .data..read_mostly : AT(ADDR(.data..read_mostly) - LOAD_OFFSET) { |
239 | READ_MOSTLY_DATA(L1_CACHE_BYTES) | 237 | READ_MOSTLY_DATA(L1_CACHE_BYTES) |
240 | } | 238 | } |
241 | 239 | ||
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig index eeba0a70e46..69d668c072a 100644 --- a/arch/powerpc/platforms/44x/Kconfig +++ b/arch/powerpc/platforms/44x/Kconfig | |||
@@ -171,6 +171,17 @@ config ISS4xx | |||
171 | help | 171 | help |
172 | This option enables support for the IBM ISS simulation environment | 172 | This option enables support for the IBM ISS simulation environment |
173 | 173 | ||
174 | config ICON | ||
175 | bool "Icon" | ||
176 | depends on 44x | ||
177 | default n | ||
178 | select PPC44x_SIMPLE | ||
179 | select 440SPe | ||
180 | select PCI | ||
181 | select PPC4xx_PCI_EXPRESS | ||
182 | help | ||
183 | This option enables support for the AMCC PPC440SPe evaluation board. | ||
184 | |||
174 | #config LUAN | 185 | #config LUAN |
175 | # bool "Luan" | 186 | # bool "Luan" |
176 | # depends on 44x | 187 | # depends on 44x |
diff --git a/arch/powerpc/platforms/44x/ppc44x_simple.c b/arch/powerpc/platforms/44x/ppc44x_simple.c index e8c23ccaa1f..5f7a29d7f59 100644 --- a/arch/powerpc/platforms/44x/ppc44x_simple.c +++ b/arch/powerpc/platforms/44x/ppc44x_simple.c | |||
@@ -61,7 +61,8 @@ static char *board[] __initdata = { | |||
61 | "amcc,redwood", | 61 | "amcc,redwood", |
62 | "amcc,sequoia", | 62 | "amcc,sequoia", |
63 | "amcc,taishan", | 63 | "amcc,taishan", |
64 | "amcc,yosemite" | 64 | "amcc,yosemite", |
65 | "mosaixtech,icon" | ||
65 | }; | 66 | }; |
66 | 67 | ||
67 | static int __init ppc44x_probe(void) | 68 | static int __init ppc44x_probe(void) |
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c index f0684c8ac96..8fe87fc6148 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) Freescale Semicondutor, Inc. 2006-2007. All rights reserved. | 2 | * Copyright (C) Freescale Semicondutor, Inc. 2006-2010. All rights reserved. |
3 | * | 3 | * |
4 | * Author: Andy Fleming <afleming@freescale.com> | 4 | * Author: Andy Fleming <afleming@freescale.com> |
5 | * | 5 | * |
@@ -154,6 +154,10 @@ static int mpc8568_mds_phy_fixups(struct phy_device *phydev) | |||
154 | * Setup the architecture | 154 | * Setup the architecture |
155 | * | 155 | * |
156 | */ | 156 | */ |
157 | #ifdef CONFIG_SMP | ||
158 | extern void __init mpc85xx_smp_init(void); | ||
159 | #endif | ||
160 | |||
157 | static void __init mpc85xx_mds_setup_arch(void) | 161 | static void __init mpc85xx_mds_setup_arch(void) |
158 | { | 162 | { |
159 | struct device_node *np; | 163 | struct device_node *np; |
@@ -194,6 +198,10 @@ static void __init mpc85xx_mds_setup_arch(void) | |||
194 | } | 198 | } |
195 | #endif | 199 | #endif |
196 | 200 | ||
201 | #ifdef CONFIG_SMP | ||
202 | mpc85xx_smp_init(); | ||
203 | #endif | ||
204 | |||
197 | #ifdef CONFIG_QUICC_ENGINE | 205 | #ifdef CONFIG_QUICC_ENGINE |
198 | np = of_find_compatible_node(NULL, NULL, "fsl,qe"); | 206 | np = of_find_compatible_node(NULL, NULL, "fsl,qe"); |
199 | if (!np) { | 207 | if (!np) { |
@@ -271,9 +279,49 @@ static void __init mpc85xx_mds_setup_arch(void) | |||
271 | BCSR_UCC_RGMII, BCSR_UCC_RTBI); | 279 | BCSR_UCC_RGMII, BCSR_UCC_RTBI); |
272 | } | 280 | } |
273 | 281 | ||
282 | } else if (machine_is(p1021_mds)) { | ||
283 | #define BCSR11_ENET_MICRST (0x1 << 5) | ||
284 | /* Reset Micrel PHY */ | ||
285 | clrbits8(&bcsr_regs[11], BCSR11_ENET_MICRST); | ||
286 | setbits8(&bcsr_regs[11], BCSR11_ENET_MICRST); | ||
274 | } | 287 | } |
288 | |||
275 | iounmap(bcsr_regs); | 289 | iounmap(bcsr_regs); |
276 | } | 290 | } |
291 | |||
292 | if (machine_is(p1021_mds)) { | ||
293 | #define MPC85xx_PMUXCR_OFFSET 0x60 | ||
294 | #define MPC85xx_PMUXCR_QE0 0x00008000 | ||
295 | #define MPC85xx_PMUXCR_QE3 0x00001000 | ||
296 | #define MPC85xx_PMUXCR_QE9 0x00000040 | ||
297 | #define MPC85xx_PMUXCR_QE12 0x00000008 | ||
298 | static __be32 __iomem *pmuxcr; | ||
299 | |||
300 | np = of_find_node_by_name(NULL, "global-utilities"); | ||
301 | |||
302 | if (np) { | ||
303 | pmuxcr = of_iomap(np, 0) + MPC85xx_PMUXCR_OFFSET; | ||
304 | |||
305 | if (!pmuxcr) | ||
306 | printk(KERN_EMERG "Error: Alternate function" | ||
307 | " signal multiplex control register not" | ||
308 | " mapped!\n"); | ||
309 | else | ||
310 | /* P1021 has pins muxed for QE and other functions. To | ||
311 | * enable QE UEC mode, we need to set bit QE0 for UCC1 | ||
312 | * in Eth mode, QE0 and QE3 for UCC5 in Eth mode, QE9 | ||
313 | * and QE12 for QE MII management singals in PMUXCR | ||
314 | * register. | ||
315 | */ | ||
316 | setbits32(pmuxcr, MPC85xx_PMUXCR_QE0 | | ||
317 | MPC85xx_PMUXCR_QE3 | | ||
318 | MPC85xx_PMUXCR_QE9 | | ||
319 | MPC85xx_PMUXCR_QE12); | ||
320 | |||
321 | of_node_put(np); | ||
322 | } | ||
323 | |||
324 | } | ||
277 | #endif /* CONFIG_QUICC_ENGINE */ | 325 | #endif /* CONFIG_QUICC_ENGINE */ |
278 | 326 | ||
279 | #ifdef CONFIG_SWIOTLB | 327 | #ifdef CONFIG_SWIOTLB |
@@ -330,6 +378,16 @@ static struct of_device_id mpc85xx_ids[] = { | |||
330 | {}, | 378 | {}, |
331 | }; | 379 | }; |
332 | 380 | ||
381 | static struct of_device_id p1021_ids[] = { | ||
382 | { .type = "soc", }, | ||
383 | { .compatible = "soc", }, | ||
384 | { .compatible = "simple-bus", }, | ||
385 | { .type = "qe", }, | ||
386 | { .compatible = "fsl,qe", }, | ||
387 | { .compatible = "gianfar", }, | ||
388 | {}, | ||
389 | }; | ||
390 | |||
333 | static int __init mpc85xx_publish_devices(void) | 391 | static int __init mpc85xx_publish_devices(void) |
334 | { | 392 | { |
335 | if (machine_is(mpc8568_mds)) | 393 | if (machine_is(mpc8568_mds)) |
@@ -342,11 +400,22 @@ static int __init mpc85xx_publish_devices(void) | |||
342 | 400 | ||
343 | return 0; | 401 | return 0; |
344 | } | 402 | } |
403 | |||
404 | static int __init p1021_publish_devices(void) | ||
405 | { | ||
406 | /* Publish the QE devices */ | ||
407 | of_platform_bus_probe(NULL, p1021_ids, NULL); | ||
408 | |||
409 | return 0; | ||
410 | } | ||
411 | |||
345 | machine_device_initcall(mpc8568_mds, mpc85xx_publish_devices); | 412 | machine_device_initcall(mpc8568_mds, mpc85xx_publish_devices); |
346 | machine_device_initcall(mpc8569_mds, mpc85xx_publish_devices); | 413 | machine_device_initcall(mpc8569_mds, mpc85xx_publish_devices); |
414 | machine_device_initcall(p1021_mds, p1021_publish_devices); | ||
347 | 415 | ||
348 | machine_arch_initcall(mpc8568_mds, swiotlb_setup_bus_notifier); | 416 | machine_arch_initcall(mpc8568_mds, swiotlb_setup_bus_notifier); |
349 | machine_arch_initcall(mpc8569_mds, swiotlb_setup_bus_notifier); | 417 | machine_arch_initcall(mpc8569_mds, swiotlb_setup_bus_notifier); |
418 | machine_arch_initcall(p1021_mds, swiotlb_setup_bus_notifier); | ||
350 | 419 | ||
351 | static void __init mpc85xx_mds_pic_init(void) | 420 | static void __init mpc85xx_mds_pic_init(void) |
352 | { | 421 | { |
@@ -366,7 +435,7 @@ static void __init mpc85xx_mds_pic_init(void) | |||
366 | 435 | ||
367 | mpic = mpic_alloc(np, r.start, | 436 | mpic = mpic_alloc(np, r.start, |
368 | MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN | | 437 | MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN | |
369 | MPIC_BROKEN_FRR_NIRQS, | 438 | MPIC_BROKEN_FRR_NIRQS | MPIC_SINGLE_DEST_CPU, |
370 | 0, 256, " OpenPIC "); | 439 | 0, 256, " OpenPIC "); |
371 | BUG_ON(mpic == NULL); | 440 | BUG_ON(mpic == NULL); |
372 | of_node_put(np); | 441 | of_node_put(np); |
@@ -380,7 +449,11 @@ static void __init mpc85xx_mds_pic_init(void) | |||
380 | if (!np) | 449 | if (!np) |
381 | return; | 450 | return; |
382 | } | 451 | } |
383 | qe_ic_init(np, 0, qe_ic_cascade_muxed_mpic, NULL); | 452 | if (machine_is(p1021_mds)) |
453 | qe_ic_init(np, 0, qe_ic_cascade_low_mpic, | ||
454 | qe_ic_cascade_high_mpic); | ||
455 | else | ||
456 | qe_ic_init(np, 0, qe_ic_cascade_muxed_mpic, NULL); | ||
384 | of_node_put(np); | 457 | of_node_put(np); |
385 | #endif /* CONFIG_QUICC_ENGINE */ | 458 | #endif /* CONFIG_QUICC_ENGINE */ |
386 | } | 459 | } |
@@ -426,3 +499,26 @@ define_machine(mpc8569_mds) { | |||
426 | .pcibios_fixup_bus = fsl_pcibios_fixup_bus, | 499 | .pcibios_fixup_bus = fsl_pcibios_fixup_bus, |
427 | #endif | 500 | #endif |
428 | }; | 501 | }; |
502 | |||
503 | static int __init p1021_mds_probe(void) | ||
504 | { | ||
505 | unsigned long root = of_get_flat_dt_root(); | ||
506 | |||
507 | return of_flat_dt_is_compatible(root, "fsl,P1021MDS"); | ||
508 | |||
509 | } | ||
510 | |||
511 | define_machine(p1021_mds) { | ||
512 | .name = "P1021 MDS", | ||
513 | .probe = p1021_mds_probe, | ||
514 | .setup_arch = mpc85xx_mds_setup_arch, | ||
515 | .init_IRQ = mpc85xx_mds_pic_init, | ||
516 | .get_irq = mpic_get_irq, | ||
517 | .restart = fsl_rstcr_restart, | ||
518 | .calibrate_decr = generic_calibrate_decr, | ||
519 | .progress = udbg_progress, | ||
520 | #ifdef CONFIG_PCI | ||
521 | .pcibios_fixup_bus = fsl_pcibios_fixup_bus, | ||
522 | #endif | ||
523 | }; | ||
524 | |||
diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c index 22667a09d40..4326b737d91 100644 --- a/arch/powerpc/platforms/cell/iommu.c +++ b/arch/powerpc/platforms/cell/iommu.c | |||
@@ -1066,7 +1066,7 @@ static int __init cell_iommu_fixed_mapping_init(void) | |||
1066 | fbase = _ALIGN_UP(fbase, 1 << IO_SEGMENT_SHIFT); | 1066 | fbase = _ALIGN_UP(fbase, 1 << IO_SEGMENT_SHIFT); |
1067 | fsize = lmb_phys_mem_size(); | 1067 | fsize = lmb_phys_mem_size(); |
1068 | 1068 | ||
1069 | if ((fbase + fsize) <= 0x800000000) | 1069 | if ((fbase + fsize) <= 0x800000000ul) |
1070 | hbase = 0; /* use the device tree window */ | 1070 | hbase = 0; /* use the device tree window */ |
1071 | else { | 1071 | else { |
1072 | /* If we're over 32 GB we need to cheat. We can't map all of | 1072 | /* If we're over 32 GB we need to cheat. We can't map all of |
diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c index a7be144f587..962c2d8dd8d 100644 --- a/arch/powerpc/sysdev/fsl_msi.c +++ b/arch/powerpc/sysdev/fsl_msi.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2008 Freescale Semiconductor, Inc. All rights reserved. | 2 | * Copyright (C) 2007-2010 Freescale Semiconductor, Inc. |
3 | * | 3 | * |
4 | * Author: Tony Li <tony.li@freescale.com> | 4 | * Author: Tony Li <tony.li@freescale.com> |
5 | * Jason Jin <Jason.jin@freescale.com> | 5 | * Jason Jin <Jason.jin@freescale.com> |
@@ -22,14 +22,20 @@ | |||
22 | #include <asm/prom.h> | 22 | #include <asm/prom.h> |
23 | #include <asm/hw_irq.h> | 23 | #include <asm/hw_irq.h> |
24 | #include <asm/ppc-pci.h> | 24 | #include <asm/ppc-pci.h> |
25 | #include <asm/mpic.h> | ||
25 | #include "fsl_msi.h" | 26 | #include "fsl_msi.h" |
26 | 27 | ||
28 | LIST_HEAD(msi_head); | ||
29 | |||
27 | struct fsl_msi_feature { | 30 | struct fsl_msi_feature { |
28 | u32 fsl_pic_ip; | 31 | u32 fsl_pic_ip; |
29 | u32 msiir_offset; | 32 | u32 msiir_offset; |
30 | }; | 33 | }; |
31 | 34 | ||
32 | static struct fsl_msi *fsl_msi; | 35 | struct fsl_msi_cascade_data { |
36 | struct fsl_msi *msi_data; | ||
37 | int index; | ||
38 | }; | ||
33 | 39 | ||
34 | static inline u32 fsl_msi_read(u32 __iomem *base, unsigned int reg) | 40 | static inline u32 fsl_msi_read(u32 __iomem *base, unsigned int reg) |
35 | { | 41 | { |
@@ -54,10 +60,12 @@ static struct irq_chip fsl_msi_chip = { | |||
54 | static int fsl_msi_host_map(struct irq_host *h, unsigned int virq, | 60 | static int fsl_msi_host_map(struct irq_host *h, unsigned int virq, |
55 | irq_hw_number_t hw) | 61 | irq_hw_number_t hw) |
56 | { | 62 | { |
63 | struct fsl_msi *msi_data = h->host_data; | ||
57 | struct irq_chip *chip = &fsl_msi_chip; | 64 | struct irq_chip *chip = &fsl_msi_chip; |
58 | 65 | ||
59 | irq_to_desc(virq)->status |= IRQ_TYPE_EDGE_FALLING; | 66 | irq_to_desc(virq)->status |= IRQ_TYPE_EDGE_FALLING; |
60 | 67 | ||
68 | set_irq_chip_data(virq, msi_data); | ||
61 | set_irq_chip_and_handler(virq, chip, handle_edge_irq); | 69 | set_irq_chip_and_handler(virq, chip, handle_edge_irq); |
62 | 70 | ||
63 | return 0; | 71 | return 0; |
@@ -96,11 +104,12 @@ static int fsl_msi_check_device(struct pci_dev *pdev, int nvec, int type) | |||
96 | static void fsl_teardown_msi_irqs(struct pci_dev *pdev) | 104 | static void fsl_teardown_msi_irqs(struct pci_dev *pdev) |
97 | { | 105 | { |
98 | struct msi_desc *entry; | 106 | struct msi_desc *entry; |
99 | struct fsl_msi *msi_data = fsl_msi; | 107 | struct fsl_msi *msi_data; |
100 | 108 | ||
101 | list_for_each_entry(entry, &pdev->msi_list, list) { | 109 | list_for_each_entry(entry, &pdev->msi_list, list) { |
102 | if (entry->irq == NO_IRQ) | 110 | if (entry->irq == NO_IRQ) |
103 | continue; | 111 | continue; |
112 | msi_data = get_irq_data(entry->irq); | ||
104 | set_irq_msi(entry->irq, NULL); | 113 | set_irq_msi(entry->irq, NULL); |
105 | msi_bitmap_free_hwirqs(&msi_data->bitmap, | 114 | msi_bitmap_free_hwirqs(&msi_data->bitmap, |
106 | virq_to_hw(entry->irq), 1); | 115 | virq_to_hw(entry->irq), 1); |
@@ -111,9 +120,10 @@ static void fsl_teardown_msi_irqs(struct pci_dev *pdev) | |||
111 | } | 120 | } |
112 | 121 | ||
113 | static void fsl_compose_msi_msg(struct pci_dev *pdev, int hwirq, | 122 | static void fsl_compose_msi_msg(struct pci_dev *pdev, int hwirq, |
114 | struct msi_msg *msg) | 123 | struct msi_msg *msg, |
124 | struct fsl_msi *fsl_msi_data) | ||
115 | { | 125 | { |
116 | struct fsl_msi *msi_data = fsl_msi; | 126 | struct fsl_msi *msi_data = fsl_msi_data; |
117 | struct pci_controller *hose = pci_bus_to_host(pdev->bus); | 127 | struct pci_controller *hose = pci_bus_to_host(pdev->bus); |
118 | u32 base = 0; | 128 | u32 base = 0; |
119 | 129 | ||
@@ -130,14 +140,19 @@ static void fsl_compose_msi_msg(struct pci_dev *pdev, int hwirq, | |||
130 | 140 | ||
131 | static int fsl_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type) | 141 | static int fsl_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type) |
132 | { | 142 | { |
133 | int rc, hwirq; | 143 | int rc, hwirq = -ENOMEM; |
134 | unsigned int virq; | 144 | unsigned int virq; |
135 | struct msi_desc *entry; | 145 | struct msi_desc *entry; |
136 | struct msi_msg msg; | 146 | struct msi_msg msg; |
137 | struct fsl_msi *msi_data = fsl_msi; | 147 | struct fsl_msi *msi_data; |
138 | 148 | ||
139 | list_for_each_entry(entry, &pdev->msi_list, list) { | 149 | list_for_each_entry(entry, &pdev->msi_list, list) { |
140 | hwirq = msi_bitmap_alloc_hwirqs(&msi_data->bitmap, 1); | 150 | list_for_each_entry(msi_data, &msi_head, list) { |
151 | hwirq = msi_bitmap_alloc_hwirqs(&msi_data->bitmap, 1); | ||
152 | if (hwirq >= 0) | ||
153 | break; | ||
154 | } | ||
155 | |||
141 | if (hwirq < 0) { | 156 | if (hwirq < 0) { |
142 | rc = hwirq; | 157 | rc = hwirq; |
143 | pr_debug("%s: fail allocating msi interrupt\n", | 158 | pr_debug("%s: fail allocating msi interrupt\n", |
@@ -154,25 +169,31 @@ static int fsl_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type) | |||
154 | rc = -ENOSPC; | 169 | rc = -ENOSPC; |
155 | goto out_free; | 170 | goto out_free; |
156 | } | 171 | } |
172 | set_irq_data(virq, msi_data); | ||
157 | set_irq_msi(virq, entry); | 173 | set_irq_msi(virq, entry); |
158 | 174 | ||
159 | fsl_compose_msi_msg(pdev, hwirq, &msg); | 175 | fsl_compose_msi_msg(pdev, hwirq, &msg, msi_data); |
160 | write_msi_msg(virq, &msg); | 176 | write_msi_msg(virq, &msg); |
161 | } | 177 | } |
162 | return 0; | 178 | return 0; |
163 | 179 | ||
164 | out_free: | 180 | out_free: |
181 | /* free by the caller of this function */ | ||
165 | return rc; | 182 | return rc; |
166 | } | 183 | } |
167 | 184 | ||
168 | static void fsl_msi_cascade(unsigned int irq, struct irq_desc *desc) | 185 | static void fsl_msi_cascade(unsigned int irq, struct irq_desc *desc) |
169 | { | 186 | { |
170 | unsigned int cascade_irq; | 187 | unsigned int cascade_irq; |
171 | struct fsl_msi *msi_data = fsl_msi; | 188 | struct fsl_msi *msi_data; |
172 | int msir_index = -1; | 189 | int msir_index = -1; |
173 | u32 msir_value = 0; | 190 | u32 msir_value = 0; |
174 | u32 intr_index; | 191 | u32 intr_index; |
175 | u32 have_shift = 0; | 192 | u32 have_shift = 0; |
193 | struct fsl_msi_cascade_data *cascade_data; | ||
194 | |||
195 | cascade_data = (struct fsl_msi_cascade_data *)get_irq_data(irq); | ||
196 | msi_data = cascade_data->msi_data; | ||
176 | 197 | ||
177 | raw_spin_lock(&desc->lock); | 198 | raw_spin_lock(&desc->lock); |
178 | if ((msi_data->feature & FSL_PIC_IP_MASK) == FSL_PIC_IP_IPIC) { | 199 | if ((msi_data->feature & FSL_PIC_IP_MASK) == FSL_PIC_IP_IPIC) { |
@@ -187,13 +208,13 @@ static void fsl_msi_cascade(unsigned int irq, struct irq_desc *desc) | |||
187 | if (unlikely(desc->status & IRQ_INPROGRESS)) | 208 | if (unlikely(desc->status & IRQ_INPROGRESS)) |
188 | goto unlock; | 209 | goto unlock; |
189 | 210 | ||
190 | msir_index = (int)desc->handler_data; | 211 | msir_index = cascade_data->index; |
191 | 212 | ||
192 | if (msir_index >= NR_MSI_REG) | 213 | if (msir_index >= NR_MSI_REG) |
193 | cascade_irq = NO_IRQ; | 214 | cascade_irq = NO_IRQ; |
194 | 215 | ||
195 | desc->status |= IRQ_INPROGRESS; | 216 | desc->status |= IRQ_INPROGRESS; |
196 | switch (fsl_msi->feature & FSL_PIC_IP_MASK) { | 217 | switch (msi_data->feature & FSL_PIC_IP_MASK) { |
197 | case FSL_PIC_IP_MPIC: | 218 | case FSL_PIC_IP_MPIC: |
198 | msir_value = fsl_msi_read(msi_data->msi_regs, | 219 | msir_value = fsl_msi_read(msi_data->msi_regs, |
199 | msir_index * 0x10); | 220 | msir_index * 0x10); |
@@ -229,6 +250,30 @@ unlock: | |||
229 | raw_spin_unlock(&desc->lock); | 250 | raw_spin_unlock(&desc->lock); |
230 | } | 251 | } |
231 | 252 | ||
253 | static int fsl_of_msi_remove(struct of_device *ofdev) | ||
254 | { | ||
255 | struct fsl_msi *msi = ofdev->dev.platform_data; | ||
256 | int virq, i; | ||
257 | struct fsl_msi_cascade_data *cascade_data; | ||
258 | |||
259 | if (msi->list.prev != NULL) | ||
260 | list_del(&msi->list); | ||
261 | for (i = 0; i < NR_MSI_REG; i++) { | ||
262 | virq = msi->msi_virqs[i]; | ||
263 | if (virq != NO_IRQ) { | ||
264 | cascade_data = get_irq_data(virq); | ||
265 | kfree(cascade_data); | ||
266 | irq_dispose_mapping(virq); | ||
267 | } | ||
268 | } | ||
269 | if (msi->bitmap.bitmap) | ||
270 | msi_bitmap_free(&msi->bitmap); | ||
271 | iounmap(msi->msi_regs); | ||
272 | kfree(msi); | ||
273 | |||
274 | return 0; | ||
275 | } | ||
276 | |||
232 | static int __devinit fsl_of_msi_probe(struct of_device *dev, | 277 | static int __devinit fsl_of_msi_probe(struct of_device *dev, |
233 | const struct of_device_id *match) | 278 | const struct of_device_id *match) |
234 | { | 279 | { |
@@ -239,15 +284,18 @@ static int __devinit fsl_of_msi_probe(struct of_device *dev, | |||
239 | int virt_msir; | 284 | int virt_msir; |
240 | const u32 *p; | 285 | const u32 *p; |
241 | struct fsl_msi_feature *features = match->data; | 286 | struct fsl_msi_feature *features = match->data; |
287 | struct fsl_msi_cascade_data *cascade_data = NULL; | ||
288 | int len; | ||
289 | u32 offset; | ||
242 | 290 | ||
243 | printk(KERN_DEBUG "Setting up Freescale MSI support\n"); | 291 | printk(KERN_DEBUG "Setting up Freescale MSI support\n"); |
244 | 292 | ||
245 | msi = kzalloc(sizeof(struct fsl_msi), GFP_KERNEL); | 293 | msi = kzalloc(sizeof(struct fsl_msi), GFP_KERNEL); |
246 | if (!msi) { | 294 | if (!msi) { |
247 | dev_err(&dev->dev, "No memory for MSI structure\n"); | 295 | dev_err(&dev->dev, "No memory for MSI structure\n"); |
248 | err = -ENOMEM; | 296 | return -ENOMEM; |
249 | goto error_out; | ||
250 | } | 297 | } |
298 | dev->dev.platform_data = msi; | ||
251 | 299 | ||
252 | msi->irqhost = irq_alloc_host(dev->dev.of_node, IRQ_HOST_MAP_LINEAR, | 300 | msi->irqhost = irq_alloc_host(dev->dev.of_node, IRQ_HOST_MAP_LINEAR, |
253 | NR_MSI_IRQS, &fsl_msi_host_ops, 0); | 301 | NR_MSI_IRQS, &fsl_msi_host_ops, 0); |
@@ -298,27 +346,47 @@ static int __devinit fsl_of_msi_probe(struct of_device *dev, | |||
298 | err = -EINVAL; | 346 | err = -EINVAL; |
299 | goto error_out; | 347 | goto error_out; |
300 | } | 348 | } |
349 | offset = 0; | ||
350 | p = of_get_property(dev->dev.of_node, "msi-available-ranges", &len); | ||
351 | if (p) | ||
352 | offset = *p / IRQS_PER_MSI_REG; | ||
301 | 353 | ||
302 | count /= sizeof(u32); | 354 | count /= sizeof(u32); |
303 | for (i = 0; i < count / 2; i++) { | 355 | for (i = 0; i < min(count / 2, NR_MSI_REG); i++) { |
304 | if (i > NR_MSI_REG) | ||
305 | break; | ||
306 | virt_msir = irq_of_parse_and_map(dev->dev.of_node, i); | 356 | virt_msir = irq_of_parse_and_map(dev->dev.of_node, i); |
307 | if (virt_msir != NO_IRQ) { | 357 | if (virt_msir != NO_IRQ) { |
308 | set_irq_data(virt_msir, (void *)i); | 358 | cascade_data = kzalloc( |
359 | sizeof(struct fsl_msi_cascade_data), | ||
360 | GFP_KERNEL); | ||
361 | if (!cascade_data) { | ||
362 | dev_err(&dev->dev, | ||
363 | "No memory for MSI cascade data\n"); | ||
364 | err = -ENOMEM; | ||
365 | goto error_out; | ||
366 | } | ||
367 | msi->msi_virqs[i] = virt_msir; | ||
368 | cascade_data->index = i + offset; | ||
369 | cascade_data->msi_data = msi; | ||
370 | set_irq_data(virt_msir, (void *)cascade_data); | ||
309 | set_irq_chained_handler(virt_msir, fsl_msi_cascade); | 371 | set_irq_chained_handler(virt_msir, fsl_msi_cascade); |
310 | } | 372 | } |
311 | } | 373 | } |
312 | 374 | ||
313 | fsl_msi = msi; | 375 | list_add_tail(&msi->list, &msi_head); |
314 | 376 | ||
315 | WARN_ON(ppc_md.setup_msi_irqs); | 377 | /* The multiple setting ppc_md.setup_msi_irqs will not harm things */ |
316 | ppc_md.setup_msi_irqs = fsl_setup_msi_irqs; | 378 | if (!ppc_md.setup_msi_irqs) { |
317 | ppc_md.teardown_msi_irqs = fsl_teardown_msi_irqs; | 379 | ppc_md.setup_msi_irqs = fsl_setup_msi_irqs; |
318 | ppc_md.msi_check_device = fsl_msi_check_device; | 380 | ppc_md.teardown_msi_irqs = fsl_teardown_msi_irqs; |
381 | ppc_md.msi_check_device = fsl_msi_check_device; | ||
382 | } else if (ppc_md.setup_msi_irqs != fsl_setup_msi_irqs) { | ||
383 | dev_err(&dev->dev, "Different MSI driver already installed!\n"); | ||
384 | err = -ENODEV; | ||
385 | goto error_out; | ||
386 | } | ||
319 | return 0; | 387 | return 0; |
320 | error_out: | 388 | error_out: |
321 | kfree(msi); | 389 | fsl_of_msi_remove(dev); |
322 | return err; | 390 | return err; |
323 | } | 391 | } |
324 | 392 | ||
@@ -351,6 +419,7 @@ static struct of_platform_driver fsl_of_msi_driver = { | |||
351 | .of_match_table = fsl_of_msi_ids, | 419 | .of_match_table = fsl_of_msi_ids, |
352 | }, | 420 | }, |
353 | .probe = fsl_of_msi_probe, | 421 | .probe = fsl_of_msi_probe, |
422 | .remove = fsl_of_msi_remove, | ||
354 | }; | 423 | }; |
355 | 424 | ||
356 | static __init int fsl_of_msi_init(void) | 425 | static __init int fsl_of_msi_init(void) |
diff --git a/arch/powerpc/sysdev/fsl_msi.h b/arch/powerpc/sysdev/fsl_msi.h index 331c7e7025b..624580c252d 100644 --- a/arch/powerpc/sysdev/fsl_msi.h +++ b/arch/powerpc/sysdev/fsl_msi.h | |||
@@ -32,8 +32,11 @@ struct fsl_msi { | |||
32 | u32 msi_addr_hi; | 32 | u32 msi_addr_hi; |
33 | void __iomem *msi_regs; | 33 | void __iomem *msi_regs; |
34 | u32 feature; | 34 | u32 feature; |
35 | int msi_virqs[NR_MSI_REG]; | ||
35 | 36 | ||
36 | struct msi_bitmap bitmap; | 37 | struct msi_bitmap bitmap; |
38 | |||
39 | struct list_head list; /* support multiple MSI banks */ | ||
37 | }; | 40 | }; |
38 | 41 | ||
39 | #endif /* _POWERPC_SYSDEV_FSL_MSI_H */ | 42 | #endif /* _POWERPC_SYSDEV_FSL_MSI_H */ |
diff --git a/arch/powerpc/sysdev/fsl_rio.c b/arch/powerpc/sysdev/fsl_rio.c index cd37e49e703..30e1626b2e8 100644 --- a/arch/powerpc/sysdev/fsl_rio.c +++ b/arch/powerpc/sysdev/fsl_rio.c | |||
@@ -1426,7 +1426,7 @@ int fsl_rio_setup(struct of_device *dev) | |||
1426 | port->iores.flags = IORESOURCE_MEM; | 1426 | port->iores.flags = IORESOURCE_MEM; |
1427 | port->iores.name = "rio_io_win"; | 1427 | port->iores.name = "rio_io_win"; |
1428 | 1428 | ||
1429 | priv->pwirq = irq_of_parse_and_map(dev->node, 0); | 1429 | priv->pwirq = irq_of_parse_and_map(dev->dev.of_node, 0); |
1430 | priv->bellirq = irq_of_parse_and_map(dev->dev.of_node, 2); | 1430 | priv->bellirq = irq_of_parse_and_map(dev->dev.of_node, 2); |
1431 | priv->txirq = irq_of_parse_and_map(dev->dev.of_node, 3); | 1431 | priv->txirq = irq_of_parse_and_map(dev->dev.of_node, 3); |
1432 | priv->rxirq = irq_of_parse_and_map(dev->dev.of_node, 4); | 1432 | priv->rxirq = irq_of_parse_and_map(dev->dev.of_node, 4); |
diff --git a/arch/powerpc/sysdev/ppc4xx_pci.c b/arch/powerpc/sysdev/ppc4xx_pci.c index 106d767bf65..156aa7d3625 100644 --- a/arch/powerpc/sysdev/ppc4xx_pci.c +++ b/arch/powerpc/sysdev/ppc4xx_pci.c | |||
@@ -974,6 +974,123 @@ static struct ppc4xx_pciex_hwops ppc460ex_pcie_hwops __initdata = | |||
974 | .setup_utl = ppc460ex_pciex_init_utl, | 974 | .setup_utl = ppc460ex_pciex_init_utl, |
975 | }; | 975 | }; |
976 | 976 | ||
977 | static int __init ppc460sx_pciex_core_init(struct device_node *np) | ||
978 | { | ||
979 | /* HSS drive amplitude */ | ||
980 | mtdcri(SDR0, PESDR0_460SX_HSSL0DAMP, 0xB9843211); | ||
981 | mtdcri(SDR0, PESDR0_460SX_HSSL1DAMP, 0xB9843211); | ||
982 | mtdcri(SDR0, PESDR0_460SX_HSSL2DAMP, 0xB9843211); | ||
983 | mtdcri(SDR0, PESDR0_460SX_HSSL3DAMP, 0xB9843211); | ||
984 | mtdcri(SDR0, PESDR0_460SX_HSSL4DAMP, 0xB9843211); | ||
985 | mtdcri(SDR0, PESDR0_460SX_HSSL5DAMP, 0xB9843211); | ||
986 | mtdcri(SDR0, PESDR0_460SX_HSSL6DAMP, 0xB9843211); | ||
987 | mtdcri(SDR0, PESDR0_460SX_HSSL7DAMP, 0xB9843211); | ||
988 | |||
989 | mtdcri(SDR0, PESDR1_460SX_HSSL0DAMP, 0xB9843211); | ||
990 | mtdcri(SDR0, PESDR1_460SX_HSSL1DAMP, 0xB9843211); | ||
991 | mtdcri(SDR0, PESDR1_460SX_HSSL2DAMP, 0xB9843211); | ||
992 | mtdcri(SDR0, PESDR1_460SX_HSSL3DAMP, 0xB9843211); | ||
993 | |||
994 | mtdcri(SDR0, PESDR2_460SX_HSSL0DAMP, 0xB9843211); | ||
995 | mtdcri(SDR0, PESDR2_460SX_HSSL1DAMP, 0xB9843211); | ||
996 | mtdcri(SDR0, PESDR2_460SX_HSSL2DAMP, 0xB9843211); | ||
997 | mtdcri(SDR0, PESDR2_460SX_HSSL3DAMP, 0xB9843211); | ||
998 | |||
999 | /* HSS TX pre-emphasis */ | ||
1000 | mtdcri(SDR0, PESDR0_460SX_HSSL0COEFA, 0xDCB98987); | ||
1001 | mtdcri(SDR0, PESDR0_460SX_HSSL1COEFA, 0xDCB98987); | ||
1002 | mtdcri(SDR0, PESDR0_460SX_HSSL2COEFA, 0xDCB98987); | ||
1003 | mtdcri(SDR0, PESDR0_460SX_HSSL3COEFA, 0xDCB98987); | ||
1004 | mtdcri(SDR0, PESDR0_460SX_HSSL4COEFA, 0xDCB98987); | ||
1005 | mtdcri(SDR0, PESDR0_460SX_HSSL5COEFA, 0xDCB98987); | ||
1006 | mtdcri(SDR0, PESDR0_460SX_HSSL6COEFA, 0xDCB98987); | ||
1007 | mtdcri(SDR0, PESDR0_460SX_HSSL7COEFA, 0xDCB98987); | ||
1008 | |||
1009 | mtdcri(SDR0, PESDR1_460SX_HSSL0COEFA, 0xDCB98987); | ||
1010 | mtdcri(SDR0, PESDR1_460SX_HSSL1COEFA, 0xDCB98987); | ||
1011 | mtdcri(SDR0, PESDR1_460SX_HSSL2COEFA, 0xDCB98987); | ||
1012 | mtdcri(SDR0, PESDR1_460SX_HSSL3COEFA, 0xDCB98987); | ||
1013 | |||
1014 | mtdcri(SDR0, PESDR2_460SX_HSSL0COEFA, 0xDCB98987); | ||
1015 | mtdcri(SDR0, PESDR2_460SX_HSSL1COEFA, 0xDCB98987); | ||
1016 | mtdcri(SDR0, PESDR2_460SX_HSSL2COEFA, 0xDCB98987); | ||
1017 | mtdcri(SDR0, PESDR2_460SX_HSSL3COEFA, 0xDCB98987); | ||
1018 | |||
1019 | /* HSS TX calibration control */ | ||
1020 | mtdcri(SDR0, PESDR0_460SX_HSSL1CALDRV, 0x22222222); | ||
1021 | mtdcri(SDR0, PESDR1_460SX_HSSL1CALDRV, 0x22220000); | ||
1022 | mtdcri(SDR0, PESDR2_460SX_HSSL1CALDRV, 0x22220000); | ||
1023 | |||
1024 | /* HSS TX slew control */ | ||
1025 | mtdcri(SDR0, PESDR0_460SX_HSSSLEW, 0xFFFFFFFF); | ||
1026 | mtdcri(SDR0, PESDR1_460SX_HSSSLEW, 0xFFFF0000); | ||
1027 | mtdcri(SDR0, PESDR2_460SX_HSSSLEW, 0xFFFF0000); | ||
1028 | |||
1029 | udelay(100); | ||
1030 | |||
1031 | /* De-assert PLLRESET */ | ||
1032 | dcri_clrset(SDR0, PESDR0_PLLLCT2, 0x00000100, 0); | ||
1033 | |||
1034 | /* Reset DL, UTL, GPL before configuration */ | ||
1035 | mtdcri(SDR0, PESDR0_460SX_RCSSET, | ||
1036 | PESDRx_RCSSET_RSTDL | PESDRx_RCSSET_RSTGU); | ||
1037 | mtdcri(SDR0, PESDR1_460SX_RCSSET, | ||
1038 | PESDRx_RCSSET_RSTDL | PESDRx_RCSSET_RSTGU); | ||
1039 | mtdcri(SDR0, PESDR2_460SX_RCSSET, | ||
1040 | PESDRx_RCSSET_RSTDL | PESDRx_RCSSET_RSTGU); | ||
1041 | |||
1042 | udelay(100); | ||
1043 | |||
1044 | /* | ||
1045 | * If bifurcation is not enabled, u-boot would have disabled the | ||
1046 | * third PCIe port | ||
1047 | */ | ||
1048 | if (((mfdcri(SDR0, PESDR1_460SX_HSSCTLSET) & 0x00000001) == | ||
1049 | 0x00000001)) { | ||
1050 | printk(KERN_INFO "PCI: PCIE bifurcation setup successfully.\n"); | ||
1051 | printk(KERN_INFO "PCI: Total 3 PCIE ports are present\n"); | ||
1052 | return 3; | ||
1053 | } | ||
1054 | |||
1055 | printk(KERN_INFO "PCI: Total 2 PCIE ports are present\n"); | ||
1056 | return 2; | ||
1057 | } | ||
1058 | |||
1059 | static int ppc460sx_pciex_init_port_hw(struct ppc4xx_pciex_port *port) | ||
1060 | { | ||
1061 | |||
1062 | if (port->endpoint) | ||
1063 | dcri_clrset(SDR0, port->sdr_base + PESDRn_UTLSET2, | ||
1064 | 0x01000000, 0); | ||
1065 | else | ||
1066 | dcri_clrset(SDR0, port->sdr_base + PESDRn_UTLSET2, | ||
1067 | 0, 0x01000000); | ||
1068 | |||
1069 | /*Gen-1*/ | ||
1070 | mtdcri(SDR0, port->sdr_base + PESDRn_460SX_RCEI, 0x08000000); | ||
1071 | |||
1072 | dcri_clrset(SDR0, port->sdr_base + PESDRn_RCSSET, | ||
1073 | (PESDRx_RCSSET_RSTGU | PESDRx_RCSSET_RSTDL), | ||
1074 | PESDRx_RCSSET_RSTPYN); | ||
1075 | |||
1076 | port->has_ibpre = 1; | ||
1077 | |||
1078 | return 0; | ||
1079 | } | ||
1080 | |||
1081 | static int ppc460sx_pciex_init_utl(struct ppc4xx_pciex_port *port) | ||
1082 | { | ||
1083 | /* Max 128 Bytes */ | ||
1084 | out_be32 (port->utl_base + PEUTL_PBBSZ, 0x00000000); | ||
1085 | return 0; | ||
1086 | } | ||
1087 | |||
1088 | static struct ppc4xx_pciex_hwops ppc460sx_pcie_hwops __initdata = { | ||
1089 | .core_init = ppc460sx_pciex_core_init, | ||
1090 | .port_init_hw = ppc460sx_pciex_init_port_hw, | ||
1091 | .setup_utl = ppc460sx_pciex_init_utl, | ||
1092 | }; | ||
1093 | |||
977 | #endif /* CONFIG_44x */ | 1094 | #endif /* CONFIG_44x */ |
978 | 1095 | ||
979 | #ifdef CONFIG_40x | 1096 | #ifdef CONFIG_40x |
@@ -1089,6 +1206,8 @@ static int __init ppc4xx_pciex_check_core_init(struct device_node *np) | |||
1089 | } | 1206 | } |
1090 | if (of_device_is_compatible(np, "ibm,plb-pciex-460ex")) | 1207 | if (of_device_is_compatible(np, "ibm,plb-pciex-460ex")) |
1091 | ppc4xx_pciex_hwops = &ppc460ex_pcie_hwops; | 1208 | ppc4xx_pciex_hwops = &ppc460ex_pcie_hwops; |
1209 | if (of_device_is_compatible(np, "ibm,plb-pciex-460sx")) | ||
1210 | ppc4xx_pciex_hwops = &ppc460sx_pcie_hwops; | ||
1092 | #endif /* CONFIG_44x */ | 1211 | #endif /* CONFIG_44x */ |
1093 | #ifdef CONFIG_40x | 1212 | #ifdef CONFIG_40x |
1094 | if (of_device_is_compatible(np, "ibm,plb-pciex-405ex")) | 1213 | if (of_device_is_compatible(np, "ibm,plb-pciex-405ex")) |
diff --git a/arch/powerpc/sysdev/ppc4xx_pci.h b/arch/powerpc/sysdev/ppc4xx_pci.h index d04e40b306f..56d9e5deccb 100644 --- a/arch/powerpc/sysdev/ppc4xx_pci.h +++ b/arch/powerpc/sysdev/ppc4xx_pci.h | |||
@@ -324,6 +324,64 @@ | |||
324 | #define PESDR0_460EX_IHS2 0x036D | 324 | #define PESDR0_460EX_IHS2 0x036D |
325 | 325 | ||
326 | /* | 326 | /* |
327 | * 460SX addtional DCRs | ||
328 | */ | ||
329 | #define PESDRn_460SX_RCEI 0x02 | ||
330 | |||
331 | #define PESDR0_460SX_HSSL0DAMP 0x320 | ||
332 | #define PESDR0_460SX_HSSL1DAMP 0x321 | ||
333 | #define PESDR0_460SX_HSSL2DAMP 0x322 | ||
334 | #define PESDR0_460SX_HSSL3DAMP 0x323 | ||
335 | #define PESDR0_460SX_HSSL4DAMP 0x324 | ||
336 | #define PESDR0_460SX_HSSL5DAMP 0x325 | ||
337 | #define PESDR0_460SX_HSSL6DAMP 0x326 | ||
338 | #define PESDR0_460SX_HSSL7DAMP 0x327 | ||
339 | |||
340 | #define PESDR1_460SX_HSSL0DAMP 0x354 | ||
341 | #define PESDR1_460SX_HSSL1DAMP 0x355 | ||
342 | #define PESDR1_460SX_HSSL2DAMP 0x356 | ||
343 | #define PESDR1_460SX_HSSL3DAMP 0x357 | ||
344 | |||
345 | #define PESDR2_460SX_HSSL0DAMP 0x384 | ||
346 | #define PESDR2_460SX_HSSL1DAMP 0x385 | ||
347 | #define PESDR2_460SX_HSSL2DAMP 0x386 | ||
348 | #define PESDR2_460SX_HSSL3DAMP 0x387 | ||
349 | |||
350 | #define PESDR0_460SX_HSSL0COEFA 0x328 | ||
351 | #define PESDR0_460SX_HSSL1COEFA 0x329 | ||
352 | #define PESDR0_460SX_HSSL2COEFA 0x32A | ||
353 | #define PESDR0_460SX_HSSL3COEFA 0x32B | ||
354 | #define PESDR0_460SX_HSSL4COEFA 0x32C | ||
355 | #define PESDR0_460SX_HSSL5COEFA 0x32D | ||
356 | #define PESDR0_460SX_HSSL6COEFA 0x32E | ||
357 | #define PESDR0_460SX_HSSL7COEFA 0x32F | ||
358 | |||
359 | #define PESDR1_460SX_HSSL0COEFA 0x358 | ||
360 | #define PESDR1_460SX_HSSL1COEFA 0x359 | ||
361 | #define PESDR1_460SX_HSSL2COEFA 0x35A | ||
362 | #define PESDR1_460SX_HSSL3COEFA 0x35B | ||
363 | |||
364 | #define PESDR2_460SX_HSSL0COEFA 0x388 | ||
365 | #define PESDR2_460SX_HSSL1COEFA 0x389 | ||
366 | #define PESDR2_460SX_HSSL2COEFA 0x38A | ||
367 | #define PESDR2_460SX_HSSL3COEFA 0x38B | ||
368 | |||
369 | #define PESDR0_460SX_HSSL1CALDRV 0x339 | ||
370 | #define PESDR1_460SX_HSSL1CALDRV 0x361 | ||
371 | #define PESDR2_460SX_HSSL1CALDRV 0x391 | ||
372 | |||
373 | #define PESDR0_460SX_HSSSLEW 0x338 | ||
374 | #define PESDR1_460SX_HSSSLEW 0x360 | ||
375 | #define PESDR2_460SX_HSSSLEW 0x390 | ||
376 | |||
377 | #define PESDR0_460SX_HSSCTLSET 0x31E | ||
378 | #define PESDR1_460SX_HSSCTLSET 0x352 | ||
379 | #define PESDR2_460SX_HSSCTLSET 0x382 | ||
380 | |||
381 | #define PESDR0_460SX_RCSSET 0x304 | ||
382 | #define PESDR1_460SX_RCSSET 0x344 | ||
383 | #define PESDR2_460SX_RCSSET 0x374 | ||
384 | /* | ||
327 | * Of the above, some are common offsets from the base | 385 | * Of the above, some are common offsets from the base |
328 | */ | 386 | */ |
329 | #define PESDRn_UTLSET1 0x00 | 387 | #define PESDRn_UTLSET1 0x00 |
diff --git a/arch/s390/include/asm/cache.h b/arch/s390/include/asm/cache.h index 9b866816863..24aafa68b64 100644 --- a/arch/s390/include/asm/cache.h +++ b/arch/s390/include/asm/cache.h | |||
@@ -14,6 +14,6 @@ | |||
14 | #define L1_CACHE_BYTES 256 | 14 | #define L1_CACHE_BYTES 256 |
15 | #define L1_CACHE_SHIFT 8 | 15 | #define L1_CACHE_SHIFT 8 |
16 | 16 | ||
17 | #define __read_mostly __attribute__((__section__(".data.read_mostly"))) | 17 | #define __read_mostly __attribute__((__section__(".data..read_mostly"))) |
18 | 18 | ||
19 | #endif | 19 | #endif |
diff --git a/arch/s390/kernel/swsusp_asm64.S b/arch/s390/kernel/swsusp_asm64.S index c56d3f56d02..1f066e46e83 100644 --- a/arch/s390/kernel/swsusp_asm64.S +++ b/arch/s390/kernel/swsusp_asm64.S | |||
@@ -264,7 +264,7 @@ restore_registers: | |||
264 | lghi %r2,0 | 264 | lghi %r2,0 |
265 | br %r14 | 265 | br %r14 |
266 | 266 | ||
267 | .section .data.nosave,"aw",@progbits | 267 | .section .data..nosave,"aw",@progbits |
268 | .align 8 | 268 | .align 8 |
269 | .Ldisabled_wait_31: | 269 | .Ldisabled_wait_31: |
270 | .long 0x000a0000,0x00000000 | 270 | .long 0x000a0000,0x00000000 |
diff --git a/arch/sh/boot/compressed/vmlinux.scr b/arch/sh/boot/compressed/vmlinux.scr index f02382ae5c4..862d7480823 100644 --- a/arch/sh/boot/compressed/vmlinux.scr +++ b/arch/sh/boot/compressed/vmlinux.scr | |||
@@ -1,6 +1,6 @@ | |||
1 | SECTIONS | 1 | SECTIONS |
2 | { | 2 | { |
3 | .rodata.compressed : { | 3 | .rodata..compressed : { |
4 | input_len = .; | 4 | input_len = .; |
5 | LONG(input_data_end - input_data) input_data = .; | 5 | LONG(input_data_end - input_data) input_data = .; |
6 | *(.data) | 6 | *(.data) |
diff --git a/arch/sh/include/asm/cache.h b/arch/sh/include/asm/cache.h index e461d67f03c..ef9e555aafb 100644 --- a/arch/sh/include/asm/cache.h +++ b/arch/sh/include/asm/cache.h | |||
@@ -14,7 +14,7 @@ | |||
14 | 14 | ||
15 | #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) | 15 | #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) |
16 | 16 | ||
17 | #define __read_mostly __attribute__((__section__(".data.read_mostly"))) | 17 | #define __read_mostly __attribute__((__section__(".data..read_mostly"))) |
18 | 18 | ||
19 | #ifndef __ASSEMBLY__ | 19 | #ifndef __ASSEMBLY__ |
20 | struct cache_info { | 20 | struct cache_info { |
diff --git a/arch/sparc/boot/btfixupprep.c b/arch/sparc/boot/btfixupprep.c index bbf91b9c3d3..e7f2940bd27 100644 --- a/arch/sparc/boot/btfixupprep.c +++ b/arch/sparc/boot/btfixupprep.c | |||
@@ -325,7 +325,7 @@ main1: | |||
325 | (*rr)->next = NULL; | 325 | (*rr)->next = NULL; |
326 | } | 326 | } |
327 | printf("! Generated by btfixupprep. Do not edit.\n\n"); | 327 | printf("! Generated by btfixupprep. Do not edit.\n\n"); |
328 | printf("\t.section\t\".data.init\",#alloc,#write\n\t.align\t4\n\n"); | 328 | printf("\t.section\t\".data..init\",#alloc,#write\n\t.align\t4\n\n"); |
329 | printf("\t.global\t___btfixup_start\n___btfixup_start:\n\n"); | 329 | printf("\t.global\t___btfixup_start\n___btfixup_start:\n\n"); |
330 | for (i = 0; i < last; i++) { | 330 | for (i = 0; i < last; i++) { |
331 | f = array + i; | 331 | f = array + i; |
diff --git a/arch/sparc/include/asm/cache.h b/arch/sparc/include/asm/cache.h index 78b07009f60..0588b8c7faa 100644 --- a/arch/sparc/include/asm/cache.h +++ b/arch/sparc/include/asm/cache.h | |||
@@ -21,7 +21,7 @@ | |||
21 | 21 | ||
22 | #define SMP_CACHE_BYTES (1 << SMP_CACHE_BYTES_SHIFT) | 22 | #define SMP_CACHE_BYTES (1 << SMP_CACHE_BYTES_SHIFT) |
23 | 23 | ||
24 | #define __read_mostly __attribute__((__section__(".data.read_mostly"))) | 24 | #define __read_mostly __attribute__((__section__(".data..read_mostly"))) |
25 | 25 | ||
26 | #ifdef CONFIG_SPARC32 | 26 | #ifdef CONFIG_SPARC32 |
27 | #include <asm/asi.h> | 27 | #include <asm/asi.h> |
diff --git a/arch/um/kernel/dyn.lds.S b/arch/um/kernel/dyn.lds.S index 7fcad58e216..69268014dd8 100644 --- a/arch/um/kernel/dyn.lds.S +++ b/arch/um/kernel/dyn.lds.S | |||
@@ -94,7 +94,7 @@ SECTIONS | |||
94 | .data : { | 94 | .data : { |
95 | INIT_TASK_DATA(KERNEL_STACK_SIZE) | 95 | INIT_TASK_DATA(KERNEL_STACK_SIZE) |
96 | . = ALIGN(KERNEL_STACK_SIZE); | 96 | . = ALIGN(KERNEL_STACK_SIZE); |
97 | *(.data.init_irqstack) | 97 | *(.data..init_irqstack) |
98 | DATA_DATA | 98 | DATA_DATA |
99 | *(.data.* .gnu.linkonce.d.*) | 99 | *(.data.* .gnu.linkonce.d.*) |
100 | SORT(CONSTRUCTORS) | 100 | SORT(CONSTRUCTORS) |
diff --git a/arch/um/kernel/init_task.c b/arch/um/kernel/init_task.c index 8aa77b61a5f..ddc9698b66e 100644 --- a/arch/um/kernel/init_task.c +++ b/arch/um/kernel/init_task.c | |||
@@ -34,5 +34,5 @@ union thread_union init_thread_union __init_task_data = | |||
34 | { INIT_THREAD_INFO(init_task) }; | 34 | { INIT_THREAD_INFO(init_task) }; |
35 | 35 | ||
36 | union thread_union cpu0_irqstack | 36 | union thread_union cpu0_irqstack |
37 | __attribute__((__section__(".data.init_irqstack"))) = | 37 | __attribute__((__section__(".data..init_irqstack"))) = |
38 | { INIT_THREAD_INFO(init_task) }; | 38 | { INIT_THREAD_INFO(init_task) }; |
diff --git a/arch/um/kernel/uml.lds.S b/arch/um/kernel/uml.lds.S index e7a6cca667a..ec637855067 100644 --- a/arch/um/kernel/uml.lds.S +++ b/arch/um/kernel/uml.lds.S | |||
@@ -50,7 +50,7 @@ SECTIONS | |||
50 | { | 50 | { |
51 | INIT_TASK_DATA(KERNEL_STACK_SIZE) | 51 | INIT_TASK_DATA(KERNEL_STACK_SIZE) |
52 | . = ALIGN(KERNEL_STACK_SIZE); | 52 | . = ALIGN(KERNEL_STACK_SIZE); |
53 | *(.data.init_irqstack) | 53 | *(.data..init_irqstack) |
54 | DATA_DATA | 54 | DATA_DATA |
55 | *(.gnu.linkonce.d*) | 55 | *(.gnu.linkonce.d*) |
56 | CONSTRUCTORS | 56 | CONSTRUCTORS |
diff --git a/arch/x86/.gitignore b/arch/x86/.gitignore new file mode 100644 index 00000000000..028079065af --- /dev/null +++ b/arch/x86/.gitignore | |||
@@ -0,0 +1,3 @@ | |||
1 | boot/compressed/vmlinux | ||
2 | tools/test_get_len | ||
3 | |||
diff --git a/arch/x86/boot/compressed/mkpiggy.c b/arch/x86/boot/compressed/mkpiggy.c index bcbd36c4143..5c228129d17 100644 --- a/arch/x86/boot/compressed/mkpiggy.c +++ b/arch/x86/boot/compressed/mkpiggy.c | |||
@@ -77,7 +77,7 @@ int main(int argc, char *argv[]) | |||
77 | offs += 32*1024 + 18; /* Add 32K + 18 bytes slack */ | 77 | offs += 32*1024 + 18; /* Add 32K + 18 bytes slack */ |
78 | offs = (offs+4095) & ~4095; /* Round to a 4K boundary */ | 78 | offs = (offs+4095) & ~4095; /* Round to a 4K boundary */ |
79 | 79 | ||
80 | printf(".section \".rodata.compressed\",\"a\",@progbits\n"); | 80 | printf(".section \".rodata..compressed\",\"a\",@progbits\n"); |
81 | printf(".globl z_input_len\n"); | 81 | printf(".globl z_input_len\n"); |
82 | printf("z_input_len = %lu\n", ilen); | 82 | printf("z_input_len = %lu\n", ilen); |
83 | printf(".globl z_output_len\n"); | 83 | printf(".globl z_output_len\n"); |
diff --git a/arch/x86/boot/compressed/vmlinux.lds.S b/arch/x86/boot/compressed/vmlinux.lds.S index a6f1a59a5b0..5ddabceee12 100644 --- a/arch/x86/boot/compressed/vmlinux.lds.S +++ b/arch/x86/boot/compressed/vmlinux.lds.S | |||
@@ -26,8 +26,8 @@ SECTIONS | |||
26 | HEAD_TEXT | 26 | HEAD_TEXT |
27 | _ehead = . ; | 27 | _ehead = . ; |
28 | } | 28 | } |
29 | .rodata.compressed : { | 29 | .rodata..compressed : { |
30 | *(.rodata.compressed) | 30 | *(.rodata..compressed) |
31 | } | 31 | } |
32 | .text : { | 32 | .text : { |
33 | _text = .; /* Text */ | 33 | _text = .; /* Text */ |
diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h index 2f9047cfaac..48f99f15452 100644 --- a/arch/x86/include/asm/cache.h +++ b/arch/x86/include/asm/cache.h | |||
@@ -7,7 +7,7 @@ | |||
7 | #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT) | 7 | #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT) |
8 | #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) | 8 | #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) |
9 | 9 | ||
10 | #define __read_mostly __attribute__((__section__(".data.read_mostly"))) | 10 | #define __read_mostly __attribute__((__section__(".data..read_mostly"))) |
11 | 11 | ||
12 | #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT | 12 | #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT |
13 | #define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT) | 13 | #define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT) |
diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S index 8ded418b059..13ab720573e 100644 --- a/arch/x86/kernel/acpi/wakeup_32.S +++ b/arch/x86/kernel/acpi/wakeup_32.S | |||
@@ -1,4 +1,4 @@ | |||
1 | .section .text.page_aligned | 1 | .section .text..page_aligned |
2 | #include <linux/linkage.h> | 2 | #include <linux/linkage.h> |
3 | #include <asm/segment.h> | 3 | #include <asm/segment.h> |
4 | #include <asm/page_types.h> | 4 | #include <asm/page_types.h> |
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c index fa5a1474cd1..0d20286d78c 100644 --- a/arch/x86/kernel/amd_iommu.c +++ b/arch/x86/kernel/amd_iommu.c | |||
@@ -1487,6 +1487,7 @@ static int __attach_device(struct device *dev, | |||
1487 | struct protection_domain *domain) | 1487 | struct protection_domain *domain) |
1488 | { | 1488 | { |
1489 | struct iommu_dev_data *dev_data, *alias_data; | 1489 | struct iommu_dev_data *dev_data, *alias_data; |
1490 | int ret; | ||
1490 | 1491 | ||
1491 | dev_data = get_dev_data(dev); | 1492 | dev_data = get_dev_data(dev); |
1492 | alias_data = get_dev_data(dev_data->alias); | 1493 | alias_data = get_dev_data(dev_data->alias); |
@@ -1498,13 +1499,14 @@ static int __attach_device(struct device *dev, | |||
1498 | spin_lock(&domain->lock); | 1499 | spin_lock(&domain->lock); |
1499 | 1500 | ||
1500 | /* Some sanity checks */ | 1501 | /* Some sanity checks */ |
1502 | ret = -EBUSY; | ||
1501 | if (alias_data->domain != NULL && | 1503 | if (alias_data->domain != NULL && |
1502 | alias_data->domain != domain) | 1504 | alias_data->domain != domain) |
1503 | return -EBUSY; | 1505 | goto out_unlock; |
1504 | 1506 | ||
1505 | if (dev_data->domain != NULL && | 1507 | if (dev_data->domain != NULL && |
1506 | dev_data->domain != domain) | 1508 | dev_data->domain != domain) |
1507 | return -EBUSY; | 1509 | goto out_unlock; |
1508 | 1510 | ||
1509 | /* Do real assignment */ | 1511 | /* Do real assignment */ |
1510 | if (dev_data->alias != dev) { | 1512 | if (dev_data->alias != dev) { |
@@ -1520,10 +1522,14 @@ static int __attach_device(struct device *dev, | |||
1520 | 1522 | ||
1521 | atomic_inc(&dev_data->bind); | 1523 | atomic_inc(&dev_data->bind); |
1522 | 1524 | ||
1525 | ret = 0; | ||
1526 | |||
1527 | out_unlock: | ||
1528 | |||
1523 | /* ready */ | 1529 | /* ready */ |
1524 | spin_unlock(&domain->lock); | 1530 | spin_unlock(&domain->lock); |
1525 | 1531 | ||
1526 | return 0; | 1532 | return ret; |
1527 | } | 1533 | } |
1528 | 1534 | ||
1529 | /* | 1535 | /* |
@@ -2324,10 +2330,6 @@ int __init amd_iommu_init_dma_ops(void) | |||
2324 | 2330 | ||
2325 | iommu_detected = 1; | 2331 | iommu_detected = 1; |
2326 | swiotlb = 0; | 2332 | swiotlb = 0; |
2327 | #ifdef CONFIG_GART_IOMMU | ||
2328 | gart_iommu_aperture_disabled = 1; | ||
2329 | gart_iommu_aperture = 0; | ||
2330 | #endif | ||
2331 | 2333 | ||
2332 | /* Make the driver finally visible to the drivers */ | 2334 | /* Make the driver finally visible to the drivers */ |
2333 | dma_ops = &amd_iommu_dma_ops; | 2335 | dma_ops = &amd_iommu_dma_ops; |
diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c index 3bacb4d0844..3cc63e2b8dd 100644 --- a/arch/x86/kernel/amd_iommu_init.c +++ b/arch/x86/kernel/amd_iommu_init.c | |||
@@ -287,8 +287,12 @@ static u8 * __init iommu_map_mmio_space(u64 address) | |||
287 | { | 287 | { |
288 | u8 *ret; | 288 | u8 *ret; |
289 | 289 | ||
290 | if (!request_mem_region(address, MMIO_REGION_LENGTH, "amd_iommu")) | 290 | if (!request_mem_region(address, MMIO_REGION_LENGTH, "amd_iommu")) { |
291 | pr_err("AMD-Vi: Can not reserve memory region %llx for mmio\n", | ||
292 | address); | ||
293 | pr_err("AMD-Vi: This is a BIOS bug. Please contact your hardware vendor\n"); | ||
291 | return NULL; | 294 | return NULL; |
295 | } | ||
292 | 296 | ||
293 | ret = ioremap_nocache(address, MMIO_REGION_LENGTH); | 297 | ret = ioremap_nocache(address, MMIO_REGION_LENGTH); |
294 | if (ret != NULL) | 298 | if (ret != NULL) |
@@ -1314,7 +1318,7 @@ static int __init amd_iommu_init(void) | |||
1314 | ret = amd_iommu_init_dma_ops(); | 1318 | ret = amd_iommu_init_dma_ops(); |
1315 | 1319 | ||
1316 | if (ret) | 1320 | if (ret) |
1317 | goto free; | 1321 | goto free_disable; |
1318 | 1322 | ||
1319 | amd_iommu_init_api(); | 1323 | amd_iommu_init_api(); |
1320 | 1324 | ||
@@ -1332,9 +1336,10 @@ static int __init amd_iommu_init(void) | |||
1332 | out: | 1336 | out: |
1333 | return ret; | 1337 | return ret; |
1334 | 1338 | ||
1335 | free: | 1339 | free_disable: |
1336 | disable_iommus(); | 1340 | disable_iommus(); |
1337 | 1341 | ||
1342 | free: | ||
1338 | amd_iommu_uninit_devices(); | 1343 | amd_iommu_uninit_devices(); |
1339 | 1344 | ||
1340 | free_pages((unsigned long)amd_iommu_pd_alloc_bitmap, | 1345 | free_pages((unsigned long)amd_iommu_pd_alloc_bitmap, |
@@ -1353,6 +1358,15 @@ free: | |||
1353 | 1358 | ||
1354 | free_unity_maps(); | 1359 | free_unity_maps(); |
1355 | 1360 | ||
1361 | #ifdef CONFIG_GART_IOMMU | ||
1362 | /* | ||
1363 | * We failed to initialize the AMD IOMMU - try fallback to GART | ||
1364 | * if possible. | ||
1365 | */ | ||
1366 | gart_iommu_init(); | ||
1367 | |||
1368 | #endif | ||
1369 | |||
1356 | goto out; | 1370 | goto out; |
1357 | } | 1371 | } |
1358 | 1372 | ||
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index c77586061bc..5db5b7d65a1 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c | |||
@@ -106,6 +106,7 @@ struct cpu_hw_events { | |||
106 | 106 | ||
107 | int n_events; | 107 | int n_events; |
108 | int n_added; | 108 | int n_added; |
109 | int n_txn; | ||
109 | int assign[X86_PMC_IDX_MAX]; /* event to counter assignment */ | 110 | int assign[X86_PMC_IDX_MAX]; /* event to counter assignment */ |
110 | u64 tags[X86_PMC_IDX_MAX]; | 111 | u64 tags[X86_PMC_IDX_MAX]; |
111 | struct perf_event *event_list[X86_PMC_IDX_MAX]; /* in enabled order */ | 112 | struct perf_event *event_list[X86_PMC_IDX_MAX]; /* in enabled order */ |
@@ -983,6 +984,7 @@ static int x86_pmu_enable(struct perf_event *event) | |||
983 | out: | 984 | out: |
984 | cpuc->n_events = n; | 985 | cpuc->n_events = n; |
985 | cpuc->n_added += n - n0; | 986 | cpuc->n_added += n - n0; |
987 | cpuc->n_txn += n - n0; | ||
986 | 988 | ||
987 | return 0; | 989 | return 0; |
988 | } | 990 | } |
@@ -1089,6 +1091,14 @@ static void x86_pmu_disable(struct perf_event *event) | |||
1089 | struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events); | 1091 | struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events); |
1090 | int i; | 1092 | int i; |
1091 | 1093 | ||
1094 | /* | ||
1095 | * If we're called during a txn, we don't need to do anything. | ||
1096 | * The events never got scheduled and ->cancel_txn will truncate | ||
1097 | * the event_list. | ||
1098 | */ | ||
1099 | if (cpuc->group_flag & PERF_EVENT_TXN_STARTED) | ||
1100 | return; | ||
1101 | |||
1092 | x86_pmu_stop(event); | 1102 | x86_pmu_stop(event); |
1093 | 1103 | ||
1094 | for (i = 0; i < cpuc->n_events; i++) { | 1104 | for (i = 0; i < cpuc->n_events; i++) { |
@@ -1379,6 +1389,7 @@ static void x86_pmu_start_txn(const struct pmu *pmu) | |||
1379 | struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events); | 1389 | struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events); |
1380 | 1390 | ||
1381 | cpuc->group_flag |= PERF_EVENT_TXN_STARTED; | 1391 | cpuc->group_flag |= PERF_EVENT_TXN_STARTED; |
1392 | cpuc->n_txn = 0; | ||
1382 | } | 1393 | } |
1383 | 1394 | ||
1384 | /* | 1395 | /* |
@@ -1391,6 +1402,11 @@ static void x86_pmu_cancel_txn(const struct pmu *pmu) | |||
1391 | struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events); | 1402 | struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events); |
1392 | 1403 | ||
1393 | cpuc->group_flag &= ~PERF_EVENT_TXN_STARTED; | 1404 | cpuc->group_flag &= ~PERF_EVENT_TXN_STARTED; |
1405 | /* | ||
1406 | * Truncate the collected events. | ||
1407 | */ | ||
1408 | cpuc->n_added -= cpuc->n_txn; | ||
1409 | cpuc->n_events -= cpuc->n_txn; | ||
1394 | } | 1410 | } |
1395 | 1411 | ||
1396 | /* | 1412 | /* |
@@ -1419,6 +1435,12 @@ static int x86_pmu_commit_txn(const struct pmu *pmu) | |||
1419 | */ | 1435 | */ |
1420 | memcpy(cpuc->assign, assign, n*sizeof(int)); | 1436 | memcpy(cpuc->assign, assign, n*sizeof(int)); |
1421 | 1437 | ||
1438 | /* | ||
1439 | * Clear out the txn count so that ->cancel_txn() which gets | ||
1440 | * run after ->commit_txn() doesn't undo things. | ||
1441 | */ | ||
1442 | cpuc->n_txn = 0; | ||
1443 | |||
1422 | return 0; | 1444 | return 0; |
1423 | } | 1445 | } |
1424 | 1446 | ||
diff --git a/arch/x86/kernel/init_task.c b/arch/x86/kernel/init_task.c index 3a54dcb9cd0..43e9ccf4494 100644 --- a/arch/x86/kernel/init_task.c +++ b/arch/x86/kernel/init_task.c | |||
@@ -34,7 +34,7 @@ EXPORT_SYMBOL(init_task); | |||
34 | /* | 34 | /* |
35 | * per-CPU TSS segments. Threads are completely 'soft' on Linux, | 35 | * per-CPU TSS segments. Threads are completely 'soft' on Linux, |
36 | * no more per-task TSS's. The TSS size is kept cacheline-aligned | 36 | * no more per-task TSS's. The TSS size is kept cacheline-aligned |
37 | * so they are allowed to end up in the .data.cacheline_aligned | 37 | * so they are allowed to end up in the .data..cacheline_aligned |
38 | * section. Since TSS's are completely CPU-local, we want them | 38 | * section. Since TSS's are completely CPU-local, we want them |
39 | * on exact cacheline boundaries, to eliminate cacheline ping-pong. | 39 | * on exact cacheline boundaries, to eliminate cacheline ping-pong. |
40 | */ | 40 | */ |
diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c index a867940a6df..de3b63ae3da 100644 --- a/arch/x86/kernel/setup_percpu.c +++ b/arch/x86/kernel/setup_percpu.c | |||
@@ -21,12 +21,6 @@ | |||
21 | #include <asm/cpu.h> | 21 | #include <asm/cpu.h> |
22 | #include <asm/stackprotector.h> | 22 | #include <asm/stackprotector.h> |
23 | 23 | ||
24 | #ifdef CONFIG_DEBUG_PER_CPU_MAPS | ||
25 | # define DBG(fmt, ...) pr_dbg(fmt, ##__VA_ARGS__) | ||
26 | #else | ||
27 | # define DBG(fmt, ...) do { if (0) pr_dbg(fmt, ##__VA_ARGS__); } while (0) | ||
28 | #endif | ||
29 | |||
30 | DEFINE_PER_CPU(int, cpu_number); | 24 | DEFINE_PER_CPU(int, cpu_number); |
31 | EXPORT_PER_CPU_SYMBOL(cpu_number); | 25 | EXPORT_PER_CPU_SYMBOL(cpu_number); |
32 | 26 | ||
@@ -247,7 +241,7 @@ void __init setup_per_cpu_areas(void) | |||
247 | #endif | 241 | #endif |
248 | #endif | 242 | #endif |
249 | /* | 243 | /* |
250 | * Up to this point, the boot CPU has been using .data.init | 244 | * Up to this point, the boot CPU has been using .init.data |
251 | * area. Reload any changed state for the boot CPU. | 245 | * area. Reload any changed state for the boot CPU. |
252 | */ | 246 | */ |
253 | if (cpu == boot_cpu_id) | 247 | if (cpu == boot_cpu_id) |
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 37462f1ddba..c4f33b2e77d 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c | |||
@@ -686,7 +686,7 @@ static void __cpuinit do_fork_idle(struct work_struct *work) | |||
686 | static void __cpuinit announce_cpu(int cpu, int apicid) | 686 | static void __cpuinit announce_cpu(int cpu, int apicid) |
687 | { | 687 | { |
688 | static int current_node = -1; | 688 | static int current_node = -1; |
689 | int node = cpu_to_node(cpu); | 689 | int node = early_cpu_to_node(cpu); |
690 | 690 | ||
691 | if (system_state == SYSTEM_BOOTING) { | 691 | if (system_state == SYSTEM_BOOTING) { |
692 | if (node != current_node) { | 692 | if (node != current_node) { |
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S index 2cc249718c4..d0bb52296fa 100644 --- a/arch/x86/kernel/vmlinux.lds.S +++ b/arch/x86/kernel/vmlinux.lds.S | |||
@@ -97,7 +97,7 @@ SECTIONS | |||
97 | HEAD_TEXT | 97 | HEAD_TEXT |
98 | #ifdef CONFIG_X86_32 | 98 | #ifdef CONFIG_X86_32 |
99 | . = ALIGN(PAGE_SIZE); | 99 | . = ALIGN(PAGE_SIZE); |
100 | *(.text.page_aligned) | 100 | *(.text..page_aligned) |
101 | #endif | 101 | #endif |
102 | . = ALIGN(8); | 102 | . = ALIGN(8); |
103 | _stext = .; | 103 | _stext = .; |
@@ -305,7 +305,7 @@ SECTIONS | |||
305 | . = ALIGN(PAGE_SIZE); | 305 | . = ALIGN(PAGE_SIZE); |
306 | .bss : AT(ADDR(.bss) - LOAD_OFFSET) { | 306 | .bss : AT(ADDR(.bss) - LOAD_OFFSET) { |
307 | __bss_start = .; | 307 | __bss_start = .; |
308 | *(.bss.page_aligned) | 308 | *(.bss..page_aligned) |
309 | *(.bss) | 309 | *(.bss) |
310 | . = ALIGN(4); | 310 | . = ALIGN(4); |
311 | __bss_stop = .; | 311 | __bss_stop = .; |
diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c index 550df481acc..787c52ca49c 100644 --- a/arch/x86/mm/numa.c +++ b/arch/x86/mm/numa.c | |||
@@ -3,12 +3,6 @@ | |||
3 | #include <linux/module.h> | 3 | #include <linux/module.h> |
4 | #include <linux/bootmem.h> | 4 | #include <linux/bootmem.h> |
5 | 5 | ||
6 | #ifdef CONFIG_DEBUG_PER_CPU_MAPS | ||
7 | # define DBG(x...) printk(KERN_DEBUG x) | ||
8 | #else | ||
9 | # define DBG(x...) | ||
10 | #endif | ||
11 | |||
12 | /* | 6 | /* |
13 | * Which logical CPUs are on which nodes | 7 | * Which logical CPUs are on which nodes |
14 | */ | 8 | */ |
diff --git a/arch/x86/xen/suspend.c b/arch/x86/xen/suspend.c index 987267f79bf..a9c66110803 100644 --- a/arch/x86/xen/suspend.c +++ b/arch/x86/xen/suspend.c | |||
@@ -60,6 +60,6 @@ static void xen_vcpu_notify_restore(void *data) | |||
60 | 60 | ||
61 | void xen_arch_resume(void) | 61 | void xen_arch_resume(void) |
62 | { | 62 | { |
63 | smp_call_function(xen_vcpu_notify_restore, | 63 | on_each_cpu(xen_vcpu_notify_restore, |
64 | (void *)CLOCK_EVT_NOTIFY_RESUME, 1); | 64 | (void *)CLOCK_EVT_NOTIFY_RESUME, 1); |
65 | } | 65 | } |
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index 73f883333a0..aa85a98d3a4 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig | |||
@@ -168,10 +168,10 @@ config ATA_BMDMA | |||
168 | default y | 168 | default y |
169 | help | 169 | help |
170 | This option adds support for SFF ATA controllers with BMDMA | 170 | This option adds support for SFF ATA controllers with BMDMA |
171 | capability. BMDMA stands for bus-master DMA and the | 171 | capability. BMDMA stands for bus-master DMA and is the |
172 | de-facto DMA interface for SFF controllers. | 172 | de facto DMA interface for SFF controllers. |
173 | 173 | ||
174 | If unuser, say Y. | 174 | If unsure, say Y. |
175 | 175 | ||
176 | if ATA_BMDMA | 176 | if ATA_BMDMA |
177 | 177 | ||
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 06b7e49e039..ddf8e486278 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
@@ -4119,9 +4119,8 @@ int ata_dev_revalidate(struct ata_device *dev, unsigned int new_class, | |||
4119 | dev->n_sectors > n_sectors && dev->n_sectors == n_native_sectors) { | 4119 | dev->n_sectors > n_sectors && dev->n_sectors == n_native_sectors) { |
4120 | ata_dev_printk(dev, KERN_WARNING, | 4120 | ata_dev_printk(dev, KERN_WARNING, |
4121 | "new n_sectors matches native, probably " | 4121 | "new n_sectors matches native, probably " |
4122 | "late HPA unlock, continuing\n"); | 4122 | "late HPA unlock, n_sectors updated\n"); |
4123 | /* keep using the old n_sectors */ | 4123 | /* use the larger n_sectors */ |
4124 | dev->n_sectors = n_sectors; | ||
4125 | return 0; | 4124 | return 0; |
4126 | } | 4125 | } |
4127 | 4126 | ||
@@ -6669,6 +6668,7 @@ EXPORT_SYMBOL_GPL(ata_dummy_port_info); | |||
6669 | EXPORT_SYMBOL_GPL(ata_link_next); | 6668 | EXPORT_SYMBOL_GPL(ata_link_next); |
6670 | EXPORT_SYMBOL_GPL(ata_dev_next); | 6669 | EXPORT_SYMBOL_GPL(ata_dev_next); |
6671 | EXPORT_SYMBOL_GPL(ata_std_bios_param); | 6670 | EXPORT_SYMBOL_GPL(ata_std_bios_param); |
6671 | EXPORT_SYMBOL_GPL(ata_scsi_unlock_native_capacity); | ||
6672 | EXPORT_SYMBOL_GPL(ata_host_init); | 6672 | EXPORT_SYMBOL_GPL(ata_host_init); |
6673 | EXPORT_SYMBOL_GPL(ata_host_alloc); | 6673 | EXPORT_SYMBOL_GPL(ata_host_alloc); |
6674 | EXPORT_SYMBOL_GPL(ata_host_alloc_pinfo); | 6674 | EXPORT_SYMBOL_GPL(ata_host_alloc_pinfo); |
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index cfa9dd3d725..a54273d2c3c 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c | |||
@@ -415,6 +415,35 @@ int ata_std_bios_param(struct scsi_device *sdev, struct block_device *bdev, | |||
415 | } | 415 | } |
416 | 416 | ||
417 | /** | 417 | /** |
418 | * ata_scsi_unlock_native_capacity - unlock native capacity | ||
419 | * @sdev: SCSI device to adjust device capacity for | ||
420 | * | ||
421 | * This function is called if a partition on @sdev extends beyond | ||
422 | * the end of the device. It requests EH to unlock HPA. | ||
423 | * | ||
424 | * LOCKING: | ||
425 | * Defined by the SCSI layer. Might sleep. | ||
426 | */ | ||
427 | void ata_scsi_unlock_native_capacity(struct scsi_device *sdev) | ||
428 | { | ||
429 | struct ata_port *ap = ata_shost_to_port(sdev->host); | ||
430 | struct ata_device *dev; | ||
431 | unsigned long flags; | ||
432 | |||
433 | spin_lock_irqsave(ap->lock, flags); | ||
434 | |||
435 | dev = ata_scsi_find_dev(ap, sdev); | ||
436 | if (dev && dev->n_sectors < dev->n_native_sectors) { | ||
437 | dev->flags |= ATA_DFLAG_UNLOCK_HPA; | ||
438 | dev->link->eh_info.action |= ATA_EH_RESET; | ||
439 | ata_port_schedule_eh(ap); | ||
440 | } | ||
441 | |||
442 | spin_unlock_irqrestore(ap->lock, flags); | ||
443 | ata_port_wait_eh(ap); | ||
444 | } | ||
445 | |||
446 | /** | ||
418 | * ata_get_identity - Handler for HDIO_GET_IDENTITY ioctl | 447 | * ata_get_identity - Handler for HDIO_GET_IDENTITY ioctl |
419 | * @ap: target port | 448 | * @ap: target port |
420 | * @sdev: SCSI device to get identify data for | 449 | * @sdev: SCSI device to get identify data for |
diff --git a/drivers/ata/pata_macio.c b/drivers/ata/pata_macio.c index 76640ac7688..75b49d01780 100644 --- a/drivers/ata/pata_macio.c +++ b/drivers/ata/pata_macio.c | |||
@@ -1355,8 +1355,11 @@ static struct of_device_id pata_macio_match[] = | |||
1355 | 1355 | ||
1356 | static struct macio_driver pata_macio_driver = | 1356 | static struct macio_driver pata_macio_driver = |
1357 | { | 1357 | { |
1358 | .name = "pata-macio", | 1358 | .driver = { |
1359 | .match_table = pata_macio_match, | 1359 | .name = "pata-macio", |
1360 | .owner = THIS_MODULE, | ||
1361 | .of_match_table = pata_macio_match, | ||
1362 | }, | ||
1360 | .probe = pata_macio_attach, | 1363 | .probe = pata_macio_attach, |
1361 | .remove = pata_macio_detach, | 1364 | .remove = pata_macio_detach, |
1362 | #ifdef CONFIG_PM | 1365 | #ifdef CONFIG_PM |
@@ -1366,9 +1369,6 @@ static struct macio_driver pata_macio_driver = | |||
1366 | #ifdef CONFIG_PMAC_MEDIABAY | 1369 | #ifdef CONFIG_PMAC_MEDIABAY |
1367 | .mediabay_event = pata_macio_mb_event, | 1370 | .mediabay_event = pata_macio_mb_event, |
1368 | #endif | 1371 | #endif |
1369 | .driver = { | ||
1370 | .owner = THIS_MODULE, | ||
1371 | }, | ||
1372 | }; | 1372 | }; |
1373 | 1373 | ||
1374 | static const struct pci_device_id pata_macio_pci_match[] = { | 1374 | static const struct pci_device_id pata_macio_pci_match[] = { |
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c index 6fd11478411..21161136cad 100644 --- a/drivers/ata/sata_nv.c +++ b/drivers/ata/sata_nv.c | |||
@@ -1669,7 +1669,6 @@ static void nv_mcp55_freeze(struct ata_port *ap) | |||
1669 | mask = readl(mmio_base + NV_INT_ENABLE_MCP55); | 1669 | mask = readl(mmio_base + NV_INT_ENABLE_MCP55); |
1670 | mask &= ~(NV_INT_ALL_MCP55 << shift); | 1670 | mask &= ~(NV_INT_ALL_MCP55 << shift); |
1671 | writel(mask, mmio_base + NV_INT_ENABLE_MCP55); | 1671 | writel(mask, mmio_base + NV_INT_ENABLE_MCP55); |
1672 | ata_sff_freeze(ap); | ||
1673 | } | 1672 | } |
1674 | 1673 | ||
1675 | static void nv_mcp55_thaw(struct ata_port *ap) | 1674 | static void nv_mcp55_thaw(struct ata_port *ap) |
@@ -1683,7 +1682,6 @@ static void nv_mcp55_thaw(struct ata_port *ap) | |||
1683 | mask = readl(mmio_base + NV_INT_ENABLE_MCP55); | 1682 | mask = readl(mmio_base + NV_INT_ENABLE_MCP55); |
1684 | mask |= (NV_INT_MASK_MCP55 << shift); | 1683 | mask |= (NV_INT_MASK_MCP55 << shift); |
1685 | writel(mask, mmio_base + NV_INT_ENABLE_MCP55); | 1684 | writel(mask, mmio_base + NV_INT_ENABLE_MCP55); |
1686 | ata_sff_thaw(ap); | ||
1687 | } | 1685 | } |
1688 | 1686 | ||
1689 | static void nv_adma_error_handler(struct ata_port *ap) | 1687 | static void nv_adma_error_handler(struct ata_port *ap) |
diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c index 101d8c219ca..0ecd0f6aa2c 100644 --- a/drivers/ata/sata_via.c +++ b/drivers/ata/sata_via.c | |||
@@ -575,6 +575,19 @@ static void svia_configure(struct pci_dev *pdev) | |||
575 | tmp8 |= NATIVE_MODE_ALL; | 575 | tmp8 |= NATIVE_MODE_ALL; |
576 | pci_write_config_byte(pdev, SATA_NATIVE_MODE, tmp8); | 576 | pci_write_config_byte(pdev, SATA_NATIVE_MODE, tmp8); |
577 | } | 577 | } |
578 | |||
579 | /* | ||
580 | * vt6421 has problems talking to some drives. The following | ||
581 | * is the magic fix from Joseph Chan <JosephChan@via.com.tw>. | ||
582 | * Please add proper documentation if possible. | ||
583 | * | ||
584 | * https://bugzilla.kernel.org/show_bug.cgi?id=15173 | ||
585 | */ | ||
586 | if (pdev->device == 0x3249) { | ||
587 | pci_read_config_byte(pdev, 0x52, &tmp8); | ||
588 | tmp8 |= 1 << 2; | ||
589 | pci_write_config_byte(pdev, 0x52, tmp8); | ||
590 | } | ||
578 | } | 591 | } |
579 | 592 | ||
580 | static int svia_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | 593 | static int svia_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) |
diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c index 52f2d11bc7b..ed6fb91123a 100644 --- a/drivers/block/swim3.c +++ b/drivers/block/swim3.c | |||
@@ -1159,8 +1159,10 @@ static struct of_device_id swim3_match[] = | |||
1159 | 1159 | ||
1160 | static struct macio_driver swim3_driver = | 1160 | static struct macio_driver swim3_driver = |
1161 | { | 1161 | { |
1162 | .name = "swim3", | 1162 | .driver = { |
1163 | .match_table = swim3_match, | 1163 | .name = "swim3", |
1164 | .of_match_table = swim3_match, | ||
1165 | }, | ||
1164 | .probe = swim3_attach, | 1166 | .probe = swim3_attach, |
1165 | #if 0 | 1167 | #if 0 |
1166 | .suspend = swim3_suspend, | 1168 | .suspend = swim3_suspend, |
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index 83fa09a836c..258bc2ae288 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c | |||
@@ -298,7 +298,9 @@ static int __devinit virtblk_probe(struct virtio_device *vdev) | |||
298 | err = virtio_config_val(vdev, VIRTIO_BLK_F_SEG_MAX, | 298 | err = virtio_config_val(vdev, VIRTIO_BLK_F_SEG_MAX, |
299 | offsetof(struct virtio_blk_config, seg_max), | 299 | offsetof(struct virtio_blk_config, seg_max), |
300 | &sg_elems); | 300 | &sg_elems); |
301 | if (err) | 301 | |
302 | /* We need at least one SG element, whatever they say. */ | ||
303 | if (err || !sg_elems) | ||
302 | sg_elems = 1; | 304 | sg_elems = 1; |
303 | 305 | ||
304 | /* We need an extra sg elements at head and tail. */ | 306 | /* We need an extra sg elements at head and tail. */ |
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c index e8ea6825822..9344216183a 100644 --- a/drivers/char/agp/intel-gtt.c +++ b/drivers/char/agp/intel-gtt.c | |||
@@ -1059,7 +1059,7 @@ static void intel_i9xx_setup_flush(void) | |||
1059 | } | 1059 | } |
1060 | } | 1060 | } |
1061 | 1061 | ||
1062 | static int intel_i915_configure(void) | 1062 | static int intel_i9xx_configure(void) |
1063 | { | 1063 | { |
1064 | struct aper_size_info_fixed *current_size; | 1064 | struct aper_size_info_fixed *current_size; |
1065 | u32 temp; | 1065 | u32 temp; |
@@ -1207,6 +1207,38 @@ static int intel_i9xx_fetch_size(void) | |||
1207 | return 0; | 1207 | return 0; |
1208 | } | 1208 | } |
1209 | 1209 | ||
1210 | static int intel_i915_get_gtt_size(void) | ||
1211 | { | ||
1212 | int size; | ||
1213 | |||
1214 | if (IS_G33) { | ||
1215 | u16 gmch_ctrl; | ||
1216 | |||
1217 | /* G33's GTT size defined in gmch_ctrl */ | ||
1218 | pci_read_config_word(agp_bridge->dev, I830_GMCH_CTRL, &gmch_ctrl); | ||
1219 | switch (gmch_ctrl & G33_PGETBL_SIZE_MASK) { | ||
1220 | case G33_PGETBL_SIZE_1M: | ||
1221 | size = 1024; | ||
1222 | break; | ||
1223 | case G33_PGETBL_SIZE_2M: | ||
1224 | size = 2048; | ||
1225 | break; | ||
1226 | default: | ||
1227 | dev_info(&agp_bridge->dev->dev, | ||
1228 | "unknown page table size 0x%x, assuming 512KB\n", | ||
1229 | (gmch_ctrl & G33_PGETBL_SIZE_MASK)); | ||
1230 | size = 512; | ||
1231 | } | ||
1232 | } else { | ||
1233 | /* On previous hardware, the GTT size was just what was | ||
1234 | * required to map the aperture. | ||
1235 | */ | ||
1236 | size = agp_bridge->driver->fetch_size(); | ||
1237 | } | ||
1238 | |||
1239 | return KB(size); | ||
1240 | } | ||
1241 | |||
1210 | /* The intel i915 automatically initializes the agp aperture during POST. | 1242 | /* The intel i915 automatically initializes the agp aperture during POST. |
1211 | * Use the memory already set aside for in the GTT. | 1243 | * Use the memory already set aside for in the GTT. |
1212 | */ | 1244 | */ |
@@ -1216,7 +1248,7 @@ static int intel_i915_create_gatt_table(struct agp_bridge_data *bridge) | |||
1216 | struct aper_size_info_fixed *size; | 1248 | struct aper_size_info_fixed *size; |
1217 | int num_entries; | 1249 | int num_entries; |
1218 | u32 temp, temp2; | 1250 | u32 temp, temp2; |
1219 | int gtt_map_size = 256 * 1024; | 1251 | int gtt_map_size; |
1220 | 1252 | ||
1221 | size = agp_bridge->current_size; | 1253 | size = agp_bridge->current_size; |
1222 | page_order = size->page_order; | 1254 | page_order = size->page_order; |
@@ -1226,8 +1258,8 @@ static int intel_i915_create_gatt_table(struct agp_bridge_data *bridge) | |||
1226 | pci_read_config_dword(intel_private.pcidev, I915_MMADDR, &temp); | 1258 | pci_read_config_dword(intel_private.pcidev, I915_MMADDR, &temp); |
1227 | pci_read_config_dword(intel_private.pcidev, I915_PTEADDR, &temp2); | 1259 | pci_read_config_dword(intel_private.pcidev, I915_PTEADDR, &temp2); |
1228 | 1260 | ||
1229 | if (IS_G33) | 1261 | gtt_map_size = intel_i915_get_gtt_size(); |
1230 | gtt_map_size = 1024 * 1024; /* 1M on G33 */ | 1262 | |
1231 | intel_private.gtt = ioremap(temp2, gtt_map_size); | 1263 | intel_private.gtt = ioremap(temp2, gtt_map_size); |
1232 | if (!intel_private.gtt) | 1264 | if (!intel_private.gtt) |
1233 | return -ENOMEM; | 1265 | return -ENOMEM; |
@@ -1422,7 +1454,7 @@ static const struct agp_bridge_driver intel_915_driver = { | |||
1422 | .size_type = FIXED_APER_SIZE, | 1454 | .size_type = FIXED_APER_SIZE, |
1423 | .num_aperture_sizes = 4, | 1455 | .num_aperture_sizes = 4, |
1424 | .needs_scratch_page = true, | 1456 | .needs_scratch_page = true, |
1425 | .configure = intel_i915_configure, | 1457 | .configure = intel_i9xx_configure, |
1426 | .fetch_size = intel_i9xx_fetch_size, | 1458 | .fetch_size = intel_i9xx_fetch_size, |
1427 | .cleanup = intel_i915_cleanup, | 1459 | .cleanup = intel_i915_cleanup, |
1428 | .mask_memory = intel_i810_mask_memory, | 1460 | .mask_memory = intel_i810_mask_memory, |
@@ -1455,7 +1487,7 @@ static const struct agp_bridge_driver intel_i965_driver = { | |||
1455 | .size_type = FIXED_APER_SIZE, | 1487 | .size_type = FIXED_APER_SIZE, |
1456 | .num_aperture_sizes = 4, | 1488 | .num_aperture_sizes = 4, |
1457 | .needs_scratch_page = true, | 1489 | .needs_scratch_page = true, |
1458 | .configure = intel_i915_configure, | 1490 | .configure = intel_i9xx_configure, |
1459 | .fetch_size = intel_i9xx_fetch_size, | 1491 | .fetch_size = intel_i9xx_fetch_size, |
1460 | .cleanup = intel_i915_cleanup, | 1492 | .cleanup = intel_i915_cleanup, |
1461 | .mask_memory = intel_i965_mask_memory, | 1493 | .mask_memory = intel_i965_mask_memory, |
@@ -1488,7 +1520,7 @@ static const struct agp_bridge_driver intel_g33_driver = { | |||
1488 | .size_type = FIXED_APER_SIZE, | 1520 | .size_type = FIXED_APER_SIZE, |
1489 | .num_aperture_sizes = 4, | 1521 | .num_aperture_sizes = 4, |
1490 | .needs_scratch_page = true, | 1522 | .needs_scratch_page = true, |
1491 | .configure = intel_i915_configure, | 1523 | .configure = intel_i9xx_configure, |
1492 | .fetch_size = intel_i9xx_fetch_size, | 1524 | .fetch_size = intel_i9xx_fetch_size, |
1493 | .cleanup = intel_i915_cleanup, | 1525 | .cleanup = intel_i915_cleanup, |
1494 | .mask_memory = intel_i965_mask_memory, | 1526 | .mask_memory = intel_i965_mask_memory, |
diff --git a/drivers/char/agp/uninorth-agp.c b/drivers/char/agp/uninorth-agp.c index 95db71360d2..f845a8f718b 100644 --- a/drivers/char/agp/uninorth-agp.c +++ b/drivers/char/agp/uninorth-agp.c | |||
@@ -415,7 +415,7 @@ static int uninorth_create_gatt_table(struct agp_bridge_data *bridge) | |||
415 | bridge->gatt_table_real = (u32 *) table; | 415 | bridge->gatt_table_real = (u32 *) table; |
416 | /* Need to clear out any dirty data still sitting in caches */ | 416 | /* Need to clear out any dirty data still sitting in caches */ |
417 | flush_dcache_range((unsigned long)table, | 417 | flush_dcache_range((unsigned long)table, |
418 | (unsigned long)(table_end + PAGE_SIZE)); | 418 | (unsigned long)table_end + 1); |
419 | bridge->gatt_table = vmap(pages, (1 << page_order), 0, PAGE_KERNEL_NCG); | 419 | bridge->gatt_table = vmap(pages, (1 << page_order), 0, PAGE_KERNEL_NCG); |
420 | 420 | ||
421 | if (bridge->gatt_table == NULL) | 421 | if (bridge->gatt_table == NULL) |
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c index 8c99bf1b5e9..942a9826bd2 100644 --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c | |||
@@ -529,6 +529,10 @@ static bool will_write_block(struct port *port) | |||
529 | { | 529 | { |
530 | bool ret; | 530 | bool ret; |
531 | 531 | ||
532 | if (!port->guest_connected) { | ||
533 | /* Port got hot-unplugged. Let's exit. */ | ||
534 | return false; | ||
535 | } | ||
532 | if (!port->host_connected) | 536 | if (!port->host_connected) |
533 | return true; | 537 | return true; |
534 | 538 | ||
@@ -1099,6 +1103,13 @@ static int remove_port(struct port *port) | |||
1099 | { | 1103 | { |
1100 | struct port_buffer *buf; | 1104 | struct port_buffer *buf; |
1101 | 1105 | ||
1106 | if (port->guest_connected) { | ||
1107 | port->guest_connected = false; | ||
1108 | port->host_connected = false; | ||
1109 | wake_up_interruptible(&port->waitqueue); | ||
1110 | send_control_msg(port, VIRTIO_CONSOLE_PORT_OPEN, 0); | ||
1111 | } | ||
1112 | |||
1102 | spin_lock_irq(&port->portdev->ports_lock); | 1113 | spin_lock_irq(&port->portdev->ports_lock); |
1103 | list_del(&port->list); | 1114 | list_del(&port->list); |
1104 | spin_unlock_irq(&port->portdev->ports_lock); | 1115 | spin_unlock_irq(&port->portdev->ports_lock); |
@@ -1120,9 +1131,6 @@ static int remove_port(struct port *port) | |||
1120 | hvc_remove(port->cons.hvc); | 1131 | hvc_remove(port->cons.hvc); |
1121 | #endif | 1132 | #endif |
1122 | } | 1133 | } |
1123 | if (port->guest_connected) | ||
1124 | send_control_msg(port, VIRTIO_CONSOLE_PORT_OPEN, 0); | ||
1125 | |||
1126 | sysfs_remove_group(&port->dev->kobj, &port_attribute_group); | 1134 | sysfs_remove_group(&port->dev->kobj, &port_attribute_group); |
1127 | device_destroy(pdrvdata.class, port->dev->devt); | 1135 | device_destroy(pdrvdata.class, port->dev->devt); |
1128 | cdev_del(&port->cdev); | 1136 | cdev_del(&port->cdev); |
diff --git a/drivers/crypto/amcc/crypto4xx_core.c b/drivers/crypto/amcc/crypto4xx_core.c index 9d65b371de6..983530ba04a 100644 --- a/drivers/crypto/amcc/crypto4xx_core.c +++ b/drivers/crypto/amcc/crypto4xx_core.c | |||
@@ -1158,7 +1158,7 @@ static int __init crypto4xx_probe(struct of_device *ofdev, | |||
1158 | struct device *dev = &ofdev->dev; | 1158 | struct device *dev = &ofdev->dev; |
1159 | struct crypto4xx_core_device *core_dev; | 1159 | struct crypto4xx_core_device *core_dev; |
1160 | 1160 | ||
1161 | rc = of_address_to_resource(ofdev->node, 0, &res); | 1161 | rc = of_address_to_resource(ofdev->dev.of_node, 0, &res); |
1162 | if (rc) | 1162 | if (rc) |
1163 | return -ENODEV; | 1163 | return -ENODEV; |
1164 | 1164 | ||
@@ -1215,13 +1215,13 @@ static int __init crypto4xx_probe(struct of_device *ofdev, | |||
1215 | (unsigned long) dev); | 1215 | (unsigned long) dev); |
1216 | 1216 | ||
1217 | /* Register for Crypto isr, Crypto Engine IRQ */ | 1217 | /* Register for Crypto isr, Crypto Engine IRQ */ |
1218 | core_dev->irq = irq_of_parse_and_map(ofdev->node, 0); | 1218 | core_dev->irq = irq_of_parse_and_map(ofdev->dev.of_node, 0); |
1219 | rc = request_irq(core_dev->irq, crypto4xx_ce_interrupt_handler, 0, | 1219 | rc = request_irq(core_dev->irq, crypto4xx_ce_interrupt_handler, 0, |
1220 | core_dev->dev->name, dev); | 1220 | core_dev->dev->name, dev); |
1221 | if (rc) | 1221 | if (rc) |
1222 | goto err_request_irq; | 1222 | goto err_request_irq; |
1223 | 1223 | ||
1224 | core_dev->dev->ce_base = of_iomap(ofdev->node, 0); | 1224 | core_dev->dev->ce_base = of_iomap(ofdev->dev.of_node, 0); |
1225 | if (!core_dev->dev->ce_base) { | 1225 | if (!core_dev->dev->ce_base) { |
1226 | dev_err(dev, "failed to of_iomap\n"); | 1226 | dev_err(dev, "failed to of_iomap\n"); |
1227 | goto err_iomap; | 1227 | goto err_iomap; |
diff --git a/drivers/crypto/n2_core.c b/drivers/crypto/n2_core.c index 8566be832f5..23163fda503 100644 --- a/drivers/crypto/n2_core.c +++ b/drivers/crypto/n2_core.c | |||
@@ -251,16 +251,10 @@ static void n2_base_ctx_init(struct n2_base_ctx *ctx) | |||
251 | struct n2_hash_ctx { | 251 | struct n2_hash_ctx { |
252 | struct n2_base_ctx base; | 252 | struct n2_base_ctx base; |
253 | 253 | ||
254 | struct crypto_ahash *fallback; | 254 | struct crypto_ahash *fallback_tfm; |
255 | }; | ||
255 | 256 | ||
256 | /* These next three members must match the layout created by | 257 | struct n2_hash_req_ctx { |
257 | * crypto_init_shash_ops_async. This allows us to properly | ||
258 | * plumb requests we can't do in hardware down to the fallback | ||
259 | * operation, providing all of the data structures and layouts | ||
260 | * expected by those paths. | ||
261 | */ | ||
262 | struct ahash_request fallback_req; | ||
263 | struct shash_desc fallback_desc; | ||
264 | union { | 258 | union { |
265 | struct md5_state md5; | 259 | struct md5_state md5; |
266 | struct sha1_state sha1; | 260 | struct sha1_state sha1; |
@@ -269,56 +263,62 @@ struct n2_hash_ctx { | |||
269 | 263 | ||
270 | unsigned char hash_key[64]; | 264 | unsigned char hash_key[64]; |
271 | unsigned char keyed_zero_hash[32]; | 265 | unsigned char keyed_zero_hash[32]; |
266 | |||
267 | struct ahash_request fallback_req; | ||
272 | }; | 268 | }; |
273 | 269 | ||
274 | static int n2_hash_async_init(struct ahash_request *req) | 270 | static int n2_hash_async_init(struct ahash_request *req) |
275 | { | 271 | { |
272 | struct n2_hash_req_ctx *rctx = ahash_request_ctx(req); | ||
276 | struct crypto_ahash *tfm = crypto_ahash_reqtfm(req); | 273 | struct crypto_ahash *tfm = crypto_ahash_reqtfm(req); |
277 | struct n2_hash_ctx *ctx = crypto_ahash_ctx(tfm); | 274 | struct n2_hash_ctx *ctx = crypto_ahash_ctx(tfm); |
278 | 275 | ||
279 | ctx->fallback_req.base.tfm = crypto_ahash_tfm(ctx->fallback); | 276 | ahash_request_set_tfm(&rctx->fallback_req, ctx->fallback_tfm); |
280 | ctx->fallback_req.base.flags = req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP; | 277 | rctx->fallback_req.base.flags = req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP; |
281 | 278 | ||
282 | return crypto_ahash_init(&ctx->fallback_req); | 279 | return crypto_ahash_init(&rctx->fallback_req); |
283 | } | 280 | } |
284 | 281 | ||
285 | static int n2_hash_async_update(struct ahash_request *req) | 282 | static int n2_hash_async_update(struct ahash_request *req) |
286 | { | 283 | { |
284 | struct n2_hash_req_ctx *rctx = ahash_request_ctx(req); | ||
287 | struct crypto_ahash *tfm = crypto_ahash_reqtfm(req); | 285 | struct crypto_ahash *tfm = crypto_ahash_reqtfm(req); |
288 | struct n2_hash_ctx *ctx = crypto_ahash_ctx(tfm); | 286 | struct n2_hash_ctx *ctx = crypto_ahash_ctx(tfm); |
289 | 287 | ||
290 | ctx->fallback_req.base.tfm = crypto_ahash_tfm(ctx->fallback); | 288 | ahash_request_set_tfm(&rctx->fallback_req, ctx->fallback_tfm); |
291 | ctx->fallback_req.base.flags = req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP; | 289 | rctx->fallback_req.base.flags = req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP; |
292 | ctx->fallback_req.nbytes = req->nbytes; | 290 | rctx->fallback_req.nbytes = req->nbytes; |
293 | ctx->fallback_req.src = req->src; | 291 | rctx->fallback_req.src = req->src; |
294 | 292 | ||
295 | return crypto_ahash_update(&ctx->fallback_req); | 293 | return crypto_ahash_update(&rctx->fallback_req); |
296 | } | 294 | } |
297 | 295 | ||
298 | static int n2_hash_async_final(struct ahash_request *req) | 296 | static int n2_hash_async_final(struct ahash_request *req) |
299 | { | 297 | { |
298 | struct n2_hash_req_ctx *rctx = ahash_request_ctx(req); | ||
300 | struct crypto_ahash *tfm = crypto_ahash_reqtfm(req); | 299 | struct crypto_ahash *tfm = crypto_ahash_reqtfm(req); |
301 | struct n2_hash_ctx *ctx = crypto_ahash_ctx(tfm); | 300 | struct n2_hash_ctx *ctx = crypto_ahash_ctx(tfm); |
302 | 301 | ||
303 | ctx->fallback_req.base.tfm = crypto_ahash_tfm(ctx->fallback); | 302 | ahash_request_set_tfm(&rctx->fallback_req, ctx->fallback_tfm); |
304 | ctx->fallback_req.base.flags = req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP; | 303 | rctx->fallback_req.base.flags = req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP; |
305 | ctx->fallback_req.result = req->result; | 304 | rctx->fallback_req.result = req->result; |
306 | 305 | ||
307 | return crypto_ahash_final(&ctx->fallback_req); | 306 | return crypto_ahash_final(&rctx->fallback_req); |
308 | } | 307 | } |
309 | 308 | ||
310 | static int n2_hash_async_finup(struct ahash_request *req) | 309 | static int n2_hash_async_finup(struct ahash_request *req) |
311 | { | 310 | { |
311 | struct n2_hash_req_ctx *rctx = ahash_request_ctx(req); | ||
312 | struct crypto_ahash *tfm = crypto_ahash_reqtfm(req); | 312 | struct crypto_ahash *tfm = crypto_ahash_reqtfm(req); |
313 | struct n2_hash_ctx *ctx = crypto_ahash_ctx(tfm); | 313 | struct n2_hash_ctx *ctx = crypto_ahash_ctx(tfm); |
314 | 314 | ||
315 | ctx->fallback_req.base.tfm = crypto_ahash_tfm(ctx->fallback); | 315 | ahash_request_set_tfm(&rctx->fallback_req, ctx->fallback_tfm); |
316 | ctx->fallback_req.base.flags = req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP; | 316 | rctx->fallback_req.base.flags = req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP; |
317 | ctx->fallback_req.nbytes = req->nbytes; | 317 | rctx->fallback_req.nbytes = req->nbytes; |
318 | ctx->fallback_req.src = req->src; | 318 | rctx->fallback_req.src = req->src; |
319 | ctx->fallback_req.result = req->result; | 319 | rctx->fallback_req.result = req->result; |
320 | 320 | ||
321 | return crypto_ahash_finup(&ctx->fallback_req); | 321 | return crypto_ahash_finup(&rctx->fallback_req); |
322 | } | 322 | } |
323 | 323 | ||
324 | static int n2_hash_cra_init(struct crypto_tfm *tfm) | 324 | static int n2_hash_cra_init(struct crypto_tfm *tfm) |
@@ -338,7 +338,10 @@ static int n2_hash_cra_init(struct crypto_tfm *tfm) | |||
338 | goto out; | 338 | goto out; |
339 | } | 339 | } |
340 | 340 | ||
341 | ctx->fallback = fallback_tfm; | 341 | crypto_ahash_set_reqsize(ahash, (sizeof(struct n2_hash_req_ctx) + |
342 | crypto_ahash_reqsize(fallback_tfm))); | ||
343 | |||
344 | ctx->fallback_tfm = fallback_tfm; | ||
342 | return 0; | 345 | return 0; |
343 | 346 | ||
344 | out: | 347 | out: |
@@ -350,7 +353,7 @@ static void n2_hash_cra_exit(struct crypto_tfm *tfm) | |||
350 | struct crypto_ahash *ahash = __crypto_ahash_cast(tfm); | 353 | struct crypto_ahash *ahash = __crypto_ahash_cast(tfm); |
351 | struct n2_hash_ctx *ctx = crypto_ahash_ctx(ahash); | 354 | struct n2_hash_ctx *ctx = crypto_ahash_ctx(ahash); |
352 | 355 | ||
353 | crypto_free_ahash(ctx->fallback); | 356 | crypto_free_ahash(ctx->fallback_tfm); |
354 | } | 357 | } |
355 | 358 | ||
356 | static unsigned long wait_for_tail(struct spu_queue *qp) | 359 | static unsigned long wait_for_tail(struct spu_queue *qp) |
@@ -399,14 +402,16 @@ static int n2_hash_async_digest(struct ahash_request *req, | |||
399 | * exceed 2^16. | 402 | * exceed 2^16. |
400 | */ | 403 | */ |
401 | if (unlikely(req->nbytes > (1 << 16))) { | 404 | if (unlikely(req->nbytes > (1 << 16))) { |
402 | ctx->fallback_req.base.tfm = crypto_ahash_tfm(ctx->fallback); | 405 | struct n2_hash_req_ctx *rctx = ahash_request_ctx(req); |
403 | ctx->fallback_req.base.flags = | 406 | |
407 | ahash_request_set_tfm(&rctx->fallback_req, ctx->fallback_tfm); | ||
408 | rctx->fallback_req.base.flags = | ||
404 | req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP; | 409 | req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP; |
405 | ctx->fallback_req.nbytes = req->nbytes; | 410 | rctx->fallback_req.nbytes = req->nbytes; |
406 | ctx->fallback_req.src = req->src; | 411 | rctx->fallback_req.src = req->src; |
407 | ctx->fallback_req.result = req->result; | 412 | rctx->fallback_req.result = req->result; |
408 | 413 | ||
409 | return crypto_ahash_digest(&ctx->fallback_req); | 414 | return crypto_ahash_digest(&rctx->fallback_req); |
410 | } | 415 | } |
411 | 416 | ||
412 | n2_base_ctx_init(&ctx->base); | 417 | n2_base_ctx_init(&ctx->base); |
@@ -472,9 +477,8 @@ out: | |||
472 | 477 | ||
473 | static int n2_md5_async_digest(struct ahash_request *req) | 478 | static int n2_md5_async_digest(struct ahash_request *req) |
474 | { | 479 | { |
475 | struct crypto_ahash *tfm = crypto_ahash_reqtfm(req); | 480 | struct n2_hash_req_ctx *rctx = ahash_request_ctx(req); |
476 | struct n2_hash_ctx *ctx = crypto_ahash_ctx(tfm); | 481 | struct md5_state *m = &rctx->u.md5; |
477 | struct md5_state *m = &ctx->u.md5; | ||
478 | 482 | ||
479 | if (unlikely(req->nbytes == 0)) { | 483 | if (unlikely(req->nbytes == 0)) { |
480 | static const char md5_zero[MD5_DIGEST_SIZE] = { | 484 | static const char md5_zero[MD5_DIGEST_SIZE] = { |
@@ -497,9 +501,8 @@ static int n2_md5_async_digest(struct ahash_request *req) | |||
497 | 501 | ||
498 | static int n2_sha1_async_digest(struct ahash_request *req) | 502 | static int n2_sha1_async_digest(struct ahash_request *req) |
499 | { | 503 | { |
500 | struct crypto_ahash *tfm = crypto_ahash_reqtfm(req); | 504 | struct n2_hash_req_ctx *rctx = ahash_request_ctx(req); |
501 | struct n2_hash_ctx *ctx = crypto_ahash_ctx(tfm); | 505 | struct sha1_state *s = &rctx->u.sha1; |
502 | struct sha1_state *s = &ctx->u.sha1; | ||
503 | 506 | ||
504 | if (unlikely(req->nbytes == 0)) { | 507 | if (unlikely(req->nbytes == 0)) { |
505 | static const char sha1_zero[SHA1_DIGEST_SIZE] = { | 508 | static const char sha1_zero[SHA1_DIGEST_SIZE] = { |
@@ -524,9 +527,8 @@ static int n2_sha1_async_digest(struct ahash_request *req) | |||
524 | 527 | ||
525 | static int n2_sha256_async_digest(struct ahash_request *req) | 528 | static int n2_sha256_async_digest(struct ahash_request *req) |
526 | { | 529 | { |
527 | struct crypto_ahash *tfm = crypto_ahash_reqtfm(req); | 530 | struct n2_hash_req_ctx *rctx = ahash_request_ctx(req); |
528 | struct n2_hash_ctx *ctx = crypto_ahash_ctx(tfm); | 531 | struct sha256_state *s = &rctx->u.sha256; |
529 | struct sha256_state *s = &ctx->u.sha256; | ||
530 | 532 | ||
531 | if (req->nbytes == 0) { | 533 | if (req->nbytes == 0) { |
532 | static const char sha256_zero[SHA256_DIGEST_SIZE] = { | 534 | static const char sha256_zero[SHA256_DIGEST_SIZE] = { |
@@ -555,9 +557,8 @@ static int n2_sha256_async_digest(struct ahash_request *req) | |||
555 | 557 | ||
556 | static int n2_sha224_async_digest(struct ahash_request *req) | 558 | static int n2_sha224_async_digest(struct ahash_request *req) |
557 | { | 559 | { |
558 | struct crypto_ahash *tfm = crypto_ahash_reqtfm(req); | 560 | struct n2_hash_req_ctx *rctx = ahash_request_ctx(req); |
559 | struct n2_hash_ctx *ctx = crypto_ahash_ctx(tfm); | 561 | struct sha256_state *s = &rctx->u.sha256; |
560 | struct sha256_state *s = &ctx->u.sha256; | ||
561 | 562 | ||
562 | if (req->nbytes == 0) { | 563 | if (req->nbytes == 0) { |
563 | static const char sha224_zero[SHA224_DIGEST_SIZE] = { | 564 | static const char sha224_zero[SHA224_DIGEST_SIZE] = { |
@@ -1398,7 +1399,7 @@ static int find_devino_index(struct of_device *dev, struct spu_mdesc_info *ip, | |||
1398 | 1399 | ||
1399 | intr = ip->ino_table[i].intr; | 1400 | intr = ip->ino_table[i].intr; |
1400 | 1401 | ||
1401 | dev_intrs = of_get_property(dev->node, "interrupts", NULL); | 1402 | dev_intrs = of_get_property(dev->dev.of_node, "interrupts", NULL); |
1402 | if (!dev_intrs) | 1403 | if (!dev_intrs) |
1403 | return -ENODEV; | 1404 | return -ENODEV; |
1404 | 1405 | ||
@@ -1449,7 +1450,7 @@ static int queue_cache_init(void) | |||
1449 | { | 1450 | { |
1450 | if (!queue_cache[HV_NCS_QTYPE_MAU - 1]) | 1451 | if (!queue_cache[HV_NCS_QTYPE_MAU - 1]) |
1451 | queue_cache[HV_NCS_QTYPE_MAU - 1] = | 1452 | queue_cache[HV_NCS_QTYPE_MAU - 1] = |
1452 | kmem_cache_create("cwq_queue", | 1453 | kmem_cache_create("mau_queue", |
1453 | (MAU_NUM_ENTRIES * | 1454 | (MAU_NUM_ENTRIES * |
1454 | MAU_ENTRY_SIZE), | 1455 | MAU_ENTRY_SIZE), |
1455 | MAU_ENTRY_SIZE, 0, NULL); | 1456 | MAU_ENTRY_SIZE, 0, NULL); |
@@ -1574,7 +1575,7 @@ static int spu_mdesc_walk_arcs(struct mdesc_handle *mdesc, | |||
1574 | id = mdesc_get_property(mdesc, tgt, "id", NULL); | 1575 | id = mdesc_get_property(mdesc, tgt, "id", NULL); |
1575 | if (table[*id] != NULL) { | 1576 | if (table[*id] != NULL) { |
1576 | dev_err(&dev->dev, "%s: SPU cpu slot already set.\n", | 1577 | dev_err(&dev->dev, "%s: SPU cpu slot already set.\n", |
1577 | dev->node->full_name); | 1578 | dev->dev.of_node->full_name); |
1578 | return -EINVAL; | 1579 | return -EINVAL; |
1579 | } | 1580 | } |
1580 | cpu_set(*id, p->sharing); | 1581 | cpu_set(*id, p->sharing); |
@@ -1595,7 +1596,7 @@ static int handle_exec_unit(struct spu_mdesc_info *ip, struct list_head *list, | |||
1595 | p = kzalloc(sizeof(struct spu_queue), GFP_KERNEL); | 1596 | p = kzalloc(sizeof(struct spu_queue), GFP_KERNEL); |
1596 | if (!p) { | 1597 | if (!p) { |
1597 | dev_err(&dev->dev, "%s: Could not allocate SPU queue.\n", | 1598 | dev_err(&dev->dev, "%s: Could not allocate SPU queue.\n", |
1598 | dev->node->full_name); | 1599 | dev->dev.of_node->full_name); |
1599 | return -ENOMEM; | 1600 | return -ENOMEM; |
1600 | } | 1601 | } |
1601 | 1602 | ||
@@ -1684,7 +1685,7 @@ static int __devinit grab_mdesc_irq_props(struct mdesc_handle *mdesc, | |||
1684 | const unsigned int *reg; | 1685 | const unsigned int *reg; |
1685 | u64 node; | 1686 | u64 node; |
1686 | 1687 | ||
1687 | reg = of_get_property(dev->node, "reg", NULL); | 1688 | reg = of_get_property(dev->dev.of_node, "reg", NULL); |
1688 | if (!reg) | 1689 | if (!reg) |
1689 | return -ENODEV; | 1690 | return -ENODEV; |
1690 | 1691 | ||
@@ -1836,7 +1837,7 @@ static int __devinit n2_crypto_probe(struct of_device *dev, | |||
1836 | 1837 | ||
1837 | n2_spu_driver_version(); | 1838 | n2_spu_driver_version(); |
1838 | 1839 | ||
1839 | full_name = dev->node->full_name; | 1840 | full_name = dev->dev.of_node->full_name; |
1840 | pr_info("Found N2CP at %s\n", full_name); | 1841 | pr_info("Found N2CP at %s\n", full_name); |
1841 | 1842 | ||
1842 | np = alloc_n2cp(); | 1843 | np = alloc_n2cp(); |
@@ -1948,7 +1949,7 @@ static int __devinit n2_mau_probe(struct of_device *dev, | |||
1948 | 1949 | ||
1949 | n2_spu_driver_version(); | 1950 | n2_spu_driver_version(); |
1950 | 1951 | ||
1951 | full_name = dev->node->full_name; | 1952 | full_name = dev->dev.of_node->full_name; |
1952 | pr_info("Found NCP at %s\n", full_name); | 1953 | pr_info("Found NCP at %s\n", full_name); |
1953 | 1954 | ||
1954 | mp = alloc_ncp(); | 1955 | mp = alloc_ncp(); |
@@ -2034,8 +2035,11 @@ static struct of_device_id n2_crypto_match[] = { | |||
2034 | MODULE_DEVICE_TABLE(of, n2_crypto_match); | 2035 | MODULE_DEVICE_TABLE(of, n2_crypto_match); |
2035 | 2036 | ||
2036 | static struct of_platform_driver n2_crypto_driver = { | 2037 | static struct of_platform_driver n2_crypto_driver = { |
2037 | .name = "n2cp", | 2038 | .driver = { |
2038 | .match_table = n2_crypto_match, | 2039 | .name = "n2cp", |
2040 | .owner = THIS_MODULE, | ||
2041 | .of_match_table = n2_crypto_match, | ||
2042 | }, | ||
2039 | .probe = n2_crypto_probe, | 2043 | .probe = n2_crypto_probe, |
2040 | .remove = __devexit_p(n2_crypto_remove), | 2044 | .remove = __devexit_p(n2_crypto_remove), |
2041 | }; | 2045 | }; |
@@ -2055,8 +2059,11 @@ static struct of_device_id n2_mau_match[] = { | |||
2055 | MODULE_DEVICE_TABLE(of, n2_mau_match); | 2059 | MODULE_DEVICE_TABLE(of, n2_mau_match); |
2056 | 2060 | ||
2057 | static struct of_platform_driver n2_mau_driver = { | 2061 | static struct of_platform_driver n2_mau_driver = { |
2058 | .name = "ncp", | 2062 | .driver = { |
2059 | .match_table = n2_mau_match, | 2063 | .name = "ncp", |
2064 | .owner = THIS_MODULE, | ||
2065 | .of_match_table = n2_mau_match, | ||
2066 | }, | ||
2060 | .probe = n2_mau_probe, | 2067 | .probe = n2_mau_probe, |
2061 | .remove = __devexit_p(n2_mau_remove), | 2068 | .remove = __devexit_p(n2_mau_remove), |
2062 | }; | 2069 | }; |
diff --git a/drivers/dma/mpc512x_dma.c b/drivers/dma/mpc512x_dma.c index 201e6e19c34..14a8c0f1698 100644 --- a/drivers/dma/mpc512x_dma.c +++ b/drivers/dma/mpc512x_dma.c | |||
@@ -630,7 +630,7 @@ mpc_dma_prep_memcpy(struct dma_chan *chan, dma_addr_t dst, dma_addr_t src, | |||
630 | static int __devinit mpc_dma_probe(struct of_device *op, | 630 | static int __devinit mpc_dma_probe(struct of_device *op, |
631 | const struct of_device_id *match) | 631 | const struct of_device_id *match) |
632 | { | 632 | { |
633 | struct device_node *dn = op->node; | 633 | struct device_node *dn = op->dev.of_node; |
634 | struct device *dev = &op->dev; | 634 | struct device *dev = &op->dev; |
635 | struct dma_device *dma; | 635 | struct dma_device *dma; |
636 | struct mpc_dma *mdma; | 636 | struct mpc_dma *mdma; |
@@ -771,12 +771,12 @@ static struct of_device_id mpc_dma_match[] = { | |||
771 | }; | 771 | }; |
772 | 772 | ||
773 | static struct of_platform_driver mpc_dma_driver = { | 773 | static struct of_platform_driver mpc_dma_driver = { |
774 | .match_table = mpc_dma_match, | ||
775 | .probe = mpc_dma_probe, | 774 | .probe = mpc_dma_probe, |
776 | .remove = __devexit_p(mpc_dma_remove), | 775 | .remove = __devexit_p(mpc_dma_remove), |
777 | .driver = { | 776 | .driver = { |
778 | .name = DRV_NAME, | 777 | .name = DRV_NAME, |
779 | .owner = THIS_MODULE, | 778 | .owner = THIS_MODULE, |
779 | .of_match_table = mpc_dma_match, | ||
780 | }, | 780 | }, |
781 | }; | 781 | }; |
782 | 782 | ||
diff --git a/drivers/dma/ppc4xx/adma.c b/drivers/dma/ppc4xx/adma.c index fa98abe4686..5a22ca6927e 100644 --- a/drivers/dma/ppc4xx/adma.c +++ b/drivers/dma/ppc4xx/adma.c | |||
@@ -4394,7 +4394,7 @@ static void ppc440spe_adma_release_irqs(struct ppc440spe_adma_device *adev, | |||
4394 | static int __devinit ppc440spe_adma_probe(struct of_device *ofdev, | 4394 | static int __devinit ppc440spe_adma_probe(struct of_device *ofdev, |
4395 | const struct of_device_id *match) | 4395 | const struct of_device_id *match) |
4396 | { | 4396 | { |
4397 | struct device_node *np = ofdev->node; | 4397 | struct device_node *np = ofdev->dev.of_node; |
4398 | struct resource res; | 4398 | struct resource res; |
4399 | struct ppc440spe_adma_device *adev; | 4399 | struct ppc440spe_adma_device *adev; |
4400 | struct ppc440spe_adma_chan *chan; | 4400 | struct ppc440spe_adma_chan *chan; |
@@ -4626,7 +4626,7 @@ out: | |||
4626 | static int __devexit ppc440spe_adma_remove(struct of_device *ofdev) | 4626 | static int __devexit ppc440spe_adma_remove(struct of_device *ofdev) |
4627 | { | 4627 | { |
4628 | struct ppc440spe_adma_device *adev = dev_get_drvdata(&ofdev->dev); | 4628 | struct ppc440spe_adma_device *adev = dev_get_drvdata(&ofdev->dev); |
4629 | struct device_node *np = ofdev->node; | 4629 | struct device_node *np = ofdev->dev.of_node; |
4630 | struct resource res; | 4630 | struct resource res; |
4631 | struct dma_chan *chan, *_chan; | 4631 | struct dma_chan *chan, *_chan; |
4632 | struct ppc_dma_chan_ref *ref, *_ref; | 4632 | struct ppc_dma_chan_ref *ref, *_ref; |
diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c index 6c1886b497f..52ca09bf472 100644 --- a/drivers/edac/mpc85xx_edac.c +++ b/drivers/edac/mpc85xx_edac.c | |||
@@ -229,7 +229,7 @@ static int __devinit mpc85xx_pci_err_probe(struct of_device *op, | |||
229 | 229 | ||
230 | pdata->edac_idx = edac_pci_idx++; | 230 | pdata->edac_idx = edac_pci_idx++; |
231 | 231 | ||
232 | res = of_address_to_resource(op->node, 0, &r); | 232 | res = of_address_to_resource(op->dev.of_node, 0, &r); |
233 | if (res) { | 233 | if (res) { |
234 | printk(KERN_ERR "%s: Unable to get resource for " | 234 | printk(KERN_ERR "%s: Unable to get resource for " |
235 | "PCI err regs\n", __func__); | 235 | "PCI err regs\n", __func__); |
@@ -274,7 +274,7 @@ static int __devinit mpc85xx_pci_err_probe(struct of_device *op, | |||
274 | } | 274 | } |
275 | 275 | ||
276 | if (edac_op_state == EDAC_OPSTATE_INT) { | 276 | if (edac_op_state == EDAC_OPSTATE_INT) { |
277 | pdata->irq = irq_of_parse_and_map(op->node, 0); | 277 | pdata->irq = irq_of_parse_and_map(op->dev.of_node, 0); |
278 | res = devm_request_irq(&op->dev, pdata->irq, | 278 | res = devm_request_irq(&op->dev, pdata->irq, |
279 | mpc85xx_pci_isr, IRQF_DISABLED, | 279 | mpc85xx_pci_isr, IRQF_DISABLED, |
280 | "[EDAC] PCI err", pci); | 280 | "[EDAC] PCI err", pci); |
@@ -529,7 +529,7 @@ static int __devinit mpc85xx_l2_err_probe(struct of_device *op, | |||
529 | edac_dev->ctl_name = pdata->name; | 529 | edac_dev->ctl_name = pdata->name; |
530 | edac_dev->dev_name = pdata->name; | 530 | edac_dev->dev_name = pdata->name; |
531 | 531 | ||
532 | res = of_address_to_resource(op->node, 0, &r); | 532 | res = of_address_to_resource(op->dev.of_node, 0, &r); |
533 | if (res) { | 533 | if (res) { |
534 | printk(KERN_ERR "%s: Unable to get resource for " | 534 | printk(KERN_ERR "%s: Unable to get resource for " |
535 | "L2 err regs\n", __func__); | 535 | "L2 err regs\n", __func__); |
@@ -576,7 +576,7 @@ static int __devinit mpc85xx_l2_err_probe(struct of_device *op, | |||
576 | } | 576 | } |
577 | 577 | ||
578 | if (edac_op_state == EDAC_OPSTATE_INT) { | 578 | if (edac_op_state == EDAC_OPSTATE_INT) { |
579 | pdata->irq = irq_of_parse_and_map(op->node, 0); | 579 | pdata->irq = irq_of_parse_and_map(op->dev.of_node, 0); |
580 | res = devm_request_irq(&op->dev, pdata->irq, | 580 | res = devm_request_irq(&op->dev, pdata->irq, |
581 | mpc85xx_l2_isr, IRQF_DISABLED, | 581 | mpc85xx_l2_isr, IRQF_DISABLED, |
582 | "[EDAC] L2 err", edac_dev); | 582 | "[EDAC] L2 err", edac_dev); |
@@ -978,7 +978,7 @@ static int __devinit mpc85xx_mc_err_probe(struct of_device *op, | |||
978 | mci->ctl_name = pdata->name; | 978 | mci->ctl_name = pdata->name; |
979 | mci->dev_name = pdata->name; | 979 | mci->dev_name = pdata->name; |
980 | 980 | ||
981 | res = of_address_to_resource(op->node, 0, &r); | 981 | res = of_address_to_resource(op->dev.of_node, 0, &r); |
982 | if (res) { | 982 | if (res) { |
983 | printk(KERN_ERR "%s: Unable to get resource for MC err regs\n", | 983 | printk(KERN_ERR "%s: Unable to get resource for MC err regs\n", |
984 | __func__); | 984 | __func__); |
@@ -1052,7 +1052,7 @@ static int __devinit mpc85xx_mc_err_probe(struct of_device *op, | |||
1052 | out_be32(pdata->mc_vbase + MPC85XX_MC_ERR_SBE, 0x10000); | 1052 | out_be32(pdata->mc_vbase + MPC85XX_MC_ERR_SBE, 0x10000); |
1053 | 1053 | ||
1054 | /* register interrupts */ | 1054 | /* register interrupts */ |
1055 | pdata->irq = irq_of_parse_and_map(op->node, 0); | 1055 | pdata->irq = irq_of_parse_and_map(op->dev.of_node, 0); |
1056 | res = devm_request_irq(&op->dev, pdata->irq, | 1056 | res = devm_request_irq(&op->dev, pdata->irq, |
1057 | mpc85xx_mc_isr, | 1057 | mpc85xx_mc_isr, |
1058 | IRQF_DISABLED | IRQF_SHARED, | 1058 | IRQF_DISABLED | IRQF_SHARED, |
diff --git a/drivers/edac/ppc4xx_edac.c b/drivers/edac/ppc4xx_edac.c index 9d6f6783328..e78839e89a0 100644 --- a/drivers/edac/ppc4xx_edac.c +++ b/drivers/edac/ppc4xx_edac.c | |||
@@ -1022,7 +1022,7 @@ ppc4xx_edac_mc_init(struct mem_ctl_info *mci, | |||
1022 | int status = 0; | 1022 | int status = 0; |
1023 | const u32 memcheck = (mcopt1 & SDRAM_MCOPT1_MCHK_MASK); | 1023 | const u32 memcheck = (mcopt1 & SDRAM_MCOPT1_MCHK_MASK); |
1024 | struct ppc4xx_edac_pdata *pdata = NULL; | 1024 | struct ppc4xx_edac_pdata *pdata = NULL; |
1025 | const struct device_node *np = op->node; | 1025 | const struct device_node *np = op->dev.of_node; |
1026 | 1026 | ||
1027 | if (match == NULL) | 1027 | if (match == NULL) |
1028 | return -EINVAL; | 1028 | return -EINVAL; |
@@ -1113,7 +1113,7 @@ ppc4xx_edac_register_irq(struct of_device *op, struct mem_ctl_info *mci) | |||
1113 | int status = 0; | 1113 | int status = 0; |
1114 | int ded_irq, sec_irq; | 1114 | int ded_irq, sec_irq; |
1115 | struct ppc4xx_edac_pdata *pdata = mci->pvt_info; | 1115 | struct ppc4xx_edac_pdata *pdata = mci->pvt_info; |
1116 | struct device_node *np = op->node; | 1116 | struct device_node *np = op->dev.of_node; |
1117 | 1117 | ||
1118 | ded_irq = irq_of_parse_and_map(np, INTMAP_ECCDED_INDEX); | 1118 | ded_irq = irq_of_parse_and_map(np, INTMAP_ECCDED_INDEX); |
1119 | sec_irq = irq_of_parse_and_map(np, INTMAP_ECCSEC_INDEX); | 1119 | sec_irq = irq_of_parse_and_map(np, INTMAP_ECCSEC_INDEX); |
@@ -1243,7 +1243,7 @@ ppc4xx_edac_probe(struct of_device *op, const struct of_device_id *match) | |||
1243 | int status = 0; | 1243 | int status = 0; |
1244 | u32 mcopt1, memcheck; | 1244 | u32 mcopt1, memcheck; |
1245 | dcr_host_t dcr_host; | 1245 | dcr_host_t dcr_host; |
1246 | const struct device_node *np = op->node; | 1246 | const struct device_node *np = op->dev.of_node; |
1247 | struct mem_ctl_info *mci = NULL; | 1247 | struct mem_ctl_info *mci = NULL; |
1248 | static int ppc4xx_edac_instance; | 1248 | static int ppc4xx_edac_instance; |
1249 | 1249 | ||
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c index 76440195104..9b2a54117c9 100644 --- a/drivers/gpu/drm/drm_crtc_helper.c +++ b/drivers/gpu/drm/drm_crtc_helper.c | |||
@@ -860,19 +860,24 @@ static void output_poll_execute(struct slow_work *work) | |||
860 | } | 860 | } |
861 | } | 861 | } |
862 | 862 | ||
863 | void drm_kms_helper_poll_init(struct drm_device *dev) | 863 | void drm_kms_helper_poll_disable(struct drm_device *dev) |
864 | { | ||
865 | if (!dev->mode_config.poll_enabled) | ||
866 | return; | ||
867 | delayed_slow_work_cancel(&dev->mode_config.output_poll_slow_work); | ||
868 | } | ||
869 | EXPORT_SYMBOL(drm_kms_helper_poll_disable); | ||
870 | |||
871 | void drm_kms_helper_poll_enable(struct drm_device *dev) | ||
864 | { | 872 | { |
865 | struct drm_connector *connector; | ||
866 | bool poll = false; | 873 | bool poll = false; |
874 | struct drm_connector *connector; | ||
867 | int ret; | 875 | int ret; |
868 | 876 | ||
869 | list_for_each_entry(connector, &dev->mode_config.connector_list, head) { | 877 | list_for_each_entry(connector, &dev->mode_config.connector_list, head) { |
870 | if (connector->polled) | 878 | if (connector->polled) |
871 | poll = true; | 879 | poll = true; |
872 | } | 880 | } |
873 | slow_work_register_user(THIS_MODULE); | ||
874 | delayed_slow_work_init(&dev->mode_config.output_poll_slow_work, | ||
875 | &output_poll_ops); | ||
876 | 881 | ||
877 | if (poll) { | 882 | if (poll) { |
878 | ret = delayed_slow_work_enqueue(&dev->mode_config.output_poll_slow_work, DRM_OUTPUT_POLL_PERIOD); | 883 | ret = delayed_slow_work_enqueue(&dev->mode_config.output_poll_slow_work, DRM_OUTPUT_POLL_PERIOD); |
@@ -880,11 +885,22 @@ void drm_kms_helper_poll_init(struct drm_device *dev) | |||
880 | DRM_ERROR("delayed enqueue failed %d\n", ret); | 885 | DRM_ERROR("delayed enqueue failed %d\n", ret); |
881 | } | 886 | } |
882 | } | 887 | } |
888 | EXPORT_SYMBOL(drm_kms_helper_poll_enable); | ||
889 | |||
890 | void drm_kms_helper_poll_init(struct drm_device *dev) | ||
891 | { | ||
892 | slow_work_register_user(THIS_MODULE); | ||
893 | delayed_slow_work_init(&dev->mode_config.output_poll_slow_work, | ||
894 | &output_poll_ops); | ||
895 | dev->mode_config.poll_enabled = true; | ||
896 | |||
897 | drm_kms_helper_poll_enable(dev); | ||
898 | } | ||
883 | EXPORT_SYMBOL(drm_kms_helper_poll_init); | 899 | EXPORT_SYMBOL(drm_kms_helper_poll_init); |
884 | 900 | ||
885 | void drm_kms_helper_poll_fini(struct drm_device *dev) | 901 | void drm_kms_helper_poll_fini(struct drm_device *dev) |
886 | { | 902 | { |
887 | delayed_slow_work_cancel(&dev->mode_config.output_poll_slow_work); | 903 | drm_kms_helper_poll_disable(dev); |
888 | slow_work_unregister_user(THIS_MODULE); | 904 | slow_work_unregister_user(THIS_MODULE); |
889 | } | 905 | } |
890 | EXPORT_SYMBOL(drm_kms_helper_poll_fini); | 906 | EXPORT_SYMBOL(drm_kms_helper_poll_fini); |
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile index 95639017bdb..da78f2c0d90 100644 --- a/drivers/gpu/drm/i915/Makefile +++ b/drivers/gpu/drm/i915/Makefile | |||
@@ -22,6 +22,7 @@ i915-y := i915_drv.o i915_dma.o i915_irq.o i915_mem.o \ | |||
22 | intel_fb.o \ | 22 | intel_fb.o \ |
23 | intel_tv.o \ | 23 | intel_tv.o \ |
24 | intel_dvo.o \ | 24 | intel_dvo.o \ |
25 | intel_ringbuffer.o \ | ||
25 | intel_overlay.o \ | 26 | intel_overlay.o \ |
26 | dvo_ch7xxx.o \ | 27 | dvo_ch7xxx.o \ |
27 | dvo_ch7017.o \ | 28 | dvo_ch7017.o \ |
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 322070c0c63..52510ad8b25 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c | |||
@@ -77,7 +77,7 @@ static int i915_gem_object_list_info(struct seq_file *m, void *data) | |||
77 | case ACTIVE_LIST: | 77 | case ACTIVE_LIST: |
78 | seq_printf(m, "Active:\n"); | 78 | seq_printf(m, "Active:\n"); |
79 | lock = &dev_priv->mm.active_list_lock; | 79 | lock = &dev_priv->mm.active_list_lock; |
80 | head = &dev_priv->mm.active_list; | 80 | head = &dev_priv->render_ring.active_list; |
81 | break; | 81 | break; |
82 | case INACTIVE_LIST: | 82 | case INACTIVE_LIST: |
83 | seq_printf(m, "Inactive:\n"); | 83 | seq_printf(m, "Inactive:\n"); |
@@ -129,7 +129,8 @@ static int i915_gem_request_info(struct seq_file *m, void *data) | |||
129 | struct drm_i915_gem_request *gem_request; | 129 | struct drm_i915_gem_request *gem_request; |
130 | 130 | ||
131 | seq_printf(m, "Request:\n"); | 131 | seq_printf(m, "Request:\n"); |
132 | list_for_each_entry(gem_request, &dev_priv->mm.request_list, list) { | 132 | list_for_each_entry(gem_request, &dev_priv->render_ring.request_list, |
133 | list) { | ||
133 | seq_printf(m, " %d @ %d\n", | 134 | seq_printf(m, " %d @ %d\n", |
134 | gem_request->seqno, | 135 | gem_request->seqno, |
135 | (int) (jiffies - gem_request->emitted_jiffies)); | 136 | (int) (jiffies - gem_request->emitted_jiffies)); |
@@ -143,9 +144,9 @@ static int i915_gem_seqno_info(struct seq_file *m, void *data) | |||
143 | struct drm_device *dev = node->minor->dev; | 144 | struct drm_device *dev = node->minor->dev; |
144 | drm_i915_private_t *dev_priv = dev->dev_private; | 145 | drm_i915_private_t *dev_priv = dev->dev_private; |
145 | 146 | ||
146 | if (dev_priv->hw_status_page != NULL) { | 147 | if (dev_priv->render_ring.status_page.page_addr != NULL) { |
147 | seq_printf(m, "Current sequence: %d\n", | 148 | seq_printf(m, "Current sequence: %d\n", |
148 | i915_get_gem_seqno(dev)); | 149 | i915_get_gem_seqno(dev, &dev_priv->render_ring)); |
149 | } else { | 150 | } else { |
150 | seq_printf(m, "Current sequence: hws uninitialized\n"); | 151 | seq_printf(m, "Current sequence: hws uninitialized\n"); |
151 | } | 152 | } |
@@ -195,9 +196,9 @@ static int i915_interrupt_info(struct seq_file *m, void *data) | |||
195 | } | 196 | } |
196 | seq_printf(m, "Interrupts received: %d\n", | 197 | seq_printf(m, "Interrupts received: %d\n", |
197 | atomic_read(&dev_priv->irq_received)); | 198 | atomic_read(&dev_priv->irq_received)); |
198 | if (dev_priv->hw_status_page != NULL) { | 199 | if (dev_priv->render_ring.status_page.page_addr != NULL) { |
199 | seq_printf(m, "Current sequence: %d\n", | 200 | seq_printf(m, "Current sequence: %d\n", |
200 | i915_get_gem_seqno(dev)); | 201 | i915_get_gem_seqno(dev, &dev_priv->render_ring)); |
201 | } else { | 202 | } else { |
202 | seq_printf(m, "Current sequence: hws uninitialized\n"); | 203 | seq_printf(m, "Current sequence: hws uninitialized\n"); |
203 | } | 204 | } |
@@ -251,7 +252,7 @@ static int i915_hws_info(struct seq_file *m, void *data) | |||
251 | int i; | 252 | int i; |
252 | volatile u32 *hws; | 253 | volatile u32 *hws; |
253 | 254 | ||
254 | hws = (volatile u32 *)dev_priv->hw_status_page; | 255 | hws = (volatile u32 *)dev_priv->render_ring.status_page.page_addr; |
255 | if (hws == NULL) | 256 | if (hws == NULL) |
256 | return 0; | 257 | return 0; |
257 | 258 | ||
@@ -287,7 +288,8 @@ static int i915_batchbuffer_info(struct seq_file *m, void *data) | |||
287 | 288 | ||
288 | spin_lock(&dev_priv->mm.active_list_lock); | 289 | spin_lock(&dev_priv->mm.active_list_lock); |
289 | 290 | ||
290 | list_for_each_entry(obj_priv, &dev_priv->mm.active_list, list) { | 291 | list_for_each_entry(obj_priv, &dev_priv->render_ring.active_list, |
292 | list) { | ||
291 | obj = &obj_priv->base; | 293 | obj = &obj_priv->base; |
292 | if (obj->read_domains & I915_GEM_DOMAIN_COMMAND) { | 294 | if (obj->read_domains & I915_GEM_DOMAIN_COMMAND) { |
293 | ret = i915_gem_object_get_pages(obj, 0); | 295 | ret = i915_gem_object_get_pages(obj, 0); |
@@ -317,14 +319,14 @@ static int i915_ringbuffer_data(struct seq_file *m, void *data) | |||
317 | u8 *virt; | 319 | u8 *virt; |
318 | uint32_t *ptr, off; | 320 | uint32_t *ptr, off; |
319 | 321 | ||
320 | if (!dev_priv->ring.ring_obj) { | 322 | if (!dev_priv->render_ring.gem_object) { |
321 | seq_printf(m, "No ringbuffer setup\n"); | 323 | seq_printf(m, "No ringbuffer setup\n"); |
322 | return 0; | 324 | return 0; |
323 | } | 325 | } |
324 | 326 | ||
325 | virt = dev_priv->ring.virtual_start; | 327 | virt = dev_priv->render_ring.virtual_start; |
326 | 328 | ||
327 | for (off = 0; off < dev_priv->ring.Size; off += 4) { | 329 | for (off = 0; off < dev_priv->render_ring.size; off += 4) { |
328 | ptr = (uint32_t *)(virt + off); | 330 | ptr = (uint32_t *)(virt + off); |
329 | seq_printf(m, "%08x : %08x\n", off, *ptr); | 331 | seq_printf(m, "%08x : %08x\n", off, *ptr); |
330 | } | 332 | } |
@@ -344,7 +346,7 @@ static int i915_ringbuffer_info(struct seq_file *m, void *data) | |||
344 | 346 | ||
345 | seq_printf(m, "RingHead : %08x\n", head); | 347 | seq_printf(m, "RingHead : %08x\n", head); |
346 | seq_printf(m, "RingTail : %08x\n", tail); | 348 | seq_printf(m, "RingTail : %08x\n", tail); |
347 | seq_printf(m, "RingSize : %08lx\n", dev_priv->ring.Size); | 349 | seq_printf(m, "RingSize : %08lx\n", dev_priv->render_ring.size); |
348 | seq_printf(m, "Acthd : %08x\n", I915_READ(IS_I965G(dev) ? ACTHD_I965 : ACTHD)); | 350 | seq_printf(m, "Acthd : %08x\n", I915_READ(IS_I965G(dev) ? ACTHD_I965 : ACTHD)); |
349 | 351 | ||
350 | return 0; | 352 | return 0; |
@@ -489,11 +491,14 @@ static int i915_cur_delayinfo(struct seq_file *m, void *unused) | |||
489 | struct drm_device *dev = node->minor->dev; | 491 | struct drm_device *dev = node->minor->dev; |
490 | drm_i915_private_t *dev_priv = dev->dev_private; | 492 | drm_i915_private_t *dev_priv = dev->dev_private; |
491 | u16 rgvswctl = I915_READ16(MEMSWCTL); | 493 | u16 rgvswctl = I915_READ16(MEMSWCTL); |
494 | u16 rgvstat = I915_READ16(MEMSTAT_ILK); | ||
492 | 495 | ||
493 | seq_printf(m, "Last command: 0x%01x\n", (rgvswctl >> 13) & 0x3); | 496 | seq_printf(m, "Requested P-state: %d\n", (rgvswctl >> 8) & 0xf); |
494 | seq_printf(m, "Command status: %d\n", (rgvswctl >> 12) & 1); | 497 | seq_printf(m, "Requested VID: %d\n", rgvswctl & 0x3f); |
495 | seq_printf(m, "P%d DELAY 0x%02x\n", (rgvswctl >> 8) & 0xf, | 498 | seq_printf(m, "Current VID: %d\n", (rgvstat & MEMSTAT_VID_MASK) >> |
496 | rgvswctl & 0x3f); | 499 | MEMSTAT_VID_SHIFT); |
500 | seq_printf(m, "Current P-state: %d\n", | ||
501 | (rgvstat & MEMSTAT_PSTATE_MASK) >> MEMSTAT_PSTATE_SHIFT); | ||
497 | 502 | ||
498 | return 0; | 503 | return 0; |
499 | } | 504 | } |
@@ -508,7 +513,8 @@ static int i915_delayfreq_table(struct seq_file *m, void *unused) | |||
508 | 513 | ||
509 | for (i = 0; i < 16; i++) { | 514 | for (i = 0; i < 16; i++) { |
510 | delayfreq = I915_READ(PXVFREQ_BASE + i * 4); | 515 | delayfreq = I915_READ(PXVFREQ_BASE + i * 4); |
511 | seq_printf(m, "P%02dVIDFREQ: 0x%08x\n", i, delayfreq); | 516 | seq_printf(m, "P%02dVIDFREQ: 0x%08x (VID: %d)\n", i, delayfreq, |
517 | (delayfreq & PXVFREQ_PX_MASK) >> PXVFREQ_PX_SHIFT); | ||
512 | } | 518 | } |
513 | 519 | ||
514 | return 0; | 520 | return 0; |
@@ -541,6 +547,8 @@ static int i915_drpc_info(struct seq_file *m, void *unused) | |||
541 | struct drm_device *dev = node->minor->dev; | 547 | struct drm_device *dev = node->minor->dev; |
542 | drm_i915_private_t *dev_priv = dev->dev_private; | 548 | drm_i915_private_t *dev_priv = dev->dev_private; |
543 | u32 rgvmodectl = I915_READ(MEMMODECTL); | 549 | u32 rgvmodectl = I915_READ(MEMMODECTL); |
550 | u32 rstdbyctl = I915_READ(MCHBAR_RENDER_STANDBY); | ||
551 | u16 crstandvid = I915_READ16(CRSTANDVID); | ||
544 | 552 | ||
545 | seq_printf(m, "HD boost: %s\n", (rgvmodectl & MEMMODE_BOOST_EN) ? | 553 | seq_printf(m, "HD boost: %s\n", (rgvmodectl & MEMMODE_BOOST_EN) ? |
546 | "yes" : "no"); | 554 | "yes" : "no"); |
@@ -555,9 +563,13 @@ static int i915_drpc_info(struct seq_file *m, void *unused) | |||
555 | rgvmodectl & MEMMODE_RCLK_GATE ? "yes" : "no"); | 563 | rgvmodectl & MEMMODE_RCLK_GATE ? "yes" : "no"); |
556 | seq_printf(m, "Starting frequency: P%d\n", | 564 | seq_printf(m, "Starting frequency: P%d\n", |
557 | (rgvmodectl & MEMMODE_FSTART_MASK) >> MEMMODE_FSTART_SHIFT); | 565 | (rgvmodectl & MEMMODE_FSTART_MASK) >> MEMMODE_FSTART_SHIFT); |
558 | seq_printf(m, "Max frequency: P%d\n", | 566 | seq_printf(m, "Max P-state: P%d\n", |
559 | (rgvmodectl & MEMMODE_FMAX_MASK) >> MEMMODE_FMAX_SHIFT); | 567 | (rgvmodectl & MEMMODE_FMAX_MASK) >> MEMMODE_FMAX_SHIFT); |
560 | seq_printf(m, "Min frequency: P%d\n", (rgvmodectl & MEMMODE_FMIN_MASK)); | 568 | seq_printf(m, "Min P-state: P%d\n", (rgvmodectl & MEMMODE_FMIN_MASK)); |
569 | seq_printf(m, "RS1 VID: %d\n", (crstandvid & 0x3f)); | ||
570 | seq_printf(m, "RS2 VID: %d\n", ((crstandvid >> 8) & 0x3f)); | ||
571 | seq_printf(m, "Render standby enabled: %s\n", | ||
572 | (rstdbyctl & RCX_SW_EXIT) ? "no" : "yes"); | ||
561 | 573 | ||
562 | return 0; | 574 | return 0; |
563 | } | 575 | } |
@@ -621,6 +633,36 @@ static int i915_sr_status(struct seq_file *m, void *unused) | |||
621 | return 0; | 633 | return 0; |
622 | } | 634 | } |
623 | 635 | ||
636 | static int i915_emon_status(struct seq_file *m, void *unused) | ||
637 | { | ||
638 | struct drm_info_node *node = (struct drm_info_node *) m->private; | ||
639 | struct drm_device *dev = node->minor->dev; | ||
640 | drm_i915_private_t *dev_priv = dev->dev_private; | ||
641 | unsigned long temp, chipset, gfx; | ||
642 | |||
643 | temp = i915_mch_val(dev_priv); | ||
644 | chipset = i915_chipset_val(dev_priv); | ||
645 | gfx = i915_gfx_val(dev_priv); | ||
646 | |||
647 | seq_printf(m, "GMCH temp: %ld\n", temp); | ||
648 | seq_printf(m, "Chipset power: %ld\n", chipset); | ||
649 | seq_printf(m, "GFX power: %ld\n", gfx); | ||
650 | seq_printf(m, "Total power: %ld\n", chipset + gfx); | ||
651 | |||
652 | return 0; | ||
653 | } | ||
654 | |||
655 | static int i915_gfxec(struct seq_file *m, void *unused) | ||
656 | { | ||
657 | struct drm_info_node *node = (struct drm_info_node *) m->private; | ||
658 | struct drm_device *dev = node->minor->dev; | ||
659 | drm_i915_private_t *dev_priv = dev->dev_private; | ||
660 | |||
661 | seq_printf(m, "GFXEC: %ld\n", (unsigned long)I915_READ(0x112f4)); | ||
662 | |||
663 | return 0; | ||
664 | } | ||
665 | |||
624 | static int | 666 | static int |
625 | i915_wedged_open(struct inode *inode, | 667 | i915_wedged_open(struct inode *inode, |
626 | struct file *filp) | 668 | struct file *filp) |
@@ -743,6 +785,8 @@ static struct drm_info_list i915_debugfs_list[] = { | |||
743 | {"i915_delayfreq_table", i915_delayfreq_table, 0}, | 785 | {"i915_delayfreq_table", i915_delayfreq_table, 0}, |
744 | {"i915_inttoext_table", i915_inttoext_table, 0}, | 786 | {"i915_inttoext_table", i915_inttoext_table, 0}, |
745 | {"i915_drpc_info", i915_drpc_info, 0}, | 787 | {"i915_drpc_info", i915_drpc_info, 0}, |
788 | {"i915_emon_status", i915_emon_status, 0}, | ||
789 | {"i915_gfxec", i915_gfxec, 0}, | ||
746 | {"i915_fbc_status", i915_fbc_status, 0}, | 790 | {"i915_fbc_status", i915_fbc_status, 0}, |
747 | {"i915_sr_status", i915_sr_status, 0}, | 791 | {"i915_sr_status", i915_sr_status, 0}, |
748 | }; | 792 | }; |
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 2a6b5de5ae5..b2ebf02e4f8 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c | |||
@@ -40,84 +40,6 @@ | |||
40 | #include <linux/vga_switcheroo.h> | 40 | #include <linux/vga_switcheroo.h> |
41 | #include <linux/slab.h> | 41 | #include <linux/slab.h> |
42 | 42 | ||
43 | /* Really want an OS-independent resettable timer. Would like to have | ||
44 | * this loop run for (eg) 3 sec, but have the timer reset every time | ||
45 | * the head pointer changes, so that EBUSY only happens if the ring | ||
46 | * actually stalls for (eg) 3 seconds. | ||
47 | */ | ||
48 | int i915_wait_ring(struct drm_device * dev, int n, const char *caller) | ||
49 | { | ||
50 | drm_i915_private_t *dev_priv = dev->dev_private; | ||
51 | drm_i915_ring_buffer_t *ring = &(dev_priv->ring); | ||
52 | u32 acthd_reg = IS_I965G(dev) ? ACTHD_I965 : ACTHD; | ||
53 | u32 last_acthd = I915_READ(acthd_reg); | ||
54 | u32 acthd; | ||
55 | u32 last_head = I915_READ(PRB0_HEAD) & HEAD_ADDR; | ||
56 | int i; | ||
57 | |||
58 | trace_i915_ring_wait_begin (dev); | ||
59 | |||
60 | for (i = 0; i < 100000; i++) { | ||
61 | ring->head = I915_READ(PRB0_HEAD) & HEAD_ADDR; | ||
62 | acthd = I915_READ(acthd_reg); | ||
63 | ring->space = ring->head - (ring->tail + 8); | ||
64 | if (ring->space < 0) | ||
65 | ring->space += ring->Size; | ||
66 | if (ring->space >= n) { | ||
67 | trace_i915_ring_wait_end (dev); | ||
68 | return 0; | ||
69 | } | ||
70 | |||
71 | if (dev->primary->master) { | ||
72 | struct drm_i915_master_private *master_priv = dev->primary->master->driver_priv; | ||
73 | if (master_priv->sarea_priv) | ||
74 | master_priv->sarea_priv->perf_boxes |= I915_BOX_WAIT; | ||
75 | } | ||
76 | |||
77 | |||
78 | if (ring->head != last_head) | ||
79 | i = 0; | ||
80 | if (acthd != last_acthd) | ||
81 | i = 0; | ||
82 | |||
83 | last_head = ring->head; | ||
84 | last_acthd = acthd; | ||
85 | msleep_interruptible(10); | ||
86 | |||
87 | } | ||
88 | |||
89 | trace_i915_ring_wait_end (dev); | ||
90 | return -EBUSY; | ||
91 | } | ||
92 | |||
93 | /* As a ringbuffer is only allowed to wrap between instructions, fill | ||
94 | * the tail with NOOPs. | ||
95 | */ | ||
96 | int i915_wrap_ring(struct drm_device *dev) | ||
97 | { | ||
98 | drm_i915_private_t *dev_priv = dev->dev_private; | ||
99 | volatile unsigned int *virt; | ||
100 | int rem; | ||
101 | |||
102 | rem = dev_priv->ring.Size - dev_priv->ring.tail; | ||
103 | if (dev_priv->ring.space < rem) { | ||
104 | int ret = i915_wait_ring(dev, rem, __func__); | ||
105 | if (ret) | ||
106 | return ret; | ||
107 | } | ||
108 | dev_priv->ring.space -= rem; | ||
109 | |||
110 | virt = (unsigned int *) | ||
111 | (dev_priv->ring.virtual_start + dev_priv->ring.tail); | ||
112 | rem /= 4; | ||
113 | while (rem--) | ||
114 | *virt++ = MI_NOOP; | ||
115 | |||
116 | dev_priv->ring.tail = 0; | ||
117 | |||
118 | return 0; | ||
119 | } | ||
120 | |||
121 | /** | 43 | /** |
122 | * Sets up the hardware status page for devices that need a physical address | 44 | * Sets up the hardware status page for devices that need a physical address |
123 | * in the register. | 45 | * in the register. |
@@ -133,10 +55,11 @@ static int i915_init_phys_hws(struct drm_device *dev) | |||
133 | DRM_ERROR("Can not allocate hardware status page\n"); | 55 | DRM_ERROR("Can not allocate hardware status page\n"); |
134 | return -ENOMEM; | 56 | return -ENOMEM; |
135 | } | 57 | } |
136 | dev_priv->hw_status_page = dev_priv->status_page_dmah->vaddr; | 58 | dev_priv->render_ring.status_page.page_addr |
59 | = dev_priv->status_page_dmah->vaddr; | ||
137 | dev_priv->dma_status_page = dev_priv->status_page_dmah->busaddr; | 60 | dev_priv->dma_status_page = dev_priv->status_page_dmah->busaddr; |
138 | 61 | ||
139 | memset(dev_priv->hw_status_page, 0, PAGE_SIZE); | 62 | memset(dev_priv->render_ring.status_page.page_addr, 0, PAGE_SIZE); |
140 | 63 | ||
141 | if (IS_I965G(dev)) | 64 | if (IS_I965G(dev)) |
142 | dev_priv->dma_status_page |= (dev_priv->dma_status_page >> 28) & | 65 | dev_priv->dma_status_page |= (dev_priv->dma_status_page >> 28) & |
@@ -159,8 +82,8 @@ static void i915_free_hws(struct drm_device *dev) | |||
159 | dev_priv->status_page_dmah = NULL; | 82 | dev_priv->status_page_dmah = NULL; |
160 | } | 83 | } |
161 | 84 | ||
162 | if (dev_priv->status_gfx_addr) { | 85 | if (dev_priv->render_ring.status_page.gfx_addr) { |
163 | dev_priv->status_gfx_addr = 0; | 86 | dev_priv->render_ring.status_page.gfx_addr = 0; |
164 | drm_core_ioremapfree(&dev_priv->hws_map, dev); | 87 | drm_core_ioremapfree(&dev_priv->hws_map, dev); |
165 | } | 88 | } |
166 | 89 | ||
@@ -172,7 +95,7 @@ void i915_kernel_lost_context(struct drm_device * dev) | |||
172 | { | 95 | { |
173 | drm_i915_private_t *dev_priv = dev->dev_private; | 96 | drm_i915_private_t *dev_priv = dev->dev_private; |
174 | struct drm_i915_master_private *master_priv; | 97 | struct drm_i915_master_private *master_priv; |
175 | drm_i915_ring_buffer_t *ring = &(dev_priv->ring); | 98 | struct intel_ring_buffer *ring = &dev_priv->render_ring; |
176 | 99 | ||
177 | /* | 100 | /* |
178 | * We should never lose context on the ring with modesetting | 101 | * We should never lose context on the ring with modesetting |
@@ -185,7 +108,7 @@ void i915_kernel_lost_context(struct drm_device * dev) | |||
185 | ring->tail = I915_READ(PRB0_TAIL) & TAIL_ADDR; | 108 | ring->tail = I915_READ(PRB0_TAIL) & TAIL_ADDR; |
186 | ring->space = ring->head - (ring->tail + 8); | 109 | ring->space = ring->head - (ring->tail + 8); |
187 | if (ring->space < 0) | 110 | if (ring->space < 0) |
188 | ring->space += ring->Size; | 111 | ring->space += ring->size; |
189 | 112 | ||
190 | if (!dev->primary->master) | 113 | if (!dev->primary->master) |
191 | return; | 114 | return; |
@@ -205,12 +128,9 @@ static int i915_dma_cleanup(struct drm_device * dev) | |||
205 | if (dev->irq_enabled) | 128 | if (dev->irq_enabled) |
206 | drm_irq_uninstall(dev); | 129 | drm_irq_uninstall(dev); |
207 | 130 | ||
208 | if (dev_priv->ring.virtual_start) { | 131 | intel_cleanup_ring_buffer(dev, &dev_priv->render_ring); |
209 | drm_core_ioremapfree(&dev_priv->ring.map, dev); | 132 | if (HAS_BSD(dev)) |
210 | dev_priv->ring.virtual_start = NULL; | 133 | intel_cleanup_ring_buffer(dev, &dev_priv->bsd_ring); |
211 | dev_priv->ring.map.handle = NULL; | ||
212 | dev_priv->ring.map.size = 0; | ||
213 | } | ||
214 | 134 | ||
215 | /* Clear the HWS virtual address at teardown */ | 135 | /* Clear the HWS virtual address at teardown */ |
216 | if (I915_NEED_GFX_HWS(dev)) | 136 | if (I915_NEED_GFX_HWS(dev)) |
@@ -233,24 +153,24 @@ static int i915_initialize(struct drm_device * dev, drm_i915_init_t * init) | |||
233 | } | 153 | } |
234 | 154 | ||
235 | if (init->ring_size != 0) { | 155 | if (init->ring_size != 0) { |
236 | if (dev_priv->ring.ring_obj != NULL) { | 156 | if (dev_priv->render_ring.gem_object != NULL) { |
237 | i915_dma_cleanup(dev); | 157 | i915_dma_cleanup(dev); |
238 | DRM_ERROR("Client tried to initialize ringbuffer in " | 158 | DRM_ERROR("Client tried to initialize ringbuffer in " |
239 | "GEM mode\n"); | 159 | "GEM mode\n"); |
240 | return -EINVAL; | 160 | return -EINVAL; |
241 | } | 161 | } |
242 | 162 | ||
243 | dev_priv->ring.Size = init->ring_size; | 163 | dev_priv->render_ring.size = init->ring_size; |
244 | 164 | ||
245 | dev_priv->ring.map.offset = init->ring_start; | 165 | dev_priv->render_ring.map.offset = init->ring_start; |
246 | dev_priv->ring.map.size = init->ring_size; | 166 | dev_priv->render_ring.map.size = init->ring_size; |
247 | dev_priv->ring.map.type = 0; | 167 | dev_priv->render_ring.map.type = 0; |
248 | dev_priv->ring.map.flags = 0; | 168 | dev_priv->render_ring.map.flags = 0; |
249 | dev_priv->ring.map.mtrr = 0; | 169 | dev_priv->render_ring.map.mtrr = 0; |
250 | 170 | ||
251 | drm_core_ioremap_wc(&dev_priv->ring.map, dev); | 171 | drm_core_ioremap_wc(&dev_priv->render_ring.map, dev); |
252 | 172 | ||
253 | if (dev_priv->ring.map.handle == NULL) { | 173 | if (dev_priv->render_ring.map.handle == NULL) { |
254 | i915_dma_cleanup(dev); | 174 | i915_dma_cleanup(dev); |
255 | DRM_ERROR("can not ioremap virtual address for" | 175 | DRM_ERROR("can not ioremap virtual address for" |
256 | " ring buffer\n"); | 176 | " ring buffer\n"); |
@@ -258,7 +178,7 @@ static int i915_initialize(struct drm_device * dev, drm_i915_init_t * init) | |||
258 | } | 178 | } |
259 | } | 179 | } |
260 | 180 | ||
261 | dev_priv->ring.virtual_start = dev_priv->ring.map.handle; | 181 | dev_priv->render_ring.virtual_start = dev_priv->render_ring.map.handle; |
262 | 182 | ||
263 | dev_priv->cpp = init->cpp; | 183 | dev_priv->cpp = init->cpp; |
264 | dev_priv->back_offset = init->back_offset; | 184 | dev_priv->back_offset = init->back_offset; |
@@ -278,26 +198,29 @@ static int i915_dma_resume(struct drm_device * dev) | |||
278 | { | 198 | { |
279 | drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; | 199 | drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; |
280 | 200 | ||
201 | struct intel_ring_buffer *ring; | ||
281 | DRM_DEBUG_DRIVER("%s\n", __func__); | 202 | DRM_DEBUG_DRIVER("%s\n", __func__); |
282 | 203 | ||
283 | if (dev_priv->ring.map.handle == NULL) { | 204 | ring = &dev_priv->render_ring; |
205 | |||
206 | if (ring->map.handle == NULL) { | ||
284 | DRM_ERROR("can not ioremap virtual address for" | 207 | DRM_ERROR("can not ioremap virtual address for" |
285 | " ring buffer\n"); | 208 | " ring buffer\n"); |
286 | return -ENOMEM; | 209 | return -ENOMEM; |
287 | } | 210 | } |
288 | 211 | ||
289 | /* Program Hardware Status Page */ | 212 | /* Program Hardware Status Page */ |
290 | if (!dev_priv->hw_status_page) { | 213 | if (!ring->status_page.page_addr) { |
291 | DRM_ERROR("Can not find hardware status page\n"); | 214 | DRM_ERROR("Can not find hardware status page\n"); |
292 | return -EINVAL; | 215 | return -EINVAL; |
293 | } | 216 | } |
294 | DRM_DEBUG_DRIVER("hw status page @ %p\n", | 217 | DRM_DEBUG_DRIVER("hw status page @ %p\n", |
295 | dev_priv->hw_status_page); | 218 | ring->status_page.page_addr); |
296 | 219 | if (ring->status_page.gfx_addr != 0) | |
297 | if (dev_priv->status_gfx_addr != 0) | 220 | ring->setup_status_page(dev, ring); |
298 | I915_WRITE(HWS_PGA, dev_priv->status_gfx_addr); | ||
299 | else | 221 | else |
300 | I915_WRITE(HWS_PGA, dev_priv->dma_status_page); | 222 | I915_WRITE(HWS_PGA, dev_priv->dma_status_page); |
223 | |||
301 | DRM_DEBUG_DRIVER("Enabled hardware status page\n"); | 224 | DRM_DEBUG_DRIVER("Enabled hardware status page\n"); |
302 | 225 | ||
303 | return 0; | 226 | return 0; |
@@ -407,9 +330,8 @@ static int i915_emit_cmds(struct drm_device * dev, int *buffer, int dwords) | |||
407 | { | 330 | { |
408 | drm_i915_private_t *dev_priv = dev->dev_private; | 331 | drm_i915_private_t *dev_priv = dev->dev_private; |
409 | int i; | 332 | int i; |
410 | RING_LOCALS; | ||
411 | 333 | ||
412 | if ((dwords+1) * sizeof(int) >= dev_priv->ring.Size - 8) | 334 | if ((dwords+1) * sizeof(int) >= dev_priv->render_ring.size - 8) |
413 | return -EINVAL; | 335 | return -EINVAL; |
414 | 336 | ||
415 | BEGIN_LP_RING((dwords+1)&~1); | 337 | BEGIN_LP_RING((dwords+1)&~1); |
@@ -442,9 +364,7 @@ i915_emit_box(struct drm_device *dev, | |||
442 | struct drm_clip_rect *boxes, | 364 | struct drm_clip_rect *boxes, |
443 | int i, int DR1, int DR4) | 365 | int i, int DR1, int DR4) |
444 | { | 366 | { |
445 | drm_i915_private_t *dev_priv = dev->dev_private; | ||
446 | struct drm_clip_rect box = boxes[i]; | 367 | struct drm_clip_rect box = boxes[i]; |
447 | RING_LOCALS; | ||
448 | 368 | ||
449 | if (box.y2 <= box.y1 || box.x2 <= box.x1 || box.y2 <= 0 || box.x2 <= 0) { | 369 | if (box.y2 <= box.y1 || box.x2 <= box.x1 || box.y2 <= 0 || box.x2 <= 0) { |
450 | DRM_ERROR("Bad box %d,%d..%d,%d\n", | 370 | DRM_ERROR("Bad box %d,%d..%d,%d\n", |
@@ -481,7 +401,6 @@ static void i915_emit_breadcrumb(struct drm_device *dev) | |||
481 | { | 401 | { |
482 | drm_i915_private_t *dev_priv = dev->dev_private; | 402 | drm_i915_private_t *dev_priv = dev->dev_private; |
483 | struct drm_i915_master_private *master_priv = dev->primary->master->driver_priv; | 403 | struct drm_i915_master_private *master_priv = dev->primary->master->driver_priv; |
484 | RING_LOCALS; | ||
485 | 404 | ||
486 | dev_priv->counter++; | 405 | dev_priv->counter++; |
487 | if (dev_priv->counter > 0x7FFFFFFFUL) | 406 | if (dev_priv->counter > 0x7FFFFFFFUL) |
@@ -535,10 +454,8 @@ static int i915_dispatch_batchbuffer(struct drm_device * dev, | |||
535 | drm_i915_batchbuffer_t * batch, | 454 | drm_i915_batchbuffer_t * batch, |
536 | struct drm_clip_rect *cliprects) | 455 | struct drm_clip_rect *cliprects) |
537 | { | 456 | { |
538 | drm_i915_private_t *dev_priv = dev->dev_private; | ||
539 | int nbox = batch->num_cliprects; | 457 | int nbox = batch->num_cliprects; |
540 | int i = 0, count; | 458 | int i = 0, count; |
541 | RING_LOCALS; | ||
542 | 459 | ||
543 | if ((batch->start | batch->used) & 0x7) { | 460 | if ((batch->start | batch->used) & 0x7) { |
544 | DRM_ERROR("alignment"); | 461 | DRM_ERROR("alignment"); |
@@ -587,7 +504,6 @@ static int i915_dispatch_flip(struct drm_device * dev) | |||
587 | drm_i915_private_t *dev_priv = dev->dev_private; | 504 | drm_i915_private_t *dev_priv = dev->dev_private; |
588 | struct drm_i915_master_private *master_priv = | 505 | struct drm_i915_master_private *master_priv = |
589 | dev->primary->master->driver_priv; | 506 | dev->primary->master->driver_priv; |
590 | RING_LOCALS; | ||
591 | 507 | ||
592 | if (!master_priv->sarea_priv) | 508 | if (!master_priv->sarea_priv) |
593 | return -EINVAL; | 509 | return -EINVAL; |
@@ -640,7 +556,8 @@ static int i915_quiescent(struct drm_device * dev) | |||
640 | drm_i915_private_t *dev_priv = dev->dev_private; | 556 | drm_i915_private_t *dev_priv = dev->dev_private; |
641 | 557 | ||
642 | i915_kernel_lost_context(dev); | 558 | i915_kernel_lost_context(dev); |
643 | return i915_wait_ring(dev, dev_priv->ring.Size - 8, __func__); | 559 | return intel_wait_ring_buffer(dev, &dev_priv->render_ring, |
560 | dev_priv->render_ring.size - 8); | ||
644 | } | 561 | } |
645 | 562 | ||
646 | static int i915_flush_ioctl(struct drm_device *dev, void *data, | 563 | static int i915_flush_ioctl(struct drm_device *dev, void *data, |
@@ -827,6 +744,9 @@ static int i915_getparam(struct drm_device *dev, void *data, | |||
827 | /* depends on GEM */ | 744 | /* depends on GEM */ |
828 | value = dev_priv->has_gem; | 745 | value = dev_priv->has_gem; |
829 | break; | 746 | break; |
747 | case I915_PARAM_HAS_BSD: | ||
748 | value = HAS_BSD(dev); | ||
749 | break; | ||
830 | default: | 750 | default: |
831 | DRM_DEBUG_DRIVER("Unknown parameter %d\n", | 751 | DRM_DEBUG_DRIVER("Unknown parameter %d\n", |
832 | param->param); | 752 | param->param); |
@@ -882,6 +802,7 @@ static int i915_set_status_page(struct drm_device *dev, void *data, | |||
882 | { | 802 | { |
883 | drm_i915_private_t *dev_priv = dev->dev_private; | 803 | drm_i915_private_t *dev_priv = dev->dev_private; |
884 | drm_i915_hws_addr_t *hws = data; | 804 | drm_i915_hws_addr_t *hws = data; |
805 | struct intel_ring_buffer *ring = &dev_priv->render_ring; | ||
885 | 806 | ||
886 | if (!I915_NEED_GFX_HWS(dev)) | 807 | if (!I915_NEED_GFX_HWS(dev)) |
887 | return -EINVAL; | 808 | return -EINVAL; |
@@ -898,7 +819,7 @@ static int i915_set_status_page(struct drm_device *dev, void *data, | |||
898 | 819 | ||
899 | DRM_DEBUG_DRIVER("set status page addr 0x%08x\n", (u32)hws->addr); | 820 | DRM_DEBUG_DRIVER("set status page addr 0x%08x\n", (u32)hws->addr); |
900 | 821 | ||
901 | dev_priv->status_gfx_addr = hws->addr & (0x1ffff<<12); | 822 | ring->status_page.gfx_addr = hws->addr & (0x1ffff<<12); |
902 | 823 | ||
903 | dev_priv->hws_map.offset = dev->agp->base + hws->addr; | 824 | dev_priv->hws_map.offset = dev->agp->base + hws->addr; |
904 | dev_priv->hws_map.size = 4*1024; | 825 | dev_priv->hws_map.size = 4*1024; |
@@ -909,19 +830,19 @@ static int i915_set_status_page(struct drm_device *dev, void *data, | |||
909 | drm_core_ioremap_wc(&dev_priv->hws_map, dev); | 830 | drm_core_ioremap_wc(&dev_priv->hws_map, dev); |
910 | if (dev_priv->hws_map.handle == NULL) { | 831 | if (dev_priv->hws_map.handle == NULL) { |
911 | i915_dma_cleanup(dev); | 832 | i915_dma_cleanup(dev); |
912 | dev_priv->status_gfx_addr = 0; | 833 | ring->status_page.gfx_addr = 0; |
913 | DRM_ERROR("can not ioremap virtual address for" | 834 | DRM_ERROR("can not ioremap virtual address for" |
914 | " G33 hw status page\n"); | 835 | " G33 hw status page\n"); |
915 | return -ENOMEM; | 836 | return -ENOMEM; |
916 | } | 837 | } |
917 | dev_priv->hw_status_page = dev_priv->hws_map.handle; | 838 | ring->status_page.page_addr = dev_priv->hws_map.handle; |
839 | memset(ring->status_page.page_addr, 0, PAGE_SIZE); | ||
840 | I915_WRITE(HWS_PGA, ring->status_page.gfx_addr); | ||
918 | 841 | ||
919 | memset(dev_priv->hw_status_page, 0, PAGE_SIZE); | ||
920 | I915_WRITE(HWS_PGA, dev_priv->status_gfx_addr); | ||
921 | DRM_DEBUG_DRIVER("load hws HWS_PGA with gfx mem 0x%x\n", | 842 | DRM_DEBUG_DRIVER("load hws HWS_PGA with gfx mem 0x%x\n", |
922 | dev_priv->status_gfx_addr); | 843 | ring->status_page.gfx_addr); |
923 | DRM_DEBUG_DRIVER("load hws at %p\n", | 844 | DRM_DEBUG_DRIVER("load hws at %p\n", |
924 | dev_priv->hw_status_page); | 845 | ring->status_page.page_addr); |
925 | return 0; | 846 | return 0; |
926 | } | 847 | } |
927 | 848 | ||
@@ -1399,12 +1320,14 @@ static void i915_switcheroo_set_state(struct pci_dev *pdev, enum vga_switcheroo_ | |||
1399 | struct drm_device *dev = pci_get_drvdata(pdev); | 1320 | struct drm_device *dev = pci_get_drvdata(pdev); |
1400 | pm_message_t pmm = { .event = PM_EVENT_SUSPEND }; | 1321 | pm_message_t pmm = { .event = PM_EVENT_SUSPEND }; |
1401 | if (state == VGA_SWITCHEROO_ON) { | 1322 | if (state == VGA_SWITCHEROO_ON) { |
1402 | printk(KERN_INFO "i915: switched off\n"); | 1323 | printk(KERN_INFO "i915: switched on\n"); |
1403 | /* i915 resume handler doesn't set to D0 */ | 1324 | /* i915 resume handler doesn't set to D0 */ |
1404 | pci_set_power_state(dev->pdev, PCI_D0); | 1325 | pci_set_power_state(dev->pdev, PCI_D0); |
1405 | i915_resume(dev); | 1326 | i915_resume(dev); |
1327 | drm_kms_helper_poll_enable(dev); | ||
1406 | } else { | 1328 | } else { |
1407 | printk(KERN_ERR "i915: switched off\n"); | 1329 | printk(KERN_ERR "i915: switched off\n"); |
1330 | drm_kms_helper_poll_disable(dev); | ||
1408 | i915_suspend(dev, pmm); | 1331 | i915_suspend(dev, pmm); |
1409 | } | 1332 | } |
1410 | } | 1333 | } |
@@ -1539,14 +1462,11 @@ void i915_master_destroy(struct drm_device *dev, struct drm_master *master) | |||
1539 | master->driver_priv = NULL; | 1462 | master->driver_priv = NULL; |
1540 | } | 1463 | } |
1541 | 1464 | ||
1542 | static void i915_get_mem_freq(struct drm_device *dev) | 1465 | static void i915_pineview_get_mem_freq(struct drm_device *dev) |
1543 | { | 1466 | { |
1544 | drm_i915_private_t *dev_priv = dev->dev_private; | 1467 | drm_i915_private_t *dev_priv = dev->dev_private; |
1545 | u32 tmp; | 1468 | u32 tmp; |
1546 | 1469 | ||
1547 | if (!IS_PINEVIEW(dev)) | ||
1548 | return; | ||
1549 | |||
1550 | tmp = I915_READ(CLKCFG); | 1470 | tmp = I915_READ(CLKCFG); |
1551 | 1471 | ||
1552 | switch (tmp & CLKCFG_FSB_MASK) { | 1472 | switch (tmp & CLKCFG_FSB_MASK) { |
@@ -1575,8 +1495,525 @@ static void i915_get_mem_freq(struct drm_device *dev) | |||
1575 | dev_priv->mem_freq = 800; | 1495 | dev_priv->mem_freq = 800; |
1576 | break; | 1496 | break; |
1577 | } | 1497 | } |
1498 | |||
1499 | /* detect pineview DDR3 setting */ | ||
1500 | tmp = I915_READ(CSHRDDR3CTL); | ||
1501 | dev_priv->is_ddr3 = (tmp & CSHRDDR3CTL_DDR3) ? 1 : 0; | ||
1502 | } | ||
1503 | |||
1504 | static void i915_ironlake_get_mem_freq(struct drm_device *dev) | ||
1505 | { | ||
1506 | drm_i915_private_t *dev_priv = dev->dev_private; | ||
1507 | u16 ddrpll, csipll; | ||
1508 | |||
1509 | ddrpll = I915_READ16(DDRMPLL1); | ||
1510 | csipll = I915_READ16(CSIPLL0); | ||
1511 | |||
1512 | switch (ddrpll & 0xff) { | ||
1513 | case 0xc: | ||
1514 | dev_priv->mem_freq = 800; | ||
1515 | break; | ||
1516 | case 0x10: | ||
1517 | dev_priv->mem_freq = 1066; | ||
1518 | break; | ||
1519 | case 0x14: | ||
1520 | dev_priv->mem_freq = 1333; | ||
1521 | break; | ||
1522 | case 0x18: | ||
1523 | dev_priv->mem_freq = 1600; | ||
1524 | break; | ||
1525 | default: | ||
1526 | DRM_DEBUG_DRIVER("unknown memory frequency 0x%02x\n", | ||
1527 | ddrpll & 0xff); | ||
1528 | dev_priv->mem_freq = 0; | ||
1529 | break; | ||
1530 | } | ||
1531 | |||
1532 | dev_priv->r_t = dev_priv->mem_freq; | ||
1533 | |||
1534 | switch (csipll & 0x3ff) { | ||
1535 | case 0x00c: | ||
1536 | dev_priv->fsb_freq = 3200; | ||
1537 | break; | ||
1538 | case 0x00e: | ||
1539 | dev_priv->fsb_freq = 3733; | ||
1540 | break; | ||
1541 | case 0x010: | ||
1542 | dev_priv->fsb_freq = 4266; | ||
1543 | break; | ||
1544 | case 0x012: | ||
1545 | dev_priv->fsb_freq = 4800; | ||
1546 | break; | ||
1547 | case 0x014: | ||
1548 | dev_priv->fsb_freq = 5333; | ||
1549 | break; | ||
1550 | case 0x016: | ||
1551 | dev_priv->fsb_freq = 5866; | ||
1552 | break; | ||
1553 | case 0x018: | ||
1554 | dev_priv->fsb_freq = 6400; | ||
1555 | break; | ||
1556 | default: | ||
1557 | DRM_DEBUG_DRIVER("unknown fsb frequency 0x%04x\n", | ||
1558 | csipll & 0x3ff); | ||
1559 | dev_priv->fsb_freq = 0; | ||
1560 | break; | ||
1561 | } | ||
1562 | |||
1563 | if (dev_priv->fsb_freq == 3200) { | ||
1564 | dev_priv->c_m = 0; | ||
1565 | } else if (dev_priv->fsb_freq > 3200 && dev_priv->fsb_freq <= 4800) { | ||
1566 | dev_priv->c_m = 1; | ||
1567 | } else { | ||
1568 | dev_priv->c_m = 2; | ||
1569 | } | ||
1570 | } | ||
1571 | |||
1572 | struct v_table { | ||
1573 | u8 vid; | ||
1574 | unsigned long vd; /* in .1 mil */ | ||
1575 | unsigned long vm; /* in .1 mil */ | ||
1576 | u8 pvid; | ||
1577 | }; | ||
1578 | |||
1579 | static struct v_table v_table[] = { | ||
1580 | { 0, 16125, 15000, 0x7f, }, | ||
1581 | { 1, 16000, 14875, 0x7e, }, | ||
1582 | { 2, 15875, 14750, 0x7d, }, | ||
1583 | { 3, 15750, 14625, 0x7c, }, | ||
1584 | { 4, 15625, 14500, 0x7b, }, | ||
1585 | { 5, 15500, 14375, 0x7a, }, | ||
1586 | { 6, 15375, 14250, 0x79, }, | ||
1587 | { 7, 15250, 14125, 0x78, }, | ||
1588 | { 8, 15125, 14000, 0x77, }, | ||
1589 | { 9, 15000, 13875, 0x76, }, | ||
1590 | { 10, 14875, 13750, 0x75, }, | ||
1591 | { 11, 14750, 13625, 0x74, }, | ||
1592 | { 12, 14625, 13500, 0x73, }, | ||
1593 | { 13, 14500, 13375, 0x72, }, | ||
1594 | { 14, 14375, 13250, 0x71, }, | ||
1595 | { 15, 14250, 13125, 0x70, }, | ||
1596 | { 16, 14125, 13000, 0x6f, }, | ||
1597 | { 17, 14000, 12875, 0x6e, }, | ||
1598 | { 18, 13875, 12750, 0x6d, }, | ||
1599 | { 19, 13750, 12625, 0x6c, }, | ||
1600 | { 20, 13625, 12500, 0x6b, }, | ||
1601 | { 21, 13500, 12375, 0x6a, }, | ||
1602 | { 22, 13375, 12250, 0x69, }, | ||
1603 | { 23, 13250, 12125, 0x68, }, | ||
1604 | { 24, 13125, 12000, 0x67, }, | ||
1605 | { 25, 13000, 11875, 0x66, }, | ||
1606 | { 26, 12875, 11750, 0x65, }, | ||
1607 | { 27, 12750, 11625, 0x64, }, | ||
1608 | { 28, 12625, 11500, 0x63, }, | ||
1609 | { 29, 12500, 11375, 0x62, }, | ||
1610 | { 30, 12375, 11250, 0x61, }, | ||
1611 | { 31, 12250, 11125, 0x60, }, | ||
1612 | { 32, 12125, 11000, 0x5f, }, | ||
1613 | { 33, 12000, 10875, 0x5e, }, | ||
1614 | { 34, 11875, 10750, 0x5d, }, | ||
1615 | { 35, 11750, 10625, 0x5c, }, | ||
1616 | { 36, 11625, 10500, 0x5b, }, | ||
1617 | { 37, 11500, 10375, 0x5a, }, | ||
1618 | { 38, 11375, 10250, 0x59, }, | ||
1619 | { 39, 11250, 10125, 0x58, }, | ||
1620 | { 40, 11125, 10000, 0x57, }, | ||
1621 | { 41, 11000, 9875, 0x56, }, | ||
1622 | { 42, 10875, 9750, 0x55, }, | ||
1623 | { 43, 10750, 9625, 0x54, }, | ||
1624 | { 44, 10625, 9500, 0x53, }, | ||
1625 | { 45, 10500, 9375, 0x52, }, | ||
1626 | { 46, 10375, 9250, 0x51, }, | ||
1627 | { 47, 10250, 9125, 0x50, }, | ||
1628 | { 48, 10125, 9000, 0x4f, }, | ||
1629 | { 49, 10000, 8875, 0x4e, }, | ||
1630 | { 50, 9875, 8750, 0x4d, }, | ||
1631 | { 51, 9750, 8625, 0x4c, }, | ||
1632 | { 52, 9625, 8500, 0x4b, }, | ||
1633 | { 53, 9500, 8375, 0x4a, }, | ||
1634 | { 54, 9375, 8250, 0x49, }, | ||
1635 | { 55, 9250, 8125, 0x48, }, | ||
1636 | { 56, 9125, 8000, 0x47, }, | ||
1637 | { 57, 9000, 7875, 0x46, }, | ||
1638 | { 58, 8875, 7750, 0x45, }, | ||
1639 | { 59, 8750, 7625, 0x44, }, | ||
1640 | { 60, 8625, 7500, 0x43, }, | ||
1641 | { 61, 8500, 7375, 0x42, }, | ||
1642 | { 62, 8375, 7250, 0x41, }, | ||
1643 | { 63, 8250, 7125, 0x40, }, | ||
1644 | { 64, 8125, 7000, 0x3f, }, | ||
1645 | { 65, 8000, 6875, 0x3e, }, | ||
1646 | { 66, 7875, 6750, 0x3d, }, | ||
1647 | { 67, 7750, 6625, 0x3c, }, | ||
1648 | { 68, 7625, 6500, 0x3b, }, | ||
1649 | { 69, 7500, 6375, 0x3a, }, | ||
1650 | { 70, 7375, 6250, 0x39, }, | ||
1651 | { 71, 7250, 6125, 0x38, }, | ||
1652 | { 72, 7125, 6000, 0x37, }, | ||
1653 | { 73, 7000, 5875, 0x36, }, | ||
1654 | { 74, 6875, 5750, 0x35, }, | ||
1655 | { 75, 6750, 5625, 0x34, }, | ||
1656 | { 76, 6625, 5500, 0x33, }, | ||
1657 | { 77, 6500, 5375, 0x32, }, | ||
1658 | { 78, 6375, 5250, 0x31, }, | ||
1659 | { 79, 6250, 5125, 0x30, }, | ||
1660 | { 80, 6125, 5000, 0x2f, }, | ||
1661 | { 81, 6000, 4875, 0x2e, }, | ||
1662 | { 82, 5875, 4750, 0x2d, }, | ||
1663 | { 83, 5750, 4625, 0x2c, }, | ||
1664 | { 84, 5625, 4500, 0x2b, }, | ||
1665 | { 85, 5500, 4375, 0x2a, }, | ||
1666 | { 86, 5375, 4250, 0x29, }, | ||
1667 | { 87, 5250, 4125, 0x28, }, | ||
1668 | { 88, 5125, 4000, 0x27, }, | ||
1669 | { 89, 5000, 3875, 0x26, }, | ||
1670 | { 90, 4875, 3750, 0x25, }, | ||
1671 | { 91, 4750, 3625, 0x24, }, | ||
1672 | { 92, 4625, 3500, 0x23, }, | ||
1673 | { 93, 4500, 3375, 0x22, }, | ||
1674 | { 94, 4375, 3250, 0x21, }, | ||
1675 | { 95, 4250, 3125, 0x20, }, | ||
1676 | { 96, 4125, 3000, 0x1f, }, | ||
1677 | { 97, 4125, 3000, 0x1e, }, | ||
1678 | { 98, 4125, 3000, 0x1d, }, | ||
1679 | { 99, 4125, 3000, 0x1c, }, | ||
1680 | { 100, 4125, 3000, 0x1b, }, | ||
1681 | { 101, 4125, 3000, 0x1a, }, | ||
1682 | { 102, 4125, 3000, 0x19, }, | ||
1683 | { 103, 4125, 3000, 0x18, }, | ||
1684 | { 104, 4125, 3000, 0x17, }, | ||
1685 | { 105, 4125, 3000, 0x16, }, | ||
1686 | { 106, 4125, 3000, 0x15, }, | ||
1687 | { 107, 4125, 3000, 0x14, }, | ||
1688 | { 108, 4125, 3000, 0x13, }, | ||
1689 | { 109, 4125, 3000, 0x12, }, | ||
1690 | { 110, 4125, 3000, 0x11, }, | ||
1691 | { 111, 4125, 3000, 0x10, }, | ||
1692 | { 112, 4125, 3000, 0x0f, }, | ||
1693 | { 113, 4125, 3000, 0x0e, }, | ||
1694 | { 114, 4125, 3000, 0x0d, }, | ||
1695 | { 115, 4125, 3000, 0x0c, }, | ||
1696 | { 116, 4125, 3000, 0x0b, }, | ||
1697 | { 117, 4125, 3000, 0x0a, }, | ||
1698 | { 118, 4125, 3000, 0x09, }, | ||
1699 | { 119, 4125, 3000, 0x08, }, | ||
1700 | { 120, 1125, 0, 0x07, }, | ||
1701 | { 121, 1000, 0, 0x06, }, | ||
1702 | { 122, 875, 0, 0x05, }, | ||
1703 | { 123, 750, 0, 0x04, }, | ||
1704 | { 124, 625, 0, 0x03, }, | ||
1705 | { 125, 500, 0, 0x02, }, | ||
1706 | { 126, 375, 0, 0x01, }, | ||
1707 | { 127, 0, 0, 0x00, }, | ||
1708 | }; | ||
1709 | |||
1710 | struct cparams { | ||
1711 | int i; | ||
1712 | int t; | ||
1713 | int m; | ||
1714 | int c; | ||
1715 | }; | ||
1716 | |||
1717 | static struct cparams cparams[] = { | ||
1718 | { 1, 1333, 301, 28664 }, | ||
1719 | { 1, 1066, 294, 24460 }, | ||
1720 | { 1, 800, 294, 25192 }, | ||
1721 | { 0, 1333, 276, 27605 }, | ||
1722 | { 0, 1066, 276, 27605 }, | ||
1723 | { 0, 800, 231, 23784 }, | ||
1724 | }; | ||
1725 | |||
1726 | unsigned long i915_chipset_val(struct drm_i915_private *dev_priv) | ||
1727 | { | ||
1728 | u64 total_count, diff, ret; | ||
1729 | u32 count1, count2, count3, m = 0, c = 0; | ||
1730 | unsigned long now = jiffies_to_msecs(jiffies), diff1; | ||
1731 | int i; | ||
1732 | |||
1733 | diff1 = now - dev_priv->last_time1; | ||
1734 | |||
1735 | count1 = I915_READ(DMIEC); | ||
1736 | count2 = I915_READ(DDREC); | ||
1737 | count3 = I915_READ(CSIEC); | ||
1738 | |||
1739 | total_count = count1 + count2 + count3; | ||
1740 | |||
1741 | /* FIXME: handle per-counter overflow */ | ||
1742 | if (total_count < dev_priv->last_count1) { | ||
1743 | diff = ~0UL - dev_priv->last_count1; | ||
1744 | diff += total_count; | ||
1745 | } else { | ||
1746 | diff = total_count - dev_priv->last_count1; | ||
1747 | } | ||
1748 | |||
1749 | for (i = 0; i < ARRAY_SIZE(cparams); i++) { | ||
1750 | if (cparams[i].i == dev_priv->c_m && | ||
1751 | cparams[i].t == dev_priv->r_t) { | ||
1752 | m = cparams[i].m; | ||
1753 | c = cparams[i].c; | ||
1754 | break; | ||
1755 | } | ||
1756 | } | ||
1757 | |||
1758 | div_u64(diff, diff1); | ||
1759 | ret = ((m * diff) + c); | ||
1760 | div_u64(ret, 10); | ||
1761 | |||
1762 | dev_priv->last_count1 = total_count; | ||
1763 | dev_priv->last_time1 = now; | ||
1764 | |||
1765 | return ret; | ||
1766 | } | ||
1767 | |||
1768 | unsigned long i915_mch_val(struct drm_i915_private *dev_priv) | ||
1769 | { | ||
1770 | unsigned long m, x, b; | ||
1771 | u32 tsfs; | ||
1772 | |||
1773 | tsfs = I915_READ(TSFS); | ||
1774 | |||
1775 | m = ((tsfs & TSFS_SLOPE_MASK) >> TSFS_SLOPE_SHIFT); | ||
1776 | x = I915_READ8(TR1); | ||
1777 | |||
1778 | b = tsfs & TSFS_INTR_MASK; | ||
1779 | |||
1780 | return ((m * x) / 127) - b; | ||
1781 | } | ||
1782 | |||
1783 | static unsigned long pvid_to_extvid(struct drm_i915_private *dev_priv, u8 pxvid) | ||
1784 | { | ||
1785 | unsigned long val = 0; | ||
1786 | int i; | ||
1787 | |||
1788 | for (i = 0; i < ARRAY_SIZE(v_table); i++) { | ||
1789 | if (v_table[i].pvid == pxvid) { | ||
1790 | if (IS_MOBILE(dev_priv->dev)) | ||
1791 | val = v_table[i].vm; | ||
1792 | else | ||
1793 | val = v_table[i].vd; | ||
1794 | } | ||
1795 | } | ||
1796 | |||
1797 | return val; | ||
1798 | } | ||
1799 | |||
1800 | void i915_update_gfx_val(struct drm_i915_private *dev_priv) | ||
1801 | { | ||
1802 | struct timespec now, diff1; | ||
1803 | u64 diff; | ||
1804 | unsigned long diffms; | ||
1805 | u32 count; | ||
1806 | |||
1807 | getrawmonotonic(&now); | ||
1808 | diff1 = timespec_sub(now, dev_priv->last_time2); | ||
1809 | |||
1810 | /* Don't divide by 0 */ | ||
1811 | diffms = diff1.tv_sec * 1000 + diff1.tv_nsec / 1000000; | ||
1812 | if (!diffms) | ||
1813 | return; | ||
1814 | |||
1815 | count = I915_READ(GFXEC); | ||
1816 | |||
1817 | if (count < dev_priv->last_count2) { | ||
1818 | diff = ~0UL - dev_priv->last_count2; | ||
1819 | diff += count; | ||
1820 | } else { | ||
1821 | diff = count - dev_priv->last_count2; | ||
1822 | } | ||
1823 | |||
1824 | dev_priv->last_count2 = count; | ||
1825 | dev_priv->last_time2 = now; | ||
1826 | |||
1827 | /* More magic constants... */ | ||
1828 | diff = diff * 1181; | ||
1829 | div_u64(diff, diffms * 10); | ||
1830 | dev_priv->gfx_power = diff; | ||
1578 | } | 1831 | } |
1579 | 1832 | ||
1833 | unsigned long i915_gfx_val(struct drm_i915_private *dev_priv) | ||
1834 | { | ||
1835 | unsigned long t, corr, state1, corr2, state2; | ||
1836 | u32 pxvid, ext_v; | ||
1837 | |||
1838 | pxvid = I915_READ(PXVFREQ_BASE + (dev_priv->cur_delay * 4)); | ||
1839 | pxvid = (pxvid >> 24) & 0x7f; | ||
1840 | ext_v = pvid_to_extvid(dev_priv, pxvid); | ||
1841 | |||
1842 | state1 = ext_v; | ||
1843 | |||
1844 | t = i915_mch_val(dev_priv); | ||
1845 | |||
1846 | /* Revel in the empirically derived constants */ | ||
1847 | |||
1848 | /* Correction factor in 1/100000 units */ | ||
1849 | if (t > 80) | ||
1850 | corr = ((t * 2349) + 135940); | ||
1851 | else if (t >= 50) | ||
1852 | corr = ((t * 964) + 29317); | ||
1853 | else /* < 50 */ | ||
1854 | corr = ((t * 301) + 1004); | ||
1855 | |||
1856 | corr = corr * ((150142 * state1) / 10000 - 78642); | ||
1857 | corr /= 100000; | ||
1858 | corr2 = (corr * dev_priv->corr); | ||
1859 | |||
1860 | state2 = (corr2 * state1) / 10000; | ||
1861 | state2 /= 100; /* convert to mW */ | ||
1862 | |||
1863 | i915_update_gfx_val(dev_priv); | ||
1864 | |||
1865 | return dev_priv->gfx_power + state2; | ||
1866 | } | ||
1867 | |||
1868 | /* Global for IPS driver to get at the current i915 device */ | ||
1869 | static struct drm_i915_private *i915_mch_dev; | ||
1870 | /* | ||
1871 | * Lock protecting IPS related data structures | ||
1872 | * - i915_mch_dev | ||
1873 | * - dev_priv->max_delay | ||
1874 | * - dev_priv->min_delay | ||
1875 | * - dev_priv->fmax | ||
1876 | * - dev_priv->gpu_busy | ||
1877 | */ | ||
1878 | DEFINE_SPINLOCK(mchdev_lock); | ||
1879 | |||
1880 | /** | ||
1881 | * i915_read_mch_val - return value for IPS use | ||
1882 | * | ||
1883 | * Calculate and return a value for the IPS driver to use when deciding whether | ||
1884 | * we have thermal and power headroom to increase CPU or GPU power budget. | ||
1885 | */ | ||
1886 | unsigned long i915_read_mch_val(void) | ||
1887 | { | ||
1888 | struct drm_i915_private *dev_priv; | ||
1889 | unsigned long chipset_val, graphics_val, ret = 0; | ||
1890 | |||
1891 | spin_lock(&mchdev_lock); | ||
1892 | if (!i915_mch_dev) | ||
1893 | goto out_unlock; | ||
1894 | dev_priv = i915_mch_dev; | ||
1895 | |||
1896 | chipset_val = i915_chipset_val(dev_priv); | ||
1897 | graphics_val = i915_gfx_val(dev_priv); | ||
1898 | |||
1899 | ret = chipset_val + graphics_val; | ||
1900 | |||
1901 | out_unlock: | ||
1902 | spin_unlock(&mchdev_lock); | ||
1903 | |||
1904 | return ret; | ||
1905 | } | ||
1906 | EXPORT_SYMBOL_GPL(i915_read_mch_val); | ||
1907 | |||
1908 | /** | ||
1909 | * i915_gpu_raise - raise GPU frequency limit | ||
1910 | * | ||
1911 | * Raise the limit; IPS indicates we have thermal headroom. | ||
1912 | */ | ||
1913 | bool i915_gpu_raise(void) | ||
1914 | { | ||
1915 | struct drm_i915_private *dev_priv; | ||
1916 | bool ret = true; | ||
1917 | |||
1918 | spin_lock(&mchdev_lock); | ||
1919 | if (!i915_mch_dev) { | ||
1920 | ret = false; | ||
1921 | goto out_unlock; | ||
1922 | } | ||
1923 | dev_priv = i915_mch_dev; | ||
1924 | |||
1925 | if (dev_priv->max_delay > dev_priv->fmax) | ||
1926 | dev_priv->max_delay--; | ||
1927 | |||
1928 | out_unlock: | ||
1929 | spin_unlock(&mchdev_lock); | ||
1930 | |||
1931 | return ret; | ||
1932 | } | ||
1933 | EXPORT_SYMBOL_GPL(i915_gpu_raise); | ||
1934 | |||
1935 | /** | ||
1936 | * i915_gpu_lower - lower GPU frequency limit | ||
1937 | * | ||
1938 | * IPS indicates we're close to a thermal limit, so throttle back the GPU | ||
1939 | * frequency maximum. | ||
1940 | */ | ||
1941 | bool i915_gpu_lower(void) | ||
1942 | { | ||
1943 | struct drm_i915_private *dev_priv; | ||
1944 | bool ret = true; | ||
1945 | |||
1946 | spin_lock(&mchdev_lock); | ||
1947 | if (!i915_mch_dev) { | ||
1948 | ret = false; | ||
1949 | goto out_unlock; | ||
1950 | } | ||
1951 | dev_priv = i915_mch_dev; | ||
1952 | |||
1953 | if (dev_priv->max_delay < dev_priv->min_delay) | ||
1954 | dev_priv->max_delay++; | ||
1955 | |||
1956 | out_unlock: | ||
1957 | spin_unlock(&mchdev_lock); | ||
1958 | |||
1959 | return ret; | ||
1960 | } | ||
1961 | EXPORT_SYMBOL_GPL(i915_gpu_lower); | ||
1962 | |||
1963 | /** | ||
1964 | * i915_gpu_busy - indicate GPU business to IPS | ||
1965 | * | ||
1966 | * Tell the IPS driver whether or not the GPU is busy. | ||
1967 | */ | ||
1968 | bool i915_gpu_busy(void) | ||
1969 | { | ||
1970 | struct drm_i915_private *dev_priv; | ||
1971 | bool ret = false; | ||
1972 | |||
1973 | spin_lock(&mchdev_lock); | ||
1974 | if (!i915_mch_dev) | ||
1975 | goto out_unlock; | ||
1976 | dev_priv = i915_mch_dev; | ||
1977 | |||
1978 | ret = dev_priv->busy; | ||
1979 | |||
1980 | out_unlock: | ||
1981 | spin_unlock(&mchdev_lock); | ||
1982 | |||
1983 | return ret; | ||
1984 | } | ||
1985 | EXPORT_SYMBOL_GPL(i915_gpu_busy); | ||
1986 | |||
1987 | /** | ||
1988 | * i915_gpu_turbo_disable - disable graphics turbo | ||
1989 | * | ||
1990 | * Disable graphics turbo by resetting the max frequency and setting the | ||
1991 | * current frequency to the default. | ||
1992 | */ | ||
1993 | bool i915_gpu_turbo_disable(void) | ||
1994 | { | ||
1995 | struct drm_i915_private *dev_priv; | ||
1996 | bool ret = true; | ||
1997 | |||
1998 | spin_lock(&mchdev_lock); | ||
1999 | if (!i915_mch_dev) { | ||
2000 | ret = false; | ||
2001 | goto out_unlock; | ||
2002 | } | ||
2003 | dev_priv = i915_mch_dev; | ||
2004 | |||
2005 | dev_priv->max_delay = dev_priv->fstart; | ||
2006 | |||
2007 | if (!ironlake_set_drps(dev_priv->dev, dev_priv->fstart)) | ||
2008 | ret = false; | ||
2009 | |||
2010 | out_unlock: | ||
2011 | spin_unlock(&mchdev_lock); | ||
2012 | |||
2013 | return ret; | ||
2014 | } | ||
2015 | EXPORT_SYMBOL_GPL(i915_gpu_turbo_disable); | ||
2016 | |||
1580 | /** | 2017 | /** |
1581 | * i915_driver_load - setup chip and create an initial config | 2018 | * i915_driver_load - setup chip and create an initial config |
1582 | * @dev: DRM device | 2019 | * @dev: DRM device |
@@ -1594,7 +2031,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) | |||
1594 | resource_size_t base, size; | 2031 | resource_size_t base, size; |
1595 | int ret = 0, mmio_bar; | 2032 | int ret = 0, mmio_bar; |
1596 | uint32_t agp_size, prealloc_size, prealloc_start; | 2033 | uint32_t agp_size, prealloc_size, prealloc_start; |
1597 | |||
1598 | /* i915 has 4 more counters */ | 2034 | /* i915 has 4 more counters */ |
1599 | dev->counters += 4; | 2035 | dev->counters += 4; |
1600 | dev->types[6] = _DRM_STAT_IRQ; | 2036 | dev->types[6] = _DRM_STAT_IRQ; |
@@ -1672,6 +2108,13 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) | |||
1672 | dev_priv->has_gem = 0; | 2108 | dev_priv->has_gem = 0; |
1673 | } | 2109 | } |
1674 | 2110 | ||
2111 | if (dev_priv->has_gem == 0 && | ||
2112 | drm_core_check_feature(dev, DRIVER_MODESET)) { | ||
2113 | DRM_ERROR("kernel modesetting requires GEM, disabling driver.\n"); | ||
2114 | ret = -ENODEV; | ||
2115 | goto out_iomapfree; | ||
2116 | } | ||
2117 | |||
1675 | dev->driver->get_vblank_counter = i915_get_vblank_counter; | 2118 | dev->driver->get_vblank_counter = i915_get_vblank_counter; |
1676 | dev->max_vblank_count = 0xffffff; /* only 24 bits of frame count */ | 2119 | dev->max_vblank_count = 0xffffff; /* only 24 bits of frame count */ |
1677 | if (IS_G4X(dev) || IS_IRONLAKE(dev) || IS_GEN6(dev)) { | 2120 | if (IS_G4X(dev) || IS_IRONLAKE(dev) || IS_GEN6(dev)) { |
@@ -1691,7 +2134,10 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) | |||
1691 | goto out_workqueue_free; | 2134 | goto out_workqueue_free; |
1692 | } | 2135 | } |
1693 | 2136 | ||
1694 | i915_get_mem_freq(dev); | 2137 | if (IS_PINEVIEW(dev)) |
2138 | i915_pineview_get_mem_freq(dev); | ||
2139 | else if (IS_IRONLAKE(dev)) | ||
2140 | i915_ironlake_get_mem_freq(dev); | ||
1695 | 2141 | ||
1696 | /* On the 945G/GM, the chipset reports the MSI capability on the | 2142 | /* On the 945G/GM, the chipset reports the MSI capability on the |
1697 | * integrated graphics even though the support isn't actually there | 2143 | * integrated graphics even though the support isn't actually there |
@@ -1709,7 +2155,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) | |||
1709 | 2155 | ||
1710 | spin_lock_init(&dev_priv->user_irq_lock); | 2156 | spin_lock_init(&dev_priv->user_irq_lock); |
1711 | spin_lock_init(&dev_priv->error_lock); | 2157 | spin_lock_init(&dev_priv->error_lock); |
1712 | dev_priv->user_irq_refcount = 0; | ||
1713 | dev_priv->trace_irq_seqno = 0; | 2158 | dev_priv->trace_irq_seqno = 0; |
1714 | 2159 | ||
1715 | ret = drm_vblank_init(dev, I915_NUM_PIPE); | 2160 | ret = drm_vblank_init(dev, I915_NUM_PIPE); |
@@ -1738,6 +2183,12 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) | |||
1738 | 2183 | ||
1739 | setup_timer(&dev_priv->hangcheck_timer, i915_hangcheck_elapsed, | 2184 | setup_timer(&dev_priv->hangcheck_timer, i915_hangcheck_elapsed, |
1740 | (unsigned long) dev); | 2185 | (unsigned long) dev); |
2186 | |||
2187 | spin_lock(&mchdev_lock); | ||
2188 | i915_mch_dev = dev_priv; | ||
2189 | dev_priv->mchdev_lock = &mchdev_lock; | ||
2190 | spin_unlock(&mchdev_lock); | ||
2191 | |||
1741 | return 0; | 2192 | return 0; |
1742 | 2193 | ||
1743 | out_workqueue_free: | 2194 | out_workqueue_free: |
@@ -1759,6 +2210,10 @@ int i915_driver_unload(struct drm_device *dev) | |||
1759 | 2210 | ||
1760 | i915_destroy_error_state(dev); | 2211 | i915_destroy_error_state(dev); |
1761 | 2212 | ||
2213 | spin_lock(&mchdev_lock); | ||
2214 | i915_mch_dev = NULL; | ||
2215 | spin_unlock(&mchdev_lock); | ||
2216 | |||
1762 | destroy_workqueue(dev_priv->wq); | 2217 | destroy_workqueue(dev_priv->wq); |
1763 | del_timer_sync(&dev_priv->hangcheck_timer); | 2218 | del_timer_sync(&dev_priv->hangcheck_timer); |
1764 | 2219 | ||
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 5c51e45ab68..423dc90c1e2 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c | |||
@@ -60,95 +60,95 @@ extern int intel_agp_enabled; | |||
60 | .subdevice = PCI_ANY_ID, \ | 60 | .subdevice = PCI_ANY_ID, \ |
61 | .driver_data = (unsigned long) info } | 61 | .driver_data = (unsigned long) info } |
62 | 62 | ||
63 | const static struct intel_device_info intel_i830_info = { | 63 | static const struct intel_device_info intel_i830_info = { |
64 | .is_i8xx = 1, .is_mobile = 1, .cursor_needs_physical = 1, | 64 | .is_i8xx = 1, .is_mobile = 1, .cursor_needs_physical = 1, |
65 | }; | 65 | }; |
66 | 66 | ||
67 | const static struct intel_device_info intel_845g_info = { | 67 | static const struct intel_device_info intel_845g_info = { |
68 | .is_i8xx = 1, | 68 | .is_i8xx = 1, |
69 | }; | 69 | }; |
70 | 70 | ||
71 | const static struct intel_device_info intel_i85x_info = { | 71 | static const struct intel_device_info intel_i85x_info = { |
72 | .is_i8xx = 1, .is_i85x = 1, .is_mobile = 1, | 72 | .is_i8xx = 1, .is_i85x = 1, .is_mobile = 1, |
73 | .cursor_needs_physical = 1, | 73 | .cursor_needs_physical = 1, |
74 | }; | 74 | }; |
75 | 75 | ||
76 | const static struct intel_device_info intel_i865g_info = { | 76 | static const struct intel_device_info intel_i865g_info = { |
77 | .is_i8xx = 1, | 77 | .is_i8xx = 1, |
78 | }; | 78 | }; |
79 | 79 | ||
80 | const static struct intel_device_info intel_i915g_info = { | 80 | static const struct intel_device_info intel_i915g_info = { |
81 | .is_i915g = 1, .is_i9xx = 1, .cursor_needs_physical = 1, | 81 | .is_i915g = 1, .is_i9xx = 1, .cursor_needs_physical = 1, |
82 | }; | 82 | }; |
83 | const static struct intel_device_info intel_i915gm_info = { | 83 | static const struct intel_device_info intel_i915gm_info = { |
84 | .is_i9xx = 1, .is_mobile = 1, | 84 | .is_i9xx = 1, .is_mobile = 1, |
85 | .cursor_needs_physical = 1, | 85 | .cursor_needs_physical = 1, |
86 | }; | 86 | }; |
87 | const static struct intel_device_info intel_i945g_info = { | 87 | static const struct intel_device_info intel_i945g_info = { |
88 | .is_i9xx = 1, .has_hotplug = 1, .cursor_needs_physical = 1, | 88 | .is_i9xx = 1, .has_hotplug = 1, .cursor_needs_physical = 1, |
89 | }; | 89 | }; |
90 | const static struct intel_device_info intel_i945gm_info = { | 90 | static const struct intel_device_info intel_i945gm_info = { |
91 | .is_i945gm = 1, .is_i9xx = 1, .is_mobile = 1, | 91 | .is_i945gm = 1, .is_i9xx = 1, .is_mobile = 1, |
92 | .has_hotplug = 1, .cursor_needs_physical = 1, | 92 | .has_hotplug = 1, .cursor_needs_physical = 1, |
93 | }; | 93 | }; |
94 | 94 | ||
95 | const static struct intel_device_info intel_i965g_info = { | 95 | static const struct intel_device_info intel_i965g_info = { |
96 | .is_i965g = 1, .is_i9xx = 1, .has_hotplug = 1, | 96 | .is_i965g = 1, .is_i9xx = 1, .has_hotplug = 1, |
97 | }; | 97 | }; |
98 | 98 | ||
99 | const static struct intel_device_info intel_i965gm_info = { | 99 | static const struct intel_device_info intel_i965gm_info = { |
100 | .is_i965g = 1, .is_mobile = 1, .is_i965gm = 1, .is_i9xx = 1, | 100 | .is_i965g = 1, .is_mobile = 1, .is_i965gm = 1, .is_i9xx = 1, |
101 | .is_mobile = 1, .has_fbc = 1, .has_rc6 = 1, | 101 | .is_mobile = 1, .has_fbc = 1, .has_rc6 = 1, |
102 | .has_hotplug = 1, | 102 | .has_hotplug = 1, |
103 | }; | 103 | }; |
104 | 104 | ||
105 | const static struct intel_device_info intel_g33_info = { | 105 | static const struct intel_device_info intel_g33_info = { |
106 | .is_g33 = 1, .is_i9xx = 1, .need_gfx_hws = 1, | 106 | .is_g33 = 1, .is_i9xx = 1, .need_gfx_hws = 1, |
107 | .has_hotplug = 1, | 107 | .has_hotplug = 1, |
108 | }; | 108 | }; |
109 | 109 | ||
110 | const static struct intel_device_info intel_g45_info = { | 110 | static const struct intel_device_info intel_g45_info = { |
111 | .is_i965g = 1, .is_g4x = 1, .is_i9xx = 1, .need_gfx_hws = 1, | 111 | .is_i965g = 1, .is_g4x = 1, .is_i9xx = 1, .need_gfx_hws = 1, |
112 | .has_pipe_cxsr = 1, | 112 | .has_pipe_cxsr = 1, |
113 | .has_hotplug = 1, | 113 | .has_hotplug = 1, |
114 | }; | 114 | }; |
115 | 115 | ||
116 | const static struct intel_device_info intel_gm45_info = { | 116 | static const struct intel_device_info intel_gm45_info = { |
117 | .is_i965g = 1, .is_mobile = 1, .is_g4x = 1, .is_i9xx = 1, | 117 | .is_i965g = 1, .is_mobile = 1, .is_g4x = 1, .is_i9xx = 1, |
118 | .is_mobile = 1, .need_gfx_hws = 1, .has_fbc = 1, .has_rc6 = 1, | 118 | .is_mobile = 1, .need_gfx_hws = 1, .has_fbc = 1, .has_rc6 = 1, |
119 | .has_pipe_cxsr = 1, | 119 | .has_pipe_cxsr = 1, |
120 | .has_hotplug = 1, | 120 | .has_hotplug = 1, |
121 | }; | 121 | }; |
122 | 122 | ||
123 | const static struct intel_device_info intel_pineview_info = { | 123 | static const struct intel_device_info intel_pineview_info = { |
124 | .is_g33 = 1, .is_pineview = 1, .is_mobile = 1, .is_i9xx = 1, | 124 | .is_g33 = 1, .is_pineview = 1, .is_mobile = 1, .is_i9xx = 1, |
125 | .need_gfx_hws = 1, | 125 | .need_gfx_hws = 1, |
126 | .has_hotplug = 1, | 126 | .has_hotplug = 1, |
127 | }; | 127 | }; |
128 | 128 | ||
129 | const static struct intel_device_info intel_ironlake_d_info = { | 129 | static const struct intel_device_info intel_ironlake_d_info = { |
130 | .is_ironlake = 1, .is_i965g = 1, .is_i9xx = 1, .need_gfx_hws = 1, | 130 | .is_ironlake = 1, .is_i965g = 1, .is_i9xx = 1, .need_gfx_hws = 1, |
131 | .has_pipe_cxsr = 1, | 131 | .has_pipe_cxsr = 1, |
132 | .has_hotplug = 1, | 132 | .has_hotplug = 1, |
133 | }; | 133 | }; |
134 | 134 | ||
135 | const static struct intel_device_info intel_ironlake_m_info = { | 135 | static const struct intel_device_info intel_ironlake_m_info = { |
136 | .is_ironlake = 1, .is_mobile = 1, .is_i965g = 1, .is_i9xx = 1, | 136 | .is_ironlake = 1, .is_mobile = 1, .is_i965g = 1, .is_i9xx = 1, |
137 | .need_gfx_hws = 1, .has_rc6 = 1, | 137 | .need_gfx_hws = 1, .has_rc6 = 1, |
138 | .has_hotplug = 1, | 138 | .has_hotplug = 1, |
139 | }; | 139 | }; |
140 | 140 | ||
141 | const static struct intel_device_info intel_sandybridge_d_info = { | 141 | static const struct intel_device_info intel_sandybridge_d_info = { |
142 | .is_i965g = 1, .is_i9xx = 1, .need_gfx_hws = 1, | 142 | .is_i965g = 1, .is_i9xx = 1, .need_gfx_hws = 1, |
143 | .has_hotplug = 1, .is_gen6 = 1, | 143 | .has_hotplug = 1, .is_gen6 = 1, |
144 | }; | 144 | }; |
145 | 145 | ||
146 | const static struct intel_device_info intel_sandybridge_m_info = { | 146 | static const struct intel_device_info intel_sandybridge_m_info = { |
147 | .is_i965g = 1, .is_mobile = 1, .is_i9xx = 1, .need_gfx_hws = 1, | 147 | .is_i965g = 1, .is_mobile = 1, .is_i9xx = 1, .need_gfx_hws = 1, |
148 | .has_hotplug = 1, .is_gen6 = 1, | 148 | .has_hotplug = 1, .is_gen6 = 1, |
149 | }; | 149 | }; |
150 | 150 | ||
151 | const static struct pci_device_id pciidlist[] = { | 151 | static const struct pci_device_id pciidlist[] = { |
152 | INTEL_VGA_DEVICE(0x3577, &intel_i830_info), | 152 | INTEL_VGA_DEVICE(0x3577, &intel_i830_info), |
153 | INTEL_VGA_DEVICE(0x2562, &intel_845g_info), | 153 | INTEL_VGA_DEVICE(0x2562, &intel_845g_info), |
154 | INTEL_VGA_DEVICE(0x3582, &intel_i85x_info), | 154 | INTEL_VGA_DEVICE(0x3582, &intel_i85x_info), |
@@ -340,7 +340,7 @@ int i965_reset(struct drm_device *dev, u8 flags) | |||
340 | /* | 340 | /* |
341 | * Clear request list | 341 | * Clear request list |
342 | */ | 342 | */ |
343 | i915_gem_retire_requests(dev); | 343 | i915_gem_retire_requests(dev, &dev_priv->render_ring); |
344 | 344 | ||
345 | if (need_display) | 345 | if (need_display) |
346 | i915_save_display(dev); | 346 | i915_save_display(dev); |
@@ -370,6 +370,7 @@ int i965_reset(struct drm_device *dev, u8 flags) | |||
370 | } | 370 | } |
371 | } else { | 371 | } else { |
372 | DRM_ERROR("Error occurred. Don't know how to reset this chip.\n"); | 372 | DRM_ERROR("Error occurred. Don't know how to reset this chip.\n"); |
373 | mutex_unlock(&dev->struct_mutex); | ||
373 | return -ENODEV; | 374 | return -ENODEV; |
374 | } | 375 | } |
375 | 376 | ||
@@ -388,33 +389,10 @@ int i965_reset(struct drm_device *dev, u8 flags) | |||
388 | * switched away). | 389 | * switched away). |
389 | */ | 390 | */ |
390 | if (drm_core_check_feature(dev, DRIVER_MODESET) || | 391 | if (drm_core_check_feature(dev, DRIVER_MODESET) || |
391 | !dev_priv->mm.suspended) { | 392 | !dev_priv->mm.suspended) { |
392 | drm_i915_ring_buffer_t *ring = &dev_priv->ring; | 393 | struct intel_ring_buffer *ring = &dev_priv->render_ring; |
393 | struct drm_gem_object *obj = ring->ring_obj; | ||
394 | struct drm_i915_gem_object *obj_priv = to_intel_bo(obj); | ||
395 | dev_priv->mm.suspended = 0; | 394 | dev_priv->mm.suspended = 0; |
396 | 395 | ring->init(dev, ring); | |
397 | /* Stop the ring if it's running. */ | ||
398 | I915_WRITE(PRB0_CTL, 0); | ||
399 | I915_WRITE(PRB0_TAIL, 0); | ||
400 | I915_WRITE(PRB0_HEAD, 0); | ||
401 | |||
402 | /* Initialize the ring. */ | ||
403 | I915_WRITE(PRB0_START, obj_priv->gtt_offset); | ||
404 | I915_WRITE(PRB0_CTL, | ||
405 | ((obj->size - 4096) & RING_NR_PAGES) | | ||
406 | RING_NO_REPORT | | ||
407 | RING_VALID); | ||
408 | if (!drm_core_check_feature(dev, DRIVER_MODESET)) | ||
409 | i915_kernel_lost_context(dev); | ||
410 | else { | ||
411 | ring->head = I915_READ(PRB0_HEAD) & HEAD_ADDR; | ||
412 | ring->tail = I915_READ(PRB0_TAIL) & TAIL_ADDR; | ||
413 | ring->space = ring->head - (ring->tail + 8); | ||
414 | if (ring->space < 0) | ||
415 | ring->space += ring->Size; | ||
416 | } | ||
417 | |||
418 | mutex_unlock(&dev->struct_mutex); | 396 | mutex_unlock(&dev->struct_mutex); |
419 | drm_irq_uninstall(dev); | 397 | drm_irq_uninstall(dev); |
420 | drm_irq_install(dev); | 398 | drm_irq_install(dev); |
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 7f797ef1ab3..9ed8ecd9580 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
@@ -32,6 +32,7 @@ | |||
32 | 32 | ||
33 | #include "i915_reg.h" | 33 | #include "i915_reg.h" |
34 | #include "intel_bios.h" | 34 | #include "intel_bios.h" |
35 | #include "intel_ringbuffer.h" | ||
35 | #include <linux/io-mapping.h> | 36 | #include <linux/io-mapping.h> |
36 | 37 | ||
37 | /* General customization: | 38 | /* General customization: |
@@ -55,6 +56,8 @@ enum plane { | |||
55 | 56 | ||
56 | #define I915_NUM_PIPE 2 | 57 | #define I915_NUM_PIPE 2 |
57 | 58 | ||
59 | #define I915_GEM_GPU_DOMAINS (~(I915_GEM_DOMAIN_CPU | I915_GEM_DOMAIN_GTT)) | ||
60 | |||
58 | /* Interface history: | 61 | /* Interface history: |
59 | * | 62 | * |
60 | * 1.1: Original. | 63 | * 1.1: Original. |
@@ -89,16 +92,6 @@ struct drm_i915_gem_phys_object { | |||
89 | struct drm_gem_object *cur_obj; | 92 | struct drm_gem_object *cur_obj; |
90 | }; | 93 | }; |
91 | 94 | ||
92 | typedef struct _drm_i915_ring_buffer { | ||
93 | unsigned long Size; | ||
94 | u8 *virtual_start; | ||
95 | int head; | ||
96 | int tail; | ||
97 | int space; | ||
98 | drm_local_map_t map; | ||
99 | struct drm_gem_object *ring_obj; | ||
100 | } drm_i915_ring_buffer_t; | ||
101 | |||
102 | struct mem_block { | 95 | struct mem_block { |
103 | struct mem_block *next; | 96 | struct mem_block *next; |
104 | struct mem_block *prev; | 97 | struct mem_block *prev; |
@@ -241,17 +234,15 @@ typedef struct drm_i915_private { | |||
241 | void __iomem *regs; | 234 | void __iomem *regs; |
242 | 235 | ||
243 | struct pci_dev *bridge_dev; | 236 | struct pci_dev *bridge_dev; |
244 | drm_i915_ring_buffer_t ring; | 237 | struct intel_ring_buffer render_ring; |
238 | struct intel_ring_buffer bsd_ring; | ||
245 | 239 | ||
246 | drm_dma_handle_t *status_page_dmah; | 240 | drm_dma_handle_t *status_page_dmah; |
247 | void *hw_status_page; | ||
248 | void *seqno_page; | 241 | void *seqno_page; |
249 | dma_addr_t dma_status_page; | 242 | dma_addr_t dma_status_page; |
250 | uint32_t counter; | 243 | uint32_t counter; |
251 | unsigned int status_gfx_addr; | ||
252 | unsigned int seqno_gfx_addr; | 244 | unsigned int seqno_gfx_addr; |
253 | drm_local_map_t hws_map; | 245 | drm_local_map_t hws_map; |
254 | struct drm_gem_object *hws_obj; | ||
255 | struct drm_gem_object *seqno_obj; | 246 | struct drm_gem_object *seqno_obj; |
256 | struct drm_gem_object *pwrctx; | 247 | struct drm_gem_object *pwrctx; |
257 | 248 | ||
@@ -267,8 +258,6 @@ typedef struct drm_i915_private { | |||
267 | atomic_t irq_received; | 258 | atomic_t irq_received; |
268 | /** Protects user_irq_refcount and irq_mask_reg */ | 259 | /** Protects user_irq_refcount and irq_mask_reg */ |
269 | spinlock_t user_irq_lock; | 260 | spinlock_t user_irq_lock; |
270 | /** Refcount for i915_user_irq_get() versus i915_user_irq_put(). */ | ||
271 | int user_irq_refcount; | ||
272 | u32 trace_irq_seqno; | 261 | u32 trace_irq_seqno; |
273 | /** Cached value of IMR to avoid reads in updating the bitfield */ | 262 | /** Cached value of IMR to avoid reads in updating the bitfield */ |
274 | u32 irq_mask_reg; | 263 | u32 irq_mask_reg; |
@@ -334,7 +323,7 @@ typedef struct drm_i915_private { | |||
334 | int fence_reg_start; /* 4 if userland hasn't ioctl'd us yet */ | 323 | int fence_reg_start; /* 4 if userland hasn't ioctl'd us yet */ |
335 | int num_fence_regs; /* 8 on pre-965, 16 otherwise */ | 324 | int num_fence_regs; /* 8 on pre-965, 16 otherwise */ |
336 | 325 | ||
337 | unsigned int fsb_freq, mem_freq; | 326 | unsigned int fsb_freq, mem_freq, is_ddr3; |
338 | 327 | ||
339 | spinlock_t error_lock; | 328 | spinlock_t error_lock; |
340 | struct drm_i915_error_state *first_error; | 329 | struct drm_i915_error_state *first_error; |
@@ -514,18 +503,7 @@ typedef struct drm_i915_private { | |||
514 | */ | 503 | */ |
515 | struct list_head shrink_list; | 504 | struct list_head shrink_list; |
516 | 505 | ||
517 | /** | ||
518 | * List of objects currently involved in rendering from the | ||
519 | * ringbuffer. | ||
520 | * | ||
521 | * Includes buffers having the contents of their GPU caches | ||
522 | * flushed, not necessarily primitives. last_rendering_seqno | ||
523 | * represents when the rendering involved will be completed. | ||
524 | * | ||
525 | * A reference is held on the buffer while on this list. | ||
526 | */ | ||
527 | spinlock_t active_list_lock; | 506 | spinlock_t active_list_lock; |
528 | struct list_head active_list; | ||
529 | 507 | ||
530 | /** | 508 | /** |
531 | * List of objects which are not in the ringbuffer but which | 509 | * List of objects which are not in the ringbuffer but which |
@@ -563,12 +541,6 @@ typedef struct drm_i915_private { | |||
563 | struct list_head fence_list; | 541 | struct list_head fence_list; |
564 | 542 | ||
565 | /** | 543 | /** |
566 | * List of breadcrumbs associated with GPU requests currently | ||
567 | * outstanding. | ||
568 | */ | ||
569 | struct list_head request_list; | ||
570 | |||
571 | /** | ||
572 | * We leave the user IRQ off as much as possible, | 544 | * We leave the user IRQ off as much as possible, |
573 | * but this means that requests will finish and never | 545 | * but this means that requests will finish and never |
574 | * be retired once the system goes idle. Set a timer to | 546 | * be retired once the system goes idle. Set a timer to |
@@ -644,6 +616,18 @@ typedef struct drm_i915_private { | |||
644 | u8 cur_delay; | 616 | u8 cur_delay; |
645 | u8 min_delay; | 617 | u8 min_delay; |
646 | u8 max_delay; | 618 | u8 max_delay; |
619 | u8 fmax; | ||
620 | u8 fstart; | ||
621 | |||
622 | u64 last_count1; | ||
623 | unsigned long last_time1; | ||
624 | u64 last_count2; | ||
625 | struct timespec last_time2; | ||
626 | unsigned long gfx_power; | ||
627 | int c_m; | ||
628 | int r_t; | ||
629 | u8 corr; | ||
630 | spinlock_t *mchdev_lock; | ||
647 | 631 | ||
648 | enum no_fbc_reason no_fbc_reason; | 632 | enum no_fbc_reason no_fbc_reason; |
649 | 633 | ||
@@ -671,19 +655,64 @@ struct drm_i915_gem_object { | |||
671 | * (has pending rendering), and is not set if it's on inactive (ready | 655 | * (has pending rendering), and is not set if it's on inactive (ready |
672 | * to be unbound). | 656 | * to be unbound). |
673 | */ | 657 | */ |
674 | int active; | 658 | unsigned int active : 1; |
675 | 659 | ||
676 | /** | 660 | /** |
677 | * This is set if the object has been written to since last bound | 661 | * This is set if the object has been written to since last bound |
678 | * to the GTT | 662 | * to the GTT |
679 | */ | 663 | */ |
680 | int dirty; | 664 | unsigned int dirty : 1; |
665 | |||
666 | /** | ||
667 | * Fence register bits (if any) for this object. Will be set | ||
668 | * as needed when mapped into the GTT. | ||
669 | * Protected by dev->struct_mutex. | ||
670 | * | ||
671 | * Size: 4 bits for 16 fences + sign (for FENCE_REG_NONE) | ||
672 | */ | ||
673 | int fence_reg : 5; | ||
674 | |||
675 | /** | ||
676 | * Used for checking the object doesn't appear more than once | ||
677 | * in an execbuffer object list. | ||
678 | */ | ||
679 | unsigned int in_execbuffer : 1; | ||
680 | |||
681 | /** | ||
682 | * Advice: are the backing pages purgeable? | ||
683 | */ | ||
684 | unsigned int madv : 2; | ||
685 | |||
686 | /** | ||
687 | * Refcount for the pages array. With the current locking scheme, there | ||
688 | * are at most two concurrent users: Binding a bo to the gtt and | ||
689 | * pwrite/pread using physical addresses. So two bits for a maximum | ||
690 | * of two users are enough. | ||
691 | */ | ||
692 | unsigned int pages_refcount : 2; | ||
693 | #define DRM_I915_GEM_OBJECT_MAX_PAGES_REFCOUNT 0x3 | ||
694 | |||
695 | /** | ||
696 | * Current tiling mode for the object. | ||
697 | */ | ||
698 | unsigned int tiling_mode : 2; | ||
699 | |||
700 | /** How many users have pinned this object in GTT space. The following | ||
701 | * users can each hold at most one reference: pwrite/pread, pin_ioctl | ||
702 | * (via user_pin_count), execbuffer (objects are not allowed multiple | ||
703 | * times for the same batchbuffer), and the framebuffer code. When | ||
704 | * switching/pageflipping, the framebuffer code has at most two buffers | ||
705 | * pinned per crtc. | ||
706 | * | ||
707 | * In the worst case this is 1 + 1 + 1 + 2*2 = 7. That would fit into 3 | ||
708 | * bits with absolutely no headroom. So use 4 bits. */ | ||
709 | int pin_count : 4; | ||
710 | #define DRM_I915_GEM_OBJECT_MAX_PIN_COUNT 0xf | ||
681 | 711 | ||
682 | /** AGP memory structure for our GTT binding. */ | 712 | /** AGP memory structure for our GTT binding. */ |
683 | DRM_AGP_MEM *agp_mem; | 713 | DRM_AGP_MEM *agp_mem; |
684 | 714 | ||
685 | struct page **pages; | 715 | struct page **pages; |
686 | int pages_refcount; | ||
687 | 716 | ||
688 | /** | 717 | /** |
689 | * Current offset of the object in GTT space. | 718 | * Current offset of the object in GTT space. |
@@ -692,26 +721,18 @@ struct drm_i915_gem_object { | |||
692 | */ | 721 | */ |
693 | uint32_t gtt_offset; | 722 | uint32_t gtt_offset; |
694 | 723 | ||
724 | /* Which ring is refering to is this object */ | ||
725 | struct intel_ring_buffer *ring; | ||
726 | |||
695 | /** | 727 | /** |
696 | * Fake offset for use by mmap(2) | 728 | * Fake offset for use by mmap(2) |
697 | */ | 729 | */ |
698 | uint64_t mmap_offset; | 730 | uint64_t mmap_offset; |
699 | 731 | ||
700 | /** | ||
701 | * Fence register bits (if any) for this object. Will be set | ||
702 | * as needed when mapped into the GTT. | ||
703 | * Protected by dev->struct_mutex. | ||
704 | */ | ||
705 | int fence_reg; | ||
706 | |||
707 | /** How many users have pinned this object in GTT space */ | ||
708 | int pin_count; | ||
709 | |||
710 | /** Breadcrumb of last rendering to the buffer. */ | 732 | /** Breadcrumb of last rendering to the buffer. */ |
711 | uint32_t last_rendering_seqno; | 733 | uint32_t last_rendering_seqno; |
712 | 734 | ||
713 | /** Current tiling mode for the object. */ | 735 | /** Current tiling stride for the object, if it's tiled. */ |
714 | uint32_t tiling_mode; | ||
715 | uint32_t stride; | 736 | uint32_t stride; |
716 | 737 | ||
717 | /** Record of address bit 17 of each page at last unbind. */ | 738 | /** Record of address bit 17 of each page at last unbind. */ |
@@ -734,17 +755,6 @@ struct drm_i915_gem_object { | |||
734 | struct drm_i915_gem_phys_object *phys_obj; | 755 | struct drm_i915_gem_phys_object *phys_obj; |
735 | 756 | ||
736 | /** | 757 | /** |
737 | * Used for checking the object doesn't appear more than once | ||
738 | * in an execbuffer object list. | ||
739 | */ | ||
740 | int in_execbuffer; | ||
741 | |||
742 | /** | ||
743 | * Advice: are the backing pages purgeable? | ||
744 | */ | ||
745 | int madv; | ||
746 | |||
747 | /** | ||
748 | * Number of crtcs where this object is currently the fb, but | 758 | * Number of crtcs where this object is currently the fb, but |
749 | * will be page flipped away on the next vblank. When it | 759 | * will be page flipped away on the next vblank. When it |
750 | * reaches 0, dev_priv->pending_flip_queue will be woken up. | 760 | * reaches 0, dev_priv->pending_flip_queue will be woken up. |
@@ -765,6 +775,9 @@ struct drm_i915_gem_object { | |||
765 | * an emission time with seqnos for tracking how far ahead of the GPU we are. | 775 | * an emission time with seqnos for tracking how far ahead of the GPU we are. |
766 | */ | 776 | */ |
767 | struct drm_i915_gem_request { | 777 | struct drm_i915_gem_request { |
778 | /** On Which ring this request was generated */ | ||
779 | struct intel_ring_buffer *ring; | ||
780 | |||
768 | /** GEM sequence number associated with this request. */ | 781 | /** GEM sequence number associated with this request. */ |
769 | uint32_t seqno; | 782 | uint32_t seqno; |
770 | 783 | ||
@@ -821,6 +834,11 @@ extern int i915_emit_box(struct drm_device *dev, | |||
821 | struct drm_clip_rect *boxes, | 834 | struct drm_clip_rect *boxes, |
822 | int i, int DR1, int DR4); | 835 | int i, int DR1, int DR4); |
823 | extern int i965_reset(struct drm_device *dev, u8 flags); | 836 | extern int i965_reset(struct drm_device *dev, u8 flags); |
837 | extern unsigned long i915_chipset_val(struct drm_i915_private *dev_priv); | ||
838 | extern unsigned long i915_mch_val(struct drm_i915_private *dev_priv); | ||
839 | extern unsigned long i915_gfx_val(struct drm_i915_private *dev_priv); | ||
840 | extern void i915_update_gfx_val(struct drm_i915_private *dev_priv); | ||
841 | |||
824 | 842 | ||
825 | /* i915_irq.c */ | 843 | /* i915_irq.c */ |
826 | void i915_hangcheck_elapsed(unsigned long data); | 844 | void i915_hangcheck_elapsed(unsigned long data); |
@@ -829,9 +847,7 @@ extern int i915_irq_emit(struct drm_device *dev, void *data, | |||
829 | struct drm_file *file_priv); | 847 | struct drm_file *file_priv); |
830 | extern int i915_irq_wait(struct drm_device *dev, void *data, | 848 | extern int i915_irq_wait(struct drm_device *dev, void *data, |
831 | struct drm_file *file_priv); | 849 | struct drm_file *file_priv); |
832 | void i915_user_irq_get(struct drm_device *dev); | ||
833 | void i915_trace_irq_get(struct drm_device *dev, u32 seqno); | 850 | void i915_trace_irq_get(struct drm_device *dev, u32 seqno); |
834 | void i915_user_irq_put(struct drm_device *dev); | ||
835 | extern void i915_enable_interrupt (struct drm_device *dev); | 851 | extern void i915_enable_interrupt (struct drm_device *dev); |
836 | 852 | ||
837 | extern irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS); | 853 | extern irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS); |
@@ -849,6 +865,11 @@ extern u32 gm45_get_vblank_counter(struct drm_device *dev, int crtc); | |||
849 | extern int i915_vblank_swap(struct drm_device *dev, void *data, | 865 | extern int i915_vblank_swap(struct drm_device *dev, void *data, |
850 | struct drm_file *file_priv); | 866 | struct drm_file *file_priv); |
851 | extern void i915_enable_irq(drm_i915_private_t *dev_priv, u32 mask); | 867 | extern void i915_enable_irq(drm_i915_private_t *dev_priv, u32 mask); |
868 | extern void i915_disable_irq(drm_i915_private_t *dev_priv, u32 mask); | ||
869 | extern void ironlake_enable_graphics_irq(drm_i915_private_t *dev_priv, | ||
870 | u32 mask); | ||
871 | extern void ironlake_disable_graphics_irq(drm_i915_private_t *dev_priv, | ||
872 | u32 mask); | ||
852 | 873 | ||
853 | void | 874 | void |
854 | i915_enable_pipestat(drm_i915_private_t *dev_priv, int pipe, u32 mask); | 875 | i915_enable_pipestat(drm_i915_private_t *dev_priv, int pipe, u32 mask); |
@@ -922,11 +943,13 @@ void i915_gem_object_unpin(struct drm_gem_object *obj); | |||
922 | int i915_gem_object_unbind(struct drm_gem_object *obj); | 943 | int i915_gem_object_unbind(struct drm_gem_object *obj); |
923 | void i915_gem_release_mmap(struct drm_gem_object *obj); | 944 | void i915_gem_release_mmap(struct drm_gem_object *obj); |
924 | void i915_gem_lastclose(struct drm_device *dev); | 945 | void i915_gem_lastclose(struct drm_device *dev); |
925 | uint32_t i915_get_gem_seqno(struct drm_device *dev); | 946 | uint32_t i915_get_gem_seqno(struct drm_device *dev, |
947 | struct intel_ring_buffer *ring); | ||
926 | bool i915_seqno_passed(uint32_t seq1, uint32_t seq2); | 948 | bool i915_seqno_passed(uint32_t seq1, uint32_t seq2); |
927 | int i915_gem_object_get_fence_reg(struct drm_gem_object *obj); | 949 | int i915_gem_object_get_fence_reg(struct drm_gem_object *obj); |
928 | int i915_gem_object_put_fence_reg(struct drm_gem_object *obj); | 950 | int i915_gem_object_put_fence_reg(struct drm_gem_object *obj); |
929 | void i915_gem_retire_requests(struct drm_device *dev); | 951 | void i915_gem_retire_requests(struct drm_device *dev, |
952 | struct intel_ring_buffer *ring); | ||
930 | void i915_gem_retire_work_handler(struct work_struct *work); | 953 | void i915_gem_retire_work_handler(struct work_struct *work); |
931 | void i915_gem_clflush_object(struct drm_gem_object *obj); | 954 | void i915_gem_clflush_object(struct drm_gem_object *obj); |
932 | int i915_gem_object_set_domain(struct drm_gem_object *obj, | 955 | int i915_gem_object_set_domain(struct drm_gem_object *obj, |
@@ -937,9 +960,13 @@ void i915_gem_cleanup_ringbuffer(struct drm_device *dev); | |||
937 | int i915_gem_do_init(struct drm_device *dev, unsigned long start, | 960 | int i915_gem_do_init(struct drm_device *dev, unsigned long start, |
938 | unsigned long end); | 961 | unsigned long end); |
939 | int i915_gem_idle(struct drm_device *dev); | 962 | int i915_gem_idle(struct drm_device *dev); |
940 | uint32_t i915_add_request(struct drm_device *dev, struct drm_file *file_priv, | 963 | uint32_t i915_add_request(struct drm_device *dev, |
941 | uint32_t flush_domains); | 964 | struct drm_file *file_priv, |
942 | int i915_do_wait_request(struct drm_device *dev, uint32_t seqno, int interruptible); | 965 | uint32_t flush_domains, |
966 | struct intel_ring_buffer *ring); | ||
967 | int i915_do_wait_request(struct drm_device *dev, | ||
968 | uint32_t seqno, int interruptible, | ||
969 | struct intel_ring_buffer *ring); | ||
943 | int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf); | 970 | int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf); |
944 | int i915_gem_object_set_to_gtt_domain(struct drm_gem_object *obj, | 971 | int i915_gem_object_set_to_gtt_domain(struct drm_gem_object *obj, |
945 | int write); | 972 | int write); |
@@ -1015,7 +1042,7 @@ extern void g4x_disable_fbc(struct drm_device *dev); | |||
1015 | extern void intel_disable_fbc(struct drm_device *dev); | 1042 | extern void intel_disable_fbc(struct drm_device *dev); |
1016 | extern void intel_enable_fbc(struct drm_crtc *crtc, unsigned long interval); | 1043 | extern void intel_enable_fbc(struct drm_crtc *crtc, unsigned long interval); |
1017 | extern bool intel_fbc_enabled(struct drm_device *dev); | 1044 | extern bool intel_fbc_enabled(struct drm_device *dev); |
1018 | 1045 | extern bool ironlake_set_drps(struct drm_device *dev, u8 val); | |
1019 | extern void intel_detect_pch (struct drm_device *dev); | 1046 | extern void intel_detect_pch (struct drm_device *dev); |
1020 | extern int intel_trans_dp_port_sel (struct drm_crtc *crtc); | 1047 | extern int intel_trans_dp_port_sel (struct drm_crtc *crtc); |
1021 | 1048 | ||
@@ -1026,7 +1053,8 @@ extern int intel_trans_dp_port_sel (struct drm_crtc *crtc); | |||
1026 | * has access to the ring. | 1053 | * has access to the ring. |
1027 | */ | 1054 | */ |
1028 | #define RING_LOCK_TEST_WITH_RETURN(dev, file_priv) do { \ | 1055 | #define RING_LOCK_TEST_WITH_RETURN(dev, file_priv) do { \ |
1029 | if (((drm_i915_private_t *)dev->dev_private)->ring.ring_obj == NULL) \ | 1056 | if (((drm_i915_private_t *)dev->dev_private)->render_ring.gem_object \ |
1057 | == NULL) \ | ||
1030 | LOCK_TEST_WITH_RETURN(dev, file_priv); \ | 1058 | LOCK_TEST_WITH_RETURN(dev, file_priv); \ |
1031 | } while (0) | 1059 | } while (0) |
1032 | 1060 | ||
@@ -1039,35 +1067,31 @@ extern int intel_trans_dp_port_sel (struct drm_crtc *crtc); | |||
1039 | #define I915_WRITE64(reg, val) writeq(val, dev_priv->regs + (reg)) | 1067 | #define I915_WRITE64(reg, val) writeq(val, dev_priv->regs + (reg)) |
1040 | #define I915_READ64(reg) readq(dev_priv->regs + (reg)) | 1068 | #define I915_READ64(reg) readq(dev_priv->regs + (reg)) |
1041 | #define POSTING_READ(reg) (void)I915_READ(reg) | 1069 | #define POSTING_READ(reg) (void)I915_READ(reg) |
1070 | #define POSTING_READ16(reg) (void)I915_READ16(reg) | ||
1042 | 1071 | ||
1043 | #define I915_VERBOSE 0 | 1072 | #define I915_VERBOSE 0 |
1044 | 1073 | ||
1045 | #define RING_LOCALS volatile unsigned int *ring_virt__; | 1074 | #define BEGIN_LP_RING(n) do { \ |
1046 | 1075 | drm_i915_private_t *dev_priv = dev->dev_private; \ | |
1047 | #define BEGIN_LP_RING(n) do { \ | 1076 | if (I915_VERBOSE) \ |
1048 | int bytes__ = 4*(n); \ | 1077 | DRM_DEBUG(" BEGIN_LP_RING %x\n", (int)(n)); \ |
1049 | if (I915_VERBOSE) DRM_DEBUG("BEGIN_LP_RING(%d)\n", (n)); \ | 1078 | intel_ring_begin(dev, &dev_priv->render_ring, 4*(n)); \ |
1050 | /* a wrap must occur between instructions so pad beforehand */ \ | ||
1051 | if (unlikely (dev_priv->ring.tail + bytes__ > dev_priv->ring.Size)) \ | ||
1052 | i915_wrap_ring(dev); \ | ||
1053 | if (unlikely (dev_priv->ring.space < bytes__)) \ | ||
1054 | i915_wait_ring(dev, bytes__, __func__); \ | ||
1055 | ring_virt__ = (unsigned int *) \ | ||
1056 | (dev_priv->ring.virtual_start + dev_priv->ring.tail); \ | ||
1057 | dev_priv->ring.tail += bytes__; \ | ||
1058 | dev_priv->ring.tail &= dev_priv->ring.Size - 1; \ | ||
1059 | dev_priv->ring.space -= bytes__; \ | ||
1060 | } while (0) | 1079 | } while (0) |
1061 | 1080 | ||
1062 | #define OUT_RING(n) do { \ | 1081 | |
1063 | if (I915_VERBOSE) DRM_DEBUG(" OUT_RING %x\n", (int)(n)); \ | 1082 | #define OUT_RING(x) do { \ |
1064 | *ring_virt__++ = (n); \ | 1083 | drm_i915_private_t *dev_priv = dev->dev_private; \ |
1084 | if (I915_VERBOSE) \ | ||
1085 | DRM_DEBUG(" OUT_RING %x\n", (int)(x)); \ | ||
1086 | intel_ring_emit(dev, &dev_priv->render_ring, x); \ | ||
1065 | } while (0) | 1087 | } while (0) |
1066 | 1088 | ||
1067 | #define ADVANCE_LP_RING() do { \ | 1089 | #define ADVANCE_LP_RING() do { \ |
1090 | drm_i915_private_t *dev_priv = dev->dev_private; \ | ||
1068 | if (I915_VERBOSE) \ | 1091 | if (I915_VERBOSE) \ |
1069 | DRM_DEBUG("ADVANCE_LP_RING %x\n", dev_priv->ring.tail); \ | 1092 | DRM_DEBUG("ADVANCE_LP_RING %x\n", \ |
1070 | I915_WRITE(PRB0_TAIL, dev_priv->ring.tail); \ | 1093 | dev_priv->render_ring.tail); \ |
1094 | intel_ring_advance(dev, &dev_priv->render_ring); \ | ||
1071 | } while(0) | 1095 | } while(0) |
1072 | 1096 | ||
1073 | /** | 1097 | /** |
@@ -1085,14 +1109,12 @@ extern int intel_trans_dp_port_sel (struct drm_crtc *crtc); | |||
1085 | * | 1109 | * |
1086 | * The area from dword 0x20 to 0x3ff is available for driver usage. | 1110 | * The area from dword 0x20 to 0x3ff is available for driver usage. |
1087 | */ | 1111 | */ |
1088 | #define READ_HWSP(dev_priv, reg) (((volatile u32*)(dev_priv->hw_status_page))[reg]) | 1112 | #define READ_HWSP(dev_priv, reg) (((volatile u32 *)\ |
1113 | (dev_priv->render_ring.status_page.page_addr))[reg]) | ||
1089 | #define READ_BREADCRUMB(dev_priv) READ_HWSP(dev_priv, I915_BREADCRUMB_INDEX) | 1114 | #define READ_BREADCRUMB(dev_priv) READ_HWSP(dev_priv, I915_BREADCRUMB_INDEX) |
1090 | #define I915_GEM_HWS_INDEX 0x20 | 1115 | #define I915_GEM_HWS_INDEX 0x20 |
1091 | #define I915_BREADCRUMB_INDEX 0x21 | 1116 | #define I915_BREADCRUMB_INDEX 0x21 |
1092 | 1117 | ||
1093 | extern int i915_wrap_ring(struct drm_device * dev); | ||
1094 | extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); | ||
1095 | |||
1096 | #define INTEL_INFO(dev) (((struct drm_i915_private *) (dev)->dev_private)->info) | 1118 | #define INTEL_INFO(dev) (((struct drm_i915_private *) (dev)->dev_private)->info) |
1097 | 1119 | ||
1098 | #define IS_I830(dev) ((dev)->pci_device == 0x3577) | 1120 | #define IS_I830(dev) ((dev)->pci_device == 0x3577) |
@@ -1138,6 +1160,7 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); | |||
1138 | (dev)->pci_device == 0x2A42 || \ | 1160 | (dev)->pci_device == 0x2A42 || \ |
1139 | (dev)->pci_device == 0x2E42) | 1161 | (dev)->pci_device == 0x2E42) |
1140 | 1162 | ||
1163 | #define HAS_BSD(dev) (IS_IRONLAKE(dev) || IS_G4X(dev)) | ||
1141 | #define I915_NEED_GFX_HWS(dev) (INTEL_INFO(dev)->need_gfx_hws) | 1164 | #define I915_NEED_GFX_HWS(dev) (INTEL_INFO(dev)->need_gfx_hws) |
1142 | 1165 | ||
1143 | /* With the 945 and later, Y tiling got adjusted so that it was 32 128-byte | 1166 | /* With the 945 and later, Y tiling got adjusted so that it was 32 128-byte |
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 112699f71fa..9ded3dae6c8 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c | |||
@@ -35,8 +35,6 @@ | |||
35 | #include <linux/swap.h> | 35 | #include <linux/swap.h> |
36 | #include <linux/pci.h> | 36 | #include <linux/pci.h> |
37 | 37 | ||
38 | #define I915_GEM_GPU_DOMAINS (~(I915_GEM_DOMAIN_CPU | I915_GEM_DOMAIN_GTT)) | ||
39 | |||
40 | static void i915_gem_object_flush_gpu_write_domain(struct drm_gem_object *obj); | 38 | static void i915_gem_object_flush_gpu_write_domain(struct drm_gem_object *obj); |
41 | static void i915_gem_object_flush_gtt_write_domain(struct drm_gem_object *obj); | 39 | static void i915_gem_object_flush_gtt_write_domain(struct drm_gem_object *obj); |
42 | static void i915_gem_object_flush_cpu_write_domain(struct drm_gem_object *obj); | 40 | static void i915_gem_object_flush_cpu_write_domain(struct drm_gem_object *obj); |
@@ -169,7 +167,7 @@ static int i915_gem_object_needs_bit17_swizzle(struct drm_gem_object *obj) | |||
169 | obj_priv->tiling_mode != I915_TILING_NONE; | 167 | obj_priv->tiling_mode != I915_TILING_NONE; |
170 | } | 168 | } |
171 | 169 | ||
172 | static inline int | 170 | static inline void |
173 | slow_shmem_copy(struct page *dst_page, | 171 | slow_shmem_copy(struct page *dst_page, |
174 | int dst_offset, | 172 | int dst_offset, |
175 | struct page *src_page, | 173 | struct page *src_page, |
@@ -178,25 +176,16 @@ slow_shmem_copy(struct page *dst_page, | |||
178 | { | 176 | { |
179 | char *dst_vaddr, *src_vaddr; | 177 | char *dst_vaddr, *src_vaddr; |
180 | 178 | ||
181 | dst_vaddr = kmap_atomic(dst_page, KM_USER0); | 179 | dst_vaddr = kmap(dst_page); |
182 | if (dst_vaddr == NULL) | 180 | src_vaddr = kmap(src_page); |
183 | return -ENOMEM; | ||
184 | |||
185 | src_vaddr = kmap_atomic(src_page, KM_USER1); | ||
186 | if (src_vaddr == NULL) { | ||
187 | kunmap_atomic(dst_vaddr, KM_USER0); | ||
188 | return -ENOMEM; | ||
189 | } | ||
190 | 181 | ||
191 | memcpy(dst_vaddr + dst_offset, src_vaddr + src_offset, length); | 182 | memcpy(dst_vaddr + dst_offset, src_vaddr + src_offset, length); |
192 | 183 | ||
193 | kunmap_atomic(src_vaddr, KM_USER1); | 184 | kunmap(src_page); |
194 | kunmap_atomic(dst_vaddr, KM_USER0); | 185 | kunmap(dst_page); |
195 | |||
196 | return 0; | ||
197 | } | 186 | } |
198 | 187 | ||
199 | static inline int | 188 | static inline void |
200 | slow_shmem_bit17_copy(struct page *gpu_page, | 189 | slow_shmem_bit17_copy(struct page *gpu_page, |
201 | int gpu_offset, | 190 | int gpu_offset, |
202 | struct page *cpu_page, | 191 | struct page *cpu_page, |
@@ -216,15 +205,8 @@ slow_shmem_bit17_copy(struct page *gpu_page, | |||
216 | cpu_page, cpu_offset, length); | 205 | cpu_page, cpu_offset, length); |
217 | } | 206 | } |
218 | 207 | ||
219 | gpu_vaddr = kmap_atomic(gpu_page, KM_USER0); | 208 | gpu_vaddr = kmap(gpu_page); |
220 | if (gpu_vaddr == NULL) | 209 | cpu_vaddr = kmap(cpu_page); |
221 | return -ENOMEM; | ||
222 | |||
223 | cpu_vaddr = kmap_atomic(cpu_page, KM_USER1); | ||
224 | if (cpu_vaddr == NULL) { | ||
225 | kunmap_atomic(gpu_vaddr, KM_USER0); | ||
226 | return -ENOMEM; | ||
227 | } | ||
228 | 210 | ||
229 | /* Copy the data, XORing A6 with A17 (1). The user already knows he's | 211 | /* Copy the data, XORing A6 with A17 (1). The user already knows he's |
230 | * XORing with the other bits (A9 for Y, A9 and A10 for X) | 212 | * XORing with the other bits (A9 for Y, A9 and A10 for X) |
@@ -248,10 +230,8 @@ slow_shmem_bit17_copy(struct page *gpu_page, | |||
248 | length -= this_length; | 230 | length -= this_length; |
249 | } | 231 | } |
250 | 232 | ||
251 | kunmap_atomic(cpu_vaddr, KM_USER1); | 233 | kunmap(cpu_page); |
252 | kunmap_atomic(gpu_vaddr, KM_USER0); | 234 | kunmap(gpu_page); |
253 | |||
254 | return 0; | ||
255 | } | 235 | } |
256 | 236 | ||
257 | /** | 237 | /** |
@@ -427,21 +407,19 @@ i915_gem_shmem_pread_slow(struct drm_device *dev, struct drm_gem_object *obj, | |||
427 | page_length = PAGE_SIZE - data_page_offset; | 407 | page_length = PAGE_SIZE - data_page_offset; |
428 | 408 | ||
429 | if (do_bit17_swizzling) { | 409 | if (do_bit17_swizzling) { |
430 | ret = slow_shmem_bit17_copy(obj_priv->pages[shmem_page_index], | 410 | slow_shmem_bit17_copy(obj_priv->pages[shmem_page_index], |
431 | shmem_page_offset, | ||
432 | user_pages[data_page_index], | ||
433 | data_page_offset, | ||
434 | page_length, | ||
435 | 1); | ||
436 | } else { | ||
437 | ret = slow_shmem_copy(user_pages[data_page_index], | ||
438 | data_page_offset, | ||
439 | obj_priv->pages[shmem_page_index], | ||
440 | shmem_page_offset, | 411 | shmem_page_offset, |
441 | page_length); | 412 | user_pages[data_page_index], |
413 | data_page_offset, | ||
414 | page_length, | ||
415 | 1); | ||
416 | } else { | ||
417 | slow_shmem_copy(user_pages[data_page_index], | ||
418 | data_page_offset, | ||
419 | obj_priv->pages[shmem_page_index], | ||
420 | shmem_page_offset, | ||
421 | page_length); | ||
442 | } | 422 | } |
443 | if (ret) | ||
444 | goto fail_put_pages; | ||
445 | 423 | ||
446 | remain -= page_length; | 424 | remain -= page_length; |
447 | data_ptr += page_length; | 425 | data_ptr += page_length; |
@@ -531,25 +509,24 @@ fast_user_write(struct io_mapping *mapping, | |||
531 | * page faults | 509 | * page faults |
532 | */ | 510 | */ |
533 | 511 | ||
534 | static inline int | 512 | static inline void |
535 | slow_kernel_write(struct io_mapping *mapping, | 513 | slow_kernel_write(struct io_mapping *mapping, |
536 | loff_t gtt_base, int gtt_offset, | 514 | loff_t gtt_base, int gtt_offset, |
537 | struct page *user_page, int user_offset, | 515 | struct page *user_page, int user_offset, |
538 | int length) | 516 | int length) |
539 | { | 517 | { |
540 | char *src_vaddr, *dst_vaddr; | 518 | char __iomem *dst_vaddr; |
541 | unsigned long unwritten; | 519 | char *src_vaddr; |
542 | 520 | ||
543 | dst_vaddr = io_mapping_map_atomic_wc(mapping, gtt_base); | 521 | dst_vaddr = io_mapping_map_wc(mapping, gtt_base); |
544 | src_vaddr = kmap_atomic(user_page, KM_USER1); | 522 | src_vaddr = kmap(user_page); |
545 | unwritten = __copy_from_user_inatomic_nocache(dst_vaddr + gtt_offset, | 523 | |
546 | src_vaddr + user_offset, | 524 | memcpy_toio(dst_vaddr + gtt_offset, |
547 | length); | 525 | src_vaddr + user_offset, |
548 | kunmap_atomic(src_vaddr, KM_USER1); | 526 | length); |
549 | io_mapping_unmap_atomic(dst_vaddr); | 527 | |
550 | if (unwritten) | 528 | kunmap(user_page); |
551 | return -EFAULT; | 529 | io_mapping_unmap(dst_vaddr); |
552 | return 0; | ||
553 | } | 530 | } |
554 | 531 | ||
555 | static inline int | 532 | static inline int |
@@ -722,18 +699,11 @@ i915_gem_gtt_pwrite_slow(struct drm_device *dev, struct drm_gem_object *obj, | |||
722 | if ((data_page_offset + page_length) > PAGE_SIZE) | 699 | if ((data_page_offset + page_length) > PAGE_SIZE) |
723 | page_length = PAGE_SIZE - data_page_offset; | 700 | page_length = PAGE_SIZE - data_page_offset; |
724 | 701 | ||
725 | ret = slow_kernel_write(dev_priv->mm.gtt_mapping, | 702 | slow_kernel_write(dev_priv->mm.gtt_mapping, |
726 | gtt_page_base, gtt_page_offset, | 703 | gtt_page_base, gtt_page_offset, |
727 | user_pages[data_page_index], | 704 | user_pages[data_page_index], |
728 | data_page_offset, | 705 | data_page_offset, |
729 | page_length); | 706 | page_length); |
730 | |||
731 | /* If we get a fault while copying data, then (presumably) our | ||
732 | * source page isn't available. Return the error and we'll | ||
733 | * retry in the slow path. | ||
734 | */ | ||
735 | if (ret) | ||
736 | goto out_unpin_object; | ||
737 | 707 | ||
738 | remain -= page_length; | 708 | remain -= page_length; |
739 | offset += page_length; | 709 | offset += page_length; |
@@ -902,21 +872,19 @@ i915_gem_shmem_pwrite_slow(struct drm_device *dev, struct drm_gem_object *obj, | |||
902 | page_length = PAGE_SIZE - data_page_offset; | 872 | page_length = PAGE_SIZE - data_page_offset; |
903 | 873 | ||
904 | if (do_bit17_swizzling) { | 874 | if (do_bit17_swizzling) { |
905 | ret = slow_shmem_bit17_copy(obj_priv->pages[shmem_page_index], | 875 | slow_shmem_bit17_copy(obj_priv->pages[shmem_page_index], |
906 | shmem_page_offset, | ||
907 | user_pages[data_page_index], | ||
908 | data_page_offset, | ||
909 | page_length, | ||
910 | 0); | ||
911 | } else { | ||
912 | ret = slow_shmem_copy(obj_priv->pages[shmem_page_index], | ||
913 | shmem_page_offset, | 876 | shmem_page_offset, |
914 | user_pages[data_page_index], | 877 | user_pages[data_page_index], |
915 | data_page_offset, | 878 | data_page_offset, |
916 | page_length); | 879 | page_length, |
880 | 0); | ||
881 | } else { | ||
882 | slow_shmem_copy(obj_priv->pages[shmem_page_index], | ||
883 | shmem_page_offset, | ||
884 | user_pages[data_page_index], | ||
885 | data_page_offset, | ||
886 | page_length); | ||
917 | } | 887 | } |
918 | if (ret) | ||
919 | goto fail_put_pages; | ||
920 | 888 | ||
921 | remain -= page_length; | 889 | remain -= page_length; |
922 | data_ptr += page_length; | 890 | data_ptr += page_length; |
@@ -973,7 +941,8 @@ i915_gem_pwrite_ioctl(struct drm_device *dev, void *data, | |||
973 | if (obj_priv->phys_obj) | 941 | if (obj_priv->phys_obj) |
974 | ret = i915_gem_phys_pwrite(dev, obj, args, file_priv); | 942 | ret = i915_gem_phys_pwrite(dev, obj, args, file_priv); |
975 | else if (obj_priv->tiling_mode == I915_TILING_NONE && | 943 | else if (obj_priv->tiling_mode == I915_TILING_NONE && |
976 | dev->gtt_total != 0) { | 944 | dev->gtt_total != 0 && |
945 | obj->write_domain != I915_GEM_DOMAIN_CPU) { | ||
977 | ret = i915_gem_gtt_pwrite_fast(dev, obj, args, file_priv); | 946 | ret = i915_gem_gtt_pwrite_fast(dev, obj, args, file_priv); |
978 | if (ret == -EFAULT) { | 947 | if (ret == -EFAULT) { |
979 | ret = i915_gem_gtt_pwrite_slow(dev, obj, args, | 948 | ret = i915_gem_gtt_pwrite_slow(dev, obj, args, |
@@ -1484,11 +1453,14 @@ i915_gem_object_put_pages(struct drm_gem_object *obj) | |||
1484 | } | 1453 | } |
1485 | 1454 | ||
1486 | static void | 1455 | static void |
1487 | i915_gem_object_move_to_active(struct drm_gem_object *obj, uint32_t seqno) | 1456 | i915_gem_object_move_to_active(struct drm_gem_object *obj, uint32_t seqno, |
1457 | struct intel_ring_buffer *ring) | ||
1488 | { | 1458 | { |
1489 | struct drm_device *dev = obj->dev; | 1459 | struct drm_device *dev = obj->dev; |
1490 | drm_i915_private_t *dev_priv = dev->dev_private; | 1460 | drm_i915_private_t *dev_priv = dev->dev_private; |
1491 | struct drm_i915_gem_object *obj_priv = to_intel_bo(obj); | 1461 | struct drm_i915_gem_object *obj_priv = to_intel_bo(obj); |
1462 | BUG_ON(ring == NULL); | ||
1463 | obj_priv->ring = ring; | ||
1492 | 1464 | ||
1493 | /* Add a reference if we're newly entering the active list. */ | 1465 | /* Add a reference if we're newly entering the active list. */ |
1494 | if (!obj_priv->active) { | 1466 | if (!obj_priv->active) { |
@@ -1497,8 +1469,7 @@ i915_gem_object_move_to_active(struct drm_gem_object *obj, uint32_t seqno) | |||
1497 | } | 1469 | } |
1498 | /* Move from whatever list we were on to the tail of execution. */ | 1470 | /* Move from whatever list we were on to the tail of execution. */ |
1499 | spin_lock(&dev_priv->mm.active_list_lock); | 1471 | spin_lock(&dev_priv->mm.active_list_lock); |
1500 | list_move_tail(&obj_priv->list, | 1472 | list_move_tail(&obj_priv->list, &ring->active_list); |
1501 | &dev_priv->mm.active_list); | ||
1502 | spin_unlock(&dev_priv->mm.active_list_lock); | 1473 | spin_unlock(&dev_priv->mm.active_list_lock); |
1503 | obj_priv->last_rendering_seqno = seqno; | 1474 | obj_priv->last_rendering_seqno = seqno; |
1504 | } | 1475 | } |
@@ -1551,6 +1522,7 @@ i915_gem_object_move_to_inactive(struct drm_gem_object *obj) | |||
1551 | BUG_ON(!list_empty(&obj_priv->gpu_write_list)); | 1522 | BUG_ON(!list_empty(&obj_priv->gpu_write_list)); |
1552 | 1523 | ||
1553 | obj_priv->last_rendering_seqno = 0; | 1524 | obj_priv->last_rendering_seqno = 0; |
1525 | obj_priv->ring = NULL; | ||
1554 | if (obj_priv->active) { | 1526 | if (obj_priv->active) { |
1555 | obj_priv->active = 0; | 1527 | obj_priv->active = 0; |
1556 | drm_gem_object_unreference(obj); | 1528 | drm_gem_object_unreference(obj); |
@@ -1560,7 +1532,8 @@ i915_gem_object_move_to_inactive(struct drm_gem_object *obj) | |||
1560 | 1532 | ||
1561 | static void | 1533 | static void |
1562 | i915_gem_process_flushing_list(struct drm_device *dev, | 1534 | i915_gem_process_flushing_list(struct drm_device *dev, |
1563 | uint32_t flush_domains, uint32_t seqno) | 1535 | uint32_t flush_domains, uint32_t seqno, |
1536 | struct intel_ring_buffer *ring) | ||
1564 | { | 1537 | { |
1565 | drm_i915_private_t *dev_priv = dev->dev_private; | 1538 | drm_i915_private_t *dev_priv = dev->dev_private; |
1566 | struct drm_i915_gem_object *obj_priv, *next; | 1539 | struct drm_i915_gem_object *obj_priv, *next; |
@@ -1571,12 +1544,13 @@ i915_gem_process_flushing_list(struct drm_device *dev, | |||
1571 | struct drm_gem_object *obj = &obj_priv->base; | 1544 | struct drm_gem_object *obj = &obj_priv->base; |
1572 | 1545 | ||
1573 | if ((obj->write_domain & flush_domains) == | 1546 | if ((obj->write_domain & flush_domains) == |
1574 | obj->write_domain) { | 1547 | obj->write_domain && |
1548 | obj_priv->ring->ring_flag == ring->ring_flag) { | ||
1575 | uint32_t old_write_domain = obj->write_domain; | 1549 | uint32_t old_write_domain = obj->write_domain; |
1576 | 1550 | ||
1577 | obj->write_domain = 0; | 1551 | obj->write_domain = 0; |
1578 | list_del_init(&obj_priv->gpu_write_list); | 1552 | list_del_init(&obj_priv->gpu_write_list); |
1579 | i915_gem_object_move_to_active(obj, seqno); | 1553 | i915_gem_object_move_to_active(obj, seqno, ring); |
1580 | 1554 | ||
1581 | /* update the fence lru list */ | 1555 | /* update the fence lru list */ |
1582 | if (obj_priv->fence_reg != I915_FENCE_REG_NONE) { | 1556 | if (obj_priv->fence_reg != I915_FENCE_REG_NONE) { |
@@ -1593,31 +1567,15 @@ i915_gem_process_flushing_list(struct drm_device *dev, | |||
1593 | } | 1567 | } |
1594 | } | 1568 | } |
1595 | 1569 | ||
1596 | #define PIPE_CONTROL_FLUSH(addr) \ | ||
1597 | OUT_RING(GFX_OP_PIPE_CONTROL | PIPE_CONTROL_QW_WRITE | \ | ||
1598 | PIPE_CONTROL_DEPTH_STALL); \ | ||
1599 | OUT_RING(addr | PIPE_CONTROL_GLOBAL_GTT); \ | ||
1600 | OUT_RING(0); \ | ||
1601 | OUT_RING(0); \ | ||
1602 | |||
1603 | /** | ||
1604 | * Creates a new sequence number, emitting a write of it to the status page | ||
1605 | * plus an interrupt, which will trigger i915_user_interrupt_handler. | ||
1606 | * | ||
1607 | * Must be called with struct_lock held. | ||
1608 | * | ||
1609 | * Returned sequence numbers are nonzero on success. | ||
1610 | */ | ||
1611 | uint32_t | 1570 | uint32_t |
1612 | i915_add_request(struct drm_device *dev, struct drm_file *file_priv, | 1571 | i915_add_request(struct drm_device *dev, struct drm_file *file_priv, |
1613 | uint32_t flush_domains) | 1572 | uint32_t flush_domains, struct intel_ring_buffer *ring) |
1614 | { | 1573 | { |
1615 | drm_i915_private_t *dev_priv = dev->dev_private; | 1574 | drm_i915_private_t *dev_priv = dev->dev_private; |
1616 | struct drm_i915_file_private *i915_file_priv = NULL; | 1575 | struct drm_i915_file_private *i915_file_priv = NULL; |
1617 | struct drm_i915_gem_request *request; | 1576 | struct drm_i915_gem_request *request; |
1618 | uint32_t seqno; | 1577 | uint32_t seqno; |
1619 | int was_empty; | 1578 | int was_empty; |
1620 | RING_LOCALS; | ||
1621 | 1579 | ||
1622 | if (file_priv != NULL) | 1580 | if (file_priv != NULL) |
1623 | i915_file_priv = file_priv->driver_priv; | 1581 | i915_file_priv = file_priv->driver_priv; |
@@ -1626,62 +1584,14 @@ i915_add_request(struct drm_device *dev, struct drm_file *file_priv, | |||
1626 | if (request == NULL) | 1584 | if (request == NULL) |
1627 | return 0; | 1585 | return 0; |
1628 | 1586 | ||
1629 | /* Grab the seqno we're going to make this request be, and bump the | 1587 | seqno = ring->add_request(dev, ring, file_priv, flush_domains); |
1630 | * next (skipping 0 so it can be the reserved no-seqno value). | ||
1631 | */ | ||
1632 | seqno = dev_priv->mm.next_gem_seqno; | ||
1633 | dev_priv->mm.next_gem_seqno++; | ||
1634 | if (dev_priv->mm.next_gem_seqno == 0) | ||
1635 | dev_priv->mm.next_gem_seqno++; | ||
1636 | |||
1637 | if (HAS_PIPE_CONTROL(dev)) { | ||
1638 | u32 scratch_addr = dev_priv->seqno_gfx_addr + 128; | ||
1639 | |||
1640 | /* | ||
1641 | * Workaround qword write incoherence by flushing the | ||
1642 | * PIPE_NOTIFY buffers out to memory before requesting | ||
1643 | * an interrupt. | ||
1644 | */ | ||
1645 | BEGIN_LP_RING(32); | ||
1646 | OUT_RING(GFX_OP_PIPE_CONTROL | PIPE_CONTROL_QW_WRITE | | ||
1647 | PIPE_CONTROL_WC_FLUSH | PIPE_CONTROL_TC_FLUSH); | ||
1648 | OUT_RING(dev_priv->seqno_gfx_addr | PIPE_CONTROL_GLOBAL_GTT); | ||
1649 | OUT_RING(seqno); | ||
1650 | OUT_RING(0); | ||
1651 | PIPE_CONTROL_FLUSH(scratch_addr); | ||
1652 | scratch_addr += 128; /* write to separate cachelines */ | ||
1653 | PIPE_CONTROL_FLUSH(scratch_addr); | ||
1654 | scratch_addr += 128; | ||
1655 | PIPE_CONTROL_FLUSH(scratch_addr); | ||
1656 | scratch_addr += 128; | ||
1657 | PIPE_CONTROL_FLUSH(scratch_addr); | ||
1658 | scratch_addr += 128; | ||
1659 | PIPE_CONTROL_FLUSH(scratch_addr); | ||
1660 | scratch_addr += 128; | ||
1661 | PIPE_CONTROL_FLUSH(scratch_addr); | ||
1662 | OUT_RING(GFX_OP_PIPE_CONTROL | PIPE_CONTROL_QW_WRITE | | ||
1663 | PIPE_CONTROL_WC_FLUSH | PIPE_CONTROL_TC_FLUSH | | ||
1664 | PIPE_CONTROL_NOTIFY); | ||
1665 | OUT_RING(dev_priv->seqno_gfx_addr | PIPE_CONTROL_GLOBAL_GTT); | ||
1666 | OUT_RING(seqno); | ||
1667 | OUT_RING(0); | ||
1668 | ADVANCE_LP_RING(); | ||
1669 | } else { | ||
1670 | BEGIN_LP_RING(4); | ||
1671 | OUT_RING(MI_STORE_DWORD_INDEX); | ||
1672 | OUT_RING(I915_GEM_HWS_INDEX << MI_STORE_DWORD_INDEX_SHIFT); | ||
1673 | OUT_RING(seqno); | ||
1674 | |||
1675 | OUT_RING(MI_USER_INTERRUPT); | ||
1676 | ADVANCE_LP_RING(); | ||
1677 | } | ||
1678 | |||
1679 | DRM_DEBUG_DRIVER("%d\n", seqno); | ||
1680 | 1588 | ||
1681 | request->seqno = seqno; | 1589 | request->seqno = seqno; |
1590 | request->ring = ring; | ||
1682 | request->emitted_jiffies = jiffies; | 1591 | request->emitted_jiffies = jiffies; |
1683 | was_empty = list_empty(&dev_priv->mm.request_list); | 1592 | was_empty = list_empty(&ring->request_list); |
1684 | list_add_tail(&request->list, &dev_priv->mm.request_list); | 1593 | list_add_tail(&request->list, &ring->request_list); |
1594 | |||
1685 | if (i915_file_priv) { | 1595 | if (i915_file_priv) { |
1686 | list_add_tail(&request->client_list, | 1596 | list_add_tail(&request->client_list, |
1687 | &i915_file_priv->mm.request_list); | 1597 | &i915_file_priv->mm.request_list); |
@@ -1693,7 +1603,7 @@ i915_add_request(struct drm_device *dev, struct drm_file *file_priv, | |||
1693 | * domain we're flushing with our flush. | 1603 | * domain we're flushing with our flush. |
1694 | */ | 1604 | */ |
1695 | if (flush_domains != 0) | 1605 | if (flush_domains != 0) |
1696 | i915_gem_process_flushing_list(dev, flush_domains, seqno); | 1606 | i915_gem_process_flushing_list(dev, flush_domains, seqno, ring); |
1697 | 1607 | ||
1698 | if (!dev_priv->mm.suspended) { | 1608 | if (!dev_priv->mm.suspended) { |
1699 | mod_timer(&dev_priv->hangcheck_timer, jiffies + DRM_I915_HANGCHECK_PERIOD); | 1609 | mod_timer(&dev_priv->hangcheck_timer, jiffies + DRM_I915_HANGCHECK_PERIOD); |
@@ -1710,20 +1620,16 @@ i915_add_request(struct drm_device *dev, struct drm_file *file_priv, | |||
1710 | * before signalling the CPU | 1620 | * before signalling the CPU |
1711 | */ | 1621 | */ |
1712 | static uint32_t | 1622 | static uint32_t |
1713 | i915_retire_commands(struct drm_device *dev) | 1623 | i915_retire_commands(struct drm_device *dev, struct intel_ring_buffer *ring) |
1714 | { | 1624 | { |
1715 | drm_i915_private_t *dev_priv = dev->dev_private; | ||
1716 | uint32_t cmd = MI_FLUSH | MI_NO_WRITE_FLUSH; | ||
1717 | uint32_t flush_domains = 0; | 1625 | uint32_t flush_domains = 0; |
1718 | RING_LOCALS; | ||
1719 | 1626 | ||
1720 | /* The sampler always gets flushed on i965 (sigh) */ | 1627 | /* The sampler always gets flushed on i965 (sigh) */ |
1721 | if (IS_I965G(dev)) | 1628 | if (IS_I965G(dev)) |
1722 | flush_domains |= I915_GEM_DOMAIN_SAMPLER; | 1629 | flush_domains |= I915_GEM_DOMAIN_SAMPLER; |
1723 | BEGIN_LP_RING(2); | 1630 | |
1724 | OUT_RING(cmd); | 1631 | ring->flush(dev, ring, |
1725 | OUT_RING(0); /* noop */ | 1632 | I915_GEM_DOMAIN_COMMAND, flush_domains); |
1726 | ADVANCE_LP_RING(); | ||
1727 | return flush_domains; | 1633 | return flush_domains; |
1728 | } | 1634 | } |
1729 | 1635 | ||
@@ -1743,11 +1649,11 @@ i915_gem_retire_request(struct drm_device *dev, | |||
1743 | * by the ringbuffer to the flushing/inactive lists as appropriate. | 1649 | * by the ringbuffer to the flushing/inactive lists as appropriate. |
1744 | */ | 1650 | */ |
1745 | spin_lock(&dev_priv->mm.active_list_lock); | 1651 | spin_lock(&dev_priv->mm.active_list_lock); |
1746 | while (!list_empty(&dev_priv->mm.active_list)) { | 1652 | while (!list_empty(&request->ring->active_list)) { |
1747 | struct drm_gem_object *obj; | 1653 | struct drm_gem_object *obj; |
1748 | struct drm_i915_gem_object *obj_priv; | 1654 | struct drm_i915_gem_object *obj_priv; |
1749 | 1655 | ||
1750 | obj_priv = list_first_entry(&dev_priv->mm.active_list, | 1656 | obj_priv = list_first_entry(&request->ring->active_list, |
1751 | struct drm_i915_gem_object, | 1657 | struct drm_i915_gem_object, |
1752 | list); | 1658 | list); |
1753 | obj = &obj_priv->base; | 1659 | obj = &obj_priv->base; |
@@ -1794,35 +1700,33 @@ i915_seqno_passed(uint32_t seq1, uint32_t seq2) | |||
1794 | } | 1700 | } |
1795 | 1701 | ||
1796 | uint32_t | 1702 | uint32_t |
1797 | i915_get_gem_seqno(struct drm_device *dev) | 1703 | i915_get_gem_seqno(struct drm_device *dev, |
1704 | struct intel_ring_buffer *ring) | ||
1798 | { | 1705 | { |
1799 | drm_i915_private_t *dev_priv = dev->dev_private; | 1706 | return ring->get_gem_seqno(dev, ring); |
1800 | |||
1801 | if (HAS_PIPE_CONTROL(dev)) | ||
1802 | return ((volatile u32 *)(dev_priv->seqno_page))[0]; | ||
1803 | else | ||
1804 | return READ_HWSP(dev_priv, I915_GEM_HWS_INDEX); | ||
1805 | } | 1707 | } |
1806 | 1708 | ||
1807 | /** | 1709 | /** |
1808 | * This function clears the request list as sequence numbers are passed. | 1710 | * This function clears the request list as sequence numbers are passed. |
1809 | */ | 1711 | */ |
1810 | void | 1712 | void |
1811 | i915_gem_retire_requests(struct drm_device *dev) | 1713 | i915_gem_retire_requests(struct drm_device *dev, |
1714 | struct intel_ring_buffer *ring) | ||
1812 | { | 1715 | { |
1813 | drm_i915_private_t *dev_priv = dev->dev_private; | 1716 | drm_i915_private_t *dev_priv = dev->dev_private; |
1814 | uint32_t seqno; | 1717 | uint32_t seqno; |
1815 | 1718 | ||
1816 | if (!dev_priv->hw_status_page || list_empty(&dev_priv->mm.request_list)) | 1719 | if (!ring->status_page.page_addr |
1720 | || list_empty(&ring->request_list)) | ||
1817 | return; | 1721 | return; |
1818 | 1722 | ||
1819 | seqno = i915_get_gem_seqno(dev); | 1723 | seqno = i915_get_gem_seqno(dev, ring); |
1820 | 1724 | ||
1821 | while (!list_empty(&dev_priv->mm.request_list)) { | 1725 | while (!list_empty(&ring->request_list)) { |
1822 | struct drm_i915_gem_request *request; | 1726 | struct drm_i915_gem_request *request; |
1823 | uint32_t retiring_seqno; | 1727 | uint32_t retiring_seqno; |
1824 | 1728 | ||
1825 | request = list_first_entry(&dev_priv->mm.request_list, | 1729 | request = list_first_entry(&ring->request_list, |
1826 | struct drm_i915_gem_request, | 1730 | struct drm_i915_gem_request, |
1827 | list); | 1731 | list); |
1828 | retiring_seqno = request->seqno; | 1732 | retiring_seqno = request->seqno; |
@@ -1840,7 +1744,8 @@ i915_gem_retire_requests(struct drm_device *dev) | |||
1840 | 1744 | ||
1841 | if (unlikely (dev_priv->trace_irq_seqno && | 1745 | if (unlikely (dev_priv->trace_irq_seqno && |
1842 | i915_seqno_passed(dev_priv->trace_irq_seqno, seqno))) { | 1746 | i915_seqno_passed(dev_priv->trace_irq_seqno, seqno))) { |
1843 | i915_user_irq_put(dev); | 1747 | |
1748 | ring->user_irq_put(dev, ring); | ||
1844 | dev_priv->trace_irq_seqno = 0; | 1749 | dev_priv->trace_irq_seqno = 0; |
1845 | } | 1750 | } |
1846 | } | 1751 | } |
@@ -1856,15 +1761,22 @@ i915_gem_retire_work_handler(struct work_struct *work) | |||
1856 | dev = dev_priv->dev; | 1761 | dev = dev_priv->dev; |
1857 | 1762 | ||
1858 | mutex_lock(&dev->struct_mutex); | 1763 | mutex_lock(&dev->struct_mutex); |
1859 | i915_gem_retire_requests(dev); | 1764 | i915_gem_retire_requests(dev, &dev_priv->render_ring); |
1765 | |||
1766 | if (HAS_BSD(dev)) | ||
1767 | i915_gem_retire_requests(dev, &dev_priv->bsd_ring); | ||
1768 | |||
1860 | if (!dev_priv->mm.suspended && | 1769 | if (!dev_priv->mm.suspended && |
1861 | !list_empty(&dev_priv->mm.request_list)) | 1770 | (!list_empty(&dev_priv->render_ring.request_list) || |
1771 | (HAS_BSD(dev) && | ||
1772 | !list_empty(&dev_priv->bsd_ring.request_list)))) | ||
1862 | queue_delayed_work(dev_priv->wq, &dev_priv->mm.retire_work, HZ); | 1773 | queue_delayed_work(dev_priv->wq, &dev_priv->mm.retire_work, HZ); |
1863 | mutex_unlock(&dev->struct_mutex); | 1774 | mutex_unlock(&dev->struct_mutex); |
1864 | } | 1775 | } |
1865 | 1776 | ||
1866 | int | 1777 | int |
1867 | i915_do_wait_request(struct drm_device *dev, uint32_t seqno, int interruptible) | 1778 | i915_do_wait_request(struct drm_device *dev, uint32_t seqno, |
1779 | int interruptible, struct intel_ring_buffer *ring) | ||
1868 | { | 1780 | { |
1869 | drm_i915_private_t *dev_priv = dev->dev_private; | 1781 | drm_i915_private_t *dev_priv = dev->dev_private; |
1870 | u32 ier; | 1782 | u32 ier; |
@@ -1875,7 +1787,7 @@ i915_do_wait_request(struct drm_device *dev, uint32_t seqno, int interruptible) | |||
1875 | if (atomic_read(&dev_priv->mm.wedged)) | 1787 | if (atomic_read(&dev_priv->mm.wedged)) |
1876 | return -EIO; | 1788 | return -EIO; |
1877 | 1789 | ||
1878 | if (!i915_seqno_passed(i915_get_gem_seqno(dev), seqno)) { | 1790 | if (!i915_seqno_passed(ring->get_gem_seqno(dev, ring), seqno)) { |
1879 | if (HAS_PCH_SPLIT(dev)) | 1791 | if (HAS_PCH_SPLIT(dev)) |
1880 | ier = I915_READ(DEIER) | I915_READ(GTIER); | 1792 | ier = I915_READ(DEIER) | I915_READ(GTIER); |
1881 | else | 1793 | else |
@@ -1889,19 +1801,21 @@ i915_do_wait_request(struct drm_device *dev, uint32_t seqno, int interruptible) | |||
1889 | 1801 | ||
1890 | trace_i915_gem_request_wait_begin(dev, seqno); | 1802 | trace_i915_gem_request_wait_begin(dev, seqno); |
1891 | 1803 | ||
1892 | dev_priv->mm.waiting_gem_seqno = seqno; | 1804 | ring->waiting_gem_seqno = seqno; |
1893 | i915_user_irq_get(dev); | 1805 | ring->user_irq_get(dev, ring); |
1894 | if (interruptible) | 1806 | if (interruptible) |
1895 | ret = wait_event_interruptible(dev_priv->irq_queue, | 1807 | ret = wait_event_interruptible(ring->irq_queue, |
1896 | i915_seqno_passed(i915_get_gem_seqno(dev), seqno) || | 1808 | i915_seqno_passed( |
1897 | atomic_read(&dev_priv->mm.wedged)); | 1809 | ring->get_gem_seqno(dev, ring), seqno) |
1810 | || atomic_read(&dev_priv->mm.wedged)); | ||
1898 | else | 1811 | else |
1899 | wait_event(dev_priv->irq_queue, | 1812 | wait_event(ring->irq_queue, |
1900 | i915_seqno_passed(i915_get_gem_seqno(dev), seqno) || | 1813 | i915_seqno_passed( |
1901 | atomic_read(&dev_priv->mm.wedged)); | 1814 | ring->get_gem_seqno(dev, ring), seqno) |
1815 | || atomic_read(&dev_priv->mm.wedged)); | ||
1902 | 1816 | ||
1903 | i915_user_irq_put(dev); | 1817 | ring->user_irq_put(dev, ring); |
1904 | dev_priv->mm.waiting_gem_seqno = 0; | 1818 | ring->waiting_gem_seqno = 0; |
1905 | 1819 | ||
1906 | trace_i915_gem_request_wait_end(dev, seqno); | 1820 | trace_i915_gem_request_wait_end(dev, seqno); |
1907 | } | 1821 | } |
@@ -1910,7 +1824,7 @@ i915_do_wait_request(struct drm_device *dev, uint32_t seqno, int interruptible) | |||
1910 | 1824 | ||
1911 | if (ret && ret != -ERESTARTSYS) | 1825 | if (ret && ret != -ERESTARTSYS) |
1912 | DRM_ERROR("%s returns %d (awaiting %d at %d)\n", | 1826 | DRM_ERROR("%s returns %d (awaiting %d at %d)\n", |
1913 | __func__, ret, seqno, i915_get_gem_seqno(dev)); | 1827 | __func__, ret, seqno, ring->get_gem_seqno(dev, ring)); |
1914 | 1828 | ||
1915 | /* Directly dispatch request retiring. While we have the work queue | 1829 | /* Directly dispatch request retiring. While we have the work queue |
1916 | * to handle this, the waiter on a request often wants an associated | 1830 | * to handle this, the waiter on a request often wants an associated |
@@ -1918,7 +1832,7 @@ i915_do_wait_request(struct drm_device *dev, uint32_t seqno, int interruptible) | |||
1918 | * a separate wait queue to handle that. | 1832 | * a separate wait queue to handle that. |
1919 | */ | 1833 | */ |
1920 | if (ret == 0) | 1834 | if (ret == 0) |
1921 | i915_gem_retire_requests(dev); | 1835 | i915_gem_retire_requests(dev, ring); |
1922 | 1836 | ||
1923 | return ret; | 1837 | return ret; |
1924 | } | 1838 | } |
@@ -1928,9 +1842,10 @@ i915_do_wait_request(struct drm_device *dev, uint32_t seqno, int interruptible) | |||
1928 | * request and object lists appropriately for that event. | 1842 | * request and object lists appropriately for that event. |
1929 | */ | 1843 | */ |
1930 | static int | 1844 | static int |
1931 | i915_wait_request(struct drm_device *dev, uint32_t seqno) | 1845 | i915_wait_request(struct drm_device *dev, uint32_t seqno, |
1846 | struct intel_ring_buffer *ring) | ||
1932 | { | 1847 | { |
1933 | return i915_do_wait_request(dev, seqno, 1); | 1848 | return i915_do_wait_request(dev, seqno, 1, ring); |
1934 | } | 1849 | } |
1935 | 1850 | ||
1936 | static void | 1851 | static void |
@@ -1939,71 +1854,29 @@ i915_gem_flush(struct drm_device *dev, | |||
1939 | uint32_t flush_domains) | 1854 | uint32_t flush_domains) |
1940 | { | 1855 | { |
1941 | drm_i915_private_t *dev_priv = dev->dev_private; | 1856 | drm_i915_private_t *dev_priv = dev->dev_private; |
1942 | uint32_t cmd; | ||
1943 | RING_LOCALS; | ||
1944 | |||
1945 | #if WATCH_EXEC | ||
1946 | DRM_INFO("%s: invalidate %08x flush %08x\n", __func__, | ||
1947 | invalidate_domains, flush_domains); | ||
1948 | #endif | ||
1949 | trace_i915_gem_request_flush(dev, dev_priv->mm.next_gem_seqno, | ||
1950 | invalidate_domains, flush_domains); | ||
1951 | |||
1952 | if (flush_domains & I915_GEM_DOMAIN_CPU) | 1857 | if (flush_domains & I915_GEM_DOMAIN_CPU) |
1953 | drm_agp_chipset_flush(dev); | 1858 | drm_agp_chipset_flush(dev); |
1859 | dev_priv->render_ring.flush(dev, &dev_priv->render_ring, | ||
1860 | invalidate_domains, | ||
1861 | flush_domains); | ||
1862 | |||
1863 | if (HAS_BSD(dev)) | ||
1864 | dev_priv->bsd_ring.flush(dev, &dev_priv->bsd_ring, | ||
1865 | invalidate_domains, | ||
1866 | flush_domains); | ||
1867 | } | ||
1954 | 1868 | ||
1955 | if ((invalidate_domains | flush_domains) & I915_GEM_GPU_DOMAINS) { | 1869 | static void |
1956 | /* | 1870 | i915_gem_flush_ring(struct drm_device *dev, |
1957 | * read/write caches: | 1871 | uint32_t invalidate_domains, |
1958 | * | 1872 | uint32_t flush_domains, |
1959 | * I915_GEM_DOMAIN_RENDER is always invalidated, but is | 1873 | struct intel_ring_buffer *ring) |
1960 | * only flushed if MI_NO_WRITE_FLUSH is unset. On 965, it is | 1874 | { |
1961 | * also flushed at 2d versus 3d pipeline switches. | 1875 | if (flush_domains & I915_GEM_DOMAIN_CPU) |
1962 | * | 1876 | drm_agp_chipset_flush(dev); |
1963 | * read-only caches: | 1877 | ring->flush(dev, ring, |
1964 | * | 1878 | invalidate_domains, |
1965 | * I915_GEM_DOMAIN_SAMPLER is flushed on pre-965 if | 1879 | flush_domains); |
1966 | * MI_READ_FLUSH is set, and is always flushed on 965. | ||
1967 | * | ||
1968 | * I915_GEM_DOMAIN_COMMAND may not exist? | ||
1969 | * | ||
1970 | * I915_GEM_DOMAIN_INSTRUCTION, which exists on 965, is | ||
1971 | * invalidated when MI_EXE_FLUSH is set. | ||
1972 | * | ||
1973 | * I915_GEM_DOMAIN_VERTEX, which exists on 965, is | ||
1974 | * invalidated with every MI_FLUSH. | ||
1975 | * | ||
1976 | * TLBs: | ||
1977 | * | ||
1978 | * On 965, TLBs associated with I915_GEM_DOMAIN_COMMAND | ||
1979 | * and I915_GEM_DOMAIN_CPU in are invalidated at PTE write and | ||
1980 | * I915_GEM_DOMAIN_RENDER and I915_GEM_DOMAIN_SAMPLER | ||
1981 | * are flushed at any MI_FLUSH. | ||
1982 | */ | ||
1983 | |||
1984 | cmd = MI_FLUSH | MI_NO_WRITE_FLUSH; | ||
1985 | if ((invalidate_domains|flush_domains) & | ||
1986 | I915_GEM_DOMAIN_RENDER) | ||
1987 | cmd &= ~MI_NO_WRITE_FLUSH; | ||
1988 | if (!IS_I965G(dev)) { | ||
1989 | /* | ||
1990 | * On the 965, the sampler cache always gets flushed | ||
1991 | * and this bit is reserved. | ||
1992 | */ | ||
1993 | if (invalidate_domains & I915_GEM_DOMAIN_SAMPLER) | ||
1994 | cmd |= MI_READ_FLUSH; | ||
1995 | } | ||
1996 | if (invalidate_domains & I915_GEM_DOMAIN_INSTRUCTION) | ||
1997 | cmd |= MI_EXE_FLUSH; | ||
1998 | |||
1999 | #if WATCH_EXEC | ||
2000 | DRM_INFO("%s: queue flush %08x to ring\n", __func__, cmd); | ||
2001 | #endif | ||
2002 | BEGIN_LP_RING(2); | ||
2003 | OUT_RING(cmd); | ||
2004 | OUT_RING(MI_NOOP); | ||
2005 | ADVANCE_LP_RING(); | ||
2006 | } | ||
2007 | } | 1880 | } |
2008 | 1881 | ||
2009 | /** | 1882 | /** |
@@ -2030,7 +1903,8 @@ i915_gem_object_wait_rendering(struct drm_gem_object *obj) | |||
2030 | DRM_INFO("%s: object %p wait for seqno %08x\n", | 1903 | DRM_INFO("%s: object %p wait for seqno %08x\n", |
2031 | __func__, obj, obj_priv->last_rendering_seqno); | 1904 | __func__, obj, obj_priv->last_rendering_seqno); |
2032 | #endif | 1905 | #endif |
2033 | ret = i915_wait_request(dev, obj_priv->last_rendering_seqno); | 1906 | ret = i915_wait_request(dev, |
1907 | obj_priv->last_rendering_seqno, obj_priv->ring); | ||
2034 | if (ret != 0) | 1908 | if (ret != 0) |
2035 | return ret; | 1909 | return ret; |
2036 | } | 1910 | } |
@@ -2146,11 +2020,14 @@ i915_gpu_idle(struct drm_device *dev) | |||
2146 | { | 2020 | { |
2147 | drm_i915_private_t *dev_priv = dev->dev_private; | 2021 | drm_i915_private_t *dev_priv = dev->dev_private; |
2148 | bool lists_empty; | 2022 | bool lists_empty; |
2149 | uint32_t seqno; | 2023 | uint32_t seqno1, seqno2; |
2024 | int ret; | ||
2150 | 2025 | ||
2151 | spin_lock(&dev_priv->mm.active_list_lock); | 2026 | spin_lock(&dev_priv->mm.active_list_lock); |
2152 | lists_empty = list_empty(&dev_priv->mm.flushing_list) && | 2027 | lists_empty = (list_empty(&dev_priv->mm.flushing_list) && |
2153 | list_empty(&dev_priv->mm.active_list); | 2028 | list_empty(&dev_priv->render_ring.active_list) && |
2029 | (!HAS_BSD(dev) || | ||
2030 | list_empty(&dev_priv->bsd_ring.active_list))); | ||
2154 | spin_unlock(&dev_priv->mm.active_list_lock); | 2031 | spin_unlock(&dev_priv->mm.active_list_lock); |
2155 | 2032 | ||
2156 | if (lists_empty) | 2033 | if (lists_empty) |
@@ -2158,11 +2035,25 @@ i915_gpu_idle(struct drm_device *dev) | |||
2158 | 2035 | ||
2159 | /* Flush everything onto the inactive list. */ | 2036 | /* Flush everything onto the inactive list. */ |
2160 | i915_gem_flush(dev, I915_GEM_GPU_DOMAINS, I915_GEM_GPU_DOMAINS); | 2037 | i915_gem_flush(dev, I915_GEM_GPU_DOMAINS, I915_GEM_GPU_DOMAINS); |
2161 | seqno = i915_add_request(dev, NULL, I915_GEM_GPU_DOMAINS); | 2038 | seqno1 = i915_add_request(dev, NULL, I915_GEM_GPU_DOMAINS, |
2162 | if (seqno == 0) | 2039 | &dev_priv->render_ring); |
2040 | if (seqno1 == 0) | ||
2163 | return -ENOMEM; | 2041 | return -ENOMEM; |
2042 | ret = i915_wait_request(dev, seqno1, &dev_priv->render_ring); | ||
2043 | |||
2044 | if (HAS_BSD(dev)) { | ||
2045 | seqno2 = i915_add_request(dev, NULL, I915_GEM_GPU_DOMAINS, | ||
2046 | &dev_priv->bsd_ring); | ||
2047 | if (seqno2 == 0) | ||
2048 | return -ENOMEM; | ||
2049 | |||
2050 | ret = i915_wait_request(dev, seqno2, &dev_priv->bsd_ring); | ||
2051 | if (ret) | ||
2052 | return ret; | ||
2053 | } | ||
2054 | |||
2164 | 2055 | ||
2165 | return i915_wait_request(dev, seqno); | 2056 | return ret; |
2166 | } | 2057 | } |
2167 | 2058 | ||
2168 | static int | 2059 | static int |
@@ -2175,7 +2066,9 @@ i915_gem_evict_everything(struct drm_device *dev) | |||
2175 | spin_lock(&dev_priv->mm.active_list_lock); | 2066 | spin_lock(&dev_priv->mm.active_list_lock); |
2176 | lists_empty = (list_empty(&dev_priv->mm.inactive_list) && | 2067 | lists_empty = (list_empty(&dev_priv->mm.inactive_list) && |
2177 | list_empty(&dev_priv->mm.flushing_list) && | 2068 | list_empty(&dev_priv->mm.flushing_list) && |
2178 | list_empty(&dev_priv->mm.active_list)); | 2069 | list_empty(&dev_priv->render_ring.active_list) && |
2070 | (!HAS_BSD(dev) | ||
2071 | || list_empty(&dev_priv->bsd_ring.active_list))); | ||
2179 | spin_unlock(&dev_priv->mm.active_list_lock); | 2072 | spin_unlock(&dev_priv->mm.active_list_lock); |
2180 | 2073 | ||
2181 | if (lists_empty) | 2074 | if (lists_empty) |
@@ -2195,7 +2088,9 @@ i915_gem_evict_everything(struct drm_device *dev) | |||
2195 | spin_lock(&dev_priv->mm.active_list_lock); | 2088 | spin_lock(&dev_priv->mm.active_list_lock); |
2196 | lists_empty = (list_empty(&dev_priv->mm.inactive_list) && | 2089 | lists_empty = (list_empty(&dev_priv->mm.inactive_list) && |
2197 | list_empty(&dev_priv->mm.flushing_list) && | 2090 | list_empty(&dev_priv->mm.flushing_list) && |
2198 | list_empty(&dev_priv->mm.active_list)); | 2091 | list_empty(&dev_priv->render_ring.active_list) && |
2092 | (!HAS_BSD(dev) | ||
2093 | || list_empty(&dev_priv->bsd_ring.active_list))); | ||
2199 | spin_unlock(&dev_priv->mm.active_list_lock); | 2094 | spin_unlock(&dev_priv->mm.active_list_lock); |
2200 | BUG_ON(!lists_empty); | 2095 | BUG_ON(!lists_empty); |
2201 | 2096 | ||
@@ -2209,8 +2104,13 @@ i915_gem_evict_something(struct drm_device *dev, int min_size) | |||
2209 | struct drm_gem_object *obj; | 2104 | struct drm_gem_object *obj; |
2210 | int ret; | 2105 | int ret; |
2211 | 2106 | ||
2107 | struct intel_ring_buffer *render_ring = &dev_priv->render_ring; | ||
2108 | struct intel_ring_buffer *bsd_ring = &dev_priv->bsd_ring; | ||
2212 | for (;;) { | 2109 | for (;;) { |
2213 | i915_gem_retire_requests(dev); | 2110 | i915_gem_retire_requests(dev, render_ring); |
2111 | |||
2112 | if (HAS_BSD(dev)) | ||
2113 | i915_gem_retire_requests(dev, bsd_ring); | ||
2214 | 2114 | ||
2215 | /* If there's an inactive buffer available now, grab it | 2115 | /* If there's an inactive buffer available now, grab it |
2216 | * and be done. | 2116 | * and be done. |
@@ -2234,14 +2134,30 @@ i915_gem_evict_something(struct drm_device *dev, int min_size) | |||
2234 | * things, wait for the next to finish and hopefully leave us | 2134 | * things, wait for the next to finish and hopefully leave us |
2235 | * a buffer to evict. | 2135 | * a buffer to evict. |
2236 | */ | 2136 | */ |
2237 | if (!list_empty(&dev_priv->mm.request_list)) { | 2137 | if (!list_empty(&render_ring->request_list)) { |
2138 | struct drm_i915_gem_request *request; | ||
2139 | |||
2140 | request = list_first_entry(&render_ring->request_list, | ||
2141 | struct drm_i915_gem_request, | ||
2142 | list); | ||
2143 | |||
2144 | ret = i915_wait_request(dev, | ||
2145 | request->seqno, request->ring); | ||
2146 | if (ret) | ||
2147 | return ret; | ||
2148 | |||
2149 | continue; | ||
2150 | } | ||
2151 | |||
2152 | if (HAS_BSD(dev) && !list_empty(&bsd_ring->request_list)) { | ||
2238 | struct drm_i915_gem_request *request; | 2153 | struct drm_i915_gem_request *request; |
2239 | 2154 | ||
2240 | request = list_first_entry(&dev_priv->mm.request_list, | 2155 | request = list_first_entry(&bsd_ring->request_list, |
2241 | struct drm_i915_gem_request, | 2156 | struct drm_i915_gem_request, |
2242 | list); | 2157 | list); |
2243 | 2158 | ||
2244 | ret = i915_wait_request(dev, request->seqno); | 2159 | ret = i915_wait_request(dev, |
2160 | request->seqno, request->ring); | ||
2245 | if (ret) | 2161 | if (ret) |
2246 | return ret; | 2162 | return ret; |
2247 | 2163 | ||
@@ -2268,10 +2184,13 @@ i915_gem_evict_something(struct drm_device *dev, int min_size) | |||
2268 | if (obj != NULL) { | 2184 | if (obj != NULL) { |
2269 | uint32_t seqno; | 2185 | uint32_t seqno; |
2270 | 2186 | ||
2271 | i915_gem_flush(dev, | 2187 | i915_gem_flush_ring(dev, |
2188 | obj->write_domain, | ||
2272 | obj->write_domain, | 2189 | obj->write_domain, |
2273 | obj->write_domain); | 2190 | obj_priv->ring); |
2274 | seqno = i915_add_request(dev, NULL, obj->write_domain); | 2191 | seqno = i915_add_request(dev, NULL, |
2192 | obj->write_domain, | ||
2193 | obj_priv->ring); | ||
2275 | if (seqno == 0) | 2194 | if (seqno == 0) |
2276 | return -ENOMEM; | 2195 | return -ENOMEM; |
2277 | continue; | 2196 | continue; |
@@ -2299,6 +2218,9 @@ i915_gem_object_get_pages(struct drm_gem_object *obj, | |||
2299 | struct inode *inode; | 2218 | struct inode *inode; |
2300 | struct page *page; | 2219 | struct page *page; |
2301 | 2220 | ||
2221 | BUG_ON(obj_priv->pages_refcount | ||
2222 | == DRM_I915_GEM_OBJECT_MAX_PAGES_REFCOUNT); | ||
2223 | |||
2302 | if (obj_priv->pages_refcount++ != 0) | 2224 | if (obj_priv->pages_refcount++ != 0) |
2303 | return 0; | 2225 | return 0; |
2304 | 2226 | ||
@@ -2697,6 +2619,14 @@ i915_gem_object_bind_to_gtt(struct drm_gem_object *obj, unsigned alignment) | |||
2697 | return -EINVAL; | 2619 | return -EINVAL; |
2698 | } | 2620 | } |
2699 | 2621 | ||
2622 | /* If the object is bigger than the entire aperture, reject it early | ||
2623 | * before evicting everything in a vain attempt to find space. | ||
2624 | */ | ||
2625 | if (obj->size > dev->gtt_total) { | ||
2626 | DRM_ERROR("Attempting to bind an object larger than the aperture\n"); | ||
2627 | return -E2BIG; | ||
2628 | } | ||
2629 | |||
2700 | search_free: | 2630 | search_free: |
2701 | free_space = drm_mm_search_free(&dev_priv->mm.gtt_space, | 2631 | free_space = drm_mm_search_free(&dev_priv->mm.gtt_space, |
2702 | obj->size, alignment, 0); | 2632 | obj->size, alignment, 0); |
@@ -2807,6 +2737,7 @@ i915_gem_object_flush_gpu_write_domain(struct drm_gem_object *obj) | |||
2807 | { | 2737 | { |
2808 | struct drm_device *dev = obj->dev; | 2738 | struct drm_device *dev = obj->dev; |
2809 | uint32_t old_write_domain; | 2739 | uint32_t old_write_domain; |
2740 | struct drm_i915_gem_object *obj_priv = to_intel_bo(obj); | ||
2810 | 2741 | ||
2811 | if ((obj->write_domain & I915_GEM_GPU_DOMAINS) == 0) | 2742 | if ((obj->write_domain & I915_GEM_GPU_DOMAINS) == 0) |
2812 | return; | 2743 | return; |
@@ -2814,7 +2745,7 @@ i915_gem_object_flush_gpu_write_domain(struct drm_gem_object *obj) | |||
2814 | /* Queue the GPU write cache flushing we need. */ | 2745 | /* Queue the GPU write cache flushing we need. */ |
2815 | old_write_domain = obj->write_domain; | 2746 | old_write_domain = obj->write_domain; |
2816 | i915_gem_flush(dev, 0, obj->write_domain); | 2747 | i915_gem_flush(dev, 0, obj->write_domain); |
2817 | (void) i915_add_request(dev, NULL, obj->write_domain); | 2748 | (void) i915_add_request(dev, NULL, obj->write_domain, obj_priv->ring); |
2818 | BUG_ON(obj->write_domain); | 2749 | BUG_ON(obj->write_domain); |
2819 | 2750 | ||
2820 | trace_i915_gem_object_change_domain(obj, | 2751 | trace_i915_gem_object_change_domain(obj, |
@@ -2954,23 +2885,24 @@ i915_gem_object_set_to_display_plane(struct drm_gem_object *obj) | |||
2954 | DRM_INFO("%s: object %p wait for seqno %08x\n", | 2885 | DRM_INFO("%s: object %p wait for seqno %08x\n", |
2955 | __func__, obj, obj_priv->last_rendering_seqno); | 2886 | __func__, obj, obj_priv->last_rendering_seqno); |
2956 | #endif | 2887 | #endif |
2957 | ret = i915_do_wait_request(dev, obj_priv->last_rendering_seqno, 0); | 2888 | ret = i915_do_wait_request(dev, |
2889 | obj_priv->last_rendering_seqno, | ||
2890 | 0, | ||
2891 | obj_priv->ring); | ||
2958 | if (ret != 0) | 2892 | if (ret != 0) |
2959 | return ret; | 2893 | return ret; |
2960 | } | 2894 | } |
2961 | 2895 | ||
2896 | i915_gem_object_flush_cpu_write_domain(obj); | ||
2897 | |||
2962 | old_write_domain = obj->write_domain; | 2898 | old_write_domain = obj->write_domain; |
2963 | old_read_domains = obj->read_domains; | 2899 | old_read_domains = obj->read_domains; |
2964 | 2900 | ||
2965 | obj->read_domains &= I915_GEM_DOMAIN_GTT; | ||
2966 | |||
2967 | i915_gem_object_flush_cpu_write_domain(obj); | ||
2968 | |||
2969 | /* It should now be out of any other write domains, and we can update | 2901 | /* It should now be out of any other write domains, and we can update |
2970 | * the domain values for our changes. | 2902 | * the domain values for our changes. |
2971 | */ | 2903 | */ |
2972 | BUG_ON((obj->write_domain & ~I915_GEM_DOMAIN_GTT) != 0); | 2904 | BUG_ON((obj->write_domain & ~I915_GEM_DOMAIN_GTT) != 0); |
2973 | obj->read_domains |= I915_GEM_DOMAIN_GTT; | 2905 | obj->read_domains = I915_GEM_DOMAIN_GTT; |
2974 | obj->write_domain = I915_GEM_DOMAIN_GTT; | 2906 | obj->write_domain = I915_GEM_DOMAIN_GTT; |
2975 | obj_priv->dirty = 1; | 2907 | obj_priv->dirty = 1; |
2976 | 2908 | ||
@@ -3354,9 +3286,13 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj, | |||
3354 | obj_priv->tiling_mode != I915_TILING_NONE; | 3286 | obj_priv->tiling_mode != I915_TILING_NONE; |
3355 | 3287 | ||
3356 | /* Check fence reg constraints and rebind if necessary */ | 3288 | /* Check fence reg constraints and rebind if necessary */ |
3357 | if (need_fence && !i915_gem_object_fence_offset_ok(obj, | 3289 | if (need_fence && |
3358 | obj_priv->tiling_mode)) | 3290 | !i915_gem_object_fence_offset_ok(obj, |
3359 | i915_gem_object_unbind(obj); | 3291 | obj_priv->tiling_mode)) { |
3292 | ret = i915_gem_object_unbind(obj); | ||
3293 | if (ret) | ||
3294 | return ret; | ||
3295 | } | ||
3360 | 3296 | ||
3361 | /* Choose the GTT offset for our buffer and put it there. */ | 3297 | /* Choose the GTT offset for our buffer and put it there. */ |
3362 | ret = i915_gem_object_pin(obj, (uint32_t) entry->alignment); | 3298 | ret = i915_gem_object_pin(obj, (uint32_t) entry->alignment); |
@@ -3370,9 +3306,6 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj, | |||
3370 | if (need_fence) { | 3306 | if (need_fence) { |
3371 | ret = i915_gem_object_get_fence_reg(obj); | 3307 | ret = i915_gem_object_get_fence_reg(obj); |
3372 | if (ret != 0) { | 3308 | if (ret != 0) { |
3373 | if (ret != -EBUSY && ret != -ERESTARTSYS) | ||
3374 | DRM_ERROR("Failure to install fence: %d\n", | ||
3375 | ret); | ||
3376 | i915_gem_object_unpin(obj); | 3309 | i915_gem_object_unpin(obj); |
3377 | return ret; | 3310 | return ret; |
3378 | } | 3311 | } |
@@ -3545,62 +3478,6 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj, | |||
3545 | return 0; | 3478 | return 0; |
3546 | } | 3479 | } |
3547 | 3480 | ||
3548 | /** Dispatch a batchbuffer to the ring | ||
3549 | */ | ||
3550 | static int | ||
3551 | i915_dispatch_gem_execbuffer(struct drm_device *dev, | ||
3552 | struct drm_i915_gem_execbuffer2 *exec, | ||
3553 | struct drm_clip_rect *cliprects, | ||
3554 | uint64_t exec_offset) | ||
3555 | { | ||
3556 | drm_i915_private_t *dev_priv = dev->dev_private; | ||
3557 | int nbox = exec->num_cliprects; | ||
3558 | int i = 0, count; | ||
3559 | uint32_t exec_start, exec_len; | ||
3560 | RING_LOCALS; | ||
3561 | |||
3562 | exec_start = (uint32_t) exec_offset + exec->batch_start_offset; | ||
3563 | exec_len = (uint32_t) exec->batch_len; | ||
3564 | |||
3565 | trace_i915_gem_request_submit(dev, dev_priv->mm.next_gem_seqno + 1); | ||
3566 | |||
3567 | count = nbox ? nbox : 1; | ||
3568 | |||
3569 | for (i = 0; i < count; i++) { | ||
3570 | if (i < nbox) { | ||
3571 | int ret = i915_emit_box(dev, cliprects, i, | ||
3572 | exec->DR1, exec->DR4); | ||
3573 | if (ret) | ||
3574 | return ret; | ||
3575 | } | ||
3576 | |||
3577 | if (IS_I830(dev) || IS_845G(dev)) { | ||
3578 | BEGIN_LP_RING(4); | ||
3579 | OUT_RING(MI_BATCH_BUFFER); | ||
3580 | OUT_RING(exec_start | MI_BATCH_NON_SECURE); | ||
3581 | OUT_RING(exec_start + exec_len - 4); | ||
3582 | OUT_RING(0); | ||
3583 | ADVANCE_LP_RING(); | ||
3584 | } else { | ||
3585 | BEGIN_LP_RING(2); | ||
3586 | if (IS_I965G(dev)) { | ||
3587 | OUT_RING(MI_BATCH_BUFFER_START | | ||
3588 | (2 << 6) | | ||
3589 | MI_BATCH_NON_SECURE_I965); | ||
3590 | OUT_RING(exec_start); | ||
3591 | } else { | ||
3592 | OUT_RING(MI_BATCH_BUFFER_START | | ||
3593 | (2 << 6)); | ||
3594 | OUT_RING(exec_start | MI_BATCH_NON_SECURE); | ||
3595 | } | ||
3596 | ADVANCE_LP_RING(); | ||
3597 | } | ||
3598 | } | ||
3599 | |||
3600 | /* XXX breadcrumb */ | ||
3601 | return 0; | ||
3602 | } | ||
3603 | |||
3604 | /* Throttle our rendering by waiting until the ring has completed our requests | 3481 | /* Throttle our rendering by waiting until the ring has completed our requests |
3605 | * emitted over 20 msec ago. | 3482 | * emitted over 20 msec ago. |
3606 | * | 3483 | * |
@@ -3629,7 +3506,7 @@ i915_gem_ring_throttle(struct drm_device *dev, struct drm_file *file_priv) | |||
3629 | if (time_after_eq(request->emitted_jiffies, recent_enough)) | 3506 | if (time_after_eq(request->emitted_jiffies, recent_enough)) |
3630 | break; | 3507 | break; |
3631 | 3508 | ||
3632 | ret = i915_wait_request(dev, request->seqno); | 3509 | ret = i915_wait_request(dev, request->seqno, request->ring); |
3633 | if (ret != 0) | 3510 | if (ret != 0) |
3634 | break; | 3511 | break; |
3635 | } | 3512 | } |
@@ -3786,10 +3663,22 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data, | |||
3786 | uint32_t seqno, flush_domains, reloc_index; | 3663 | uint32_t seqno, flush_domains, reloc_index; |
3787 | int pin_tries, flips; | 3664 | int pin_tries, flips; |
3788 | 3665 | ||
3666 | struct intel_ring_buffer *ring = NULL; | ||
3667 | |||
3789 | #if WATCH_EXEC | 3668 | #if WATCH_EXEC |
3790 | DRM_INFO("buffers_ptr %d buffer_count %d len %08x\n", | 3669 | DRM_INFO("buffers_ptr %d buffer_count %d len %08x\n", |
3791 | (int) args->buffers_ptr, args->buffer_count, args->batch_len); | 3670 | (int) args->buffers_ptr, args->buffer_count, args->batch_len); |
3792 | #endif | 3671 | #endif |
3672 | if (args->flags & I915_EXEC_BSD) { | ||
3673 | if (!HAS_BSD(dev)) { | ||
3674 | DRM_ERROR("execbuf with wrong flag\n"); | ||
3675 | return -EINVAL; | ||
3676 | } | ||
3677 | ring = &dev_priv->bsd_ring; | ||
3678 | } else { | ||
3679 | ring = &dev_priv->render_ring; | ||
3680 | } | ||
3681 | |||
3793 | 3682 | ||
3794 | if (args->buffer_count < 1) { | 3683 | if (args->buffer_count < 1) { |
3795 | DRM_ERROR("execbuf with %d buffers\n", args->buffer_count); | 3684 | DRM_ERROR("execbuf with %d buffers\n", args->buffer_count); |
@@ -3902,11 +3791,19 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data, | |||
3902 | if (ret != -ENOSPC || pin_tries >= 1) { | 3791 | if (ret != -ENOSPC || pin_tries >= 1) { |
3903 | if (ret != -ERESTARTSYS) { | 3792 | if (ret != -ERESTARTSYS) { |
3904 | unsigned long long total_size = 0; | 3793 | unsigned long long total_size = 0; |
3905 | for (i = 0; i < args->buffer_count; i++) | 3794 | int num_fences = 0; |
3795 | for (i = 0; i < args->buffer_count; i++) { | ||
3796 | obj_priv = object_list[i]->driver_private; | ||
3797 | |||
3906 | total_size += object_list[i]->size; | 3798 | total_size += object_list[i]->size; |
3907 | DRM_ERROR("Failed to pin buffer %d of %d, total %llu bytes: %d\n", | 3799 | num_fences += |
3800 | exec_list[i].flags & EXEC_OBJECT_NEEDS_FENCE && | ||
3801 | obj_priv->tiling_mode != I915_TILING_NONE; | ||
3802 | } | ||
3803 | DRM_ERROR("Failed to pin buffer %d of %d, total %llu bytes, %d fences: %d\n", | ||
3908 | pinned+1, args->buffer_count, | 3804 | pinned+1, args->buffer_count, |
3909 | total_size, ret); | 3805 | total_size, num_fences, |
3806 | ret); | ||
3910 | DRM_ERROR("%d objects [%d pinned], " | 3807 | DRM_ERROR("%d objects [%d pinned], " |
3911 | "%d object bytes [%d pinned], " | 3808 | "%d object bytes [%d pinned], " |
3912 | "%d/%d gtt bytes\n", | 3809 | "%d/%d gtt bytes\n", |
@@ -3976,9 +3873,16 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data, | |||
3976 | i915_gem_flush(dev, | 3873 | i915_gem_flush(dev, |
3977 | dev->invalidate_domains, | 3874 | dev->invalidate_domains, |
3978 | dev->flush_domains); | 3875 | dev->flush_domains); |
3979 | if (dev->flush_domains & I915_GEM_GPU_DOMAINS) | 3876 | if (dev->flush_domains & I915_GEM_GPU_DOMAINS) { |
3980 | (void)i915_add_request(dev, file_priv, | 3877 | (void)i915_add_request(dev, file_priv, |
3981 | dev->flush_domains); | 3878 | dev->flush_domains, |
3879 | &dev_priv->render_ring); | ||
3880 | |||
3881 | if (HAS_BSD(dev)) | ||
3882 | (void)i915_add_request(dev, file_priv, | ||
3883 | dev->flush_domains, | ||
3884 | &dev_priv->bsd_ring); | ||
3885 | } | ||
3982 | } | 3886 | } |
3983 | 3887 | ||
3984 | for (i = 0; i < args->buffer_count; i++) { | 3888 | for (i = 0; i < args->buffer_count; i++) { |
@@ -4015,7 +3919,8 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data, | |||
4015 | #endif | 3919 | #endif |
4016 | 3920 | ||
4017 | /* Exec the batchbuffer */ | 3921 | /* Exec the batchbuffer */ |
4018 | ret = i915_dispatch_gem_execbuffer(dev, args, cliprects, exec_offset); | 3922 | ret = ring->dispatch_gem_execbuffer(dev, ring, args, |
3923 | cliprects, exec_offset); | ||
4019 | if (ret) { | 3924 | if (ret) { |
4020 | DRM_ERROR("dispatch failed %d\n", ret); | 3925 | DRM_ERROR("dispatch failed %d\n", ret); |
4021 | goto err; | 3926 | goto err; |
@@ -4025,7 +3930,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data, | |||
4025 | * Ensure that the commands in the batch buffer are | 3930 | * Ensure that the commands in the batch buffer are |
4026 | * finished before the interrupt fires | 3931 | * finished before the interrupt fires |
4027 | */ | 3932 | */ |
4028 | flush_domains = i915_retire_commands(dev); | 3933 | flush_domains = i915_retire_commands(dev, ring); |
4029 | 3934 | ||
4030 | i915_verify_inactive(dev, __FILE__, __LINE__); | 3935 | i915_verify_inactive(dev, __FILE__, __LINE__); |
4031 | 3936 | ||
@@ -4036,12 +3941,13 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data, | |||
4036 | * *some* interrupts representing completion of buffers that we can | 3941 | * *some* interrupts representing completion of buffers that we can |
4037 | * wait on when trying to clear up gtt space). | 3942 | * wait on when trying to clear up gtt space). |
4038 | */ | 3943 | */ |
4039 | seqno = i915_add_request(dev, file_priv, flush_domains); | 3944 | seqno = i915_add_request(dev, file_priv, flush_domains, ring); |
4040 | BUG_ON(seqno == 0); | 3945 | BUG_ON(seqno == 0); |
4041 | for (i = 0; i < args->buffer_count; i++) { | 3946 | for (i = 0; i < args->buffer_count; i++) { |
4042 | struct drm_gem_object *obj = object_list[i]; | 3947 | struct drm_gem_object *obj = object_list[i]; |
3948 | obj_priv = to_intel_bo(obj); | ||
4043 | 3949 | ||
4044 | i915_gem_object_move_to_active(obj, seqno); | 3950 | i915_gem_object_move_to_active(obj, seqno, ring); |
4045 | #if WATCH_LRU | 3951 | #if WATCH_LRU |
4046 | DRM_INFO("%s: move to exec list %p\n", __func__, obj); | 3952 | DRM_INFO("%s: move to exec list %p\n", __func__, obj); |
4047 | #endif | 3953 | #endif |
@@ -4153,7 +4059,7 @@ i915_gem_execbuffer(struct drm_device *dev, void *data, | |||
4153 | exec2.DR4 = args->DR4; | 4059 | exec2.DR4 = args->DR4; |
4154 | exec2.num_cliprects = args->num_cliprects; | 4060 | exec2.num_cliprects = args->num_cliprects; |
4155 | exec2.cliprects_ptr = args->cliprects_ptr; | 4061 | exec2.cliprects_ptr = args->cliprects_ptr; |
4156 | exec2.flags = 0; | 4062 | exec2.flags = I915_EXEC_RENDER; |
4157 | 4063 | ||
4158 | ret = i915_gem_do_execbuffer(dev, data, file_priv, &exec2, exec2_list); | 4064 | ret = i915_gem_do_execbuffer(dev, data, file_priv, &exec2, exec2_list); |
4159 | if (!ret) { | 4065 | if (!ret) { |
@@ -4239,7 +4145,20 @@ i915_gem_object_pin(struct drm_gem_object *obj, uint32_t alignment) | |||
4239 | struct drm_i915_gem_object *obj_priv = to_intel_bo(obj); | 4145 | struct drm_i915_gem_object *obj_priv = to_intel_bo(obj); |
4240 | int ret; | 4146 | int ret; |
4241 | 4147 | ||
4148 | BUG_ON(obj_priv->pin_count == DRM_I915_GEM_OBJECT_MAX_PIN_COUNT); | ||
4149 | |||
4242 | i915_verify_inactive(dev, __FILE__, __LINE__); | 4150 | i915_verify_inactive(dev, __FILE__, __LINE__); |
4151 | |||
4152 | if (obj_priv->gtt_space != NULL) { | ||
4153 | if (alignment == 0) | ||
4154 | alignment = i915_gem_get_gtt_alignment(obj); | ||
4155 | if (obj_priv->gtt_offset & (alignment - 1)) { | ||
4156 | ret = i915_gem_object_unbind(obj); | ||
4157 | if (ret) | ||
4158 | return ret; | ||
4159 | } | ||
4160 | } | ||
4161 | |||
4243 | if (obj_priv->gtt_space == NULL) { | 4162 | if (obj_priv->gtt_space == NULL) { |
4244 | ret = i915_gem_object_bind_to_gtt(obj, alignment); | 4163 | ret = i915_gem_object_bind_to_gtt(obj, alignment); |
4245 | if (ret) | 4164 | if (ret) |
@@ -4392,6 +4311,7 @@ i915_gem_busy_ioctl(struct drm_device *dev, void *data, | |||
4392 | struct drm_i915_gem_busy *args = data; | 4311 | struct drm_i915_gem_busy *args = data; |
4393 | struct drm_gem_object *obj; | 4312 | struct drm_gem_object *obj; |
4394 | struct drm_i915_gem_object *obj_priv; | 4313 | struct drm_i915_gem_object *obj_priv; |
4314 | drm_i915_private_t *dev_priv = dev->dev_private; | ||
4395 | 4315 | ||
4396 | obj = drm_gem_object_lookup(dev, file_priv, args->handle); | 4316 | obj = drm_gem_object_lookup(dev, file_priv, args->handle); |
4397 | if (obj == NULL) { | 4317 | if (obj == NULL) { |
@@ -4406,7 +4326,10 @@ i915_gem_busy_ioctl(struct drm_device *dev, void *data, | |||
4406 | * actually unmasked, and our working set ends up being larger than | 4326 | * actually unmasked, and our working set ends up being larger than |
4407 | * required. | 4327 | * required. |
4408 | */ | 4328 | */ |
4409 | i915_gem_retire_requests(dev); | 4329 | i915_gem_retire_requests(dev, &dev_priv->render_ring); |
4330 | |||
4331 | if (HAS_BSD(dev)) | ||
4332 | i915_gem_retire_requests(dev, &dev_priv->bsd_ring); | ||
4410 | 4333 | ||
4411 | obj_priv = to_intel_bo(obj); | 4334 | obj_priv = to_intel_bo(obj); |
4412 | /* Don't count being on the flushing list against the object being | 4335 | /* Don't count being on the flushing list against the object being |
@@ -4573,7 +4496,10 @@ i915_gem_idle(struct drm_device *dev) | |||
4573 | 4496 | ||
4574 | mutex_lock(&dev->struct_mutex); | 4497 | mutex_lock(&dev->struct_mutex); |
4575 | 4498 | ||
4576 | if (dev_priv->mm.suspended || dev_priv->ring.ring_obj == NULL) { | 4499 | if (dev_priv->mm.suspended || |
4500 | (dev_priv->render_ring.gem_object == NULL) || | ||
4501 | (HAS_BSD(dev) && | ||
4502 | dev_priv->bsd_ring.gem_object == NULL)) { | ||
4577 | mutex_unlock(&dev->struct_mutex); | 4503 | mutex_unlock(&dev->struct_mutex); |
4578 | return 0; | 4504 | return 0; |
4579 | } | 4505 | } |
@@ -4654,71 +4580,6 @@ err: | |||
4654 | return ret; | 4580 | return ret; |
4655 | } | 4581 | } |
4656 | 4582 | ||
4657 | static int | ||
4658 | i915_gem_init_hws(struct drm_device *dev) | ||
4659 | { | ||
4660 | drm_i915_private_t *dev_priv = dev->dev_private; | ||
4661 | struct drm_gem_object *obj; | ||
4662 | struct drm_i915_gem_object *obj_priv; | ||
4663 | int ret; | ||
4664 | |||
4665 | /* If we need a physical address for the status page, it's already | ||
4666 | * initialized at driver load time. | ||
4667 | */ | ||
4668 | if (!I915_NEED_GFX_HWS(dev)) | ||
4669 | return 0; | ||
4670 | |||
4671 | obj = i915_gem_alloc_object(dev, 4096); | ||
4672 | if (obj == NULL) { | ||
4673 | DRM_ERROR("Failed to allocate status page\n"); | ||
4674 | ret = -ENOMEM; | ||
4675 | goto err; | ||
4676 | } | ||
4677 | obj_priv = to_intel_bo(obj); | ||
4678 | obj_priv->agp_type = AGP_USER_CACHED_MEMORY; | ||
4679 | |||
4680 | ret = i915_gem_object_pin(obj, 4096); | ||
4681 | if (ret != 0) { | ||
4682 | drm_gem_object_unreference(obj); | ||
4683 | goto err_unref; | ||
4684 | } | ||
4685 | |||
4686 | dev_priv->status_gfx_addr = obj_priv->gtt_offset; | ||
4687 | |||
4688 | dev_priv->hw_status_page = kmap(obj_priv->pages[0]); | ||
4689 | if (dev_priv->hw_status_page == NULL) { | ||
4690 | DRM_ERROR("Failed to map status page.\n"); | ||
4691 | memset(&dev_priv->hws_map, 0, sizeof(dev_priv->hws_map)); | ||
4692 | ret = -EINVAL; | ||
4693 | goto err_unpin; | ||
4694 | } | ||
4695 | |||
4696 | if (HAS_PIPE_CONTROL(dev)) { | ||
4697 | ret = i915_gem_init_pipe_control(dev); | ||
4698 | if (ret) | ||
4699 | goto err_unpin; | ||
4700 | } | ||
4701 | |||
4702 | dev_priv->hws_obj = obj; | ||
4703 | memset(dev_priv->hw_status_page, 0, PAGE_SIZE); | ||
4704 | if (IS_GEN6(dev)) { | ||
4705 | I915_WRITE(HWS_PGA_GEN6, dev_priv->status_gfx_addr); | ||
4706 | I915_READ(HWS_PGA_GEN6); /* posting read */ | ||
4707 | } else { | ||
4708 | I915_WRITE(HWS_PGA, dev_priv->status_gfx_addr); | ||
4709 | I915_READ(HWS_PGA); /* posting read */ | ||
4710 | } | ||
4711 | DRM_DEBUG_DRIVER("hws offset: 0x%08x\n", dev_priv->status_gfx_addr); | ||
4712 | |||
4713 | return 0; | ||
4714 | |||
4715 | err_unpin: | ||
4716 | i915_gem_object_unpin(obj); | ||
4717 | err_unref: | ||
4718 | drm_gem_object_unreference(obj); | ||
4719 | err: | ||
4720 | return 0; | ||
4721 | } | ||
4722 | 4583 | ||
4723 | static void | 4584 | static void |
4724 | i915_gem_cleanup_pipe_control(struct drm_device *dev) | 4585 | i915_gem_cleanup_pipe_control(struct drm_device *dev) |
@@ -4737,146 +4598,46 @@ i915_gem_cleanup_pipe_control(struct drm_device *dev) | |||
4737 | dev_priv->seqno_page = NULL; | 4598 | dev_priv->seqno_page = NULL; |
4738 | } | 4599 | } |
4739 | 4600 | ||
4740 | static void | ||
4741 | i915_gem_cleanup_hws(struct drm_device *dev) | ||
4742 | { | ||
4743 | drm_i915_private_t *dev_priv = dev->dev_private; | ||
4744 | struct drm_gem_object *obj; | ||
4745 | struct drm_i915_gem_object *obj_priv; | ||
4746 | |||
4747 | if (dev_priv->hws_obj == NULL) | ||
4748 | return; | ||
4749 | |||
4750 | obj = dev_priv->hws_obj; | ||
4751 | obj_priv = to_intel_bo(obj); | ||
4752 | |||
4753 | kunmap(obj_priv->pages[0]); | ||
4754 | i915_gem_object_unpin(obj); | ||
4755 | drm_gem_object_unreference(obj); | ||
4756 | dev_priv->hws_obj = NULL; | ||
4757 | |||
4758 | memset(&dev_priv->hws_map, 0, sizeof(dev_priv->hws_map)); | ||
4759 | dev_priv->hw_status_page = NULL; | ||
4760 | |||
4761 | if (HAS_PIPE_CONTROL(dev)) | ||
4762 | i915_gem_cleanup_pipe_control(dev); | ||
4763 | |||
4764 | /* Write high address into HWS_PGA when disabling. */ | ||
4765 | I915_WRITE(HWS_PGA, 0x1ffff000); | ||
4766 | } | ||
4767 | |||
4768 | int | 4601 | int |
4769 | i915_gem_init_ringbuffer(struct drm_device *dev) | 4602 | i915_gem_init_ringbuffer(struct drm_device *dev) |
4770 | { | 4603 | { |
4771 | drm_i915_private_t *dev_priv = dev->dev_private; | 4604 | drm_i915_private_t *dev_priv = dev->dev_private; |
4772 | struct drm_gem_object *obj; | ||
4773 | struct drm_i915_gem_object *obj_priv; | ||
4774 | drm_i915_ring_buffer_t *ring = &dev_priv->ring; | ||
4775 | int ret; | 4605 | int ret; |
4776 | u32 head; | ||
4777 | |||
4778 | ret = i915_gem_init_hws(dev); | ||
4779 | if (ret != 0) | ||
4780 | return ret; | ||
4781 | 4606 | ||
4782 | obj = i915_gem_alloc_object(dev, 128 * 1024); | 4607 | dev_priv->render_ring = render_ring; |
4783 | if (obj == NULL) { | ||
4784 | DRM_ERROR("Failed to allocate ringbuffer\n"); | ||
4785 | i915_gem_cleanup_hws(dev); | ||
4786 | return -ENOMEM; | ||
4787 | } | ||
4788 | obj_priv = to_intel_bo(obj); | ||
4789 | 4608 | ||
4790 | ret = i915_gem_object_pin(obj, 4096); | 4609 | if (!I915_NEED_GFX_HWS(dev)) { |
4791 | if (ret != 0) { | 4610 | dev_priv->render_ring.status_page.page_addr |
4792 | drm_gem_object_unreference(obj); | 4611 | = dev_priv->status_page_dmah->vaddr; |
4793 | i915_gem_cleanup_hws(dev); | 4612 | memset(dev_priv->render_ring.status_page.page_addr, |
4794 | return ret; | 4613 | 0, PAGE_SIZE); |
4795 | } | 4614 | } |
4796 | 4615 | ||
4797 | /* Set up the kernel mapping for the ring. */ | 4616 | if (HAS_PIPE_CONTROL(dev)) { |
4798 | ring->Size = obj->size; | 4617 | ret = i915_gem_init_pipe_control(dev); |
4799 | 4618 | if (ret) | |
4800 | ring->map.offset = dev->agp->base + obj_priv->gtt_offset; | 4619 | return ret; |
4801 | ring->map.size = obj->size; | ||
4802 | ring->map.type = 0; | ||
4803 | ring->map.flags = 0; | ||
4804 | ring->map.mtrr = 0; | ||
4805 | |||
4806 | drm_core_ioremap_wc(&ring->map, dev); | ||
4807 | if (ring->map.handle == NULL) { | ||
4808 | DRM_ERROR("Failed to map ringbuffer.\n"); | ||
4809 | memset(&dev_priv->ring, 0, sizeof(dev_priv->ring)); | ||
4810 | i915_gem_object_unpin(obj); | ||
4811 | drm_gem_object_unreference(obj); | ||
4812 | i915_gem_cleanup_hws(dev); | ||
4813 | return -EINVAL; | ||
4814 | } | ||
4815 | ring->ring_obj = obj; | ||
4816 | ring->virtual_start = ring->map.handle; | ||
4817 | |||
4818 | /* Stop the ring if it's running. */ | ||
4819 | I915_WRITE(PRB0_CTL, 0); | ||
4820 | I915_WRITE(PRB0_TAIL, 0); | ||
4821 | I915_WRITE(PRB0_HEAD, 0); | ||
4822 | |||
4823 | /* Initialize the ring. */ | ||
4824 | I915_WRITE(PRB0_START, obj_priv->gtt_offset); | ||
4825 | head = I915_READ(PRB0_HEAD) & HEAD_ADDR; | ||
4826 | |||
4827 | /* G45 ring initialization fails to reset head to zero */ | ||
4828 | if (head != 0) { | ||
4829 | DRM_ERROR("Ring head not reset to zero " | ||
4830 | "ctl %08x head %08x tail %08x start %08x\n", | ||
4831 | I915_READ(PRB0_CTL), | ||
4832 | I915_READ(PRB0_HEAD), | ||
4833 | I915_READ(PRB0_TAIL), | ||
4834 | I915_READ(PRB0_START)); | ||
4835 | I915_WRITE(PRB0_HEAD, 0); | ||
4836 | |||
4837 | DRM_ERROR("Ring head forced to zero " | ||
4838 | "ctl %08x head %08x tail %08x start %08x\n", | ||
4839 | I915_READ(PRB0_CTL), | ||
4840 | I915_READ(PRB0_HEAD), | ||
4841 | I915_READ(PRB0_TAIL), | ||
4842 | I915_READ(PRB0_START)); | ||
4843 | } | ||
4844 | |||
4845 | I915_WRITE(PRB0_CTL, | ||
4846 | ((obj->size - 4096) & RING_NR_PAGES) | | ||
4847 | RING_NO_REPORT | | ||
4848 | RING_VALID); | ||
4849 | |||
4850 | head = I915_READ(PRB0_HEAD) & HEAD_ADDR; | ||
4851 | |||
4852 | /* If the head is still not zero, the ring is dead */ | ||
4853 | if (head != 0) { | ||
4854 | DRM_ERROR("Ring initialization failed " | ||
4855 | "ctl %08x head %08x tail %08x start %08x\n", | ||
4856 | I915_READ(PRB0_CTL), | ||
4857 | I915_READ(PRB0_HEAD), | ||
4858 | I915_READ(PRB0_TAIL), | ||
4859 | I915_READ(PRB0_START)); | ||
4860 | return -EIO; | ||
4861 | } | 4620 | } |
4862 | 4621 | ||
4863 | /* Update our cache of the ring state */ | 4622 | ret = intel_init_ring_buffer(dev, &dev_priv->render_ring); |
4864 | if (!drm_core_check_feature(dev, DRIVER_MODESET)) | 4623 | if (ret) |
4865 | i915_kernel_lost_context(dev); | 4624 | goto cleanup_pipe_control; |
4866 | else { | ||
4867 | ring->head = I915_READ(PRB0_HEAD) & HEAD_ADDR; | ||
4868 | ring->tail = I915_READ(PRB0_TAIL) & TAIL_ADDR; | ||
4869 | ring->space = ring->head - (ring->tail + 8); | ||
4870 | if (ring->space < 0) | ||
4871 | ring->space += ring->Size; | ||
4872 | } | ||
4873 | 4625 | ||
4874 | if (IS_I9XX(dev) && !IS_GEN3(dev)) { | 4626 | if (HAS_BSD(dev)) { |
4875 | I915_WRITE(MI_MODE, | 4627 | dev_priv->bsd_ring = bsd_ring; |
4876 | (VS_TIMER_DISPATCH) << 16 | VS_TIMER_DISPATCH); | 4628 | ret = intel_init_ring_buffer(dev, &dev_priv->bsd_ring); |
4629 | if (ret) | ||
4630 | goto cleanup_render_ring; | ||
4877 | } | 4631 | } |
4878 | 4632 | ||
4879 | return 0; | 4633 | return 0; |
4634 | |||
4635 | cleanup_render_ring: | ||
4636 | intel_cleanup_ring_buffer(dev, &dev_priv->render_ring); | ||
4637 | cleanup_pipe_control: | ||
4638 | if (HAS_PIPE_CONTROL(dev)) | ||
4639 | i915_gem_cleanup_pipe_control(dev); | ||
4640 | return ret; | ||
4880 | } | 4641 | } |
4881 | 4642 | ||
4882 | void | 4643 | void |
@@ -4884,17 +4645,11 @@ i915_gem_cleanup_ringbuffer(struct drm_device *dev) | |||
4884 | { | 4645 | { |
4885 | drm_i915_private_t *dev_priv = dev->dev_private; | 4646 | drm_i915_private_t *dev_priv = dev->dev_private; |
4886 | 4647 | ||
4887 | if (dev_priv->ring.ring_obj == NULL) | 4648 | intel_cleanup_ring_buffer(dev, &dev_priv->render_ring); |
4888 | return; | 4649 | if (HAS_BSD(dev)) |
4889 | 4650 | intel_cleanup_ring_buffer(dev, &dev_priv->bsd_ring); | |
4890 | drm_core_ioremapfree(&dev_priv->ring.map, dev); | 4651 | if (HAS_PIPE_CONTROL(dev)) |
4891 | 4652 | i915_gem_cleanup_pipe_control(dev); | |
4892 | i915_gem_object_unpin(dev_priv->ring.ring_obj); | ||
4893 | drm_gem_object_unreference(dev_priv->ring.ring_obj); | ||
4894 | dev_priv->ring.ring_obj = NULL; | ||
4895 | memset(&dev_priv->ring, 0, sizeof(dev_priv->ring)); | ||
4896 | |||
4897 | i915_gem_cleanup_hws(dev); | ||
4898 | } | 4653 | } |
4899 | 4654 | ||
4900 | int | 4655 | int |
@@ -4922,12 +4677,14 @@ i915_gem_entervt_ioctl(struct drm_device *dev, void *data, | |||
4922 | } | 4677 | } |
4923 | 4678 | ||
4924 | spin_lock(&dev_priv->mm.active_list_lock); | 4679 | spin_lock(&dev_priv->mm.active_list_lock); |
4925 | BUG_ON(!list_empty(&dev_priv->mm.active_list)); | 4680 | BUG_ON(!list_empty(&dev_priv->render_ring.active_list)); |
4681 | BUG_ON(HAS_BSD(dev) && !list_empty(&dev_priv->bsd_ring.active_list)); | ||
4926 | spin_unlock(&dev_priv->mm.active_list_lock); | 4682 | spin_unlock(&dev_priv->mm.active_list_lock); |
4927 | 4683 | ||
4928 | BUG_ON(!list_empty(&dev_priv->mm.flushing_list)); | 4684 | BUG_ON(!list_empty(&dev_priv->mm.flushing_list)); |
4929 | BUG_ON(!list_empty(&dev_priv->mm.inactive_list)); | 4685 | BUG_ON(!list_empty(&dev_priv->mm.inactive_list)); |
4930 | BUG_ON(!list_empty(&dev_priv->mm.request_list)); | 4686 | BUG_ON(!list_empty(&dev_priv->render_ring.request_list)); |
4687 | BUG_ON(HAS_BSD(dev) && !list_empty(&dev_priv->bsd_ring.request_list)); | ||
4931 | mutex_unlock(&dev->struct_mutex); | 4688 | mutex_unlock(&dev->struct_mutex); |
4932 | 4689 | ||
4933 | drm_irq_install(dev); | 4690 | drm_irq_install(dev); |
@@ -4966,18 +4723,20 @@ i915_gem_load(struct drm_device *dev) | |||
4966 | drm_i915_private_t *dev_priv = dev->dev_private; | 4723 | drm_i915_private_t *dev_priv = dev->dev_private; |
4967 | 4724 | ||
4968 | spin_lock_init(&dev_priv->mm.active_list_lock); | 4725 | spin_lock_init(&dev_priv->mm.active_list_lock); |
4969 | INIT_LIST_HEAD(&dev_priv->mm.active_list); | ||
4970 | INIT_LIST_HEAD(&dev_priv->mm.flushing_list); | 4726 | INIT_LIST_HEAD(&dev_priv->mm.flushing_list); |
4971 | INIT_LIST_HEAD(&dev_priv->mm.gpu_write_list); | 4727 | INIT_LIST_HEAD(&dev_priv->mm.gpu_write_list); |
4972 | INIT_LIST_HEAD(&dev_priv->mm.inactive_list); | 4728 | INIT_LIST_HEAD(&dev_priv->mm.inactive_list); |
4973 | INIT_LIST_HEAD(&dev_priv->mm.request_list); | ||
4974 | INIT_LIST_HEAD(&dev_priv->mm.fence_list); | 4729 | INIT_LIST_HEAD(&dev_priv->mm.fence_list); |
4730 | INIT_LIST_HEAD(&dev_priv->render_ring.active_list); | ||
4731 | INIT_LIST_HEAD(&dev_priv->render_ring.request_list); | ||
4732 | if (HAS_BSD(dev)) { | ||
4733 | INIT_LIST_HEAD(&dev_priv->bsd_ring.active_list); | ||
4734 | INIT_LIST_HEAD(&dev_priv->bsd_ring.request_list); | ||
4735 | } | ||
4975 | for (i = 0; i < 16; i++) | 4736 | for (i = 0; i < 16; i++) |
4976 | INIT_LIST_HEAD(&dev_priv->fence_regs[i].lru_list); | 4737 | INIT_LIST_HEAD(&dev_priv->fence_regs[i].lru_list); |
4977 | INIT_DELAYED_WORK(&dev_priv->mm.retire_work, | 4738 | INIT_DELAYED_WORK(&dev_priv->mm.retire_work, |
4978 | i915_gem_retire_work_handler); | 4739 | i915_gem_retire_work_handler); |
4979 | dev_priv->mm.next_gem_seqno = 1; | ||
4980 | |||
4981 | spin_lock(&shrink_list_lock); | 4740 | spin_lock(&shrink_list_lock); |
4982 | list_add(&dev_priv->mm.shrink_list, &shrink_list); | 4741 | list_add(&dev_priv->mm.shrink_list, &shrink_list); |
4983 | spin_unlock(&shrink_list_lock); | 4742 | spin_unlock(&shrink_list_lock); |
@@ -5209,7 +4968,9 @@ i915_gpu_is_active(struct drm_device *dev) | |||
5209 | 4968 | ||
5210 | spin_lock(&dev_priv->mm.active_list_lock); | 4969 | spin_lock(&dev_priv->mm.active_list_lock); |
5211 | lists_empty = list_empty(&dev_priv->mm.flushing_list) && | 4970 | lists_empty = list_empty(&dev_priv->mm.flushing_list) && |
5212 | list_empty(&dev_priv->mm.active_list); | 4971 | list_empty(&dev_priv->render_ring.active_list); |
4972 | if (HAS_BSD(dev)) | ||
4973 | lists_empty &= list_empty(&dev_priv->bsd_ring.active_list); | ||
5213 | spin_unlock(&dev_priv->mm.active_list_lock); | 4974 | spin_unlock(&dev_priv->mm.active_list_lock); |
5214 | 4975 | ||
5215 | return !lists_empty; | 4976 | return !lists_empty; |
@@ -5254,8 +5015,10 @@ rescan: | |||
5254 | continue; | 5015 | continue; |
5255 | 5016 | ||
5256 | spin_unlock(&shrink_list_lock); | 5017 | spin_unlock(&shrink_list_lock); |
5018 | i915_gem_retire_requests(dev, &dev_priv->render_ring); | ||
5257 | 5019 | ||
5258 | i915_gem_retire_requests(dev); | 5020 | if (HAS_BSD(dev)) |
5021 | i915_gem_retire_requests(dev, &dev_priv->bsd_ring); | ||
5259 | 5022 | ||
5260 | list_for_each_entry_safe(obj_priv, next_obj, | 5023 | list_for_each_entry_safe(obj_priv, next_obj, |
5261 | &dev_priv->mm.inactive_list, | 5024 | &dev_priv->mm.inactive_list, |
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 8c3f0802686..2479be001e4 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c | |||
@@ -53,7 +53,7 @@ | |||
53 | I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT) | 53 | I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT) |
54 | 54 | ||
55 | /** Interrupts that we mask and unmask at runtime. */ | 55 | /** Interrupts that we mask and unmask at runtime. */ |
56 | #define I915_INTERRUPT_ENABLE_VAR (I915_USER_INTERRUPT) | 56 | #define I915_INTERRUPT_ENABLE_VAR (I915_USER_INTERRUPT | I915_BSD_USER_INTERRUPT) |
57 | 57 | ||
58 | #define I915_PIPE_VBLANK_STATUS (PIPE_START_VBLANK_INTERRUPT_STATUS |\ | 58 | #define I915_PIPE_VBLANK_STATUS (PIPE_START_VBLANK_INTERRUPT_STATUS |\ |
59 | PIPE_VBLANK_INTERRUPT_STATUS) | 59 | PIPE_VBLANK_INTERRUPT_STATUS) |
@@ -74,7 +74,7 @@ ironlake_enable_graphics_irq(drm_i915_private_t *dev_priv, u32 mask) | |||
74 | } | 74 | } |
75 | } | 75 | } |
76 | 76 | ||
77 | static inline void | 77 | void |
78 | ironlake_disable_graphics_irq(drm_i915_private_t *dev_priv, u32 mask) | 78 | ironlake_disable_graphics_irq(drm_i915_private_t *dev_priv, u32 mask) |
79 | { | 79 | { |
80 | if ((dev_priv->gt_irq_mask_reg & mask) != mask) { | 80 | if ((dev_priv->gt_irq_mask_reg & mask) != mask) { |
@@ -115,7 +115,7 @@ i915_enable_irq(drm_i915_private_t *dev_priv, u32 mask) | |||
115 | } | 115 | } |
116 | } | 116 | } |
117 | 117 | ||
118 | static inline void | 118 | void |
119 | i915_disable_irq(drm_i915_private_t *dev_priv, u32 mask) | 119 | i915_disable_irq(drm_i915_private_t *dev_priv, u32 mask) |
120 | { | 120 | { |
121 | if ((dev_priv->irq_mask_reg & mask) != mask) { | 121 | if ((dev_priv->irq_mask_reg & mask) != mask) { |
@@ -278,10 +278,9 @@ static void i915_handle_rps_change(struct drm_device *dev) | |||
278 | { | 278 | { |
279 | drm_i915_private_t *dev_priv = dev->dev_private; | 279 | drm_i915_private_t *dev_priv = dev->dev_private; |
280 | u32 busy_up, busy_down, max_avg, min_avg; | 280 | u32 busy_up, busy_down, max_avg, min_avg; |
281 | u16 rgvswctl; | ||
282 | u8 new_delay = dev_priv->cur_delay; | 281 | u8 new_delay = dev_priv->cur_delay; |
283 | 282 | ||
284 | I915_WRITE(MEMINTRSTS, I915_READ(MEMINTRSTS) & ~MEMINT_EVAL_CHG); | 283 | I915_WRITE16(MEMINTRSTS, MEMINT_EVAL_CHG); |
285 | busy_up = I915_READ(RCPREVBSYTUPAVG); | 284 | busy_up = I915_READ(RCPREVBSYTUPAVG); |
286 | busy_down = I915_READ(RCPREVBSYTDNAVG); | 285 | busy_down = I915_READ(RCPREVBSYTDNAVG); |
287 | max_avg = I915_READ(RCBMAXAVG); | 286 | max_avg = I915_READ(RCBMAXAVG); |
@@ -300,27 +299,8 @@ static void i915_handle_rps_change(struct drm_device *dev) | |||
300 | new_delay = dev_priv->min_delay; | 299 | new_delay = dev_priv->min_delay; |
301 | } | 300 | } |
302 | 301 | ||
303 | DRM_DEBUG("rps change requested: %d -> %d\n", | 302 | if (ironlake_set_drps(dev, new_delay)) |
304 | dev_priv->cur_delay, new_delay); | 303 | dev_priv->cur_delay = new_delay; |
305 | |||
306 | rgvswctl = I915_READ(MEMSWCTL); | ||
307 | if (rgvswctl & MEMCTL_CMD_STS) { | ||
308 | DRM_ERROR("gpu busy, RCS change rejected\n"); | ||
309 | return; /* still busy with another command */ | ||
310 | } | ||
311 | |||
312 | /* Program the new state */ | ||
313 | rgvswctl = (MEMCTL_CMD_CHFREQ << MEMCTL_CMD_SHIFT) | | ||
314 | (new_delay << MEMCTL_FREQ_SHIFT) | MEMCTL_SFCAVM; | ||
315 | I915_WRITE(MEMSWCTL, rgvswctl); | ||
316 | POSTING_READ(MEMSWCTL); | ||
317 | |||
318 | rgvswctl |= MEMCTL_CMD_STS; | ||
319 | I915_WRITE(MEMSWCTL, rgvswctl); | ||
320 | |||
321 | dev_priv->cur_delay = new_delay; | ||
322 | |||
323 | DRM_DEBUG("rps changed\n"); | ||
324 | 304 | ||
325 | return; | 305 | return; |
326 | } | 306 | } |
@@ -331,6 +311,7 @@ irqreturn_t ironlake_irq_handler(struct drm_device *dev) | |||
331 | int ret = IRQ_NONE; | 311 | int ret = IRQ_NONE; |
332 | u32 de_iir, gt_iir, de_ier, pch_iir; | 312 | u32 de_iir, gt_iir, de_ier, pch_iir; |
333 | struct drm_i915_master_private *master_priv; | 313 | struct drm_i915_master_private *master_priv; |
314 | struct intel_ring_buffer *render_ring = &dev_priv->render_ring; | ||
334 | 315 | ||
335 | /* disable master interrupt before clearing iir */ | 316 | /* disable master interrupt before clearing iir */ |
336 | de_ier = I915_READ(DEIER); | 317 | de_ier = I915_READ(DEIER); |
@@ -354,13 +335,16 @@ irqreturn_t ironlake_irq_handler(struct drm_device *dev) | |||
354 | } | 335 | } |
355 | 336 | ||
356 | if (gt_iir & GT_PIPE_NOTIFY) { | 337 | if (gt_iir & GT_PIPE_NOTIFY) { |
357 | u32 seqno = i915_get_gem_seqno(dev); | 338 | u32 seqno = render_ring->get_gem_seqno(dev, render_ring); |
358 | dev_priv->mm.irq_gem_seqno = seqno; | 339 | render_ring->irq_gem_seqno = seqno; |
359 | trace_i915_gem_request_complete(dev, seqno); | 340 | trace_i915_gem_request_complete(dev, seqno); |
360 | DRM_WAKEUP(&dev_priv->irq_queue); | 341 | DRM_WAKEUP(&dev_priv->render_ring.irq_queue); |
361 | dev_priv->hangcheck_count = 0; | 342 | dev_priv->hangcheck_count = 0; |
362 | mod_timer(&dev_priv->hangcheck_timer, jiffies + DRM_I915_HANGCHECK_PERIOD); | 343 | mod_timer(&dev_priv->hangcheck_timer, jiffies + DRM_I915_HANGCHECK_PERIOD); |
363 | } | 344 | } |
345 | if (gt_iir & GT_BSD_USER_INTERRUPT) | ||
346 | DRM_WAKEUP(&dev_priv->bsd_ring.irq_queue); | ||
347 | |||
364 | 348 | ||
365 | if (de_iir & DE_GSE) | 349 | if (de_iir & DE_GSE) |
366 | ironlake_opregion_gse_intr(dev); | 350 | ironlake_opregion_gse_intr(dev); |
@@ -388,7 +372,7 @@ irqreturn_t ironlake_irq_handler(struct drm_device *dev) | |||
388 | } | 372 | } |
389 | 373 | ||
390 | if (de_iir & DE_PCU_EVENT) { | 374 | if (de_iir & DE_PCU_EVENT) { |
391 | I915_WRITE(MEMINTRSTS, I915_READ(MEMINTRSTS)); | 375 | I915_WRITE16(MEMINTRSTS, I915_READ(MEMINTRSTS)); |
392 | i915_handle_rps_change(dev); | 376 | i915_handle_rps_change(dev); |
393 | } | 377 | } |
394 | 378 | ||
@@ -536,17 +520,18 @@ i915_ringbuffer_last_batch(struct drm_device *dev) | |||
536 | */ | 520 | */ |
537 | bbaddr = 0; | 521 | bbaddr = 0; |
538 | head = I915_READ(PRB0_HEAD) & HEAD_ADDR; | 522 | head = I915_READ(PRB0_HEAD) & HEAD_ADDR; |
539 | ring = (u32 *)(dev_priv->ring.virtual_start + head); | 523 | ring = (u32 *)(dev_priv->render_ring.virtual_start + head); |
540 | 524 | ||
541 | while (--ring >= (u32 *)dev_priv->ring.virtual_start) { | 525 | while (--ring >= (u32 *)dev_priv->render_ring.virtual_start) { |
542 | bbaddr = i915_get_bbaddr(dev, ring); | 526 | bbaddr = i915_get_bbaddr(dev, ring); |
543 | if (bbaddr) | 527 | if (bbaddr) |
544 | break; | 528 | break; |
545 | } | 529 | } |
546 | 530 | ||
547 | if (bbaddr == 0) { | 531 | if (bbaddr == 0) { |
548 | ring = (u32 *)(dev_priv->ring.virtual_start + dev_priv->ring.Size); | 532 | ring = (u32 *)(dev_priv->render_ring.virtual_start |
549 | while (--ring >= (u32 *)dev_priv->ring.virtual_start) { | 533 | + dev_priv->render_ring.size); |
534 | while (--ring >= (u32 *)dev_priv->render_ring.virtual_start) { | ||
550 | bbaddr = i915_get_bbaddr(dev, ring); | 535 | bbaddr = i915_get_bbaddr(dev, ring); |
551 | if (bbaddr) | 536 | if (bbaddr) |
552 | break; | 537 | break; |
@@ -587,7 +572,7 @@ static void i915_capture_error_state(struct drm_device *dev) | |||
587 | return; | 572 | return; |
588 | } | 573 | } |
589 | 574 | ||
590 | error->seqno = i915_get_gem_seqno(dev); | 575 | error->seqno = i915_get_gem_seqno(dev, &dev_priv->render_ring); |
591 | error->eir = I915_READ(EIR); | 576 | error->eir = I915_READ(EIR); |
592 | error->pgtbl_er = I915_READ(PGTBL_ER); | 577 | error->pgtbl_er = I915_READ(PGTBL_ER); |
593 | error->pipeastat = I915_READ(PIPEASTAT); | 578 | error->pipeastat = I915_READ(PIPEASTAT); |
@@ -615,7 +600,9 @@ static void i915_capture_error_state(struct drm_device *dev) | |||
615 | batchbuffer[0] = NULL; | 600 | batchbuffer[0] = NULL; |
616 | batchbuffer[1] = NULL; | 601 | batchbuffer[1] = NULL; |
617 | count = 0; | 602 | count = 0; |
618 | list_for_each_entry(obj_priv, &dev_priv->mm.active_list, list) { | 603 | list_for_each_entry(obj_priv, |
604 | &dev_priv->render_ring.active_list, list) { | ||
605 | |||
619 | struct drm_gem_object *obj = &obj_priv->base; | 606 | struct drm_gem_object *obj = &obj_priv->base; |
620 | 607 | ||
621 | if (batchbuffer[0] == NULL && | 608 | if (batchbuffer[0] == NULL && |
@@ -639,7 +626,8 @@ static void i915_capture_error_state(struct drm_device *dev) | |||
639 | error->batchbuffer[1] = i915_error_object_create(dev, batchbuffer[1]); | 626 | error->batchbuffer[1] = i915_error_object_create(dev, batchbuffer[1]); |
640 | 627 | ||
641 | /* Record the ringbuffer */ | 628 | /* Record the ringbuffer */ |
642 | error->ringbuffer = i915_error_object_create(dev, dev_priv->ring.ring_obj); | 629 | error->ringbuffer = i915_error_object_create(dev, |
630 | dev_priv->render_ring.gem_object); | ||
643 | 631 | ||
644 | /* Record buffers on the active list. */ | 632 | /* Record buffers on the active list. */ |
645 | error->active_bo = NULL; | 633 | error->active_bo = NULL; |
@@ -651,7 +639,8 @@ static void i915_capture_error_state(struct drm_device *dev) | |||
651 | 639 | ||
652 | if (error->active_bo) { | 640 | if (error->active_bo) { |
653 | int i = 0; | 641 | int i = 0; |
654 | list_for_each_entry(obj_priv, &dev_priv->mm.active_list, list) { | 642 | list_for_each_entry(obj_priv, |
643 | &dev_priv->render_ring.active_list, list) { | ||
655 | struct drm_gem_object *obj = &obj_priv->base; | 644 | struct drm_gem_object *obj = &obj_priv->base; |
656 | 645 | ||
657 | error->active_bo[i].size = obj->size; | 646 | error->active_bo[i].size = obj->size; |
@@ -703,24 +692,13 @@ void i915_destroy_error_state(struct drm_device *dev) | |||
703 | i915_error_state_free(dev, error); | 692 | i915_error_state_free(dev, error); |
704 | } | 693 | } |
705 | 694 | ||
706 | /** | 695 | static void i915_report_and_clear_eir(struct drm_device *dev) |
707 | * i915_handle_error - handle an error interrupt | ||
708 | * @dev: drm device | ||
709 | * | ||
710 | * Do some basic checking of regsiter state at error interrupt time and | ||
711 | * dump it to the syslog. Also call i915_capture_error_state() to make | ||
712 | * sure we get a record and make it available in debugfs. Fire a uevent | ||
713 | * so userspace knows something bad happened (should trigger collection | ||
714 | * of a ring dump etc.). | ||
715 | */ | ||
716 | static void i915_handle_error(struct drm_device *dev, bool wedged) | ||
717 | { | 696 | { |
718 | struct drm_i915_private *dev_priv = dev->dev_private; | 697 | struct drm_i915_private *dev_priv = dev->dev_private; |
719 | u32 eir = I915_READ(EIR); | 698 | u32 eir = I915_READ(EIR); |
720 | u32 pipea_stats = I915_READ(PIPEASTAT); | ||
721 | u32 pipeb_stats = I915_READ(PIPEBSTAT); | ||
722 | 699 | ||
723 | i915_capture_error_state(dev); | 700 | if (!eir) |
701 | return; | ||
724 | 702 | ||
725 | printk(KERN_ERR "render error detected, EIR: 0x%08x\n", | 703 | printk(KERN_ERR "render error detected, EIR: 0x%08x\n", |
726 | eir); | 704 | eir); |
@@ -766,6 +744,9 @@ static void i915_handle_error(struct drm_device *dev, bool wedged) | |||
766 | } | 744 | } |
767 | 745 | ||
768 | if (eir & I915_ERROR_MEMORY_REFRESH) { | 746 | if (eir & I915_ERROR_MEMORY_REFRESH) { |
747 | u32 pipea_stats = I915_READ(PIPEASTAT); | ||
748 | u32 pipeb_stats = I915_READ(PIPEBSTAT); | ||
749 | |||
769 | printk(KERN_ERR "memory refresh error\n"); | 750 | printk(KERN_ERR "memory refresh error\n"); |
770 | printk(KERN_ERR "PIPEASTAT: 0x%08x\n", | 751 | printk(KERN_ERR "PIPEASTAT: 0x%08x\n", |
771 | pipea_stats); | 752 | pipea_stats); |
@@ -822,6 +803,24 @@ static void i915_handle_error(struct drm_device *dev, bool wedged) | |||
822 | I915_WRITE(EMR, I915_READ(EMR) | eir); | 803 | I915_WRITE(EMR, I915_READ(EMR) | eir); |
823 | I915_WRITE(IIR, I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT); | 804 | I915_WRITE(IIR, I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT); |
824 | } | 805 | } |
806 | } | ||
807 | |||
808 | /** | ||
809 | * i915_handle_error - handle an error interrupt | ||
810 | * @dev: drm device | ||
811 | * | ||
812 | * Do some basic checking of regsiter state at error interrupt time and | ||
813 | * dump it to the syslog. Also call i915_capture_error_state() to make | ||
814 | * sure we get a record and make it available in debugfs. Fire a uevent | ||
815 | * so userspace knows something bad happened (should trigger collection | ||
816 | * of a ring dump etc.). | ||
817 | */ | ||
818 | static void i915_handle_error(struct drm_device *dev, bool wedged) | ||
819 | { | ||
820 | struct drm_i915_private *dev_priv = dev->dev_private; | ||
821 | |||
822 | i915_capture_error_state(dev); | ||
823 | i915_report_and_clear_eir(dev); | ||
825 | 824 | ||
826 | if (wedged) { | 825 | if (wedged) { |
827 | atomic_set(&dev_priv->mm.wedged, 1); | 826 | atomic_set(&dev_priv->mm.wedged, 1); |
@@ -829,7 +828,7 @@ static void i915_handle_error(struct drm_device *dev, bool wedged) | |||
829 | /* | 828 | /* |
830 | * Wakeup waiting processes so they don't hang | 829 | * Wakeup waiting processes so they don't hang |
831 | */ | 830 | */ |
832 | DRM_WAKEUP(&dev_priv->irq_queue); | 831 | DRM_WAKEUP(&dev_priv->render_ring.irq_queue); |
833 | } | 832 | } |
834 | 833 | ||
835 | queue_work(dev_priv->wq, &dev_priv->error_work); | 834 | queue_work(dev_priv->wq, &dev_priv->error_work); |
@@ -848,6 +847,7 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS) | |||
848 | unsigned long irqflags; | 847 | unsigned long irqflags; |
849 | int irq_received; | 848 | int irq_received; |
850 | int ret = IRQ_NONE; | 849 | int ret = IRQ_NONE; |
850 | struct intel_ring_buffer *render_ring = &dev_priv->render_ring; | ||
851 | 851 | ||
852 | atomic_inc(&dev_priv->irq_received); | 852 | atomic_inc(&dev_priv->irq_received); |
853 | 853 | ||
@@ -928,14 +928,18 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS) | |||
928 | } | 928 | } |
929 | 929 | ||
930 | if (iir & I915_USER_INTERRUPT) { | 930 | if (iir & I915_USER_INTERRUPT) { |
931 | u32 seqno = i915_get_gem_seqno(dev); | 931 | u32 seqno = |
932 | dev_priv->mm.irq_gem_seqno = seqno; | 932 | render_ring->get_gem_seqno(dev, render_ring); |
933 | render_ring->irq_gem_seqno = seqno; | ||
933 | trace_i915_gem_request_complete(dev, seqno); | 934 | trace_i915_gem_request_complete(dev, seqno); |
934 | DRM_WAKEUP(&dev_priv->irq_queue); | 935 | DRM_WAKEUP(&dev_priv->render_ring.irq_queue); |
935 | dev_priv->hangcheck_count = 0; | 936 | dev_priv->hangcheck_count = 0; |
936 | mod_timer(&dev_priv->hangcheck_timer, jiffies + DRM_I915_HANGCHECK_PERIOD); | 937 | mod_timer(&dev_priv->hangcheck_timer, jiffies + DRM_I915_HANGCHECK_PERIOD); |
937 | } | 938 | } |
938 | 939 | ||
940 | if (HAS_BSD(dev) && (iir & I915_BSD_USER_INTERRUPT)) | ||
941 | DRM_WAKEUP(&dev_priv->bsd_ring.irq_queue); | ||
942 | |||
939 | if (iir & I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT) | 943 | if (iir & I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT) |
940 | intel_prepare_page_flip(dev, 0); | 944 | intel_prepare_page_flip(dev, 0); |
941 | 945 | ||
@@ -984,7 +988,6 @@ static int i915_emit_irq(struct drm_device * dev) | |||
984 | { | 988 | { |
985 | drm_i915_private_t *dev_priv = dev->dev_private; | 989 | drm_i915_private_t *dev_priv = dev->dev_private; |
986 | struct drm_i915_master_private *master_priv = dev->primary->master->driver_priv; | 990 | struct drm_i915_master_private *master_priv = dev->primary->master->driver_priv; |
987 | RING_LOCALS; | ||
988 | 991 | ||
989 | i915_kernel_lost_context(dev); | 992 | i915_kernel_lost_context(dev); |
990 | 993 | ||
@@ -1006,43 +1009,13 @@ static int i915_emit_irq(struct drm_device * dev) | |||
1006 | return dev_priv->counter; | 1009 | return dev_priv->counter; |
1007 | } | 1010 | } |
1008 | 1011 | ||
1009 | void i915_user_irq_get(struct drm_device *dev) | ||
1010 | { | ||
1011 | drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; | ||
1012 | unsigned long irqflags; | ||
1013 | |||
1014 | spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags); | ||
1015 | if (dev->irq_enabled && (++dev_priv->user_irq_refcount == 1)) { | ||
1016 | if (HAS_PCH_SPLIT(dev)) | ||
1017 | ironlake_enable_graphics_irq(dev_priv, GT_PIPE_NOTIFY); | ||
1018 | else | ||
1019 | i915_enable_irq(dev_priv, I915_USER_INTERRUPT); | ||
1020 | } | ||
1021 | spin_unlock_irqrestore(&dev_priv->user_irq_lock, irqflags); | ||
1022 | } | ||
1023 | |||
1024 | void i915_user_irq_put(struct drm_device *dev) | ||
1025 | { | ||
1026 | drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; | ||
1027 | unsigned long irqflags; | ||
1028 | |||
1029 | spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags); | ||
1030 | BUG_ON(dev->irq_enabled && dev_priv->user_irq_refcount <= 0); | ||
1031 | if (dev->irq_enabled && (--dev_priv->user_irq_refcount == 0)) { | ||
1032 | if (HAS_PCH_SPLIT(dev)) | ||
1033 | ironlake_disable_graphics_irq(dev_priv, GT_PIPE_NOTIFY); | ||
1034 | else | ||
1035 | i915_disable_irq(dev_priv, I915_USER_INTERRUPT); | ||
1036 | } | ||
1037 | spin_unlock_irqrestore(&dev_priv->user_irq_lock, irqflags); | ||
1038 | } | ||
1039 | |||
1040 | void i915_trace_irq_get(struct drm_device *dev, u32 seqno) | 1012 | void i915_trace_irq_get(struct drm_device *dev, u32 seqno) |
1041 | { | 1013 | { |
1042 | drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; | 1014 | drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; |
1015 | struct intel_ring_buffer *render_ring = &dev_priv->render_ring; | ||
1043 | 1016 | ||
1044 | if (dev_priv->trace_irq_seqno == 0) | 1017 | if (dev_priv->trace_irq_seqno == 0) |
1045 | i915_user_irq_get(dev); | 1018 | render_ring->user_irq_get(dev, render_ring); |
1046 | 1019 | ||
1047 | dev_priv->trace_irq_seqno = seqno; | 1020 | dev_priv->trace_irq_seqno = seqno; |
1048 | } | 1021 | } |
@@ -1052,6 +1025,7 @@ static int i915_wait_irq(struct drm_device * dev, int irq_nr) | |||
1052 | drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; | 1025 | drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; |
1053 | struct drm_i915_master_private *master_priv = dev->primary->master->driver_priv; | 1026 | struct drm_i915_master_private *master_priv = dev->primary->master->driver_priv; |
1054 | int ret = 0; | 1027 | int ret = 0; |
1028 | struct intel_ring_buffer *render_ring = &dev_priv->render_ring; | ||
1055 | 1029 | ||
1056 | DRM_DEBUG_DRIVER("irq_nr=%d breadcrumb=%d\n", irq_nr, | 1030 | DRM_DEBUG_DRIVER("irq_nr=%d breadcrumb=%d\n", irq_nr, |
1057 | READ_BREADCRUMB(dev_priv)); | 1031 | READ_BREADCRUMB(dev_priv)); |
@@ -1065,10 +1039,10 @@ static int i915_wait_irq(struct drm_device * dev, int irq_nr) | |||
1065 | if (master_priv->sarea_priv) | 1039 | if (master_priv->sarea_priv) |
1066 | master_priv->sarea_priv->perf_boxes |= I915_BOX_WAIT; | 1040 | master_priv->sarea_priv->perf_boxes |= I915_BOX_WAIT; |
1067 | 1041 | ||
1068 | i915_user_irq_get(dev); | 1042 | render_ring->user_irq_get(dev, render_ring); |
1069 | DRM_WAIT_ON(ret, dev_priv->irq_queue, 3 * DRM_HZ, | 1043 | DRM_WAIT_ON(ret, dev_priv->render_ring.irq_queue, 3 * DRM_HZ, |
1070 | READ_BREADCRUMB(dev_priv) >= irq_nr); | 1044 | READ_BREADCRUMB(dev_priv) >= irq_nr); |
1071 | i915_user_irq_put(dev); | 1045 | render_ring->user_irq_put(dev, render_ring); |
1072 | 1046 | ||
1073 | if (ret == -EBUSY) { | 1047 | if (ret == -EBUSY) { |
1074 | DRM_ERROR("EBUSY -- rec: %d emitted: %d\n", | 1048 | DRM_ERROR("EBUSY -- rec: %d emitted: %d\n", |
@@ -1087,7 +1061,7 @@ int i915_irq_emit(struct drm_device *dev, void *data, | |||
1087 | drm_i915_irq_emit_t *emit = data; | 1061 | drm_i915_irq_emit_t *emit = data; |
1088 | int result; | 1062 | int result; |
1089 | 1063 | ||
1090 | if (!dev_priv || !dev_priv->ring.virtual_start) { | 1064 | if (!dev_priv || !dev_priv->render_ring.virtual_start) { |
1091 | DRM_ERROR("called with no initialization\n"); | 1065 | DRM_ERROR("called with no initialization\n"); |
1092 | return -EINVAL; | 1066 | return -EINVAL; |
1093 | } | 1067 | } |
@@ -1233,9 +1207,12 @@ int i915_vblank_swap(struct drm_device *dev, void *data, | |||
1233 | return -EINVAL; | 1207 | return -EINVAL; |
1234 | } | 1208 | } |
1235 | 1209 | ||
1236 | struct drm_i915_gem_request *i915_get_tail_request(struct drm_device *dev) { | 1210 | struct drm_i915_gem_request * |
1211 | i915_get_tail_request(struct drm_device *dev) | ||
1212 | { | ||
1237 | drm_i915_private_t *dev_priv = dev->dev_private; | 1213 | drm_i915_private_t *dev_priv = dev->dev_private; |
1238 | return list_entry(dev_priv->mm.request_list.prev, struct drm_i915_gem_request, list); | 1214 | return list_entry(dev_priv->render_ring.request_list.prev, |
1215 | struct drm_i915_gem_request, list); | ||
1239 | } | 1216 | } |
1240 | 1217 | ||
1241 | /** | 1218 | /** |
@@ -1260,8 +1237,10 @@ void i915_hangcheck_elapsed(unsigned long data) | |||
1260 | acthd = I915_READ(ACTHD_I965); | 1237 | acthd = I915_READ(ACTHD_I965); |
1261 | 1238 | ||
1262 | /* If all work is done then ACTHD clearly hasn't advanced. */ | 1239 | /* If all work is done then ACTHD clearly hasn't advanced. */ |
1263 | if (list_empty(&dev_priv->mm.request_list) || | 1240 | if (list_empty(&dev_priv->render_ring.request_list) || |
1264 | i915_seqno_passed(i915_get_gem_seqno(dev), i915_get_tail_request(dev)->seqno)) { | 1241 | i915_seqno_passed(i915_get_gem_seqno(dev, |
1242 | &dev_priv->render_ring), | ||
1243 | i915_get_tail_request(dev)->seqno)) { | ||
1265 | dev_priv->hangcheck_count = 0; | 1244 | dev_priv->hangcheck_count = 0; |
1266 | return; | 1245 | return; |
1267 | } | 1246 | } |
@@ -1314,7 +1293,7 @@ static int ironlake_irq_postinstall(struct drm_device *dev) | |||
1314 | /* enable kind of interrupts always enabled */ | 1293 | /* enable kind of interrupts always enabled */ |
1315 | u32 display_mask = DE_MASTER_IRQ_CONTROL | DE_GSE | DE_PCH_EVENT | | 1294 | u32 display_mask = DE_MASTER_IRQ_CONTROL | DE_GSE | DE_PCH_EVENT | |
1316 | DE_PLANEA_FLIP_DONE | DE_PLANEB_FLIP_DONE; | 1295 | DE_PLANEA_FLIP_DONE | DE_PLANEB_FLIP_DONE; |
1317 | u32 render_mask = GT_PIPE_NOTIFY; | 1296 | u32 render_mask = GT_PIPE_NOTIFY | GT_BSD_USER_INTERRUPT; |
1318 | u32 hotplug_mask = SDE_CRT_HOTPLUG | SDE_PORTB_HOTPLUG | | 1297 | u32 hotplug_mask = SDE_CRT_HOTPLUG | SDE_PORTB_HOTPLUG | |
1319 | SDE_PORTC_HOTPLUG | SDE_PORTD_HOTPLUG; | 1298 | SDE_PORTC_HOTPLUG | SDE_PORTD_HOTPLUG; |
1320 | 1299 | ||
@@ -1328,7 +1307,7 @@ static int ironlake_irq_postinstall(struct drm_device *dev) | |||
1328 | (void) I915_READ(DEIER); | 1307 | (void) I915_READ(DEIER); |
1329 | 1308 | ||
1330 | /* user interrupt should be enabled, but masked initial */ | 1309 | /* user interrupt should be enabled, but masked initial */ |
1331 | dev_priv->gt_irq_mask_reg = 0xffffffff; | 1310 | dev_priv->gt_irq_mask_reg = ~render_mask; |
1332 | dev_priv->gt_irq_enable_reg = render_mask; | 1311 | dev_priv->gt_irq_enable_reg = render_mask; |
1333 | 1312 | ||
1334 | I915_WRITE(GTIIR, I915_READ(GTIIR)); | 1313 | I915_WRITE(GTIIR, I915_READ(GTIIR)); |
@@ -1391,7 +1370,10 @@ int i915_driver_irq_postinstall(struct drm_device *dev) | |||
1391 | u32 enable_mask = I915_INTERRUPT_ENABLE_FIX | I915_INTERRUPT_ENABLE_VAR; | 1370 | u32 enable_mask = I915_INTERRUPT_ENABLE_FIX | I915_INTERRUPT_ENABLE_VAR; |
1392 | u32 error_mask; | 1371 | u32 error_mask; |
1393 | 1372 | ||
1394 | DRM_INIT_WAITQUEUE(&dev_priv->irq_queue); | 1373 | DRM_INIT_WAITQUEUE(&dev_priv->render_ring.irq_queue); |
1374 | |||
1375 | if (HAS_BSD(dev)) | ||
1376 | DRM_INIT_WAITQUEUE(&dev_priv->bsd_ring.irq_queue); | ||
1395 | 1377 | ||
1396 | dev_priv->vblank_pipe = DRM_I915_VBLANK_PIPE_A | DRM_I915_VBLANK_PIPE_B; | 1378 | dev_priv->vblank_pipe = DRM_I915_VBLANK_PIPE_A | DRM_I915_VBLANK_PIPE_B; |
1397 | 1379 | ||
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index f3e39cc46f0..64b0a3afd92 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h | |||
@@ -334,6 +334,7 @@ | |||
334 | #define I915_DEBUG_INTERRUPT (1<<2) | 334 | #define I915_DEBUG_INTERRUPT (1<<2) |
335 | #define I915_USER_INTERRUPT (1<<1) | 335 | #define I915_USER_INTERRUPT (1<<1) |
336 | #define I915_ASLE_INTERRUPT (1<<0) | 336 | #define I915_ASLE_INTERRUPT (1<<0) |
337 | #define I915_BSD_USER_INTERRUPT (1<<25) | ||
337 | #define EIR 0x020b0 | 338 | #define EIR 0x020b0 |
338 | #define EMR 0x020b4 | 339 | #define EMR 0x020b4 |
339 | #define ESR 0x020b8 | 340 | #define ESR 0x020b8 |
@@ -368,6 +369,36 @@ | |||
368 | #define BB_ADDR 0x02140 /* 8 bytes */ | 369 | #define BB_ADDR 0x02140 /* 8 bytes */ |
369 | #define GFX_FLSH_CNTL 0x02170 /* 915+ only */ | 370 | #define GFX_FLSH_CNTL 0x02170 /* 915+ only */ |
370 | 371 | ||
372 | /* GEN6 interrupt control */ | ||
373 | #define GEN6_RENDER_HWSTAM 0x2098 | ||
374 | #define GEN6_RENDER_IMR 0x20a8 | ||
375 | #define GEN6_RENDER_CONTEXT_SWITCH_INTERRUPT (1 << 8) | ||
376 | #define GEN6_RENDER_PPGTT_PAGE_FAULT (1 << 7) | ||
377 | #define GEN6_RENDER TIMEOUT_COUNTER_EXPIRED (1 << 6) | ||
378 | #define GEN6_RENDER_L3_PARITY_ERROR (1 << 5) | ||
379 | #define GEN6_RENDER_PIPE_CONTROL_NOTIFY_INTERRUPT (1 << 4) | ||
380 | #define GEN6_RENDER_COMMAND_PARSER_MASTER_ERROR (1 << 3) | ||
381 | #define GEN6_RENDER_SYNC_STATUS (1 << 2) | ||
382 | #define GEN6_RENDER_DEBUG_INTERRUPT (1 << 1) | ||
383 | #define GEN6_RENDER_USER_INTERRUPT (1 << 0) | ||
384 | |||
385 | #define GEN6_BLITTER_HWSTAM 0x22098 | ||
386 | #define GEN6_BLITTER_IMR 0x220a8 | ||
387 | #define GEN6_BLITTER_MI_FLUSH_DW_NOTIFY_INTERRUPT (1 << 26) | ||
388 | #define GEN6_BLITTER_COMMAND_PARSER_MASTER_ERROR (1 << 25) | ||
389 | #define GEN6_BLITTER_SYNC_STATUS (1 << 24) | ||
390 | #define GEN6_BLITTER_USER_INTERRUPT (1 << 22) | ||
391 | /* | ||
392 | * BSD (bit stream decoder instruction and interrupt control register defines | ||
393 | * (G4X and Ironlake only) | ||
394 | */ | ||
395 | |||
396 | #define BSD_RING_TAIL 0x04030 | ||
397 | #define BSD_RING_HEAD 0x04034 | ||
398 | #define BSD_RING_START 0x04038 | ||
399 | #define BSD_RING_CTL 0x0403c | ||
400 | #define BSD_RING_ACTHD 0x04074 | ||
401 | #define BSD_HWS_PGA 0x04080 | ||
371 | 402 | ||
372 | /* | 403 | /* |
373 | * Framebuffer compression (915+ only) | 404 | * Framebuffer compression (915+ only) |
@@ -805,6 +836,10 @@ | |||
805 | #define DCC_CHANNEL_XOR_DISABLE (1 << 10) | 836 | #define DCC_CHANNEL_XOR_DISABLE (1 << 10) |
806 | #define DCC_CHANNEL_XOR_BIT_17 (1 << 9) | 837 | #define DCC_CHANNEL_XOR_BIT_17 (1 << 9) |
807 | 838 | ||
839 | /** Pineview MCH register contains DDR3 setting */ | ||
840 | #define CSHRDDR3CTL 0x101a8 | ||
841 | #define CSHRDDR3CTL_DDR3 (1 << 2) | ||
842 | |||
808 | /** 965 MCH register controlling DRAM channel configuration */ | 843 | /** 965 MCH register controlling DRAM channel configuration */ |
809 | #define C0DRB3 0x10206 | 844 | #define C0DRB3 0x10206 |
810 | #define C1DRB3 0x10606 | 845 | #define C1DRB3 0x10606 |
@@ -826,6 +861,12 @@ | |||
826 | #define CLKCFG_MEM_800 (3 << 4) | 861 | #define CLKCFG_MEM_800 (3 << 4) |
827 | #define CLKCFG_MEM_MASK (7 << 4) | 862 | #define CLKCFG_MEM_MASK (7 << 4) |
828 | 863 | ||
864 | #define TR1 0x11006 | ||
865 | #define TSFS 0x11020 | ||
866 | #define TSFS_SLOPE_MASK 0x0000ff00 | ||
867 | #define TSFS_SLOPE_SHIFT 8 | ||
868 | #define TSFS_INTR_MASK 0x000000ff | ||
869 | |||
829 | #define CRSTANDVID 0x11100 | 870 | #define CRSTANDVID 0x11100 |
830 | #define PXVFREQ_BASE 0x11110 /* P[0-15]VIDFREQ (0x1114c) (Ironlake) */ | 871 | #define PXVFREQ_BASE 0x11110 /* P[0-15]VIDFREQ (0x1114c) (Ironlake) */ |
831 | #define PXVFREQ_PX_MASK 0x7f000000 | 872 | #define PXVFREQ_PX_MASK 0x7f000000 |
@@ -964,6 +1005,41 @@ | |||
964 | #define MEMSTAT_SRC_CTL_STDBY 3 | 1005 | #define MEMSTAT_SRC_CTL_STDBY 3 |
965 | #define RCPREVBSYTUPAVG 0x113b8 | 1006 | #define RCPREVBSYTUPAVG 0x113b8 |
966 | #define RCPREVBSYTDNAVG 0x113bc | 1007 | #define RCPREVBSYTDNAVG 0x113bc |
1008 | #define SDEW 0x1124c | ||
1009 | #define CSIEW0 0x11250 | ||
1010 | #define CSIEW1 0x11254 | ||
1011 | #define CSIEW2 0x11258 | ||
1012 | #define PEW 0x1125c | ||
1013 | #define DEW 0x11270 | ||
1014 | #define MCHAFE 0x112c0 | ||
1015 | #define CSIEC 0x112e0 | ||
1016 | #define DMIEC 0x112e4 | ||
1017 | #define DDREC 0x112e8 | ||
1018 | #define PEG0EC 0x112ec | ||
1019 | #define PEG1EC 0x112f0 | ||
1020 | #define GFXEC 0x112f4 | ||
1021 | #define RPPREVBSYTUPAVG 0x113b8 | ||
1022 | #define RPPREVBSYTDNAVG 0x113bc | ||
1023 | #define ECR 0x11600 | ||
1024 | #define ECR_GPFE (1<<31) | ||
1025 | #define ECR_IMONE (1<<30) | ||
1026 | #define ECR_CAP_MASK 0x0000001f /* Event range, 0-31 */ | ||
1027 | #define OGW0 0x11608 | ||
1028 | #define OGW1 0x1160c | ||
1029 | #define EG0 0x11610 | ||
1030 | #define EG1 0x11614 | ||
1031 | #define EG2 0x11618 | ||
1032 | #define EG3 0x1161c | ||
1033 | #define EG4 0x11620 | ||
1034 | #define EG5 0x11624 | ||
1035 | #define EG6 0x11628 | ||
1036 | #define EG7 0x1162c | ||
1037 | #define PXW 0x11664 | ||
1038 | #define PXWL 0x11680 | ||
1039 | #define LCFUSE02 0x116c0 | ||
1040 | #define LCFUSE_HIV_MASK 0x000000ff | ||
1041 | #define CSIPLL0 0x12c10 | ||
1042 | #define DDRMPLL1 0X12c20 | ||
967 | #define PEG_BAND_GAP_DATA 0x14d68 | 1043 | #define PEG_BAND_GAP_DATA 0x14d68 |
968 | 1044 | ||
969 | /* | 1045 | /* |
@@ -1055,7 +1131,6 @@ | |||
1055 | #define CRT_HOTPLUG_DETECT_VOLTAGE_325MV (0 << 2) | 1131 | #define CRT_HOTPLUG_DETECT_VOLTAGE_325MV (0 << 2) |
1056 | #define CRT_HOTPLUG_DETECT_VOLTAGE_475MV (1 << 2) | 1132 | #define CRT_HOTPLUG_DETECT_VOLTAGE_475MV (1 << 2) |
1057 | #define CRT_HOTPLUG_MASK (0x3fc) /* Bits 9-2 */ | 1133 | #define CRT_HOTPLUG_MASK (0x3fc) /* Bits 9-2 */ |
1058 | #define CRT_FORCE_HOTPLUG_MASK 0xfffffe1f | ||
1059 | 1134 | ||
1060 | #define PORT_HOTPLUG_STAT 0x61114 | 1135 | #define PORT_HOTPLUG_STAT 0x61114 |
1061 | #define HDMIB_HOTPLUG_INT_STATUS (1 << 29) | 1136 | #define HDMIB_HOTPLUG_INT_STATUS (1 << 29) |
@@ -2355,6 +2430,8 @@ | |||
2355 | #define GT_PIPE_NOTIFY (1 << 4) | 2430 | #define GT_PIPE_NOTIFY (1 << 4) |
2356 | #define GT_SYNC_STATUS (1 << 2) | 2431 | #define GT_SYNC_STATUS (1 << 2) |
2357 | #define GT_USER_INTERRUPT (1 << 0) | 2432 | #define GT_USER_INTERRUPT (1 << 0) |
2433 | #define GT_BSD_USER_INTERRUPT (1 << 5) | ||
2434 | |||
2358 | 2435 | ||
2359 | #define GTISR 0x44010 | 2436 | #define GTISR 0x44010 |
2360 | #define GTIMR 0x44014 | 2437 | #define GTIMR 0x44014 |
@@ -2690,6 +2767,9 @@ | |||
2690 | #define SDVO_ENCODING (0) | 2767 | #define SDVO_ENCODING (0) |
2691 | #define TMDS_ENCODING (2 << 10) | 2768 | #define TMDS_ENCODING (2 << 10) |
2692 | #define NULL_PACKET_VSYNC_ENABLE (1 << 9) | 2769 | #define NULL_PACKET_VSYNC_ENABLE (1 << 9) |
2770 | /* CPT */ | ||
2771 | #define HDMI_MODE_SELECT (1 << 9) | ||
2772 | #define DVI_MODE_SELECT (0) | ||
2693 | #define SDVOB_BORDER_ENABLE (1 << 7) | 2773 | #define SDVOB_BORDER_ENABLE (1 << 7) |
2694 | #define AUDIO_ENABLE (1 << 6) | 2774 | #define AUDIO_ENABLE (1 << 6) |
2695 | #define VSYNC_ACTIVE_HIGH (1 << 4) | 2775 | #define VSYNC_ACTIVE_HIGH (1 << 4) |
diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h index 9e4c45f68d6..fab21760dd5 100644 --- a/drivers/gpu/drm/i915/i915_trace.h +++ b/drivers/gpu/drm/i915/i915_trace.h | |||
@@ -53,23 +53,6 @@ TRACE_EVENT(i915_gem_object_bind, | |||
53 | __entry->obj, __entry->gtt_offset) | 53 | __entry->obj, __entry->gtt_offset) |
54 | ); | 54 | ); |
55 | 55 | ||
56 | TRACE_EVENT(i915_gem_object_clflush, | ||
57 | |||
58 | TP_PROTO(struct drm_gem_object *obj), | ||
59 | |||
60 | TP_ARGS(obj), | ||
61 | |||
62 | TP_STRUCT__entry( | ||
63 | __field(struct drm_gem_object *, obj) | ||
64 | ), | ||
65 | |||
66 | TP_fast_assign( | ||
67 | __entry->obj = obj; | ||
68 | ), | ||
69 | |||
70 | TP_printk("obj=%p", __entry->obj) | ||
71 | ); | ||
72 | |||
73 | TRACE_EVENT(i915_gem_object_change_domain, | 56 | TRACE_EVENT(i915_gem_object_change_domain, |
74 | 57 | ||
75 | TP_PROTO(struct drm_gem_object *obj, uint32_t old_read_domains, uint32_t old_write_domain), | 58 | TP_PROTO(struct drm_gem_object *obj, uint32_t old_read_domains, uint32_t old_write_domain), |
@@ -132,6 +115,13 @@ DECLARE_EVENT_CLASS(i915_gem_object, | |||
132 | TP_printk("obj=%p", __entry->obj) | 115 | TP_printk("obj=%p", __entry->obj) |
133 | ); | 116 | ); |
134 | 117 | ||
118 | DEFINE_EVENT(i915_gem_object, i915_gem_object_clflush, | ||
119 | |||
120 | TP_PROTO(struct drm_gem_object *obj), | ||
121 | |||
122 | TP_ARGS(obj) | ||
123 | ); | ||
124 | |||
135 | DEFINE_EVENT(i915_gem_object, i915_gem_object_unbind, | 125 | DEFINE_EVENT(i915_gem_object, i915_gem_object_unbind, |
136 | 126 | ||
137 | TP_PROTO(struct drm_gem_object *obj), | 127 | TP_PROTO(struct drm_gem_object *obj), |
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c index 4c748d8f73d..96f75d7f663 100644 --- a/drivers/gpu/drm/i915/intel_bios.c +++ b/drivers/gpu/drm/i915/intel_bios.c | |||
@@ -95,6 +95,16 @@ fill_detail_timing_data(struct drm_display_mode *panel_fixed_mode, | |||
95 | panel_fixed_mode->clock = dvo_timing->clock * 10; | 95 | panel_fixed_mode->clock = dvo_timing->clock * 10; |
96 | panel_fixed_mode->type = DRM_MODE_TYPE_PREFERRED; | 96 | panel_fixed_mode->type = DRM_MODE_TYPE_PREFERRED; |
97 | 97 | ||
98 | if (dvo_timing->hsync_positive) | ||
99 | panel_fixed_mode->flags |= DRM_MODE_FLAG_PHSYNC; | ||
100 | else | ||
101 | panel_fixed_mode->flags |= DRM_MODE_FLAG_NHSYNC; | ||
102 | |||
103 | if (dvo_timing->vsync_positive) | ||
104 | panel_fixed_mode->flags |= DRM_MODE_FLAG_PVSYNC; | ||
105 | else | ||
106 | panel_fixed_mode->flags |= DRM_MODE_FLAG_NVSYNC; | ||
107 | |||
98 | /* Some VBTs have bogus h/vtotal values */ | 108 | /* Some VBTs have bogus h/vtotal values */ |
99 | if (panel_fixed_mode->hsync_end > panel_fixed_mode->htotal) | 109 | if (panel_fixed_mode->hsync_end > panel_fixed_mode->htotal) |
100 | panel_fixed_mode->htotal = panel_fixed_mode->hsync_end + 1; | 110 | panel_fixed_mode->htotal = panel_fixed_mode->hsync_end + 1; |
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c index e16ac5a28c3..22ff3845573 100644 --- a/drivers/gpu/drm/i915/intel_crt.c +++ b/drivers/gpu/drm/i915/intel_crt.c | |||
@@ -217,7 +217,8 @@ static bool intel_crt_detect_hotplug(struct drm_connector *connector) | |||
217 | { | 217 | { |
218 | struct drm_device *dev = connector->dev; | 218 | struct drm_device *dev = connector->dev; |
219 | struct drm_i915_private *dev_priv = dev->dev_private; | 219 | struct drm_i915_private *dev_priv = dev->dev_private; |
220 | u32 hotplug_en; | 220 | u32 hotplug_en, orig, stat; |
221 | bool ret = false; | ||
221 | int i, tries = 0; | 222 | int i, tries = 0; |
222 | 223 | ||
223 | if (HAS_PCH_SPLIT(dev)) | 224 | if (HAS_PCH_SPLIT(dev)) |
@@ -232,8 +233,8 @@ static bool intel_crt_detect_hotplug(struct drm_connector *connector) | |||
232 | tries = 2; | 233 | tries = 2; |
233 | else | 234 | else |
234 | tries = 1; | 235 | tries = 1; |
235 | hotplug_en = I915_READ(PORT_HOTPLUG_EN); | 236 | hotplug_en = orig = I915_READ(PORT_HOTPLUG_EN); |
236 | hotplug_en &= CRT_FORCE_HOTPLUG_MASK; | 237 | hotplug_en &= CRT_HOTPLUG_MASK; |
237 | hotplug_en |= CRT_HOTPLUG_FORCE_DETECT; | 238 | hotplug_en |= CRT_HOTPLUG_FORCE_DETECT; |
238 | 239 | ||
239 | if (IS_G4X(dev)) | 240 | if (IS_G4X(dev)) |
@@ -255,11 +256,17 @@ static bool intel_crt_detect_hotplug(struct drm_connector *connector) | |||
255 | } while (time_after(timeout, jiffies)); | 256 | } while (time_after(timeout, jiffies)); |
256 | } | 257 | } |
257 | 258 | ||
258 | if ((I915_READ(PORT_HOTPLUG_STAT) & CRT_HOTPLUG_MONITOR_MASK) != | 259 | stat = I915_READ(PORT_HOTPLUG_STAT); |
259 | CRT_HOTPLUG_MONITOR_NONE) | 260 | if ((stat & CRT_HOTPLUG_MONITOR_MASK) != CRT_HOTPLUG_MONITOR_NONE) |
260 | return true; | 261 | ret = true; |
262 | |||
263 | /* clear the interrupt we just generated, if any */ | ||
264 | I915_WRITE(PORT_HOTPLUG_STAT, CRT_HOTPLUG_INT_STATUS); | ||
261 | 265 | ||
262 | return false; | 266 | /* and put the bits back */ |
267 | I915_WRITE(PORT_HOTPLUG_EN, orig); | ||
268 | |||
269 | return ret; | ||
263 | } | 270 | } |
264 | 271 | ||
265 | static bool intel_crt_detect_ddc(struct drm_encoder *encoder) | 272 | static bool intel_crt_detect_ddc(struct drm_encoder *encoder) |
@@ -569,7 +576,7 @@ void intel_crt_init(struct drm_device *dev) | |||
569 | (1 << INTEL_ANALOG_CLONE_BIT) | | 576 | (1 << INTEL_ANALOG_CLONE_BIT) | |
570 | (1 << INTEL_SDVO_LVDS_CLONE_BIT); | 577 | (1 << INTEL_SDVO_LVDS_CLONE_BIT); |
571 | intel_encoder->crtc_mask = (1 << 0) | (1 << 1); | 578 | intel_encoder->crtc_mask = (1 << 0) | (1 << 1); |
572 | connector->interlace_allowed = 0; | 579 | connector->interlace_allowed = 1; |
573 | connector->doublescan_allowed = 0; | 580 | connector->doublescan_allowed = 0; |
574 | 581 | ||
575 | drm_encoder_helper_add(&intel_encoder->enc, &intel_crt_helper_funcs); | 582 | drm_encoder_helper_add(&intel_encoder->enc, &intel_crt_helper_funcs); |
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index f469a84cacf..88a1ab7c05c 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
@@ -1029,19 +1029,28 @@ static void i8xx_enable_fbc(struct drm_crtc *crtc, unsigned long interval) | |||
1029 | void i8xx_disable_fbc(struct drm_device *dev) | 1029 | void i8xx_disable_fbc(struct drm_device *dev) |
1030 | { | 1030 | { |
1031 | struct drm_i915_private *dev_priv = dev->dev_private; | 1031 | struct drm_i915_private *dev_priv = dev->dev_private; |
1032 | unsigned long timeout = jiffies + msecs_to_jiffies(1); | ||
1032 | u32 fbc_ctl; | 1033 | u32 fbc_ctl; |
1033 | 1034 | ||
1034 | if (!I915_HAS_FBC(dev)) | 1035 | if (!I915_HAS_FBC(dev)) |
1035 | return; | 1036 | return; |
1036 | 1037 | ||
1038 | if (!(I915_READ(FBC_CONTROL) & FBC_CTL_EN)) | ||
1039 | return; /* Already off, just return */ | ||
1040 | |||
1037 | /* Disable compression */ | 1041 | /* Disable compression */ |
1038 | fbc_ctl = I915_READ(FBC_CONTROL); | 1042 | fbc_ctl = I915_READ(FBC_CONTROL); |
1039 | fbc_ctl &= ~FBC_CTL_EN; | 1043 | fbc_ctl &= ~FBC_CTL_EN; |
1040 | I915_WRITE(FBC_CONTROL, fbc_ctl); | 1044 | I915_WRITE(FBC_CONTROL, fbc_ctl); |
1041 | 1045 | ||
1042 | /* Wait for compressing bit to clear */ | 1046 | /* Wait for compressing bit to clear */ |
1043 | while (I915_READ(FBC_STATUS) & FBC_STAT_COMPRESSING) | 1047 | while (I915_READ(FBC_STATUS) & FBC_STAT_COMPRESSING) { |
1044 | ; /* nothing */ | 1048 | if (time_after(jiffies, timeout)) { |
1049 | DRM_DEBUG_DRIVER("FBC idle timed out\n"); | ||
1050 | break; | ||
1051 | } | ||
1052 | ; /* do nothing */ | ||
1053 | } | ||
1045 | 1054 | ||
1046 | intel_wait_for_vblank(dev); | 1055 | intel_wait_for_vblank(dev); |
1047 | 1056 | ||
@@ -1239,10 +1248,11 @@ static void intel_update_fbc(struct drm_crtc *crtc, | |||
1239 | return; | 1248 | return; |
1240 | 1249 | ||
1241 | out_disable: | 1250 | out_disable: |
1242 | DRM_DEBUG_KMS("unsupported config, disabling FBC\n"); | ||
1243 | /* Multiple disables should be harmless */ | 1251 | /* Multiple disables should be harmless */ |
1244 | if (intel_fbc_enabled(dev)) | 1252 | if (intel_fbc_enabled(dev)) { |
1253 | DRM_DEBUG_KMS("unsupported config, disabling FBC\n"); | ||
1245 | intel_disable_fbc(dev); | 1254 | intel_disable_fbc(dev); |
1255 | } | ||
1246 | } | 1256 | } |
1247 | 1257 | ||
1248 | static int | 1258 | static int |
@@ -1386,7 +1396,8 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y, | |||
1386 | Start = obj_priv->gtt_offset; | 1396 | Start = obj_priv->gtt_offset; |
1387 | Offset = y * crtc->fb->pitch + x * (crtc->fb->bits_per_pixel / 8); | 1397 | Offset = y * crtc->fb->pitch + x * (crtc->fb->bits_per_pixel / 8); |
1388 | 1398 | ||
1389 | DRM_DEBUG_KMS("Writing base %08lX %08lX %d %d\n", Start, Offset, x, y); | 1399 | DRM_DEBUG_KMS("Writing base %08lX %08lX %d %d %d\n", |
1400 | Start, Offset, x, y, crtc->fb->pitch); | ||
1390 | I915_WRITE(dspstride, crtc->fb->pitch); | 1401 | I915_WRITE(dspstride, crtc->fb->pitch); |
1391 | if (IS_I965G(dev)) { | 1402 | if (IS_I965G(dev)) { |
1392 | I915_WRITE(dspbase, Offset); | 1403 | I915_WRITE(dspbase, Offset); |
@@ -2345,6 +2356,8 @@ static bool intel_crtc_mode_fixup(struct drm_crtc *crtc, | |||
2345 | if (mode->clock * 3 > 27000 * 4) | 2356 | if (mode->clock * 3 > 27000 * 4) |
2346 | return MODE_CLOCK_HIGH; | 2357 | return MODE_CLOCK_HIGH; |
2347 | } | 2358 | } |
2359 | |||
2360 | drm_mode_set_crtcinfo(adjusted_mode, 0); | ||
2348 | return true; | 2361 | return true; |
2349 | } | 2362 | } |
2350 | 2363 | ||
@@ -2629,6 +2642,7 @@ static unsigned long intel_calculate_wm(unsigned long clock_in_khz, | |||
2629 | 2642 | ||
2630 | struct cxsr_latency { | 2643 | struct cxsr_latency { |
2631 | int is_desktop; | 2644 | int is_desktop; |
2645 | int is_ddr3; | ||
2632 | unsigned long fsb_freq; | 2646 | unsigned long fsb_freq; |
2633 | unsigned long mem_freq; | 2647 | unsigned long mem_freq; |
2634 | unsigned long display_sr; | 2648 | unsigned long display_sr; |
@@ -2638,33 +2652,45 @@ struct cxsr_latency { | |||
2638 | }; | 2652 | }; |
2639 | 2653 | ||
2640 | static struct cxsr_latency cxsr_latency_table[] = { | 2654 | static struct cxsr_latency cxsr_latency_table[] = { |
2641 | {1, 800, 400, 3382, 33382, 3983, 33983}, /* DDR2-400 SC */ | 2655 | {1, 0, 800, 400, 3382, 33382, 3983, 33983}, /* DDR2-400 SC */ |
2642 | {1, 800, 667, 3354, 33354, 3807, 33807}, /* DDR2-667 SC */ | 2656 | {1, 0, 800, 667, 3354, 33354, 3807, 33807}, /* DDR2-667 SC */ |
2643 | {1, 800, 800, 3347, 33347, 3763, 33763}, /* DDR2-800 SC */ | 2657 | {1, 0, 800, 800, 3347, 33347, 3763, 33763}, /* DDR2-800 SC */ |
2644 | 2658 | {1, 1, 800, 667, 6420, 36420, 6873, 36873}, /* DDR3-667 SC */ | |
2645 | {1, 667, 400, 3400, 33400, 4021, 34021}, /* DDR2-400 SC */ | 2659 | {1, 1, 800, 800, 5902, 35902, 6318, 36318}, /* DDR3-800 SC */ |
2646 | {1, 667, 667, 3372, 33372, 3845, 33845}, /* DDR2-667 SC */ | 2660 | |
2647 | {1, 667, 800, 3386, 33386, 3822, 33822}, /* DDR2-800 SC */ | 2661 | {1, 0, 667, 400, 3400, 33400, 4021, 34021}, /* DDR2-400 SC */ |
2648 | 2662 | {1, 0, 667, 667, 3372, 33372, 3845, 33845}, /* DDR2-667 SC */ | |
2649 | {1, 400, 400, 3472, 33472, 4173, 34173}, /* DDR2-400 SC */ | 2663 | {1, 0, 667, 800, 3386, 33386, 3822, 33822}, /* DDR2-800 SC */ |
2650 | {1, 400, 667, 3443, 33443, 3996, 33996}, /* DDR2-667 SC */ | 2664 | {1, 1, 667, 667, 6438, 36438, 6911, 36911}, /* DDR3-667 SC */ |
2651 | {1, 400, 800, 3430, 33430, 3946, 33946}, /* DDR2-800 SC */ | 2665 | {1, 1, 667, 800, 5941, 35941, 6377, 36377}, /* DDR3-800 SC */ |
2652 | 2666 | ||
2653 | {0, 800, 400, 3438, 33438, 4065, 34065}, /* DDR2-400 SC */ | 2667 | {1, 0, 400, 400, 3472, 33472, 4173, 34173}, /* DDR2-400 SC */ |
2654 | {0, 800, 667, 3410, 33410, 3889, 33889}, /* DDR2-667 SC */ | 2668 | {1, 0, 400, 667, 3443, 33443, 3996, 33996}, /* DDR2-667 SC */ |
2655 | {0, 800, 800, 3403, 33403, 3845, 33845}, /* DDR2-800 SC */ | 2669 | {1, 0, 400, 800, 3430, 33430, 3946, 33946}, /* DDR2-800 SC */ |
2656 | 2670 | {1, 1, 400, 667, 6509, 36509, 7062, 37062}, /* DDR3-667 SC */ | |
2657 | {0, 667, 400, 3456, 33456, 4103, 34106}, /* DDR2-400 SC */ | 2671 | {1, 1, 400, 800, 5985, 35985, 6501, 36501}, /* DDR3-800 SC */ |
2658 | {0, 667, 667, 3428, 33428, 3927, 33927}, /* DDR2-667 SC */ | 2672 | |
2659 | {0, 667, 800, 3443, 33443, 3905, 33905}, /* DDR2-800 SC */ | 2673 | {0, 0, 800, 400, 3438, 33438, 4065, 34065}, /* DDR2-400 SC */ |
2660 | 2674 | {0, 0, 800, 667, 3410, 33410, 3889, 33889}, /* DDR2-667 SC */ | |
2661 | {0, 400, 400, 3528, 33528, 4255, 34255}, /* DDR2-400 SC */ | 2675 | {0, 0, 800, 800, 3403, 33403, 3845, 33845}, /* DDR2-800 SC */ |
2662 | {0, 400, 667, 3500, 33500, 4079, 34079}, /* DDR2-667 SC */ | 2676 | {0, 1, 800, 667, 6476, 36476, 6955, 36955}, /* DDR3-667 SC */ |
2663 | {0, 400, 800, 3487, 33487, 4029, 34029}, /* DDR2-800 SC */ | 2677 | {0, 1, 800, 800, 5958, 35958, 6400, 36400}, /* DDR3-800 SC */ |
2678 | |||
2679 | {0, 0, 667, 400, 3456, 33456, 4103, 34106}, /* DDR2-400 SC */ | ||
2680 | {0, 0, 667, 667, 3428, 33428, 3927, 33927}, /* DDR2-667 SC */ | ||
2681 | {0, 0, 667, 800, 3443, 33443, 3905, 33905}, /* DDR2-800 SC */ | ||
2682 | {0, 1, 667, 667, 6494, 36494, 6993, 36993}, /* DDR3-667 SC */ | ||
2683 | {0, 1, 667, 800, 5998, 35998, 6460, 36460}, /* DDR3-800 SC */ | ||
2684 | |||
2685 | {0, 0, 400, 400, 3528, 33528, 4255, 34255}, /* DDR2-400 SC */ | ||
2686 | {0, 0, 400, 667, 3500, 33500, 4079, 34079}, /* DDR2-667 SC */ | ||
2687 | {0, 0, 400, 800, 3487, 33487, 4029, 34029}, /* DDR2-800 SC */ | ||
2688 | {0, 1, 400, 667, 6566, 36566, 7145, 37145}, /* DDR3-667 SC */ | ||
2689 | {0, 1, 400, 800, 6042, 36042, 6584, 36584}, /* DDR3-800 SC */ | ||
2664 | }; | 2690 | }; |
2665 | 2691 | ||
2666 | static struct cxsr_latency *intel_get_cxsr_latency(int is_desktop, int fsb, | 2692 | static struct cxsr_latency *intel_get_cxsr_latency(int is_desktop, int is_ddr3, |
2667 | int mem) | 2693 | int fsb, int mem) |
2668 | { | 2694 | { |
2669 | int i; | 2695 | int i; |
2670 | struct cxsr_latency *latency; | 2696 | struct cxsr_latency *latency; |
@@ -2675,6 +2701,7 @@ static struct cxsr_latency *intel_get_cxsr_latency(int is_desktop, int fsb, | |||
2675 | for (i = 0; i < ARRAY_SIZE(cxsr_latency_table); i++) { | 2701 | for (i = 0; i < ARRAY_SIZE(cxsr_latency_table); i++) { |
2676 | latency = &cxsr_latency_table[i]; | 2702 | latency = &cxsr_latency_table[i]; |
2677 | if (is_desktop == latency->is_desktop && | 2703 | if (is_desktop == latency->is_desktop && |
2704 | is_ddr3 == latency->is_ddr3 && | ||
2678 | fsb == latency->fsb_freq && mem == latency->mem_freq) | 2705 | fsb == latency->fsb_freq && mem == latency->mem_freq) |
2679 | return latency; | 2706 | return latency; |
2680 | } | 2707 | } |
@@ -2789,8 +2816,8 @@ static void pineview_update_wm(struct drm_device *dev, int planea_clock, | |||
2789 | struct cxsr_latency *latency; | 2816 | struct cxsr_latency *latency; |
2790 | int sr_clock; | 2817 | int sr_clock; |
2791 | 2818 | ||
2792 | latency = intel_get_cxsr_latency(IS_PINEVIEW_G(dev), dev_priv->fsb_freq, | 2819 | latency = intel_get_cxsr_latency(IS_PINEVIEW_G(dev), dev_priv->is_ddr3, |
2793 | dev_priv->mem_freq); | 2820 | dev_priv->fsb_freq, dev_priv->mem_freq); |
2794 | if (!latency) { | 2821 | if (!latency) { |
2795 | DRM_DEBUG_KMS("Unknown FSB/MEM found, disable CxSR\n"); | 2822 | DRM_DEBUG_KMS("Unknown FSB/MEM found, disable CxSR\n"); |
2796 | pineview_disable_cxsr(dev); | 2823 | pineview_disable_cxsr(dev); |
@@ -3772,6 +3799,18 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc, | |||
3772 | } | 3799 | } |
3773 | } | 3800 | } |
3774 | 3801 | ||
3802 | if (adjusted_mode->flags & DRM_MODE_FLAG_INTERLACE) { | ||
3803 | pipeconf |= PIPECONF_INTERLACE_W_FIELD_INDICATION; | ||
3804 | /* the chip adds 2 halflines automatically */ | ||
3805 | adjusted_mode->crtc_vdisplay -= 1; | ||
3806 | adjusted_mode->crtc_vtotal -= 1; | ||
3807 | adjusted_mode->crtc_vblank_start -= 1; | ||
3808 | adjusted_mode->crtc_vblank_end -= 1; | ||
3809 | adjusted_mode->crtc_vsync_end -= 1; | ||
3810 | adjusted_mode->crtc_vsync_start -= 1; | ||
3811 | } else | ||
3812 | pipeconf &= ~PIPECONF_INTERLACE_W_FIELD_INDICATION; /* progressive */ | ||
3813 | |||
3775 | I915_WRITE(htot_reg, (adjusted_mode->crtc_hdisplay - 1) | | 3814 | I915_WRITE(htot_reg, (adjusted_mode->crtc_hdisplay - 1) | |
3776 | ((adjusted_mode->crtc_htotal - 1) << 16)); | 3815 | ((adjusted_mode->crtc_htotal - 1) << 16)); |
3777 | I915_WRITE(hblank_reg, (adjusted_mode->crtc_hblank_start - 1) | | 3816 | I915_WRITE(hblank_reg, (adjusted_mode->crtc_hblank_start - 1) | |
@@ -4436,6 +4475,8 @@ static void intel_idle_update(struct work_struct *work) | |||
4436 | 4475 | ||
4437 | mutex_lock(&dev->struct_mutex); | 4476 | mutex_lock(&dev->struct_mutex); |
4438 | 4477 | ||
4478 | i915_update_gfx_val(dev_priv); | ||
4479 | |||
4439 | if (IS_I945G(dev) || IS_I945GM(dev)) { | 4480 | if (IS_I945G(dev) || IS_I945GM(dev)) { |
4440 | DRM_DEBUG_DRIVER("enable memory self refresh on 945\n"); | 4481 | DRM_DEBUG_DRIVER("enable memory self refresh on 945\n"); |
4441 | I915_WRITE(FW_BLC_SELF, FW_BLC_SELF_EN_MASK | FW_BLC_SELF_EN); | 4482 | I915_WRITE(FW_BLC_SELF, FW_BLC_SELF_EN_MASK | FW_BLC_SELF_EN); |
@@ -4564,12 +4605,6 @@ void intel_finish_page_flip(struct drm_device *dev, int pipe) | |||
4564 | spin_lock_irqsave(&dev->event_lock, flags); | 4605 | spin_lock_irqsave(&dev->event_lock, flags); |
4565 | work = intel_crtc->unpin_work; | 4606 | work = intel_crtc->unpin_work; |
4566 | if (work == NULL || !work->pending) { | 4607 | if (work == NULL || !work->pending) { |
4567 | if (work && !work->pending) { | ||
4568 | obj_priv = to_intel_bo(work->pending_flip_obj); | ||
4569 | DRM_DEBUG_DRIVER("flip finish: %p (%d) not pending?\n", | ||
4570 | obj_priv, | ||
4571 | atomic_read(&obj_priv->pending_flip)); | ||
4572 | } | ||
4573 | spin_unlock_irqrestore(&dev->event_lock, flags); | 4608 | spin_unlock_irqrestore(&dev->event_lock, flags); |
4574 | return; | 4609 | return; |
4575 | } | 4610 | } |
@@ -4629,14 +4664,11 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, | |||
4629 | unsigned long flags; | 4664 | unsigned long flags; |
4630 | int pipesrc_reg = (intel_crtc->pipe == 0) ? PIPEASRC : PIPEBSRC; | 4665 | int pipesrc_reg = (intel_crtc->pipe == 0) ? PIPEASRC : PIPEBSRC; |
4631 | int ret, pipesrc; | 4666 | int ret, pipesrc; |
4632 | RING_LOCALS; | ||
4633 | 4667 | ||
4634 | work = kzalloc(sizeof *work, GFP_KERNEL); | 4668 | work = kzalloc(sizeof *work, GFP_KERNEL); |
4635 | if (work == NULL) | 4669 | if (work == NULL) |
4636 | return -ENOMEM; | 4670 | return -ENOMEM; |
4637 | 4671 | ||
4638 | mutex_lock(&dev->struct_mutex); | ||
4639 | |||
4640 | work->event = event; | 4672 | work->event = event; |
4641 | work->dev = crtc->dev; | 4673 | work->dev = crtc->dev; |
4642 | intel_fb = to_intel_framebuffer(crtc->fb); | 4674 | intel_fb = to_intel_framebuffer(crtc->fb); |
@@ -4646,10 +4678,10 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, | |||
4646 | /* We borrow the event spin lock for protecting unpin_work */ | 4678 | /* We borrow the event spin lock for protecting unpin_work */ |
4647 | spin_lock_irqsave(&dev->event_lock, flags); | 4679 | spin_lock_irqsave(&dev->event_lock, flags); |
4648 | if (intel_crtc->unpin_work) { | 4680 | if (intel_crtc->unpin_work) { |
4649 | DRM_DEBUG_DRIVER("flip queue: crtc already busy\n"); | ||
4650 | spin_unlock_irqrestore(&dev->event_lock, flags); | 4681 | spin_unlock_irqrestore(&dev->event_lock, flags); |
4651 | kfree(work); | 4682 | kfree(work); |
4652 | mutex_unlock(&dev->struct_mutex); | 4683 | |
4684 | DRM_DEBUG_DRIVER("flip queue: crtc already busy\n"); | ||
4653 | return -EBUSY; | 4685 | return -EBUSY; |
4654 | } | 4686 | } |
4655 | intel_crtc->unpin_work = work; | 4687 | intel_crtc->unpin_work = work; |
@@ -4658,13 +4690,19 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, | |||
4658 | intel_fb = to_intel_framebuffer(fb); | 4690 | intel_fb = to_intel_framebuffer(fb); |
4659 | obj = intel_fb->obj; | 4691 | obj = intel_fb->obj; |
4660 | 4692 | ||
4693 | mutex_lock(&dev->struct_mutex); | ||
4661 | ret = intel_pin_and_fence_fb_obj(dev, obj); | 4694 | ret = intel_pin_and_fence_fb_obj(dev, obj); |
4662 | if (ret != 0) { | 4695 | if (ret != 0) { |
4663 | DRM_DEBUG_DRIVER("flip queue: %p pin & fence failed\n", | ||
4664 | to_intel_bo(obj)); | ||
4665 | kfree(work); | ||
4666 | intel_crtc->unpin_work = NULL; | ||
4667 | mutex_unlock(&dev->struct_mutex); | 4696 | mutex_unlock(&dev->struct_mutex); |
4697 | |||
4698 | spin_lock_irqsave(&dev->event_lock, flags); | ||
4699 | intel_crtc->unpin_work = NULL; | ||
4700 | spin_unlock_irqrestore(&dev->event_lock, flags); | ||
4701 | |||
4702 | kfree(work); | ||
4703 | |||
4704 | DRM_DEBUG_DRIVER("flip queue: %p pin & fence failed\n", | ||
4705 | to_intel_bo(obj)); | ||
4668 | return ret; | 4706 | return ret; |
4669 | } | 4707 | } |
4670 | 4708 | ||
@@ -5023,10 +5061,32 @@ err_unref: | |||
5023 | return NULL; | 5061 | return NULL; |
5024 | } | 5062 | } |
5025 | 5063 | ||
5064 | bool ironlake_set_drps(struct drm_device *dev, u8 val) | ||
5065 | { | ||
5066 | struct drm_i915_private *dev_priv = dev->dev_private; | ||
5067 | u16 rgvswctl; | ||
5068 | |||
5069 | rgvswctl = I915_READ16(MEMSWCTL); | ||
5070 | if (rgvswctl & MEMCTL_CMD_STS) { | ||
5071 | DRM_DEBUG("gpu busy, RCS change rejected\n"); | ||
5072 | return false; /* still busy with another command */ | ||
5073 | } | ||
5074 | |||
5075 | rgvswctl = (MEMCTL_CMD_CHFREQ << MEMCTL_CMD_SHIFT) | | ||
5076 | (val << MEMCTL_FREQ_SHIFT) | MEMCTL_SFCAVM; | ||
5077 | I915_WRITE16(MEMSWCTL, rgvswctl); | ||
5078 | POSTING_READ16(MEMSWCTL); | ||
5079 | |||
5080 | rgvswctl |= MEMCTL_CMD_STS; | ||
5081 | I915_WRITE16(MEMSWCTL, rgvswctl); | ||
5082 | |||
5083 | return true; | ||
5084 | } | ||
5085 | |||
5026 | void ironlake_enable_drps(struct drm_device *dev) | 5086 | void ironlake_enable_drps(struct drm_device *dev) |
5027 | { | 5087 | { |
5028 | struct drm_i915_private *dev_priv = dev->dev_private; | 5088 | struct drm_i915_private *dev_priv = dev->dev_private; |
5029 | u32 rgvmodectl = I915_READ(MEMMODECTL), rgvswctl; | 5089 | u32 rgvmodectl = I915_READ(MEMMODECTL); |
5030 | u8 fmax, fmin, fstart, vstart; | 5090 | u8 fmax, fmin, fstart, vstart; |
5031 | int i = 0; | 5091 | int i = 0; |
5032 | 5092 | ||
@@ -5045,13 +5105,21 @@ void ironlake_enable_drps(struct drm_device *dev) | |||
5045 | fmin = (rgvmodectl & MEMMODE_FMIN_MASK); | 5105 | fmin = (rgvmodectl & MEMMODE_FMIN_MASK); |
5046 | fstart = (rgvmodectl & MEMMODE_FSTART_MASK) >> | 5106 | fstart = (rgvmodectl & MEMMODE_FSTART_MASK) >> |
5047 | MEMMODE_FSTART_SHIFT; | 5107 | MEMMODE_FSTART_SHIFT; |
5108 | fstart = fmax; | ||
5109 | |||
5048 | vstart = (I915_READ(PXVFREQ_BASE + (fstart * 4)) & PXVFREQ_PX_MASK) >> | 5110 | vstart = (I915_READ(PXVFREQ_BASE + (fstart * 4)) & PXVFREQ_PX_MASK) >> |
5049 | PXVFREQ_PX_SHIFT; | 5111 | PXVFREQ_PX_SHIFT; |
5050 | 5112 | ||
5051 | dev_priv->max_delay = fstart; /* can't go to fmax w/o IPS */ | 5113 | dev_priv->fmax = fstart; /* IPS callback will increase this */ |
5114 | dev_priv->fstart = fstart; | ||
5115 | |||
5116 | dev_priv->max_delay = fmax; | ||
5052 | dev_priv->min_delay = fmin; | 5117 | dev_priv->min_delay = fmin; |
5053 | dev_priv->cur_delay = fstart; | 5118 | dev_priv->cur_delay = fstart; |
5054 | 5119 | ||
5120 | DRM_DEBUG_DRIVER("fmax: %d, fmin: %d, fstart: %d\n", fmax, fmin, | ||
5121 | fstart); | ||
5122 | |||
5055 | I915_WRITE(MEMINTREN, MEMINT_CX_SUPR_EN | MEMINT_EVAL_CHG_EN); | 5123 | I915_WRITE(MEMINTREN, MEMINT_CX_SUPR_EN | MEMINT_EVAL_CHG_EN); |
5056 | 5124 | ||
5057 | /* | 5125 | /* |
@@ -5073,20 +5141,19 @@ void ironlake_enable_drps(struct drm_device *dev) | |||
5073 | } | 5141 | } |
5074 | msleep(1); | 5142 | msleep(1); |
5075 | 5143 | ||
5076 | rgvswctl = (MEMCTL_CMD_CHFREQ << MEMCTL_CMD_SHIFT) | | 5144 | ironlake_set_drps(dev, fstart); |
5077 | (fstart << MEMCTL_FREQ_SHIFT) | MEMCTL_SFCAVM; | ||
5078 | I915_WRITE(MEMSWCTL, rgvswctl); | ||
5079 | POSTING_READ(MEMSWCTL); | ||
5080 | 5145 | ||
5081 | rgvswctl |= MEMCTL_CMD_STS; | 5146 | dev_priv->last_count1 = I915_READ(0x112e4) + I915_READ(0x112e8) + |
5082 | I915_WRITE(MEMSWCTL, rgvswctl); | 5147 | I915_READ(0x112e0); |
5148 | dev_priv->last_time1 = jiffies_to_msecs(jiffies); | ||
5149 | dev_priv->last_count2 = I915_READ(0x112f4); | ||
5150 | getrawmonotonic(&dev_priv->last_time2); | ||
5083 | } | 5151 | } |
5084 | 5152 | ||
5085 | void ironlake_disable_drps(struct drm_device *dev) | 5153 | void ironlake_disable_drps(struct drm_device *dev) |
5086 | { | 5154 | { |
5087 | struct drm_i915_private *dev_priv = dev->dev_private; | 5155 | struct drm_i915_private *dev_priv = dev->dev_private; |
5088 | u32 rgvswctl; | 5156 | u16 rgvswctl = I915_READ16(MEMSWCTL); |
5089 | u8 fstart; | ||
5090 | 5157 | ||
5091 | /* Ack interrupts, disable EFC interrupt */ | 5158 | /* Ack interrupts, disable EFC interrupt */ |
5092 | I915_WRITE(MEMINTREN, I915_READ(MEMINTREN) & ~MEMINT_EVAL_CHG_EN); | 5159 | I915_WRITE(MEMINTREN, I915_READ(MEMINTREN) & ~MEMINT_EVAL_CHG_EN); |
@@ -5096,11 +5163,7 @@ void ironlake_disable_drps(struct drm_device *dev) | |||
5096 | I915_WRITE(DEIMR, I915_READ(DEIMR) | DE_PCU_EVENT); | 5163 | I915_WRITE(DEIMR, I915_READ(DEIMR) | DE_PCU_EVENT); |
5097 | 5164 | ||
5098 | /* Go back to the starting frequency */ | 5165 | /* Go back to the starting frequency */ |
5099 | fstart = (I915_READ(MEMMODECTL) & MEMMODE_FSTART_MASK) >> | 5166 | ironlake_set_drps(dev, dev_priv->fstart); |
5100 | MEMMODE_FSTART_SHIFT; | ||
5101 | rgvswctl = (MEMCTL_CMD_CHFREQ << MEMCTL_CMD_SHIFT) | | ||
5102 | (fstart << MEMCTL_FREQ_SHIFT) | MEMCTL_SFCAVM; | ||
5103 | I915_WRITE(MEMSWCTL, rgvswctl); | ||
5104 | msleep(1); | 5167 | msleep(1); |
5105 | rgvswctl |= MEMCTL_CMD_STS; | 5168 | rgvswctl |= MEMCTL_CMD_STS; |
5106 | I915_WRITE(MEMSWCTL, rgvswctl); | 5169 | I915_WRITE(MEMSWCTL, rgvswctl); |
@@ -5108,6 +5171,92 @@ void ironlake_disable_drps(struct drm_device *dev) | |||
5108 | 5171 | ||
5109 | } | 5172 | } |
5110 | 5173 | ||
5174 | static unsigned long intel_pxfreq(u32 vidfreq) | ||
5175 | { | ||
5176 | unsigned long freq; | ||
5177 | int div = (vidfreq & 0x3f0000) >> 16; | ||
5178 | int post = (vidfreq & 0x3000) >> 12; | ||
5179 | int pre = (vidfreq & 0x7); | ||
5180 | |||
5181 | if (!pre) | ||
5182 | return 0; | ||
5183 | |||
5184 | freq = ((div * 133333) / ((1<<post) * pre)); | ||
5185 | |||
5186 | return freq; | ||
5187 | } | ||
5188 | |||
5189 | void intel_init_emon(struct drm_device *dev) | ||
5190 | { | ||
5191 | struct drm_i915_private *dev_priv = dev->dev_private; | ||
5192 | u32 lcfuse; | ||
5193 | u8 pxw[16]; | ||
5194 | int i; | ||
5195 | |||
5196 | /* Disable to program */ | ||
5197 | I915_WRITE(ECR, 0); | ||
5198 | POSTING_READ(ECR); | ||
5199 | |||
5200 | /* Program energy weights for various events */ | ||
5201 | I915_WRITE(SDEW, 0x15040d00); | ||
5202 | I915_WRITE(CSIEW0, 0x007f0000); | ||
5203 | I915_WRITE(CSIEW1, 0x1e220004); | ||
5204 | I915_WRITE(CSIEW2, 0x04000004); | ||
5205 | |||
5206 | for (i = 0; i < 5; i++) | ||
5207 | I915_WRITE(PEW + (i * 4), 0); | ||
5208 | for (i = 0; i < 3; i++) | ||
5209 | I915_WRITE(DEW + (i * 4), 0); | ||
5210 | |||
5211 | /* Program P-state weights to account for frequency power adjustment */ | ||
5212 | for (i = 0; i < 16; i++) { | ||
5213 | u32 pxvidfreq = I915_READ(PXVFREQ_BASE + (i * 4)); | ||
5214 | unsigned long freq = intel_pxfreq(pxvidfreq); | ||
5215 | unsigned long vid = (pxvidfreq & PXVFREQ_PX_MASK) >> | ||
5216 | PXVFREQ_PX_SHIFT; | ||
5217 | unsigned long val; | ||
5218 | |||
5219 | val = vid * vid; | ||
5220 | val *= (freq / 1000); | ||
5221 | val *= 255; | ||
5222 | val /= (127*127*900); | ||
5223 | if (val > 0xff) | ||
5224 | DRM_ERROR("bad pxval: %ld\n", val); | ||
5225 | pxw[i] = val; | ||
5226 | } | ||
5227 | /* Render standby states get 0 weight */ | ||
5228 | pxw[14] = 0; | ||
5229 | pxw[15] = 0; | ||
5230 | |||
5231 | for (i = 0; i < 4; i++) { | ||
5232 | u32 val = (pxw[i*4] << 24) | (pxw[(i*4)+1] << 16) | | ||
5233 | (pxw[(i*4)+2] << 8) | (pxw[(i*4)+3]); | ||
5234 | I915_WRITE(PXW + (i * 4), val); | ||
5235 | } | ||
5236 | |||
5237 | /* Adjust magic regs to magic values (more experimental results) */ | ||
5238 | I915_WRITE(OGW0, 0); | ||
5239 | I915_WRITE(OGW1, 0); | ||
5240 | I915_WRITE(EG0, 0x00007f00); | ||
5241 | I915_WRITE(EG1, 0x0000000e); | ||
5242 | I915_WRITE(EG2, 0x000e0000); | ||
5243 | I915_WRITE(EG3, 0x68000300); | ||
5244 | I915_WRITE(EG4, 0x42000000); | ||
5245 | I915_WRITE(EG5, 0x00140031); | ||
5246 | I915_WRITE(EG6, 0); | ||
5247 | I915_WRITE(EG7, 0); | ||
5248 | |||
5249 | for (i = 0; i < 8; i++) | ||
5250 | I915_WRITE(PXWL + (i * 4), 0); | ||
5251 | |||
5252 | /* Enable PMON + select events */ | ||
5253 | I915_WRITE(ECR, 0x80000019); | ||
5254 | |||
5255 | lcfuse = I915_READ(LCFUSE02); | ||
5256 | |||
5257 | dev_priv->corr = (lcfuse & LCFUSE_HIV_MASK); | ||
5258 | } | ||
5259 | |||
5111 | void intel_init_clock_gating(struct drm_device *dev) | 5260 | void intel_init_clock_gating(struct drm_device *dev) |
5112 | { | 5261 | { |
5113 | struct drm_i915_private *dev_priv = dev->dev_private; | 5262 | struct drm_i915_private *dev_priv = dev->dev_private; |
@@ -5277,11 +5426,13 @@ static void intel_init_display(struct drm_device *dev) | |||
5277 | dev_priv->display.update_wm = NULL; | 5426 | dev_priv->display.update_wm = NULL; |
5278 | } else if (IS_PINEVIEW(dev)) { | 5427 | } else if (IS_PINEVIEW(dev)) { |
5279 | if (!intel_get_cxsr_latency(IS_PINEVIEW_G(dev), | 5428 | if (!intel_get_cxsr_latency(IS_PINEVIEW_G(dev), |
5429 | dev_priv->is_ddr3, | ||
5280 | dev_priv->fsb_freq, | 5430 | dev_priv->fsb_freq, |
5281 | dev_priv->mem_freq)) { | 5431 | dev_priv->mem_freq)) { |
5282 | DRM_INFO("failed to find known CxSR latency " | 5432 | DRM_INFO("failed to find known CxSR latency " |
5283 | "(found fsb freq %d, mem freq %d), " | 5433 | "(found ddr%s fsb freq %d, mem freq %d), " |
5284 | "disabling CxSR\n", | 5434 | "disabling CxSR\n", |
5435 | (dev_priv->is_ddr3 == 1) ? "3": "2", | ||
5285 | dev_priv->fsb_freq, dev_priv->mem_freq); | 5436 | dev_priv->fsb_freq, dev_priv->mem_freq); |
5286 | /* Disable CxSR and never update its watermark again */ | 5437 | /* Disable CxSR and never update its watermark again */ |
5287 | pineview_disable_cxsr(dev); | 5438 | pineview_disable_cxsr(dev); |
@@ -5354,8 +5505,10 @@ void intel_modeset_init(struct drm_device *dev) | |||
5354 | 5505 | ||
5355 | intel_init_clock_gating(dev); | 5506 | intel_init_clock_gating(dev); |
5356 | 5507 | ||
5357 | if (IS_IRONLAKE_M(dev)) | 5508 | if (IS_IRONLAKE_M(dev)) { |
5358 | ironlake_enable_drps(dev); | 5509 | ironlake_enable_drps(dev); |
5510 | intel_init_emon(dev); | ||
5511 | } | ||
5359 | 5512 | ||
5360 | INIT_WORK(&dev_priv->idle_work, intel_idle_update); | 5513 | INIT_WORK(&dev_priv->idle_work, intel_idle_update); |
5361 | setup_timer(&dev_priv->idle_timer, intel_gpu_idle_timer, | 5514 | setup_timer(&dev_priv->idle_timer, intel_gpu_idle_timer, |
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 6b1c9a27c27..49b54f05d3c 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c | |||
@@ -576,7 +576,7 @@ intel_dp_set_m_n(struct drm_crtc *crtc, struct drm_display_mode *mode, | |||
576 | struct intel_encoder *intel_encoder; | 576 | struct intel_encoder *intel_encoder; |
577 | struct intel_dp_priv *dp_priv; | 577 | struct intel_dp_priv *dp_priv; |
578 | 578 | ||
579 | if (!encoder || encoder->crtc != crtc) | 579 | if (encoder->crtc != crtc) |
580 | continue; | 580 | continue; |
581 | 581 | ||
582 | intel_encoder = enc_to_intel_encoder(encoder); | 582 | intel_encoder = enc_to_intel_encoder(encoder); |
@@ -675,10 +675,9 @@ intel_dp_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode, | |||
675 | dp_priv->link_configuration[1] = dp_priv->lane_count; | 675 | dp_priv->link_configuration[1] = dp_priv->lane_count; |
676 | 676 | ||
677 | /* | 677 | /* |
678 | * Check for DPCD version > 1.1, | 678 | * Check for DPCD version > 1.1 and enhanced framing support |
679 | * enable enahanced frame stuff in that case | ||
680 | */ | 679 | */ |
681 | if (dp_priv->dpcd[0] >= 0x11) { | 680 | if (dp_priv->dpcd[0] >= 0x11 && (dp_priv->dpcd[2] & DP_ENHANCED_FRAME_CAP)) { |
682 | dp_priv->link_configuration[1] |= DP_LANE_COUNT_ENHANCED_FRAME_EN; | 681 | dp_priv->link_configuration[1] |= DP_LANE_COUNT_ENHANCED_FRAME_EN; |
683 | dp_priv->DP |= DP_ENHANCED_FRAMING; | 682 | dp_priv->DP |= DP_ENHANCED_FRAMING; |
684 | } | 683 | } |
@@ -1208,6 +1207,8 @@ ironlake_dp_detect(struct drm_connector *connector) | |||
1208 | if (dp_priv->dpcd[0] != 0) | 1207 | if (dp_priv->dpcd[0] != 0) |
1209 | status = connector_status_connected; | 1208 | status = connector_status_connected; |
1210 | } | 1209 | } |
1210 | DRM_DEBUG_KMS("DPCD: %hx%hx%hx%hx\n", dp_priv->dpcd[0], | ||
1211 | dp_priv->dpcd[1], dp_priv->dpcd[2], dp_priv->dpcd[3]); | ||
1211 | return status; | 1212 | return status; |
1212 | } | 1213 | } |
1213 | 1214 | ||
@@ -1352,7 +1353,7 @@ intel_trans_dp_port_sel (struct drm_crtc *crtc) | |||
1352 | struct intel_encoder *intel_encoder = NULL; | 1353 | struct intel_encoder *intel_encoder = NULL; |
1353 | 1354 | ||
1354 | list_for_each_entry(encoder, &mode_config->encoder_list, head) { | 1355 | list_for_each_entry(encoder, &mode_config->encoder_list, head) { |
1355 | if (!encoder || encoder->crtc != crtc) | 1356 | if (encoder->crtc != crtc) |
1356 | continue; | 1357 | continue; |
1357 | 1358 | ||
1358 | intel_encoder = enc_to_intel_encoder(encoder); | 1359 | intel_encoder = enc_to_intel_encoder(encoder); |
diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c index 6f53cf7fbc5..f8c76e64bb7 100644 --- a/drivers/gpu/drm/i915/intel_fb.c +++ b/drivers/gpu/drm/i915/intel_fb.c | |||
@@ -105,7 +105,11 @@ static int intelfb_create(struct intel_fbdev *ifbdev, | |||
105 | } | 105 | } |
106 | 106 | ||
107 | /* Flush everything out, we'll be doing GTT only from now on */ | 107 | /* Flush everything out, we'll be doing GTT only from now on */ |
108 | i915_gem_object_set_to_gtt_domain(fbo, 1); | 108 | ret = i915_gem_object_set_to_gtt_domain(fbo, 1); |
109 | if (ret) { | ||
110 | DRM_ERROR("failed to bind fb: %d.\n", ret); | ||
111 | goto out_unpin; | ||
112 | } | ||
109 | 113 | ||
110 | info = framebuffer_alloc(0, device); | 114 | info = framebuffer_alloc(0, device); |
111 | if (!info) { | 115 | if (!info) { |
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index 65727f0a79a..83bd764b000 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c | |||
@@ -59,8 +59,11 @@ static void intel_hdmi_mode_set(struct drm_encoder *encoder, | |||
59 | SDVO_VSYNC_ACTIVE_HIGH | | 59 | SDVO_VSYNC_ACTIVE_HIGH | |
60 | SDVO_HSYNC_ACTIVE_HIGH; | 60 | SDVO_HSYNC_ACTIVE_HIGH; |
61 | 61 | ||
62 | if (hdmi_priv->has_hdmi_sink) | 62 | if (hdmi_priv->has_hdmi_sink) { |
63 | sdvox |= SDVO_AUDIO_ENABLE; | 63 | sdvox |= SDVO_AUDIO_ENABLE; |
64 | if (HAS_PCH_CPT(dev)) | ||
65 | sdvox |= HDMI_MODE_SELECT; | ||
66 | } | ||
64 | 67 | ||
65 | if (intel_crtc->pipe == 1) { | 68 | if (intel_crtc->pipe == 1) { |
66 | if (HAS_PCH_CPT(dev)) | 69 | if (HAS_PCH_CPT(dev)) |
diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c index b0e17b06eb6..d7ad5139d17 100644 --- a/drivers/gpu/drm/i915/intel_overlay.c +++ b/drivers/gpu/drm/i915/intel_overlay.c | |||
@@ -211,9 +211,8 @@ static void intel_overlay_unmap_regs_atomic(struct intel_overlay *overlay) | |||
211 | static int intel_overlay_on(struct intel_overlay *overlay) | 211 | static int intel_overlay_on(struct intel_overlay *overlay) |
212 | { | 212 | { |
213 | struct drm_device *dev = overlay->dev; | 213 | struct drm_device *dev = overlay->dev; |
214 | drm_i915_private_t *dev_priv = dev->dev_private; | ||
215 | int ret; | 214 | int ret; |
216 | RING_LOCALS; | 215 | drm_i915_private_t *dev_priv = dev->dev_private; |
217 | 216 | ||
218 | BUG_ON(overlay->active); | 217 | BUG_ON(overlay->active); |
219 | 218 | ||
@@ -227,11 +226,13 @@ static int intel_overlay_on(struct intel_overlay *overlay) | |||
227 | OUT_RING(MI_NOOP); | 226 | OUT_RING(MI_NOOP); |
228 | ADVANCE_LP_RING(); | 227 | ADVANCE_LP_RING(); |
229 | 228 | ||
230 | overlay->last_flip_req = i915_add_request(dev, NULL, 0); | 229 | overlay->last_flip_req = |
230 | i915_add_request(dev, NULL, 0, &dev_priv->render_ring); | ||
231 | if (overlay->last_flip_req == 0) | 231 | if (overlay->last_flip_req == 0) |
232 | return -ENOMEM; | 232 | return -ENOMEM; |
233 | 233 | ||
234 | ret = i915_do_wait_request(dev, overlay->last_flip_req, 1); | 234 | ret = i915_do_wait_request(dev, |
235 | overlay->last_flip_req, 1, &dev_priv->render_ring); | ||
235 | if (ret != 0) | 236 | if (ret != 0) |
236 | return ret; | 237 | return ret; |
237 | 238 | ||
@@ -248,7 +249,6 @@ static void intel_overlay_continue(struct intel_overlay *overlay, | |||
248 | drm_i915_private_t *dev_priv = dev->dev_private; | 249 | drm_i915_private_t *dev_priv = dev->dev_private; |
249 | u32 flip_addr = overlay->flip_addr; | 250 | u32 flip_addr = overlay->flip_addr; |
250 | u32 tmp; | 251 | u32 tmp; |
251 | RING_LOCALS; | ||
252 | 252 | ||
253 | BUG_ON(!overlay->active); | 253 | BUG_ON(!overlay->active); |
254 | 254 | ||
@@ -265,7 +265,8 @@ static void intel_overlay_continue(struct intel_overlay *overlay, | |||
265 | OUT_RING(flip_addr); | 265 | OUT_RING(flip_addr); |
266 | ADVANCE_LP_RING(); | 266 | ADVANCE_LP_RING(); |
267 | 267 | ||
268 | overlay->last_flip_req = i915_add_request(dev, NULL, 0); | 268 | overlay->last_flip_req = |
269 | i915_add_request(dev, NULL, 0, &dev_priv->render_ring); | ||
269 | } | 270 | } |
270 | 271 | ||
271 | static int intel_overlay_wait_flip(struct intel_overlay *overlay) | 272 | static int intel_overlay_wait_flip(struct intel_overlay *overlay) |
@@ -274,10 +275,10 @@ static int intel_overlay_wait_flip(struct intel_overlay *overlay) | |||
274 | drm_i915_private_t *dev_priv = dev->dev_private; | 275 | drm_i915_private_t *dev_priv = dev->dev_private; |
275 | int ret; | 276 | int ret; |
276 | u32 tmp; | 277 | u32 tmp; |
277 | RING_LOCALS; | ||
278 | 278 | ||
279 | if (overlay->last_flip_req != 0) { | 279 | if (overlay->last_flip_req != 0) { |
280 | ret = i915_do_wait_request(dev, overlay->last_flip_req, 1); | 280 | ret = i915_do_wait_request(dev, overlay->last_flip_req, |
281 | 1, &dev_priv->render_ring); | ||
281 | if (ret == 0) { | 282 | if (ret == 0) { |
282 | overlay->last_flip_req = 0; | 283 | overlay->last_flip_req = 0; |
283 | 284 | ||
@@ -296,11 +297,13 @@ static int intel_overlay_wait_flip(struct intel_overlay *overlay) | |||
296 | OUT_RING(MI_NOOP); | 297 | OUT_RING(MI_NOOP); |
297 | ADVANCE_LP_RING(); | 298 | ADVANCE_LP_RING(); |
298 | 299 | ||
299 | overlay->last_flip_req = i915_add_request(dev, NULL, 0); | 300 | overlay->last_flip_req = |
301 | i915_add_request(dev, NULL, 0, &dev_priv->render_ring); | ||
300 | if (overlay->last_flip_req == 0) | 302 | if (overlay->last_flip_req == 0) |
301 | return -ENOMEM; | 303 | return -ENOMEM; |
302 | 304 | ||
303 | ret = i915_do_wait_request(dev, overlay->last_flip_req, 1); | 305 | ret = i915_do_wait_request(dev, overlay->last_flip_req, |
306 | 1, &dev_priv->render_ring); | ||
304 | if (ret != 0) | 307 | if (ret != 0) |
305 | return ret; | 308 | return ret; |
306 | 309 | ||
@@ -314,9 +317,8 @@ static int intel_overlay_off(struct intel_overlay *overlay) | |||
314 | { | 317 | { |
315 | u32 flip_addr = overlay->flip_addr; | 318 | u32 flip_addr = overlay->flip_addr; |
316 | struct drm_device *dev = overlay->dev; | 319 | struct drm_device *dev = overlay->dev; |
317 | drm_i915_private_t *dev_priv = dev->dev_private; | 320 | drm_i915_private_t *dev_priv = dev->dev_private; |
318 | int ret; | 321 | int ret; |
319 | RING_LOCALS; | ||
320 | 322 | ||
321 | BUG_ON(!overlay->active); | 323 | BUG_ON(!overlay->active); |
322 | 324 | ||
@@ -336,11 +338,13 @@ static int intel_overlay_off(struct intel_overlay *overlay) | |||
336 | OUT_RING(MI_NOOP); | 338 | OUT_RING(MI_NOOP); |
337 | ADVANCE_LP_RING(); | 339 | ADVANCE_LP_RING(); |
338 | 340 | ||
339 | overlay->last_flip_req = i915_add_request(dev, NULL, 0); | 341 | overlay->last_flip_req = |
342 | i915_add_request(dev, NULL, 0, &dev_priv->render_ring); | ||
340 | if (overlay->last_flip_req == 0) | 343 | if (overlay->last_flip_req == 0) |
341 | return -ENOMEM; | 344 | return -ENOMEM; |
342 | 345 | ||
343 | ret = i915_do_wait_request(dev, overlay->last_flip_req, 1); | 346 | ret = i915_do_wait_request(dev, overlay->last_flip_req, |
347 | 1, &dev_priv->render_ring); | ||
344 | if (ret != 0) | 348 | if (ret != 0) |
345 | return ret; | 349 | return ret; |
346 | 350 | ||
@@ -354,11 +358,13 @@ static int intel_overlay_off(struct intel_overlay *overlay) | |||
354 | OUT_RING(MI_NOOP); | 358 | OUT_RING(MI_NOOP); |
355 | ADVANCE_LP_RING(); | 359 | ADVANCE_LP_RING(); |
356 | 360 | ||
357 | overlay->last_flip_req = i915_add_request(dev, NULL, 0); | 361 | overlay->last_flip_req = |
362 | i915_add_request(dev, NULL, 0, &dev_priv->render_ring); | ||
358 | if (overlay->last_flip_req == 0) | 363 | if (overlay->last_flip_req == 0) |
359 | return -ENOMEM; | 364 | return -ENOMEM; |
360 | 365 | ||
361 | ret = i915_do_wait_request(dev, overlay->last_flip_req, 1); | 366 | ret = i915_do_wait_request(dev, overlay->last_flip_req, |
367 | 1, &dev_priv->render_ring); | ||
362 | if (ret != 0) | 368 | if (ret != 0) |
363 | return ret; | 369 | return ret; |
364 | 370 | ||
@@ -390,22 +396,23 @@ int intel_overlay_recover_from_interrupt(struct intel_overlay *overlay, | |||
390 | int interruptible) | 396 | int interruptible) |
391 | { | 397 | { |
392 | struct drm_device *dev = overlay->dev; | 398 | struct drm_device *dev = overlay->dev; |
393 | drm_i915_private_t *dev_priv = dev->dev_private; | ||
394 | struct drm_gem_object *obj; | 399 | struct drm_gem_object *obj; |
400 | drm_i915_private_t *dev_priv = dev->dev_private; | ||
395 | u32 flip_addr; | 401 | u32 flip_addr; |
396 | int ret; | 402 | int ret; |
397 | RING_LOCALS; | ||
398 | 403 | ||
399 | if (overlay->hw_wedged == HW_WEDGED) | 404 | if (overlay->hw_wedged == HW_WEDGED) |
400 | return -EIO; | 405 | return -EIO; |
401 | 406 | ||
402 | if (overlay->last_flip_req == 0) { | 407 | if (overlay->last_flip_req == 0) { |
403 | overlay->last_flip_req = i915_add_request(dev, NULL, 0); | 408 | overlay->last_flip_req = |
409 | i915_add_request(dev, NULL, 0, &dev_priv->render_ring); | ||
404 | if (overlay->last_flip_req == 0) | 410 | if (overlay->last_flip_req == 0) |
405 | return -ENOMEM; | 411 | return -ENOMEM; |
406 | } | 412 | } |
407 | 413 | ||
408 | ret = i915_do_wait_request(dev, overlay->last_flip_req, interruptible); | 414 | ret = i915_do_wait_request(dev, overlay->last_flip_req, |
415 | interruptible, &dev_priv->render_ring); | ||
409 | if (ret != 0) | 416 | if (ret != 0) |
410 | return ret; | 417 | return ret; |
411 | 418 | ||
@@ -429,12 +436,13 @@ int intel_overlay_recover_from_interrupt(struct intel_overlay *overlay, | |||
429 | OUT_RING(MI_NOOP); | 436 | OUT_RING(MI_NOOP); |
430 | ADVANCE_LP_RING(); | 437 | ADVANCE_LP_RING(); |
431 | 438 | ||
432 | overlay->last_flip_req = i915_add_request(dev, NULL, 0); | 439 | overlay->last_flip_req = i915_add_request(dev, NULL, |
440 | 0, &dev_priv->render_ring); | ||
433 | if (overlay->last_flip_req == 0) | 441 | if (overlay->last_flip_req == 0) |
434 | return -ENOMEM; | 442 | return -ENOMEM; |
435 | 443 | ||
436 | ret = i915_do_wait_request(dev, overlay->last_flip_req, | 444 | ret = i915_do_wait_request(dev, overlay->last_flip_req, |
437 | interruptible); | 445 | interruptible, &dev_priv->render_ring); |
438 | if (ret != 0) | 446 | if (ret != 0) |
439 | return ret; | 447 | return ret; |
440 | 448 | ||
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c new file mode 100644 index 00000000000..cea4f1a8709 --- /dev/null +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c | |||
@@ -0,0 +1,849 @@ | |||
1 | /* | ||
2 | * Copyright © 2008-2010 Intel Corporation | ||
3 | * | ||
4 | * Permission is hereby granted, free of charge, to any person obtaining a | ||
5 | * copy of this software and associated documentation files (the "Software"), | ||
6 | * to deal in the Software without restriction, including without limitation | ||
7 | * the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
8 | * and/or sell copies of the Software, and to permit persons to whom the | ||
9 | * Software is furnished to do so, subject to the following conditions: | ||
10 | * | ||
11 | * The above copyright notice and this permission notice (including the next | ||
12 | * paragraph) shall be included in all copies or substantial portions of the | ||
13 | * Software. | ||
14 | * | ||
15 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
16 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
17 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | ||
18 | * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
19 | * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
20 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS | ||
21 | * IN THE SOFTWARE. | ||
22 | * | ||
23 | * Authors: | ||
24 | * Eric Anholt <eric@anholt.net> | ||
25 | * Zou Nan hai <nanhai.zou@intel.com> | ||
26 | * Xiang Hai hao<haihao.xiang@intel.com> | ||
27 | * | ||
28 | */ | ||
29 | |||
30 | #include "drmP.h" | ||
31 | #include "drm.h" | ||
32 | #include "i915_drv.h" | ||
33 | #include "i915_drm.h" | ||
34 | #include "i915_trace.h" | ||
35 | |||
36 | static void | ||
37 | render_ring_flush(struct drm_device *dev, | ||
38 | struct intel_ring_buffer *ring, | ||
39 | u32 invalidate_domains, | ||
40 | u32 flush_domains) | ||
41 | { | ||
42 | #if WATCH_EXEC | ||
43 | DRM_INFO("%s: invalidate %08x flush %08x\n", __func__, | ||
44 | invalidate_domains, flush_domains); | ||
45 | #endif | ||
46 | u32 cmd; | ||
47 | trace_i915_gem_request_flush(dev, ring->next_seqno, | ||
48 | invalidate_domains, flush_domains); | ||
49 | |||
50 | if ((invalidate_domains | flush_domains) & I915_GEM_GPU_DOMAINS) { | ||
51 | /* | ||
52 | * read/write caches: | ||
53 | * | ||
54 | * I915_GEM_DOMAIN_RENDER is always invalidated, but is | ||
55 | * only flushed if MI_NO_WRITE_FLUSH is unset. On 965, it is | ||
56 | * also flushed at 2d versus 3d pipeline switches. | ||
57 | * | ||
58 | * read-only caches: | ||
59 | * | ||
60 | * I915_GEM_DOMAIN_SAMPLER is flushed on pre-965 if | ||
61 | * MI_READ_FLUSH is set, and is always flushed on 965. | ||
62 | * | ||
63 | * I915_GEM_DOMAIN_COMMAND may not exist? | ||
64 | * | ||
65 | * I915_GEM_DOMAIN_INSTRUCTION, which exists on 965, is | ||
66 | * invalidated when MI_EXE_FLUSH is set. | ||
67 | * | ||
68 | * I915_GEM_DOMAIN_VERTEX, which exists on 965, is | ||
69 | * invalidated with every MI_FLUSH. | ||
70 | * | ||
71 | * TLBs: | ||
72 | * | ||
73 | * On 965, TLBs associated with I915_GEM_DOMAIN_COMMAND | ||
74 | * and I915_GEM_DOMAIN_CPU in are invalidated at PTE write and | ||
75 | * I915_GEM_DOMAIN_RENDER and I915_GEM_DOMAIN_SAMPLER | ||
76 | * are flushed at any MI_FLUSH. | ||
77 | */ | ||
78 | |||
79 | cmd = MI_FLUSH | MI_NO_WRITE_FLUSH; | ||
80 | if ((invalidate_domains|flush_domains) & | ||
81 | I915_GEM_DOMAIN_RENDER) | ||
82 | cmd &= ~MI_NO_WRITE_FLUSH; | ||
83 | if (!IS_I965G(dev)) { | ||
84 | /* | ||
85 | * On the 965, the sampler cache always gets flushed | ||
86 | * and this bit is reserved. | ||
87 | */ | ||
88 | if (invalidate_domains & I915_GEM_DOMAIN_SAMPLER) | ||
89 | cmd |= MI_READ_FLUSH; | ||
90 | } | ||
91 | if (invalidate_domains & I915_GEM_DOMAIN_INSTRUCTION) | ||
92 | cmd |= MI_EXE_FLUSH; | ||
93 | |||
94 | #if WATCH_EXEC | ||
95 | DRM_INFO("%s: queue flush %08x to ring\n", __func__, cmd); | ||
96 | #endif | ||
97 | intel_ring_begin(dev, ring, 8); | ||
98 | intel_ring_emit(dev, ring, cmd); | ||
99 | intel_ring_emit(dev, ring, MI_NOOP); | ||
100 | intel_ring_advance(dev, ring); | ||
101 | } | ||
102 | } | ||
103 | |||
104 | static unsigned int render_ring_get_head(struct drm_device *dev, | ||
105 | struct intel_ring_buffer *ring) | ||
106 | { | ||
107 | drm_i915_private_t *dev_priv = dev->dev_private; | ||
108 | return I915_READ(PRB0_HEAD) & HEAD_ADDR; | ||
109 | } | ||
110 | |||
111 | static unsigned int render_ring_get_tail(struct drm_device *dev, | ||
112 | struct intel_ring_buffer *ring) | ||
113 | { | ||
114 | drm_i915_private_t *dev_priv = dev->dev_private; | ||
115 | return I915_READ(PRB0_TAIL) & TAIL_ADDR; | ||
116 | } | ||
117 | |||
118 | static unsigned int render_ring_get_active_head(struct drm_device *dev, | ||
119 | struct intel_ring_buffer *ring) | ||
120 | { | ||
121 | drm_i915_private_t *dev_priv = dev->dev_private; | ||
122 | u32 acthd_reg = IS_I965G(dev) ? ACTHD_I965 : ACTHD; | ||
123 | |||
124 | return I915_READ(acthd_reg); | ||
125 | } | ||
126 | |||
127 | static void render_ring_advance_ring(struct drm_device *dev, | ||
128 | struct intel_ring_buffer *ring) | ||
129 | { | ||
130 | drm_i915_private_t *dev_priv = dev->dev_private; | ||
131 | I915_WRITE(PRB0_TAIL, ring->tail); | ||
132 | } | ||
133 | |||
134 | static int init_ring_common(struct drm_device *dev, | ||
135 | struct intel_ring_buffer *ring) | ||
136 | { | ||
137 | u32 head; | ||
138 | drm_i915_private_t *dev_priv = dev->dev_private; | ||
139 | struct drm_i915_gem_object *obj_priv; | ||
140 | obj_priv = to_intel_bo(ring->gem_object); | ||
141 | |||
142 | /* Stop the ring if it's running. */ | ||
143 | I915_WRITE(ring->regs.ctl, 0); | ||
144 | I915_WRITE(ring->regs.head, 0); | ||
145 | I915_WRITE(ring->regs.tail, 0); | ||
146 | |||
147 | /* Initialize the ring. */ | ||
148 | I915_WRITE(ring->regs.start, obj_priv->gtt_offset); | ||
149 | head = ring->get_head(dev, ring); | ||
150 | |||
151 | /* G45 ring initialization fails to reset head to zero */ | ||
152 | if (head != 0) { | ||
153 | DRM_ERROR("%s head not reset to zero " | ||
154 | "ctl %08x head %08x tail %08x start %08x\n", | ||
155 | ring->name, | ||
156 | I915_READ(ring->regs.ctl), | ||
157 | I915_READ(ring->regs.head), | ||
158 | I915_READ(ring->regs.tail), | ||
159 | I915_READ(ring->regs.start)); | ||
160 | |||
161 | I915_WRITE(ring->regs.head, 0); | ||
162 | |||
163 | DRM_ERROR("%s head forced to zero " | ||
164 | "ctl %08x head %08x tail %08x start %08x\n", | ||
165 | ring->name, | ||
166 | I915_READ(ring->regs.ctl), | ||
167 | I915_READ(ring->regs.head), | ||
168 | I915_READ(ring->regs.tail), | ||
169 | I915_READ(ring->regs.start)); | ||
170 | } | ||
171 | |||
172 | I915_WRITE(ring->regs.ctl, | ||
173 | ((ring->gem_object->size - PAGE_SIZE) & RING_NR_PAGES) | ||
174 | | RING_NO_REPORT | RING_VALID); | ||
175 | |||
176 | head = I915_READ(ring->regs.head) & HEAD_ADDR; | ||
177 | /* If the head is still not zero, the ring is dead */ | ||
178 | if (head != 0) { | ||
179 | DRM_ERROR("%s initialization failed " | ||
180 | "ctl %08x head %08x tail %08x start %08x\n", | ||
181 | ring->name, | ||
182 | I915_READ(ring->regs.ctl), | ||
183 | I915_READ(ring->regs.head), | ||
184 | I915_READ(ring->regs.tail), | ||
185 | I915_READ(ring->regs.start)); | ||
186 | return -EIO; | ||
187 | } | ||
188 | |||
189 | if (!drm_core_check_feature(dev, DRIVER_MODESET)) | ||
190 | i915_kernel_lost_context(dev); | ||
191 | else { | ||
192 | ring->head = ring->get_head(dev, ring); | ||
193 | ring->tail = ring->get_tail(dev, ring); | ||
194 | ring->space = ring->head - (ring->tail + 8); | ||
195 | if (ring->space < 0) | ||
196 | ring->space += ring->size; | ||
197 | } | ||
198 | return 0; | ||
199 | } | ||
200 | |||
201 | static int init_render_ring(struct drm_device *dev, | ||
202 | struct intel_ring_buffer *ring) | ||
203 | { | ||
204 | drm_i915_private_t *dev_priv = dev->dev_private; | ||
205 | int ret = init_ring_common(dev, ring); | ||
206 | if (IS_I9XX(dev) && !IS_GEN3(dev)) { | ||
207 | I915_WRITE(MI_MODE, | ||
208 | (VS_TIMER_DISPATCH) << 16 | VS_TIMER_DISPATCH); | ||
209 | } | ||
210 | return ret; | ||
211 | } | ||
212 | |||
213 | #define PIPE_CONTROL_FLUSH(addr) \ | ||
214 | do { \ | ||
215 | OUT_RING(GFX_OP_PIPE_CONTROL | PIPE_CONTROL_QW_WRITE | \ | ||
216 | PIPE_CONTROL_DEPTH_STALL | 2); \ | ||
217 | OUT_RING(addr | PIPE_CONTROL_GLOBAL_GTT); \ | ||
218 | OUT_RING(0); \ | ||
219 | OUT_RING(0); \ | ||
220 | } while (0) | ||
221 | |||
222 | /** | ||
223 | * Creates a new sequence number, emitting a write of it to the status page | ||
224 | * plus an interrupt, which will trigger i915_user_interrupt_handler. | ||
225 | * | ||
226 | * Must be called with struct_lock held. | ||
227 | * | ||
228 | * Returned sequence numbers are nonzero on success. | ||
229 | */ | ||
230 | static u32 | ||
231 | render_ring_add_request(struct drm_device *dev, | ||
232 | struct intel_ring_buffer *ring, | ||
233 | struct drm_file *file_priv, | ||
234 | u32 flush_domains) | ||
235 | { | ||
236 | u32 seqno; | ||
237 | drm_i915_private_t *dev_priv = dev->dev_private; | ||
238 | seqno = intel_ring_get_seqno(dev, ring); | ||
239 | |||
240 | if (IS_GEN6(dev)) { | ||
241 | BEGIN_LP_RING(6); | ||
242 | OUT_RING(GFX_OP_PIPE_CONTROL | 3); | ||
243 | OUT_RING(PIPE_CONTROL_QW_WRITE | | ||
244 | PIPE_CONTROL_WC_FLUSH | PIPE_CONTROL_IS_FLUSH | | ||
245 | PIPE_CONTROL_NOTIFY); | ||
246 | OUT_RING(dev_priv->seqno_gfx_addr | PIPE_CONTROL_GLOBAL_GTT); | ||
247 | OUT_RING(seqno); | ||
248 | OUT_RING(0); | ||
249 | OUT_RING(0); | ||
250 | ADVANCE_LP_RING(); | ||
251 | } else if (HAS_PIPE_CONTROL(dev)) { | ||
252 | u32 scratch_addr = dev_priv->seqno_gfx_addr + 128; | ||
253 | |||
254 | /* | ||
255 | * Workaround qword write incoherence by flushing the | ||
256 | * PIPE_NOTIFY buffers out to memory before requesting | ||
257 | * an interrupt. | ||
258 | */ | ||
259 | BEGIN_LP_RING(32); | ||
260 | OUT_RING(GFX_OP_PIPE_CONTROL | PIPE_CONTROL_QW_WRITE | | ||
261 | PIPE_CONTROL_WC_FLUSH | PIPE_CONTROL_TC_FLUSH); | ||
262 | OUT_RING(dev_priv->seqno_gfx_addr | PIPE_CONTROL_GLOBAL_GTT); | ||
263 | OUT_RING(seqno); | ||
264 | OUT_RING(0); | ||
265 | PIPE_CONTROL_FLUSH(scratch_addr); | ||
266 | scratch_addr += 128; /* write to separate cachelines */ | ||
267 | PIPE_CONTROL_FLUSH(scratch_addr); | ||
268 | scratch_addr += 128; | ||
269 | PIPE_CONTROL_FLUSH(scratch_addr); | ||
270 | scratch_addr += 128; | ||
271 | PIPE_CONTROL_FLUSH(scratch_addr); | ||
272 | scratch_addr += 128; | ||
273 | PIPE_CONTROL_FLUSH(scratch_addr); | ||
274 | scratch_addr += 128; | ||
275 | PIPE_CONTROL_FLUSH(scratch_addr); | ||
276 | OUT_RING(GFX_OP_PIPE_CONTROL | PIPE_CONTROL_QW_WRITE | | ||
277 | PIPE_CONTROL_WC_FLUSH | PIPE_CONTROL_TC_FLUSH | | ||
278 | PIPE_CONTROL_NOTIFY); | ||
279 | OUT_RING(dev_priv->seqno_gfx_addr | PIPE_CONTROL_GLOBAL_GTT); | ||
280 | OUT_RING(seqno); | ||
281 | OUT_RING(0); | ||
282 | ADVANCE_LP_RING(); | ||
283 | } else { | ||
284 | BEGIN_LP_RING(4); | ||
285 | OUT_RING(MI_STORE_DWORD_INDEX); | ||
286 | OUT_RING(I915_GEM_HWS_INDEX << MI_STORE_DWORD_INDEX_SHIFT); | ||
287 | OUT_RING(seqno); | ||
288 | |||
289 | OUT_RING(MI_USER_INTERRUPT); | ||
290 | ADVANCE_LP_RING(); | ||
291 | } | ||
292 | return seqno; | ||
293 | } | ||
294 | |||
295 | static u32 | ||
296 | render_ring_get_gem_seqno(struct drm_device *dev, | ||
297 | struct intel_ring_buffer *ring) | ||
298 | { | ||
299 | drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; | ||
300 | if (HAS_PIPE_CONTROL(dev)) | ||
301 | return ((volatile u32 *)(dev_priv->seqno_page))[0]; | ||
302 | else | ||
303 | return intel_read_status_page(ring, I915_GEM_HWS_INDEX); | ||
304 | } | ||
305 | |||
306 | static void | ||
307 | render_ring_get_user_irq(struct drm_device *dev, | ||
308 | struct intel_ring_buffer *ring) | ||
309 | { | ||
310 | drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; | ||
311 | unsigned long irqflags; | ||
312 | |||
313 | spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags); | ||
314 | if (dev->irq_enabled && (++ring->user_irq_refcount == 1)) { | ||
315 | if (HAS_PCH_SPLIT(dev)) | ||
316 | ironlake_enable_graphics_irq(dev_priv, GT_PIPE_NOTIFY); | ||
317 | else | ||
318 | i915_enable_irq(dev_priv, I915_USER_INTERRUPT); | ||
319 | } | ||
320 | spin_unlock_irqrestore(&dev_priv->user_irq_lock, irqflags); | ||
321 | } | ||
322 | |||
323 | static void | ||
324 | render_ring_put_user_irq(struct drm_device *dev, | ||
325 | struct intel_ring_buffer *ring) | ||
326 | { | ||
327 | drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; | ||
328 | unsigned long irqflags; | ||
329 | |||
330 | spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags); | ||
331 | BUG_ON(dev->irq_enabled && ring->user_irq_refcount <= 0); | ||
332 | if (dev->irq_enabled && (--ring->user_irq_refcount == 0)) { | ||
333 | if (HAS_PCH_SPLIT(dev)) | ||
334 | ironlake_disable_graphics_irq(dev_priv, GT_PIPE_NOTIFY); | ||
335 | else | ||
336 | i915_disable_irq(dev_priv, I915_USER_INTERRUPT); | ||
337 | } | ||
338 | spin_unlock_irqrestore(&dev_priv->user_irq_lock, irqflags); | ||
339 | } | ||
340 | |||
341 | static void render_setup_status_page(struct drm_device *dev, | ||
342 | struct intel_ring_buffer *ring) | ||
343 | { | ||
344 | drm_i915_private_t *dev_priv = dev->dev_private; | ||
345 | if (IS_GEN6(dev)) { | ||
346 | I915_WRITE(HWS_PGA_GEN6, ring->status_page.gfx_addr); | ||
347 | I915_READ(HWS_PGA_GEN6); /* posting read */ | ||
348 | } else { | ||
349 | I915_WRITE(HWS_PGA, ring->status_page.gfx_addr); | ||
350 | I915_READ(HWS_PGA); /* posting read */ | ||
351 | } | ||
352 | |||
353 | } | ||
354 | |||
355 | void | ||
356 | bsd_ring_flush(struct drm_device *dev, | ||
357 | struct intel_ring_buffer *ring, | ||
358 | u32 invalidate_domains, | ||
359 | u32 flush_domains) | ||
360 | { | ||
361 | intel_ring_begin(dev, ring, 8); | ||
362 | intel_ring_emit(dev, ring, MI_FLUSH); | ||
363 | intel_ring_emit(dev, ring, MI_NOOP); | ||
364 | intel_ring_advance(dev, ring); | ||
365 | } | ||
366 | |||
367 | static inline unsigned int bsd_ring_get_head(struct drm_device *dev, | ||
368 | struct intel_ring_buffer *ring) | ||
369 | { | ||
370 | drm_i915_private_t *dev_priv = dev->dev_private; | ||
371 | return I915_READ(BSD_RING_HEAD) & HEAD_ADDR; | ||
372 | } | ||
373 | |||
374 | static inline unsigned int bsd_ring_get_tail(struct drm_device *dev, | ||
375 | struct intel_ring_buffer *ring) | ||
376 | { | ||
377 | drm_i915_private_t *dev_priv = dev->dev_private; | ||
378 | return I915_READ(BSD_RING_TAIL) & TAIL_ADDR; | ||
379 | } | ||
380 | |||
381 | static inline unsigned int bsd_ring_get_active_head(struct drm_device *dev, | ||
382 | struct intel_ring_buffer *ring) | ||
383 | { | ||
384 | drm_i915_private_t *dev_priv = dev->dev_private; | ||
385 | return I915_READ(BSD_RING_ACTHD); | ||
386 | } | ||
387 | |||
388 | static inline void bsd_ring_advance_ring(struct drm_device *dev, | ||
389 | struct intel_ring_buffer *ring) | ||
390 | { | ||
391 | drm_i915_private_t *dev_priv = dev->dev_private; | ||
392 | I915_WRITE(BSD_RING_TAIL, ring->tail); | ||
393 | } | ||
394 | |||
395 | static int init_bsd_ring(struct drm_device *dev, | ||
396 | struct intel_ring_buffer *ring) | ||
397 | { | ||
398 | return init_ring_common(dev, ring); | ||
399 | } | ||
400 | |||
401 | static u32 | ||
402 | bsd_ring_add_request(struct drm_device *dev, | ||
403 | struct intel_ring_buffer *ring, | ||
404 | struct drm_file *file_priv, | ||
405 | u32 flush_domains) | ||
406 | { | ||
407 | u32 seqno; | ||
408 | seqno = intel_ring_get_seqno(dev, ring); | ||
409 | intel_ring_begin(dev, ring, 4); | ||
410 | intel_ring_emit(dev, ring, MI_STORE_DWORD_INDEX); | ||
411 | intel_ring_emit(dev, ring, | ||
412 | I915_GEM_HWS_INDEX << MI_STORE_DWORD_INDEX_SHIFT); | ||
413 | intel_ring_emit(dev, ring, seqno); | ||
414 | intel_ring_emit(dev, ring, MI_USER_INTERRUPT); | ||
415 | intel_ring_advance(dev, ring); | ||
416 | |||
417 | DRM_DEBUG_DRIVER("%s %d\n", ring->name, seqno); | ||
418 | |||
419 | return seqno; | ||
420 | } | ||
421 | |||
422 | static void bsd_setup_status_page(struct drm_device *dev, | ||
423 | struct intel_ring_buffer *ring) | ||
424 | { | ||
425 | drm_i915_private_t *dev_priv = dev->dev_private; | ||
426 | I915_WRITE(BSD_HWS_PGA, ring->status_page.gfx_addr); | ||
427 | I915_READ(BSD_HWS_PGA); | ||
428 | } | ||
429 | |||
430 | static void | ||
431 | bsd_ring_get_user_irq(struct drm_device *dev, | ||
432 | struct intel_ring_buffer *ring) | ||
433 | { | ||
434 | /* do nothing */ | ||
435 | } | ||
436 | static void | ||
437 | bsd_ring_put_user_irq(struct drm_device *dev, | ||
438 | struct intel_ring_buffer *ring) | ||
439 | { | ||
440 | /* do nothing */ | ||
441 | } | ||
442 | |||
443 | static u32 | ||
444 | bsd_ring_get_gem_seqno(struct drm_device *dev, | ||
445 | struct intel_ring_buffer *ring) | ||
446 | { | ||
447 | return intel_read_status_page(ring, I915_GEM_HWS_INDEX); | ||
448 | } | ||
449 | |||
450 | static int | ||
451 | bsd_ring_dispatch_gem_execbuffer(struct drm_device *dev, | ||
452 | struct intel_ring_buffer *ring, | ||
453 | struct drm_i915_gem_execbuffer2 *exec, | ||
454 | struct drm_clip_rect *cliprects, | ||
455 | uint64_t exec_offset) | ||
456 | { | ||
457 | uint32_t exec_start; | ||
458 | exec_start = (uint32_t) exec_offset + exec->batch_start_offset; | ||
459 | intel_ring_begin(dev, ring, 2); | ||
460 | intel_ring_emit(dev, ring, MI_BATCH_BUFFER_START | | ||
461 | (2 << 6) | MI_BATCH_NON_SECURE_I965); | ||
462 | intel_ring_emit(dev, ring, exec_start); | ||
463 | intel_ring_advance(dev, ring); | ||
464 | return 0; | ||
465 | } | ||
466 | |||
467 | |||
468 | static int | ||
469 | render_ring_dispatch_gem_execbuffer(struct drm_device *dev, | ||
470 | struct intel_ring_buffer *ring, | ||
471 | struct drm_i915_gem_execbuffer2 *exec, | ||
472 | struct drm_clip_rect *cliprects, | ||
473 | uint64_t exec_offset) | ||
474 | { | ||
475 | drm_i915_private_t *dev_priv = dev->dev_private; | ||
476 | int nbox = exec->num_cliprects; | ||
477 | int i = 0, count; | ||
478 | uint32_t exec_start, exec_len; | ||
479 | exec_start = (uint32_t) exec_offset + exec->batch_start_offset; | ||
480 | exec_len = (uint32_t) exec->batch_len; | ||
481 | |||
482 | trace_i915_gem_request_submit(dev, dev_priv->mm.next_gem_seqno + 1); | ||
483 | |||
484 | count = nbox ? nbox : 1; | ||
485 | |||
486 | for (i = 0; i < count; i++) { | ||
487 | if (i < nbox) { | ||
488 | int ret = i915_emit_box(dev, cliprects, i, | ||
489 | exec->DR1, exec->DR4); | ||
490 | if (ret) | ||
491 | return ret; | ||
492 | } | ||
493 | |||
494 | if (IS_I830(dev) || IS_845G(dev)) { | ||
495 | intel_ring_begin(dev, ring, 4); | ||
496 | intel_ring_emit(dev, ring, MI_BATCH_BUFFER); | ||
497 | intel_ring_emit(dev, ring, | ||
498 | exec_start | MI_BATCH_NON_SECURE); | ||
499 | intel_ring_emit(dev, ring, exec_start + exec_len - 4); | ||
500 | intel_ring_emit(dev, ring, 0); | ||
501 | } else { | ||
502 | intel_ring_begin(dev, ring, 4); | ||
503 | if (IS_I965G(dev)) { | ||
504 | intel_ring_emit(dev, ring, | ||
505 | MI_BATCH_BUFFER_START | (2 << 6) | ||
506 | | MI_BATCH_NON_SECURE_I965); | ||
507 | intel_ring_emit(dev, ring, exec_start); | ||
508 | } else { | ||
509 | intel_ring_emit(dev, ring, MI_BATCH_BUFFER_START | ||
510 | | (2 << 6)); | ||
511 | intel_ring_emit(dev, ring, exec_start | | ||
512 | MI_BATCH_NON_SECURE); | ||
513 | } | ||
514 | } | ||
515 | intel_ring_advance(dev, ring); | ||
516 | } | ||
517 | |||
518 | /* XXX breadcrumb */ | ||
519 | return 0; | ||
520 | } | ||
521 | |||
522 | static void cleanup_status_page(struct drm_device *dev, | ||
523 | struct intel_ring_buffer *ring) | ||
524 | { | ||
525 | drm_i915_private_t *dev_priv = dev->dev_private; | ||
526 | struct drm_gem_object *obj; | ||
527 | struct drm_i915_gem_object *obj_priv; | ||
528 | |||
529 | obj = ring->status_page.obj; | ||
530 | if (obj == NULL) | ||
531 | return; | ||
532 | obj_priv = to_intel_bo(obj); | ||
533 | |||
534 | kunmap(obj_priv->pages[0]); | ||
535 | i915_gem_object_unpin(obj); | ||
536 | drm_gem_object_unreference(obj); | ||
537 | ring->status_page.obj = NULL; | ||
538 | |||
539 | memset(&dev_priv->hws_map, 0, sizeof(dev_priv->hws_map)); | ||
540 | } | ||
541 | |||
542 | static int init_status_page(struct drm_device *dev, | ||
543 | struct intel_ring_buffer *ring) | ||
544 | { | ||
545 | drm_i915_private_t *dev_priv = dev->dev_private; | ||
546 | struct drm_gem_object *obj; | ||
547 | struct drm_i915_gem_object *obj_priv; | ||
548 | int ret; | ||
549 | |||
550 | obj = i915_gem_alloc_object(dev, 4096); | ||
551 | if (obj == NULL) { | ||
552 | DRM_ERROR("Failed to allocate status page\n"); | ||
553 | ret = -ENOMEM; | ||
554 | goto err; | ||
555 | } | ||
556 | obj_priv = to_intel_bo(obj); | ||
557 | obj_priv->agp_type = AGP_USER_CACHED_MEMORY; | ||
558 | |||
559 | ret = i915_gem_object_pin(obj, 4096); | ||
560 | if (ret != 0) { | ||
561 | goto err_unref; | ||
562 | } | ||
563 | |||
564 | ring->status_page.gfx_addr = obj_priv->gtt_offset; | ||
565 | ring->status_page.page_addr = kmap(obj_priv->pages[0]); | ||
566 | if (ring->status_page.page_addr == NULL) { | ||
567 | memset(&dev_priv->hws_map, 0, sizeof(dev_priv->hws_map)); | ||
568 | goto err_unpin; | ||
569 | } | ||
570 | ring->status_page.obj = obj; | ||
571 | memset(ring->status_page.page_addr, 0, PAGE_SIZE); | ||
572 | |||
573 | ring->setup_status_page(dev, ring); | ||
574 | DRM_DEBUG_DRIVER("%s hws offset: 0x%08x\n", | ||
575 | ring->name, ring->status_page.gfx_addr); | ||
576 | |||
577 | return 0; | ||
578 | |||
579 | err_unpin: | ||
580 | i915_gem_object_unpin(obj); | ||
581 | err_unref: | ||
582 | drm_gem_object_unreference(obj); | ||
583 | err: | ||
584 | return ret; | ||
585 | } | ||
586 | |||
587 | |||
588 | int intel_init_ring_buffer(struct drm_device *dev, | ||
589 | struct intel_ring_buffer *ring) | ||
590 | { | ||
591 | int ret; | ||
592 | struct drm_i915_gem_object *obj_priv; | ||
593 | struct drm_gem_object *obj; | ||
594 | ring->dev = dev; | ||
595 | |||
596 | if (I915_NEED_GFX_HWS(dev)) { | ||
597 | ret = init_status_page(dev, ring); | ||
598 | if (ret) | ||
599 | return ret; | ||
600 | } | ||
601 | |||
602 | obj = i915_gem_alloc_object(dev, ring->size); | ||
603 | if (obj == NULL) { | ||
604 | DRM_ERROR("Failed to allocate ringbuffer\n"); | ||
605 | ret = -ENOMEM; | ||
606 | goto cleanup; | ||
607 | } | ||
608 | |||
609 | ring->gem_object = obj; | ||
610 | |||
611 | ret = i915_gem_object_pin(obj, ring->alignment); | ||
612 | if (ret != 0) { | ||
613 | drm_gem_object_unreference(obj); | ||
614 | goto cleanup; | ||
615 | } | ||
616 | |||
617 | obj_priv = to_intel_bo(obj); | ||
618 | ring->map.size = ring->size; | ||
619 | ring->map.offset = dev->agp->base + obj_priv->gtt_offset; | ||
620 | ring->map.type = 0; | ||
621 | ring->map.flags = 0; | ||
622 | ring->map.mtrr = 0; | ||
623 | |||
624 | drm_core_ioremap_wc(&ring->map, dev); | ||
625 | if (ring->map.handle == NULL) { | ||
626 | DRM_ERROR("Failed to map ringbuffer.\n"); | ||
627 | i915_gem_object_unpin(obj); | ||
628 | drm_gem_object_unreference(obj); | ||
629 | ret = -EINVAL; | ||
630 | goto cleanup; | ||
631 | } | ||
632 | |||
633 | ring->virtual_start = ring->map.handle; | ||
634 | ret = ring->init(dev, ring); | ||
635 | if (ret != 0) { | ||
636 | intel_cleanup_ring_buffer(dev, ring); | ||
637 | return ret; | ||
638 | } | ||
639 | |||
640 | if (!drm_core_check_feature(dev, DRIVER_MODESET)) | ||
641 | i915_kernel_lost_context(dev); | ||
642 | else { | ||
643 | ring->head = ring->get_head(dev, ring); | ||
644 | ring->tail = ring->get_tail(dev, ring); | ||
645 | ring->space = ring->head - (ring->tail + 8); | ||
646 | if (ring->space < 0) | ||
647 | ring->space += ring->size; | ||
648 | } | ||
649 | INIT_LIST_HEAD(&ring->active_list); | ||
650 | INIT_LIST_HEAD(&ring->request_list); | ||
651 | return ret; | ||
652 | cleanup: | ||
653 | cleanup_status_page(dev, ring); | ||
654 | return ret; | ||
655 | } | ||
656 | |||
657 | void intel_cleanup_ring_buffer(struct drm_device *dev, | ||
658 | struct intel_ring_buffer *ring) | ||
659 | { | ||
660 | if (ring->gem_object == NULL) | ||
661 | return; | ||
662 | |||
663 | drm_core_ioremapfree(&ring->map, dev); | ||
664 | |||
665 | i915_gem_object_unpin(ring->gem_object); | ||
666 | drm_gem_object_unreference(ring->gem_object); | ||
667 | ring->gem_object = NULL; | ||
668 | cleanup_status_page(dev, ring); | ||
669 | } | ||
670 | |||
671 | int intel_wrap_ring_buffer(struct drm_device *dev, | ||
672 | struct intel_ring_buffer *ring) | ||
673 | { | ||
674 | unsigned int *virt; | ||
675 | int rem; | ||
676 | rem = ring->size - ring->tail; | ||
677 | |||
678 | if (ring->space < rem) { | ||
679 | int ret = intel_wait_ring_buffer(dev, ring, rem); | ||
680 | if (ret) | ||
681 | return ret; | ||
682 | } | ||
683 | |||
684 | virt = (unsigned int *)(ring->virtual_start + ring->tail); | ||
685 | rem /= 4; | ||
686 | while (rem--) | ||
687 | *virt++ = MI_NOOP; | ||
688 | |||
689 | ring->tail = 0; | ||
690 | |||
691 | return 0; | ||
692 | } | ||
693 | |||
694 | int intel_wait_ring_buffer(struct drm_device *dev, | ||
695 | struct intel_ring_buffer *ring, int n) | ||
696 | { | ||
697 | unsigned long end; | ||
698 | |||
699 | trace_i915_ring_wait_begin (dev); | ||
700 | end = jiffies + 3 * HZ; | ||
701 | do { | ||
702 | ring->head = ring->get_head(dev, ring); | ||
703 | ring->space = ring->head - (ring->tail + 8); | ||
704 | if (ring->space < 0) | ||
705 | ring->space += ring->size; | ||
706 | if (ring->space >= n) { | ||
707 | trace_i915_ring_wait_end (dev); | ||
708 | return 0; | ||
709 | } | ||
710 | |||
711 | if (dev->primary->master) { | ||
712 | struct drm_i915_master_private *master_priv = dev->primary->master->driver_priv; | ||
713 | if (master_priv->sarea_priv) | ||
714 | master_priv->sarea_priv->perf_boxes |= I915_BOX_WAIT; | ||
715 | } | ||
716 | |||
717 | yield(); | ||
718 | } while (!time_after(jiffies, end)); | ||
719 | trace_i915_ring_wait_end (dev); | ||
720 | return -EBUSY; | ||
721 | } | ||
722 | |||
723 | void intel_ring_begin(struct drm_device *dev, | ||
724 | struct intel_ring_buffer *ring, int n) | ||
725 | { | ||
726 | if (unlikely(ring->tail + n > ring->size)) | ||
727 | intel_wrap_ring_buffer(dev, ring); | ||
728 | if (unlikely(ring->space < n)) | ||
729 | intel_wait_ring_buffer(dev, ring, n); | ||
730 | } | ||
731 | |||
732 | void intel_ring_emit(struct drm_device *dev, | ||
733 | struct intel_ring_buffer *ring, unsigned int data) | ||
734 | { | ||
735 | unsigned int *virt = ring->virtual_start + ring->tail; | ||
736 | *virt = data; | ||
737 | ring->tail += 4; | ||
738 | ring->tail &= ring->size - 1; | ||
739 | ring->space -= 4; | ||
740 | } | ||
741 | |||
742 | void intel_ring_advance(struct drm_device *dev, | ||
743 | struct intel_ring_buffer *ring) | ||
744 | { | ||
745 | ring->advance_ring(dev, ring); | ||
746 | } | ||
747 | |||
748 | void intel_fill_struct(struct drm_device *dev, | ||
749 | struct intel_ring_buffer *ring, | ||
750 | void *data, | ||
751 | unsigned int len) | ||
752 | { | ||
753 | unsigned int *virt = ring->virtual_start + ring->tail; | ||
754 | BUG_ON((len&~(4-1)) != 0); | ||
755 | intel_ring_begin(dev, ring, len); | ||
756 | memcpy(virt, data, len); | ||
757 | ring->tail += len; | ||
758 | ring->tail &= ring->size - 1; | ||
759 | ring->space -= len; | ||
760 | intel_ring_advance(dev, ring); | ||
761 | } | ||
762 | |||
763 | u32 intel_ring_get_seqno(struct drm_device *dev, | ||
764 | struct intel_ring_buffer *ring) | ||
765 | { | ||
766 | u32 seqno; | ||
767 | seqno = ring->next_seqno; | ||
768 | |||
769 | /* reserve 0 for non-seqno */ | ||
770 | if (++ring->next_seqno == 0) | ||
771 | ring->next_seqno = 1; | ||
772 | return seqno; | ||
773 | } | ||
774 | |||
775 | struct intel_ring_buffer render_ring = { | ||
776 | .name = "render ring", | ||
777 | .regs = { | ||
778 | .ctl = PRB0_CTL, | ||
779 | .head = PRB0_HEAD, | ||
780 | .tail = PRB0_TAIL, | ||
781 | .start = PRB0_START | ||
782 | }, | ||
783 | .ring_flag = I915_EXEC_RENDER, | ||
784 | .size = 32 * PAGE_SIZE, | ||
785 | .alignment = PAGE_SIZE, | ||
786 | .virtual_start = NULL, | ||
787 | .dev = NULL, | ||
788 | .gem_object = NULL, | ||
789 | .head = 0, | ||
790 | .tail = 0, | ||
791 | .space = 0, | ||
792 | .next_seqno = 1, | ||
793 | .user_irq_refcount = 0, | ||
794 | .irq_gem_seqno = 0, | ||
795 | .waiting_gem_seqno = 0, | ||
796 | .setup_status_page = render_setup_status_page, | ||
797 | .init = init_render_ring, | ||
798 | .get_head = render_ring_get_head, | ||
799 | .get_tail = render_ring_get_tail, | ||
800 | .get_active_head = render_ring_get_active_head, | ||
801 | .advance_ring = render_ring_advance_ring, | ||
802 | .flush = render_ring_flush, | ||
803 | .add_request = render_ring_add_request, | ||
804 | .get_gem_seqno = render_ring_get_gem_seqno, | ||
805 | .user_irq_get = render_ring_get_user_irq, | ||
806 | .user_irq_put = render_ring_put_user_irq, | ||
807 | .dispatch_gem_execbuffer = render_ring_dispatch_gem_execbuffer, | ||
808 | .status_page = {NULL, 0, NULL}, | ||
809 | .map = {0,} | ||
810 | }; | ||
811 | |||
812 | /* ring buffer for bit-stream decoder */ | ||
813 | |||
814 | struct intel_ring_buffer bsd_ring = { | ||
815 | .name = "bsd ring", | ||
816 | .regs = { | ||
817 | .ctl = BSD_RING_CTL, | ||
818 | .head = BSD_RING_HEAD, | ||
819 | .tail = BSD_RING_TAIL, | ||
820 | .start = BSD_RING_START | ||
821 | }, | ||
822 | .ring_flag = I915_EXEC_BSD, | ||
823 | .size = 32 * PAGE_SIZE, | ||
824 | .alignment = PAGE_SIZE, | ||
825 | .virtual_start = NULL, | ||
826 | .dev = NULL, | ||
827 | .gem_object = NULL, | ||
828 | .head = 0, | ||
829 | .tail = 0, | ||
830 | .space = 0, | ||
831 | .next_seqno = 1, | ||
832 | .user_irq_refcount = 0, | ||
833 | .irq_gem_seqno = 0, | ||
834 | .waiting_gem_seqno = 0, | ||
835 | .setup_status_page = bsd_setup_status_page, | ||
836 | .init = init_bsd_ring, | ||
837 | .get_head = bsd_ring_get_head, | ||
838 | .get_tail = bsd_ring_get_tail, | ||
839 | .get_active_head = bsd_ring_get_active_head, | ||
840 | .advance_ring = bsd_ring_advance_ring, | ||
841 | .flush = bsd_ring_flush, | ||
842 | .add_request = bsd_ring_add_request, | ||
843 | .get_gem_seqno = bsd_ring_get_gem_seqno, | ||
844 | .user_irq_get = bsd_ring_get_user_irq, | ||
845 | .user_irq_put = bsd_ring_put_user_irq, | ||
846 | .dispatch_gem_execbuffer = bsd_ring_dispatch_gem_execbuffer, | ||
847 | .status_page = {NULL, 0, NULL}, | ||
848 | .map = {0,} | ||
849 | }; | ||
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h new file mode 100644 index 00000000000..d5568d3766d --- /dev/null +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h | |||
@@ -0,0 +1,124 @@ | |||
1 | #ifndef _INTEL_RINGBUFFER_H_ | ||
2 | #define _INTEL_RINGBUFFER_H_ | ||
3 | |||
4 | struct intel_hw_status_page { | ||
5 | void *page_addr; | ||
6 | unsigned int gfx_addr; | ||
7 | struct drm_gem_object *obj; | ||
8 | }; | ||
9 | |||
10 | struct drm_i915_gem_execbuffer2; | ||
11 | struct intel_ring_buffer { | ||
12 | const char *name; | ||
13 | struct ring_regs { | ||
14 | u32 ctl; | ||
15 | u32 head; | ||
16 | u32 tail; | ||
17 | u32 start; | ||
18 | } regs; | ||
19 | unsigned int ring_flag; | ||
20 | unsigned long size; | ||
21 | unsigned int alignment; | ||
22 | void *virtual_start; | ||
23 | struct drm_device *dev; | ||
24 | struct drm_gem_object *gem_object; | ||
25 | |||
26 | unsigned int head; | ||
27 | unsigned int tail; | ||
28 | unsigned int space; | ||
29 | u32 next_seqno; | ||
30 | struct intel_hw_status_page status_page; | ||
31 | |||
32 | u32 irq_gem_seqno; /* last seq seem at irq time */ | ||
33 | u32 waiting_gem_seqno; | ||
34 | int user_irq_refcount; | ||
35 | void (*user_irq_get)(struct drm_device *dev, | ||
36 | struct intel_ring_buffer *ring); | ||
37 | void (*user_irq_put)(struct drm_device *dev, | ||
38 | struct intel_ring_buffer *ring); | ||
39 | void (*setup_status_page)(struct drm_device *dev, | ||
40 | struct intel_ring_buffer *ring); | ||
41 | |||
42 | int (*init)(struct drm_device *dev, | ||
43 | struct intel_ring_buffer *ring); | ||
44 | |||
45 | unsigned int (*get_head)(struct drm_device *dev, | ||
46 | struct intel_ring_buffer *ring); | ||
47 | unsigned int (*get_tail)(struct drm_device *dev, | ||
48 | struct intel_ring_buffer *ring); | ||
49 | unsigned int (*get_active_head)(struct drm_device *dev, | ||
50 | struct intel_ring_buffer *ring); | ||
51 | void (*advance_ring)(struct drm_device *dev, | ||
52 | struct intel_ring_buffer *ring); | ||
53 | void (*flush)(struct drm_device *dev, | ||
54 | struct intel_ring_buffer *ring, | ||
55 | u32 invalidate_domains, | ||
56 | u32 flush_domains); | ||
57 | u32 (*add_request)(struct drm_device *dev, | ||
58 | struct intel_ring_buffer *ring, | ||
59 | struct drm_file *file_priv, | ||
60 | u32 flush_domains); | ||
61 | u32 (*get_gem_seqno)(struct drm_device *dev, | ||
62 | struct intel_ring_buffer *ring); | ||
63 | int (*dispatch_gem_execbuffer)(struct drm_device *dev, | ||
64 | struct intel_ring_buffer *ring, | ||
65 | struct drm_i915_gem_execbuffer2 *exec, | ||
66 | struct drm_clip_rect *cliprects, | ||
67 | uint64_t exec_offset); | ||
68 | |||
69 | /** | ||
70 | * List of objects currently involved in rendering from the | ||
71 | * ringbuffer. | ||
72 | * | ||
73 | * Includes buffers having the contents of their GPU caches | ||
74 | * flushed, not necessarily primitives. last_rendering_seqno | ||
75 | * represents when the rendering involved will be completed. | ||
76 | * | ||
77 | * A reference is held on the buffer while on this list. | ||
78 | */ | ||
79 | struct list_head active_list; | ||
80 | |||
81 | /** | ||
82 | * List of breadcrumbs associated with GPU requests currently | ||
83 | * outstanding. | ||
84 | */ | ||
85 | struct list_head request_list; | ||
86 | |||
87 | wait_queue_head_t irq_queue; | ||
88 | drm_local_map_t map; | ||
89 | }; | ||
90 | |||
91 | static inline u32 | ||
92 | intel_read_status_page(struct intel_ring_buffer *ring, | ||
93 | int reg) | ||
94 | { | ||
95 | u32 *regs = ring->status_page.page_addr; | ||
96 | return regs[reg]; | ||
97 | } | ||
98 | |||
99 | int intel_init_ring_buffer(struct drm_device *dev, | ||
100 | struct intel_ring_buffer *ring); | ||
101 | void intel_cleanup_ring_buffer(struct drm_device *dev, | ||
102 | struct intel_ring_buffer *ring); | ||
103 | int intel_wait_ring_buffer(struct drm_device *dev, | ||
104 | struct intel_ring_buffer *ring, int n); | ||
105 | int intel_wrap_ring_buffer(struct drm_device *dev, | ||
106 | struct intel_ring_buffer *ring); | ||
107 | void intel_ring_begin(struct drm_device *dev, | ||
108 | struct intel_ring_buffer *ring, int n); | ||
109 | void intel_ring_emit(struct drm_device *dev, | ||
110 | struct intel_ring_buffer *ring, u32 data); | ||
111 | void intel_fill_struct(struct drm_device *dev, | ||
112 | struct intel_ring_buffer *ring, | ||
113 | void *data, | ||
114 | unsigned int len); | ||
115 | void intel_ring_advance(struct drm_device *dev, | ||
116 | struct intel_ring_buffer *ring); | ||
117 | |||
118 | u32 intel_ring_get_seqno(struct drm_device *dev, | ||
119 | struct intel_ring_buffer *ring); | ||
120 | |||
121 | extern struct intel_ring_buffer render_ring; | ||
122 | extern struct intel_ring_buffer bsd_ring; | ||
123 | |||
124 | #endif /* _INTEL_RINGBUFFER_H_ */ | ||
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index aba72c489a2..76993ac16cc 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c | |||
@@ -1479,7 +1479,7 @@ intel_find_analog_connector(struct drm_device *dev) | |||
1479 | intel_encoder = enc_to_intel_encoder(encoder); | 1479 | intel_encoder = enc_to_intel_encoder(encoder); |
1480 | if (intel_encoder->type == INTEL_OUTPUT_ANALOG) { | 1480 | if (intel_encoder->type == INTEL_OUTPUT_ANALOG) { |
1481 | list_for_each_entry(connector, &dev->mode_config.connector_list, head) { | 1481 | list_for_each_entry(connector, &dev->mode_config.connector_list, head) { |
1482 | if (connector && encoder == intel_attached_encoder(connector)) | 1482 | if (encoder == intel_attached_encoder(connector)) |
1483 | return connector; | 1483 | return connector; |
1484 | } | 1484 | } |
1485 | } | 1485 | } |
diff --git a/drivers/gpu/drm/nouveau/nouveau_acpi.c b/drivers/gpu/drm/nouveau/nouveau_acpi.c index e13f6af0037..d4bcca8a513 100644 --- a/drivers/gpu/drm/nouveau/nouveau_acpi.c +++ b/drivers/gpu/drm/nouveau/nouveau_acpi.c | |||
@@ -34,7 +34,7 @@ | |||
34 | static struct nouveau_dsm_priv { | 34 | static struct nouveau_dsm_priv { |
35 | bool dsm_detected; | 35 | bool dsm_detected; |
36 | acpi_handle dhandle; | 36 | acpi_handle dhandle; |
37 | acpi_handle dsm_handle; | 37 | acpi_handle rom_handle; |
38 | } nouveau_dsm_priv; | 38 | } nouveau_dsm_priv; |
39 | 39 | ||
40 | static const char nouveau_dsm_muid[] = { | 40 | static const char nouveau_dsm_muid[] = { |
@@ -107,9 +107,9 @@ static int nouveau_dsm_set_discrete_state(acpi_handle handle, enum vga_switchero | |||
107 | static int nouveau_dsm_switchto(enum vga_switcheroo_client_id id) | 107 | static int nouveau_dsm_switchto(enum vga_switcheroo_client_id id) |
108 | { | 108 | { |
109 | if (id == VGA_SWITCHEROO_IGD) | 109 | if (id == VGA_SWITCHEROO_IGD) |
110 | return nouveau_dsm_switch_mux(nouveau_dsm_priv.dsm_handle, NOUVEAU_DSM_LED_STAMINA); | 110 | return nouveau_dsm_switch_mux(nouveau_dsm_priv.dhandle, NOUVEAU_DSM_LED_STAMINA); |
111 | else | 111 | else |
112 | return nouveau_dsm_switch_mux(nouveau_dsm_priv.dsm_handle, NOUVEAU_DSM_LED_SPEED); | 112 | return nouveau_dsm_switch_mux(nouveau_dsm_priv.dhandle, NOUVEAU_DSM_LED_SPEED); |
113 | } | 113 | } |
114 | 114 | ||
115 | static int nouveau_dsm_power_state(enum vga_switcheroo_client_id id, | 115 | static int nouveau_dsm_power_state(enum vga_switcheroo_client_id id, |
@@ -118,7 +118,7 @@ static int nouveau_dsm_power_state(enum vga_switcheroo_client_id id, | |||
118 | if (id == VGA_SWITCHEROO_IGD) | 118 | if (id == VGA_SWITCHEROO_IGD) |
119 | return 0; | 119 | return 0; |
120 | 120 | ||
121 | return nouveau_dsm_set_discrete_state(nouveau_dsm_priv.dsm_handle, state); | 121 | return nouveau_dsm_set_discrete_state(nouveau_dsm_priv.dhandle, state); |
122 | } | 122 | } |
123 | 123 | ||
124 | static int nouveau_dsm_init(void) | 124 | static int nouveau_dsm_init(void) |
@@ -151,18 +151,18 @@ static bool nouveau_dsm_pci_probe(struct pci_dev *pdev) | |||
151 | dhandle = DEVICE_ACPI_HANDLE(&pdev->dev); | 151 | dhandle = DEVICE_ACPI_HANDLE(&pdev->dev); |
152 | if (!dhandle) | 152 | if (!dhandle) |
153 | return false; | 153 | return false; |
154 | |||
154 | status = acpi_get_handle(dhandle, "_DSM", &nvidia_handle); | 155 | status = acpi_get_handle(dhandle, "_DSM", &nvidia_handle); |
155 | if (ACPI_FAILURE(status)) { | 156 | if (ACPI_FAILURE(status)) { |
156 | return false; | 157 | return false; |
157 | } | 158 | } |
158 | 159 | ||
159 | ret= nouveau_dsm(nvidia_handle, NOUVEAU_DSM_SUPPORTED, | 160 | ret = nouveau_dsm(dhandle, NOUVEAU_DSM_SUPPORTED, |
160 | NOUVEAU_DSM_SUPPORTED_FUNCTIONS, &result); | 161 | NOUVEAU_DSM_SUPPORTED_FUNCTIONS, &result); |
161 | if (ret < 0) | 162 | if (ret < 0) |
162 | return false; | 163 | return false; |
163 | 164 | ||
164 | nouveau_dsm_priv.dhandle = dhandle; | 165 | nouveau_dsm_priv.dhandle = dhandle; |
165 | nouveau_dsm_priv.dsm_handle = nvidia_handle; | ||
166 | return true; | 166 | return true; |
167 | } | 167 | } |
168 | 168 | ||
@@ -173,6 +173,7 @@ static bool nouveau_dsm_detect(void) | |||
173 | struct pci_dev *pdev = NULL; | 173 | struct pci_dev *pdev = NULL; |
174 | int has_dsm = 0; | 174 | int has_dsm = 0; |
175 | int vga_count = 0; | 175 | int vga_count = 0; |
176 | |||
176 | while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, pdev)) != NULL) { | 177 | while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, pdev)) != NULL) { |
177 | vga_count++; | 178 | vga_count++; |
178 | 179 | ||
@@ -180,7 +181,7 @@ static bool nouveau_dsm_detect(void) | |||
180 | } | 181 | } |
181 | 182 | ||
182 | if (vga_count == 2 && has_dsm) { | 183 | if (vga_count == 2 && has_dsm) { |
183 | acpi_get_name(nouveau_dsm_priv.dsm_handle, ACPI_FULL_PATHNAME, &buffer); | 184 | acpi_get_name(nouveau_dsm_priv.dhandle, ACPI_FULL_PATHNAME, &buffer); |
184 | printk(KERN_INFO "VGA switcheroo: detected DSM switching method %s handle\n", | 185 | printk(KERN_INFO "VGA switcheroo: detected DSM switching method %s handle\n", |
185 | acpi_method_name); | 186 | acpi_method_name); |
186 | nouveau_dsm_priv.dsm_detected = true; | 187 | nouveau_dsm_priv.dsm_detected = true; |
@@ -204,3 +205,57 @@ void nouveau_unregister_dsm_handler(void) | |||
204 | { | 205 | { |
205 | vga_switcheroo_unregister_handler(); | 206 | vga_switcheroo_unregister_handler(); |
206 | } | 207 | } |
208 | |||
209 | /* retrieve the ROM in 4k blocks */ | ||
210 | static int nouveau_rom_call(acpi_handle rom_handle, uint8_t *bios, | ||
211 | int offset, int len) | ||
212 | { | ||
213 | acpi_status status; | ||
214 | union acpi_object rom_arg_elements[2], *obj; | ||
215 | struct acpi_object_list rom_arg; | ||
216 | struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL}; | ||
217 | |||
218 | rom_arg.count = 2; | ||
219 | rom_arg.pointer = &rom_arg_elements[0]; | ||
220 | |||
221 | rom_arg_elements[0].type = ACPI_TYPE_INTEGER; | ||
222 | rom_arg_elements[0].integer.value = offset; | ||
223 | |||
224 | rom_arg_elements[1].type = ACPI_TYPE_INTEGER; | ||
225 | rom_arg_elements[1].integer.value = len; | ||
226 | |||
227 | status = acpi_evaluate_object(rom_handle, NULL, &rom_arg, &buffer); | ||
228 | if (ACPI_FAILURE(status)) { | ||
229 | printk(KERN_INFO "failed to evaluate ROM got %s\n", acpi_format_exception(status)); | ||
230 | return -ENODEV; | ||
231 | } | ||
232 | obj = (union acpi_object *)buffer.pointer; | ||
233 | memcpy(bios+offset, obj->buffer.pointer, len); | ||
234 | kfree(buffer.pointer); | ||
235 | return len; | ||
236 | } | ||
237 | |||
238 | bool nouveau_acpi_rom_supported(struct pci_dev *pdev) | ||
239 | { | ||
240 | acpi_status status; | ||
241 | acpi_handle dhandle, rom_handle; | ||
242 | |||
243 | if (!nouveau_dsm_priv.dsm_detected) | ||
244 | return false; | ||
245 | |||
246 | dhandle = DEVICE_ACPI_HANDLE(&pdev->dev); | ||
247 | if (!dhandle) | ||
248 | return false; | ||
249 | |||
250 | status = acpi_get_handle(dhandle, "_ROM", &rom_handle); | ||
251 | if (ACPI_FAILURE(status)) | ||
252 | return false; | ||
253 | |||
254 | nouveau_dsm_priv.rom_handle = rom_handle; | ||
255 | return true; | ||
256 | } | ||
257 | |||
258 | int nouveau_acpi_get_bios_chunk(uint8_t *bios, int offset, int len) | ||
259 | { | ||
260 | return nouveau_rom_call(nouveau_dsm_priv.rom_handle, bios, offset, len); | ||
261 | } | ||
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c index e7e69ccce5c..9ba2deaadcc 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bios.c +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c | |||
@@ -178,6 +178,25 @@ out: | |||
178 | pci_disable_rom(dev->pdev); | 178 | pci_disable_rom(dev->pdev); |
179 | } | 179 | } |
180 | 180 | ||
181 | static void load_vbios_acpi(struct drm_device *dev, uint8_t *data) | ||
182 | { | ||
183 | int i; | ||
184 | int ret; | ||
185 | int size = 64 * 1024; | ||
186 | |||
187 | if (!nouveau_acpi_rom_supported(dev->pdev)) | ||
188 | return; | ||
189 | |||
190 | for (i = 0; i < (size / ROM_BIOS_PAGE); i++) { | ||
191 | ret = nouveau_acpi_get_bios_chunk(data, | ||
192 | (i * ROM_BIOS_PAGE), | ||
193 | ROM_BIOS_PAGE); | ||
194 | if (ret <= 0) | ||
195 | break; | ||
196 | } | ||
197 | return; | ||
198 | } | ||
199 | |||
181 | struct methods { | 200 | struct methods { |
182 | const char desc[8]; | 201 | const char desc[8]; |
183 | void (*loadbios)(struct drm_device *, uint8_t *); | 202 | void (*loadbios)(struct drm_device *, uint8_t *); |
@@ -191,6 +210,7 @@ static struct methods nv04_methods[] = { | |||
191 | }; | 210 | }; |
192 | 211 | ||
193 | static struct methods nv50_methods[] = { | 212 | static struct methods nv50_methods[] = { |
213 | { "ACPI", load_vbios_acpi, true }, | ||
194 | { "PRAMIN", load_vbios_pramin, true }, | 214 | { "PRAMIN", load_vbios_pramin, true }, |
195 | { "PROM", load_vbios_prom, false }, | 215 | { "PROM", load_vbios_prom, false }, |
196 | { "PCIROM", load_vbios_pci, true }, | 216 | { "PCIROM", load_vbios_pci, true }, |
@@ -2807,7 +2827,10 @@ init_gpio(struct nvbios *bios, uint16_t offset, struct init_exec *iexec) | |||
2807 | 2827 | ||
2808 | BIOSLOG(bios, "0x%04X: Entry: 0x%08X\n", offset, gpio->entry); | 2828 | BIOSLOG(bios, "0x%04X: Entry: 0x%08X\n", offset, gpio->entry); |
2809 | 2829 | ||
2810 | nv50_gpio_set(bios->dev, gpio->tag, gpio->state_default); | 2830 | BIOSLOG(bios, "0x%04X: set gpio 0x%02x, state %d\n", |
2831 | offset, gpio->tag, gpio->state_default); | ||
2832 | if (bios->execute) | ||
2833 | nv50_gpio_set(bios->dev, gpio->tag, gpio->state_default); | ||
2811 | 2834 | ||
2812 | /* The NVIDIA binary driver doesn't appear to actually do | 2835 | /* The NVIDIA binary driver doesn't appear to actually do |
2813 | * any of this, my VBIOS does however. | 2836 | * any of this, my VBIOS does however. |
@@ -5533,12 +5556,6 @@ parse_dcb20_entry(struct drm_device *dev, struct dcb_table *dcb, | |||
5533 | entry->bus = (conn >> 16) & 0xf; | 5556 | entry->bus = (conn >> 16) & 0xf; |
5534 | entry->location = (conn >> 20) & 0x3; | 5557 | entry->location = (conn >> 20) & 0x3; |
5535 | entry->or = (conn >> 24) & 0xf; | 5558 | entry->or = (conn >> 24) & 0xf; |
5536 | /* | ||
5537 | * Normal entries consist of a single bit, but dual link has the | ||
5538 | * next most significant bit set too | ||
5539 | */ | ||
5540 | entry->duallink_possible = | ||
5541 | ((1 << (ffs(entry->or) - 1)) * 3 == entry->or); | ||
5542 | 5559 | ||
5543 | switch (entry->type) { | 5560 | switch (entry->type) { |
5544 | case OUTPUT_ANALOG: | 5561 | case OUTPUT_ANALOG: |
@@ -5622,6 +5639,16 @@ parse_dcb20_entry(struct drm_device *dev, struct dcb_table *dcb, | |||
5622 | break; | 5639 | break; |
5623 | } | 5640 | } |
5624 | 5641 | ||
5642 | if (dcb->version < 0x40) { | ||
5643 | /* Normal entries consist of a single bit, but dual link has | ||
5644 | * the next most significant bit set too | ||
5645 | */ | ||
5646 | entry->duallink_possible = | ||
5647 | ((1 << (ffs(entry->or) - 1)) * 3 == entry->or); | ||
5648 | } else { | ||
5649 | entry->duallink_possible = (entry->sorconf.link == 3); | ||
5650 | } | ||
5651 | |||
5625 | /* unsure what DCB version introduces this, 3.0? */ | 5652 | /* unsure what DCB version introduces this, 3.0? */ |
5626 | if (conf & 0x100000) | 5653 | if (conf & 0x100000) |
5627 | entry->i2c_upper_default = true; | 5654 | entry->i2c_upper_default = true; |
@@ -6205,6 +6232,30 @@ nouveau_bios_i2c_devices_takedown(struct drm_device *dev) | |||
6205 | nouveau_i2c_fini(dev, entry); | 6232 | nouveau_i2c_fini(dev, entry); |
6206 | } | 6233 | } |
6207 | 6234 | ||
6235 | static bool | ||
6236 | nouveau_bios_posted(struct drm_device *dev) | ||
6237 | { | ||
6238 | struct drm_nouveau_private *dev_priv = dev->dev_private; | ||
6239 | bool was_locked; | ||
6240 | unsigned htotal; | ||
6241 | |||
6242 | if (dev_priv->chipset >= NV_50) { | ||
6243 | if (NVReadVgaCrtc(dev, 0, 0x00) == 0 && | ||
6244 | NVReadVgaCrtc(dev, 0, 0x1a) == 0) | ||
6245 | return false; | ||
6246 | return true; | ||
6247 | } | ||
6248 | |||
6249 | was_locked = NVLockVgaCrtcs(dev, false); | ||
6250 | htotal = NVReadVgaCrtc(dev, 0, 0x06); | ||
6251 | htotal |= (NVReadVgaCrtc(dev, 0, 0x07) & 0x01) << 8; | ||
6252 | htotal |= (NVReadVgaCrtc(dev, 0, 0x07) & 0x20) << 4; | ||
6253 | htotal |= (NVReadVgaCrtc(dev, 0, 0x25) & 0x01) << 10; | ||
6254 | htotal |= (NVReadVgaCrtc(dev, 0, 0x41) & 0x01) << 11; | ||
6255 | NVLockVgaCrtcs(dev, was_locked); | ||
6256 | return (htotal != 0); | ||
6257 | } | ||
6258 | |||
6208 | int | 6259 | int |
6209 | nouveau_bios_init(struct drm_device *dev) | 6260 | nouveau_bios_init(struct drm_device *dev) |
6210 | { | 6261 | { |
@@ -6239,11 +6290,9 @@ nouveau_bios_init(struct drm_device *dev) | |||
6239 | bios->execute = false; | 6290 | bios->execute = false; |
6240 | 6291 | ||
6241 | /* ... unless card isn't POSTed already */ | 6292 | /* ... unless card isn't POSTed already */ |
6242 | if (dev_priv->card_type >= NV_10 && | 6293 | if (!nouveau_bios_posted(dev)) { |
6243 | NVReadVgaCrtc(dev, 0, 0x00) == 0 && | ||
6244 | NVReadVgaCrtc(dev, 0, 0x1a) == 0) { | ||
6245 | NV_INFO(dev, "Adaptor not initialised\n"); | 6294 | NV_INFO(dev, "Adaptor not initialised\n"); |
6246 | if (dev_priv->card_type < NV_50) { | 6295 | if (dev_priv->card_type < NV_40) { |
6247 | NV_ERROR(dev, "Unable to POST this chipset\n"); | 6296 | NV_ERROR(dev, "Unable to POST this chipset\n"); |
6248 | return -ENODEV; | 6297 | return -ENODEV; |
6249 | } | 6298 | } |
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c index 266b0ff441a..149ed224c3c 100644 --- a/drivers/gpu/drm/nouveau/nouveau_connector.c +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c | |||
@@ -432,24 +432,27 @@ nouveau_connector_set_property(struct drm_connector *connector, | |||
432 | } | 432 | } |
433 | 433 | ||
434 | static struct drm_display_mode * | 434 | static struct drm_display_mode * |
435 | nouveau_connector_native_mode(struct nouveau_connector *connector) | 435 | nouveau_connector_native_mode(struct drm_connector *connector) |
436 | { | 436 | { |
437 | struct drm_device *dev = connector->base.dev; | 437 | struct drm_connector_helper_funcs *helper = connector->helper_private; |
438 | struct nouveau_connector *nv_connector = nouveau_connector(connector); | ||
439 | struct drm_device *dev = connector->dev; | ||
438 | struct drm_display_mode *mode, *largest = NULL; | 440 | struct drm_display_mode *mode, *largest = NULL; |
439 | int high_w = 0, high_h = 0, high_v = 0; | 441 | int high_w = 0, high_h = 0, high_v = 0; |
440 | 442 | ||
441 | /* Use preferred mode if there is one.. */ | 443 | list_for_each_entry(mode, &nv_connector->base.probed_modes, head) { |
442 | list_for_each_entry(mode, &connector->base.probed_modes, head) { | 444 | if (helper->mode_valid(connector, mode) != MODE_OK) |
445 | continue; | ||
446 | |||
447 | /* Use preferred mode if there is one.. */ | ||
443 | if (mode->type & DRM_MODE_TYPE_PREFERRED) { | 448 | if (mode->type & DRM_MODE_TYPE_PREFERRED) { |
444 | NV_DEBUG_KMS(dev, "native mode from preferred\n"); | 449 | NV_DEBUG_KMS(dev, "native mode from preferred\n"); |
445 | return drm_mode_duplicate(dev, mode); | 450 | return drm_mode_duplicate(dev, mode); |
446 | } | 451 | } |
447 | } | ||
448 | 452 | ||
449 | /* Otherwise, take the resolution with the largest width, then height, | 453 | /* Otherwise, take the resolution with the largest width, then |
450 | * then vertical refresh | 454 | * height, then vertical refresh |
451 | */ | 455 | */ |
452 | list_for_each_entry(mode, &connector->base.probed_modes, head) { | ||
453 | if (mode->hdisplay < high_w) | 456 | if (mode->hdisplay < high_w) |
454 | continue; | 457 | continue; |
455 | 458 | ||
@@ -553,7 +556,7 @@ nouveau_connector_get_modes(struct drm_connector *connector) | |||
553 | */ | 556 | */ |
554 | if (!nv_connector->native_mode) | 557 | if (!nv_connector->native_mode) |
555 | nv_connector->native_mode = | 558 | nv_connector->native_mode = |
556 | nouveau_connector_native_mode(nv_connector); | 559 | nouveau_connector_native_mode(connector); |
557 | if (ret == 0 && nv_connector->native_mode) { | 560 | if (ret == 0 && nv_connector->native_mode) { |
558 | struct drm_display_mode *mode; | 561 | struct drm_display_mode *mode; |
559 | 562 | ||
@@ -584,9 +587,9 @@ nouveau_connector_mode_valid(struct drm_connector *connector, | |||
584 | 587 | ||
585 | switch (nv_encoder->dcb->type) { | 588 | switch (nv_encoder->dcb->type) { |
586 | case OUTPUT_LVDS: | 589 | case OUTPUT_LVDS: |
587 | BUG_ON(!nv_connector->native_mode); | 590 | if (nv_connector->native_mode && |
588 | if (mode->hdisplay > nv_connector->native_mode->hdisplay || | 591 | (mode->hdisplay > nv_connector->native_mode->hdisplay || |
589 | mode->vdisplay > nv_connector->native_mode->vdisplay) | 592 | mode->vdisplay > nv_connector->native_mode->vdisplay)) |
590 | return MODE_PANEL; | 593 | return MODE_PANEL; |
591 | 594 | ||
592 | min_clock = 0; | 595 | min_clock = 0; |
@@ -594,8 +597,7 @@ nouveau_connector_mode_valid(struct drm_connector *connector, | |||
594 | break; | 597 | break; |
595 | case OUTPUT_TMDS: | 598 | case OUTPUT_TMDS: |
596 | if ((dev_priv->card_type >= NV_50 && !nouveau_duallink) || | 599 | if ((dev_priv->card_type >= NV_50 && !nouveau_duallink) || |
597 | (dev_priv->card_type < NV_50 && | 600 | !nv_encoder->dcb->duallink_possible) |
598 | !nv_encoder->dcb->duallink_possible)) | ||
599 | max_clock = 165000; | 601 | max_clock = 165000; |
600 | else | 602 | else |
601 | max_clock = 330000; | 603 | max_clock = 330000; |
@@ -729,7 +731,7 @@ nouveau_connector_create_lvds(struct drm_device *dev, | |||
729 | if (ret == 0) | 731 | if (ret == 0) |
730 | goto out; | 732 | goto out; |
731 | nv_connector->detected_encoder = nv_encoder; | 733 | nv_connector->detected_encoder = nv_encoder; |
732 | nv_connector->native_mode = nouveau_connector_native_mode(nv_connector); | 734 | nv_connector->native_mode = nouveau_connector_native_mode(connector); |
733 | list_for_each_entry_safe(mode, temp, &connector->probed_modes, head) | 735 | list_for_each_entry_safe(mode, temp, &connector->probed_modes, head) |
734 | drm_mode_remove(connector, mode); | 736 | drm_mode_remove(connector, mode); |
735 | 737 | ||
diff --git a/drivers/gpu/drm/nouveau/nouveau_crtc.h b/drivers/gpu/drm/nouveau/nouveau_crtc.h index 49fa7b2d257..cb1ce2a0916 100644 --- a/drivers/gpu/drm/nouveau/nouveau_crtc.h +++ b/drivers/gpu/drm/nouveau/nouveau_crtc.h | |||
@@ -40,6 +40,8 @@ struct nouveau_crtc { | |||
40 | int sharpness; | 40 | int sharpness; |
41 | int last_dpms; | 41 | int last_dpms; |
42 | 42 | ||
43 | int cursor_saved_x, cursor_saved_y; | ||
44 | |||
43 | struct { | 45 | struct { |
44 | int cpp; | 46 | int cpp; |
45 | bool blanked; | 47 | bool blanked; |
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c index c6079e36669..27377043229 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.c +++ b/drivers/gpu/drm/nouveau/nouveau_drv.c | |||
@@ -175,6 +175,13 @@ nouveau_pci_suspend(struct pci_dev *pdev, pm_message_t pm_state) | |||
175 | nouveau_bo_unpin(nouveau_fb->nvbo); | 175 | nouveau_bo_unpin(nouveau_fb->nvbo); |
176 | } | 176 | } |
177 | 177 | ||
178 | list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { | ||
179 | struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc); | ||
180 | |||
181 | nouveau_bo_unmap(nv_crtc->cursor.nvbo); | ||
182 | nouveau_bo_unpin(nv_crtc->cursor.nvbo); | ||
183 | } | ||
184 | |||
178 | NV_INFO(dev, "Evicting buffers...\n"); | 185 | NV_INFO(dev, "Evicting buffers...\n"); |
179 | ttm_bo_evict_mm(&dev_priv->ttm.bdev, TTM_PL_VRAM); | 186 | ttm_bo_evict_mm(&dev_priv->ttm.bdev, TTM_PL_VRAM); |
180 | 187 | ||
@@ -314,12 +321,34 @@ nouveau_pci_resume(struct pci_dev *pdev) | |||
314 | nouveau_bo_pin(nouveau_fb->nvbo, TTM_PL_FLAG_VRAM); | 321 | nouveau_bo_pin(nouveau_fb->nvbo, TTM_PL_FLAG_VRAM); |
315 | } | 322 | } |
316 | 323 | ||
324 | list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { | ||
325 | struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc); | ||
326 | int ret; | ||
327 | |||
328 | ret = nouveau_bo_pin(nv_crtc->cursor.nvbo, TTM_PL_FLAG_VRAM); | ||
329 | if (!ret) | ||
330 | ret = nouveau_bo_map(nv_crtc->cursor.nvbo); | ||
331 | if (ret) | ||
332 | NV_ERROR(dev, "Could not pin/map cursor.\n"); | ||
333 | } | ||
334 | |||
317 | if (dev_priv->card_type < NV_50) { | 335 | if (dev_priv->card_type < NV_50) { |
318 | nv04_display_restore(dev); | 336 | nv04_display_restore(dev); |
319 | NVLockVgaCrtcs(dev, false); | 337 | NVLockVgaCrtcs(dev, false); |
320 | } else | 338 | } else |
321 | nv50_display_init(dev); | 339 | nv50_display_init(dev); |
322 | 340 | ||
341 | list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { | ||
342 | struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc); | ||
343 | |||
344 | nv_crtc->cursor.set_offset(nv_crtc, | ||
345 | nv_crtc->cursor.nvbo->bo.offset - | ||
346 | dev_priv->vm_vram_base); | ||
347 | |||
348 | nv_crtc->cursor.set_pos(nv_crtc, nv_crtc->cursor_saved_x, | ||
349 | nv_crtc->cursor_saved_y); | ||
350 | } | ||
351 | |||
323 | /* Force CLUT to get re-loaded during modeset */ | 352 | /* Force CLUT to get re-loaded during modeset */ |
324 | list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { | 353 | list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { |
325 | struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc); | 354 | struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc); |
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h index 5b134438eff..c6971910648 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h | |||
@@ -851,12 +851,17 @@ extern int nouveau_dma_init(struct nouveau_channel *); | |||
851 | extern int nouveau_dma_wait(struct nouveau_channel *, int slots, int size); | 851 | extern int nouveau_dma_wait(struct nouveau_channel *, int slots, int size); |
852 | 852 | ||
853 | /* nouveau_acpi.c */ | 853 | /* nouveau_acpi.c */ |
854 | #define ROM_BIOS_PAGE 4096 | ||
854 | #if defined(CONFIG_ACPI) | 855 | #if defined(CONFIG_ACPI) |
855 | void nouveau_register_dsm_handler(void); | 856 | void nouveau_register_dsm_handler(void); |
856 | void nouveau_unregister_dsm_handler(void); | 857 | void nouveau_unregister_dsm_handler(void); |
858 | int nouveau_acpi_get_bios_chunk(uint8_t *bios, int offset, int len); | ||
859 | bool nouveau_acpi_rom_supported(struct pci_dev *pdev); | ||
857 | #else | 860 | #else |
858 | static inline void nouveau_register_dsm_handler(void) {} | 861 | static inline void nouveau_register_dsm_handler(void) {} |
859 | static inline void nouveau_unregister_dsm_handler(void) {} | 862 | static inline void nouveau_unregister_dsm_handler(void) {} |
863 | static inline bool nouveau_acpi_rom_supported(struct pci_dev *pdev) { return false; } | ||
864 | static inline int nouveau_acpi_get_bios_chunk(uint8_t *bios, int offset, int len) { return -EINVAL; } | ||
860 | #endif | 865 | #endif |
861 | 866 | ||
862 | /* nouveau_backlight.c */ | 867 | /* nouveau_backlight.c */ |
diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c index 775a7017af6..c1fd42b0dad 100644 --- a/drivers/gpu/drm/nouveau/nouveau_mem.c +++ b/drivers/gpu/drm/nouveau/nouveau_mem.c | |||
@@ -540,7 +540,8 @@ nouveau_mem_detect(struct drm_device *dev) | |||
540 | dev_priv->vram_size = nv_rd32(dev, NV04_FIFO_DATA); | 540 | dev_priv->vram_size = nv_rd32(dev, NV04_FIFO_DATA); |
541 | dev_priv->vram_size &= NV10_FIFO_DATA_RAM_AMOUNT_MB_MASK; | 541 | dev_priv->vram_size &= NV10_FIFO_DATA_RAM_AMOUNT_MB_MASK; |
542 | if (dev_priv->chipset == 0xaa || dev_priv->chipset == 0xac) | 542 | if (dev_priv->chipset == 0xaa || dev_priv->chipset == 0xac) |
543 | dev_priv->vram_sys_base = nv_rd32(dev, 0x100e10) << 12; | 543 | dev_priv->vram_sys_base = nv_rd32(dev, 0x100e10); |
544 | dev_priv->vram_sys_base <<= 12; | ||
544 | } | 545 | } |
545 | 546 | ||
546 | NV_INFO(dev, "Detected %dMiB VRAM\n", (int)(dev_priv->vram_size >> 20)); | 547 | NV_INFO(dev, "Detected %dMiB VRAM\n", (int)(dev_priv->vram_size >> 20)); |
diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c index e632339c323..147e59c4015 100644 --- a/drivers/gpu/drm/nouveau/nouveau_state.c +++ b/drivers/gpu/drm/nouveau/nouveau_state.c | |||
@@ -376,12 +376,15 @@ out_err: | |||
376 | static void nouveau_switcheroo_set_state(struct pci_dev *pdev, | 376 | static void nouveau_switcheroo_set_state(struct pci_dev *pdev, |
377 | enum vga_switcheroo_state state) | 377 | enum vga_switcheroo_state state) |
378 | { | 378 | { |
379 | struct drm_device *dev = pci_get_drvdata(pdev); | ||
379 | pm_message_t pmm = { .event = PM_EVENT_SUSPEND }; | 380 | pm_message_t pmm = { .event = PM_EVENT_SUSPEND }; |
380 | if (state == VGA_SWITCHEROO_ON) { | 381 | if (state == VGA_SWITCHEROO_ON) { |
381 | printk(KERN_ERR "VGA switcheroo: switched nouveau on\n"); | 382 | printk(KERN_ERR "VGA switcheroo: switched nouveau on\n"); |
382 | nouveau_pci_resume(pdev); | 383 | nouveau_pci_resume(pdev); |
384 | drm_kms_helper_poll_enable(dev); | ||
383 | } else { | 385 | } else { |
384 | printk(KERN_ERR "VGA switcheroo: switched nouveau off\n"); | 386 | printk(KERN_ERR "VGA switcheroo: switched nouveau off\n"); |
387 | drm_kms_helper_poll_disable(dev); | ||
385 | nouveau_pci_suspend(pdev, pmm); | 388 | nouveau_pci_suspend(pdev, pmm); |
386 | } | 389 | } |
387 | } | 390 | } |
@@ -913,6 +916,9 @@ int nouveau_ioctl_getparam(struct drm_device *dev, void *data, | |||
913 | case NOUVEAU_GETPARAM_VM_VRAM_BASE: | 916 | case NOUVEAU_GETPARAM_VM_VRAM_BASE: |
914 | getparam->value = dev_priv->vm_vram_base; | 917 | getparam->value = dev_priv->vm_vram_base; |
915 | break; | 918 | break; |
919 | case NOUVEAU_GETPARAM_PTIMER_TIME: | ||
920 | getparam->value = dev_priv->engine.timer.read(dev); | ||
921 | break; | ||
916 | case NOUVEAU_GETPARAM_GRAPH_UNITS: | 922 | case NOUVEAU_GETPARAM_GRAPH_UNITS: |
917 | /* NV40 and NV50 versions are quite different, but register | 923 | /* NV40 and NV50 versions are quite different, but register |
918 | * address is the same. User is supposed to know the card | 924 | * address is the same. User is supposed to know the card |
diff --git a/drivers/gpu/drm/nouveau/nv04_cursor.c b/drivers/gpu/drm/nouveau/nv04_cursor.c index 89a91b9d8b2..aaf3de3bc81 100644 --- a/drivers/gpu/drm/nouveau/nv04_cursor.c +++ b/drivers/gpu/drm/nouveau/nv04_cursor.c | |||
@@ -20,6 +20,7 @@ nv04_cursor_hide(struct nouveau_crtc *nv_crtc, bool update) | |||
20 | static void | 20 | static void |
21 | nv04_cursor_set_pos(struct nouveau_crtc *nv_crtc, int x, int y) | 21 | nv04_cursor_set_pos(struct nouveau_crtc *nv_crtc, int x, int y) |
22 | { | 22 | { |
23 | nv_crtc->cursor_saved_x = x; nv_crtc->cursor_saved_y = y; | ||
23 | NVWriteRAMDAC(nv_crtc->base.dev, nv_crtc->index, | 24 | NVWriteRAMDAC(nv_crtc->base.dev, nv_crtc->index, |
24 | NV_PRAMDAC_CU_START_POS, | 25 | NV_PRAMDAC_CU_START_POS, |
25 | XLATE(y, 0, NV_PRAMDAC_CU_START_POS_Y) | | 26 | XLATE(y, 0, NV_PRAMDAC_CU_START_POS_Y) | |
diff --git a/drivers/gpu/drm/nouveau/nv50_cursor.c b/drivers/gpu/drm/nouveau/nv50_cursor.c index 753e723adb3..03ad7ab14f0 100644 --- a/drivers/gpu/drm/nouveau/nv50_cursor.c +++ b/drivers/gpu/drm/nouveau/nv50_cursor.c | |||
@@ -107,6 +107,7 @@ nv50_cursor_set_pos(struct nouveau_crtc *nv_crtc, int x, int y) | |||
107 | { | 107 | { |
108 | struct drm_device *dev = nv_crtc->base.dev; | 108 | struct drm_device *dev = nv_crtc->base.dev; |
109 | 109 | ||
110 | nv_crtc->cursor_saved_x = x; nv_crtc->cursor_saved_y = y; | ||
110 | nv_wr32(dev, NV50_PDISPLAY_CURSOR_USER_POS(nv_crtc->index), | 111 | nv_wr32(dev, NV50_PDISPLAY_CURSOR_USER_POS(nv_crtc->index), |
111 | ((y & 0xFFFF) << 16) | (x & 0xFFFF)); | 112 | ((y & 0xFFFF) << 16) | (x & 0xFFFF)); |
112 | /* Needed to make the cursor move. */ | 113 | /* Needed to make the cursor move. */ |
diff --git a/drivers/gpu/drm/nouveau/nv50_sor.c b/drivers/gpu/drm/nouveau/nv50_sor.c index b11eaf9c5c7..812778db76a 100644 --- a/drivers/gpu/drm/nouveau/nv50_sor.c +++ b/drivers/gpu/drm/nouveau/nv50_sor.c | |||
@@ -274,7 +274,6 @@ static const struct drm_encoder_funcs nv50_sor_encoder_funcs = { | |||
274 | int | 274 | int |
275 | nv50_sor_create(struct drm_device *dev, struct dcb_entry *entry) | 275 | nv50_sor_create(struct drm_device *dev, struct dcb_entry *entry) |
276 | { | 276 | { |
277 | struct drm_nouveau_private *dev_priv = dev->dev_private; | ||
278 | struct nouveau_encoder *nv_encoder = NULL; | 277 | struct nouveau_encoder *nv_encoder = NULL; |
279 | struct drm_encoder *encoder; | 278 | struct drm_encoder *encoder; |
280 | bool dum; | 279 | bool dum; |
@@ -324,11 +323,7 @@ nv50_sor_create(struct drm_device *dev, struct dcb_entry *entry) | |||
324 | int or = nv_encoder->or, link = !(entry->dpconf.sor.link & 1); | 323 | int or = nv_encoder->or, link = !(entry->dpconf.sor.link & 1); |
325 | uint32_t tmp; | 324 | uint32_t tmp; |
326 | 325 | ||
327 | if (dev_priv->chipset < 0x90 || | 326 | tmp = nv_rd32(dev, 0x61c700 + (or * 0x800)); |
328 | dev_priv->chipset == 0x92 || dev_priv->chipset == 0xa0) | ||
329 | tmp = nv_rd32(dev, NV50_PDISPLAY_SOR_MODE_CTRL_C(or)); | ||
330 | else | ||
331 | tmp = nv_rd32(dev, NV90_PDISPLAY_SOR_MODE_CTRL_C(or)); | ||
332 | 327 | ||
333 | switch ((tmp & 0x00000f00) >> 8) { | 328 | switch ((tmp & 0x00000f00) >> 8) { |
334 | case 8: | 329 | case 8: |
diff --git a/drivers/gpu/drm/radeon/Makefile b/drivers/gpu/drm/radeon/Makefile index 3c91312dea9..84b1f2729d4 100644 --- a/drivers/gpu/drm/radeon/Makefile +++ b/drivers/gpu/drm/radeon/Makefile | |||
@@ -33,6 +33,9 @@ $(obj)/rs600_reg_safe.h: $(src)/reg_srcs/rs600 $(obj)/mkregtable | |||
33 | $(obj)/r600_reg_safe.h: $(src)/reg_srcs/r600 $(obj)/mkregtable | 33 | $(obj)/r600_reg_safe.h: $(src)/reg_srcs/r600 $(obj)/mkregtable |
34 | $(call if_changed,mkregtable) | 34 | $(call if_changed,mkregtable) |
35 | 35 | ||
36 | $(obj)/evergreen_reg_safe.h: $(src)/reg_srcs/evergreen $(obj)/mkregtable | ||
37 | $(call if_changed,mkregtable) | ||
38 | |||
36 | $(obj)/r100.o: $(obj)/r100_reg_safe.h $(obj)/rn50_reg_safe.h | 39 | $(obj)/r100.o: $(obj)/r100_reg_safe.h $(obj)/rn50_reg_safe.h |
37 | 40 | ||
38 | $(obj)/r200.o: $(obj)/r200_reg_safe.h | 41 | $(obj)/r200.o: $(obj)/r200_reg_safe.h |
@@ -47,6 +50,8 @@ $(obj)/rs600.o: $(obj)/rs600_reg_safe.h | |||
47 | 50 | ||
48 | $(obj)/r600_cs.o: $(obj)/r600_reg_safe.h | 51 | $(obj)/r600_cs.o: $(obj)/r600_reg_safe.h |
49 | 52 | ||
53 | $(obj)/evergreen_cs.o: $(obj)/evergreen_reg_safe.h | ||
54 | |||
50 | radeon-y := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o \ | 55 | radeon-y := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o \ |
51 | radeon_irq.o r300_cmdbuf.o r600_cp.o | 56 | radeon_irq.o r300_cmdbuf.o r600_cp.o |
52 | # add KMS driver | 57 | # add KMS driver |
@@ -60,7 +65,7 @@ radeon-y += radeon_device.o radeon_asic.o radeon_kms.o \ | |||
60 | rs400.o rs600.o rs690.o rv515.o r520.o r600.o rv770.o radeon_test.o \ | 65 | rs400.o rs600.o rs690.o rv515.o r520.o r600.o rv770.o radeon_test.o \ |
61 | r200.o radeon_legacy_tv.o r600_cs.o r600_blit.o r600_blit_shaders.o \ | 66 | r200.o radeon_legacy_tv.o r600_cs.o r600_blit.o r600_blit_shaders.o \ |
62 | r600_blit_kms.o radeon_pm.o atombios_dp.o r600_audio.o r600_hdmi.o \ | 67 | r600_blit_kms.o radeon_pm.o atombios_dp.o r600_audio.o r600_hdmi.o \ |
63 | evergreen.o | 68 | evergreen.o evergreen_cs.o |
64 | 69 | ||
65 | radeon-$(CONFIG_COMPAT) += radeon_ioc32.o | 70 | radeon-$(CONFIG_COMPAT) += radeon_ioc32.o |
66 | radeon-$(CONFIG_VGA_SWITCHEROO) += radeon_atpx_handler.o | 71 | radeon-$(CONFIG_VGA_SWITCHEROO) += radeon_atpx_handler.o |
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 8c8e4d3cbaa..0440c0939bd 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c | |||
@@ -41,7 +41,12 @@ void evergreen_fini(struct radeon_device *rdev); | |||
41 | 41 | ||
42 | void evergreen_pm_misc(struct radeon_device *rdev) | 42 | void evergreen_pm_misc(struct radeon_device *rdev) |
43 | { | 43 | { |
44 | int requested_index = rdev->pm.requested_power_state_index; | ||
45 | struct radeon_power_state *ps = &rdev->pm.power_state[requested_index]; | ||
46 | struct radeon_voltage *voltage = &ps->clock_info[0].voltage; | ||
44 | 47 | ||
48 | if ((voltage->type == VOLTAGE_SW) && voltage->voltage) | ||
49 | radeon_atom_set_voltage(rdev, voltage->voltage); | ||
45 | } | 50 | } |
46 | 51 | ||
47 | void evergreen_pm_prepare(struct radeon_device *rdev) | 52 | void evergreen_pm_prepare(struct radeon_device *rdev) |
diff --git a/drivers/gpu/drm/radeon/evergreen_cs.c b/drivers/gpu/drm/radeon/evergreen_cs.c new file mode 100644 index 00000000000..64516b95089 --- /dev/null +++ b/drivers/gpu/drm/radeon/evergreen_cs.c | |||
@@ -0,0 +1,1356 @@ | |||
1 | /* | ||
2 | * Copyright 2010 Advanced Micro Devices, Inc. | ||
3 | * Copyright 2008 Red Hat Inc. | ||
4 | * Copyright 2009 Jerome Glisse. | ||
5 | * | ||
6 | * Permission is hereby granted, free of charge, to any person obtaining a | ||
7 | * copy of this software and associated documentation files (the "Software"), | ||
8 | * to deal in the Software without restriction, including without limitation | ||
9 | * the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
10 | * and/or sell copies of the Software, and to permit persons to whom the | ||
11 | * Software is furnished to do so, subject to the following conditions: | ||
12 | * | ||
13 | * The above copyright notice and this permission notice shall be included in | ||
14 | * all copies or substantial portions of the Software. | ||
15 | * | ||
16 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
17 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
18 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | ||
19 | * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR | ||
20 | * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, | ||
21 | * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | ||
22 | * OTHER DEALINGS IN THE SOFTWARE. | ||
23 | * | ||
24 | * Authors: Dave Airlie | ||
25 | * Alex Deucher | ||
26 | * Jerome Glisse | ||
27 | */ | ||
28 | #include "drmP.h" | ||
29 | #include "radeon.h" | ||
30 | #include "evergreend.h" | ||
31 | #include "evergreen_reg_safe.h" | ||
32 | |||
33 | static int evergreen_cs_packet_next_reloc(struct radeon_cs_parser *p, | ||
34 | struct radeon_cs_reloc **cs_reloc); | ||
35 | |||
36 | struct evergreen_cs_track { | ||
37 | u32 group_size; | ||
38 | u32 nbanks; | ||
39 | u32 npipes; | ||
40 | /* value we track */ | ||
41 | u32 nsamples; | ||
42 | u32 cb_color_base_last[12]; | ||
43 | struct radeon_bo *cb_color_bo[12]; | ||
44 | u32 cb_color_bo_offset[12]; | ||
45 | struct radeon_bo *cb_color_fmask_bo[8]; | ||
46 | struct radeon_bo *cb_color_cmask_bo[8]; | ||
47 | u32 cb_color_info[12]; | ||
48 | u32 cb_color_view[12]; | ||
49 | u32 cb_color_pitch_idx[12]; | ||
50 | u32 cb_color_slice_idx[12]; | ||
51 | u32 cb_color_dim_idx[12]; | ||
52 | u32 cb_color_dim[12]; | ||
53 | u32 cb_color_pitch[12]; | ||
54 | u32 cb_color_slice[12]; | ||
55 | u32 cb_color_cmask_slice[8]; | ||
56 | u32 cb_color_fmask_slice[8]; | ||
57 | u32 cb_target_mask; | ||
58 | u32 cb_shader_mask; | ||
59 | u32 vgt_strmout_config; | ||
60 | u32 vgt_strmout_buffer_config; | ||
61 | u32 db_depth_control; | ||
62 | u32 db_depth_view; | ||
63 | u32 db_depth_size; | ||
64 | u32 db_depth_size_idx; | ||
65 | u32 db_z_info; | ||
66 | u32 db_z_idx; | ||
67 | u32 db_z_read_offset; | ||
68 | u32 db_z_write_offset; | ||
69 | struct radeon_bo *db_z_read_bo; | ||
70 | struct radeon_bo *db_z_write_bo; | ||
71 | u32 db_s_info; | ||
72 | u32 db_s_idx; | ||
73 | u32 db_s_read_offset; | ||
74 | u32 db_s_write_offset; | ||
75 | struct radeon_bo *db_s_read_bo; | ||
76 | struct radeon_bo *db_s_write_bo; | ||
77 | }; | ||
78 | |||
79 | static void evergreen_cs_track_init(struct evergreen_cs_track *track) | ||
80 | { | ||
81 | int i; | ||
82 | |||
83 | for (i = 0; i < 8; i++) { | ||
84 | track->cb_color_fmask_bo[i] = NULL; | ||
85 | track->cb_color_cmask_bo[i] = NULL; | ||
86 | track->cb_color_cmask_slice[i] = 0; | ||
87 | track->cb_color_fmask_slice[i] = 0; | ||
88 | } | ||
89 | |||
90 | for (i = 0; i < 12; i++) { | ||
91 | track->cb_color_base_last[i] = 0; | ||
92 | track->cb_color_bo[i] = NULL; | ||
93 | track->cb_color_bo_offset[i] = 0xFFFFFFFF; | ||
94 | track->cb_color_info[i] = 0; | ||
95 | track->cb_color_view[i] = 0; | ||
96 | track->cb_color_pitch_idx[i] = 0; | ||
97 | track->cb_color_slice_idx[i] = 0; | ||
98 | track->cb_color_dim[i] = 0; | ||
99 | track->cb_color_pitch[i] = 0; | ||
100 | track->cb_color_slice[i] = 0; | ||
101 | track->cb_color_dim[i] = 0; | ||
102 | } | ||
103 | track->cb_target_mask = 0xFFFFFFFF; | ||
104 | track->cb_shader_mask = 0xFFFFFFFF; | ||
105 | |||
106 | track->db_depth_view = 0xFFFFC000; | ||
107 | track->db_depth_size = 0xFFFFFFFF; | ||
108 | track->db_depth_size_idx = 0; | ||
109 | track->db_depth_control = 0xFFFFFFFF; | ||
110 | track->db_z_info = 0xFFFFFFFF; | ||
111 | track->db_z_idx = 0xFFFFFFFF; | ||
112 | track->db_z_read_offset = 0xFFFFFFFF; | ||
113 | track->db_z_write_offset = 0xFFFFFFFF; | ||
114 | track->db_z_read_bo = NULL; | ||
115 | track->db_z_write_bo = NULL; | ||
116 | track->db_s_info = 0xFFFFFFFF; | ||
117 | track->db_s_idx = 0xFFFFFFFF; | ||
118 | track->db_s_read_offset = 0xFFFFFFFF; | ||
119 | track->db_s_write_offset = 0xFFFFFFFF; | ||
120 | track->db_s_read_bo = NULL; | ||
121 | track->db_s_write_bo = NULL; | ||
122 | } | ||
123 | |||
124 | static inline int evergreen_cs_track_validate_cb(struct radeon_cs_parser *p, int i) | ||
125 | { | ||
126 | /* XXX fill in */ | ||
127 | return 0; | ||
128 | } | ||
129 | |||
130 | static int evergreen_cs_track_check(struct radeon_cs_parser *p) | ||
131 | { | ||
132 | struct evergreen_cs_track *track = p->track; | ||
133 | |||
134 | /* we don't support stream out buffer yet */ | ||
135 | if (track->vgt_strmout_config || track->vgt_strmout_buffer_config) { | ||
136 | dev_warn(p->dev, "this kernel doesn't support SMX output buffer\n"); | ||
137 | return -EINVAL; | ||
138 | } | ||
139 | |||
140 | /* XXX fill in */ | ||
141 | return 0; | ||
142 | } | ||
143 | |||
144 | /** | ||
145 | * evergreen_cs_packet_parse() - parse cp packet and point ib index to next packet | ||
146 | * @parser: parser structure holding parsing context. | ||
147 | * @pkt: where to store packet informations | ||
148 | * | ||
149 | * Assume that chunk_ib_index is properly set. Will return -EINVAL | ||
150 | * if packet is bigger than remaining ib size. or if packets is unknown. | ||
151 | **/ | ||
152 | int evergreen_cs_packet_parse(struct radeon_cs_parser *p, | ||
153 | struct radeon_cs_packet *pkt, | ||
154 | unsigned idx) | ||
155 | { | ||
156 | struct radeon_cs_chunk *ib_chunk = &p->chunks[p->chunk_ib_idx]; | ||
157 | uint32_t header; | ||
158 | |||
159 | if (idx >= ib_chunk->length_dw) { | ||
160 | DRM_ERROR("Can not parse packet at %d after CS end %d !\n", | ||
161 | idx, ib_chunk->length_dw); | ||
162 | return -EINVAL; | ||
163 | } | ||
164 | header = radeon_get_ib_value(p, idx); | ||
165 | pkt->idx = idx; | ||
166 | pkt->type = CP_PACKET_GET_TYPE(header); | ||
167 | pkt->count = CP_PACKET_GET_COUNT(header); | ||
168 | pkt->one_reg_wr = 0; | ||
169 | switch (pkt->type) { | ||
170 | case PACKET_TYPE0: | ||
171 | pkt->reg = CP_PACKET0_GET_REG(header); | ||
172 | break; | ||
173 | case PACKET_TYPE3: | ||
174 | pkt->opcode = CP_PACKET3_GET_OPCODE(header); | ||
175 | break; | ||
176 | case PACKET_TYPE2: | ||
177 | pkt->count = -1; | ||
178 | break; | ||
179 | default: | ||
180 | DRM_ERROR("Unknown packet type %d at %d !\n", pkt->type, idx); | ||
181 | return -EINVAL; | ||
182 | } | ||
183 | if ((pkt->count + 1 + pkt->idx) >= ib_chunk->length_dw) { | ||
184 | DRM_ERROR("Packet (%d:%d:%d) end after CS buffer (%d) !\n", | ||
185 | pkt->idx, pkt->type, pkt->count, ib_chunk->length_dw); | ||
186 | return -EINVAL; | ||
187 | } | ||
188 | return 0; | ||
189 | } | ||
190 | |||
191 | /** | ||
192 | * evergreen_cs_packet_next_reloc() - parse next packet which should be reloc packet3 | ||
193 | * @parser: parser structure holding parsing context. | ||
194 | * @data: pointer to relocation data | ||
195 | * @offset_start: starting offset | ||
196 | * @offset_mask: offset mask (to align start offset on) | ||
197 | * @reloc: reloc informations | ||
198 | * | ||
199 | * Check next packet is relocation packet3, do bo validation and compute | ||
200 | * GPU offset using the provided start. | ||
201 | **/ | ||
202 | static int evergreen_cs_packet_next_reloc(struct radeon_cs_parser *p, | ||
203 | struct radeon_cs_reloc **cs_reloc) | ||
204 | { | ||
205 | struct radeon_cs_chunk *relocs_chunk; | ||
206 | struct radeon_cs_packet p3reloc; | ||
207 | unsigned idx; | ||
208 | int r; | ||
209 | |||
210 | if (p->chunk_relocs_idx == -1) { | ||
211 | DRM_ERROR("No relocation chunk !\n"); | ||
212 | return -EINVAL; | ||
213 | } | ||
214 | *cs_reloc = NULL; | ||
215 | relocs_chunk = &p->chunks[p->chunk_relocs_idx]; | ||
216 | r = evergreen_cs_packet_parse(p, &p3reloc, p->idx); | ||
217 | if (r) { | ||
218 | return r; | ||
219 | } | ||
220 | p->idx += p3reloc.count + 2; | ||
221 | if (p3reloc.type != PACKET_TYPE3 || p3reloc.opcode != PACKET3_NOP) { | ||
222 | DRM_ERROR("No packet3 for relocation for packet at %d.\n", | ||
223 | p3reloc.idx); | ||
224 | return -EINVAL; | ||
225 | } | ||
226 | idx = radeon_get_ib_value(p, p3reloc.idx + 1); | ||
227 | if (idx >= relocs_chunk->length_dw) { | ||
228 | DRM_ERROR("Relocs at %d after relocations chunk end %d !\n", | ||
229 | idx, relocs_chunk->length_dw); | ||
230 | return -EINVAL; | ||
231 | } | ||
232 | /* FIXME: we assume reloc size is 4 dwords */ | ||
233 | *cs_reloc = p->relocs_ptr[(idx / 4)]; | ||
234 | return 0; | ||
235 | } | ||
236 | |||
237 | /** | ||
238 | * evergreen_cs_packet_next_is_pkt3_nop() - test if next packet is packet3 nop for reloc | ||
239 | * @parser: parser structure holding parsing context. | ||
240 | * | ||
241 | * Check next packet is relocation packet3, do bo validation and compute | ||
242 | * GPU offset using the provided start. | ||
243 | **/ | ||
244 | static inline int evergreen_cs_packet_next_is_pkt3_nop(struct radeon_cs_parser *p) | ||
245 | { | ||
246 | struct radeon_cs_packet p3reloc; | ||
247 | int r; | ||
248 | |||
249 | r = evergreen_cs_packet_parse(p, &p3reloc, p->idx); | ||
250 | if (r) { | ||
251 | return 0; | ||
252 | } | ||
253 | if (p3reloc.type != PACKET_TYPE3 || p3reloc.opcode != PACKET3_NOP) { | ||
254 | return 0; | ||
255 | } | ||
256 | return 1; | ||
257 | } | ||
258 | |||
259 | /** | ||
260 | * evergreen_cs_packet_next_vline() - parse userspace VLINE packet | ||
261 | * @parser: parser structure holding parsing context. | ||
262 | * | ||
263 | * Userspace sends a special sequence for VLINE waits. | ||
264 | * PACKET0 - VLINE_START_END + value | ||
265 | * PACKET3 - WAIT_REG_MEM poll vline status reg | ||
266 | * RELOC (P3) - crtc_id in reloc. | ||
267 | * | ||
268 | * This function parses this and relocates the VLINE START END | ||
269 | * and WAIT_REG_MEM packets to the correct crtc. | ||
270 | * It also detects a switched off crtc and nulls out the | ||
271 | * wait in that case. | ||
272 | */ | ||
273 | static int evergreen_cs_packet_parse_vline(struct radeon_cs_parser *p) | ||
274 | { | ||
275 | struct drm_mode_object *obj; | ||
276 | struct drm_crtc *crtc; | ||
277 | struct radeon_crtc *radeon_crtc; | ||
278 | struct radeon_cs_packet p3reloc, wait_reg_mem; | ||
279 | int crtc_id; | ||
280 | int r; | ||
281 | uint32_t header, h_idx, reg, wait_reg_mem_info; | ||
282 | volatile uint32_t *ib; | ||
283 | |||
284 | ib = p->ib->ptr; | ||
285 | |||
286 | /* parse the WAIT_REG_MEM */ | ||
287 | r = evergreen_cs_packet_parse(p, &wait_reg_mem, p->idx); | ||
288 | if (r) | ||
289 | return r; | ||
290 | |||
291 | /* check its a WAIT_REG_MEM */ | ||
292 | if (wait_reg_mem.type != PACKET_TYPE3 || | ||
293 | wait_reg_mem.opcode != PACKET3_WAIT_REG_MEM) { | ||
294 | DRM_ERROR("vline wait missing WAIT_REG_MEM segment\n"); | ||
295 | r = -EINVAL; | ||
296 | return r; | ||
297 | } | ||
298 | |||
299 | wait_reg_mem_info = radeon_get_ib_value(p, wait_reg_mem.idx + 1); | ||
300 | /* bit 4 is reg (0) or mem (1) */ | ||
301 | if (wait_reg_mem_info & 0x10) { | ||
302 | DRM_ERROR("vline WAIT_REG_MEM waiting on MEM rather than REG\n"); | ||
303 | r = -EINVAL; | ||
304 | return r; | ||
305 | } | ||
306 | /* waiting for value to be equal */ | ||
307 | if ((wait_reg_mem_info & 0x7) != 0x3) { | ||
308 | DRM_ERROR("vline WAIT_REG_MEM function not equal\n"); | ||
309 | r = -EINVAL; | ||
310 | return r; | ||
311 | } | ||
312 | if ((radeon_get_ib_value(p, wait_reg_mem.idx + 2) << 2) != EVERGREEN_VLINE_STATUS) { | ||
313 | DRM_ERROR("vline WAIT_REG_MEM bad reg\n"); | ||
314 | r = -EINVAL; | ||
315 | return r; | ||
316 | } | ||
317 | |||
318 | if (radeon_get_ib_value(p, wait_reg_mem.idx + 5) != EVERGREEN_VLINE_STAT) { | ||
319 | DRM_ERROR("vline WAIT_REG_MEM bad bit mask\n"); | ||
320 | r = -EINVAL; | ||
321 | return r; | ||
322 | } | ||
323 | |||
324 | /* jump over the NOP */ | ||
325 | r = evergreen_cs_packet_parse(p, &p3reloc, p->idx + wait_reg_mem.count + 2); | ||
326 | if (r) | ||
327 | return r; | ||
328 | |||
329 | h_idx = p->idx - 2; | ||
330 | p->idx += wait_reg_mem.count + 2; | ||
331 | p->idx += p3reloc.count + 2; | ||
332 | |||
333 | header = radeon_get_ib_value(p, h_idx); | ||
334 | crtc_id = radeon_get_ib_value(p, h_idx + 2 + 7 + 1); | ||
335 | reg = CP_PACKET0_GET_REG(header); | ||
336 | mutex_lock(&p->rdev->ddev->mode_config.mutex); | ||
337 | obj = drm_mode_object_find(p->rdev->ddev, crtc_id, DRM_MODE_OBJECT_CRTC); | ||
338 | if (!obj) { | ||
339 | DRM_ERROR("cannot find crtc %d\n", crtc_id); | ||
340 | r = -EINVAL; | ||
341 | goto out; | ||
342 | } | ||
343 | crtc = obj_to_crtc(obj); | ||
344 | radeon_crtc = to_radeon_crtc(crtc); | ||
345 | crtc_id = radeon_crtc->crtc_id; | ||
346 | |||
347 | if (!crtc->enabled) { | ||
348 | /* if the CRTC isn't enabled - we need to nop out the WAIT_REG_MEM */ | ||
349 | ib[h_idx + 2] = PACKET2(0); | ||
350 | ib[h_idx + 3] = PACKET2(0); | ||
351 | ib[h_idx + 4] = PACKET2(0); | ||
352 | ib[h_idx + 5] = PACKET2(0); | ||
353 | ib[h_idx + 6] = PACKET2(0); | ||
354 | ib[h_idx + 7] = PACKET2(0); | ||
355 | ib[h_idx + 8] = PACKET2(0); | ||
356 | } else { | ||
357 | switch (reg) { | ||
358 | case EVERGREEN_VLINE_START_END: | ||
359 | header &= ~R600_CP_PACKET0_REG_MASK; | ||
360 | header |= (EVERGREEN_VLINE_START_END + radeon_crtc->crtc_offset) >> 2; | ||
361 | ib[h_idx] = header; | ||
362 | ib[h_idx + 4] = (EVERGREEN_VLINE_STATUS + radeon_crtc->crtc_offset) >> 2; | ||
363 | break; | ||
364 | default: | ||
365 | DRM_ERROR("unknown crtc reloc\n"); | ||
366 | r = -EINVAL; | ||
367 | goto out; | ||
368 | } | ||
369 | } | ||
370 | out: | ||
371 | mutex_unlock(&p->rdev->ddev->mode_config.mutex); | ||
372 | return r; | ||
373 | } | ||
374 | |||
375 | static int evergreen_packet0_check(struct radeon_cs_parser *p, | ||
376 | struct radeon_cs_packet *pkt, | ||
377 | unsigned idx, unsigned reg) | ||
378 | { | ||
379 | int r; | ||
380 | |||
381 | switch (reg) { | ||
382 | case EVERGREEN_VLINE_START_END: | ||
383 | r = evergreen_cs_packet_parse_vline(p); | ||
384 | if (r) { | ||
385 | DRM_ERROR("No reloc for ib[%d]=0x%04X\n", | ||
386 | idx, reg); | ||
387 | return r; | ||
388 | } | ||
389 | break; | ||
390 | default: | ||
391 | printk(KERN_ERR "Forbidden register 0x%04X in cs at %d\n", | ||
392 | reg, idx); | ||
393 | return -EINVAL; | ||
394 | } | ||
395 | return 0; | ||
396 | } | ||
397 | |||
398 | static int evergreen_cs_parse_packet0(struct radeon_cs_parser *p, | ||
399 | struct radeon_cs_packet *pkt) | ||
400 | { | ||
401 | unsigned reg, i; | ||
402 | unsigned idx; | ||
403 | int r; | ||
404 | |||
405 | idx = pkt->idx + 1; | ||
406 | reg = pkt->reg; | ||
407 | for (i = 0; i <= pkt->count; i++, idx++, reg += 4) { | ||
408 | r = evergreen_packet0_check(p, pkt, idx, reg); | ||
409 | if (r) { | ||
410 | return r; | ||
411 | } | ||
412 | } | ||
413 | return 0; | ||
414 | } | ||
415 | |||
416 | /** | ||
417 | * evergreen_cs_check_reg() - check if register is authorized or not | ||
418 | * @parser: parser structure holding parsing context | ||
419 | * @reg: register we are testing | ||
420 | * @idx: index into the cs buffer | ||
421 | * | ||
422 | * This function will test against evergreen_reg_safe_bm and return 0 | ||
423 | * if register is safe. If register is not flag as safe this function | ||
424 | * will test it against a list of register needind special handling. | ||
425 | */ | ||
426 | static inline int evergreen_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u32 idx) | ||
427 | { | ||
428 | struct evergreen_cs_track *track = (struct evergreen_cs_track *)p->track; | ||
429 | struct radeon_cs_reloc *reloc; | ||
430 | u32 last_reg = ARRAY_SIZE(evergreen_reg_safe_bm); | ||
431 | u32 m, i, tmp, *ib; | ||
432 | int r; | ||
433 | |||
434 | i = (reg >> 7); | ||
435 | if (i > last_reg) { | ||
436 | dev_warn(p->dev, "forbidden register 0x%08x at %d\n", reg, idx); | ||
437 | return -EINVAL; | ||
438 | } | ||
439 | m = 1 << ((reg >> 2) & 31); | ||
440 | if (!(evergreen_reg_safe_bm[i] & m)) | ||
441 | return 0; | ||
442 | ib = p->ib->ptr; | ||
443 | switch (reg) { | ||
444 | /* force following reg to 0 in an attemp to disable out buffer | ||
445 | * which will need us to better understand how it works to perform | ||
446 | * security check on it (Jerome) | ||
447 | */ | ||
448 | case SQ_ESGS_RING_SIZE: | ||
449 | case SQ_GSVS_RING_SIZE: | ||
450 | case SQ_ESTMP_RING_SIZE: | ||
451 | case SQ_GSTMP_RING_SIZE: | ||
452 | case SQ_HSTMP_RING_SIZE: | ||
453 | case SQ_LSTMP_RING_SIZE: | ||
454 | case SQ_PSTMP_RING_SIZE: | ||
455 | case SQ_VSTMP_RING_SIZE: | ||
456 | case SQ_ESGS_RING_ITEMSIZE: | ||
457 | case SQ_ESTMP_RING_ITEMSIZE: | ||
458 | case SQ_GSTMP_RING_ITEMSIZE: | ||
459 | case SQ_GSVS_RING_ITEMSIZE: | ||
460 | case SQ_GS_VERT_ITEMSIZE: | ||
461 | case SQ_GS_VERT_ITEMSIZE_1: | ||
462 | case SQ_GS_VERT_ITEMSIZE_2: | ||
463 | case SQ_GS_VERT_ITEMSIZE_3: | ||
464 | case SQ_GSVS_RING_OFFSET_1: | ||
465 | case SQ_GSVS_RING_OFFSET_2: | ||
466 | case SQ_GSVS_RING_OFFSET_3: | ||
467 | case SQ_HSTMP_RING_ITEMSIZE: | ||
468 | case SQ_LSTMP_RING_ITEMSIZE: | ||
469 | case SQ_PSTMP_RING_ITEMSIZE: | ||
470 | case SQ_VSTMP_RING_ITEMSIZE: | ||
471 | case VGT_TF_RING_SIZE: | ||
472 | /* get value to populate the IB don't remove */ | ||
473 | tmp =radeon_get_ib_value(p, idx); | ||
474 | ib[idx] = 0; | ||
475 | break; | ||
476 | case DB_DEPTH_CONTROL: | ||
477 | track->db_depth_control = radeon_get_ib_value(p, idx); | ||
478 | break; | ||
479 | case DB_Z_INFO: | ||
480 | r = evergreen_cs_packet_next_reloc(p, &reloc); | ||
481 | if (r) { | ||
482 | dev_warn(p->dev, "bad SET_CONTEXT_REG " | ||
483 | "0x%04X\n", reg); | ||
484 | return -EINVAL; | ||
485 | } | ||
486 | track->db_z_info = radeon_get_ib_value(p, idx); | ||
487 | ib[idx] &= ~Z_ARRAY_MODE(0xf); | ||
488 | track->db_z_info &= ~Z_ARRAY_MODE(0xf); | ||
489 | if (reloc->lobj.tiling_flags & RADEON_TILING_MACRO) { | ||
490 | ib[idx] |= Z_ARRAY_MODE(ARRAY_2D_TILED_THIN1); | ||
491 | track->db_z_info |= Z_ARRAY_MODE(ARRAY_2D_TILED_THIN1); | ||
492 | } else { | ||
493 | ib[idx] |= Z_ARRAY_MODE(ARRAY_1D_TILED_THIN1); | ||
494 | track->db_z_info |= Z_ARRAY_MODE(ARRAY_1D_TILED_THIN1); | ||
495 | } | ||
496 | break; | ||
497 | case DB_STENCIL_INFO: | ||
498 | track->db_s_info = radeon_get_ib_value(p, idx); | ||
499 | break; | ||
500 | case DB_DEPTH_VIEW: | ||
501 | track->db_depth_view = radeon_get_ib_value(p, idx); | ||
502 | break; | ||
503 | case DB_DEPTH_SIZE: | ||
504 | track->db_depth_size = radeon_get_ib_value(p, idx); | ||
505 | track->db_depth_size_idx = idx; | ||
506 | break; | ||
507 | case DB_Z_READ_BASE: | ||
508 | r = evergreen_cs_packet_next_reloc(p, &reloc); | ||
509 | if (r) { | ||
510 | dev_warn(p->dev, "bad SET_CONTEXT_REG " | ||
511 | "0x%04X\n", reg); | ||
512 | return -EINVAL; | ||
513 | } | ||
514 | track->db_z_read_offset = radeon_get_ib_value(p, idx); | ||
515 | ib[idx] += (u32)((reloc->lobj.gpu_offset >> 8) & 0xffffffff); | ||
516 | track->db_z_read_bo = reloc->robj; | ||
517 | break; | ||
518 | case DB_Z_WRITE_BASE: | ||
519 | r = evergreen_cs_packet_next_reloc(p, &reloc); | ||
520 | if (r) { | ||
521 | dev_warn(p->dev, "bad SET_CONTEXT_REG " | ||
522 | "0x%04X\n", reg); | ||
523 | return -EINVAL; | ||
524 | } | ||
525 | track->db_z_write_offset = radeon_get_ib_value(p, idx); | ||
526 | ib[idx] += (u32)((reloc->lobj.gpu_offset >> 8) & 0xffffffff); | ||
527 | track->db_z_write_bo = reloc->robj; | ||
528 | break; | ||
529 | case DB_STENCIL_READ_BASE: | ||
530 | r = evergreen_cs_packet_next_reloc(p, &reloc); | ||
531 | if (r) { | ||
532 | dev_warn(p->dev, "bad SET_CONTEXT_REG " | ||
533 | "0x%04X\n", reg); | ||
534 | return -EINVAL; | ||
535 | } | ||
536 | track->db_s_read_offset = radeon_get_ib_value(p, idx); | ||
537 | ib[idx] += (u32)((reloc->lobj.gpu_offset >> 8) & 0xffffffff); | ||
538 | track->db_s_read_bo = reloc->robj; | ||
539 | break; | ||
540 | case DB_STENCIL_WRITE_BASE: | ||
541 | r = evergreen_cs_packet_next_reloc(p, &reloc); | ||
542 | if (r) { | ||
543 | dev_warn(p->dev, "bad SET_CONTEXT_REG " | ||
544 | "0x%04X\n", reg); | ||
545 | return -EINVAL; | ||
546 | } | ||
547 | track->db_s_write_offset = radeon_get_ib_value(p, idx); | ||
548 | ib[idx] += (u32)((reloc->lobj.gpu_offset >> 8) & 0xffffffff); | ||
549 | track->db_s_write_bo = reloc->robj; | ||
550 | break; | ||
551 | case VGT_STRMOUT_CONFIG: | ||
552 | track->vgt_strmout_config = radeon_get_ib_value(p, idx); | ||
553 | break; | ||
554 | case VGT_STRMOUT_BUFFER_CONFIG: | ||
555 | track->vgt_strmout_buffer_config = radeon_get_ib_value(p, idx); | ||
556 | break; | ||
557 | case CB_TARGET_MASK: | ||
558 | track->cb_target_mask = radeon_get_ib_value(p, idx); | ||
559 | break; | ||
560 | case CB_SHADER_MASK: | ||
561 | track->cb_shader_mask = radeon_get_ib_value(p, idx); | ||
562 | break; | ||
563 | case PA_SC_AA_CONFIG: | ||
564 | tmp = radeon_get_ib_value(p, idx) & MSAA_NUM_SAMPLES_MASK; | ||
565 | track->nsamples = 1 << tmp; | ||
566 | break; | ||
567 | case CB_COLOR0_VIEW: | ||
568 | case CB_COLOR1_VIEW: | ||
569 | case CB_COLOR2_VIEW: | ||
570 | case CB_COLOR3_VIEW: | ||
571 | case CB_COLOR4_VIEW: | ||
572 | case CB_COLOR5_VIEW: | ||
573 | case CB_COLOR6_VIEW: | ||
574 | case CB_COLOR7_VIEW: | ||
575 | tmp = (reg - CB_COLOR0_VIEW) / 0x3c; | ||
576 | track->cb_color_view[tmp] = radeon_get_ib_value(p, idx); | ||
577 | break; | ||
578 | case CB_COLOR8_VIEW: | ||
579 | case CB_COLOR9_VIEW: | ||
580 | case CB_COLOR10_VIEW: | ||
581 | case CB_COLOR11_VIEW: | ||
582 | tmp = ((reg - CB_COLOR8_VIEW) / 0x1c) + 8; | ||
583 | track->cb_color_view[tmp] = radeon_get_ib_value(p, idx); | ||
584 | break; | ||
585 | case CB_COLOR0_INFO: | ||
586 | case CB_COLOR1_INFO: | ||
587 | case CB_COLOR2_INFO: | ||
588 | case CB_COLOR3_INFO: | ||
589 | case CB_COLOR4_INFO: | ||
590 | case CB_COLOR5_INFO: | ||
591 | case CB_COLOR6_INFO: | ||
592 | case CB_COLOR7_INFO: | ||
593 | r = evergreen_cs_packet_next_reloc(p, &reloc); | ||
594 | if (r) { | ||
595 | dev_warn(p->dev, "bad SET_CONTEXT_REG " | ||
596 | "0x%04X\n", reg); | ||
597 | return -EINVAL; | ||
598 | } | ||
599 | tmp = (reg - CB_COLOR0_INFO) / 0x3c; | ||
600 | track->cb_color_info[tmp] = radeon_get_ib_value(p, idx); | ||
601 | if (reloc->lobj.tiling_flags & RADEON_TILING_MACRO) { | ||
602 | ib[idx] |= CB_ARRAY_MODE(ARRAY_2D_TILED_THIN1); | ||
603 | track->cb_color_info[tmp] |= CB_ARRAY_MODE(ARRAY_2D_TILED_THIN1); | ||
604 | } else if (reloc->lobj.tiling_flags & RADEON_TILING_MICRO) { | ||
605 | ib[idx] |= CB_ARRAY_MODE(ARRAY_1D_TILED_THIN1); | ||
606 | track->cb_color_info[tmp] |= CB_ARRAY_MODE(ARRAY_1D_TILED_THIN1); | ||
607 | } | ||
608 | break; | ||
609 | case CB_COLOR8_INFO: | ||
610 | case CB_COLOR9_INFO: | ||
611 | case CB_COLOR10_INFO: | ||
612 | case CB_COLOR11_INFO: | ||
613 | r = evergreen_cs_packet_next_reloc(p, &reloc); | ||
614 | if (r) { | ||
615 | dev_warn(p->dev, "bad SET_CONTEXT_REG " | ||
616 | "0x%04X\n", reg); | ||
617 | return -EINVAL; | ||
618 | } | ||
619 | tmp = ((reg - CB_COLOR8_INFO) / 0x1c) + 8; | ||
620 | track->cb_color_info[tmp] = radeon_get_ib_value(p, idx); | ||
621 | if (reloc->lobj.tiling_flags & RADEON_TILING_MACRO) { | ||
622 | ib[idx] |= CB_ARRAY_MODE(ARRAY_2D_TILED_THIN1); | ||
623 | track->cb_color_info[tmp] |= CB_ARRAY_MODE(ARRAY_2D_TILED_THIN1); | ||
624 | } else if (reloc->lobj.tiling_flags & RADEON_TILING_MICRO) { | ||
625 | ib[idx] |= CB_ARRAY_MODE(ARRAY_1D_TILED_THIN1); | ||
626 | track->cb_color_info[tmp] |= CB_ARRAY_MODE(ARRAY_1D_TILED_THIN1); | ||
627 | } | ||
628 | break; | ||
629 | case CB_COLOR0_PITCH: | ||
630 | case CB_COLOR1_PITCH: | ||
631 | case CB_COLOR2_PITCH: | ||
632 | case CB_COLOR3_PITCH: | ||
633 | case CB_COLOR4_PITCH: | ||
634 | case CB_COLOR5_PITCH: | ||
635 | case CB_COLOR6_PITCH: | ||
636 | case CB_COLOR7_PITCH: | ||
637 | tmp = (reg - CB_COLOR0_PITCH) / 0x3c; | ||
638 | track->cb_color_pitch[tmp] = radeon_get_ib_value(p, idx); | ||
639 | track->cb_color_pitch_idx[tmp] = idx; | ||
640 | break; | ||
641 | case CB_COLOR8_PITCH: | ||
642 | case CB_COLOR9_PITCH: | ||
643 | case CB_COLOR10_PITCH: | ||
644 | case CB_COLOR11_PITCH: | ||
645 | tmp = ((reg - CB_COLOR8_PITCH) / 0x1c) + 8; | ||
646 | track->cb_color_pitch[tmp] = radeon_get_ib_value(p, idx); | ||
647 | track->cb_color_pitch_idx[tmp] = idx; | ||
648 | break; | ||
649 | case CB_COLOR0_SLICE: | ||
650 | case CB_COLOR1_SLICE: | ||
651 | case CB_COLOR2_SLICE: | ||
652 | case CB_COLOR3_SLICE: | ||
653 | case CB_COLOR4_SLICE: | ||
654 | case CB_COLOR5_SLICE: | ||
655 | case CB_COLOR6_SLICE: | ||
656 | case CB_COLOR7_SLICE: | ||
657 | tmp = (reg - CB_COLOR0_SLICE) / 0x3c; | ||
658 | track->cb_color_slice[tmp] = radeon_get_ib_value(p, idx); | ||
659 | track->cb_color_slice_idx[tmp] = idx; | ||
660 | break; | ||
661 | case CB_COLOR8_SLICE: | ||
662 | case CB_COLOR9_SLICE: | ||
663 | case CB_COLOR10_SLICE: | ||
664 | case CB_COLOR11_SLICE: | ||
665 | tmp = ((reg - CB_COLOR8_SLICE) / 0x1c) + 8; | ||
666 | track->cb_color_slice[tmp] = radeon_get_ib_value(p, idx); | ||
667 | track->cb_color_slice_idx[tmp] = idx; | ||
668 | break; | ||
669 | case CB_COLOR0_ATTRIB: | ||
670 | case CB_COLOR1_ATTRIB: | ||
671 | case CB_COLOR2_ATTRIB: | ||
672 | case CB_COLOR3_ATTRIB: | ||
673 | case CB_COLOR4_ATTRIB: | ||
674 | case CB_COLOR5_ATTRIB: | ||
675 | case CB_COLOR6_ATTRIB: | ||
676 | case CB_COLOR7_ATTRIB: | ||
677 | case CB_COLOR8_ATTRIB: | ||
678 | case CB_COLOR9_ATTRIB: | ||
679 | case CB_COLOR10_ATTRIB: | ||
680 | case CB_COLOR11_ATTRIB: | ||
681 | break; | ||
682 | case CB_COLOR0_DIM: | ||
683 | case CB_COLOR1_DIM: | ||
684 | case CB_COLOR2_DIM: | ||
685 | case CB_COLOR3_DIM: | ||
686 | case CB_COLOR4_DIM: | ||
687 | case CB_COLOR5_DIM: | ||
688 | case CB_COLOR6_DIM: | ||
689 | case CB_COLOR7_DIM: | ||
690 | tmp = (reg - CB_COLOR0_DIM) / 0x3c; | ||
691 | track->cb_color_dim[tmp] = radeon_get_ib_value(p, idx); | ||
692 | track->cb_color_dim_idx[tmp] = idx; | ||
693 | break; | ||
694 | case CB_COLOR8_DIM: | ||
695 | case CB_COLOR9_DIM: | ||
696 | case CB_COLOR10_DIM: | ||
697 | case CB_COLOR11_DIM: | ||
698 | tmp = ((reg - CB_COLOR8_DIM) / 0x1c) + 8; | ||
699 | track->cb_color_dim[tmp] = radeon_get_ib_value(p, idx); | ||
700 | track->cb_color_dim_idx[tmp] = idx; | ||
701 | break; | ||
702 | case CB_COLOR0_FMASK: | ||
703 | case CB_COLOR1_FMASK: | ||
704 | case CB_COLOR2_FMASK: | ||
705 | case CB_COLOR3_FMASK: | ||
706 | case CB_COLOR4_FMASK: | ||
707 | case CB_COLOR5_FMASK: | ||
708 | case CB_COLOR6_FMASK: | ||
709 | case CB_COLOR7_FMASK: | ||
710 | tmp = (reg - CB_COLOR0_FMASK) / 0x3c; | ||
711 | r = evergreen_cs_packet_next_reloc(p, &reloc); | ||
712 | if (r) { | ||
713 | dev_err(p->dev, "bad SET_CONTEXT_REG 0x%04X\n", reg); | ||
714 | return -EINVAL; | ||
715 | } | ||
716 | ib[idx] += (u32)((reloc->lobj.gpu_offset >> 8) & 0xffffffff); | ||
717 | track->cb_color_fmask_bo[tmp] = reloc->robj; | ||
718 | break; | ||
719 | case CB_COLOR0_CMASK: | ||
720 | case CB_COLOR1_CMASK: | ||
721 | case CB_COLOR2_CMASK: | ||
722 | case CB_COLOR3_CMASK: | ||
723 | case CB_COLOR4_CMASK: | ||
724 | case CB_COLOR5_CMASK: | ||
725 | case CB_COLOR6_CMASK: | ||
726 | case CB_COLOR7_CMASK: | ||
727 | tmp = (reg - CB_COLOR0_CMASK) / 0x3c; | ||
728 | r = evergreen_cs_packet_next_reloc(p, &reloc); | ||
729 | if (r) { | ||
730 | dev_err(p->dev, "bad SET_CONTEXT_REG 0x%04X\n", reg); | ||
731 | return -EINVAL; | ||
732 | } | ||
733 | ib[idx] += (u32)((reloc->lobj.gpu_offset >> 8) & 0xffffffff); | ||
734 | track->cb_color_cmask_bo[tmp] = reloc->robj; | ||
735 | break; | ||
736 | case CB_COLOR0_FMASK_SLICE: | ||
737 | case CB_COLOR1_FMASK_SLICE: | ||
738 | case CB_COLOR2_FMASK_SLICE: | ||
739 | case CB_COLOR3_FMASK_SLICE: | ||
740 | case CB_COLOR4_FMASK_SLICE: | ||
741 | case CB_COLOR5_FMASK_SLICE: | ||
742 | case CB_COLOR6_FMASK_SLICE: | ||
743 | case CB_COLOR7_FMASK_SLICE: | ||
744 | tmp = (reg - CB_COLOR0_FMASK_SLICE) / 0x3c; | ||
745 | track->cb_color_fmask_slice[tmp] = radeon_get_ib_value(p, idx); | ||
746 | break; | ||
747 | case CB_COLOR0_CMASK_SLICE: | ||
748 | case CB_COLOR1_CMASK_SLICE: | ||
749 | case CB_COLOR2_CMASK_SLICE: | ||
750 | case CB_COLOR3_CMASK_SLICE: | ||
751 | case CB_COLOR4_CMASK_SLICE: | ||
752 | case CB_COLOR5_CMASK_SLICE: | ||
753 | case CB_COLOR6_CMASK_SLICE: | ||
754 | case CB_COLOR7_CMASK_SLICE: | ||
755 | tmp = (reg - CB_COLOR0_CMASK_SLICE) / 0x3c; | ||
756 | track->cb_color_cmask_slice[tmp] = radeon_get_ib_value(p, idx); | ||
757 | break; | ||
758 | case CB_COLOR0_BASE: | ||
759 | case CB_COLOR1_BASE: | ||
760 | case CB_COLOR2_BASE: | ||
761 | case CB_COLOR3_BASE: | ||
762 | case CB_COLOR4_BASE: | ||
763 | case CB_COLOR5_BASE: | ||
764 | case CB_COLOR6_BASE: | ||
765 | case CB_COLOR7_BASE: | ||
766 | r = evergreen_cs_packet_next_reloc(p, &reloc); | ||
767 | if (r) { | ||
768 | dev_warn(p->dev, "bad SET_CONTEXT_REG " | ||
769 | "0x%04X\n", reg); | ||
770 | return -EINVAL; | ||
771 | } | ||
772 | tmp = (reg - CB_COLOR0_BASE) / 0x3c; | ||
773 | track->cb_color_bo_offset[tmp] = radeon_get_ib_value(p, idx); | ||
774 | ib[idx] += (u32)((reloc->lobj.gpu_offset >> 8) & 0xffffffff); | ||
775 | track->cb_color_base_last[tmp] = ib[idx]; | ||
776 | track->cb_color_bo[tmp] = reloc->robj; | ||
777 | break; | ||
778 | case CB_COLOR8_BASE: | ||
779 | case CB_COLOR9_BASE: | ||
780 | case CB_COLOR10_BASE: | ||
781 | case CB_COLOR11_BASE: | ||
782 | r = evergreen_cs_packet_next_reloc(p, &reloc); | ||
783 | if (r) { | ||
784 | dev_warn(p->dev, "bad SET_CONTEXT_REG " | ||
785 | "0x%04X\n", reg); | ||
786 | return -EINVAL; | ||
787 | } | ||
788 | tmp = ((reg - CB_COLOR8_BASE) / 0x1c) + 8; | ||
789 | track->cb_color_bo_offset[tmp] = radeon_get_ib_value(p, idx); | ||
790 | ib[idx] += (u32)((reloc->lobj.gpu_offset >> 8) & 0xffffffff); | ||
791 | track->cb_color_base_last[tmp] = ib[idx]; | ||
792 | track->cb_color_bo[tmp] = reloc->robj; | ||
793 | break; | ||
794 | case CB_IMMED0_BASE: | ||
795 | case CB_IMMED1_BASE: | ||
796 | case CB_IMMED2_BASE: | ||
797 | case CB_IMMED3_BASE: | ||
798 | case CB_IMMED4_BASE: | ||
799 | case CB_IMMED5_BASE: | ||
800 | case CB_IMMED6_BASE: | ||
801 | case CB_IMMED7_BASE: | ||
802 | case CB_IMMED8_BASE: | ||
803 | case CB_IMMED9_BASE: | ||
804 | case CB_IMMED10_BASE: | ||
805 | case CB_IMMED11_BASE: | ||
806 | case DB_HTILE_DATA_BASE: | ||
807 | case SQ_PGM_START_FS: | ||
808 | case SQ_PGM_START_ES: | ||
809 | case SQ_PGM_START_VS: | ||
810 | case SQ_PGM_START_GS: | ||
811 | case SQ_PGM_START_PS: | ||
812 | case SQ_PGM_START_HS: | ||
813 | case SQ_PGM_START_LS: | ||
814 | case GDS_ADDR_BASE: | ||
815 | case SQ_CONST_MEM_BASE: | ||
816 | case SQ_ALU_CONST_CACHE_GS_0: | ||
817 | case SQ_ALU_CONST_CACHE_GS_1: | ||
818 | case SQ_ALU_CONST_CACHE_GS_2: | ||
819 | case SQ_ALU_CONST_CACHE_GS_3: | ||
820 | case SQ_ALU_CONST_CACHE_GS_4: | ||
821 | case SQ_ALU_CONST_CACHE_GS_5: | ||
822 | case SQ_ALU_CONST_CACHE_GS_6: | ||
823 | case SQ_ALU_CONST_CACHE_GS_7: | ||
824 | case SQ_ALU_CONST_CACHE_GS_8: | ||
825 | case SQ_ALU_CONST_CACHE_GS_9: | ||
826 | case SQ_ALU_CONST_CACHE_GS_10: | ||
827 | case SQ_ALU_CONST_CACHE_GS_11: | ||
828 | case SQ_ALU_CONST_CACHE_GS_12: | ||
829 | case SQ_ALU_CONST_CACHE_GS_13: | ||
830 | case SQ_ALU_CONST_CACHE_GS_14: | ||
831 | case SQ_ALU_CONST_CACHE_GS_15: | ||
832 | case SQ_ALU_CONST_CACHE_PS_0: | ||
833 | case SQ_ALU_CONST_CACHE_PS_1: | ||
834 | case SQ_ALU_CONST_CACHE_PS_2: | ||
835 | case SQ_ALU_CONST_CACHE_PS_3: | ||
836 | case SQ_ALU_CONST_CACHE_PS_4: | ||
837 | case SQ_ALU_CONST_CACHE_PS_5: | ||
838 | case SQ_ALU_CONST_CACHE_PS_6: | ||
839 | case SQ_ALU_CONST_CACHE_PS_7: | ||
840 | case SQ_ALU_CONST_CACHE_PS_8: | ||
841 | case SQ_ALU_CONST_CACHE_PS_9: | ||
842 | case SQ_ALU_CONST_CACHE_PS_10: | ||
843 | case SQ_ALU_CONST_CACHE_PS_11: | ||
844 | case SQ_ALU_CONST_CACHE_PS_12: | ||
845 | case SQ_ALU_CONST_CACHE_PS_13: | ||
846 | case SQ_ALU_CONST_CACHE_PS_14: | ||
847 | case SQ_ALU_CONST_CACHE_PS_15: | ||
848 | case SQ_ALU_CONST_CACHE_VS_0: | ||
849 | case SQ_ALU_CONST_CACHE_VS_1: | ||
850 | case SQ_ALU_CONST_CACHE_VS_2: | ||
851 | case SQ_ALU_CONST_CACHE_VS_3: | ||
852 | case SQ_ALU_CONST_CACHE_VS_4: | ||
853 | case SQ_ALU_CONST_CACHE_VS_5: | ||
854 | case SQ_ALU_CONST_CACHE_VS_6: | ||
855 | case SQ_ALU_CONST_CACHE_VS_7: | ||
856 | case SQ_ALU_CONST_CACHE_VS_8: | ||
857 | case SQ_ALU_CONST_CACHE_VS_9: | ||
858 | case SQ_ALU_CONST_CACHE_VS_10: | ||
859 | case SQ_ALU_CONST_CACHE_VS_11: | ||
860 | case SQ_ALU_CONST_CACHE_VS_12: | ||
861 | case SQ_ALU_CONST_CACHE_VS_13: | ||
862 | case SQ_ALU_CONST_CACHE_VS_14: | ||
863 | case SQ_ALU_CONST_CACHE_VS_15: | ||
864 | case SQ_ALU_CONST_CACHE_HS_0: | ||
865 | case SQ_ALU_CONST_CACHE_HS_1: | ||
866 | case SQ_ALU_CONST_CACHE_HS_2: | ||
867 | case SQ_ALU_CONST_CACHE_HS_3: | ||
868 | case SQ_ALU_CONST_CACHE_HS_4: | ||
869 | case SQ_ALU_CONST_CACHE_HS_5: | ||
870 | case SQ_ALU_CONST_CACHE_HS_6: | ||
871 | case SQ_ALU_CONST_CACHE_HS_7: | ||
872 | case SQ_ALU_CONST_CACHE_HS_8: | ||
873 | case SQ_ALU_CONST_CACHE_HS_9: | ||
874 | case SQ_ALU_CONST_CACHE_HS_10: | ||
875 | case SQ_ALU_CONST_CACHE_HS_11: | ||
876 | case SQ_ALU_CONST_CACHE_HS_12: | ||
877 | case SQ_ALU_CONST_CACHE_HS_13: | ||
878 | case SQ_ALU_CONST_CACHE_HS_14: | ||
879 | case SQ_ALU_CONST_CACHE_HS_15: | ||
880 | case SQ_ALU_CONST_CACHE_LS_0: | ||
881 | case SQ_ALU_CONST_CACHE_LS_1: | ||
882 | case SQ_ALU_CONST_CACHE_LS_2: | ||
883 | case SQ_ALU_CONST_CACHE_LS_3: | ||
884 | case SQ_ALU_CONST_CACHE_LS_4: | ||
885 | case SQ_ALU_CONST_CACHE_LS_5: | ||
886 | case SQ_ALU_CONST_CACHE_LS_6: | ||
887 | case SQ_ALU_CONST_CACHE_LS_7: | ||
888 | case SQ_ALU_CONST_CACHE_LS_8: | ||
889 | case SQ_ALU_CONST_CACHE_LS_9: | ||
890 | case SQ_ALU_CONST_CACHE_LS_10: | ||
891 | case SQ_ALU_CONST_CACHE_LS_11: | ||
892 | case SQ_ALU_CONST_CACHE_LS_12: | ||
893 | case SQ_ALU_CONST_CACHE_LS_13: | ||
894 | case SQ_ALU_CONST_CACHE_LS_14: | ||
895 | case SQ_ALU_CONST_CACHE_LS_15: | ||
896 | r = evergreen_cs_packet_next_reloc(p, &reloc); | ||
897 | if (r) { | ||
898 | dev_warn(p->dev, "bad SET_CONTEXT_REG " | ||
899 | "0x%04X\n", reg); | ||
900 | return -EINVAL; | ||
901 | } | ||
902 | ib[idx] += (u32)((reloc->lobj.gpu_offset >> 8) & 0xffffffff); | ||
903 | break; | ||
904 | default: | ||
905 | dev_warn(p->dev, "forbidden register 0x%08x at %d\n", reg, idx); | ||
906 | return -EINVAL; | ||
907 | } | ||
908 | return 0; | ||
909 | } | ||
910 | |||
911 | /** | ||
912 | * evergreen_check_texture_resource() - check if register is authorized or not | ||
913 | * @p: parser structure holding parsing context | ||
914 | * @idx: index into the cs buffer | ||
915 | * @texture: texture's bo structure | ||
916 | * @mipmap: mipmap's bo structure | ||
917 | * | ||
918 | * This function will check that the resource has valid field and that | ||
919 | * the texture and mipmap bo object are big enough to cover this resource. | ||
920 | */ | ||
921 | static inline int evergreen_check_texture_resource(struct radeon_cs_parser *p, u32 idx, | ||
922 | struct radeon_bo *texture, | ||
923 | struct radeon_bo *mipmap) | ||
924 | { | ||
925 | /* XXX fill in */ | ||
926 | return 0; | ||
927 | } | ||
928 | |||
929 | static int evergreen_packet3_check(struct radeon_cs_parser *p, | ||
930 | struct radeon_cs_packet *pkt) | ||
931 | { | ||
932 | struct radeon_cs_reloc *reloc; | ||
933 | struct evergreen_cs_track *track; | ||
934 | volatile u32 *ib; | ||
935 | unsigned idx; | ||
936 | unsigned i; | ||
937 | unsigned start_reg, end_reg, reg; | ||
938 | int r; | ||
939 | u32 idx_value; | ||
940 | |||
941 | track = (struct evergreen_cs_track *)p->track; | ||
942 | ib = p->ib->ptr; | ||
943 | idx = pkt->idx + 1; | ||
944 | idx_value = radeon_get_ib_value(p, idx); | ||
945 | |||
946 | switch (pkt->opcode) { | ||
947 | case PACKET3_CONTEXT_CONTROL: | ||
948 | if (pkt->count != 1) { | ||
949 | DRM_ERROR("bad CONTEXT_CONTROL\n"); | ||
950 | return -EINVAL; | ||
951 | } | ||
952 | break; | ||
953 | case PACKET3_INDEX_TYPE: | ||
954 | case PACKET3_NUM_INSTANCES: | ||
955 | case PACKET3_CLEAR_STATE: | ||
956 | if (pkt->count) { | ||
957 | DRM_ERROR("bad INDEX_TYPE/NUM_INSTANCES/CLEAR_STATE\n"); | ||
958 | return -EINVAL; | ||
959 | } | ||
960 | break; | ||
961 | case PACKET3_INDEX_BASE: | ||
962 | if (pkt->count != 1) { | ||
963 | DRM_ERROR("bad INDEX_BASE\n"); | ||
964 | return -EINVAL; | ||
965 | } | ||
966 | r = evergreen_cs_packet_next_reloc(p, &reloc); | ||
967 | if (r) { | ||
968 | DRM_ERROR("bad INDEX_BASE\n"); | ||
969 | return -EINVAL; | ||
970 | } | ||
971 | ib[idx+0] = idx_value + (u32)(reloc->lobj.gpu_offset & 0xffffffff); | ||
972 | ib[idx+1] += upper_32_bits(reloc->lobj.gpu_offset) & 0xff; | ||
973 | r = evergreen_cs_track_check(p); | ||
974 | if (r) { | ||
975 | dev_warn(p->dev, "%s:%d invalid cmd stream\n", __func__, __LINE__); | ||
976 | return r; | ||
977 | } | ||
978 | break; | ||
979 | case PACKET3_DRAW_INDEX: | ||
980 | if (pkt->count != 3) { | ||
981 | DRM_ERROR("bad DRAW_INDEX\n"); | ||
982 | return -EINVAL; | ||
983 | } | ||
984 | r = evergreen_cs_packet_next_reloc(p, &reloc); | ||
985 | if (r) { | ||
986 | DRM_ERROR("bad DRAW_INDEX\n"); | ||
987 | return -EINVAL; | ||
988 | } | ||
989 | ib[idx+0] = idx_value + (u32)(reloc->lobj.gpu_offset & 0xffffffff); | ||
990 | ib[idx+1] += upper_32_bits(reloc->lobj.gpu_offset) & 0xff; | ||
991 | r = evergreen_cs_track_check(p); | ||
992 | if (r) { | ||
993 | dev_warn(p->dev, "%s:%d invalid cmd stream\n", __func__, __LINE__); | ||
994 | return r; | ||
995 | } | ||
996 | break; | ||
997 | case PACKET3_DRAW_INDEX_2: | ||
998 | if (pkt->count != 4) { | ||
999 | DRM_ERROR("bad DRAW_INDEX_2\n"); | ||
1000 | return -EINVAL; | ||
1001 | } | ||
1002 | r = evergreen_cs_packet_next_reloc(p, &reloc); | ||
1003 | if (r) { | ||
1004 | DRM_ERROR("bad DRAW_INDEX_2\n"); | ||
1005 | return -EINVAL; | ||
1006 | } | ||
1007 | ib[idx+1] = idx_value + (u32)(reloc->lobj.gpu_offset & 0xffffffff); | ||
1008 | ib[idx+2] += upper_32_bits(reloc->lobj.gpu_offset) & 0xff; | ||
1009 | r = evergreen_cs_track_check(p); | ||
1010 | if (r) { | ||
1011 | dev_warn(p->dev, "%s:%d invalid cmd stream\n", __func__, __LINE__); | ||
1012 | return r; | ||
1013 | } | ||
1014 | break; | ||
1015 | case PACKET3_DRAW_INDEX_AUTO: | ||
1016 | if (pkt->count != 1) { | ||
1017 | DRM_ERROR("bad DRAW_INDEX_AUTO\n"); | ||
1018 | return -EINVAL; | ||
1019 | } | ||
1020 | r = evergreen_cs_track_check(p); | ||
1021 | if (r) { | ||
1022 | dev_warn(p->dev, "%s:%d invalid cmd stream %d\n", __func__, __LINE__, idx); | ||
1023 | return r; | ||
1024 | } | ||
1025 | break; | ||
1026 | case PACKET3_DRAW_INDEX_MULTI_AUTO: | ||
1027 | if (pkt->count != 2) { | ||
1028 | DRM_ERROR("bad DRAW_INDEX_MULTI_AUTO\n"); | ||
1029 | return -EINVAL; | ||
1030 | } | ||
1031 | r = evergreen_cs_track_check(p); | ||
1032 | if (r) { | ||
1033 | dev_warn(p->dev, "%s:%d invalid cmd stream %d\n", __func__, __LINE__, idx); | ||
1034 | return r; | ||
1035 | } | ||
1036 | break; | ||
1037 | case PACKET3_DRAW_INDEX_IMMD: | ||
1038 | if (pkt->count < 2) { | ||
1039 | DRM_ERROR("bad DRAW_INDEX_IMMD\n"); | ||
1040 | return -EINVAL; | ||
1041 | } | ||
1042 | r = evergreen_cs_track_check(p); | ||
1043 | if (r) { | ||
1044 | dev_warn(p->dev, "%s:%d invalid cmd stream\n", __func__, __LINE__); | ||
1045 | return r; | ||
1046 | } | ||
1047 | break; | ||
1048 | case PACKET3_DRAW_INDEX_OFFSET: | ||
1049 | if (pkt->count != 2) { | ||
1050 | DRM_ERROR("bad DRAW_INDEX_OFFSET\n"); | ||
1051 | return -EINVAL; | ||
1052 | } | ||
1053 | r = evergreen_cs_track_check(p); | ||
1054 | if (r) { | ||
1055 | dev_warn(p->dev, "%s:%d invalid cmd stream\n", __func__, __LINE__); | ||
1056 | return r; | ||
1057 | } | ||
1058 | break; | ||
1059 | case PACKET3_DRAW_INDEX_OFFSET_2: | ||
1060 | if (pkt->count != 3) { | ||
1061 | DRM_ERROR("bad DRAW_INDEX_OFFSET_2\n"); | ||
1062 | return -EINVAL; | ||
1063 | } | ||
1064 | r = evergreen_cs_track_check(p); | ||
1065 | if (r) { | ||
1066 | dev_warn(p->dev, "%s:%d invalid cmd stream\n", __func__, __LINE__); | ||
1067 | return r; | ||
1068 | } | ||
1069 | break; | ||
1070 | case PACKET3_WAIT_REG_MEM: | ||
1071 | if (pkt->count != 5) { | ||
1072 | DRM_ERROR("bad WAIT_REG_MEM\n"); | ||
1073 | return -EINVAL; | ||
1074 | } | ||
1075 | /* bit 4 is reg (0) or mem (1) */ | ||
1076 | if (idx_value & 0x10) { | ||
1077 | r = evergreen_cs_packet_next_reloc(p, &reloc); | ||
1078 | if (r) { | ||
1079 | DRM_ERROR("bad WAIT_REG_MEM\n"); | ||
1080 | return -EINVAL; | ||
1081 | } | ||
1082 | ib[idx+1] += (u32)(reloc->lobj.gpu_offset & 0xffffffff); | ||
1083 | ib[idx+2] += upper_32_bits(reloc->lobj.gpu_offset) & 0xff; | ||
1084 | } | ||
1085 | break; | ||
1086 | case PACKET3_SURFACE_SYNC: | ||
1087 | if (pkt->count != 3) { | ||
1088 | DRM_ERROR("bad SURFACE_SYNC\n"); | ||
1089 | return -EINVAL; | ||
1090 | } | ||
1091 | /* 0xffffffff/0x0 is flush all cache flag */ | ||
1092 | if (radeon_get_ib_value(p, idx + 1) != 0xffffffff || | ||
1093 | radeon_get_ib_value(p, idx + 2) != 0) { | ||
1094 | r = evergreen_cs_packet_next_reloc(p, &reloc); | ||
1095 | if (r) { | ||
1096 | DRM_ERROR("bad SURFACE_SYNC\n"); | ||
1097 | return -EINVAL; | ||
1098 | } | ||
1099 | ib[idx+2] += (u32)((reloc->lobj.gpu_offset >> 8) & 0xffffffff); | ||
1100 | } | ||
1101 | break; | ||
1102 | case PACKET3_EVENT_WRITE: | ||
1103 | if (pkt->count != 2 && pkt->count != 0) { | ||
1104 | DRM_ERROR("bad EVENT_WRITE\n"); | ||
1105 | return -EINVAL; | ||
1106 | } | ||
1107 | if (pkt->count) { | ||
1108 | r = evergreen_cs_packet_next_reloc(p, &reloc); | ||
1109 | if (r) { | ||
1110 | DRM_ERROR("bad EVENT_WRITE\n"); | ||
1111 | return -EINVAL; | ||
1112 | } | ||
1113 | ib[idx+1] += (u32)(reloc->lobj.gpu_offset & 0xffffffff); | ||
1114 | ib[idx+2] += upper_32_bits(reloc->lobj.gpu_offset) & 0xff; | ||
1115 | } | ||
1116 | break; | ||
1117 | case PACKET3_EVENT_WRITE_EOP: | ||
1118 | if (pkt->count != 4) { | ||
1119 | DRM_ERROR("bad EVENT_WRITE_EOP\n"); | ||
1120 | return -EINVAL; | ||
1121 | } | ||
1122 | r = evergreen_cs_packet_next_reloc(p, &reloc); | ||
1123 | if (r) { | ||
1124 | DRM_ERROR("bad EVENT_WRITE_EOP\n"); | ||
1125 | return -EINVAL; | ||
1126 | } | ||
1127 | ib[idx+1] += (u32)(reloc->lobj.gpu_offset & 0xffffffff); | ||
1128 | ib[idx+2] += upper_32_bits(reloc->lobj.gpu_offset) & 0xff; | ||
1129 | break; | ||
1130 | case PACKET3_EVENT_WRITE_EOS: | ||
1131 | if (pkt->count != 3) { | ||
1132 | DRM_ERROR("bad EVENT_WRITE_EOS\n"); | ||
1133 | return -EINVAL; | ||
1134 | } | ||
1135 | r = evergreen_cs_packet_next_reloc(p, &reloc); | ||
1136 | if (r) { | ||
1137 | DRM_ERROR("bad EVENT_WRITE_EOS\n"); | ||
1138 | return -EINVAL; | ||
1139 | } | ||
1140 | ib[idx+1] += (u32)(reloc->lobj.gpu_offset & 0xffffffff); | ||
1141 | ib[idx+2] += upper_32_bits(reloc->lobj.gpu_offset) & 0xff; | ||
1142 | break; | ||
1143 | case PACKET3_SET_CONFIG_REG: | ||
1144 | start_reg = (idx_value << 2) + PACKET3_SET_CONFIG_REG_START; | ||
1145 | end_reg = 4 * pkt->count + start_reg - 4; | ||
1146 | if ((start_reg < PACKET3_SET_CONFIG_REG_START) || | ||
1147 | (start_reg >= PACKET3_SET_CONFIG_REG_END) || | ||
1148 | (end_reg >= PACKET3_SET_CONFIG_REG_END)) { | ||
1149 | DRM_ERROR("bad PACKET3_SET_CONFIG_REG\n"); | ||
1150 | return -EINVAL; | ||
1151 | } | ||
1152 | for (i = 0; i < pkt->count; i++) { | ||
1153 | reg = start_reg + (4 * i); | ||
1154 | r = evergreen_cs_check_reg(p, reg, idx+1+i); | ||
1155 | if (r) | ||
1156 | return r; | ||
1157 | } | ||
1158 | break; | ||
1159 | case PACKET3_SET_CONTEXT_REG: | ||
1160 | start_reg = (idx_value << 2) + PACKET3_SET_CONTEXT_REG_START; | ||
1161 | end_reg = 4 * pkt->count + start_reg - 4; | ||
1162 | if ((start_reg < PACKET3_SET_CONTEXT_REG_START) || | ||
1163 | (start_reg >= PACKET3_SET_CONTEXT_REG_END) || | ||
1164 | (end_reg >= PACKET3_SET_CONTEXT_REG_END)) { | ||
1165 | DRM_ERROR("bad PACKET3_SET_CONTEXT_REG\n"); | ||
1166 | return -EINVAL; | ||
1167 | } | ||
1168 | for (i = 0; i < pkt->count; i++) { | ||
1169 | reg = start_reg + (4 * i); | ||
1170 | r = evergreen_cs_check_reg(p, reg, idx+1+i); | ||
1171 | if (r) | ||
1172 | return r; | ||
1173 | } | ||
1174 | break; | ||
1175 | case PACKET3_SET_RESOURCE: | ||
1176 | if (pkt->count % 8) { | ||
1177 | DRM_ERROR("bad SET_RESOURCE\n"); | ||
1178 | return -EINVAL; | ||
1179 | } | ||
1180 | start_reg = (idx_value << 2) + PACKET3_SET_RESOURCE_START; | ||
1181 | end_reg = 4 * pkt->count + start_reg - 4; | ||
1182 | if ((start_reg < PACKET3_SET_RESOURCE_START) || | ||
1183 | (start_reg >= PACKET3_SET_RESOURCE_END) || | ||
1184 | (end_reg >= PACKET3_SET_RESOURCE_END)) { | ||
1185 | DRM_ERROR("bad SET_RESOURCE\n"); | ||
1186 | return -EINVAL; | ||
1187 | } | ||
1188 | for (i = 0; i < (pkt->count / 8); i++) { | ||
1189 | struct radeon_bo *texture, *mipmap; | ||
1190 | u32 size, offset; | ||
1191 | |||
1192 | switch (G__SQ_CONSTANT_TYPE(radeon_get_ib_value(p, idx+1+(i*8)+7))) { | ||
1193 | case SQ_TEX_VTX_VALID_TEXTURE: | ||
1194 | /* tex base */ | ||
1195 | r = evergreen_cs_packet_next_reloc(p, &reloc); | ||
1196 | if (r) { | ||
1197 | DRM_ERROR("bad SET_RESOURCE (tex)\n"); | ||
1198 | return -EINVAL; | ||
1199 | } | ||
1200 | ib[idx+1+(i*8)+3] += (u32)((reloc->lobj.gpu_offset >> 8) & 0xffffffff); | ||
1201 | if (reloc->lobj.tiling_flags & RADEON_TILING_MACRO) | ||
1202 | ib[idx+1+(i*8)+1] |= TEX_ARRAY_MODE(ARRAY_2D_TILED_THIN1); | ||
1203 | else if (reloc->lobj.tiling_flags & RADEON_TILING_MICRO) | ||
1204 | ib[idx+1+(i*8)+1] |= TEX_ARRAY_MODE(ARRAY_1D_TILED_THIN1); | ||
1205 | texture = reloc->robj; | ||
1206 | /* tex mip base */ | ||
1207 | r = evergreen_cs_packet_next_reloc(p, &reloc); | ||
1208 | if (r) { | ||
1209 | DRM_ERROR("bad SET_RESOURCE (tex)\n"); | ||
1210 | return -EINVAL; | ||
1211 | } | ||
1212 | ib[idx+1+(i*8)+4] += (u32)((reloc->lobj.gpu_offset >> 8) & 0xffffffff); | ||
1213 | mipmap = reloc->robj; | ||
1214 | r = evergreen_check_texture_resource(p, idx+1+(i*8), | ||
1215 | texture, mipmap); | ||
1216 | if (r) | ||
1217 | return r; | ||
1218 | break; | ||
1219 | case SQ_TEX_VTX_VALID_BUFFER: | ||
1220 | /* vtx base */ | ||
1221 | r = evergreen_cs_packet_next_reloc(p, &reloc); | ||
1222 | if (r) { | ||
1223 | DRM_ERROR("bad SET_RESOURCE (vtx)\n"); | ||
1224 | return -EINVAL; | ||
1225 | } | ||
1226 | offset = radeon_get_ib_value(p, idx+1+(i*8)+0); | ||
1227 | size = radeon_get_ib_value(p, idx+1+(i*8)+1); | ||
1228 | if (p->rdev && (size + offset) > radeon_bo_size(reloc->robj)) { | ||
1229 | /* force size to size of the buffer */ | ||
1230 | dev_warn(p->dev, "vbo resource seems too big for the bo\n"); | ||
1231 | ib[idx+1+(i*8)+1] = radeon_bo_size(reloc->robj); | ||
1232 | } | ||
1233 | ib[idx+1+(i*8)+0] += (u32)((reloc->lobj.gpu_offset) & 0xffffffff); | ||
1234 | ib[idx+1+(i*8)+2] += upper_32_bits(reloc->lobj.gpu_offset) & 0xff; | ||
1235 | break; | ||
1236 | case SQ_TEX_VTX_INVALID_TEXTURE: | ||
1237 | case SQ_TEX_VTX_INVALID_BUFFER: | ||
1238 | default: | ||
1239 | DRM_ERROR("bad SET_RESOURCE\n"); | ||
1240 | return -EINVAL; | ||
1241 | } | ||
1242 | } | ||
1243 | break; | ||
1244 | case PACKET3_SET_ALU_CONST: | ||
1245 | /* XXX fix me ALU const buffers only */ | ||
1246 | break; | ||
1247 | case PACKET3_SET_BOOL_CONST: | ||
1248 | start_reg = (idx_value << 2) + PACKET3_SET_BOOL_CONST_START; | ||
1249 | end_reg = 4 * pkt->count + start_reg - 4; | ||
1250 | if ((start_reg < PACKET3_SET_BOOL_CONST_START) || | ||
1251 | (start_reg >= PACKET3_SET_BOOL_CONST_END) || | ||
1252 | (end_reg >= PACKET3_SET_BOOL_CONST_END)) { | ||
1253 | DRM_ERROR("bad SET_BOOL_CONST\n"); | ||
1254 | return -EINVAL; | ||
1255 | } | ||
1256 | break; | ||
1257 | case PACKET3_SET_LOOP_CONST: | ||
1258 | start_reg = (idx_value << 2) + PACKET3_SET_LOOP_CONST_START; | ||
1259 | end_reg = 4 * pkt->count + start_reg - 4; | ||
1260 | if ((start_reg < PACKET3_SET_LOOP_CONST_START) || | ||
1261 | (start_reg >= PACKET3_SET_LOOP_CONST_END) || | ||
1262 | (end_reg >= PACKET3_SET_LOOP_CONST_END)) { | ||
1263 | DRM_ERROR("bad SET_LOOP_CONST\n"); | ||
1264 | return -EINVAL; | ||
1265 | } | ||
1266 | break; | ||
1267 | case PACKET3_SET_CTL_CONST: | ||
1268 | start_reg = (idx_value << 2) + PACKET3_SET_CTL_CONST_START; | ||
1269 | end_reg = 4 * pkt->count + start_reg - 4; | ||
1270 | if ((start_reg < PACKET3_SET_CTL_CONST_START) || | ||
1271 | (start_reg >= PACKET3_SET_CTL_CONST_END) || | ||
1272 | (end_reg >= PACKET3_SET_CTL_CONST_END)) { | ||
1273 | DRM_ERROR("bad SET_CTL_CONST\n"); | ||
1274 | return -EINVAL; | ||
1275 | } | ||
1276 | break; | ||
1277 | case PACKET3_SET_SAMPLER: | ||
1278 | if (pkt->count % 3) { | ||
1279 | DRM_ERROR("bad SET_SAMPLER\n"); | ||
1280 | return -EINVAL; | ||
1281 | } | ||
1282 | start_reg = (idx_value << 2) + PACKET3_SET_SAMPLER_START; | ||
1283 | end_reg = 4 * pkt->count + start_reg - 4; | ||
1284 | if ((start_reg < PACKET3_SET_SAMPLER_START) || | ||
1285 | (start_reg >= PACKET3_SET_SAMPLER_END) || | ||
1286 | (end_reg >= PACKET3_SET_SAMPLER_END)) { | ||
1287 | DRM_ERROR("bad SET_SAMPLER\n"); | ||
1288 | return -EINVAL; | ||
1289 | } | ||
1290 | break; | ||
1291 | case PACKET3_NOP: | ||
1292 | break; | ||
1293 | default: | ||
1294 | DRM_ERROR("Packet3 opcode %x not supported\n", pkt->opcode); | ||
1295 | return -EINVAL; | ||
1296 | } | ||
1297 | return 0; | ||
1298 | } | ||
1299 | |||
1300 | int evergreen_cs_parse(struct radeon_cs_parser *p) | ||
1301 | { | ||
1302 | struct radeon_cs_packet pkt; | ||
1303 | struct evergreen_cs_track *track; | ||
1304 | int r; | ||
1305 | |||
1306 | if (p->track == NULL) { | ||
1307 | /* initialize tracker, we are in kms */ | ||
1308 | track = kzalloc(sizeof(*track), GFP_KERNEL); | ||
1309 | if (track == NULL) | ||
1310 | return -ENOMEM; | ||
1311 | evergreen_cs_track_init(track); | ||
1312 | track->npipes = p->rdev->config.evergreen.tiling_npipes; | ||
1313 | track->nbanks = p->rdev->config.evergreen.tiling_nbanks; | ||
1314 | track->group_size = p->rdev->config.evergreen.tiling_group_size; | ||
1315 | p->track = track; | ||
1316 | } | ||
1317 | do { | ||
1318 | r = evergreen_cs_packet_parse(p, &pkt, p->idx); | ||
1319 | if (r) { | ||
1320 | kfree(p->track); | ||
1321 | p->track = NULL; | ||
1322 | return r; | ||
1323 | } | ||
1324 | p->idx += pkt.count + 2; | ||
1325 | switch (pkt.type) { | ||
1326 | case PACKET_TYPE0: | ||
1327 | r = evergreen_cs_parse_packet0(p, &pkt); | ||
1328 | break; | ||
1329 | case PACKET_TYPE2: | ||
1330 | break; | ||
1331 | case PACKET_TYPE3: | ||
1332 | r = evergreen_packet3_check(p, &pkt); | ||
1333 | break; | ||
1334 | default: | ||
1335 | DRM_ERROR("Unknown packet type %d !\n", pkt.type); | ||
1336 | kfree(p->track); | ||
1337 | p->track = NULL; | ||
1338 | return -EINVAL; | ||
1339 | } | ||
1340 | if (r) { | ||
1341 | kfree(p->track); | ||
1342 | p->track = NULL; | ||
1343 | return r; | ||
1344 | } | ||
1345 | } while (p->idx < p->chunks[p->chunk_ib_idx].length_dw); | ||
1346 | #if 0 | ||
1347 | for (r = 0; r < p->ib->length_dw; r++) { | ||
1348 | printk(KERN_INFO "%05d 0x%08X\n", r, p->ib->ptr[r]); | ||
1349 | mdelay(1); | ||
1350 | } | ||
1351 | #endif | ||
1352 | kfree(p->track); | ||
1353 | p->track = NULL; | ||
1354 | return 0; | ||
1355 | } | ||
1356 | |||
diff --git a/drivers/gpu/drm/radeon/evergreen_reg.h b/drivers/gpu/drm/radeon/evergreen_reg.h index af86af836f1..e028c1cd9d9 100644 --- a/drivers/gpu/drm/radeon/evergreen_reg.h +++ b/drivers/gpu/drm/radeon/evergreen_reg.h | |||
@@ -151,6 +151,9 @@ | |||
151 | #define EVERGREEN_DATA_FORMAT 0x6b00 | 151 | #define EVERGREEN_DATA_FORMAT 0x6b00 |
152 | # define EVERGREEN_INTERLEAVE_EN (1 << 0) | 152 | # define EVERGREEN_INTERLEAVE_EN (1 << 0) |
153 | #define EVERGREEN_DESKTOP_HEIGHT 0x6b04 | 153 | #define EVERGREEN_DESKTOP_HEIGHT 0x6b04 |
154 | #define EVERGREEN_VLINE_START_END 0x6b08 | ||
155 | #define EVERGREEN_VLINE_STATUS 0x6bb8 | ||
156 | # define EVERGREEN_VLINE_STAT (1 << 12) | ||
154 | 157 | ||
155 | #define EVERGREEN_VIEWPORT_START 0x6d70 | 158 | #define EVERGREEN_VIEWPORT_START 0x6d70 |
156 | #define EVERGREEN_VIEWPORT_SIZE 0x6d74 | 159 | #define EVERGREEN_VIEWPORT_SIZE 0x6d74 |
diff --git a/drivers/gpu/drm/radeon/evergreend.h b/drivers/gpu/drm/radeon/evergreend.h index 93e9e17ad54..79683f6b445 100644 --- a/drivers/gpu/drm/radeon/evergreend.h +++ b/drivers/gpu/drm/radeon/evergreend.h | |||
@@ -218,6 +218,8 @@ | |||
218 | #define CLIP_VTX_REORDER_ENA (1 << 0) | 218 | #define CLIP_VTX_REORDER_ENA (1 << 0) |
219 | #define NUM_CLIP_SEQ(x) ((x) << 1) | 219 | #define NUM_CLIP_SEQ(x) ((x) << 1) |
220 | #define PA_SC_AA_CONFIG 0x28C04 | 220 | #define PA_SC_AA_CONFIG 0x28C04 |
221 | #define MSAA_NUM_SAMPLES_SHIFT 0 | ||
222 | #define MSAA_NUM_SAMPLES_MASK 0x3 | ||
221 | #define PA_SC_CLIPRECT_RULE 0x2820C | 223 | #define PA_SC_CLIPRECT_RULE 0x2820C |
222 | #define PA_SC_EDGERULE 0x28230 | 224 | #define PA_SC_EDGERULE 0x28230 |
223 | #define PA_SC_FIFO_SIZE 0x8BCC | 225 | #define PA_SC_FIFO_SIZE 0x8BCC |
@@ -553,4 +555,466 @@ | |||
553 | # define DC_HPDx_RX_INT_TIMER(x) ((x) << 16) | 555 | # define DC_HPDx_RX_INT_TIMER(x) ((x) << 16) |
554 | # define DC_HPDx_EN (1 << 28) | 556 | # define DC_HPDx_EN (1 << 28) |
555 | 557 | ||
558 | /* | ||
559 | * PM4 | ||
560 | */ | ||
561 | #define PACKET_TYPE0 0 | ||
562 | #define PACKET_TYPE1 1 | ||
563 | #define PACKET_TYPE2 2 | ||
564 | #define PACKET_TYPE3 3 | ||
565 | |||
566 | #define CP_PACKET_GET_TYPE(h) (((h) >> 30) & 3) | ||
567 | #define CP_PACKET_GET_COUNT(h) (((h) >> 16) & 0x3FFF) | ||
568 | #define CP_PACKET0_GET_REG(h) (((h) & 0xFFFF) << 2) | ||
569 | #define CP_PACKET3_GET_OPCODE(h) (((h) >> 8) & 0xFF) | ||
570 | #define PACKET0(reg, n) ((PACKET_TYPE0 << 30) | \ | ||
571 | (((reg) >> 2) & 0xFFFF) | \ | ||
572 | ((n) & 0x3FFF) << 16) | ||
573 | #define CP_PACKET2 0x80000000 | ||
574 | #define PACKET2_PAD_SHIFT 0 | ||
575 | #define PACKET2_PAD_MASK (0x3fffffff << 0) | ||
576 | |||
577 | #define PACKET2(v) (CP_PACKET2 | REG_SET(PACKET2_PAD, (v))) | ||
578 | |||
579 | #define PACKET3(op, n) ((PACKET_TYPE3 << 30) | \ | ||
580 | (((op) & 0xFF) << 8) | \ | ||
581 | ((n) & 0x3FFF) << 16) | ||
582 | |||
583 | /* Packet 3 types */ | ||
584 | #define PACKET3_NOP 0x10 | ||
585 | #define PACKET3_SET_BASE 0x11 | ||
586 | #define PACKET3_CLEAR_STATE 0x12 | ||
587 | #define PACKET3_INDIRECT_BUFFER_SIZE 0x13 | ||
588 | #define PACKET3_DISPATCH_DIRECT 0x15 | ||
589 | #define PACKET3_DISPATCH_INDIRECT 0x16 | ||
590 | #define PACKET3_INDIRECT_BUFFER_END 0x17 | ||
591 | #define PACKET3_SET_PREDICATION 0x20 | ||
592 | #define PACKET3_REG_RMW 0x21 | ||
593 | #define PACKET3_COND_EXEC 0x22 | ||
594 | #define PACKET3_PRED_EXEC 0x23 | ||
595 | #define PACKET3_DRAW_INDIRECT 0x24 | ||
596 | #define PACKET3_DRAW_INDEX_INDIRECT 0x25 | ||
597 | #define PACKET3_INDEX_BASE 0x26 | ||
598 | #define PACKET3_DRAW_INDEX_2 0x27 | ||
599 | #define PACKET3_CONTEXT_CONTROL 0x28 | ||
600 | #define PACKET3_DRAW_INDEX_OFFSET 0x29 | ||
601 | #define PACKET3_INDEX_TYPE 0x2A | ||
602 | #define PACKET3_DRAW_INDEX 0x2B | ||
603 | #define PACKET3_DRAW_INDEX_AUTO 0x2D | ||
604 | #define PACKET3_DRAW_INDEX_IMMD 0x2E | ||
605 | #define PACKET3_NUM_INSTANCES 0x2F | ||
606 | #define PACKET3_DRAW_INDEX_MULTI_AUTO 0x30 | ||
607 | #define PACKET3_STRMOUT_BUFFER_UPDATE 0x34 | ||
608 | #define PACKET3_DRAW_INDEX_OFFSET_2 0x35 | ||
609 | #define PACKET3_DRAW_INDEX_MULTI_ELEMENT 0x36 | ||
610 | #define PACKET3_MEM_SEMAPHORE 0x39 | ||
611 | #define PACKET3_MPEG_INDEX 0x3A | ||
612 | #define PACKET3_WAIT_REG_MEM 0x3C | ||
613 | #define PACKET3_MEM_WRITE 0x3D | ||
614 | #define PACKET3_INDIRECT_BUFFER 0x32 | ||
615 | #define PACKET3_SURFACE_SYNC 0x43 | ||
616 | # define PACKET3_CB0_DEST_BASE_ENA (1 << 6) | ||
617 | # define PACKET3_CB1_DEST_BASE_ENA (1 << 7) | ||
618 | # define PACKET3_CB2_DEST_BASE_ENA (1 << 8) | ||
619 | # define PACKET3_CB3_DEST_BASE_ENA (1 << 9) | ||
620 | # define PACKET3_CB4_DEST_BASE_ENA (1 << 10) | ||
621 | # define PACKET3_CB5_DEST_BASE_ENA (1 << 11) | ||
622 | # define PACKET3_CB6_DEST_BASE_ENA (1 << 12) | ||
623 | # define PACKET3_CB7_DEST_BASE_ENA (1 << 13) | ||
624 | # define PACKET3_DB_DEST_BASE_ENA (1 << 14) | ||
625 | # define PACKET3_CB8_DEST_BASE_ENA (1 << 15) | ||
626 | # define PACKET3_CB9_DEST_BASE_ENA (1 << 16) | ||
627 | # define PACKET3_CB10_DEST_BASE_ENA (1 << 17) | ||
628 | # define PACKET3_CB11_DEST_BASE_ENA (1 << 17) | ||
629 | # define PACKET3_FULL_CACHE_ENA (1 << 20) | ||
630 | # define PACKET3_TC_ACTION_ENA (1 << 23) | ||
631 | # define PACKET3_VC_ACTION_ENA (1 << 24) | ||
632 | # define PACKET3_CB_ACTION_ENA (1 << 25) | ||
633 | # define PACKET3_DB_ACTION_ENA (1 << 26) | ||
634 | # define PACKET3_SH_ACTION_ENA (1 << 27) | ||
635 | # define PACKET3_SMX_ACTION_ENA (1 << 28) | ||
636 | #define PACKET3_ME_INITIALIZE 0x44 | ||
637 | #define PACKET3_ME_INITIALIZE_DEVICE_ID(x) ((x) << 16) | ||
638 | #define PACKET3_COND_WRITE 0x45 | ||
639 | #define PACKET3_EVENT_WRITE 0x46 | ||
640 | #define PACKET3_EVENT_WRITE_EOP 0x47 | ||
641 | #define PACKET3_EVENT_WRITE_EOS 0x48 | ||
642 | #define PACKET3_PREAMBLE_CNTL 0x4A | ||
643 | #define PACKET3_RB_OFFSET 0x4B | ||
644 | #define PACKET3_ALU_PS_CONST_BUFFER_COPY 0x4C | ||
645 | #define PACKET3_ALU_VS_CONST_BUFFER_COPY 0x4D | ||
646 | #define PACKET3_ALU_PS_CONST_UPDATE 0x4E | ||
647 | #define PACKET3_ALU_VS_CONST_UPDATE 0x4F | ||
648 | #define PACKET3_ONE_REG_WRITE 0x57 | ||
649 | #define PACKET3_SET_CONFIG_REG 0x68 | ||
650 | #define PACKET3_SET_CONFIG_REG_START 0x00008000 | ||
651 | #define PACKET3_SET_CONFIG_REG_END 0x0000ac00 | ||
652 | #define PACKET3_SET_CONTEXT_REG 0x69 | ||
653 | #define PACKET3_SET_CONTEXT_REG_START 0x00028000 | ||
654 | #define PACKET3_SET_CONTEXT_REG_END 0x00029000 | ||
655 | #define PACKET3_SET_ALU_CONST 0x6A | ||
656 | /* alu const buffers only; no reg file */ | ||
657 | #define PACKET3_SET_BOOL_CONST 0x6B | ||
658 | #define PACKET3_SET_BOOL_CONST_START 0x0003a500 | ||
659 | #define PACKET3_SET_BOOL_CONST_END 0x0003a518 | ||
660 | #define PACKET3_SET_LOOP_CONST 0x6C | ||
661 | #define PACKET3_SET_LOOP_CONST_START 0x0003a200 | ||
662 | #define PACKET3_SET_LOOP_CONST_END 0x0003a500 | ||
663 | #define PACKET3_SET_RESOURCE 0x6D | ||
664 | #define PACKET3_SET_RESOURCE_START 0x00030000 | ||
665 | #define PACKET3_SET_RESOURCE_END 0x00038000 | ||
666 | #define PACKET3_SET_SAMPLER 0x6E | ||
667 | #define PACKET3_SET_SAMPLER_START 0x0003c000 | ||
668 | #define PACKET3_SET_SAMPLER_END 0x0003c600 | ||
669 | #define PACKET3_SET_CTL_CONST 0x6F | ||
670 | #define PACKET3_SET_CTL_CONST_START 0x0003cff0 | ||
671 | #define PACKET3_SET_CTL_CONST_END 0x0003ff0c | ||
672 | #define PACKET3_SET_RESOURCE_OFFSET 0x70 | ||
673 | #define PACKET3_SET_ALU_CONST_VS 0x71 | ||
674 | #define PACKET3_SET_ALU_CONST_DI 0x72 | ||
675 | #define PACKET3_SET_CONTEXT_REG_INDIRECT 0x73 | ||
676 | #define PACKET3_SET_RESOURCE_INDIRECT 0x74 | ||
677 | #define PACKET3_SET_APPEND_CNT 0x75 | ||
678 | |||
679 | #define SQ_RESOURCE_CONSTANT_WORD7_0 0x3001c | ||
680 | #define S__SQ_CONSTANT_TYPE(x) (((x) & 3) << 30) | ||
681 | #define G__SQ_CONSTANT_TYPE(x) (((x) >> 30) & 3) | ||
682 | #define SQ_TEX_VTX_INVALID_TEXTURE 0x0 | ||
683 | #define SQ_TEX_VTX_INVALID_BUFFER 0x1 | ||
684 | #define SQ_TEX_VTX_VALID_TEXTURE 0x2 | ||
685 | #define SQ_TEX_VTX_VALID_BUFFER 0x3 | ||
686 | |||
687 | #define SQ_CONST_MEM_BASE 0x8df8 | ||
688 | |||
689 | #define SQ_ESGS_RING_SIZE 0x8c44 | ||
690 | #define SQ_GSVS_RING_SIZE 0x8c4c | ||
691 | #define SQ_ESTMP_RING_SIZE 0x8c54 | ||
692 | #define SQ_GSTMP_RING_SIZE 0x8c5c | ||
693 | #define SQ_VSTMP_RING_SIZE 0x8c64 | ||
694 | #define SQ_PSTMP_RING_SIZE 0x8c6c | ||
695 | #define SQ_LSTMP_RING_SIZE 0x8e14 | ||
696 | #define SQ_HSTMP_RING_SIZE 0x8e1c | ||
697 | #define VGT_TF_RING_SIZE 0x8988 | ||
698 | |||
699 | #define SQ_ESGS_RING_ITEMSIZE 0x28900 | ||
700 | #define SQ_GSVS_RING_ITEMSIZE 0x28904 | ||
701 | #define SQ_ESTMP_RING_ITEMSIZE 0x28908 | ||
702 | #define SQ_GSTMP_RING_ITEMSIZE 0x2890c | ||
703 | #define SQ_VSTMP_RING_ITEMSIZE 0x28910 | ||
704 | #define SQ_PSTMP_RING_ITEMSIZE 0x28914 | ||
705 | #define SQ_LSTMP_RING_ITEMSIZE 0x28830 | ||
706 | #define SQ_HSTMP_RING_ITEMSIZE 0x28834 | ||
707 | |||
708 | #define SQ_GS_VERT_ITEMSIZE 0x2891c | ||
709 | #define SQ_GS_VERT_ITEMSIZE_1 0x28920 | ||
710 | #define SQ_GS_VERT_ITEMSIZE_2 0x28924 | ||
711 | #define SQ_GS_VERT_ITEMSIZE_3 0x28928 | ||
712 | #define SQ_GSVS_RING_OFFSET_1 0x2892c | ||
713 | #define SQ_GSVS_RING_OFFSET_2 0x28930 | ||
714 | #define SQ_GSVS_RING_OFFSET_3 0x28934 | ||
715 | |||
716 | #define SQ_ALU_CONST_CACHE_PS_0 0x28940 | ||
717 | #define SQ_ALU_CONST_CACHE_PS_1 0x28944 | ||
718 | #define SQ_ALU_CONST_CACHE_PS_2 0x28948 | ||
719 | #define SQ_ALU_CONST_CACHE_PS_3 0x2894c | ||
720 | #define SQ_ALU_CONST_CACHE_PS_4 0x28950 | ||
721 | #define SQ_ALU_CONST_CACHE_PS_5 0x28954 | ||
722 | #define SQ_ALU_CONST_CACHE_PS_6 0x28958 | ||
723 | #define SQ_ALU_CONST_CACHE_PS_7 0x2895c | ||
724 | #define SQ_ALU_CONST_CACHE_PS_8 0x28960 | ||
725 | #define SQ_ALU_CONST_CACHE_PS_9 0x28964 | ||
726 | #define SQ_ALU_CONST_CACHE_PS_10 0x28968 | ||
727 | #define SQ_ALU_CONST_CACHE_PS_11 0x2896c | ||
728 | #define SQ_ALU_CONST_CACHE_PS_12 0x28970 | ||
729 | #define SQ_ALU_CONST_CACHE_PS_13 0x28974 | ||
730 | #define SQ_ALU_CONST_CACHE_PS_14 0x28978 | ||
731 | #define SQ_ALU_CONST_CACHE_PS_15 0x2897c | ||
732 | #define SQ_ALU_CONST_CACHE_VS_0 0x28980 | ||
733 | #define SQ_ALU_CONST_CACHE_VS_1 0x28984 | ||
734 | #define SQ_ALU_CONST_CACHE_VS_2 0x28988 | ||
735 | #define SQ_ALU_CONST_CACHE_VS_3 0x2898c | ||
736 | #define SQ_ALU_CONST_CACHE_VS_4 0x28990 | ||
737 | #define SQ_ALU_CONST_CACHE_VS_5 0x28994 | ||
738 | #define SQ_ALU_CONST_CACHE_VS_6 0x28998 | ||
739 | #define SQ_ALU_CONST_CACHE_VS_7 0x2899c | ||
740 | #define SQ_ALU_CONST_CACHE_VS_8 0x289a0 | ||
741 | #define SQ_ALU_CONST_CACHE_VS_9 0x289a4 | ||
742 | #define SQ_ALU_CONST_CACHE_VS_10 0x289a8 | ||
743 | #define SQ_ALU_CONST_CACHE_VS_11 0x289ac | ||
744 | #define SQ_ALU_CONST_CACHE_VS_12 0x289b0 | ||
745 | #define SQ_ALU_CONST_CACHE_VS_13 0x289b4 | ||
746 | #define SQ_ALU_CONST_CACHE_VS_14 0x289b8 | ||
747 | #define SQ_ALU_CONST_CACHE_VS_15 0x289bc | ||
748 | #define SQ_ALU_CONST_CACHE_GS_0 0x289c0 | ||
749 | #define SQ_ALU_CONST_CACHE_GS_1 0x289c4 | ||
750 | #define SQ_ALU_CONST_CACHE_GS_2 0x289c8 | ||
751 | #define SQ_ALU_CONST_CACHE_GS_3 0x289cc | ||
752 | #define SQ_ALU_CONST_CACHE_GS_4 0x289d0 | ||
753 | #define SQ_ALU_CONST_CACHE_GS_5 0x289d4 | ||
754 | #define SQ_ALU_CONST_CACHE_GS_6 0x289d8 | ||
755 | #define SQ_ALU_CONST_CACHE_GS_7 0x289dc | ||
756 | #define SQ_ALU_CONST_CACHE_GS_8 0x289e0 | ||
757 | #define SQ_ALU_CONST_CACHE_GS_9 0x289e4 | ||
758 | #define SQ_ALU_CONST_CACHE_GS_10 0x289e8 | ||
759 | #define SQ_ALU_CONST_CACHE_GS_11 0x289ec | ||
760 | #define SQ_ALU_CONST_CACHE_GS_12 0x289f0 | ||
761 | #define SQ_ALU_CONST_CACHE_GS_13 0x289f4 | ||
762 | #define SQ_ALU_CONST_CACHE_GS_14 0x289f8 | ||
763 | #define SQ_ALU_CONST_CACHE_GS_15 0x289fc | ||
764 | #define SQ_ALU_CONST_CACHE_HS_0 0x28f00 | ||
765 | #define SQ_ALU_CONST_CACHE_HS_1 0x28f04 | ||
766 | #define SQ_ALU_CONST_CACHE_HS_2 0x28f08 | ||
767 | #define SQ_ALU_CONST_CACHE_HS_3 0x28f0c | ||
768 | #define SQ_ALU_CONST_CACHE_HS_4 0x28f10 | ||
769 | #define SQ_ALU_CONST_CACHE_HS_5 0x28f14 | ||
770 | #define SQ_ALU_CONST_CACHE_HS_6 0x28f18 | ||
771 | #define SQ_ALU_CONST_CACHE_HS_7 0x28f1c | ||
772 | #define SQ_ALU_CONST_CACHE_HS_8 0x28f20 | ||
773 | #define SQ_ALU_CONST_CACHE_HS_9 0x28f24 | ||
774 | #define SQ_ALU_CONST_CACHE_HS_10 0x28f28 | ||
775 | #define SQ_ALU_CONST_CACHE_HS_11 0x28f2c | ||
776 | #define SQ_ALU_CONST_CACHE_HS_12 0x28f30 | ||
777 | #define SQ_ALU_CONST_CACHE_HS_13 0x28f34 | ||
778 | #define SQ_ALU_CONST_CACHE_HS_14 0x28f38 | ||
779 | #define SQ_ALU_CONST_CACHE_HS_15 0x28f3c | ||
780 | #define SQ_ALU_CONST_CACHE_LS_0 0x28f40 | ||
781 | #define SQ_ALU_CONST_CACHE_LS_1 0x28f44 | ||
782 | #define SQ_ALU_CONST_CACHE_LS_2 0x28f48 | ||
783 | #define SQ_ALU_CONST_CACHE_LS_3 0x28f4c | ||
784 | #define SQ_ALU_CONST_CACHE_LS_4 0x28f50 | ||
785 | #define SQ_ALU_CONST_CACHE_LS_5 0x28f54 | ||
786 | #define SQ_ALU_CONST_CACHE_LS_6 0x28f58 | ||
787 | #define SQ_ALU_CONST_CACHE_LS_7 0x28f5c | ||
788 | #define SQ_ALU_CONST_CACHE_LS_8 0x28f60 | ||
789 | #define SQ_ALU_CONST_CACHE_LS_9 0x28f64 | ||
790 | #define SQ_ALU_CONST_CACHE_LS_10 0x28f68 | ||
791 | #define SQ_ALU_CONST_CACHE_LS_11 0x28f6c | ||
792 | #define SQ_ALU_CONST_CACHE_LS_12 0x28f70 | ||
793 | #define SQ_ALU_CONST_CACHE_LS_13 0x28f74 | ||
794 | #define SQ_ALU_CONST_CACHE_LS_14 0x28f78 | ||
795 | #define SQ_ALU_CONST_CACHE_LS_15 0x28f7c | ||
796 | |||
797 | #define DB_DEPTH_CONTROL 0x28800 | ||
798 | #define DB_DEPTH_VIEW 0x28008 | ||
799 | #define DB_HTILE_DATA_BASE 0x28014 | ||
800 | #define DB_Z_INFO 0x28040 | ||
801 | # define Z_ARRAY_MODE(x) ((x) << 4) | ||
802 | #define DB_STENCIL_INFO 0x28044 | ||
803 | #define DB_Z_READ_BASE 0x28048 | ||
804 | #define DB_STENCIL_READ_BASE 0x2804c | ||
805 | #define DB_Z_WRITE_BASE 0x28050 | ||
806 | #define DB_STENCIL_WRITE_BASE 0x28054 | ||
807 | #define DB_DEPTH_SIZE 0x28058 | ||
808 | |||
809 | #define SQ_PGM_START_PS 0x28840 | ||
810 | #define SQ_PGM_START_VS 0x2885c | ||
811 | #define SQ_PGM_START_GS 0x28874 | ||
812 | #define SQ_PGM_START_ES 0x2888c | ||
813 | #define SQ_PGM_START_FS 0x288a4 | ||
814 | #define SQ_PGM_START_HS 0x288b8 | ||
815 | #define SQ_PGM_START_LS 0x288d0 | ||
816 | |||
817 | #define VGT_STRMOUT_CONFIG 0x28b94 | ||
818 | #define VGT_STRMOUT_BUFFER_CONFIG 0x28b98 | ||
819 | |||
820 | #define CB_TARGET_MASK 0x28238 | ||
821 | #define CB_SHADER_MASK 0x2823c | ||
822 | |||
823 | #define GDS_ADDR_BASE 0x28720 | ||
824 | |||
825 | #define CB_IMMED0_BASE 0x28b9c | ||
826 | #define CB_IMMED1_BASE 0x28ba0 | ||
827 | #define CB_IMMED2_BASE 0x28ba4 | ||
828 | #define CB_IMMED3_BASE 0x28ba8 | ||
829 | #define CB_IMMED4_BASE 0x28bac | ||
830 | #define CB_IMMED5_BASE 0x28bb0 | ||
831 | #define CB_IMMED6_BASE 0x28bb4 | ||
832 | #define CB_IMMED7_BASE 0x28bb8 | ||
833 | #define CB_IMMED8_BASE 0x28bbc | ||
834 | #define CB_IMMED9_BASE 0x28bc0 | ||
835 | #define CB_IMMED10_BASE 0x28bc4 | ||
836 | #define CB_IMMED11_BASE 0x28bc8 | ||
837 | |||
838 | /* all 12 CB blocks have these regs */ | ||
839 | #define CB_COLOR0_BASE 0x28c60 | ||
840 | #define CB_COLOR0_PITCH 0x28c64 | ||
841 | #define CB_COLOR0_SLICE 0x28c68 | ||
842 | #define CB_COLOR0_VIEW 0x28c6c | ||
843 | #define CB_COLOR0_INFO 0x28c70 | ||
844 | # define CB_ARRAY_MODE(x) ((x) << 8) | ||
845 | # define ARRAY_LINEAR_GENERAL 0 | ||
846 | # define ARRAY_LINEAR_ALIGNED 1 | ||
847 | # define ARRAY_1D_TILED_THIN1 2 | ||
848 | # define ARRAY_2D_TILED_THIN1 4 | ||
849 | #define CB_COLOR0_ATTRIB 0x28c74 | ||
850 | #define CB_COLOR0_DIM 0x28c78 | ||
851 | /* only CB0-7 blocks have these regs */ | ||
852 | #define CB_COLOR0_CMASK 0x28c7c | ||
853 | #define CB_COLOR0_CMASK_SLICE 0x28c80 | ||
854 | #define CB_COLOR0_FMASK 0x28c84 | ||
855 | #define CB_COLOR0_FMASK_SLICE 0x28c88 | ||
856 | #define CB_COLOR0_CLEAR_WORD0 0x28c8c | ||
857 | #define CB_COLOR0_CLEAR_WORD1 0x28c90 | ||
858 | #define CB_COLOR0_CLEAR_WORD2 0x28c94 | ||
859 | #define CB_COLOR0_CLEAR_WORD3 0x28c98 | ||
860 | |||
861 | #define CB_COLOR1_BASE 0x28c9c | ||
862 | #define CB_COLOR2_BASE 0x28cd8 | ||
863 | #define CB_COLOR3_BASE 0x28d14 | ||
864 | #define CB_COLOR4_BASE 0x28d50 | ||
865 | #define CB_COLOR5_BASE 0x28d8c | ||
866 | #define CB_COLOR6_BASE 0x28dc8 | ||
867 | #define CB_COLOR7_BASE 0x28e04 | ||
868 | #define CB_COLOR8_BASE 0x28e40 | ||
869 | #define CB_COLOR9_BASE 0x28e5c | ||
870 | #define CB_COLOR10_BASE 0x28e78 | ||
871 | #define CB_COLOR11_BASE 0x28e94 | ||
872 | |||
873 | #define CB_COLOR1_PITCH 0x28ca0 | ||
874 | #define CB_COLOR2_PITCH 0x28cdc | ||
875 | #define CB_COLOR3_PITCH 0x28d18 | ||
876 | #define CB_COLOR4_PITCH 0x28d54 | ||
877 | #define CB_COLOR5_PITCH 0x28d90 | ||
878 | #define CB_COLOR6_PITCH 0x28dcc | ||
879 | #define CB_COLOR7_PITCH 0x28e08 | ||
880 | #define CB_COLOR8_PITCH 0x28e44 | ||
881 | #define CB_COLOR9_PITCH 0x28e60 | ||
882 | #define CB_COLOR10_PITCH 0x28e7c | ||
883 | #define CB_COLOR11_PITCH 0x28e98 | ||
884 | |||
885 | #define CB_COLOR1_SLICE 0x28ca4 | ||
886 | #define CB_COLOR2_SLICE 0x28ce0 | ||
887 | #define CB_COLOR3_SLICE 0x28d1c | ||
888 | #define CB_COLOR4_SLICE 0x28d58 | ||
889 | #define CB_COLOR5_SLICE 0x28d94 | ||
890 | #define CB_COLOR6_SLICE 0x28dd0 | ||
891 | #define CB_COLOR7_SLICE 0x28e0c | ||
892 | #define CB_COLOR8_SLICE 0x28e48 | ||
893 | #define CB_COLOR9_SLICE 0x28e64 | ||
894 | #define CB_COLOR10_SLICE 0x28e80 | ||
895 | #define CB_COLOR11_SLICE 0x28e9c | ||
896 | |||
897 | #define CB_COLOR1_VIEW 0x28ca8 | ||
898 | #define CB_COLOR2_VIEW 0x28ce4 | ||
899 | #define CB_COLOR3_VIEW 0x28d20 | ||
900 | #define CB_COLOR4_VIEW 0x28d5c | ||
901 | #define CB_COLOR5_VIEW 0x28d98 | ||
902 | #define CB_COLOR6_VIEW 0x28dd4 | ||
903 | #define CB_COLOR7_VIEW 0x28e10 | ||
904 | #define CB_COLOR8_VIEW 0x28e4c | ||
905 | #define CB_COLOR9_VIEW 0x28e68 | ||
906 | #define CB_COLOR10_VIEW 0x28e84 | ||
907 | #define CB_COLOR11_VIEW 0x28ea0 | ||
908 | |||
909 | #define CB_COLOR1_INFO 0x28cac | ||
910 | #define CB_COLOR2_INFO 0x28ce8 | ||
911 | #define CB_COLOR3_INFO 0x28d24 | ||
912 | #define CB_COLOR4_INFO 0x28d60 | ||
913 | #define CB_COLOR5_INFO 0x28d9c | ||
914 | #define CB_COLOR6_INFO 0x28dd8 | ||
915 | #define CB_COLOR7_INFO 0x28e14 | ||
916 | #define CB_COLOR8_INFO 0x28e50 | ||
917 | #define CB_COLOR9_INFO 0x28e6c | ||
918 | #define CB_COLOR10_INFO 0x28e88 | ||
919 | #define CB_COLOR11_INFO 0x28ea4 | ||
920 | |||
921 | #define CB_COLOR1_ATTRIB 0x28cb0 | ||
922 | #define CB_COLOR2_ATTRIB 0x28cec | ||
923 | #define CB_COLOR3_ATTRIB 0x28d28 | ||
924 | #define CB_COLOR4_ATTRIB 0x28d64 | ||
925 | #define CB_COLOR5_ATTRIB 0x28da0 | ||
926 | #define CB_COLOR6_ATTRIB 0x28ddc | ||
927 | #define CB_COLOR7_ATTRIB 0x28e18 | ||
928 | #define CB_COLOR8_ATTRIB 0x28e54 | ||
929 | #define CB_COLOR9_ATTRIB 0x28e70 | ||
930 | #define CB_COLOR10_ATTRIB 0x28e8c | ||
931 | #define CB_COLOR11_ATTRIB 0x28ea8 | ||
932 | |||
933 | #define CB_COLOR1_DIM 0x28cb4 | ||
934 | #define CB_COLOR2_DIM 0x28cf0 | ||
935 | #define CB_COLOR3_DIM 0x28d2c | ||
936 | #define CB_COLOR4_DIM 0x28d68 | ||
937 | #define CB_COLOR5_DIM 0x28da4 | ||
938 | #define CB_COLOR6_DIM 0x28de0 | ||
939 | #define CB_COLOR7_DIM 0x28e1c | ||
940 | #define CB_COLOR8_DIM 0x28e58 | ||
941 | #define CB_COLOR9_DIM 0x28e74 | ||
942 | #define CB_COLOR10_DIM 0x28e90 | ||
943 | #define CB_COLOR11_DIM 0x28eac | ||
944 | |||
945 | #define CB_COLOR1_CMASK 0x28cb8 | ||
946 | #define CB_COLOR2_CMASK 0x28cf4 | ||
947 | #define CB_COLOR3_CMASK 0x28d30 | ||
948 | #define CB_COLOR4_CMASK 0x28d6c | ||
949 | #define CB_COLOR5_CMASK 0x28da8 | ||
950 | #define CB_COLOR6_CMASK 0x28de4 | ||
951 | #define CB_COLOR7_CMASK 0x28e20 | ||
952 | |||
953 | #define CB_COLOR1_CMASK_SLICE 0x28cbc | ||
954 | #define CB_COLOR2_CMASK_SLICE 0x28cf8 | ||
955 | #define CB_COLOR3_CMASK_SLICE 0x28d34 | ||
956 | #define CB_COLOR4_CMASK_SLICE 0x28d70 | ||
957 | #define CB_COLOR5_CMASK_SLICE 0x28dac | ||
958 | #define CB_COLOR6_CMASK_SLICE 0x28de8 | ||
959 | #define CB_COLOR7_CMASK_SLICE 0x28e24 | ||
960 | |||
961 | #define CB_COLOR1_FMASK 0x28cc0 | ||
962 | #define CB_COLOR2_FMASK 0x28cfc | ||
963 | #define CB_COLOR3_FMASK 0x28d38 | ||
964 | #define CB_COLOR4_FMASK 0x28d74 | ||
965 | #define CB_COLOR5_FMASK 0x28db0 | ||
966 | #define CB_COLOR6_FMASK 0x28dec | ||
967 | #define CB_COLOR7_FMASK 0x28e28 | ||
968 | |||
969 | #define CB_COLOR1_FMASK_SLICE 0x28cc4 | ||
970 | #define CB_COLOR2_FMASK_SLICE 0x28d00 | ||
971 | #define CB_COLOR3_FMASK_SLICE 0x28d3c | ||
972 | #define CB_COLOR4_FMASK_SLICE 0x28d78 | ||
973 | #define CB_COLOR5_FMASK_SLICE 0x28db4 | ||
974 | #define CB_COLOR6_FMASK_SLICE 0x28df0 | ||
975 | #define CB_COLOR7_FMASK_SLICE 0x28e2c | ||
976 | |||
977 | #define CB_COLOR1_CLEAR_WORD0 0x28cc8 | ||
978 | #define CB_COLOR2_CLEAR_WORD0 0x28d04 | ||
979 | #define CB_COLOR3_CLEAR_WORD0 0x28d40 | ||
980 | #define CB_COLOR4_CLEAR_WORD0 0x28d7c | ||
981 | #define CB_COLOR5_CLEAR_WORD0 0x28db8 | ||
982 | #define CB_COLOR6_CLEAR_WORD0 0x28df4 | ||
983 | #define CB_COLOR7_CLEAR_WORD0 0x28e30 | ||
984 | |||
985 | #define CB_COLOR1_CLEAR_WORD1 0x28ccc | ||
986 | #define CB_COLOR2_CLEAR_WORD1 0x28d08 | ||
987 | #define CB_COLOR3_CLEAR_WORD1 0x28d44 | ||
988 | #define CB_COLOR4_CLEAR_WORD1 0x28d80 | ||
989 | #define CB_COLOR5_CLEAR_WORD1 0x28dbc | ||
990 | #define CB_COLOR6_CLEAR_WORD1 0x28df8 | ||
991 | #define CB_COLOR7_CLEAR_WORD1 0x28e34 | ||
992 | |||
993 | #define CB_COLOR1_CLEAR_WORD2 0x28cd0 | ||
994 | #define CB_COLOR2_CLEAR_WORD2 0x28d0c | ||
995 | #define CB_COLOR3_CLEAR_WORD2 0x28d48 | ||
996 | #define CB_COLOR4_CLEAR_WORD2 0x28d84 | ||
997 | #define CB_COLOR5_CLEAR_WORD2 0x28dc0 | ||
998 | #define CB_COLOR6_CLEAR_WORD2 0x28dfc | ||
999 | #define CB_COLOR7_CLEAR_WORD2 0x28e38 | ||
1000 | |||
1001 | #define CB_COLOR1_CLEAR_WORD3 0x28cd4 | ||
1002 | #define CB_COLOR2_CLEAR_WORD3 0x28d10 | ||
1003 | #define CB_COLOR3_CLEAR_WORD3 0x28d4c | ||
1004 | #define CB_COLOR4_CLEAR_WORD3 0x28d88 | ||
1005 | #define CB_COLOR5_CLEAR_WORD3 0x28dc4 | ||
1006 | #define CB_COLOR6_CLEAR_WORD3 0x28e00 | ||
1007 | #define CB_COLOR7_CLEAR_WORD3 0x28e3c | ||
1008 | |||
1009 | #define SQ_TEX_RESOURCE_WORD0_0 0x30000 | ||
1010 | #define SQ_TEX_RESOURCE_WORD1_0 0x30004 | ||
1011 | # define TEX_ARRAY_MODE(x) ((x) << 28) | ||
1012 | #define SQ_TEX_RESOURCE_WORD2_0 0x30008 | ||
1013 | #define SQ_TEX_RESOURCE_WORD3_0 0x3000C | ||
1014 | #define SQ_TEX_RESOURCE_WORD4_0 0x30010 | ||
1015 | #define SQ_TEX_RESOURCE_WORD5_0 0x30014 | ||
1016 | #define SQ_TEX_RESOURCE_WORD6_0 0x30018 | ||
1017 | #define SQ_TEX_RESOURCE_WORD7_0 0x3001c | ||
1018 | |||
1019 | |||
556 | #endif | 1020 | #endif |
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index 44e96a2ae25..e14f59748e6 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c | |||
@@ -475,6 +475,12 @@ void r600_pm_init_profile(struct radeon_device *rdev) | |||
475 | 475 | ||
476 | void r600_pm_misc(struct radeon_device *rdev) | 476 | void r600_pm_misc(struct radeon_device *rdev) |
477 | { | 477 | { |
478 | int requested_index = rdev->pm.requested_power_state_index; | ||
479 | struct radeon_power_state *ps = &rdev->pm.power_state[requested_index]; | ||
480 | struct radeon_voltage *voltage = &ps->clock_info[0].voltage; | ||
481 | |||
482 | if ((voltage->type == VOLTAGE_SW) && voltage->voltage) | ||
483 | radeon_atom_set_voltage(rdev, voltage->voltage); | ||
478 | 484 | ||
479 | } | 485 | } |
480 | 486 | ||
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index 669feb689bf..5f96fe871b3 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h | |||
@@ -176,6 +176,7 @@ void radeon_pm_suspend(struct radeon_device *rdev); | |||
176 | void radeon_pm_resume(struct radeon_device *rdev); | 176 | void radeon_pm_resume(struct radeon_device *rdev); |
177 | void radeon_combios_get_power_modes(struct radeon_device *rdev); | 177 | void radeon_combios_get_power_modes(struct radeon_device *rdev); |
178 | void radeon_atombios_get_power_modes(struct radeon_device *rdev); | 178 | void radeon_atombios_get_power_modes(struct radeon_device *rdev); |
179 | void radeon_atom_set_voltage(struct radeon_device *rdev, u16 level); | ||
179 | 180 | ||
180 | /* | 181 | /* |
181 | * Fences. | 182 | * Fences. |
diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c index e57df08d4ae..87f7e2cc52d 100644 --- a/drivers/gpu/drm/radeon/radeon_asic.c +++ b/drivers/gpu/drm/radeon/radeon_asic.c | |||
@@ -724,8 +724,8 @@ static struct radeon_asic evergreen_asic = { | |||
724 | .irq_set = &evergreen_irq_set, | 724 | .irq_set = &evergreen_irq_set, |
725 | .irq_process = &evergreen_irq_process, | 725 | .irq_process = &evergreen_irq_process, |
726 | .get_vblank_counter = &evergreen_get_vblank_counter, | 726 | .get_vblank_counter = &evergreen_get_vblank_counter, |
727 | .fence_ring_emit = NULL, | 727 | .fence_ring_emit = &r600_fence_ring_emit, |
728 | .cs_parse = NULL, | 728 | .cs_parse = &evergreen_cs_parse, |
729 | .copy_blit = NULL, | 729 | .copy_blit = NULL, |
730 | .copy_dma = NULL, | 730 | .copy_dma = NULL, |
731 | .copy = NULL, | 731 | .copy = NULL, |
diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h index 5c40a3dfaca..c0bbaa64157 100644 --- a/drivers/gpu/drm/radeon/radeon_asic.h +++ b/drivers/gpu/drm/radeon/radeon_asic.h | |||
@@ -314,6 +314,7 @@ void evergreen_hpd_set_polarity(struct radeon_device *rdev, | |||
314 | u32 evergreen_get_vblank_counter(struct radeon_device *rdev, int crtc); | 314 | u32 evergreen_get_vblank_counter(struct radeon_device *rdev, int crtc); |
315 | int evergreen_irq_set(struct radeon_device *rdev); | 315 | int evergreen_irq_set(struct radeon_device *rdev); |
316 | int evergreen_irq_process(struct radeon_device *rdev); | 316 | int evergreen_irq_process(struct radeon_device *rdev); |
317 | extern int evergreen_cs_parse(struct radeon_cs_parser *p); | ||
317 | extern void evergreen_pm_misc(struct radeon_device *rdev); | 318 | extern void evergreen_pm_misc(struct radeon_device *rdev); |
318 | extern void evergreen_pm_prepare(struct radeon_device *rdev); | 319 | extern void evergreen_pm_prepare(struct radeon_device *rdev); |
319 | extern void evergreen_pm_finish(struct radeon_device *rdev); | 320 | extern void evergreen_pm_finish(struct radeon_device *rdev); |
diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c index 24ea683f7cf..4305cd55d0a 100644 --- a/drivers/gpu/drm/radeon/radeon_atombios.c +++ b/drivers/gpu/drm/radeon/radeon_atombios.c | |||
@@ -1538,7 +1538,8 @@ void radeon_atombios_get_power_modes(struct radeon_device *rdev) | |||
1538 | rdev->pm.power_state[state_index].pcie_lanes = | 1538 | rdev->pm.power_state[state_index].pcie_lanes = |
1539 | power_info->info.asPowerPlayInfo[i].ucNumPciELanes; | 1539 | power_info->info.asPowerPlayInfo[i].ucNumPciELanes; |
1540 | misc = le32_to_cpu(power_info->info.asPowerPlayInfo[i].ulMiscInfo); | 1540 | misc = le32_to_cpu(power_info->info.asPowerPlayInfo[i].ulMiscInfo); |
1541 | if (misc & ATOM_PM_MISCINFO_VOLTAGE_DROP_SUPPORT) { | 1541 | if ((misc & ATOM_PM_MISCINFO_VOLTAGE_DROP_SUPPORT) || |
1542 | (misc & ATOM_PM_MISCINFO_VOLTAGE_DROP_ACTIVE_HIGH)) { | ||
1542 | rdev->pm.power_state[state_index].clock_info[0].voltage.type = | 1543 | rdev->pm.power_state[state_index].clock_info[0].voltage.type = |
1543 | VOLTAGE_GPIO; | 1544 | VOLTAGE_GPIO; |
1544 | rdev->pm.power_state[state_index].clock_info[0].voltage.gpio = | 1545 | rdev->pm.power_state[state_index].clock_info[0].voltage.gpio = |
@@ -1605,7 +1606,8 @@ void radeon_atombios_get_power_modes(struct radeon_device *rdev) | |||
1605 | power_info->info_2.asPowerPlayInfo[i].ucNumPciELanes; | 1606 | power_info->info_2.asPowerPlayInfo[i].ucNumPciELanes; |
1606 | misc = le32_to_cpu(power_info->info_2.asPowerPlayInfo[i].ulMiscInfo); | 1607 | misc = le32_to_cpu(power_info->info_2.asPowerPlayInfo[i].ulMiscInfo); |
1607 | misc2 = le32_to_cpu(power_info->info_2.asPowerPlayInfo[i].ulMiscInfo2); | 1608 | misc2 = le32_to_cpu(power_info->info_2.asPowerPlayInfo[i].ulMiscInfo2); |
1608 | if (misc & ATOM_PM_MISCINFO_VOLTAGE_DROP_SUPPORT) { | 1609 | if ((misc & ATOM_PM_MISCINFO_VOLTAGE_DROP_SUPPORT) || |
1610 | (misc & ATOM_PM_MISCINFO_VOLTAGE_DROP_ACTIVE_HIGH)) { | ||
1609 | rdev->pm.power_state[state_index].clock_info[0].voltage.type = | 1611 | rdev->pm.power_state[state_index].clock_info[0].voltage.type = |
1610 | VOLTAGE_GPIO; | 1612 | VOLTAGE_GPIO; |
1611 | rdev->pm.power_state[state_index].clock_info[0].voltage.gpio = | 1613 | rdev->pm.power_state[state_index].clock_info[0].voltage.gpio = |
@@ -1679,7 +1681,8 @@ void radeon_atombios_get_power_modes(struct radeon_device *rdev) | |||
1679 | power_info->info_3.asPowerPlayInfo[i].ucNumPciELanes; | 1681 | power_info->info_3.asPowerPlayInfo[i].ucNumPciELanes; |
1680 | misc = le32_to_cpu(power_info->info_3.asPowerPlayInfo[i].ulMiscInfo); | 1682 | misc = le32_to_cpu(power_info->info_3.asPowerPlayInfo[i].ulMiscInfo); |
1681 | misc2 = le32_to_cpu(power_info->info_3.asPowerPlayInfo[i].ulMiscInfo2); | 1683 | misc2 = le32_to_cpu(power_info->info_3.asPowerPlayInfo[i].ulMiscInfo2); |
1682 | if (misc & ATOM_PM_MISCINFO_VOLTAGE_DROP_SUPPORT) { | 1684 | if ((misc & ATOM_PM_MISCINFO_VOLTAGE_DROP_SUPPORT) || |
1685 | (misc & ATOM_PM_MISCINFO_VOLTAGE_DROP_ACTIVE_HIGH)) { | ||
1683 | rdev->pm.power_state[state_index].clock_info[0].voltage.type = | 1686 | rdev->pm.power_state[state_index].clock_info[0].voltage.type = |
1684 | VOLTAGE_GPIO; | 1687 | VOLTAGE_GPIO; |
1685 | rdev->pm.power_state[state_index].clock_info[0].voltage.gpio = | 1688 | rdev->pm.power_state[state_index].clock_info[0].voltage.gpio = |
@@ -1755,9 +1758,22 @@ void radeon_atombios_get_power_modes(struct radeon_device *rdev) | |||
1755 | rdev->pm.power_state[state_index].misc2 = 0; | 1758 | rdev->pm.power_state[state_index].misc2 = 0; |
1756 | } | 1759 | } |
1757 | } else { | 1760 | } else { |
1761 | int fw_index = GetIndexIntoMasterTable(DATA, FirmwareInfo); | ||
1762 | uint8_t fw_frev, fw_crev; | ||
1763 | uint16_t fw_data_offset, vddc = 0; | ||
1764 | union firmware_info *firmware_info; | ||
1765 | ATOM_PPLIB_THERMALCONTROLLER *controller = &power_info->info_4.sThermalController; | ||
1766 | |||
1767 | if (atom_parse_data_header(mode_info->atom_context, fw_index, NULL, | ||
1768 | &fw_frev, &fw_crev, &fw_data_offset)) { | ||
1769 | firmware_info = | ||
1770 | (union firmware_info *)(mode_info->atom_context->bios + | ||
1771 | fw_data_offset); | ||
1772 | vddc = firmware_info->info_14.usBootUpVDDCVoltage; | ||
1773 | } | ||
1774 | |||
1758 | /* add the i2c bus for thermal/fan chip */ | 1775 | /* add the i2c bus for thermal/fan chip */ |
1759 | /* no support for internal controller yet */ | 1776 | /* no support for internal controller yet */ |
1760 | ATOM_PPLIB_THERMALCONTROLLER *controller = &power_info->info_4.sThermalController; | ||
1761 | if (controller->ucType > 0) { | 1777 | if (controller->ucType > 0) { |
1762 | if ((controller->ucType == ATOM_PP_THERMALCONTROLLER_RV6xx) || | 1778 | if ((controller->ucType == ATOM_PP_THERMALCONTROLLER_RV6xx) || |
1763 | (controller->ucType == ATOM_PP_THERMALCONTROLLER_RV770) || | 1779 | (controller->ucType == ATOM_PP_THERMALCONTROLLER_RV770) || |
@@ -1904,6 +1920,16 @@ void radeon_atombios_get_power_modes(struct radeon_device *rdev) | |||
1904 | rdev->pm.default_power_state_index = state_index; | 1920 | rdev->pm.default_power_state_index = state_index; |
1905 | rdev->pm.power_state[state_index].default_clock_mode = | 1921 | rdev->pm.power_state[state_index].default_clock_mode = |
1906 | &rdev->pm.power_state[state_index].clock_info[mode_index - 1]; | 1922 | &rdev->pm.power_state[state_index].clock_info[mode_index - 1]; |
1923 | /* patch the table values with the default slck/mclk from firmware info */ | ||
1924 | for (j = 0; j < mode_index; j++) { | ||
1925 | rdev->pm.power_state[state_index].clock_info[j].mclk = | ||
1926 | rdev->clock.default_mclk; | ||
1927 | rdev->pm.power_state[state_index].clock_info[j].sclk = | ||
1928 | rdev->clock.default_sclk; | ||
1929 | if (vddc) | ||
1930 | rdev->pm.power_state[state_index].clock_info[j].voltage.voltage = | ||
1931 | vddc; | ||
1932 | } | ||
1907 | } | 1933 | } |
1908 | state_index++; | 1934 | state_index++; |
1909 | } | 1935 | } |
@@ -1998,6 +2024,42 @@ void radeon_atom_set_memory_clock(struct radeon_device *rdev, | |||
1998 | atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args); | 2024 | atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args); |
1999 | } | 2025 | } |
2000 | 2026 | ||
2027 | union set_voltage { | ||
2028 | struct _SET_VOLTAGE_PS_ALLOCATION alloc; | ||
2029 | struct _SET_VOLTAGE_PARAMETERS v1; | ||
2030 | struct _SET_VOLTAGE_PARAMETERS_V2 v2; | ||
2031 | }; | ||
2032 | |||
2033 | void radeon_atom_set_voltage(struct radeon_device *rdev, u16 level) | ||
2034 | { | ||
2035 | union set_voltage args; | ||
2036 | int index = GetIndexIntoMasterTable(COMMAND, SetVoltage); | ||
2037 | u8 frev, crev, volt_index = level; | ||
2038 | |||
2039 | if (!atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev, &crev)) | ||
2040 | return; | ||
2041 | |||
2042 | switch (crev) { | ||
2043 | case 1: | ||
2044 | args.v1.ucVoltageType = SET_VOLTAGE_TYPE_ASIC_VDDC; | ||
2045 | args.v1.ucVoltageMode = SET_ASIC_VOLTAGE_MODE_ALL_SOURCE; | ||
2046 | args.v1.ucVoltageIndex = volt_index; | ||
2047 | break; | ||
2048 | case 2: | ||
2049 | args.v2.ucVoltageType = SET_VOLTAGE_TYPE_ASIC_VDDC; | ||
2050 | args.v2.ucVoltageMode = SET_ASIC_VOLTAGE_MODE_SET_VOLTAGE; | ||
2051 | args.v2.usVoltageLevel = cpu_to_le16(level); | ||
2052 | break; | ||
2053 | default: | ||
2054 | DRM_ERROR("Unknown table version %d, %d\n", frev, crev); | ||
2055 | return; | ||
2056 | } | ||
2057 | |||
2058 | atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args); | ||
2059 | } | ||
2060 | |||
2061 | |||
2062 | |||
2001 | void radeon_atom_initialize_bios_scratch_regs(struct drm_device *dev) | 2063 | void radeon_atom_initialize_bios_scratch_regs(struct drm_device *dev) |
2002 | { | 2064 | { |
2003 | struct radeon_device *rdev = dev->dev_private; | 2065 | struct radeon_device *rdev = dev->dev_private; |
diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c index 7b5e10d3e9c..102c744eaf5 100644 --- a/drivers/gpu/drm/radeon/radeon_combios.c +++ b/drivers/gpu/drm/radeon/radeon_combios.c | |||
@@ -2454,7 +2454,12 @@ default_mode: | |||
2454 | rdev->pm.power_state[state_index].clock_info[0].mclk = rdev->clock.default_mclk; | 2454 | rdev->pm.power_state[state_index].clock_info[0].mclk = rdev->clock.default_mclk; |
2455 | rdev->pm.power_state[state_index].clock_info[0].sclk = rdev->clock.default_sclk; | 2455 | rdev->pm.power_state[state_index].clock_info[0].sclk = rdev->clock.default_sclk; |
2456 | rdev->pm.power_state[state_index].default_clock_mode = &rdev->pm.power_state[state_index].clock_info[0]; | 2456 | rdev->pm.power_state[state_index].default_clock_mode = &rdev->pm.power_state[state_index].clock_info[0]; |
2457 | rdev->pm.power_state[state_index].clock_info[0].voltage.type = VOLTAGE_NONE; | 2457 | if ((state_index > 0) && |
2458 | (rdev->pm.power_state[0].clock_info[0].voltage.type = VOLTAGE_GPIO)) | ||
2459 | rdev->pm.power_state[state_index].clock_info[0].voltage = | ||
2460 | rdev->pm.power_state[0].clock_info[0].voltage; | ||
2461 | else | ||
2462 | rdev->pm.power_state[state_index].clock_info[0].voltage.type = VOLTAGE_NONE; | ||
2458 | rdev->pm.power_state[state_index].pcie_lanes = 16; | 2463 | rdev->pm.power_state[state_index].pcie_lanes = 16; |
2459 | rdev->pm.power_state[state_index].flags = 0; | 2464 | rdev->pm.power_state[state_index].flags = 0; |
2460 | rdev->pm.default_power_state_index = state_index; | 2465 | rdev->pm.default_power_state_index = state_index; |
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index fdc3fdf78ac..f10faed2156 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c | |||
@@ -546,8 +546,10 @@ static void radeon_switcheroo_set_state(struct pci_dev *pdev, enum vga_switchero | |||
546 | /* don't suspend or resume card normally */ | 546 | /* don't suspend or resume card normally */ |
547 | rdev->powered_down = false; | 547 | rdev->powered_down = false; |
548 | radeon_resume_kms(dev); | 548 | radeon_resume_kms(dev); |
549 | drm_kms_helper_poll_enable(dev); | ||
549 | } else { | 550 | } else { |
550 | printk(KERN_INFO "radeon: switched off\n"); | 551 | printk(KERN_INFO "radeon: switched off\n"); |
552 | drm_kms_helper_poll_disable(dev); | ||
551 | radeon_suspend_kms(dev, pmm); | 553 | radeon_suspend_kms(dev, pmm); |
552 | /* don't suspend or resume card normally */ | 554 | /* don't suspend or resume card normally */ |
553 | rdev->powered_down = true; | 555 | rdev->powered_down = true; |
@@ -711,6 +713,7 @@ int radeon_suspend_kms(struct drm_device *dev, pm_message_t state) | |||
711 | { | 713 | { |
712 | struct radeon_device *rdev; | 714 | struct radeon_device *rdev; |
713 | struct drm_crtc *crtc; | 715 | struct drm_crtc *crtc; |
716 | struct drm_connector *connector; | ||
714 | int r; | 717 | int r; |
715 | 718 | ||
716 | if (dev == NULL || dev->dev_private == NULL) { | 719 | if (dev == NULL || dev->dev_private == NULL) { |
@@ -723,6 +726,12 @@ int radeon_suspend_kms(struct drm_device *dev, pm_message_t state) | |||
723 | 726 | ||
724 | if (rdev->powered_down) | 727 | if (rdev->powered_down) |
725 | return 0; | 728 | return 0; |
729 | |||
730 | /* turn off display hw */ | ||
731 | list_for_each_entry(connector, &dev->mode_config.connector_list, head) { | ||
732 | drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF); | ||
733 | } | ||
734 | |||
726 | /* unpin the front buffers */ | 735 | /* unpin the front buffers */ |
727 | list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { | 736 | list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { |
728 | struct radeon_framebuffer *rfb = to_radeon_framebuffer(crtc->fb); | 737 | struct radeon_framebuffer *rfb = to_radeon_framebuffer(crtc->fb); |
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c index a8d162c6f82..02281269a88 100644 --- a/drivers/gpu/drm/radeon/radeon_pm.c +++ b/drivers/gpu/drm/radeon/radeon_pm.c | |||
@@ -151,6 +151,7 @@ static void radeon_sync_with_vblank(struct radeon_device *rdev) | |||
151 | static void radeon_set_power_state(struct radeon_device *rdev) | 151 | static void radeon_set_power_state(struct radeon_device *rdev) |
152 | { | 152 | { |
153 | u32 sclk, mclk; | 153 | u32 sclk, mclk; |
154 | bool misc_after = false; | ||
154 | 155 | ||
155 | if ((rdev->pm.requested_clock_mode_index == rdev->pm.current_clock_mode_index) && | 156 | if ((rdev->pm.requested_clock_mode_index == rdev->pm.current_clock_mode_index) && |
156 | (rdev->pm.requested_power_state_index == rdev->pm.current_power_state_index)) | 157 | (rdev->pm.requested_power_state_index == rdev->pm.current_power_state_index)) |
@@ -167,55 +168,47 @@ static void radeon_set_power_state(struct radeon_device *rdev) | |||
167 | if (mclk > rdev->clock.default_mclk) | 168 | if (mclk > rdev->clock.default_mclk) |
168 | mclk = rdev->clock.default_mclk; | 169 | mclk = rdev->clock.default_mclk; |
169 | 170 | ||
170 | /* voltage, pcie lanes, etc.*/ | 171 | /* upvolt before raising clocks, downvolt after lowering clocks */ |
171 | radeon_pm_misc(rdev); | 172 | if (sclk < rdev->pm.current_sclk) |
173 | misc_after = true; | ||
172 | 174 | ||
173 | if (rdev->pm.pm_method == PM_METHOD_DYNPM) { | 175 | radeon_sync_with_vblank(rdev); |
174 | radeon_sync_with_vblank(rdev); | ||
175 | 176 | ||
177 | if (rdev->pm.pm_method == PM_METHOD_DYNPM) { | ||
176 | if (!radeon_pm_in_vbl(rdev)) | 178 | if (!radeon_pm_in_vbl(rdev)) |
177 | return; | 179 | return; |
180 | } | ||
178 | 181 | ||
179 | radeon_pm_prepare(rdev); | 182 | radeon_pm_prepare(rdev); |
180 | /* set engine clock */ | ||
181 | if (sclk != rdev->pm.current_sclk) { | ||
182 | radeon_pm_debug_check_in_vbl(rdev, false); | ||
183 | radeon_set_engine_clock(rdev, sclk); | ||
184 | radeon_pm_debug_check_in_vbl(rdev, true); | ||
185 | rdev->pm.current_sclk = sclk; | ||
186 | DRM_DEBUG("Setting: e: %d\n", sclk); | ||
187 | } | ||
188 | 183 | ||
189 | /* set memory clock */ | 184 | if (!misc_after) |
190 | if (rdev->asic->set_memory_clock && (mclk != rdev->pm.current_mclk)) { | 185 | /* voltage, pcie lanes, etc.*/ |
191 | radeon_pm_debug_check_in_vbl(rdev, false); | 186 | radeon_pm_misc(rdev); |
192 | radeon_set_memory_clock(rdev, mclk); | 187 | |
193 | radeon_pm_debug_check_in_vbl(rdev, true); | 188 | /* set engine clock */ |
194 | rdev->pm.current_mclk = mclk; | 189 | if (sclk != rdev->pm.current_sclk) { |
195 | DRM_DEBUG("Setting: m: %d\n", mclk); | 190 | radeon_pm_debug_check_in_vbl(rdev, false); |
196 | } | 191 | radeon_set_engine_clock(rdev, sclk); |
197 | radeon_pm_finish(rdev); | 192 | radeon_pm_debug_check_in_vbl(rdev, true); |
198 | } else { | 193 | rdev->pm.current_sclk = sclk; |
199 | /* set engine clock */ | 194 | DRM_DEBUG("Setting: e: %d\n", sclk); |
200 | if (sclk != rdev->pm.current_sclk) { | 195 | } |
201 | radeon_sync_with_vblank(rdev); | 196 | |
202 | radeon_pm_prepare(rdev); | 197 | /* set memory clock */ |
203 | radeon_set_engine_clock(rdev, sclk); | 198 | if (rdev->asic->set_memory_clock && (mclk != rdev->pm.current_mclk)) { |
204 | radeon_pm_finish(rdev); | 199 | radeon_pm_debug_check_in_vbl(rdev, false); |
205 | rdev->pm.current_sclk = sclk; | 200 | radeon_set_memory_clock(rdev, mclk); |
206 | DRM_DEBUG("Setting: e: %d\n", sclk); | 201 | radeon_pm_debug_check_in_vbl(rdev, true); |
207 | } | 202 | rdev->pm.current_mclk = mclk; |
208 | /* set memory clock */ | 203 | DRM_DEBUG("Setting: m: %d\n", mclk); |
209 | if (rdev->asic->set_memory_clock && (mclk != rdev->pm.current_mclk)) { | ||
210 | radeon_sync_with_vblank(rdev); | ||
211 | radeon_pm_prepare(rdev); | ||
212 | radeon_set_memory_clock(rdev, mclk); | ||
213 | radeon_pm_finish(rdev); | ||
214 | rdev->pm.current_mclk = mclk; | ||
215 | DRM_DEBUG("Setting: m: %d\n", mclk); | ||
216 | } | ||
217 | } | 204 | } |
218 | 205 | ||
206 | if (misc_after) | ||
207 | /* voltage, pcie lanes, etc.*/ | ||
208 | radeon_pm_misc(rdev); | ||
209 | |||
210 | radeon_pm_finish(rdev); | ||
211 | |||
219 | rdev->pm.current_power_state_index = rdev->pm.requested_power_state_index; | 212 | rdev->pm.current_power_state_index = rdev->pm.requested_power_state_index; |
220 | rdev->pm.current_clock_mode_index = rdev->pm.requested_clock_mode_index; | 213 | rdev->pm.current_clock_mode_index = rdev->pm.requested_clock_mode_index; |
221 | } else | 214 | } else |
diff --git a/drivers/gpu/drm/radeon/reg_srcs/evergreen b/drivers/gpu/drm/radeon/reg_srcs/evergreen new file mode 100644 index 00000000000..b5c757f68d3 --- /dev/null +++ b/drivers/gpu/drm/radeon/reg_srcs/evergreen | |||
@@ -0,0 +1,611 @@ | |||
1 | evergreen 0x9400 | ||
2 | 0x00008040 WAIT_UNTIL | ||
3 | 0x00008044 WAIT_UNTIL_POLL_CNTL | ||
4 | 0x00008048 WAIT_UNTIL_POLL_MASK | ||
5 | 0x0000804c WAIT_UNTIL_POLL_REFDATA | ||
6 | 0x000088B0 VGT_VTX_VECT_EJECT_REG | ||
7 | 0x000088C4 VGT_CACHE_INVALIDATION | ||
8 | 0x000088D4 VGT_GS_VERTEX_REUSE | ||
9 | 0x00008958 VGT_PRIMITIVE_TYPE | ||
10 | 0x0000895C VGT_INDEX_TYPE | ||
11 | 0x00008970 VGT_NUM_INDICES | ||
12 | 0x00008974 VGT_NUM_INSTANCES | ||
13 | 0x00008990 VGT_COMPUTE_DIM_X | ||
14 | 0x00008994 VGT_COMPUTE_DIM_Y | ||
15 | 0x00008998 VGT_COMPUTE_DIM_Z | ||
16 | 0x0000899C VGT_COMPUTE_START_X | ||
17 | 0x000089A0 VGT_COMPUTE_START_Y | ||
18 | 0x000089A4 VGT_COMPUTE_START_Z | ||
19 | 0x000089AC VGT_COMPUTE_THREAD_GOURP_SIZE | ||
20 | 0x00008A14 PA_CL_ENHANCE | ||
21 | 0x00008A60 PA_SC_LINE_STIPPLE_VALUE | ||
22 | 0x00008B10 PA_SC_LINE_STIPPLE_STATE | ||
23 | 0x00008BF0 PA_SC_ENHANCE | ||
24 | 0x00008D8C SQ_DYN_GPR_CNTL_PS_FLUSH_REQ | ||
25 | 0x00008C00 SQ_CONFIG | ||
26 | 0x00008C04 SQ_GPR_RESOURCE_MGMT_1 | ||
27 | 0x00008C08 SQ_GPR_RESOURCE_MGMT_2 | ||
28 | 0x00008C0C SQ_GPR_RESOURCE_MGMT_3 | ||
29 | 0x00008C10 SQ_GLOBAL_GPR_RESOURCE_MGMT_1 | ||
30 | 0x00008C14 SQ_GLOBAL_GPR_RESOURCE_MGMT_2 | ||
31 | 0x00008C18 SQ_THREAD_RESOURCE_MGMT | ||
32 | 0x00008C1C SQ_THREAD_RESOURCE_MGMT_2 | ||
33 | 0x00008C20 SQ_STACK_RESOURCE_MGMT_1 | ||
34 | 0x00008C24 SQ_STACK_RESOURCE_MGMT_2 | ||
35 | 0x00008C28 SQ_STACK_RESOURCE_MGMT_3 | ||
36 | 0x00008DF8 SQ_CONST_MEM_BASE | ||
37 | 0x00008E48 SQ_EX_ALLOC_TABLE_SLOTS | ||
38 | 0x00009100 SPI_CONFIG_CNTL | ||
39 | 0x0000913C SPI_CONFIG_CNTL_1 | ||
40 | 0x00009700 VC_CNTL | ||
41 | 0x00009714 VC_ENHANCE | ||
42 | 0x00009830 DB_DEBUG | ||
43 | 0x00009834 DB_DEBUG2 | ||
44 | 0x00009838 DB_DEBUG3 | ||
45 | 0x0000983C DB_DEBUG4 | ||
46 | 0x00009854 DB_WATERMARKS | ||
47 | 0x0000A400 TD_PS_BORDER_COLOR_INDEX | ||
48 | 0x0000A404 TD_PS_BORDER_COLOR_RED | ||
49 | 0x0000A408 TD_PS_BORDER_COLOR_GREEN | ||
50 | 0x0000A40C TD_PS_BORDER_COLOR_BLUE | ||
51 | 0x0000A410 TD_PS_BORDER_COLOR_ALPHA | ||
52 | 0x0000A414 TD_VS_BORDER_COLOR_INDEX | ||
53 | 0x0000A418 TD_VS_BORDER_COLOR_RED | ||
54 | 0x0000A41C TD_VS_BORDER_COLOR_GREEN | ||
55 | 0x0000A420 TD_VS_BORDER_COLOR_BLUE | ||
56 | 0x0000A424 TD_VS_BORDER_COLOR_ALPHA | ||
57 | 0x0000A428 TD_GS_BORDER_COLOR_INDEX | ||
58 | 0x0000A42C TD_GS_BORDER_COLOR_RED | ||
59 | 0x0000A430 TD_GS_BORDER_COLOR_GREEN | ||
60 | 0x0000A434 TD_GS_BORDER_COLOR_BLUE | ||
61 | 0x0000A438 TD_GS_BORDER_COLOR_ALPHA | ||
62 | 0x0000A43C TD_HS_BORDER_COLOR_INDEX | ||
63 | 0x0000A440 TD_HS_BORDER_COLOR_RED | ||
64 | 0x0000A444 TD_HS_BORDER_COLOR_GREEN | ||
65 | 0x0000A448 TD_HS_BORDER_COLOR_BLUE | ||
66 | 0x0000A44C TD_HS_BORDER_COLOR_ALPHA | ||
67 | 0x0000A450 TD_LS_BORDER_COLOR_INDEX | ||
68 | 0x0000A454 TD_LS_BORDER_COLOR_RED | ||
69 | 0x0000A458 TD_LS_BORDER_COLOR_GREEN | ||
70 | 0x0000A45C TD_LS_BORDER_COLOR_BLUE | ||
71 | 0x0000A460 TD_LS_BORDER_COLOR_ALPHA | ||
72 | 0x0000A464 TD_CS_BORDER_COLOR_INDEX | ||
73 | 0x0000A468 TD_CS_BORDER_COLOR_RED | ||
74 | 0x0000A46C TD_CS_BORDER_COLOR_GREEN | ||
75 | 0x0000A470 TD_CS_BORDER_COLOR_BLUE | ||
76 | 0x0000A474 TD_CS_BORDER_COLOR_ALPHA | ||
77 | 0x00028000 DB_RENDER_CONTROL | ||
78 | 0x00028004 DB_COUNT_CONTROL | ||
79 | 0x0002800C DB_RENDER_OVERRIDE | ||
80 | 0x00028010 DB_RENDER_OVERRIDE2 | ||
81 | 0x00028028 DB_STENCIL_CLEAR | ||
82 | 0x0002802C DB_DEPTH_CLEAR | ||
83 | 0x00028034 PA_SC_SCREEN_SCISSOR_BR | ||
84 | 0x00028030 PA_SC_SCREEN_SCISSOR_TL | ||
85 | 0x0002805C DB_DEPTH_SLICE | ||
86 | 0x00028140 SQ_ALU_CONST_BUFFER_SIZE_PS_0 | ||
87 | 0x00028144 SQ_ALU_CONST_BUFFER_SIZE_PS_1 | ||
88 | 0x00028148 SQ_ALU_CONST_BUFFER_SIZE_PS_2 | ||
89 | 0x0002814C SQ_ALU_CONST_BUFFER_SIZE_PS_3 | ||
90 | 0x00028150 SQ_ALU_CONST_BUFFER_SIZE_PS_4 | ||
91 | 0x00028154 SQ_ALU_CONST_BUFFER_SIZE_PS_5 | ||
92 | 0x00028158 SQ_ALU_CONST_BUFFER_SIZE_PS_6 | ||
93 | 0x0002815C SQ_ALU_CONST_BUFFER_SIZE_PS_7 | ||
94 | 0x00028160 SQ_ALU_CONST_BUFFER_SIZE_PS_8 | ||
95 | 0x00028164 SQ_ALU_CONST_BUFFER_SIZE_PS_9 | ||
96 | 0x00028168 SQ_ALU_CONST_BUFFER_SIZE_PS_10 | ||
97 | 0x0002816C SQ_ALU_CONST_BUFFER_SIZE_PS_11 | ||
98 | 0x00028170 SQ_ALU_CONST_BUFFER_SIZE_PS_12 | ||
99 | 0x00028174 SQ_ALU_CONST_BUFFER_SIZE_PS_13 | ||
100 | 0x00028178 SQ_ALU_CONST_BUFFER_SIZE_PS_14 | ||
101 | 0x0002817C SQ_ALU_CONST_BUFFER_SIZE_PS_15 | ||
102 | 0x00028180 SQ_ALU_CONST_BUFFER_SIZE_VS_0 | ||
103 | 0x00028184 SQ_ALU_CONST_BUFFER_SIZE_VS_1 | ||
104 | 0x00028188 SQ_ALU_CONST_BUFFER_SIZE_VS_2 | ||
105 | 0x0002818C SQ_ALU_CONST_BUFFER_SIZE_VS_3 | ||
106 | 0x00028190 SQ_ALU_CONST_BUFFER_SIZE_VS_4 | ||
107 | 0x00028194 SQ_ALU_CONST_BUFFER_SIZE_VS_5 | ||
108 | 0x00028198 SQ_ALU_CONST_BUFFER_SIZE_VS_6 | ||
109 | 0x0002819C SQ_ALU_CONST_BUFFER_SIZE_VS_7 | ||
110 | 0x000281A0 SQ_ALU_CONST_BUFFER_SIZE_VS_8 | ||
111 | 0x000281A4 SQ_ALU_CONST_BUFFER_SIZE_VS_9 | ||
112 | 0x000281A8 SQ_ALU_CONST_BUFFER_SIZE_VS_10 | ||
113 | 0x000281AC SQ_ALU_CONST_BUFFER_SIZE_VS_11 | ||
114 | 0x000281B0 SQ_ALU_CONST_BUFFER_SIZE_VS_12 | ||
115 | 0x000281B4 SQ_ALU_CONST_BUFFER_SIZE_VS_13 | ||
116 | 0x000281B8 SQ_ALU_CONST_BUFFER_SIZE_VS_14 | ||
117 | 0x000281BC SQ_ALU_CONST_BUFFER_SIZE_VS_15 | ||
118 | 0x000281C0 SQ_ALU_CONST_BUFFER_SIZE_GS_0 | ||
119 | 0x000281C4 SQ_ALU_CONST_BUFFER_SIZE_GS_1 | ||
120 | 0x000281C8 SQ_ALU_CONST_BUFFER_SIZE_GS_2 | ||
121 | 0x000281CC SQ_ALU_CONST_BUFFER_SIZE_GS_3 | ||
122 | 0x000281D0 SQ_ALU_CONST_BUFFER_SIZE_GS_4 | ||
123 | 0x000281D4 SQ_ALU_CONST_BUFFER_SIZE_GS_5 | ||
124 | 0x000281D8 SQ_ALU_CONST_BUFFER_SIZE_GS_6 | ||
125 | 0x000281DC SQ_ALU_CONST_BUFFER_SIZE_GS_7 | ||
126 | 0x000281E0 SQ_ALU_CONST_BUFFER_SIZE_GS_8 | ||
127 | 0x000281E4 SQ_ALU_CONST_BUFFER_SIZE_GS_9 | ||
128 | 0x000281E8 SQ_ALU_CONST_BUFFER_SIZE_GS_10 | ||
129 | 0x000281EC SQ_ALU_CONST_BUFFER_SIZE_GS_11 | ||
130 | 0x000281F0 SQ_ALU_CONST_BUFFER_SIZE_GS_12 | ||
131 | 0x000281F4 SQ_ALU_CONST_BUFFER_SIZE_GS_13 | ||
132 | 0x000281F8 SQ_ALU_CONST_BUFFER_SIZE_GS_14 | ||
133 | 0x000281FC SQ_ALU_CONST_BUFFER_SIZE_GS_15 | ||
134 | 0x00028200 PA_SC_WINDOW_OFFSET | ||
135 | 0x00028204 PA_SC_WINDOW_SCISSOR_TL | ||
136 | 0x00028208 PA_SC_WINDOW_SCISSOR_BR | ||
137 | 0x0002820C PA_SC_CLIPRECT_RULE | ||
138 | 0x00028210 PA_SC_CLIPRECT_0_TL | ||
139 | 0x00028214 PA_SC_CLIPRECT_0_BR | ||
140 | 0x00028218 PA_SC_CLIPRECT_1_TL | ||
141 | 0x0002821C PA_SC_CLIPRECT_1_BR | ||
142 | 0x00028220 PA_SC_CLIPRECT_2_TL | ||
143 | 0x00028224 PA_SC_CLIPRECT_2_BR | ||
144 | 0x00028228 PA_SC_CLIPRECT_3_TL | ||
145 | 0x0002822C PA_SC_CLIPRECT_3_BR | ||
146 | 0x00028230 PA_SC_EDGERULE | ||
147 | 0x00028234 PA_SU_HARDWARE_SCREEN_OFFSET | ||
148 | 0x00028240 PA_SC_GENERIC_SCISSOR_TL | ||
149 | 0x00028244 PA_SC_GENERIC_SCISSOR_BR | ||
150 | 0x00028250 PA_SC_VPORT_SCISSOR_0_TL | ||
151 | 0x00028254 PA_SC_VPORT_SCISSOR_0_BR | ||
152 | 0x00028258 PA_SC_VPORT_SCISSOR_1_TL | ||
153 | 0x0002825C PA_SC_VPORT_SCISSOR_1_BR | ||
154 | 0x00028260 PA_SC_VPORT_SCISSOR_2_TL | ||
155 | 0x00028264 PA_SC_VPORT_SCISSOR_2_BR | ||
156 | 0x00028268 PA_SC_VPORT_SCISSOR_3_TL | ||
157 | 0x0002826C PA_SC_VPORT_SCISSOR_3_BR | ||
158 | 0x00028270 PA_SC_VPORT_SCISSOR_4_TL | ||
159 | 0x00028274 PA_SC_VPORT_SCISSOR_4_BR | ||
160 | 0x00028278 PA_SC_VPORT_SCISSOR_5_TL | ||
161 | 0x0002827C PA_SC_VPORT_SCISSOR_5_BR | ||
162 | 0x00028280 PA_SC_VPORT_SCISSOR_6_TL | ||
163 | 0x00028284 PA_SC_VPORT_SCISSOR_6_BR | ||
164 | 0x00028288 PA_SC_VPORT_SCISSOR_7_TL | ||
165 | 0x0002828C PA_SC_VPORT_SCISSOR_7_BR | ||
166 | 0x00028290 PA_SC_VPORT_SCISSOR_8_TL | ||
167 | 0x00028294 PA_SC_VPORT_SCISSOR_8_BR | ||
168 | 0x00028298 PA_SC_VPORT_SCISSOR_9_TL | ||
169 | 0x0002829C PA_SC_VPORT_SCISSOR_9_BR | ||
170 | 0x000282A0 PA_SC_VPORT_SCISSOR_10_TL | ||
171 | 0x000282A4 PA_SC_VPORT_SCISSOR_10_BR | ||
172 | 0x000282A8 PA_SC_VPORT_SCISSOR_11_TL | ||
173 | 0x000282AC PA_SC_VPORT_SCISSOR_11_BR | ||
174 | 0x000282B0 PA_SC_VPORT_SCISSOR_12_TL | ||
175 | 0x000282B4 PA_SC_VPORT_SCISSOR_12_BR | ||
176 | 0x000282B8 PA_SC_VPORT_SCISSOR_13_TL | ||
177 | 0x000282BC PA_SC_VPORT_SCISSOR_13_BR | ||
178 | 0x000282C0 PA_SC_VPORT_SCISSOR_14_TL | ||
179 | 0x000282C4 PA_SC_VPORT_SCISSOR_14_BR | ||
180 | 0x000282C8 PA_SC_VPORT_SCISSOR_15_TL | ||
181 | 0x000282CC PA_SC_VPORT_SCISSOR_15_BR | ||
182 | 0x000282D0 PA_SC_VPORT_ZMIN_0 | ||
183 | 0x000282D4 PA_SC_VPORT_ZMAX_0 | ||
184 | 0x000282D8 PA_SC_VPORT_ZMIN_1 | ||
185 | 0x000282DC PA_SC_VPORT_ZMAX_1 | ||
186 | 0x000282E0 PA_SC_VPORT_ZMIN_2 | ||
187 | 0x000282E4 PA_SC_VPORT_ZMAX_2 | ||
188 | 0x000282E8 PA_SC_VPORT_ZMIN_3 | ||
189 | 0x000282EC PA_SC_VPORT_ZMAX_3 | ||
190 | 0x000282F0 PA_SC_VPORT_ZMIN_4 | ||
191 | 0x000282F4 PA_SC_VPORT_ZMAX_4 | ||
192 | 0x000282F8 PA_SC_VPORT_ZMIN_5 | ||
193 | 0x000282FC PA_SC_VPORT_ZMAX_5 | ||
194 | 0x00028300 PA_SC_VPORT_ZMIN_6 | ||
195 | 0x00028304 PA_SC_VPORT_ZMAX_6 | ||
196 | 0x00028308 PA_SC_VPORT_ZMIN_7 | ||
197 | 0x0002830C PA_SC_VPORT_ZMAX_7 | ||
198 | 0x00028310 PA_SC_VPORT_ZMIN_8 | ||
199 | 0x00028314 PA_SC_VPORT_ZMAX_8 | ||
200 | 0x00028318 PA_SC_VPORT_ZMIN_9 | ||
201 | 0x0002831C PA_SC_VPORT_ZMAX_9 | ||
202 | 0x00028320 PA_SC_VPORT_ZMIN_10 | ||
203 | 0x00028324 PA_SC_VPORT_ZMAX_10 | ||
204 | 0x00028328 PA_SC_VPORT_ZMIN_11 | ||
205 | 0x0002832C PA_SC_VPORT_ZMAX_11 | ||
206 | 0x00028330 PA_SC_VPORT_ZMIN_12 | ||
207 | 0x00028334 PA_SC_VPORT_ZMAX_12 | ||
208 | 0x00028338 PA_SC_VPORT_ZMIN_13 | ||
209 | 0x0002833C PA_SC_VPORT_ZMAX_13 | ||
210 | 0x00028340 PA_SC_VPORT_ZMIN_14 | ||
211 | 0x00028344 PA_SC_VPORT_ZMAX_14 | ||
212 | 0x00028348 PA_SC_VPORT_ZMIN_15 | ||
213 | 0x0002834C PA_SC_VPORT_ZMAX_15 | ||
214 | 0x00028350 SX_MISC | ||
215 | 0x00028380 SQ_VTX_SEMANTIC_0 | ||
216 | 0x00028384 SQ_VTX_SEMANTIC_1 | ||
217 | 0x00028388 SQ_VTX_SEMANTIC_2 | ||
218 | 0x0002838C SQ_VTX_SEMANTIC_3 | ||
219 | 0x00028390 SQ_VTX_SEMANTIC_4 | ||
220 | 0x00028394 SQ_VTX_SEMANTIC_5 | ||
221 | 0x00028398 SQ_VTX_SEMANTIC_6 | ||
222 | 0x0002839C SQ_VTX_SEMANTIC_7 | ||
223 | 0x000283A0 SQ_VTX_SEMANTIC_8 | ||
224 | 0x000283A4 SQ_VTX_SEMANTIC_9 | ||
225 | 0x000283A8 SQ_VTX_SEMANTIC_10 | ||
226 | 0x000283AC SQ_VTX_SEMANTIC_11 | ||
227 | 0x000283B0 SQ_VTX_SEMANTIC_12 | ||
228 | 0x000283B4 SQ_VTX_SEMANTIC_13 | ||
229 | 0x000283B8 SQ_VTX_SEMANTIC_14 | ||
230 | 0x000283BC SQ_VTX_SEMANTIC_15 | ||
231 | 0x000283C0 SQ_VTX_SEMANTIC_16 | ||
232 | 0x000283C4 SQ_VTX_SEMANTIC_17 | ||
233 | 0x000283C8 SQ_VTX_SEMANTIC_18 | ||
234 | 0x000283CC SQ_VTX_SEMANTIC_19 | ||
235 | 0x000283D0 SQ_VTX_SEMANTIC_20 | ||
236 | 0x000283D4 SQ_VTX_SEMANTIC_21 | ||
237 | 0x000283D8 SQ_VTX_SEMANTIC_22 | ||
238 | 0x000283DC SQ_VTX_SEMANTIC_23 | ||
239 | 0x000283E0 SQ_VTX_SEMANTIC_24 | ||
240 | 0x000283E4 SQ_VTX_SEMANTIC_25 | ||
241 | 0x000283E8 SQ_VTX_SEMANTIC_26 | ||
242 | 0x000283EC SQ_VTX_SEMANTIC_27 | ||
243 | 0x000283F0 SQ_VTX_SEMANTIC_28 | ||
244 | 0x000283F4 SQ_VTX_SEMANTIC_29 | ||
245 | 0x000283F8 SQ_VTX_SEMANTIC_30 | ||
246 | 0x000283FC SQ_VTX_SEMANTIC_31 | ||
247 | 0x00028400 VGT_MAX_VTX_INDX | ||
248 | 0x00028404 VGT_MIN_VTX_INDX | ||
249 | 0x00028408 VGT_INDX_OFFSET | ||
250 | 0x0002840C VGT_MULTI_PRIM_IB_RESET_INDX | ||
251 | 0x00028410 SX_ALPHA_TEST_CONTROL | ||
252 | 0x00028414 CB_BLEND_RED | ||
253 | 0x00028418 CB_BLEND_GREEN | ||
254 | 0x0002841C CB_BLEND_BLUE | ||
255 | 0x00028420 CB_BLEND_ALPHA | ||
256 | 0x00028430 DB_STENCILREFMASK | ||
257 | 0x00028434 DB_STENCILREFMASK_BF | ||
258 | 0x00028438 SX_ALPHA_REF | ||
259 | 0x0002843C PA_CL_VPORT_XSCALE_0 | ||
260 | 0x00028440 PA_CL_VPORT_XOFFSET_0 | ||
261 | 0x00028444 PA_CL_VPORT_YSCALE_0 | ||
262 | 0x00028448 PA_CL_VPORT_YOFFSET_0 | ||
263 | 0x0002844C PA_CL_VPORT_ZSCALE_0 | ||
264 | 0x00028450 PA_CL_VPORT_ZOFFSET_0 | ||
265 | 0x00028454 PA_CL_VPORT_XSCALE_1 | ||
266 | 0x00028458 PA_CL_VPORT_XOFFSET_1 | ||
267 | 0x0002845C PA_CL_VPORT_YSCALE_1 | ||
268 | 0x00028460 PA_CL_VPORT_YOFFSET_1 | ||
269 | 0x00028464 PA_CL_VPORT_ZSCALE_1 | ||
270 | 0x00028468 PA_CL_VPORT_ZOFFSET_1 | ||
271 | 0x0002846C PA_CL_VPORT_XSCALE_2 | ||
272 | 0x00028470 PA_CL_VPORT_XOFFSET_2 | ||
273 | 0x00028474 PA_CL_VPORT_YSCALE_2 | ||
274 | 0x00028478 PA_CL_VPORT_YOFFSET_2 | ||
275 | 0x0002847C PA_CL_VPORT_ZSCALE_2 | ||
276 | 0x00028480 PA_CL_VPORT_ZOFFSET_2 | ||
277 | 0x00028484 PA_CL_VPORT_XSCALE_3 | ||
278 | 0x00028488 PA_CL_VPORT_XOFFSET_3 | ||
279 | 0x0002848C PA_CL_VPORT_YSCALE_3 | ||
280 | 0x00028490 PA_CL_VPORT_YOFFSET_3 | ||
281 | 0x00028494 PA_CL_VPORT_ZSCALE_3 | ||
282 | 0x00028498 PA_CL_VPORT_ZOFFSET_3 | ||
283 | 0x0002849C PA_CL_VPORT_XSCALE_4 | ||
284 | 0x000284A0 PA_CL_VPORT_XOFFSET_4 | ||
285 | 0x000284A4 PA_CL_VPORT_YSCALE_4 | ||
286 | 0x000284A8 PA_CL_VPORT_YOFFSET_4 | ||
287 | 0x000284AC PA_CL_VPORT_ZSCALE_4 | ||
288 | 0x000284B0 PA_CL_VPORT_ZOFFSET_4 | ||
289 | 0x000284B4 PA_CL_VPORT_XSCALE_5 | ||
290 | 0x000284B8 PA_CL_VPORT_XOFFSET_5 | ||
291 | 0x000284BC PA_CL_VPORT_YSCALE_5 | ||
292 | 0x000284C0 PA_CL_VPORT_YOFFSET_5 | ||
293 | 0x000284C4 PA_CL_VPORT_ZSCALE_5 | ||
294 | 0x000284C8 PA_CL_VPORT_ZOFFSET_5 | ||
295 | 0x000284CC PA_CL_VPORT_XSCALE_6 | ||
296 | 0x000284D0 PA_CL_VPORT_XOFFSET_6 | ||
297 | 0x000284D4 PA_CL_VPORT_YSCALE_6 | ||
298 | 0x000284D8 PA_CL_VPORT_YOFFSET_6 | ||
299 | 0x000284DC PA_CL_VPORT_ZSCALE_6 | ||
300 | 0x000284E0 PA_CL_VPORT_ZOFFSET_6 | ||
301 | 0x000284E4 PA_CL_VPORT_XSCALE_7 | ||
302 | 0x000284E8 PA_CL_VPORT_XOFFSET_7 | ||
303 | 0x000284EC PA_CL_VPORT_YSCALE_7 | ||
304 | 0x000284F0 PA_CL_VPORT_YOFFSET_7 | ||
305 | 0x000284F4 PA_CL_VPORT_ZSCALE_7 | ||
306 | 0x000284F8 PA_CL_VPORT_ZOFFSET_7 | ||
307 | 0x000284FC PA_CL_VPORT_XSCALE_8 | ||
308 | 0x00028500 PA_CL_VPORT_XOFFSET_8 | ||
309 | 0x00028504 PA_CL_VPORT_YSCALE_8 | ||
310 | 0x00028508 PA_CL_VPORT_YOFFSET_8 | ||
311 | 0x0002850C PA_CL_VPORT_ZSCALE_8 | ||
312 | 0x00028510 PA_CL_VPORT_ZOFFSET_8 | ||
313 | 0x00028514 PA_CL_VPORT_XSCALE_9 | ||
314 | 0x00028518 PA_CL_VPORT_XOFFSET_9 | ||
315 | 0x0002851C PA_CL_VPORT_YSCALE_9 | ||
316 | 0x00028520 PA_CL_VPORT_YOFFSET_9 | ||
317 | 0x00028524 PA_CL_VPORT_ZSCALE_9 | ||
318 | 0x00028528 PA_CL_VPORT_ZOFFSET_9 | ||
319 | 0x0002852C PA_CL_VPORT_XSCALE_10 | ||
320 | 0x00028530 PA_CL_VPORT_XOFFSET_10 | ||
321 | 0x00028534 PA_CL_VPORT_YSCALE_10 | ||
322 | 0x00028538 PA_CL_VPORT_YOFFSET_10 | ||
323 | 0x0002853C PA_CL_VPORT_ZSCALE_10 | ||
324 | 0x00028540 PA_CL_VPORT_ZOFFSET_10 | ||
325 | 0x00028544 PA_CL_VPORT_XSCALE_11 | ||
326 | 0x00028548 PA_CL_VPORT_XOFFSET_11 | ||
327 | 0x0002854C PA_CL_VPORT_YSCALE_11 | ||
328 | 0x00028550 PA_CL_VPORT_YOFFSET_11 | ||
329 | 0x00028554 PA_CL_VPORT_ZSCALE_11 | ||
330 | 0x00028558 PA_CL_VPORT_ZOFFSET_11 | ||
331 | 0x0002855C PA_CL_VPORT_XSCALE_12 | ||
332 | 0x00028560 PA_CL_VPORT_XOFFSET_12 | ||
333 | 0x00028564 PA_CL_VPORT_YSCALE_12 | ||
334 | 0x00028568 PA_CL_VPORT_YOFFSET_12 | ||
335 | 0x0002856C PA_CL_VPORT_ZSCALE_12 | ||
336 | 0x00028570 PA_CL_VPORT_ZOFFSET_12 | ||
337 | 0x00028574 PA_CL_VPORT_XSCALE_13 | ||
338 | 0x00028578 PA_CL_VPORT_XOFFSET_13 | ||
339 | 0x0002857C PA_CL_VPORT_YSCALE_13 | ||
340 | 0x00028580 PA_CL_VPORT_YOFFSET_13 | ||
341 | 0x00028584 PA_CL_VPORT_ZSCALE_13 | ||
342 | 0x00028588 PA_CL_VPORT_ZOFFSET_13 | ||
343 | 0x0002858C PA_CL_VPORT_XSCALE_14 | ||
344 | 0x00028590 PA_CL_VPORT_XOFFSET_14 | ||
345 | 0x00028594 PA_CL_VPORT_YSCALE_14 | ||
346 | 0x00028598 PA_CL_VPORT_YOFFSET_14 | ||
347 | 0x0002859C PA_CL_VPORT_ZSCALE_14 | ||
348 | 0x000285A0 PA_CL_VPORT_ZOFFSET_14 | ||
349 | 0x000285A4 PA_CL_VPORT_XSCALE_15 | ||
350 | 0x000285A8 PA_CL_VPORT_XOFFSET_15 | ||
351 | 0x000285AC PA_CL_VPORT_YSCALE_15 | ||
352 | 0x000285B0 PA_CL_VPORT_YOFFSET_15 | ||
353 | 0x000285B4 PA_CL_VPORT_ZSCALE_15 | ||
354 | 0x000285B8 PA_CL_VPORT_ZOFFSET_15 | ||
355 | 0x000285BC PA_CL_UCP_0_X | ||
356 | 0x000285C0 PA_CL_UCP_0_Y | ||
357 | 0x000285C4 PA_CL_UCP_0_Z | ||
358 | 0x000285C8 PA_CL_UCP_0_W | ||
359 | 0x000285CC PA_CL_UCP_1_X | ||
360 | 0x000285D0 PA_CL_UCP_1_Y | ||
361 | 0x000285D4 PA_CL_UCP_1_Z | ||
362 | 0x000285D8 PA_CL_UCP_1_W | ||
363 | 0x000285DC PA_CL_UCP_2_X | ||
364 | 0x000285E0 PA_CL_UCP_2_Y | ||
365 | 0x000285E4 PA_CL_UCP_2_Z | ||
366 | 0x000285E8 PA_CL_UCP_2_W | ||
367 | 0x000285EC PA_CL_UCP_3_X | ||
368 | 0x000285F0 PA_CL_UCP_3_Y | ||
369 | 0x000285F4 PA_CL_UCP_3_Z | ||
370 | 0x000285F8 PA_CL_UCP_3_W | ||
371 | 0x000285FC PA_CL_UCP_4_X | ||
372 | 0x00028600 PA_CL_UCP_4_Y | ||
373 | 0x00028604 PA_CL_UCP_4_Z | ||
374 | 0x00028608 PA_CL_UCP_4_W | ||
375 | 0x0002860C PA_CL_UCP_5_X | ||
376 | 0x00028610 PA_CL_UCP_5_Y | ||
377 | 0x00028614 PA_CL_UCP_5_Z | ||
378 | 0x00028618 PA_CL_UCP_5_W | ||
379 | 0x0002861C SPI_VS_OUT_ID_0 | ||
380 | 0x00028620 SPI_VS_OUT_ID_1 | ||
381 | 0x00028624 SPI_VS_OUT_ID_2 | ||
382 | 0x00028628 SPI_VS_OUT_ID_3 | ||
383 | 0x0002862C SPI_VS_OUT_ID_4 | ||
384 | 0x00028630 SPI_VS_OUT_ID_5 | ||
385 | 0x00028634 SPI_VS_OUT_ID_6 | ||
386 | 0x00028638 SPI_VS_OUT_ID_7 | ||
387 | 0x0002863C SPI_VS_OUT_ID_8 | ||
388 | 0x00028640 SPI_VS_OUT_ID_9 | ||
389 | 0x00028644 SPI_PS_INPUT_CNTL_0 | ||
390 | 0x00028648 SPI_PS_INPUT_CNTL_1 | ||
391 | 0x0002864C SPI_PS_INPUT_CNTL_2 | ||
392 | 0x00028650 SPI_PS_INPUT_CNTL_3 | ||
393 | 0x00028654 SPI_PS_INPUT_CNTL_4 | ||
394 | 0x00028658 SPI_PS_INPUT_CNTL_5 | ||
395 | 0x0002865C SPI_PS_INPUT_CNTL_6 | ||
396 | 0x00028660 SPI_PS_INPUT_CNTL_7 | ||
397 | 0x00028664 SPI_PS_INPUT_CNTL_8 | ||
398 | 0x00028668 SPI_PS_INPUT_CNTL_9 | ||
399 | 0x0002866C SPI_PS_INPUT_CNTL_10 | ||
400 | 0x00028670 SPI_PS_INPUT_CNTL_11 | ||
401 | 0x00028674 SPI_PS_INPUT_CNTL_12 | ||
402 | 0x00028678 SPI_PS_INPUT_CNTL_13 | ||
403 | 0x0002867C SPI_PS_INPUT_CNTL_14 | ||
404 | 0x00028680 SPI_PS_INPUT_CNTL_15 | ||
405 | 0x00028684 SPI_PS_INPUT_CNTL_16 | ||
406 | 0x00028688 SPI_PS_INPUT_CNTL_17 | ||
407 | 0x0002868C SPI_PS_INPUT_CNTL_18 | ||
408 | 0x00028690 SPI_PS_INPUT_CNTL_19 | ||
409 | 0x00028694 SPI_PS_INPUT_CNTL_20 | ||
410 | 0x00028698 SPI_PS_INPUT_CNTL_21 | ||
411 | 0x0002869C SPI_PS_INPUT_CNTL_22 | ||
412 | 0x000286A0 SPI_PS_INPUT_CNTL_23 | ||
413 | 0x000286A4 SPI_PS_INPUT_CNTL_24 | ||
414 | 0x000286A8 SPI_PS_INPUT_CNTL_25 | ||
415 | 0x000286AC SPI_PS_INPUT_CNTL_26 | ||
416 | 0x000286B0 SPI_PS_INPUT_CNTL_27 | ||
417 | 0x000286B4 SPI_PS_INPUT_CNTL_28 | ||
418 | 0x000286B8 SPI_PS_INPUT_CNTL_29 | ||
419 | 0x000286BC SPI_PS_INPUT_CNTL_30 | ||
420 | 0x000286C0 SPI_PS_INPUT_CNTL_31 | ||
421 | 0x000286C4 SPI_VS_OUT_CONFIG | ||
422 | 0x000286C8 SPI_THREAD_GROUPING | ||
423 | 0x000286CC SPI_PS_IN_CONTROL_0 | ||
424 | 0x000286D0 SPI_PS_IN_CONTROL_1 | ||
425 | 0x000286D4 SPI_INTERP_CONTROL_0 | ||
426 | 0x000286D8 SPI_INPUT_Z | ||
427 | 0x000286DC SPI_FOG_CNTL | ||
428 | 0x000286E0 SPI_BARYC_CNTL | ||
429 | 0x000286E4 SPI_PS_IN_CONTROL_2 | ||
430 | 0x000286E8 SPI_COMPUTE_INPUT_CNTL | ||
431 | 0x000286EC SPI_COMPUTE_NUM_THREAD_X | ||
432 | 0x000286F0 SPI_COMPUTE_NUM_THREAD_Y | ||
433 | 0x000286F4 SPI_COMPUTE_NUM_THREAD_Z | ||
434 | 0x000286F8 GDS_ADDR_SIZE | ||
435 | 0x00028780 CB_BLEND0_CONTROL | ||
436 | 0x00028784 CB_BLEND1_CONTROL | ||
437 | 0x00028788 CB_BLEND2_CONTROL | ||
438 | 0x0002878C CB_BLEND3_CONTROL | ||
439 | 0x00028790 CB_BLEND4_CONTROL | ||
440 | 0x00028794 CB_BLEND5_CONTROL | ||
441 | 0x00028798 CB_BLEND6_CONTROL | ||
442 | 0x0002879C CB_BLEND7_CONTROL | ||
443 | 0x000287CC CS_COPY_STATE | ||
444 | 0x000287D0 GFX_COPY_STATE | ||
445 | 0x000287D4 PA_CL_POINT_X_RAD | ||
446 | 0x000287D8 PA_CL_POINT_Y_RAD | ||
447 | 0x000287DC PA_CL_POINT_SIZE | ||
448 | 0x000287E0 PA_CL_POINT_CULL_RAD | ||
449 | 0x00028808 CB_COLOR_CONTROL | ||
450 | 0x0002880C DB_SHADER_CONTROL | ||
451 | 0x00028810 PA_CL_CLIP_CNTL | ||
452 | 0x00028814 PA_SU_SC_MODE_CNTL | ||
453 | 0x00028818 PA_CL_VTE_CNTL | ||
454 | 0x0002881C PA_CL_VS_OUT_CNTL | ||
455 | 0x00028820 PA_CL_NANINF_CNTL | ||
456 | 0x00028824 PA_SU_LINE_STIPPLE_CNTL | ||
457 | 0x00028828 PA_SU_LINE_STIPPLE_SCALE | ||
458 | 0x0002882C PA_SU_PRIM_FILTER_CNTL | ||
459 | 0x00028838 SQ_DYN_GPR_RESOURCE_LIMIT_1 | ||
460 | 0x00028844 SQ_PGM_RESOURCES_PS | ||
461 | 0x00028848 SQ_PGM_RESOURCES_2_PS | ||
462 | 0x0002884C SQ_PGM_EXPORTS_PS | ||
463 | 0x0002885C SQ_PGM_RESOURCES_VS | ||
464 | 0x00028860 SQ_PGM_RESOURCES_2_VS | ||
465 | 0x00028878 SQ_PGM_RESOURCES_GS | ||
466 | 0x0002887C SQ_PGM_RESOURCES_2_GS | ||
467 | 0x00028890 SQ_PGM_RESOURCES_ES | ||
468 | 0x00028894 SQ_PGM_RESOURCES_2_ES | ||
469 | 0x000288A8 SQ_PGM_RESOURCES_FS | ||
470 | 0x000288BC SQ_PGM_RESOURCES_HS | ||
471 | 0x000288C0 SQ_PGM_RESOURCES_2_HS | ||
472 | 0x000288D0 SQ_PGM_RESOURCES_LS | ||
473 | 0x000288D4 SQ_PGM_RESOURCES_2_LS | ||
474 | 0x000288E8 SQ_LDS_ALLOC | ||
475 | 0x000288EC SQ_LDS_ALLOC_PS | ||
476 | 0x000288F0 SQ_VTX_SEMANTIC_CLEAR | ||
477 | 0x00028A00 PA_SU_POINT_SIZE | ||
478 | 0x00028A04 PA_SU_POINT_MINMAX | ||
479 | 0x00028A08 PA_SU_LINE_CNTL | ||
480 | 0x00028A0C PA_SC_LINE_STIPPLE | ||
481 | 0x00028A10 VGT_OUTPUT_PATH_CNTL | ||
482 | 0x00028A14 VGT_HOS_CNTL | ||
483 | 0x00028A18 VGT_HOS_MAX_TESS_LEVEL | ||
484 | 0x00028A1C VGT_HOS_MIN_TESS_LEVEL | ||
485 | 0x00028A20 VGT_HOS_REUSE_DEPTH | ||
486 | 0x00028A24 VGT_GROUP_PRIM_TYPE | ||
487 | 0x00028A28 VGT_GROUP_FIRST_DECR | ||
488 | 0x00028A2C VGT_GROUP_DECR | ||
489 | 0x00028A30 VGT_GROUP_VECT_0_CNTL | ||
490 | 0x00028A34 VGT_GROUP_VECT_1_CNTL | ||
491 | 0x00028A38 VGT_GROUP_VECT_0_FMT_CNTL | ||
492 | 0x00028A3C VGT_GROUP_VECT_1_FMT_CNTL | ||
493 | 0x00028A40 VGT_GS_MODE | ||
494 | 0x00028A48 PA_SC_MODE_CNTL_0 | ||
495 | 0x00028A4C PA_SC_MODE_CNTL_1 | ||
496 | 0x00028A50 VGT_ENHANCE | ||
497 | 0x00028A54 VGT_GS_PER_ES | ||
498 | 0x00028A58 VGT_ES_PER_GS | ||
499 | 0x00028A5C VGT_GS_PER_VS | ||
500 | 0x00028A6C VGT_GS_OUT_PRIM_TYPE | ||
501 | 0x00028A84 VGT_PRIMITIVEID_EN | ||
502 | 0x00028A94 VGT_MULTI_PRIM_IB_RESET_EN | ||
503 | 0x00028AA0 VGT_INSTANCE_STEP_RATE_0 | ||
504 | 0x00028AA4 VGT_INSTANCE_STEP_RATE_1 | ||
505 | 0x00028AB4 VGT_REUSE_OFF | ||
506 | 0x00028AB8 VGT_VTX_CNT_EN | ||
507 | 0x00028ABC DB_HTILE_SURFACE | ||
508 | 0x00028AC0 DB_SRESULTS_COMPARE_STATE0 | ||
509 | 0x00028AC4 DB_SRESULTS_COMPARE_STATE1 | ||
510 | 0x00028AC8 DB_PRELOAD_CONTROL | ||
511 | 0x00028B38 VGT_GS_MAX_VERT_OUT | ||
512 | 0x00028B54 VGT_SHADER_STAGES_EN | ||
513 | 0x00028B58 VGT_LS_HS_CONFIG | ||
514 | 0x00028B5C VGT_LS_SIZE | ||
515 | 0x00028B60 VGT_HS_SIZE | ||
516 | 0x00028B64 VGT_LS_HS_ALLOC | ||
517 | 0x00028B68 VGT_HS_PATCH_CONST | ||
518 | 0x00028B6C VGT_TF_PARAM | ||
519 | 0x00028B70 DB_ALPHA_TO_MASK | ||
520 | 0x00028B74 VGT_DISPATCH_INITIATOR | ||
521 | 0x00028B78 PA_SU_POLY_OFFSET_DB_FMT_CNTL | ||
522 | 0x00028B7C PA_SU_POLY_OFFSET_CLAMP | ||
523 | 0x00028B80 PA_SU_POLY_OFFSET_FRONT_SCALE | ||
524 | 0x00028B84 PA_SU_POLY_OFFSET_FRONT_OFFSET | ||
525 | 0x00028B88 PA_SU_POLY_OFFSET_BACK_SCALE | ||
526 | 0x00028B8C PA_SU_POLY_OFFSET_BACK_OFFSET | ||
527 | 0x00028B74 VGT_GS_INSTANCE_CNT | ||
528 | 0x00028C00 PA_SC_LINE_CNTL | ||
529 | 0x00028C08 PA_SU_VTX_CNTL | ||
530 | 0x00028C0C PA_CL_GB_VERT_CLIP_ADJ | ||
531 | 0x00028C10 PA_CL_GB_VERT_DISC_ADJ | ||
532 | 0x00028C14 PA_CL_GB_HORZ_CLIP_ADJ | ||
533 | 0x00028C18 PA_CL_GB_HORZ_DISC_ADJ | ||
534 | 0x00028C1C PA_SC_AA_SAMPLE_LOCS_0 | ||
535 | 0x00028C20 PA_SC_AA_SAMPLE_LOCS_1 | ||
536 | 0x00028C24 PA_SC_AA_SAMPLE_LOCS_2 | ||
537 | 0x00028C28 PA_SC_AA_SAMPLE_LOCS_3 | ||
538 | 0x00028C2C PA_SC_AA_SAMPLE_LOCS_4 | ||
539 | 0x00028C30 PA_SC_AA_SAMPLE_LOCS_5 | ||
540 | 0x00028C34 PA_SC_AA_SAMPLE_LOCS_6 | ||
541 | 0x00028C38 PA_SC_AA_SAMPLE_LOCS_7 | ||
542 | 0x00028C3C PA_SC_AA_MASK | ||
543 | 0x00028C8C CB_COLOR0_CLEAR_WORD0 | ||
544 | 0x00028C90 CB_COLOR0_CLEAR_WORD1 | ||
545 | 0x00028C94 CB_COLOR0_CLEAR_WORD2 | ||
546 | 0x00028C98 CB_COLOR0_CLEAR_WORD3 | ||
547 | 0x00028CC8 CB_COLOR1_CLEAR_WORD0 | ||
548 | 0x00028CCC CB_COLOR1_CLEAR_WORD1 | ||
549 | 0x00028CD0 CB_COLOR1_CLEAR_WORD2 | ||
550 | 0x00028CD4 CB_COLOR1_CLEAR_WORD3 | ||
551 | 0x00028D04 CB_COLOR2_CLEAR_WORD0 | ||
552 | 0x00028D08 CB_COLOR2_CLEAR_WORD1 | ||
553 | 0x00028D0C CB_COLOR2_CLEAR_WORD2 | ||
554 | 0x00028D10 CB_COLOR2_CLEAR_WORD3 | ||
555 | 0x00028D40 CB_COLOR3_CLEAR_WORD0 | ||
556 | 0x00028D44 CB_COLOR3_CLEAR_WORD1 | ||
557 | 0x00028D48 CB_COLOR3_CLEAR_WORD2 | ||
558 | 0x00028D4C CB_COLOR3_CLEAR_WORD3 | ||
559 | 0x00028D7C CB_COLOR4_CLEAR_WORD0 | ||
560 | 0x00028D80 CB_COLOR4_CLEAR_WORD1 | ||
561 | 0x00028D84 CB_COLOR4_CLEAR_WORD2 | ||
562 | 0x00028D88 CB_COLOR4_CLEAR_WORD3 | ||
563 | 0x00028DB8 CB_COLOR5_CLEAR_WORD0 | ||
564 | 0x00028DBC CB_COLOR5_CLEAR_WORD1 | ||
565 | 0x00028DC0 CB_COLOR5_CLEAR_WORD2 | ||
566 | 0x00028DC4 CB_COLOR5_CLEAR_WORD3 | ||
567 | 0x00028DF4 CB_COLOR6_CLEAR_WORD0 | ||
568 | 0x00028DF8 CB_COLOR6_CLEAR_WORD1 | ||
569 | 0x00028DFC CB_COLOR6_CLEAR_WORD2 | ||
570 | 0x00028E00 CB_COLOR6_CLEAR_WORD3 | ||
571 | 0x00028E30 CB_COLOR7_CLEAR_WORD0 | ||
572 | 0x00028E34 CB_COLOR7_CLEAR_WORD1 | ||
573 | 0x00028E38 CB_COLOR7_CLEAR_WORD2 | ||
574 | 0x00028E3C CB_COLOR7_CLEAR_WORD3 | ||
575 | 0x00028F80 SQ_ALU_CONST_BUFFER_SIZE_HS_0 | ||
576 | 0x00028F84 SQ_ALU_CONST_BUFFER_SIZE_HS_1 | ||
577 | 0x00028F88 SQ_ALU_CONST_BUFFER_SIZE_HS_2 | ||
578 | 0x00028F8C SQ_ALU_CONST_BUFFER_SIZE_HS_3 | ||
579 | 0x00028F90 SQ_ALU_CONST_BUFFER_SIZE_HS_4 | ||
580 | 0x00028F94 SQ_ALU_CONST_BUFFER_SIZE_HS_5 | ||
581 | 0x00028F98 SQ_ALU_CONST_BUFFER_SIZE_HS_6 | ||
582 | 0x00028F9C SQ_ALU_CONST_BUFFER_SIZE_HS_7 | ||
583 | 0x00028FA0 SQ_ALU_CONST_BUFFER_SIZE_HS_8 | ||
584 | 0x00028FA4 SQ_ALU_CONST_BUFFER_SIZE_HS_9 | ||
585 | 0x00028FA8 SQ_ALU_CONST_BUFFER_SIZE_HS_10 | ||
586 | 0x00028FAC SQ_ALU_CONST_BUFFER_SIZE_HS_11 | ||
587 | 0x00028FB0 SQ_ALU_CONST_BUFFER_SIZE_HS_12 | ||
588 | 0x00028FB4 SQ_ALU_CONST_BUFFER_SIZE_HS_13 | ||
589 | 0x00028FB8 SQ_ALU_CONST_BUFFER_SIZE_HS_14 | ||
590 | 0x00028FBC SQ_ALU_CONST_BUFFER_SIZE_HS_15 | ||
591 | 0x00028FC0 SQ_ALU_CONST_BUFFER_SIZE_LS_0 | ||
592 | 0x00028FC4 SQ_ALU_CONST_BUFFER_SIZE_LS_1 | ||
593 | 0x00028FC8 SQ_ALU_CONST_BUFFER_SIZE_LS_2 | ||
594 | 0x00028FCC SQ_ALU_CONST_BUFFER_SIZE_LS_3 | ||
595 | 0x00028FD0 SQ_ALU_CONST_BUFFER_SIZE_LS_4 | ||
596 | 0x00028FD4 SQ_ALU_CONST_BUFFER_SIZE_LS_5 | ||
597 | 0x00028FD8 SQ_ALU_CONST_BUFFER_SIZE_LS_6 | ||
598 | 0x00028FDC SQ_ALU_CONST_BUFFER_SIZE_LS_7 | ||
599 | 0x00028FE0 SQ_ALU_CONST_BUFFER_SIZE_LS_8 | ||
600 | 0x00028FE4 SQ_ALU_CONST_BUFFER_SIZE_LS_9 | ||
601 | 0x00028FE8 SQ_ALU_CONST_BUFFER_SIZE_LS_10 | ||
602 | 0x00028FEC SQ_ALU_CONST_BUFFER_SIZE_LS_11 | ||
603 | 0x00028FF0 SQ_ALU_CONST_BUFFER_SIZE_LS_12 | ||
604 | 0x00028FF4 SQ_ALU_CONST_BUFFER_SIZE_LS_13 | ||
605 | 0x00028FF8 SQ_ALU_CONST_BUFFER_SIZE_LS_14 | ||
606 | 0x00028FFC SQ_ALU_CONST_BUFFER_SIZE_LS_15 | ||
607 | 0x0003CFF0 SQ_VTX_BASE_VTX_LOC | ||
608 | 0x0003CFF4 SQ_VTX_START_INST_LOC | ||
609 | 0x0003FF00 SQ_TEX_SAMPLER_CLEAR | ||
610 | 0x0003FF04 SQ_TEX_RESOURCE_CLEAR | ||
611 | 0x0003FF08 SQ_LOOP_BOOL_CLEAR | ||
diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c index 79887cac5b5..7bb4c3e52f3 100644 --- a/drivers/gpu/drm/radeon/rs600.c +++ b/drivers/gpu/drm/radeon/rs600.c | |||
@@ -74,7 +74,8 @@ void rs600_pm_misc(struct radeon_device *rdev) | |||
74 | if (voltage->delay) | 74 | if (voltage->delay) |
75 | udelay(voltage->delay); | 75 | udelay(voltage->delay); |
76 | } | 76 | } |
77 | } | 77 | } else if (voltage->type == VOLTAGE_VDDC) |
78 | radeon_atom_set_voltage(rdev, voltage->vddc_id); | ||
78 | 79 | ||
79 | dyn_pwrmgt_sclk_length = RREG32_PLL(DYN_PWRMGT_SCLK_LENGTH); | 80 | dyn_pwrmgt_sclk_length = RREG32_PLL(DYN_PWRMGT_SCLK_LENGTH); |
80 | dyn_pwrmgt_sclk_length &= ~REDUCED_POWER_SCLK_HILEN(0xf); | 81 | dyn_pwrmgt_sclk_length &= ~REDUCED_POWER_SCLK_HILEN(0xf); |
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c index 253f24aec03..33952da6534 100644 --- a/drivers/gpu/drm/radeon/rv770.c +++ b/drivers/gpu/drm/radeon/rv770.c | |||
@@ -44,7 +44,12 @@ void rv770_fini(struct radeon_device *rdev); | |||
44 | 44 | ||
45 | void rv770_pm_misc(struct radeon_device *rdev) | 45 | void rv770_pm_misc(struct radeon_device *rdev) |
46 | { | 46 | { |
47 | int requested_index = rdev->pm.requested_power_state_index; | ||
48 | struct radeon_power_state *ps = &rdev->pm.power_state[requested_index]; | ||
49 | struct radeon_voltage *voltage = &ps->clock_info[0].voltage; | ||
47 | 50 | ||
51 | if ((voltage->type == VOLTAGE_SW) && voltage->voltage) | ||
52 | radeon_atom_set_voltage(rdev, voltage->voltage); | ||
48 | } | 53 | } |
49 | 54 | ||
50 | /* | 55 | /* |
diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c index 0d9a42c2394..ef910694bd6 100644 --- a/drivers/gpu/drm/ttm/ttm_page_alloc.c +++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c | |||
@@ -77,7 +77,7 @@ struct ttm_page_pool { | |||
77 | /** | 77 | /** |
78 | * Limits for the pool. They are handled without locks because only place where | 78 | * Limits for the pool. They are handled without locks because only place where |
79 | * they may change is in sysfs store. They won't have immediate effect anyway | 79 | * they may change is in sysfs store. They won't have immediate effect anyway |
80 | * so forcing serialiazation to access them is pointless. | 80 | * so forcing serialization to access them is pointless. |
81 | */ | 81 | */ |
82 | 82 | ||
83 | struct ttm_pool_opts { | 83 | struct ttm_pool_opts { |
@@ -165,16 +165,18 @@ static ssize_t ttm_pool_store(struct kobject *kobj, | |||
165 | m->options.small = val; | 165 | m->options.small = val; |
166 | else if (attr == &ttm_page_pool_alloc_size) { | 166 | else if (attr == &ttm_page_pool_alloc_size) { |
167 | if (val > NUM_PAGES_TO_ALLOC*8) { | 167 | if (val > NUM_PAGES_TO_ALLOC*8) { |
168 | printk(KERN_ERR "[ttm] Setting allocation size to %lu " | 168 | printk(KERN_ERR TTM_PFX |
169 | "is not allowed. Recomended size is " | 169 | "Setting allocation size to %lu " |
170 | "%lu\n", | 170 | "is not allowed. Recommended size is " |
171 | NUM_PAGES_TO_ALLOC*(PAGE_SIZE >> 7), | 171 | "%lu\n", |
172 | NUM_PAGES_TO_ALLOC*(PAGE_SIZE >> 10)); | 172 | NUM_PAGES_TO_ALLOC*(PAGE_SIZE >> 7), |
173 | NUM_PAGES_TO_ALLOC*(PAGE_SIZE >> 10)); | ||
173 | return size; | 174 | return size; |
174 | } else if (val > NUM_PAGES_TO_ALLOC) { | 175 | } else if (val > NUM_PAGES_TO_ALLOC) { |
175 | printk(KERN_WARNING "[ttm] Setting allocation size to " | 176 | printk(KERN_WARNING TTM_PFX |
176 | "larger than %lu is not recomended.\n", | 177 | "Setting allocation size to " |
177 | NUM_PAGES_TO_ALLOC*(PAGE_SIZE >> 10)); | 178 | "larger than %lu is not recommended.\n", |
179 | NUM_PAGES_TO_ALLOC*(PAGE_SIZE >> 10)); | ||
178 | } | 180 | } |
179 | m->options.alloc_size = val; | 181 | m->options.alloc_size = val; |
180 | } | 182 | } |
@@ -277,7 +279,7 @@ static void ttm_pages_put(struct page *pages[], unsigned npages) | |||
277 | { | 279 | { |
278 | unsigned i; | 280 | unsigned i; |
279 | if (set_pages_array_wb(pages, npages)) | 281 | if (set_pages_array_wb(pages, npages)) |
280 | printk(KERN_ERR "[ttm] Failed to set %d pages to wb!\n", | 282 | printk(KERN_ERR TTM_PFX "Failed to set %d pages to wb!\n", |
281 | npages); | 283 | npages); |
282 | for (i = 0; i < npages; ++i) | 284 | for (i = 0; i < npages; ++i) |
283 | __free_page(pages[i]); | 285 | __free_page(pages[i]); |
@@ -313,7 +315,8 @@ static int ttm_page_pool_free(struct ttm_page_pool *pool, unsigned nr_free) | |||
313 | pages_to_free = kmalloc(npages_to_free * sizeof(struct page *), | 315 | pages_to_free = kmalloc(npages_to_free * sizeof(struct page *), |
314 | GFP_KERNEL); | 316 | GFP_KERNEL); |
315 | if (!pages_to_free) { | 317 | if (!pages_to_free) { |
316 | printk(KERN_ERR "Failed to allocate memory for pool free operation.\n"); | 318 | printk(KERN_ERR TTM_PFX |
319 | "Failed to allocate memory for pool free operation.\n"); | ||
317 | return 0; | 320 | return 0; |
318 | } | 321 | } |
319 | 322 | ||
@@ -390,7 +393,7 @@ static int ttm_pool_get_num_unused_pages(void) | |||
390 | } | 393 | } |
391 | 394 | ||
392 | /** | 395 | /** |
393 | * Calback for mm to request pool to reduce number of page held. | 396 | * Callback for mm to request pool to reduce number of page held. |
394 | */ | 397 | */ |
395 | static int ttm_pool_mm_shrink(int shrink_pages, gfp_t gfp_mask) | 398 | static int ttm_pool_mm_shrink(int shrink_pages, gfp_t gfp_mask) |
396 | { | 399 | { |
@@ -433,14 +436,16 @@ static int ttm_set_pages_caching(struct page **pages, | |||
433 | case tt_uncached: | 436 | case tt_uncached: |
434 | r = set_pages_array_uc(pages, cpages); | 437 | r = set_pages_array_uc(pages, cpages); |
435 | if (r) | 438 | if (r) |
436 | printk(KERN_ERR "[ttm] Failed to set %d pages to uc!\n", | 439 | printk(KERN_ERR TTM_PFX |
437 | cpages); | 440 | "Failed to set %d pages to uc!\n", |
441 | cpages); | ||
438 | break; | 442 | break; |
439 | case tt_wc: | 443 | case tt_wc: |
440 | r = set_pages_array_wc(pages, cpages); | 444 | r = set_pages_array_wc(pages, cpages); |
441 | if (r) | 445 | if (r) |
442 | printk(KERN_ERR "[ttm] Failed to set %d pages to wc!\n", | 446 | printk(KERN_ERR TTM_PFX |
443 | cpages); | 447 | "Failed to set %d pages to wc!\n", |
448 | cpages); | ||
444 | break; | 449 | break; |
445 | default: | 450 | default: |
446 | break; | 451 | break; |
@@ -458,7 +463,7 @@ static void ttm_handle_caching_state_failure(struct list_head *pages, | |||
458 | struct page **failed_pages, unsigned cpages) | 463 | struct page **failed_pages, unsigned cpages) |
459 | { | 464 | { |
460 | unsigned i; | 465 | unsigned i; |
461 | /* Failed pages has to be reed */ | 466 | /* Failed pages have to be freed */ |
462 | for (i = 0; i < cpages; ++i) { | 467 | for (i = 0; i < cpages; ++i) { |
463 | list_del(&failed_pages[i]->lru); | 468 | list_del(&failed_pages[i]->lru); |
464 | __free_page(failed_pages[i]); | 469 | __free_page(failed_pages[i]); |
@@ -485,7 +490,8 @@ static int ttm_alloc_new_pages(struct list_head *pages, int gfp_flags, | |||
485 | caching_array = kmalloc(max_cpages*sizeof(struct page *), GFP_KERNEL); | 490 | caching_array = kmalloc(max_cpages*sizeof(struct page *), GFP_KERNEL); |
486 | 491 | ||
487 | if (!caching_array) { | 492 | if (!caching_array) { |
488 | printk(KERN_ERR "[ttm] unable to allocate table for new pages."); | 493 | printk(KERN_ERR TTM_PFX |
494 | "Unable to allocate table for new pages."); | ||
489 | return -ENOMEM; | 495 | return -ENOMEM; |
490 | } | 496 | } |
491 | 497 | ||
@@ -493,12 +499,13 @@ static int ttm_alloc_new_pages(struct list_head *pages, int gfp_flags, | |||
493 | p = alloc_page(gfp_flags); | 499 | p = alloc_page(gfp_flags); |
494 | 500 | ||
495 | if (!p) { | 501 | if (!p) { |
496 | printk(KERN_ERR "[ttm] unable to get page %u\n", i); | 502 | printk(KERN_ERR TTM_PFX "Unable to get page %u.\n", i); |
497 | 503 | ||
498 | /* store already allocated pages in the pool after | 504 | /* store already allocated pages in the pool after |
499 | * setting the caching state */ | 505 | * setting the caching state */ |
500 | if (cpages) { | 506 | if (cpages) { |
501 | r = ttm_set_pages_caching(caching_array, cstate, cpages); | 507 | r = ttm_set_pages_caching(caching_array, |
508 | cstate, cpages); | ||
502 | if (r) | 509 | if (r) |
503 | ttm_handle_caching_state_failure(pages, | 510 | ttm_handle_caching_state_failure(pages, |
504 | ttm_flags, cstate, | 511 | ttm_flags, cstate, |
@@ -590,7 +597,8 @@ static void ttm_page_pool_fill_locked(struct ttm_page_pool *pool, | |||
590 | ++pool->nrefills; | 597 | ++pool->nrefills; |
591 | pool->npages += alloc_size; | 598 | pool->npages += alloc_size; |
592 | } else { | 599 | } else { |
593 | printk(KERN_ERR "[ttm] Failed to fill pool (%p).", pool); | 600 | printk(KERN_ERR TTM_PFX |
601 | "Failed to fill pool (%p).", pool); | ||
594 | /* If we have any pages left put them to the pool. */ | 602 | /* If we have any pages left put them to the pool. */ |
595 | list_for_each_entry(p, &pool->list, lru) { | 603 | list_for_each_entry(p, &pool->list, lru) { |
596 | ++cpages; | 604 | ++cpages; |
@@ -671,13 +679,14 @@ int ttm_get_pages(struct list_head *pages, int flags, | |||
671 | if (flags & TTM_PAGE_FLAG_DMA32) | 679 | if (flags & TTM_PAGE_FLAG_DMA32) |
672 | gfp_flags |= GFP_DMA32; | 680 | gfp_flags |= GFP_DMA32; |
673 | else | 681 | else |
674 | gfp_flags |= __GFP_HIGHMEM; | 682 | gfp_flags |= GFP_HIGHUSER; |
675 | 683 | ||
676 | for (r = 0; r < count; ++r) { | 684 | for (r = 0; r < count; ++r) { |
677 | p = alloc_page(gfp_flags); | 685 | p = alloc_page(gfp_flags); |
678 | if (!p) { | 686 | if (!p) { |
679 | 687 | ||
680 | printk(KERN_ERR "[ttm] unable to allocate page."); | 688 | printk(KERN_ERR TTM_PFX |
689 | "Unable to allocate page."); | ||
681 | return -ENOMEM; | 690 | return -ENOMEM; |
682 | } | 691 | } |
683 | 692 | ||
@@ -709,8 +718,9 @@ int ttm_get_pages(struct list_head *pages, int flags, | |||
709 | if (r) { | 718 | if (r) { |
710 | /* If there is any pages in the list put them back to | 719 | /* If there is any pages in the list put them back to |
711 | * the pool. */ | 720 | * the pool. */ |
712 | printk(KERN_ERR "[ttm] Failed to allocate extra pages " | 721 | printk(KERN_ERR TTM_PFX |
713 | "for large request."); | 722 | "Failed to allocate extra pages " |
723 | "for large request."); | ||
714 | ttm_put_pages(pages, 0, flags, cstate); | 724 | ttm_put_pages(pages, 0, flags, cstate); |
715 | return r; | 725 | return r; |
716 | } | 726 | } |
@@ -778,7 +788,7 @@ int ttm_page_alloc_init(struct ttm_mem_global *glob, unsigned max_pages) | |||
778 | if (atomic_add_return(1, &_manager.page_alloc_inited) > 1) | 788 | if (atomic_add_return(1, &_manager.page_alloc_inited) > 1) |
779 | return 0; | 789 | return 0; |
780 | 790 | ||
781 | printk(KERN_INFO "[ttm] Initializing pool allocator.\n"); | 791 | printk(KERN_INFO TTM_PFX "Initializing pool allocator.\n"); |
782 | 792 | ||
783 | ttm_page_pool_init_locked(&_manager.wc_pool, GFP_HIGHUSER, "wc"); | 793 | ttm_page_pool_init_locked(&_manager.wc_pool, GFP_HIGHUSER, "wc"); |
784 | 794 | ||
@@ -813,7 +823,7 @@ void ttm_page_alloc_fini() | |||
813 | if (atomic_sub_return(1, &_manager.page_alloc_inited) > 0) | 823 | if (atomic_sub_return(1, &_manager.page_alloc_inited) > 0) |
814 | return; | 824 | return; |
815 | 825 | ||
816 | printk(KERN_INFO "[ttm] Finilizing pool allocator.\n"); | 826 | printk(KERN_INFO TTM_PFX "Finalizing pool allocator.\n"); |
817 | ttm_pool_mm_shrink_fini(&_manager); | 827 | ttm_pool_mm_shrink_fini(&_manager); |
818 | 828 | ||
819 | for (i = 0; i < NUM_POOLS; ++i) | 829 | for (i = 0; i < NUM_POOLS; ++i) |
diff --git a/drivers/gpu/drm/vmwgfx/Makefile b/drivers/gpu/drm/vmwgfx/Makefile index 1a3cb6816d1..4505e17df3f 100644 --- a/drivers/gpu/drm/vmwgfx/Makefile +++ b/drivers/gpu/drm/vmwgfx/Makefile | |||
@@ -4,6 +4,6 @@ ccflags-y := -Iinclude/drm | |||
4 | vmwgfx-y := vmwgfx_execbuf.o vmwgfx_gmr.o vmwgfx_kms.o vmwgfx_drv.o \ | 4 | vmwgfx-y := vmwgfx_execbuf.o vmwgfx_gmr.o vmwgfx_kms.o vmwgfx_drv.o \ |
5 | vmwgfx_fb.o vmwgfx_ioctl.o vmwgfx_resource.o vmwgfx_buffer.o \ | 5 | vmwgfx_fb.o vmwgfx_ioctl.o vmwgfx_resource.o vmwgfx_buffer.o \ |
6 | vmwgfx_fifo.o vmwgfx_irq.o vmwgfx_ldu.o vmwgfx_ttm_glue.o \ | 6 | vmwgfx_fifo.o vmwgfx_irq.o vmwgfx_ldu.o vmwgfx_ttm_glue.o \ |
7 | vmwgfx_overlay.o | 7 | vmwgfx_overlay.o vmwgfx_fence.o |
8 | 8 | ||
9 | obj-$(CONFIG_DRM_VMWGFX) := vmwgfx.o | 9 | obj-$(CONFIG_DRM_VMWGFX) := vmwgfx.o |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index 0c9c0811f42..b793c8c9acb 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | |||
@@ -88,6 +88,9 @@ | |||
88 | #define DRM_IOCTL_VMW_FENCE_WAIT \ | 88 | #define DRM_IOCTL_VMW_FENCE_WAIT \ |
89 | DRM_IOWR(DRM_COMMAND_BASE + DRM_VMW_FENCE_WAIT, \ | 89 | DRM_IOWR(DRM_COMMAND_BASE + DRM_VMW_FENCE_WAIT, \ |
90 | struct drm_vmw_fence_wait_arg) | 90 | struct drm_vmw_fence_wait_arg) |
91 | #define DRM_IOCTL_VMW_UPDATE_LAYOUT \ | ||
92 | DRM_IOWR(DRM_COMMAND_BASE + DRM_VMW_UPDATE_LAYOUT, \ | ||
93 | struct drm_vmw_update_layout_arg) | ||
91 | 94 | ||
92 | 95 | ||
93 | /** | 96 | /** |
@@ -135,7 +138,9 @@ static struct drm_ioctl_desc vmw_ioctls[] = { | |||
135 | VMW_IOCTL_DEF(DRM_IOCTL_VMW_FIFO_DEBUG, vmw_fifo_debug_ioctl, | 138 | VMW_IOCTL_DEF(DRM_IOCTL_VMW_FIFO_DEBUG, vmw_fifo_debug_ioctl, |
136 | DRM_AUTH | DRM_ROOT_ONLY | DRM_MASTER | DRM_UNLOCKED), | 139 | DRM_AUTH | DRM_ROOT_ONLY | DRM_MASTER | DRM_UNLOCKED), |
137 | VMW_IOCTL_DEF(DRM_IOCTL_VMW_FENCE_WAIT, vmw_fence_wait_ioctl, | 140 | VMW_IOCTL_DEF(DRM_IOCTL_VMW_FENCE_WAIT, vmw_fence_wait_ioctl, |
138 | DRM_AUTH | DRM_UNLOCKED) | 141 | DRM_AUTH | DRM_UNLOCKED), |
142 | VMW_IOCTL_DEF(DRM_IOCTL_VMW_UPDATE_LAYOUT, vmw_kms_update_layout_ioctl, | ||
143 | DRM_MASTER | DRM_CONTROL_ALLOW | DRM_UNLOCKED) | ||
139 | }; | 144 | }; |
140 | 145 | ||
141 | static struct pci_device_id vmw_pci_id_list[] = { | 146 | static struct pci_device_id vmw_pci_id_list[] = { |
@@ -318,6 +323,15 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset) | |||
318 | goto out_err3; | 323 | goto out_err3; |
319 | } | 324 | } |
320 | 325 | ||
326 | /* Need mmio memory to check for fifo pitchlock cap. */ | ||
327 | if (!(dev_priv->capabilities & SVGA_CAP_DISPLAY_TOPOLOGY) && | ||
328 | !(dev_priv->capabilities & SVGA_CAP_PITCHLOCK) && | ||
329 | !vmw_fifo_have_pitchlock(dev_priv)) { | ||
330 | ret = -ENOSYS; | ||
331 | DRM_ERROR("Hardware has no pitchlock\n"); | ||
332 | goto out_err4; | ||
333 | } | ||
334 | |||
321 | dev_priv->tdev = ttm_object_device_init | 335 | dev_priv->tdev = ttm_object_device_init |
322 | (dev_priv->mem_global_ref.object, 12); | 336 | (dev_priv->mem_global_ref.object, 12); |
323 | 337 | ||
@@ -399,8 +413,6 @@ static int vmw_driver_unload(struct drm_device *dev) | |||
399 | { | 413 | { |
400 | struct vmw_private *dev_priv = vmw_priv(dev); | 414 | struct vmw_private *dev_priv = vmw_priv(dev); |
401 | 415 | ||
402 | DRM_INFO(VMWGFX_DRIVER_NAME " unload.\n"); | ||
403 | |||
404 | unregister_pm_notifier(&dev_priv->pm_nb); | 416 | unregister_pm_notifier(&dev_priv->pm_nb); |
405 | 417 | ||
406 | vmw_fb_close(dev_priv); | 418 | vmw_fb_close(dev_priv); |
@@ -546,7 +558,6 @@ static int vmw_master_create(struct drm_device *dev, | |||
546 | { | 558 | { |
547 | struct vmw_master *vmaster; | 559 | struct vmw_master *vmaster; |
548 | 560 | ||
549 | DRM_INFO("Master create.\n"); | ||
550 | vmaster = kzalloc(sizeof(*vmaster), GFP_KERNEL); | 561 | vmaster = kzalloc(sizeof(*vmaster), GFP_KERNEL); |
551 | if (unlikely(vmaster == NULL)) | 562 | if (unlikely(vmaster == NULL)) |
552 | return -ENOMEM; | 563 | return -ENOMEM; |
@@ -563,7 +574,6 @@ static void vmw_master_destroy(struct drm_device *dev, | |||
563 | { | 574 | { |
564 | struct vmw_master *vmaster = vmw_master(master); | 575 | struct vmw_master *vmaster = vmw_master(master); |
565 | 576 | ||
566 | DRM_INFO("Master destroy.\n"); | ||
567 | master->driver_priv = NULL; | 577 | master->driver_priv = NULL; |
568 | kfree(vmaster); | 578 | kfree(vmaster); |
569 | } | 579 | } |
@@ -579,8 +589,6 @@ static int vmw_master_set(struct drm_device *dev, | |||
579 | struct vmw_master *vmaster = vmw_master(file_priv->master); | 589 | struct vmw_master *vmaster = vmw_master(file_priv->master); |
580 | int ret = 0; | 590 | int ret = 0; |
581 | 591 | ||
582 | DRM_INFO("Master set.\n"); | ||
583 | |||
584 | if (active) { | 592 | if (active) { |
585 | BUG_ON(active != &dev_priv->fbdev_master); | 593 | BUG_ON(active != &dev_priv->fbdev_master); |
586 | ret = ttm_vt_lock(&active->lock, false, vmw_fp->tfile); | 594 | ret = ttm_vt_lock(&active->lock, false, vmw_fp->tfile); |
@@ -622,8 +630,6 @@ static void vmw_master_drop(struct drm_device *dev, | |||
622 | struct vmw_master *vmaster = vmw_master(file_priv->master); | 630 | struct vmw_master *vmaster = vmw_master(file_priv->master); |
623 | int ret; | 631 | int ret; |
624 | 632 | ||
625 | DRM_INFO("Master drop.\n"); | ||
626 | |||
627 | /** | 633 | /** |
628 | * Make sure the master doesn't disappear while we have | 634 | * Make sure the master doesn't disappear while we have |
629 | * it locked. | 635 | * it locked. |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h index 356dc935ec1..eaad5209533 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | |||
@@ -41,12 +41,13 @@ | |||
41 | 41 | ||
42 | #define VMWGFX_DRIVER_DATE "20100209" | 42 | #define VMWGFX_DRIVER_DATE "20100209" |
43 | #define VMWGFX_DRIVER_MAJOR 1 | 43 | #define VMWGFX_DRIVER_MAJOR 1 |
44 | #define VMWGFX_DRIVER_MINOR 0 | 44 | #define VMWGFX_DRIVER_MINOR 2 |
45 | #define VMWGFX_DRIVER_PATCHLEVEL 0 | 45 | #define VMWGFX_DRIVER_PATCHLEVEL 0 |
46 | #define VMWGFX_FILE_PAGE_OFFSET 0x00100000 | 46 | #define VMWGFX_FILE_PAGE_OFFSET 0x00100000 |
47 | #define VMWGFX_FIFO_STATIC_SIZE (1024*1024) | 47 | #define VMWGFX_FIFO_STATIC_SIZE (1024*1024) |
48 | #define VMWGFX_MAX_RELOCATIONS 2048 | 48 | #define VMWGFX_MAX_RELOCATIONS 2048 |
49 | #define VMWGFX_MAX_GMRS 2048 | 49 | #define VMWGFX_MAX_GMRS 2048 |
50 | #define VMWGFX_MAX_DISPLAYS 16 | ||
50 | 51 | ||
51 | struct vmw_fpriv { | 52 | struct vmw_fpriv { |
52 | struct drm_master *locked_master; | 53 | struct drm_master *locked_master; |
@@ -102,6 +103,13 @@ struct vmw_surface { | |||
102 | struct vmw_cursor_snooper snooper; | 103 | struct vmw_cursor_snooper snooper; |
103 | }; | 104 | }; |
104 | 105 | ||
106 | struct vmw_fence_queue { | ||
107 | struct list_head head; | ||
108 | struct timespec lag; | ||
109 | struct timespec lag_time; | ||
110 | spinlock_t lock; | ||
111 | }; | ||
112 | |||
105 | struct vmw_fifo_state { | 113 | struct vmw_fifo_state { |
106 | unsigned long reserved_size; | 114 | unsigned long reserved_size; |
107 | __le32 *dynamic_buffer; | 115 | __le32 *dynamic_buffer; |
@@ -115,6 +123,7 @@ struct vmw_fifo_state { | |||
115 | uint32_t capabilities; | 123 | uint32_t capabilities; |
116 | struct mutex fifo_mutex; | 124 | struct mutex fifo_mutex; |
117 | struct rw_semaphore rwsem; | 125 | struct rw_semaphore rwsem; |
126 | struct vmw_fence_queue fence_queue; | ||
118 | }; | 127 | }; |
119 | 128 | ||
120 | struct vmw_relocation { | 129 | struct vmw_relocation { |
@@ -144,6 +153,14 @@ struct vmw_master { | |||
144 | struct ttm_lock lock; | 153 | struct ttm_lock lock; |
145 | }; | 154 | }; |
146 | 155 | ||
156 | struct vmw_vga_topology_state { | ||
157 | uint32_t width; | ||
158 | uint32_t height; | ||
159 | uint32_t primary; | ||
160 | uint32_t pos_x; | ||
161 | uint32_t pos_y; | ||
162 | }; | ||
163 | |||
147 | struct vmw_private { | 164 | struct vmw_private { |
148 | struct ttm_bo_device bdev; | 165 | struct ttm_bo_device bdev; |
149 | struct ttm_bo_global_ref bo_global_ref; | 166 | struct ttm_bo_global_ref bo_global_ref; |
@@ -171,14 +188,19 @@ struct vmw_private { | |||
171 | * VGA registers. | 188 | * VGA registers. |
172 | */ | 189 | */ |
173 | 190 | ||
191 | struct vmw_vga_topology_state vga_save[VMWGFX_MAX_DISPLAYS]; | ||
174 | uint32_t vga_width; | 192 | uint32_t vga_width; |
175 | uint32_t vga_height; | 193 | uint32_t vga_height; |
176 | uint32_t vga_depth; | 194 | uint32_t vga_depth; |
177 | uint32_t vga_bpp; | 195 | uint32_t vga_bpp; |
178 | uint32_t vga_pseudo; | 196 | uint32_t vga_pseudo; |
179 | uint32_t vga_red_mask; | 197 | uint32_t vga_red_mask; |
180 | uint32_t vga_blue_mask; | ||
181 | uint32_t vga_green_mask; | 198 | uint32_t vga_green_mask; |
199 | uint32_t vga_blue_mask; | ||
200 | uint32_t vga_bpl; | ||
201 | uint32_t vga_pitchlock; | ||
202 | |||
203 | uint32_t num_displays; | ||
182 | 204 | ||
183 | /* | 205 | /* |
184 | * Framebuffer info. | 206 | * Framebuffer info. |
@@ -393,6 +415,7 @@ extern int vmw_fifo_send_fence(struct vmw_private *dev_priv, | |||
393 | extern void vmw_fifo_ping_host(struct vmw_private *dev_priv, uint32_t reason); | 415 | extern void vmw_fifo_ping_host(struct vmw_private *dev_priv, uint32_t reason); |
394 | extern int vmw_fifo_mmap(struct file *filp, struct vm_area_struct *vma); | 416 | extern int vmw_fifo_mmap(struct file *filp, struct vm_area_struct *vma); |
395 | extern bool vmw_fifo_have_3d(struct vmw_private *dev_priv); | 417 | extern bool vmw_fifo_have_3d(struct vmw_private *dev_priv); |
418 | extern bool vmw_fifo_have_pitchlock(struct vmw_private *dev_priv); | ||
396 | 419 | ||
397 | /** | 420 | /** |
398 | * TTM glue - vmwgfx_ttm_glue.c | 421 | * TTM glue - vmwgfx_ttm_glue.c |
@@ -441,6 +464,23 @@ extern int vmw_fallback_wait(struct vmw_private *dev_priv, | |||
441 | uint32_t sequence, | 464 | uint32_t sequence, |
442 | bool interruptible, | 465 | bool interruptible, |
443 | unsigned long timeout); | 466 | unsigned long timeout); |
467 | extern void vmw_update_sequence(struct vmw_private *dev_priv, | ||
468 | struct vmw_fifo_state *fifo_state); | ||
469 | |||
470 | |||
471 | /** | ||
472 | * Rudimentary fence objects currently used only for throttling - | ||
473 | * vmwgfx_fence.c | ||
474 | */ | ||
475 | |||
476 | extern void vmw_fence_queue_init(struct vmw_fence_queue *queue); | ||
477 | extern void vmw_fence_queue_takedown(struct vmw_fence_queue *queue); | ||
478 | extern int vmw_fence_push(struct vmw_fence_queue *queue, | ||
479 | uint32_t sequence); | ||
480 | extern int vmw_fence_pull(struct vmw_fence_queue *queue, | ||
481 | uint32_t signaled_sequence); | ||
482 | extern int vmw_wait_lag(struct vmw_private *dev_priv, | ||
483 | struct vmw_fence_queue *queue, uint32_t us); | ||
444 | 484 | ||
445 | /** | 485 | /** |
446 | * Kernel framebuffer - vmwgfx_fb.c | 486 | * Kernel framebuffer - vmwgfx_fb.c |
@@ -466,6 +506,11 @@ void vmw_kms_cursor_snoop(struct vmw_surface *srf, | |||
466 | struct ttm_object_file *tfile, | 506 | struct ttm_object_file *tfile, |
467 | struct ttm_buffer_object *bo, | 507 | struct ttm_buffer_object *bo, |
468 | SVGA3dCmdHeader *header); | 508 | SVGA3dCmdHeader *header); |
509 | void vmw_kms_write_svga(struct vmw_private *vmw_priv, | ||
510 | unsigned width, unsigned height, unsigned pitch, | ||
511 | unsigned bbp, unsigned depth); | ||
512 | int vmw_kms_update_layout_ioctl(struct drm_device *dev, void *data, | ||
513 | struct drm_file *file_priv); | ||
469 | 514 | ||
470 | /** | 515 | /** |
471 | * Overlay control - vmwgfx_overlay.c | 516 | * Overlay control - vmwgfx_overlay.c |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c index dbd36b8910c..bdd67cf8331 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | |||
@@ -669,6 +669,15 @@ int vmw_execbuf_ioctl(struct drm_device *dev, void *data, | |||
669 | goto out_err; | 669 | goto out_err; |
670 | 670 | ||
671 | vmw_apply_relocations(sw_context); | 671 | vmw_apply_relocations(sw_context); |
672 | |||
673 | if (arg->throttle_us) { | ||
674 | ret = vmw_wait_lag(dev_priv, &dev_priv->fifo.fence_queue, | ||
675 | arg->throttle_us); | ||
676 | |||
677 | if (unlikely(ret != 0)) | ||
678 | goto out_err; | ||
679 | } | ||
680 | |||
672 | vmw_fifo_commit(dev_priv, arg->command_size); | 681 | vmw_fifo_commit(dev_priv, arg->command_size); |
673 | 682 | ||
674 | ret = vmw_fifo_send_fence(dev_priv, &sequence); | 683 | ret = vmw_fifo_send_fence(dev_priv, &sequence); |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c index 7421aaad8d0..b0866f04ec7 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | |||
@@ -132,16 +132,14 @@ static int vmw_fb_check_var(struct fb_var_screeninfo *var, | |||
132 | return -EINVAL; | 132 | return -EINVAL; |
133 | } | 133 | } |
134 | 134 | ||
135 | /* without multimon its hard to resize */ | 135 | if (!(vmw_priv->capabilities & SVGA_CAP_DISPLAY_TOPOLOGY) && |
136 | if (!(vmw_priv->capabilities & SVGA_CAP_MULTIMON) && | 136 | (var->xoffset != 0 || var->yoffset != 0)) { |
137 | (var->xres != par->max_width || | 137 | DRM_ERROR("Can not handle panning without display topology\n"); |
138 | var->yres != par->max_height)) { | ||
139 | DRM_ERROR("Tried to resize, but we don't have multimon\n"); | ||
140 | return -EINVAL; | 138 | return -EINVAL; |
141 | } | 139 | } |
142 | 140 | ||
143 | if (var->xres > par->max_width || | 141 | if ((var->xoffset + var->xres) > par->max_width || |
144 | var->yres > par->max_height) { | 142 | (var->yoffset + var->yres) > par->max_height) { |
145 | DRM_ERROR("Requested geom can not fit in framebuffer\n"); | 143 | DRM_ERROR("Requested geom can not fit in framebuffer\n"); |
146 | return -EINVAL; | 144 | return -EINVAL; |
147 | } | 145 | } |
@@ -154,27 +152,11 @@ static int vmw_fb_set_par(struct fb_info *info) | |||
154 | struct vmw_fb_par *par = info->par; | 152 | struct vmw_fb_par *par = info->par; |
155 | struct vmw_private *vmw_priv = par->vmw_priv; | 153 | struct vmw_private *vmw_priv = par->vmw_priv; |
156 | 154 | ||
157 | if (vmw_priv->capabilities & SVGA_CAP_MULTIMON) { | 155 | vmw_kms_write_svga(vmw_priv, info->var.xres, info->var.yres, |
158 | vmw_write(vmw_priv, SVGA_REG_NUM_GUEST_DISPLAYS, 1); | 156 | info->fix.line_length, |
159 | vmw_write(vmw_priv, SVGA_REG_DISPLAY_ID, 0); | 157 | par->bpp, par->depth); |
160 | vmw_write(vmw_priv, SVGA_REG_DISPLAY_IS_PRIMARY, true); | 158 | if (vmw_priv->capabilities & SVGA_CAP_DISPLAY_TOPOLOGY) { |
161 | vmw_write(vmw_priv, SVGA_REG_DISPLAY_POSITION_X, 0); | ||
162 | vmw_write(vmw_priv, SVGA_REG_DISPLAY_POSITION_Y, 0); | ||
163 | vmw_write(vmw_priv, SVGA_REG_DISPLAY_WIDTH, 0); | ||
164 | vmw_write(vmw_priv, SVGA_REG_DISPLAY_HEIGHT, 0); | ||
165 | vmw_write(vmw_priv, SVGA_REG_DISPLAY_ID, SVGA_ID_INVALID); | ||
166 | |||
167 | vmw_write(vmw_priv, SVGA_REG_ENABLE, 1); | ||
168 | vmw_write(vmw_priv, SVGA_REG_WIDTH, par->max_width); | ||
169 | vmw_write(vmw_priv, SVGA_REG_HEIGHT, par->max_height); | ||
170 | vmw_write(vmw_priv, SVGA_REG_BITS_PER_PIXEL, par->bpp); | ||
171 | vmw_write(vmw_priv, SVGA_REG_DEPTH, par->depth); | ||
172 | vmw_write(vmw_priv, SVGA_REG_RED_MASK, 0x00ff0000); | ||
173 | vmw_write(vmw_priv, SVGA_REG_GREEN_MASK, 0x0000ff00); | ||
174 | vmw_write(vmw_priv, SVGA_REG_BLUE_MASK, 0x000000ff); | ||
175 | |||
176 | /* TODO check if pitch and offset changes */ | 159 | /* TODO check if pitch and offset changes */ |
177 | |||
178 | vmw_write(vmw_priv, SVGA_REG_NUM_GUEST_DISPLAYS, 1); | 160 | vmw_write(vmw_priv, SVGA_REG_NUM_GUEST_DISPLAYS, 1); |
179 | vmw_write(vmw_priv, SVGA_REG_DISPLAY_ID, 0); | 161 | vmw_write(vmw_priv, SVGA_REG_DISPLAY_ID, 0); |
180 | vmw_write(vmw_priv, SVGA_REG_DISPLAY_IS_PRIMARY, true); | 162 | vmw_write(vmw_priv, SVGA_REG_DISPLAY_IS_PRIMARY, true); |
@@ -183,13 +165,13 @@ static int vmw_fb_set_par(struct fb_info *info) | |||
183 | vmw_write(vmw_priv, SVGA_REG_DISPLAY_WIDTH, info->var.xres); | 165 | vmw_write(vmw_priv, SVGA_REG_DISPLAY_WIDTH, info->var.xres); |
184 | vmw_write(vmw_priv, SVGA_REG_DISPLAY_HEIGHT, info->var.yres); | 166 | vmw_write(vmw_priv, SVGA_REG_DISPLAY_HEIGHT, info->var.yres); |
185 | vmw_write(vmw_priv, SVGA_REG_DISPLAY_ID, SVGA_ID_INVALID); | 167 | vmw_write(vmw_priv, SVGA_REG_DISPLAY_ID, SVGA_ID_INVALID); |
186 | } else { | ||
187 | vmw_write(vmw_priv, SVGA_REG_WIDTH, info->var.xres); | ||
188 | vmw_write(vmw_priv, SVGA_REG_HEIGHT, info->var.yres); | ||
189 | |||
190 | /* TODO check if pitch and offset changes */ | ||
191 | } | 168 | } |
192 | 169 | ||
170 | /* This is really helpful since if this fails the user | ||
171 | * can probably not see anything on the screen. | ||
172 | */ | ||
173 | WARN_ON(vmw_read(vmw_priv, SVGA_REG_FB_OFFSET) != 0); | ||
174 | |||
193 | return 0; | 175 | return 0; |
194 | } | 176 | } |
195 | 177 | ||
@@ -416,48 +398,23 @@ int vmw_fb_init(struct vmw_private *vmw_priv) | |||
416 | unsigned fb_bbp, fb_depth, fb_offset, fb_pitch, fb_size; | 398 | unsigned fb_bbp, fb_depth, fb_offset, fb_pitch, fb_size; |
417 | int ret; | 399 | int ret; |
418 | 400 | ||
401 | /* XXX These shouldn't be hardcoded. */ | ||
419 | initial_width = 800; | 402 | initial_width = 800; |
420 | initial_height = 600; | 403 | initial_height = 600; |
421 | 404 | ||
422 | fb_bbp = 32; | 405 | fb_bbp = 32; |
423 | fb_depth = 24; | 406 | fb_depth = 24; |
424 | 407 | ||
425 | if (vmw_priv->capabilities & SVGA_CAP_MULTIMON) { | 408 | /* XXX As shouldn't these be as well. */ |
426 | fb_width = min(vmw_priv->fb_max_width, (unsigned)2048); | 409 | fb_width = min(vmw_priv->fb_max_width, (unsigned)2048); |
427 | fb_height = min(vmw_priv->fb_max_height, (unsigned)2048); | 410 | fb_height = min(vmw_priv->fb_max_height, (unsigned)2048); |
428 | } else { | ||
429 | fb_width = min(vmw_priv->fb_max_width, initial_width); | ||
430 | fb_height = min(vmw_priv->fb_max_height, initial_height); | ||
431 | } | ||
432 | 411 | ||
433 | initial_width = min(fb_width, initial_width); | 412 | initial_width = min(fb_width, initial_width); |
434 | initial_height = min(fb_height, initial_height); | 413 | initial_height = min(fb_height, initial_height); |
435 | 414 | ||
436 | vmw_write(vmw_priv, SVGA_REG_WIDTH, fb_width); | 415 | fb_pitch = fb_width * fb_bbp / 8; |
437 | vmw_write(vmw_priv, SVGA_REG_HEIGHT, fb_height); | 416 | fb_size = fb_pitch * fb_height; |
438 | vmw_write(vmw_priv, SVGA_REG_BITS_PER_PIXEL, fb_bbp); | ||
439 | vmw_write(vmw_priv, SVGA_REG_DEPTH, fb_depth); | ||
440 | vmw_write(vmw_priv, SVGA_REG_RED_MASK, 0x00ff0000); | ||
441 | vmw_write(vmw_priv, SVGA_REG_GREEN_MASK, 0x0000ff00); | ||
442 | vmw_write(vmw_priv, SVGA_REG_BLUE_MASK, 0x000000ff); | ||
443 | |||
444 | fb_size = vmw_read(vmw_priv, SVGA_REG_FB_SIZE); | ||
445 | fb_offset = vmw_read(vmw_priv, SVGA_REG_FB_OFFSET); | 417 | fb_offset = vmw_read(vmw_priv, SVGA_REG_FB_OFFSET); |
446 | fb_pitch = vmw_read(vmw_priv, SVGA_REG_BYTES_PER_LINE); | ||
447 | |||
448 | DRM_DEBUG("width %u\n", vmw_read(vmw_priv, SVGA_REG_MAX_WIDTH)); | ||
449 | DRM_DEBUG("height %u\n", vmw_read(vmw_priv, SVGA_REG_MAX_HEIGHT)); | ||
450 | DRM_DEBUG("width %u\n", vmw_read(vmw_priv, SVGA_REG_WIDTH)); | ||
451 | DRM_DEBUG("height %u\n", vmw_read(vmw_priv, SVGA_REG_HEIGHT)); | ||
452 | DRM_DEBUG("bpp %u\n", vmw_read(vmw_priv, SVGA_REG_BITS_PER_PIXEL)); | ||
453 | DRM_DEBUG("depth %u\n", vmw_read(vmw_priv, SVGA_REG_DEPTH)); | ||
454 | DRM_DEBUG("bpl %u\n", vmw_read(vmw_priv, SVGA_REG_BYTES_PER_LINE)); | ||
455 | DRM_DEBUG("r mask %08x\n", vmw_read(vmw_priv, SVGA_REG_RED_MASK)); | ||
456 | DRM_DEBUG("g mask %08x\n", vmw_read(vmw_priv, SVGA_REG_GREEN_MASK)); | ||
457 | DRM_DEBUG("b mask %08x\n", vmw_read(vmw_priv, SVGA_REG_BLUE_MASK)); | ||
458 | DRM_DEBUG("fb_offset 0x%08x\n", fb_offset); | ||
459 | DRM_DEBUG("fb_pitch %u\n", fb_pitch); | ||
460 | DRM_DEBUG("fb_size %u kiB\n", fb_size / 1024); | ||
461 | 418 | ||
462 | info = framebuffer_alloc(sizeof(*par), device); | 419 | info = framebuffer_alloc(sizeof(*par), device); |
463 | if (!info) | 420 | if (!info) |
@@ -659,6 +616,10 @@ int vmw_dmabuf_to_start_of_vram(struct vmw_private *vmw_priv, | |||
659 | goto err_unlock; | 616 | goto err_unlock; |
660 | 617 | ||
661 | ret = ttm_bo_validate(bo, &ne_placement, false, false, false); | 618 | ret = ttm_bo_validate(bo, &ne_placement, false, false, false); |
619 | |||
620 | /* Could probably bug on */ | ||
621 | WARN_ON(bo->offset != 0); | ||
622 | |||
662 | ttm_bo_unreserve(bo); | 623 | ttm_bo_unreserve(bo); |
663 | err_unlock: | 624 | err_unlock: |
664 | ttm_write_unlock(&vmw_priv->active_master->lock); | 625 | ttm_write_unlock(&vmw_priv->active_master->lock); |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c new file mode 100644 index 00000000000..61eacc1b5ca --- /dev/null +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | |||
@@ -0,0 +1,173 @@ | |||
1 | /************************************************************************** | ||
2 | * | ||
3 | * Copyright (C) 2010 VMware, Inc., Palo Alto, CA., USA | ||
4 | * All Rights Reserved. | ||
5 | * | ||
6 | * Permission is hereby granted, free of charge, to any person obtaining a | ||
7 | * copy of this software and associated documentation files (the | ||
8 | * "Software"), to deal in the Software without restriction, including | ||
9 | * without limitation the rights to use, copy, modify, merge, publish, | ||
10 | * distribute, sub license, and/or sell copies of the Software, and to | ||
11 | * permit persons to whom the Software is furnished to do so, subject to | ||
12 | * the following conditions: | ||
13 | * | ||
14 | * The above copyright notice and this permission notice (including the | ||
15 | * next paragraph) shall be included in all copies or substantial portions | ||
16 | * of the Software. | ||
17 | * | ||
18 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
19 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
20 | * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL | ||
21 | * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, | ||
22 | * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR | ||
23 | * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE | ||
24 | * USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
25 | * | ||
26 | **************************************************************************/ | ||
27 | |||
28 | |||
29 | #include "vmwgfx_drv.h" | ||
30 | |||
31 | struct vmw_fence { | ||
32 | struct list_head head; | ||
33 | uint32_t sequence; | ||
34 | struct timespec submitted; | ||
35 | }; | ||
36 | |||
37 | void vmw_fence_queue_init(struct vmw_fence_queue *queue) | ||
38 | { | ||
39 | INIT_LIST_HEAD(&queue->head); | ||
40 | queue->lag = ns_to_timespec(0); | ||
41 | getrawmonotonic(&queue->lag_time); | ||
42 | spin_lock_init(&queue->lock); | ||
43 | } | ||
44 | |||
45 | void vmw_fence_queue_takedown(struct vmw_fence_queue *queue) | ||
46 | { | ||
47 | struct vmw_fence *fence, *next; | ||
48 | |||
49 | spin_lock(&queue->lock); | ||
50 | list_for_each_entry_safe(fence, next, &queue->head, head) { | ||
51 | kfree(fence); | ||
52 | } | ||
53 | spin_unlock(&queue->lock); | ||
54 | } | ||
55 | |||
56 | int vmw_fence_push(struct vmw_fence_queue *queue, | ||
57 | uint32_t sequence) | ||
58 | { | ||
59 | struct vmw_fence *fence = kmalloc(sizeof(*fence), GFP_KERNEL); | ||
60 | |||
61 | if (unlikely(!fence)) | ||
62 | return -ENOMEM; | ||
63 | |||
64 | fence->sequence = sequence; | ||
65 | getrawmonotonic(&fence->submitted); | ||
66 | spin_lock(&queue->lock); | ||
67 | list_add_tail(&fence->head, &queue->head); | ||
68 | spin_unlock(&queue->lock); | ||
69 | |||
70 | return 0; | ||
71 | } | ||
72 | |||
73 | int vmw_fence_pull(struct vmw_fence_queue *queue, | ||
74 | uint32_t signaled_sequence) | ||
75 | { | ||
76 | struct vmw_fence *fence, *next; | ||
77 | struct timespec now; | ||
78 | bool updated = false; | ||
79 | |||
80 | spin_lock(&queue->lock); | ||
81 | getrawmonotonic(&now); | ||
82 | |||
83 | if (list_empty(&queue->head)) { | ||
84 | queue->lag = ns_to_timespec(0); | ||
85 | queue->lag_time = now; | ||
86 | updated = true; | ||
87 | goto out_unlock; | ||
88 | } | ||
89 | |||
90 | list_for_each_entry_safe(fence, next, &queue->head, head) { | ||
91 | if (signaled_sequence - fence->sequence > (1 << 30)) | ||
92 | continue; | ||
93 | |||
94 | queue->lag = timespec_sub(now, fence->submitted); | ||
95 | queue->lag_time = now; | ||
96 | updated = true; | ||
97 | list_del(&fence->head); | ||
98 | kfree(fence); | ||
99 | } | ||
100 | |||
101 | out_unlock: | ||
102 | spin_unlock(&queue->lock); | ||
103 | |||
104 | return (updated) ? 0 : -EBUSY; | ||
105 | } | ||
106 | |||
107 | static struct timespec vmw_timespec_add(struct timespec t1, | ||
108 | struct timespec t2) | ||
109 | { | ||
110 | t1.tv_sec += t2.tv_sec; | ||
111 | t1.tv_nsec += t2.tv_nsec; | ||
112 | if (t1.tv_nsec >= 1000000000L) { | ||
113 | t1.tv_sec += 1; | ||
114 | t1.tv_nsec -= 1000000000L; | ||
115 | } | ||
116 | |||
117 | return t1; | ||
118 | } | ||
119 | |||
120 | static struct timespec vmw_fifo_lag(struct vmw_fence_queue *queue) | ||
121 | { | ||
122 | struct timespec now; | ||
123 | |||
124 | spin_lock(&queue->lock); | ||
125 | getrawmonotonic(&now); | ||
126 | queue->lag = vmw_timespec_add(queue->lag, | ||
127 | timespec_sub(now, queue->lag_time)); | ||
128 | queue->lag_time = now; | ||
129 | spin_unlock(&queue->lock); | ||
130 | return queue->lag; | ||
131 | } | ||
132 | |||
133 | |||
134 | static bool vmw_lag_lt(struct vmw_fence_queue *queue, | ||
135 | uint32_t us) | ||
136 | { | ||
137 | struct timespec lag, cond; | ||
138 | |||
139 | cond = ns_to_timespec((s64) us * 1000); | ||
140 | lag = vmw_fifo_lag(queue); | ||
141 | return (timespec_compare(&lag, &cond) < 1); | ||
142 | } | ||
143 | |||
144 | int vmw_wait_lag(struct vmw_private *dev_priv, | ||
145 | struct vmw_fence_queue *queue, uint32_t us) | ||
146 | { | ||
147 | struct vmw_fence *fence; | ||
148 | uint32_t sequence; | ||
149 | int ret; | ||
150 | |||
151 | while (!vmw_lag_lt(queue, us)) { | ||
152 | spin_lock(&queue->lock); | ||
153 | if (list_empty(&queue->head)) | ||
154 | sequence = atomic_read(&dev_priv->fence_seq); | ||
155 | else { | ||
156 | fence = list_first_entry(&queue->head, | ||
157 | struct vmw_fence, head); | ||
158 | sequence = fence->sequence; | ||
159 | } | ||
160 | spin_unlock(&queue->lock); | ||
161 | |||
162 | ret = vmw_wait_fence(dev_priv, false, sequence, true, | ||
163 | 3*HZ); | ||
164 | |||
165 | if (unlikely(ret != 0)) | ||
166 | return ret; | ||
167 | |||
168 | (void) vmw_fence_pull(queue, sequence); | ||
169 | } | ||
170 | return 0; | ||
171 | } | ||
172 | |||
173 | |||
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c index 39d43a01d84..e6a1eb7ea95 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | |||
@@ -34,6 +34,9 @@ bool vmw_fifo_have_3d(struct vmw_private *dev_priv) | |||
34 | __le32 __iomem *fifo_mem = dev_priv->mmio_virt; | 34 | __le32 __iomem *fifo_mem = dev_priv->mmio_virt; |
35 | uint32_t fifo_min, hwversion; | 35 | uint32_t fifo_min, hwversion; |
36 | 36 | ||
37 | if (!(dev_priv->capabilities & SVGA_CAP_EXTENDED_FIFO)) | ||
38 | return false; | ||
39 | |||
37 | fifo_min = ioread32(fifo_mem + SVGA_FIFO_MIN); | 40 | fifo_min = ioread32(fifo_mem + SVGA_FIFO_MIN); |
38 | if (fifo_min <= SVGA_FIFO_3D_HWVERSION * sizeof(unsigned int)) | 41 | if (fifo_min <= SVGA_FIFO_3D_HWVERSION * sizeof(unsigned int)) |
39 | return false; | 42 | return false; |
@@ -48,6 +51,21 @@ bool vmw_fifo_have_3d(struct vmw_private *dev_priv) | |||
48 | return true; | 51 | return true; |
49 | } | 52 | } |
50 | 53 | ||
54 | bool vmw_fifo_have_pitchlock(struct vmw_private *dev_priv) | ||
55 | { | ||
56 | __le32 __iomem *fifo_mem = dev_priv->mmio_virt; | ||
57 | uint32_t caps; | ||
58 | |||
59 | if (!(dev_priv->capabilities & SVGA_CAP_EXTENDED_FIFO)) | ||
60 | return false; | ||
61 | |||
62 | caps = ioread32(fifo_mem + SVGA_FIFO_CAPABILITIES); | ||
63 | if (caps & SVGA_FIFO_CAP_PITCHLOCK) | ||
64 | return true; | ||
65 | |||
66 | return false; | ||
67 | } | ||
68 | |||
51 | int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo) | 69 | int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo) |
52 | { | 70 | { |
53 | __le32 __iomem *fifo_mem = dev_priv->mmio_virt; | 71 | __le32 __iomem *fifo_mem = dev_priv->mmio_virt; |
@@ -120,7 +138,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo) | |||
120 | 138 | ||
121 | atomic_set(&dev_priv->fence_seq, dev_priv->last_read_sequence); | 139 | atomic_set(&dev_priv->fence_seq, dev_priv->last_read_sequence); |
122 | iowrite32(dev_priv->last_read_sequence, fifo_mem + SVGA_FIFO_FENCE); | 140 | iowrite32(dev_priv->last_read_sequence, fifo_mem + SVGA_FIFO_FENCE); |
123 | 141 | vmw_fence_queue_init(&fifo->fence_queue); | |
124 | return vmw_fifo_send_fence(dev_priv, &dummy); | 142 | return vmw_fifo_send_fence(dev_priv, &dummy); |
125 | out_err: | 143 | out_err: |
126 | vfree(fifo->static_buffer); | 144 | vfree(fifo->static_buffer); |
@@ -159,6 +177,7 @@ void vmw_fifo_release(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo) | |||
159 | dev_priv->enable_state); | 177 | dev_priv->enable_state); |
160 | 178 | ||
161 | mutex_unlock(&dev_priv->hw_mutex); | 179 | mutex_unlock(&dev_priv->hw_mutex); |
180 | vmw_fence_queue_takedown(&fifo->fence_queue); | ||
162 | 181 | ||
163 | if (likely(fifo->last_buffer != NULL)) { | 182 | if (likely(fifo->last_buffer != NULL)) { |
164 | vfree(fifo->last_buffer); | 183 | vfree(fifo->last_buffer); |
@@ -484,6 +503,8 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *sequence) | |||
484 | fifo_state->last_buffer_add = true; | 503 | fifo_state->last_buffer_add = true; |
485 | vmw_fifo_commit(dev_priv, bytes); | 504 | vmw_fifo_commit(dev_priv, bytes); |
486 | fifo_state->last_buffer_add = false; | 505 | fifo_state->last_buffer_add = false; |
506 | (void) vmw_fence_push(&fifo_state->fence_queue, *sequence); | ||
507 | vmw_update_sequence(dev_priv, fifo_state); | ||
487 | 508 | ||
488 | out_err: | 509 | out_err: |
489 | return ret; | 510 | return ret; |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c index 4d7cb539386..e92298a6a38 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c | |||
@@ -64,22 +64,33 @@ static bool vmw_fifo_idle(struct vmw_private *dev_priv, uint32_t sequence) | |||
64 | return (busy == 0); | 64 | return (busy == 0); |
65 | } | 65 | } |
66 | 66 | ||
67 | void vmw_update_sequence(struct vmw_private *dev_priv, | ||
68 | struct vmw_fifo_state *fifo_state) | ||
69 | { | ||
70 | __le32 __iomem *fifo_mem = dev_priv->mmio_virt; | ||
71 | |||
72 | uint32_t sequence = ioread32(fifo_mem + SVGA_FIFO_FENCE); | ||
73 | |||
74 | if (dev_priv->last_read_sequence != sequence) { | ||
75 | dev_priv->last_read_sequence = sequence; | ||
76 | vmw_fence_pull(&fifo_state->fence_queue, sequence); | ||
77 | } | ||
78 | } | ||
67 | 79 | ||
68 | bool vmw_fence_signaled(struct vmw_private *dev_priv, | 80 | bool vmw_fence_signaled(struct vmw_private *dev_priv, |
69 | uint32_t sequence) | 81 | uint32_t sequence) |
70 | { | 82 | { |
71 | __le32 __iomem *fifo_mem = dev_priv->mmio_virt; | ||
72 | struct vmw_fifo_state *fifo_state; | 83 | struct vmw_fifo_state *fifo_state; |
73 | bool ret; | 84 | bool ret; |
74 | 85 | ||
75 | if (likely(dev_priv->last_read_sequence - sequence < VMW_FENCE_WRAP)) | 86 | if (likely(dev_priv->last_read_sequence - sequence < VMW_FENCE_WRAP)) |
76 | return true; | 87 | return true; |
77 | 88 | ||
78 | dev_priv->last_read_sequence = ioread32(fifo_mem + SVGA_FIFO_FENCE); | 89 | fifo_state = &dev_priv->fifo; |
90 | vmw_update_sequence(dev_priv, fifo_state); | ||
79 | if (likely(dev_priv->last_read_sequence - sequence < VMW_FENCE_WRAP)) | 91 | if (likely(dev_priv->last_read_sequence - sequence < VMW_FENCE_WRAP)) |
80 | return true; | 92 | return true; |
81 | 93 | ||
82 | fifo_state = &dev_priv->fifo; | ||
83 | if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE) && | 94 | if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE) && |
84 | vmw_fifo_idle(dev_priv, sequence)) | 95 | vmw_fifo_idle(dev_priv, sequence)) |
85 | return true; | 96 | return true; |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c index bbc7c4c30bc..f1d62611241 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | |||
@@ -30,6 +30,8 @@ | |||
30 | /* Might need a hrtimer here? */ | 30 | /* Might need a hrtimer here? */ |
31 | #define VMWGFX_PRESENT_RATE ((HZ / 60 > 0) ? HZ / 60 : 1) | 31 | #define VMWGFX_PRESENT_RATE ((HZ / 60 > 0) ? HZ / 60 : 1) |
32 | 32 | ||
33 | static int vmw_surface_dmabuf_pin(struct vmw_framebuffer *vfb); | ||
34 | static int vmw_surface_dmabuf_unpin(struct vmw_framebuffer *vfb); | ||
33 | 35 | ||
34 | void vmw_display_unit_cleanup(struct vmw_display_unit *du) | 36 | void vmw_display_unit_cleanup(struct vmw_display_unit *du) |
35 | { | 37 | { |
@@ -326,6 +328,7 @@ int vmw_framebuffer_create_handle(struct drm_framebuffer *fb, | |||
326 | struct vmw_framebuffer_surface { | 328 | struct vmw_framebuffer_surface { |
327 | struct vmw_framebuffer base; | 329 | struct vmw_framebuffer base; |
328 | struct vmw_surface *surface; | 330 | struct vmw_surface *surface; |
331 | struct vmw_dma_buffer *buffer; | ||
329 | struct delayed_work d_work; | 332 | struct delayed_work d_work; |
330 | struct mutex work_lock; | 333 | struct mutex work_lock; |
331 | bool present_fs; | 334 | bool present_fs; |
@@ -500,8 +503,8 @@ int vmw_kms_new_framebuffer_surface(struct vmw_private *dev_priv, | |||
500 | vfbs->base.base.depth = 24; | 503 | vfbs->base.base.depth = 24; |
501 | vfbs->base.base.width = width; | 504 | vfbs->base.base.width = width; |
502 | vfbs->base.base.height = height; | 505 | vfbs->base.base.height = height; |
503 | vfbs->base.pin = NULL; | 506 | vfbs->base.pin = &vmw_surface_dmabuf_pin; |
504 | vfbs->base.unpin = NULL; | 507 | vfbs->base.unpin = &vmw_surface_dmabuf_unpin; |
505 | vfbs->surface = surface; | 508 | vfbs->surface = surface; |
506 | mutex_init(&vfbs->work_lock); | 509 | mutex_init(&vfbs->work_lock); |
507 | INIT_DELAYED_WORK(&vfbs->d_work, &vmw_framebuffer_present_fs_callback); | 510 | INIT_DELAYED_WORK(&vfbs->d_work, &vmw_framebuffer_present_fs_callback); |
@@ -589,6 +592,40 @@ static struct drm_framebuffer_funcs vmw_framebuffer_dmabuf_funcs = { | |||
589 | .create_handle = vmw_framebuffer_create_handle, | 592 | .create_handle = vmw_framebuffer_create_handle, |
590 | }; | 593 | }; |
591 | 594 | ||
595 | static int vmw_surface_dmabuf_pin(struct vmw_framebuffer *vfb) | ||
596 | { | ||
597 | struct vmw_private *dev_priv = vmw_priv(vfb->base.dev); | ||
598 | struct vmw_framebuffer_surface *vfbs = | ||
599 | vmw_framebuffer_to_vfbs(&vfb->base); | ||
600 | unsigned long size = vfbs->base.base.pitch * vfbs->base.base.height; | ||
601 | int ret; | ||
602 | |||
603 | vfbs->buffer = kzalloc(sizeof(*vfbs->buffer), GFP_KERNEL); | ||
604 | if (unlikely(vfbs->buffer == NULL)) | ||
605 | return -ENOMEM; | ||
606 | |||
607 | vmw_overlay_pause_all(dev_priv); | ||
608 | ret = vmw_dmabuf_init(dev_priv, vfbs->buffer, size, | ||
609 | &vmw_vram_ne_placement, | ||
610 | false, &vmw_dmabuf_bo_free); | ||
611 | vmw_overlay_resume_all(dev_priv); | ||
612 | |||
613 | return ret; | ||
614 | } | ||
615 | |||
616 | static int vmw_surface_dmabuf_unpin(struct vmw_framebuffer *vfb) | ||
617 | { | ||
618 | struct ttm_buffer_object *bo; | ||
619 | struct vmw_framebuffer_surface *vfbs = | ||
620 | vmw_framebuffer_to_vfbs(&vfb->base); | ||
621 | |||
622 | bo = &vfbs->buffer->base; | ||
623 | ttm_bo_unref(&bo); | ||
624 | vfbs->buffer = NULL; | ||
625 | |||
626 | return 0; | ||
627 | } | ||
628 | |||
592 | static int vmw_framebuffer_dmabuf_pin(struct vmw_framebuffer *vfb) | 629 | static int vmw_framebuffer_dmabuf_pin(struct vmw_framebuffer *vfb) |
593 | { | 630 | { |
594 | struct vmw_private *dev_priv = vmw_priv(vfb->base.dev); | 631 | struct vmw_private *dev_priv = vmw_priv(vfb->base.dev); |
@@ -596,33 +633,15 @@ static int vmw_framebuffer_dmabuf_pin(struct vmw_framebuffer *vfb) | |||
596 | vmw_framebuffer_to_vfbd(&vfb->base); | 633 | vmw_framebuffer_to_vfbd(&vfb->base); |
597 | int ret; | 634 | int ret; |
598 | 635 | ||
636 | |||
599 | vmw_overlay_pause_all(dev_priv); | 637 | vmw_overlay_pause_all(dev_priv); |
600 | 638 | ||
601 | ret = vmw_dmabuf_to_start_of_vram(dev_priv, vfbd->buffer); | 639 | ret = vmw_dmabuf_to_start_of_vram(dev_priv, vfbd->buffer); |
602 | 640 | ||
603 | if (dev_priv->capabilities & SVGA_CAP_MULTIMON) { | ||
604 | vmw_write(dev_priv, SVGA_REG_NUM_GUEST_DISPLAYS, 1); | ||
605 | vmw_write(dev_priv, SVGA_REG_DISPLAY_ID, 0); | ||
606 | vmw_write(dev_priv, SVGA_REG_DISPLAY_IS_PRIMARY, true); | ||
607 | vmw_write(dev_priv, SVGA_REG_DISPLAY_POSITION_X, 0); | ||
608 | vmw_write(dev_priv, SVGA_REG_DISPLAY_POSITION_Y, 0); | ||
609 | vmw_write(dev_priv, SVGA_REG_DISPLAY_WIDTH, 0); | ||
610 | vmw_write(dev_priv, SVGA_REG_DISPLAY_HEIGHT, 0); | ||
611 | vmw_write(dev_priv, SVGA_REG_DISPLAY_ID, SVGA_ID_INVALID); | ||
612 | |||
613 | vmw_write(dev_priv, SVGA_REG_ENABLE, 1); | ||
614 | vmw_write(dev_priv, SVGA_REG_WIDTH, vfb->base.width); | ||
615 | vmw_write(dev_priv, SVGA_REG_HEIGHT, vfb->base.height); | ||
616 | vmw_write(dev_priv, SVGA_REG_BITS_PER_PIXEL, vfb->base.bits_per_pixel); | ||
617 | vmw_write(dev_priv, SVGA_REG_DEPTH, vfb->base.depth); | ||
618 | vmw_write(dev_priv, SVGA_REG_RED_MASK, 0x00ff0000); | ||
619 | vmw_write(dev_priv, SVGA_REG_GREEN_MASK, 0x0000ff00); | ||
620 | vmw_write(dev_priv, SVGA_REG_BLUE_MASK, 0x000000ff); | ||
621 | } else | ||
622 | WARN_ON(true); | ||
623 | |||
624 | vmw_overlay_resume_all(dev_priv); | 641 | vmw_overlay_resume_all(dev_priv); |
625 | 642 | ||
643 | WARN_ON(ret != 0); | ||
644 | |||
626 | return 0; | 645 | return 0; |
627 | } | 646 | } |
628 | 647 | ||
@@ -668,7 +687,7 @@ int vmw_kms_new_framebuffer_dmabuf(struct vmw_private *dev_priv, | |||
668 | 687 | ||
669 | /* XXX get the first 3 from the surface info */ | 688 | /* XXX get the first 3 from the surface info */ |
670 | vfbd->base.base.bits_per_pixel = 32; | 689 | vfbd->base.base.bits_per_pixel = 32; |
671 | vfbd->base.base.pitch = width * 32 / 4; | 690 | vfbd->base.base.pitch = width * vfbd->base.base.bits_per_pixel / 8; |
672 | vfbd->base.base.depth = 24; | 691 | vfbd->base.base.depth = 24; |
673 | vfbd->base.base.width = width; | 692 | vfbd->base.base.width = width; |
674 | vfbd->base.base.height = height; | 693 | vfbd->base.base.height = height; |
@@ -765,8 +784,9 @@ int vmw_kms_init(struct vmw_private *dev_priv) | |||
765 | dev->mode_config.funcs = &vmw_kms_funcs; | 784 | dev->mode_config.funcs = &vmw_kms_funcs; |
766 | dev->mode_config.min_width = 1; | 785 | dev->mode_config.min_width = 1; |
767 | dev->mode_config.min_height = 1; | 786 | dev->mode_config.min_height = 1; |
768 | dev->mode_config.max_width = dev_priv->fb_max_width; | 787 | /* assumed largest fb size */ |
769 | dev->mode_config.max_height = dev_priv->fb_max_height; | 788 | dev->mode_config.max_width = 8192; |
789 | dev->mode_config.max_height = 8192; | ||
770 | 790 | ||
771 | ret = vmw_kms_init_legacy_display_system(dev_priv); | 791 | ret = vmw_kms_init_legacy_display_system(dev_priv); |
772 | 792 | ||
@@ -826,49 +846,140 @@ out: | |||
826 | return ret; | 846 | return ret; |
827 | } | 847 | } |
828 | 848 | ||
849 | void vmw_kms_write_svga(struct vmw_private *vmw_priv, | ||
850 | unsigned width, unsigned height, unsigned pitch, | ||
851 | unsigned bbp, unsigned depth) | ||
852 | { | ||
853 | if (vmw_priv->capabilities & SVGA_CAP_PITCHLOCK) | ||
854 | vmw_write(vmw_priv, SVGA_REG_PITCHLOCK, pitch); | ||
855 | else if (vmw_fifo_have_pitchlock(vmw_priv)) | ||
856 | iowrite32(pitch, vmw_priv->mmio_virt + SVGA_FIFO_PITCHLOCK); | ||
857 | vmw_write(vmw_priv, SVGA_REG_WIDTH, width); | ||
858 | vmw_write(vmw_priv, SVGA_REG_HEIGHT, height); | ||
859 | vmw_write(vmw_priv, SVGA_REG_BITS_PER_PIXEL, bbp); | ||
860 | vmw_write(vmw_priv, SVGA_REG_DEPTH, depth); | ||
861 | vmw_write(vmw_priv, SVGA_REG_RED_MASK, 0x00ff0000); | ||
862 | vmw_write(vmw_priv, SVGA_REG_GREEN_MASK, 0x0000ff00); | ||
863 | vmw_write(vmw_priv, SVGA_REG_BLUE_MASK, 0x000000ff); | ||
864 | } | ||
865 | |||
829 | int vmw_kms_save_vga(struct vmw_private *vmw_priv) | 866 | int vmw_kms_save_vga(struct vmw_private *vmw_priv) |
830 | { | 867 | { |
831 | /* | 868 | struct vmw_vga_topology_state *save; |
832 | * setup a single multimon monitor with the size | 869 | uint32_t i; |
833 | * of 0x0, this stops the UI from resizing when we | ||
834 | * change the framebuffer size | ||
835 | */ | ||
836 | if (vmw_priv->capabilities & SVGA_CAP_MULTIMON) { | ||
837 | vmw_write(vmw_priv, SVGA_REG_NUM_GUEST_DISPLAYS, 1); | ||
838 | vmw_write(vmw_priv, SVGA_REG_DISPLAY_ID, 0); | ||
839 | vmw_write(vmw_priv, SVGA_REG_DISPLAY_IS_PRIMARY, true); | ||
840 | vmw_write(vmw_priv, SVGA_REG_DISPLAY_POSITION_X, 0); | ||
841 | vmw_write(vmw_priv, SVGA_REG_DISPLAY_POSITION_Y, 0); | ||
842 | vmw_write(vmw_priv, SVGA_REG_DISPLAY_WIDTH, 0); | ||
843 | vmw_write(vmw_priv, SVGA_REG_DISPLAY_HEIGHT, 0); | ||
844 | vmw_write(vmw_priv, SVGA_REG_DISPLAY_ID, SVGA_ID_INVALID); | ||
845 | } | ||
846 | 870 | ||
847 | vmw_priv->vga_width = vmw_read(vmw_priv, SVGA_REG_WIDTH); | 871 | vmw_priv->vga_width = vmw_read(vmw_priv, SVGA_REG_WIDTH); |
848 | vmw_priv->vga_height = vmw_read(vmw_priv, SVGA_REG_HEIGHT); | 872 | vmw_priv->vga_height = vmw_read(vmw_priv, SVGA_REG_HEIGHT); |
849 | vmw_priv->vga_bpp = vmw_read(vmw_priv, SVGA_REG_BITS_PER_PIXEL); | ||
850 | vmw_priv->vga_depth = vmw_read(vmw_priv, SVGA_REG_DEPTH); | 873 | vmw_priv->vga_depth = vmw_read(vmw_priv, SVGA_REG_DEPTH); |
874 | vmw_priv->vga_bpp = vmw_read(vmw_priv, SVGA_REG_BITS_PER_PIXEL); | ||
851 | vmw_priv->vga_pseudo = vmw_read(vmw_priv, SVGA_REG_PSEUDOCOLOR); | 875 | vmw_priv->vga_pseudo = vmw_read(vmw_priv, SVGA_REG_PSEUDOCOLOR); |
852 | vmw_priv->vga_red_mask = vmw_read(vmw_priv, SVGA_REG_RED_MASK); | 876 | vmw_priv->vga_red_mask = vmw_read(vmw_priv, SVGA_REG_RED_MASK); |
853 | vmw_priv->vga_green_mask = vmw_read(vmw_priv, SVGA_REG_GREEN_MASK); | ||
854 | vmw_priv->vga_blue_mask = vmw_read(vmw_priv, SVGA_REG_BLUE_MASK); | 877 | vmw_priv->vga_blue_mask = vmw_read(vmw_priv, SVGA_REG_BLUE_MASK); |
878 | vmw_priv->vga_green_mask = vmw_read(vmw_priv, SVGA_REG_GREEN_MASK); | ||
879 | if (vmw_priv->capabilities & SVGA_CAP_PITCHLOCK) | ||
880 | vmw_priv->vga_pitchlock = | ||
881 | vmw_read(vmw_priv, SVGA_REG_PITCHLOCK); | ||
882 | else if (vmw_fifo_have_pitchlock(vmw_priv)) | ||
883 | vmw_priv->vga_pitchlock = ioread32(vmw_priv->mmio_virt + | ||
884 | SVGA_FIFO_PITCHLOCK); | ||
885 | |||
886 | if (!(vmw_priv->capabilities & SVGA_CAP_DISPLAY_TOPOLOGY)) | ||
887 | return 0; | ||
855 | 888 | ||
889 | vmw_priv->num_displays = vmw_read(vmw_priv, | ||
890 | SVGA_REG_NUM_GUEST_DISPLAYS); | ||
891 | |||
892 | for (i = 0; i < vmw_priv->num_displays; ++i) { | ||
893 | save = &vmw_priv->vga_save[i]; | ||
894 | vmw_write(vmw_priv, SVGA_REG_DISPLAY_ID, i); | ||
895 | save->primary = vmw_read(vmw_priv, SVGA_REG_DISPLAY_IS_PRIMARY); | ||
896 | save->pos_x = vmw_read(vmw_priv, SVGA_REG_DISPLAY_POSITION_X); | ||
897 | save->pos_y = vmw_read(vmw_priv, SVGA_REG_DISPLAY_POSITION_Y); | ||
898 | save->width = vmw_read(vmw_priv, SVGA_REG_DISPLAY_WIDTH); | ||
899 | save->height = vmw_read(vmw_priv, SVGA_REG_DISPLAY_HEIGHT); | ||
900 | vmw_write(vmw_priv, SVGA_REG_DISPLAY_ID, SVGA_ID_INVALID); | ||
901 | } | ||
856 | return 0; | 902 | return 0; |
857 | } | 903 | } |
858 | 904 | ||
859 | int vmw_kms_restore_vga(struct vmw_private *vmw_priv) | 905 | int vmw_kms_restore_vga(struct vmw_private *vmw_priv) |
860 | { | 906 | { |
907 | struct vmw_vga_topology_state *save; | ||
908 | uint32_t i; | ||
909 | |||
861 | vmw_write(vmw_priv, SVGA_REG_WIDTH, vmw_priv->vga_width); | 910 | vmw_write(vmw_priv, SVGA_REG_WIDTH, vmw_priv->vga_width); |
862 | vmw_write(vmw_priv, SVGA_REG_HEIGHT, vmw_priv->vga_height); | 911 | vmw_write(vmw_priv, SVGA_REG_HEIGHT, vmw_priv->vga_height); |
863 | vmw_write(vmw_priv, SVGA_REG_BITS_PER_PIXEL, vmw_priv->vga_bpp); | ||
864 | vmw_write(vmw_priv, SVGA_REG_DEPTH, vmw_priv->vga_depth); | 912 | vmw_write(vmw_priv, SVGA_REG_DEPTH, vmw_priv->vga_depth); |
913 | vmw_write(vmw_priv, SVGA_REG_BITS_PER_PIXEL, vmw_priv->vga_bpp); | ||
865 | vmw_write(vmw_priv, SVGA_REG_PSEUDOCOLOR, vmw_priv->vga_pseudo); | 914 | vmw_write(vmw_priv, SVGA_REG_PSEUDOCOLOR, vmw_priv->vga_pseudo); |
866 | vmw_write(vmw_priv, SVGA_REG_RED_MASK, vmw_priv->vga_red_mask); | 915 | vmw_write(vmw_priv, SVGA_REG_RED_MASK, vmw_priv->vga_red_mask); |
867 | vmw_write(vmw_priv, SVGA_REG_GREEN_MASK, vmw_priv->vga_green_mask); | 916 | vmw_write(vmw_priv, SVGA_REG_GREEN_MASK, vmw_priv->vga_green_mask); |
868 | vmw_write(vmw_priv, SVGA_REG_BLUE_MASK, vmw_priv->vga_blue_mask); | 917 | vmw_write(vmw_priv, SVGA_REG_BLUE_MASK, vmw_priv->vga_blue_mask); |
918 | if (vmw_priv->capabilities & SVGA_CAP_PITCHLOCK) | ||
919 | vmw_write(vmw_priv, SVGA_REG_PITCHLOCK, | ||
920 | vmw_priv->vga_pitchlock); | ||
921 | else if (vmw_fifo_have_pitchlock(vmw_priv)) | ||
922 | iowrite32(vmw_priv->vga_pitchlock, | ||
923 | vmw_priv->mmio_virt + SVGA_FIFO_PITCHLOCK); | ||
924 | |||
925 | if (!(vmw_priv->capabilities & SVGA_CAP_DISPLAY_TOPOLOGY)) | ||
926 | return 0; | ||
869 | 927 | ||
870 | /* TODO check for multimon */ | 928 | for (i = 0; i < vmw_priv->num_displays; ++i) { |
871 | vmw_write(vmw_priv, SVGA_REG_NUM_GUEST_DISPLAYS, 0); | 929 | save = &vmw_priv->vga_save[i]; |
930 | vmw_write(vmw_priv, SVGA_REG_DISPLAY_ID, i); | ||
931 | vmw_write(vmw_priv, SVGA_REG_DISPLAY_IS_PRIMARY, save->primary); | ||
932 | vmw_write(vmw_priv, SVGA_REG_DISPLAY_POSITION_X, save->pos_x); | ||
933 | vmw_write(vmw_priv, SVGA_REG_DISPLAY_POSITION_Y, save->pos_y); | ||
934 | vmw_write(vmw_priv, SVGA_REG_DISPLAY_WIDTH, save->width); | ||
935 | vmw_write(vmw_priv, SVGA_REG_DISPLAY_HEIGHT, save->height); | ||
936 | vmw_write(vmw_priv, SVGA_REG_DISPLAY_ID, SVGA_ID_INVALID); | ||
937 | } | ||
872 | 938 | ||
873 | return 0; | 939 | return 0; |
874 | } | 940 | } |
941 | |||
942 | int vmw_kms_update_layout_ioctl(struct drm_device *dev, void *data, | ||
943 | struct drm_file *file_priv) | ||
944 | { | ||
945 | struct vmw_private *dev_priv = vmw_priv(dev); | ||
946 | struct drm_vmw_update_layout_arg *arg = | ||
947 | (struct drm_vmw_update_layout_arg *)data; | ||
948 | struct vmw_master *vmaster = vmw_master(file_priv->master); | ||
949 | void __user *user_rects; | ||
950 | struct drm_vmw_rect *rects; | ||
951 | unsigned rects_size; | ||
952 | int ret; | ||
953 | |||
954 | ret = ttm_read_lock(&vmaster->lock, true); | ||
955 | if (unlikely(ret != 0)) | ||
956 | return ret; | ||
957 | |||
958 | if (!arg->num_outputs) { | ||
959 | struct drm_vmw_rect def_rect = {0, 0, 800, 600}; | ||
960 | vmw_kms_ldu_update_layout(dev_priv, 1, &def_rect); | ||
961 | goto out_unlock; | ||
962 | } | ||
963 | |||
964 | rects_size = arg->num_outputs * sizeof(struct drm_vmw_rect); | ||
965 | rects = kzalloc(rects_size, GFP_KERNEL); | ||
966 | if (unlikely(!rects)) { | ||
967 | ret = -ENOMEM; | ||
968 | goto out_unlock; | ||
969 | } | ||
970 | |||
971 | user_rects = (void __user *)(unsigned long)arg->rects; | ||
972 | ret = copy_from_user(rects, user_rects, rects_size); | ||
973 | if (unlikely(ret != 0)) { | ||
974 | DRM_ERROR("Failed to get rects.\n"); | ||
975 | goto out_free; | ||
976 | } | ||
977 | |||
978 | vmw_kms_ldu_update_layout(dev_priv, arg->num_outputs, rects); | ||
979 | |||
980 | out_free: | ||
981 | kfree(rects); | ||
982 | out_unlock: | ||
983 | ttm_read_unlock(&vmaster->lock); | ||
984 | return ret; | ||
985 | } | ||
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h index 8b95249f053..8a398a0339b 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | |||
@@ -94,9 +94,11 @@ int vmw_du_crtc_cursor_set(struct drm_crtc *crtc, struct drm_file *file_priv, | |||
94 | int vmw_du_crtc_cursor_move(struct drm_crtc *crtc, int x, int y); | 94 | int vmw_du_crtc_cursor_move(struct drm_crtc *crtc, int x, int y); |
95 | 95 | ||
96 | /* | 96 | /* |
97 | * Legacy display unit functions - vmwgfx_ldu.h | 97 | * Legacy display unit functions - vmwgfx_ldu.c |
98 | */ | 98 | */ |
99 | int vmw_kms_init_legacy_display_system(struct vmw_private *dev_priv); | 99 | int vmw_kms_init_legacy_display_system(struct vmw_private *dev_priv); |
100 | int vmw_kms_close_legacy_display_system(struct vmw_private *dev_priv); | 100 | int vmw_kms_close_legacy_display_system(struct vmw_private *dev_priv); |
101 | int vmw_kms_ldu_update_layout(struct vmw_private *dev_priv, unsigned num, | ||
102 | struct drm_vmw_rect *rects); | ||
101 | 103 | ||
102 | #endif | 104 | #endif |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c index 90891593bf6..cfaf690a5b2 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | |||
@@ -38,6 +38,7 @@ struct vmw_legacy_display { | |||
38 | struct list_head active; | 38 | struct list_head active; |
39 | 39 | ||
40 | unsigned num_active; | 40 | unsigned num_active; |
41 | unsigned last_num_active; | ||
41 | 42 | ||
42 | struct vmw_framebuffer *fb; | 43 | struct vmw_framebuffer *fb; |
43 | }; | 44 | }; |
@@ -48,9 +49,12 @@ struct vmw_legacy_display { | |||
48 | struct vmw_legacy_display_unit { | 49 | struct vmw_legacy_display_unit { |
49 | struct vmw_display_unit base; | 50 | struct vmw_display_unit base; |
50 | 51 | ||
51 | struct list_head active; | 52 | unsigned pref_width; |
53 | unsigned pref_height; | ||
54 | bool pref_active; | ||
55 | struct drm_display_mode *pref_mode; | ||
52 | 56 | ||
53 | unsigned unit; | 57 | struct list_head active; |
54 | }; | 58 | }; |
55 | 59 | ||
56 | static void vmw_ldu_destroy(struct vmw_legacy_display_unit *ldu) | 60 | static void vmw_ldu_destroy(struct vmw_legacy_display_unit *ldu) |
@@ -88,23 +92,44 @@ static int vmw_ldu_commit_list(struct vmw_private *dev_priv) | |||
88 | { | 92 | { |
89 | struct vmw_legacy_display *lds = dev_priv->ldu_priv; | 93 | struct vmw_legacy_display *lds = dev_priv->ldu_priv; |
90 | struct vmw_legacy_display_unit *entry; | 94 | struct vmw_legacy_display_unit *entry; |
91 | struct drm_crtc *crtc; | 95 | struct drm_framebuffer *fb = NULL; |
96 | struct drm_crtc *crtc = NULL; | ||
92 | int i = 0; | 97 | int i = 0; |
93 | 98 | ||
94 | /* to stop the screen from changing size on resize */ | 99 | /* If there is no display topology the host just assumes |
95 | vmw_write(dev_priv, SVGA_REG_NUM_GUEST_DISPLAYS, 0); | 100 | * that the guest will set the same layout as the host. |
96 | for (i = 0; i < lds->num_active; i++) { | 101 | */ |
97 | vmw_write(dev_priv, SVGA_REG_DISPLAY_ID, i); | 102 | if (!(dev_priv->capabilities & SVGA_CAP_DISPLAY_TOPOLOGY)) { |
98 | vmw_write(dev_priv, SVGA_REG_DISPLAY_IS_PRIMARY, !i); | 103 | int w = 0, h = 0; |
99 | vmw_write(dev_priv, SVGA_REG_DISPLAY_POSITION_X, 0); | 104 | list_for_each_entry(entry, &lds->active, active) { |
100 | vmw_write(dev_priv, SVGA_REG_DISPLAY_POSITION_Y, 0); | 105 | crtc = &entry->base.crtc; |
101 | vmw_write(dev_priv, SVGA_REG_DISPLAY_WIDTH, 0); | 106 | w = max(w, crtc->x + crtc->mode.hdisplay); |
102 | vmw_write(dev_priv, SVGA_REG_DISPLAY_HEIGHT, 0); | 107 | h = max(h, crtc->y + crtc->mode.vdisplay); |
103 | vmw_write(dev_priv, SVGA_REG_DISPLAY_ID, SVGA_ID_INVALID); | 108 | i++; |
109 | } | ||
110 | |||
111 | if (crtc == NULL) | ||
112 | return 0; | ||
113 | fb = entry->base.crtc.fb; | ||
114 | |||
115 | vmw_kms_write_svga(dev_priv, w, h, fb->pitch, | ||
116 | fb->bits_per_pixel, fb->depth); | ||
117 | |||
118 | return 0; | ||
104 | } | 119 | } |
105 | 120 | ||
106 | /* Now set the mode */ | 121 | if (!list_empty(&lds->active)) { |
107 | vmw_write(dev_priv, SVGA_REG_NUM_GUEST_DISPLAYS, lds->num_active); | 122 | entry = list_entry(lds->active.next, typeof(*entry), active); |
123 | fb = entry->base.crtc.fb; | ||
124 | |||
125 | vmw_kms_write_svga(dev_priv, fb->width, fb->height, fb->pitch, | ||
126 | fb->bits_per_pixel, fb->depth); | ||
127 | } | ||
128 | |||
129 | /* Make sure we always show something. */ | ||
130 | vmw_write(dev_priv, SVGA_REG_NUM_GUEST_DISPLAYS, | ||
131 | lds->num_active ? lds->num_active : 1); | ||
132 | |||
108 | i = 0; | 133 | i = 0; |
109 | list_for_each_entry(entry, &lds->active, active) { | 134 | list_for_each_entry(entry, &lds->active, active) { |
110 | crtc = &entry->base.crtc; | 135 | crtc = &entry->base.crtc; |
@@ -120,6 +145,10 @@ static int vmw_ldu_commit_list(struct vmw_private *dev_priv) | |||
120 | i++; | 145 | i++; |
121 | } | 146 | } |
122 | 147 | ||
148 | BUG_ON(i != lds->num_active); | ||
149 | |||
150 | lds->last_num_active = lds->num_active; | ||
151 | |||
123 | return 0; | 152 | return 0; |
124 | } | 153 | } |
125 | 154 | ||
@@ -130,6 +159,7 @@ static int vmw_ldu_del_active(struct vmw_private *vmw_priv, | |||
130 | if (list_empty(&ldu->active)) | 159 | if (list_empty(&ldu->active)) |
131 | return 0; | 160 | return 0; |
132 | 161 | ||
162 | /* Must init otherwise list_empty(&ldu->active) will not work. */ | ||
133 | list_del_init(&ldu->active); | 163 | list_del_init(&ldu->active); |
134 | if (--(ld->num_active) == 0) { | 164 | if (--(ld->num_active) == 0) { |
135 | BUG_ON(!ld->fb); | 165 | BUG_ON(!ld->fb); |
@@ -149,24 +179,29 @@ static int vmw_ldu_add_active(struct vmw_private *vmw_priv, | |||
149 | struct vmw_legacy_display_unit *entry; | 179 | struct vmw_legacy_display_unit *entry; |
150 | struct list_head *at; | 180 | struct list_head *at; |
151 | 181 | ||
182 | BUG_ON(!ld->num_active && ld->fb); | ||
183 | if (vfb != ld->fb) { | ||
184 | if (ld->fb && ld->fb->unpin) | ||
185 | ld->fb->unpin(ld->fb); | ||
186 | if (vfb->pin) | ||
187 | vfb->pin(vfb); | ||
188 | ld->fb = vfb; | ||
189 | } | ||
190 | |||
152 | if (!list_empty(&ldu->active)) | 191 | if (!list_empty(&ldu->active)) |
153 | return 0; | 192 | return 0; |
154 | 193 | ||
155 | at = &ld->active; | 194 | at = &ld->active; |
156 | list_for_each_entry(entry, &ld->active, active) { | 195 | list_for_each_entry(entry, &ld->active, active) { |
157 | if (entry->unit > ldu->unit) | 196 | if (entry->base.unit > ldu->base.unit) |
158 | break; | 197 | break; |
159 | 198 | ||
160 | at = &entry->active; | 199 | at = &entry->active; |
161 | } | 200 | } |
162 | 201 | ||
163 | list_add(&ldu->active, at); | 202 | list_add(&ldu->active, at); |
164 | if (ld->num_active++ == 0) { | 203 | |
165 | BUG_ON(ld->fb); | 204 | ld->num_active++; |
166 | if (vfb->pin) | ||
167 | vfb->pin(vfb); | ||
168 | ld->fb = vfb; | ||
169 | } | ||
170 | 205 | ||
171 | return 0; | 206 | return 0; |
172 | } | 207 | } |
@@ -208,6 +243,8 @@ static int vmw_ldu_crtc_set_config(struct drm_mode_set *set) | |||
208 | 243 | ||
209 | /* ldu only supports one fb active at the time */ | 244 | /* ldu only supports one fb active at the time */ |
210 | if (dev_priv->ldu_priv->fb && vfb && | 245 | if (dev_priv->ldu_priv->fb && vfb && |
246 | !(dev_priv->ldu_priv->num_active == 1 && | ||
247 | !list_empty(&ldu->active)) && | ||
211 | dev_priv->ldu_priv->fb != vfb) { | 248 | dev_priv->ldu_priv->fb != vfb) { |
212 | DRM_ERROR("Multiple framebuffers not supported\n"); | 249 | DRM_ERROR("Multiple framebuffers not supported\n"); |
213 | return -EINVAL; | 250 | return -EINVAL; |
@@ -300,8 +337,7 @@ static void vmw_ldu_connector_restore(struct drm_connector *connector) | |||
300 | static enum drm_connector_status | 337 | static enum drm_connector_status |
301 | vmw_ldu_connector_detect(struct drm_connector *connector) | 338 | vmw_ldu_connector_detect(struct drm_connector *connector) |
302 | { | 339 | { |
303 | /* XXX vmwctrl should control connection status */ | 340 | if (vmw_connector_to_ldu(connector)->pref_active) |
304 | if (vmw_connector_to_ldu(connector)->base.unit == 0) | ||
305 | return connector_status_connected; | 341 | return connector_status_connected; |
306 | return connector_status_disconnected; | 342 | return connector_status_disconnected; |
307 | } | 343 | } |
@@ -312,10 +348,9 @@ static struct drm_display_mode vmw_ldu_connector_builtin[] = { | |||
312 | 752, 800, 0, 480, 489, 492, 525, 0, | 348 | 752, 800, 0, 480, 489, 492, 525, 0, |
313 | DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, | 349 | DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC) }, |
314 | /* 800x600@60Hz */ | 350 | /* 800x600@60Hz */ |
315 | { DRM_MODE("800x600", | 351 | { DRM_MODE("800x600", DRM_MODE_TYPE_DRIVER, 40000, 800, 840, |
316 | DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED, | 352 | 968, 1056, 0, 600, 601, 605, 628, 0, |
317 | 40000, 800, 840, 968, 1056, 0, 600, 601, 605, 628, | 353 | DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, |
318 | 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, | ||
319 | /* 1024x768@60Hz */ | 354 | /* 1024x768@60Hz */ |
320 | { DRM_MODE("1024x768", DRM_MODE_TYPE_DRIVER, 65000, 1024, 1048, | 355 | { DRM_MODE("1024x768", DRM_MODE_TYPE_DRIVER, 65000, 1024, 1048, |
321 | 1184, 1344, 0, 768, 771, 777, 806, 0, | 356 | 1184, 1344, 0, 768, 771, 777, 806, 0, |
@@ -387,10 +422,34 @@ static struct drm_display_mode vmw_ldu_connector_builtin[] = { | |||
387 | static int vmw_ldu_connector_fill_modes(struct drm_connector *connector, | 422 | static int vmw_ldu_connector_fill_modes(struct drm_connector *connector, |
388 | uint32_t max_width, uint32_t max_height) | 423 | uint32_t max_width, uint32_t max_height) |
389 | { | 424 | { |
425 | struct vmw_legacy_display_unit *ldu = vmw_connector_to_ldu(connector); | ||
390 | struct drm_device *dev = connector->dev; | 426 | struct drm_device *dev = connector->dev; |
391 | struct drm_display_mode *mode = NULL; | 427 | struct drm_display_mode *mode = NULL; |
428 | struct drm_display_mode prefmode = { DRM_MODE("preferred", | ||
429 | DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED, | ||
430 | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | ||
431 | DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) | ||
432 | }; | ||
392 | int i; | 433 | int i; |
393 | 434 | ||
435 | /* Add preferred mode */ | ||
436 | { | ||
437 | mode = drm_mode_duplicate(dev, &prefmode); | ||
438 | if (!mode) | ||
439 | return 0; | ||
440 | mode->hdisplay = ldu->pref_width; | ||
441 | mode->vdisplay = ldu->pref_height; | ||
442 | mode->vrefresh = drm_mode_vrefresh(mode); | ||
443 | drm_mode_probed_add(connector, mode); | ||
444 | |||
445 | if (ldu->pref_mode) { | ||
446 | list_del_init(&ldu->pref_mode->head); | ||
447 | drm_mode_destroy(dev, ldu->pref_mode); | ||
448 | } | ||
449 | |||
450 | ldu->pref_mode = mode; | ||
451 | } | ||
452 | |||
394 | for (i = 0; vmw_ldu_connector_builtin[i].type != 0; i++) { | 453 | for (i = 0; vmw_ldu_connector_builtin[i].type != 0; i++) { |
395 | if (vmw_ldu_connector_builtin[i].hdisplay > max_width || | 454 | if (vmw_ldu_connector_builtin[i].hdisplay > max_width || |
396 | vmw_ldu_connector_builtin[i].vdisplay > max_height) | 455 | vmw_ldu_connector_builtin[i].vdisplay > max_height) |
@@ -443,18 +502,21 @@ static int vmw_ldu_init(struct vmw_private *dev_priv, unsigned unit) | |||
443 | if (!ldu) | 502 | if (!ldu) |
444 | return -ENOMEM; | 503 | return -ENOMEM; |
445 | 504 | ||
446 | ldu->unit = unit; | 505 | ldu->base.unit = unit; |
447 | crtc = &ldu->base.crtc; | 506 | crtc = &ldu->base.crtc; |
448 | encoder = &ldu->base.encoder; | 507 | encoder = &ldu->base.encoder; |
449 | connector = &ldu->base.connector; | 508 | connector = &ldu->base.connector; |
450 | 509 | ||
510 | INIT_LIST_HEAD(&ldu->active); | ||
511 | |||
512 | ldu->pref_active = (unit == 0); | ||
513 | ldu->pref_width = 800; | ||
514 | ldu->pref_height = 600; | ||
515 | ldu->pref_mode = NULL; | ||
516 | |||
451 | drm_connector_init(dev, connector, &vmw_legacy_connector_funcs, | 517 | drm_connector_init(dev, connector, &vmw_legacy_connector_funcs, |
452 | DRM_MODE_CONNECTOR_LVDS); | 518 | DRM_MODE_CONNECTOR_LVDS); |
453 | /* Initial status */ | 519 | connector->status = vmw_ldu_connector_detect(connector); |
454 | if (unit == 0) | ||
455 | connector->status = connector_status_connected; | ||
456 | else | ||
457 | connector->status = connector_status_disconnected; | ||
458 | 520 | ||
459 | drm_encoder_init(dev, encoder, &vmw_legacy_encoder_funcs, | 521 | drm_encoder_init(dev, encoder, &vmw_legacy_encoder_funcs, |
460 | DRM_MODE_ENCODER_LVDS); | 522 | DRM_MODE_ENCODER_LVDS); |
@@ -462,8 +524,6 @@ static int vmw_ldu_init(struct vmw_private *dev_priv, unsigned unit) | |||
462 | encoder->possible_crtcs = (1 << unit); | 524 | encoder->possible_crtcs = (1 << unit); |
463 | encoder->possible_clones = 0; | 525 | encoder->possible_clones = 0; |
464 | 526 | ||
465 | INIT_LIST_HEAD(&ldu->active); | ||
466 | |||
467 | drm_crtc_init(dev, crtc, &vmw_legacy_crtc_funcs); | 527 | drm_crtc_init(dev, crtc, &vmw_legacy_crtc_funcs); |
468 | 528 | ||
469 | drm_connector_attach_property(connector, | 529 | drm_connector_attach_property(connector, |
@@ -487,18 +547,22 @@ int vmw_kms_init_legacy_display_system(struct vmw_private *dev_priv) | |||
487 | 547 | ||
488 | INIT_LIST_HEAD(&dev_priv->ldu_priv->active); | 548 | INIT_LIST_HEAD(&dev_priv->ldu_priv->active); |
489 | dev_priv->ldu_priv->num_active = 0; | 549 | dev_priv->ldu_priv->num_active = 0; |
550 | dev_priv->ldu_priv->last_num_active = 0; | ||
490 | dev_priv->ldu_priv->fb = NULL; | 551 | dev_priv->ldu_priv->fb = NULL; |
491 | 552 | ||
492 | drm_mode_create_dirty_info_property(dev_priv->dev); | 553 | drm_mode_create_dirty_info_property(dev_priv->dev); |
493 | 554 | ||
494 | vmw_ldu_init(dev_priv, 0); | 555 | vmw_ldu_init(dev_priv, 0); |
495 | vmw_ldu_init(dev_priv, 1); | 556 | /* for old hardware without multimon only enable one display */ |
496 | vmw_ldu_init(dev_priv, 2); | 557 | if (dev_priv->capabilities & SVGA_CAP_MULTIMON) { |
497 | vmw_ldu_init(dev_priv, 3); | 558 | vmw_ldu_init(dev_priv, 1); |
498 | vmw_ldu_init(dev_priv, 4); | 559 | vmw_ldu_init(dev_priv, 2); |
499 | vmw_ldu_init(dev_priv, 5); | 560 | vmw_ldu_init(dev_priv, 3); |
500 | vmw_ldu_init(dev_priv, 6); | 561 | vmw_ldu_init(dev_priv, 4); |
501 | vmw_ldu_init(dev_priv, 7); | 562 | vmw_ldu_init(dev_priv, 5); |
563 | vmw_ldu_init(dev_priv, 6); | ||
564 | vmw_ldu_init(dev_priv, 7); | ||
565 | } | ||
502 | 566 | ||
503 | return 0; | 567 | return 0; |
504 | } | 568 | } |
@@ -514,3 +578,42 @@ int vmw_kms_close_legacy_display_system(struct vmw_private *dev_priv) | |||
514 | 578 | ||
515 | return 0; | 579 | return 0; |
516 | } | 580 | } |
581 | |||
582 | int vmw_kms_ldu_update_layout(struct vmw_private *dev_priv, unsigned num, | ||
583 | struct drm_vmw_rect *rects) | ||
584 | { | ||
585 | struct drm_device *dev = dev_priv->dev; | ||
586 | struct vmw_legacy_display_unit *ldu; | ||
587 | struct drm_connector *con; | ||
588 | int i; | ||
589 | |||
590 | mutex_lock(&dev->mode_config.mutex); | ||
591 | |||
592 | #if 0 | ||
593 | DRM_INFO("%s: new layout ", __func__); | ||
594 | for (i = 0; i < (int)num; i++) | ||
595 | DRM_INFO("(%i, %i %ux%u) ", rects[i].x, rects[i].y, | ||
596 | rects[i].w, rects[i].h); | ||
597 | DRM_INFO("\n"); | ||
598 | #else | ||
599 | (void)i; | ||
600 | #endif | ||
601 | |||
602 | list_for_each_entry(con, &dev->mode_config.connector_list, head) { | ||
603 | ldu = vmw_connector_to_ldu(con); | ||
604 | if (num > ldu->base.unit) { | ||
605 | ldu->pref_width = rects[ldu->base.unit].w; | ||
606 | ldu->pref_height = rects[ldu->base.unit].h; | ||
607 | ldu->pref_active = true; | ||
608 | } else { | ||
609 | ldu->pref_width = 800; | ||
610 | ldu->pref_height = 600; | ||
611 | ldu->pref_active = false; | ||
612 | } | ||
613 | con->status = vmw_ldu_connector_detect(con); | ||
614 | } | ||
615 | |||
616 | mutex_unlock(&dev->mode_config.mutex); | ||
617 | |||
618 | return 0; | ||
619 | } | ||
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c b/drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c index ad566c85b07..df2036ed18d 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | |||
@@ -358,6 +358,8 @@ static int vmw_overlay_update_stream(struct vmw_private *dev_priv, | |||
358 | if (stream->buf != buf) | 358 | if (stream->buf != buf) |
359 | stream->buf = vmw_dmabuf_reference(buf); | 359 | stream->buf = vmw_dmabuf_reference(buf); |
360 | stream->saved = *arg; | 360 | stream->saved = *arg; |
361 | /* stream is no longer stopped/paused */ | ||
362 | stream->paused = false; | ||
361 | 363 | ||
362 | return 0; | 364 | return 0; |
363 | } | 365 | } |
diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c index 441e38c95a8..b87569e96b1 100644 --- a/drivers/gpu/vga/vgaarb.c +++ b/drivers/gpu/vga/vgaarb.c | |||
@@ -1,12 +1,32 @@ | |||
1 | /* | 1 | /* |
2 | * vgaarb.c | 2 | * vgaarb.c: Implements the VGA arbitration. For details refer to |
3 | * Documentation/vgaarbiter.txt | ||
4 | * | ||
3 | * | 5 | * |
4 | * (C) Copyright 2005 Benjamin Herrenschmidt <benh@kernel.crashing.org> | 6 | * (C) Copyright 2005 Benjamin Herrenschmidt <benh@kernel.crashing.org> |
5 | * (C) Copyright 2007 Paulo R. Zanoni <przanoni@gmail.com> | 7 | * (C) Copyright 2007 Paulo R. Zanoni <przanoni@gmail.com> |
6 | * (C) Copyright 2007, 2009 Tiago Vignatti <vignatti@freedesktop.org> | 8 | * (C) Copyright 2007, 2009 Tiago Vignatti <vignatti@freedesktop.org> |
7 | * | 9 | * |
8 | * Implements the VGA arbitration. For details refer to | 10 | * Permission is hereby granted, free of charge, to any person obtaining a |
9 | * Documentation/vgaarbiter.txt | 11 | * copy of this software and associated documentation files (the "Software"), |
12 | * to deal in the Software without restriction, including without limitation | ||
13 | * the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
14 | * and/or sell copies of the Software, and to permit persons to whom the | ||
15 | * Software is furnished to do so, subject to the following conditions: | ||
16 | * | ||
17 | * The above copyright notice and this permission notice (including the next | ||
18 | * paragraph) shall be included in all copies or substantial portions of the | ||
19 | * Software. | ||
20 | * | ||
21 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
22 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
23 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | ||
24 | * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
25 | * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
26 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | ||
27 | * DEALINGS | ||
28 | * IN THE SOFTWARE. | ||
29 | * | ||
10 | */ | 30 | */ |
11 | 31 | ||
12 | #include <linux/module.h> | 32 | #include <linux/module.h> |
@@ -155,8 +175,8 @@ static struct vga_device *__vga_tryget(struct vga_device *vgadev, | |||
155 | (vgadev->decodes & VGA_RSRC_LEGACY_MEM)) | 175 | (vgadev->decodes & VGA_RSRC_LEGACY_MEM)) |
156 | rsrc |= VGA_RSRC_LEGACY_MEM; | 176 | rsrc |= VGA_RSRC_LEGACY_MEM; |
157 | 177 | ||
158 | pr_devel("%s: %d\n", __func__, rsrc); | 178 | pr_debug("%s: %d\n", __func__, rsrc); |
159 | pr_devel("%s: owns: %d\n", __func__, vgadev->owns); | 179 | pr_debug("%s: owns: %d\n", __func__, vgadev->owns); |
160 | 180 | ||
161 | /* Check what resources we need to acquire */ | 181 | /* Check what resources we need to acquire */ |
162 | wants = rsrc & ~vgadev->owns; | 182 | wants = rsrc & ~vgadev->owns; |
@@ -268,7 +288,7 @@ static void __vga_put(struct vga_device *vgadev, unsigned int rsrc) | |||
268 | { | 288 | { |
269 | unsigned int old_locks = vgadev->locks; | 289 | unsigned int old_locks = vgadev->locks; |
270 | 290 | ||
271 | pr_devel("%s\n", __func__); | 291 | pr_debug("%s\n", __func__); |
272 | 292 | ||
273 | /* Update our counters, and account for equivalent legacy resources | 293 | /* Update our counters, and account for equivalent legacy resources |
274 | * if we decode them | 294 | * if we decode them |
@@ -575,6 +595,7 @@ static inline void vga_update_device_decodes(struct vga_device *vgadev, | |||
575 | else | 595 | else |
576 | vga_decode_count--; | 596 | vga_decode_count--; |
577 | } | 597 | } |
598 | pr_debug("vgaarb: decoding count now is: %d\n", vga_decode_count); | ||
578 | } | 599 | } |
579 | 600 | ||
580 | void __vga_set_legacy_decoding(struct pci_dev *pdev, unsigned int decodes, bool userspace) | 601 | void __vga_set_legacy_decoding(struct pci_dev *pdev, unsigned int decodes, bool userspace) |
@@ -831,7 +852,7 @@ static ssize_t vga_arb_write(struct file *file, const char __user * buf, | |||
831 | curr_pos += 5; | 852 | curr_pos += 5; |
832 | remaining -= 5; | 853 | remaining -= 5; |
833 | 854 | ||
834 | pr_devel("client 0x%p called 'lock'\n", priv); | 855 | pr_debug("client 0x%p called 'lock'\n", priv); |
835 | 856 | ||
836 | if (!vga_str_to_iostate(curr_pos, remaining, &io_state)) { | 857 | if (!vga_str_to_iostate(curr_pos, remaining, &io_state)) { |
837 | ret_val = -EPROTO; | 858 | ret_val = -EPROTO; |
@@ -867,7 +888,7 @@ static ssize_t vga_arb_write(struct file *file, const char __user * buf, | |||
867 | curr_pos += 7; | 888 | curr_pos += 7; |
868 | remaining -= 7; | 889 | remaining -= 7; |
869 | 890 | ||
870 | pr_devel("client 0x%p called 'unlock'\n", priv); | 891 | pr_debug("client 0x%p called 'unlock'\n", priv); |
871 | 892 | ||
872 | if (strncmp(curr_pos, "all", 3) == 0) | 893 | if (strncmp(curr_pos, "all", 3) == 0) |
873 | io_state = VGA_RSRC_LEGACY_IO | VGA_RSRC_LEGACY_MEM; | 894 | io_state = VGA_RSRC_LEGACY_IO | VGA_RSRC_LEGACY_MEM; |
@@ -917,7 +938,7 @@ static ssize_t vga_arb_write(struct file *file, const char __user * buf, | |||
917 | curr_pos += 8; | 938 | curr_pos += 8; |
918 | remaining -= 8; | 939 | remaining -= 8; |
919 | 940 | ||
920 | pr_devel("client 0x%p called 'trylock'\n", priv); | 941 | pr_debug("client 0x%p called 'trylock'\n", priv); |
921 | 942 | ||
922 | if (!vga_str_to_iostate(curr_pos, remaining, &io_state)) { | 943 | if (!vga_str_to_iostate(curr_pos, remaining, &io_state)) { |
923 | ret_val = -EPROTO; | 944 | ret_val = -EPROTO; |
@@ -961,7 +982,7 @@ static ssize_t vga_arb_write(struct file *file, const char __user * buf, | |||
961 | 982 | ||
962 | curr_pos += 7; | 983 | curr_pos += 7; |
963 | remaining -= 7; | 984 | remaining -= 7; |
964 | pr_devel("client 0x%p called 'target'\n", priv); | 985 | pr_debug("client 0x%p called 'target'\n", priv); |
965 | /* if target is default */ | 986 | /* if target is default */ |
966 | if (!strncmp(curr_pos, "default", 7)) | 987 | if (!strncmp(curr_pos, "default", 7)) |
967 | pdev = pci_dev_get(vga_default_device()); | 988 | pdev = pci_dev_get(vga_default_device()); |
@@ -971,11 +992,11 @@ static ssize_t vga_arb_write(struct file *file, const char __user * buf, | |||
971 | ret_val = -EPROTO; | 992 | ret_val = -EPROTO; |
972 | goto done; | 993 | goto done; |
973 | } | 994 | } |
974 | pr_devel("vgaarb: %s ==> %x:%x:%x.%x\n", curr_pos, | 995 | pr_debug("vgaarb: %s ==> %x:%x:%x.%x\n", curr_pos, |
975 | domain, bus, PCI_SLOT(devfn), PCI_FUNC(devfn)); | 996 | domain, bus, PCI_SLOT(devfn), PCI_FUNC(devfn)); |
976 | 997 | ||
977 | pbus = pci_find_bus(domain, bus); | 998 | pbus = pci_find_bus(domain, bus); |
978 | pr_devel("vgaarb: pbus %p\n", pbus); | 999 | pr_debug("vgaarb: pbus %p\n", pbus); |
979 | if (pbus == NULL) { | 1000 | if (pbus == NULL) { |
980 | pr_err("vgaarb: invalid PCI domain and/or bus address %x:%x\n", | 1001 | pr_err("vgaarb: invalid PCI domain and/or bus address %x:%x\n", |
981 | domain, bus); | 1002 | domain, bus); |
@@ -983,7 +1004,7 @@ static ssize_t vga_arb_write(struct file *file, const char __user * buf, | |||
983 | goto done; | 1004 | goto done; |
984 | } | 1005 | } |
985 | pdev = pci_get_slot(pbus, devfn); | 1006 | pdev = pci_get_slot(pbus, devfn); |
986 | pr_devel("vgaarb: pdev %p\n", pdev); | 1007 | pr_debug("vgaarb: pdev %p\n", pdev); |
987 | if (!pdev) { | 1008 | if (!pdev) { |
988 | pr_err("vgaarb: invalid PCI address %x:%x\n", | 1009 | pr_err("vgaarb: invalid PCI address %x:%x\n", |
989 | bus, devfn); | 1010 | bus, devfn); |
@@ -993,7 +1014,7 @@ static ssize_t vga_arb_write(struct file *file, const char __user * buf, | |||
993 | } | 1014 | } |
994 | 1015 | ||
995 | vgadev = vgadev_find(pdev); | 1016 | vgadev = vgadev_find(pdev); |
996 | pr_devel("vgaarb: vgadev %p\n", vgadev); | 1017 | pr_debug("vgaarb: vgadev %p\n", vgadev); |
997 | if (vgadev == NULL) { | 1018 | if (vgadev == NULL) { |
998 | pr_err("vgaarb: this pci device is not a vga device\n"); | 1019 | pr_err("vgaarb: this pci device is not a vga device\n"); |
999 | pci_dev_put(pdev); | 1020 | pci_dev_put(pdev); |
@@ -1029,7 +1050,7 @@ static ssize_t vga_arb_write(struct file *file, const char __user * buf, | |||
1029 | } else if (strncmp(curr_pos, "decodes ", 8) == 0) { | 1050 | } else if (strncmp(curr_pos, "decodes ", 8) == 0) { |
1030 | curr_pos += 8; | 1051 | curr_pos += 8; |
1031 | remaining -= 8; | 1052 | remaining -= 8; |
1032 | pr_devel("vgaarb: client 0x%p called 'decodes'\n", priv); | 1053 | pr_debug("vgaarb: client 0x%p called 'decodes'\n", priv); |
1033 | 1054 | ||
1034 | if (!vga_str_to_iostate(curr_pos, remaining, &io_state)) { | 1055 | if (!vga_str_to_iostate(curr_pos, remaining, &io_state)) { |
1035 | ret_val = -EPROTO; | 1056 | ret_val = -EPROTO; |
@@ -1058,7 +1079,7 @@ static unsigned int vga_arb_fpoll(struct file *file, poll_table * wait) | |||
1058 | { | 1079 | { |
1059 | struct vga_arb_private *priv = file->private_data; | 1080 | struct vga_arb_private *priv = file->private_data; |
1060 | 1081 | ||
1061 | pr_devel("%s\n", __func__); | 1082 | pr_debug("%s\n", __func__); |
1062 | 1083 | ||
1063 | if (priv == NULL) | 1084 | if (priv == NULL) |
1064 | return -ENODEV; | 1085 | return -ENODEV; |
@@ -1071,7 +1092,7 @@ static int vga_arb_open(struct inode *inode, struct file *file) | |||
1071 | struct vga_arb_private *priv; | 1092 | struct vga_arb_private *priv; |
1072 | unsigned long flags; | 1093 | unsigned long flags; |
1073 | 1094 | ||
1074 | pr_devel("%s\n", __func__); | 1095 | pr_debug("%s\n", __func__); |
1075 | 1096 | ||
1076 | priv = kmalloc(sizeof(struct vga_arb_private), GFP_KERNEL); | 1097 | priv = kmalloc(sizeof(struct vga_arb_private), GFP_KERNEL); |
1077 | if (priv == NULL) | 1098 | if (priv == NULL) |
@@ -1101,7 +1122,7 @@ static int vga_arb_release(struct inode *inode, struct file *file) | |||
1101 | unsigned long flags; | 1122 | unsigned long flags; |
1102 | int i; | 1123 | int i; |
1103 | 1124 | ||
1104 | pr_devel("%s\n", __func__); | 1125 | pr_debug("%s\n", __func__); |
1105 | 1126 | ||
1106 | if (priv == NULL) | 1127 | if (priv == NULL) |
1107 | return -ENODEV; | 1128 | return -ENODEV; |
@@ -1112,7 +1133,7 @@ static int vga_arb_release(struct inode *inode, struct file *file) | |||
1112 | uc = &priv->cards[i]; | 1133 | uc = &priv->cards[i]; |
1113 | if (uc->pdev == NULL) | 1134 | if (uc->pdev == NULL) |
1114 | continue; | 1135 | continue; |
1115 | pr_devel("uc->io_cnt == %d, uc->mem_cnt == %d\n", | 1136 | pr_debug("uc->io_cnt == %d, uc->mem_cnt == %d\n", |
1116 | uc->io_cnt, uc->mem_cnt); | 1137 | uc->io_cnt, uc->mem_cnt); |
1117 | while (uc->io_cnt--) | 1138 | while (uc->io_cnt--) |
1118 | vga_put(uc->pdev, VGA_RSRC_LEGACY_IO); | 1139 | vga_put(uc->pdev, VGA_RSRC_LEGACY_IO); |
@@ -1165,7 +1186,7 @@ static int pci_notify(struct notifier_block *nb, unsigned long action, | |||
1165 | struct pci_dev *pdev = to_pci_dev(dev); | 1186 | struct pci_dev *pdev = to_pci_dev(dev); |
1166 | bool notify = false; | 1187 | bool notify = false; |
1167 | 1188 | ||
1168 | pr_devel("%s\n", __func__); | 1189 | pr_debug("%s\n", __func__); |
1169 | 1190 | ||
1170 | /* For now we're only intereted in devices added and removed. I didn't | 1191 | /* For now we're only intereted in devices added and removed. I didn't |
1171 | * test this thing here, so someone needs to double check for the | 1192 | * test this thing here, so someone needs to double check for the |
diff --git a/drivers/hwmon/adt7411.c b/drivers/hwmon/adt7411.c index 4086c7257f9..f13c843a296 100644 --- a/drivers/hwmon/adt7411.c +++ b/drivers/hwmon/adt7411.c | |||
@@ -316,7 +316,6 @@ static int __devinit adt7411_probe(struct i2c_client *client, | |||
316 | exit_remove: | 316 | exit_remove: |
317 | sysfs_remove_group(&client->dev.kobj, &adt7411_attr_grp); | 317 | sysfs_remove_group(&client->dev.kobj, &adt7411_attr_grp); |
318 | exit_free: | 318 | exit_free: |
319 | i2c_set_clientdata(client, NULL); | ||
320 | kfree(data); | 319 | kfree(data); |
321 | return ret; | 320 | return ret; |
322 | } | 321 | } |
@@ -327,7 +326,6 @@ static int __devexit adt7411_remove(struct i2c_client *client) | |||
327 | 326 | ||
328 | hwmon_device_unregister(data->hwmon_dev); | 327 | hwmon_device_unregister(data->hwmon_dev); |
329 | sysfs_remove_group(&client->dev.kobj, &adt7411_attr_grp); | 328 | sysfs_remove_group(&client->dev.kobj, &adt7411_attr_grp); |
330 | i2c_set_clientdata(client, NULL); | ||
331 | kfree(data); | 329 | kfree(data); |
332 | return 0; | 330 | return 0; |
333 | } | 331 | } |
diff --git a/drivers/hwmon/asc7621.c b/drivers/hwmon/asc7621.c index 0f388adc618..3b973f30b1f 100644 --- a/drivers/hwmon/asc7621.c +++ b/drivers/hwmon/asc7621.c | |||
@@ -1141,7 +1141,6 @@ exit_remove: | |||
1141 | &(asc7621_params[i].sda.dev_attr)); | 1141 | &(asc7621_params[i].sda.dev_attr)); |
1142 | } | 1142 | } |
1143 | 1143 | ||
1144 | i2c_set_clientdata(client, NULL); | ||
1145 | kfree(data); | 1144 | kfree(data); |
1146 | return err; | 1145 | return err; |
1147 | } | 1146 | } |
@@ -1196,7 +1195,6 @@ static int asc7621_remove(struct i2c_client *client) | |||
1196 | &(asc7621_params[i].sda.dev_attr)); | 1195 | &(asc7621_params[i].sda.dev_attr)); |
1197 | } | 1196 | } |
1198 | 1197 | ||
1199 | i2c_set_clientdata(client, NULL); | ||
1200 | kfree(data); | 1198 | kfree(data); |
1201 | return 0; | 1199 | return 0; |
1202 | } | 1200 | } |
diff --git a/drivers/hwmon/f75375s.c b/drivers/hwmon/f75375s.c index bad2cf3ef4a..0f58ecc5334 100644 --- a/drivers/hwmon/f75375s.c +++ b/drivers/hwmon/f75375s.c | |||
@@ -662,7 +662,6 @@ exit_remove: | |||
662 | sysfs_remove_group(&client->dev.kobj, &f75375_group); | 662 | sysfs_remove_group(&client->dev.kobj, &f75375_group); |
663 | exit_free: | 663 | exit_free: |
664 | kfree(data); | 664 | kfree(data); |
665 | i2c_set_clientdata(client, NULL); | ||
666 | return err; | 665 | return err; |
667 | } | 666 | } |
668 | 667 | ||
@@ -672,7 +671,6 @@ static int f75375_remove(struct i2c_client *client) | |||
672 | hwmon_device_unregister(data->hwmon_dev); | 671 | hwmon_device_unregister(data->hwmon_dev); |
673 | sysfs_remove_group(&client->dev.kobj, &f75375_group); | 672 | sysfs_remove_group(&client->dev.kobj, &f75375_group); |
674 | kfree(data); | 673 | kfree(data); |
675 | i2c_set_clientdata(client, NULL); | ||
676 | return 0; | 674 | return 0; |
677 | } | 675 | } |
678 | 676 | ||
diff --git a/drivers/hwmon/g760a.c b/drivers/hwmon/g760a.c index 09ea12e0a55..1f63d1a3af5 100644 --- a/drivers/hwmon/g760a.c +++ b/drivers/hwmon/g760a.c | |||
@@ -236,7 +236,6 @@ error_hwmon_device_register: | |||
236 | sysfs_remove_group(&client->dev.kobj, &g760a_group); | 236 | sysfs_remove_group(&client->dev.kobj, &g760a_group); |
237 | error_sysfs_create_group: | 237 | error_sysfs_create_group: |
238 | kfree(data); | 238 | kfree(data); |
239 | i2c_set_clientdata(client, NULL); | ||
240 | 239 | ||
241 | return err; | 240 | return err; |
242 | } | 241 | } |
@@ -247,7 +246,6 @@ static int g760a_remove(struct i2c_client *client) | |||
247 | hwmon_device_unregister(data->hwmon_dev); | 246 | hwmon_device_unregister(data->hwmon_dev); |
248 | sysfs_remove_group(&client->dev.kobj, &g760a_group); | 247 | sysfs_remove_group(&client->dev.kobj, &g760a_group); |
249 | kfree(data); | 248 | kfree(data); |
250 | i2c_set_clientdata(client, NULL); | ||
251 | 249 | ||
252 | return 0; | 250 | return 0; |
253 | } | 251 | } |
diff --git a/drivers/hwmon/lm73.c b/drivers/hwmon/lm73.c index 4d1b76bc814..29b9030d42c 100644 --- a/drivers/hwmon/lm73.c +++ b/drivers/hwmon/lm73.c | |||
@@ -136,7 +136,6 @@ static int lm73_remove(struct i2c_client *client) | |||
136 | 136 | ||
137 | hwmon_device_unregister(hwmon_dev); | 137 | hwmon_device_unregister(hwmon_dev); |
138 | sysfs_remove_group(&client->dev.kobj, &lm73_group); | 138 | sysfs_remove_group(&client->dev.kobj, &lm73_group); |
139 | i2c_set_clientdata(client, NULL); | ||
140 | return 0; | 139 | return 0; |
141 | } | 140 | } |
142 | 141 | ||
diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c index 56463428a41..393f354f92a 100644 --- a/drivers/hwmon/lm75.c +++ b/drivers/hwmon/lm75.c | |||
@@ -192,7 +192,6 @@ lm75_probe(struct i2c_client *client, const struct i2c_device_id *id) | |||
192 | exit_remove: | 192 | exit_remove: |
193 | sysfs_remove_group(&client->dev.kobj, &lm75_group); | 193 | sysfs_remove_group(&client->dev.kobj, &lm75_group); |
194 | exit_free: | 194 | exit_free: |
195 | i2c_set_clientdata(client, NULL); | ||
196 | kfree(data); | 195 | kfree(data); |
197 | return status; | 196 | return status; |
198 | } | 197 | } |
@@ -204,7 +203,6 @@ static int lm75_remove(struct i2c_client *client) | |||
204 | hwmon_device_unregister(data->hwmon_dev); | 203 | hwmon_device_unregister(data->hwmon_dev); |
205 | sysfs_remove_group(&client->dev.kobj, &lm75_group); | 204 | sysfs_remove_group(&client->dev.kobj, &lm75_group); |
206 | lm75_write_value(client, LM75_REG_CONF, data->orig_conf); | 205 | lm75_write_value(client, LM75_REG_CONF, data->orig_conf); |
207 | i2c_set_clientdata(client, NULL); | ||
208 | kfree(data); | 206 | kfree(data); |
209 | return 0; | 207 | return 0; |
210 | } | 208 | } |
diff --git a/drivers/hwmon/lm95241.c b/drivers/hwmon/lm95241.c index 8fc8eb8cba4..94741d42112 100644 --- a/drivers/hwmon/lm95241.c +++ b/drivers/hwmon/lm95241.c | |||
@@ -399,7 +399,6 @@ static int lm95241_remove(struct i2c_client *client) | |||
399 | hwmon_device_unregister(data->hwmon_dev); | 399 | hwmon_device_unregister(data->hwmon_dev); |
400 | sysfs_remove_group(&client->dev.kobj, &lm95241_group); | 400 | sysfs_remove_group(&client->dev.kobj, &lm95241_group); |
401 | 401 | ||
402 | i2c_set_clientdata(client, NULL); | ||
403 | kfree(data); | 402 | kfree(data); |
404 | return 0; | 403 | return 0; |
405 | } | 404 | } |
diff --git a/drivers/hwmon/tmp102.c b/drivers/hwmon/tmp102.c index 8013895a1fa..93187c3cb5e 100644 --- a/drivers/hwmon/tmp102.c +++ b/drivers/hwmon/tmp102.c | |||
@@ -224,7 +224,6 @@ fail_remove_sysfs: | |||
224 | fail_restore_config: | 224 | fail_restore_config: |
225 | tmp102_write_reg(client, TMP102_CONF_REG, tmp102->config_orig); | 225 | tmp102_write_reg(client, TMP102_CONF_REG, tmp102->config_orig); |
226 | fail_free: | 226 | fail_free: |
227 | i2c_set_clientdata(client, NULL); | ||
228 | kfree(tmp102); | 227 | kfree(tmp102); |
229 | 228 | ||
230 | return status; | 229 | return status; |
@@ -247,7 +246,6 @@ static int __devexit tmp102_remove(struct i2c_client *client) | |||
247 | config | TMP102_CONF_SD); | 246 | config | TMP102_CONF_SD); |
248 | } | 247 | } |
249 | 248 | ||
250 | i2c_set_clientdata(client, NULL); | ||
251 | kfree(tmp102); | 249 | kfree(tmp102); |
252 | 250 | ||
253 | return 0; | 251 | return 0; |
diff --git a/drivers/hwmon/tmp421.c b/drivers/hwmon/tmp421.c index 738c472ece2..6b4165c1209 100644 --- a/drivers/hwmon/tmp421.c +++ b/drivers/hwmon/tmp421.c | |||
@@ -295,7 +295,6 @@ exit_remove: | |||
295 | sysfs_remove_group(&client->dev.kobj, &tmp421_group); | 295 | sysfs_remove_group(&client->dev.kobj, &tmp421_group); |
296 | 296 | ||
297 | exit_free: | 297 | exit_free: |
298 | i2c_set_clientdata(client, NULL); | ||
299 | kfree(data); | 298 | kfree(data); |
300 | 299 | ||
301 | return err; | 300 | return err; |
@@ -308,7 +307,6 @@ static int tmp421_remove(struct i2c_client *client) | |||
308 | hwmon_device_unregister(data->hwmon_dev); | 307 | hwmon_device_unregister(data->hwmon_dev); |
309 | sysfs_remove_group(&client->dev.kobj, &tmp421_group); | 308 | sysfs_remove_group(&client->dev.kobj, &tmp421_group); |
310 | 309 | ||
311 | i2c_set_clientdata(client, NULL); | ||
312 | kfree(data); | 310 | kfree(data); |
313 | 311 | ||
314 | return 0; | 312 | return 0; |
diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c index 32d4adee73d..c84b9b4e696 100644 --- a/drivers/hwmon/w83781d.c +++ b/drivers/hwmon/w83781d.c | |||
@@ -1197,7 +1197,6 @@ ERROR4: | |||
1197 | if (data->lm75[1]) | 1197 | if (data->lm75[1]) |
1198 | i2c_unregister_device(data->lm75[1]); | 1198 | i2c_unregister_device(data->lm75[1]); |
1199 | ERROR3: | 1199 | ERROR3: |
1200 | i2c_set_clientdata(client, NULL); | ||
1201 | kfree(data); | 1200 | kfree(data); |
1202 | ERROR1: | 1201 | ERROR1: |
1203 | return err; | 1202 | return err; |
@@ -1219,7 +1218,6 @@ w83781d_remove(struct i2c_client *client) | |||
1219 | if (data->lm75[1]) | 1218 | if (data->lm75[1]) |
1220 | i2c_unregister_device(data->lm75[1]); | 1219 | i2c_unregister_device(data->lm75[1]); |
1221 | 1220 | ||
1222 | i2c_set_clientdata(client, NULL); | ||
1223 | kfree(data); | 1221 | kfree(data); |
1224 | 1222 | ||
1225 | return 0; | 1223 | return 0; |
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index 87ab0568bb0..bceafbfa726 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig | |||
@@ -475,6 +475,26 @@ config I2C_PASEMI | |||
475 | help | 475 | help |
476 | Supports the PA Semi PWRficient on-chip SMBus interfaces. | 476 | Supports the PA Semi PWRficient on-chip SMBus interfaces. |
477 | 477 | ||
478 | config I2C_PCA_PLATFORM | ||
479 | tristate "PCA9564/PCA9665 as platform device" | ||
480 | select I2C_ALGOPCA | ||
481 | default n | ||
482 | help | ||
483 | This driver supports a memory mapped Philips PCA9564/PCA9665 | ||
484 | parallel bus to I2C bus controller. | ||
485 | |||
486 | This driver can also be built as a module. If so, the module | ||
487 | will be called i2c-pca-platform. | ||
488 | |||
489 | config I2C_PMCMSP | ||
490 | tristate "PMC MSP I2C TWI Controller" | ||
491 | depends on PMC_MSP | ||
492 | help | ||
493 | This driver supports the PMC TWI controller on MSP devices. | ||
494 | |||
495 | This driver can also be built as module. If so, the module | ||
496 | will be called i2c-pmcmsp. | ||
497 | |||
478 | config I2C_PNX | 498 | config I2C_PNX |
479 | tristate "I2C bus support for Philips PNX targets" | 499 | tristate "I2C bus support for Philips PNX targets" |
480 | depends on ARCH_PNX4008 | 500 | depends on ARCH_PNX4008 |
@@ -711,26 +731,6 @@ config I2C_PCA_ISA | |||
711 | delays when I2C/SMBus chip drivers are loaded (e.g. at boot | 731 | delays when I2C/SMBus chip drivers are loaded (e.g. at boot |
712 | time). If unsure, say N. | 732 | time). If unsure, say N. |
713 | 733 | ||
714 | config I2C_PCA_PLATFORM | ||
715 | tristate "PCA9564/PCA9665 as platform device" | ||
716 | select I2C_ALGOPCA | ||
717 | default n | ||
718 | help | ||
719 | This driver supports a memory mapped Philips PCA9564/PCA9665 | ||
720 | parallel bus to I2C bus controller. | ||
721 | |||
722 | This driver can also be built as a module. If so, the module | ||
723 | will be called i2c-pca-platform. | ||
724 | |||
725 | config I2C_PMCMSP | ||
726 | tristate "PMC MSP I2C TWI Controller" | ||
727 | depends on PMC_MSP | ||
728 | help | ||
729 | This driver supports the PMC TWI controller on MSP devices. | ||
730 | |||
731 | This driver can also be built as module. If so, the module | ||
732 | will be called i2c-pmcmsp. | ||
733 | |||
734 | config I2C_SIBYTE | 734 | config I2C_SIBYTE |
735 | tristate "SiByte SMBus interface" | 735 | tristate "SiByte SMBus interface" |
736 | depends on SIBYTE_SB1xxx_SOC | 736 | depends on SIBYTE_SB1xxx_SOC |
diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile index 097236f631e..936880bd1dc 100644 --- a/drivers/i2c/busses/Makefile +++ b/drivers/i2c/busses/Makefile | |||
@@ -27,7 +27,7 @@ obj-$(CONFIG_I2C_VIAPRO) += i2c-viapro.o | |||
27 | obj-$(CONFIG_I2C_HYDRA) += i2c-hydra.o | 27 | obj-$(CONFIG_I2C_HYDRA) += i2c-hydra.o |
28 | obj-$(CONFIG_I2C_POWERMAC) += i2c-powermac.o | 28 | obj-$(CONFIG_I2C_POWERMAC) += i2c-powermac.o |
29 | 29 | ||
30 | # Embebbed system I2C/SMBus host controller drivers | 30 | # Embedded system I2C/SMBus host controller drivers |
31 | obj-$(CONFIG_I2C_AT91) += i2c-at91.o | 31 | obj-$(CONFIG_I2C_AT91) += i2c-at91.o |
32 | obj-$(CONFIG_I2C_AU1550) += i2c-au1550.o | 32 | obj-$(CONFIG_I2C_AU1550) += i2c-au1550.o |
33 | obj-$(CONFIG_I2C_BLACKFIN_TWI) += i2c-bfin-twi.o | 33 | obj-$(CONFIG_I2C_BLACKFIN_TWI) += i2c-bfin-twi.o |
@@ -46,6 +46,8 @@ obj-$(CONFIG_I2C_NOMADIK) += i2c-nomadik.o | |||
46 | obj-$(CONFIG_I2C_OCORES) += i2c-ocores.o | 46 | obj-$(CONFIG_I2C_OCORES) += i2c-ocores.o |
47 | obj-$(CONFIG_I2C_OMAP) += i2c-omap.o | 47 | obj-$(CONFIG_I2C_OMAP) += i2c-omap.o |
48 | obj-$(CONFIG_I2C_PASEMI) += i2c-pasemi.o | 48 | obj-$(CONFIG_I2C_PASEMI) += i2c-pasemi.o |
49 | obj-$(CONFIG_I2C_PCA_PLATFORM) += i2c-pca-platform.o | ||
50 | obj-$(CONFIG_I2C_PMCMSP) += i2c-pmcmsp.o | ||
49 | obj-$(CONFIG_I2C_PNX) += i2c-pnx.o | 51 | obj-$(CONFIG_I2C_PNX) += i2c-pnx.o |
50 | obj-$(CONFIG_I2C_PXA) += i2c-pxa.o | 52 | obj-$(CONFIG_I2C_PXA) += i2c-pxa.o |
51 | obj-$(CONFIG_I2C_S3C2410) += i2c-s3c2410.o | 53 | obj-$(CONFIG_I2C_S3C2410) += i2c-s3c2410.o |
@@ -68,8 +70,6 @@ obj-$(CONFIG_I2C_TINY_USB) += i2c-tiny-usb.o | |||
68 | obj-$(CONFIG_I2C_ACORN) += i2c-acorn.o | 70 | obj-$(CONFIG_I2C_ACORN) += i2c-acorn.o |
69 | obj-$(CONFIG_I2C_ELEKTOR) += i2c-elektor.o | 71 | obj-$(CONFIG_I2C_ELEKTOR) += i2c-elektor.o |
70 | obj-$(CONFIG_I2C_PCA_ISA) += i2c-pca-isa.o | 72 | obj-$(CONFIG_I2C_PCA_ISA) += i2c-pca-isa.o |
71 | obj-$(CONFIG_I2C_PCA_PLATFORM) += i2c-pca-platform.o | ||
72 | obj-$(CONFIG_I2C_PMCMSP) += i2c-pmcmsp.o | ||
73 | obj-$(CONFIG_I2C_SIBYTE) += i2c-sibyte.o | 73 | obj-$(CONFIG_I2C_SIBYTE) += i2c-sibyte.o |
74 | obj-$(CONFIG_I2C_STUB) += i2c-stub.o | 74 | obj-$(CONFIG_I2C_STUB) += i2c-stub.o |
75 | obj-$(CONFIG_SCx200_ACB) += scx200_acb.o | 75 | obj-$(CONFIG_SCx200_ACB) += scx200_acb.o |
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index e0f833cca3f..1cca2631e5b 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c | |||
@@ -47,7 +47,6 @@ static DEFINE_MUTEX(core_lock); | |||
47 | static DEFINE_IDR(i2c_adapter_idr); | 47 | static DEFINE_IDR(i2c_adapter_idr); |
48 | 48 | ||
49 | static struct device_type i2c_client_type; | 49 | static struct device_type i2c_client_type; |
50 | static int i2c_check_addr(struct i2c_adapter *adapter, int addr); | ||
51 | static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver); | 50 | static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver); |
52 | 51 | ||
53 | /* ------------------------------------------------------------------------- */ | 52 | /* ------------------------------------------------------------------------- */ |
@@ -371,6 +370,59 @@ struct i2c_client *i2c_verify_client(struct device *dev) | |||
371 | EXPORT_SYMBOL(i2c_verify_client); | 370 | EXPORT_SYMBOL(i2c_verify_client); |
372 | 371 | ||
373 | 372 | ||
373 | /* This is a permissive address validity check, I2C address map constraints | ||
374 | * are purposedly not enforced, except for the general call address. */ | ||
375 | static int i2c_check_client_addr_validity(const struct i2c_client *client) | ||
376 | { | ||
377 | if (client->flags & I2C_CLIENT_TEN) { | ||
378 | /* 10-bit address, all values are valid */ | ||
379 | if (client->addr > 0x3ff) | ||
380 | return -EINVAL; | ||
381 | } else { | ||
382 | /* 7-bit address, reject the general call address */ | ||
383 | if (client->addr == 0x00 || client->addr > 0x7f) | ||
384 | return -EINVAL; | ||
385 | } | ||
386 | return 0; | ||
387 | } | ||
388 | |||
389 | /* And this is a strict address validity check, used when probing. If a | ||
390 | * device uses a reserved address, then it shouldn't be probed. 7-bit | ||
391 | * addressing is assumed, 10-bit address devices are rare and should be | ||
392 | * explicitly enumerated. */ | ||
393 | static int i2c_check_addr_validity(unsigned short addr) | ||
394 | { | ||
395 | /* | ||
396 | * Reserved addresses per I2C specification: | ||
397 | * 0x00 General call address / START byte | ||
398 | * 0x01 CBUS address | ||
399 | * 0x02 Reserved for different bus format | ||
400 | * 0x03 Reserved for future purposes | ||
401 | * 0x04-0x07 Hs-mode master code | ||
402 | * 0x78-0x7b 10-bit slave addressing | ||
403 | * 0x7c-0x7f Reserved for future purposes | ||
404 | */ | ||
405 | if (addr < 0x08 || addr > 0x77) | ||
406 | return -EINVAL; | ||
407 | return 0; | ||
408 | } | ||
409 | |||
410 | static int __i2c_check_addr_busy(struct device *dev, void *addrp) | ||
411 | { | ||
412 | struct i2c_client *client = i2c_verify_client(dev); | ||
413 | int addr = *(int *)addrp; | ||
414 | |||
415 | if (client && client->addr == addr) | ||
416 | return -EBUSY; | ||
417 | return 0; | ||
418 | } | ||
419 | |||
420 | static int i2c_check_addr_busy(struct i2c_adapter *adapter, int addr) | ||
421 | { | ||
422 | return device_for_each_child(&adapter->dev, &addr, | ||
423 | __i2c_check_addr_busy); | ||
424 | } | ||
425 | |||
374 | /** | 426 | /** |
375 | * i2c_new_device - instantiate an i2c device | 427 | * i2c_new_device - instantiate an i2c device |
376 | * @adap: the adapter managing the device | 428 | * @adap: the adapter managing the device |
@@ -410,8 +462,16 @@ i2c_new_device(struct i2c_adapter *adap, struct i2c_board_info const *info) | |||
410 | 462 | ||
411 | strlcpy(client->name, info->type, sizeof(client->name)); | 463 | strlcpy(client->name, info->type, sizeof(client->name)); |
412 | 464 | ||
465 | /* Check for address validity */ | ||
466 | status = i2c_check_client_addr_validity(client); | ||
467 | if (status) { | ||
468 | dev_err(&adap->dev, "Invalid %d-bit I2C address 0x%02hx\n", | ||
469 | client->flags & I2C_CLIENT_TEN ? 10 : 7, client->addr); | ||
470 | goto out_err_silent; | ||
471 | } | ||
472 | |||
413 | /* Check for address business */ | 473 | /* Check for address business */ |
414 | status = i2c_check_addr(adap, client->addr); | 474 | status = i2c_check_addr_busy(adap, client->addr); |
415 | if (status) | 475 | if (status) |
416 | goto out_err; | 476 | goto out_err; |
417 | 477 | ||
@@ -436,6 +496,7 @@ i2c_new_device(struct i2c_adapter *adap, struct i2c_board_info const *info) | |||
436 | out_err: | 496 | out_err: |
437 | dev_err(&adap->dev, "Failed to register i2c client %s at 0x%02x " | 497 | dev_err(&adap->dev, "Failed to register i2c client %s at 0x%02x " |
438 | "(%d)\n", client->name, client->addr, status); | 498 | "(%d)\n", client->name, client->addr, status); |
499 | out_err_silent: | ||
439 | kfree(client); | 500 | kfree(client); |
440 | return NULL; | 501 | return NULL; |
441 | } | 502 | } |
@@ -561,15 +622,9 @@ i2c_sysfs_new_device(struct device *dev, struct device_attribute *attr, | |||
561 | return -EINVAL; | 622 | return -EINVAL; |
562 | } | 623 | } |
563 | 624 | ||
564 | if (info.addr < 0x03 || info.addr > 0x77) { | ||
565 | dev_err(dev, "%s: Invalid I2C address 0x%hx\n", "new_device", | ||
566 | info.addr); | ||
567 | return -EINVAL; | ||
568 | } | ||
569 | |||
570 | client = i2c_new_device(adap, &info); | 625 | client = i2c_new_device(adap, &info); |
571 | if (!client) | 626 | if (!client) |
572 | return -EEXIST; | 627 | return -EINVAL; |
573 | 628 | ||
574 | /* Keep track of the added device */ | 629 | /* Keep track of the added device */ |
575 | i2c_lock_adapter(adap); | 630 | i2c_lock_adapter(adap); |
@@ -1024,21 +1079,6 @@ EXPORT_SYMBOL(i2c_del_driver); | |||
1024 | 1079 | ||
1025 | /* ------------------------------------------------------------------------- */ | 1080 | /* ------------------------------------------------------------------------- */ |
1026 | 1081 | ||
1027 | static int __i2c_check_addr(struct device *dev, void *addrp) | ||
1028 | { | ||
1029 | struct i2c_client *client = i2c_verify_client(dev); | ||
1030 | int addr = *(int *)addrp; | ||
1031 | |||
1032 | if (client && client->addr == addr) | ||
1033 | return -EBUSY; | ||
1034 | return 0; | ||
1035 | } | ||
1036 | |||
1037 | static int i2c_check_addr(struct i2c_adapter *adapter, int addr) | ||
1038 | { | ||
1039 | return device_for_each_child(&adapter->dev, &addr, __i2c_check_addr); | ||
1040 | } | ||
1041 | |||
1042 | /** | 1082 | /** |
1043 | * i2c_use_client - increments the reference count of the i2c client structure | 1083 | * i2c_use_client - increments the reference count of the i2c client structure |
1044 | * @client: the client being referenced | 1084 | * @client: the client being referenced |
@@ -1277,6 +1317,41 @@ EXPORT_SYMBOL(i2c_master_recv); | |||
1277 | * ---------------------------------------------------- | 1317 | * ---------------------------------------------------- |
1278 | */ | 1318 | */ |
1279 | 1319 | ||
1320 | /* | ||
1321 | * Legacy default probe function, mostly relevant for SMBus. The default | ||
1322 | * probe method is a quick write, but it is known to corrupt the 24RF08 | ||
1323 | * EEPROMs due to a state machine bug, and could also irreversibly | ||
1324 | * write-protect some EEPROMs, so for address ranges 0x30-0x37 and 0x50-0x5f, | ||
1325 | * we use a short byte read instead. Also, some bus drivers don't implement | ||
1326 | * quick write, so we fallback to a byte read in that case too. | ||
1327 | * On x86, there is another special case for FSC hardware monitoring chips, | ||
1328 | * which want regular byte reads (address 0x73.) Fortunately, these are the | ||
1329 | * only known chips using this I2C address on PC hardware. | ||
1330 | * Returns 1 if probe succeeded, 0 if not. | ||
1331 | */ | ||
1332 | static int i2c_default_probe(struct i2c_adapter *adap, unsigned short addr) | ||
1333 | { | ||
1334 | int err; | ||
1335 | union i2c_smbus_data dummy; | ||
1336 | |||
1337 | #ifdef CONFIG_X86 | ||
1338 | if (addr == 0x73 && (adap->class & I2C_CLASS_HWMON) | ||
1339 | && i2c_check_functionality(adap, I2C_FUNC_SMBUS_READ_BYTE_DATA)) | ||
1340 | err = i2c_smbus_xfer(adap, addr, 0, I2C_SMBUS_READ, 0, | ||
1341 | I2C_SMBUS_BYTE_DATA, &dummy); | ||
1342 | else | ||
1343 | #endif | ||
1344 | if ((addr & ~0x07) == 0x30 || (addr & ~0x0f) == 0x50 | ||
1345 | || !i2c_check_functionality(adap, I2C_FUNC_SMBUS_QUICK)) | ||
1346 | err = i2c_smbus_xfer(adap, addr, 0, I2C_SMBUS_READ, 0, | ||
1347 | I2C_SMBUS_BYTE, &dummy); | ||
1348 | else | ||
1349 | err = i2c_smbus_xfer(adap, addr, 0, I2C_SMBUS_WRITE, 0, | ||
1350 | I2C_SMBUS_QUICK, NULL); | ||
1351 | |||
1352 | return err >= 0; | ||
1353 | } | ||
1354 | |||
1280 | static int i2c_detect_address(struct i2c_client *temp_client, | 1355 | static int i2c_detect_address(struct i2c_client *temp_client, |
1281 | struct i2c_driver *driver) | 1356 | struct i2c_driver *driver) |
1282 | { | 1357 | { |
@@ -1286,34 +1361,20 @@ static int i2c_detect_address(struct i2c_client *temp_client, | |||
1286 | int err; | 1361 | int err; |
1287 | 1362 | ||
1288 | /* Make sure the address is valid */ | 1363 | /* Make sure the address is valid */ |
1289 | if (addr < 0x03 || addr > 0x77) { | 1364 | err = i2c_check_addr_validity(addr); |
1365 | if (err) { | ||
1290 | dev_warn(&adapter->dev, "Invalid probe address 0x%02x\n", | 1366 | dev_warn(&adapter->dev, "Invalid probe address 0x%02x\n", |
1291 | addr); | 1367 | addr); |
1292 | return -EINVAL; | 1368 | return err; |
1293 | } | 1369 | } |
1294 | 1370 | ||
1295 | /* Skip if already in use */ | 1371 | /* Skip if already in use */ |
1296 | if (i2c_check_addr(adapter, addr)) | 1372 | if (i2c_check_addr_busy(adapter, addr)) |
1297 | return 0; | 1373 | return 0; |
1298 | 1374 | ||
1299 | /* Make sure there is something at this address */ | 1375 | /* Make sure there is something at this address */ |
1300 | if (addr == 0x73 && (adapter->class & I2C_CLASS_HWMON)) { | 1376 | if (!i2c_default_probe(adapter, addr)) |
1301 | /* Special probe for FSC hwmon chips */ | 1377 | return 0; |
1302 | union i2c_smbus_data dummy; | ||
1303 | |||
1304 | if (i2c_smbus_xfer(adapter, addr, 0, I2C_SMBUS_READ, 0, | ||
1305 | I2C_SMBUS_BYTE_DATA, &dummy) < 0) | ||
1306 | return 0; | ||
1307 | } else { | ||
1308 | if (i2c_smbus_xfer(adapter, addr, 0, I2C_SMBUS_WRITE, 0, | ||
1309 | I2C_SMBUS_QUICK, NULL) < 0) | ||
1310 | return 0; | ||
1311 | |||
1312 | /* Prevent 24RF08 corruption */ | ||
1313 | if ((addr & ~0x0f) == 0x50) | ||
1314 | i2c_smbus_xfer(adapter, addr, 0, I2C_SMBUS_WRITE, 0, | ||
1315 | I2C_SMBUS_QUICK, NULL); | ||
1316 | } | ||
1317 | 1378 | ||
1318 | /* Finally call the custom detection function */ | 1379 | /* Finally call the custom detection function */ |
1319 | memset(&info, 0, sizeof(struct i2c_board_info)); | 1380 | memset(&info, 0, sizeof(struct i2c_board_info)); |
@@ -1407,42 +1468,22 @@ i2c_new_probed_device(struct i2c_adapter *adap, | |||
1407 | 1468 | ||
1408 | for (i = 0; addr_list[i] != I2C_CLIENT_END; i++) { | 1469 | for (i = 0; addr_list[i] != I2C_CLIENT_END; i++) { |
1409 | /* Check address validity */ | 1470 | /* Check address validity */ |
1410 | if (addr_list[i] < 0x03 || addr_list[i] > 0x77) { | 1471 | if (i2c_check_addr_validity(addr_list[i]) < 0) { |
1411 | dev_warn(&adap->dev, "Invalid 7-bit address " | 1472 | dev_warn(&adap->dev, "Invalid 7-bit address " |
1412 | "0x%02x\n", addr_list[i]); | 1473 | "0x%02x\n", addr_list[i]); |
1413 | continue; | 1474 | continue; |
1414 | } | 1475 | } |
1415 | 1476 | ||
1416 | /* Check address availability */ | 1477 | /* Check address availability */ |
1417 | if (i2c_check_addr(adap, addr_list[i])) { | 1478 | if (i2c_check_addr_busy(adap, addr_list[i])) { |
1418 | dev_dbg(&adap->dev, "Address 0x%02x already in " | 1479 | dev_dbg(&adap->dev, "Address 0x%02x already in " |
1419 | "use, not probing\n", addr_list[i]); | 1480 | "use, not probing\n", addr_list[i]); |
1420 | continue; | 1481 | continue; |
1421 | } | 1482 | } |
1422 | 1483 | ||
1423 | /* Test address responsiveness | 1484 | /* Test address responsiveness */ |
1424 | The default probe method is a quick write, but it is known | 1485 | if (i2c_default_probe(adap, addr_list[i])) |
1425 | to corrupt the 24RF08 EEPROMs due to a state machine bug, | 1486 | break; |
1426 | and could also irreversibly write-protect some EEPROMs, so | ||
1427 | for address ranges 0x30-0x37 and 0x50-0x5f, we use a byte | ||
1428 | read instead. Also, some bus drivers don't implement | ||
1429 | quick write, so we fallback to a byte read it that case | ||
1430 | too. */ | ||
1431 | if ((addr_list[i] & ~0x07) == 0x30 | ||
1432 | || (addr_list[i] & ~0x0f) == 0x50 | ||
1433 | || !i2c_check_functionality(adap, I2C_FUNC_SMBUS_QUICK)) { | ||
1434 | union i2c_smbus_data data; | ||
1435 | |||
1436 | if (i2c_smbus_xfer(adap, addr_list[i], 0, | ||
1437 | I2C_SMBUS_READ, 0, | ||
1438 | I2C_SMBUS_BYTE, &data) >= 0) | ||
1439 | break; | ||
1440 | } else { | ||
1441 | if (i2c_smbus_xfer(adap, addr_list[i], 0, | ||
1442 | I2C_SMBUS_WRITE, 0, | ||
1443 | I2C_SMBUS_QUICK, NULL) >= 0) | ||
1444 | break; | ||
1445 | } | ||
1446 | } | 1487 | } |
1447 | 1488 | ||
1448 | if (addr_list[i] == I2C_CLIENT_END) { | 1489 | if (addr_list[i] == I2C_CLIENT_END) { |
diff --git a/drivers/i2c/i2c-smbus.c b/drivers/i2c/i2c-smbus.c index a24e0bfe920..f61ccc1e5ea 100644 --- a/drivers/i2c/i2c-smbus.c +++ b/drivers/i2c/i2c-smbus.c | |||
@@ -173,7 +173,6 @@ static int smbalert_remove(struct i2c_client *ara) | |||
173 | 173 | ||
174 | cancel_work_sync(&alert->alert); | 174 | cancel_work_sync(&alert->alert); |
175 | 175 | ||
176 | i2c_set_clientdata(ara, NULL); | ||
177 | kfree(alert); | 176 | kfree(alert); |
178 | return 0; | 177 | return 0; |
179 | } | 178 | } |
diff --git a/drivers/ide/pmac.c b/drivers/ide/pmac.c index 183fa38760d..ebcf8e470a9 100644 --- a/drivers/ide/pmac.c +++ b/drivers/ide/pmac.c | |||
@@ -1400,8 +1400,11 @@ static struct of_device_id pmac_ide_macio_match[] = | |||
1400 | 1400 | ||
1401 | static struct macio_driver pmac_ide_macio_driver = | 1401 | static struct macio_driver pmac_ide_macio_driver = |
1402 | { | 1402 | { |
1403 | .name = "ide-pmac", | 1403 | .driver = { |
1404 | .match_table = pmac_ide_macio_match, | 1404 | .name = "ide-pmac", |
1405 | .owner = THIS_MODULE, | ||
1406 | .of_match_table = pmac_ide_macio_match, | ||
1407 | }, | ||
1405 | .probe = pmac_ide_macio_attach, | 1408 | .probe = pmac_ide_macio_attach, |
1406 | .suspend = pmac_ide_macio_suspend, | 1409 | .suspend = pmac_ide_macio_suspend, |
1407 | .resume = pmac_ide_macio_resume, | 1410 | .resume = pmac_ide_macio_resume, |
diff --git a/drivers/input/keyboard/adp5588-keys.c b/drivers/input/keyboard/adp5588-keys.c index 4771ab172b5..744600eff22 100644 --- a/drivers/input/keyboard/adp5588-keys.c +++ b/drivers/input/keyboard/adp5588-keys.c | |||
@@ -287,7 +287,6 @@ static int __devexit adp5588_remove(struct i2c_client *client) | |||
287 | free_irq(client->irq, kpad); | 287 | free_irq(client->irq, kpad); |
288 | cancel_delayed_work_sync(&kpad->work); | 288 | cancel_delayed_work_sync(&kpad->work); |
289 | input_unregister_device(kpad->input); | 289 | input_unregister_device(kpad->input); |
290 | i2c_set_clientdata(client, NULL); | ||
291 | kfree(kpad); | 290 | kfree(kpad); |
292 | 291 | ||
293 | return 0; | 292 | return 0; |
diff --git a/drivers/input/keyboard/lm8323.c b/drivers/input/keyboard/lm8323.c index bc696931fed..40b032f0e32 100644 --- a/drivers/input/keyboard/lm8323.c +++ b/drivers/input/keyboard/lm8323.c | |||
@@ -778,8 +778,6 @@ static int __devexit lm8323_remove(struct i2c_client *client) | |||
778 | struct lm8323_chip *lm = i2c_get_clientdata(client); | 778 | struct lm8323_chip *lm = i2c_get_clientdata(client); |
779 | int i; | 779 | int i; |
780 | 780 | ||
781 | i2c_set_clientdata(client, NULL); | ||
782 | |||
783 | disable_irq_wake(client->irq); | 781 | disable_irq_wake(client->irq); |
784 | free_irq(client->irq, lm); | 782 | free_irq(client->irq, lm); |
785 | cancel_work_sync(&lm->work); | 783 | cancel_work_sync(&lm->work); |
diff --git a/drivers/input/keyboard/max7359_keypad.c b/drivers/input/keyboard/max7359_keypad.c index 7fc8185e5c1..9091ff5ea80 100644 --- a/drivers/input/keyboard/max7359_keypad.c +++ b/drivers/input/keyboard/max7359_keypad.c | |||
@@ -265,7 +265,6 @@ static int __devexit max7359_remove(struct i2c_client *client) | |||
265 | 265 | ||
266 | free_irq(client->irq, keypad); | 266 | free_irq(client->irq, keypad); |
267 | input_unregister_device(keypad->input_dev); | 267 | input_unregister_device(keypad->input_dev); |
268 | i2c_set_clientdata(client, NULL); | ||
269 | kfree(keypad); | 268 | kfree(keypad); |
270 | 269 | ||
271 | return 0; | 270 | return 0; |
diff --git a/drivers/input/keyboard/qt2160.c b/drivers/input/keyboard/qt2160.c index 31f30087b59..fac695157e8 100644 --- a/drivers/input/keyboard/qt2160.c +++ b/drivers/input/keyboard/qt2160.c | |||
@@ -358,7 +358,6 @@ static int __devexit qt2160_remove(struct i2c_client *client) | |||
358 | input_unregister_device(qt2160->input); | 358 | input_unregister_device(qt2160->input); |
359 | kfree(qt2160); | 359 | kfree(qt2160); |
360 | 360 | ||
361 | i2c_set_clientdata(client, NULL); | ||
362 | return 0; | 361 | return 0; |
363 | } | 362 | } |
364 | 363 | ||
diff --git a/drivers/input/keyboard/tca6416-keypad.c b/drivers/input/keyboard/tca6416-keypad.c index 493c93f25e2..00137bebcf9 100644 --- a/drivers/input/keyboard/tca6416-keypad.c +++ b/drivers/input/keyboard/tca6416-keypad.c | |||
@@ -316,8 +316,6 @@ static int __devexit tca6416_keypad_remove(struct i2c_client *client) | |||
316 | input_unregister_device(chip->input); | 316 | input_unregister_device(chip->input); |
317 | kfree(chip); | 317 | kfree(chip); |
318 | 318 | ||
319 | i2c_set_clientdata(client, NULL); | ||
320 | |||
321 | return 0; | 319 | return 0; |
322 | } | 320 | } |
323 | 321 | ||
diff --git a/drivers/input/misc/ad714x-i2c.c b/drivers/input/misc/ad714x-i2c.c index e9adbe49f6a..2bef8fa56c9 100644 --- a/drivers/input/misc/ad714x-i2c.c +++ b/drivers/input/misc/ad714x-i2c.c | |||
@@ -97,7 +97,6 @@ static int __devexit ad714x_i2c_remove(struct i2c_client *client) | |||
97 | struct ad714x_chip *chip = i2c_get_clientdata(client); | 97 | struct ad714x_chip *chip = i2c_get_clientdata(client); |
98 | 98 | ||
99 | ad714x_remove(chip); | 99 | ad714x_remove(chip); |
100 | i2c_set_clientdata(client, NULL); | ||
101 | 100 | ||
102 | return 0; | 101 | return 0; |
103 | } | 102 | } |
diff --git a/drivers/input/misc/pcf8574_keypad.c b/drivers/input/misc/pcf8574_keypad.c index 5c3ac4e0b05..0ac47d2898e 100644 --- a/drivers/input/misc/pcf8574_keypad.c +++ b/drivers/input/misc/pcf8574_keypad.c | |||
@@ -168,8 +168,6 @@ static int __devexit pcf8574_kp_remove(struct i2c_client *client) | |||
168 | input_unregister_device(lp->idev); | 168 | input_unregister_device(lp->idev); |
169 | kfree(lp); | 169 | kfree(lp); |
170 | 170 | ||
171 | i2c_set_clientdata(client, NULL); | ||
172 | |||
173 | return 0; | 171 | return 0; |
174 | } | 172 | } |
175 | 173 | ||
diff --git a/drivers/input/mouse/synaptics_i2c.c b/drivers/input/mouse/synaptics_i2c.c index 8291e7399ff..0ae62f0bcb3 100644 --- a/drivers/input/mouse/synaptics_i2c.c +++ b/drivers/input/mouse/synaptics_i2c.c | |||
@@ -613,7 +613,6 @@ static int __devexit synaptics_i2c_remove(struct i2c_client *client) | |||
613 | free_irq(client->irq, touch); | 613 | free_irq(client->irq, touch); |
614 | 614 | ||
615 | input_unregister_device(touch->input); | 615 | input_unregister_device(touch->input); |
616 | i2c_set_clientdata(client, NULL); | ||
617 | kfree(touch); | 616 | kfree(touch); |
618 | 617 | ||
619 | return 0; | 618 | return 0; |
diff --git a/drivers/input/touchscreen/ad7879.c b/drivers/input/touchscreen/ad7879.c index 794d070c690..4b32fb4704c 100644 --- a/drivers/input/touchscreen/ad7879.c +++ b/drivers/input/touchscreen/ad7879.c | |||
@@ -812,10 +812,8 @@ static int __devinit ad7879_probe(struct i2c_client *client, | |||
812 | ts->bus = client; | 812 | ts->bus = client; |
813 | 813 | ||
814 | error = ad7879_construct(client, ts); | 814 | error = ad7879_construct(client, ts); |
815 | if (error) { | 815 | if (error) |
816 | i2c_set_clientdata(client, NULL); | ||
817 | kfree(ts); | 816 | kfree(ts); |
818 | } | ||
819 | 817 | ||
820 | return error; | 818 | return error; |
821 | } | 819 | } |
@@ -825,7 +823,6 @@ static int __devexit ad7879_remove(struct i2c_client *client) | |||
825 | struct ad7879 *ts = dev_get_drvdata(&client->dev); | 823 | struct ad7879 *ts = dev_get_drvdata(&client->dev); |
826 | 824 | ||
827 | ad7879_destroy(client, ts); | 825 | ad7879_destroy(client, ts); |
828 | i2c_set_clientdata(client, NULL); | ||
829 | kfree(ts); | 826 | kfree(ts); |
830 | 827 | ||
831 | return 0; | 828 | return 0; |
diff --git a/drivers/input/touchscreen/eeti_ts.c b/drivers/input/touchscreen/eeti_ts.c index 75f8b73010f..7a3a916f84a 100644 --- a/drivers/input/touchscreen/eeti_ts.c +++ b/drivers/input/touchscreen/eeti_ts.c | |||
@@ -238,7 +238,6 @@ err2: | |||
238 | input = NULL; /* so we dont try to free it below */ | 238 | input = NULL; /* so we dont try to free it below */ |
239 | err1: | 239 | err1: |
240 | input_free_device(input); | 240 | input_free_device(input); |
241 | i2c_set_clientdata(client, NULL); | ||
242 | kfree(priv); | 241 | kfree(priv); |
243 | err0: | 242 | err0: |
244 | return err; | 243 | return err; |
@@ -256,7 +255,6 @@ static int __devexit eeti_ts_remove(struct i2c_client *client) | |||
256 | enable_irq(priv->irq); | 255 | enable_irq(priv->irq); |
257 | 256 | ||
258 | input_unregister_device(priv->input); | 257 | input_unregister_device(priv->input); |
259 | i2c_set_clientdata(client, NULL); | ||
260 | kfree(priv); | 258 | kfree(priv); |
261 | 259 | ||
262 | return 0; | 260 | return 0; |
diff --git a/drivers/input/touchscreen/mcs5000_ts.c b/drivers/input/touchscreen/mcs5000_ts.c index ce8ab0269f6..1fb0c2f06a4 100644 --- a/drivers/input/touchscreen/mcs5000_ts.c +++ b/drivers/input/touchscreen/mcs5000_ts.c | |||
@@ -256,7 +256,6 @@ static int __devexit mcs5000_ts_remove(struct i2c_client *client) | |||
256 | free_irq(client->irq, data); | 256 | free_irq(client->irq, data); |
257 | input_unregister_device(data->input_dev); | 257 | input_unregister_device(data->input_dev); |
258 | kfree(data); | 258 | kfree(data); |
259 | i2c_set_clientdata(client, NULL); | ||
260 | 259 | ||
261 | return 0; | 260 | return 0; |
262 | } | 261 | } |
diff --git a/drivers/input/touchscreen/tsc2007.c b/drivers/input/touchscreen/tsc2007.c index 769b479fcaa..be23780e8a3 100644 --- a/drivers/input/touchscreen/tsc2007.c +++ b/drivers/input/touchscreen/tsc2007.c | |||
@@ -347,8 +347,6 @@ static int __devexit tsc2007_remove(struct i2c_client *client) | |||
347 | struct tsc2007 *ts = i2c_get_clientdata(client); | 347 | struct tsc2007 *ts = i2c_get_clientdata(client); |
348 | struct tsc2007_platform_data *pdata = client->dev.platform_data; | 348 | struct tsc2007_platform_data *pdata = client->dev.platform_data; |
349 | 349 | ||
350 | i2c_set_clientdata(client, NULL); | ||
351 | |||
352 | tsc2007_free_irq(ts); | 350 | tsc2007_free_irq(ts); |
353 | 351 | ||
354 | if (pdata->exit_platform_hw) | 352 | if (pdata->exit_platform_hw) |
diff --git a/drivers/isdn/hardware/mISDN/hfcsusb.c b/drivers/isdn/hardware/mISDN/hfcsusb.c index b3b7e2879ba..8700474747e 100644 --- a/drivers/isdn/hardware/mISDN/hfcsusb.c +++ b/drivers/isdn/hardware/mISDN/hfcsusb.c | |||
@@ -97,8 +97,10 @@ static int write_reg(struct hfcsusb *hw, __u8 reg, __u8 val) | |||
97 | hw->name, __func__, reg, val); | 97 | hw->name, __func__, reg, val); |
98 | 98 | ||
99 | spin_lock(&hw->ctrl_lock); | 99 | spin_lock(&hw->ctrl_lock); |
100 | if (hw->ctrl_cnt >= HFC_CTRL_BUFSIZE) | 100 | if (hw->ctrl_cnt >= HFC_CTRL_BUFSIZE) { |
101 | spin_unlock(&hw->ctrl_lock); | ||
101 | return 1; | 102 | return 1; |
103 | } | ||
102 | buf = &hw->ctrl_buff[hw->ctrl_in_idx]; | 104 | buf = &hw->ctrl_buff[hw->ctrl_in_idx]; |
103 | buf->hfcs_reg = reg; | 105 | buf->hfcs_reg = reg; |
104 | buf->reg_val = val; | 106 | buf->reg_val = val; |
diff --git a/drivers/isdn/hardware/mISDN/netjet.c b/drivers/isdn/hardware/mISDN/netjet.c index 0a3553df065..54ae71a907f 100644 --- a/drivers/isdn/hardware/mISDN/netjet.c +++ b/drivers/isdn/hardware/mISDN/netjet.c | |||
@@ -320,12 +320,12 @@ inittiger(struct tiger_hw *card) | |||
320 | return -ENOMEM; | 320 | return -ENOMEM; |
321 | } | 321 | } |
322 | for (i = 0; i < 2; i++) { | 322 | for (i = 0; i < 2; i++) { |
323 | card->bc[i].hsbuf = kmalloc(NJ_DMA_TXSIZE, GFP_KERNEL); | 323 | card->bc[i].hsbuf = kmalloc(NJ_DMA_TXSIZE, GFP_ATOMIC); |
324 | if (!card->bc[i].hsbuf) { | 324 | if (!card->bc[i].hsbuf) { |
325 | pr_info("%s: no B%d send buffer\n", card->name, i + 1); | 325 | pr_info("%s: no B%d send buffer\n", card->name, i + 1); |
326 | return -ENOMEM; | 326 | return -ENOMEM; |
327 | } | 327 | } |
328 | card->bc[i].hrbuf = kmalloc(NJ_DMA_RXSIZE, GFP_KERNEL); | 328 | card->bc[i].hrbuf = kmalloc(NJ_DMA_RXSIZE, GFP_ATOMIC); |
329 | if (!card->bc[i].hrbuf) { | 329 | if (!card->bc[i].hrbuf) { |
330 | pr_info("%s: no B%d recv buffer\n", card->name, i + 1); | 330 | pr_info("%s: no B%d recv buffer\n", card->name, i + 1); |
331 | return -ENOMEM; | 331 | return -ENOMEM; |
diff --git a/drivers/leds/leds-bd2802.c b/drivers/leds/leds-bd2802.c index 286b501a357..5dcdf9d69b3 100644 --- a/drivers/leds/leds-bd2802.c +++ b/drivers/leds/leds-bd2802.c | |||
@@ -742,7 +742,6 @@ failed_unregister_dev_file: | |||
742 | for (i--; i >= 0; i--) | 742 | for (i--; i >= 0; i--) |
743 | device_remove_file(&led->client->dev, bd2802_attributes[i]); | 743 | device_remove_file(&led->client->dev, bd2802_attributes[i]); |
744 | failed_free: | 744 | failed_free: |
745 | i2c_set_clientdata(client, NULL); | ||
746 | kfree(led); | 745 | kfree(led); |
747 | 746 | ||
748 | return ret; | 747 | return ret; |
@@ -759,7 +758,6 @@ static int __exit bd2802_remove(struct i2c_client *client) | |||
759 | bd2802_disable_adv_conf(led); | 758 | bd2802_disable_adv_conf(led); |
760 | for (i = 0; i < ARRAY_SIZE(bd2802_attributes); i++) | 759 | for (i = 0; i < ARRAY_SIZE(bd2802_attributes); i++) |
761 | device_remove_file(&led->client->dev, bd2802_attributes[i]); | 760 | device_remove_file(&led->client->dev, bd2802_attributes[i]); |
762 | i2c_set_clientdata(client, NULL); | ||
763 | kfree(led); | 761 | kfree(led); |
764 | 762 | ||
765 | return 0; | 763 | return 0; |
diff --git a/drivers/leds/leds-lp3944.c b/drivers/leds/leds-lp3944.c index 932a58da76c..9010c054615 100644 --- a/drivers/leds/leds-lp3944.c +++ b/drivers/leds/leds-lp3944.c | |||
@@ -432,7 +432,6 @@ static int __devexit lp3944_remove(struct i2c_client *client) | |||
432 | } | 432 | } |
433 | 433 | ||
434 | kfree(data); | 434 | kfree(data); |
435 | i2c_set_clientdata(client, NULL); | ||
436 | 435 | ||
437 | return 0; | 436 | return 0; |
438 | } | 437 | } |
diff --git a/drivers/leds/leds-pca9532.c b/drivers/leds/leds-pca9532.c index 6682175fa9f..43d08756d82 100644 --- a/drivers/leds/leds-pca9532.c +++ b/drivers/leds/leds-pca9532.c | |||
@@ -320,10 +320,8 @@ static int pca9532_probe(struct i2c_client *client, | |||
320 | mutex_init(&data->update_lock); | 320 | mutex_init(&data->update_lock); |
321 | 321 | ||
322 | err = pca9532_configure(client, data, pca9532_pdata); | 322 | err = pca9532_configure(client, data, pca9532_pdata); |
323 | if (err) { | 323 | if (err) |
324 | kfree(data); | 324 | kfree(data); |
325 | i2c_set_clientdata(client, NULL); | ||
326 | } | ||
327 | 325 | ||
328 | return err; | 326 | return err; |
329 | } | 327 | } |
@@ -351,7 +349,6 @@ static int pca9532_remove(struct i2c_client *client) | |||
351 | } | 349 | } |
352 | 350 | ||
353 | kfree(data); | 351 | kfree(data); |
354 | i2c_set_clientdata(client, NULL); | ||
355 | return 0; | 352 | return 0; |
356 | } | 353 | } |
357 | 354 | ||
diff --git a/drivers/leds/leds-pca955x.c b/drivers/leds/leds-pca955x.c index 8ff50f23419..66aa3e8e786 100644 --- a/drivers/leds/leds-pca955x.c +++ b/drivers/leds/leds-pca955x.c | |||
@@ -342,7 +342,6 @@ exit: | |||
342 | } | 342 | } |
343 | 343 | ||
344 | kfree(pca955x); | 344 | kfree(pca955x); |
345 | i2c_set_clientdata(client, NULL); | ||
346 | 345 | ||
347 | return err; | 346 | return err; |
348 | } | 347 | } |
@@ -358,7 +357,6 @@ static int __devexit pca955x_remove(struct i2c_client *client) | |||
358 | } | 357 | } |
359 | 358 | ||
360 | kfree(pca955x); | 359 | kfree(pca955x); |
361 | i2c_set_clientdata(client, NULL); | ||
362 | 360 | ||
363 | return 0; | 361 | return 0; |
364 | } | 362 | } |
diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c index 97147804a49..b6e7ddc09d7 100644 --- a/drivers/macintosh/macio_asic.c +++ b/drivers/macintosh/macio_asic.c | |||
@@ -492,8 +492,8 @@ static void macio_pci_add_devices(struct macio_chip *chip) | |||
492 | } | 492 | } |
493 | 493 | ||
494 | /* Add media bay devices if any */ | 494 | /* Add media bay devices if any */ |
495 | pnode = mbdev->ofdev.dev.of_node; | 495 | if (mbdev) { |
496 | if (mbdev) | 496 | pnode = mbdev->ofdev.dev.of_node; |
497 | for (np = NULL; (np = of_get_next_child(pnode, np)) != NULL;) { | 497 | for (np = NULL; (np = of_get_next_child(pnode, np)) != NULL;) { |
498 | if (macio_skip_device(np)) | 498 | if (macio_skip_device(np)) |
499 | continue; | 499 | continue; |
@@ -502,10 +502,11 @@ static void macio_pci_add_devices(struct macio_chip *chip) | |||
502 | mbdev, root_res) == NULL) | 502 | mbdev, root_res) == NULL) |
503 | of_node_put(np); | 503 | of_node_put(np); |
504 | } | 504 | } |
505 | } | ||
505 | 506 | ||
506 | /* Add serial ports if any */ | 507 | /* Add serial ports if any */ |
507 | pnode = sdev->ofdev.dev.of_node; | ||
508 | if (sdev) { | 508 | if (sdev) { |
509 | pnode = sdev->ofdev.dev.of_node; | ||
509 | for (np = NULL; (np = of_get_next_child(pnode, np)) != NULL;) { | 510 | for (np = NULL; (np = of_get_next_child(pnode, np)) != NULL;) { |
510 | if (macio_skip_device(np)) | 511 | if (macio_skip_device(np)) |
511 | continue; | 512 | continue; |
@@ -525,7 +526,6 @@ static void macio_pci_add_devices(struct macio_chip *chip) | |||
525 | int macio_register_driver(struct macio_driver *drv) | 526 | int macio_register_driver(struct macio_driver *drv) |
526 | { | 527 | { |
527 | /* initialize common driver fields */ | 528 | /* initialize common driver fields */ |
528 | drv->driver.name = drv->name; | ||
529 | drv->driver.bus = &macio_bus_type; | 529 | drv->driver.bus = &macio_bus_type; |
530 | 530 | ||
531 | /* register with core */ | 531 | /* register with core */ |
diff --git a/drivers/macintosh/mediabay.c b/drivers/macintosh/mediabay.c index 288acce76b7..2fd435bc542 100644 --- a/drivers/macintosh/mediabay.c +++ b/drivers/macintosh/mediabay.c | |||
@@ -728,8 +728,10 @@ static struct of_device_id media_bay_match[] = | |||
728 | 728 | ||
729 | static struct macio_driver media_bay_driver = | 729 | static struct macio_driver media_bay_driver = |
730 | { | 730 | { |
731 | .name = "media-bay", | 731 | .driver = { |
732 | .match_table = media_bay_match, | 732 | .name = "media-bay", |
733 | .of_match_table = media_bay_match, | ||
734 | }, | ||
733 | .probe = media_bay_attach, | 735 | .probe = media_bay_attach, |
734 | .suspend = media_bay_suspend, | 736 | .suspend = media_bay_suspend, |
735 | .resume = media_bay_resume | 737 | .resume = media_bay_resume |
diff --git a/drivers/macintosh/rack-meter.c b/drivers/macintosh/rack-meter.c index 12946c5f583..53cce3a5da2 100644 --- a/drivers/macintosh/rack-meter.c +++ b/drivers/macintosh/rack-meter.c | |||
@@ -584,9 +584,11 @@ static struct of_device_id rackmeter_match[] = { | |||
584 | }; | 584 | }; |
585 | 585 | ||
586 | static struct macio_driver rackmeter_driver = { | 586 | static struct macio_driver rackmeter_driver = { |
587 | .name = "rackmeter", | 587 | .driver = { |
588 | .owner = THIS_MODULE, | 588 | .name = "rackmeter", |
589 | .match_table = rackmeter_match, | 589 | .owner = THIS_MODULE, |
590 | .of_match_table = rackmeter_match, | ||
591 | }, | ||
590 | .probe = rackmeter_probe, | 592 | .probe = rackmeter_probe, |
591 | .remove = __devexit_p(rackmeter_remove), | 593 | .remove = __devexit_p(rackmeter_remove), |
592 | .shutdown = rackmeter_shutdown, | 594 | .shutdown = rackmeter_shutdown, |
diff --git a/drivers/macintosh/therm_adt746x.c b/drivers/macintosh/therm_adt746x.c index 16d82f17ae8..c42eeb43042 100644 --- a/drivers/macintosh/therm_adt746x.c +++ b/drivers/macintosh/therm_adt746x.c | |||
@@ -182,7 +182,6 @@ remove_thermostat(struct i2c_client *client) | |||
182 | 182 | ||
183 | thermostat = NULL; | 183 | thermostat = NULL; |
184 | 184 | ||
185 | i2c_set_clientdata(client, NULL); | ||
186 | kfree(th); | 185 | kfree(th); |
187 | 186 | ||
188 | return 0; | 187 | return 0; |
@@ -400,7 +399,6 @@ static int probe_thermostat(struct i2c_client *client, | |||
400 | rc = read_reg(th, CONFIG_REG); | 399 | rc = read_reg(th, CONFIG_REG); |
401 | if (rc < 0) { | 400 | if (rc < 0) { |
402 | dev_err(&client->dev, "Thermostat failed to read config!\n"); | 401 | dev_err(&client->dev, "Thermostat failed to read config!\n"); |
403 | i2c_set_clientdata(client, NULL); | ||
404 | kfree(th); | 402 | kfree(th); |
405 | return -ENODEV; | 403 | return -ENODEV; |
406 | } | 404 | } |
diff --git a/drivers/macintosh/windfarm_lm75_sensor.c b/drivers/macintosh/windfarm_lm75_sensor.c index d8257d35afd..647c6add219 100644 --- a/drivers/macintosh/windfarm_lm75_sensor.c +++ b/drivers/macintosh/windfarm_lm75_sensor.c | |||
@@ -107,10 +107,8 @@ static int wf_lm75_probe(struct i2c_client *client, | |||
107 | i2c_set_clientdata(client, lm); | 107 | i2c_set_clientdata(client, lm); |
108 | 108 | ||
109 | rc = wf_register_sensor(&lm->sens); | 109 | rc = wf_register_sensor(&lm->sens); |
110 | if (rc) { | 110 | if (rc) |
111 | i2c_set_clientdata(client, NULL); | ||
112 | kfree(lm); | 111 | kfree(lm); |
113 | } | ||
114 | 112 | ||
115 | return rc; | 113 | return rc; |
116 | } | 114 | } |
@@ -216,7 +214,6 @@ static int wf_lm75_remove(struct i2c_client *client) | |||
216 | /* release sensor */ | 214 | /* release sensor */ |
217 | wf_unregister_sensor(&lm->sens); | 215 | wf_unregister_sensor(&lm->sens); |
218 | 216 | ||
219 | i2c_set_clientdata(client, NULL); | ||
220 | return 0; | 217 | return 0; |
221 | } | 218 | } |
222 | 219 | ||
diff --git a/drivers/macintosh/windfarm_max6690_sensor.c b/drivers/macintosh/windfarm_max6690_sensor.c index b486eb929fd..8204113268f 100644 --- a/drivers/macintosh/windfarm_max6690_sensor.c +++ b/drivers/macintosh/windfarm_max6690_sensor.c | |||
@@ -81,7 +81,6 @@ static int wf_max6690_probe(struct i2c_client *client, | |||
81 | 81 | ||
82 | rc = wf_register_sensor(&max->sens); | 82 | rc = wf_register_sensor(&max->sens); |
83 | if (rc) { | 83 | if (rc) { |
84 | i2c_set_clientdata(client, NULL); | ||
85 | kfree(max); | 84 | kfree(max); |
86 | } | 85 | } |
87 | 86 | ||
diff --git a/drivers/macintosh/windfarm_smu_sat.c b/drivers/macintosh/windfarm_smu_sat.c index e20330a2895..65a8ff3e1f8 100644 --- a/drivers/macintosh/windfarm_smu_sat.c +++ b/drivers/macintosh/windfarm_smu_sat.c | |||
@@ -376,7 +376,6 @@ static int wf_sat_remove(struct i2c_client *client) | |||
376 | /* XXX TODO */ | 376 | /* XXX TODO */ |
377 | 377 | ||
378 | sat->i2c = NULL; | 378 | sat->i2c = NULL; |
379 | i2c_set_clientdata(client, NULL); | ||
380 | return 0; | 379 | return 0; |
381 | } | 380 | } |
382 | 381 | ||
diff --git a/drivers/media/radio/si470x/radio-si470x-i2c.c b/drivers/media/radio/si470x/radio-si470x-i2c.c index a5844d08d8b..67a4ec8768a 100644 --- a/drivers/media/radio/si470x/radio-si470x-i2c.c +++ b/drivers/media/radio/si470x/radio-si470x-i2c.c | |||
@@ -482,7 +482,6 @@ static __devexit int si470x_i2c_remove(struct i2c_client *client) | |||
482 | cancel_work_sync(&radio->radio_work); | 482 | cancel_work_sync(&radio->radio_work); |
483 | video_unregister_device(radio->videodev); | 483 | video_unregister_device(radio->videodev); |
484 | kfree(radio); | 484 | kfree(radio); |
485 | i2c_set_clientdata(client, NULL); | ||
486 | 485 | ||
487 | return 0; | 486 | return 0; |
488 | } | 487 | } |
diff --git a/drivers/media/video/mt9m001.c b/drivers/media/video/mt9m001.c index b62c0bd3f8e..e3b9a8ab37f 100644 --- a/drivers/media/video/mt9m001.c +++ b/drivers/media/video/mt9m001.c | |||
@@ -785,7 +785,6 @@ static int mt9m001_probe(struct i2c_client *client, | |||
785 | ret = mt9m001_video_probe(icd, client); | 785 | ret = mt9m001_video_probe(icd, client); |
786 | if (ret) { | 786 | if (ret) { |
787 | icd->ops = NULL; | 787 | icd->ops = NULL; |
788 | i2c_set_clientdata(client, NULL); | ||
789 | kfree(mt9m001); | 788 | kfree(mt9m001); |
790 | } | 789 | } |
791 | 790 | ||
@@ -799,7 +798,6 @@ static int mt9m001_remove(struct i2c_client *client) | |||
799 | 798 | ||
800 | icd->ops = NULL; | 799 | icd->ops = NULL; |
801 | mt9m001_video_remove(icd); | 800 | mt9m001_video_remove(icd); |
802 | i2c_set_clientdata(client, NULL); | ||
803 | client->driver = NULL; | 801 | client->driver = NULL; |
804 | kfree(mt9m001); | 802 | kfree(mt9m001); |
805 | 803 | ||
diff --git a/drivers/media/video/mt9m111.c b/drivers/media/video/mt9m111.c index d35f536f9fc..e42162c50f0 100644 --- a/drivers/media/video/mt9m111.c +++ b/drivers/media/video/mt9m111.c | |||
@@ -1068,7 +1068,6 @@ static int mt9m111_probe(struct i2c_client *client, | |||
1068 | ret = mt9m111_video_probe(icd, client); | 1068 | ret = mt9m111_video_probe(icd, client); |
1069 | if (ret) { | 1069 | if (ret) { |
1070 | icd->ops = NULL; | 1070 | icd->ops = NULL; |
1071 | i2c_set_clientdata(client, NULL); | ||
1072 | kfree(mt9m111); | 1071 | kfree(mt9m111); |
1073 | } | 1072 | } |
1074 | 1073 | ||
@@ -1081,7 +1080,6 @@ static int mt9m111_remove(struct i2c_client *client) | |||
1081 | struct soc_camera_device *icd = client->dev.platform_data; | 1080 | struct soc_camera_device *icd = client->dev.platform_data; |
1082 | 1081 | ||
1083 | icd->ops = NULL; | 1082 | icd->ops = NULL; |
1084 | i2c_set_clientdata(client, NULL); | ||
1085 | client->driver = NULL; | 1083 | client->driver = NULL; |
1086 | kfree(mt9m111); | 1084 | kfree(mt9m111); |
1087 | 1085 | ||
diff --git a/drivers/media/video/mt9t031.c b/drivers/media/video/mt9t031.c index 78b4e091d2d..9f5ff2547f1 100644 --- a/drivers/media/video/mt9t031.c +++ b/drivers/media/video/mt9t031.c | |||
@@ -883,7 +883,6 @@ static int mt9t031_probe(struct i2c_client *client, | |||
883 | if (ret) { | 883 | if (ret) { |
884 | if (icd) | 884 | if (icd) |
885 | icd->ops = NULL; | 885 | icd->ops = NULL; |
886 | i2c_set_clientdata(client, NULL); | ||
887 | kfree(mt9t031); | 886 | kfree(mt9t031); |
888 | } | 887 | } |
889 | 888 | ||
@@ -897,7 +896,6 @@ static int mt9t031_remove(struct i2c_client *client) | |||
897 | 896 | ||
898 | if (icd) | 897 | if (icd) |
899 | icd->ops = NULL; | 898 | icd->ops = NULL; |
900 | i2c_set_clientdata(client, NULL); | ||
901 | client->driver = NULL; | 899 | client->driver = NULL; |
902 | kfree(mt9t031); | 900 | kfree(mt9t031); |
903 | 901 | ||
diff --git a/drivers/media/video/mt9t112.c b/drivers/media/video/mt9t112.c index 7438f8d775b..aa4fce95098 100644 --- a/drivers/media/video/mt9t112.c +++ b/drivers/media/video/mt9t112.c | |||
@@ -1119,7 +1119,6 @@ static int mt9t112_probe(struct i2c_client *client, | |||
1119 | ret = mt9t112_camera_probe(icd, client); | 1119 | ret = mt9t112_camera_probe(icd, client); |
1120 | if (ret) { | 1120 | if (ret) { |
1121 | icd->ops = NULL; | 1121 | icd->ops = NULL; |
1122 | i2c_set_clientdata(client, NULL); | ||
1123 | kfree(priv); | 1122 | kfree(priv); |
1124 | } | 1123 | } |
1125 | 1124 | ||
@@ -1132,7 +1131,6 @@ static int mt9t112_remove(struct i2c_client *client) | |||
1132 | struct soc_camera_device *icd = client->dev.platform_data; | 1131 | struct soc_camera_device *icd = client->dev.platform_data; |
1133 | 1132 | ||
1134 | icd->ops = NULL; | 1133 | icd->ops = NULL; |
1135 | i2c_set_clientdata(client, NULL); | ||
1136 | kfree(priv); | 1134 | kfree(priv); |
1137 | return 0; | 1135 | return 0; |
1138 | } | 1136 | } |
diff --git a/drivers/media/video/mt9v022.c b/drivers/media/video/mt9v022.c index e5bae4c9393..fb44ff00662 100644 --- a/drivers/media/video/mt9v022.c +++ b/drivers/media/video/mt9v022.c | |||
@@ -920,7 +920,6 @@ static int mt9v022_probe(struct i2c_client *client, | |||
920 | ret = mt9v022_video_probe(icd, client); | 920 | ret = mt9v022_video_probe(icd, client); |
921 | if (ret) { | 921 | if (ret) { |
922 | icd->ops = NULL; | 922 | icd->ops = NULL; |
923 | i2c_set_clientdata(client, NULL); | ||
924 | kfree(mt9v022); | 923 | kfree(mt9v022); |
925 | } | 924 | } |
926 | 925 | ||
@@ -934,7 +933,6 @@ static int mt9v022_remove(struct i2c_client *client) | |||
934 | 933 | ||
935 | icd->ops = NULL; | 934 | icd->ops = NULL; |
936 | mt9v022_video_remove(icd); | 935 | mt9v022_video_remove(icd); |
937 | i2c_set_clientdata(client, NULL); | ||
938 | client->driver = NULL; | 936 | client->driver = NULL; |
939 | kfree(mt9v022); | 937 | kfree(mt9v022); |
940 | 938 | ||
diff --git a/drivers/media/video/ov772x.c b/drivers/media/video/ov772x.c index 7f8ece30c77..c33acc94b74 100644 --- a/drivers/media/video/ov772x.c +++ b/drivers/media/video/ov772x.c | |||
@@ -1159,7 +1159,6 @@ static int ov772x_probe(struct i2c_client *client, | |||
1159 | ret = ov772x_video_probe(icd, client); | 1159 | ret = ov772x_video_probe(icd, client); |
1160 | if (ret) { | 1160 | if (ret) { |
1161 | icd->ops = NULL; | 1161 | icd->ops = NULL; |
1162 | i2c_set_clientdata(client, NULL); | ||
1163 | kfree(priv); | 1162 | kfree(priv); |
1164 | } | 1163 | } |
1165 | 1164 | ||
@@ -1172,7 +1171,6 @@ static int ov772x_remove(struct i2c_client *client) | |||
1172 | struct soc_camera_device *icd = client->dev.platform_data; | 1171 | struct soc_camera_device *icd = client->dev.platform_data; |
1173 | 1172 | ||
1174 | icd->ops = NULL; | 1173 | icd->ops = NULL; |
1175 | i2c_set_clientdata(client, NULL); | ||
1176 | kfree(priv); | 1174 | kfree(priv); |
1177 | return 0; | 1175 | return 0; |
1178 | } | 1176 | } |
diff --git a/drivers/media/video/ov9640.c b/drivers/media/video/ov9640.c index 36599a65f54..035e9ecb0c7 100644 --- a/drivers/media/video/ov9640.c +++ b/drivers/media/video/ov9640.c | |||
@@ -783,7 +783,6 @@ static int ov9640_probe(struct i2c_client *client, | |||
783 | 783 | ||
784 | if (ret) { | 784 | if (ret) { |
785 | icd->ops = NULL; | 785 | icd->ops = NULL; |
786 | i2c_set_clientdata(client, NULL); | ||
787 | kfree(priv); | 786 | kfree(priv); |
788 | } | 787 | } |
789 | 788 | ||
@@ -794,7 +793,6 @@ static int ov9640_remove(struct i2c_client *client) | |||
794 | { | 793 | { |
795 | struct ov9640_priv *priv = i2c_get_clientdata(client); | 794 | struct ov9640_priv *priv = i2c_get_clientdata(client); |
796 | 795 | ||
797 | i2c_set_clientdata(client, NULL); | ||
798 | kfree(priv); | 796 | kfree(priv); |
799 | return 0; | 797 | return 0; |
800 | } | 798 | } |
diff --git a/drivers/media/video/rj54n1cb0c.c b/drivers/media/video/rj54n1cb0c.c index bbd9c11e2c5..2c3b58c99e1 100644 --- a/drivers/media/video/rj54n1cb0c.c +++ b/drivers/media/video/rj54n1cb0c.c | |||
@@ -1444,7 +1444,6 @@ static int rj54n1_probe(struct i2c_client *client, | |||
1444 | ret = rj54n1_video_probe(icd, client, rj54n1_priv); | 1444 | ret = rj54n1_video_probe(icd, client, rj54n1_priv); |
1445 | if (ret < 0) { | 1445 | if (ret < 0) { |
1446 | icd->ops = NULL; | 1446 | icd->ops = NULL; |
1447 | i2c_set_clientdata(client, NULL); | ||
1448 | kfree(rj54n1); | 1447 | kfree(rj54n1); |
1449 | return ret; | 1448 | return ret; |
1450 | } | 1449 | } |
@@ -1461,7 +1460,6 @@ static int rj54n1_remove(struct i2c_client *client) | |||
1461 | icd->ops = NULL; | 1460 | icd->ops = NULL; |
1462 | if (icl->free_bus) | 1461 | if (icl->free_bus) |
1463 | icl->free_bus(icl); | 1462 | icl->free_bus(icl); |
1464 | i2c_set_clientdata(client, NULL); | ||
1465 | client->driver = NULL; | 1463 | client->driver = NULL; |
1466 | kfree(rj54n1); | 1464 | kfree(rj54n1); |
1467 | 1465 | ||
diff --git a/drivers/media/video/tcm825x.c b/drivers/media/video/tcm825x.c index b90e9da3167..54681a53582 100644 --- a/drivers/media/video/tcm825x.c +++ b/drivers/media/video/tcm825x.c | |||
@@ -850,7 +850,6 @@ static int tcm825x_probe(struct i2c_client *client, | |||
850 | const struct i2c_device_id *did) | 850 | const struct i2c_device_id *did) |
851 | { | 851 | { |
852 | struct tcm825x_sensor *sensor = &tcm825x; | 852 | struct tcm825x_sensor *sensor = &tcm825x; |
853 | int rval; | ||
854 | 853 | ||
855 | if (i2c_get_clientdata(client)) | 854 | if (i2c_get_clientdata(client)) |
856 | return -EBUSY; | 855 | return -EBUSY; |
@@ -871,11 +870,7 @@ static int tcm825x_probe(struct i2c_client *client, | |||
871 | sensor->pix.height = tcm825x_sizes[QVGA].height; | 870 | sensor->pix.height = tcm825x_sizes[QVGA].height; |
872 | sensor->pix.pixelformat = V4L2_PIX_FMT_RGB565; | 871 | sensor->pix.pixelformat = V4L2_PIX_FMT_RGB565; |
873 | 872 | ||
874 | rval = v4l2_int_device_register(sensor->v4l2_int_device); | 873 | return v4l2_int_device_register(sensor->v4l2_int_device); |
875 | if (rval) | ||
876 | i2c_set_clientdata(client, NULL); | ||
877 | |||
878 | return rval; | ||
879 | } | 874 | } |
880 | 875 | ||
881 | static int tcm825x_remove(struct i2c_client *client) | 876 | static int tcm825x_remove(struct i2c_client *client) |
@@ -886,7 +881,6 @@ static int tcm825x_remove(struct i2c_client *client) | |||
886 | return -ENODEV; /* our client isn't attached */ | 881 | return -ENODEV; /* our client isn't attached */ |
887 | 882 | ||
888 | v4l2_int_device_unregister(sensor->v4l2_int_device); | 883 | v4l2_int_device_unregister(sensor->v4l2_int_device); |
889 | i2c_set_clientdata(client, NULL); | ||
890 | 884 | ||
891 | return 0; | 885 | return 0; |
892 | } | 886 | } |
diff --git a/drivers/media/video/tw9910.c b/drivers/media/video/tw9910.c index 76be733eabf..6eb3395def0 100644 --- a/drivers/media/video/tw9910.c +++ b/drivers/media/video/tw9910.c | |||
@@ -977,7 +977,6 @@ static int tw9910_probe(struct i2c_client *client, | |||
977 | ret = tw9910_video_probe(icd, client); | 977 | ret = tw9910_video_probe(icd, client); |
978 | if (ret) { | 978 | if (ret) { |
979 | icd->ops = NULL; | 979 | icd->ops = NULL; |
980 | i2c_set_clientdata(client, NULL); | ||
981 | kfree(priv); | 980 | kfree(priv); |
982 | } | 981 | } |
983 | 982 | ||
@@ -990,7 +989,6 @@ static int tw9910_remove(struct i2c_client *client) | |||
990 | struct soc_camera_device *icd = client->dev.platform_data; | 989 | struct soc_camera_device *icd = client->dev.platform_data; |
991 | 990 | ||
992 | icd->ops = NULL; | 991 | icd->ops = NULL; |
993 | i2c_set_clientdata(client, NULL); | ||
994 | kfree(priv); | 992 | kfree(priv); |
995 | return 0; | 993 | return 0; |
996 | } | 994 | } |
diff --git a/drivers/mfd/88pm860x-i2c.c b/drivers/mfd/88pm860x-i2c.c index c933b64d128..bc02e6b2160 100644 --- a/drivers/mfd/88pm860x-i2c.c +++ b/drivers/mfd/88pm860x-i2c.c | |||
@@ -200,8 +200,6 @@ static int __devexit pm860x_remove(struct i2c_client *client) | |||
200 | 200 | ||
201 | pm860x_device_exit(chip); | 201 | pm860x_device_exit(chip); |
202 | i2c_unregister_device(chip->companion); | 202 | i2c_unregister_device(chip->companion); |
203 | i2c_set_clientdata(chip->client, NULL); | ||
204 | i2c_set_clientdata(client, NULL); | ||
205 | kfree(chip); | 203 | kfree(chip); |
206 | return 0; | 204 | return 0; |
207 | } | 205 | } |
diff --git a/drivers/mfd/ab3100-core.c b/drivers/mfd/ab3100-core.c index 53ebfee548f..66379b41390 100644 --- a/drivers/mfd/ab3100-core.c +++ b/drivers/mfd/ab3100-core.c | |||
@@ -957,7 +957,6 @@ static int __init ab3100_probe(struct i2c_client *client, | |||
957 | i2c_unregister_device(ab3100->testreg_client); | 957 | i2c_unregister_device(ab3100->testreg_client); |
958 | exit_no_testreg_client: | 958 | exit_no_testreg_client: |
959 | exit_no_detect: | 959 | exit_no_detect: |
960 | i2c_set_clientdata(client, NULL); | ||
961 | kfree(ab3100); | 960 | kfree(ab3100); |
962 | return err; | 961 | return err; |
963 | } | 962 | } |
@@ -979,7 +978,6 @@ static int __exit ab3100_remove(struct i2c_client *client) | |||
979 | * their notifiers so deactivate IRQ | 978 | * their notifiers so deactivate IRQ |
980 | */ | 979 | */ |
981 | free_irq(client->irq, ab3100); | 980 | free_irq(client->irq, ab3100); |
982 | i2c_set_clientdata(client, NULL); | ||
983 | kfree(ab3100); | 981 | kfree(ab3100); |
984 | return 0; | 982 | return 0; |
985 | } | 983 | } |
diff --git a/drivers/mfd/ab3550-core.c b/drivers/mfd/ab3550-core.c index 1060f8e1c40..f54ab62e7bc 100644 --- a/drivers/mfd/ab3550-core.c +++ b/drivers/mfd/ab3550-core.c | |||
@@ -1362,7 +1362,6 @@ static int __exit ab3550_remove(struct i2c_client *client) | |||
1362 | * their notifiers so deactivate IRQ | 1362 | * their notifiers so deactivate IRQ |
1363 | */ | 1363 | */ |
1364 | free_irq(client->irq, ab); | 1364 | free_irq(client->irq, ab); |
1365 | i2c_set_clientdata(client, NULL); | ||
1366 | kfree(ab); | 1365 | kfree(ab); |
1367 | return 0; | 1366 | return 0; |
1368 | } | 1367 | } |
diff --git a/drivers/mfd/adp5520.c b/drivers/mfd/adp5520.c index 00553286565..3122139b430 100644 --- a/drivers/mfd/adp5520.c +++ b/drivers/mfd/adp5520.c | |||
@@ -302,7 +302,6 @@ out_free_irq: | |||
302 | free_irq(chip->irq, chip); | 302 | free_irq(chip->irq, chip); |
303 | 303 | ||
304 | out_free_chip: | 304 | out_free_chip: |
305 | i2c_set_clientdata(client, NULL); | ||
306 | kfree(chip); | 305 | kfree(chip); |
307 | 306 | ||
308 | return ret; | 307 | return ret; |
@@ -317,7 +316,6 @@ static int __devexit adp5520_remove(struct i2c_client *client) | |||
317 | 316 | ||
318 | adp5520_remove_subdevs(chip); | 317 | adp5520_remove_subdevs(chip); |
319 | adp5520_write(chip->dev, ADP5520_MODE_STATUS, 0); | 318 | adp5520_write(chip->dev, ADP5520_MODE_STATUS, 0); |
320 | i2c_set_clientdata(client, NULL); | ||
321 | kfree(chip); | 319 | kfree(chip); |
322 | return 0; | 320 | return 0; |
323 | } | 321 | } |
diff --git a/drivers/mfd/da903x.c b/drivers/mfd/da903x.c index 3ad915d0589..c07aece900f 100644 --- a/drivers/mfd/da903x.c +++ b/drivers/mfd/da903x.c | |||
@@ -534,7 +534,6 @@ static int __devinit da903x_probe(struct i2c_client *client, | |||
534 | out_free_irq: | 534 | out_free_irq: |
535 | free_irq(client->irq, chip); | 535 | free_irq(client->irq, chip); |
536 | out_free_chip: | 536 | out_free_chip: |
537 | i2c_set_clientdata(client, NULL); | ||
538 | kfree(chip); | 537 | kfree(chip); |
539 | return ret; | 538 | return ret; |
540 | } | 539 | } |
@@ -544,7 +543,6 @@ static int __devexit da903x_remove(struct i2c_client *client) | |||
544 | struct da903x_chip *chip = i2c_get_clientdata(client); | 543 | struct da903x_chip *chip = i2c_get_clientdata(client); |
545 | 544 | ||
546 | da903x_remove_subdevs(chip); | 545 | da903x_remove_subdevs(chip); |
547 | i2c_set_clientdata(client, NULL); | ||
548 | kfree(chip); | 546 | kfree(chip); |
549 | return 0; | 547 | return 0; |
550 | } | 548 | } |
diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c index e73f3f5252a..0219115e00c 100644 --- a/drivers/mfd/max8925-i2c.c +++ b/drivers/mfd/max8925-i2c.c | |||
@@ -173,7 +173,6 @@ static int __devexit max8925_remove(struct i2c_client *client) | |||
173 | max8925_device_exit(chip); | 173 | max8925_device_exit(chip); |
174 | i2c_unregister_device(chip->adc); | 174 | i2c_unregister_device(chip->adc); |
175 | i2c_unregister_device(chip->rtc); | 175 | i2c_unregister_device(chip->rtc); |
176 | i2c_set_clientdata(chip->i2c, NULL); | ||
177 | kfree(chip); | 176 | kfree(chip); |
178 | return 0; | 177 | return 0; |
179 | } | 178 | } |
diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c index 721948be12c..a3fb4bcb988 100644 --- a/drivers/mfd/menelaus.c +++ b/drivers/mfd/menelaus.c | |||
@@ -1228,7 +1228,6 @@ fail2: | |||
1228 | free_irq(client->irq, menelaus); | 1228 | free_irq(client->irq, menelaus); |
1229 | flush_scheduled_work(); | 1229 | flush_scheduled_work(); |
1230 | fail1: | 1230 | fail1: |
1231 | i2c_set_clientdata(client, NULL); | ||
1232 | kfree(menelaus); | 1231 | kfree(menelaus); |
1233 | return err; | 1232 | return err; |
1234 | } | 1233 | } |
@@ -1238,7 +1237,6 @@ static int __exit menelaus_remove(struct i2c_client *client) | |||
1238 | struct menelaus_chip *menelaus = i2c_get_clientdata(client); | 1237 | struct menelaus_chip *menelaus = i2c_get_clientdata(client); |
1239 | 1238 | ||
1240 | free_irq(client->irq, menelaus); | 1239 | free_irq(client->irq, menelaus); |
1241 | i2c_set_clientdata(client, NULL); | ||
1242 | kfree(menelaus); | 1240 | kfree(menelaus); |
1243 | the_menelaus = NULL; | 1241 | the_menelaus = NULL; |
1244 | return 0; | 1242 | return 0; |
diff --git a/drivers/mfd/pcf50633-core.c b/drivers/mfd/pcf50633-core.c index 704736e6e9b..23e58552728 100644 --- a/drivers/mfd/pcf50633-core.c +++ b/drivers/mfd/pcf50633-core.c | |||
@@ -336,7 +336,6 @@ static int __devinit pcf50633_probe(struct i2c_client *client, | |||
336 | return 0; | 336 | return 0; |
337 | 337 | ||
338 | err_free: | 338 | err_free: |
339 | i2c_set_clientdata(client, NULL); | ||
340 | kfree(pcf); | 339 | kfree(pcf); |
341 | 340 | ||
342 | return ret; | 341 | return ret; |
@@ -357,7 +356,6 @@ static int __devexit pcf50633_remove(struct i2c_client *client) | |||
357 | for (i = 0; i < PCF50633_NUM_REGULATORS; i++) | 356 | for (i = 0; i < PCF50633_NUM_REGULATORS; i++) |
358 | platform_device_unregister(pcf->regulator_pdev[i]); | 357 | platform_device_unregister(pcf->regulator_pdev[i]); |
359 | 358 | ||
360 | i2c_set_clientdata(client, NULL); | ||
361 | kfree(pcf); | 359 | kfree(pcf); |
362 | 360 | ||
363 | return 0; | 361 | return 0; |
diff --git a/drivers/mfd/tc35892.c b/drivers/mfd/tc35892.c index 715f095dd7a..e619e2a5599 100644 --- a/drivers/mfd/tc35892.c +++ b/drivers/mfd/tc35892.c | |||
@@ -296,7 +296,6 @@ out_freeirq: | |||
296 | out_removeirq: | 296 | out_removeirq: |
297 | tc35892_irq_remove(tc35892); | 297 | tc35892_irq_remove(tc35892); |
298 | out_free: | 298 | out_free: |
299 | i2c_set_clientdata(i2c, NULL); | ||
300 | kfree(tc35892); | 299 | kfree(tc35892); |
301 | return ret; | 300 | return ret; |
302 | } | 301 | } |
@@ -310,7 +309,6 @@ static int __devexit tc35892_remove(struct i2c_client *client) | |||
310 | free_irq(tc35892->i2c->irq, tc35892); | 309 | free_irq(tc35892->i2c->irq, tc35892); |
311 | tc35892_irq_remove(tc35892); | 310 | tc35892_irq_remove(tc35892); |
312 | 311 | ||
313 | i2c_set_clientdata(client, NULL); | ||
314 | kfree(tc35892); | 312 | kfree(tc35892); |
315 | 313 | ||
316 | return 0; | 314 | return 0; |
diff --git a/drivers/mfd/tps65010.c b/drivers/mfd/tps65010.c index 9b22a77f70f..d0016b67d12 100644 --- a/drivers/mfd/tps65010.c +++ b/drivers/mfd/tps65010.c | |||
@@ -530,7 +530,6 @@ static int __exit tps65010_remove(struct i2c_client *client) | |||
530 | cancel_delayed_work(&tps->work); | 530 | cancel_delayed_work(&tps->work); |
531 | flush_scheduled_work(); | 531 | flush_scheduled_work(); |
532 | debugfs_remove(tps->file); | 532 | debugfs_remove(tps->file); |
533 | i2c_set_clientdata(client, NULL); | ||
534 | kfree(tps); | 533 | kfree(tps); |
535 | the_tps = NULL; | 534 | the_tps = NULL; |
536 | return 0; | 535 | return 0; |
diff --git a/drivers/mfd/wm8350-i2c.c b/drivers/mfd/wm8350-i2c.c index 7795af4b1fe..5fe5de166ad 100644 --- a/drivers/mfd/wm8350-i2c.c +++ b/drivers/mfd/wm8350-i2c.c | |||
@@ -80,7 +80,6 @@ static int wm8350_i2c_probe(struct i2c_client *i2c, | |||
80 | return ret; | 80 | return ret; |
81 | 81 | ||
82 | err: | 82 | err: |
83 | i2c_set_clientdata(i2c, NULL); | ||
84 | kfree(wm8350); | 83 | kfree(wm8350); |
85 | return ret; | 84 | return ret; |
86 | } | 85 | } |
@@ -90,7 +89,6 @@ static int wm8350_i2c_remove(struct i2c_client *i2c) | |||
90 | struct wm8350 *wm8350 = i2c_get_clientdata(i2c); | 89 | struct wm8350 *wm8350 = i2c_get_clientdata(i2c); |
91 | 90 | ||
92 | wm8350_device_exit(wm8350); | 91 | wm8350_device_exit(wm8350); |
93 | i2c_set_clientdata(i2c, NULL); | ||
94 | kfree(wm8350); | 92 | kfree(wm8350); |
95 | 93 | ||
96 | return 0; | 94 | return 0; |
diff --git a/drivers/mfd/wm8400-core.c b/drivers/mfd/wm8400-core.c index e08aafa663d..1bfef4846b0 100644 --- a/drivers/mfd/wm8400-core.c +++ b/drivers/mfd/wm8400-core.c | |||
@@ -415,7 +415,6 @@ static int wm8400_i2c_probe(struct i2c_client *i2c, | |||
415 | return 0; | 415 | return 0; |
416 | 416 | ||
417 | struct_err: | 417 | struct_err: |
418 | i2c_set_clientdata(i2c, NULL); | ||
419 | kfree(wm8400); | 418 | kfree(wm8400); |
420 | err: | 419 | err: |
421 | return ret; | 420 | return ret; |
@@ -426,7 +425,6 @@ static int wm8400_i2c_remove(struct i2c_client *i2c) | |||
426 | struct wm8400 *wm8400 = i2c_get_clientdata(i2c); | 425 | struct wm8400 *wm8400 = i2c_get_clientdata(i2c); |
427 | 426 | ||
428 | wm8400_release(wm8400); | 427 | wm8400_release(wm8400); |
429 | i2c_set_clientdata(i2c, NULL); | ||
430 | kfree(wm8400); | 428 | kfree(wm8400); |
431 | 429 | ||
432 | return 0; | 430 | return 0; |
diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c index f7ca3a42b49..559b0b3c16c 100644 --- a/drivers/misc/eeprom/at24.c +++ b/drivers/misc/eeprom/at24.c | |||
@@ -643,7 +643,6 @@ static int __devexit at24_remove(struct i2c_client *client) | |||
643 | 643 | ||
644 | kfree(at24->writebuf); | 644 | kfree(at24->writebuf); |
645 | kfree(at24); | 645 | kfree(at24); |
646 | i2c_set_clientdata(client, NULL); | ||
647 | return 0; | 646 | return 0; |
648 | } | 647 | } |
649 | 648 | ||
diff --git a/drivers/mtd/maps/pismo.c b/drivers/mtd/maps/pismo.c index eb476b7f8d1..f4ce273e93f 100644 --- a/drivers/mtd/maps/pismo.c +++ b/drivers/mtd/maps/pismo.c | |||
@@ -234,7 +234,6 @@ static int __devexit pismo_remove(struct i2c_client *client) | |||
234 | /* FIXME: set_vpp needs saner arguments */ | 234 | /* FIXME: set_vpp needs saner arguments */ |
235 | pismo_setvpp_remove_fix(pismo); | 235 | pismo_setvpp_remove_fix(pismo); |
236 | 236 | ||
237 | i2c_set_clientdata(client, NULL); | ||
238 | kfree(pismo); | 237 | kfree(pismo); |
239 | 238 | ||
240 | return 0; | 239 | return 0; |
@@ -286,7 +285,6 @@ static int __devinit pismo_probe(struct i2c_client *client, | |||
286 | return 0; | 285 | return 0; |
287 | 286 | ||
288 | exit_free: | 287 | exit_free: |
289 | i2c_set_clientdata(client, NULL); | ||
290 | kfree(pismo); | 288 | kfree(pismo); |
291 | return ret; | 289 | return ret; |
292 | } | 290 | } |
diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c index 00aea6f7d1f..1312eda57ba 100644 --- a/drivers/mtd/nand/fsl_upm.c +++ b/drivers/mtd/nand/fsl_upm.c | |||
@@ -232,7 +232,7 @@ static int __devinit fun_probe(struct of_device *ofdev, | |||
232 | if (!fun) | 232 | if (!fun) |
233 | return -ENOMEM; | 233 | return -ENOMEM; |
234 | 234 | ||
235 | ret = of_address_to_resource(ofdev->node, 0, &io_res); | 235 | ret = of_address_to_resource(ofdev->dev.of_node, 0, &io_res); |
236 | if (ret) { | 236 | if (ret) { |
237 | dev_err(&ofdev->dev, "can't get IO base\n"); | 237 | dev_err(&ofdev->dev, "can't get IO base\n"); |
238 | goto err1; | 238 | goto err1; |
@@ -244,7 +244,8 @@ static int __devinit fun_probe(struct of_device *ofdev, | |||
244 | goto err1; | 244 | goto err1; |
245 | } | 245 | } |
246 | 246 | ||
247 | prop = of_get_property(ofdev->node, "fsl,upm-addr-offset", &size); | 247 | prop = of_get_property(ofdev->dev.of_node, "fsl,upm-addr-offset", |
248 | &size); | ||
248 | if (!prop || size != sizeof(uint32_t)) { | 249 | if (!prop || size != sizeof(uint32_t)) { |
249 | dev_err(&ofdev->dev, "can't get UPM address offset\n"); | 250 | dev_err(&ofdev->dev, "can't get UPM address offset\n"); |
250 | ret = -EINVAL; | 251 | ret = -EINVAL; |
@@ -252,7 +253,7 @@ static int __devinit fun_probe(struct of_device *ofdev, | |||
252 | } | 253 | } |
253 | fun->upm_addr_offset = *prop; | 254 | fun->upm_addr_offset = *prop; |
254 | 255 | ||
255 | prop = of_get_property(ofdev->node, "fsl,upm-cmd-offset", &size); | 256 | prop = of_get_property(ofdev->dev.of_node, "fsl,upm-cmd-offset", &size); |
256 | if (!prop || size != sizeof(uint32_t)) { | 257 | if (!prop || size != sizeof(uint32_t)) { |
257 | dev_err(&ofdev->dev, "can't get UPM command offset\n"); | 258 | dev_err(&ofdev->dev, "can't get UPM command offset\n"); |
258 | ret = -EINVAL; | 259 | ret = -EINVAL; |
@@ -260,7 +261,7 @@ static int __devinit fun_probe(struct of_device *ofdev, | |||
260 | } | 261 | } |
261 | fun->upm_cmd_offset = *prop; | 262 | fun->upm_cmd_offset = *prop; |
262 | 263 | ||
263 | prop = of_get_property(ofdev->node, | 264 | prop = of_get_property(ofdev->dev.of_node, |
264 | "fsl,upm-addr-line-cs-offsets", &size); | 265 | "fsl,upm-addr-line-cs-offsets", &size); |
265 | if (prop && (size / sizeof(uint32_t)) > 0) { | 266 | if (prop && (size / sizeof(uint32_t)) > 0) { |
266 | fun->mchip_count = size / sizeof(uint32_t); | 267 | fun->mchip_count = size / sizeof(uint32_t); |
@@ -276,7 +277,7 @@ static int __devinit fun_probe(struct of_device *ofdev, | |||
276 | 277 | ||
277 | for (i = 0; i < fun->mchip_count; i++) { | 278 | for (i = 0; i < fun->mchip_count; i++) { |
278 | fun->rnb_gpio[i] = -1; | 279 | fun->rnb_gpio[i] = -1; |
279 | rnb_gpio = of_get_gpio(ofdev->node, i); | 280 | rnb_gpio = of_get_gpio(ofdev->dev.of_node, i); |
280 | if (rnb_gpio >= 0) { | 281 | if (rnb_gpio >= 0) { |
281 | ret = gpio_request(rnb_gpio, dev_name(&ofdev->dev)); | 282 | ret = gpio_request(rnb_gpio, dev_name(&ofdev->dev)); |
282 | if (ret) { | 283 | if (ret) { |
@@ -292,13 +293,13 @@ static int __devinit fun_probe(struct of_device *ofdev, | |||
292 | } | 293 | } |
293 | } | 294 | } |
294 | 295 | ||
295 | prop = of_get_property(ofdev->node, "chip-delay", NULL); | 296 | prop = of_get_property(ofdev->dev.of_node, "chip-delay", NULL); |
296 | if (prop) | 297 | if (prop) |
297 | fun->chip_delay = *prop; | 298 | fun->chip_delay = *prop; |
298 | else | 299 | else |
299 | fun->chip_delay = 50; | 300 | fun->chip_delay = 50; |
300 | 301 | ||
301 | prop = of_get_property(ofdev->node, "fsl,upm-wait-flags", &size); | 302 | prop = of_get_property(ofdev->dev.of_node, "fsl,upm-wait-flags", &size); |
302 | if (prop && size == sizeof(uint32_t)) | 303 | if (prop && size == sizeof(uint32_t)) |
303 | fun->wait_flags = *prop; | 304 | fun->wait_flags = *prop; |
304 | else | 305 | else |
@@ -315,7 +316,7 @@ static int __devinit fun_probe(struct of_device *ofdev, | |||
315 | fun->dev = &ofdev->dev; | 316 | fun->dev = &ofdev->dev; |
316 | fun->last_ctrl = NAND_CLE; | 317 | fun->last_ctrl = NAND_CLE; |
317 | 318 | ||
318 | ret = fun_chip_init(fun, ofdev->node, &io_res); | 319 | ret = fun_chip_init(fun, ofdev->dev.of_node, &io_res); |
319 | if (ret) | 320 | if (ret) |
320 | goto err2; | 321 | goto err2; |
321 | 322 | ||
diff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/mpc5121_nfc.c index 3d0867d829c..0a130dcaa12 100644 --- a/drivers/mtd/nand/mpc5121_nfc.c +++ b/drivers/mtd/nand/mpc5121_nfc.c | |||
@@ -650,7 +650,7 @@ static void mpc5121_nfc_free(struct device *dev, struct mtd_info *mtd) | |||
650 | static int __devinit mpc5121_nfc_probe(struct of_device *op, | 650 | static int __devinit mpc5121_nfc_probe(struct of_device *op, |
651 | const struct of_device_id *match) | 651 | const struct of_device_id *match) |
652 | { | 652 | { |
653 | struct device_node *rootnode, *dn = op->node; | 653 | struct device_node *rootnode, *dn = op->dev.of_node; |
654 | struct device *dev = &op->dev; | 654 | struct device *dev = &op->dev; |
655 | struct mpc5121_nfc_prv *prv; | 655 | struct mpc5121_nfc_prv *prv; |
656 | struct resource res; | 656 | struct resource res; |
@@ -889,12 +889,12 @@ static struct of_device_id mpc5121_nfc_match[] __devinitdata = { | |||
889 | }; | 889 | }; |
890 | 890 | ||
891 | static struct of_platform_driver mpc5121_nfc_driver = { | 891 | static struct of_platform_driver mpc5121_nfc_driver = { |
892 | .match_table = mpc5121_nfc_match, | ||
893 | .probe = mpc5121_nfc_probe, | 892 | .probe = mpc5121_nfc_probe, |
894 | .remove = __devexit_p(mpc5121_nfc_remove), | 893 | .remove = __devexit_p(mpc5121_nfc_remove), |
895 | .driver = { | 894 | .driver = { |
896 | .name = DRV_NAME, | 895 | .name = DRV_NAME, |
897 | .owner = THIS_MODULE, | 896 | .owner = THIS_MODULE, |
897 | .of_match_table = mpc5121_nfc_match, | ||
898 | }, | 898 | }, |
899 | }; | 899 | }; |
900 | 900 | ||
diff --git a/drivers/mtd/nand/socrates_nand.c b/drivers/mtd/nand/socrates_nand.c index 884852dc7eb..cc728b12de8 100644 --- a/drivers/mtd/nand/socrates_nand.c +++ b/drivers/mtd/nand/socrates_nand.c | |||
@@ -183,7 +183,7 @@ static int __devinit socrates_nand_probe(struct of_device *ofdev, | |||
183 | return -ENOMEM; | 183 | return -ENOMEM; |
184 | } | 184 | } |
185 | 185 | ||
186 | host->io_base = of_iomap(ofdev->node, 0); | 186 | host->io_base = of_iomap(ofdev->dev.of_node, 0); |
187 | if (host->io_base == NULL) { | 187 | if (host->io_base == NULL) { |
188 | printk(KERN_ERR "socrates_nand: ioremap failed\n"); | 188 | printk(KERN_ERR "socrates_nand: ioremap failed\n"); |
189 | kfree(host); | 189 | kfree(host); |
@@ -244,7 +244,7 @@ static int __devinit socrates_nand_probe(struct of_device *ofdev, | |||
244 | #ifdef CONFIG_MTD_OF_PARTS | 244 | #ifdef CONFIG_MTD_OF_PARTS |
245 | if (num_partitions == 0) { | 245 | if (num_partitions == 0) { |
246 | num_partitions = of_mtd_parse_partitions(&ofdev->dev, | 246 | num_partitions = of_mtd_parse_partitions(&ofdev->dev, |
247 | ofdev->node, | 247 | ofdev->dev.of_node, |
248 | &partitions); | 248 | &partitions); |
249 | if (num_partitions < 0) { | 249 | if (num_partitions < 0) { |
250 | res = num_partitions; | 250 | res = num_partitions; |
diff --git a/drivers/net/benet/be_cmds.c b/drivers/net/benet/be_cmds.c index 9d11dbf5e4d..b9ad799c719 100644 --- a/drivers/net/benet/be_cmds.c +++ b/drivers/net/benet/be_cmds.c | |||
@@ -1429,7 +1429,7 @@ int be_cmd_write_flashrom(struct be_adapter *adapter, struct be_dma_mem *cmd, | |||
1429 | wrb = wrb_from_mccq(adapter); | 1429 | wrb = wrb_from_mccq(adapter); |
1430 | if (!wrb) { | 1430 | if (!wrb) { |
1431 | status = -EBUSY; | 1431 | status = -EBUSY; |
1432 | goto err; | 1432 | goto err_unlock; |
1433 | } | 1433 | } |
1434 | req = cmd->va; | 1434 | req = cmd->va; |
1435 | sge = nonembedded_sgl(wrb); | 1435 | sge = nonembedded_sgl(wrb); |
@@ -1457,7 +1457,10 @@ int be_cmd_write_flashrom(struct be_adapter *adapter, struct be_dma_mem *cmd, | |||
1457 | else | 1457 | else |
1458 | status = adapter->flash_status; | 1458 | status = adapter->flash_status; |
1459 | 1459 | ||
1460 | err: | 1460 | return status; |
1461 | |||
1462 | err_unlock: | ||
1463 | spin_unlock_bh(&adapter->mcc_lock); | ||
1461 | return status; | 1464 | return status; |
1462 | } | 1465 | } |
1463 | 1466 | ||
@@ -1497,7 +1500,7 @@ err: | |||
1497 | return status; | 1500 | return status; |
1498 | } | 1501 | } |
1499 | 1502 | ||
1500 | extern int be_cmd_enable_magic_wol(struct be_adapter *adapter, u8 *mac, | 1503 | int be_cmd_enable_magic_wol(struct be_adapter *adapter, u8 *mac, |
1501 | struct be_dma_mem *nonemb_cmd) | 1504 | struct be_dma_mem *nonemb_cmd) |
1502 | { | 1505 | { |
1503 | struct be_mcc_wrb *wrb; | 1506 | struct be_mcc_wrb *wrb; |
@@ -1590,7 +1593,7 @@ int be_cmd_loopback_test(struct be_adapter *adapter, u32 port_num, | |||
1590 | 1593 | ||
1591 | be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_LOWLEVEL, | 1594 | be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_LOWLEVEL, |
1592 | OPCODE_LOWLEVEL_LOOPBACK_TEST, sizeof(*req)); | 1595 | OPCODE_LOWLEVEL_LOOPBACK_TEST, sizeof(*req)); |
1593 | req->hdr.timeout = 4; | 1596 | req->hdr.timeout = cpu_to_le32(4); |
1594 | 1597 | ||
1595 | req->pattern = cpu_to_le64(pattern); | 1598 | req->pattern = cpu_to_le64(pattern); |
1596 | req->src_port = cpu_to_le32(port_num); | 1599 | req->src_port = cpu_to_le32(port_num); |
@@ -1662,7 +1665,7 @@ err: | |||
1662 | return status; | 1665 | return status; |
1663 | } | 1666 | } |
1664 | 1667 | ||
1665 | extern int be_cmd_get_seeprom_data(struct be_adapter *adapter, | 1668 | int be_cmd_get_seeprom_data(struct be_adapter *adapter, |
1666 | struct be_dma_mem *nonemb_cmd) | 1669 | struct be_dma_mem *nonemb_cmd) |
1667 | { | 1670 | { |
1668 | struct be_mcc_wrb *wrb; | 1671 | struct be_mcc_wrb *wrb; |
diff --git a/drivers/net/bmac.c b/drivers/net/bmac.c index 39250b2ca88..959add2410b 100644 --- a/drivers/net/bmac.c +++ b/drivers/net/bmac.c | |||
@@ -1654,8 +1654,11 @@ MODULE_DEVICE_TABLE (of, bmac_match); | |||
1654 | 1654 | ||
1655 | static struct macio_driver bmac_driver = | 1655 | static struct macio_driver bmac_driver = |
1656 | { | 1656 | { |
1657 | .name = "bmac", | 1657 | .driver = { |
1658 | .match_table = bmac_match, | 1658 | .name = "bmac", |
1659 | .owner = THIS_MODULE, | ||
1660 | .of_match_table = bmac_match, | ||
1661 | }, | ||
1659 | .probe = bmac_probe, | 1662 | .probe = bmac_probe, |
1660 | .remove = bmac_remove, | 1663 | .remove = bmac_remove, |
1661 | #ifdef CONFIG_PM | 1664 | #ifdef CONFIG_PM |
diff --git a/drivers/net/can/mscan/mpc5xxx_can.c b/drivers/net/can/mscan/mpc5xxx_can.c index 8af8442c694..af753936e83 100644 --- a/drivers/net/can/mscan/mpc5xxx_can.c +++ b/drivers/net/can/mscan/mpc5xxx_can.c | |||
@@ -73,7 +73,7 @@ static u32 __devinit mpc52xx_can_get_clock(struct of_device *ofdev, | |||
73 | else | 73 | else |
74 | *mscan_clksrc = MSCAN_CLKSRC_XTAL; | 74 | *mscan_clksrc = MSCAN_CLKSRC_XTAL; |
75 | 75 | ||
76 | freq = mpc5xxx_get_bus_frequency(ofdev->node); | 76 | freq = mpc5xxx_get_bus_frequency(ofdev->dev.of_node); |
77 | if (!freq) | 77 | if (!freq) |
78 | return 0; | 78 | return 0; |
79 | 79 | ||
@@ -152,7 +152,7 @@ static u32 __devinit mpc512x_can_get_clock(struct of_device *ofdev, | |||
152 | } | 152 | } |
153 | 153 | ||
154 | /* Determine the MSCAN device index from the physical address */ | 154 | /* Determine the MSCAN device index from the physical address */ |
155 | pval = of_get_property(ofdev->node, "reg", &plen); | 155 | pval = of_get_property(ofdev->dev.of_node, "reg", &plen); |
156 | BUG_ON(!pval || plen < sizeof(*pval)); | 156 | BUG_ON(!pval || plen < sizeof(*pval)); |
157 | clockidx = (*pval & 0x80) ? 1 : 0; | 157 | clockidx = (*pval & 0x80) ? 1 : 0; |
158 | if (*pval & 0x2000) | 158 | if (*pval & 0x2000) |
@@ -168,11 +168,11 @@ static u32 __devinit mpc512x_can_get_clock(struct of_device *ofdev, | |||
168 | */ | 168 | */ |
169 | if (clock_name && !strcmp(clock_name, "ip")) { | 169 | if (clock_name && !strcmp(clock_name, "ip")) { |
170 | *mscan_clksrc = MSCAN_CLKSRC_IPS; | 170 | *mscan_clksrc = MSCAN_CLKSRC_IPS; |
171 | freq = mpc5xxx_get_bus_frequency(ofdev->node); | 171 | freq = mpc5xxx_get_bus_frequency(ofdev->dev.of_node); |
172 | } else { | 172 | } else { |
173 | *mscan_clksrc = MSCAN_CLKSRC_BUS; | 173 | *mscan_clksrc = MSCAN_CLKSRC_BUS; |
174 | 174 | ||
175 | pval = of_get_property(ofdev->node, | 175 | pval = of_get_property(ofdev->dev.of_node, |
176 | "fsl,mscan-clock-divider", &plen); | 176 | "fsl,mscan-clock-divider", &plen); |
177 | if (pval && plen == sizeof(*pval)) | 177 | if (pval && plen == sizeof(*pval)) |
178 | clockdiv = *pval; | 178 | clockdiv = *pval; |
@@ -251,7 +251,7 @@ static int __devinit mpc5xxx_can_probe(struct of_device *ofdev, | |||
251 | const struct of_device_id *id) | 251 | const struct of_device_id *id) |
252 | { | 252 | { |
253 | struct mpc5xxx_can_data *data = (struct mpc5xxx_can_data *)id->data; | 253 | struct mpc5xxx_can_data *data = (struct mpc5xxx_can_data *)id->data; |
254 | struct device_node *np = ofdev->node; | 254 | struct device_node *np = ofdev->dev.of_node; |
255 | struct net_device *dev; | 255 | struct net_device *dev; |
256 | struct mscan_priv *priv; | 256 | struct mscan_priv *priv; |
257 | void __iomem *base; | 257 | void __iomem *base; |
diff --git a/drivers/net/fs_enet/mac-fcc.c b/drivers/net/fs_enet/mac-fcc.c index 5d45084b287..48e91b6242c 100644 --- a/drivers/net/fs_enet/mac-fcc.c +++ b/drivers/net/fs_enet/mac-fcc.c | |||
@@ -504,17 +504,54 @@ static int get_regs_len(struct net_device *dev) | |||
504 | } | 504 | } |
505 | 505 | ||
506 | /* Some transmit errors cause the transmitter to shut | 506 | /* Some transmit errors cause the transmitter to shut |
507 | * down. We now issue a restart transmit. Since the | 507 | * down. We now issue a restart transmit. |
508 | * errors close the BD and update the pointers, the restart | 508 | * Also, to workaround 8260 device erratum CPM37, we must |
509 | * _should_ pick up without having to reset any of our | 509 | * disable and then re-enable the transmitterfollowing a |
510 | * pointers either. Also, To workaround 8260 device erratum | 510 | * Late Collision, Underrun, or Retry Limit error. |
511 | * CPM37, we must disable and then re-enable the transmitter | 511 | * In addition, tbptr may point beyond BDs beyond still marked |
512 | * following a Late Collision, Underrun, or Retry Limit error. | 512 | * as ready due to internal pipelining, so we need to look back |
513 | * through the BDs and adjust tbptr to point to the last BD | ||
514 | * marked as ready. This may result in some buffers being | ||
515 | * retransmitted. | ||
513 | */ | 516 | */ |
514 | static void tx_restart(struct net_device *dev) | 517 | static void tx_restart(struct net_device *dev) |
515 | { | 518 | { |
516 | struct fs_enet_private *fep = netdev_priv(dev); | 519 | struct fs_enet_private *fep = netdev_priv(dev); |
517 | fcc_t __iomem *fccp = fep->fcc.fccp; | 520 | fcc_t __iomem *fccp = fep->fcc.fccp; |
521 | const struct fs_platform_info *fpi = fep->fpi; | ||
522 | fcc_enet_t __iomem *ep = fep->fcc.ep; | ||
523 | cbd_t __iomem *curr_tbptr; | ||
524 | cbd_t __iomem *recheck_bd; | ||
525 | cbd_t __iomem *prev_bd; | ||
526 | cbd_t __iomem *last_tx_bd; | ||
527 | |||
528 | last_tx_bd = fep->tx_bd_base + (fpi->tx_ring * sizeof(cbd_t)); | ||
529 | |||
530 | /* get the current bd held in TBPTR and scan back from this point */ | ||
531 | recheck_bd = curr_tbptr = (cbd_t __iomem *) | ||
532 | ((R32(ep, fen_genfcc.fcc_tbptr) - fep->ring_mem_addr) + | ||
533 | fep->ring_base); | ||
534 | |||
535 | prev_bd = (recheck_bd == fep->tx_bd_base) ? last_tx_bd : recheck_bd - 1; | ||
536 | |||
537 | /* Move through the bds in reverse, look for the earliest buffer | ||
538 | * that is not ready. Adjust TBPTR to the following buffer */ | ||
539 | while ((CBDR_SC(prev_bd) & BD_ENET_TX_READY) != 0) { | ||
540 | /* Go back one buffer */ | ||
541 | recheck_bd = prev_bd; | ||
542 | |||
543 | /* update the previous buffer */ | ||
544 | prev_bd = (prev_bd == fep->tx_bd_base) ? last_tx_bd : prev_bd - 1; | ||
545 | |||
546 | /* We should never see all bds marked as ready, check anyway */ | ||
547 | if (recheck_bd == curr_tbptr) | ||
548 | break; | ||
549 | } | ||
550 | /* Now update the TBPTR and dirty flag to the current buffer */ | ||
551 | W32(ep, fen_genfcc.fcc_tbptr, | ||
552 | (uint) (((void *)recheck_bd - fep->ring_base) + | ||
553 | fep->ring_mem_addr)); | ||
554 | fep->dirty_tx = recheck_bd; | ||
518 | 555 | ||
519 | C32(fccp, fcc_gfmr, FCC_GFMR_ENT); | 556 | C32(fccp, fcc_gfmr, FCC_GFMR_ENT); |
520 | udelay(10); | 557 | udelay(10); |
diff --git a/drivers/net/fs_enet/mii-bitbang.c b/drivers/net/fs_enet/mii-bitbang.c index 0f90685d3d1..3607340f3da 100644 --- a/drivers/net/fs_enet/mii-bitbang.c +++ b/drivers/net/fs_enet/mii-bitbang.c | |||
@@ -169,7 +169,7 @@ static int __devinit fs_enet_mdio_probe(struct of_device *ofdev, | |||
169 | 169 | ||
170 | new_bus->name = "CPM2 Bitbanged MII", | 170 | new_bus->name = "CPM2 Bitbanged MII", |
171 | 171 | ||
172 | ret = fs_mii_bitbang_init(new_bus, ofdev->node); | 172 | ret = fs_mii_bitbang_init(new_bus, ofdev->dev.of_node); |
173 | if (ret) | 173 | if (ret) |
174 | goto out_free_bus; | 174 | goto out_free_bus; |
175 | 175 | ||
@@ -181,7 +181,7 @@ static int __devinit fs_enet_mdio_probe(struct of_device *ofdev, | |||
181 | new_bus->parent = &ofdev->dev; | 181 | new_bus->parent = &ofdev->dev; |
182 | dev_set_drvdata(&ofdev->dev, new_bus); | 182 | dev_set_drvdata(&ofdev->dev, new_bus); |
183 | 183 | ||
184 | ret = of_mdiobus_register(new_bus, ofdev->node); | 184 | ret = of_mdiobus_register(new_bus, ofdev->dev.of_node); |
185 | if (ret) | 185 | if (ret) |
186 | goto out_free_irqs; | 186 | goto out_free_irqs; |
187 | 187 | ||
diff --git a/drivers/net/greth.c b/drivers/net/greth.c index f37a4c143dd..3a029d02c2b 100644 --- a/drivers/net/greth.c +++ b/drivers/net/greth.c | |||
@@ -1607,14 +1607,13 @@ static struct of_device_id greth_of_match[] = { | |||
1607 | MODULE_DEVICE_TABLE(of, greth_of_match); | 1607 | MODULE_DEVICE_TABLE(of, greth_of_match); |
1608 | 1608 | ||
1609 | static struct of_platform_driver greth_of_driver = { | 1609 | static struct of_platform_driver greth_of_driver = { |
1610 | .name = "grlib-greth", | 1610 | .driver = { |
1611 | .match_table = greth_of_match, | 1611 | .name = "grlib-greth", |
1612 | .owner = THIS_MODULE, | ||
1613 | .of_match_table = greth_of_match, | ||
1614 | }, | ||
1612 | .probe = greth_of_probe, | 1615 | .probe = greth_of_probe, |
1613 | .remove = __devexit_p(greth_of_remove), | 1616 | .remove = __devexit_p(greth_of_remove), |
1614 | .driver = { | ||
1615 | .owner = THIS_MODULE, | ||
1616 | .name = "grlib-greth", | ||
1617 | }, | ||
1618 | }; | 1617 | }; |
1619 | 1618 | ||
1620 | static int __init greth_init(void) | 1619 | static int __init greth_init(void) |
diff --git a/drivers/net/ksz884x.c b/drivers/net/ksz884x.c index c80ca64277b..7805bbf1d53 100644 --- a/drivers/net/ksz884x.c +++ b/drivers/net/ksz884x.c | |||
@@ -4854,7 +4854,7 @@ static inline void copy_old_skb(struct sk_buff *old, struct sk_buff *skb) | |||
4854 | * | 4854 | * |
4855 | * Return 0 if successful; otherwise an error code indicating failure. | 4855 | * Return 0 if successful; otherwise an error code indicating failure. |
4856 | */ | 4856 | */ |
4857 | static int netdev_tx(struct sk_buff *skb, struct net_device *dev) | 4857 | static netdev_tx_t netdev_tx(struct sk_buff *skb, struct net_device *dev) |
4858 | { | 4858 | { |
4859 | struct dev_priv *priv = netdev_priv(dev); | 4859 | struct dev_priv *priv = netdev_priv(dev); |
4860 | struct dev_info *hw_priv = priv->adapter; | 4860 | struct dev_info *hw_priv = priv->adapter; |
@@ -6863,6 +6863,7 @@ static const struct net_device_ops netdev_ops = { | |||
6863 | .ndo_tx_timeout = netdev_tx_timeout, | 6863 | .ndo_tx_timeout = netdev_tx_timeout, |
6864 | .ndo_change_mtu = netdev_change_mtu, | 6864 | .ndo_change_mtu = netdev_change_mtu, |
6865 | .ndo_set_mac_address = netdev_set_mac_address, | 6865 | .ndo_set_mac_address = netdev_set_mac_address, |
6866 | .ndo_validate_addr = eth_validate_addr, | ||
6866 | .ndo_do_ioctl = netdev_ioctl, | 6867 | .ndo_do_ioctl = netdev_ioctl, |
6867 | .ndo_set_rx_mode = netdev_set_rx_mode, | 6868 | .ndo_set_rx_mode = netdev_set_rx_mode, |
6868 | #ifdef CONFIG_NET_POLL_CONTROLLER | 6869 | #ifdef CONFIG_NET_POLL_CONTROLLER |
diff --git a/drivers/net/mace.c b/drivers/net/mace.c index b6855a6476f..1c5221f79d6 100644 --- a/drivers/net/mace.c +++ b/drivers/net/mace.c | |||
@@ -997,8 +997,11 @@ MODULE_DEVICE_TABLE (of, mace_match); | |||
997 | 997 | ||
998 | static struct macio_driver mace_driver = | 998 | static struct macio_driver mace_driver = |
999 | { | 999 | { |
1000 | .name = "mace", | 1000 | .driver = { |
1001 | .match_table = mace_match, | 1001 | .name = "mace", |
1002 | .owner = THIS_MODULE, | ||
1003 | .of_match_table = mace_match, | ||
1004 | }, | ||
1002 | .probe = mace_probe, | 1005 | .probe = mace_probe, |
1003 | .remove = mace_remove, | 1006 | .remove = mace_remove, |
1004 | }; | 1007 | }; |
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 78eb3190b9b..1edb7a61983 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c | |||
@@ -340,7 +340,7 @@ static int add_recvbuf_small(struct virtnet_info *vi, gfp_t gfp) | |||
340 | 340 | ||
341 | skb_to_sgvec(skb, vi->rx_sg + 1, 0, skb->len); | 341 | skb_to_sgvec(skb, vi->rx_sg + 1, 0, skb->len); |
342 | 342 | ||
343 | err = virtqueue_add_buf(vi->rvq, vi->rx_sg, 0, 2, skb); | 343 | err = virtqueue_add_buf_gfp(vi->rvq, vi->rx_sg, 0, 2, skb, gfp); |
344 | if (err < 0) | 344 | if (err < 0) |
345 | dev_kfree_skb(skb); | 345 | dev_kfree_skb(skb); |
346 | 346 | ||
@@ -385,8 +385,8 @@ static int add_recvbuf_big(struct virtnet_info *vi, gfp_t gfp) | |||
385 | 385 | ||
386 | /* chain first in list head */ | 386 | /* chain first in list head */ |
387 | first->private = (unsigned long)list; | 387 | first->private = (unsigned long)list; |
388 | err = virtqueue_add_buf(vi->rvq, vi->rx_sg, 0, MAX_SKB_FRAGS + 2, | 388 | err = virtqueue_add_buf_gfp(vi->rvq, vi->rx_sg, 0, MAX_SKB_FRAGS + 2, |
389 | first); | 389 | first, gfp); |
390 | if (err < 0) | 390 | if (err < 0) |
391 | give_pages(vi, first); | 391 | give_pages(vi, first); |
392 | 392 | ||
@@ -404,7 +404,7 @@ static int add_recvbuf_mergeable(struct virtnet_info *vi, gfp_t gfp) | |||
404 | 404 | ||
405 | sg_init_one(vi->rx_sg, page_address(page), PAGE_SIZE); | 405 | sg_init_one(vi->rx_sg, page_address(page), PAGE_SIZE); |
406 | 406 | ||
407 | err = virtqueue_add_buf(vi->rvq, vi->rx_sg, 0, 1, page); | 407 | err = virtqueue_add_buf_gfp(vi->rvq, vi->rx_sg, 0, 1, page, gfp); |
408 | if (err < 0) | 408 | if (err < 0) |
409 | give_pages(vi, page); | 409 | give_pages(vi, page); |
410 | 410 | ||
diff --git a/drivers/net/wireless/ath/ar9170/usb.c b/drivers/net/wireless/ath/ar9170/usb.c index 82ab532a492..a93dc18a45c 100644 --- a/drivers/net/wireless/ath/ar9170/usb.c +++ b/drivers/net/wireless/ath/ar9170/usb.c | |||
@@ -739,17 +739,27 @@ err_out: | |||
739 | static void ar9170_usb_firmware_failed(struct ar9170_usb *aru) | 739 | static void ar9170_usb_firmware_failed(struct ar9170_usb *aru) |
740 | { | 740 | { |
741 | struct device *parent = aru->udev->dev.parent; | 741 | struct device *parent = aru->udev->dev.parent; |
742 | struct usb_device *udev; | ||
743 | |||
744 | /* | ||
745 | * Store a copy of the usb_device pointer locally. | ||
746 | * This is because device_release_driver initiates | ||
747 | * ar9170_usb_disconnect, which in turn frees our | ||
748 | * driver context (aru). | ||
749 | */ | ||
750 | udev = aru->udev; | ||
742 | 751 | ||
743 | complete(&aru->firmware_loading_complete); | 752 | complete(&aru->firmware_loading_complete); |
744 | 753 | ||
745 | /* unbind anything failed */ | 754 | /* unbind anything failed */ |
746 | if (parent) | 755 | if (parent) |
747 | device_lock(parent); | 756 | device_lock(parent); |
748 | device_release_driver(&aru->udev->dev); | 757 | |
758 | device_release_driver(&udev->dev); | ||
749 | if (parent) | 759 | if (parent) |
750 | device_unlock(parent); | 760 | device_unlock(parent); |
751 | 761 | ||
752 | usb_put_dev(aru->udev); | 762 | usb_put_dev(udev); |
753 | } | 763 | } |
754 | 764 | ||
755 | static void ar9170_usb_firmware_finish(const struct firmware *fw, void *context) | 765 | static void ar9170_usb_firmware_finish(const struct firmware *fw, void *context) |
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c index 3db19172b43..859aa4ab076 100644 --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c | |||
@@ -1198,7 +1198,7 @@ void ath_drain_all_txq(struct ath_softc *sc, bool retry_tx) | |||
1198 | int r; | 1198 | int r; |
1199 | 1199 | ||
1200 | ath_print(common, ATH_DBG_FATAL, | 1200 | ath_print(common, ATH_DBG_FATAL, |
1201 | "Unable to stop TxDMA. Reset HAL!\n"); | 1201 | "Failed to stop TX DMA. Resetting hardware!\n"); |
1202 | 1202 | ||
1203 | spin_lock_bh(&sc->sc_resetlock); | 1203 | spin_lock_bh(&sc->sc_resetlock); |
1204 | r = ath9k_hw_reset(ah, sc->sc_ah->curchan, false); | 1204 | r = ath9k_hw_reset(ah, sc->sc_ah->curchan, false); |
@@ -1728,6 +1728,8 @@ static int ath_tx_setup_buffer(struct ieee80211_hw *hw, struct ath_buf *bf, | |||
1728 | } else | 1728 | } else |
1729 | bf->bf_isnullfunc = false; | 1729 | bf->bf_isnullfunc = false; |
1730 | 1730 | ||
1731 | bf->bf_tx_aborted = false; | ||
1732 | |||
1731 | return 0; | 1733 | return 0; |
1732 | } | 1734 | } |
1733 | 1735 | ||
@@ -1989,7 +1991,7 @@ static int ath_tx_num_badfrms(struct ath_softc *sc, struct ath_buf *bf, | |||
1989 | int nbad = 0; | 1991 | int nbad = 0; |
1990 | int isaggr = 0; | 1992 | int isaggr = 0; |
1991 | 1993 | ||
1992 | if (bf->bf_tx_aborted) | 1994 | if (bf->bf_lastbf->bf_tx_aborted) |
1993 | return 0; | 1995 | return 0; |
1994 | 1996 | ||
1995 | isaggr = bf_isaggr(bf); | 1997 | isaggr = bf_isaggr(bf); |
diff --git a/drivers/net/wireless/libertas/rx.c b/drivers/net/wireless/libertas/rx.c index a115bfa9513..7a377f5b766 100644 --- a/drivers/net/wireless/libertas/rx.c +++ b/drivers/net/wireless/libertas/rx.c | |||
@@ -329,9 +329,8 @@ static int process_rxed_802_11_packet(struct lbs_private *priv, | |||
329 | /* create the exported radio header */ | 329 | /* create the exported radio header */ |
330 | 330 | ||
331 | /* radiotap header */ | 331 | /* radiotap header */ |
332 | radiotap_hdr.hdr.it_version = 0; | 332 | memset(&radiotap_hdr, 0, sizeof(radiotap_hdr)); |
333 | /* XXX must check this value for pad */ | 333 | /* XXX must check radiotap_hdr.hdr.it_pad for pad */ |
334 | radiotap_hdr.hdr.it_pad = 0; | ||
335 | radiotap_hdr.hdr.it_len = cpu_to_le16 (sizeof(struct rx_radiotap_hdr)); | 334 | radiotap_hdr.hdr.it_len = cpu_to_le16 (sizeof(struct rx_radiotap_hdr)); |
336 | radiotap_hdr.hdr.it_present = cpu_to_le32 (RX_RADIOTAP_PRESENT); | 335 | radiotap_hdr.hdr.it_present = cpu_to_le32 (RX_RADIOTAP_PRESENT); |
337 | radiotap_hdr.rate = convert_mv_rate_to_radiotap(prxpd->rx_rate); | 336 | radiotap_hdr.rate = convert_mv_rate_to_radiotap(prxpd->rx_rate); |
diff --git a/drivers/net/wireless/orinoco/airport.c b/drivers/net/wireless/orinoco/airport.c index 9bcee10c930..4a0a0e5265c 100644 --- a/drivers/net/wireless/orinoco/airport.c +++ b/drivers/net/wireless/orinoco/airport.c | |||
@@ -239,8 +239,11 @@ static struct of_device_id airport_match[] = | |||
239 | MODULE_DEVICE_TABLE(of, airport_match); | 239 | MODULE_DEVICE_TABLE(of, airport_match); |
240 | 240 | ||
241 | static struct macio_driver airport_driver = { | 241 | static struct macio_driver airport_driver = { |
242 | .name = DRIVER_NAME, | 242 | .driver = { |
243 | .match_table = airport_match, | 243 | .name = DRIVER_NAME, |
244 | .owner = THIS_MODULE, | ||
245 | .of_match_table = airport_match, | ||
246 | }, | ||
244 | .probe = airport_attach, | 247 | .probe = airport_attach, |
245 | .remove = airport_detach, | 248 | .remove = airport_detach, |
246 | .suspend = airport_suspend, | 249 | .suspend = airport_suspend, |
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c index 699161327d6..0f8b84b7224 100644 --- a/drivers/net/wireless/rt2x00/rt2800usb.c +++ b/drivers/net/wireless/rt2x00/rt2800usb.c | |||
@@ -413,7 +413,7 @@ static void rt2800usb_write_tx_desc(struct rt2x00_dev *rt2x00dev, | |||
413 | */ | 413 | */ |
414 | rt2x00_desc_read(txi, 0, &word); | 414 | rt2x00_desc_read(txi, 0, &word); |
415 | rt2x00_set_field32(&word, TXINFO_W0_USB_DMA_TX_PKT_LEN, | 415 | rt2x00_set_field32(&word, TXINFO_W0_USB_DMA_TX_PKT_LEN, |
416 | skb->len - TXINFO_DESC_SIZE); | 416 | skb->len + TXWI_DESC_SIZE); |
417 | rt2x00_set_field32(&word, TXINFO_W0_WIV, | 417 | rt2x00_set_field32(&word, TXINFO_W0_WIV, |
418 | !test_bit(ENTRY_TXD_ENCRYPT_IV, &txdesc->flags)); | 418 | !test_bit(ENTRY_TXD_ENCRYPT_IV, &txdesc->flags)); |
419 | rt2x00_set_field32(&word, TXINFO_W0_QSEL, 2); | 419 | rt2x00_set_field32(&word, TXINFO_W0_QSEL, 2); |
diff --git a/drivers/pcmcia/m8xx_pcmcia.c b/drivers/pcmcia/m8xx_pcmcia.c index 1a648b90b63..25e5e30a18a 100644 --- a/drivers/pcmcia/m8xx_pcmcia.c +++ b/drivers/pcmcia/m8xx_pcmcia.c | |||
@@ -1157,7 +1157,7 @@ static int __init m8xx_probe(struct of_device *ofdev, | |||
1157 | unsigned int i, m, hwirq; | 1157 | unsigned int i, m, hwirq; |
1158 | pcmconf8xx_t *pcmcia; | 1158 | pcmconf8xx_t *pcmcia; |
1159 | int status; | 1159 | int status; |
1160 | struct device_node *np = ofdev->node; | 1160 | struct device_node *np = ofdev->dev.of_node; |
1161 | 1161 | ||
1162 | pcmcia_info("%s\n", version); | 1162 | pcmcia_info("%s\n", version); |
1163 | 1163 | ||
@@ -1301,7 +1301,7 @@ static struct of_platform_driver m8xx_pcmcia_driver = { | |||
1301 | .driver = { | 1301 | .driver = { |
1302 | .name = driver_name, | 1302 | .name = driver_name, |
1303 | .owner = THIS_MODULE, | 1303 | .owner = THIS_MODULE, |
1304 | .match_table = m8xx_pcmcia_match, | 1304 | .of_match_table = m8xx_pcmcia_match, |
1305 | }, | 1305 | }, |
1306 | .probe = m8xx_probe, | 1306 | .probe = m8xx_probe, |
1307 | .remove = m8xx_remove, | 1307 | .remove = m8xx_remove, |
diff --git a/drivers/platform/x86/intel_scu_ipc.c b/drivers/platform/x86/intel_scu_ipc.c index 576c3ed9243..40658e3385b 100644 --- a/drivers/platform/x86/intel_scu_ipc.c +++ b/drivers/platform/x86/intel_scu_ipc.c | |||
@@ -524,7 +524,7 @@ int intel_scu_ipc_command(int cmd, int sub, u32 *in, int inlen, | |||
524 | for (i = 0; i < inlen; i++) | 524 | for (i = 0; i < inlen; i++) |
525 | ipc_data_writel(*in++, 4 * i); | 525 | ipc_data_writel(*in++, 4 * i); |
526 | 526 | ||
527 | ipc_command(cmd << 12 | sub); | 527 | ipc_command((cmd << 12) | sub | (inlen << 18)); |
528 | err = busy_loop(); | 528 | err = busy_loop(); |
529 | 529 | ||
530 | for (i = 0; i < outlen; i++) | 530 | for (i = 0; i < outlen; i++) |
diff --git a/drivers/power/max17040_battery.c b/drivers/power/max17040_battery.c index f3e22c9fe20..2f2f9a6f54f 100644 --- a/drivers/power/max17040_battery.c +++ b/drivers/power/max17040_battery.c | |||
@@ -225,7 +225,6 @@ static int __devinit max17040_probe(struct i2c_client *client, | |||
225 | ret = power_supply_register(&client->dev, &chip->battery); | 225 | ret = power_supply_register(&client->dev, &chip->battery); |
226 | if (ret) { | 226 | if (ret) { |
227 | dev_err(&client->dev, "failed: power supply register\n"); | 227 | dev_err(&client->dev, "failed: power supply register\n"); |
228 | i2c_set_clientdata(client, NULL); | ||
229 | kfree(chip); | 228 | kfree(chip); |
230 | return ret; | 229 | return ret; |
231 | } | 230 | } |
@@ -245,7 +244,6 @@ static int __devexit max17040_remove(struct i2c_client *client) | |||
245 | 244 | ||
246 | power_supply_unregister(&chip->battery); | 245 | power_supply_unregister(&chip->battery); |
247 | cancel_delayed_work(&chip->work); | 246 | cancel_delayed_work(&chip->work); |
248 | i2c_set_clientdata(client, NULL); | ||
249 | kfree(chip); | 247 | kfree(chip); |
250 | return 0; | 248 | return 0; |
251 | } | 249 | } |
diff --git a/drivers/regulator/lp3971.c b/drivers/regulator/lp3971.c index 671a7d1f1f0..8ae3732eb24 100644 --- a/drivers/regulator/lp3971.c +++ b/drivers/regulator/lp3971.c | |||
@@ -519,8 +519,6 @@ static int __devexit lp3971_i2c_remove(struct i2c_client *i2c) | |||
519 | struct lp3971 *lp3971 = i2c_get_clientdata(i2c); | 519 | struct lp3971 *lp3971 = i2c_get_clientdata(i2c); |
520 | int i; | 520 | int i; |
521 | 521 | ||
522 | i2c_set_clientdata(i2c, NULL); | ||
523 | |||
524 | for (i = 0; i < lp3971->num_regulators; i++) | 522 | for (i = 0; i < lp3971->num_regulators; i++) |
525 | regulator_unregister(lp3971->rdev[i]); | 523 | regulator_unregister(lp3971->rdev[i]); |
526 | 524 | ||
diff --git a/drivers/regulator/max1586.c b/drivers/regulator/max1586.c index b3c1afc1688..2b54d9d75f1 100644 --- a/drivers/regulator/max1586.c +++ b/drivers/regulator/max1586.c | |||
@@ -244,7 +244,6 @@ static int __devexit max1586_pmic_remove(struct i2c_client *client) | |||
244 | for (i = 0; i <= MAX1586_V6; i++) | 244 | for (i = 0; i <= MAX1586_V6; i++) |
245 | if (rdev[i]) | 245 | if (rdev[i]) |
246 | regulator_unregister(rdev[i]); | 246 | regulator_unregister(rdev[i]); |
247 | i2c_set_clientdata(client, NULL); | ||
248 | kfree(rdev); | 247 | kfree(rdev); |
249 | 248 | ||
250 | return 0; | 249 | return 0; |
diff --git a/drivers/regulator/max8649.c b/drivers/regulator/max8649.c index bfc4c5ffdc9..4520ace3f7e 100644 --- a/drivers/regulator/max8649.c +++ b/drivers/regulator/max8649.c | |||
@@ -357,7 +357,6 @@ static int __devinit max8649_regulator_probe(struct i2c_client *client, | |||
357 | dev_info(info->dev, "Max8649 regulator device is detected.\n"); | 357 | dev_info(info->dev, "Max8649 regulator device is detected.\n"); |
358 | return 0; | 358 | return 0; |
359 | out: | 359 | out: |
360 | i2c_set_clientdata(client, NULL); | ||
361 | kfree(info); | 360 | kfree(info); |
362 | return ret; | 361 | return ret; |
363 | } | 362 | } |
@@ -369,7 +368,6 @@ static int __devexit max8649_regulator_remove(struct i2c_client *client) | |||
369 | if (info) { | 368 | if (info) { |
370 | if (info->regulator) | 369 | if (info->regulator) |
371 | regulator_unregister(info->regulator); | 370 | regulator_unregister(info->regulator); |
372 | i2c_set_clientdata(client, NULL); | ||
373 | kfree(info); | 371 | kfree(info); |
374 | } | 372 | } |
375 | 373 | ||
diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c index 3790b21879f..d97220efae5 100644 --- a/drivers/regulator/max8660.c +++ b/drivers/regulator/max8660.c | |||
@@ -471,7 +471,6 @@ static int __devexit max8660_remove(struct i2c_client *client) | |||
471 | for (i = 0; i < MAX8660_V_END; i++) | 471 | for (i = 0; i < MAX8660_V_END; i++) |
472 | if (rdev[i]) | 472 | if (rdev[i]) |
473 | regulator_unregister(rdev[i]); | 473 | regulator_unregister(rdev[i]); |
474 | i2c_set_clientdata(client, NULL); | ||
475 | kfree(rdev); | 474 | kfree(rdev); |
476 | 475 | ||
477 | return 0; | 476 | return 0; |
diff --git a/drivers/regulator/tps65023-regulator.c b/drivers/regulator/tps65023-regulator.c index 8e2f2098b00..f50afc9f287 100644 --- a/drivers/regulator/tps65023-regulator.c +++ b/drivers/regulator/tps65023-regulator.c | |||
@@ -538,9 +538,6 @@ static int __devexit tps_65023_remove(struct i2c_client *client) | |||
538 | struct tps_pmic *tps = i2c_get_clientdata(client); | 538 | struct tps_pmic *tps = i2c_get_clientdata(client); |
539 | int i; | 539 | int i; |
540 | 540 | ||
541 | /* clear the client data in i2c */ | ||
542 | i2c_set_clientdata(client, NULL); | ||
543 | |||
544 | for (i = 0; i < TPS65023_NUM_REGULATOR; i++) | 541 | for (i = 0; i < TPS65023_NUM_REGULATOR; i++) |
545 | regulator_unregister(tps->rdev[i]); | 542 | regulator_unregister(tps->rdev[i]); |
546 | 543 | ||
diff --git a/drivers/rtc/rtc-ds1374.c b/drivers/rtc/rtc-ds1374.c index 61945734ad0..1f0007fd443 100644 --- a/drivers/rtc/rtc-ds1374.c +++ b/drivers/rtc/rtc-ds1374.c | |||
@@ -403,7 +403,6 @@ out_irq: | |||
403 | free_irq(client->irq, client); | 403 | free_irq(client->irq, client); |
404 | 404 | ||
405 | out_free: | 405 | out_free: |
406 | i2c_set_clientdata(client, NULL); | ||
407 | kfree(ds1374); | 406 | kfree(ds1374); |
408 | return ret; | 407 | return ret; |
409 | } | 408 | } |
@@ -422,7 +421,6 @@ static int __devexit ds1374_remove(struct i2c_client *client) | |||
422 | } | 421 | } |
423 | 422 | ||
424 | rtc_device_unregister(ds1374->rtc); | 423 | rtc_device_unregister(ds1374->rtc); |
425 | i2c_set_clientdata(client, NULL); | ||
426 | kfree(ds1374); | 424 | kfree(ds1374); |
427 | return 0; | 425 | return 0; |
428 | } | 426 | } |
diff --git a/drivers/rtc/rtc-mpc5121.c b/drivers/rtc/rtc-mpc5121.c index f0dbf9cb8f9..db5d8c416d2 100644 --- a/drivers/rtc/rtc-mpc5121.c +++ b/drivers/rtc/rtc-mpc5121.c | |||
@@ -279,7 +279,7 @@ static int __devinit mpc5121_rtc_probe(struct of_device *op, | |||
279 | if (!rtc) | 279 | if (!rtc) |
280 | return -ENOMEM; | 280 | return -ENOMEM; |
281 | 281 | ||
282 | rtc->regs = of_iomap(op->node, 0); | 282 | rtc->regs = of_iomap(op->dev.of_node, 0); |
283 | if (!rtc->regs) { | 283 | if (!rtc->regs) { |
284 | dev_err(&op->dev, "%s: couldn't map io space\n", __func__); | 284 | dev_err(&op->dev, "%s: couldn't map io space\n", __func__); |
285 | err = -ENOSYS; | 285 | err = -ENOSYS; |
@@ -290,7 +290,7 @@ static int __devinit mpc5121_rtc_probe(struct of_device *op, | |||
290 | 290 | ||
291 | dev_set_drvdata(&op->dev, rtc); | 291 | dev_set_drvdata(&op->dev, rtc); |
292 | 292 | ||
293 | rtc->irq = irq_of_parse_and_map(op->node, 1); | 293 | rtc->irq = irq_of_parse_and_map(op->dev.of_node, 1); |
294 | err = request_irq(rtc->irq, mpc5121_rtc_handler, IRQF_DISABLED, | 294 | err = request_irq(rtc->irq, mpc5121_rtc_handler, IRQF_DISABLED, |
295 | "mpc5121-rtc", &op->dev); | 295 | "mpc5121-rtc", &op->dev); |
296 | if (err) { | 296 | if (err) { |
@@ -299,7 +299,7 @@ static int __devinit mpc5121_rtc_probe(struct of_device *op, | |||
299 | goto out_dispose; | 299 | goto out_dispose; |
300 | } | 300 | } |
301 | 301 | ||
302 | rtc->irq_periodic = irq_of_parse_and_map(op->node, 0); | 302 | rtc->irq_periodic = irq_of_parse_and_map(op->dev.of_node, 0); |
303 | err = request_irq(rtc->irq_periodic, mpc5121_rtc_handler_upd, | 303 | err = request_irq(rtc->irq_periodic, mpc5121_rtc_handler_upd, |
304 | IRQF_DISABLED, "mpc5121-rtc_upd", &op->dev); | 304 | IRQF_DISABLED, "mpc5121-rtc_upd", &op->dev); |
305 | if (err) { | 305 | if (err) { |
@@ -365,9 +365,11 @@ static struct of_device_id mpc5121_rtc_match[] __devinitdata = { | |||
365 | }; | 365 | }; |
366 | 366 | ||
367 | static struct of_platform_driver mpc5121_rtc_driver = { | 367 | static struct of_platform_driver mpc5121_rtc_driver = { |
368 | .owner = THIS_MODULE, | 368 | .driver = { |
369 | .name = "mpc5121-rtc", | 369 | .name = "mpc5121-rtc", |
370 | .match_table = mpc5121_rtc_match, | 370 | .owner = THIS_MODULE, |
371 | .of_match_table = mpc5121_rtc_match, | ||
372 | }, | ||
371 | .probe = mpc5121_rtc_probe, | 373 | .probe = mpc5121_rtc_probe, |
372 | .remove = __devexit_p(mpc5121_rtc_remove), | 374 | .remove = __devexit_p(mpc5121_rtc_remove), |
373 | }; | 375 | }; |
diff --git a/drivers/rtc/rtc-rx8025.c b/drivers/rtc/rtc-rx8025.c index b65c82f792d..789f62f9b47 100644 --- a/drivers/rtc/rtc-rx8025.c +++ b/drivers/rtc/rtc-rx8025.c | |||
@@ -632,7 +632,6 @@ errout_reg: | |||
632 | rtc_device_unregister(rx8025->rtc); | 632 | rtc_device_unregister(rx8025->rtc); |
633 | 633 | ||
634 | errout_free: | 634 | errout_free: |
635 | i2c_set_clientdata(client, NULL); | ||
636 | kfree(rx8025); | 635 | kfree(rx8025); |
637 | 636 | ||
638 | errout: | 637 | errout: |
@@ -656,7 +655,6 @@ static int __devexit rx8025_remove(struct i2c_client *client) | |||
656 | 655 | ||
657 | rx8025_sysfs_unregister(&client->dev); | 656 | rx8025_sysfs_unregister(&client->dev); |
658 | rtc_device_unregister(rx8025->rtc); | 657 | rtc_device_unregister(rx8025->rtc); |
659 | i2c_set_clientdata(client, NULL); | ||
660 | kfree(rx8025); | 658 | kfree(rx8025); |
661 | return 0; | 659 | return 0; |
662 | } | 660 | } |
diff --git a/drivers/rtc/rtc-s35390a.c b/drivers/rtc/rtc-s35390a.c index def4d396d0b..f789e002c9b 100644 --- a/drivers/rtc/rtc-s35390a.c +++ b/drivers/rtc/rtc-s35390a.c | |||
@@ -275,7 +275,6 @@ exit_dummy: | |||
275 | if (s35390a->client[i]) | 275 | if (s35390a->client[i]) |
276 | i2c_unregister_device(s35390a->client[i]); | 276 | i2c_unregister_device(s35390a->client[i]); |
277 | kfree(s35390a); | 277 | kfree(s35390a); |
278 | i2c_set_clientdata(client, NULL); | ||
279 | 278 | ||
280 | exit: | 279 | exit: |
281 | return err; | 280 | return err; |
@@ -292,7 +291,6 @@ static int s35390a_remove(struct i2c_client *client) | |||
292 | 291 | ||
293 | rtc_device_unregister(s35390a->rtc); | 292 | rtc_device_unregister(s35390a->rtc); |
294 | kfree(s35390a); | 293 | kfree(s35390a); |
295 | i2c_set_clientdata(client, NULL); | ||
296 | 294 | ||
297 | return 0; | 295 | return 0; |
298 | } | 296 | } |
diff --git a/drivers/scsi/mac53c94.c b/drivers/scsi/mac53c94.c index 18735b39b3d..3ddb4dc62d5 100644 --- a/drivers/scsi/mac53c94.c +++ b/drivers/scsi/mac53c94.c | |||
@@ -542,8 +542,11 @@ MODULE_DEVICE_TABLE (of, mac53c94_match); | |||
542 | 542 | ||
543 | static struct macio_driver mac53c94_driver = | 543 | static struct macio_driver mac53c94_driver = |
544 | { | 544 | { |
545 | .name = "mac53c94", | 545 | .driver = { |
546 | .match_table = mac53c94_match, | 546 | .name = "mac53c94", |
547 | .owner = THIS_MODULE, | ||
548 | .of_match_table = mac53c94_match, | ||
549 | }, | ||
547 | .probe = mac53c94_probe, | 550 | .probe = mac53c94_probe, |
548 | .remove = mac53c94_remove, | 551 | .remove = mac53c94_remove, |
549 | }; | 552 | }; |
diff --git a/drivers/scsi/mesh.c b/drivers/scsi/mesh.c index a1c97e88068..1f784fde251 100644 --- a/drivers/scsi/mesh.c +++ b/drivers/scsi/mesh.c | |||
@@ -2036,8 +2036,11 @@ MODULE_DEVICE_TABLE (of, mesh_match); | |||
2036 | 2036 | ||
2037 | static struct macio_driver mesh_driver = | 2037 | static struct macio_driver mesh_driver = |
2038 | { | 2038 | { |
2039 | .name = "mesh", | 2039 | .driver = { |
2040 | .match_table = mesh_match, | 2040 | .name = "mesh", |
2041 | .owner = THIS_MODULE, | ||
2042 | .of_match_table = mesh_match, | ||
2043 | }, | ||
2041 | .probe = mesh_probe, | 2044 | .probe = mesh_probe, |
2042 | .remove = mesh_remove, | 2045 | .remove = mesh_remove, |
2043 | .shutdown = mesh_shutdown, | 2046 | .shutdown = mesh_shutdown, |
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 829cc37abc4..8802e48bc06 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c | |||
@@ -97,6 +97,7 @@ MODULE_ALIAS_SCSI_DEVICE(TYPE_RBC); | |||
97 | #endif | 97 | #endif |
98 | 98 | ||
99 | static int sd_revalidate_disk(struct gendisk *); | 99 | static int sd_revalidate_disk(struct gendisk *); |
100 | static void sd_unlock_native_capacity(struct gendisk *disk); | ||
100 | static int sd_probe(struct device *); | 101 | static int sd_probe(struct device *); |
101 | static int sd_remove(struct device *); | 102 | static int sd_remove(struct device *); |
102 | static void sd_shutdown(struct device *); | 103 | static void sd_shutdown(struct device *); |
@@ -1101,6 +1102,7 @@ static const struct block_device_operations sd_fops = { | |||
1101 | #endif | 1102 | #endif |
1102 | .media_changed = sd_media_changed, | 1103 | .media_changed = sd_media_changed, |
1103 | .revalidate_disk = sd_revalidate_disk, | 1104 | .revalidate_disk = sd_revalidate_disk, |
1105 | .unlock_native_capacity = sd_unlock_native_capacity, | ||
1104 | }; | 1106 | }; |
1105 | 1107 | ||
1106 | static unsigned int sd_completed_bytes(struct scsi_cmnd *scmd) | 1108 | static unsigned int sd_completed_bytes(struct scsi_cmnd *scmd) |
@@ -2121,6 +2123,26 @@ static int sd_revalidate_disk(struct gendisk *disk) | |||
2121 | } | 2123 | } |
2122 | 2124 | ||
2123 | /** | 2125 | /** |
2126 | * sd_unlock_native_capacity - unlock native capacity | ||
2127 | * @disk: struct gendisk to set capacity for | ||
2128 | * | ||
2129 | * Block layer calls this function if it detects that partitions | ||
2130 | * on @disk reach beyond the end of the device. If the SCSI host | ||
2131 | * implements ->unlock_native_capacity() method, it's invoked to | ||
2132 | * give it a chance to adjust the device capacity. | ||
2133 | * | ||
2134 | * CONTEXT: | ||
2135 | * Defined by block layer. Might sleep. | ||
2136 | */ | ||
2137 | static void sd_unlock_native_capacity(struct gendisk *disk) | ||
2138 | { | ||
2139 | struct scsi_device *sdev = scsi_disk(disk)->device; | ||
2140 | |||
2141 | if (sdev->host->hostt->unlock_native_capacity) | ||
2142 | sdev->host->hostt->unlock_native_capacity(sdev); | ||
2143 | } | ||
2144 | |||
2145 | /** | ||
2124 | * sd_format_disk_name - format disk name | 2146 | * sd_format_disk_name - format disk name |
2125 | * @prefix: name prefix - ie. "sd" for SCSI disks | 2147 | * @prefix: name prefix - ie. "sd" for SCSI disks |
2126 | * @index: index of the disk to format name for | 2148 | * @index: index of the disk to format name for |
diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c index cabbdc7ba58..5b9cde79e4e 100644 --- a/drivers/serial/pmac_zilog.c +++ b/drivers/serial/pmac_zilog.c | |||
@@ -2005,8 +2005,11 @@ static struct of_device_id pmz_match[] = | |||
2005 | MODULE_DEVICE_TABLE (of, pmz_match); | 2005 | MODULE_DEVICE_TABLE (of, pmz_match); |
2006 | 2006 | ||
2007 | static struct macio_driver pmz_driver = { | 2007 | static struct macio_driver pmz_driver = { |
2008 | .name = "pmac_zilog", | 2008 | .driver = { |
2009 | .match_table = pmz_match, | 2009 | .name = "pmac_zilog", |
2010 | .owner = THIS_MODULE, | ||
2011 | .of_match_table = pmz_match, | ||
2012 | }, | ||
2010 | .probe = pmz_attach, | 2013 | .probe = pmz_attach, |
2011 | .remove = pmz_detach, | 2014 | .remove = pmz_detach, |
2012 | .suspend = pmz_suspend, | 2015 | .suspend = pmz_suspend, |
diff --git a/drivers/sfi/sfi_core.c b/drivers/sfi/sfi_core.c index 00519595864..ceba593dc84 100644 --- a/drivers/sfi/sfi_core.c +++ b/drivers/sfi/sfi_core.c | |||
@@ -441,8 +441,10 @@ struct sfi_table_attr __init *sfi_sysfs_install_table(u64 pa) | |||
441 | 441 | ||
442 | ret = sysfs_create_bin_file(tables_kobj, | 442 | ret = sysfs_create_bin_file(tables_kobj, |
443 | &tbl_attr->attr); | 443 | &tbl_attr->attr); |
444 | if (ret) | 444 | if (ret) { |
445 | kfree(tbl_attr); | 445 | kfree(tbl_attr); |
446 | tbl_attr = NULL; | ||
447 | } | ||
446 | 448 | ||
447 | sfi_unmap_table(th); | 449 | sfi_unmap_table(th); |
448 | return tbl_attr; | 450 | return tbl_attr; |
diff --git a/drivers/spi/mpc512x_psc_spi.c b/drivers/spi/mpc512x_psc_spi.c index 28a126d2742..2534b1ec3ed 100644 --- a/drivers/spi/mpc512x_psc_spi.c +++ b/drivers/spi/mpc512x_psc_spi.c | |||
@@ -512,29 +512,29 @@ static int __init mpc512x_psc_spi_of_probe(struct of_device *op, | |||
512 | u64 regaddr64, size64; | 512 | u64 regaddr64, size64; |
513 | s16 id = -1; | 513 | s16 id = -1; |
514 | 514 | ||
515 | regaddr_p = of_get_address(op->node, 0, &size64, NULL); | 515 | regaddr_p = of_get_address(op->dev.of_node, 0, &size64, NULL); |
516 | if (!regaddr_p) { | 516 | if (!regaddr_p) { |
517 | dev_err(&op->dev, "Invalid PSC address\n"); | 517 | dev_err(&op->dev, "Invalid PSC address\n"); |
518 | return -EINVAL; | 518 | return -EINVAL; |
519 | } | 519 | } |
520 | regaddr64 = of_translate_address(op->node, regaddr_p); | 520 | regaddr64 = of_translate_address(op->dev.of_node, regaddr_p); |
521 | 521 | ||
522 | /* get PSC id (0..11, used by port_config) */ | 522 | /* get PSC id (0..11, used by port_config) */ |
523 | if (op->dev.platform_data == NULL) { | 523 | if (op->dev.platform_data == NULL) { |
524 | const u32 *psc_nump; | 524 | const u32 *psc_nump; |
525 | 525 | ||
526 | psc_nump = of_get_property(op->node, "cell-index", NULL); | 526 | psc_nump = of_get_property(op->dev.of_node, "cell-index", NULL); |
527 | if (!psc_nump || *psc_nump > 11) { | 527 | if (!psc_nump || *psc_nump > 11) { |
528 | dev_err(&op->dev, "mpc512x_psc_spi: Device node %s " | 528 | dev_err(&op->dev, "mpc512x_psc_spi: Device node %s " |
529 | "has invalid cell-index property\n", | 529 | "has invalid cell-index property\n", |
530 | op->node->full_name); | 530 | op->dev.of_node->full_name); |
531 | return -EINVAL; | 531 | return -EINVAL; |
532 | } | 532 | } |
533 | id = *psc_nump; | 533 | id = *psc_nump; |
534 | } | 534 | } |
535 | 535 | ||
536 | return mpc512x_psc_spi_do_probe(&op->dev, (u32) regaddr64, (u32) size64, | 536 | return mpc512x_psc_spi_do_probe(&op->dev, (u32) regaddr64, (u32) size64, |
537 | irq_of_parse_and_map(op->node, 0), id); | 537 | irq_of_parse_and_map(op->dev.of_node, 0), id); |
538 | } | 538 | } |
539 | 539 | ||
540 | static int __exit mpc512x_psc_spi_of_remove(struct of_device *op) | 540 | static int __exit mpc512x_psc_spi_of_remove(struct of_device *op) |
@@ -550,12 +550,12 @@ static struct of_device_id mpc512x_psc_spi_of_match[] = { | |||
550 | MODULE_DEVICE_TABLE(of, mpc512x_psc_spi_of_match); | 550 | MODULE_DEVICE_TABLE(of, mpc512x_psc_spi_of_match); |
551 | 551 | ||
552 | static struct of_platform_driver mpc512x_psc_spi_of_driver = { | 552 | static struct of_platform_driver mpc512x_psc_spi_of_driver = { |
553 | .match_table = mpc512x_psc_spi_of_match, | ||
554 | .probe = mpc512x_psc_spi_of_probe, | 553 | .probe = mpc512x_psc_spi_of_probe, |
555 | .remove = __exit_p(mpc512x_psc_spi_of_remove), | 554 | .remove = __exit_p(mpc512x_psc_spi_of_remove), |
556 | .driver = { | 555 | .driver = { |
557 | .name = "mpc512x-psc-spi", | 556 | .name = "mpc512x-psc-spi", |
558 | .owner = THIS_MODULE, | 557 | .owner = THIS_MODULE, |
558 | .of_match_table = mpc512x_psc_spi_of_match, | ||
559 | }, | 559 | }, |
560 | }; | 560 | }; |
561 | 561 | ||
diff --git a/drivers/spi/spi_ppc4xx.c b/drivers/spi/spi_ppc4xx.c index 19c0b3b34fc..d53466a249d 100644 --- a/drivers/spi/spi_ppc4xx.c +++ b/drivers/spi/spi_ppc4xx.c | |||
@@ -397,7 +397,7 @@ static int __init spi_ppc4xx_of_probe(struct of_device *op, | |||
397 | struct spi_master *master; | 397 | struct spi_master *master; |
398 | struct spi_bitbang *bbp; | 398 | struct spi_bitbang *bbp; |
399 | struct resource resource; | 399 | struct resource resource; |
400 | struct device_node *np = op->node; | 400 | struct device_node *np = op->dev.of_node; |
401 | struct device *dev = &op->dev; | 401 | struct device *dev = &op->dev; |
402 | struct device_node *opbnp; | 402 | struct device_node *opbnp; |
403 | int ret; | 403 | int ret; |
diff --git a/drivers/ssb/pci.c b/drivers/ssb/pci.c index 989e2752cc3..6dcda86be6e 100644 --- a/drivers/ssb/pci.c +++ b/drivers/ssb/pci.c | |||
@@ -625,9 +625,12 @@ static int ssb_pci_sprom_get(struct ssb_bus *bus, | |||
625 | ssb_printk(KERN_ERR PFX "No SPROM available!\n"); | 625 | ssb_printk(KERN_ERR PFX "No SPROM available!\n"); |
626 | return -ENODEV; | 626 | return -ENODEV; |
627 | } | 627 | } |
628 | 628 | if (bus->chipco.dev) { /* can be unavailible! */ | |
629 | bus->sprom_offset = (bus->chipco.dev->id.revision < 31) ? | 629 | bus->sprom_offset = (bus->chipco.dev->id.revision < 31) ? |
630 | SSB_SPROM_BASE1 : SSB_SPROM_BASE31; | 630 | SSB_SPROM_BASE1 : SSB_SPROM_BASE31; |
631 | } else { | ||
632 | bus->sprom_offset = SSB_SPROM_BASE1; | ||
633 | } | ||
631 | 634 | ||
632 | buf = kcalloc(SSB_SPROMSIZE_WORDS_R123, sizeof(u16), GFP_KERNEL); | 635 | buf = kcalloc(SSB_SPROMSIZE_WORDS_R123, sizeof(u16), GFP_KERNEL); |
633 | if (!buf) | 636 | if (!buf) |
diff --git a/drivers/ssb/sprom.c b/drivers/ssb/sprom.c index 007bc3a0348..4f7cc8d1327 100644 --- a/drivers/ssb/sprom.c +++ b/drivers/ssb/sprom.c | |||
@@ -185,6 +185,7 @@ bool ssb_is_sprom_available(struct ssb_bus *bus) | |||
185 | /* this routine differs from specs as we do not access SPROM directly | 185 | /* this routine differs from specs as we do not access SPROM directly |
186 | on PCMCIA */ | 186 | on PCMCIA */ |
187 | if (bus->bustype == SSB_BUSTYPE_PCI && | 187 | if (bus->bustype == SSB_BUSTYPE_PCI && |
188 | bus->chipco.dev && /* can be unavailible! */ | ||
188 | bus->chipco.dev->id.revision >= 31) | 189 | bus->chipco.dev->id.revision >= 31) |
189 | return bus->chipco.capabilities & SSB_CHIPCO_CAP_SPROM; | 190 | return bus->chipco.capabilities & SSB_CHIPCO_CAP_SPROM; |
190 | 191 | ||
diff --git a/drivers/staging/dream/synaptics_i2c_rmi.c b/drivers/staging/dream/synaptics_i2c_rmi.c index 1f020dad623..3320359408a 100644 --- a/drivers/staging/dream/synaptics_i2c_rmi.c +++ b/drivers/staging/dream/synaptics_i2c_rmi.c | |||
@@ -519,7 +519,6 @@ err_input_register_device_failed: | |||
519 | err_input_dev_alloc_failed: | 519 | err_input_dev_alloc_failed: |
520 | err_detect_failed: | 520 | err_detect_failed: |
521 | err_power_failed: | 521 | err_power_failed: |
522 | i2c_set_clientdata(client, NULL); | ||
523 | kfree(ts); | 522 | kfree(ts); |
524 | err_alloc_data_failed: | 523 | err_alloc_data_failed: |
525 | err_check_functionality_failed: | 524 | err_check_functionality_failed: |
@@ -537,7 +536,6 @@ static int synaptics_ts_remove(struct i2c_client *client) | |||
537 | else | 536 | else |
538 | hrtimer_cancel(&ts->timer); | 537 | hrtimer_cancel(&ts->timer); |
539 | input_unregister_device(ts->input_dev); | 538 | input_unregister_device(ts->input_dev); |
540 | i2c_set_clientdata(client, NULL); | ||
541 | kfree(ts); | 539 | kfree(ts); |
542 | return 0; | 540 | return 0; |
543 | } | 541 | } |
diff --git a/drivers/staging/go7007/wis-saa7113.c b/drivers/staging/go7007/wis-saa7113.c index bd925457f8b..72f5c1f56d1 100644 --- a/drivers/staging/go7007/wis-saa7113.c +++ b/drivers/staging/go7007/wis-saa7113.c | |||
@@ -289,7 +289,6 @@ static int wis_saa7113_probe(struct i2c_client *client, | |||
289 | if (write_regs(client, initial_registers) < 0) { | 289 | if (write_regs(client, initial_registers) < 0) { |
290 | printk(KERN_ERR | 290 | printk(KERN_ERR |
291 | "wis-saa7113: error initializing SAA7113\n"); | 291 | "wis-saa7113: error initializing SAA7113\n"); |
292 | i2c_set_clientdata(client, NULL); | ||
293 | kfree(dec); | 292 | kfree(dec); |
294 | return -ENODEV; | 293 | return -ENODEV; |
295 | } | 294 | } |
@@ -301,7 +300,6 @@ static int wis_saa7113_remove(struct i2c_client *client) | |||
301 | { | 300 | { |
302 | struct wis_saa7113 *dec = i2c_get_clientdata(client); | 301 | struct wis_saa7113 *dec = i2c_get_clientdata(client); |
303 | 302 | ||
304 | i2c_set_clientdata(client, NULL); | ||
305 | kfree(dec); | 303 | kfree(dec); |
306 | return 0; | 304 | return 0; |
307 | } | 305 | } |
diff --git a/drivers/staging/go7007/wis-saa7115.c b/drivers/staging/go7007/wis-saa7115.c index b2eb804c195..cd950b61cf7 100644 --- a/drivers/staging/go7007/wis-saa7115.c +++ b/drivers/staging/go7007/wis-saa7115.c | |||
@@ -422,7 +422,6 @@ static int wis_saa7115_probe(struct i2c_client *client, | |||
422 | if (write_regs(client, initial_registers) < 0) { | 422 | if (write_regs(client, initial_registers) < 0) { |
423 | printk(KERN_ERR | 423 | printk(KERN_ERR |
424 | "wis-saa7115: error initializing SAA7115\n"); | 424 | "wis-saa7115: error initializing SAA7115\n"); |
425 | i2c_set_clientdata(client, NULL); | ||
426 | kfree(dec); | 425 | kfree(dec); |
427 | return -ENODEV; | 426 | return -ENODEV; |
428 | } | 427 | } |
@@ -434,7 +433,6 @@ static int wis_saa7115_remove(struct i2c_client *client) | |||
434 | { | 433 | { |
435 | struct wis_saa7115 *dec = i2c_get_clientdata(client); | 434 | struct wis_saa7115 *dec = i2c_get_clientdata(client); |
436 | 435 | ||
437 | i2c_set_clientdata(client, NULL); | ||
438 | kfree(dec); | 436 | kfree(dec); |
439 | return 0; | 437 | return 0; |
440 | } | 438 | } |
diff --git a/drivers/staging/go7007/wis-sony-tuner.c b/drivers/staging/go7007/wis-sony-tuner.c index b1013291190..981c9b311b8 100644 --- a/drivers/staging/go7007/wis-sony-tuner.c +++ b/drivers/staging/go7007/wis-sony-tuner.c | |||
@@ -684,7 +684,6 @@ static int wis_sony_tuner_remove(struct i2c_client *client) | |||
684 | { | 684 | { |
685 | struct wis_sony_tuner *t = i2c_get_clientdata(client); | 685 | struct wis_sony_tuner *t = i2c_get_clientdata(client); |
686 | 686 | ||
687 | i2c_set_clientdata(client, NULL); | ||
688 | kfree(t); | 687 | kfree(t); |
689 | return 0; | 688 | return 0; |
690 | } | 689 | } |
diff --git a/drivers/staging/go7007/wis-tw2804.c b/drivers/staging/go7007/wis-tw2804.c index 315268d130d..ee28a99dc38 100644 --- a/drivers/staging/go7007/wis-tw2804.c +++ b/drivers/staging/go7007/wis-tw2804.c | |||
@@ -323,7 +323,6 @@ static int wis_tw2804_remove(struct i2c_client *client) | |||
323 | { | 323 | { |
324 | struct wis_tw2804 *dec = i2c_get_clientdata(client); | 324 | struct wis_tw2804 *dec = i2c_get_clientdata(client); |
325 | 325 | ||
326 | i2c_set_clientdata(client, NULL); | ||
327 | kfree(dec); | 326 | kfree(dec); |
328 | return 0; | 327 | return 0; |
329 | } | 328 | } |
diff --git a/drivers/staging/go7007/wis-tw9903.c b/drivers/staging/go7007/wis-tw9903.c index 2afea09091b..80d47269b1c 100644 --- a/drivers/staging/go7007/wis-tw9903.c +++ b/drivers/staging/go7007/wis-tw9903.c | |||
@@ -294,7 +294,6 @@ static int wis_tw9903_probe(struct i2c_client *client, | |||
294 | 294 | ||
295 | if (write_regs(client, initial_registers) < 0) { | 295 | if (write_regs(client, initial_registers) < 0) { |
296 | printk(KERN_ERR "wis-tw9903: error initializing TW9903\n"); | 296 | printk(KERN_ERR "wis-tw9903: error initializing TW9903\n"); |
297 | i2c_set_clientdata(client, NULL); | ||
298 | kfree(dec); | 297 | kfree(dec); |
299 | return -ENODEV; | 298 | return -ENODEV; |
300 | } | 299 | } |
@@ -306,7 +305,6 @@ static int wis_tw9903_remove(struct i2c_client *client) | |||
306 | { | 305 | { |
307 | struct wis_tw9903 *dec = i2c_get_clientdata(client); | 306 | struct wis_tw9903 *dec = i2c_get_clientdata(client); |
308 | 307 | ||
309 | i2c_set_clientdata(client, NULL); | ||
310 | kfree(dec); | 308 | kfree(dec); |
311 | return 0; | 309 | return 0; |
312 | } | 310 | } |
diff --git a/drivers/staging/iio/adc/max1363_core.c b/drivers/staging/iio/adc/max1363_core.c index 20e267448d1..905f8560d31 100644 --- a/drivers/staging/iio/adc/max1363_core.c +++ b/drivers/staging/iio/adc/max1363_core.c | |||
@@ -1011,7 +1011,6 @@ error_put_reg: | |||
1011 | if (!IS_ERR(st->reg)) | 1011 | if (!IS_ERR(st->reg)) |
1012 | regulator_put(st->reg); | 1012 | regulator_put(st->reg); |
1013 | error_free_st: | 1013 | error_free_st: |
1014 | i2c_set_clientdata(client, NULL); | ||
1015 | kfree(st); | 1014 | kfree(st); |
1016 | 1015 | ||
1017 | error_ret: | 1016 | error_ret: |
@@ -1030,7 +1029,6 @@ static int max1363_remove(struct i2c_client *client) | |||
1030 | regulator_disable(st->reg); | 1029 | regulator_disable(st->reg); |
1031 | regulator_put(st->reg); | 1030 | regulator_put(st->reg); |
1032 | } | 1031 | } |
1033 | i2c_set_clientdata(client, NULL); | ||
1034 | kfree(st); | 1032 | kfree(st); |
1035 | 1033 | ||
1036 | return 0; | 1034 | return 0; |
diff --git a/drivers/staging/iio/light/tsl2563.c b/drivers/staging/iio/light/tsl2563.c index 43aaacff4e7..e4b0a5ef1c1 100644 --- a/drivers/staging/iio/light/tsl2563.c +++ b/drivers/staging/iio/light/tsl2563.c | |||
@@ -694,7 +694,6 @@ static int __devinit tsl2563_probe(struct i2c_client *client, | |||
694 | fail2: | 694 | fail2: |
695 | iio_device_unregister(chip->indio_dev); | 695 | iio_device_unregister(chip->indio_dev); |
696 | fail1: | 696 | fail1: |
697 | i2c_set_clientdata(client, NULL); | ||
698 | kfree(chip); | 697 | kfree(chip); |
699 | return err; | 698 | return err; |
700 | } | 699 | } |
@@ -705,7 +704,6 @@ static int tsl2563_remove(struct i2c_client *client) | |||
705 | 704 | ||
706 | iio_device_unregister(chip->indio_dev); | 705 | iio_device_unregister(chip->indio_dev); |
707 | 706 | ||
708 | i2c_set_clientdata(client, NULL); | ||
709 | kfree(chip); | 707 | kfree(chip); |
710 | return 0; | 708 | return 0; |
711 | } | 709 | } |
diff --git a/drivers/usb/gadget/f_audio.c b/drivers/usb/gadget/f_audio.c index 43bf44514c4..b91115f84b1 100644 --- a/drivers/usb/gadget/f_audio.c +++ b/drivers/usb/gadget/f_audio.c | |||
@@ -101,7 +101,7 @@ static struct uac_feature_unit_descriptor_0 feature_unit_desc = { | |||
101 | static struct usb_audio_control mute_control = { | 101 | static struct usb_audio_control mute_control = { |
102 | .list = LIST_HEAD_INIT(mute_control.list), | 102 | .list = LIST_HEAD_INIT(mute_control.list), |
103 | .name = "Mute Control", | 103 | .name = "Mute Control", |
104 | .type = UAC_MUTE_CONTROL, | 104 | .type = UAC_FU_MUTE, |
105 | /* Todo: add real Mute control code */ | 105 | /* Todo: add real Mute control code */ |
106 | .set = generic_set_cmd, | 106 | .set = generic_set_cmd, |
107 | .get = generic_get_cmd, | 107 | .get = generic_get_cmd, |
@@ -110,7 +110,7 @@ static struct usb_audio_control mute_control = { | |||
110 | static struct usb_audio_control volume_control = { | 110 | static struct usb_audio_control volume_control = { |
111 | .list = LIST_HEAD_INIT(volume_control.list), | 111 | .list = LIST_HEAD_INIT(volume_control.list), |
112 | .name = "Volume Control", | 112 | .name = "Volume Control", |
113 | .type = UAC_VOLUME_CONTROL, | 113 | .type = UAC_FU_VOLUME, |
114 | /* Todo: add real Volume control code */ | 114 | /* Todo: add real Volume control code */ |
115 | .set = generic_set_cmd, | 115 | .set = generic_set_cmd, |
116 | .get = generic_get_cmd, | 116 | .get = generic_get_cmd, |
diff --git a/drivers/usb/gadget/fsl_qe_udc.c b/drivers/usb/gadget/fsl_qe_udc.c index 2928523268b..82506ca297d 100644 --- a/drivers/usb/gadget/fsl_qe_udc.c +++ b/drivers/usb/gadget/fsl_qe_udc.c | |||
@@ -2400,7 +2400,7 @@ EXPORT_SYMBOL(usb_gadget_unregister_driver); | |||
2400 | static struct qe_udc __devinit *qe_udc_config(struct of_device *ofdev) | 2400 | static struct qe_udc __devinit *qe_udc_config(struct of_device *ofdev) |
2401 | { | 2401 | { |
2402 | struct qe_udc *udc; | 2402 | struct qe_udc *udc; |
2403 | struct device_node *np = ofdev->node; | 2403 | struct device_node *np = ofdev->dev.of_node; |
2404 | unsigned int tmp_addr = 0; | 2404 | unsigned int tmp_addr = 0; |
2405 | struct usb_device_para __iomem *usbpram; | 2405 | struct usb_device_para __iomem *usbpram; |
2406 | unsigned int i; | 2406 | unsigned int i; |
@@ -2525,7 +2525,7 @@ static void qe_udc_release(struct device *dev) | |||
2525 | static int __devinit qe_udc_probe(struct of_device *ofdev, | 2525 | static int __devinit qe_udc_probe(struct of_device *ofdev, |
2526 | const struct of_device_id *match) | 2526 | const struct of_device_id *match) |
2527 | { | 2527 | { |
2528 | struct device_node *np = ofdev->node; | 2528 | struct device_node *np = ofdev->dev.of_node; |
2529 | struct qe_ep *ep; | 2529 | struct qe_ep *ep; |
2530 | unsigned int ret = 0; | 2530 | unsigned int ret = 0; |
2531 | unsigned int i; | 2531 | unsigned int i; |
diff --git a/drivers/usb/host/ehci-xilinx-of.c b/drivers/usb/host/ehci-xilinx-of.c index 013972bbde5..4899f451add 100644 --- a/drivers/usb/host/ehci-xilinx-of.c +++ b/drivers/usb/host/ehci-xilinx-of.c | |||
@@ -151,7 +151,7 @@ static const struct hc_driver ehci_xilinx_of_hc_driver = { | |||
151 | static int __devinit | 151 | static int __devinit |
152 | ehci_hcd_xilinx_of_probe(struct of_device *op, const struct of_device_id *match) | 152 | ehci_hcd_xilinx_of_probe(struct of_device *op, const struct of_device_id *match) |
153 | { | 153 | { |
154 | struct device_node *dn = op->node; | 154 | struct device_node *dn = op->dev.of_node; |
155 | struct usb_hcd *hcd; | 155 | struct usb_hcd *hcd; |
156 | struct ehci_hcd *ehci; | 156 | struct ehci_hcd *ehci; |
157 | struct resource res; | 157 | struct resource res; |
diff --git a/drivers/video/aty/mach64_accel.c b/drivers/video/aty/mach64_accel.c index 51fcc0a2c94..e45833ce975 100644 --- a/drivers/video/aty/mach64_accel.c +++ b/drivers/video/aty/mach64_accel.c | |||
@@ -242,7 +242,7 @@ void atyfb_copyarea(struct fb_info *info, const struct fb_copyarea *area) | |||
242 | void atyfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect) | 242 | void atyfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect) |
243 | { | 243 | { |
244 | struct atyfb_par *par = (struct atyfb_par *) info->par; | 244 | struct atyfb_par *par = (struct atyfb_par *) info->par; |
245 | u32 color = rect->color, dx = rect->dx, width = rect->width, rotation = 0; | 245 | u32 color, dx = rect->dx, width = rect->width, rotation = 0; |
246 | 246 | ||
247 | if (par->asleep) | 247 | if (par->asleep) |
248 | return; | 248 | return; |
@@ -253,8 +253,11 @@ void atyfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect) | |||
253 | return; | 253 | return; |
254 | } | 254 | } |
255 | 255 | ||
256 | color |= (rect->color << 8); | 256 | if (info->fix.visual == FB_VISUAL_TRUECOLOR || |
257 | color |= (rect->color << 16); | 257 | info->fix.visual == FB_VISUAL_DIRECTCOLOR) |
258 | color = ((u32 *)(info->pseudo_palette))[rect->color]; | ||
259 | else | ||
260 | color = rect->color; | ||
258 | 261 | ||
259 | if (info->var.bits_per_pixel == 24) { | 262 | if (info->var.bits_per_pixel == 24) { |
260 | /* In 24 bpp, the engine is in 8 bpp - this requires that all */ | 263 | /* In 24 bpp, the engine is in 8 bpp - this requires that all */ |
diff --git a/drivers/video/backlight/adp8860_bl.c b/drivers/video/backlight/adp8860_bl.c index 921ca37398f..3ec24609151 100644 --- a/drivers/video/backlight/adp8860_bl.c +++ b/drivers/video/backlight/adp8860_bl.c | |||
@@ -756,7 +756,6 @@ out: | |||
756 | out1: | 756 | out1: |
757 | backlight_device_unregister(bl); | 757 | backlight_device_unregister(bl); |
758 | out2: | 758 | out2: |
759 | i2c_set_clientdata(client, NULL); | ||
760 | kfree(data); | 759 | kfree(data); |
761 | 760 | ||
762 | return ret; | 761 | return ret; |
@@ -776,7 +775,6 @@ static int __devexit adp8860_remove(struct i2c_client *client) | |||
776 | &adp8860_bl_attr_group); | 775 | &adp8860_bl_attr_group); |
777 | 776 | ||
778 | backlight_device_unregister(data->bl); | 777 | backlight_device_unregister(data->bl); |
779 | i2c_set_clientdata(client, NULL); | ||
780 | kfree(data); | 778 | kfree(data); |
781 | 779 | ||
782 | return 0; | 780 | return 0; |
diff --git a/drivers/video/backlight/tosa_bl.c b/drivers/video/backlight/tosa_bl.c index e03e60bbfd8..2a04b382ec4 100644 --- a/drivers/video/backlight/tosa_bl.c +++ b/drivers/video/backlight/tosa_bl.c | |||
@@ -119,7 +119,6 @@ static int __devinit tosa_bl_probe(struct i2c_client *client, | |||
119 | 119 | ||
120 | err_reg: | 120 | err_reg: |
121 | data->bl = NULL; | 121 | data->bl = NULL; |
122 | i2c_set_clientdata(client, NULL); | ||
123 | err_gpio_dir: | 122 | err_gpio_dir: |
124 | gpio_free(TOSA_GPIO_BL_C20MA); | 123 | gpio_free(TOSA_GPIO_BL_C20MA); |
125 | err_gpio_bl: | 124 | err_gpio_bl: |
@@ -133,7 +132,6 @@ static int __devexit tosa_bl_remove(struct i2c_client *client) | |||
133 | 132 | ||
134 | backlight_device_unregister(data->bl); | 133 | backlight_device_unregister(data->bl); |
135 | data->bl = NULL; | 134 | data->bl = NULL; |
136 | i2c_set_clientdata(client, NULL); | ||
137 | 135 | ||
138 | gpio_free(TOSA_GPIO_BL_C20MA); | 136 | gpio_free(TOSA_GPIO_BL_C20MA); |
139 | 137 | ||
diff --git a/drivers/video/bw2.c b/drivers/video/bw2.c index 2c371c07f0d..09f1b9b462f 100644 --- a/drivers/video/bw2.c +++ b/drivers/video/bw2.c | |||
@@ -275,7 +275,7 @@ static int __devinit bw2_do_default_mode(struct bw2_par *par, | |||
275 | 275 | ||
276 | static int __devinit bw2_probe(struct of_device *op, const struct of_device_id *match) | 276 | static int __devinit bw2_probe(struct of_device *op, const struct of_device_id *match) |
277 | { | 277 | { |
278 | struct device_node *dp = op->node; | 278 | struct device_node *dp = op->dev.of_node; |
279 | struct fb_info *info; | 279 | struct fb_info *info; |
280 | struct bw2_par *par; | 280 | struct bw2_par *par; |
281 | int linebytes, err; | 281 | int linebytes, err; |
diff --git a/drivers/video/cg14.c b/drivers/video/cg14.c index d12e05b6e63..e5dc2241194 100644 --- a/drivers/video/cg14.c +++ b/drivers/video/cg14.c | |||
@@ -465,7 +465,7 @@ static void cg14_unmap_regs(struct of_device *op, struct fb_info *info, | |||
465 | 465 | ||
466 | static int __devinit cg14_probe(struct of_device *op, const struct of_device_id *match) | 466 | static int __devinit cg14_probe(struct of_device *op, const struct of_device_id *match) |
467 | { | 467 | { |
468 | struct device_node *dp = op->node; | 468 | struct device_node *dp = op->dev.of_node; |
469 | struct fb_info *info; | 469 | struct fb_info *info; |
470 | struct cg14_par *par; | 470 | struct cg14_par *par; |
471 | int is_8mb, linebytes, i, err; | 471 | int is_8mb, linebytes, i, err; |
diff --git a/drivers/video/cg3.c b/drivers/video/cg3.c index b98f93f7f66..558d73a948a 100644 --- a/drivers/video/cg3.c +++ b/drivers/video/cg3.c | |||
@@ -349,7 +349,7 @@ static int __devinit cg3_do_default_mode(struct cg3_par *par) | |||
349 | static int __devinit cg3_probe(struct of_device *op, | 349 | static int __devinit cg3_probe(struct of_device *op, |
350 | const struct of_device_id *match) | 350 | const struct of_device_id *match) |
351 | { | 351 | { |
352 | struct device_node *dp = op->node; | 352 | struct device_node *dp = op->dev.of_node; |
353 | struct fb_info *info; | 353 | struct fb_info *info; |
354 | struct cg3_par *par; | 354 | struct cg3_par *par; |
355 | int linebytes, err; | 355 | int linebytes, err; |
diff --git a/drivers/video/leo.c b/drivers/video/leo.c index 3d7895316ea..9e8bf7d5e24 100644 --- a/drivers/video/leo.c +++ b/drivers/video/leo.c | |||
@@ -550,7 +550,7 @@ static void leo_unmap_regs(struct of_device *op, struct fb_info *info, | |||
550 | static int __devinit leo_probe(struct of_device *op, | 550 | static int __devinit leo_probe(struct of_device *op, |
551 | const struct of_device_id *match) | 551 | const struct of_device_id *match) |
552 | { | 552 | { |
553 | struct device_node *dp = op->node; | 553 | struct device_node *dp = op->dev.of_node; |
554 | struct fb_info *info; | 554 | struct fb_info *info; |
555 | struct leo_par *par; | 555 | struct leo_par *par; |
556 | int linebytes, err; | 556 | int linebytes, err; |
diff --git a/drivers/video/mb862xx/mb862xxfb.c b/drivers/video/mb862xx/mb862xxfb.c index 0540de4f5cb..4e2b8cc3d46 100644 --- a/drivers/video/mb862xx/mb862xxfb.c +++ b/drivers/video/mb862xx/mb862xxfb.c | |||
@@ -553,7 +553,7 @@ static int mb862xx_gdc_init(struct mb862xxfb_par *par) | |||
553 | static int __devinit of_platform_mb862xx_probe(struct of_device *ofdev, | 553 | static int __devinit of_platform_mb862xx_probe(struct of_device *ofdev, |
554 | const struct of_device_id *id) | 554 | const struct of_device_id *id) |
555 | { | 555 | { |
556 | struct device_node *np = ofdev->node; | 556 | struct device_node *np = ofdev->dev.of_node; |
557 | struct device *dev = &ofdev->dev; | 557 | struct device *dev = &ofdev->dev; |
558 | struct mb862xxfb_par *par; | 558 | struct mb862xxfb_par *par; |
559 | struct fb_info *info; | 559 | struct fb_info *info; |
diff --git a/drivers/video/p9100.c b/drivers/video/p9100.c index c85dd408a9b..6552751e81a 100644 --- a/drivers/video/p9100.c +++ b/drivers/video/p9100.c | |||
@@ -251,7 +251,7 @@ static void p9100_init_fix(struct fb_info *info, int linebytes, struct device_no | |||
251 | 251 | ||
252 | static int __devinit p9100_probe(struct of_device *op, const struct of_device_id *match) | 252 | static int __devinit p9100_probe(struct of_device *op, const struct of_device_id *match) |
253 | { | 253 | { |
254 | struct device_node *dp = op->node; | 254 | struct device_node *dp = op->dev.of_node; |
255 | struct fb_info *info; | 255 | struct fb_info *info; |
256 | struct p9100_par *par; | 256 | struct p9100_par *par; |
257 | int linebytes, err; | 257 | int linebytes, err; |
diff --git a/drivers/video/tcx.c b/drivers/video/tcx.c index ef7a7bd8b50..cc039b33d2d 100644 --- a/drivers/video/tcx.c +++ b/drivers/video/tcx.c | |||
@@ -365,7 +365,7 @@ static void tcx_unmap_regs(struct of_device *op, struct fb_info *info, | |||
365 | static int __devinit tcx_probe(struct of_device *op, | 365 | static int __devinit tcx_probe(struct of_device *op, |
366 | const struct of_device_id *match) | 366 | const struct of_device_id *match) |
367 | { | 367 | { |
368 | struct device_node *dp = op->node; | 368 | struct device_node *dp = op->dev.of_node; |
369 | struct fb_info *info; | 369 | struct fb_info *info; |
370 | struct tcx_par *par; | 370 | struct tcx_par *par; |
371 | int linebytes, i, err; | 371 | int linebytes, i, err; |
diff --git a/drivers/watchdog/gef_wdt.c b/drivers/watchdog/gef_wdt.c index ca0f4c6cf5a..1df284f9c2a 100644 --- a/drivers/watchdog/gef_wdt.c +++ b/drivers/watchdog/gef_wdt.c | |||
@@ -273,7 +273,7 @@ static int __devinit gef_wdt_probe(struct of_device *dev, | |||
273 | bus_clk = freq; | 273 | bus_clk = freq; |
274 | 274 | ||
275 | /* Map devices registers into memory */ | 275 | /* Map devices registers into memory */ |
276 | gef_wdt_regs = of_iomap(dev->node, 0); | 276 | gef_wdt_regs = of_iomap(dev->dev.of_node, 0); |
277 | if (gef_wdt_regs == NULL) | 277 | if (gef_wdt_regs == NULL) |
278 | return -ENOMEM; | 278 | return -ENOMEM; |
279 | 279 | ||
diff --git a/drivers/watchdog/mpc8xxx_wdt.c b/drivers/watchdog/mpc8xxx_wdt.c index 6622335773b..4cda64dd309 100644 --- a/drivers/watchdog/mpc8xxx_wdt.c +++ b/drivers/watchdog/mpc8xxx_wdt.c | |||
@@ -189,7 +189,7 @@ static int __devinit mpc8xxx_wdt_probe(struct of_device *ofdev, | |||
189 | const struct of_device_id *match) | 189 | const struct of_device_id *match) |
190 | { | 190 | { |
191 | int ret; | 191 | int ret; |
192 | struct device_node *np = ofdev->node; | 192 | struct device_node *np = ofdev->dev.of_node; |
193 | struct mpc8xxx_wdt_type *wdt_type = match->data; | 193 | struct mpc8xxx_wdt_type *wdt_type = match->data; |
194 | u32 freq = fsl_get_sys_freq(); | 194 | u32 freq = fsl_get_sys_freq(); |
195 | bool enabled; | 195 | bool enabled; |
diff --git a/drivers/xen/xenbus/xenbus_xs.c b/drivers/xen/xenbus/xenbus_xs.c index eab33f1dbdf..7b547f53f65 100644 --- a/drivers/xen/xenbus/xenbus_xs.c +++ b/drivers/xen/xenbus/xenbus_xs.c | |||
@@ -499,7 +499,7 @@ int xenbus_printf(struct xenbus_transaction t, | |||
499 | #define PRINTF_BUFFER_SIZE 4096 | 499 | #define PRINTF_BUFFER_SIZE 4096 |
500 | char *printf_buffer; | 500 | char *printf_buffer; |
501 | 501 | ||
502 | printf_buffer = kmalloc(PRINTF_BUFFER_SIZE, GFP_KERNEL); | 502 | printf_buffer = kmalloc(PRINTF_BUFFER_SIZE, GFP_NOIO | __GFP_HIGH); |
503 | if (printf_buffer == NULL) | 503 | if (printf_buffer == NULL) |
504 | return -ENOMEM; | 504 | return -ENOMEM; |
505 | 505 | ||
diff --git a/fs/afs/server.c b/fs/afs/server.c index f4909951667..9fdc7fe3a7b 100644 --- a/fs/afs/server.c +++ b/fs/afs/server.c | |||
@@ -91,9 +91,10 @@ static struct afs_server *afs_alloc_server(struct afs_cell *cell, | |||
91 | 91 | ||
92 | memcpy(&server->addr, addr, sizeof(struct in_addr)); | 92 | memcpy(&server->addr, addr, sizeof(struct in_addr)); |
93 | server->addr.s_addr = addr->s_addr; | 93 | server->addr.s_addr = addr->s_addr; |
94 | _leave(" = %p{%d}", server, atomic_read(&server->usage)); | ||
95 | } else { | ||
96 | _leave(" = NULL [nomem]"); | ||
94 | } | 97 | } |
95 | |||
96 | _leave(" = %p{%d}", server, atomic_read(&server->usage)); | ||
97 | return server; | 98 | return server; |
98 | } | 99 | } |
99 | 100 | ||
diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c index 2c5f9a0e5d7..63039ed9576 100644 --- a/fs/binfmt_elf_fdpic.c +++ b/fs/binfmt_elf_fdpic.c | |||
@@ -990,10 +990,9 @@ static int elf_fdpic_map_file_constdisp_on_uclinux( | |||
990 | 990 | ||
991 | /* clear any space allocated but not loaded */ | 991 | /* clear any space allocated but not loaded */ |
992 | if (phdr->p_filesz < phdr->p_memsz) { | 992 | if (phdr->p_filesz < phdr->p_memsz) { |
993 | ret = clear_user((void *) (seg->addr + phdr->p_filesz), | 993 | if (clear_user((void *) (seg->addr + phdr->p_filesz), |
994 | phdr->p_memsz - phdr->p_filesz); | 994 | phdr->p_memsz - phdr->p_filesz)) |
995 | if (ret) | 995 | return -EFAULT; |
996 | return ret; | ||
997 | } | 996 | } |
998 | 997 | ||
999 | if (mm) { | 998 | if (mm) { |
@@ -1027,7 +1026,7 @@ static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *params, | |||
1027 | struct elf32_fdpic_loadseg *seg; | 1026 | struct elf32_fdpic_loadseg *seg; |
1028 | struct elf32_phdr *phdr; | 1027 | struct elf32_phdr *phdr; |
1029 | unsigned long load_addr, delta_vaddr; | 1028 | unsigned long load_addr, delta_vaddr; |
1030 | int loop, dvset, ret; | 1029 | int loop, dvset; |
1031 | 1030 | ||
1032 | load_addr = params->load_addr; | 1031 | load_addr = params->load_addr; |
1033 | delta_vaddr = 0; | 1032 | delta_vaddr = 0; |
@@ -1127,9 +1126,8 @@ static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *params, | |||
1127 | * PT_LOAD */ | 1126 | * PT_LOAD */ |
1128 | if (prot & PROT_WRITE && disp > 0) { | 1127 | if (prot & PROT_WRITE && disp > 0) { |
1129 | kdebug("clear[%d] ad=%lx sz=%lx", loop, maddr, disp); | 1128 | kdebug("clear[%d] ad=%lx sz=%lx", loop, maddr, disp); |
1130 | ret = clear_user((void __user *) maddr, disp); | 1129 | if (clear_user((void __user *) maddr, disp)) |
1131 | if (ret) | 1130 | return -EFAULT; |
1132 | return ret; | ||
1133 | maddr += disp; | 1131 | maddr += disp; |
1134 | } | 1132 | } |
1135 | 1133 | ||
@@ -1164,19 +1162,17 @@ static int elf_fdpic_map_file_by_direct_mmap(struct elf_fdpic_params *params, | |||
1164 | if (prot & PROT_WRITE && excess1 > 0) { | 1162 | if (prot & PROT_WRITE && excess1 > 0) { |
1165 | kdebug("clear[%d] ad=%lx sz=%lx", | 1163 | kdebug("clear[%d] ad=%lx sz=%lx", |
1166 | loop, maddr + phdr->p_filesz, excess1); | 1164 | loop, maddr + phdr->p_filesz, excess1); |
1167 | ret = clear_user((void __user *) maddr + phdr->p_filesz, | 1165 | if (clear_user((void __user *) maddr + phdr->p_filesz, |
1168 | excess1); | 1166 | excess1)) |
1169 | if (ret) | 1167 | return -EFAULT; |
1170 | return ret; | ||
1171 | } | 1168 | } |
1172 | 1169 | ||
1173 | #else | 1170 | #else |
1174 | if (excess > 0) { | 1171 | if (excess > 0) { |
1175 | kdebug("clear[%d] ad=%lx sz=%lx", | 1172 | kdebug("clear[%d] ad=%lx sz=%lx", |
1176 | loop, maddr + phdr->p_filesz, excess); | 1173 | loop, maddr + phdr->p_filesz, excess); |
1177 | ret = clear_user((void *) maddr + phdr->p_filesz, excess); | 1174 | if (clear_user((void *) maddr + phdr->p_filesz, excess)) |
1178 | if (ret) | 1175 | return -EFAULT; |
1179 | return ret; | ||
1180 | } | 1176 | } |
1181 | #endif | 1177 | #endif |
1182 | 1178 | ||
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index f1ff785b229..75541af4b3d 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c | |||
@@ -1952,6 +1952,7 @@ static void cifs_copy_cache_pages(struct address_space *mapping, | |||
1952 | bytes_read -= PAGE_CACHE_SIZE; | 1952 | bytes_read -= PAGE_CACHE_SIZE; |
1953 | continue; | 1953 | continue; |
1954 | } | 1954 | } |
1955 | page_cache_release(page); | ||
1955 | 1956 | ||
1956 | target = kmap_atomic(page, KM_USER0); | 1957 | target = kmap_atomic(page, KM_USER0); |
1957 | 1958 | ||
diff --git a/fs/fscache/page.c b/fs/fscache/page.c index 47aefd376e5..723b889fd21 100644 --- a/fs/fscache/page.c +++ b/fs/fscache/page.c | |||
@@ -710,30 +710,26 @@ static void fscache_write_op(struct fscache_operation *_op) | |||
710 | goto superseded; | 710 | goto superseded; |
711 | } | 711 | } |
712 | 712 | ||
713 | if (page) { | 713 | radix_tree_tag_set(&cookie->stores, page->index, |
714 | radix_tree_tag_set(&cookie->stores, page->index, | 714 | FSCACHE_COOKIE_STORING_TAG); |
715 | FSCACHE_COOKIE_STORING_TAG); | 715 | radix_tree_tag_clear(&cookie->stores, page->index, |
716 | radix_tree_tag_clear(&cookie->stores, page->index, | 716 | FSCACHE_COOKIE_PENDING_TAG); |
717 | FSCACHE_COOKIE_PENDING_TAG); | ||
718 | } | ||
719 | 717 | ||
720 | spin_unlock(&cookie->stores_lock); | 718 | spin_unlock(&cookie->stores_lock); |
721 | spin_unlock(&object->lock); | 719 | spin_unlock(&object->lock); |
722 | 720 | ||
723 | if (page) { | 721 | fscache_set_op_state(&op->op, "Store"); |
724 | fscache_set_op_state(&op->op, "Store"); | 722 | fscache_stat(&fscache_n_store_pages); |
725 | fscache_stat(&fscache_n_store_pages); | 723 | fscache_stat(&fscache_n_cop_write_page); |
726 | fscache_stat(&fscache_n_cop_write_page); | 724 | ret = object->cache->ops->write_page(op, page); |
727 | ret = object->cache->ops->write_page(op, page); | 725 | fscache_stat_d(&fscache_n_cop_write_page); |
728 | fscache_stat_d(&fscache_n_cop_write_page); | 726 | fscache_set_op_state(&op->op, "EndWrite"); |
729 | fscache_set_op_state(&op->op, "EndWrite"); | 727 | fscache_end_page_write(object, page); |
730 | fscache_end_page_write(object, page); | 728 | if (ret < 0) { |
731 | if (ret < 0) { | 729 | fscache_set_op_state(&op->op, "Abort"); |
732 | fscache_set_op_state(&op->op, "Abort"); | 730 | fscache_abort_object(object); |
733 | fscache_abort_object(object); | 731 | } else { |
734 | } else { | 732 | fscache_enqueue_operation(&op->op); |
735 | fscache_enqueue_operation(&op->op); | ||
736 | } | ||
737 | } | 733 | } |
738 | 734 | ||
739 | _leave(""); | 735 | _leave(""); |
diff --git a/include/asm-generic/percpu.h b/include/asm-generic/percpu.h index 04f91c2d3f7..b5043a9890d 100644 --- a/include/asm-generic/percpu.h +++ b/include/asm-generic/percpu.h | |||
@@ -80,7 +80,7 @@ extern void setup_per_cpu_areas(void); | |||
80 | 80 | ||
81 | #ifndef PER_CPU_BASE_SECTION | 81 | #ifndef PER_CPU_BASE_SECTION |
82 | #ifdef CONFIG_SMP | 82 | #ifdef CONFIG_SMP |
83 | #define PER_CPU_BASE_SECTION ".data.percpu" | 83 | #define PER_CPU_BASE_SECTION ".data..percpu" |
84 | #else | 84 | #else |
85 | #define PER_CPU_BASE_SECTION ".data" | 85 | #define PER_CPU_BASE_SECTION ".data" |
86 | #endif | 86 | #endif |
@@ -92,15 +92,15 @@ extern void setup_per_cpu_areas(void); | |||
92 | #define PER_CPU_SHARED_ALIGNED_SECTION "" | 92 | #define PER_CPU_SHARED_ALIGNED_SECTION "" |
93 | #define PER_CPU_ALIGNED_SECTION "" | 93 | #define PER_CPU_ALIGNED_SECTION "" |
94 | #else | 94 | #else |
95 | #define PER_CPU_SHARED_ALIGNED_SECTION ".shared_aligned" | 95 | #define PER_CPU_SHARED_ALIGNED_SECTION "..shared_aligned" |
96 | #define PER_CPU_ALIGNED_SECTION ".shared_aligned" | 96 | #define PER_CPU_ALIGNED_SECTION "..shared_aligned" |
97 | #endif | 97 | #endif |
98 | #define PER_CPU_FIRST_SECTION ".first" | 98 | #define PER_CPU_FIRST_SECTION "..first" |
99 | 99 | ||
100 | #else | 100 | #else |
101 | 101 | ||
102 | #define PER_CPU_SHARED_ALIGNED_SECTION "" | 102 | #define PER_CPU_SHARED_ALIGNED_SECTION "" |
103 | #define PER_CPU_ALIGNED_SECTION ".shared_aligned" | 103 | #define PER_CPU_ALIGNED_SECTION "..shared_aligned" |
104 | #define PER_CPU_FIRST_SECTION "" | 104 | #define PER_CPU_FIRST_SECTION "" |
105 | 105 | ||
106 | #endif | 106 | #endif |
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index ef779c6fc3d..48c5299cbf2 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h | |||
@@ -175,25 +175,25 @@ | |||
175 | #define NOSAVE_DATA \ | 175 | #define NOSAVE_DATA \ |
176 | . = ALIGN(PAGE_SIZE); \ | 176 | . = ALIGN(PAGE_SIZE); \ |
177 | VMLINUX_SYMBOL(__nosave_begin) = .; \ | 177 | VMLINUX_SYMBOL(__nosave_begin) = .; \ |
178 | *(.data.nosave) \ | 178 | *(.data..nosave) \ |
179 | . = ALIGN(PAGE_SIZE); \ | 179 | . = ALIGN(PAGE_SIZE); \ |
180 | VMLINUX_SYMBOL(__nosave_end) = .; | 180 | VMLINUX_SYMBOL(__nosave_end) = .; |
181 | 181 | ||
182 | #define PAGE_ALIGNED_DATA(page_align) \ | 182 | #define PAGE_ALIGNED_DATA(page_align) \ |
183 | . = ALIGN(page_align); \ | 183 | . = ALIGN(page_align); \ |
184 | *(.data.page_aligned) | 184 | *(.data..page_aligned) |
185 | 185 | ||
186 | #define READ_MOSTLY_DATA(align) \ | 186 | #define READ_MOSTLY_DATA(align) \ |
187 | . = ALIGN(align); \ | 187 | . = ALIGN(align); \ |
188 | *(.data.read_mostly) | 188 | *(.data..read_mostly) |
189 | 189 | ||
190 | #define CACHELINE_ALIGNED_DATA(align) \ | 190 | #define CACHELINE_ALIGNED_DATA(align) \ |
191 | . = ALIGN(align); \ | 191 | . = ALIGN(align); \ |
192 | *(.data.cacheline_aligned) | 192 | *(.data..cacheline_aligned) |
193 | 193 | ||
194 | #define INIT_TASK_DATA(align) \ | 194 | #define INIT_TASK_DATA(align) \ |
195 | . = ALIGN(align); \ | 195 | . = ALIGN(align); \ |
196 | *(.data.init_task) | 196 | *(.data..init_task) |
197 | 197 | ||
198 | /* | 198 | /* |
199 | * Read only Data | 199 | * Read only Data |
@@ -435,7 +435,7 @@ | |||
435 | */ | 435 | */ |
436 | #define INIT_TASK_DATA_SECTION(align) \ | 436 | #define INIT_TASK_DATA_SECTION(align) \ |
437 | . = ALIGN(align); \ | 437 | . = ALIGN(align); \ |
438 | .data.init_task : { \ | 438 | .data..init_task : { \ |
439 | INIT_TASK_DATA(align) \ | 439 | INIT_TASK_DATA(align) \ |
440 | } | 440 | } |
441 | 441 | ||
@@ -499,7 +499,7 @@ | |||
499 | #define BSS(bss_align) \ | 499 | #define BSS(bss_align) \ |
500 | . = ALIGN(bss_align); \ | 500 | . = ALIGN(bss_align); \ |
501 | .bss : AT(ADDR(.bss) - LOAD_OFFSET) { \ | 501 | .bss : AT(ADDR(.bss) - LOAD_OFFSET) { \ |
502 | *(.bss.page_aligned) \ | 502 | *(.bss..page_aligned) \ |
503 | *(.dynbss) \ | 503 | *(.dynbss) \ |
504 | *(.bss) \ | 504 | *(.bss) \ |
505 | *(COMMON) \ | 505 | *(COMMON) \ |
@@ -666,16 +666,16 @@ | |||
666 | */ | 666 | */ |
667 | #define PERCPU_VADDR(vaddr, phdr) \ | 667 | #define PERCPU_VADDR(vaddr, phdr) \ |
668 | VMLINUX_SYMBOL(__per_cpu_load) = .; \ | 668 | VMLINUX_SYMBOL(__per_cpu_load) = .; \ |
669 | .data.percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \ | 669 | .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \ |
670 | - LOAD_OFFSET) { \ | 670 | - LOAD_OFFSET) { \ |
671 | VMLINUX_SYMBOL(__per_cpu_start) = .; \ | 671 | VMLINUX_SYMBOL(__per_cpu_start) = .; \ |
672 | *(.data.percpu.first) \ | 672 | *(.data..percpu..first) \ |
673 | *(.data.percpu.page_aligned) \ | 673 | *(.data..percpu..page_aligned) \ |
674 | *(.data.percpu) \ | 674 | *(.data..percpu) \ |
675 | *(.data.percpu.shared_aligned) \ | 675 | *(.data..percpu..shared_aligned) \ |
676 | VMLINUX_SYMBOL(__per_cpu_end) = .; \ | 676 | VMLINUX_SYMBOL(__per_cpu_end) = .; \ |
677 | } phdr \ | 677 | } phdr \ |
678 | . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data.percpu); | 678 | . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu); |
679 | 679 | ||
680 | /** | 680 | /** |
681 | * PERCPU - define output section for percpu area, simple version | 681 | * PERCPU - define output section for percpu area, simple version |
@@ -687,18 +687,18 @@ | |||
687 | * | 687 | * |
688 | * This macro is equivalent to ALIGN(align); PERCPU_VADDR( , ) except | 688 | * This macro is equivalent to ALIGN(align); PERCPU_VADDR( , ) except |
689 | * that __per_cpu_load is defined as a relative symbol against | 689 | * that __per_cpu_load is defined as a relative symbol against |
690 | * .data.percpu which is required for relocatable x86_32 | 690 | * .data..percpu which is required for relocatable x86_32 |
691 | * configuration. | 691 | * configuration. |
692 | */ | 692 | */ |
693 | #define PERCPU(align) \ | 693 | #define PERCPU(align) \ |
694 | . = ALIGN(align); \ | 694 | . = ALIGN(align); \ |
695 | .data.percpu : AT(ADDR(.data.percpu) - LOAD_OFFSET) { \ | 695 | .data..percpu : AT(ADDR(.data..percpu) - LOAD_OFFSET) { \ |
696 | VMLINUX_SYMBOL(__per_cpu_load) = .; \ | 696 | VMLINUX_SYMBOL(__per_cpu_load) = .; \ |
697 | VMLINUX_SYMBOL(__per_cpu_start) = .; \ | 697 | VMLINUX_SYMBOL(__per_cpu_start) = .; \ |
698 | *(.data.percpu.first) \ | 698 | *(.data..percpu..first) \ |
699 | *(.data.percpu.page_aligned) \ | 699 | *(.data..percpu..page_aligned) \ |
700 | *(.data.percpu) \ | 700 | *(.data..percpu) \ |
701 | *(.data.percpu.shared_aligned) \ | 701 | *(.data..percpu..shared_aligned) \ |
702 | VMLINUX_SYMBOL(__per_cpu_end) = .; \ | 702 | VMLINUX_SYMBOL(__per_cpu_end) = .; \ |
703 | } | 703 | } |
704 | 704 | ||
diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h index dc5873c21e4..1121f7799c6 100644 --- a/include/drm/drm_crtc_helper.h +++ b/include/drm/drm_crtc_helper.h | |||
@@ -130,4 +130,7 @@ extern int drm_helper_resume_force_mode(struct drm_device *dev); | |||
130 | extern void drm_kms_helper_poll_init(struct drm_device *dev); | 130 | extern void drm_kms_helper_poll_init(struct drm_device *dev); |
131 | extern void drm_kms_helper_poll_fini(struct drm_device *dev); | 131 | extern void drm_kms_helper_poll_fini(struct drm_device *dev); |
132 | extern void drm_helper_hpd_irq_event(struct drm_device *dev); | 132 | extern void drm_helper_hpd_irq_event(struct drm_device *dev); |
133 | |||
134 | extern void drm_kms_helper_poll_disable(struct drm_device *dev); | ||
135 | extern void drm_kms_helper_poll_enable(struct drm_device *dev); | ||
133 | #endif | 136 | #endif |
diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h index b64a8d7cdf6..7f0028e1010 100644 --- a/include/drm/i915_drm.h +++ b/include/drm/i915_drm.h | |||
@@ -275,6 +275,7 @@ typedef struct drm_i915_irq_wait { | |||
275 | #define I915_PARAM_HAS_OVERLAY 7 | 275 | #define I915_PARAM_HAS_OVERLAY 7 |
276 | #define I915_PARAM_HAS_PAGEFLIPPING 8 | 276 | #define I915_PARAM_HAS_PAGEFLIPPING 8 |
277 | #define I915_PARAM_HAS_EXECBUF2 9 | 277 | #define I915_PARAM_HAS_EXECBUF2 9 |
278 | #define I915_PARAM_HAS_BSD 10 | ||
278 | 279 | ||
279 | typedef struct drm_i915_getparam { | 280 | typedef struct drm_i915_getparam { |
280 | int param; | 281 | int param; |
@@ -616,7 +617,9 @@ struct drm_i915_gem_execbuffer2 { | |||
616 | __u32 num_cliprects; | 617 | __u32 num_cliprects; |
617 | /** This is a struct drm_clip_rect *cliprects */ | 618 | /** This is a struct drm_clip_rect *cliprects */ |
618 | __u64 cliprects_ptr; | 619 | __u64 cliprects_ptr; |
619 | __u64 flags; /* currently unused */ | 620 | #define I915_EXEC_RENDER (1<<0) |
621 | #define I915_EXEC_BSD (1<<1) | ||
622 | __u64 flags; | ||
620 | __u64 rsvd1; | 623 | __u64 rsvd1; |
621 | __u64 rsvd2; | 624 | __u64 rsvd2; |
622 | }; | 625 | }; |
diff --git a/include/drm/nouveau_drm.h b/include/drm/nouveau_drm.h index a6a9f4af5eb..fe917dee723 100644 --- a/include/drm/nouveau_drm.h +++ b/include/drm/nouveau_drm.h | |||
@@ -79,6 +79,7 @@ struct drm_nouveau_gpuobj_free { | |||
79 | #define NOUVEAU_GETPARAM_CHIPSET_ID 11 | 79 | #define NOUVEAU_GETPARAM_CHIPSET_ID 11 |
80 | #define NOUVEAU_GETPARAM_VM_VRAM_BASE 12 | 80 | #define NOUVEAU_GETPARAM_VM_VRAM_BASE 12 |
81 | #define NOUVEAU_GETPARAM_GRAPH_UNITS 13 | 81 | #define NOUVEAU_GETPARAM_GRAPH_UNITS 13 |
82 | #define NOUVEAU_GETPARAM_PTIMER_TIME 14 | ||
82 | struct drm_nouveau_getparam { | 83 | struct drm_nouveau_getparam { |
83 | uint64_t param; | 84 | uint64_t param; |
84 | uint64_t value; | 85 | uint64_t value; |
diff --git a/include/drm/vmwgfx_drm.h b/include/drm/vmwgfx_drm.h index c7645f480d1..4d0842391ed 100644 --- a/include/drm/vmwgfx_drm.h +++ b/include/drm/vmwgfx_drm.h | |||
@@ -50,6 +50,8 @@ | |||
50 | #define DRM_VMW_EXECBUF 12 | 50 | #define DRM_VMW_EXECBUF 12 |
51 | #define DRM_VMW_FIFO_DEBUG 13 | 51 | #define DRM_VMW_FIFO_DEBUG 13 |
52 | #define DRM_VMW_FENCE_WAIT 14 | 52 | #define DRM_VMW_FENCE_WAIT 14 |
53 | /* guarded by minor version >= 2 */ | ||
54 | #define DRM_VMW_UPDATE_LAYOUT 15 | ||
53 | 55 | ||
54 | 56 | ||
55 | /*************************************************************************/ | 57 | /*************************************************************************/ |
@@ -585,4 +587,28 @@ struct drm_vmw_stream_arg { | |||
585 | * sure that the stream has been stopped. | 587 | * sure that the stream has been stopped. |
586 | */ | 588 | */ |
587 | 589 | ||
590 | /*************************************************************************/ | ||
591 | /** | ||
592 | * DRM_VMW_UPDATE_LAYOUT - Update layout | ||
593 | * | ||
594 | * Updates the prefered modes and connection status for connectors. The | ||
595 | * command conisits of one drm_vmw_update_layout_arg pointing out a array | ||
596 | * of num_outputs drm_vmw_rect's. | ||
597 | */ | ||
598 | |||
599 | /** | ||
600 | * struct drm_vmw_update_layout_arg | ||
601 | * | ||
602 | * @num_outputs: number of active | ||
603 | * @rects: pointer to array of drm_vmw_rect | ||
604 | * | ||
605 | * Input argument to the DRM_VMW_UPDATE_LAYOUT Ioctl. | ||
606 | */ | ||
607 | |||
608 | struct drm_vmw_update_layout_arg { | ||
609 | uint32_t num_outputs; | ||
610 | uint32_t pad64; | ||
611 | uint64_t rects; | ||
612 | }; | ||
613 | |||
588 | #endif | 614 | #endif |
diff --git a/include/linux/cache.h b/include/linux/cache.h index 97e24881c4c..4c570653ab8 100644 --- a/include/linux/cache.h +++ b/include/linux/cache.h | |||
@@ -31,7 +31,7 @@ | |||
31 | #ifndef __cacheline_aligned | 31 | #ifndef __cacheline_aligned |
32 | #define __cacheline_aligned \ | 32 | #define __cacheline_aligned \ |
33 | __attribute__((__aligned__(SMP_CACHE_BYTES), \ | 33 | __attribute__((__aligned__(SMP_CACHE_BYTES), \ |
34 | __section__(".data.cacheline_aligned"))) | 34 | __section__(".data..cacheline_aligned"))) |
35 | #endif /* __cacheline_aligned */ | 35 | #endif /* __cacheline_aligned */ |
36 | 36 | ||
37 | #ifndef __cacheline_aligned_in_smp | 37 | #ifndef __cacheline_aligned_in_smp |
diff --git a/include/linux/init.h b/include/linux/init.h index ab1d31f9352..de994304e0b 100644 --- a/include/linux/init.h +++ b/include/linux/init.h | |||
@@ -301,7 +301,7 @@ void __init parse_early_options(char *cmdline); | |||
301 | #endif | 301 | #endif |
302 | 302 | ||
303 | /* Data marked not to be saved by software suspend */ | 303 | /* Data marked not to be saved by software suspend */ |
304 | #define __nosavedata __section(.data.nosave) | 304 | #define __nosavedata __section(.data..nosave) |
305 | 305 | ||
306 | /* This means "can be init if no module support, otherwise module load | 306 | /* This means "can be init if no module support, otherwise module load |
307 | may call it." */ | 307 | may call it." */ |
diff --git a/include/linux/init_task.h b/include/linux/init_task.h index 2beaa13492b..1f43fa56f60 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h | |||
@@ -183,7 +183,7 @@ extern struct cred init_cred; | |||
183 | } | 183 | } |
184 | 184 | ||
185 | /* Attach to the init_task data structure for proper alignment */ | 185 | /* Attach to the init_task data structure for proper alignment */ |
186 | #define __init_task_data __attribute__((__section__(".data.init_task"))) | 186 | #define __init_task_data __attribute__((__section__(".data..init_task"))) |
187 | 187 | ||
188 | 188 | ||
189 | #endif | 189 | #endif |
diff --git a/include/linux/libata.h b/include/linux/libata.h index 3bad2701bfa..b85f3ff34d7 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
@@ -1023,6 +1023,7 @@ extern void ata_scsi_simulate(struct ata_device *dev, struct scsi_cmnd *cmd, | |||
1023 | extern int ata_std_bios_param(struct scsi_device *sdev, | 1023 | extern int ata_std_bios_param(struct scsi_device *sdev, |
1024 | struct block_device *bdev, | 1024 | struct block_device *bdev, |
1025 | sector_t capacity, int geom[]); | 1025 | sector_t capacity, int geom[]); |
1026 | extern void ata_scsi_unlock_native_capacity(struct scsi_device *sdev); | ||
1026 | extern int ata_scsi_slave_config(struct scsi_device *sdev); | 1027 | extern int ata_scsi_slave_config(struct scsi_device *sdev); |
1027 | extern void ata_scsi_slave_destroy(struct scsi_device *sdev); | 1028 | extern void ata_scsi_slave_destroy(struct scsi_device *sdev); |
1028 | extern int ata_scsi_change_queue_depth(struct scsi_device *sdev, | 1029 | extern int ata_scsi_change_queue_depth(struct scsi_device *sdev, |
@@ -1174,6 +1175,7 @@ extern struct device_attribute *ata_common_sdev_attrs[]; | |||
1174 | .slave_configure = ata_scsi_slave_config, \ | 1175 | .slave_configure = ata_scsi_slave_config, \ |
1175 | .slave_destroy = ata_scsi_slave_destroy, \ | 1176 | .slave_destroy = ata_scsi_slave_destroy, \ |
1176 | .bios_param = ata_std_bios_param, \ | 1177 | .bios_param = ata_std_bios_param, \ |
1178 | .unlock_native_capacity = ata_scsi_unlock_native_capacity, \ | ||
1177 | .sdev_attrs = ata_common_sdev_attrs | 1179 | .sdev_attrs = ata_common_sdev_attrs |
1178 | 1180 | ||
1179 | #define ATA_NCQ_SHT(drv_name) \ | 1181 | #define ATA_NCQ_SHT(drv_name) \ |
diff --git a/include/linux/linkage.h b/include/linux/linkage.h index 5126cceb6ae..7135ebc8428 100644 --- a/include/linux/linkage.h +++ b/include/linux/linkage.h | |||
@@ -18,8 +18,8 @@ | |||
18 | # define asmregparm | 18 | # define asmregparm |
19 | #endif | 19 | #endif |
20 | 20 | ||
21 | #define __page_aligned_data __section(.data.page_aligned) __aligned(PAGE_SIZE) | 21 | #define __page_aligned_data __section(.data..page_aligned) __aligned(PAGE_SIZE) |
22 | #define __page_aligned_bss __section(.bss.page_aligned) __aligned(PAGE_SIZE) | 22 | #define __page_aligned_bss __section(.bss..page_aligned) __aligned(PAGE_SIZE) |
23 | 23 | ||
24 | /* | 24 | /* |
25 | * For assembly routines. | 25 | * For assembly routines. |
@@ -27,8 +27,8 @@ | |||
27 | * Note when using these that you must specify the appropriate | 27 | * Note when using these that you must specify the appropriate |
28 | * alignment directives yourself | 28 | * alignment directives yourself |
29 | */ | 29 | */ |
30 | #define __PAGE_ALIGNED_DATA .section ".data.page_aligned", "aw" | 30 | #define __PAGE_ALIGNED_DATA .section ".data..page_aligned", "aw" |
31 | #define __PAGE_ALIGNED_BSS .section ".bss.page_aligned", "aw" | 31 | #define __PAGE_ALIGNED_BSS .section ".bss..page_aligned", "aw" |
32 | 32 | ||
33 | /* | 33 | /* |
34 | * This is used by architectures to keep arguments on the stack | 34 | * This is used by architectures to keep arguments on the stack |
diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h index c00cc0c4d0b..24e5d01d27d 100644 --- a/include/linux/netfilter/x_tables.h +++ b/include/linux/netfilter/x_tables.h | |||
@@ -397,7 +397,7 @@ struct xt_table_info { | |||
397 | * @stacksize jumps (number of user chains) can possibly be made. | 397 | * @stacksize jumps (number of user chains) can possibly be made. |
398 | */ | 398 | */ |
399 | unsigned int stacksize; | 399 | unsigned int stacksize; |
400 | unsigned int *stackptr; | 400 | unsigned int __percpu *stackptr; |
401 | void ***jumpstack; | 401 | void ***jumpstack; |
402 | /* ipt_entry tables: one per CPU */ | 402 | /* ipt_entry tables: one per CPU */ |
403 | /* Note : this field MUST be the last one, see XT_TABLE_INFO_SZ */ | 403 | /* Note : this field MUST be the last one, see XT_TABLE_INFO_SZ */ |
diff --git a/include/linux/percpu-defs.h b/include/linux/percpu-defs.h index 68567c0b3a5..ce2dc655cd1 100644 --- a/include/linux/percpu-defs.h +++ b/include/linux/percpu-defs.h | |||
@@ -131,11 +131,11 @@ | |||
131 | * Declaration/definition used for per-CPU variables that must be page aligned. | 131 | * Declaration/definition used for per-CPU variables that must be page aligned. |
132 | */ | 132 | */ |
133 | #define DECLARE_PER_CPU_PAGE_ALIGNED(type, name) \ | 133 | #define DECLARE_PER_CPU_PAGE_ALIGNED(type, name) \ |
134 | DECLARE_PER_CPU_SECTION(type, name, ".page_aligned") \ | 134 | DECLARE_PER_CPU_SECTION(type, name, "..page_aligned") \ |
135 | __aligned(PAGE_SIZE) | 135 | __aligned(PAGE_SIZE) |
136 | 136 | ||
137 | #define DEFINE_PER_CPU_PAGE_ALIGNED(type, name) \ | 137 | #define DEFINE_PER_CPU_PAGE_ALIGNED(type, name) \ |
138 | DEFINE_PER_CPU_SECTION(type, name, ".page_aligned") \ | 138 | DEFINE_PER_CPU_SECTION(type, name, "..page_aligned") \ |
139 | __aligned(PAGE_SIZE) | 139 | __aligned(PAGE_SIZE) |
140 | 140 | ||
141 | /* | 141 | /* |
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index fb6c91eac7e..5d0266d9498 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h | |||
@@ -585,6 +585,7 @@ enum perf_event_active_state { | |||
585 | struct file; | 585 | struct file; |
586 | 586 | ||
587 | struct perf_mmap_data { | 587 | struct perf_mmap_data { |
588 | atomic_t refcount; | ||
588 | struct rcu_head rcu_head; | 589 | struct rcu_head rcu_head; |
589 | #ifdef CONFIG_PERF_USE_VMALLOC | 590 | #ifdef CONFIG_PERF_USE_VMALLOC |
590 | struct work_struct work; | 591 | struct work_struct work; |
@@ -592,7 +593,6 @@ struct perf_mmap_data { | |||
592 | #endif | 593 | #endif |
593 | int nr_pages; /* nr of data pages */ | 594 | int nr_pages; /* nr of data pages */ |
594 | int writable; /* are we writable */ | 595 | int writable; /* are we writable */ |
595 | int nr_locked; /* nr pages mlocked */ | ||
596 | 596 | ||
597 | atomic_t poll; /* POLL_ for wakeups */ | 597 | atomic_t poll; /* POLL_ for wakeups */ |
598 | 598 | ||
@@ -631,6 +631,9 @@ struct swevent_hlist { | |||
631 | struct rcu_head rcu_head; | 631 | struct rcu_head rcu_head; |
632 | }; | 632 | }; |
633 | 633 | ||
634 | #define PERF_ATTACH_CONTEXT 0x01 | ||
635 | #define PERF_ATTACH_GROUP 0x02 | ||
636 | |||
634 | /** | 637 | /** |
635 | * struct perf_event - performance event kernel representation: | 638 | * struct perf_event - performance event kernel representation: |
636 | */ | 639 | */ |
@@ -643,10 +646,10 @@ struct perf_event { | |||
643 | int nr_siblings; | 646 | int nr_siblings; |
644 | int group_flags; | 647 | int group_flags; |
645 | struct perf_event *group_leader; | 648 | struct perf_event *group_leader; |
646 | struct perf_event *output; | ||
647 | const struct pmu *pmu; | 649 | const struct pmu *pmu; |
648 | 650 | ||
649 | enum perf_event_active_state state; | 651 | enum perf_event_active_state state; |
652 | unsigned int attach_state; | ||
650 | atomic64_t count; | 653 | atomic64_t count; |
651 | 654 | ||
652 | /* | 655 | /* |
@@ -704,6 +707,8 @@ struct perf_event { | |||
704 | /* mmap bits */ | 707 | /* mmap bits */ |
705 | struct mutex mmap_mutex; | 708 | struct mutex mmap_mutex; |
706 | atomic_t mmap_count; | 709 | atomic_t mmap_count; |
710 | int mmap_locked; | ||
711 | struct user_struct *mmap_user; | ||
707 | struct perf_mmap_data *data; | 712 | struct perf_mmap_data *data; |
708 | 713 | ||
709 | /* poll related */ | 714 | /* poll related */ |
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 7cdfb4d5284..bf243fc5495 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h | |||
@@ -501,7 +501,7 @@ static inline struct sk_buff *alloc_skb_fclone(unsigned int size, | |||
501 | return __alloc_skb(size, priority, 1, -1); | 501 | return __alloc_skb(size, priority, 1, -1); |
502 | } | 502 | } |
503 | 503 | ||
504 | extern int skb_recycle_check(struct sk_buff *skb, int skb_size); | 504 | extern bool skb_recycle_check(struct sk_buff *skb, int skb_size); |
505 | 505 | ||
506 | extern struct sk_buff *skb_morph(struct sk_buff *dst, struct sk_buff *src); | 506 | extern struct sk_buff *skb_morph(struct sk_buff *dst, struct sk_buff *src); |
507 | extern struct sk_buff *skb_clone(struct sk_buff *skb, | 507 | extern struct sk_buff *skb_clone(struct sk_buff *skb, |
diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h index 89fac6a3f78..f8854655860 100644 --- a/include/linux/spinlock.h +++ b/include/linux/spinlock.h | |||
@@ -60,7 +60,7 @@ | |||
60 | /* | 60 | /* |
61 | * Must define these before including other files, inline functions need them | 61 | * Must define these before including other files, inline functions need them |
62 | */ | 62 | */ |
63 | #define LOCK_SECTION_NAME ".text.lock."KBUILD_BASENAME | 63 | #define LOCK_SECTION_NAME ".text..lock."KBUILD_BASENAME |
64 | 64 | ||
65 | #define LOCK_SECTION_START(extra) \ | 65 | #define LOCK_SECTION_START(extra) \ |
66 | ".subsection 1\n\t" \ | 66 | ".subsection 1\n\t" \ |
diff --git a/include/linux/usb/audio-v2.h b/include/linux/usb/audio-v2.h index 92f1d99f0f1..383b94ba8c2 100644 --- a/include/linux/usb/audio-v2.h +++ b/include/linux/usb/audio-v2.h | |||
@@ -18,6 +18,16 @@ | |||
18 | /* v1.0 and v2.0 of this standard have many things in common. For the rest | 18 | /* v1.0 and v2.0 of this standard have many things in common. For the rest |
19 | * of the definitions, please refer to audio.h */ | 19 | * of the definitions, please refer to audio.h */ |
20 | 20 | ||
21 | static inline bool uac2_control_is_readable(u32 bmControls, u8 control) | ||
22 | { | ||
23 | return (bmControls >> (control * 2)) & 0x1; | ||
24 | } | ||
25 | |||
26 | static inline bool uac2_control_is_writeable(u32 bmControls, u8 control) | ||
27 | { | ||
28 | return (bmControls >> (control * 2)) & 0x2; | ||
29 | } | ||
30 | |||
21 | /* 4.7.2.1 Clock Source Descriptor */ | 31 | /* 4.7.2.1 Clock Source Descriptor */ |
22 | 32 | ||
23 | struct uac_clock_source_descriptor { | 33 | struct uac_clock_source_descriptor { |
@@ -31,6 +41,13 @@ struct uac_clock_source_descriptor { | |||
31 | __u8 iClockSource; | 41 | __u8 iClockSource; |
32 | } __attribute__((packed)); | 42 | } __attribute__((packed)); |
33 | 43 | ||
44 | /* bmAttribute fields */ | ||
45 | #define UAC_CLOCK_SOURCE_TYPE_EXT 0x0 | ||
46 | #define UAC_CLOCK_SOURCE_TYPE_INT_FIXED 0x1 | ||
47 | #define UAC_CLOCK_SOURCE_TYPE_INT_VAR 0x2 | ||
48 | #define UAC_CLOCK_SOURCE_TYPE_INT_PROG 0x3 | ||
49 | #define UAC_CLOCK_SOURCE_SYNCED_TO_SOF (1 << 2) | ||
50 | |||
34 | /* 4.7.2.2 Clock Source Descriptor */ | 51 | /* 4.7.2.2 Clock Source Descriptor */ |
35 | 52 | ||
36 | struct uac_clock_selector_descriptor { | 53 | struct uac_clock_selector_descriptor { |
@@ -39,8 +56,20 @@ struct uac_clock_selector_descriptor { | |||
39 | __u8 bDescriptorSubtype; | 56 | __u8 bDescriptorSubtype; |
40 | __u8 bClockID; | 57 | __u8 bClockID; |
41 | __u8 bNrInPins; | 58 | __u8 bNrInPins; |
42 | __u8 bmControls; | ||
43 | __u8 baCSourceID[]; | 59 | __u8 baCSourceID[]; |
60 | /* bmControls, bAssocTerminal and iClockSource omitted */ | ||
61 | } __attribute__((packed)); | ||
62 | |||
63 | /* 4.7.2.3 Clock Multiplier Descriptor */ | ||
64 | |||
65 | struct uac_clock_multiplier_descriptor { | ||
66 | __u8 bLength; | ||
67 | __u8 bDescriptorType; | ||
68 | __u8 bDescriptorSubtype; | ||
69 | __u8 bClockID; | ||
70 | __u8 bCSourceID; | ||
71 | __u8 bmControls; | ||
72 | __u8 iClockMultiplier; | ||
44 | } __attribute__((packed)); | 73 | } __attribute__((packed)); |
45 | 74 | ||
46 | /* 4.7.2.4 Input terminal descriptor */ | 75 | /* 4.7.2.4 Input terminal descriptor */ |
diff --git a/include/linux/usb/audio.h b/include/linux/usb/audio.h index 5d646c38875..c51200c715e 100644 --- a/include/linux/usb/audio.h +++ b/include/linux/usb/audio.h | |||
@@ -47,6 +47,15 @@ | |||
47 | #define UAC_FORMAT_TYPE 0x02 | 47 | #define UAC_FORMAT_TYPE 0x02 |
48 | #define UAC_FORMAT_SPECIFIC 0x03 | 48 | #define UAC_FORMAT_SPECIFIC 0x03 |
49 | 49 | ||
50 | /* A.7 Processing Unit Process Types */ | ||
51 | #define UAC_PROCESS_UNDEFINED 0x00 | ||
52 | #define UAC_PROCESS_UP_DOWNMIX 0x01 | ||
53 | #define UAC_PROCESS_DOLBY_PROLOGIC 0x02 | ||
54 | #define UAC_PROCESS_STEREO_EXTENDER 0x03 | ||
55 | #define UAC_PROCESS_REVERB 0x04 | ||
56 | #define UAC_PROCESS_CHORUS 0x05 | ||
57 | #define UAC_PROCESS_DYN_RANGE_COMP 0x06 | ||
58 | |||
50 | /* A.8 Audio Class-Specific Endpoint Descriptor Subtypes */ | 59 | /* A.8 Audio Class-Specific Endpoint Descriptor Subtypes */ |
51 | #define UAC_EP_GENERAL 0x01 | 60 | #define UAC_EP_GENERAL 0x01 |
52 | 61 | ||
@@ -73,6 +82,60 @@ | |||
73 | 82 | ||
74 | #define UAC_GET_STAT 0xff | 83 | #define UAC_GET_STAT 0xff |
75 | 84 | ||
85 | /* A.10 Control Selector Codes */ | ||
86 | |||
87 | /* A.10.1 Terminal Control Selectors */ | ||
88 | #define UAC_TERM_COPY_PROTECT 0x01 | ||
89 | |||
90 | /* A.10.2 Feature Unit Control Selectors */ | ||
91 | #define UAC_FU_MUTE 0x01 | ||
92 | #define UAC_FU_VOLUME 0x02 | ||
93 | #define UAC_FU_BASS 0x03 | ||
94 | #define UAC_FU_MID 0x04 | ||
95 | #define UAC_FU_TREBLE 0x05 | ||
96 | #define UAC_FU_GRAPHIC_EQUALIZER 0x06 | ||
97 | #define UAC_FU_AUTOMATIC_GAIN 0x07 | ||
98 | #define UAC_FU_DELAY 0x08 | ||
99 | #define UAC_FU_BASS_BOOST 0x09 | ||
100 | #define UAC_FU_LOUDNESS 0x0a | ||
101 | |||
102 | #define UAC_CONTROL_BIT(CS) (1 << ((CS) - 1)) | ||
103 | |||
104 | /* A.10.3.1 Up/Down-mix Processing Unit Controls Selectors */ | ||
105 | #define UAC_UD_ENABLE 0x01 | ||
106 | #define UAC_UD_MODE_SELECT 0x02 | ||
107 | |||
108 | /* A.10.3.2 Dolby Prologic (tm) Processing Unit Controls Selectors */ | ||
109 | #define UAC_DP_ENABLE 0x01 | ||
110 | #define UAC_DP_MODE_SELECT 0x02 | ||
111 | |||
112 | /* A.10.3.3 3D Stereo Extender Processing Unit Control Selectors */ | ||
113 | #define UAC_3D_ENABLE 0x01 | ||
114 | #define UAC_3D_SPACE 0x02 | ||
115 | |||
116 | /* A.10.3.4 Reverberation Processing Unit Control Selectors */ | ||
117 | #define UAC_REVERB_ENABLE 0x01 | ||
118 | #define UAC_REVERB_LEVEL 0x02 | ||
119 | #define UAC_REVERB_TIME 0x03 | ||
120 | #define UAC_REVERB_FEEDBACK 0x04 | ||
121 | |||
122 | /* A.10.3.5 Chorus Processing Unit Control Selectors */ | ||
123 | #define UAC_CHORUS_ENABLE 0x01 | ||
124 | #define UAC_CHORUS_LEVEL 0x02 | ||
125 | #define UAC_CHORUS_RATE 0x03 | ||
126 | #define UAC_CHORUS_DEPTH 0x04 | ||
127 | |||
128 | /* A.10.3.6 Dynamic Range Compressor Unit Control Selectors */ | ||
129 | #define UAC_DCR_ENABLE 0x01 | ||
130 | #define UAC_DCR_RATE 0x02 | ||
131 | #define UAC_DCR_MAXAMPL 0x03 | ||
132 | #define UAC_DCR_THRESHOLD 0x04 | ||
133 | #define UAC_DCR_ATTACK_TIME 0x05 | ||
134 | #define UAC_DCR_RELEASE_TIME 0x06 | ||
135 | |||
136 | /* A.10.4 Extension Unit Control Selectors */ | ||
137 | #define UAC_XU_ENABLE 0x01 | ||
138 | |||
76 | /* MIDI - A.1 MS Class-Specific Interface Descriptor Subtypes */ | 139 | /* MIDI - A.1 MS Class-Specific Interface Descriptor Subtypes */ |
77 | #define UAC_MS_HEADER 0x01 | 140 | #define UAC_MS_HEADER 0x01 |
78 | #define UAC_MIDI_IN_JACK 0x02 | 141 | #define UAC_MIDI_IN_JACK 0x02 |
@@ -244,7 +307,7 @@ struct uac_selector_unit_descriptor { | |||
244 | static inline __u8 uac_selector_unit_iSelector(struct uac_selector_unit_descriptor *desc) | 307 | static inline __u8 uac_selector_unit_iSelector(struct uac_selector_unit_descriptor *desc) |
245 | { | 308 | { |
246 | __u8 *raw = (__u8 *) desc; | 309 | __u8 *raw = (__u8 *) desc; |
247 | return raw[9 + desc->bLength - 1]; | 310 | return raw[desc->bLength - 1]; |
248 | } | 311 | } |
249 | 312 | ||
250 | /* 4.3.2.5 Feature Unit Descriptor */ | 313 | /* 4.3.2.5 Feature Unit Descriptor */ |
@@ -463,31 +526,6 @@ struct uac_iso_endpoint_descriptor { | |||
463 | #define UAC_EP_CS_ATTR_PITCH_CONTROL 0x02 | 526 | #define UAC_EP_CS_ATTR_PITCH_CONTROL 0x02 |
464 | #define UAC_EP_CS_ATTR_FILL_MAX 0x80 | 527 | #define UAC_EP_CS_ATTR_FILL_MAX 0x80 |
465 | 528 | ||
466 | /* A.10.2 Feature Unit Control Selectors */ | ||
467 | |||
468 | #define UAC_FU_CONTROL_UNDEFINED 0x00 | ||
469 | #define UAC_MUTE_CONTROL 0x01 | ||
470 | #define UAC_VOLUME_CONTROL 0x02 | ||
471 | #define UAC_BASS_CONTROL 0x03 | ||
472 | #define UAC_MID_CONTROL 0x04 | ||
473 | #define UAC_TREBLE_CONTROL 0x05 | ||
474 | #define UAC_GRAPHIC_EQUALIZER_CONTROL 0x06 | ||
475 | #define UAC_AUTOMATIC_GAIN_CONTROL 0x07 | ||
476 | #define UAC_DELAY_CONTROL 0x08 | ||
477 | #define UAC_BASS_BOOST_CONTROL 0x09 | ||
478 | #define UAC_LOUDNESS_CONTROL 0x0a | ||
479 | |||
480 | #define UAC_FU_MUTE (1 << (UAC_MUTE_CONTROL - 1)) | ||
481 | #define UAC_FU_VOLUME (1 << (UAC_VOLUME_CONTROL - 1)) | ||
482 | #define UAC_FU_BASS (1 << (UAC_BASS_CONTROL - 1)) | ||
483 | #define UAC_FU_MID (1 << (UAC_MID_CONTROL - 1)) | ||
484 | #define UAC_FU_TREBLE (1 << (UAC_TREBLE_CONTROL - 1)) | ||
485 | #define UAC_FU_GRAPHIC_EQ (1 << (UAC_GRAPHIC_EQUALIZER_CONTROL - 1)) | ||
486 | #define UAC_FU_AUTO_GAIN (1 << (UAC_AUTOMATIC_GAIN_CONTROL - 1)) | ||
487 | #define UAC_FU_DELAY (1 << (UAC_DELAY_CONTROL - 1)) | ||
488 | #define UAC_FU_BASS_BOOST (1 << (UAC_BASS_BOOST_CONTROL - 1)) | ||
489 | #define UAC_FU_LOUDNESS (1 << (UAC_LOUDNESS_CONTROL - 1)) | ||
490 | |||
491 | /* status word format (3.7.1.1) */ | 529 | /* status word format (3.7.1.1) */ |
492 | 530 | ||
493 | #define UAC1_STATUS_TYPE_ORIG_MASK 0x0f | 531 | #define UAC1_STATUS_TYPE_ORIG_MASK 0x0f |
diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h index 2dfaa293ae8..c9a97597699 100644 --- a/include/linux/vgaarb.h +++ b/include/linux/vgaarb.h | |||
@@ -5,6 +5,27 @@ | |||
5 | * (C) Copyright 2005 Benjamin Herrenschmidt <benh@kernel.crashing.org> | 5 | * (C) Copyright 2005 Benjamin Herrenschmidt <benh@kernel.crashing.org> |
6 | * (C) Copyright 2007 Paulo R. Zanoni <przanoni@gmail.com> | 6 | * (C) Copyright 2007 Paulo R. Zanoni <przanoni@gmail.com> |
7 | * (C) Copyright 2007, 2009 Tiago Vignatti <vignatti@freedesktop.org> | 7 | * (C) Copyright 2007, 2009 Tiago Vignatti <vignatti@freedesktop.org> |
8 | * | ||
9 | * Permission is hereby granted, free of charge, to any person obtaining a | ||
10 | * copy of this software and associated documentation files (the "Software"), | ||
11 | * to deal in the Software without restriction, including without limitation | ||
12 | * the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
13 | * and/or sell copies of the Software, and to permit persons to whom the | ||
14 | * Software is furnished to do so, subject to the following conditions: | ||
15 | * | ||
16 | * The above copyright notice and this permission notice (including the next | ||
17 | * paragraph) shall be included in all copies or substantial portions of the | ||
18 | * Software. | ||
19 | * | ||
20 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
21 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
22 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | ||
23 | * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
24 | * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
25 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | ||
26 | * DEALINGS | ||
27 | * IN THE SOFTWARE. | ||
28 | * | ||
8 | */ | 29 | */ |
9 | 30 | ||
10 | #ifndef LINUX_VGA_H | 31 | #ifndef LINUX_VGA_H |
diff --git a/include/net/sock.h b/include/net/sock.h index ca241ea1487..731150d5279 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
@@ -1524,20 +1524,7 @@ extern void sk_stop_timer(struct sock *sk, struct timer_list* timer); | |||
1524 | 1524 | ||
1525 | extern int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb); | 1525 | extern int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb); |
1526 | 1526 | ||
1527 | static inline int sock_queue_err_skb(struct sock *sk, struct sk_buff *skb) | 1527 | extern int sock_queue_err_skb(struct sock *sk, struct sk_buff *skb); |
1528 | { | ||
1529 | /* Cast skb->rcvbuf to unsigned... It's pointless, but reduces | ||
1530 | number of warnings when compiling with -W --ANK | ||
1531 | */ | ||
1532 | if (atomic_read(&sk->sk_rmem_alloc) + skb->truesize >= | ||
1533 | (unsigned)sk->sk_rcvbuf) | ||
1534 | return -ENOMEM; | ||
1535 | skb_set_owner_r(skb, sk); | ||
1536 | skb_queue_tail(&sk->sk_error_queue, skb); | ||
1537 | if (!sock_flag(sk, SOCK_DEAD)) | ||
1538 | sk->sk_data_ready(sk, skb->len); | ||
1539 | return 0; | ||
1540 | } | ||
1541 | 1528 | ||
1542 | /* | 1529 | /* |
1543 | * Recover an error report and clear atomically | 1530 | * Recover an error report and clear atomically |
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h index c50a97fc76f..b7bdecb7b76 100644 --- a/include/scsi/scsi_host.h +++ b/include/scsi/scsi_host.h | |||
@@ -327,6 +327,14 @@ struct scsi_host_template { | |||
327 | sector_t, int []); | 327 | sector_t, int []); |
328 | 328 | ||
329 | /* | 329 | /* |
330 | * This function is called when one or more partitions on the | ||
331 | * device reach beyond the end of the device. | ||
332 | * | ||
333 | * Status: OPTIONAL | ||
334 | */ | ||
335 | void (*unlock_native_capacity)(struct scsi_device *); | ||
336 | |||
337 | /* | ||
330 | * Can be used to export driver statistics and other infos to the | 338 | * Can be used to export driver statistics and other infos to the |
331 | * world outside the kernel ie. userspace and it also provides an | 339 | * world outside the kernel ie. userspace and it also provides an |
332 | * interface to feed the driver with information. | 340 | * interface to feed the driver with information. |
diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h index 4f733ecea46..b9e1dd6c620 100644 --- a/include/trace/events/sched.h +++ b/include/trace/events/sched.h | |||
@@ -115,6 +115,23 @@ DEFINE_EVENT(sched_wakeup_template, sched_wakeup_new, | |||
115 | TP_PROTO(struct task_struct *p, int success), | 115 | TP_PROTO(struct task_struct *p, int success), |
116 | TP_ARGS(p, success)); | 116 | TP_ARGS(p, success)); |
117 | 117 | ||
118 | #ifdef CREATE_TRACE_POINTS | ||
119 | static inline long __trace_sched_switch_state(struct task_struct *p) | ||
120 | { | ||
121 | long state = p->state; | ||
122 | |||
123 | #ifdef CONFIG_PREEMPT | ||
124 | /* | ||
125 | * For all intents and purposes a preempted task is a running task. | ||
126 | */ | ||
127 | if (task_thread_info(p)->preempt_count & PREEMPT_ACTIVE) | ||
128 | state = TASK_RUNNING; | ||
129 | #endif | ||
130 | |||
131 | return state; | ||
132 | } | ||
133 | #endif | ||
134 | |||
118 | /* | 135 | /* |
119 | * Tracepoint for task switches, performed by the scheduler: | 136 | * Tracepoint for task switches, performed by the scheduler: |
120 | */ | 137 | */ |
@@ -139,7 +156,7 @@ TRACE_EVENT(sched_switch, | |||
139 | memcpy(__entry->next_comm, next->comm, TASK_COMM_LEN); | 156 | memcpy(__entry->next_comm, next->comm, TASK_COMM_LEN); |
140 | __entry->prev_pid = prev->pid; | 157 | __entry->prev_pid = prev->pid; |
141 | __entry->prev_prio = prev->prio; | 158 | __entry->prev_prio = prev->prio; |
142 | __entry->prev_state = prev->state; | 159 | __entry->prev_state = __trace_sched_switch_state(prev); |
143 | memcpy(__entry->prev_comm, prev->comm, TASK_COMM_LEN); | 160 | memcpy(__entry->prev_comm, prev->comm, TASK_COMM_LEN); |
144 | __entry->next_pid = next->pid; | 161 | __entry->next_pid = next->pid; |
145 | __entry->next_prio = next->prio; | 162 | __entry->next_prio = next->prio; |
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h index 3d685d1f2a0..5a64905d727 100644 --- a/include/trace/ftrace.h +++ b/include/trace/ftrace.h | |||
@@ -725,7 +725,7 @@ perf_trace_##call(void *__data, proto) \ | |||
725 | \ | 725 | \ |
726 | { assign; } \ | 726 | { assign; } \ |
727 | \ | 727 | \ |
728 | head = per_cpu_ptr(event_call->perf_events, smp_processor_id());\ | 728 | head = this_cpu_ptr(event_call->perf_events); \ |
729 | perf_trace_buf_submit(entry, __entry_size, rctx, __addr, \ | 729 | perf_trace_buf_submit(entry, __entry_size, rctx, __addr, \ |
730 | __count, &__regs, head); \ | 730 | __count, &__regs, head); \ |
731 | } | 731 | } |
diff --git a/init/Kconfig b/init/Kconfig index 2cce9f343ad..5cff9a980c3 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -76,6 +76,14 @@ config INIT_ENV_ARG_LIMIT | |||
76 | variables passed to init from the kernel command line. | 76 | variables passed to init from the kernel command line. |
77 | 77 | ||
78 | 78 | ||
79 | config CROSS_COMPILE | ||
80 | string "Cross-compiler tool prefix" | ||
81 | help | ||
82 | Same as running 'make CROSS_COMPILE=prefix-' but stored for | ||
83 | default make runs in this kernel build directory. You don't | ||
84 | need to set this unless you want the configured kernel build | ||
85 | directory to select the cross-compiler automatically. | ||
86 | |||
79 | config LOCALVERSION | 87 | config LOCALVERSION |
80 | string "Local version - append to kernel release" | 88 | string "Local version - append to kernel release" |
81 | help | 89 | help |
diff --git a/kernel/cpu.c b/kernel/cpu.c index 8b92539b475..97d1b426a4a 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c | |||
@@ -34,7 +34,7 @@ void cpu_maps_update_done(void) | |||
34 | mutex_unlock(&cpu_add_remove_lock); | 34 | mutex_unlock(&cpu_add_remove_lock); |
35 | } | 35 | } |
36 | 36 | ||
37 | static __cpuinitdata RAW_NOTIFIER_HEAD(cpu_chain); | 37 | static RAW_NOTIFIER_HEAD(cpu_chain); |
38 | 38 | ||
39 | /* If set, cpu_up and cpu_down will return -EBUSY and do nothing. | 39 | /* If set, cpu_up and cpu_down will return -EBUSY and do nothing. |
40 | * Should always be manipulated under cpu_add_remove_lock | 40 | * Should always be manipulated under cpu_add_remove_lock |
diff --git a/kernel/module.c b/kernel/module.c index 333fbcc9697..0129769301e 100644 --- a/kernel/module.c +++ b/kernel/module.c | |||
@@ -403,7 +403,7 @@ static unsigned int find_pcpusec(Elf_Ehdr *hdr, | |||
403 | Elf_Shdr *sechdrs, | 403 | Elf_Shdr *sechdrs, |
404 | const char *secstrings) | 404 | const char *secstrings) |
405 | { | 405 | { |
406 | return find_sec(hdr, sechdrs, secstrings, ".data.percpu"); | 406 | return find_sec(hdr, sechdrs, secstrings, ".data..percpu"); |
407 | } | 407 | } |
408 | 408 | ||
409 | static void percpu_modcopy(struct module *mod, | 409 | static void percpu_modcopy(struct module *mod, |
@@ -2014,6 +2014,7 @@ static noinline struct module *load_module(void __user *umod, | |||
2014 | long err = 0; | 2014 | long err = 0; |
2015 | void *ptr = NULL; /* Stops spurious gcc warning */ | 2015 | void *ptr = NULL; /* Stops spurious gcc warning */ |
2016 | unsigned long symoffs, stroffs, *strmap; | 2016 | unsigned long symoffs, stroffs, *strmap; |
2017 | void __percpu *percpu; | ||
2017 | 2018 | ||
2018 | mm_segment_t old_fs; | 2019 | mm_segment_t old_fs; |
2019 | 2020 | ||
@@ -2158,6 +2159,8 @@ static noinline struct module *load_module(void __user *umod, | |||
2158 | goto free_mod; | 2159 | goto free_mod; |
2159 | sechdrs[pcpuindex].sh_flags &= ~(unsigned long)SHF_ALLOC; | 2160 | sechdrs[pcpuindex].sh_flags &= ~(unsigned long)SHF_ALLOC; |
2160 | } | 2161 | } |
2162 | /* Keep this around for failure path. */ | ||
2163 | percpu = mod_percpu(mod); | ||
2161 | 2164 | ||
2162 | /* Determine total sizes, and put offsets in sh_entsize. For now | 2165 | /* Determine total sizes, and put offsets in sh_entsize. For now |
2163 | this is done generically; there doesn't appear to be any | 2166 | this is done generically; there doesn't appear to be any |
@@ -2463,7 +2466,7 @@ static noinline struct module *load_module(void __user *umod, | |||
2463 | module_free(mod, mod->module_core); | 2466 | module_free(mod, mod->module_core); |
2464 | /* mod will be freed with core. Don't access it beyond this line! */ | 2467 | /* mod will be freed with core. Don't access it beyond this line! */ |
2465 | free_percpu: | 2468 | free_percpu: |
2466 | percpu_modfree(mod); | 2469 | free_percpu(percpu); |
2467 | free_mod: | 2470 | free_mod: |
2468 | kfree(args); | 2471 | kfree(args); |
2469 | kfree(strmap); | 2472 | kfree(strmap); |
diff --git a/kernel/perf_event.c b/kernel/perf_event.c index bd7ce8ca5bb..31d6afe9259 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c | |||
@@ -283,14 +283,15 @@ ctx_group_list(struct perf_event *event, struct perf_event_context *ctx) | |||
283 | static void | 283 | static void |
284 | list_add_event(struct perf_event *event, struct perf_event_context *ctx) | 284 | list_add_event(struct perf_event *event, struct perf_event_context *ctx) |
285 | { | 285 | { |
286 | struct perf_event *group_leader = event->group_leader; | 286 | WARN_ON_ONCE(event->attach_state & PERF_ATTACH_CONTEXT); |
287 | event->attach_state |= PERF_ATTACH_CONTEXT; | ||
287 | 288 | ||
288 | /* | 289 | /* |
289 | * Depending on whether it is a standalone or sibling event, | 290 | * If we're a stand alone event or group leader, we go to the context |
290 | * add it straight to the context's event list, or to the group | 291 | * list, group events are kept attached to the group so that |
291 | * leader's sibling list: | 292 | * perf_group_detach can, at all times, locate all siblings. |
292 | */ | 293 | */ |
293 | if (group_leader == event) { | 294 | if (event->group_leader == event) { |
294 | struct list_head *list; | 295 | struct list_head *list; |
295 | 296 | ||
296 | if (is_software_event(event)) | 297 | if (is_software_event(event)) |
@@ -298,13 +299,6 @@ list_add_event(struct perf_event *event, struct perf_event_context *ctx) | |||
298 | 299 | ||
299 | list = ctx_group_list(event, ctx); | 300 | list = ctx_group_list(event, ctx); |
300 | list_add_tail(&event->group_entry, list); | 301 | list_add_tail(&event->group_entry, list); |
301 | } else { | ||
302 | if (group_leader->group_flags & PERF_GROUP_SOFTWARE && | ||
303 | !is_software_event(event)) | ||
304 | group_leader->group_flags &= ~PERF_GROUP_SOFTWARE; | ||
305 | |||
306 | list_add_tail(&event->group_entry, &group_leader->sibling_list); | ||
307 | group_leader->nr_siblings++; | ||
308 | } | 302 | } |
309 | 303 | ||
310 | list_add_rcu(&event->event_entry, &ctx->event_list); | 304 | list_add_rcu(&event->event_entry, &ctx->event_list); |
@@ -313,6 +307,24 @@ list_add_event(struct perf_event *event, struct perf_event_context *ctx) | |||
313 | ctx->nr_stat++; | 307 | ctx->nr_stat++; |
314 | } | 308 | } |
315 | 309 | ||
310 | static void perf_group_attach(struct perf_event *event) | ||
311 | { | ||
312 | struct perf_event *group_leader = event->group_leader; | ||
313 | |||
314 | WARN_ON_ONCE(event->attach_state & PERF_ATTACH_GROUP); | ||
315 | event->attach_state |= PERF_ATTACH_GROUP; | ||
316 | |||
317 | if (group_leader == event) | ||
318 | return; | ||
319 | |||
320 | if (group_leader->group_flags & PERF_GROUP_SOFTWARE && | ||
321 | !is_software_event(event)) | ||
322 | group_leader->group_flags &= ~PERF_GROUP_SOFTWARE; | ||
323 | |||
324 | list_add_tail(&event->group_entry, &group_leader->sibling_list); | ||
325 | group_leader->nr_siblings++; | ||
326 | } | ||
327 | |||
316 | /* | 328 | /* |
317 | * Remove a event from the lists for its context. | 329 | * Remove a event from the lists for its context. |
318 | * Must be called with ctx->mutex and ctx->lock held. | 330 | * Must be called with ctx->mutex and ctx->lock held. |
@@ -320,17 +332,22 @@ list_add_event(struct perf_event *event, struct perf_event_context *ctx) | |||
320 | static void | 332 | static void |
321 | list_del_event(struct perf_event *event, struct perf_event_context *ctx) | 333 | list_del_event(struct perf_event *event, struct perf_event_context *ctx) |
322 | { | 334 | { |
323 | if (list_empty(&event->group_entry)) | 335 | /* |
336 | * We can have double detach due to exit/hot-unplug + close. | ||
337 | */ | ||
338 | if (!(event->attach_state & PERF_ATTACH_CONTEXT)) | ||
324 | return; | 339 | return; |
340 | |||
341 | event->attach_state &= ~PERF_ATTACH_CONTEXT; | ||
342 | |||
325 | ctx->nr_events--; | 343 | ctx->nr_events--; |
326 | if (event->attr.inherit_stat) | 344 | if (event->attr.inherit_stat) |
327 | ctx->nr_stat--; | 345 | ctx->nr_stat--; |
328 | 346 | ||
329 | list_del_init(&event->group_entry); | ||
330 | list_del_rcu(&event->event_entry); | 347 | list_del_rcu(&event->event_entry); |
331 | 348 | ||
332 | if (event->group_leader != event) | 349 | if (event->group_leader == event) |
333 | event->group_leader->nr_siblings--; | 350 | list_del_init(&event->group_entry); |
334 | 351 | ||
335 | update_group_times(event); | 352 | update_group_times(event); |
336 | 353 | ||
@@ -345,21 +362,39 @@ list_del_event(struct perf_event *event, struct perf_event_context *ctx) | |||
345 | event->state = PERF_EVENT_STATE_OFF; | 362 | event->state = PERF_EVENT_STATE_OFF; |
346 | } | 363 | } |
347 | 364 | ||
348 | static void | 365 | static void perf_group_detach(struct perf_event *event) |
349 | perf_destroy_group(struct perf_event *event, struct perf_event_context *ctx) | ||
350 | { | 366 | { |
351 | struct perf_event *sibling, *tmp; | 367 | struct perf_event *sibling, *tmp; |
368 | struct list_head *list = NULL; | ||
369 | |||
370 | /* | ||
371 | * We can have double detach due to exit/hot-unplug + close. | ||
372 | */ | ||
373 | if (!(event->attach_state & PERF_ATTACH_GROUP)) | ||
374 | return; | ||
375 | |||
376 | event->attach_state &= ~PERF_ATTACH_GROUP; | ||
377 | |||
378 | /* | ||
379 | * If this is a sibling, remove it from its group. | ||
380 | */ | ||
381 | if (event->group_leader != event) { | ||
382 | list_del_init(&event->group_entry); | ||
383 | event->group_leader->nr_siblings--; | ||
384 | return; | ||
385 | } | ||
386 | |||
387 | if (!list_empty(&event->group_entry)) | ||
388 | list = &event->group_entry; | ||
352 | 389 | ||
353 | /* | 390 | /* |
354 | * If this was a group event with sibling events then | 391 | * If this was a group event with sibling events then |
355 | * upgrade the siblings to singleton events by adding them | 392 | * upgrade the siblings to singleton events by adding them |
356 | * to the context list directly: | 393 | * to whatever list we are on. |
357 | */ | 394 | */ |
358 | list_for_each_entry_safe(sibling, tmp, &event->sibling_list, group_entry) { | 395 | list_for_each_entry_safe(sibling, tmp, &event->sibling_list, group_entry) { |
359 | struct list_head *list; | 396 | if (list) |
360 | 397 | list_move_tail(&sibling->group_entry, list); | |
361 | list = ctx_group_list(event, ctx); | ||
362 | list_move_tail(&sibling->group_entry, list); | ||
363 | sibling->group_leader = sibling; | 398 | sibling->group_leader = sibling; |
364 | 399 | ||
365 | /* Inherit group flags from the previous leader */ | 400 | /* Inherit group flags from the previous leader */ |
@@ -652,8 +687,11 @@ group_sched_in(struct perf_event *group_event, | |||
652 | if (txn) | 687 | if (txn) |
653 | pmu->start_txn(pmu); | 688 | pmu->start_txn(pmu); |
654 | 689 | ||
655 | if (event_sched_in(group_event, cpuctx, ctx)) | 690 | if (event_sched_in(group_event, cpuctx, ctx)) { |
691 | if (txn) | ||
692 | pmu->cancel_txn(pmu); | ||
656 | return -EAGAIN; | 693 | return -EAGAIN; |
694 | } | ||
657 | 695 | ||
658 | /* | 696 | /* |
659 | * Schedule in siblings as one group (if any): | 697 | * Schedule in siblings as one group (if any): |
@@ -675,9 +713,6 @@ group_sched_in(struct perf_event *group_event, | |||
675 | } | 713 | } |
676 | 714 | ||
677 | group_error: | 715 | group_error: |
678 | if (txn) | ||
679 | pmu->cancel_txn(pmu); | ||
680 | |||
681 | /* | 716 | /* |
682 | * Groups can be scheduled in as one unit only, so undo any | 717 | * Groups can be scheduled in as one unit only, so undo any |
683 | * partial group before returning: | 718 | * partial group before returning: |
@@ -689,6 +724,9 @@ group_error: | |||
689 | } | 724 | } |
690 | event_sched_out(group_event, cpuctx, ctx); | 725 | event_sched_out(group_event, cpuctx, ctx); |
691 | 726 | ||
727 | if (txn) | ||
728 | pmu->cancel_txn(pmu); | ||
729 | |||
692 | return -EAGAIN; | 730 | return -EAGAIN; |
693 | } | 731 | } |
694 | 732 | ||
@@ -727,6 +765,7 @@ static void add_event_to_ctx(struct perf_event *event, | |||
727 | struct perf_event_context *ctx) | 765 | struct perf_event_context *ctx) |
728 | { | 766 | { |
729 | list_add_event(event, ctx); | 767 | list_add_event(event, ctx); |
768 | perf_group_attach(event); | ||
730 | event->tstamp_enabled = ctx->time; | 769 | event->tstamp_enabled = ctx->time; |
731 | event->tstamp_running = ctx->time; | 770 | event->tstamp_running = ctx->time; |
732 | event->tstamp_stopped = ctx->time; | 771 | event->tstamp_stopped = ctx->time; |
@@ -1841,6 +1880,7 @@ static void free_event_rcu(struct rcu_head *head) | |||
1841 | } | 1880 | } |
1842 | 1881 | ||
1843 | static void perf_pending_sync(struct perf_event *event); | 1882 | static void perf_pending_sync(struct perf_event *event); |
1883 | static void perf_mmap_data_put(struct perf_mmap_data *data); | ||
1844 | 1884 | ||
1845 | static void free_event(struct perf_event *event) | 1885 | static void free_event(struct perf_event *event) |
1846 | { | 1886 | { |
@@ -1856,9 +1896,9 @@ static void free_event(struct perf_event *event) | |||
1856 | atomic_dec(&nr_task_events); | 1896 | atomic_dec(&nr_task_events); |
1857 | } | 1897 | } |
1858 | 1898 | ||
1859 | if (event->output) { | 1899 | if (event->data) { |
1860 | fput(event->output->filp); | 1900 | perf_mmap_data_put(event->data); |
1861 | event->output = NULL; | 1901 | event->data = NULL; |
1862 | } | 1902 | } |
1863 | 1903 | ||
1864 | if (event->destroy) | 1904 | if (event->destroy) |
@@ -1893,8 +1933,8 @@ int perf_event_release_kernel(struct perf_event *event) | |||
1893 | */ | 1933 | */ |
1894 | mutex_lock_nested(&ctx->mutex, SINGLE_DEPTH_NESTING); | 1934 | mutex_lock_nested(&ctx->mutex, SINGLE_DEPTH_NESTING); |
1895 | raw_spin_lock_irq(&ctx->lock); | 1935 | raw_spin_lock_irq(&ctx->lock); |
1936 | perf_group_detach(event); | ||
1896 | list_del_event(event, ctx); | 1937 | list_del_event(event, ctx); |
1897 | perf_destroy_group(event, ctx); | ||
1898 | raw_spin_unlock_irq(&ctx->lock); | 1938 | raw_spin_unlock_irq(&ctx->lock); |
1899 | mutex_unlock(&ctx->mutex); | 1939 | mutex_unlock(&ctx->mutex); |
1900 | 1940 | ||
@@ -2175,7 +2215,27 @@ unlock: | |||
2175 | return ret; | 2215 | return ret; |
2176 | } | 2216 | } |
2177 | 2217 | ||
2178 | static int perf_event_set_output(struct perf_event *event, int output_fd); | 2218 | static const struct file_operations perf_fops; |
2219 | |||
2220 | static struct perf_event *perf_fget_light(int fd, int *fput_needed) | ||
2221 | { | ||
2222 | struct file *file; | ||
2223 | |||
2224 | file = fget_light(fd, fput_needed); | ||
2225 | if (!file) | ||
2226 | return ERR_PTR(-EBADF); | ||
2227 | |||
2228 | if (file->f_op != &perf_fops) { | ||
2229 | fput_light(file, *fput_needed); | ||
2230 | *fput_needed = 0; | ||
2231 | return ERR_PTR(-EBADF); | ||
2232 | } | ||
2233 | |||
2234 | return file->private_data; | ||
2235 | } | ||
2236 | |||
2237 | static int perf_event_set_output(struct perf_event *event, | ||
2238 | struct perf_event *output_event); | ||
2179 | static int perf_event_set_filter(struct perf_event *event, void __user *arg); | 2239 | static int perf_event_set_filter(struct perf_event *event, void __user *arg); |
2180 | 2240 | ||
2181 | static long perf_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | 2241 | static long perf_ioctl(struct file *file, unsigned int cmd, unsigned long arg) |
@@ -2202,7 +2262,23 @@ static long perf_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | |||
2202 | return perf_event_period(event, (u64 __user *)arg); | 2262 | return perf_event_period(event, (u64 __user *)arg); |
2203 | 2263 | ||
2204 | case PERF_EVENT_IOC_SET_OUTPUT: | 2264 | case PERF_EVENT_IOC_SET_OUTPUT: |
2205 | return perf_event_set_output(event, arg); | 2265 | { |
2266 | struct perf_event *output_event = NULL; | ||
2267 | int fput_needed = 0; | ||
2268 | int ret; | ||
2269 | |||
2270 | if (arg != -1) { | ||
2271 | output_event = perf_fget_light(arg, &fput_needed); | ||
2272 | if (IS_ERR(output_event)) | ||
2273 | return PTR_ERR(output_event); | ||
2274 | } | ||
2275 | |||
2276 | ret = perf_event_set_output(event, output_event); | ||
2277 | if (output_event) | ||
2278 | fput_light(output_event->filp, fput_needed); | ||
2279 | |||
2280 | return ret; | ||
2281 | } | ||
2206 | 2282 | ||
2207 | case PERF_EVENT_IOC_SET_FILTER: | 2283 | case PERF_EVENT_IOC_SET_FILTER: |
2208 | return perf_event_set_filter(event, (void __user *)arg); | 2284 | return perf_event_set_filter(event, (void __user *)arg); |
@@ -2335,8 +2411,6 @@ perf_mmap_data_alloc(struct perf_event *event, int nr_pages) | |||
2335 | unsigned long size; | 2411 | unsigned long size; |
2336 | int i; | 2412 | int i; |
2337 | 2413 | ||
2338 | WARN_ON(atomic_read(&event->mmap_count)); | ||
2339 | |||
2340 | size = sizeof(struct perf_mmap_data); | 2414 | size = sizeof(struct perf_mmap_data); |
2341 | size += nr_pages * sizeof(void *); | 2415 | size += nr_pages * sizeof(void *); |
2342 | 2416 | ||
@@ -2452,8 +2526,6 @@ perf_mmap_data_alloc(struct perf_event *event, int nr_pages) | |||
2452 | unsigned long size; | 2526 | unsigned long size; |
2453 | void *all_buf; | 2527 | void *all_buf; |
2454 | 2528 | ||
2455 | WARN_ON(atomic_read(&event->mmap_count)); | ||
2456 | |||
2457 | size = sizeof(struct perf_mmap_data); | 2529 | size = sizeof(struct perf_mmap_data); |
2458 | size += sizeof(void *); | 2530 | size += sizeof(void *); |
2459 | 2531 | ||
@@ -2536,7 +2608,7 @@ perf_mmap_data_init(struct perf_event *event, struct perf_mmap_data *data) | |||
2536 | if (!data->watermark) | 2608 | if (!data->watermark) |
2537 | data->watermark = max_size / 2; | 2609 | data->watermark = max_size / 2; |
2538 | 2610 | ||
2539 | 2611 | atomic_set(&data->refcount, 1); | |
2540 | rcu_assign_pointer(event->data, data); | 2612 | rcu_assign_pointer(event->data, data); |
2541 | } | 2613 | } |
2542 | 2614 | ||
@@ -2548,13 +2620,26 @@ static void perf_mmap_data_free_rcu(struct rcu_head *rcu_head) | |||
2548 | perf_mmap_data_free(data); | 2620 | perf_mmap_data_free(data); |
2549 | } | 2621 | } |
2550 | 2622 | ||
2551 | static void perf_mmap_data_release(struct perf_event *event) | 2623 | static struct perf_mmap_data *perf_mmap_data_get(struct perf_event *event) |
2552 | { | 2624 | { |
2553 | struct perf_mmap_data *data = event->data; | 2625 | struct perf_mmap_data *data; |
2554 | 2626 | ||
2555 | WARN_ON(atomic_read(&event->mmap_count)); | 2627 | rcu_read_lock(); |
2628 | data = rcu_dereference(event->data); | ||
2629 | if (data) { | ||
2630 | if (!atomic_inc_not_zero(&data->refcount)) | ||
2631 | data = NULL; | ||
2632 | } | ||
2633 | rcu_read_unlock(); | ||
2634 | |||
2635 | return data; | ||
2636 | } | ||
2637 | |||
2638 | static void perf_mmap_data_put(struct perf_mmap_data *data) | ||
2639 | { | ||
2640 | if (!atomic_dec_and_test(&data->refcount)) | ||
2641 | return; | ||
2556 | 2642 | ||
2557 | rcu_assign_pointer(event->data, NULL); | ||
2558 | call_rcu(&data->rcu_head, perf_mmap_data_free_rcu); | 2643 | call_rcu(&data->rcu_head, perf_mmap_data_free_rcu); |
2559 | } | 2644 | } |
2560 | 2645 | ||
@@ -2569,15 +2654,18 @@ static void perf_mmap_close(struct vm_area_struct *vma) | |||
2569 | { | 2654 | { |
2570 | struct perf_event *event = vma->vm_file->private_data; | 2655 | struct perf_event *event = vma->vm_file->private_data; |
2571 | 2656 | ||
2572 | WARN_ON_ONCE(event->ctx->parent_ctx); | ||
2573 | if (atomic_dec_and_mutex_lock(&event->mmap_count, &event->mmap_mutex)) { | 2657 | if (atomic_dec_and_mutex_lock(&event->mmap_count, &event->mmap_mutex)) { |
2574 | unsigned long size = perf_data_size(event->data); | 2658 | unsigned long size = perf_data_size(event->data); |
2575 | struct user_struct *user = current_user(); | 2659 | struct user_struct *user = event->mmap_user; |
2660 | struct perf_mmap_data *data = event->data; | ||
2576 | 2661 | ||
2577 | atomic_long_sub((size >> PAGE_SHIFT) + 1, &user->locked_vm); | 2662 | atomic_long_sub((size >> PAGE_SHIFT) + 1, &user->locked_vm); |
2578 | vma->vm_mm->locked_vm -= event->data->nr_locked; | 2663 | vma->vm_mm->locked_vm -= event->mmap_locked; |
2579 | perf_mmap_data_release(event); | 2664 | rcu_assign_pointer(event->data, NULL); |
2580 | mutex_unlock(&event->mmap_mutex); | 2665 | mutex_unlock(&event->mmap_mutex); |
2666 | |||
2667 | perf_mmap_data_put(data); | ||
2668 | free_uid(user); | ||
2581 | } | 2669 | } |
2582 | } | 2670 | } |
2583 | 2671 | ||
@@ -2629,13 +2717,10 @@ static int perf_mmap(struct file *file, struct vm_area_struct *vma) | |||
2629 | 2717 | ||
2630 | WARN_ON_ONCE(event->ctx->parent_ctx); | 2718 | WARN_ON_ONCE(event->ctx->parent_ctx); |
2631 | mutex_lock(&event->mmap_mutex); | 2719 | mutex_lock(&event->mmap_mutex); |
2632 | if (event->output) { | 2720 | if (event->data) { |
2633 | ret = -EINVAL; | 2721 | if (event->data->nr_pages == nr_pages) |
2634 | goto unlock; | 2722 | atomic_inc(&event->data->refcount); |
2635 | } | 2723 | else |
2636 | |||
2637 | if (atomic_inc_not_zero(&event->mmap_count)) { | ||
2638 | if (nr_pages != event->data->nr_pages) | ||
2639 | ret = -EINVAL; | 2724 | ret = -EINVAL; |
2640 | goto unlock; | 2725 | goto unlock; |
2641 | } | 2726 | } |
@@ -2667,21 +2752,23 @@ static int perf_mmap(struct file *file, struct vm_area_struct *vma) | |||
2667 | WARN_ON(event->data); | 2752 | WARN_ON(event->data); |
2668 | 2753 | ||
2669 | data = perf_mmap_data_alloc(event, nr_pages); | 2754 | data = perf_mmap_data_alloc(event, nr_pages); |
2670 | ret = -ENOMEM; | 2755 | if (!data) { |
2671 | if (!data) | 2756 | ret = -ENOMEM; |
2672 | goto unlock; | 2757 | goto unlock; |
2758 | } | ||
2673 | 2759 | ||
2674 | ret = 0; | ||
2675 | perf_mmap_data_init(event, data); | 2760 | perf_mmap_data_init(event, data); |
2676 | |||
2677 | atomic_set(&event->mmap_count, 1); | ||
2678 | atomic_long_add(user_extra, &user->locked_vm); | ||
2679 | vma->vm_mm->locked_vm += extra; | ||
2680 | event->data->nr_locked = extra; | ||
2681 | if (vma->vm_flags & VM_WRITE) | 2761 | if (vma->vm_flags & VM_WRITE) |
2682 | event->data->writable = 1; | 2762 | event->data->writable = 1; |
2683 | 2763 | ||
2764 | atomic_long_add(user_extra, &user->locked_vm); | ||
2765 | event->mmap_locked = extra; | ||
2766 | event->mmap_user = get_current_user(); | ||
2767 | vma->vm_mm->locked_vm += event->mmap_locked; | ||
2768 | |||
2684 | unlock: | 2769 | unlock: |
2770 | if (!ret) | ||
2771 | atomic_inc(&event->mmap_count); | ||
2685 | mutex_unlock(&event->mmap_mutex); | 2772 | mutex_unlock(&event->mmap_mutex); |
2686 | 2773 | ||
2687 | vma->vm_flags |= VM_RESERVED; | 2774 | vma->vm_flags |= VM_RESERVED; |
@@ -2977,6 +3064,7 @@ __always_inline void perf_output_copy(struct perf_output_handle *handle, | |||
2977 | 3064 | ||
2978 | len -= size; | 3065 | len -= size; |
2979 | handle->addr += size; | 3066 | handle->addr += size; |
3067 | buf += size; | ||
2980 | handle->size -= size; | 3068 | handle->size -= size; |
2981 | if (!handle->size) { | 3069 | if (!handle->size) { |
2982 | struct perf_mmap_data *data = handle->data; | 3070 | struct perf_mmap_data *data = handle->data; |
@@ -2993,7 +3081,6 @@ int perf_output_begin(struct perf_output_handle *handle, | |||
2993 | struct perf_event *event, unsigned int size, | 3081 | struct perf_event *event, unsigned int size, |
2994 | int nmi, int sample) | 3082 | int nmi, int sample) |
2995 | { | 3083 | { |
2996 | struct perf_event *output_event; | ||
2997 | struct perf_mmap_data *data; | 3084 | struct perf_mmap_data *data; |
2998 | unsigned long tail, offset, head; | 3085 | unsigned long tail, offset, head; |
2999 | int have_lost; | 3086 | int have_lost; |
@@ -3010,10 +3097,6 @@ int perf_output_begin(struct perf_output_handle *handle, | |||
3010 | if (event->parent) | 3097 | if (event->parent) |
3011 | event = event->parent; | 3098 | event = event->parent; |
3012 | 3099 | ||
3013 | output_event = rcu_dereference(event->output); | ||
3014 | if (output_event) | ||
3015 | event = output_event; | ||
3016 | |||
3017 | data = rcu_dereference(event->data); | 3100 | data = rcu_dereference(event->data); |
3018 | if (!data) | 3101 | if (!data) |
3019 | goto out; | 3102 | goto out; |
@@ -3972,13 +4055,6 @@ static void perf_swevent_overflow(struct perf_event *event, u64 overflow, | |||
3972 | } | 4055 | } |
3973 | } | 4056 | } |
3974 | 4057 | ||
3975 | static void perf_swevent_unthrottle(struct perf_event *event) | ||
3976 | { | ||
3977 | /* | ||
3978 | * Nothing to do, we already reset hwc->interrupts. | ||
3979 | */ | ||
3980 | } | ||
3981 | |||
3982 | static void perf_swevent_add(struct perf_event *event, u64 nr, | 4058 | static void perf_swevent_add(struct perf_event *event, u64 nr, |
3983 | int nmi, struct perf_sample_data *data, | 4059 | int nmi, struct perf_sample_data *data, |
3984 | struct pt_regs *regs) | 4060 | struct pt_regs *regs) |
@@ -4193,11 +4269,22 @@ static void perf_swevent_disable(struct perf_event *event) | |||
4193 | hlist_del_rcu(&event->hlist_entry); | 4269 | hlist_del_rcu(&event->hlist_entry); |
4194 | } | 4270 | } |
4195 | 4271 | ||
4272 | static void perf_swevent_void(struct perf_event *event) | ||
4273 | { | ||
4274 | } | ||
4275 | |||
4276 | static int perf_swevent_int(struct perf_event *event) | ||
4277 | { | ||
4278 | return 0; | ||
4279 | } | ||
4280 | |||
4196 | static const struct pmu perf_ops_generic = { | 4281 | static const struct pmu perf_ops_generic = { |
4197 | .enable = perf_swevent_enable, | 4282 | .enable = perf_swevent_enable, |
4198 | .disable = perf_swevent_disable, | 4283 | .disable = perf_swevent_disable, |
4284 | .start = perf_swevent_int, | ||
4285 | .stop = perf_swevent_void, | ||
4199 | .read = perf_swevent_read, | 4286 | .read = perf_swevent_read, |
4200 | .unthrottle = perf_swevent_unthrottle, | 4287 | .unthrottle = perf_swevent_void, /* hwc->interrupts already reset */ |
4201 | }; | 4288 | }; |
4202 | 4289 | ||
4203 | /* | 4290 | /* |
@@ -4478,8 +4565,10 @@ static int swevent_hlist_get(struct perf_event *event) | |||
4478 | static const struct pmu perf_ops_tracepoint = { | 4565 | static const struct pmu perf_ops_tracepoint = { |
4479 | .enable = perf_trace_enable, | 4566 | .enable = perf_trace_enable, |
4480 | .disable = perf_trace_disable, | 4567 | .disable = perf_trace_disable, |
4568 | .start = perf_swevent_int, | ||
4569 | .stop = perf_swevent_void, | ||
4481 | .read = perf_swevent_read, | 4570 | .read = perf_swevent_read, |
4482 | .unthrottle = perf_swevent_unthrottle, | 4571 | .unthrottle = perf_swevent_void, |
4483 | }; | 4572 | }; |
4484 | 4573 | ||
4485 | static int perf_tp_filter_match(struct perf_event *event, | 4574 | static int perf_tp_filter_match(struct perf_event *event, |
@@ -4912,39 +5001,17 @@ err_size: | |||
4912 | goto out; | 5001 | goto out; |
4913 | } | 5002 | } |
4914 | 5003 | ||
4915 | static int perf_event_set_output(struct perf_event *event, int output_fd) | 5004 | static int |
5005 | perf_event_set_output(struct perf_event *event, struct perf_event *output_event) | ||
4916 | { | 5006 | { |
4917 | struct perf_event *output_event = NULL; | 5007 | struct perf_mmap_data *data = NULL, *old_data = NULL; |
4918 | struct file *output_file = NULL; | ||
4919 | struct perf_event *old_output; | ||
4920 | int fput_needed = 0; | ||
4921 | int ret = -EINVAL; | 5008 | int ret = -EINVAL; |
4922 | 5009 | ||
4923 | /* | 5010 | if (!output_event) |
4924 | * Don't allow output of inherited per-task events. This would | ||
4925 | * create performance issues due to cross cpu access. | ||
4926 | */ | ||
4927 | if (event->cpu == -1 && event->attr.inherit) | ||
4928 | return -EINVAL; | ||
4929 | |||
4930 | if (!output_fd) | ||
4931 | goto set; | 5011 | goto set; |
4932 | 5012 | ||
4933 | output_file = fget_light(output_fd, &fput_needed); | 5013 | /* don't allow circular references */ |
4934 | if (!output_file) | 5014 | if (event == output_event) |
4935 | return -EBADF; | ||
4936 | |||
4937 | if (output_file->f_op != &perf_fops) | ||
4938 | goto out; | ||
4939 | |||
4940 | output_event = output_file->private_data; | ||
4941 | |||
4942 | /* Don't chain output fds */ | ||
4943 | if (output_event->output) | ||
4944 | goto out; | ||
4945 | |||
4946 | /* Don't set an output fd when we already have an output channel */ | ||
4947 | if (event->data) | ||
4948 | goto out; | 5015 | goto out; |
4949 | 5016 | ||
4950 | /* | 5017 | /* |
@@ -4959,26 +5026,28 @@ static int perf_event_set_output(struct perf_event *event, int output_fd) | |||
4959 | if (output_event->cpu == -1 && output_event->ctx != event->ctx) | 5026 | if (output_event->cpu == -1 && output_event->ctx != event->ctx) |
4960 | goto out; | 5027 | goto out; |
4961 | 5028 | ||
4962 | atomic_long_inc(&output_file->f_count); | ||
4963 | |||
4964 | set: | 5029 | set: |
4965 | mutex_lock(&event->mmap_mutex); | 5030 | mutex_lock(&event->mmap_mutex); |
4966 | old_output = event->output; | 5031 | /* Can't redirect output if we've got an active mmap() */ |
4967 | rcu_assign_pointer(event->output, output_event); | 5032 | if (atomic_read(&event->mmap_count)) |
4968 | mutex_unlock(&event->mmap_mutex); | 5033 | goto unlock; |
4969 | 5034 | ||
4970 | if (old_output) { | 5035 | if (output_event) { |
4971 | /* | 5036 | /* get the buffer we want to redirect to */ |
4972 | * we need to make sure no existing perf_output_*() | 5037 | data = perf_mmap_data_get(output_event); |
4973 | * is still referencing this event. | 5038 | if (!data) |
4974 | */ | 5039 | goto unlock; |
4975 | synchronize_rcu(); | ||
4976 | fput(old_output->filp); | ||
4977 | } | 5040 | } |
4978 | 5041 | ||
5042 | old_data = event->data; | ||
5043 | rcu_assign_pointer(event->data, data); | ||
4979 | ret = 0; | 5044 | ret = 0; |
5045 | unlock: | ||
5046 | mutex_unlock(&event->mmap_mutex); | ||
5047 | |||
5048 | if (old_data) | ||
5049 | perf_mmap_data_put(old_data); | ||
4980 | out: | 5050 | out: |
4981 | fput_light(output_file, fput_needed); | ||
4982 | return ret; | 5051 | return ret; |
4983 | } | 5052 | } |
4984 | 5053 | ||
@@ -4994,7 +5063,7 @@ SYSCALL_DEFINE5(perf_event_open, | |||
4994 | struct perf_event_attr __user *, attr_uptr, | 5063 | struct perf_event_attr __user *, attr_uptr, |
4995 | pid_t, pid, int, cpu, int, group_fd, unsigned long, flags) | 5064 | pid_t, pid, int, cpu, int, group_fd, unsigned long, flags) |
4996 | { | 5065 | { |
4997 | struct perf_event *event, *group_leader; | 5066 | struct perf_event *event, *group_leader = NULL, *output_event = NULL; |
4998 | struct perf_event_attr attr; | 5067 | struct perf_event_attr attr; |
4999 | struct perf_event_context *ctx; | 5068 | struct perf_event_context *ctx; |
5000 | struct file *event_file = NULL; | 5069 | struct file *event_file = NULL; |
@@ -5034,19 +5103,25 @@ SYSCALL_DEFINE5(perf_event_open, | |||
5034 | goto err_fd; | 5103 | goto err_fd; |
5035 | } | 5104 | } |
5036 | 5105 | ||
5106 | if (group_fd != -1) { | ||
5107 | group_leader = perf_fget_light(group_fd, &fput_needed); | ||
5108 | if (IS_ERR(group_leader)) { | ||
5109 | err = PTR_ERR(group_leader); | ||
5110 | goto err_put_context; | ||
5111 | } | ||
5112 | group_file = group_leader->filp; | ||
5113 | if (flags & PERF_FLAG_FD_OUTPUT) | ||
5114 | output_event = group_leader; | ||
5115 | if (flags & PERF_FLAG_FD_NO_GROUP) | ||
5116 | group_leader = NULL; | ||
5117 | } | ||
5118 | |||
5037 | /* | 5119 | /* |
5038 | * Look up the group leader (we will attach this event to it): | 5120 | * Look up the group leader (we will attach this event to it): |
5039 | */ | 5121 | */ |
5040 | group_leader = NULL; | 5122 | if (group_leader) { |
5041 | if (group_fd != -1 && !(flags & PERF_FLAG_FD_NO_GROUP)) { | ||
5042 | err = -EINVAL; | 5123 | err = -EINVAL; |
5043 | group_file = fget_light(group_fd, &fput_needed); | ||
5044 | if (!group_file) | ||
5045 | goto err_put_context; | ||
5046 | if (group_file->f_op != &perf_fops) | ||
5047 | goto err_put_context; | ||
5048 | 5124 | ||
5049 | group_leader = group_file->private_data; | ||
5050 | /* | 5125 | /* |
5051 | * Do not allow a recursive hierarchy (this new sibling | 5126 | * Do not allow a recursive hierarchy (this new sibling |
5052 | * becoming part of another group-sibling): | 5127 | * becoming part of another group-sibling): |
@@ -5068,9 +5143,16 @@ SYSCALL_DEFINE5(perf_event_open, | |||
5068 | 5143 | ||
5069 | event = perf_event_alloc(&attr, cpu, ctx, group_leader, | 5144 | event = perf_event_alloc(&attr, cpu, ctx, group_leader, |
5070 | NULL, NULL, GFP_KERNEL); | 5145 | NULL, NULL, GFP_KERNEL); |
5071 | err = PTR_ERR(event); | 5146 | if (IS_ERR(event)) { |
5072 | if (IS_ERR(event)) | 5147 | err = PTR_ERR(event); |
5073 | goto err_put_context; | 5148 | goto err_put_context; |
5149 | } | ||
5150 | |||
5151 | if (output_event) { | ||
5152 | err = perf_event_set_output(event, output_event); | ||
5153 | if (err) | ||
5154 | goto err_free_put_context; | ||
5155 | } | ||
5074 | 5156 | ||
5075 | event_file = anon_inode_getfile("[perf_event]", &perf_fops, event, O_RDWR); | 5157 | event_file = anon_inode_getfile("[perf_event]", &perf_fops, event, O_RDWR); |
5076 | if (IS_ERR(event_file)) { | 5158 | if (IS_ERR(event_file)) { |
@@ -5078,12 +5160,6 @@ SYSCALL_DEFINE5(perf_event_open, | |||
5078 | goto err_free_put_context; | 5160 | goto err_free_put_context; |
5079 | } | 5161 | } |
5080 | 5162 | ||
5081 | if (flags & PERF_FLAG_FD_OUTPUT) { | ||
5082 | err = perf_event_set_output(event, group_fd); | ||
5083 | if (err) | ||
5084 | goto err_fput_free_put_context; | ||
5085 | } | ||
5086 | |||
5087 | event->filp = event_file; | 5163 | event->filp = event_file; |
5088 | WARN_ON_ONCE(ctx->parent_ctx); | 5164 | WARN_ON_ONCE(ctx->parent_ctx); |
5089 | mutex_lock(&ctx->mutex); | 5165 | mutex_lock(&ctx->mutex); |
@@ -5097,12 +5173,16 @@ SYSCALL_DEFINE5(perf_event_open, | |||
5097 | list_add_tail(&event->owner_entry, ¤t->perf_event_list); | 5173 | list_add_tail(&event->owner_entry, ¤t->perf_event_list); |
5098 | mutex_unlock(¤t->perf_event_mutex); | 5174 | mutex_unlock(¤t->perf_event_mutex); |
5099 | 5175 | ||
5176 | /* | ||
5177 | * Drop the reference on the group_event after placing the | ||
5178 | * new event on the sibling_list. This ensures destruction | ||
5179 | * of the group leader will find the pointer to itself in | ||
5180 | * perf_group_detach(). | ||
5181 | */ | ||
5100 | fput_light(group_file, fput_needed); | 5182 | fput_light(group_file, fput_needed); |
5101 | fd_install(event_fd, event_file); | 5183 | fd_install(event_fd, event_file); |
5102 | return event_fd; | 5184 | return event_fd; |
5103 | 5185 | ||
5104 | err_fput_free_put_context: | ||
5105 | fput(event_file); | ||
5106 | err_free_put_context: | 5186 | err_free_put_context: |
5107 | free_event(event); | 5187 | free_event(event); |
5108 | err_put_context: | 5188 | err_put_context: |
@@ -5420,6 +5500,7 @@ static void perf_free_event(struct perf_event *event, | |||
5420 | 5500 | ||
5421 | fput(parent->filp); | 5501 | fput(parent->filp); |
5422 | 5502 | ||
5503 | perf_group_detach(event); | ||
5423 | list_del_event(event, ctx); | 5504 | list_del_event(event, ctx); |
5424 | free_event(event); | 5505 | free_event(event); |
5425 | } | 5506 | } |
diff --git a/kernel/sched.c b/kernel/sched.c index d4840814250..f8b8996228d 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -544,6 +544,8 @@ struct rq { | |||
544 | struct root_domain *rd; | 544 | struct root_domain *rd; |
545 | struct sched_domain *sd; | 545 | struct sched_domain *sd; |
546 | 546 | ||
547 | unsigned long cpu_power; | ||
548 | |||
547 | unsigned char idle_at_tick; | 549 | unsigned char idle_at_tick; |
548 | /* For active balancing */ | 550 | /* For active balancing */ |
549 | int post_schedule; | 551 | int post_schedule; |
@@ -1499,24 +1501,9 @@ static unsigned long target_load(int cpu, int type) | |||
1499 | return max(rq->cpu_load[type-1], total); | 1501 | return max(rq->cpu_load[type-1], total); |
1500 | } | 1502 | } |
1501 | 1503 | ||
1502 | static struct sched_group *group_of(int cpu) | ||
1503 | { | ||
1504 | struct sched_domain *sd = rcu_dereference_sched(cpu_rq(cpu)->sd); | ||
1505 | |||
1506 | if (!sd) | ||
1507 | return NULL; | ||
1508 | |||
1509 | return sd->groups; | ||
1510 | } | ||
1511 | |||
1512 | static unsigned long power_of(int cpu) | 1504 | static unsigned long power_of(int cpu) |
1513 | { | 1505 | { |
1514 | struct sched_group *group = group_of(cpu); | 1506 | return cpu_rq(cpu)->cpu_power; |
1515 | |||
1516 | if (!group) | ||
1517 | return SCHED_LOAD_SCALE; | ||
1518 | |||
1519 | return group->cpu_power; | ||
1520 | } | 1507 | } |
1521 | 1508 | ||
1522 | static int task_hot(struct task_struct *p, u64 now, struct sched_domain *sd); | 1509 | static int task_hot(struct task_struct *p, u64 now, struct sched_domain *sd); |
@@ -1854,8 +1841,8 @@ static void dec_nr_running(struct rq *rq) | |||
1854 | static void set_load_weight(struct task_struct *p) | 1841 | static void set_load_weight(struct task_struct *p) |
1855 | { | 1842 | { |
1856 | if (task_has_rt_policy(p)) { | 1843 | if (task_has_rt_policy(p)) { |
1857 | p->se.load.weight = prio_to_weight[0] * 2; | 1844 | p->se.load.weight = 0; |
1858 | p->se.load.inv_weight = prio_to_wmult[0] >> 1; | 1845 | p->se.load.inv_weight = WMULT_CONST; |
1859 | return; | 1846 | return; |
1860 | } | 1847 | } |
1861 | 1848 | ||
@@ -7605,6 +7592,7 @@ void __init sched_init(void) | |||
7605 | #ifdef CONFIG_SMP | 7592 | #ifdef CONFIG_SMP |
7606 | rq->sd = NULL; | 7593 | rq->sd = NULL; |
7607 | rq->rd = NULL; | 7594 | rq->rd = NULL; |
7595 | rq->cpu_power = SCHED_LOAD_SCALE; | ||
7608 | rq->post_schedule = 0; | 7596 | rq->post_schedule = 0; |
7609 | rq->active_balance = 0; | 7597 | rq->active_balance = 0; |
7610 | rq->next_balance = jiffies; | 7598 | rq->next_balance = jiffies; |
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c index 217e4a9393e..eed35eded60 100644 --- a/kernel/sched_fair.c +++ b/kernel/sched_fair.c | |||
@@ -1225,7 +1225,6 @@ static int wake_affine(struct sched_domain *sd, struct task_struct *p, int sync) | |||
1225 | unsigned long this_load, load; | 1225 | unsigned long this_load, load; |
1226 | int idx, this_cpu, prev_cpu; | 1226 | int idx, this_cpu, prev_cpu; |
1227 | unsigned long tl_per_task; | 1227 | unsigned long tl_per_task; |
1228 | unsigned int imbalance; | ||
1229 | struct task_group *tg; | 1228 | struct task_group *tg; |
1230 | unsigned long weight; | 1229 | unsigned long weight; |
1231 | int balanced; | 1230 | int balanced; |
@@ -1252,8 +1251,6 @@ static int wake_affine(struct sched_domain *sd, struct task_struct *p, int sync) | |||
1252 | tg = task_group(p); | 1251 | tg = task_group(p); |
1253 | weight = p->se.load.weight; | 1252 | weight = p->se.load.weight; |
1254 | 1253 | ||
1255 | imbalance = 100 + (sd->imbalance_pct - 100) / 2; | ||
1256 | |||
1257 | /* | 1254 | /* |
1258 | * In low-load situations, where prev_cpu is idle and this_cpu is idle | 1255 | * In low-load situations, where prev_cpu is idle and this_cpu is idle |
1259 | * due to the sync cause above having dropped this_load to 0, we'll | 1256 | * due to the sync cause above having dropped this_load to 0, we'll |
@@ -1263,9 +1260,21 @@ static int wake_affine(struct sched_domain *sd, struct task_struct *p, int sync) | |||
1263 | * Otherwise check if either cpus are near enough in load to allow this | 1260 | * Otherwise check if either cpus are near enough in load to allow this |
1264 | * task to be woken on this_cpu. | 1261 | * task to be woken on this_cpu. |
1265 | */ | 1262 | */ |
1266 | balanced = !this_load || | 1263 | if (this_load) { |
1267 | 100*(this_load + effective_load(tg, this_cpu, weight, weight)) <= | 1264 | unsigned long this_eff_load, prev_eff_load; |
1268 | imbalance*(load + effective_load(tg, prev_cpu, 0, weight)); | 1265 | |
1266 | this_eff_load = 100; | ||
1267 | this_eff_load *= power_of(prev_cpu); | ||
1268 | this_eff_load *= this_load + | ||
1269 | effective_load(tg, this_cpu, weight, weight); | ||
1270 | |||
1271 | prev_eff_load = 100 + (sd->imbalance_pct - 100) / 2; | ||
1272 | prev_eff_load *= power_of(this_cpu); | ||
1273 | prev_eff_load *= load + effective_load(tg, prev_cpu, 0, weight); | ||
1274 | |||
1275 | balanced = this_eff_load <= prev_eff_load; | ||
1276 | } else | ||
1277 | balanced = true; | ||
1269 | 1278 | ||
1270 | /* | 1279 | /* |
1271 | * If the currently running task will sleep within | 1280 | * If the currently running task will sleep within |
@@ -2298,6 +2307,7 @@ static void update_cpu_power(struct sched_domain *sd, int cpu) | |||
2298 | if (!power) | 2307 | if (!power) |
2299 | power = 1; | 2308 | power = 1; |
2300 | 2309 | ||
2310 | cpu_rq(cpu)->cpu_power = power; | ||
2301 | sdg->cpu_power = power; | 2311 | sdg->cpu_power = power; |
2302 | } | 2312 | } |
2303 | 2313 | ||
diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c index b4e7431e7c7..70f8d90331e 100644 --- a/kernel/stop_machine.c +++ b/kernel/stop_machine.c | |||
@@ -321,7 +321,7 @@ static int __cpuinit cpu_stop_cpu_callback(struct notifier_block *nfb, | |||
321 | 321 | ||
322 | #ifdef CONFIG_HOTPLUG_CPU | 322 | #ifdef CONFIG_HOTPLUG_CPU |
323 | case CPU_UP_CANCELED: | 323 | case CPU_UP_CANCELED: |
324 | case CPU_DEAD: | 324 | case CPU_POST_DEAD: |
325 | { | 325 | { |
326 | struct cpu_stop_work *work; | 326 | struct cpu_stop_work *work; |
327 | 327 | ||
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c index 36ea2b65dcd..638711c1750 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c | |||
@@ -842,6 +842,7 @@ static void blk_add_trace_split(void *ignore, | |||
842 | 842 | ||
843 | /** | 843 | /** |
844 | * blk_add_trace_remap - Add a trace for a remap operation | 844 | * blk_add_trace_remap - Add a trace for a remap operation |
845 | * @ignore: trace callback data parameter (not used) | ||
845 | * @q: queue the io is for | 846 | * @q: queue the io is for |
846 | * @bio: the source bio | 847 | * @bio: the source bio |
847 | * @dev: target device | 848 | * @dev: target device |
@@ -873,6 +874,7 @@ static void blk_add_trace_remap(void *ignore, | |||
873 | 874 | ||
874 | /** | 875 | /** |
875 | * blk_add_trace_rq_remap - Add a trace for a request-remap operation | 876 | * blk_add_trace_rq_remap - Add a trace for a request-remap operation |
877 | * @ignore: trace callback data parameter (not used) | ||
876 | * @q: queue the io is for | 878 | * @q: queue the io is for |
877 | * @rq: the source request | 879 | * @rq: the source request |
878 | * @dev: target device | 880 | * @dev: target device |
diff --git a/kernel/trace/trace_event_perf.c b/kernel/trace/trace_event_perf.c index cb6f365016e..e6f65887842 100644 --- a/kernel/trace/trace_event_perf.c +++ b/kernel/trace/trace_event_perf.c | |||
@@ -116,7 +116,7 @@ int perf_trace_enable(struct perf_event *p_event) | |||
116 | if (WARN_ON_ONCE(!list)) | 116 | if (WARN_ON_ONCE(!list)) |
117 | return -EINVAL; | 117 | return -EINVAL; |
118 | 118 | ||
119 | list = per_cpu_ptr(list, smp_processor_id()); | 119 | list = this_cpu_ptr(list); |
120 | hlist_add_head_rcu(&p_event->hlist_entry, list); | 120 | hlist_add_head_rcu(&p_event->hlist_entry, list); |
121 | 121 | ||
122 | return 0; | 122 | return 0; |
@@ -132,8 +132,9 @@ void perf_trace_destroy(struct perf_event *p_event) | |||
132 | struct ftrace_event_call *tp_event = p_event->tp_event; | 132 | struct ftrace_event_call *tp_event = p_event->tp_event; |
133 | int i; | 133 | int i; |
134 | 134 | ||
135 | mutex_lock(&event_mutex); | ||
135 | if (--tp_event->perf_refcount > 0) | 136 | if (--tp_event->perf_refcount > 0) |
136 | return; | 137 | goto out; |
137 | 138 | ||
138 | if (tp_event->class->reg) | 139 | if (tp_event->class->reg) |
139 | tp_event->class->reg(tp_event, TRACE_REG_PERF_UNREGISTER); | 140 | tp_event->class->reg(tp_event, TRACE_REG_PERF_UNREGISTER); |
@@ -142,6 +143,12 @@ void perf_trace_destroy(struct perf_event *p_event) | |||
142 | tp_event->class->perf_probe, | 143 | tp_event->class->perf_probe, |
143 | tp_event); | 144 | tp_event); |
144 | 145 | ||
146 | /* | ||
147 | * Ensure our callback won't be called anymore. See | ||
148 | * tracepoint_probe_unregister() and __DO_TRACE(). | ||
149 | */ | ||
150 | synchronize_sched(); | ||
151 | |||
145 | free_percpu(tp_event->perf_events); | 152 | free_percpu(tp_event->perf_events); |
146 | tp_event->perf_events = NULL; | 153 | tp_event->perf_events = NULL; |
147 | 154 | ||
@@ -151,6 +158,8 @@ void perf_trace_destroy(struct perf_event *p_event) | |||
151 | perf_trace_buf[i] = NULL; | 158 | perf_trace_buf[i] = NULL; |
152 | } | 159 | } |
153 | } | 160 | } |
161 | out: | ||
162 | mutex_unlock(&event_mutex); | ||
154 | } | 163 | } |
155 | 164 | ||
156 | __kprobes void *perf_trace_buf_prepare(int size, unsigned short type, | 165 | __kprobes void *perf_trace_buf_prepare(int size, unsigned short type, |
@@ -169,7 +178,7 @@ __kprobes void *perf_trace_buf_prepare(int size, unsigned short type, | |||
169 | if (*rctxp < 0) | 178 | if (*rctxp < 0) |
170 | return NULL; | 179 | return NULL; |
171 | 180 | ||
172 | raw_data = per_cpu_ptr(perf_trace_buf[*rctxp], smp_processor_id()); | 181 | raw_data = this_cpu_ptr(perf_trace_buf[*rctxp]); |
173 | 182 | ||
174 | /* zero the dead bytes from align to not leak stack to user */ | 183 | /* zero the dead bytes from align to not leak stack to user */ |
175 | memset(&raw_data[size - sizeof(u64)], 0, sizeof(u64)); | 184 | memset(&raw_data[size - sizeof(u64)], 0, sizeof(u64)); |
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index faf7cefd15d..f52b5f50299 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c | |||
@@ -1359,7 +1359,7 @@ static __kprobes void kprobe_perf_func(struct kprobe *kp, | |||
1359 | for (i = 0; i < tp->nr_args; i++) | 1359 | for (i = 0; i < tp->nr_args; i++) |
1360 | call_fetch(&tp->args[i].fetch, regs, data + tp->args[i].offset); | 1360 | call_fetch(&tp->args[i].fetch, regs, data + tp->args[i].offset); |
1361 | 1361 | ||
1362 | head = per_cpu_ptr(call->perf_events, smp_processor_id()); | 1362 | head = this_cpu_ptr(call->perf_events); |
1363 | perf_trace_buf_submit(entry, size, rctx, entry->ip, 1, regs, head); | 1363 | perf_trace_buf_submit(entry, size, rctx, entry->ip, 1, regs, head); |
1364 | } | 1364 | } |
1365 | 1365 | ||
@@ -1392,7 +1392,7 @@ static __kprobes void kretprobe_perf_func(struct kretprobe_instance *ri, | |||
1392 | for (i = 0; i < tp->nr_args; i++) | 1392 | for (i = 0; i < tp->nr_args; i++) |
1393 | call_fetch(&tp->args[i].fetch, regs, data + tp->args[i].offset); | 1393 | call_fetch(&tp->args[i].fetch, regs, data + tp->args[i].offset); |
1394 | 1394 | ||
1395 | head = per_cpu_ptr(call->perf_events, smp_processor_id()); | 1395 | head = this_cpu_ptr(call->perf_events); |
1396 | perf_trace_buf_submit(entry, size, rctx, entry->ret_ip, 1, regs, head); | 1396 | perf_trace_buf_submit(entry, size, rctx, entry->ret_ip, 1, regs, head); |
1397 | } | 1397 | } |
1398 | 1398 | ||
diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c index d2c859cec9e..34e35804304 100644 --- a/kernel/trace/trace_syscalls.c +++ b/kernel/trace/trace_syscalls.c | |||
@@ -519,7 +519,7 @@ static void perf_syscall_enter(void *ignore, struct pt_regs *regs, long id) | |||
519 | syscall_get_arguments(current, regs, 0, sys_data->nb_args, | 519 | syscall_get_arguments(current, regs, 0, sys_data->nb_args, |
520 | (unsigned long *)&rec->args); | 520 | (unsigned long *)&rec->args); |
521 | 521 | ||
522 | head = per_cpu_ptr(sys_data->enter_event->perf_events, smp_processor_id()); | 522 | head = this_cpu_ptr(sys_data->enter_event->perf_events); |
523 | perf_trace_buf_submit(rec, size, rctx, 0, 1, regs, head); | 523 | perf_trace_buf_submit(rec, size, rctx, 0, 1, regs, head); |
524 | } | 524 | } |
525 | 525 | ||
@@ -595,7 +595,7 @@ static void perf_syscall_exit(void *ignore, struct pt_regs *regs, long ret) | |||
595 | rec->nr = syscall_nr; | 595 | rec->nr = syscall_nr; |
596 | rec->ret = syscall_get_return_value(current, regs); | 596 | rec->ret = syscall_get_return_value(current, regs); |
597 | 597 | ||
598 | head = per_cpu_ptr(sys_data->exit_event->perf_events, smp_processor_id()); | 598 | head = this_cpu_ptr(sys_data->exit_event->perf_events); |
599 | perf_trace_buf_submit(rec, size, rctx, 0, 1, regs, head); | 599 | perf_trace_buf_submit(rec, size, rctx, 0, 1, regs, head); |
600 | } | 600 | } |
601 | 601 | ||
diff --git a/net/caif/cfserl.c b/net/caif/cfserl.c index cb4325a3dc8..965c5baace4 100644 --- a/net/caif/cfserl.c +++ b/net/caif/cfserl.c | |||
@@ -59,16 +59,18 @@ static int cfserl_receive(struct cflayer *l, struct cfpkt *newpkt) | |||
59 | u8 stx = CFSERL_STX; | 59 | u8 stx = CFSERL_STX; |
60 | int ret; | 60 | int ret; |
61 | u16 expectlen = 0; | 61 | u16 expectlen = 0; |
62 | |||
62 | caif_assert(newpkt != NULL); | 63 | caif_assert(newpkt != NULL); |
63 | spin_lock(&layr->sync); | 64 | spin_lock(&layr->sync); |
64 | 65 | ||
65 | if (layr->incomplete_frm != NULL) { | 66 | if (layr->incomplete_frm != NULL) { |
66 | |||
67 | layr->incomplete_frm = | 67 | layr->incomplete_frm = |
68 | cfpkt_append(layr->incomplete_frm, newpkt, expectlen); | 68 | cfpkt_append(layr->incomplete_frm, newpkt, expectlen); |
69 | pkt = layr->incomplete_frm; | 69 | pkt = layr->incomplete_frm; |
70 | if (pkt == NULL) | 70 | if (pkt == NULL) { |
71 | spin_unlock(&layr->sync); | ||
71 | return -ENOMEM; | 72 | return -ENOMEM; |
73 | } | ||
72 | } else { | 74 | } else { |
73 | pkt = newpkt; | 75 | pkt = newpkt; |
74 | } | 76 | } |
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index f8abf68e398..9f07e749d7b 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c | |||
@@ -482,22 +482,22 @@ EXPORT_SYMBOL(consume_skb); | |||
482 | * reference count dropping and cleans up the skbuff as if it | 482 | * reference count dropping and cleans up the skbuff as if it |
483 | * just came from __alloc_skb(). | 483 | * just came from __alloc_skb(). |
484 | */ | 484 | */ |
485 | int skb_recycle_check(struct sk_buff *skb, int skb_size) | 485 | bool skb_recycle_check(struct sk_buff *skb, int skb_size) |
486 | { | 486 | { |
487 | struct skb_shared_info *shinfo; | 487 | struct skb_shared_info *shinfo; |
488 | 488 | ||
489 | if (irqs_disabled()) | 489 | if (irqs_disabled()) |
490 | return 0; | 490 | return false; |
491 | 491 | ||
492 | if (skb_is_nonlinear(skb) || skb->fclone != SKB_FCLONE_UNAVAILABLE) | 492 | if (skb_is_nonlinear(skb) || skb->fclone != SKB_FCLONE_UNAVAILABLE) |
493 | return 0; | 493 | return false; |
494 | 494 | ||
495 | skb_size = SKB_DATA_ALIGN(skb_size + NET_SKB_PAD); | 495 | skb_size = SKB_DATA_ALIGN(skb_size + NET_SKB_PAD); |
496 | if (skb_end_pointer(skb) - skb->head < skb_size) | 496 | if (skb_end_pointer(skb) - skb->head < skb_size) |
497 | return 0; | 497 | return false; |
498 | 498 | ||
499 | if (skb_shared(skb) || skb_cloned(skb)) | 499 | if (skb_shared(skb) || skb_cloned(skb)) |
500 | return 0; | 500 | return false; |
501 | 501 | ||
502 | skb_release_head_state(skb); | 502 | skb_release_head_state(skb); |
503 | 503 | ||
@@ -509,7 +509,7 @@ int skb_recycle_check(struct sk_buff *skb, int skb_size) | |||
509 | skb->data = skb->head + NET_SKB_PAD; | 509 | skb->data = skb->head + NET_SKB_PAD; |
510 | skb_reset_tail_pointer(skb); | 510 | skb_reset_tail_pointer(skb); |
511 | 511 | ||
512 | return 1; | 512 | return true; |
513 | } | 513 | } |
514 | EXPORT_SYMBOL(skb_recycle_check); | 514 | EXPORT_SYMBOL(skb_recycle_check); |
515 | 515 | ||
@@ -2965,6 +2965,34 @@ int skb_cow_data(struct sk_buff *skb, int tailbits, struct sk_buff **trailer) | |||
2965 | } | 2965 | } |
2966 | EXPORT_SYMBOL_GPL(skb_cow_data); | 2966 | EXPORT_SYMBOL_GPL(skb_cow_data); |
2967 | 2967 | ||
2968 | static void sock_rmem_free(struct sk_buff *skb) | ||
2969 | { | ||
2970 | struct sock *sk = skb->sk; | ||
2971 | |||
2972 | atomic_sub(skb->truesize, &sk->sk_rmem_alloc); | ||
2973 | } | ||
2974 | |||
2975 | /* | ||
2976 | * Note: We dont mem charge error packets (no sk_forward_alloc changes) | ||
2977 | */ | ||
2978 | int sock_queue_err_skb(struct sock *sk, struct sk_buff *skb) | ||
2979 | { | ||
2980 | if (atomic_read(&sk->sk_rmem_alloc) + skb->truesize >= | ||
2981 | (unsigned)sk->sk_rcvbuf) | ||
2982 | return -ENOMEM; | ||
2983 | |||
2984 | skb_orphan(skb); | ||
2985 | skb->sk = sk; | ||
2986 | skb->destructor = sock_rmem_free; | ||
2987 | atomic_add(skb->truesize, &sk->sk_rmem_alloc); | ||
2988 | |||
2989 | skb_queue_tail(&sk->sk_error_queue, skb); | ||
2990 | if (!sock_flag(sk, SOCK_DEAD)) | ||
2991 | sk->sk_data_ready(sk, skb->len); | ||
2992 | return 0; | ||
2993 | } | ||
2994 | EXPORT_SYMBOL(sock_queue_err_skb); | ||
2995 | |||
2968 | void skb_tstamp_tx(struct sk_buff *orig_skb, | 2996 | void skb_tstamp_tx(struct sk_buff *orig_skb, |
2969 | struct skb_shared_hwtstamps *hwtstamps) | 2997 | struct skb_shared_hwtstamps *hwtstamps) |
2970 | { | 2998 | { |
@@ -2996,7 +3024,9 @@ void skb_tstamp_tx(struct sk_buff *orig_skb, | |||
2996 | memset(serr, 0, sizeof(*serr)); | 3024 | memset(serr, 0, sizeof(*serr)); |
2997 | serr->ee.ee_errno = ENOMSG; | 3025 | serr->ee.ee_errno = ENOMSG; |
2998 | serr->ee.ee_origin = SO_EE_ORIGIN_TIMESTAMPING; | 3026 | serr->ee.ee_origin = SO_EE_ORIGIN_TIMESTAMPING; |
3027 | |||
2999 | err = sock_queue_err_skb(sk, skb); | 3028 | err = sock_queue_err_skb(sk, skb); |
3029 | |||
3000 | if (err) | 3030 | if (err) |
3001 | kfree_skb(skb); | 3031 | kfree_skb(skb); |
3002 | } | 3032 | } |
diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c index 63958f3394a..4b6c5ca610f 100644 --- a/net/ipv4/netfilter/ip_tables.c +++ b/net/ipv4/netfilter/ip_tables.c | |||
@@ -336,7 +336,7 @@ ipt_do_table(struct sk_buff *skb, | |||
336 | cpu = smp_processor_id(); | 336 | cpu = smp_processor_id(); |
337 | table_base = private->entries[cpu]; | 337 | table_base = private->entries[cpu]; |
338 | jumpstack = (struct ipt_entry **)private->jumpstack[cpu]; | 338 | jumpstack = (struct ipt_entry **)private->jumpstack[cpu]; |
339 | stackptr = &private->stackptr[cpu]; | 339 | stackptr = per_cpu_ptr(private->stackptr, cpu); |
340 | origptr = *stackptr; | 340 | origptr = *stackptr; |
341 | 341 | ||
342 | e = get_entry(table_base, private->hook_entry[hook]); | 342 | e = get_entry(table_base, private->hook_entry[hook]); |
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 3e6dafcb107..548d575e6cc 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
@@ -2639,7 +2639,7 @@ static void DBGUNDO(struct sock *sk, const char *msg) | |||
2639 | if (sk->sk_family == AF_INET) { | 2639 | if (sk->sk_family == AF_INET) { |
2640 | printk(KERN_DEBUG "Undo %s %pI4/%u c%u l%u ss%u/%u p%u\n", | 2640 | printk(KERN_DEBUG "Undo %s %pI4/%u c%u l%u ss%u/%u p%u\n", |
2641 | msg, | 2641 | msg, |
2642 | &inet->daddr, ntohs(inet->dport), | 2642 | &inet->inet_daddr, ntohs(inet->inet_dport), |
2643 | tp->snd_cwnd, tcp_left_out(tp), | 2643 | tp->snd_cwnd, tcp_left_out(tp), |
2644 | tp->snd_ssthresh, tp->prior_ssthresh, | 2644 | tp->snd_ssthresh, tp->prior_ssthresh, |
2645 | tp->packets_out); | 2645 | tp->packets_out); |
@@ -2649,7 +2649,7 @@ static void DBGUNDO(struct sock *sk, const char *msg) | |||
2649 | struct ipv6_pinfo *np = inet6_sk(sk); | 2649 | struct ipv6_pinfo *np = inet6_sk(sk); |
2650 | printk(KERN_DEBUG "Undo %s %pI6/%u c%u l%u ss%u/%u p%u\n", | 2650 | printk(KERN_DEBUG "Undo %s %pI6/%u c%u l%u ss%u/%u p%u\n", |
2651 | msg, | 2651 | msg, |
2652 | &np->daddr, ntohs(inet->dport), | 2652 | &np->daddr, ntohs(inet->inet_dport), |
2653 | tp->snd_cwnd, tcp_left_out(tp), | 2653 | tp->snd_cwnd, tcp_left_out(tp), |
2654 | tp->snd_ssthresh, tp->prior_ssthresh, | 2654 | tp->snd_ssthresh, tp->prior_ssthresh, |
2655 | tp->packets_out); | 2655 | tp->packets_out); |
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 58585748bda..eec4ff456e3 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c | |||
@@ -633,9 +633,9 @@ void __udp4_lib_err(struct sk_buff *skb, u32 info, struct udp_table *udptable) | |||
633 | if (!inet->recverr) { | 633 | if (!inet->recverr) { |
634 | if (!harderr || sk->sk_state != TCP_ESTABLISHED) | 634 | if (!harderr || sk->sk_state != TCP_ESTABLISHED) |
635 | goto out; | 635 | goto out; |
636 | } else { | 636 | } else |
637 | ip_icmp_error(sk, skb, err, uh->dest, info, (u8 *)(uh+1)); | 637 | ip_icmp_error(sk, skb, err, uh->dest, info, (u8 *)(uh+1)); |
638 | } | 638 | |
639 | sk->sk_err = err; | 639 | sk->sk_err = err; |
640 | sk->sk_error_report(sk); | 640 | sk->sk_error_report(sk); |
641 | out: | 641 | out: |
diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c index 6f517bd8369..9d2d68f0e60 100644 --- a/net/ipv6/netfilter/ip6_tables.c +++ b/net/ipv6/netfilter/ip6_tables.c | |||
@@ -363,7 +363,7 @@ ip6t_do_table(struct sk_buff *skb, | |||
363 | cpu = smp_processor_id(); | 363 | cpu = smp_processor_id(); |
364 | table_base = private->entries[cpu]; | 364 | table_base = private->entries[cpu]; |
365 | jumpstack = (struct ip6t_entry **)private->jumpstack[cpu]; | 365 | jumpstack = (struct ip6t_entry **)private->jumpstack[cpu]; |
366 | stackptr = &private->stackptr[cpu]; | 366 | stackptr = per_cpu_ptr(private->stackptr, cpu); |
367 | origptr = *stackptr; | 367 | origptr = *stackptr; |
368 | 368 | ||
369 | e = get_entry(table_base, private->hook_entry[hook]); | 369 | e = get_entry(table_base, private->hook_entry[hook]); |
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 294cbe8b072..252d76199c4 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c | |||
@@ -814,7 +814,7 @@ struct dst_entry * ip6_route_output(struct net *net, struct sock *sk, | |||
814 | { | 814 | { |
815 | int flags = 0; | 815 | int flags = 0; |
816 | 816 | ||
817 | if (fl->oif || rt6_need_strict(&fl->fl6_dst)) | 817 | if ((sk && sk->sk_bound_dev_if) || rt6_need_strict(&fl->fl6_dst)) |
818 | flags |= RT6_LOOKUP_F_IFACE; | 818 | flags |= RT6_LOOKUP_F_IFACE; |
819 | 819 | ||
820 | if (!ipv6_addr_any(&fl->fl6_src)) | 820 | if (!ipv6_addr_any(&fl->fl6_src)) |
diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c index 5d218c530a4..32be11e4c4d 100644 --- a/net/mac80211/chan.c +++ b/net/mac80211/chan.c | |||
@@ -5,7 +5,7 @@ | |||
5 | #include <linux/nl80211.h> | 5 | #include <linux/nl80211.h> |
6 | #include "ieee80211_i.h" | 6 | #include "ieee80211_i.h" |
7 | 7 | ||
8 | enum ieee80211_chan_mode | 8 | static enum ieee80211_chan_mode |
9 | __ieee80211_get_channel_mode(struct ieee80211_local *local, | 9 | __ieee80211_get_channel_mode(struct ieee80211_local *local, |
10 | struct ieee80211_sub_if_data *ignore) | 10 | struct ieee80211_sub_if_data *ignore) |
11 | { | 11 | { |
diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c index 445de702b8b..e34622fa000 100644 --- a/net/netfilter/x_tables.c +++ b/net/netfilter/x_tables.c | |||
@@ -699,10 +699,8 @@ void xt_free_table_info(struct xt_table_info *info) | |||
699 | vfree(info->jumpstack); | 699 | vfree(info->jumpstack); |
700 | else | 700 | else |
701 | kfree(info->jumpstack); | 701 | kfree(info->jumpstack); |
702 | if (sizeof(unsigned int) * nr_cpu_ids > PAGE_SIZE) | 702 | |
703 | vfree(info->stackptr); | 703 | free_percpu(info->stackptr); |
704 | else | ||
705 | kfree(info->stackptr); | ||
706 | 704 | ||
707 | kfree(info); | 705 | kfree(info); |
708 | } | 706 | } |
@@ -753,14 +751,9 @@ static int xt_jumpstack_alloc(struct xt_table_info *i) | |||
753 | unsigned int size; | 751 | unsigned int size; |
754 | int cpu; | 752 | int cpu; |
755 | 753 | ||
756 | size = sizeof(unsigned int) * nr_cpu_ids; | 754 | i->stackptr = alloc_percpu(unsigned int); |
757 | if (size > PAGE_SIZE) | ||
758 | i->stackptr = vmalloc(size); | ||
759 | else | ||
760 | i->stackptr = kmalloc(size, GFP_KERNEL); | ||
761 | if (i->stackptr == NULL) | 755 | if (i->stackptr == NULL) |
762 | return -ENOMEM; | 756 | return -ENOMEM; |
763 | memset(i->stackptr, 0, size); | ||
764 | 757 | ||
765 | size = sizeof(void **) * nr_cpu_ids; | 758 | size = sizeof(void **) * nr_cpu_ids; |
766 | if (size > PAGE_SIZE) | 759 | if (size > PAGE_SIZE) |
@@ -844,10 +837,6 @@ struct xt_table *xt_register_table(struct net *net, | |||
844 | struct xt_table_info *private; | 837 | struct xt_table_info *private; |
845 | struct xt_table *t, *table; | 838 | struct xt_table *t, *table; |
846 | 839 | ||
847 | ret = xt_jumpstack_alloc(newinfo); | ||
848 | if (ret < 0) | ||
849 | return ERR_PTR(ret); | ||
850 | |||
851 | /* Don't add one object to multiple lists. */ | 840 | /* Don't add one object to multiple lists. */ |
852 | table = kmemdup(input_table, sizeof(struct xt_table), GFP_KERNEL); | 841 | table = kmemdup(input_table, sizeof(struct xt_table), GFP_KERNEL); |
853 | if (!table) { | 842 | if (!table) { |
diff --git a/net/phonet/pep.c b/net/phonet/pep.c index 7b048a35ca5..94d72e85a47 100644 --- a/net/phonet/pep.c +++ b/net/phonet/pep.c | |||
@@ -1045,12 +1045,12 @@ static void pep_sock_unhash(struct sock *sk) | |||
1045 | lock_sock(sk); | 1045 | lock_sock(sk); |
1046 | if ((1 << sk->sk_state) & ~(TCPF_CLOSE|TCPF_LISTEN)) { | 1046 | if ((1 << sk->sk_state) & ~(TCPF_CLOSE|TCPF_LISTEN)) { |
1047 | skparent = pn->listener; | 1047 | skparent = pn->listener; |
1048 | sk_del_node_init(sk); | ||
1049 | release_sock(sk); | 1048 | release_sock(sk); |
1050 | 1049 | ||
1051 | sk = skparent; | ||
1052 | pn = pep_sk(skparent); | 1050 | pn = pep_sk(skparent); |
1053 | lock_sock(sk); | 1051 | lock_sock(skparent); |
1052 | sk_del_node_init(sk); | ||
1053 | sk = skparent; | ||
1054 | } | 1054 | } |
1055 | /* Unhash a listening sock only when it is closed | 1055 | /* Unhash a listening sock only when it is closed |
1056 | * and all of its active connected pipes are closed. */ | 1056 | * and all of its active connected pipes are closed. */ |
diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c index 10ed0d55f75..f68832798db 100644 --- a/net/rds/ib_cm.c +++ b/net/rds/ib_cm.c | |||
@@ -475,6 +475,7 @@ int rds_ib_cm_handle_connect(struct rdma_cm_id *cm_id, | |||
475 | err = rds_ib_setup_qp(conn); | 475 | err = rds_ib_setup_qp(conn); |
476 | if (err) { | 476 | if (err) { |
477 | rds_ib_conn_error(conn, "rds_ib_setup_qp failed (%d)\n", err); | 477 | rds_ib_conn_error(conn, "rds_ib_setup_qp failed (%d)\n", err); |
478 | mutex_unlock(&conn->c_cm_lock); | ||
478 | goto out; | 479 | goto out; |
479 | } | 480 | } |
480 | 481 | ||
diff --git a/net/rds/iw_cm.c b/net/rds/iw_cm.c index a9d951b4fba..b5dd6ac39be 100644 --- a/net/rds/iw_cm.c +++ b/net/rds/iw_cm.c | |||
@@ -452,6 +452,7 @@ int rds_iw_cm_handle_connect(struct rdma_cm_id *cm_id, | |||
452 | err = rds_iw_setup_qp(conn); | 452 | err = rds_iw_setup_qp(conn); |
453 | if (err) { | 453 | if (err) { |
454 | rds_iw_conn_error(conn, "rds_iw_setup_qp failed (%d)\n", err); | 454 | rds_iw_conn_error(conn, "rds_iw_setup_qp failed (%d)\n", err); |
455 | mutex_unlock(&conn->c_cm_lock); | ||
455 | goto out; | 456 | goto out; |
456 | } | 457 | } |
457 | 458 | ||
diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 0b94d2fa3a8..e4deb73e9a8 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build | |||
@@ -82,7 +82,7 @@ ifneq ($(strip $(lib-y) $(lib-m) $(lib-n) $(lib-)),) | |||
82 | lib-target := $(obj)/lib.a | 82 | lib-target := $(obj)/lib.a |
83 | endif | 83 | endif |
84 | 84 | ||
85 | ifneq ($(strip $(obj-y) $(obj-m) $(obj-n) $(obj-) $(lib-target)),) | 85 | ifneq ($(strip $(obj-y) $(obj-m) $(obj-n) $(obj-) $(subdir-m) $(lib-target)),) |
86 | builtin-target := $(obj)/built-in.o | 86 | builtin-target := $(obj)/built-in.o |
87 | endif | 87 | endif |
88 | 88 | ||
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index cbcd654215e..54fd1b70013 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib | |||
@@ -241,7 +241,7 @@ cmd_lzma = (cat $(filter-out FORCE,$^) | \ | |||
241 | lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \ | 241 | lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \ |
242 | (rm -f $@ ; false) | 242 | (rm -f $@ ; false) |
243 | 243 | ||
244 | quiet_cmd_lzo = LZO $@ | 244 | quiet_cmd_lzo = LZO $@ |
245 | cmd_lzo = (cat $(filter-out FORCE,$^) | \ | 245 | cmd_lzo = (cat $(filter-out FORCE,$^) | \ |
246 | lzop -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \ | 246 | lzop -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \ |
247 | (rm -f $@ ; false) | 247 | (rm -f $@ ; false) |
diff --git a/scripts/checkincludes.pl b/scripts/checkincludes.pl index 676ddc07d6f..97b2c6143fe 100755 --- a/scripts/checkincludes.pl +++ b/scripts/checkincludes.pl | |||
@@ -11,6 +11,8 @@ | |||
11 | # you do have real dups and do not have them under #ifdef's. You | 11 | # you do have real dups and do not have them under #ifdef's. You |
12 | # could also just review the results. | 12 | # could also just review the results. |
13 | 13 | ||
14 | use strict; | ||
15 | |||
14 | sub usage { | 16 | sub usage { |
15 | print "Usage: checkincludes.pl [-r]\n"; | 17 | print "Usage: checkincludes.pl [-r]\n"; |
16 | print "By default we just warn of duplicates\n"; | 18 | print "By default we just warn of duplicates\n"; |
@@ -35,23 +37,24 @@ if ($#ARGV >= 1) { | |||
35 | } | 37 | } |
36 | } | 38 | } |
37 | 39 | ||
38 | foreach $file (@ARGV) { | 40 | foreach my $file (@ARGV) { |
39 | open(FILE, $file) or die "Cannot open $file: $!.\n"; | 41 | open(my $f, '<', $file) |
42 | or die "Cannot open $file: $!.\n"; | ||
40 | 43 | ||
41 | my %includedfiles = (); | 44 | my %includedfiles = (); |
42 | my @file_lines = (); | 45 | my @file_lines = (); |
43 | 46 | ||
44 | while (<FILE>) { | 47 | while (<$f>) { |
45 | if (m/^\s*#\s*include\s*[<"](\S*)[>"]/o) { | 48 | if (m/^\s*#\s*include\s*[<"](\S*)[>"]/o) { |
46 | ++$includedfiles{$1}; | 49 | ++$includedfiles{$1}; |
47 | } | 50 | } |
48 | push(@file_lines, $_); | 51 | push(@file_lines, $_); |
49 | } | 52 | } |
50 | 53 | ||
51 | close(FILE); | 54 | close($f); |
52 | 55 | ||
53 | if (!$remove) { | 56 | if (!$remove) { |
54 | foreach $filename (keys %includedfiles) { | 57 | foreach my $filename (keys %includedfiles) { |
55 | if ($includedfiles{$filename} > 1) { | 58 | if ($includedfiles{$filename} > 1) { |
56 | print "$file: $filename is included more than once.\n"; | 59 | print "$file: $filename is included more than once.\n"; |
57 | } | 60 | } |
@@ -59,27 +62,28 @@ foreach $file (@ARGV) { | |||
59 | next; | 62 | next; |
60 | } | 63 | } |
61 | 64 | ||
62 | open(FILE,">$file") || die("Cannot write to $file: $!"); | 65 | open($f, '>', $file) |
66 | or die("Cannot write to $file: $!"); | ||
63 | 67 | ||
64 | my $dups = 0; | 68 | my $dups = 0; |
65 | foreach (@file_lines) { | 69 | foreach (@file_lines) { |
66 | if (m/^\s*#\s*include\s*[<"](\S*)[>"]/o) { | 70 | if (m/^\s*#\s*include\s*[<"](\S*)[>"]/o) { |
67 | foreach $filename (keys %includedfiles) { | 71 | foreach my $filename (keys %includedfiles) { |
68 | if ($1 eq $filename) { | 72 | if ($1 eq $filename) { |
69 | if ($includedfiles{$filename} > 1) { | 73 | if ($includedfiles{$filename} > 1) { |
70 | $includedfiles{$filename}--; | 74 | $includedfiles{$filename}--; |
71 | $dups++; | 75 | $dups++; |
72 | } else { | 76 | } else { |
73 | print FILE $_; | 77 | print {$f} $_; |
74 | } | 78 | } |
75 | } | 79 | } |
76 | } | 80 | } |
77 | } else { | 81 | } else { |
78 | print FILE $_; | 82 | print {$f} $_; |
79 | } | 83 | } |
80 | } | 84 | } |
81 | if ($dups > 0) { | 85 | if ($dups > 0) { |
82 | print "$file: removed $dups duplicate includes\n"; | 86 | print "$file: removed $dups duplicate includes\n"; |
83 | } | 87 | } |
84 | close(FILE); | 88 | close($f); |
85 | } | 89 | } |
diff --git a/scripts/checkstack.pl b/scripts/checkstack.pl index 14ee68e991d..1afff6658a7 100755 --- a/scripts/checkstack.pl +++ b/scripts/checkstack.pl | |||
@@ -21,6 +21,8 @@ | |||
21 | # | 21 | # |
22 | # TODO : Port to all architectures (one regex per arch) | 22 | # TODO : Port to all architectures (one regex per arch) |
23 | 23 | ||
24 | use strict; | ||
25 | |||
24 | # check for arch | 26 | # check for arch |
25 | # | 27 | # |
26 | # $re is used for two matches: | 28 | # $re is used for two matches: |
@@ -104,19 +106,11 @@ my (@stack, $re, $dre, $x, $xs); | |||
104 | } | 106 | } |
105 | } | 107 | } |
106 | 108 | ||
107 | sub bysize($) { | ||
108 | my ($asize, $bsize); | ||
109 | ($asize = $a) =~ s/.*: *(.*)$/$1/; | ||
110 | ($bsize = $b) =~ s/.*: *(.*)$/$1/; | ||
111 | $bsize <=> $asize | ||
112 | } | ||
113 | |||
114 | # | 109 | # |
115 | # main() | 110 | # main() |
116 | # | 111 | # |
117 | my $funcre = qr/^$x* <(.*)>:$/; | 112 | my $funcre = qr/^$x* <(.*)>:$/; |
118 | my $func; | 113 | my ($func, $file, $lastslash); |
119 | my $file, $lastslash; | ||
120 | 114 | ||
121 | while (my $line = <STDIN>) { | 115 | while (my $line = <STDIN>) { |
122 | if ($line =~ m/$funcre/) { | 116 | if ($line =~ m/$funcre/) { |
@@ -173,4 +167,6 @@ while (my $line = <STDIN>) { | |||
173 | } | 167 | } |
174 | } | 168 | } |
175 | 169 | ||
176 | print sort bysize @stack; | 170 | # Sort output by size (last field) |
171 | print sort { ($b =~ /:\t*(\d+)$/)[0] <=> ($a =~ /:\t*(\d+)$/)[0] } @stack; | ||
172 | |||
diff --git a/scripts/checkversion.pl b/scripts/checkversion.pl index ec7d21161bd..b444e89a009 100755 --- a/scripts/checkversion.pl +++ b/scripts/checkversion.pl | |||
@@ -5,23 +5,22 @@ | |||
5 | # including <linux/version.h> that don't need it. | 5 | # including <linux/version.h> that don't need it. |
6 | # Copyright (C) 2003, Randy Dunlap <rdunlap@xenotime.net> | 6 | # Copyright (C) 2003, Randy Dunlap <rdunlap@xenotime.net> |
7 | 7 | ||
8 | use strict; | ||
9 | |||
8 | $| = 1; | 10 | $| = 1; |
9 | 11 | ||
10 | my $debugging = 0; | 12 | my $debugging; |
11 | 13 | ||
12 | foreach $file (@ARGV) | 14 | foreach my $file (@ARGV) { |
13 | { | ||
14 | # Open this file. | 15 | # Open this file. |
15 | open(FILE, $file) || die "Can't open $file: $!\n"; | 16 | open( my $f, '<', $file ) |
17 | or die "Can't open $file: $!\n"; | ||
16 | 18 | ||
17 | # Initialize variables. | 19 | # Initialize variables. |
18 | my $fInComment = 0; | 20 | my ($fInComment, $fInString, $fUseVersion); |
19 | my $fInString = 0; | ||
20 | my $fUseVersion = 0; | ||
21 | my $iLinuxVersion = 0; | 21 | my $iLinuxVersion = 0; |
22 | 22 | ||
23 | LINE: while ( <FILE> ) | 23 | while (<$f>) { |
24 | { | ||
25 | # Strip comments. | 24 | # Strip comments. |
26 | $fInComment && (s+^.*?\*/+ +o ? ($fInComment = 0) : next); | 25 | $fInComment && (s+^.*?\*/+ +o ? ($fInComment = 0) : next); |
27 | m+/\*+o && (s+/\*.*?\*/+ +go, (s+/\*.*$+ +o && ($fInComment = 1))); | 26 | m+/\*+o && (s+/\*.*?\*/+ +go, (s+/\*.*$+ +o && ($fInComment = 1))); |
@@ -43,8 +42,8 @@ foreach $file (@ARGV) | |||
43 | # Look for uses: LINUX_VERSION_CODE, KERNEL_VERSION, UTS_RELEASE | 42 | # Look for uses: LINUX_VERSION_CODE, KERNEL_VERSION, UTS_RELEASE |
44 | if (($_ =~ /LINUX_VERSION_CODE/) || ($_ =~ /\WKERNEL_VERSION/)) { | 43 | if (($_ =~ /LINUX_VERSION_CODE/) || ($_ =~ /\WKERNEL_VERSION/)) { |
45 | $fUseVersion = 1; | 44 | $fUseVersion = 1; |
46 | last LINE if $iLinuxVersion; | 45 | last if $iLinuxVersion; |
47 | } | 46 | } |
48 | } | 47 | } |
49 | 48 | ||
50 | # Report used version IDs without include? | 49 | # Report used version IDs without include? |
@@ -67,5 +66,5 @@ foreach $file (@ARGV) | |||
67 | } | 66 | } |
68 | } | 67 | } |
69 | 68 | ||
70 | close(FILE); | 69 | close($f); |
71 | } | 70 | } |
diff --git a/scripts/decodecode b/scripts/decodecode index 4b00647814b..8b30cc36744 100755 --- a/scripts/decodecode +++ b/scripts/decodecode | |||
@@ -7,7 +7,7 @@ | |||
7 | # AFLAGS=--32 decodecode < 386.oops | 7 | # AFLAGS=--32 decodecode < 386.oops |
8 | 8 | ||
9 | cleanup() { | 9 | cleanup() { |
10 | rm -f $T $T.s $T.o $T.oo $T.aa $T.aaa | 10 | rm -f $T $T.s $T.o $T.oo $T.aa $T.dis |
11 | exit 1 | 11 | exit 1 |
12 | } | 12 | } |
13 | 13 | ||
@@ -39,6 +39,29 @@ fi | |||
39 | echo $code | 39 | echo $code |
40 | code=`echo $code | sed -e 's/.*Code: //'` | 40 | code=`echo $code | sed -e 's/.*Code: //'` |
41 | 41 | ||
42 | width=`expr index "$code" ' '` | ||
43 | width=$[($width-1)/2] | ||
44 | case $width in | ||
45 | 1) type=byte ;; | ||
46 | 2) type=2byte ;; | ||
47 | 4) type=4byte ;; | ||
48 | esac | ||
49 | |||
50 | disas() { | ||
51 | ${CROSS_COMPILE}as $AFLAGS -o $1.o $1.s &> /dev/null | ||
52 | |||
53 | if [ "$ARCH" == "arm" ]; then | ||
54 | if [ $width == 2 ]; then | ||
55 | OBJDUMPFLAGS="-M force-thumb" | ||
56 | fi | ||
57 | |||
58 | ${CROSS_COMPILE}strip $1.o | ||
59 | fi | ||
60 | |||
61 | ${CROSS_COMPILE}objdump $OBJDUMPFLAGS -S $1.o | \ | ||
62 | grep -v "/tmp\|Disassembly\|\.text\|^$" &> $1.dis | ||
63 | } | ||
64 | |||
42 | marker=`expr index "$code" "\<"` | 65 | marker=`expr index "$code" "\<"` |
43 | if [ $marker -eq 0 ]; then | 66 | if [ $marker -eq 0 ]; then |
44 | marker=`expr index "$code" "\("` | 67 | marker=`expr index "$code" "\("` |
@@ -49,26 +72,25 @@ if [ $marker -ne 0 ]; then | |||
49 | echo All code >> $T.oo | 72 | echo All code >> $T.oo |
50 | echo ======== >> $T.oo | 73 | echo ======== >> $T.oo |
51 | beforemark=`echo "$code"` | 74 | beforemark=`echo "$code"` |
52 | echo -n " .byte 0x" > $T.s | 75 | echo -n " .$type 0x" > $T.s |
53 | echo $beforemark | sed -e 's/ /,0x/g' | sed -e 's/<//g' | sed -e 's/>//g' >> $T.s | 76 | echo $beforemark | sed -e 's/ /,0x/g; s/[<>()]//g' >> $T.s |
54 | as $AFLAGS -o $T.o $T.s &> /dev/null | 77 | disas $T |
55 | objdump -S $T.o | grep -v "/tmp" | grep -v "Disassembly" | grep -v "\.text" | grep -v "^$" &> $T.ooo | 78 | cat $T.dis >> $T.oo |
56 | cat $T.ooo >> $T.oo | 79 | rm -f $T.o $T.s $T.dis |
57 | rm -f $T.o $T.s $T.ooo | ||
58 | 80 | ||
59 | # and fix code at-and-after marker | 81 | # and fix code at-and-after marker |
60 | code=`echo "$code" | cut -c$((${marker} + 1))-` | 82 | code=`echo "$code" | cut -c$((${marker} + 1))-` |
61 | fi | 83 | fi |
62 | echo Code starting with the faulting instruction > $T.aa | 84 | echo Code starting with the faulting instruction > $T.aa |
63 | echo =========================================== >> $T.aa | 85 | echo =========================================== >> $T.aa |
64 | code=`echo $code | sed -e 's/ [<(]/ /;s/[>)] / /;s/ /,0x/g'` | 86 | code=`echo $code | sed -e 's/ [<(]/ /;s/[>)] / /;s/ /,0x/g; s/[>)]$//'` |
65 | echo -n " .byte 0x" > $T.s | 87 | echo -n " .$type 0x" > $T.s |
66 | echo $code >> $T.s | 88 | echo $code >> $T.s |
67 | as $AFLAGS -o $T.o $T.s &> /dev/null | 89 | disas $T |
68 | objdump -S $T.o | grep -v "Disassembly" | grep -v "/tmp" | grep -v "\.text" | grep -v "^$" &> $T.aaa | 90 | cat $T.dis >> $T.aa |
69 | cat $T.aaa >> $T.aa | ||
70 | 91 | ||
71 | faultline=`cat $T.aaa | head -1 | cut -d":" -f2` | 92 | faultline=`cat $T.dis | head -1 | cut -d":" -f2` |
93 | faultline=`echo "$faultline" | sed -e 's/\[/\\\[/g; s/\]/\\\]/g'` | ||
72 | 94 | ||
73 | cat $T.oo | sed -e "s/\($faultline\)/\*\1 <-- trapping instruction/g" | 95 | cat $T.oo | sed -e "s/\($faultline\)/\*\1 <-- trapping instruction/g" |
74 | echo | 96 | echo |
diff --git a/scripts/export_report.pl b/scripts/export_report.pl index 705b5ba7c15..04dce7c15f8 100644 --- a/scripts/export_report.pl +++ b/scripts/export_report.pl | |||
@@ -49,10 +49,10 @@ sub usage { | |||
49 | } | 49 | } |
50 | 50 | ||
51 | sub collectcfiles { | 51 | sub collectcfiles { |
52 | my @file = `cat .tmp_versions/*.mod | grep '.*\.ko\$'`; | 52 | my @file |
53 | @file = grep {s/\.ko/.mod.c/} @file; | 53 | = `cat .tmp_versions/*.mod | grep '.*\.ko\$' | sed s/\.ko$/.mod.c/`; |
54 | chomp @file; | 54 | chomp @file; |
55 | return @file; | 55 | return @file; |
56 | } | 56 | } |
57 | 57 | ||
58 | my (%SYMBOL, %MODULE, %opt, @allcfiles); | 58 | my (%SYMBOL, %MODULE, %opt, @allcfiles); |
@@ -71,37 +71,40 @@ if (not defined $opt{'k'}) { | |||
71 | $opt{'k'} = "Module.symvers"; | 71 | $opt{'k'} = "Module.symvers"; |
72 | } | 72 | } |
73 | 73 | ||
74 | unless (open(MODULE_SYMVERS, $opt{'k'})) { | 74 | open (my $module_symvers, '<', $opt{'k'}) |
75 | die "Sorry, cannot open $opt{'k'}: $!\n"; | 75 | or die "Sorry, cannot open $opt{'k'}: $!\n"; |
76 | } | ||
77 | 76 | ||
78 | if (defined $opt{'o'}) { | 77 | if (defined $opt{'o'}) { |
79 | unless (open(OUTPUT_HANDLE, ">$opt{'o'}")) { | 78 | open (my $out, '>', $opt{'o'}) |
80 | die "Sorry, cannot open $opt{'o'} $!\n"; | 79 | or die "Sorry, cannot open $opt{'o'} $!\n"; |
81 | } | 80 | |
82 | select OUTPUT_HANDLE; | 81 | select $out; |
83 | } | 82 | } |
83 | |||
84 | # | 84 | # |
85 | # collect all the symbols and their attributes from the | 85 | # collect all the symbols and their attributes from the |
86 | # Module.symvers file | 86 | # Module.symvers file |
87 | # | 87 | # |
88 | while ( <MODULE_SYMVERS> ) { | 88 | while ( <$module_symvers> ) { |
89 | chomp; | 89 | chomp; |
90 | my (undef, $symbol, $module, $gpl) = split; | 90 | my (undef, $symbol, $module, $gpl) = split; |
91 | $SYMBOL { $symbol } = [ $module , "0" , $symbol, $gpl]; | 91 | $SYMBOL { $symbol } = [ $module , "0" , $symbol, $gpl]; |
92 | } | 92 | } |
93 | close(MODULE_SYMVERS); | 93 | close($module_symvers); |
94 | 94 | ||
95 | # | 95 | # |
96 | # collect the usage count of each symbol. | 96 | # collect the usage count of each symbol. |
97 | # | 97 | # |
98 | foreach my $thismod (@allcfiles) { | 98 | foreach my $thismod (@allcfiles) { |
99 | unless (open(MODULE_MODULE, $thismod)) { | 99 | my $module; |
100 | print "Sorry, cannot open $thismod: $!\n"; | 100 | |
101 | unless (open ($module, '<', $thismod)) { | ||
102 | warn "Sorry, cannot open $thismod: $!\n"; | ||
101 | next; | 103 | next; |
102 | } | 104 | } |
105 | |||
103 | my $state=0; | 106 | my $state=0; |
104 | while ( <MODULE_MODULE> ) { | 107 | while ( <$module> ) { |
105 | chomp; | 108 | chomp; |
106 | if ($state == 0) { | 109 | if ($state == 0) { |
107 | $state = 1 if ($_ =~ /static const struct modversion_info/); | 110 | $state = 1 if ($_ =~ /static const struct modversion_info/); |
@@ -124,7 +127,7 @@ foreach my $thismod (@allcfiles) { | |||
124 | if ($state != 2) { | 127 | if ($state != 2) { |
125 | print "WARNING:$thismod is not built with CONFIG_MODVERSION enabled\n"; | 128 | print "WARNING:$thismod is not built with CONFIG_MODVERSION enabled\n"; |
126 | } | 129 | } |
127 | close(MODULE_MODULE); | 130 | close($module); |
128 | } | 131 | } |
129 | 132 | ||
130 | print "\tThis file reports the exported symbols usage patterns by in-tree\n", | 133 | print "\tThis file reports the exported symbols usage patterns by in-tree\n", |
diff --git a/scripts/gen_initramfs_list.sh b/scripts/gen_initramfs_list.sh index a932ae52f92..5958fffb211 100644 --- a/scripts/gen_initramfs_list.sh +++ b/scripts/gen_initramfs_list.sh | |||
@@ -202,6 +202,7 @@ input_file() { | |||
202 | print_mtime "$1" >> ${output} | 202 | print_mtime "$1" >> ${output} |
203 | cat "$1" >> ${output} | 203 | cat "$1" >> ${output} |
204 | else | 204 | else |
205 | echo "$1 \\" | ||
205 | cat "$1" | while read type dir file perm ; do | 206 | cat "$1" | while read type dir file perm ; do |
206 | if [ "$type" == "file" ]; then | 207 | if [ "$type" == "file" ]; then |
207 | echo "$file \\"; | 208 | echo "$file \\"; |
@@ -231,7 +232,7 @@ arg="$1" | |||
231 | case "$arg" in | 232 | case "$arg" in |
232 | "-l") # files included in initramfs - used by kbuild | 233 | "-l") # files included in initramfs - used by kbuild |
233 | dep_list="list_" | 234 | dep_list="list_" |
234 | echo "deps_initramfs := \\" | 235 | echo "deps_initramfs := $0 \\" |
235 | shift | 236 | shift |
236 | ;; | 237 | ;; |
237 | "-o") # generate compressed cpio image named $1 | 238 | "-o") # generate compressed cpio image named $1 |
diff --git a/scripts/genksyms/genksyms.c b/scripts/genksyms/genksyms.c index af6b8363a2d..f99115ebe92 100644 --- a/scripts/genksyms/genksyms.c +++ b/scripts/genksyms/genksyms.c | |||
@@ -758,8 +758,10 @@ int main(int argc, char **argv) | |||
758 | /* setlinebuf(debugfile); */ | 758 | /* setlinebuf(debugfile); */ |
759 | } | 759 | } |
760 | 760 | ||
761 | if (flag_reference) | 761 | if (flag_reference) { |
762 | read_reference(ref_file); | 762 | read_reference(ref_file); |
763 | fclose(ref_file); | ||
764 | } | ||
763 | 765 | ||
764 | yyparse(); | 766 | yyparse(); |
765 | 767 | ||
diff --git a/scripts/headerdep.pl b/scripts/headerdep.pl index b7f6c560e24..8dd019bc5a7 100755 --- a/scripts/headerdep.pl +++ b/scripts/headerdep.pl | |||
@@ -80,8 +80,7 @@ sub search { | |||
80 | my $path = "$i/$filename"; | 80 | my $path = "$i/$filename"; |
81 | return $path if -f $path; | 81 | return $path if -f $path; |
82 | } | 82 | } |
83 | 83 | return; | |
84 | return undef; | ||
85 | } | 84 | } |
86 | 85 | ||
87 | sub parse_all { | 86 | sub parse_all { |
diff --git a/scripts/headers_check.pl b/scripts/headers_check.pl index db1dd7a549f..50d6cfd1fa7 100644 --- a/scripts/headers_check.pl +++ b/scripts/headers_check.pl | |||
@@ -28,11 +28,12 @@ my $lineno = 0; | |||
28 | my $filename; | 28 | my $filename; |
29 | 29 | ||
30 | foreach my $file (@files) { | 30 | foreach my $file (@files) { |
31 | local *FH; | ||
32 | $filename = $file; | 31 | $filename = $file; |
33 | open(FH, "<$filename") or die "$filename: $!\n"; | 32 | |
33 | open(my $fh, '<', $filename) | ||
34 | or die "$filename: $!\n"; | ||
34 | $lineno = 0; | 35 | $lineno = 0; |
35 | while ($line = <FH>) { | 36 | while ($line = <$fh>) { |
36 | $lineno++; | 37 | $lineno++; |
37 | &check_include(); | 38 | &check_include(); |
38 | &check_asm_types(); | 39 | &check_asm_types(); |
@@ -40,7 +41,7 @@ foreach my $file (@files) { | |||
40 | &check_declarations(); | 41 | &check_declarations(); |
41 | # Dropped for now. Too much noise &check_config(); | 42 | # Dropped for now. Too much noise &check_config(); |
42 | } | 43 | } |
43 | close FH; | 44 | close $fh; |
44 | } | 45 | } |
45 | exit $ret; | 46 | exit $ret; |
46 | 47 | ||
@@ -78,7 +79,7 @@ sub check_config | |||
78 | } | 79 | } |
79 | 80 | ||
80 | my $linux_asm_types; | 81 | my $linux_asm_types; |
81 | sub check_asm_types() | 82 | sub check_asm_types |
82 | { | 83 | { |
83 | if ($filename =~ /types.h|int-l64.h|int-ll64.h/o) { | 84 | if ($filename =~ /types.h|int-l64.h|int-ll64.h/o) { |
84 | return; | 85 | return; |
diff --git a/scripts/headers_install.pl b/scripts/headers_install.pl index b89ca2c58fd..4ca3be3b2e5 100644 --- a/scripts/headers_install.pl +++ b/scripts/headers_install.pl | |||
@@ -23,13 +23,13 @@ my ($readdir, $installdir, $arch, @files) = @ARGV; | |||
23 | my $unifdef = "scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__"; | 23 | my $unifdef = "scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__"; |
24 | 24 | ||
25 | foreach my $file (@files) { | 25 | foreach my $file (@files) { |
26 | local *INFILE; | ||
27 | local *OUTFILE; | ||
28 | my $tmpfile = "$installdir/$file.tmp"; | 26 | my $tmpfile = "$installdir/$file.tmp"; |
29 | open(INFILE, "<$readdir/$file") | 27 | |
30 | or die "$readdir/$file: $!\n"; | 28 | open(my $in, '<', "$readdir/$file") |
31 | open(OUTFILE, ">$tmpfile") or die "$tmpfile: $!\n"; | 29 | or die "$readdir/$file: $!\n"; |
32 | while (my $line = <INFILE>) { | 30 | open(my $out, '>', $tmpfile) |
31 | or die "$tmpfile: $!\n"; | ||
32 | while (my $line = <$in>) { | ||
33 | $line =~ s/([\s(])__user\s/$1/g; | 33 | $line =~ s/([\s(])__user\s/$1/g; |
34 | $line =~ s/([\s(])__force\s/$1/g; | 34 | $line =~ s/([\s(])__force\s/$1/g; |
35 | $line =~ s/([\s(])__iomem\s/$1/g; | 35 | $line =~ s/([\s(])__iomem\s/$1/g; |
@@ -39,10 +39,11 @@ foreach my $file (@files) { | |||
39 | $line =~ s/(^|\s)(inline)\b/$1__$2__/g; | 39 | $line =~ s/(^|\s)(inline)\b/$1__$2__/g; |
40 | $line =~ s/(^|\s)(asm)\b(\s|[(]|$)/$1__$2__$3/g; | 40 | $line =~ s/(^|\s)(asm)\b(\s|[(]|$)/$1__$2__$3/g; |
41 | $line =~ s/(^|\s|[(])(volatile)\b(\s|[(]|$)/$1__$2__$3/g; | 41 | $line =~ s/(^|\s|[(])(volatile)\b(\s|[(]|$)/$1__$2__$3/g; |
42 | printf OUTFILE "%s", $line; | 42 | printf {$out} "%s", $line; |
43 | } | 43 | } |
44 | close OUTFILE; | 44 | close $out; |
45 | close INFILE; | 45 | close $in; |
46 | |||
46 | system $unifdef . " $tmpfile > $installdir/$file"; | 47 | system $unifdef . " $tmpfile > $installdir/$file"; |
47 | unlink $tmpfile; | 48 | unlink $tmpfile; |
48 | } | 49 | } |
diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c index 86c3896a1e0..e3902fb39af 100644 --- a/scripts/kallsyms.c +++ b/scripts/kallsyms.c | |||
@@ -108,8 +108,10 @@ static int read_symbol(FILE *in, struct sym_entry *s) | |||
108 | rc = fscanf(in, "%llx %c %499s\n", &s->addr, &stype, str); | 108 | rc = fscanf(in, "%llx %c %499s\n", &s->addr, &stype, str); |
109 | if (rc != 3) { | 109 | if (rc != 3) { |
110 | if (rc != EOF) { | 110 | if (rc != EOF) { |
111 | /* skip line */ | 111 | /* skip line. sym is used as dummy to |
112 | fgets(str, 500, in); | 112 | * shut of "warn_unused_result" warning. |
113 | */ | ||
114 | sym = fgets(str, 500, in); | ||
113 | } | 115 | } |
114 | return -1; | 116 | return -1; |
115 | } | 117 | } |
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 186c46604d0..7cdae39b8f0 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile | |||
@@ -23,6 +23,9 @@ menuconfig: $(obj)/mconf | |||
23 | config: $(obj)/conf | 23 | config: $(obj)/conf |
24 | $< $(Kconfig) | 24 | $< $(Kconfig) |
25 | 25 | ||
26 | nconfig: $(obj)/nconf | ||
27 | $< $(Kconfig) | ||
28 | |||
26 | oldconfig: $(obj)/conf | 29 | oldconfig: $(obj)/conf |
27 | $< -o $(Kconfig) | 30 | $< -o $(Kconfig) |
28 | 31 | ||
@@ -120,6 +123,7 @@ endif | |||
120 | # Help text used by make help | 123 | # Help text used by make help |
121 | help: | 124 | help: |
122 | @echo ' config - Update current config utilising a line-oriented program' | 125 | @echo ' config - Update current config utilising a line-oriented program' |
126 | @echo ' nconfig - Update current config utilising a ncurses menu based program' | ||
123 | @echo ' menuconfig - Update current config utilising a menu based program' | 127 | @echo ' menuconfig - Update current config utilising a menu based program' |
124 | @echo ' xconfig - Update current config utilising a QT based front-end' | 128 | @echo ' xconfig - Update current config utilising a QT based front-end' |
125 | @echo ' gconfig - Update current config utilising a GTK based front-end' | 129 | @echo ' gconfig - Update current config utilising a GTK based front-end' |
@@ -147,6 +151,8 @@ HOST_EXTRACFLAGS += -DLOCALE | |||
147 | # =========================================================================== | 151 | # =========================================================================== |
148 | # Shared Makefile for the various kconfig executables: | 152 | # Shared Makefile for the various kconfig executables: |
149 | # conf: Used for defconfig, oldconfig and related targets | 153 | # conf: Used for defconfig, oldconfig and related targets |
154 | # nconf: Used for the nconfig target. | ||
155 | # Utilizes ncurses | ||
150 | # mconf: Used for the menuconfig target | 156 | # mconf: Used for the menuconfig target |
151 | # Utilizes the lxdialog package | 157 | # Utilizes the lxdialog package |
152 | # qconf: Used for the xconfig target | 158 | # qconf: Used for the xconfig target |
@@ -159,11 +165,16 @@ lxdialog := lxdialog/checklist.o lxdialog/util.o lxdialog/inputbox.o | |||
159 | lxdialog += lxdialog/textbox.o lxdialog/yesno.o lxdialog/menubox.o | 165 | lxdialog += lxdialog/textbox.o lxdialog/yesno.o lxdialog/menubox.o |
160 | 166 | ||
161 | conf-objs := conf.o zconf.tab.o | 167 | conf-objs := conf.o zconf.tab.o |
162 | mconf-objs := mconf.o zconf.tab.o $(lxdialog) | 168 | mconf-objs := mconf.o zconf.tab.o $(lxdialog) |
169 | nconf-objs := nconf.o zconf.tab.o nconf.gui.o | ||
163 | kxgettext-objs := kxgettext.o zconf.tab.o | 170 | kxgettext-objs := kxgettext.o zconf.tab.o |
164 | 171 | ||
165 | hostprogs-y := conf qconf gconf kxgettext | 172 | hostprogs-y := conf qconf gconf kxgettext |
166 | 173 | ||
174 | ifeq ($(MAKECMDGOALS),nconfig) | ||
175 | hostprogs-y += nconf | ||
176 | endif | ||
177 | |||
167 | ifeq ($(MAKECMDGOALS),menuconfig) | 178 | ifeq ($(MAKECMDGOALS),menuconfig) |
168 | hostprogs-y += mconf | 179 | hostprogs-y += mconf |
169 | endif | 180 | endif |
@@ -187,7 +198,7 @@ endif | |||
187 | 198 | ||
188 | clean-files := lkc_defs.h qconf.moc .tmp_qtcheck \ | 199 | clean-files := lkc_defs.h qconf.moc .tmp_qtcheck \ |
189 | .tmp_gtkcheck zconf.tab.c lex.zconf.c zconf.hash.c gconf.glade.h | 200 | .tmp_gtkcheck zconf.tab.c lex.zconf.c zconf.hash.c gconf.glade.h |
190 | clean-files += mconf qconf gconf | 201 | clean-files += mconf qconf gconf nconf |
191 | clean-files += config.pot linux.pot | 202 | clean-files += config.pot linux.pot |
192 | 203 | ||
193 | # Check that we have the required ncurses stuff installed for lxdialog (menuconfig) | 204 | # Check that we have the required ncurses stuff installed for lxdialog (menuconfig) |
@@ -212,6 +223,7 @@ HOSTLOADLIBES_gconf = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0` | |||
212 | HOSTCFLAGS_gconf.o = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \ | 223 | HOSTCFLAGS_gconf.o = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \ |
213 | -D LKC_DIRECT_LINK | 224 | -D LKC_DIRECT_LINK |
214 | 225 | ||
226 | HOSTLOADLIBES_nconf = -lmenu -lpanel -lncurses | ||
215 | $(obj)/qconf.o: $(obj)/.tmp_qtcheck | 227 | $(obj)/qconf.o: $(obj)/.tmp_qtcheck |
216 | 228 | ||
217 | ifeq ($(qconf-target),1) | 229 | ifeq ($(qconf-target),1) |
diff --git a/scripts/kconfig/expr.c b/scripts/kconfig/expr.c index edd3f39a080..d83f2322893 100644 --- a/scripts/kconfig/expr.c +++ b/scripts/kconfig/expr.c | |||
@@ -1097,9 +1097,32 @@ void expr_fprint(struct expr *e, FILE *out) | |||
1097 | 1097 | ||
1098 | static void expr_print_gstr_helper(void *data, struct symbol *sym, const char *str) | 1098 | static void expr_print_gstr_helper(void *data, struct symbol *sym, const char *str) |
1099 | { | 1099 | { |
1100 | str_append((struct gstr*)data, str); | 1100 | struct gstr *gs = (struct gstr*)data; |
1101 | const char *sym_str = NULL; | ||
1102 | |||
1103 | if (sym) | ||
1104 | sym_str = sym_get_string_value(sym); | ||
1105 | |||
1106 | if (gs->max_width) { | ||
1107 | unsigned extra_length = strlen(str); | ||
1108 | const char *last_cr = strrchr(gs->s, '\n'); | ||
1109 | unsigned last_line_length; | ||
1110 | |||
1111 | if (sym_str) | ||
1112 | extra_length += 4 + strlen(sym_str); | ||
1113 | |||
1114 | if (!last_cr) | ||
1115 | last_cr = gs->s; | ||
1116 | |||
1117 | last_line_length = strlen(gs->s) - (last_cr - gs->s); | ||
1118 | |||
1119 | if ((last_line_length + extra_length) > gs->max_width) | ||
1120 | str_append(gs, "\\\n"); | ||
1121 | } | ||
1122 | |||
1123 | str_append(gs, str); | ||
1101 | if (sym) | 1124 | if (sym) |
1102 | str_printf((struct gstr*)data, " [=%s]", sym_get_string_value(sym)); | 1125 | str_printf(gs, " [=%s]", sym_str); |
1103 | } | 1126 | } |
1104 | 1127 | ||
1105 | void expr_gstr_print(struct expr *e, struct gstr *gs) | 1128 | void expr_gstr_print(struct expr *e, struct gstr *gs) |
diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h index 6408fefae08..891cd9ce9ba 100644 --- a/scripts/kconfig/expr.h +++ b/scripts/kconfig/expr.h | |||
@@ -86,7 +86,7 @@ struct symbol { | |||
86 | struct expr_value rev_dep; | 86 | struct expr_value rev_dep; |
87 | }; | 87 | }; |
88 | 88 | ||
89 | #define for_all_symbols(i, sym) for (i = 0; i < 257; i++) for (sym = symbol_hash[i]; sym; sym = sym->next) if (sym->type != S_OTHER) | 89 | #define for_all_symbols(i, sym) for (i = 0; i < SYMBOL_HASHSIZE; i++) for (sym = symbol_hash[i]; sym; sym = sym->next) if (sym->type != S_OTHER) |
90 | 90 | ||
91 | #define SYMBOL_CONST 0x0001 /* symbol is const */ | 91 | #define SYMBOL_CONST 0x0001 /* symbol is const */ |
92 | #define SYMBOL_CHECK 0x0008 /* used during dependency checking */ | 92 | #define SYMBOL_CHECK 0x0008 /* used during dependency checking */ |
@@ -108,8 +108,7 @@ struct symbol { | |||
108 | #define SYMBOL_DEF4 0x80000 /* symbol.def[S_DEF_4] is valid */ | 108 | #define SYMBOL_DEF4 0x80000 /* symbol.def[S_DEF_4] is valid */ |
109 | 109 | ||
110 | #define SYMBOL_MAXLENGTH 256 | 110 | #define SYMBOL_MAXLENGTH 256 |
111 | #define SYMBOL_HASHSIZE 257 | 111 | #define SYMBOL_HASHSIZE 9973 |
112 | #define SYMBOL_HASHMASK 0xff | ||
113 | 112 | ||
114 | /* A property represent the config options that can be associated | 113 | /* A property represent the config options that can be associated |
115 | * with a config "symbol". | 114 | * with a config "symbol". |
diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 65464366fe3..bef10411837 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c | |||
@@ -30,13 +30,16 @@ enum { | |||
30 | SINGLE_VIEW, SPLIT_VIEW, FULL_VIEW | 30 | SINGLE_VIEW, SPLIT_VIEW, FULL_VIEW |
31 | }; | 31 | }; |
32 | 32 | ||
33 | enum { | ||
34 | OPT_NORMAL, OPT_ALL, OPT_PROMPT | ||
35 | }; | ||
36 | |||
33 | static gint view_mode = FULL_VIEW; | 37 | static gint view_mode = FULL_VIEW; |
34 | static gboolean show_name = TRUE; | 38 | static gboolean show_name = TRUE; |
35 | static gboolean show_range = TRUE; | 39 | static gboolean show_range = TRUE; |
36 | static gboolean show_value = TRUE; | 40 | static gboolean show_value = TRUE; |
37 | static gboolean show_all = FALSE; | ||
38 | static gboolean show_debug = FALSE; | ||
39 | static gboolean resizeable = FALSE; | 41 | static gboolean resizeable = FALSE; |
42 | static int opt_mode = OPT_NORMAL; | ||
40 | 43 | ||
41 | GtkWidget *main_wnd = NULL; | 44 | GtkWidget *main_wnd = NULL; |
42 | GtkWidget *tree1_w = NULL; // left frame | 45 | GtkWidget *tree1_w = NULL; // left frame |
@@ -76,36 +79,7 @@ static void conf_changed(void); | |||
76 | 79 | ||
77 | /* Helping/Debugging Functions */ | 80 | /* Helping/Debugging Functions */ |
78 | 81 | ||
79 | 82 | const char *dbg_sym_flags(int val) | |
80 | const char *dbg_print_stype(int val) | ||
81 | { | ||
82 | static char buf[256]; | ||
83 | |||
84 | bzero(buf, 256); | ||
85 | |||
86 | if (val == S_UNKNOWN) | ||
87 | strcpy(buf, "unknown"); | ||
88 | if (val == S_BOOLEAN) | ||
89 | strcpy(buf, "boolean"); | ||
90 | if (val == S_TRISTATE) | ||
91 | strcpy(buf, "tristate"); | ||
92 | if (val == S_INT) | ||
93 | strcpy(buf, "int"); | ||
94 | if (val == S_HEX) | ||
95 | strcpy(buf, "hex"); | ||
96 | if (val == S_STRING) | ||
97 | strcpy(buf, "string"); | ||
98 | if (val == S_OTHER) | ||
99 | strcpy(buf, "other"); | ||
100 | |||
101 | #ifdef DEBUG | ||
102 | printf("%s", buf); | ||
103 | #endif | ||
104 | |||
105 | return buf; | ||
106 | } | ||
107 | |||
108 | const char *dbg_print_flags(int val) | ||
109 | { | 83 | { |
110 | static char buf[256]; | 84 | static char buf[256]; |
111 | 85 | ||
@@ -131,40 +105,10 @@ const char *dbg_print_flags(int val) | |||
131 | strcat(buf, "auto/"); | 105 | strcat(buf, "auto/"); |
132 | 106 | ||
133 | buf[strlen(buf) - 1] = '\0'; | 107 | buf[strlen(buf) - 1] = '\0'; |
134 | #ifdef DEBUG | ||
135 | printf("%s", buf); | ||
136 | #endif | ||
137 | |||
138 | return buf; | ||
139 | } | ||
140 | |||
141 | const char *dbg_print_ptype(int val) | ||
142 | { | ||
143 | static char buf[256]; | ||
144 | |||
145 | bzero(buf, 256); | ||
146 | |||
147 | if (val == P_UNKNOWN) | ||
148 | strcpy(buf, "unknown"); | ||
149 | if (val == P_PROMPT) | ||
150 | strcpy(buf, "prompt"); | ||
151 | if (val == P_COMMENT) | ||
152 | strcpy(buf, "comment"); | ||
153 | if (val == P_MENU) | ||
154 | strcpy(buf, "menu"); | ||
155 | if (val == P_DEFAULT) | ||
156 | strcpy(buf, "default"); | ||
157 | if (val == P_CHOICE) | ||
158 | strcpy(buf, "choice"); | ||
159 | |||
160 | #ifdef DEBUG | ||
161 | printf("%s", buf); | ||
162 | #endif | ||
163 | 108 | ||
164 | return buf; | 109 | return buf; |
165 | } | 110 | } |
166 | 111 | ||
167 | |||
168 | void replace_button_icon(GladeXML * xml, GdkDrawable * window, | 112 | void replace_button_icon(GladeXML * xml, GdkDrawable * window, |
169 | GtkStyle * style, gchar * btn_name, gchar ** xpm) | 113 | GtkStyle * style, gchar * btn_name, gchar ** xpm) |
170 | { | 114 | { |
@@ -697,20 +641,29 @@ void on_show_data1_activate(GtkMenuItem * menuitem, gpointer user_data) | |||
697 | 641 | ||
698 | 642 | ||
699 | void | 643 | void |
700 | on_show_all_options1_activate(GtkMenuItem * menuitem, gpointer user_data) | 644 | on_set_option_mode1_activate(GtkMenuItem *menuitem, gpointer user_data) |
701 | { | 645 | { |
702 | show_all = GTK_CHECK_MENU_ITEM(menuitem)->active; | 646 | opt_mode = OPT_NORMAL; |
647 | gtk_tree_store_clear(tree2); | ||
648 | display_tree(&rootmenu); /* instead of update_tree to speed-up */ | ||
649 | } | ||
650 | |||
703 | 651 | ||
652 | void | ||
653 | on_set_option_mode2_activate(GtkMenuItem *menuitem, gpointer user_data) | ||
654 | { | ||
655 | opt_mode = OPT_ALL; | ||
704 | gtk_tree_store_clear(tree2); | 656 | gtk_tree_store_clear(tree2); |
705 | display_tree(&rootmenu); // instead of update_tree to speed-up | 657 | display_tree(&rootmenu); /* instead of update_tree to speed-up */ |
706 | } | 658 | } |
707 | 659 | ||
708 | 660 | ||
709 | void | 661 | void |
710 | on_show_debug_info1_activate(GtkMenuItem * menuitem, gpointer user_data) | 662 | on_set_option_mode3_activate(GtkMenuItem *menuitem, gpointer user_data) |
711 | { | 663 | { |
712 | show_debug = GTK_CHECK_MENU_ITEM(menuitem)->active; | 664 | opt_mode = OPT_PROMPT; |
713 | update_tree(&rootmenu, NULL); | 665 | gtk_tree_store_clear(tree2); |
666 | display_tree(&rootmenu); /* instead of update_tree to speed-up */ | ||
714 | } | 667 | } |
715 | 668 | ||
716 | 669 | ||
@@ -1163,7 +1116,10 @@ static gchar **fill_row(struct menu *menu) | |||
1163 | g_strdup_printf("%s %s", _(menu_get_prompt(menu)), | 1116 | g_strdup_printf("%s %s", _(menu_get_prompt(menu)), |
1164 | sym && sym_has_value(sym) ? "(NEW)" : ""); | 1117 | sym && sym_has_value(sym) ? "(NEW)" : ""); |
1165 | 1118 | ||
1166 | if (show_all && !menu_is_visible(menu)) | 1119 | if (opt_mode == OPT_ALL && !menu_is_visible(menu)) |
1120 | row[COL_COLOR] = g_strdup("DarkGray"); | ||
1121 | else if (opt_mode == OPT_PROMPT && | ||
1122 | menu_has_prompt(menu) && !menu_is_visible(menu)) | ||
1167 | row[COL_COLOR] = g_strdup("DarkGray"); | 1123 | row[COL_COLOR] = g_strdup("DarkGray"); |
1168 | else | 1124 | else |
1169 | row[COL_COLOR] = g_strdup("Black"); | 1125 | row[COL_COLOR] = g_strdup("Black"); |
@@ -1386,16 +1342,19 @@ static void update_tree(struct menu *src, GtkTreeIter * dst) | |||
1386 | menu2 ? menu_get_prompt(menu2) : "nil"); | 1342 | menu2 ? menu_get_prompt(menu2) : "nil"); |
1387 | #endif | 1343 | #endif |
1388 | 1344 | ||
1389 | if (!menu_is_visible(child1) && !show_all) { // remove node | 1345 | if ((opt_mode == OPT_NORMAL && !menu_is_visible(child1)) || |
1346 | (opt_mode == OPT_PROMPT && !menu_has_prompt(child1))) { | ||
1347 | |||
1348 | /* remove node */ | ||
1390 | if (gtktree_iter_find_node(dst, menu1) != NULL) { | 1349 | if (gtktree_iter_find_node(dst, menu1) != NULL) { |
1391 | memcpy(&tmp, child2, sizeof(GtkTreeIter)); | 1350 | memcpy(&tmp, child2, sizeof(GtkTreeIter)); |
1392 | valid = gtk_tree_model_iter_next(model2, | 1351 | valid = gtk_tree_model_iter_next(model2, |
1393 | child2); | 1352 | child2); |
1394 | gtk_tree_store_remove(tree2, &tmp); | 1353 | gtk_tree_store_remove(tree2, &tmp); |
1395 | if (!valid) | 1354 | if (!valid) |
1396 | return; // next parent | 1355 | return; /* next parent */ |
1397 | else | 1356 | else |
1398 | goto reparse; // next child | 1357 | goto reparse; /* next child */ |
1399 | } else | 1358 | } else |
1400 | continue; | 1359 | continue; |
1401 | } | 1360 | } |
@@ -1464,17 +1423,19 @@ static void display_tree(struct menu *menu) | |||
1464 | && (tree == tree2)) | 1423 | && (tree == tree2)) |
1465 | continue; | 1424 | continue; |
1466 | 1425 | ||
1467 | if (menu_is_visible(child) || show_all) | 1426 | if ((opt_mode == OPT_NORMAL && menu_is_visible(child)) || |
1427 | (opt_mode == OPT_PROMPT && menu_has_prompt(child)) || | ||
1428 | (opt_mode == OPT_ALL)) | ||
1468 | place_node(child, fill_row(child)); | 1429 | place_node(child, fill_row(child)); |
1469 | #ifdef DEBUG | 1430 | #ifdef DEBUG |
1470 | printf("%*c%s: ", indent, ' ', menu_get_prompt(child)); | 1431 | printf("%*c%s: ", indent, ' ', menu_get_prompt(child)); |
1471 | printf("%s", child->flags & MENU_ROOT ? "rootmenu | " : ""); | 1432 | printf("%s", child->flags & MENU_ROOT ? "rootmenu | " : ""); |
1472 | dbg_print_ptype(ptype); | 1433 | printf("%s", prop_get_type_name(ptype)); |
1473 | printf(" | "); | 1434 | printf(" | "); |
1474 | if (sym) { | 1435 | if (sym) { |
1475 | dbg_print_stype(sym->type); | 1436 | printf("%s", sym_type_name(sym->type)); |
1476 | printf(" | "); | 1437 | printf(" | "); |
1477 | dbg_print_flags(sym->flags); | 1438 | printf("%s", dbg_sym_flags(sym->flags)); |
1478 | printf("\n"); | 1439 | printf("\n"); |
1479 | } else | 1440 | } else |
1480 | printf("\n"); | 1441 | printf("\n"); |
diff --git a/scripts/kconfig/gconf.glade b/scripts/kconfig/gconf.glade index b1c86c19292..d52b0a75d82 100644 --- a/scripts/kconfig/gconf.glade +++ b/scripts/kconfig/gconf.glade | |||
@@ -190,26 +190,40 @@ | |||
190 | </child> | 190 | </child> |
191 | 191 | ||
192 | <child> | 192 | <child> |
193 | <widget class="GtkCheckMenuItem" id="show_all_options1"> | 193 | <widget class="GtkRadioMenuItem" id="set_option_mode1"> |
194 | <property name="visible">True</property> | ||
195 | <property name="tooltip" translatable="yes">Show normal options</property> | ||
196 | <property name="label" translatable="yes">Show normal options</property> | ||
197 | <property name="use_underline">True</property> | ||
198 | <property name="active">True</property> | ||
199 | <signal name="activate" handler="on_set_option_mode1_activate"/> | ||
200 | </widget> | ||
201 | </child> | ||
202 | |||
203 | <child> | ||
204 | <widget class="GtkRadioMenuItem" id="set_option_mode2"> | ||
194 | <property name="visible">True</property> | 205 | <property name="visible">True</property> |
195 | <property name="tooltip" translatable="yes">Show all options</property> | 206 | <property name="tooltip" translatable="yes">Show all options</property> |
196 | <property name="label" translatable="yes">Show all _options</property> | 207 | <property name="label" translatable="yes">Show all _options</property> |
197 | <property name="use_underline">True</property> | 208 | <property name="use_underline">True</property> |
198 | <property name="active">False</property> | 209 | <property name="active">False</property> |
199 | <signal name="activate" handler="on_show_all_options1_activate"/> | 210 | <property name="group">set_option_mode1</property> |
211 | <signal name="activate" handler="on_set_option_mode2_activate"/> | ||
200 | </widget> | 212 | </widget> |
201 | </child> | 213 | </child> |
202 | 214 | ||
203 | <child> | 215 | <child> |
204 | <widget class="GtkCheckMenuItem" id="show_debug_info1"> | 216 | <widget class="GtkRadioMenuItem" id="set_option_mode3"> |
205 | <property name="visible">True</property> | 217 | <property name="visible">True</property> |
206 | <property name="tooltip" translatable="yes">Show masked options</property> | 218 | <property name="tooltip" translatable="yes">Show all options with prompts</property> |
207 | <property name="label" translatable="yes">Show _debug info</property> | 219 | <property name="label" translatable="yes">Show all prompt options</property> |
208 | <property name="use_underline">True</property> | 220 | <property name="use_underline">True</property> |
209 | <property name="active">False</property> | 221 | <property name="active">False</property> |
210 | <signal name="activate" handler="on_show_debug_info1_activate"/> | 222 | <property name="group">set_option_mode1</property> |
223 | <signal name="activate" handler="on_set_option_mode3_activate"/> | ||
211 | </widget> | 224 | </widget> |
212 | </child> | 225 | </child> |
226 | |||
213 | </widget> | 227 | </widget> |
214 | </child> | 228 | </child> |
215 | </widget> | 229 | </widget> |
diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h index f379b0bf8c9..ce6549cdacc 100644 --- a/scripts/kconfig/lkc.h +++ b/scripts/kconfig/lkc.h | |||
@@ -84,7 +84,7 @@ void conf_set_all_new_symbols(enum conf_def_mode mode); | |||
84 | void kconfig_load(void); | 84 | void kconfig_load(void); |
85 | 85 | ||
86 | /* menu.c */ | 86 | /* menu.c */ |
87 | void menu_init(void); | 87 | void _menu_init(void); |
88 | void menu_warn(struct menu *menu, const char *fmt, ...); | 88 | void menu_warn(struct menu *menu, const char *fmt, ...); |
89 | struct menu *menu_add_menu(void); | 89 | struct menu *menu_add_menu(void); |
90 | void menu_end_menu(void); | 90 | void menu_end_menu(void); |
@@ -106,6 +106,11 @@ int file_write_dep(const char *name); | |||
106 | struct gstr { | 106 | struct gstr { |
107 | size_t len; | 107 | size_t len; |
108 | char *s; | 108 | char *s; |
109 | /* | ||
110 | * when max_width is not zero long lines in string s (if any) get | ||
111 | * wrapped not to exceed the max_width value | ||
112 | */ | ||
113 | int max_width; | ||
109 | }; | 114 | }; |
110 | struct gstr str_new(void); | 115 | struct gstr str_new(void); |
111 | struct gstr str_assign(const char *s); | 116 | struct gstr str_assign(const char *s); |
diff --git a/scripts/kconfig/lkc_proto.h b/scripts/kconfig/lkc_proto.h index ffeb532b2cf..7cadcad8233 100644 --- a/scripts/kconfig/lkc_proto.h +++ b/scripts/kconfig/lkc_proto.h | |||
@@ -11,13 +11,15 @@ P(conf_set_changed_callback, void,(void (*fn)(void))); | |||
11 | /* menu.c */ | 11 | /* menu.c */ |
12 | P(rootmenu,struct menu,); | 12 | P(rootmenu,struct menu,); |
13 | 13 | ||
14 | P(menu_is_visible,bool,(struct menu *menu)); | 14 | P(menu_is_visible, bool, (struct menu *menu)); |
15 | P(menu_has_prompt, bool, (struct menu *menu)); | ||
15 | P(menu_get_prompt,const char *,(struct menu *menu)); | 16 | P(menu_get_prompt,const char *,(struct menu *menu)); |
16 | P(menu_get_root_menu,struct menu *,(struct menu *menu)); | 17 | P(menu_get_root_menu,struct menu *,(struct menu *menu)); |
17 | P(menu_get_parent_menu,struct menu *,(struct menu *menu)); | 18 | P(menu_get_parent_menu,struct menu *,(struct menu *menu)); |
18 | P(menu_has_help,bool,(struct menu *menu)); | 19 | P(menu_has_help,bool,(struct menu *menu)); |
19 | P(menu_get_help,const char *,(struct menu *menu)); | 20 | P(menu_get_help,const char *,(struct menu *menu)); |
20 | P(get_symbol_str,void,(struct gstr *r, struct symbol *sym)); | 21 | P(get_symbol_str, void, (struct gstr *r, struct symbol *sym)); |
22 | P(get_relations_str, struct gstr, (struct symbol **sym_arr)); | ||
21 | P(menu_get_ext_help,void,(struct menu *menu, struct gstr *help)); | 23 | P(menu_get_ext_help,void,(struct menu *menu, struct gstr *help)); |
22 | 24 | ||
23 | /* symbol.c */ | 25 | /* symbol.c */ |
diff --git a/scripts/kconfig/lxdialog/inputbox.c b/scripts/kconfig/lxdialog/inputbox.c index 616c6013818..dd8e587c50e 100644 --- a/scripts/kconfig/lxdialog/inputbox.c +++ b/scripts/kconfig/lxdialog/inputbox.c | |||
@@ -180,7 +180,7 @@ do_resize: | |||
180 | case KEY_LEFT: | 180 | case KEY_LEFT: |
181 | switch (button) { | 181 | switch (button) { |
182 | case -1: | 182 | case -1: |
183 | button = 1; /* Indicates "Cancel" button is selected */ | 183 | button = 1; /* Indicates "Help" button is selected */ |
184 | print_buttons(dialog, height, width, 1); | 184 | print_buttons(dialog, height, width, 1); |
185 | break; | 185 | break; |
186 | case 0: | 186 | case 0: |
@@ -204,7 +204,7 @@ do_resize: | |||
204 | print_buttons(dialog, height, width, 0); | 204 | print_buttons(dialog, height, width, 0); |
205 | break; | 205 | break; |
206 | case 0: | 206 | case 0: |
207 | button = 1; /* Indicates "Cancel" button is selected */ | 207 | button = 1; /* Indicates "Help" button is selected */ |
208 | print_buttons(dialog, height, width, 1); | 208 | print_buttons(dialog, height, width, 1); |
209 | break; | 209 | break; |
210 | case 1: | 210 | case 1: |
diff --git a/scripts/kconfig/lxdialog/menubox.c b/scripts/kconfig/lxdialog/menubox.c index fa9d633f293..1d604738fa1 100644 --- a/scripts/kconfig/lxdialog/menubox.c +++ b/scripts/kconfig/lxdialog/menubox.c | |||
@@ -383,6 +383,10 @@ do_resize: | |||
383 | case 'n': | 383 | case 'n': |
384 | case 'm': | 384 | case 'm': |
385 | case '/': | 385 | case '/': |
386 | case 'h': | ||
387 | case '?': | ||
388 | case 'z': | ||
389 | case '\n': | ||
386 | /* save scroll info */ | 390 | /* save scroll info */ |
387 | *s_scroll = scroll; | 391 | *s_scroll = scroll; |
388 | delwin(menu); | 392 | delwin(menu); |
@@ -390,8 +394,10 @@ do_resize: | |||
390 | item_set(scroll + choice); | 394 | item_set(scroll + choice); |
391 | item_set_selected(1); | 395 | item_set_selected(1); |
392 | switch (key) { | 396 | switch (key) { |
397 | case 'h': | ||
398 | case '?': | ||
399 | return 2; | ||
393 | case 's': | 400 | case 's': |
394 | return 3; | ||
395 | case 'y': | 401 | case 'y': |
396 | return 3; | 402 | return 3; |
397 | case 'n': | 403 | case 'n': |
@@ -402,18 +408,12 @@ do_resize: | |||
402 | return 6; | 408 | return 6; |
403 | case '/': | 409 | case '/': |
404 | return 7; | 410 | return 7; |
411 | case 'z': | ||
412 | return 8; | ||
413 | case '\n': | ||
414 | return button; | ||
405 | } | 415 | } |
406 | return 0; | 416 | return 0; |
407 | case 'h': | ||
408 | case '?': | ||
409 | button = 2; | ||
410 | case '\n': | ||
411 | *s_scroll = scroll; | ||
412 | delwin(menu); | ||
413 | delwin(dialog); | ||
414 | item_set(scroll + choice); | ||
415 | item_set_selected(1); | ||
416 | return button; | ||
417 | case 'e': | 417 | case 'e': |
418 | case 'x': | 418 | case 'x': |
419 | key = KEY_ESC; | 419 | key = KEY_ESC; |
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c index 8413cf38ed2..2c83d3234d3 100644 --- a/scripts/kconfig/mconf.c +++ b/scripts/kconfig/mconf.c | |||
@@ -67,13 +67,15 @@ static const char mconf_readme[] = N_( | |||
67 | " there is a delayed response which you may find annoying.\n" | 67 | " there is a delayed response which you may find annoying.\n" |
68 | "\n" | 68 | "\n" |
69 | " Also, the <TAB> and cursor keys will cycle between <Select>,\n" | 69 | " Also, the <TAB> and cursor keys will cycle between <Select>,\n" |
70 | " <Exit> and <Help>\n" | 70 | " <Exit> and <Help>.\n" |
71 | "\n" | 71 | "\n" |
72 | "o To get help with an item, use the cursor keys to highlight <Help>\n" | 72 | "o To get help with an item, use the cursor keys to highlight <Help>\n" |
73 | " and Press <ENTER>.\n" | 73 | " and press <ENTER>.\n" |
74 | "\n" | 74 | "\n" |
75 | " Shortcut: Press <H> or <?>.\n" | 75 | " Shortcut: Press <H> or <?>.\n" |
76 | "\n" | 76 | "\n" |
77 | "o To show hidden options, press <Z>.\n" | ||
78 | "\n" | ||
77 | "\n" | 79 | "\n" |
78 | "Radiolists (Choice lists)\n" | 80 | "Radiolists (Choice lists)\n" |
79 | "-----------\n" | 81 | "-----------\n" |
@@ -272,6 +274,7 @@ static int indent; | |||
272 | static struct menu *current_menu; | 274 | static struct menu *current_menu; |
273 | static int child_count; | 275 | static int child_count; |
274 | static int single_menu_mode; | 276 | static int single_menu_mode; |
277 | static int show_all_options; | ||
275 | 278 | ||
276 | static void conf(struct menu *menu); | 279 | static void conf(struct menu *menu); |
277 | static void conf_choice(struct menu *menu); | 280 | static void conf_choice(struct menu *menu); |
@@ -282,19 +285,6 @@ static void show_textbox(const char *title, const char *text, int r, int c); | |||
282 | static void show_helptext(const char *title, const char *text); | 285 | static void show_helptext(const char *title, const char *text); |
283 | static void show_help(struct menu *menu); | 286 | static void show_help(struct menu *menu); |
284 | 287 | ||
285 | static struct gstr get_relations_str(struct symbol **sym_arr) | ||
286 | { | ||
287 | struct symbol *sym; | ||
288 | struct gstr res = str_new(); | ||
289 | int i; | ||
290 | |||
291 | for (i = 0; sym_arr && (sym = sym_arr[i]); i++) | ||
292 | get_symbol_str(&res, sym); | ||
293 | if (!i) | ||
294 | str_append(&res, _("No matches found.\n")); | ||
295 | return res; | ||
296 | } | ||
297 | |||
298 | static char filename[PATH_MAX+1]; | 288 | static char filename[PATH_MAX+1]; |
299 | static void set_config_filename(const char *config_filename) | 289 | static void set_config_filename(const char *config_filename) |
300 | { | 290 | { |
@@ -359,8 +349,16 @@ static void build_conf(struct menu *menu) | |||
359 | int type, tmp, doint = 2; | 349 | int type, tmp, doint = 2; |
360 | tristate val; | 350 | tristate val; |
361 | char ch; | 351 | char ch; |
362 | 352 | bool visible; | |
363 | if (!menu_is_visible(menu)) | 353 | |
354 | /* | ||
355 | * note: menu_is_visible() has side effect that it will | ||
356 | * recalc the value of the symbol. | ||
357 | */ | ||
358 | visible = menu_is_visible(menu); | ||
359 | if (show_all_options && !menu_has_prompt(menu)) | ||
360 | return; | ||
361 | else if (!show_all_options && !visible) | ||
364 | return; | 362 | return; |
365 | 363 | ||
366 | sym = menu->sym; | 364 | sym = menu->sym; |
@@ -619,6 +617,9 @@ static void conf(struct menu *menu) | |||
619 | case 7: | 617 | case 7: |
620 | search_conf(); | 618 | search_conf(); |
621 | break; | 619 | break; |
620 | case 8: | ||
621 | show_all_options = !show_all_options; | ||
622 | break; | ||
622 | } | 623 | } |
623 | } | 624 | } |
624 | } | 625 | } |
@@ -638,6 +639,7 @@ static void show_help(struct menu *menu) | |||
638 | { | 639 | { |
639 | struct gstr help = str_new(); | 640 | struct gstr help = str_new(); |
640 | 641 | ||
642 | help.max_width = getmaxx(stdscr) - 10; | ||
641 | menu_get_ext_help(menu, &help); | 643 | menu_get_ext_help(menu, &help); |
642 | 644 | ||
643 | show_helptext(_(menu_get_prompt(menu)), str_get(&help)); | 645 | show_helptext(_(menu_get_prompt(menu)), str_get(&help)); |
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index 059a2465c57..203632cc30b 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c | |||
@@ -38,7 +38,7 @@ static void prop_warn(struct property *prop, const char *fmt, ...) | |||
38 | va_end(ap); | 38 | va_end(ap); |
39 | } | 39 | } |
40 | 40 | ||
41 | void menu_init(void) | 41 | void _menu_init(void) |
42 | { | 42 | { |
43 | current_entry = current_menu = &rootmenu; | 43 | current_entry = current_menu = &rootmenu; |
44 | last_entry_ptr = &rootmenu.list; | 44 | last_entry_ptr = &rootmenu.list; |
@@ -197,7 +197,7 @@ static void sym_check_prop(struct symbol *sym) | |||
197 | if ((sym->type == S_STRING || sym->type == S_INT || sym->type == S_HEX) && | 197 | if ((sym->type == S_STRING || sym->type == S_INT || sym->type == S_HEX) && |
198 | prop->expr->type != E_SYMBOL) | 198 | prop->expr->type != E_SYMBOL) |
199 | prop_warn(prop, | 199 | prop_warn(prop, |
200 | "default for config symbol '%'" | 200 | "default for config symbol '%s'" |
201 | " must be a single symbol", sym->name); | 201 | " must be a single symbol", sym->name); |
202 | break; | 202 | break; |
203 | case P_SELECT: | 203 | case P_SELECT: |
@@ -390,6 +390,13 @@ void menu_finalize(struct menu *parent) | |||
390 | } | 390 | } |
391 | } | 391 | } |
392 | 392 | ||
393 | bool menu_has_prompt(struct menu *menu) | ||
394 | { | ||
395 | if (!menu->prompt) | ||
396 | return false; | ||
397 | return true; | ||
398 | } | ||
399 | |||
393 | bool menu_is_visible(struct menu *menu) | 400 | bool menu_is_visible(struct menu *menu) |
394 | { | 401 | { |
395 | struct menu *child; | 402 | struct menu *child; |
@@ -398,6 +405,7 @@ bool menu_is_visible(struct menu *menu) | |||
398 | 405 | ||
399 | if (!menu->prompt) | 406 | if (!menu->prompt) |
400 | return false; | 407 | return false; |
408 | |||
401 | sym = menu->sym; | 409 | sym = menu->sym; |
402 | if (sym) { | 410 | if (sym) { |
403 | sym_calc_value(sym); | 411 | sym_calc_value(sym); |
@@ -407,12 +415,14 @@ bool menu_is_visible(struct menu *menu) | |||
407 | 415 | ||
408 | if (visible != no) | 416 | if (visible != no) |
409 | return true; | 417 | return true; |
418 | |||
410 | if (!sym || sym_get_tristate_value(menu->sym) == no) | 419 | if (!sym || sym_get_tristate_value(menu->sym) == no) |
411 | return false; | 420 | return false; |
412 | 421 | ||
413 | for (child = menu->list; child; child = child->next) | 422 | for (child = menu->list; child; child = child->next) |
414 | if (menu_is_visible(child)) | 423 | if (menu_is_visible(child)) |
415 | return true; | 424 | return true; |
425 | |||
416 | return false; | 426 | return false; |
417 | } | 427 | } |
418 | 428 | ||
@@ -515,6 +525,20 @@ void get_symbol_str(struct gstr *r, struct symbol *sym) | |||
515 | str_append(r, "\n\n"); | 525 | str_append(r, "\n\n"); |
516 | } | 526 | } |
517 | 527 | ||
528 | struct gstr get_relations_str(struct symbol **sym_arr) | ||
529 | { | ||
530 | struct symbol *sym; | ||
531 | struct gstr res = str_new(); | ||
532 | int i; | ||
533 | |||
534 | for (i = 0; sym_arr && (sym = sym_arr[i]); i++) | ||
535 | get_symbol_str(&res, sym); | ||
536 | if (!i) | ||
537 | str_append(&res, _("No matches found.\n")); | ||
538 | return res; | ||
539 | } | ||
540 | |||
541 | |||
518 | void menu_get_ext_help(struct menu *menu, struct gstr *help) | 542 | void menu_get_ext_help(struct menu *menu, struct gstr *help) |
519 | { | 543 | { |
520 | struct symbol *sym = menu->sym; | 544 | struct symbol *sym = menu->sym; |
diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c new file mode 100644 index 00000000000..762caf80ce3 --- /dev/null +++ b/scripts/kconfig/nconf.c | |||
@@ -0,0 +1,1568 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2008 Nir Tzachar <nir.tzachar@gmail.com? | ||
3 | * Released under the terms of the GNU GPL v2.0. | ||
4 | * | ||
5 | * Derived from menuconfig. | ||
6 | * | ||
7 | */ | ||
8 | #define LKC_DIRECT_LINK | ||
9 | #include "lkc.h" | ||
10 | #include "nconf.h" | ||
11 | |||
12 | static const char nconf_readme[] = N_( | ||
13 | "Overview\n" | ||
14 | "--------\n" | ||
15 | "Some kernel features may be built directly into the kernel.\n" | ||
16 | "Some may be made into loadable runtime modules. Some features\n" | ||
17 | "may be completely removed altogether. There are also certain\n" | ||
18 | "kernel parameters which are not really features, but must be\n" | ||
19 | "entered in as decimal or hexadecimal numbers or possibly text.\n" | ||
20 | "\n" | ||
21 | "Menu items beginning with following braces represent features that\n" | ||
22 | " [ ] can be built in or removed\n" | ||
23 | " < > can be built in, modularized or removed\n" | ||
24 | " { } can be built in or modularized (selected by other feature)\n" | ||
25 | " - - are selected by other feature,\n" | ||
26 | " XXX cannot be selected. use Symbol Info to find out why,\n" | ||
27 | "while *, M or whitespace inside braces means to build in, build as\n" | ||
28 | "a module or to exclude the feature respectively.\n" | ||
29 | "\n" | ||
30 | "To change any of these features, highlight it with the cursor\n" | ||
31 | "keys and press <Y> to build it in, <M> to make it a module or\n" | ||
32 | "<N> to removed it. You may also press the <Space Bar> to cycle\n" | ||
33 | "through the available options (ie. Y->N->M->Y).\n" | ||
34 | "\n" | ||
35 | "Some additional keyboard hints:\n" | ||
36 | "\n" | ||
37 | "Menus\n" | ||
38 | "----------\n" | ||
39 | "o Use the Up/Down arrow keys (cursor keys) to highlight the item\n" | ||
40 | " you wish to change use <Enter> or <Space>. Goto submenu by \n" | ||
41 | " pressing <Enter> of <right-arrow>. Use <Esc> or <left-arrow> to go back.\n" | ||
42 | " Submenus are designated by \"--->\".\n" | ||
43 | "\n" | ||
44 | " Shortcut: Press the option's highlighted letter (hotkey).\n" | ||
45 | " Pressing a hotkey more than once will sequence\n" | ||
46 | " through all visible items which use that hotkey.\n" | ||
47 | "\n" | ||
48 | " You may also use the <PAGE UP> and <PAGE DOWN> keys to scroll\n" | ||
49 | " unseen options into view.\n" | ||
50 | "\n" | ||
51 | "o To exit a menu use the just press <ESC> <F5> <F8> or <left-arrow>.\n" | ||
52 | "\n" | ||
53 | "o To get help with an item, press <F1>\n" | ||
54 | " Shortcut: Press <h> or <?>.\n" | ||
55 | "\n" | ||
56 | "\n" | ||
57 | "Radiolists (Choice lists)\n" | ||
58 | "-----------\n" | ||
59 | "o Use the cursor keys to select the option you wish to set and press\n" | ||
60 | " <S> or the <SPACE BAR>.\n" | ||
61 | "\n" | ||
62 | " Shortcut: Press the first letter of the option you wish to set then\n" | ||
63 | " press <S> or <SPACE BAR>.\n" | ||
64 | "\n" | ||
65 | "o To see available help for the item, press <F1>\n" | ||
66 | " Shortcut: Press <H> or <?>.\n" | ||
67 | "\n" | ||
68 | "\n" | ||
69 | "Data Entry\n" | ||
70 | "-----------\n" | ||
71 | "o Enter the requested information and press <ENTER>\n" | ||
72 | " If you are entering hexadecimal values, it is not necessary to\n" | ||
73 | " add the '0x' prefix to the entry.\n" | ||
74 | "\n" | ||
75 | "o For help, press <F1>.\n" | ||
76 | "\n" | ||
77 | "\n" | ||
78 | "Text Box (Help Window)\n" | ||
79 | "--------\n" | ||
80 | "o Use the cursor keys to scroll up/down/left/right. The VI editor\n" | ||
81 | " keys h,j,k,l function here as do <SPACE BAR> for those\n" | ||
82 | " who are familiar with less and lynx.\n" | ||
83 | "\n" | ||
84 | "o Press <Enter>, <F1>, <F5>, <F7> or <Esc> to exit.\n" | ||
85 | "\n" | ||
86 | "\n" | ||
87 | "Alternate Configuration Files\n" | ||
88 | "-----------------------------\n" | ||
89 | "nconfig supports the use of alternate configuration files for\n" | ||
90 | "those who, for various reasons, find it necessary to switch\n" | ||
91 | "between different kernel configurations.\n" | ||
92 | "\n" | ||
93 | "At the end of the main menu you will find two options. One is\n" | ||
94 | "for saving the current configuration to a file of your choosing.\n" | ||
95 | "The other option is for loading a previously saved alternate\n" | ||
96 | "configuration.\n" | ||
97 | "\n" | ||
98 | "Even if you don't use alternate configuration files, but you\n" | ||
99 | "find during a nconfig session that you have completely messed\n" | ||
100 | "up your settings, you may use the \"Load Alternate...\" option to\n" | ||
101 | "restore your previously saved settings from \".config\" without\n" | ||
102 | "restarting nconfig.\n" | ||
103 | "\n" | ||
104 | "Other information\n" | ||
105 | "-----------------\n" | ||
106 | "If you use nconfig in an XTERM window make sure you have your\n" | ||
107 | "$TERM variable set to point to a xterm definition which supports color.\n" | ||
108 | "Otherwise, nconfig will look rather bad. nconfig will not\n" | ||
109 | "display correctly in a RXVT window because rxvt displays only one\n" | ||
110 | "intensity of color, bright.\n" | ||
111 | "\n" | ||
112 | "nconfig will display larger menus on screens or xterms which are\n" | ||
113 | "set to display more than the standard 25 row by 80 column geometry.\n" | ||
114 | "In order for this to work, the \"stty size\" command must be able to\n" | ||
115 | "display the screen's current row and column geometry. I STRONGLY\n" | ||
116 | "RECOMMEND that you make sure you do NOT have the shell variables\n" | ||
117 | "LINES and COLUMNS exported into your environment. Some distributions\n" | ||
118 | "export those variables via /etc/profile. Some ncurses programs can\n" | ||
119 | "become confused when those variables (LINES & COLUMNS) don't reflect\n" | ||
120 | "the true screen size.\n" | ||
121 | "\n" | ||
122 | "Optional personality available\n" | ||
123 | "------------------------------\n" | ||
124 | "If you prefer to have all of the kernel options listed in a single\n" | ||
125 | "menu, rather than the default multimenu hierarchy, run the nconfig\n" | ||
126 | "with NCONFIG_MODE environment variable set to single_menu. Example:\n" | ||
127 | "\n" | ||
128 | "make NCONFIG_MODE=single_menu nconfig\n" | ||
129 | "\n" | ||
130 | "<Enter> will then unroll the appropriate category, or enfold it if it\n" | ||
131 | "is already unrolled.\n" | ||
132 | "\n" | ||
133 | "Note that this mode can eventually be a little more CPU expensive\n" | ||
134 | "(especially with a larger number of unrolled categories) than the\n" | ||
135 | "default mode.\n" | ||
136 | "\n"), | ||
137 | menu_no_f_instructions[] = N_( | ||
138 | " You do not have function keys support. Please follow the\n" | ||
139 | " following instructions:\n" | ||
140 | " Arrow keys navigate the menu.\n" | ||
141 | " <Enter> or <right-arrow> selects submenus --->.\n" | ||
142 | " Capital Letters are hotkeys.\n" | ||
143 | " Pressing <Y> includes, <N> excludes, <M> modularizes features.\n" | ||
144 | " Pressing SpaceBar toggles between the above options\n" | ||
145 | " Press <Esc> or <left-arrow> to go back one menu, \n" | ||
146 | " <?> or <h> for Help, </> for Search.\n" | ||
147 | " <1> is interchangable with <F1>, <2> with <F2>, etc.\n" | ||
148 | " Legend: [*] built-in [ ] excluded <M> module < > module capable.\n" | ||
149 | " <Esc> always leaves the current window\n"), | ||
150 | menu_instructions[] = N_( | ||
151 | " Arrow keys navigate the menu.\n" | ||
152 | " <Enter> or <right-arrow> selects submenus --->.\n" | ||
153 | " Capital Letters are hotkeys.\n" | ||
154 | " Pressing <Y> includes, <N> excludes, <M> modularizes features.\n" | ||
155 | " Pressing SpaceBar toggles between the above options\n" | ||
156 | " Press <Esc>, <F3> or <left-arrow> to go back one menu, \n" | ||
157 | " <?>, <F1> or <h> for Help, </> for Search.\n" | ||
158 | " <1> is interchangable with <F1>, <2> with <F2>, etc.\n" | ||
159 | " Legend: [*] built-in [ ] excluded <M> module < > module capable.\n" | ||
160 | " <Esc> always leaves the current window\n"), | ||
161 | radiolist_instructions[] = N_( | ||
162 | " Use the arrow keys to navigate this window or\n" | ||
163 | " press the hotkey of the item you wish to select\n" | ||
164 | " followed by the <SPACE BAR>.\n" | ||
165 | " Press <?>, <F1> or <h> for additional information about this option.\n"), | ||
166 | inputbox_instructions_int[] = N_( | ||
167 | "Please enter a decimal value.\n" | ||
168 | "Fractions will not be accepted.\n" | ||
169 | "Press <RETURN> to accept, <ESC> to cancel."), | ||
170 | inputbox_instructions_hex[] = N_( | ||
171 | "Please enter a hexadecimal value.\n" | ||
172 | "Press <RETURN> to accept, <ESC> to cancel."), | ||
173 | inputbox_instructions_string[] = N_( | ||
174 | "Please enter a string value.\n" | ||
175 | "Press <RETURN> to accept, <ESC> to cancel."), | ||
176 | setmod_text[] = N_( | ||
177 | "This feature depends on another which\n" | ||
178 | "has been configured as a module.\n" | ||
179 | "As a result, this feature will be built as a module."), | ||
180 | nohelp_text[] = N_( | ||
181 | "There is no help available for this kernel option.\n"), | ||
182 | load_config_text[] = N_( | ||
183 | "Enter the name of the configuration file you wish to load.\n" | ||
184 | "Accept the name shown to restore the configuration you\n" | ||
185 | "last retrieved. Leave blank to abort."), | ||
186 | load_config_help[] = N_( | ||
187 | "\n" | ||
188 | "For various reasons, one may wish to keep several different kernel\n" | ||
189 | "configurations available on a single machine.\n" | ||
190 | "\n" | ||
191 | "If you have saved a previous configuration in a file other than the\n" | ||
192 | "kernel's default, entering the name of the file here will allow you\n" | ||
193 | "to modify that configuration.\n" | ||
194 | "\n" | ||
195 | "If you are uncertain, then you have probably never used alternate\n" | ||
196 | "configuration files. You should therefor leave this blank to abort.\n"), | ||
197 | save_config_text[] = N_( | ||
198 | "Enter a filename to which this configuration should be saved\n" | ||
199 | "as an alternate. Leave blank to abort."), | ||
200 | save_config_help[] = N_( | ||
201 | "\n" | ||
202 | "For various reasons, one may wish to keep different kernel\n" | ||
203 | "configurations available on a single machine.\n" | ||
204 | "\n" | ||
205 | "Entering a file name here will allow you to later retrieve, modify\n" | ||
206 | "and use the current configuration as an alternate to whatever\n" | ||
207 | "configuration options you have selected at that time.\n" | ||
208 | "\n" | ||
209 | "If you are uncertain what all this means then you should probably\n" | ||
210 | "leave this blank.\n"), | ||
211 | search_help[] = N_( | ||
212 | "\n" | ||
213 | "Search for CONFIG_ symbols and display their relations.\n" | ||
214 | "Regular expressions are allowed.\n" | ||
215 | "Example: search for \"^FOO\"\n" | ||
216 | "Result:\n" | ||
217 | "-----------------------------------------------------------------\n" | ||
218 | "Symbol: FOO [ = m]\n" | ||
219 | "Prompt: Foo bus is used to drive the bar HW\n" | ||
220 | "Defined at drivers/pci/Kconfig:47\n" | ||
221 | "Depends on: X86_LOCAL_APIC && X86_IO_APIC || IA64\n" | ||
222 | "Location:\n" | ||
223 | " -> Bus options (PCI, PCMCIA, EISA, MCA, ISA)\n" | ||
224 | " -> PCI support (PCI [ = y])\n" | ||
225 | " -> PCI access mode (<choice> [ = y])\n" | ||
226 | "Selects: LIBCRC32\n" | ||
227 | "Selected by: BAR\n" | ||
228 | "-----------------------------------------------------------------\n" | ||
229 | "o The line 'Prompt:' shows the text used in the menu structure for\n" | ||
230 | " this CONFIG_ symbol\n" | ||
231 | "o The 'Defined at' line tell at what file / line number the symbol\n" | ||
232 | " is defined\n" | ||
233 | "o The 'Depends on:' line tell what symbols needs to be defined for\n" | ||
234 | " this symbol to be visible in the menu (selectable)\n" | ||
235 | "o The 'Location:' lines tell where in the menu structure this symbol\n" | ||
236 | " is located\n" | ||
237 | " A location followed by a [ = y] indicate that this is a selectable\n" | ||
238 | " menu item - and current value is displayed inside brackets.\n" | ||
239 | "o The 'Selects:' line tell what symbol will be automatically\n" | ||
240 | " selected if this symbol is selected (y or m)\n" | ||
241 | "o The 'Selected by' line tell what symbol has selected this symbol\n" | ||
242 | "\n" | ||
243 | "Only relevant lines are shown.\n" | ||
244 | "\n\n" | ||
245 | "Search examples:\n" | ||
246 | "Examples: USB = > find all CONFIG_ symbols containing USB\n" | ||
247 | " ^USB => find all CONFIG_ symbols starting with USB\n" | ||
248 | " USB$ => find all CONFIG_ symbols ending with USB\n" | ||
249 | "\n"); | ||
250 | |||
251 | struct mitem { | ||
252 | char str[256]; | ||
253 | char tag; | ||
254 | void *usrptr; | ||
255 | int is_hot; | ||
256 | int is_visible; | ||
257 | }; | ||
258 | |||
259 | #define MAX_MENU_ITEMS 4096 | ||
260 | static int show_all_items; | ||
261 | static int indent; | ||
262 | static struct menu *current_menu; | ||
263 | static int child_count; | ||
264 | static int single_menu_mode; | ||
265 | /* the window in which all information appears */ | ||
266 | static WINDOW *main_window; | ||
267 | /* the largest size of the menu window */ | ||
268 | static int mwin_max_lines; | ||
269 | static int mwin_max_cols; | ||
270 | /* the window in which we show option buttons */ | ||
271 | static MENU *curses_menu; | ||
272 | static ITEM *curses_menu_items[MAX_MENU_ITEMS]; | ||
273 | static struct mitem k_menu_items[MAX_MENU_ITEMS]; | ||
274 | static int items_num; | ||
275 | static int global_exit; | ||
276 | /* the currently selected button */ | ||
277 | const char *current_instructions = menu_instructions; | ||
278 | /* this array is used to implement hot keys. it is updated in item_make and | ||
279 | * resetted in clean_items. It would be better to use a hash, but lets keep it | ||
280 | * simple... */ | ||
281 | #define MAX_SAME_KEY MAX_MENU_ITEMS | ||
282 | struct { | ||
283 | int count; | ||
284 | int ptrs[MAX_MENU_ITEMS]; | ||
285 | } hotkeys[1<<(sizeof(char)*8)]; | ||
286 | |||
287 | static void conf(struct menu *menu); | ||
288 | static void conf_choice(struct menu *menu); | ||
289 | static void conf_string(struct menu *menu); | ||
290 | static void conf_load(void); | ||
291 | static void conf_save(void); | ||
292 | static void show_help(struct menu *menu); | ||
293 | static int do_exit(void); | ||
294 | static void setup_windows(void); | ||
295 | |||
296 | typedef void (*function_key_handler_t)(int *key, struct menu *menu); | ||
297 | static void handle_f1(int *key, struct menu *current_item); | ||
298 | static void handle_f2(int *key, struct menu *current_item); | ||
299 | static void handle_f3(int *key, struct menu *current_item); | ||
300 | static void handle_f4(int *key, struct menu *current_item); | ||
301 | static void handle_f5(int *key, struct menu *current_item); | ||
302 | static void handle_f6(int *key, struct menu *current_item); | ||
303 | static void handle_f7(int *key, struct menu *current_item); | ||
304 | static void handle_f8(int *key, struct menu *current_item); | ||
305 | |||
306 | struct function_keys { | ||
307 | const char *key_str; | ||
308 | const char *func; | ||
309 | function_key key; | ||
310 | function_key_handler_t handler; | ||
311 | }; | ||
312 | |||
313 | static const int function_keys_num = 8; | ||
314 | struct function_keys function_keys[] = { | ||
315 | { | ||
316 | .key_str = "F1", | ||
317 | .func = "Help", | ||
318 | .key = F_HELP, | ||
319 | .handler = handle_f1, | ||
320 | }, | ||
321 | { | ||
322 | .key_str = "F2", | ||
323 | .func = "Symbol Info", | ||
324 | .key = F_SYMBOL, | ||
325 | .handler = handle_f2, | ||
326 | }, | ||
327 | { | ||
328 | .key_str = "F3", | ||
329 | .func = "Instructions", | ||
330 | .key = F_INSTS, | ||
331 | .handler = handle_f3, | ||
332 | }, | ||
333 | { | ||
334 | .key_str = "F4", | ||
335 | .func = "Config", | ||
336 | .key = F_CONF, | ||
337 | .handler = handle_f4, | ||
338 | }, | ||
339 | { | ||
340 | .key_str = "F5", | ||
341 | .func = "Back", | ||
342 | .key = F_BACK, | ||
343 | .handler = handle_f5, | ||
344 | }, | ||
345 | { | ||
346 | .key_str = "F6", | ||
347 | .func = "Save", | ||
348 | .key = F_SAVE, | ||
349 | .handler = handle_f6, | ||
350 | }, | ||
351 | { | ||
352 | .key_str = "F7", | ||
353 | .func = "Load", | ||
354 | .key = F_LOAD, | ||
355 | .handler = handle_f7, | ||
356 | }, | ||
357 | { | ||
358 | .key_str = "F8", | ||
359 | .func = "Exit", | ||
360 | .key = F_EXIT, | ||
361 | .handler = handle_f8, | ||
362 | }, | ||
363 | }; | ||
364 | |||
365 | static void print_function_line(void) | ||
366 | { | ||
367 | int i; | ||
368 | int offset = 1; | ||
369 | const int skip = 1; | ||
370 | |||
371 | for (i = 0; i < function_keys_num; i++) { | ||
372 | wattrset(main_window, attributes[FUNCTION_HIGHLIGHT]); | ||
373 | mvwprintw(main_window, LINES-3, offset, | ||
374 | "%s", | ||
375 | function_keys[i].key_str); | ||
376 | wattrset(main_window, attributes[FUNCTION_TEXT]); | ||
377 | offset += strlen(function_keys[i].key_str); | ||
378 | mvwprintw(main_window, LINES-3, | ||
379 | offset, "%s", | ||
380 | function_keys[i].func); | ||
381 | offset += strlen(function_keys[i].func) + skip; | ||
382 | } | ||
383 | wattrset(main_window, attributes[NORMAL]); | ||
384 | } | ||
385 | |||
386 | /* help */ | ||
387 | static void handle_f1(int *key, struct menu *current_item) | ||
388 | { | ||
389 | show_scroll_win(main_window, | ||
390 | _("README"), _(nconf_readme)); | ||
391 | return; | ||
392 | } | ||
393 | |||
394 | /* symbole help */ | ||
395 | static void handle_f2(int *key, struct menu *current_item) | ||
396 | { | ||
397 | show_help(current_item); | ||
398 | return; | ||
399 | } | ||
400 | |||
401 | /* instructions */ | ||
402 | static void handle_f3(int *key, struct menu *current_item) | ||
403 | { | ||
404 | show_scroll_win(main_window, | ||
405 | _("Instructions"), | ||
406 | _(current_instructions)); | ||
407 | return; | ||
408 | } | ||
409 | |||
410 | /* config */ | ||
411 | static void handle_f4(int *key, struct menu *current_item) | ||
412 | { | ||
413 | int res = btn_dialog(main_window, | ||
414 | _("Show all symbols?"), | ||
415 | 2, | ||
416 | " <Show All> ", | ||
417 | "<Don't show all>"); | ||
418 | if (res == 0) | ||
419 | show_all_items = 1; | ||
420 | else if (res == 1) | ||
421 | show_all_items = 0; | ||
422 | |||
423 | return; | ||
424 | } | ||
425 | |||
426 | /* back */ | ||
427 | static void handle_f5(int *key, struct menu *current_item) | ||
428 | { | ||
429 | *key = KEY_LEFT; | ||
430 | return; | ||
431 | } | ||
432 | |||
433 | /* save */ | ||
434 | static void handle_f6(int *key, struct menu *current_item) | ||
435 | { | ||
436 | conf_save(); | ||
437 | return; | ||
438 | } | ||
439 | |||
440 | /* load */ | ||
441 | static void handle_f7(int *key, struct menu *current_item) | ||
442 | { | ||
443 | conf_load(); | ||
444 | return; | ||
445 | } | ||
446 | |||
447 | /* exit */ | ||
448 | static void handle_f8(int *key, struct menu *current_item) | ||
449 | { | ||
450 | do_exit(); | ||
451 | return; | ||
452 | } | ||
453 | |||
454 | /* return != 0 to indicate the key was handles */ | ||
455 | static int process_special_keys(int *key, struct menu *menu) | ||
456 | { | ||
457 | int i; | ||
458 | |||
459 | if (*key == KEY_RESIZE) { | ||
460 | setup_windows(); | ||
461 | return 1; | ||
462 | } | ||
463 | |||
464 | for (i = 0; i < function_keys_num; i++) { | ||
465 | if (*key == KEY_F(function_keys[i].key) || | ||
466 | *key == '0' + function_keys[i].key){ | ||
467 | function_keys[i].handler(key, menu); | ||
468 | return 1; | ||
469 | } | ||
470 | } | ||
471 | |||
472 | return 0; | ||
473 | } | ||
474 | |||
475 | static void clean_items(void) | ||
476 | { | ||
477 | int i; | ||
478 | for (i = 0; curses_menu_items[i]; i++) | ||
479 | free_item(curses_menu_items[i]); | ||
480 | bzero(curses_menu_items, sizeof(curses_menu_items)); | ||
481 | bzero(k_menu_items, sizeof(k_menu_items)); | ||
482 | bzero(hotkeys, sizeof(hotkeys)); | ||
483 | items_num = 0; | ||
484 | } | ||
485 | |||
486 | /* return the index of the next hot item, or -1 if no such item exists */ | ||
487 | static int get_next_hot(int c) | ||
488 | { | ||
489 | static int hot_index; | ||
490 | static int hot_char; | ||
491 | |||
492 | if (c < 0 || c > 255 || hotkeys[c].count <= 0) | ||
493 | return -1; | ||
494 | |||
495 | if (hot_char == c) { | ||
496 | hot_index = (hot_index+1)%hotkeys[c].count; | ||
497 | return hotkeys[c].ptrs[hot_index]; | ||
498 | } else { | ||
499 | hot_char = c; | ||
500 | hot_index = 0; | ||
501 | return hotkeys[c].ptrs[0]; | ||
502 | } | ||
503 | } | ||
504 | |||
505 | /* can the char c be a hot key? no, if c is a common shortcut used elsewhere */ | ||
506 | static int canbhot(char c) | ||
507 | { | ||
508 | c = tolower(c); | ||
509 | return isalnum(c) && c != 'y' && c != 'm' && c != 'h' && | ||
510 | c != 'n' && c != '?'; | ||
511 | } | ||
512 | |||
513 | /* check if str already contains a hot key. */ | ||
514 | static int is_hot(int index) | ||
515 | { | ||
516 | return k_menu_items[index].is_hot; | ||
517 | } | ||
518 | |||
519 | /* find the first possible hot key, and mark it. | ||
520 | * index is the index of the item in the menu | ||
521 | * return 0 on success*/ | ||
522 | static int make_hot(char *dest, int len, const char *org, int index) | ||
523 | { | ||
524 | int position = -1; | ||
525 | int i; | ||
526 | int tmp; | ||
527 | int c; | ||
528 | int org_len = strlen(org); | ||
529 | |||
530 | if (org == NULL || is_hot(index)) | ||
531 | return 1; | ||
532 | |||
533 | /* make sure not to make hot keys out of markers. | ||
534 | * find where to start looking for a hot key | ||
535 | */ | ||
536 | i = 0; | ||
537 | /* skip white space */ | ||
538 | while (i < org_len && org[i] == ' ') | ||
539 | i++; | ||
540 | if (i == org_len) | ||
541 | return -1; | ||
542 | /* if encountering '(' or '<' or '[', find the match and look from there | ||
543 | **/ | ||
544 | if (org[i] == '[' || org[i] == '<' || org[i] == '(') { | ||
545 | i++; | ||
546 | for (; i < org_len; i++) | ||
547 | if (org[i] == ']' || org[i] == '>' || org[i] == ')') | ||
548 | break; | ||
549 | } | ||
550 | if (i == org_len) | ||
551 | return -1; | ||
552 | for (; i < org_len; i++) { | ||
553 | if (canbhot(org[i]) && org[i-1] != '<' && org[i-1] != '(') { | ||
554 | position = i; | ||
555 | break; | ||
556 | } | ||
557 | } | ||
558 | if (position == -1) | ||
559 | return 1; | ||
560 | |||
561 | /* ok, char at org[position] should be a hot key to this item */ | ||
562 | c = tolower(org[position]); | ||
563 | tmp = hotkeys[c].count; | ||
564 | hotkeys[c].ptrs[tmp] = index; | ||
565 | hotkeys[c].count++; | ||
566 | /* | ||
567 | snprintf(dest, len, "%.*s(%c)%s", position, org, org[position], | ||
568 | &org[position+1]); | ||
569 | */ | ||
570 | /* make org[position] uppercase, and all leading letter small case */ | ||
571 | strncpy(dest, org, len); | ||
572 | for (i = 0; i < position; i++) | ||
573 | dest[i] = tolower(dest[i]); | ||
574 | dest[position] = toupper(dest[position]); | ||
575 | k_menu_items[index].is_hot = 1; | ||
576 | return 0; | ||
577 | } | ||
578 | |||
579 | /* Make a new item. Add a hotkey mark in the first possible letter. | ||
580 | * As ncurses does not allow any attributes inside menue item, we mark the | ||
581 | * hot key as the first capitalized letter in the string */ | ||
582 | static void item_make(struct menu *menu, char tag, const char *fmt, ...) | ||
583 | { | ||
584 | va_list ap; | ||
585 | char tmp_str[256]; | ||
586 | |||
587 | if (items_num > MAX_MENU_ITEMS-1) | ||
588 | return; | ||
589 | |||
590 | bzero(&k_menu_items[items_num], sizeof(k_menu_items[0])); | ||
591 | k_menu_items[items_num].tag = tag; | ||
592 | k_menu_items[items_num].usrptr = menu; | ||
593 | if (menu != NULL) | ||
594 | k_menu_items[items_num].is_visible = | ||
595 | menu_is_visible(menu); | ||
596 | else | ||
597 | k_menu_items[items_num].is_visible = 1; | ||
598 | |||
599 | va_start(ap, fmt); | ||
600 | vsnprintf(tmp_str, sizeof(tmp_str), fmt, ap); | ||
601 | if (!k_menu_items[items_num].is_visible) | ||
602 | memcpy(tmp_str, "XXX", 3); | ||
603 | va_end(ap); | ||
604 | if (make_hot( | ||
605 | k_menu_items[items_num].str, | ||
606 | sizeof(k_menu_items[items_num].str), tmp_str, items_num) != 0) | ||
607 | strncpy(k_menu_items[items_num].str, | ||
608 | tmp_str, | ||
609 | sizeof(k_menu_items[items_num].str)); | ||
610 | |||
611 | curses_menu_items[items_num] = new_item( | ||
612 | k_menu_items[items_num].str, | ||
613 | k_menu_items[items_num].str); | ||
614 | set_item_userptr(curses_menu_items[items_num], | ||
615 | &k_menu_items[items_num]); | ||
616 | /* | ||
617 | if (!k_menu_items[items_num].is_visible) | ||
618 | item_opts_off(curses_menu_items[items_num], O_SELECTABLE); | ||
619 | */ | ||
620 | |||
621 | items_num++; | ||
622 | curses_menu_items[items_num] = NULL; | ||
623 | } | ||
624 | |||
625 | /* very hackish. adds a string to the last item added */ | ||
626 | static void item_add_str(const char *fmt, ...) | ||
627 | { | ||
628 | va_list ap; | ||
629 | int index = items_num-1; | ||
630 | char new_str[256]; | ||
631 | char tmp_str[256]; | ||
632 | |||
633 | if (index < 0) | ||
634 | return; | ||
635 | |||
636 | va_start(ap, fmt); | ||
637 | vsnprintf(new_str, sizeof(new_str), fmt, ap); | ||
638 | va_end(ap); | ||
639 | snprintf(tmp_str, sizeof(tmp_str), "%s%s", | ||
640 | k_menu_items[index].str, new_str); | ||
641 | if (make_hot(k_menu_items[index].str, | ||
642 | sizeof(k_menu_items[index].str), tmp_str, index) != 0) | ||
643 | strncpy(k_menu_items[index].str, | ||
644 | tmp_str, | ||
645 | sizeof(k_menu_items[index].str)); | ||
646 | |||
647 | free_item(curses_menu_items[index]); | ||
648 | curses_menu_items[index] = new_item( | ||
649 | k_menu_items[index].str, | ||
650 | k_menu_items[index].str); | ||
651 | set_item_userptr(curses_menu_items[index], | ||
652 | &k_menu_items[index]); | ||
653 | } | ||
654 | |||
655 | /* get the tag of the currently selected item */ | ||
656 | static char item_tag(void) | ||
657 | { | ||
658 | ITEM *cur; | ||
659 | struct mitem *mcur; | ||
660 | |||
661 | cur = current_item(curses_menu); | ||
662 | if (cur == NULL) | ||
663 | return 0; | ||
664 | mcur = (struct mitem *) item_userptr(cur); | ||
665 | return mcur->tag; | ||
666 | } | ||
667 | |||
668 | static int curses_item_index(void) | ||
669 | { | ||
670 | return item_index(current_item(curses_menu)); | ||
671 | } | ||
672 | |||
673 | static void *item_data(void) | ||
674 | { | ||
675 | ITEM *cur; | ||
676 | struct mitem *mcur; | ||
677 | |||
678 | cur = current_item(curses_menu); | ||
679 | mcur = (struct mitem *) item_userptr(cur); | ||
680 | return mcur->usrptr; | ||
681 | |||
682 | } | ||
683 | |||
684 | static int item_is_tag(char tag) | ||
685 | { | ||
686 | return item_tag() == tag; | ||
687 | } | ||
688 | |||
689 | static char filename[PATH_MAX+1]; | ||
690 | static char menu_backtitle[PATH_MAX+128]; | ||
691 | static const char *set_config_filename(const char *config_filename) | ||
692 | { | ||
693 | int size; | ||
694 | struct symbol *sym; | ||
695 | |||
696 | sym = sym_lookup("KERNELVERSION", 0); | ||
697 | sym_calc_value(sym); | ||
698 | size = snprintf(menu_backtitle, sizeof(menu_backtitle), | ||
699 | _("%s - Linux Kernel v%s Configuration"), | ||
700 | config_filename, sym_get_string_value(sym)); | ||
701 | if (size >= sizeof(menu_backtitle)) | ||
702 | menu_backtitle[sizeof(menu_backtitle)-1] = '\0'; | ||
703 | |||
704 | size = snprintf(filename, sizeof(filename), "%s", config_filename); | ||
705 | if (size >= sizeof(filename)) | ||
706 | filename[sizeof(filename)-1] = '\0'; | ||
707 | return menu_backtitle; | ||
708 | } | ||
709 | |||
710 | /* command = 0 is supress, 1 is restore */ | ||
711 | static void supress_stdout(int command) | ||
712 | { | ||
713 | static FILE *org_stdout; | ||
714 | static FILE *org_stderr; | ||
715 | |||
716 | if (command == 0) { | ||
717 | org_stdout = stdout; | ||
718 | org_stderr = stderr; | ||
719 | stdout = fopen("/dev/null", "a"); | ||
720 | stderr = fopen("/dev/null", "a"); | ||
721 | } else { | ||
722 | fclose(stdout); | ||
723 | fclose(stderr); | ||
724 | stdout = org_stdout; | ||
725 | stderr = org_stderr; | ||
726 | } | ||
727 | } | ||
728 | |||
729 | /* return = 0 means we are successful. | ||
730 | * -1 means go on doing what you were doing | ||
731 | */ | ||
732 | static int do_exit(void) | ||
733 | { | ||
734 | int res; | ||
735 | if (!conf_get_changed()) { | ||
736 | global_exit = 1; | ||
737 | return 0; | ||
738 | } | ||
739 | res = btn_dialog(main_window, | ||
740 | _("Do you wish to save your " | ||
741 | "new kernel configuration?\n" | ||
742 | "<ESC> to cancel and resume nconfig."), | ||
743 | 2, | ||
744 | " <save> ", | ||
745 | "<don't save>"); | ||
746 | if (res == KEY_EXIT) { | ||
747 | global_exit = 0; | ||
748 | return -1; | ||
749 | } | ||
750 | |||
751 | /* if we got here, the user really wants to exit */ | ||
752 | switch (res) { | ||
753 | case 0: | ||
754 | supress_stdout(0); | ||
755 | res = conf_write(filename); | ||
756 | supress_stdout(1); | ||
757 | if (res) | ||
758 | btn_dialog( | ||
759 | main_window, | ||
760 | _("Error during writing of the kernel " | ||
761 | "configuration.\n" | ||
762 | "Your kernel configuration " | ||
763 | "changes were NOT saved."), | ||
764 | 1, | ||
765 | "<OK>"); | ||
766 | else { | ||
767 | char buf[1024]; | ||
768 | snprintf(buf, 1024, | ||
769 | _("Configuration written to %s\n" | ||
770 | "End of Linux kernel configuration.\n" | ||
771 | "Execute 'make' to build the kernel or try" | ||
772 | " 'make help'."), filename); | ||
773 | btn_dialog( | ||
774 | main_window, | ||
775 | buf, | ||
776 | 1, | ||
777 | "<OK>"); | ||
778 | } | ||
779 | break; | ||
780 | default: | ||
781 | btn_dialog( | ||
782 | main_window, | ||
783 | _("Your kernel configuration changes were NOT saved."), | ||
784 | 1, | ||
785 | "<OK>"); | ||
786 | break; | ||
787 | } | ||
788 | global_exit = 1; | ||
789 | return 0; | ||
790 | } | ||
791 | |||
792 | |||
793 | static void search_conf(void) | ||
794 | { | ||
795 | struct symbol **sym_arr; | ||
796 | struct gstr res; | ||
797 | char dialog_input_result[100]; | ||
798 | char *dialog_input; | ||
799 | int dres; | ||
800 | again: | ||
801 | dres = dialog_inputbox(main_window, | ||
802 | _("Search Configuration Parameter"), | ||
803 | _("Enter CONFIG_ (sub)string to search for " | ||
804 | "(with or without \"CONFIG\")"), | ||
805 | "", dialog_input_result, 99); | ||
806 | switch (dres) { | ||
807 | case 0: | ||
808 | break; | ||
809 | case 1: | ||
810 | show_scroll_win(main_window, | ||
811 | _("Search Configuration"), search_help); | ||
812 | goto again; | ||
813 | default: | ||
814 | return; | ||
815 | } | ||
816 | |||
817 | /* strip CONFIG_ if necessary */ | ||
818 | dialog_input = dialog_input_result; | ||
819 | if (strncasecmp(dialog_input_result, "CONFIG_", 7) == 0) | ||
820 | dialog_input += 7; | ||
821 | |||
822 | sym_arr = sym_re_search(dialog_input); | ||
823 | res = get_relations_str(sym_arr); | ||
824 | free(sym_arr); | ||
825 | show_scroll_win(main_window, | ||
826 | _("Search Results"), str_get(&res)); | ||
827 | str_free(&res); | ||
828 | } | ||
829 | |||
830 | |||
831 | static void build_conf(struct menu *menu) | ||
832 | { | ||
833 | struct symbol *sym; | ||
834 | struct property *prop; | ||
835 | struct menu *child; | ||
836 | int type, tmp, doint = 2; | ||
837 | tristate val; | ||
838 | char ch; | ||
839 | |||
840 | if (!menu || (!show_all_items && !menu_is_visible(menu))) | ||
841 | return; | ||
842 | |||
843 | sym = menu->sym; | ||
844 | prop = menu->prompt; | ||
845 | if (!sym) { | ||
846 | if (prop && menu != current_menu) { | ||
847 | const char *prompt = menu_get_prompt(menu); | ||
848 | enum prop_type ptype; | ||
849 | ptype = menu->prompt ? menu->prompt->type : P_UNKNOWN; | ||
850 | switch (ptype) { | ||
851 | case P_MENU: | ||
852 | child_count++; | ||
853 | prompt = _(prompt); | ||
854 | if (single_menu_mode) { | ||
855 | item_make(menu, 'm', | ||
856 | "%s%*c%s", | ||
857 | menu->data ? "-->" : "++>", | ||
858 | indent + 1, ' ', prompt); | ||
859 | } else | ||
860 | item_make(menu, 'm', | ||
861 | " %*c%s --->", | ||
862 | indent + 1, | ||
863 | ' ', prompt); | ||
864 | |||
865 | if (single_menu_mode && menu->data) | ||
866 | goto conf_childs; | ||
867 | return; | ||
868 | case P_COMMENT: | ||
869 | if (prompt) { | ||
870 | child_count++; | ||
871 | item_make(menu, ':', | ||
872 | " %*c*** %s ***", | ||
873 | indent + 1, ' ', | ||
874 | _(prompt)); | ||
875 | } | ||
876 | break; | ||
877 | default: | ||
878 | if (prompt) { | ||
879 | child_count++; | ||
880 | item_make(menu, ':', "---%*c%s", | ||
881 | indent + 1, ' ', | ||
882 | _(prompt)); | ||
883 | } | ||
884 | } | ||
885 | } else | ||
886 | doint = 0; | ||
887 | goto conf_childs; | ||
888 | } | ||
889 | |||
890 | type = sym_get_type(sym); | ||
891 | if (sym_is_choice(sym)) { | ||
892 | struct symbol *def_sym = sym_get_choice_value(sym); | ||
893 | struct menu *def_menu = NULL; | ||
894 | |||
895 | child_count++; | ||
896 | for (child = menu->list; child; child = child->next) { | ||
897 | if (menu_is_visible(child) && child->sym == def_sym) | ||
898 | def_menu = child; | ||
899 | } | ||
900 | |||
901 | val = sym_get_tristate_value(sym); | ||
902 | if (sym_is_changable(sym)) { | ||
903 | switch (type) { | ||
904 | case S_BOOLEAN: | ||
905 | item_make(menu, 't', "[%c]", | ||
906 | val == no ? ' ' : '*'); | ||
907 | break; | ||
908 | case S_TRISTATE: | ||
909 | switch (val) { | ||
910 | case yes: | ||
911 | ch = '*'; | ||
912 | break; | ||
913 | case mod: | ||
914 | ch = 'M'; | ||
915 | break; | ||
916 | default: | ||
917 | ch = ' '; | ||
918 | break; | ||
919 | } | ||
920 | item_make(menu, 't', "<%c>", ch); | ||
921 | break; | ||
922 | } | ||
923 | } else { | ||
924 | item_make(menu, def_menu ? 't' : ':', " "); | ||
925 | } | ||
926 | |||
927 | item_add_str("%*c%s", indent + 1, | ||
928 | ' ', _(menu_get_prompt(menu))); | ||
929 | if (val == yes) { | ||
930 | if (def_menu) { | ||
931 | item_add_str(" (%s)", | ||
932 | _(menu_get_prompt(def_menu))); | ||
933 | item_add_str(" --->"); | ||
934 | if (def_menu->list) { | ||
935 | indent += 2; | ||
936 | build_conf(def_menu); | ||
937 | indent -= 2; | ||
938 | } | ||
939 | } | ||
940 | return; | ||
941 | } | ||
942 | } else { | ||
943 | if (menu == current_menu) { | ||
944 | item_make(menu, ':', | ||
945 | "---%*c%s", indent + 1, | ||
946 | ' ', _(menu_get_prompt(menu))); | ||
947 | goto conf_childs; | ||
948 | } | ||
949 | child_count++; | ||
950 | val = sym_get_tristate_value(sym); | ||
951 | if (sym_is_choice_value(sym) && val == yes) { | ||
952 | item_make(menu, ':', " "); | ||
953 | } else { | ||
954 | switch (type) { | ||
955 | case S_BOOLEAN: | ||
956 | if (sym_is_changable(sym)) | ||
957 | item_make(menu, 't', "[%c]", | ||
958 | val == no ? ' ' : '*'); | ||
959 | else | ||
960 | item_make(menu, 't', "-%c-", | ||
961 | val == no ? ' ' : '*'); | ||
962 | break; | ||
963 | case S_TRISTATE: | ||
964 | switch (val) { | ||
965 | case yes: | ||
966 | ch = '*'; | ||
967 | break; | ||
968 | case mod: | ||
969 | ch = 'M'; | ||
970 | break; | ||
971 | default: | ||
972 | ch = ' '; | ||
973 | break; | ||
974 | } | ||
975 | if (sym_is_changable(sym)) { | ||
976 | if (sym->rev_dep.tri == mod) | ||
977 | item_make(menu, | ||
978 | 't', "{%c}", ch); | ||
979 | else | ||
980 | item_make(menu, | ||
981 | 't', "<%c>", ch); | ||
982 | } else | ||
983 | item_make(menu, 't', "-%c-", ch); | ||
984 | break; | ||
985 | default: | ||
986 | tmp = 2 + strlen(sym_get_string_value(sym)); | ||
987 | item_make(menu, 's', " (%s)", | ||
988 | sym_get_string_value(sym)); | ||
989 | tmp = indent - tmp + 4; | ||
990 | if (tmp < 0) | ||
991 | tmp = 0; | ||
992 | item_add_str("%*c%s%s", tmp, ' ', | ||
993 | _(menu_get_prompt(menu)), | ||
994 | (sym_has_value(sym) || | ||
995 | !sym_is_changable(sym)) ? "" : | ||
996 | _(" (NEW)")); | ||
997 | goto conf_childs; | ||
998 | } | ||
999 | } | ||
1000 | item_add_str("%*c%s%s", indent + 1, ' ', | ||
1001 | _(menu_get_prompt(menu)), | ||
1002 | (sym_has_value(sym) || !sym_is_changable(sym)) ? | ||
1003 | "" : _(" (NEW)")); | ||
1004 | if (menu->prompt && menu->prompt->type == P_MENU) { | ||
1005 | item_add_str(" --->"); | ||
1006 | return; | ||
1007 | } | ||
1008 | } | ||
1009 | |||
1010 | conf_childs: | ||
1011 | indent += doint; | ||
1012 | for (child = menu->list; child; child = child->next) | ||
1013 | build_conf(child); | ||
1014 | indent -= doint; | ||
1015 | } | ||
1016 | |||
1017 | static void reset_menu(void) | ||
1018 | { | ||
1019 | unpost_menu(curses_menu); | ||
1020 | clean_items(); | ||
1021 | } | ||
1022 | |||
1023 | /* adjust the menu to show this item. | ||
1024 | * prefer not to scroll the menu if possible*/ | ||
1025 | static void center_item(int selected_index, int *last_top_row) | ||
1026 | { | ||
1027 | int toprow; | ||
1028 | int maxy, maxx; | ||
1029 | |||
1030 | scale_menu(curses_menu, &maxy, &maxx); | ||
1031 | set_top_row(curses_menu, *last_top_row); | ||
1032 | toprow = top_row(curses_menu); | ||
1033 | if (selected_index >= toprow && selected_index < toprow+maxy) { | ||
1034 | /* we can only move the selected item. no need to scroll */ | ||
1035 | set_current_item(curses_menu, | ||
1036 | curses_menu_items[selected_index]); | ||
1037 | } else { | ||
1038 | toprow = max(selected_index-maxy/2, 0); | ||
1039 | if (toprow >= item_count(curses_menu)-maxy) | ||
1040 | toprow = item_count(curses_menu)-mwin_max_lines; | ||
1041 | set_top_row(curses_menu, toprow); | ||
1042 | set_current_item(curses_menu, | ||
1043 | curses_menu_items[selected_index]); | ||
1044 | } | ||
1045 | *last_top_row = toprow; | ||
1046 | post_menu(curses_menu); | ||
1047 | refresh_all_windows(main_window); | ||
1048 | } | ||
1049 | |||
1050 | /* this function assumes reset_menu has been called before */ | ||
1051 | static void show_menu(const char *prompt, const char *instructions, | ||
1052 | int selected_index, int *last_top_row) | ||
1053 | { | ||
1054 | int maxx, maxy; | ||
1055 | WINDOW *menu_window; | ||
1056 | |||
1057 | current_instructions = instructions; | ||
1058 | |||
1059 | clear(); | ||
1060 | wattrset(main_window, attributes[NORMAL]); | ||
1061 | print_in_middle(stdscr, 1, 0, COLS, | ||
1062 | menu_backtitle, | ||
1063 | attributes[MAIN_HEADING]); | ||
1064 | |||
1065 | wattrset(main_window, attributes[MAIN_MENU_BOX]); | ||
1066 | box(main_window, 0, 0); | ||
1067 | wattrset(main_window, attributes[MAIN_MENU_HEADING]); | ||
1068 | mvwprintw(main_window, 0, 3, " %s ", prompt); | ||
1069 | wattrset(main_window, attributes[NORMAL]); | ||
1070 | |||
1071 | set_menu_items(curses_menu, curses_menu_items); | ||
1072 | |||
1073 | /* position the menu at the middle of the screen */ | ||
1074 | scale_menu(curses_menu, &maxy, &maxx); | ||
1075 | maxx = min(maxx, mwin_max_cols-2); | ||
1076 | maxy = mwin_max_lines-2; | ||
1077 | menu_window = derwin(main_window, | ||
1078 | maxy, | ||
1079 | maxx, | ||
1080 | 2, | ||
1081 | (mwin_max_cols-maxx)/2); | ||
1082 | keypad(menu_window, TRUE); | ||
1083 | set_menu_win(curses_menu, menu_window); | ||
1084 | set_menu_sub(curses_menu, menu_window); | ||
1085 | |||
1086 | /* must reassert this after changing items, otherwise returns to a | ||
1087 | * default of 16 | ||
1088 | */ | ||
1089 | set_menu_format(curses_menu, maxy, 1); | ||
1090 | center_item(selected_index, last_top_row); | ||
1091 | set_menu_format(curses_menu, maxy, 1); | ||
1092 | |||
1093 | print_function_line(); | ||
1094 | |||
1095 | /* Post the menu */ | ||
1096 | post_menu(curses_menu); | ||
1097 | refresh_all_windows(main_window); | ||
1098 | } | ||
1099 | |||
1100 | |||
1101 | static void conf(struct menu *menu) | ||
1102 | { | ||
1103 | char pattern[256]; | ||
1104 | struct menu *submenu = 0; | ||
1105 | const char *prompt = menu_get_prompt(menu); | ||
1106 | struct symbol *sym; | ||
1107 | struct menu *active_menu = NULL; | ||
1108 | int res; | ||
1109 | int current_index = 0; | ||
1110 | int last_top_row = 0; | ||
1111 | |||
1112 | bzero(pattern, sizeof(pattern)); | ||
1113 | |||
1114 | while (!global_exit) { | ||
1115 | reset_menu(); | ||
1116 | current_menu = menu; | ||
1117 | build_conf(menu); | ||
1118 | if (!child_count) | ||
1119 | break; | ||
1120 | |||
1121 | show_menu(prompt ? _(prompt) : _("Main Menu"), | ||
1122 | _(menu_instructions), | ||
1123 | current_index, &last_top_row); | ||
1124 | keypad((menu_win(curses_menu)), TRUE); | ||
1125 | while (!global_exit && (res = wgetch(menu_win(curses_menu)))) { | ||
1126 | if (process_special_keys(&res, | ||
1127 | (struct menu *) item_data())) | ||
1128 | break; | ||
1129 | switch (res) { | ||
1130 | case KEY_DOWN: | ||
1131 | menu_driver(curses_menu, REQ_DOWN_ITEM); | ||
1132 | break; | ||
1133 | case KEY_UP: | ||
1134 | menu_driver(curses_menu, REQ_UP_ITEM); | ||
1135 | break; | ||
1136 | case KEY_NPAGE: | ||
1137 | menu_driver(curses_menu, REQ_SCR_DPAGE); | ||
1138 | break; | ||
1139 | case KEY_PPAGE: | ||
1140 | menu_driver(curses_menu, REQ_SCR_UPAGE); | ||
1141 | break; | ||
1142 | case KEY_HOME: | ||
1143 | menu_driver(curses_menu, REQ_FIRST_ITEM); | ||
1144 | break; | ||
1145 | case KEY_END: | ||
1146 | menu_driver(curses_menu, REQ_LAST_ITEM); | ||
1147 | break; | ||
1148 | case 'h': | ||
1149 | case '?': | ||
1150 | show_help((struct menu *) item_data()); | ||
1151 | break; | ||
1152 | } | ||
1153 | if (res == 10 || res == 27 || | ||
1154 | res == 32 || res == 'n' || res == 'y' || | ||
1155 | res == KEY_LEFT || res == KEY_RIGHT || | ||
1156 | res == 'm' || res == '/') | ||
1157 | break; | ||
1158 | else if (canbhot(res)) { | ||
1159 | /* check for hot keys: */ | ||
1160 | int tmp = get_next_hot(res); | ||
1161 | if (tmp != -1) | ||
1162 | center_item(tmp, &last_top_row); | ||
1163 | } | ||
1164 | refresh_all_windows(main_window); | ||
1165 | } | ||
1166 | |||
1167 | refresh_all_windows(main_window); | ||
1168 | /* if ESC or left*/ | ||
1169 | if (res == 27 || (menu != &rootmenu && res == KEY_LEFT)) | ||
1170 | break; | ||
1171 | |||
1172 | /* remember location in the menu */ | ||
1173 | last_top_row = top_row(curses_menu); | ||
1174 | current_index = curses_item_index(); | ||
1175 | |||
1176 | if (!item_tag()) | ||
1177 | continue; | ||
1178 | |||
1179 | submenu = (struct menu *) item_data(); | ||
1180 | active_menu = (struct menu *)item_data(); | ||
1181 | if (!submenu || !menu_is_visible(submenu)) | ||
1182 | continue; | ||
1183 | if (submenu) | ||
1184 | sym = submenu->sym; | ||
1185 | else | ||
1186 | sym = NULL; | ||
1187 | |||
1188 | switch (res) { | ||
1189 | case ' ': | ||
1190 | if (item_is_tag('t')) | ||
1191 | sym_toggle_tristate_value(sym); | ||
1192 | else if (item_is_tag('m')) | ||
1193 | conf(submenu); | ||
1194 | break; | ||
1195 | case KEY_RIGHT: | ||
1196 | case 10: /* ENTER WAS PRESSED */ | ||
1197 | switch (item_tag()) { | ||
1198 | case 'm': | ||
1199 | if (single_menu_mode) | ||
1200 | submenu->data = | ||
1201 | (void *) (long) !submenu->data; | ||
1202 | else | ||
1203 | conf(submenu); | ||
1204 | break; | ||
1205 | case 't': | ||
1206 | if (sym_is_choice(sym) && | ||
1207 | sym_get_tristate_value(sym) == yes) | ||
1208 | conf_choice(submenu); | ||
1209 | else if (submenu->prompt && | ||
1210 | submenu->prompt->type == P_MENU) | ||
1211 | conf(submenu); | ||
1212 | else if (res == 10) | ||
1213 | sym_toggle_tristate_value(sym); | ||
1214 | break; | ||
1215 | case 's': | ||
1216 | conf_string(submenu); | ||
1217 | break; | ||
1218 | } | ||
1219 | break; | ||
1220 | case 'y': | ||
1221 | if (item_is_tag('t')) { | ||
1222 | if (sym_set_tristate_value(sym, yes)) | ||
1223 | break; | ||
1224 | if (sym_set_tristate_value(sym, mod)) | ||
1225 | btn_dialog(main_window, setmod_text, 0); | ||
1226 | } | ||
1227 | break; | ||
1228 | case 'n': | ||
1229 | if (item_is_tag('t')) | ||
1230 | sym_set_tristate_value(sym, no); | ||
1231 | break; | ||
1232 | case 'm': | ||
1233 | if (item_is_tag('t')) | ||
1234 | sym_set_tristate_value(sym, mod); | ||
1235 | break; | ||
1236 | case '/': | ||
1237 | search_conf(); | ||
1238 | break; | ||
1239 | } | ||
1240 | } | ||
1241 | } | ||
1242 | |||
1243 | static void show_help(struct menu *menu) | ||
1244 | { | ||
1245 | struct gstr help = str_new(); | ||
1246 | |||
1247 | if (menu && menu->sym && menu_has_help(menu)) { | ||
1248 | if (menu->sym->name) { | ||
1249 | str_printf(&help, "CONFIG_%s:\n\n", menu->sym->name); | ||
1250 | str_append(&help, _(menu_get_help(menu))); | ||
1251 | str_append(&help, "\n"); | ||
1252 | get_symbol_str(&help, menu->sym); | ||
1253 | } | ||
1254 | } else { | ||
1255 | str_append(&help, nohelp_text); | ||
1256 | } | ||
1257 | show_scroll_win(main_window, _(menu_get_prompt(menu)), str_get(&help)); | ||
1258 | str_free(&help); | ||
1259 | } | ||
1260 | |||
1261 | static void conf_choice(struct menu *menu) | ||
1262 | { | ||
1263 | const char *prompt = _(menu_get_prompt(menu)); | ||
1264 | struct menu *child = 0; | ||
1265 | struct symbol *active; | ||
1266 | int selected_index = 0; | ||
1267 | int last_top_row = 0; | ||
1268 | int res, i = 0; | ||
1269 | |||
1270 | active = sym_get_choice_value(menu->sym); | ||
1271 | /* this is mostly duplicated from the conf() function. */ | ||
1272 | while (!global_exit) { | ||
1273 | reset_menu(); | ||
1274 | |||
1275 | for (i = 0, child = menu->list; child; child = child->next) { | ||
1276 | if (!show_all_items && !menu_is_visible(child)) | ||
1277 | continue; | ||
1278 | |||
1279 | if (child->sym == sym_get_choice_value(menu->sym)) | ||
1280 | item_make(child, ':', "<X> %s", | ||
1281 | _(menu_get_prompt(child))); | ||
1282 | else | ||
1283 | item_make(child, ':', " %s", | ||
1284 | _(menu_get_prompt(child))); | ||
1285 | if (child->sym == active){ | ||
1286 | last_top_row = top_row(curses_menu); | ||
1287 | selected_index = i; | ||
1288 | } | ||
1289 | i++; | ||
1290 | } | ||
1291 | show_menu(prompt ? _(prompt) : _("Choice Menu"), | ||
1292 | _(radiolist_instructions), | ||
1293 | selected_index, | ||
1294 | &last_top_row); | ||
1295 | while (!global_exit && (res = wgetch(menu_win(curses_menu)))) { | ||
1296 | if (process_special_keys( | ||
1297 | &res, | ||
1298 | (struct menu *) item_data())) | ||
1299 | break; | ||
1300 | switch (res) { | ||
1301 | case KEY_DOWN: | ||
1302 | menu_driver(curses_menu, REQ_DOWN_ITEM); | ||
1303 | break; | ||
1304 | case KEY_UP: | ||
1305 | menu_driver(curses_menu, REQ_UP_ITEM); | ||
1306 | break; | ||
1307 | case KEY_NPAGE: | ||
1308 | menu_driver(curses_menu, REQ_SCR_DPAGE); | ||
1309 | break; | ||
1310 | case KEY_PPAGE: | ||
1311 | menu_driver(curses_menu, REQ_SCR_UPAGE); | ||
1312 | break; | ||
1313 | case KEY_HOME: | ||
1314 | menu_driver(curses_menu, REQ_FIRST_ITEM); | ||
1315 | break; | ||
1316 | case KEY_END: | ||
1317 | menu_driver(curses_menu, REQ_LAST_ITEM); | ||
1318 | break; | ||
1319 | case 'h': | ||
1320 | case '?': | ||
1321 | show_help((struct menu *) item_data()); | ||
1322 | break; | ||
1323 | } | ||
1324 | if (res == 10 || res == 27 || res == ' ' || | ||
1325 | res == KEY_LEFT) | ||
1326 | break; | ||
1327 | else if (canbhot(res)) { | ||
1328 | /* check for hot keys: */ | ||
1329 | int tmp = get_next_hot(res); | ||
1330 | if (tmp != -1) | ||
1331 | center_item(tmp, &last_top_row); | ||
1332 | } | ||
1333 | refresh_all_windows(main_window); | ||
1334 | } | ||
1335 | /* if ESC or left */ | ||
1336 | if (res == 27 || res == KEY_LEFT) | ||
1337 | break; | ||
1338 | |||
1339 | child = item_data(); | ||
1340 | if (!child || !menu_is_visible(child)) | ||
1341 | continue; | ||
1342 | switch (res) { | ||
1343 | case ' ': | ||
1344 | case 10: | ||
1345 | case KEY_RIGHT: | ||
1346 | sym_set_tristate_value(child->sym, yes); | ||
1347 | return; | ||
1348 | case 'h': | ||
1349 | case '?': | ||
1350 | show_help(child); | ||
1351 | active = child->sym; | ||
1352 | break; | ||
1353 | case KEY_EXIT: | ||
1354 | return; | ||
1355 | } | ||
1356 | } | ||
1357 | } | ||
1358 | |||
1359 | static void conf_string(struct menu *menu) | ||
1360 | { | ||
1361 | const char *prompt = menu_get_prompt(menu); | ||
1362 | char dialog_input_result[256]; | ||
1363 | |||
1364 | while (1) { | ||
1365 | int res; | ||
1366 | const char *heading; | ||
1367 | |||
1368 | switch (sym_get_type(menu->sym)) { | ||
1369 | case S_INT: | ||
1370 | heading = _(inputbox_instructions_int); | ||
1371 | break; | ||
1372 | case S_HEX: | ||
1373 | heading = _(inputbox_instructions_hex); | ||
1374 | break; | ||
1375 | case S_STRING: | ||
1376 | heading = _(inputbox_instructions_string); | ||
1377 | break; | ||
1378 | default: | ||
1379 | heading = _("Internal nconf error!"); | ||
1380 | } | ||
1381 | res = dialog_inputbox(main_window, | ||
1382 | prompt ? _(prompt) : _("Main Menu"), | ||
1383 | heading, | ||
1384 | sym_get_string_value(menu->sym), | ||
1385 | dialog_input_result, | ||
1386 | sizeof(dialog_input_result)); | ||
1387 | switch (res) { | ||
1388 | case 0: | ||
1389 | if (sym_set_string_value(menu->sym, | ||
1390 | dialog_input_result)) | ||
1391 | return; | ||
1392 | btn_dialog(main_window, | ||
1393 | _("You have made an invalid entry."), 0); | ||
1394 | break; | ||
1395 | case 1: | ||
1396 | show_help(menu); | ||
1397 | break; | ||
1398 | case KEY_EXIT: | ||
1399 | return; | ||
1400 | } | ||
1401 | } | ||
1402 | } | ||
1403 | |||
1404 | static void conf_load(void) | ||
1405 | { | ||
1406 | char dialog_input_result[256]; | ||
1407 | while (1) { | ||
1408 | int res; | ||
1409 | res = dialog_inputbox(main_window, | ||
1410 | NULL, load_config_text, | ||
1411 | filename, | ||
1412 | dialog_input_result, | ||
1413 | sizeof(dialog_input_result)); | ||
1414 | switch (res) { | ||
1415 | case 0: | ||
1416 | if (!dialog_input_result[0]) | ||
1417 | return; | ||
1418 | if (!conf_read(dialog_input_result)) { | ||
1419 | set_config_filename(dialog_input_result); | ||
1420 | sym_set_change_count(1); | ||
1421 | return; | ||
1422 | } | ||
1423 | btn_dialog(main_window, _("File does not exist!"), 0); | ||
1424 | break; | ||
1425 | case 1: | ||
1426 | show_scroll_win(main_window, | ||
1427 | _("Load Alternate Configuration"), | ||
1428 | load_config_help); | ||
1429 | break; | ||
1430 | case KEY_EXIT: | ||
1431 | return; | ||
1432 | } | ||
1433 | } | ||
1434 | } | ||
1435 | |||
1436 | static void conf_save(void) | ||
1437 | { | ||
1438 | char dialog_input_result[256]; | ||
1439 | while (1) { | ||
1440 | int res; | ||
1441 | res = dialog_inputbox(main_window, | ||
1442 | NULL, save_config_text, | ||
1443 | filename, | ||
1444 | dialog_input_result, | ||
1445 | sizeof(dialog_input_result)); | ||
1446 | switch (res) { | ||
1447 | case 0: | ||
1448 | if (!dialog_input_result[0]) | ||
1449 | return; | ||
1450 | supress_stdout(0); | ||
1451 | res = conf_write(dialog_input_result); | ||
1452 | supress_stdout(1); | ||
1453 | if (!res) { | ||
1454 | char buf[1024]; | ||
1455 | sprintf(buf, "%s %s", | ||
1456 | _("configuration file saved to: "), | ||
1457 | dialog_input_result); | ||
1458 | btn_dialog(main_window, | ||
1459 | buf, 1, "<OK>"); | ||
1460 | set_config_filename(dialog_input_result); | ||
1461 | return; | ||
1462 | } | ||
1463 | btn_dialog(main_window, _("Can't create file! " | ||
1464 | "Probably a nonexistent directory."), | ||
1465 | 1, "<OK>"); | ||
1466 | break; | ||
1467 | case 1: | ||
1468 | show_scroll_win(main_window, | ||
1469 | _("Save Alternate Configuration"), | ||
1470 | save_config_help); | ||
1471 | break; | ||
1472 | case KEY_EXIT: | ||
1473 | return; | ||
1474 | } | ||
1475 | } | ||
1476 | } | ||
1477 | |||
1478 | void setup_windows(void) | ||
1479 | { | ||
1480 | if (main_window != NULL) | ||
1481 | delwin(main_window); | ||
1482 | |||
1483 | /* set up the menu and menu window */ | ||
1484 | main_window = newwin(LINES-2, COLS-2, 2, 1); | ||
1485 | keypad(main_window, TRUE); | ||
1486 | mwin_max_lines = LINES-6; | ||
1487 | mwin_max_cols = COLS-6; | ||
1488 | |||
1489 | /* panels order is from bottom to top */ | ||
1490 | new_panel(main_window); | ||
1491 | } | ||
1492 | |||
1493 | int main(int ac, char **av) | ||
1494 | { | ||
1495 | char *mode; | ||
1496 | |||
1497 | setlocale(LC_ALL, ""); | ||
1498 | bindtextdomain(PACKAGE, LOCALEDIR); | ||
1499 | textdomain(PACKAGE); | ||
1500 | |||
1501 | conf_parse(av[1]); | ||
1502 | conf_read(NULL); | ||
1503 | |||
1504 | mode = getenv("NCONFIG_MODE"); | ||
1505 | if (mode) { | ||
1506 | if (!strcasecmp(mode, "single_menu")) | ||
1507 | single_menu_mode = 1; | ||
1508 | } | ||
1509 | |||
1510 | /* Initialize curses */ | ||
1511 | initscr(); | ||
1512 | /* set color theme */ | ||
1513 | set_colors(); | ||
1514 | |||
1515 | cbreak(); | ||
1516 | noecho(); | ||
1517 | keypad(stdscr, TRUE); | ||
1518 | curs_set(0); | ||
1519 | |||
1520 | if (COLS < 75 || LINES < 20) { | ||
1521 | endwin(); | ||
1522 | printf("Your terminal should have at " | ||
1523 | "least 20 lines and 75 columns\n"); | ||
1524 | return 1; | ||
1525 | } | ||
1526 | |||
1527 | notimeout(stdscr, FALSE); | ||
1528 | ESCDELAY = 1; | ||
1529 | |||
1530 | /* set btns menu */ | ||
1531 | curses_menu = new_menu(curses_menu_items); | ||
1532 | menu_opts_off(curses_menu, O_SHOWDESC); | ||
1533 | menu_opts_off(curses_menu, O_SHOWMATCH); | ||
1534 | menu_opts_on(curses_menu, O_ONEVALUE); | ||
1535 | menu_opts_on(curses_menu, O_NONCYCLIC); | ||
1536 | set_menu_mark(curses_menu, " "); | ||
1537 | set_menu_fore(curses_menu, attributes[MAIN_MENU_FORE]); | ||
1538 | set_menu_back(curses_menu, attributes[MAIN_MENU_BACK]); | ||
1539 | set_menu_grey(curses_menu, attributes[MAIN_MENU_GREY]); | ||
1540 | |||
1541 | set_config_filename(conf_get_configname()); | ||
1542 | setup_windows(); | ||
1543 | |||
1544 | /* check for KEY_FUNC(1) */ | ||
1545 | if (has_key(KEY_F(1)) == FALSE) { | ||
1546 | show_scroll_win(main_window, | ||
1547 | _("Instructions"), | ||
1548 | _(menu_no_f_instructions)); | ||
1549 | } | ||
1550 | |||
1551 | |||
1552 | |||
1553 | /* do the work */ | ||
1554 | while (!global_exit) { | ||
1555 | conf(&rootmenu); | ||
1556 | if (!global_exit && do_exit() == 0) | ||
1557 | break; | ||
1558 | } | ||
1559 | /* ok, we are done */ | ||
1560 | unpost_menu(curses_menu); | ||
1561 | free_menu(curses_menu); | ||
1562 | delwin(main_window); | ||
1563 | clear(); | ||
1564 | refresh(); | ||
1565 | endwin(); | ||
1566 | return 0; | ||
1567 | } | ||
1568 | |||
diff --git a/scripts/kconfig/nconf.gui.c b/scripts/kconfig/nconf.gui.c new file mode 100644 index 00000000000..115edb437fb --- /dev/null +++ b/scripts/kconfig/nconf.gui.c | |||
@@ -0,0 +1,617 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2008 Nir Tzachar <nir.tzachar@gmail.com? | ||
3 | * Released under the terms of the GNU GPL v2.0. | ||
4 | * | ||
5 | * Derived from menuconfig. | ||
6 | * | ||
7 | */ | ||
8 | #include "nconf.h" | ||
9 | |||
10 | /* a list of all the different widgets we use */ | ||
11 | attributes_t attributes[ATTR_MAX+1] = {0}; | ||
12 | |||
13 | /* available colors: | ||
14 | COLOR_BLACK 0 | ||
15 | COLOR_RED 1 | ||
16 | COLOR_GREEN 2 | ||
17 | COLOR_YELLOW 3 | ||
18 | COLOR_BLUE 4 | ||
19 | COLOR_MAGENTA 5 | ||
20 | COLOR_CYAN 6 | ||
21 | COLOR_WHITE 7 | ||
22 | */ | ||
23 | static void set_normal_colors(void) | ||
24 | { | ||
25 | init_pair(NORMAL, -1, -1); | ||
26 | init_pair(MAIN_HEADING, COLOR_MAGENTA, -1); | ||
27 | |||
28 | /* FORE is for the selected item */ | ||
29 | init_pair(MAIN_MENU_FORE, -1, -1); | ||
30 | /* BACK for all the rest */ | ||
31 | init_pair(MAIN_MENU_BACK, -1, -1); | ||
32 | init_pair(MAIN_MENU_GREY, -1, -1); | ||
33 | init_pair(MAIN_MENU_HEADING, COLOR_GREEN, -1); | ||
34 | init_pair(MAIN_MENU_BOX, COLOR_YELLOW, -1); | ||
35 | |||
36 | init_pair(SCROLLWIN_TEXT, -1, -1); | ||
37 | init_pair(SCROLLWIN_HEADING, COLOR_GREEN, -1); | ||
38 | init_pair(SCROLLWIN_BOX, COLOR_YELLOW, -1); | ||
39 | |||
40 | init_pair(DIALOG_TEXT, -1, -1); | ||
41 | init_pair(DIALOG_BOX, COLOR_YELLOW, -1); | ||
42 | init_pair(DIALOG_MENU_BACK, COLOR_YELLOW, -1); | ||
43 | init_pair(DIALOG_MENU_FORE, COLOR_RED, -1); | ||
44 | |||
45 | init_pair(INPUT_BOX, COLOR_YELLOW, -1); | ||
46 | init_pair(INPUT_HEADING, COLOR_GREEN, -1); | ||
47 | init_pair(INPUT_TEXT, -1, -1); | ||
48 | init_pair(INPUT_FIELD, -1, -1); | ||
49 | |||
50 | init_pair(FUNCTION_HIGHLIGHT, -1, -1); | ||
51 | init_pair(FUNCTION_TEXT, COLOR_BLUE, -1); | ||
52 | } | ||
53 | |||
54 | /* available attributes: | ||
55 | A_NORMAL Normal display (no highlight) | ||
56 | A_STANDOUT Best highlighting mode of the terminal. | ||
57 | A_UNDERLINE Underlining | ||
58 | A_REVERSE Reverse video | ||
59 | A_BLINK Blinking | ||
60 | A_DIM Half bright | ||
61 | A_BOLD Extra bright or bold | ||
62 | A_PROTECT Protected mode | ||
63 | A_INVIS Invisible or blank mode | ||
64 | A_ALTCHARSET Alternate character set | ||
65 | A_CHARTEXT Bit-mask to extract a character | ||
66 | COLOR_PAIR(n) Color-pair number n | ||
67 | */ | ||
68 | static void normal_color_theme(void) | ||
69 | { | ||
70 | /* automatically add color... */ | ||
71 | #define mkattr(name, attr) do { \ | ||
72 | attributes[name] = attr | COLOR_PAIR(name); } while (0) | ||
73 | mkattr(NORMAL, NORMAL); | ||
74 | mkattr(MAIN_HEADING, A_BOLD | A_UNDERLINE); | ||
75 | |||
76 | mkattr(MAIN_MENU_FORE, A_REVERSE); | ||
77 | mkattr(MAIN_MENU_BACK, A_NORMAL); | ||
78 | mkattr(MAIN_MENU_GREY, A_NORMAL); | ||
79 | mkattr(MAIN_MENU_HEADING, A_BOLD); | ||
80 | mkattr(MAIN_MENU_BOX, A_NORMAL); | ||
81 | |||
82 | mkattr(SCROLLWIN_TEXT, A_NORMAL); | ||
83 | mkattr(SCROLLWIN_HEADING, A_BOLD); | ||
84 | mkattr(SCROLLWIN_BOX, A_BOLD); | ||
85 | |||
86 | mkattr(DIALOG_TEXT, A_BOLD); | ||
87 | mkattr(DIALOG_BOX, A_BOLD); | ||
88 | mkattr(DIALOG_MENU_FORE, A_STANDOUT); | ||
89 | mkattr(DIALOG_MENU_BACK, A_NORMAL); | ||
90 | |||
91 | mkattr(INPUT_BOX, A_NORMAL); | ||
92 | mkattr(INPUT_HEADING, A_BOLD); | ||
93 | mkattr(INPUT_TEXT, A_NORMAL); | ||
94 | mkattr(INPUT_FIELD, A_UNDERLINE); | ||
95 | |||
96 | mkattr(FUNCTION_HIGHLIGHT, A_BOLD); | ||
97 | mkattr(FUNCTION_TEXT, A_REVERSE); | ||
98 | } | ||
99 | |||
100 | static void no_colors_theme(void) | ||
101 | { | ||
102 | /* automatically add highlight, no color */ | ||
103 | #define mkattrn(name, attr) { attributes[name] = attr; } | ||
104 | |||
105 | mkattrn(NORMAL, NORMAL); | ||
106 | mkattrn(MAIN_HEADING, A_BOLD | A_UNDERLINE); | ||
107 | |||
108 | mkattrn(MAIN_MENU_FORE, A_STANDOUT); | ||
109 | mkattrn(MAIN_MENU_BACK, A_NORMAL); | ||
110 | mkattrn(MAIN_MENU_GREY, A_NORMAL); | ||
111 | mkattrn(MAIN_MENU_HEADING, A_BOLD); | ||
112 | mkattrn(MAIN_MENU_BOX, A_NORMAL); | ||
113 | |||
114 | mkattrn(SCROLLWIN_TEXT, A_NORMAL); | ||
115 | mkattrn(SCROLLWIN_HEADING, A_BOLD); | ||
116 | mkattrn(SCROLLWIN_BOX, A_BOLD); | ||
117 | |||
118 | mkattrn(DIALOG_TEXT, A_NORMAL); | ||
119 | mkattrn(DIALOG_BOX, A_BOLD); | ||
120 | mkattrn(DIALOG_MENU_FORE, A_STANDOUT); | ||
121 | mkattrn(DIALOG_MENU_BACK, A_NORMAL); | ||
122 | |||
123 | mkattrn(INPUT_BOX, A_BOLD); | ||
124 | mkattrn(INPUT_HEADING, A_BOLD); | ||
125 | mkattrn(INPUT_TEXT, A_NORMAL); | ||
126 | mkattrn(INPUT_FIELD, A_UNDERLINE); | ||
127 | |||
128 | mkattrn(FUNCTION_HIGHLIGHT, A_BOLD); | ||
129 | mkattrn(FUNCTION_TEXT, A_REVERSE); | ||
130 | } | ||
131 | |||
132 | void set_colors() | ||
133 | { | ||
134 | start_color(); | ||
135 | use_default_colors(); | ||
136 | set_normal_colors(); | ||
137 | if (has_colors()) { | ||
138 | normal_color_theme(); | ||
139 | } else { | ||
140 | /* give deafults */ | ||
141 | no_colors_theme(); | ||
142 | } | ||
143 | } | ||
144 | |||
145 | |||
146 | /* this changes the windows attributes !!! */ | ||
147 | void print_in_middle(WINDOW *win, | ||
148 | int starty, | ||
149 | int startx, | ||
150 | int width, | ||
151 | const char *string, | ||
152 | chtype color) | ||
153 | { int length, x, y; | ||
154 | float temp; | ||
155 | |||
156 | |||
157 | if (win == NULL) | ||
158 | win = stdscr; | ||
159 | getyx(win, y, x); | ||
160 | if (startx != 0) | ||
161 | x = startx; | ||
162 | if (starty != 0) | ||
163 | y = starty; | ||
164 | if (width == 0) | ||
165 | width = 80; | ||
166 | |||
167 | length = strlen(string); | ||
168 | temp = (width - length) / 2; | ||
169 | x = startx + (int)temp; | ||
170 | wattrset(win, color); | ||
171 | mvwprintw(win, y, x, "%s", string); | ||
172 | refresh(); | ||
173 | } | ||
174 | |||
175 | int get_line_no(const char *text) | ||
176 | { | ||
177 | int i; | ||
178 | int total = 1; | ||
179 | |||
180 | if (!text) | ||
181 | return 0; | ||
182 | |||
183 | for (i = 0; text[i] != '\0'; i++) | ||
184 | if (text[i] == '\n') | ||
185 | total++; | ||
186 | return total; | ||
187 | } | ||
188 | |||
189 | const char *get_line(const char *text, int line_no) | ||
190 | { | ||
191 | int i; | ||
192 | int lines = 0; | ||
193 | |||
194 | if (!text) | ||
195 | return 0; | ||
196 | |||
197 | for (i = 0; text[i] != '\0' && lines < line_no; i++) | ||
198 | if (text[i] == '\n') | ||
199 | lines++; | ||
200 | return text+i; | ||
201 | } | ||
202 | |||
203 | int get_line_length(const char *line) | ||
204 | { | ||
205 | int res = 0; | ||
206 | while (*line != '\0' && *line != '\n') { | ||
207 | line++; | ||
208 | res++; | ||
209 | } | ||
210 | return res; | ||
211 | } | ||
212 | |||
213 | /* print all lines to the window. */ | ||
214 | void fill_window(WINDOW *win, const char *text) | ||
215 | { | ||
216 | int x, y; | ||
217 | int total_lines = get_line_no(text); | ||
218 | int i; | ||
219 | |||
220 | getmaxyx(win, y, x); | ||
221 | /* do not go over end of line */ | ||
222 | total_lines = min(total_lines, y); | ||
223 | for (i = 0; i < total_lines; i++) { | ||
224 | char tmp[x+10]; | ||
225 | const char *line = get_line(text, i); | ||
226 | int len = get_line_length(line); | ||
227 | strncpy(tmp, line, min(len, x)); | ||
228 | tmp[len] = '\0'; | ||
229 | mvwprintw(win, i, 0, tmp); | ||
230 | } | ||
231 | } | ||
232 | |||
233 | /* get the message, and buttons. | ||
234 | * each button must be a char* | ||
235 | * return the selected button | ||
236 | * | ||
237 | * this dialog is used for 2 different things: | ||
238 | * 1) show a text box, no buttons. | ||
239 | * 2) show a dialog, with horizontal buttons | ||
240 | */ | ||
241 | int btn_dialog(WINDOW *main_window, const char *msg, int btn_num, ...) | ||
242 | { | ||
243 | va_list ap; | ||
244 | char *btn; | ||
245 | int btns_width = 0; | ||
246 | int msg_lines = 0; | ||
247 | int msg_width = 0; | ||
248 | int total_width; | ||
249 | int win_rows = 0; | ||
250 | WINDOW *win; | ||
251 | WINDOW *msg_win; | ||
252 | WINDOW *menu_win; | ||
253 | MENU *menu; | ||
254 | ITEM *btns[btn_num+1]; | ||
255 | int i, x, y; | ||
256 | int res = -1; | ||
257 | |||
258 | |||
259 | va_start(ap, btn_num); | ||
260 | for (i = 0; i < btn_num; i++) { | ||
261 | btn = va_arg(ap, char *); | ||
262 | btns[i] = new_item(btn, ""); | ||
263 | btns_width += strlen(btn)+1; | ||
264 | } | ||
265 | va_end(ap); | ||
266 | btns[btn_num] = NULL; | ||
267 | |||
268 | /* find the widest line of msg: */ | ||
269 | msg_lines = get_line_no(msg); | ||
270 | for (i = 0; i < msg_lines; i++) { | ||
271 | const char *line = get_line(msg, i); | ||
272 | int len = get_line_length(line); | ||
273 | if (msg_width < len) | ||
274 | msg_width = len; | ||
275 | } | ||
276 | |||
277 | total_width = max(msg_width, btns_width); | ||
278 | /* place dialog in middle of screen */ | ||
279 | y = (LINES-(msg_lines+4))/2; | ||
280 | x = (COLS-(total_width+4))/2; | ||
281 | |||
282 | |||
283 | /* create the windows */ | ||
284 | if (btn_num > 0) | ||
285 | win_rows = msg_lines+4; | ||
286 | else | ||
287 | win_rows = msg_lines+2; | ||
288 | |||
289 | win = newwin(win_rows, total_width+4, y, x); | ||
290 | keypad(win, TRUE); | ||
291 | menu_win = derwin(win, 1, btns_width, win_rows-2, | ||
292 | 1+(total_width+2-btns_width)/2); | ||
293 | menu = new_menu(btns); | ||
294 | msg_win = derwin(win, win_rows-2, msg_width, 1, | ||
295 | 1+(total_width+2-msg_width)/2); | ||
296 | |||
297 | set_menu_fore(menu, attributes[DIALOG_MENU_FORE]); | ||
298 | set_menu_back(menu, attributes[DIALOG_MENU_BACK]); | ||
299 | |||
300 | wattrset(win, attributes[DIALOG_BOX]); | ||
301 | box(win, 0, 0); | ||
302 | |||
303 | /* print message */ | ||
304 | wattrset(msg_win, attributes[DIALOG_TEXT]); | ||
305 | fill_window(msg_win, msg); | ||
306 | |||
307 | set_menu_win(menu, win); | ||
308 | set_menu_sub(menu, menu_win); | ||
309 | set_menu_format(menu, 1, btn_num); | ||
310 | menu_opts_off(menu, O_SHOWDESC); | ||
311 | menu_opts_off(menu, O_SHOWMATCH); | ||
312 | menu_opts_on(menu, O_ONEVALUE); | ||
313 | menu_opts_on(menu, O_NONCYCLIC); | ||
314 | set_menu_mark(menu, ""); | ||
315 | post_menu(menu); | ||
316 | |||
317 | |||
318 | touchwin(win); | ||
319 | refresh_all_windows(main_window); | ||
320 | while ((res = wgetch(win))) { | ||
321 | switch (res) { | ||
322 | case KEY_LEFT: | ||
323 | menu_driver(menu, REQ_LEFT_ITEM); | ||
324 | break; | ||
325 | case KEY_RIGHT: | ||
326 | menu_driver(menu, REQ_RIGHT_ITEM); | ||
327 | break; | ||
328 | case 10: /* ENTER */ | ||
329 | case 27: /* ESCAPE */ | ||
330 | case ' ': | ||
331 | case KEY_F(F_BACK): | ||
332 | case KEY_F(F_EXIT): | ||
333 | break; | ||
334 | } | ||
335 | touchwin(win); | ||
336 | refresh_all_windows(main_window); | ||
337 | |||
338 | if (res == 10 || res == ' ') { | ||
339 | res = item_index(current_item(menu)); | ||
340 | break; | ||
341 | } else if (res == 27 || res == KEY_F(F_BACK) || | ||
342 | res == KEY_F(F_EXIT)) { | ||
343 | res = KEY_EXIT; | ||
344 | break; | ||
345 | } | ||
346 | } | ||
347 | |||
348 | unpost_menu(menu); | ||
349 | free_menu(menu); | ||
350 | for (i = 0; i < btn_num; i++) | ||
351 | free_item(btns[i]); | ||
352 | |||
353 | delwin(win); | ||
354 | return res; | ||
355 | } | ||
356 | |||
357 | int dialog_inputbox(WINDOW *main_window, | ||
358 | const char *title, const char *prompt, | ||
359 | const char *init, char *result, int result_len) | ||
360 | { | ||
361 | int prompt_lines = 0; | ||
362 | int prompt_width = 0; | ||
363 | WINDOW *win; | ||
364 | WINDOW *prompt_win; | ||
365 | WINDOW *form_win; | ||
366 | PANEL *panel; | ||
367 | int i, x, y; | ||
368 | int res = -1; | ||
369 | int cursor_position = strlen(init); | ||
370 | |||
371 | |||
372 | /* find the widest line of msg: */ | ||
373 | prompt_lines = get_line_no(prompt); | ||
374 | for (i = 0; i < prompt_lines; i++) { | ||
375 | const char *line = get_line(prompt, i); | ||
376 | int len = get_line_length(line); | ||
377 | prompt_width = max(prompt_width, len); | ||
378 | } | ||
379 | |||
380 | if (title) | ||
381 | prompt_width = max(prompt_width, strlen(title)); | ||
382 | |||
383 | /* place dialog in middle of screen */ | ||
384 | y = (LINES-(prompt_lines+4))/2; | ||
385 | x = (COLS-(prompt_width+4))/2; | ||
386 | |||
387 | strncpy(result, init, result_len); | ||
388 | |||
389 | /* create the windows */ | ||
390 | win = newwin(prompt_lines+6, prompt_width+7, y, x); | ||
391 | prompt_win = derwin(win, prompt_lines+1, prompt_width, 2, 2); | ||
392 | form_win = derwin(win, 1, prompt_width, prompt_lines+3, 2); | ||
393 | keypad(form_win, TRUE); | ||
394 | |||
395 | wattrset(form_win, attributes[INPUT_FIELD]); | ||
396 | |||
397 | wattrset(win, attributes[INPUT_BOX]); | ||
398 | box(win, 0, 0); | ||
399 | wattrset(win, attributes[INPUT_HEADING]); | ||
400 | if (title) | ||
401 | mvwprintw(win, 0, 3, "%s", title); | ||
402 | |||
403 | /* print message */ | ||
404 | wattrset(prompt_win, attributes[INPUT_TEXT]); | ||
405 | fill_window(prompt_win, prompt); | ||
406 | |||
407 | mvwprintw(form_win, 0, 0, "%*s", prompt_width, " "); | ||
408 | mvwprintw(form_win, 0, 0, "%s", result); | ||
409 | |||
410 | /* create panels */ | ||
411 | panel = new_panel(win); | ||
412 | |||
413 | /* show the cursor */ | ||
414 | curs_set(1); | ||
415 | |||
416 | touchwin(win); | ||
417 | refresh_all_windows(main_window); | ||
418 | while ((res = wgetch(form_win))) { | ||
419 | int len = strlen(result); | ||
420 | switch (res) { | ||
421 | case 10: /* ENTER */ | ||
422 | case 27: /* ESCAPE */ | ||
423 | case KEY_F(F_HELP): | ||
424 | case KEY_F(F_EXIT): | ||
425 | case KEY_F(F_BACK): | ||
426 | break; | ||
427 | case 127: | ||
428 | case KEY_BACKSPACE: | ||
429 | if (cursor_position > 0) { | ||
430 | memmove(&result[cursor_position-1], | ||
431 | &result[cursor_position], | ||
432 | len-cursor_position+1); | ||
433 | cursor_position--; | ||
434 | } | ||
435 | break; | ||
436 | case KEY_DC: | ||
437 | if (cursor_position >= 0 && cursor_position < len) { | ||
438 | memmove(&result[cursor_position], | ||
439 | &result[cursor_position+1], | ||
440 | len-cursor_position+1); | ||
441 | } | ||
442 | break; | ||
443 | case KEY_UP: | ||
444 | case KEY_RIGHT: | ||
445 | if (cursor_position < len && | ||
446 | cursor_position < min(result_len, prompt_width)) | ||
447 | cursor_position++; | ||
448 | break; | ||
449 | case KEY_DOWN: | ||
450 | case KEY_LEFT: | ||
451 | if (cursor_position > 0) | ||
452 | cursor_position--; | ||
453 | break; | ||
454 | default: | ||
455 | if ((isgraph(res) || isspace(res)) && | ||
456 | len-2 < result_len) { | ||
457 | /* insert the char at the proper position */ | ||
458 | memmove(&result[cursor_position+1], | ||
459 | &result[cursor_position], | ||
460 | len+1); | ||
461 | result[cursor_position] = res; | ||
462 | cursor_position++; | ||
463 | } else { | ||
464 | mvprintw(0, 0, "unknow key: %d\n", res); | ||
465 | } | ||
466 | break; | ||
467 | } | ||
468 | wmove(form_win, 0, 0); | ||
469 | wclrtoeol(form_win); | ||
470 | mvwprintw(form_win, 0, 0, "%*s", prompt_width, " "); | ||
471 | mvwprintw(form_win, 0, 0, "%s", result); | ||
472 | wmove(form_win, 0, cursor_position); | ||
473 | touchwin(win); | ||
474 | refresh_all_windows(main_window); | ||
475 | |||
476 | if (res == 10) { | ||
477 | res = 0; | ||
478 | break; | ||
479 | } else if (res == 27 || res == KEY_F(F_BACK) || | ||
480 | res == KEY_F(F_EXIT)) { | ||
481 | res = KEY_EXIT; | ||
482 | break; | ||
483 | } else if (res == KEY_F(F_HELP)) { | ||
484 | res = 1; | ||
485 | break; | ||
486 | } | ||
487 | } | ||
488 | |||
489 | /* hide the cursor */ | ||
490 | curs_set(0); | ||
491 | del_panel(panel); | ||
492 | delwin(prompt_win); | ||
493 | delwin(form_win); | ||
494 | delwin(win); | ||
495 | return res; | ||
496 | } | ||
497 | |||
498 | /* refresh all windows in the correct order */ | ||
499 | void refresh_all_windows(WINDOW *main_window) | ||
500 | { | ||
501 | update_panels(); | ||
502 | touchwin(main_window); | ||
503 | refresh(); | ||
504 | } | ||
505 | |||
506 | /* layman's scrollable window... */ | ||
507 | void show_scroll_win(WINDOW *main_window, | ||
508 | const char *title, | ||
509 | const char *text) | ||
510 | { | ||
511 | int res; | ||
512 | int total_lines = get_line_no(text); | ||
513 | int x, y; | ||
514 | int start_x = 0, start_y = 0; | ||
515 | int text_lines = 0, text_cols = 0; | ||
516 | int total_cols = 0; | ||
517 | int win_cols = 0; | ||
518 | int win_lines = 0; | ||
519 | int i = 0; | ||
520 | WINDOW *win; | ||
521 | WINDOW *pad; | ||
522 | PANEL *panel; | ||
523 | |||
524 | /* find the widest line of msg: */ | ||
525 | total_lines = get_line_no(text); | ||
526 | for (i = 0; i < total_lines; i++) { | ||
527 | const char *line = get_line(text, i); | ||
528 | int len = get_line_length(line); | ||
529 | total_cols = max(total_cols, len+2); | ||
530 | } | ||
531 | |||
532 | /* create the pad */ | ||
533 | pad = newpad(total_lines+10, total_cols+10); | ||
534 | wattrset(pad, attributes[SCROLLWIN_TEXT]); | ||
535 | fill_window(pad, text); | ||
536 | |||
537 | win_lines = min(total_lines+4, LINES-2); | ||
538 | win_cols = min(total_cols+2, COLS-2); | ||
539 | text_lines = max(win_lines-4, 0); | ||
540 | text_cols = max(win_cols-2, 0); | ||
541 | |||
542 | /* place window in middle of screen */ | ||
543 | y = (LINES-win_lines)/2; | ||
544 | x = (COLS-win_cols)/2; | ||
545 | |||
546 | win = newwin(win_lines, win_cols, y, x); | ||
547 | keypad(win, TRUE); | ||
548 | /* show the help in the help window, and show the help panel */ | ||
549 | wattrset(win, attributes[SCROLLWIN_BOX]); | ||
550 | box(win, 0, 0); | ||
551 | wattrset(win, attributes[SCROLLWIN_HEADING]); | ||
552 | mvwprintw(win, 0, 3, " %s ", title); | ||
553 | panel = new_panel(win); | ||
554 | |||
555 | /* handle scrolling */ | ||
556 | do { | ||
557 | |||
558 | copywin(pad, win, start_y, start_x, 2, 2, text_lines, | ||
559 | text_cols, 0); | ||
560 | print_in_middle(win, | ||
561 | text_lines+2, | ||
562 | 0, | ||
563 | text_cols, | ||
564 | "<OK>", | ||
565 | attributes[DIALOG_MENU_FORE]); | ||
566 | wrefresh(win); | ||
567 | |||
568 | res = wgetch(win); | ||
569 | switch (res) { | ||
570 | case KEY_NPAGE: | ||
571 | case ' ': | ||
572 | start_y += text_lines-2; | ||
573 | break; | ||
574 | case KEY_PPAGE: | ||
575 | start_y -= text_lines+2; | ||
576 | break; | ||
577 | case KEY_HOME: | ||
578 | start_y = 0; | ||
579 | break; | ||
580 | case KEY_END: | ||
581 | start_y = total_lines-text_lines; | ||
582 | break; | ||
583 | case KEY_DOWN: | ||
584 | case 'j': | ||
585 | start_y++; | ||
586 | break; | ||
587 | case KEY_UP: | ||
588 | case 'k': | ||
589 | start_y--; | ||
590 | break; | ||
591 | case KEY_LEFT: | ||
592 | case 'h': | ||
593 | start_x--; | ||
594 | break; | ||
595 | case KEY_RIGHT: | ||
596 | case 'l': | ||
597 | start_x++; | ||
598 | break; | ||
599 | } | ||
600 | if (res == 10 || res == 27 || res == 'q' | ||
601 | || res == KEY_F(F_BACK) || res == KEY_F(F_EXIT)) { | ||
602 | break; | ||
603 | } | ||
604 | if (start_y < 0) | ||
605 | start_y = 0; | ||
606 | if (start_y >= total_lines-text_lines) | ||
607 | start_y = total_lines-text_lines; | ||
608 | if (start_x < 0) | ||
609 | start_x = 0; | ||
610 | if (start_x >= total_cols-text_cols) | ||
611 | start_x = total_cols-text_cols; | ||
612 | } while (res); | ||
613 | |||
614 | del_panel(panel); | ||
615 | delwin(win); | ||
616 | refresh_all_windows(main_window); | ||
617 | } | ||
diff --git a/scripts/kconfig/nconf.h b/scripts/kconfig/nconf.h new file mode 100644 index 00000000000..fb429666600 --- /dev/null +++ b/scripts/kconfig/nconf.h | |||
@@ -0,0 +1,95 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2008 Nir Tzachar <nir.tzachar@gmail.com? | ||
3 | * Released under the terms of the GNU GPL v2.0. | ||
4 | * | ||
5 | * Derived from menuconfig. | ||
6 | * | ||
7 | */ | ||
8 | |||
9 | #include <ctype.h> | ||
10 | #include <errno.h> | ||
11 | #include <fcntl.h> | ||
12 | #include <limits.h> | ||
13 | #include <stdarg.h> | ||
14 | #include <stdlib.h> | ||
15 | #include <string.h> | ||
16 | #include <unistd.h> | ||
17 | #include <locale.h> | ||
18 | #include <curses.h> | ||
19 | #include <menu.h> | ||
20 | #include <panel.h> | ||
21 | #include <form.h> | ||
22 | |||
23 | #include <stdio.h> | ||
24 | #include <time.h> | ||
25 | #include <sys/time.h> | ||
26 | |||
27 | #include "ncurses.h" | ||
28 | |||
29 | #define max(a, b) ({\ | ||
30 | typeof(a) _a = a;\ | ||
31 | typeof(b) _b = b;\ | ||
32 | _a > _b ? _a : _b; }) | ||
33 | |||
34 | #define min(a, b) ({\ | ||
35 | typeof(a) _a = a;\ | ||
36 | typeof(b) _b = b;\ | ||
37 | _a < _b ? _a : _b; }) | ||
38 | |||
39 | typedef enum { | ||
40 | NORMAL = 1, | ||
41 | MAIN_HEADING, | ||
42 | MAIN_MENU_BOX, | ||
43 | MAIN_MENU_FORE, | ||
44 | MAIN_MENU_BACK, | ||
45 | MAIN_MENU_GREY, | ||
46 | MAIN_MENU_HEADING, | ||
47 | SCROLLWIN_TEXT, | ||
48 | SCROLLWIN_HEADING, | ||
49 | SCROLLWIN_BOX, | ||
50 | DIALOG_TEXT, | ||
51 | DIALOG_MENU_FORE, | ||
52 | DIALOG_MENU_BACK, | ||
53 | DIALOG_BOX, | ||
54 | INPUT_BOX, | ||
55 | INPUT_HEADING, | ||
56 | INPUT_TEXT, | ||
57 | INPUT_FIELD, | ||
58 | FUNCTION_TEXT, | ||
59 | FUNCTION_HIGHLIGHT, | ||
60 | ATTR_MAX | ||
61 | } attributes_t; | ||
62 | extern attributes_t attributes[]; | ||
63 | |||
64 | typedef enum { | ||
65 | F_HELP = 1, | ||
66 | F_SYMBOL = 2, | ||
67 | F_INSTS = 3, | ||
68 | F_CONF = 4, | ||
69 | F_BACK = 5, | ||
70 | F_SAVE = 6, | ||
71 | F_LOAD = 7, | ||
72 | F_EXIT = 8 | ||
73 | } function_key; | ||
74 | |||
75 | void set_colors(void); | ||
76 | |||
77 | /* this changes the windows attributes !!! */ | ||
78 | void print_in_middle(WINDOW *win, | ||
79 | int starty, | ||
80 | int startx, | ||
81 | int width, | ||
82 | const char *string, | ||
83 | chtype color); | ||
84 | int get_line_length(const char *line); | ||
85 | int get_line_no(const char *text); | ||
86 | const char *get_line(const char *text, int line_no); | ||
87 | void fill_window(WINDOW *win, const char *text); | ||
88 | int btn_dialog(WINDOW *main_window, const char *msg, int btn_num, ...); | ||
89 | int dialog_inputbox(WINDOW *main_window, | ||
90 | const char *title, const char *prompt, | ||
91 | const char *init, char *result, int result_len); | ||
92 | void refresh_all_windows(WINDOW *main_window); | ||
93 | void show_scroll_win(WINDOW *main_window, | ||
94 | const char *title, | ||
95 | const char *text); | ||
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c index 6c8fbbb66eb..2e7a048e0cf 100644 --- a/scripts/kconfig/symbol.c +++ b/scripts/kconfig/symbol.c | |||
@@ -651,12 +651,20 @@ bool sym_is_changable(struct symbol *sym) | |||
651 | return sym->visible > sym->rev_dep.tri; | 651 | return sym->visible > sym->rev_dep.tri; |
652 | } | 652 | } |
653 | 653 | ||
654 | static unsigned strhash(const char *s) | ||
655 | { | ||
656 | /* fnv32 hash */ | ||
657 | unsigned hash = 2166136261U; | ||
658 | for (; *s; s++) | ||
659 | hash = (hash ^ *s) * 0x01000193; | ||
660 | return hash; | ||
661 | } | ||
662 | |||
654 | struct symbol *sym_lookup(const char *name, int flags) | 663 | struct symbol *sym_lookup(const char *name, int flags) |
655 | { | 664 | { |
656 | struct symbol *symbol; | 665 | struct symbol *symbol; |
657 | const char *ptr; | ||
658 | char *new_name; | 666 | char *new_name; |
659 | int hash = 0; | 667 | int hash; |
660 | 668 | ||
661 | if (name) { | 669 | if (name) { |
662 | if (name[0] && !name[1]) { | 670 | if (name[0] && !name[1]) { |
@@ -666,12 +674,11 @@ struct symbol *sym_lookup(const char *name, int flags) | |||
666 | case 'n': return &symbol_no; | 674 | case 'n': return &symbol_no; |
667 | } | 675 | } |
668 | } | 676 | } |
669 | for (ptr = name; *ptr; ptr++) | 677 | hash = strhash(name) % SYMBOL_HASHSIZE; |
670 | hash += *ptr; | ||
671 | hash &= 0xff; | ||
672 | 678 | ||
673 | for (symbol = symbol_hash[hash]; symbol; symbol = symbol->next) { | 679 | for (symbol = symbol_hash[hash]; symbol; symbol = symbol->next) { |
674 | if (!strcmp(symbol->name, name) && | 680 | if (symbol->name && |
681 | !strcmp(symbol->name, name) && | ||
675 | (flags ? symbol->flags & flags | 682 | (flags ? symbol->flags & flags |
676 | : !(symbol->flags & (SYMBOL_CONST|SYMBOL_CHOICE)))) | 683 | : !(symbol->flags & (SYMBOL_CONST|SYMBOL_CHOICE)))) |
677 | return symbol; | 684 | return symbol; |
@@ -679,7 +686,7 @@ struct symbol *sym_lookup(const char *name, int flags) | |||
679 | new_name = strdup(name); | 686 | new_name = strdup(name); |
680 | } else { | 687 | } else { |
681 | new_name = NULL; | 688 | new_name = NULL; |
682 | hash = 256; | 689 | hash = 0; |
683 | } | 690 | } |
684 | 691 | ||
685 | symbol = malloc(sizeof(*symbol)); | 692 | symbol = malloc(sizeof(*symbol)); |
@@ -697,7 +704,6 @@ struct symbol *sym_lookup(const char *name, int flags) | |||
697 | struct symbol *sym_find(const char *name) | 704 | struct symbol *sym_find(const char *name) |
698 | { | 705 | { |
699 | struct symbol *symbol = NULL; | 706 | struct symbol *symbol = NULL; |
700 | const char *ptr; | ||
701 | int hash = 0; | 707 | int hash = 0; |
702 | 708 | ||
703 | if (!name) | 709 | if (!name) |
@@ -710,12 +716,11 @@ struct symbol *sym_find(const char *name) | |||
710 | case 'n': return &symbol_no; | 716 | case 'n': return &symbol_no; |
711 | } | 717 | } |
712 | } | 718 | } |
713 | for (ptr = name; *ptr; ptr++) | 719 | hash = strhash(name) % SYMBOL_HASHSIZE; |
714 | hash += *ptr; | ||
715 | hash &= 0xff; | ||
716 | 720 | ||
717 | for (symbol = symbol_hash[hash]; symbol; symbol = symbol->next) { | 721 | for (symbol = symbol_hash[hash]; symbol; symbol = symbol->next) { |
718 | if (!strcmp(symbol->name, name) && | 722 | if (symbol->name && |
723 | !strcmp(symbol->name, name) && | ||
719 | !(symbol->flags & SYMBOL_CONST)) | 724 | !(symbol->flags & SYMBOL_CONST)) |
720 | break; | 725 | break; |
721 | } | 726 | } |
@@ -750,6 +755,7 @@ struct symbol **sym_re_search(const char *pattern) | |||
750 | return NULL; | 755 | return NULL; |
751 | } | 756 | } |
752 | } | 757 | } |
758 | sym_calc_value(sym); | ||
753 | sym_arr[cnt++] = sym; | 759 | sym_arr[cnt++] = sym; |
754 | } | 760 | } |
755 | if (sym_arr) | 761 | if (sym_arr) |
diff --git a/scripts/kconfig/util.c b/scripts/kconfig/util.c index 25d1ec4ca28..78b5c04e736 100644 --- a/scripts/kconfig/util.c +++ b/scripts/kconfig/util.c | |||
@@ -78,6 +78,7 @@ struct gstr str_new(void) | |||
78 | struct gstr gs; | 78 | struct gstr gs; |
79 | gs.s = malloc(sizeof(char) * 64); | 79 | gs.s = malloc(sizeof(char) * 64); |
80 | gs.len = 64; | 80 | gs.len = 64; |
81 | gs.max_width = 0; | ||
81 | strcpy(gs.s, "\0"); | 82 | strcpy(gs.s, "\0"); |
82 | return gs; | 83 | return gs; |
83 | } | 84 | } |
@@ -88,6 +89,7 @@ struct gstr str_assign(const char *s) | |||
88 | struct gstr gs; | 89 | struct gstr gs; |
89 | gs.s = strdup(s); | 90 | gs.s = strdup(s); |
90 | gs.len = strlen(s) + 1; | 91 | gs.len = strlen(s) + 1; |
92 | gs.max_width = 0; | ||
91 | return gs; | 93 | return gs; |
92 | } | 94 | } |
93 | 95 | ||
diff --git a/scripts/kconfig/zconf.tab.c_shipped b/scripts/kconfig/zconf.tab.c_shipped index 6e9dcd59aa8..32a9eefd842 100644 --- a/scripts/kconfig/zconf.tab.c_shipped +++ b/scripts/kconfig/zconf.tab.c_shipped | |||
@@ -104,7 +104,7 @@ static void zconf_error(const char *err, ...); | |||
104 | static void zconferror(const char *err); | 104 | static void zconferror(const char *err); |
105 | static bool zconf_endtoken(struct kconf_id *id, int starttoken, int endtoken); | 105 | static bool zconf_endtoken(struct kconf_id *id, int starttoken, int endtoken); |
106 | 106 | ||
107 | struct symbol *symbol_hash[257]; | 107 | struct symbol *symbol_hash[SYMBOL_HASHSIZE]; |
108 | 108 | ||
109 | static struct menu *current_menu, *current_entry; | 109 | static struct menu *current_menu, *current_entry; |
110 | 110 | ||
@@ -2220,7 +2220,7 @@ void conf_parse(const char *name) | |||
2220 | zconf_initscan(name); | 2220 | zconf_initscan(name); |
2221 | 2221 | ||
2222 | sym_init(); | 2222 | sym_init(); |
2223 | menu_init(); | 2223 | _menu_init(); |
2224 | modules_sym = sym_lookup(NULL, 0); | 2224 | modules_sym = sym_lookup(NULL, 0); |
2225 | modules_sym->type = S_BOOLEAN; | 2225 | modules_sym->type = S_BOOLEAN; |
2226 | modules_sym->flags |= SYMBOL_AUTO; | 2226 | modules_sym->flags |= SYMBOL_AUTO; |
@@ -2336,9 +2336,9 @@ static void print_symbol(FILE *out, struct menu *menu) | |||
2336 | struct property *prop; | 2336 | struct property *prop; |
2337 | 2337 | ||
2338 | if (sym_is_choice(sym)) | 2338 | if (sym_is_choice(sym)) |
2339 | fprintf(out, "choice\n"); | 2339 | fprintf(out, "\nchoice\n"); |
2340 | else | 2340 | else |
2341 | fprintf(out, "config %s\n", sym->name); | 2341 | fprintf(out, "\nconfig %s\n", sym->name); |
2342 | switch (sym->type) { | 2342 | switch (sym->type) { |
2343 | case S_BOOLEAN: | 2343 | case S_BOOLEAN: |
2344 | fputs(" boolean\n", out); | 2344 | fputs(" boolean\n", out); |
@@ -2384,6 +2384,21 @@ static void print_symbol(FILE *out, struct menu *menu) | |||
2384 | case P_CHOICE: | 2384 | case P_CHOICE: |
2385 | fputs(" #choice value\n", out); | 2385 | fputs(" #choice value\n", out); |
2386 | break; | 2386 | break; |
2387 | case P_SELECT: | ||
2388 | fputs( " select ", out); | ||
2389 | expr_fprint(prop->expr, out); | ||
2390 | fputc('\n', out); | ||
2391 | break; | ||
2392 | case P_RANGE: | ||
2393 | fputs( " range ", out); | ||
2394 | expr_fprint(prop->expr, out); | ||
2395 | fputc('\n', out); | ||
2396 | break; | ||
2397 | case P_MENU: | ||
2398 | fputs( " menu ", out); | ||
2399 | print_quoted_string(out, prop->text); | ||
2400 | fputc('\n', out); | ||
2401 | break; | ||
2387 | default: | 2402 | default: |
2388 | fprintf(out, " unknown prop %d!\n", prop->type); | 2403 | fprintf(out, " unknown prop %d!\n", prop->type); |
2389 | break; | 2404 | break; |
@@ -2395,7 +2410,6 @@ static void print_symbol(FILE *out, struct menu *menu) | |||
2395 | menu->help[len] = 0; | 2410 | menu->help[len] = 0; |
2396 | fprintf(out, " help\n%s\n", menu->help); | 2411 | fprintf(out, " help\n%s\n", menu->help); |
2397 | } | 2412 | } |
2398 | fputc('\n', out); | ||
2399 | } | 2413 | } |
2400 | 2414 | ||
2401 | void zconfdump(FILE *out) | 2415 | void zconfdump(FILE *out) |
@@ -2428,7 +2442,6 @@ void zconfdump(FILE *out) | |||
2428 | expr_fprint(prop->visible.expr, out); | 2442 | expr_fprint(prop->visible.expr, out); |
2429 | fputc('\n', out); | 2443 | fputc('\n', out); |
2430 | } | 2444 | } |
2431 | fputs("\n", out); | ||
2432 | } | 2445 | } |
2433 | 2446 | ||
2434 | if (menu->list) | 2447 | if (menu->list) |
diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y index 8c43491f8cc..23dfd3baa7a 100644 --- a/scripts/kconfig/zconf.y +++ b/scripts/kconfig/zconf.y | |||
@@ -27,7 +27,7 @@ static void zconf_error(const char *err, ...); | |||
27 | static void zconferror(const char *err); | 27 | static void zconferror(const char *err); |
28 | static bool zconf_endtoken(struct kconf_id *id, int starttoken, int endtoken); | 28 | static bool zconf_endtoken(struct kconf_id *id, int starttoken, int endtoken); |
29 | 29 | ||
30 | struct symbol *symbol_hash[257]; | 30 | struct symbol *symbol_hash[SYMBOL_HASHSIZE]; |
31 | 31 | ||
32 | static struct menu *current_menu, *current_entry; | 32 | static struct menu *current_menu, *current_entry; |
33 | 33 | ||
@@ -475,7 +475,7 @@ void conf_parse(const char *name) | |||
475 | zconf_initscan(name); | 475 | zconf_initscan(name); |
476 | 476 | ||
477 | sym_init(); | 477 | sym_init(); |
478 | menu_init(); | 478 | _menu_init(); |
479 | modules_sym = sym_lookup(NULL, 0); | 479 | modules_sym = sym_lookup(NULL, 0); |
480 | modules_sym->type = S_BOOLEAN; | 480 | modules_sym->type = S_BOOLEAN; |
481 | modules_sym->flags |= SYMBOL_AUTO; | 481 | modules_sym->flags |= SYMBOL_AUTO; |
@@ -591,9 +591,9 @@ static void print_symbol(FILE *out, struct menu *menu) | |||
591 | struct property *prop; | 591 | struct property *prop; |
592 | 592 | ||
593 | if (sym_is_choice(sym)) | 593 | if (sym_is_choice(sym)) |
594 | fprintf(out, "choice\n"); | 594 | fprintf(out, "\nchoice\n"); |
595 | else | 595 | else |
596 | fprintf(out, "config %s\n", sym->name); | 596 | fprintf(out, "\nconfig %s\n", sym->name); |
597 | switch (sym->type) { | 597 | switch (sym->type) { |
598 | case S_BOOLEAN: | 598 | case S_BOOLEAN: |
599 | fputs(" boolean\n", out); | 599 | fputs(" boolean\n", out); |
@@ -639,6 +639,21 @@ static void print_symbol(FILE *out, struct menu *menu) | |||
639 | case P_CHOICE: | 639 | case P_CHOICE: |
640 | fputs(" #choice value\n", out); | 640 | fputs(" #choice value\n", out); |
641 | break; | 641 | break; |
642 | case P_SELECT: | ||
643 | fputs( " select ", out); | ||
644 | expr_fprint(prop->expr, out); | ||
645 | fputc('\n', out); | ||
646 | break; | ||
647 | case P_RANGE: | ||
648 | fputs( " range ", out); | ||
649 | expr_fprint(prop->expr, out); | ||
650 | fputc('\n', out); | ||
651 | break; | ||
652 | case P_MENU: | ||
653 | fputs( " menu ", out); | ||
654 | print_quoted_string(out, prop->text); | ||
655 | fputc('\n', out); | ||
656 | break; | ||
642 | default: | 657 | default: |
643 | fprintf(out, " unknown prop %d!\n", prop->type); | 658 | fprintf(out, " unknown prop %d!\n", prop->type); |
644 | break; | 659 | break; |
@@ -650,7 +665,6 @@ static void print_symbol(FILE *out, struct menu *menu) | |||
650 | menu->help[len] = 0; | 665 | menu->help[len] = 0; |
651 | fprintf(out, " help\n%s\n", menu->help); | 666 | fprintf(out, " help\n%s\n", menu->help); |
652 | } | 667 | } |
653 | fputc('\n', out); | ||
654 | } | 668 | } |
655 | 669 | ||
656 | void zconfdump(FILE *out) | 670 | void zconfdump(FILE *out) |
@@ -683,7 +697,6 @@ void zconfdump(FILE *out) | |||
683 | expr_fprint(prop->visible.expr, out); | 697 | expr_fprint(prop->visible.expr, out); |
684 | fputc('\n', out); | 698 | fputc('\n', out); |
685 | } | 699 | } |
686 | fputs("\n", out); | ||
687 | } | 700 | } |
688 | 701 | ||
689 | if (menu->list) | 702 | if (menu->list) |
diff --git a/scripts/markup_oops.pl b/scripts/markup_oops.pl index e950f9cde01..827896f5650 100644 --- a/scripts/markup_oops.pl +++ b/scripts/markup_oops.pl | |||
@@ -2,6 +2,7 @@ | |||
2 | 2 | ||
3 | use File::Basename; | 3 | use File::Basename; |
4 | use Math::BigInt; | 4 | use Math::BigInt; |
5 | use Getopt::Long; | ||
5 | 6 | ||
6 | # Copyright 2008, Intel Corporation | 7 | # Copyright 2008, Intel Corporation |
7 | # | 8 | # |
@@ -15,6 +16,16 @@ use Math::BigInt; | |||
15 | # Arjan van de Ven <arjan@linux.intel.com> | 16 | # Arjan van de Ven <arjan@linux.intel.com> |
16 | 17 | ||
17 | 18 | ||
19 | my $cross_compile = ""; | ||
20 | my $vmlinux_name = ""; | ||
21 | my $modulefile = ""; | ||
22 | |||
23 | # Get options | ||
24 | Getopt::Long::GetOptions( | ||
25 | 'cross-compile|c=s' => \$cross_compile, | ||
26 | 'module|m=s' => \$modulefile, | ||
27 | 'help|h' => \&usage, | ||
28 | ) || usage (); | ||
18 | my $vmlinux_name = $ARGV[0]; | 29 | my $vmlinux_name = $ARGV[0]; |
19 | if (!defined($vmlinux_name)) { | 30 | if (!defined($vmlinux_name)) { |
20 | my $kerver = `uname -r`; | 31 | my $kerver = `uname -r`; |
@@ -23,9 +34,8 @@ if (!defined($vmlinux_name)) { | |||
23 | print "No vmlinux specified, assuming $vmlinux_name\n"; | 34 | print "No vmlinux specified, assuming $vmlinux_name\n"; |
24 | } | 35 | } |
25 | my $filename = $vmlinux_name; | 36 | my $filename = $vmlinux_name; |
26 | # | 37 | |
27 | # Step 1: Parse the oops to find the EIP value | 38 | # Parse the oops to find the EIP value |
28 | # | ||
29 | 39 | ||
30 | my $target = "0"; | 40 | my $target = "0"; |
31 | my $function; | 41 | my $function; |
@@ -177,26 +187,26 @@ my $decodestart = Math::BigInt->from_hex("0x$target") - Math::BigInt->from_hex(" | |||
177 | my $decodestop = Math::BigInt->from_hex("0x$target") + 8192; | 187 | my $decodestop = Math::BigInt->from_hex("0x$target") + 8192; |
178 | if ($target eq "0") { | 188 | if ($target eq "0") { |
179 | print "No oops found!\n"; | 189 | print "No oops found!\n"; |
180 | print "Usage: \n"; | 190 | usage(); |
181 | print " dmesg | perl scripts/markup_oops.pl vmlinux\n"; | ||
182 | exit; | ||
183 | } | 191 | } |
184 | 192 | ||
185 | # if it's a module, we need to find the .ko file and calculate a load offset | 193 | # if it's a module, we need to find the .ko file and calculate a load offset |
186 | if ($module ne "") { | 194 | if ($module ne "") { |
187 | my $modulefile = `modinfo $module | grep '^filename:' | awk '{ print \$2 }'`; | 195 | if ($modulefile eq "") { |
188 | chomp($modulefile); | 196 | $modulefile = `modinfo -F filename $module`; |
197 | chomp($modulefile); | ||
198 | } | ||
189 | $filename = $modulefile; | 199 | $filename = $modulefile; |
190 | if ($filename eq "") { | 200 | if ($filename eq "") { |
191 | print "Module .ko file for $module not found. Aborting\n"; | 201 | print "Module .ko file for $module not found. Aborting\n"; |
192 | exit; | 202 | exit; |
193 | } | 203 | } |
194 | # ok so we found the module, now we need to calculate the vma offset | 204 | # ok so we found the module, now we need to calculate the vma offset |
195 | open(FILE, "objdump -dS $filename |") || die "Cannot start objdump"; | 205 | open(FILE, $cross_compile."objdump -dS $filename |") || die "Cannot start objdump"; |
196 | while (<FILE>) { | 206 | while (<FILE>) { |
197 | if ($_ =~ /^([0-9a-f]+) \<$function\>\:/) { | 207 | if ($_ =~ /^([0-9a-f]+) \<$function\>\:/) { |
198 | my $fu = $1; | 208 | my $fu = $1; |
199 | $vmaoffset = hex($target) - hex($fu) - hex($func_offset); | 209 | $vmaoffset = Math::BigInt->from_hex("0x$target") - Math::BigInt->from_hex("0x$fu") - Math::BigInt->from_hex("0x$func_offset"); |
200 | } | 210 | } |
201 | } | 211 | } |
202 | close(FILE); | 212 | close(FILE); |
@@ -204,7 +214,7 @@ if ($module ne "") { | |||
204 | 214 | ||
205 | my $counter = 0; | 215 | my $counter = 0; |
206 | my $state = 0; | 216 | my $state = 0; |
207 | my $center = 0; | 217 | my $center = -1; |
208 | my @lines; | 218 | my @lines; |
209 | my @reglines; | 219 | my @reglines; |
210 | 220 | ||
@@ -212,7 +222,7 @@ sub InRange { | |||
212 | my ($address, $target) = @_; | 222 | my ($address, $target) = @_; |
213 | my $ad = "0x".$address; | 223 | my $ad = "0x".$address; |
214 | my $ta = "0x".$target; | 224 | my $ta = "0x".$target; |
215 | my $delta = hex($ad) - hex($ta); | 225 | my $delta = Math::BigInt->from_hex($ad) - Math::BigInt->from_hex($ta); |
216 | 226 | ||
217 | if (($delta > -4096) && ($delta < 4096)) { | 227 | if (($delta > -4096) && ($delta < 4096)) { |
218 | return 1; | 228 | return 1; |
@@ -225,7 +235,7 @@ sub InRange { | |||
225 | # first, parse the input into the lines array, but to keep size down, | 235 | # first, parse the input into the lines array, but to keep size down, |
226 | # we only do this for 4Kb around the sweet spot | 236 | # we only do this for 4Kb around the sweet spot |
227 | 237 | ||
228 | open(FILE, "objdump -dS --adjust-vma=$vmaoffset --start-address=$decodestart --stop-address=$decodestop $filename |") || die "Cannot start objdump"; | 238 | open(FILE, $cross_compile."objdump -dS --adjust-vma=$vmaoffset --start-address=$decodestart --stop-address=$decodestop $filename |") || die "Cannot start objdump"; |
229 | 239 | ||
230 | while (<FILE>) { | 240 | while (<FILE>) { |
231 | my $line = $_; | 241 | my $line = $_; |
@@ -236,7 +246,8 @@ while (<FILE>) { | |||
236 | $state = 1; | 246 | $state = 1; |
237 | } | 247 | } |
238 | } | 248 | } |
239 | } else { | 249 | } |
250 | if ($state == 1) { | ||
240 | if ($line =~ /^([a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]+)\:/) { | 251 | if ($line =~ /^([a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]+)\:/) { |
241 | my $val = $1; | 252 | my $val = $1; |
242 | if (!InRange($val, $target)) { | 253 | if (!InRange($val, $target)) { |
@@ -259,7 +270,7 @@ if ($counter == 0) { | |||
259 | exit; | 270 | exit; |
260 | } | 271 | } |
261 | 272 | ||
262 | if ($center == 0) { | 273 | if ($center == -1) { |
263 | print "No matching code found \n"; | 274 | print "No matching code found \n"; |
264 | exit; | 275 | exit; |
265 | } | 276 | } |
@@ -344,3 +355,16 @@ while ($i < $finish) { | |||
344 | $i = $i +1; | 355 | $i = $i +1; |
345 | } | 356 | } |
346 | 357 | ||
358 | sub usage { | ||
359 | print <<EOT; | ||
360 | Usage: | ||
361 | dmesg | perl $0 [OPTION] [VMLINUX] | ||
362 | |||
363 | OPTION: | ||
364 | -c, --cross-compile CROSS_COMPILE Specify the prefix used for toolchain. | ||
365 | -m, --module MODULE_DIRNAME Specify the module filename. | ||
366 | -h, --help Help. | ||
367 | EOT | ||
368 | exit; | ||
369 | } | ||
370 | |||
diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h index 23dbad80cce..50ad317a4bf 100755 --- a/scripts/mkcompile_h +++ b/scripts/mkcompile_h | |||
@@ -67,9 +67,8 @@ UTS_TRUNCATE="cut -b -$UTS_LEN" | |||
67 | echo \#define LINUX_COMPILE_BY \"`whoami`\" | 67 | echo \#define LINUX_COMPILE_BY \"`whoami`\" |
68 | echo \#define LINUX_COMPILE_HOST \"`hostname | $UTS_TRUNCATE`\" | 68 | echo \#define LINUX_COMPILE_HOST \"`hostname | $UTS_TRUNCATE`\" |
69 | 69 | ||
70 | if [ -x /bin/dnsdomainname ]; then | 70 | domain=`dnsdomainname 2> /dev/null` |
71 | domain=`dnsdomainname 2> /dev/null` | 71 | if [ -z "$domain" ]; then |
72 | elif [ -x /bin/domainname ]; then | ||
73 | domain=`domainname 2> /dev/null` | 72 | domain=`domainname 2> /dev/null` |
74 | fi | 73 | fi |
75 | 74 | ||
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 20923613467..3318692e4e7 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c | |||
@@ -781,10 +781,13 @@ static void check_section(const char *modname, struct elf_info *elf, | |||
781 | #define ALL_EXIT_TEXT_SECTIONS \ | 781 | #define ALL_EXIT_TEXT_SECTIONS \ |
782 | ".exit.text$", ".devexit.text$", ".cpuexit.text$", ".memexit.text$" | 782 | ".exit.text$", ".devexit.text$", ".cpuexit.text$", ".memexit.text$" |
783 | 783 | ||
784 | #define ALL_INIT_SECTIONS INIT_SECTIONS, DEV_INIT_SECTIONS, \ | 784 | #define ALL_XXXINIT_SECTIONS DEV_INIT_SECTIONS, CPU_INIT_SECTIONS, \ |
785 | CPU_INIT_SECTIONS, MEM_INIT_SECTIONS | 785 | MEM_INIT_SECTIONS |
786 | #define ALL_EXIT_SECTIONS EXIT_SECTIONS, DEV_EXIT_SECTIONS, \ | 786 | #define ALL_XXXEXIT_SECTIONS DEV_EXIT_SECTIONS, CPU_EXIT_SECTIONS, \ |
787 | CPU_EXIT_SECTIONS, MEM_EXIT_SECTIONS | 787 | MEM_EXIT_SECTIONS |
788 | |||
789 | #define ALL_INIT_SECTIONS INIT_SECTIONS, ALL_XXXINIT_SECTIONS | ||
790 | #define ALL_EXIT_SECTIONS EXIT_SECTIONS, ALL_XXXEXIT_SECTIONS | ||
788 | 791 | ||
789 | #define DATA_SECTIONS ".data$", ".data.rel$" | 792 | #define DATA_SECTIONS ".data$", ".data.rel$" |
790 | #define TEXT_SECTIONS ".text$" | 793 | #define TEXT_SECTIONS ".text$" |
@@ -814,33 +817,29 @@ static const char *data_sections[] = { DATA_SECTIONS, NULL }; | |||
814 | 817 | ||
815 | 818 | ||
816 | /* symbols in .data that may refer to init/exit sections */ | 819 | /* symbols in .data that may refer to init/exit sections */ |
817 | static const char *symbol_white_list[] = | 820 | #define DEFAULT_SYMBOL_WHITE_LIST \ |
818 | { | 821 | "*driver", \ |
819 | "*driver", | 822 | "*_template", /* scsi uses *_template a lot */ \ |
820 | "*_template", /* scsi uses *_template a lot */ | 823 | "*_timer", /* arm uses ops structures named _timer a lot */ \ |
821 | "*_timer", /* arm uses ops structures named _timer a lot */ | 824 | "*_sht", /* scsi also used *_sht to some extent */ \ |
822 | "*_sht", /* scsi also used *_sht to some extent */ | 825 | "*_ops", \ |
823 | "*_ops", | 826 | "*_probe", \ |
824 | "*_probe", | 827 | "*_probe_one", \ |
825 | "*_probe_one", | 828 | "*_console" |
826 | "*_console", | ||
827 | NULL | ||
828 | }; | ||
829 | 829 | ||
830 | static const char *head_sections[] = { ".head.text*", NULL }; | 830 | static const char *head_sections[] = { ".head.text*", NULL }; |
831 | static const char *linker_symbols[] = | 831 | static const char *linker_symbols[] = |
832 | { "__init_begin", "_sinittext", "_einittext", NULL }; | 832 | { "__init_begin", "_sinittext", "_einittext", NULL }; |
833 | 833 | ||
834 | enum mismatch { | 834 | enum mismatch { |
835 | NO_MISMATCH, | 835 | TEXT_TO_ANY_INIT, |
836 | TEXT_TO_INIT, | 836 | DATA_TO_ANY_INIT, |
837 | DATA_TO_INIT, | 837 | TEXT_TO_ANY_EXIT, |
838 | TEXT_TO_EXIT, | 838 | DATA_TO_ANY_EXIT, |
839 | DATA_TO_EXIT, | 839 | XXXINIT_TO_SOME_INIT, |
840 | XXXINIT_TO_INIT, | 840 | XXXEXIT_TO_SOME_EXIT, |
841 | XXXEXIT_TO_EXIT, | 841 | ANY_INIT_TO_ANY_EXIT, |
842 | INIT_TO_EXIT, | 842 | ANY_EXIT_TO_ANY_INIT, |
843 | EXIT_TO_INIT, | ||
844 | EXPORT_TO_INIT_EXIT, | 843 | EXPORT_TO_INIT_EXIT, |
845 | }; | 844 | }; |
846 | 845 | ||
@@ -848,6 +847,7 @@ struct sectioncheck { | |||
848 | const char *fromsec[20]; | 847 | const char *fromsec[20]; |
849 | const char *tosec[20]; | 848 | const char *tosec[20]; |
850 | enum mismatch mismatch; | 849 | enum mismatch mismatch; |
850 | const char *symbol_white_list[20]; | ||
851 | }; | 851 | }; |
852 | 852 | ||
853 | const struct sectioncheck sectioncheck[] = { | 853 | const struct sectioncheck sectioncheck[] = { |
@@ -857,80 +857,103 @@ const struct sectioncheck sectioncheck[] = { | |||
857 | { | 857 | { |
858 | .fromsec = { TEXT_SECTIONS, NULL }, | 858 | .fromsec = { TEXT_SECTIONS, NULL }, |
859 | .tosec = { ALL_INIT_SECTIONS, NULL }, | 859 | .tosec = { ALL_INIT_SECTIONS, NULL }, |
860 | .mismatch = TEXT_TO_INIT, | 860 | .mismatch = TEXT_TO_ANY_INIT, |
861 | .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL }, | ||
861 | }, | 862 | }, |
862 | { | 863 | { |
863 | .fromsec = { DATA_SECTIONS, NULL }, | 864 | .fromsec = { DATA_SECTIONS, NULL }, |
864 | .tosec = { ALL_INIT_SECTIONS, NULL }, | 865 | .tosec = { ALL_XXXINIT_SECTIONS, NULL }, |
865 | .mismatch = DATA_TO_INIT, | 866 | .mismatch = DATA_TO_ANY_INIT, |
867 | .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL }, | ||
868 | }, | ||
869 | { | ||
870 | .fromsec = { DATA_SECTIONS, NULL }, | ||
871 | .tosec = { INIT_SECTIONS, NULL }, | ||
872 | .mismatch = DATA_TO_ANY_INIT, | ||
873 | .symbol_white_list = { | ||
874 | "*_template", "*_timer", "*_sht", "*_ops", | ||
875 | "*_probe", "*_probe_one", "*_console", NULL | ||
876 | }, | ||
866 | }, | 877 | }, |
867 | { | 878 | { |
868 | .fromsec = { TEXT_SECTIONS, NULL }, | 879 | .fromsec = { TEXT_SECTIONS, NULL }, |
869 | .tosec = { ALL_EXIT_SECTIONS, NULL }, | 880 | .tosec = { ALL_EXIT_SECTIONS, NULL }, |
870 | .mismatch = TEXT_TO_EXIT, | 881 | .mismatch = TEXT_TO_ANY_EXIT, |
882 | .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL }, | ||
871 | }, | 883 | }, |
872 | { | 884 | { |
873 | .fromsec = { DATA_SECTIONS, NULL }, | 885 | .fromsec = { DATA_SECTIONS, NULL }, |
874 | .tosec = { ALL_EXIT_SECTIONS, NULL }, | 886 | .tosec = { ALL_EXIT_SECTIONS, NULL }, |
875 | .mismatch = DATA_TO_EXIT, | 887 | .mismatch = DATA_TO_ANY_EXIT, |
888 | .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL }, | ||
876 | }, | 889 | }, |
877 | /* Do not reference init code/data from devinit/cpuinit/meminit code/data */ | 890 | /* Do not reference init code/data from devinit/cpuinit/meminit code/data */ |
878 | { | 891 | { |
879 | .fromsec = { DEV_INIT_SECTIONS, CPU_INIT_SECTIONS, MEM_INIT_SECTIONS, NULL }, | 892 | .fromsec = { ALL_XXXINIT_SECTIONS, NULL }, |
880 | .tosec = { INIT_SECTIONS, NULL }, | 893 | .tosec = { INIT_SECTIONS, NULL }, |
881 | .mismatch = XXXINIT_TO_INIT, | 894 | .mismatch = XXXINIT_TO_SOME_INIT, |
895 | .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL }, | ||
882 | }, | 896 | }, |
883 | /* Do not reference cpuinit code/data from meminit code/data */ | 897 | /* Do not reference cpuinit code/data from meminit code/data */ |
884 | { | 898 | { |
885 | .fromsec = { MEM_INIT_SECTIONS, NULL }, | 899 | .fromsec = { MEM_INIT_SECTIONS, NULL }, |
886 | .tosec = { CPU_INIT_SECTIONS, NULL }, | 900 | .tosec = { CPU_INIT_SECTIONS, NULL }, |
887 | .mismatch = XXXINIT_TO_INIT, | 901 | .mismatch = XXXINIT_TO_SOME_INIT, |
902 | .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL }, | ||
888 | }, | 903 | }, |
889 | /* Do not reference meminit code/data from cpuinit code/data */ | 904 | /* Do not reference meminit code/data from cpuinit code/data */ |
890 | { | 905 | { |
891 | .fromsec = { CPU_INIT_SECTIONS, NULL }, | 906 | .fromsec = { CPU_INIT_SECTIONS, NULL }, |
892 | .tosec = { MEM_INIT_SECTIONS, NULL }, | 907 | .tosec = { MEM_INIT_SECTIONS, NULL }, |
893 | .mismatch = XXXINIT_TO_INIT, | 908 | .mismatch = XXXINIT_TO_SOME_INIT, |
909 | .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL }, | ||
894 | }, | 910 | }, |
895 | /* Do not reference exit code/data from devexit/cpuexit/memexit code/data */ | 911 | /* Do not reference exit code/data from devexit/cpuexit/memexit code/data */ |
896 | { | 912 | { |
897 | .fromsec = { DEV_EXIT_SECTIONS, CPU_EXIT_SECTIONS, MEM_EXIT_SECTIONS, NULL }, | 913 | .fromsec = { ALL_XXXEXIT_SECTIONS, NULL }, |
898 | .tosec = { EXIT_SECTIONS, NULL }, | 914 | .tosec = { EXIT_SECTIONS, NULL }, |
899 | .mismatch = XXXEXIT_TO_EXIT, | 915 | .mismatch = XXXEXIT_TO_SOME_EXIT, |
916 | .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL }, | ||
900 | }, | 917 | }, |
901 | /* Do not reference cpuexit code/data from memexit code/data */ | 918 | /* Do not reference cpuexit code/data from memexit code/data */ |
902 | { | 919 | { |
903 | .fromsec = { MEM_EXIT_SECTIONS, NULL }, | 920 | .fromsec = { MEM_EXIT_SECTIONS, NULL }, |
904 | .tosec = { CPU_EXIT_SECTIONS, NULL }, | 921 | .tosec = { CPU_EXIT_SECTIONS, NULL }, |
905 | .mismatch = XXXEXIT_TO_EXIT, | 922 | .mismatch = XXXEXIT_TO_SOME_EXIT, |
923 | .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL }, | ||
906 | }, | 924 | }, |
907 | /* Do not reference memexit code/data from cpuexit code/data */ | 925 | /* Do not reference memexit code/data from cpuexit code/data */ |
908 | { | 926 | { |
909 | .fromsec = { CPU_EXIT_SECTIONS, NULL }, | 927 | .fromsec = { CPU_EXIT_SECTIONS, NULL }, |
910 | .tosec = { MEM_EXIT_SECTIONS, NULL }, | 928 | .tosec = { MEM_EXIT_SECTIONS, NULL }, |
911 | .mismatch = XXXEXIT_TO_EXIT, | 929 | .mismatch = XXXEXIT_TO_SOME_EXIT, |
930 | .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL }, | ||
912 | }, | 931 | }, |
913 | /* Do not use exit code/data from init code */ | 932 | /* Do not use exit code/data from init code */ |
914 | { | 933 | { |
915 | .fromsec = { ALL_INIT_SECTIONS, NULL }, | 934 | .fromsec = { ALL_INIT_SECTIONS, NULL }, |
916 | .tosec = { ALL_EXIT_SECTIONS, NULL }, | 935 | .tosec = { ALL_EXIT_SECTIONS, NULL }, |
917 | .mismatch = INIT_TO_EXIT, | 936 | .mismatch = ANY_INIT_TO_ANY_EXIT, |
937 | .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL }, | ||
918 | }, | 938 | }, |
919 | /* Do not use init code/data from exit code */ | 939 | /* Do not use init code/data from exit code */ |
920 | { | 940 | { |
921 | .fromsec = { ALL_EXIT_SECTIONS, NULL }, | 941 | .fromsec = { ALL_EXIT_SECTIONS, NULL }, |
922 | .tosec = { ALL_INIT_SECTIONS, NULL }, | 942 | .tosec = { ALL_INIT_SECTIONS, NULL }, |
923 | .mismatch = EXIT_TO_INIT, | 943 | .mismatch = ANY_EXIT_TO_ANY_INIT, |
944 | .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL }, | ||
924 | }, | 945 | }, |
925 | /* Do not export init/exit functions or data */ | 946 | /* Do not export init/exit functions or data */ |
926 | { | 947 | { |
927 | .fromsec = { "__ksymtab*", NULL }, | 948 | .fromsec = { "__ksymtab*", NULL }, |
928 | .tosec = { INIT_SECTIONS, EXIT_SECTIONS, NULL }, | 949 | .tosec = { INIT_SECTIONS, EXIT_SECTIONS, NULL }, |
929 | .mismatch = EXPORT_TO_INIT_EXIT | 950 | .mismatch = EXPORT_TO_INIT_EXIT, |
951 | .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL }, | ||
930 | } | 952 | } |
931 | }; | 953 | }; |
932 | 954 | ||
933 | static int section_mismatch(const char *fromsec, const char *tosec) | 955 | static const struct sectioncheck *section_mismatch( |
956 | const char *fromsec, const char *tosec) | ||
934 | { | 957 | { |
935 | int i; | 958 | int i; |
936 | int elems = sizeof(sectioncheck) / sizeof(struct sectioncheck); | 959 | int elems = sizeof(sectioncheck) / sizeof(struct sectioncheck); |
@@ -939,10 +962,10 @@ static int section_mismatch(const char *fromsec, const char *tosec) | |||
939 | for (i = 0; i < elems; i++) { | 962 | for (i = 0; i < elems; i++) { |
940 | if (match(fromsec, check->fromsec) && | 963 | if (match(fromsec, check->fromsec) && |
941 | match(tosec, check->tosec)) | 964 | match(tosec, check->tosec)) |
942 | return check->mismatch; | 965 | return check; |
943 | check++; | 966 | check++; |
944 | } | 967 | } |
945 | return NO_MISMATCH; | 968 | return NULL; |
946 | } | 969 | } |
947 | 970 | ||
948 | /** | 971 | /** |
@@ -961,7 +984,7 @@ static int section_mismatch(const char *fromsec, const char *tosec) | |||
961 | * Pattern 2: | 984 | * Pattern 2: |
962 | * Many drivers utilise a *driver container with references to | 985 | * Many drivers utilise a *driver container with references to |
963 | * add, remove, probe functions etc. | 986 | * add, remove, probe functions etc. |
964 | * These functions may often be marked __init and we do not want to | 987 | * These functions may often be marked __devinit and we do not want to |
965 | * warn here. | 988 | * warn here. |
966 | * the pattern is identified by: | 989 | * the pattern is identified by: |
967 | * tosec = init or exit section | 990 | * tosec = init or exit section |
@@ -982,7 +1005,8 @@ static int section_mismatch(const char *fromsec, const char *tosec) | |||
982 | * refsymname = __init_begin, _sinittext, _einittext | 1005 | * refsymname = __init_begin, _sinittext, _einittext |
983 | * | 1006 | * |
984 | **/ | 1007 | **/ |
985 | static int secref_whitelist(const char *fromsec, const char *fromsym, | 1008 | static int secref_whitelist(const struct sectioncheck *mismatch, |
1009 | const char *fromsec, const char *fromsym, | ||
986 | const char *tosec, const char *tosym) | 1010 | const char *tosec, const char *tosym) |
987 | { | 1011 | { |
988 | /* Check for pattern 1 */ | 1012 | /* Check for pattern 1 */ |
@@ -994,7 +1018,7 @@ static int secref_whitelist(const char *fromsec, const char *fromsym, | |||
994 | /* Check for pattern 2 */ | 1018 | /* Check for pattern 2 */ |
995 | if (match(tosec, init_exit_sections) && | 1019 | if (match(tosec, init_exit_sections) && |
996 | match(fromsec, data_sections) && | 1020 | match(fromsec, data_sections) && |
997 | match(fromsym, symbol_white_list)) | 1021 | match(fromsym, mismatch->symbol_white_list)) |
998 | return 0; | 1022 | return 0; |
999 | 1023 | ||
1000 | /* Check for pattern 3 */ | 1024 | /* Check for pattern 3 */ |
@@ -1155,7 +1179,8 @@ static int is_function(Elf_Sym *sym) | |||
1155 | * Try to find symbols near it so user can find it. | 1179 | * Try to find symbols near it so user can find it. |
1156 | * Check whitelist before warning - it may be a false positive. | 1180 | * Check whitelist before warning - it may be a false positive. |
1157 | */ | 1181 | */ |
1158 | static void report_sec_mismatch(const char *modname, enum mismatch mismatch, | 1182 | static void report_sec_mismatch(const char *modname, |
1183 | const struct sectioncheck *mismatch, | ||
1159 | const char *fromsec, | 1184 | const char *fromsec, |
1160 | unsigned long long fromaddr, | 1185 | unsigned long long fromaddr, |
1161 | const char *fromsym, | 1186 | const char *fromsym, |
@@ -1186,8 +1211,8 @@ static void report_sec_mismatch(const char *modname, enum mismatch mismatch, | |||
1186 | modname, fromsec, fromaddr, from, fromsym, from_p, to, tosec, | 1211 | modname, fromsec, fromaddr, from, fromsym, from_p, to, tosec, |
1187 | tosym, to_p); | 1212 | tosym, to_p); |
1188 | 1213 | ||
1189 | switch (mismatch) { | 1214 | switch (mismatch->mismatch) { |
1190 | case TEXT_TO_INIT: | 1215 | case TEXT_TO_ANY_INIT: |
1191 | fprintf(stderr, | 1216 | fprintf(stderr, |
1192 | "The function %s%s() references\n" | 1217 | "The function %s%s() references\n" |
1193 | "the %s %s%s%s.\n" | 1218 | "the %s %s%s%s.\n" |
@@ -1197,8 +1222,8 @@ static void report_sec_mismatch(const char *modname, enum mismatch mismatch, | |||
1197 | to, sec2annotation(tosec), tosym, to_p, | 1222 | to, sec2annotation(tosec), tosym, to_p, |
1198 | fromsym, sec2annotation(tosec), tosym); | 1223 | fromsym, sec2annotation(tosec), tosym); |
1199 | break; | 1224 | break; |
1200 | case DATA_TO_INIT: { | 1225 | case DATA_TO_ANY_INIT: { |
1201 | const char **s = symbol_white_list; | 1226 | const char *const *s = mismatch->symbol_white_list; |
1202 | fprintf(stderr, | 1227 | fprintf(stderr, |
1203 | "The variable %s references\n" | 1228 | "The variable %s references\n" |
1204 | "the %s %s%s%s\n" | 1229 | "the %s %s%s%s\n" |
@@ -1211,15 +1236,15 @@ static void report_sec_mismatch(const char *modname, enum mismatch mismatch, | |||
1211 | fprintf(stderr, "\n"); | 1236 | fprintf(stderr, "\n"); |
1212 | break; | 1237 | break; |
1213 | } | 1238 | } |
1214 | case TEXT_TO_EXIT: | 1239 | case TEXT_TO_ANY_EXIT: |
1215 | fprintf(stderr, | 1240 | fprintf(stderr, |
1216 | "The function %s() references a %s in an exit section.\n" | 1241 | "The function %s() references a %s in an exit section.\n" |
1217 | "Often the %s %s%s has valid usage outside the exit section\n" | 1242 | "Often the %s %s%s has valid usage outside the exit section\n" |
1218 | "and the fix is to remove the %sannotation of %s.\n", | 1243 | "and the fix is to remove the %sannotation of %s.\n", |
1219 | fromsym, to, to, tosym, to_p, sec2annotation(tosec), tosym); | 1244 | fromsym, to, to, tosym, to_p, sec2annotation(tosec), tosym); |
1220 | break; | 1245 | break; |
1221 | case DATA_TO_EXIT: { | 1246 | case DATA_TO_ANY_EXIT: { |
1222 | const char **s = symbol_white_list; | 1247 | const char *const *s = mismatch->symbol_white_list; |
1223 | fprintf(stderr, | 1248 | fprintf(stderr, |
1224 | "The variable %s references\n" | 1249 | "The variable %s references\n" |
1225 | "the %s %s%s%s\n" | 1250 | "the %s %s%s%s\n" |
@@ -1232,8 +1257,8 @@ static void report_sec_mismatch(const char *modname, enum mismatch mismatch, | |||
1232 | fprintf(stderr, "\n"); | 1257 | fprintf(stderr, "\n"); |
1233 | break; | 1258 | break; |
1234 | } | 1259 | } |
1235 | case XXXINIT_TO_INIT: | 1260 | case XXXINIT_TO_SOME_INIT: |
1236 | case XXXEXIT_TO_EXIT: | 1261 | case XXXEXIT_TO_SOME_EXIT: |
1237 | fprintf(stderr, | 1262 | fprintf(stderr, |
1238 | "The %s %s%s%s references\n" | 1263 | "The %s %s%s%s references\n" |
1239 | "a %s %s%s%s.\n" | 1264 | "a %s %s%s%s.\n" |
@@ -1243,7 +1268,7 @@ static void report_sec_mismatch(const char *modname, enum mismatch mismatch, | |||
1243 | to, sec2annotation(tosec), tosym, to_p, | 1268 | to, sec2annotation(tosec), tosym, to_p, |
1244 | tosym, fromsym, tosym); | 1269 | tosym, fromsym, tosym); |
1245 | break; | 1270 | break; |
1246 | case INIT_TO_EXIT: | 1271 | case ANY_INIT_TO_ANY_EXIT: |
1247 | fprintf(stderr, | 1272 | fprintf(stderr, |
1248 | "The %s %s%s%s references\n" | 1273 | "The %s %s%s%s references\n" |
1249 | "a %s %s%s%s.\n" | 1274 | "a %s %s%s%s.\n" |
@@ -1256,7 +1281,7 @@ static void report_sec_mismatch(const char *modname, enum mismatch mismatch, | |||
1256 | to, sec2annotation(tosec), tosym, to_p, | 1281 | to, sec2annotation(tosec), tosym, to_p, |
1257 | sec2annotation(tosec), tosym, to_p); | 1282 | sec2annotation(tosec), tosym, to_p); |
1258 | break; | 1283 | break; |
1259 | case EXIT_TO_INIT: | 1284 | case ANY_EXIT_TO_ANY_INIT: |
1260 | fprintf(stderr, | 1285 | fprintf(stderr, |
1261 | "The %s %s%s%s references\n" | 1286 | "The %s %s%s%s references\n" |
1262 | "a %s %s%s%s.\n" | 1287 | "a %s %s%s%s.\n" |
@@ -1275,8 +1300,6 @@ static void report_sec_mismatch(const char *modname, enum mismatch mismatch, | |||
1275 | "Fix this by removing the %sannotation of %s " | 1300 | "Fix this by removing the %sannotation of %s " |
1276 | "or drop the export.\n", | 1301 | "or drop the export.\n", |
1277 | tosym, sec2annotation(tosec), sec2annotation(tosec), tosym); | 1302 | tosym, sec2annotation(tosec), sec2annotation(tosec), tosym); |
1278 | case NO_MISMATCH: | ||
1279 | /* To get warnings on missing members */ | ||
1280 | break; | 1303 | break; |
1281 | } | 1304 | } |
1282 | fprintf(stderr, "\n"); | 1305 | fprintf(stderr, "\n"); |
@@ -1286,11 +1309,11 @@ static void check_section_mismatch(const char *modname, struct elf_info *elf, | |||
1286 | Elf_Rela *r, Elf_Sym *sym, const char *fromsec) | 1309 | Elf_Rela *r, Elf_Sym *sym, const char *fromsec) |
1287 | { | 1310 | { |
1288 | const char *tosec; | 1311 | const char *tosec; |
1289 | enum mismatch mismatch; | 1312 | const struct sectioncheck *mismatch; |
1290 | 1313 | ||
1291 | tosec = sec_name(elf, sym->st_shndx); | 1314 | tosec = sec_name(elf, sym->st_shndx); |
1292 | mismatch = section_mismatch(fromsec, tosec); | 1315 | mismatch = section_mismatch(fromsec, tosec); |
1293 | if (mismatch != NO_MISMATCH) { | 1316 | if (mismatch) { |
1294 | Elf_Sym *to; | 1317 | Elf_Sym *to; |
1295 | Elf_Sym *from; | 1318 | Elf_Sym *from; |
1296 | const char *tosym; | 1319 | const char *tosym; |
@@ -1302,7 +1325,8 @@ static void check_section_mismatch(const char *modname, struct elf_info *elf, | |||
1302 | tosym = sym_name(elf, to); | 1325 | tosym = sym_name(elf, to); |
1303 | 1326 | ||
1304 | /* check whitelist - we may ignore it */ | 1327 | /* check whitelist - we may ignore it */ |
1305 | if (secref_whitelist(fromsec, fromsym, tosec, tosym)) { | 1328 | if (secref_whitelist(mismatch, |
1329 | fromsec, fromsym, tosec, tosym)) { | ||
1306 | report_sec_mismatch(modname, mismatch, | 1330 | report_sec_mismatch(modname, mismatch, |
1307 | fromsec, r->r_offset, fromsym, | 1331 | fromsec, r->r_offset, fromsym, |
1308 | is_function(from), tosec, tosym, | 1332 | is_function(from), tosec, tosym, |
diff --git a/scripts/namespace.pl b/scripts/namespace.pl index c6e88c652c2..361d0f71184 100755 --- a/scripts/namespace.pl +++ b/scripts/namespace.pl | |||
@@ -175,12 +175,11 @@ sub do_nm | |||
175 | } | 175 | } |
176 | if (! -e "$source.c" && ! -e "$source.S") { | 176 | if (! -e "$source.c" && ! -e "$source.S") { |
177 | # No obvious source, exclude the object if it is conglomerate | 177 | # No obvious source, exclude the object if it is conglomerate |
178 | if (! open(OBJDUMPDATA, "$objdump $basename|")) { | 178 | open(my $objdumpdata, "$objdump $basename|") |
179 | printf STDERR "$objdump $fullname failed $!\n"; | 179 | or die "$objdump $fullname failed $!\n"; |
180 | return; | 180 | |
181 | } | ||
182 | my $comment; | 181 | my $comment; |
183 | while (<OBJDUMPDATA>) { | 182 | while (<$objdumpdata>) { |
184 | chomp(); | 183 | chomp(); |
185 | if (/^In archive/) { | 184 | if (/^In archive/) { |
186 | # Archives are always conglomerate | 185 | # Archives are always conglomerate |
@@ -190,18 +189,18 @@ sub do_nm | |||
190 | next if (! /^[ 0-9a-f]{5,} /); | 189 | next if (! /^[ 0-9a-f]{5,} /); |
191 | $comment .= substr($_, 43); | 190 | $comment .= substr($_, 43); |
192 | } | 191 | } |
193 | close(OBJDUMPDATA); | 192 | close($objdumpdata); |
193 | |||
194 | if (!defined($comment) || $comment !~ /GCC\:.*GCC\:/m) { | 194 | if (!defined($comment) || $comment !~ /GCC\:.*GCC\:/m) { |
195 | printf STDERR "No source file found for $fullname\n"; | 195 | printf STDERR "No source file found for $fullname\n"; |
196 | } | 196 | } |
197 | return; | 197 | return; |
198 | } | 198 | } |
199 | if (! open(NMDATA, "$nm $basename|")) { | 199 | open (my $nmdata, "$nm $basename|") |
200 | printf STDERR "$nm $fullname failed $!\n"; | 200 | or die "$nm $fullname failed $!\n"; |
201 | return; | 201 | |
202 | } | ||
203 | my @nmdata; | 202 | my @nmdata; |
204 | while (<NMDATA>) { | 203 | while (<$nmdata>) { |
205 | chop; | 204 | chop; |
206 | ($type, $name) = (split(/ +/, $_, 3))[1..2]; | 205 | ($type, $name) = (split(/ +/, $_, 3))[1..2]; |
207 | # Expected types | 206 | # Expected types |
@@ -268,7 +267,8 @@ sub do_nm | |||
268 | } | 267 | } |
269 | } | 268 | } |
270 | } | 269 | } |
271 | close(NMDATA); | 270 | close($nmdata); |
271 | |||
272 | if ($#nmdata < 0) { | 272 | if ($#nmdata < 0) { |
273 | if ( | 273 | if ( |
274 | $fullname ne "lib/brlock.o" | 274 | $fullname ne "lib/brlock.o" |
@@ -316,8 +316,7 @@ sub drop_def | |||
316 | 316 | ||
317 | sub list_multiply_defined | 317 | sub list_multiply_defined |
318 | { | 318 | { |
319 | my ($name, $module); | 319 | foreach my $name (keys(%def)) { |
320 | foreach $name (keys(%def)) { | ||
321 | if ($#{$def{$name}} > 0) { | 320 | if ($#{$def{$name}} > 0) { |
322 | # Special case for cond_syscall | 321 | # Special case for cond_syscall |
323 | if ($#{$def{$name}} == 1 && $name =~ /^sys_/ && | 322 | if ($#{$def{$name}} == 1 && $name =~ /^sys_/ && |
@@ -333,8 +332,9 @@ sub list_multiply_defined | |||
333 | &drop_def("arch/x86/kernel/vsyscall-sysenter_32.o", $name); | 332 | &drop_def("arch/x86/kernel/vsyscall-sysenter_32.o", $name); |
334 | next; | 333 | next; |
335 | } | 334 | } |
335 | |||
336 | printf "$name is multiply defined in :-\n"; | 336 | printf "$name is multiply defined in :-\n"; |
337 | foreach $module (@{$def{$name}}) { | 337 | foreach my $module (@{$def{$name}}) { |
338 | printf "\t$module\n"; | 338 | printf "\t$module\n"; |
339 | } | 339 | } |
340 | } | 340 | } |
@@ -343,12 +343,13 @@ sub list_multiply_defined | |||
343 | 343 | ||
344 | sub resolve_external_references | 344 | sub resolve_external_references |
345 | { | 345 | { |
346 | my ($object, $type, $name, $i, $j, $kstrtab, $ksymtab, $export); | 346 | my ($kstrtab, $ksymtab, $export); |
347 | |||
347 | printf "\n"; | 348 | printf "\n"; |
348 | foreach $object (keys(%nmdata)) { | 349 | foreach my $object (keys(%nmdata)) { |
349 | my $nmdata = $nmdata{$object}; | 350 | my $nmdata = $nmdata{$object}; |
350 | for ($i = 0; $i <= $#{$nmdata}; ++$i) { | 351 | for (my $i = 0; $i <= $#{$nmdata}; ++$i) { |
351 | ($type, $name) = split(' ', $nmdata->[$i], 2); | 352 | my ($type, $name) = split(' ', $nmdata->[$i], 2); |
352 | if ($type eq "U" || $type eq "w") { | 353 | if ($type eq "U" || $type eq "w") { |
353 | if (exists($def{$name}) || exists($ksymtab{$name})) { | 354 | if (exists($def{$name}) || exists($ksymtab{$name})) { |
354 | # add the owning object to the nmdata | 355 | # add the owning object to the nmdata |
@@ -357,7 +358,7 @@ sub resolve_external_references | |||
357 | $kstrtab = "R __kstrtab_$name"; | 358 | $kstrtab = "R __kstrtab_$name"; |
358 | $ksymtab = "R __ksymtab_$name"; | 359 | $ksymtab = "R __ksymtab_$name"; |
359 | $export = 0; | 360 | $export = 0; |
360 | for ($j = 0; $j <= $#{$nmdata}; ++$j) { | 361 | for (my $j = 0; $j <= $#{$nmdata}; ++$j) { |
361 | if ($nmdata->[$j] eq $kstrtab || | 362 | if ($nmdata->[$j] eq $kstrtab || |
362 | $nmdata->[$j] eq $ksymtab) { | 363 | $nmdata->[$j] eq $ksymtab) { |
363 | $export = 1; | 364 | $export = 1; |
@@ -424,11 +425,11 @@ sub resolve_external_references | |||
424 | sub list_extra_externals | 425 | sub list_extra_externals |
425 | { | 426 | { |
426 | my %noref = (); | 427 | my %noref = (); |
427 | my ($name, @module, $module, $export); | 428 | |
428 | foreach $name (keys(%def)) { | 429 | foreach my $name (keys(%def)) { |
429 | if (! exists($ref{$name})) { | 430 | if (! exists($ref{$name})) { |
430 | @module = @{$def{$name}}; | 431 | my @module = @{$def{$name}}; |
431 | foreach $module (@module) { | 432 | foreach my $module (@module) { |
432 | if (! exists($noref{$module})) { | 433 | if (! exists($noref{$module})) { |
433 | $noref{$module} = []; | 434 | $noref{$module} = []; |
434 | } | 435 | } |
@@ -438,16 +439,16 @@ sub list_extra_externals | |||
438 | } | 439 | } |
439 | if (%noref) { | 440 | if (%noref) { |
440 | printf "\nExternally defined symbols with no external references\n"; | 441 | printf "\nExternally defined symbols with no external references\n"; |
441 | foreach $module (sort(keys(%noref))) { | 442 | foreach my $module (sort(keys(%noref))) { |
442 | printf " $module\n"; | 443 | printf " $module\n"; |
443 | foreach (sort(@{$noref{$module}})) { | 444 | foreach (sort(@{$noref{$module}})) { |
444 | if (exists($export{$_})) { | 445 | my $export; |
445 | $export = " (export only)"; | 446 | if (exists($export{$_})) { |
446 | } | 447 | $export = " (export only)"; |
447 | else { | 448 | } else { |
448 | $export = ""; | 449 | $export = ""; |
449 | } | 450 | } |
450 | printf " $_$export\n"; | 451 | printf " $_$export\n"; |
451 | } | 452 | } |
452 | } | 453 | } |
453 | } | 454 | } |
diff --git a/scripts/package/builddeb b/scripts/package/builddeb index 8b357b0bd25..07f2fbde2ab 100644 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb | |||
@@ -18,6 +18,8 @@ create_package() { | |||
18 | cp debian/copyright "$pdir/usr/share/doc/$pname/" | 18 | cp debian/copyright "$pdir/usr/share/doc/$pname/" |
19 | cp debian/changelog "$pdir/usr/share/doc/$pname/changelog.Debian" | 19 | cp debian/changelog "$pdir/usr/share/doc/$pname/changelog.Debian" |
20 | gzip -9 "$pdir/usr/share/doc/$pname/changelog.Debian" | 20 | gzip -9 "$pdir/usr/share/doc/$pname/changelog.Debian" |
21 | sh -c "cd '$pdir'; find . -type f ! -path './DEBIAN/*' -printf '%P\0' \ | ||
22 | | xargs -r0 md5sum > DEBIAN/md5sums" | ||
21 | 23 | ||
22 | # Fix ownership and permissions | 24 | # Fix ownership and permissions |
23 | chown -R root:root "$pdir" | 25 | chown -R root:root "$pdir" |
diff --git a/scripts/package/mkspec b/scripts/package/mkspec index fa27f3dac76..15440f55aef 100755 --- a/scripts/package/mkspec +++ b/scripts/package/mkspec | |||
@@ -39,7 +39,7 @@ if ! $PREBUILT; then | |||
39 | echo "Source: kernel-$__KERNELRELEASE.tar.gz" | 39 | echo "Source: kernel-$__KERNELRELEASE.tar.gz" |
40 | fi | 40 | fi |
41 | 41 | ||
42 | echo "BuildRoot: /var/tmp/%{name}-%{PACKAGE_VERSION}-root" | 42 | echo "BuildRoot: %{_tmppath}/%{name}-%{PACKAGE_VERSION}-root" |
43 | echo "Provides: $PROVIDES" | 43 | echo "Provides: $PROVIDES" |
44 | echo "%define __spec_install_post /usr/lib/rpm/brp-compress || :" | 44 | echo "%define __spec_install_post /usr/lib/rpm/brp-compress || :" |
45 | echo "%define debug_package %{nil}" | 45 | echo "%define debug_package %{nil}" |
diff --git a/scripts/profile2linkerlist.pl b/scripts/profile2linkerlist.pl index cb4260ebdb9..6943fa7cc95 100644 --- a/scripts/profile2linkerlist.pl +++ b/scripts/profile2linkerlist.pl | |||
@@ -7,15 +7,13 @@ | |||
7 | # usage: | 7 | # usage: |
8 | # readprofile | sort -rn | perl profile2linkerlist.pl > functionlist | 8 | # readprofile | sort -rn | perl profile2linkerlist.pl > functionlist |
9 | # | 9 | # |
10 | use strict; | ||
10 | 11 | ||
11 | while (<>) { | 12 | while (<>) { |
12 | my $line = $_; | 13 | my $line = $_; |
13 | 14 | ||
14 | $_ =~ /\W*[0-9]+\W*([a-zA-Z\_0-9]+)\W*[0-9]+/; | 15 | $_ =~ /\W*[0-9]+\W*([a-zA-Z\_0-9]+)\W*[0-9]+/; |
15 | 16 | ||
16 | if ( ($line =~ /unknown/) || ($line =~ /total/)) { | 17 | print "*(.text.$1)\n" |
17 | 18 | unless ($line =~ /unknown/) || ($line =~ /total/); | |
18 | } else { | ||
19 | print "*(.text.$1)\n"; | ||
20 | } | ||
21 | } | 19 | } |
diff --git a/scripts/rt-tester/rt-tester.py b/scripts/rt-tester/rt-tester.py index 4c79660793c..44423b4dcb8 100644 --- a/scripts/rt-tester/rt-tester.py +++ b/scripts/rt-tester/rt-tester.py | |||
@@ -1,4 +1,4 @@ | |||
1 | #!/usr/bin/env python | 1 | #!/usr/bin/python |
2 | # | 2 | # |
3 | # rt-mutex tester | 3 | # rt-mutex tester |
4 | # | 4 | # |
diff --git a/scripts/show_delta b/scripts/show_delta index 48a706ab3d0..17df3051747 100755 --- a/scripts/show_delta +++ b/scripts/show_delta | |||
@@ -1,4 +1,4 @@ | |||
1 | #!/usr/bin/env python | 1 | #!/usr/bin/python |
2 | # | 2 | # |
3 | # show_deltas: Read list of printk messages instrumented with | 3 | # show_deltas: Read list of printk messages instrumented with |
4 | # time data, and format with time deltas. | 4 | # time data, and format with time deltas. |
diff --git a/scripts/tags.sh b/scripts/tags.sh index 1a0c44d7c4a..8509bb51293 100755 --- a/scripts/tags.sh +++ b/scripts/tags.sh | |||
@@ -5,7 +5,7 @@ | |||
5 | # mode may be any of: tags, TAGS, cscope | 5 | # mode may be any of: tags, TAGS, cscope |
6 | # | 6 | # |
7 | # Uses the following environment variables: | 7 | # Uses the following environment variables: |
8 | # ARCH, SUBARCH, srctree, src, obj | 8 | # ARCH, SUBARCH, SRCARCH, srctree, src, obj |
9 | 9 | ||
10 | if [ "$KBUILD_VERBOSE" = "1" ]; then | 10 | if [ "$KBUILD_VERBOSE" = "1" ]; then |
11 | set -x | 11 | set -x |
@@ -17,28 +17,48 @@ ignore="( -name SCCS -o -name BitKeeper -o -name .svn -o \ | |||
17 | -name .git ) \ | 17 | -name .git ) \ |
18 | -prune -o" | 18 | -prune -o" |
19 | 19 | ||
20 | # Do not use full path is we do not use O=.. builds | 20 | # Do not use full path if we do not use O=.. builds |
21 | # Use make O=. {tags|cscope} | ||
22 | # to force full paths for a non-O= build | ||
21 | if [ "${KBUILD_SRC}" = "" ]; then | 23 | if [ "${KBUILD_SRC}" = "" ]; then |
22 | tree= | 24 | tree= |
23 | else | 25 | else |
24 | tree=${srctree}/ | 26 | tree=${srctree}/ |
25 | fi | 27 | fi |
26 | 28 | ||
29 | # Find all available archs | ||
30 | find_all_archs() | ||
31 | { | ||
32 | ALLSOURCE_ARCHS="" | ||
33 | for arch in `ls ${tree}arch`; do | ||
34 | ALLSOURCE_ARCHS="${ALLSOURCE_ARCHS} "${arch##\/} | ||
35 | done | ||
36 | } | ||
37 | |||
27 | # Detect if ALLSOURCE_ARCHS is set. If not, we assume SRCARCH | 38 | # Detect if ALLSOURCE_ARCHS is set. If not, we assume SRCARCH |
28 | if [ "${ALLSOURCE_ARCHS}" = "" ]; then | 39 | if [ "${ALLSOURCE_ARCHS}" = "" ]; then |
29 | ALLSOURCE_ARCHS=${SRCARCH} | 40 | ALLSOURCE_ARCHS=${SRCARCH} |
41 | elif [ "${ALLSOURCE_ARCHS}" = "all" ]; then | ||
42 | find_all_archs | ||
30 | fi | 43 | fi |
31 | 44 | ||
32 | # find sources in arch/$ARCH | 45 | # find sources in arch/$ARCH |
33 | find_arch_sources() | 46 | find_arch_sources() |
34 | { | 47 | { |
35 | find ${tree}arch/$1 $ignore -name "$2" -print; | 48 | for i in $archincludedir; do |
49 | prune="$prune -wholename $i -prune -o" | ||
50 | done | ||
51 | find ${tree}arch/$1 $ignore $prune -name "$2" -print; | ||
36 | } | 52 | } |
37 | 53 | ||
38 | # find sources in arch/$1/include | 54 | # find sources in arch/$1/include |
39 | find_arch_include_sources() | 55 | find_arch_include_sources() |
40 | { | 56 | { |
41 | find ${tree}arch/$1/include $ignore -name "$2" -print; | 57 | include=$(find ${tree}arch/$1/ -name include -type d); |
58 | if [ -n "$include" ]; then | ||
59 | archincludedir="$archincludedir $include" | ||
60 | find $include $ignore -name "$2" -print; | ||
61 | fi | ||
42 | } | 62 | } |
43 | 63 | ||
44 | # find sources in include/ | 64 | # find sources in include/ |
@@ -63,14 +83,15 @@ find_sources() | |||
63 | 83 | ||
64 | all_sources() | 84 | all_sources() |
65 | { | 85 | { |
66 | for arch in $ALLSOURCE_ARCHS | 86 | find_arch_include_sources ${SRCARCH} '*.[chS]' |
67 | do | ||
68 | find_sources $arch '*.[chS]' | ||
69 | done | ||
70 | if [ ! -z "$archinclude" ]; then | 87 | if [ ! -z "$archinclude" ]; then |
71 | find_arch_include_sources $archinclude '*.[chS]' | 88 | find_arch_include_sources $archinclude '*.[chS]' |
72 | fi | 89 | fi |
73 | find_include_sources '*.[chS]' | 90 | find_include_sources '*.[chS]' |
91 | for arch in $ALLSOURCE_ARCHS | ||
92 | do | ||
93 | find_sources $arch '*.[chS]' | ||
94 | done | ||
74 | find_other_sources '*.[chS]' | 95 | find_other_sources '*.[chS]' |
75 | } | 96 | } |
76 | 97 | ||
@@ -89,13 +110,7 @@ all_defconfigs() | |||
89 | 110 | ||
90 | docscope() | 111 | docscope() |
91 | { | 112 | { |
92 | # always use absolute paths for cscope, as recommended by cscope | 113 | (echo \-k; echo \-q; all_sources) > cscope.files |
93 | # upstream | ||
94 | case "$tree" in | ||
95 | /*) ;; | ||
96 | *) tree=$PWD/$tree ;; | ||
97 | esac | ||
98 | (cd /; echo \-k; echo \-q; all_sources) > cscope.files | ||
99 | cscope -b -f cscope.out | 114 | cscope -b -f cscope.out |
100 | } | 115 | } |
101 | 116 | ||
diff --git a/sound/aoa/soundbus/i2sbus/core.c b/sound/aoa/soundbus/i2sbus/core.c index 67893372173..3ff8cc5f487 100644 --- a/sound/aoa/soundbus/i2sbus/core.c +++ b/sound/aoa/soundbus/i2sbus/core.c | |||
@@ -437,9 +437,11 @@ static int i2sbus_shutdown(struct macio_dev* dev) | |||
437 | } | 437 | } |
438 | 438 | ||
439 | static struct macio_driver i2sbus_drv = { | 439 | static struct macio_driver i2sbus_drv = { |
440 | .name = "soundbus-i2s", | 440 | .driver = { |
441 | .owner = THIS_MODULE, | 441 | .name = "soundbus-i2s", |
442 | .match_table = i2sbus_match, | 442 | .owner = THIS_MODULE, |
443 | .of_match_table = i2sbus_match, | ||
444 | }, | ||
443 | .probe = i2sbus_probe, | 445 | .probe = i2sbus_probe, |
444 | .remove = i2sbus_remove, | 446 | .remove = i2sbus_remove, |
445 | #ifdef CONFIG_PM | 447 | #ifdef CONFIG_PM |
diff --git a/sound/pci/asihpi/asihpi.c b/sound/pci/asihpi/asihpi.c index f74c7372b3d..1db586af4f9 100644 --- a/sound/pci/asihpi/asihpi.c +++ b/sound/pci/asihpi/asihpi.c | |||
@@ -2578,6 +2578,9 @@ static int __devinit snd_card_asihpi_mixer_new(struct snd_card_asihpi *asihpi) | |||
2578 | if (err) | 2578 | if (err) |
2579 | return -err; | 2579 | return -err; |
2580 | 2580 | ||
2581 | memset(&prev_ctl, 0, sizeof(prev_ctl)); | ||
2582 | prev_ctl.control_type = -1; | ||
2583 | |||
2581 | for (idx = 0; idx < 2000; idx++) { | 2584 | for (idx = 0; idx < 2000; idx++) { |
2582 | err = hpi_mixer_get_control_by_index( | 2585 | err = hpi_mixer_get_control_by_index( |
2583 | ss, asihpi->h_mixer, | 2586 | ss, asihpi->h_mixer, |
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index dc79564fea3..1df25cf5ce3 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c | |||
@@ -1913,11 +1913,11 @@ static int azx_position_ok(struct azx *chip, struct azx_dev *azx_dev) | |||
1913 | if (WARN_ONCE(!azx_dev->period_bytes, | 1913 | if (WARN_ONCE(!azx_dev->period_bytes, |
1914 | "hda-intel: zero azx_dev->period_bytes")) | 1914 | "hda-intel: zero azx_dev->period_bytes")) |
1915 | return -1; /* this shouldn't happen! */ | 1915 | return -1; /* this shouldn't happen! */ |
1916 | if (wallclk <= azx_dev->period_wallclk && | 1916 | if (wallclk < (azx_dev->period_wallclk * 5) / 4 && |
1917 | pos % azx_dev->period_bytes > azx_dev->period_bytes / 2) | 1917 | pos % azx_dev->period_bytes > azx_dev->period_bytes / 2) |
1918 | /* NG - it's below the first next period boundary */ | 1918 | /* NG - it's below the first next period boundary */ |
1919 | return bdl_pos_adj[chip->dev_index] ? 0 : -1; | 1919 | return bdl_pos_adj[chip->dev_index] ? 0 : -1; |
1920 | azx_dev->start_wallclk = wallclk; | 1920 | azx_dev->start_wallclk += wallclk; |
1921 | return 1; /* OK, it's fine */ | 1921 | return 1; /* OK, it's fine */ |
1922 | } | 1922 | } |
1923 | 1923 | ||
@@ -2288,6 +2288,8 @@ static struct snd_pci_quirk position_fix_list[] __devinitdata = { | |||
2288 | SND_PCI_QUIRK(0x1028, 0x01f6, "Dell Latitude 131L", POS_FIX_LPIB), | 2288 | SND_PCI_QUIRK(0x1028, 0x01f6, "Dell Latitude 131L", POS_FIX_LPIB), |
2289 | SND_PCI_QUIRK(0x103c, 0x306d, "HP dv3", POS_FIX_LPIB), | 2289 | SND_PCI_QUIRK(0x103c, 0x306d, "HP dv3", POS_FIX_LPIB), |
2290 | SND_PCI_QUIRK(0x1043, 0x813d, "ASUS P5AD2", POS_FIX_LPIB), | 2290 | SND_PCI_QUIRK(0x1043, 0x813d, "ASUS P5AD2", POS_FIX_LPIB), |
2291 | SND_PCI_QUIRK(0x1043, 0x81b3, "ASUS", POS_FIX_LPIB), | ||
2292 | SND_PCI_QUIRK(0x1043, 0x81e7, "ASUS M2V", POS_FIX_LPIB), | ||
2291 | SND_PCI_QUIRK(0x104d, 0x9069, "Sony VPCS11V9E", POS_FIX_LPIB), | 2293 | SND_PCI_QUIRK(0x104d, 0x9069, "Sony VPCS11V9E", POS_FIX_LPIB), |
2292 | SND_PCI_QUIRK(0x1106, 0x3288, "ASUS M2V-MX SE", POS_FIX_LPIB), | 2294 | SND_PCI_QUIRK(0x1106, 0x3288, "ASUS M2V-MX SE", POS_FIX_LPIB), |
2293 | SND_PCI_QUIRK(0x1179, 0xff10, "Toshiba A100-259", POS_FIX_LPIB), | 2295 | SND_PCI_QUIRK(0x1179, 0xff10, "Toshiba A100-259", POS_FIX_LPIB), |
@@ -2296,6 +2298,7 @@ static struct snd_pci_quirk position_fix_list[] __devinitdata = { | |||
2296 | SND_PCI_QUIRK(0x1462, 0x1002, "MSI Wind U115", POS_FIX_LPIB), | 2298 | SND_PCI_QUIRK(0x1462, 0x1002, "MSI Wind U115", POS_FIX_LPIB), |
2297 | SND_PCI_QUIRK(0x1565, 0x820f, "Biostar Microtech", POS_FIX_LPIB), | 2299 | SND_PCI_QUIRK(0x1565, 0x820f, "Biostar Microtech", POS_FIX_LPIB), |
2298 | SND_PCI_QUIRK(0x1565, 0x8218, "Biostar Microtech", POS_FIX_LPIB), | 2300 | SND_PCI_QUIRK(0x1565, 0x8218, "Biostar Microtech", POS_FIX_LPIB), |
2301 | SND_PCI_QUIRK(0x1849, 0x0888, "775Dual-VSTA", POS_FIX_LPIB), | ||
2299 | SND_PCI_QUIRK(0x8086, 0x2503, "DG965OT AAD63733-203", POS_FIX_LPIB), | 2302 | SND_PCI_QUIRK(0x8086, 0x2503, "DG965OT AAD63733-203", POS_FIX_LPIB), |
2300 | SND_PCI_QUIRK(0x8086, 0xd601, "eMachines T5212", POS_FIX_LPIB), | 2303 | SND_PCI_QUIRK(0x8086, 0xd601, "eMachines T5212", POS_FIX_LPIB), |
2301 | {} | 2304 | {} |
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 17d4548cc35..d792cddbf4c 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
@@ -9476,6 +9476,7 @@ static struct snd_pci_quirk alc882_ssid_cfg_tbl[] = { | |||
9476 | SND_PCI_QUIRK(0x106b, 0x1000, "iMac 24", ALC885_IMAC24), | 9476 | SND_PCI_QUIRK(0x106b, 0x1000, "iMac 24", ALC885_IMAC24), |
9477 | SND_PCI_QUIRK(0x106b, 0x2800, "AppleTV", ALC885_IMAC24), | 9477 | SND_PCI_QUIRK(0x106b, 0x2800, "AppleTV", ALC885_IMAC24), |
9478 | SND_PCI_QUIRK(0x106b, 0x2c00, "MacbookPro rev3", ALC885_MBP3), | 9478 | SND_PCI_QUIRK(0x106b, 0x2c00, "MacbookPro rev3", ALC885_MBP3), |
9479 | SND_PCI_QUIRK(0x106b, 0x3000, "iMac", ALC889A_MB31), | ||
9479 | SND_PCI_QUIRK(0x106b, 0x3600, "Macbook 3,1", ALC889A_MB31), | 9480 | SND_PCI_QUIRK(0x106b, 0x3600, "Macbook 3,1", ALC889A_MB31), |
9480 | SND_PCI_QUIRK(0x106b, 0x3800, "MacbookPro 4,1", ALC885_MBP3), | 9481 | SND_PCI_QUIRK(0x106b, 0x3800, "MacbookPro 4,1", ALC885_MBP3), |
9481 | SND_PCI_QUIRK(0x106b, 0x3e00, "iMac 24 Aluminum", ALC885_IMAC24), | 9482 | SND_PCI_QUIRK(0x106b, 0x3e00, "iMac 24 Aluminum", ALC885_IMAC24), |
diff --git a/sound/soc/imx/Kconfig b/sound/soc/imx/Kconfig index eba9b9d257a..252defea93b 100644 --- a/sound/soc/imx/Kconfig +++ b/sound/soc/imx/Kconfig | |||
@@ -13,9 +13,18 @@ config SND_MXC_SOC_SSI | |||
13 | 13 | ||
14 | config SND_MXC_SOC_WM1133_EV1 | 14 | config SND_MXC_SOC_WM1133_EV1 |
15 | tristate "Audio on the the i.MX31ADS with WM1133-EV1 fitted" | 15 | tristate "Audio on the the i.MX31ADS with WM1133-EV1 fitted" |
16 | depends on SND_IMX_SOC && EXPERIMENTAL | 16 | depends on SND_IMX_SOC && MACH_MX31ADS_WM1133_EV1 && EXPERIMENTAL |
17 | select SND_SOC_WM8350 | 17 | select SND_SOC_WM8350 |
18 | select SND_MXC_SOC_SSI | 18 | select SND_MXC_SOC_SSI |
19 | help | 19 | help |
20 | Enable support for audio on the i.MX31ADS with the WM1133-EV1 | 20 | Enable support for audio on the i.MX31ADS with the WM1133-EV1 |
21 | PMIC board with WM8835x fitted. | 21 | PMIC board with WM8835x fitted. |
22 | |||
23 | config SND_SOC_PHYCORE_AC97 | ||
24 | tristate "SoC Audio support for Phytec phyCORE (and phyCARD) boards" | ||
25 | depends on MACH_PCM043 || MACH_PCA100 | ||
26 | select SND_MXC_SOC_SSI | ||
27 | select SND_SOC_WM9712 | ||
28 | help | ||
29 | Say Y if you want to add support for SoC audio on Phytec phyCORE | ||
30 | and phyCARD boards in AC97 mode | ||
diff --git a/sound/usb/Makefile b/sound/usb/Makefile index e7ac7f493a8..1e362bf8834 100644 --- a/sound/usb/Makefile +++ b/sound/usb/Makefile | |||
@@ -11,7 +11,8 @@ snd-usb-audio-objs := card.o \ | |||
11 | endpoint.o \ | 11 | endpoint.o \ |
12 | urb.o \ | 12 | urb.o \ |
13 | pcm.o \ | 13 | pcm.o \ |
14 | helper.o | 14 | helper.o \ |
15 | clock.o | ||
15 | 16 | ||
16 | snd-usbmidi-lib-objs := midi.o | 17 | snd-usbmidi-lib-objs := midi.o |
17 | 18 | ||
diff --git a/sound/usb/card.c b/sound/usb/card.c index da1346bd485..7a8ac1d81be 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c | |||
@@ -236,7 +236,6 @@ static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif) | |||
236 | } | 236 | } |
237 | 237 | ||
238 | case UAC_VERSION_2: { | 238 | case UAC_VERSION_2: { |
239 | struct uac_clock_source_descriptor *cs; | ||
240 | struct usb_interface_assoc_descriptor *assoc = | 239 | struct usb_interface_assoc_descriptor *assoc = |
241 | usb_ifnum_to_if(dev, ctrlif)->intf_assoc; | 240 | usb_ifnum_to_if(dev, ctrlif)->intf_assoc; |
242 | 241 | ||
@@ -245,21 +244,6 @@ static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif) | |||
245 | return -EINVAL; | 244 | return -EINVAL; |
246 | } | 245 | } |
247 | 246 | ||
248 | /* FIXME: for now, we expect there is at least one clock source | ||
249 | * descriptor and we always take the first one. | ||
250 | * We should properly support devices with multiple clock sources, | ||
251 | * clock selectors and sample rate conversion units. */ | ||
252 | |||
253 | cs = snd_usb_find_csint_desc(host_iface->extra, host_iface->extralen, | ||
254 | NULL, UAC2_CLOCK_SOURCE); | ||
255 | |||
256 | if (!cs) { | ||
257 | snd_printk(KERN_ERR "CLOCK_SOURCE descriptor not found\n"); | ||
258 | return -EINVAL; | ||
259 | } | ||
260 | |||
261 | chip->clock_id = cs->bClockID; | ||
262 | |||
263 | for (i = 0; i < assoc->bInterfaceCount; i++) { | 247 | for (i = 0; i < assoc->bInterfaceCount; i++) { |
264 | int intf = assoc->bFirstInterface + i; | 248 | int intf = assoc->bFirstInterface + i; |
265 | 249 | ||
@@ -481,6 +465,8 @@ static void *snd_usb_audio_probe(struct usb_device *dev, | |||
481 | goto __error; | 465 | goto __error; |
482 | } | 466 | } |
483 | 467 | ||
468 | chip->ctrl_intf = alts; | ||
469 | |||
484 | if (err > 0) { | 470 | if (err > 0) { |
485 | /* create normal USB audio interfaces */ | 471 | /* create normal USB audio interfaces */ |
486 | if (snd_usb_create_streams(chip, ifnum) < 0 || | 472 | if (snd_usb_create_streams(chip, ifnum) < 0 || |
diff --git a/sound/usb/card.h b/sound/usb/card.h index ed92420c109..1febf2f2375 100644 --- a/sound/usb/card.h +++ b/sound/usb/card.h | |||
@@ -25,6 +25,7 @@ struct audioformat { | |||
25 | unsigned int rate_min, rate_max; /* min/max rates */ | 25 | unsigned int rate_min, rate_max; /* min/max rates */ |
26 | unsigned int nr_rates; /* number of rate table entries */ | 26 | unsigned int nr_rates; /* number of rate table entries */ |
27 | unsigned int *rate_table; /* rate table */ | 27 | unsigned int *rate_table; /* rate table */ |
28 | unsigned char clock; /* associated clock */ | ||
28 | }; | 29 | }; |
29 | 30 | ||
30 | struct snd_usb_substream; | 31 | struct snd_usb_substream; |
diff --git a/sound/usb/clock.c b/sound/usb/clock.c new file mode 100644 index 00000000000..b7aadd614c7 --- /dev/null +++ b/sound/usb/clock.c | |||
@@ -0,0 +1,311 @@ | |||
1 | /* | ||
2 | * Clock domain and sample rate management functions | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License as published by | ||
6 | * the Free Software Foundation; either version 2 of the License, or | ||
7 | * (at your option) any later version. | ||
8 | * | ||
9 | * This program is distributed in the hope that it will be useful, | ||
10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
12 | * GNU General Public License for more details. | ||
13 | * | ||
14 | * You should have received a copy of the GNU General Public License | ||
15 | * along with this program; if not, write to the Free Software | ||
16 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
17 | * | ||
18 | */ | ||
19 | |||
20 | #include <linux/bitops.h> | ||
21 | #include <linux/init.h> | ||
22 | #include <linux/list.h> | ||
23 | #include <linux/slab.h> | ||
24 | #include <linux/string.h> | ||
25 | #include <linux/usb.h> | ||
26 | #include <linux/moduleparam.h> | ||
27 | #include <linux/mutex.h> | ||
28 | #include <linux/usb/audio.h> | ||
29 | #include <linux/usb/audio-v2.h> | ||
30 | |||
31 | #include <sound/core.h> | ||
32 | #include <sound/info.h> | ||
33 | #include <sound/pcm.h> | ||
34 | #include <sound/pcm_params.h> | ||
35 | #include <sound/initval.h> | ||
36 | |||
37 | #include "usbaudio.h" | ||
38 | #include "card.h" | ||
39 | #include "midi.h" | ||
40 | #include "mixer.h" | ||
41 | #include "proc.h" | ||
42 | #include "quirks.h" | ||
43 | #include "endpoint.h" | ||
44 | #include "helper.h" | ||
45 | #include "debug.h" | ||
46 | #include "pcm.h" | ||
47 | #include "urb.h" | ||
48 | #include "format.h" | ||
49 | |||
50 | static struct uac_clock_source_descriptor * | ||
51 | snd_usb_find_clock_source(struct usb_host_interface *ctrl_iface, | ||
52 | int clock_id) | ||
53 | { | ||
54 | struct uac_clock_source_descriptor *cs = NULL; | ||
55 | |||
56 | while ((cs = snd_usb_find_csint_desc(ctrl_iface->extra, | ||
57 | ctrl_iface->extralen, | ||
58 | cs, UAC2_CLOCK_SOURCE))) { | ||
59 | if (cs->bClockID == clock_id) | ||
60 | return cs; | ||
61 | } | ||
62 | |||
63 | return NULL; | ||
64 | } | ||
65 | |||
66 | static struct uac_clock_selector_descriptor * | ||
67 | snd_usb_find_clock_selector(struct usb_host_interface *ctrl_iface, | ||
68 | int clock_id) | ||
69 | { | ||
70 | struct uac_clock_selector_descriptor *cs = NULL; | ||
71 | |||
72 | while ((cs = snd_usb_find_csint_desc(ctrl_iface->extra, | ||
73 | ctrl_iface->extralen, | ||
74 | cs, UAC2_CLOCK_SELECTOR))) { | ||
75 | if (cs->bClockID == clock_id) | ||
76 | return cs; | ||
77 | } | ||
78 | |||
79 | return NULL; | ||
80 | } | ||
81 | |||
82 | static struct uac_clock_multiplier_descriptor * | ||
83 | snd_usb_find_clock_multiplier(struct usb_host_interface *ctrl_iface, | ||
84 | int clock_id) | ||
85 | { | ||
86 | struct uac_clock_multiplier_descriptor *cs = NULL; | ||
87 | |||
88 | while ((cs = snd_usb_find_csint_desc(ctrl_iface->extra, | ||
89 | ctrl_iface->extralen, | ||
90 | cs, UAC2_CLOCK_MULTIPLIER))) { | ||
91 | if (cs->bClockID == clock_id) | ||
92 | return cs; | ||
93 | } | ||
94 | |||
95 | return NULL; | ||
96 | } | ||
97 | |||
98 | static int uac_clock_selector_get_val(struct snd_usb_audio *chip, int selector_id) | ||
99 | { | ||
100 | unsigned char buf; | ||
101 | int ret; | ||
102 | |||
103 | ret = snd_usb_ctl_msg(chip->dev, usb_rcvctrlpipe(chip->dev, 0), | ||
104 | UAC2_CS_CUR, | ||
105 | USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN, | ||
106 | UAC2_CX_CLOCK_SELECTOR << 8, selector_id << 8, | ||
107 | &buf, sizeof(buf), 1000); | ||
108 | |||
109 | if (ret < 0) | ||
110 | return ret; | ||
111 | |||
112 | return buf; | ||
113 | } | ||
114 | |||
115 | static bool uac_clock_source_is_valid(struct snd_usb_audio *chip, int source_id) | ||
116 | { | ||
117 | int err; | ||
118 | unsigned char data; | ||
119 | struct usb_device *dev = chip->dev; | ||
120 | |||
121 | err = snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), UAC2_CS_CUR, | ||
122 | USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN, | ||
123 | UAC2_CS_CONTROL_CLOCK_VALID << 8, source_id << 8, | ||
124 | &data, sizeof(data), 1000); | ||
125 | |||
126 | if (err < 0) { | ||
127 | snd_printk(KERN_WARNING "%s(): cannot get clock validity for id %d\n", | ||
128 | __func__, source_id); | ||
129 | return err; | ||
130 | } | ||
131 | |||
132 | return !!data; | ||
133 | } | ||
134 | |||
135 | /* Try to find the clock source ID of a given clock entity */ | ||
136 | |||
137 | static int __uac_clock_find_source(struct snd_usb_audio *chip, | ||
138 | struct usb_host_interface *host_iface, | ||
139 | int entity_id, unsigned long *visited) | ||
140 | { | ||
141 | struct uac_clock_source_descriptor *source; | ||
142 | struct uac_clock_selector_descriptor *selector; | ||
143 | struct uac_clock_multiplier_descriptor *multiplier; | ||
144 | |||
145 | entity_id &= 0xff; | ||
146 | |||
147 | if (test_and_set_bit(entity_id, visited)) { | ||
148 | snd_printk(KERN_WARNING | ||
149 | "%s(): recursive clock topology detected, id %d.\n", | ||
150 | __func__, entity_id); | ||
151 | return -EINVAL; | ||
152 | } | ||
153 | |||
154 | /* first, see if the ID we're looking for is a clock source already */ | ||
155 | source = snd_usb_find_clock_source(host_iface, entity_id); | ||
156 | if (source) | ||
157 | return source->bClockID; | ||
158 | |||
159 | selector = snd_usb_find_clock_selector(host_iface, entity_id); | ||
160 | if (selector) { | ||
161 | int ret; | ||
162 | |||
163 | /* the entity ID we are looking for is a selector. | ||
164 | * find out what it currently selects */ | ||
165 | ret = uac_clock_selector_get_val(chip, selector->bClockID); | ||
166 | if (ret < 0) | ||
167 | return ret; | ||
168 | |||
169 | if (ret > selector->bNrInPins || ret < 1) { | ||
170 | printk(KERN_ERR | ||
171 | "%s(): selector reported illegal value, id %d, ret %d\n", | ||
172 | __func__, selector->bClockID, ret); | ||
173 | |||
174 | return -EINVAL; | ||
175 | } | ||
176 | |||
177 | return __uac_clock_find_source(chip, host_iface, | ||
178 | selector->baCSourceID[ret-1], | ||
179 | visited); | ||
180 | } | ||
181 | |||
182 | /* FIXME: multipliers only act as pass-thru element for now */ | ||
183 | multiplier = snd_usb_find_clock_multiplier(host_iface, entity_id); | ||
184 | if (multiplier) | ||
185 | return __uac_clock_find_source(chip, host_iface, | ||
186 | multiplier->bCSourceID, visited); | ||
187 | |||
188 | return -EINVAL; | ||
189 | } | ||
190 | |||
191 | int snd_usb_clock_find_source(struct snd_usb_audio *chip, | ||
192 | struct usb_host_interface *host_iface, | ||
193 | int entity_id) | ||
194 | { | ||
195 | DECLARE_BITMAP(visited, 256); | ||
196 | memset(visited, 0, sizeof(visited)); | ||
197 | return __uac_clock_find_source(chip, host_iface, entity_id, visited); | ||
198 | } | ||
199 | |||
200 | static int set_sample_rate_v1(struct snd_usb_audio *chip, int iface, | ||
201 | struct usb_host_interface *alts, | ||
202 | struct audioformat *fmt, int rate) | ||
203 | { | ||
204 | struct usb_device *dev = chip->dev; | ||
205 | unsigned int ep; | ||
206 | unsigned char data[3]; | ||
207 | int err, crate; | ||
208 | |||
209 | ep = get_endpoint(alts, 0)->bEndpointAddress; | ||
210 | |||
211 | /* if endpoint doesn't have sampling rate control, bail out */ | ||
212 | if (!(fmt->attributes & UAC_EP_CS_ATTR_SAMPLE_RATE)) { | ||
213 | snd_printk(KERN_WARNING "%d:%d:%d: endpoint lacks sample rate attribute bit, cannot set.\n", | ||
214 | dev->devnum, iface, fmt->altsetting); | ||
215 | return 0; | ||
216 | } | ||
217 | |||
218 | data[0] = rate; | ||
219 | data[1] = rate >> 8; | ||
220 | data[2] = rate >> 16; | ||
221 | if ((err = snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), UAC_SET_CUR, | ||
222 | USB_TYPE_CLASS | USB_RECIP_ENDPOINT | USB_DIR_OUT, | ||
223 | UAC_EP_CS_ATTR_SAMPLE_RATE << 8, ep, | ||
224 | data, sizeof(data), 1000)) < 0) { | ||
225 | snd_printk(KERN_ERR "%d:%d:%d: cannot set freq %d to ep %#x\n", | ||
226 | dev->devnum, iface, fmt->altsetting, rate, ep); | ||
227 | return err; | ||
228 | } | ||
229 | |||
230 | if ((err = snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), UAC_GET_CUR, | ||
231 | USB_TYPE_CLASS | USB_RECIP_ENDPOINT | USB_DIR_IN, | ||
232 | UAC_EP_CS_ATTR_SAMPLE_RATE << 8, ep, | ||
233 | data, sizeof(data), 1000)) < 0) { | ||
234 | snd_printk(KERN_WARNING "%d:%d:%d: cannot get freq at ep %#x\n", | ||
235 | dev->devnum, iface, fmt->altsetting, ep); | ||
236 | return 0; /* some devices don't support reading */ | ||
237 | } | ||
238 | |||
239 | crate = data[0] | (data[1] << 8) | (data[2] << 16); | ||
240 | if (crate != rate) { | ||
241 | snd_printd(KERN_WARNING "current rate %d is different from the runtime rate %d\n", crate, rate); | ||
242 | // runtime->rate = crate; | ||
243 | } | ||
244 | |||
245 | return 0; | ||
246 | } | ||
247 | |||
248 | static int set_sample_rate_v2(struct snd_usb_audio *chip, int iface, | ||
249 | struct usb_host_interface *alts, | ||
250 | struct audioformat *fmt, int rate) | ||
251 | { | ||
252 | struct usb_device *dev = chip->dev; | ||
253 | unsigned char data[4]; | ||
254 | int err, crate; | ||
255 | int clock = snd_usb_clock_find_source(chip, chip->ctrl_intf, fmt->clock); | ||
256 | |||
257 | if (clock < 0) | ||
258 | return clock; | ||
259 | |||
260 | if (!uac_clock_source_is_valid(chip, clock)) { | ||
261 | snd_printk(KERN_ERR "%d:%d:%d: clock source %d is not valid, cannot use\n", | ||
262 | dev->devnum, iface, fmt->altsetting, clock); | ||
263 | return -ENXIO; | ||
264 | } | ||
265 | |||
266 | data[0] = rate; | ||
267 | data[1] = rate >> 8; | ||
268 | data[2] = rate >> 16; | ||
269 | data[3] = rate >> 24; | ||
270 | if ((err = snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), UAC2_CS_CUR, | ||
271 | USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_OUT, | ||
272 | UAC2_CS_CONTROL_SAM_FREQ << 8, clock << 8, | ||
273 | data, sizeof(data), 1000)) < 0) { | ||
274 | snd_printk(KERN_ERR "%d:%d:%d: cannot set freq %d (v2)\n", | ||
275 | dev->devnum, iface, fmt->altsetting, rate); | ||
276 | return err; | ||
277 | } | ||
278 | |||
279 | if ((err = snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), UAC2_CS_CUR, | ||
280 | USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN, | ||
281 | UAC2_CS_CONTROL_SAM_FREQ << 8, clock << 8, | ||
282 | data, sizeof(data), 1000)) < 0) { | ||
283 | snd_printk(KERN_WARNING "%d:%d:%d: cannot get freq (v2)\n", | ||
284 | dev->devnum, iface, fmt->altsetting); | ||
285 | return err; | ||
286 | } | ||
287 | |||
288 | crate = data[0] | (data[1] << 8) | (data[2] << 16) | (data[3] << 24); | ||
289 | if (crate != rate) | ||
290 | snd_printd(KERN_WARNING "current rate %d is different from the runtime rate %d\n", crate, rate); | ||
291 | |||
292 | return 0; | ||
293 | } | ||
294 | |||
295 | int snd_usb_init_sample_rate(struct snd_usb_audio *chip, int iface, | ||
296 | struct usb_host_interface *alts, | ||
297 | struct audioformat *fmt, int rate) | ||
298 | { | ||
299 | struct usb_interface_descriptor *altsd = get_iface_desc(alts); | ||
300 | |||
301 | switch (altsd->bInterfaceProtocol) { | ||
302 | case UAC_VERSION_1: | ||
303 | return set_sample_rate_v1(chip, iface, alts, fmt, rate); | ||
304 | |||
305 | case UAC_VERSION_2: | ||
306 | return set_sample_rate_v2(chip, iface, alts, fmt, rate); | ||
307 | } | ||
308 | |||
309 | return -EINVAL; | ||
310 | } | ||
311 | |||
diff --git a/sound/usb/clock.h b/sound/usb/clock.h new file mode 100644 index 00000000000..beb253684e2 --- /dev/null +++ b/sound/usb/clock.h | |||
@@ -0,0 +1,12 @@ | |||
1 | #ifndef __USBAUDIO_CLOCK_H | ||
2 | #define __USBAUDIO_CLOCK_H | ||
3 | |||
4 | int snd_usb_init_sample_rate(struct snd_usb_audio *chip, int iface, | ||
5 | struct usb_host_interface *alts, | ||
6 | struct audioformat *fmt, int rate); | ||
7 | |||
8 | int snd_usb_clock_find_source(struct snd_usb_audio *chip, | ||
9 | struct usb_host_interface *host_iface, | ||
10 | int entity_id); | ||
11 | |||
12 | #endif /* __USBAUDIO_CLOCK_H */ | ||
diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c index 28ee1ce3971..9593b91452b 100644 --- a/sound/usb/endpoint.c +++ b/sound/usb/endpoint.c | |||
@@ -190,6 +190,38 @@ static int parse_uac_endpoint_attributes(struct snd_usb_audio *chip, | |||
190 | return attributes; | 190 | return attributes; |
191 | } | 191 | } |
192 | 192 | ||
193 | static struct uac2_input_terminal_descriptor * | ||
194 | snd_usb_find_input_terminal_descriptor(struct usb_host_interface *ctrl_iface, | ||
195 | int terminal_id) | ||
196 | { | ||
197 | struct uac2_input_terminal_descriptor *term = NULL; | ||
198 | |||
199 | while ((term = snd_usb_find_csint_desc(ctrl_iface->extra, | ||
200 | ctrl_iface->extralen, | ||
201 | term, UAC_INPUT_TERMINAL))) { | ||
202 | if (term->bTerminalID == terminal_id) | ||
203 | return term; | ||
204 | } | ||
205 | |||
206 | return NULL; | ||
207 | } | ||
208 | |||
209 | static struct uac2_output_terminal_descriptor * | ||
210 | snd_usb_find_output_terminal_descriptor(struct usb_host_interface *ctrl_iface, | ||
211 | int terminal_id) | ||
212 | { | ||
213 | struct uac2_output_terminal_descriptor *term = NULL; | ||
214 | |||
215 | while ((term = snd_usb_find_csint_desc(ctrl_iface->extra, | ||
216 | ctrl_iface->extralen, | ||
217 | term, UAC_OUTPUT_TERMINAL))) { | ||
218 | if (term->bTerminalID == terminal_id) | ||
219 | return term; | ||
220 | } | ||
221 | |||
222 | return NULL; | ||
223 | } | ||
224 | |||
193 | int snd_usb_parse_audio_endpoints(struct snd_usb_audio *chip, int iface_no) | 225 | int snd_usb_parse_audio_endpoints(struct snd_usb_audio *chip, int iface_no) |
194 | { | 226 | { |
195 | struct usb_device *dev; | 227 | struct usb_device *dev; |
@@ -199,7 +231,7 @@ int snd_usb_parse_audio_endpoints(struct snd_usb_audio *chip, int iface_no) | |||
199 | int i, altno, err, stream; | 231 | int i, altno, err, stream; |
200 | int format = 0, num_channels = 0; | 232 | int format = 0, num_channels = 0; |
201 | struct audioformat *fp = NULL; | 233 | struct audioformat *fp = NULL; |
202 | int num, protocol; | 234 | int num, protocol, clock = 0; |
203 | struct uac_format_type_i_continuous_descriptor *fmt; | 235 | struct uac_format_type_i_continuous_descriptor *fmt; |
204 | 236 | ||
205 | dev = chip->dev; | 237 | dev = chip->dev; |
@@ -263,6 +295,8 @@ int snd_usb_parse_audio_endpoints(struct snd_usb_audio *chip, int iface_no) | |||
263 | } | 295 | } |
264 | 296 | ||
265 | case UAC_VERSION_2: { | 297 | case UAC_VERSION_2: { |
298 | struct uac2_input_terminal_descriptor *input_term; | ||
299 | struct uac2_output_terminal_descriptor *output_term; | ||
266 | struct uac_as_header_descriptor_v2 *as = | 300 | struct uac_as_header_descriptor_v2 *as = |
267 | snd_usb_find_csint_desc(alts->extra, alts->extralen, NULL, UAC_AS_GENERAL); | 301 | snd_usb_find_csint_desc(alts->extra, alts->extralen, NULL, UAC_AS_GENERAL); |
268 | 302 | ||
@@ -281,7 +315,25 @@ int snd_usb_parse_audio_endpoints(struct snd_usb_audio *chip, int iface_no) | |||
281 | num_channels = as->bNrChannels; | 315 | num_channels = as->bNrChannels; |
282 | format = le32_to_cpu(as->bmFormats); | 316 | format = le32_to_cpu(as->bmFormats); |
283 | 317 | ||
284 | break; | 318 | /* lookup the terminal associated to this interface |
319 | * to extract the clock */ | ||
320 | input_term = snd_usb_find_input_terminal_descriptor(chip->ctrl_intf, | ||
321 | as->bTerminalLink); | ||
322 | if (input_term) { | ||
323 | clock = input_term->bCSourceID; | ||
324 | break; | ||
325 | } | ||
326 | |||
327 | output_term = snd_usb_find_output_terminal_descriptor(chip->ctrl_intf, | ||
328 | as->bTerminalLink); | ||
329 | if (output_term) { | ||
330 | clock = output_term->bCSourceID; | ||
331 | break; | ||
332 | } | ||
333 | |||
334 | snd_printk(KERN_ERR "%d:%u:%d : bogus bTerminalLink %d\n", | ||
335 | dev->devnum, iface_no, altno, as->bTerminalLink); | ||
336 | continue; | ||
285 | } | 337 | } |
286 | 338 | ||
287 | default: | 339 | default: |
@@ -338,6 +390,7 @@ int snd_usb_parse_audio_endpoints(struct snd_usb_audio *chip, int iface_no) | |||
338 | fp->maxpacksize = (((fp->maxpacksize >> 11) & 3) + 1) | 390 | fp->maxpacksize = (((fp->maxpacksize >> 11) & 3) + 1) |
339 | * (fp->maxpacksize & 0x7ff); | 391 | * (fp->maxpacksize & 0x7ff); |
340 | fp->attributes = parse_uac_endpoint_attributes(chip, alts, protocol, iface_no); | 392 | fp->attributes = parse_uac_endpoint_attributes(chip, alts, protocol, iface_no); |
393 | fp->clock = clock; | ||
341 | 394 | ||
342 | /* some quirks for attributes here */ | 395 | /* some quirks for attributes here */ |
343 | 396 | ||
diff --git a/sound/usb/format.c b/sound/usb/format.c index fe29d61de19..5367cd1e52d 100644 --- a/sound/usb/format.c +++ b/sound/usb/format.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include "quirks.h" | 29 | #include "quirks.h" |
30 | #include "helper.h" | 30 | #include "helper.h" |
31 | #include "debug.h" | 31 | #include "debug.h" |
32 | #include "clock.h" | ||
32 | 33 | ||
33 | /* | 34 | /* |
34 | * parse the audio format type I descriptor | 35 | * parse the audio format type I descriptor |
@@ -215,15 +216,17 @@ static int parse_audio_format_rates_v2(struct snd_usb_audio *chip, | |||
215 | struct usb_device *dev = chip->dev; | 216 | struct usb_device *dev = chip->dev; |
216 | unsigned char tmp[2], *data; | 217 | unsigned char tmp[2], *data; |
217 | int i, nr_rates, data_size, ret = 0; | 218 | int i, nr_rates, data_size, ret = 0; |
219 | int clock = snd_usb_clock_find_source(chip, chip->ctrl_intf, fp->clock); | ||
218 | 220 | ||
219 | /* get the number of sample rates first by only fetching 2 bytes */ | 221 | /* get the number of sample rates first by only fetching 2 bytes */ |
220 | ret = snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), UAC2_CS_RANGE, | 222 | ret = snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), UAC2_CS_RANGE, |
221 | USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN, | 223 | USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN, |
222 | UAC2_CS_CONTROL_SAM_FREQ << 8, chip->clock_id << 8, | 224 | UAC2_CS_CONTROL_SAM_FREQ << 8, clock << 8, |
223 | tmp, sizeof(tmp), 1000); | 225 | tmp, sizeof(tmp), 1000); |
224 | 226 | ||
225 | if (ret < 0) { | 227 | if (ret < 0) { |
226 | snd_printk(KERN_ERR "unable to retrieve number of sample rates\n"); | 228 | snd_printk(KERN_ERR "%s(): unable to retrieve number of sample rates (clock %d)\n", |
229 | __func__, clock); | ||
227 | goto err; | 230 | goto err; |
228 | } | 231 | } |
229 | 232 | ||
@@ -237,12 +240,13 @@ static int parse_audio_format_rates_v2(struct snd_usb_audio *chip, | |||
237 | 240 | ||
238 | /* now get the full information */ | 241 | /* now get the full information */ |
239 | ret = snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), UAC2_CS_RANGE, | 242 | ret = snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), UAC2_CS_RANGE, |
240 | USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN, | 243 | USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN, |
241 | UAC2_CS_CONTROL_SAM_FREQ << 8, chip->clock_id << 8, | 244 | UAC2_CS_CONTROL_SAM_FREQ << 8, clock << 8, |
242 | data, data_size, 1000); | 245 | data, data_size, 1000); |
243 | 246 | ||
244 | if (ret < 0) { | 247 | if (ret < 0) { |
245 | snd_printk(KERN_ERR "unable to retrieve sample rate range\n"); | 248 | snd_printk(KERN_ERR "%s(): unable to retrieve sample rate range (clock %d)\n", |
249 | __func__, clock); | ||
246 | ret = -EINVAL; | 250 | ret = -EINVAL; |
247 | goto err_free; | 251 | goto err_free; |
248 | } | 252 | } |
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index 03ce971e002..a060d005e20 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c | |||
@@ -78,39 +78,6 @@ enum { | |||
78 | USB_MIXER_U16, | 78 | USB_MIXER_U16, |
79 | }; | 79 | }; |
80 | 80 | ||
81 | enum { | ||
82 | USB_PROC_UPDOWN = 1, | ||
83 | USB_PROC_UPDOWN_SWITCH = 1, | ||
84 | USB_PROC_UPDOWN_MODE_SEL = 2, | ||
85 | |||
86 | USB_PROC_PROLOGIC = 2, | ||
87 | USB_PROC_PROLOGIC_SWITCH = 1, | ||
88 | USB_PROC_PROLOGIC_MODE_SEL = 2, | ||
89 | |||
90 | USB_PROC_3DENH = 3, | ||
91 | USB_PROC_3DENH_SWITCH = 1, | ||
92 | USB_PROC_3DENH_SPACE = 2, | ||
93 | |||
94 | USB_PROC_REVERB = 4, | ||
95 | USB_PROC_REVERB_SWITCH = 1, | ||
96 | USB_PROC_REVERB_LEVEL = 2, | ||
97 | USB_PROC_REVERB_TIME = 3, | ||
98 | USB_PROC_REVERB_DELAY = 4, | ||
99 | |||
100 | USB_PROC_CHORUS = 5, | ||
101 | USB_PROC_CHORUS_SWITCH = 1, | ||
102 | USB_PROC_CHORUS_LEVEL = 2, | ||
103 | USB_PROC_CHORUS_RATE = 3, | ||
104 | USB_PROC_CHORUS_DEPTH = 4, | ||
105 | |||
106 | USB_PROC_DCR = 6, | ||
107 | USB_PROC_DCR_SWITCH = 1, | ||
108 | USB_PROC_DCR_RATIO = 2, | ||
109 | USB_PROC_DCR_MAX_AMP = 3, | ||
110 | USB_PROC_DCR_THRESHOLD = 4, | ||
111 | USB_PROC_DCR_ATTACK = 5, | ||
112 | USB_PROC_DCR_RELEASE = 6, | ||
113 | }; | ||
114 | 81 | ||
115 | /*E-mu 0202(0404) eXtension Unit(XU) control*/ | 82 | /*E-mu 0202(0404) eXtension Unit(XU) control*/ |
116 | enum { | 83 | enum { |
@@ -198,22 +165,24 @@ static int check_mapped_selector_name(struct mixer_build *state, int unitid, | |||
198 | 165 | ||
199 | /* | 166 | /* |
200 | * find an audio control unit with the given unit id | 167 | * find an audio control unit with the given unit id |
201 | * this doesn't return any clock related units, so they need to be handled elsewhere | ||
202 | */ | 168 | */ |
203 | static void *find_audio_control_unit(struct mixer_build *state, unsigned char unit) | 169 | static void *find_audio_control_unit(struct mixer_build *state, unsigned char unit) |
204 | { | 170 | { |
205 | unsigned char *p; | 171 | /* we just parse the header */ |
172 | struct uac_feature_unit_descriptor *hdr = NULL; | ||
206 | 173 | ||
207 | p = NULL; | 174 | while ((hdr = snd_usb_find_desc(state->buffer, state->buflen, hdr, |
208 | while ((p = snd_usb_find_desc(state->buffer, state->buflen, p, | 175 | USB_DT_CS_INTERFACE)) != NULL) { |
209 | USB_DT_CS_INTERFACE)) != NULL) { | 176 | if (hdr->bLength >= 4 && |
210 | if (p[0] >= 4 && p[2] >= UAC_INPUT_TERMINAL && p[2] <= UAC2_EXTENSION_UNIT_V2 && p[3] == unit) | 177 | hdr->bDescriptorSubtype >= UAC_INPUT_TERMINAL && |
211 | return p; | 178 | hdr->bDescriptorSubtype <= UAC2_SAMPLE_RATE_CONVERTER && |
179 | hdr->bUnitID == unit) | ||
180 | return hdr; | ||
212 | } | 181 | } |
182 | |||
213 | return NULL; | 183 | return NULL; |
214 | } | 184 | } |
215 | 185 | ||
216 | |||
217 | /* | 186 | /* |
218 | * copy a string with the given id | 187 | * copy a string with the given id |
219 | */ | 188 | */ |
@@ -344,8 +313,8 @@ static int get_ctl_value_v2(struct usb_mixer_elem_info *cval, int request, int v | |||
344 | buf, sizeof(buf), 1000); | 313 | buf, sizeof(buf), 1000); |
345 | 314 | ||
346 | if (ret < 0) { | 315 | if (ret < 0) { |
347 | snd_printdd(KERN_ERR "cannot get ctl value: req = %#x, wValue = %#x, wIndex = %#x, type = %d\n", | 316 | snd_printk(KERN_ERR "cannot get ctl value: req = %#x, wValue = %#x, wIndex = %#x, type = %d\n", |
348 | request, validx, cval->mixer->ctrlif | (cval->id << 8), cval->val_type); | 317 | request, validx, cval->mixer->ctrlif | (cval->id << 8), cval->val_type); |
349 | return ret; | 318 | return ret; |
350 | } | 319 | } |
351 | 320 | ||
@@ -462,6 +431,16 @@ static int set_cur_mix_value(struct usb_mixer_elem_info *cval, int channel, | |||
462 | int index, int value) | 431 | int index, int value) |
463 | { | 432 | { |
464 | int err; | 433 | int err; |
434 | unsigned int read_only = (channel == 0) ? | ||
435 | cval->master_readonly : | ||
436 | cval->ch_readonly & (1 << (channel - 1)); | ||
437 | |||
438 | if (read_only) { | ||
439 | snd_printdd(KERN_INFO "%s(): channel %d of control %d is read_only\n", | ||
440 | __func__, channel, cval->control); | ||
441 | return 0; | ||
442 | } | ||
443 | |||
465 | err = snd_usb_mixer_set_ctl_value(cval, UAC_SET_CUR, (cval->control << 8) | channel, | 444 | err = snd_usb_mixer_set_ctl_value(cval, UAC_SET_CUR, (cval->control << 8) | channel, |
466 | value); | 445 | value); |
467 | if (err < 0) | 446 | if (err < 0) |
@@ -631,6 +610,7 @@ static int get_term_name(struct mixer_build *state, struct usb_audio_term *iterm | |||
631 | */ | 610 | */ |
632 | static int check_input_term(struct mixer_build *state, int id, struct usb_audio_term *term) | 611 | static int check_input_term(struct mixer_build *state, int id, struct usb_audio_term *term) |
633 | { | 612 | { |
613 | int err; | ||
634 | void *p1; | 614 | void *p1; |
635 | 615 | ||
636 | memset(term, 0, sizeof(*term)); | 616 | memset(term, 0, sizeof(*term)); |
@@ -651,6 +631,11 @@ static int check_input_term(struct mixer_build *state, int id, struct usb_audio_ | |||
651 | term->channels = d->bNrChannels; | 631 | term->channels = d->bNrChannels; |
652 | term->chconfig = le32_to_cpu(d->bmChannelConfig); | 632 | term->chconfig = le32_to_cpu(d->bmChannelConfig); |
653 | term->name = d->iTerminal; | 633 | term->name = d->iTerminal; |
634 | |||
635 | /* call recursively to get the clock selectors */ | ||
636 | err = check_input_term(state, d->bCSourceID, term); | ||
637 | if (err < 0) | ||
638 | return err; | ||
654 | } | 639 | } |
655 | return 0; | 640 | return 0; |
656 | case UAC_FEATURE_UNIT: { | 641 | case UAC_FEATURE_UNIT: { |
@@ -667,7 +652,8 @@ static int check_input_term(struct mixer_build *state, int id, struct usb_audio_ | |||
667 | term->name = uac_mixer_unit_iMixer(d); | 652 | term->name = uac_mixer_unit_iMixer(d); |
668 | return 0; | 653 | return 0; |
669 | } | 654 | } |
670 | case UAC_SELECTOR_UNIT: { | 655 | case UAC_SELECTOR_UNIT: |
656 | case UAC2_CLOCK_SELECTOR: { | ||
671 | struct uac_selector_unit_descriptor *d = p1; | 657 | struct uac_selector_unit_descriptor *d = p1; |
672 | /* call recursively to retrieve the channel info */ | 658 | /* call recursively to retrieve the channel info */ |
673 | if (check_input_term(state, d->baSourceID[0], term) < 0) | 659 | if (check_input_term(state, d->baSourceID[0], term) < 0) |
@@ -690,6 +676,13 @@ static int check_input_term(struct mixer_build *state, int id, struct usb_audio_ | |||
690 | term->name = uac_processing_unit_iProcessing(d, state->mixer->protocol); | 676 | term->name = uac_processing_unit_iProcessing(d, state->mixer->protocol); |
691 | return 0; | 677 | return 0; |
692 | } | 678 | } |
679 | case UAC2_CLOCK_SOURCE: { | ||
680 | struct uac_clock_source_descriptor *d = p1; | ||
681 | term->type = d->bDescriptorSubtype << 16; /* virtual type */ | ||
682 | term->id = id; | ||
683 | term->name = d->iClockSource; | ||
684 | return 0; | ||
685 | } | ||
693 | default: | 686 | default: |
694 | return -ENODEV; | 687 | return -ENODEV; |
695 | } | 688 | } |
@@ -709,16 +702,20 @@ struct usb_feature_control_info { | |||
709 | }; | 702 | }; |
710 | 703 | ||
711 | static struct usb_feature_control_info audio_feature_info[] = { | 704 | static struct usb_feature_control_info audio_feature_info[] = { |
712 | { "Mute", USB_MIXER_INV_BOOLEAN }, | 705 | { "Mute", USB_MIXER_INV_BOOLEAN }, |
713 | { "Volume", USB_MIXER_S16 }, | 706 | { "Volume", USB_MIXER_S16 }, |
714 | { "Tone Control - Bass", USB_MIXER_S8 }, | 707 | { "Tone Control - Bass", USB_MIXER_S8 }, |
715 | { "Tone Control - Mid", USB_MIXER_S8 }, | 708 | { "Tone Control - Mid", USB_MIXER_S8 }, |
716 | { "Tone Control - Treble", USB_MIXER_S8 }, | 709 | { "Tone Control - Treble", USB_MIXER_S8 }, |
717 | { "Graphic Equalizer", USB_MIXER_S8 }, /* FIXME: not implemeted yet */ | 710 | { "Graphic Equalizer", USB_MIXER_S8 }, /* FIXME: not implemeted yet */ |
718 | { "Auto Gain Control", USB_MIXER_BOOLEAN }, | 711 | { "Auto Gain Control", USB_MIXER_BOOLEAN }, |
719 | { "Delay Control", USB_MIXER_U16 }, | 712 | { "Delay Control", USB_MIXER_U16 }, |
720 | { "Bass Boost", USB_MIXER_BOOLEAN }, | 713 | { "Bass Boost", USB_MIXER_BOOLEAN }, |
721 | { "Loudness", USB_MIXER_BOOLEAN }, | 714 | { "Loudness", USB_MIXER_BOOLEAN }, |
715 | /* UAC2 specific */ | ||
716 | { "Input Gain Control", USB_MIXER_U16 }, | ||
717 | { "Input Gain Pad Control", USB_MIXER_BOOLEAN }, | ||
718 | { "Phase Inverter Control", USB_MIXER_BOOLEAN }, | ||
722 | }; | 719 | }; |
723 | 720 | ||
724 | 721 | ||
@@ -958,7 +955,7 @@ static size_t append_ctl_name(struct snd_kcontrol *kctl, const char *str) | |||
958 | static void build_feature_ctl(struct mixer_build *state, void *raw_desc, | 955 | static void build_feature_ctl(struct mixer_build *state, void *raw_desc, |
959 | unsigned int ctl_mask, int control, | 956 | unsigned int ctl_mask, int control, |
960 | struct usb_audio_term *iterm, int unitid, | 957 | struct usb_audio_term *iterm, int unitid, |
961 | int read_only) | 958 | int readonly_mask) |
962 | { | 959 | { |
963 | struct uac_feature_unit_descriptor *desc = raw_desc; | 960 | struct uac_feature_unit_descriptor *desc = raw_desc; |
964 | unsigned int len = 0; | 961 | unsigned int len = 0; |
@@ -970,7 +967,7 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc, | |||
970 | 967 | ||
971 | control++; /* change from zero-based to 1-based value */ | 968 | control++; /* change from zero-based to 1-based value */ |
972 | 969 | ||
973 | if (control == UAC_GRAPHIC_EQUALIZER_CONTROL) { | 970 | if (control == UAC_FU_GRAPHIC_EQUALIZER) { |
974 | /* FIXME: not supported yet */ | 971 | /* FIXME: not supported yet */ |
975 | return; | 972 | return; |
976 | } | 973 | } |
@@ -989,20 +986,25 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc, | |||
989 | cval->control = control; | 986 | cval->control = control; |
990 | cval->cmask = ctl_mask; | 987 | cval->cmask = ctl_mask; |
991 | cval->val_type = audio_feature_info[control-1].type; | 988 | cval->val_type = audio_feature_info[control-1].type; |
992 | if (ctl_mask == 0) | 989 | if (ctl_mask == 0) { |
993 | cval->channels = 1; /* master channel */ | 990 | cval->channels = 1; /* master channel */ |
994 | else { | 991 | cval->master_readonly = readonly_mask; |
992 | } else { | ||
995 | int i, c = 0; | 993 | int i, c = 0; |
996 | for (i = 0; i < 16; i++) | 994 | for (i = 0; i < 16; i++) |
997 | if (ctl_mask & (1 << i)) | 995 | if (ctl_mask & (1 << i)) |
998 | c++; | 996 | c++; |
999 | cval->channels = c; | 997 | cval->channels = c; |
998 | cval->ch_readonly = readonly_mask; | ||
1000 | } | 999 | } |
1001 | 1000 | ||
1002 | /* get min/max values */ | 1001 | /* get min/max values */ |
1003 | get_min_max(cval, 0); | 1002 | get_min_max(cval, 0); |
1004 | 1003 | ||
1005 | if (read_only) | 1004 | /* if all channels in the mask are marked read-only, make the control |
1005 | * read-only. set_cur_mix_value() will check the mask again and won't | ||
1006 | * issue write commands to read-only channels. */ | ||
1007 | if (cval->channels == readonly_mask) | ||
1006 | kctl = snd_ctl_new1(&usb_feature_unit_ctl_ro, cval); | 1008 | kctl = snd_ctl_new1(&usb_feature_unit_ctl_ro, cval); |
1007 | else | 1009 | else |
1008 | kctl = snd_ctl_new1(&usb_feature_unit_ctl, cval); | 1010 | kctl = snd_ctl_new1(&usb_feature_unit_ctl, cval); |
@@ -1021,8 +1023,8 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc, | |||
1021 | kctl->id.name, sizeof(kctl->id.name)); | 1023 | kctl->id.name, sizeof(kctl->id.name)); |
1022 | 1024 | ||
1023 | switch (control) { | 1025 | switch (control) { |
1024 | case UAC_MUTE_CONTROL: | 1026 | case UAC_FU_MUTE: |
1025 | case UAC_VOLUME_CONTROL: | 1027 | case UAC_FU_VOLUME: |
1026 | /* determine the control name. the rule is: | 1028 | /* determine the control name. the rule is: |
1027 | * - if a name id is given in descriptor, use it. | 1029 | * - if a name id is given in descriptor, use it. |
1028 | * - if the connected input can be determined, then use the name | 1030 | * - if the connected input can be determined, then use the name |
@@ -1049,9 +1051,9 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc, | |||
1049 | len = append_ctl_name(kctl, " Playback"); | 1051 | len = append_ctl_name(kctl, " Playback"); |
1050 | } | 1052 | } |
1051 | } | 1053 | } |
1052 | append_ctl_name(kctl, control == UAC_MUTE_CONTROL ? | 1054 | append_ctl_name(kctl, control == UAC_FU_MUTE ? |
1053 | " Switch" : " Volume"); | 1055 | " Switch" : " Volume"); |
1054 | if (control == UAC_VOLUME_CONTROL) { | 1056 | if (control == UAC_FU_VOLUME) { |
1055 | kctl->tlv.c = mixer_vol_tlv; | 1057 | kctl->tlv.c = mixer_vol_tlv; |
1056 | kctl->vd[0].access |= | 1058 | kctl->vd[0].access |= |
1057 | SNDRV_CTL_ELEM_ACCESS_TLV_READ | | 1059 | SNDRV_CTL_ELEM_ACCESS_TLV_READ | |
@@ -1150,7 +1152,7 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid, void | |||
1150 | snd_printk(KERN_INFO | 1152 | snd_printk(KERN_INFO |
1151 | "usbmixer: master volume quirk for PCM2702 chip\n"); | 1153 | "usbmixer: master volume quirk for PCM2702 chip\n"); |
1152 | /* disable non-functional volume control */ | 1154 | /* disable non-functional volume control */ |
1153 | master_bits &= ~UAC_FU_VOLUME; | 1155 | master_bits &= ~UAC_CONTROL_BIT(UAC_FU_VOLUME); |
1154 | break; | 1156 | break; |
1155 | } | 1157 | } |
1156 | if (channels > 0) | 1158 | if (channels > 0) |
@@ -1188,19 +1190,22 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid, void | |||
1188 | 1190 | ||
1189 | for (j = 0; j < channels; j++) { | 1191 | for (j = 0; j < channels; j++) { |
1190 | unsigned int mask = snd_usb_combine_bytes(bmaControls + csize * (j+1), csize); | 1192 | unsigned int mask = snd_usb_combine_bytes(bmaControls + csize * (j+1), csize); |
1191 | if (mask & (1 << (i * 2))) { | 1193 | if (uac2_control_is_readable(mask, i)) { |
1192 | ch_bits |= (1 << j); | 1194 | ch_bits |= (1 << j); |
1193 | if (~mask & (1 << ((i * 2) + 1))) | 1195 | if (!uac2_control_is_writeable(mask, i)) |
1194 | ch_read_only |= (1 << j); | 1196 | ch_read_only |= (1 << j); |
1195 | } | 1197 | } |
1196 | } | 1198 | } |
1197 | 1199 | ||
1198 | /* FIXME: the whole unit is read-only if any of the channels is marked read-only */ | 1200 | /* NOTE: build_feature_ctl() will mark the control read-only if all channels |
1201 | * are marked read-only in the descriptors. Otherwise, the control will be | ||
1202 | * reported as writeable, but the driver will not actually issue a write | ||
1203 | * command for read-only channels */ | ||
1199 | if (ch_bits & 1) /* the first channel must be set (for ease of programming) */ | 1204 | if (ch_bits & 1) /* the first channel must be set (for ease of programming) */ |
1200 | build_feature_ctl(state, _ftr, ch_bits, i, &iterm, unitid, !!ch_read_only); | 1205 | build_feature_ctl(state, _ftr, ch_bits, i, &iterm, unitid, ch_read_only); |
1201 | if (master_bits & (1 << i * 2)) | 1206 | if (uac2_control_is_readable(master_bits, i)) |
1202 | build_feature_ctl(state, _ftr, 0, i, &iterm, unitid, | 1207 | build_feature_ctl(state, _ftr, 0, i, &iterm, unitid, |
1203 | ~master_bits & (1 << ((i * 2) + 1))); | 1208 | !uac2_control_is_writeable(master_bits, i)); |
1204 | } | 1209 | } |
1205 | } | 1210 | } |
1206 | 1211 | ||
@@ -1392,51 +1397,51 @@ struct procunit_info { | |||
1392 | }; | 1397 | }; |
1393 | 1398 | ||
1394 | static struct procunit_value_info updown_proc_info[] = { | 1399 | static struct procunit_value_info updown_proc_info[] = { |
1395 | { USB_PROC_UPDOWN_SWITCH, "Switch", USB_MIXER_BOOLEAN }, | 1400 | { UAC_UD_ENABLE, "Switch", USB_MIXER_BOOLEAN }, |
1396 | { USB_PROC_UPDOWN_MODE_SEL, "Mode Select", USB_MIXER_U8, 1 }, | 1401 | { UAC_UD_MODE_SELECT, "Mode Select", USB_MIXER_U8, 1 }, |
1397 | { 0 } | 1402 | { 0 } |
1398 | }; | 1403 | }; |
1399 | static struct procunit_value_info prologic_proc_info[] = { | 1404 | static struct procunit_value_info prologic_proc_info[] = { |
1400 | { USB_PROC_PROLOGIC_SWITCH, "Switch", USB_MIXER_BOOLEAN }, | 1405 | { UAC_DP_ENABLE, "Switch", USB_MIXER_BOOLEAN }, |
1401 | { USB_PROC_PROLOGIC_MODE_SEL, "Mode Select", USB_MIXER_U8, 1 }, | 1406 | { UAC_DP_MODE_SELECT, "Mode Select", USB_MIXER_U8, 1 }, |
1402 | { 0 } | 1407 | { 0 } |
1403 | }; | 1408 | }; |
1404 | static struct procunit_value_info threed_enh_proc_info[] = { | 1409 | static struct procunit_value_info threed_enh_proc_info[] = { |
1405 | { USB_PROC_3DENH_SWITCH, "Switch", USB_MIXER_BOOLEAN }, | 1410 | { UAC_3D_ENABLE, "Switch", USB_MIXER_BOOLEAN }, |
1406 | { USB_PROC_3DENH_SPACE, "Spaciousness", USB_MIXER_U8 }, | 1411 | { UAC_3D_SPACE, "Spaciousness", USB_MIXER_U8 }, |
1407 | { 0 } | 1412 | { 0 } |
1408 | }; | 1413 | }; |
1409 | static struct procunit_value_info reverb_proc_info[] = { | 1414 | static struct procunit_value_info reverb_proc_info[] = { |
1410 | { USB_PROC_REVERB_SWITCH, "Switch", USB_MIXER_BOOLEAN }, | 1415 | { UAC_REVERB_ENABLE, "Switch", USB_MIXER_BOOLEAN }, |
1411 | { USB_PROC_REVERB_LEVEL, "Level", USB_MIXER_U8 }, | 1416 | { UAC_REVERB_LEVEL, "Level", USB_MIXER_U8 }, |
1412 | { USB_PROC_REVERB_TIME, "Time", USB_MIXER_U16 }, | 1417 | { UAC_REVERB_TIME, "Time", USB_MIXER_U16 }, |
1413 | { USB_PROC_REVERB_DELAY, "Delay", USB_MIXER_U8 }, | 1418 | { UAC_REVERB_FEEDBACK, "Feedback", USB_MIXER_U8 }, |
1414 | { 0 } | 1419 | { 0 } |
1415 | }; | 1420 | }; |
1416 | static struct procunit_value_info chorus_proc_info[] = { | 1421 | static struct procunit_value_info chorus_proc_info[] = { |
1417 | { USB_PROC_CHORUS_SWITCH, "Switch", USB_MIXER_BOOLEAN }, | 1422 | { UAC_CHORUS_ENABLE, "Switch", USB_MIXER_BOOLEAN }, |
1418 | { USB_PROC_CHORUS_LEVEL, "Level", USB_MIXER_U8 }, | 1423 | { UAC_CHORUS_LEVEL, "Level", USB_MIXER_U8 }, |
1419 | { USB_PROC_CHORUS_RATE, "Rate", USB_MIXER_U16 }, | 1424 | { UAC_CHORUS_RATE, "Rate", USB_MIXER_U16 }, |
1420 | { USB_PROC_CHORUS_DEPTH, "Depth", USB_MIXER_U16 }, | 1425 | { UAC_CHORUS_DEPTH, "Depth", USB_MIXER_U16 }, |
1421 | { 0 } | 1426 | { 0 } |
1422 | }; | 1427 | }; |
1423 | static struct procunit_value_info dcr_proc_info[] = { | 1428 | static struct procunit_value_info dcr_proc_info[] = { |
1424 | { USB_PROC_DCR_SWITCH, "Switch", USB_MIXER_BOOLEAN }, | 1429 | { UAC_DCR_ENABLE, "Switch", USB_MIXER_BOOLEAN }, |
1425 | { USB_PROC_DCR_RATIO, "Ratio", USB_MIXER_U16 }, | 1430 | { UAC_DCR_RATE, "Ratio", USB_MIXER_U16 }, |
1426 | { USB_PROC_DCR_MAX_AMP, "Max Amp", USB_MIXER_S16 }, | 1431 | { UAC_DCR_MAXAMPL, "Max Amp", USB_MIXER_S16 }, |
1427 | { USB_PROC_DCR_THRESHOLD, "Threshold", USB_MIXER_S16 }, | 1432 | { UAC_DCR_THRESHOLD, "Threshold", USB_MIXER_S16 }, |
1428 | { USB_PROC_DCR_ATTACK, "Attack Time", USB_MIXER_U16 }, | 1433 | { UAC_DCR_ATTACK_TIME, "Attack Time", USB_MIXER_U16 }, |
1429 | { USB_PROC_DCR_RELEASE, "Release Time", USB_MIXER_U16 }, | 1434 | { UAC_DCR_RELEASE_TIME, "Release Time", USB_MIXER_U16 }, |
1430 | { 0 } | 1435 | { 0 } |
1431 | }; | 1436 | }; |
1432 | 1437 | ||
1433 | static struct procunit_info procunits[] = { | 1438 | static struct procunit_info procunits[] = { |
1434 | { USB_PROC_UPDOWN, "Up Down", updown_proc_info }, | 1439 | { UAC_PROCESS_UP_DOWNMIX, "Up Down", updown_proc_info }, |
1435 | { USB_PROC_PROLOGIC, "Dolby Prologic", prologic_proc_info }, | 1440 | { UAC_PROCESS_DOLBY_PROLOGIC, "Dolby Prologic", prologic_proc_info }, |
1436 | { USB_PROC_3DENH, "3D Stereo Extender", threed_enh_proc_info }, | 1441 | { UAC_PROCESS_STEREO_EXTENDER, "3D Stereo Extender", threed_enh_proc_info }, |
1437 | { USB_PROC_REVERB, "Reverb", reverb_proc_info }, | 1442 | { UAC_PROCESS_REVERB, "Reverb", reverb_proc_info }, |
1438 | { USB_PROC_CHORUS, "Chorus", chorus_proc_info }, | 1443 | { UAC_PROCESS_CHORUS, "Chorus", chorus_proc_info }, |
1439 | { USB_PROC_DCR, "DCR", dcr_proc_info }, | 1444 | { UAC_PROCESS_DYN_RANGE_COMP, "DCR", dcr_proc_info }, |
1440 | { 0 }, | 1445 | { 0 }, |
1441 | }; | 1446 | }; |
1442 | /* | 1447 | /* |
@@ -1524,7 +1529,7 @@ static int build_audio_procunit(struct mixer_build *state, int unitid, void *raw | |||
1524 | cval->channels = 1; | 1529 | cval->channels = 1; |
1525 | 1530 | ||
1526 | /* get min/max values */ | 1531 | /* get min/max values */ |
1527 | if (type == USB_PROC_UPDOWN && cval->control == USB_PROC_UPDOWN_MODE_SEL) { | 1532 | if (type == UAC_PROCESS_UP_DOWNMIX && cval->control == UAC_UD_MODE_SELECT) { |
1528 | __u8 *control_spec = uac_processing_unit_specific(desc, state->mixer->protocol); | 1533 | __u8 *control_spec = uac_processing_unit_specific(desc, state->mixer->protocol); |
1529 | /* FIXME: hard-coded */ | 1534 | /* FIXME: hard-coded */ |
1530 | cval->min = 1; | 1535 | cval->min = 1; |
@@ -1619,7 +1624,7 @@ static int mixer_ctl_selector_get(struct snd_kcontrol *kcontrol, struct snd_ctl_ | |||
1619 | struct usb_mixer_elem_info *cval = kcontrol->private_data; | 1624 | struct usb_mixer_elem_info *cval = kcontrol->private_data; |
1620 | int val, err; | 1625 | int val, err; |
1621 | 1626 | ||
1622 | err = get_cur_ctl_value(cval, 0, &val); | 1627 | err = get_cur_ctl_value(cval, cval->control << 8, &val); |
1623 | if (err < 0) { | 1628 | if (err < 0) { |
1624 | if (cval->mixer->ignore_ctl_error) { | 1629 | if (cval->mixer->ignore_ctl_error) { |
1625 | ucontrol->value.enumerated.item[0] = 0; | 1630 | ucontrol->value.enumerated.item[0] = 0; |
@@ -1638,7 +1643,7 @@ static int mixer_ctl_selector_put(struct snd_kcontrol *kcontrol, struct snd_ctl_ | |||
1638 | struct usb_mixer_elem_info *cval = kcontrol->private_data; | 1643 | struct usb_mixer_elem_info *cval = kcontrol->private_data; |
1639 | int val, oval, err; | 1644 | int val, oval, err; |
1640 | 1645 | ||
1641 | err = get_cur_ctl_value(cval, 0, &oval); | 1646 | err = get_cur_ctl_value(cval, cval->control << 8, &oval); |
1642 | if (err < 0) { | 1647 | if (err < 0) { |
1643 | if (cval->mixer->ignore_ctl_error) | 1648 | if (cval->mixer->ignore_ctl_error) |
1644 | return 0; | 1649 | return 0; |
@@ -1647,7 +1652,7 @@ static int mixer_ctl_selector_put(struct snd_kcontrol *kcontrol, struct snd_ctl_ | |||
1647 | val = ucontrol->value.enumerated.item[0]; | 1652 | val = ucontrol->value.enumerated.item[0]; |
1648 | val = get_abs_value(cval, val); | 1653 | val = get_abs_value(cval, val); |
1649 | if (val != oval) { | 1654 | if (val != oval) { |
1650 | set_cur_ctl_value(cval, 0, val); | 1655 | set_cur_ctl_value(cval, cval->control << 8, val); |
1651 | return 1; | 1656 | return 1; |
1652 | } | 1657 | } |
1653 | return 0; | 1658 | return 0; |
@@ -1729,6 +1734,11 @@ static int parse_audio_selector_unit(struct mixer_build *state, int unitid, void | |||
1729 | cval->res = 1; | 1734 | cval->res = 1; |
1730 | cval->initialized = 1; | 1735 | cval->initialized = 1; |
1731 | 1736 | ||
1737 | if (desc->bDescriptorSubtype == UAC2_CLOCK_SELECTOR) | ||
1738 | cval->control = UAC2_CX_CLOCK_SELECTOR; | ||
1739 | else | ||
1740 | cval->control = 0; | ||
1741 | |||
1732 | namelist = kmalloc(sizeof(char *) * desc->bNrInPins, GFP_KERNEL); | 1742 | namelist = kmalloc(sizeof(char *) * desc->bNrInPins, GFP_KERNEL); |
1733 | if (! namelist) { | 1743 | if (! namelist) { |
1734 | snd_printk(KERN_ERR "cannot malloc\n"); | 1744 | snd_printk(KERN_ERR "cannot malloc\n"); |
@@ -1778,7 +1788,9 @@ static int parse_audio_selector_unit(struct mixer_build *state, int unitid, void | |||
1778 | if (! len) | 1788 | if (! len) |
1779 | strlcpy(kctl->id.name, "USB", sizeof(kctl->id.name)); | 1789 | strlcpy(kctl->id.name, "USB", sizeof(kctl->id.name)); |
1780 | 1790 | ||
1781 | if ((state->oterm.type & 0xff00) == 0x0100) | 1791 | if (desc->bDescriptorSubtype == UAC2_CLOCK_SELECTOR) |
1792 | append_ctl_name(kctl, " Clock Source"); | ||
1793 | else if ((state->oterm.type & 0xff00) == 0x0100) | ||
1782 | append_ctl_name(kctl, " Capture Source"); | 1794 | append_ctl_name(kctl, " Capture Source"); |
1783 | else | 1795 | else |
1784 | append_ctl_name(kctl, " Playback Source"); | 1796 | append_ctl_name(kctl, " Playback Source"); |
@@ -1812,10 +1824,12 @@ static int parse_audio_unit(struct mixer_build *state, int unitid) | |||
1812 | 1824 | ||
1813 | switch (p1[2]) { | 1825 | switch (p1[2]) { |
1814 | case UAC_INPUT_TERMINAL: | 1826 | case UAC_INPUT_TERMINAL: |
1827 | case UAC2_CLOCK_SOURCE: | ||
1815 | return 0; /* NOP */ | 1828 | return 0; /* NOP */ |
1816 | case UAC_MIXER_UNIT: | 1829 | case UAC_MIXER_UNIT: |
1817 | return parse_audio_mixer_unit(state, unitid, p1); | 1830 | return parse_audio_mixer_unit(state, unitid, p1); |
1818 | case UAC_SELECTOR_UNIT: | 1831 | case UAC_SELECTOR_UNIT: |
1832 | case UAC2_CLOCK_SELECTOR: | ||
1819 | return parse_audio_selector_unit(state, unitid, p1); | 1833 | return parse_audio_selector_unit(state, unitid, p1); |
1820 | case UAC_FEATURE_UNIT: | 1834 | case UAC_FEATURE_UNIT: |
1821 | return parse_audio_feature_unit(state, unitid, p1); | 1835 | return parse_audio_feature_unit(state, unitid, p1); |
@@ -1912,6 +1926,11 @@ static int snd_usb_mixer_controls(struct usb_mixer_interface *mixer) | |||
1912 | err = parse_audio_unit(&state, desc->bSourceID); | 1926 | err = parse_audio_unit(&state, desc->bSourceID); |
1913 | if (err < 0) | 1927 | if (err < 0) |
1914 | return err; | 1928 | return err; |
1929 | |||
1930 | /* for UAC2, use the same approach to also add the clock selectors */ | ||
1931 | err = parse_audio_unit(&state, desc->bCSourceID); | ||
1932 | if (err < 0) | ||
1933 | return err; | ||
1915 | } | 1934 | } |
1916 | } | 1935 | } |
1917 | 1936 | ||
diff --git a/sound/usb/mixer.h b/sound/usb/mixer.h index 130123854a6..a7cf1007fbb 100644 --- a/sound/usb/mixer.h +++ b/sound/usb/mixer.h | |||
@@ -34,6 +34,8 @@ struct usb_mixer_elem_info { | |||
34 | unsigned int id; | 34 | unsigned int id; |
35 | unsigned int control; /* CS or ICN (high byte) */ | 35 | unsigned int control; /* CS or ICN (high byte) */ |
36 | unsigned int cmask; /* channel mask bitmap: 0 = master */ | 36 | unsigned int cmask; /* channel mask bitmap: 0 = master */ |
37 | unsigned int ch_readonly; | ||
38 | unsigned int master_readonly; | ||
37 | int channels; | 39 | int channels; |
38 | int val_type; | 40 | int val_type; |
39 | int min, max, res; | 41 | int min, max, res; |
diff --git a/sound/usb/mixer_maps.c b/sound/usb/mixer_maps.c index d93fc89beba..f1324c42383 100644 --- a/sound/usb/mixer_maps.c +++ b/sound/usb/mixer_maps.c | |||
@@ -85,8 +85,8 @@ static struct usbmix_name_map extigy_map[] = { | |||
85 | /* 16: MU (w/o controls) */ | 85 | /* 16: MU (w/o controls) */ |
86 | { 17, NULL, 1 }, /* DISABLED: PU-switch (any effect?) */ | 86 | { 17, NULL, 1 }, /* DISABLED: PU-switch (any effect?) */ |
87 | { 17, "Channel Routing", 2 }, /* PU: mode select */ | 87 | { 17, "Channel Routing", 2 }, /* PU: mode select */ |
88 | { 18, "Tone Control - Bass", UAC_BASS_CONTROL }, /* FU */ | 88 | { 18, "Tone Control - Bass", UAC_FU_BASS }, /* FU */ |
89 | { 18, "Tone Control - Treble", UAC_TREBLE_CONTROL }, /* FU */ | 89 | { 18, "Tone Control - Treble", UAC_FU_TREBLE }, /* FU */ |
90 | { 18, "Master Playback" }, /* FU; others */ | 90 | { 18, "Master Playback" }, /* FU; others */ |
91 | /* 19: OT speaker */ | 91 | /* 19: OT speaker */ |
92 | /* 20: OT headphone */ | 92 | /* 20: OT headphone */ |
diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c index 056587de7be..456829882f4 100644 --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include "urb.h" | 31 | #include "urb.h" |
32 | #include "helper.h" | 32 | #include "helper.h" |
33 | #include "pcm.h" | 33 | #include "pcm.h" |
34 | #include "clock.h" | ||
34 | 35 | ||
35 | /* | 36 | /* |
36 | * return the current pcm pointer. just based on the hwptr_done value. | 37 | * return the current pcm pointer. just based on the hwptr_done value. |
@@ -181,103 +182,6 @@ int snd_usb_init_pitch(struct snd_usb_audio *chip, int iface, | |||
181 | return -EINVAL; | 182 | return -EINVAL; |
182 | } | 183 | } |
183 | 184 | ||
184 | static int set_sample_rate_v1(struct snd_usb_audio *chip, int iface, | ||
185 | struct usb_host_interface *alts, | ||
186 | struct audioformat *fmt, int rate) | ||
187 | { | ||
188 | struct usb_device *dev = chip->dev; | ||
189 | unsigned int ep; | ||
190 | unsigned char data[3]; | ||
191 | int err, crate; | ||
192 | |||
193 | ep = get_endpoint(alts, 0)->bEndpointAddress; | ||
194 | /* if endpoint doesn't have sampling rate control, bail out */ | ||
195 | if (!(fmt->attributes & UAC_EP_CS_ATTR_SAMPLE_RATE)) { | ||
196 | snd_printk(KERN_WARNING "%d:%d:%d: endpoint lacks sample rate attribute bit, cannot set.\n", | ||
197 | dev->devnum, iface, fmt->altsetting); | ||
198 | return 0; | ||
199 | } | ||
200 | |||
201 | data[0] = rate; | ||
202 | data[1] = rate >> 8; | ||
203 | data[2] = rate >> 16; | ||
204 | if ((err = snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), UAC_SET_CUR, | ||
205 | USB_TYPE_CLASS|USB_RECIP_ENDPOINT|USB_DIR_OUT, | ||
206 | UAC_EP_CS_ATTR_SAMPLE_RATE << 8, ep, | ||
207 | data, sizeof(data), 1000)) < 0) { | ||
208 | snd_printk(KERN_ERR "%d:%d:%d: cannot set freq %d to ep %#x\n", | ||
209 | dev->devnum, iface, fmt->altsetting, rate, ep); | ||
210 | return err; | ||
211 | } | ||
212 | if ((err = snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), UAC_GET_CUR, | ||
213 | USB_TYPE_CLASS|USB_RECIP_ENDPOINT|USB_DIR_IN, | ||
214 | UAC_EP_CS_ATTR_SAMPLE_RATE << 8, ep, | ||
215 | data, sizeof(data), 1000)) < 0) { | ||
216 | snd_printk(KERN_WARNING "%d:%d:%d: cannot get freq at ep %#x\n", | ||
217 | dev->devnum, iface, fmt->altsetting, ep); | ||
218 | return 0; /* some devices don't support reading */ | ||
219 | } | ||
220 | crate = data[0] | (data[1] << 8) | (data[2] << 16); | ||
221 | if (crate != rate) { | ||
222 | snd_printd(KERN_WARNING "current rate %d is different from the runtime rate %d\n", crate, rate); | ||
223 | // runtime->rate = crate; | ||
224 | } | ||
225 | |||
226 | return 0; | ||
227 | } | ||
228 | |||
229 | static int set_sample_rate_v2(struct snd_usb_audio *chip, int iface, | ||
230 | struct usb_host_interface *alts, | ||
231 | struct audioformat *fmt, int rate) | ||
232 | { | ||
233 | struct usb_device *dev = chip->dev; | ||
234 | unsigned char data[4]; | ||
235 | int err, crate; | ||
236 | |||
237 | data[0] = rate; | ||
238 | data[1] = rate >> 8; | ||
239 | data[2] = rate >> 16; | ||
240 | data[3] = rate >> 24; | ||
241 | if ((err = snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), UAC2_CS_CUR, | ||
242 | USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_OUT, | ||
243 | UAC2_CS_CONTROL_SAM_FREQ << 8, chip->clock_id << 8, | ||
244 | data, sizeof(data), 1000)) < 0) { | ||
245 | snd_printk(KERN_ERR "%d:%d:%d: cannot set freq %d (v2)\n", | ||
246 | dev->devnum, iface, fmt->altsetting, rate); | ||
247 | return err; | ||
248 | } | ||
249 | if ((err = snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), UAC2_CS_CUR, | ||
250 | USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN, | ||
251 | UAC2_CS_CONTROL_SAM_FREQ << 8, chip->clock_id << 8, | ||
252 | data, sizeof(data), 1000)) < 0) { | ||
253 | snd_printk(KERN_WARNING "%d:%d:%d: cannot get freq (v2)\n", | ||
254 | dev->devnum, iface, fmt->altsetting); | ||
255 | return err; | ||
256 | } | ||
257 | crate = data[0] | (data[1] << 8) | (data[2] << 16) | (data[3] << 24); | ||
258 | if (crate != rate) | ||
259 | snd_printd(KERN_WARNING "current rate %d is different from the runtime rate %d\n", crate, rate); | ||
260 | |||
261 | return 0; | ||
262 | } | ||
263 | |||
264 | int snd_usb_init_sample_rate(struct snd_usb_audio *chip, int iface, | ||
265 | struct usb_host_interface *alts, | ||
266 | struct audioformat *fmt, int rate) | ||
267 | { | ||
268 | struct usb_interface_descriptor *altsd = get_iface_desc(alts); | ||
269 | |||
270 | switch (altsd->bInterfaceProtocol) { | ||
271 | case UAC_VERSION_1: | ||
272 | return set_sample_rate_v1(chip, iface, alts, fmt, rate); | ||
273 | |||
274 | case UAC_VERSION_2: | ||
275 | return set_sample_rate_v2(chip, iface, alts, fmt, rate); | ||
276 | } | ||
277 | |||
278 | return -EINVAL; | ||
279 | } | ||
280 | |||
281 | /* | 185 | /* |
282 | * find a matching format and set up the interface | 186 | * find a matching format and set up the interface |
283 | */ | 187 | */ |
diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h index 06ebf24d3a4..24d3319cc34 100644 --- a/sound/usb/usbaudio.h +++ b/sound/usb/usbaudio.h | |||
@@ -40,9 +40,6 @@ struct snd_usb_audio { | |||
40 | int num_interfaces; | 40 | int num_interfaces; |
41 | int num_suspended_intf; | 41 | int num_suspended_intf; |
42 | 42 | ||
43 | /* for audio class v2 */ | ||
44 | int clock_id; | ||
45 | |||
46 | struct list_head pcm_list; /* list of pcm streams */ | 43 | struct list_head pcm_list; /* list of pcm streams */ |
47 | int pcm_devs; | 44 | int pcm_devs; |
48 | 45 | ||
@@ -53,6 +50,8 @@ struct snd_usb_audio { | |||
53 | int setup; /* from the 'device_setup' module param */ | 50 | int setup; /* from the 'device_setup' module param */ |
54 | int nrpacks; /* from the 'nrpacks' module param */ | 51 | int nrpacks; /* from the 'nrpacks' module param */ |
55 | int async_unlink; /* from the 'async_unlink' module param */ | 52 | int async_unlink; /* from the 'async_unlink' module param */ |
53 | |||
54 | struct usb_host_interface *ctrl_intf; /* the audio control interface */ | ||
56 | }; | 55 | }; |
57 | 56 | ||
58 | /* | 57 | /* |
diff --git a/tools/perf/builtin-buildid-list.c b/tools/perf/builtin-buildid-list.c index 44a47e13bd6..99890728409 100644 --- a/tools/perf/builtin-buildid-list.c +++ b/tools/perf/builtin-buildid-list.c | |||
@@ -43,8 +43,10 @@ static int __cmd_buildid_list(void) | |||
43 | if (session == NULL) | 43 | if (session == NULL) |
44 | return -1; | 44 | return -1; |
45 | 45 | ||
46 | if (with_hits) | 46 | if (with_hits) { |
47 | symbol_conf.full_paths = true; | ||
47 | perf_session__process_events(session, &build_id__mark_dso_hit_ops); | 48 | perf_session__process_events(session, &build_id__mark_dso_hit_ops); |
49 | } | ||
48 | 50 | ||
49 | perf_session__fprintf_dsos_buildid(session, stdout, with_hits); | 51 | perf_session__fprintf_dsos_buildid(session, stdout, with_hits); |
50 | 52 | ||
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 9bc89050e6f..dc3435e18bd 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c | |||
@@ -503,7 +503,6 @@ static int __cmd_record(int argc, const char **argv) | |||
503 | { | 503 | { |
504 | int i, counter; | 504 | int i, counter; |
505 | struct stat st; | 505 | struct stat st; |
506 | pid_t pid = 0; | ||
507 | int flags; | 506 | int flags; |
508 | int err; | 507 | int err; |
509 | unsigned long waking = 0; | 508 | unsigned long waking = 0; |
@@ -572,7 +571,7 @@ static int __cmd_record(int argc, const char **argv) | |||
572 | 571 | ||
573 | if (forks) { | 572 | if (forks) { |
574 | child_pid = fork(); | 573 | child_pid = fork(); |
575 | if (pid < 0) { | 574 | if (child_pid < 0) { |
576 | perror("failed to fork"); | 575 | perror("failed to fork"); |
577 | exit(-1); | 576 | exit(-1); |
578 | } | 577 | } |
diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c index f67bce2a83b..55f3b5dcc73 100644 --- a/tools/perf/builtin-sched.c +++ b/tools/perf/builtin-sched.c | |||
@@ -1645,6 +1645,7 @@ static struct perf_event_ops event_ops = { | |||
1645 | .sample = process_sample_event, | 1645 | .sample = process_sample_event, |
1646 | .comm = event__process_comm, | 1646 | .comm = event__process_comm, |
1647 | .lost = event__process_lost, | 1647 | .lost = event__process_lost, |
1648 | .fork = event__process_task, | ||
1648 | .ordered_samples = true, | 1649 | .ordered_samples = true, |
1649 | }; | 1650 | }; |
1650 | 1651 | ||
diff --git a/tools/perf/scripts/python/check-perf-trace.py b/tools/perf/scripts/python/check-perf-trace.py index 964d934395f..d9f7893e315 100644 --- a/tools/perf/scripts/python/check-perf-trace.py +++ b/tools/perf/scripts/python/check-perf-trace.py | |||
@@ -51,8 +51,7 @@ def kmem__kmalloc(event_name, context, common_cpu, | |||
51 | 51 | ||
52 | flag_str("kmem__kmalloc", "gfp_flags", gfp_flags)), | 52 | flag_str("kmem__kmalloc", "gfp_flags", gfp_flags)), |
53 | 53 | ||
54 | def trace_unhandled(event_name, context, common_cpu, common_secs, common_nsecs, | 54 | def trace_unhandled(event_name, context, event_fields_dict): |
55 | common_pid, common_comm): | ||
56 | try: | 55 | try: |
57 | unhandled[event_name] += 1 | 56 | unhandled[event_name] += 1 |
58 | except TypeError: | 57 | except TypeError: |
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c index 50771b5813e..1f08f008d28 100644 --- a/tools/perf/util/event.c +++ b/tools/perf/util/event.c | |||
@@ -370,9 +370,9 @@ static int thread__set_comm_adjust(struct thread *self, const char *comm) | |||
370 | 370 | ||
371 | int event__process_comm(event_t *self, struct perf_session *session) | 371 | int event__process_comm(event_t *self, struct perf_session *session) |
372 | { | 372 | { |
373 | struct thread *thread = perf_session__findnew(session, self->comm.pid); | 373 | struct thread *thread = perf_session__findnew(session, self->comm.tid); |
374 | 374 | ||
375 | dump_printf(": %s:%d\n", self->comm.comm, self->comm.pid); | 375 | dump_printf(": %s:%d\n", self->comm.comm, self->comm.tid); |
376 | 376 | ||
377 | if (thread == NULL || thread__set_comm_adjust(thread, self->comm.comm)) { | 377 | if (thread == NULL || thread__set_comm_adjust(thread, self->comm.comm)) { |
378 | dump_printf("problem processing PERF_RECORD_COMM, skipping event.\n"); | 378 | dump_printf("problem processing PERF_RECORD_COMM, skipping event.\n"); |
@@ -532,16 +532,11 @@ out_problem: | |||
532 | 532 | ||
533 | int event__process_task(event_t *self, struct perf_session *session) | 533 | int event__process_task(event_t *self, struct perf_session *session) |
534 | { | 534 | { |
535 | struct thread *thread = perf_session__findnew(session, self->fork.pid); | 535 | struct thread *thread = perf_session__findnew(session, self->fork.tid); |
536 | struct thread *parent = perf_session__findnew(session, self->fork.ppid); | 536 | struct thread *parent = perf_session__findnew(session, self->fork.ptid); |
537 | 537 | ||
538 | dump_printf("(%d:%d):(%d:%d)\n", self->fork.pid, self->fork.tid, | 538 | dump_printf("(%d:%d):(%d:%d)\n", self->fork.pid, self->fork.tid, |
539 | self->fork.ppid, self->fork.ptid); | 539 | self->fork.ppid, self->fork.ptid); |
540 | /* | ||
541 | * A thread clone will have the same PID for both parent and child. | ||
542 | */ | ||
543 | if (thread == parent) | ||
544 | return 0; | ||
545 | 540 | ||
546 | if (self->header.type == PERF_RECORD_EXIT) | 541 | if (self->header.type == PERF_RECORD_EXIT) |
547 | return 0; | 542 | return 0; |
diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c index cbf7eae2ce0..07f89b66b31 100644 --- a/tools/perf/util/hist.c +++ b/tools/perf/util/hist.c | |||
@@ -965,7 +965,7 @@ static int hist_entry__parse_objdump_line(struct hist_entry *self, FILE *file, | |||
965 | * Parse hexa addresses followed by ':' | 965 | * Parse hexa addresses followed by ':' |
966 | */ | 966 | */ |
967 | line_ip = strtoull(tmp, &tmp2, 16); | 967 | line_ip = strtoull(tmp, &tmp2, 16); |
968 | if (*tmp2 != ':') | 968 | if (*tmp2 != ':' || tmp == tmp2) |
969 | line_ip = -1; | 969 | line_ip = -1; |
970 | } | 970 | } |
971 | 971 | ||
diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c index 81f39cab3aa..33a63252374 100644 --- a/tools/perf/util/scripting-engines/trace-event-python.c +++ b/tools/perf/util/scripting-engines/trace-event-python.c | |||
@@ -208,7 +208,7 @@ static void python_process_event(int cpu, void *data, | |||
208 | int size __unused, | 208 | int size __unused, |
209 | unsigned long long nsecs, char *comm) | 209 | unsigned long long nsecs, char *comm) |
210 | { | 210 | { |
211 | PyObject *handler, *retval, *context, *t, *obj; | 211 | PyObject *handler, *retval, *context, *t, *obj, *dict = NULL; |
212 | static char handler_name[256]; | 212 | static char handler_name[256]; |
213 | struct format_field *field; | 213 | struct format_field *field; |
214 | unsigned long long val; | 214 | unsigned long long val; |
@@ -232,6 +232,14 @@ static void python_process_event(int cpu, void *data, | |||
232 | 232 | ||
233 | sprintf(handler_name, "%s__%s", event->system, event->name); | 233 | sprintf(handler_name, "%s__%s", event->system, event->name); |
234 | 234 | ||
235 | handler = PyDict_GetItemString(main_dict, handler_name); | ||
236 | if (handler && !PyCallable_Check(handler)) | ||
237 | handler = NULL; | ||
238 | if (!handler) { | ||
239 | dict = PyDict_New(); | ||
240 | if (!dict) | ||
241 | Py_FatalError("couldn't create Python dict"); | ||
242 | } | ||
235 | s = nsecs / NSECS_PER_SEC; | 243 | s = nsecs / NSECS_PER_SEC; |
236 | ns = nsecs - s * NSECS_PER_SEC; | 244 | ns = nsecs - s * NSECS_PER_SEC; |
237 | 245 | ||
@@ -242,12 +250,20 @@ static void python_process_event(int cpu, void *data, | |||
242 | PyTuple_SetItem(t, n++, PyString_FromString(handler_name)); | 250 | PyTuple_SetItem(t, n++, PyString_FromString(handler_name)); |
243 | PyTuple_SetItem(t, n++, | 251 | PyTuple_SetItem(t, n++, |
244 | PyCObject_FromVoidPtr(scripting_context, NULL)); | 252 | PyCObject_FromVoidPtr(scripting_context, NULL)); |
245 | PyTuple_SetItem(t, n++, PyInt_FromLong(cpu)); | ||
246 | PyTuple_SetItem(t, n++, PyInt_FromLong(s)); | ||
247 | PyTuple_SetItem(t, n++, PyInt_FromLong(ns)); | ||
248 | PyTuple_SetItem(t, n++, PyInt_FromLong(pid)); | ||
249 | PyTuple_SetItem(t, n++, PyString_FromString(comm)); | ||
250 | 253 | ||
254 | if (handler) { | ||
255 | PyTuple_SetItem(t, n++, PyInt_FromLong(cpu)); | ||
256 | PyTuple_SetItem(t, n++, PyInt_FromLong(s)); | ||
257 | PyTuple_SetItem(t, n++, PyInt_FromLong(ns)); | ||
258 | PyTuple_SetItem(t, n++, PyInt_FromLong(pid)); | ||
259 | PyTuple_SetItem(t, n++, PyString_FromString(comm)); | ||
260 | } else { | ||
261 | PyDict_SetItemString(dict, "common_cpu", PyInt_FromLong(cpu)); | ||
262 | PyDict_SetItemString(dict, "common_s", PyInt_FromLong(s)); | ||
263 | PyDict_SetItemString(dict, "common_ns", PyInt_FromLong(ns)); | ||
264 | PyDict_SetItemString(dict, "common_pid", PyInt_FromLong(pid)); | ||
265 | PyDict_SetItemString(dict, "common_comm", PyString_FromString(comm)); | ||
266 | } | ||
251 | for (field = event->format.fields; field; field = field->next) { | 267 | for (field = event->format.fields; field; field = field->next) { |
252 | if (field->flags & FIELD_IS_STRING) { | 268 | if (field->flags & FIELD_IS_STRING) { |
253 | int offset; | 269 | int offset; |
@@ -272,27 +288,31 @@ static void python_process_event(int cpu, void *data, | |||
272 | obj = PyLong_FromUnsignedLongLong(val); | 288 | obj = PyLong_FromUnsignedLongLong(val); |
273 | } | 289 | } |
274 | } | 290 | } |
275 | PyTuple_SetItem(t, n++, obj); | 291 | if (handler) |
292 | PyTuple_SetItem(t, n++, obj); | ||
293 | else | ||
294 | PyDict_SetItemString(dict, field->name, obj); | ||
295 | |||
276 | } | 296 | } |
297 | if (!handler) | ||
298 | PyTuple_SetItem(t, n++, dict); | ||
277 | 299 | ||
278 | if (_PyTuple_Resize(&t, n) == -1) | 300 | if (_PyTuple_Resize(&t, n) == -1) |
279 | Py_FatalError("error resizing Python tuple"); | 301 | Py_FatalError("error resizing Python tuple"); |
280 | 302 | ||
281 | handler = PyDict_GetItemString(main_dict, handler_name); | 303 | if (handler) { |
282 | if (handler && PyCallable_Check(handler)) { | ||
283 | retval = PyObject_CallObject(handler, t); | 304 | retval = PyObject_CallObject(handler, t); |
284 | if (retval == NULL) | 305 | if (retval == NULL) |
285 | handler_call_die(handler_name); | 306 | handler_call_die(handler_name); |
286 | } else { | 307 | } else { |
287 | handler = PyDict_GetItemString(main_dict, "trace_unhandled"); | 308 | handler = PyDict_GetItemString(main_dict, "trace_unhandled"); |
288 | if (handler && PyCallable_Check(handler)) { | 309 | if (handler && PyCallable_Check(handler)) { |
289 | if (_PyTuple_Resize(&t, N_COMMON_FIELDS) == -1) | ||
290 | Py_FatalError("error resizing Python tuple"); | ||
291 | 310 | ||
292 | retval = PyObject_CallObject(handler, t); | 311 | retval = PyObject_CallObject(handler, t); |
293 | if (retval == NULL) | 312 | if (retval == NULL) |
294 | handler_call_die("trace_unhandled"); | 313 | handler_call_die("trace_unhandled"); |
295 | } | 314 | } |
315 | Py_DECREF(dict); | ||
296 | } | 316 | } |
297 | 317 | ||
298 | Py_DECREF(t); | 318 | Py_DECREF(t); |
@@ -548,12 +568,10 @@ static int python_generate_script(const char *outfile) | |||
548 | } | 568 | } |
549 | 569 | ||
550 | fprintf(ofp, "def trace_unhandled(event_name, context, " | 570 | fprintf(ofp, "def trace_unhandled(event_name, context, " |
551 | "common_cpu, common_secs, common_nsecs,\n\t\t" | 571 | "event_fields_dict):\n"); |
552 | "common_pid, common_comm):\n"); | ||
553 | 572 | ||
554 | fprintf(ofp, "\t\tprint_header(event_name, common_cpu, " | 573 | fprintf(ofp, "\t\tprint ' '.join(['%%s=%%s'%%(k,str(v))" |
555 | "common_secs, common_nsecs,\n\t\tcommon_pid, " | 574 | "for k,v in sorted(event_fields_dict.items())])\n\n"); |
556 | "common_comm)\n\n"); | ||
557 | 575 | ||
558 | fprintf(ofp, "def print_header(" | 576 | fprintf(ofp, "def print_header(" |
559 | "event_name, cpu, secs, nsecs, pid, comm):\n" | 577 | "event_name, cpu, secs, nsecs, pid, comm):\n" |