Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 566b60c0 authored by Russell King's avatar Russell King
Browse files

Merge branch 'uprobes-v7' of git://git.linaro.org/people/dave.long/linux into devel-stable 

This patch series adds basic uprobes support to ARM. It is based on
patches developed earlier by Rabin Vincent. That approach of adding
hooks into the kprobes instruction parsing code was not well received.
This approach separates the ARM instruction parsing code in kprobes out
into a separate set of functions which can be used by both kprobes and
uprobes. Both kprobes and uprobes then provide their own semantic action
tables to process the results of the parsing.
parents 3ba4cea2 c7edc9e3

Documentation/ABI/testing/sysfs-tty

+1 −2
Original line number Original line Diff line number Diff line
@@ -3,8 +3,7 @@ Date: Nov 2010 
Contact:	Kay Sievers <kay.sievers@vrfy.org>

Contact:	Kay Sievers <kay.sievers@vrfy.org>

Description:

Description:

		 Shows the list of currently configured

		 Shows the list of currently configured

		 tty devices used for the console,

		 console devices, like 'tty1 ttyS0'.

		 like 'tty1 ttyS0'.

		 The last entry in the file is the active

		 The last entry in the file is the active

		 device connected to /dev/console.

		 device connected to /dev/console.

		 The file supports poll() to detect virtual

		 The file supports poll() to detect virtual

Documentation/PCI/MSI-HOWTO.txt

+109 −10
Original line number Original line Diff line number Diff line
@@ -82,7 +82,19 @@ Most of the hard work is done for the driver in the PCI layer. It simply 
has to request that the PCI layer set up the MSI capability for this

has to request that the PCI layer set up the MSI capability for this

device.

device.





4.2.1 pci_enable_msi_range

4.2.1 pci_enable_msi



int pci_enable_msi(struct pci_dev *dev)



A successful call allocates ONE interrupt to the device, regardless

of how many MSIs the device supports.  The device is switched from

pin-based interrupt mode to MSI mode.  The dev->irq number is changed

to a new number which represents the message signaled interrupt;

consequently, this function should be called before the driver calls

request_irq(), because an MSI is delivered via a vector that is

different from the vector of a pin-based interrupt.



4.2.2 pci_enable_msi_range





int pci_enable_msi_range(struct pci_dev *dev, int minvec, int maxvec)

int pci_enable_msi_range(struct pci_dev *dev, int minvec, int maxvec)
@@ -147,6 +159,11 @@ static int foo_driver_enable_msi(struct pci_dev *pdev, int nvec) 
	return pci_enable_msi_range(pdev, nvec, nvec);

	return pci_enable_msi_range(pdev, nvec, nvec);

}

}





Note, unlike pci_enable_msi_exact() function, which could be also used to

enable a particular number of MSI-X interrupts, pci_enable_msi_range()

returns either a negative errno or 'nvec' (not negative errno or 0 - as

pci_enable_msi_exact() does).



4.2.1.3 Single MSI mode

4.2.1.3 Single MSI mode





The most notorious example of the request type described above is

The most notorious example of the request type described above is
@@ -158,7 +175,27 @@ static int foo_driver_enable_single_msi(struct pci_dev *pdev) 
	return pci_enable_msi_range(pdev, 1, 1);

	return pci_enable_msi_range(pdev, 1, 1);

}

}





4.2.2 pci_disable_msi

Note, unlike pci_enable_msi() function, which could be also used to

enable the single MSI mode, pci_enable_msi_range() returns either a

negative errno or 1 (not negative errno or 0 - as pci_enable_msi()

does).



4.2.3 pci_enable_msi_exact



int pci_enable_msi_exact(struct pci_dev *dev, int nvec)



This variation on pci_enable_msi_range() call allows a device driver to

request exactly 'nvec' MSIs.



If this function returns a negative number, it indicates an error and

the driver should not attempt to request any more MSI interrupts for

this device.



By contrast with pci_enable_msi_range() function, pci_enable_msi_exact()

returns zero in case of success, which indicates MSI interrupts have been

successfully allocated.



4.2.4 pci_disable_msi





void pci_disable_msi(struct pci_dev *dev)

void pci_disable_msi(struct pci_dev *dev)
@@ -172,7 +209,7 @@ on any interrupt for which it previously called request_irq(). 
Failure to do so results in a BUG_ON(), leaving the device with

Failure to do so results in a BUG_ON(), leaving the device with

MSI enabled and thus leaking its vector.

MSI enabled and thus leaking its vector.





4.2.3 pci_msi_vec_count

4.2.4 pci_msi_vec_count





int pci_msi_vec_count(struct pci_dev *dev)

int pci_msi_vec_count(struct pci_dev *dev)
@@ -257,7 +294,7 @@ possible, likely up to the limit returned by pci_msix_vec_count() function: 




static int foo_driver_enable_msix(struct foo_adapter *adapter, int nvec)

static int foo_driver_enable_msix(struct foo_adapter *adapter, int nvec)

{

{

	return pci_enable_msi_range(adapter->pdev, adapter->msix_entries,

	return pci_enable_msix_range(adapter->pdev, adapter->msix_entries,

				     1, nvec);

				     1, nvec);

}

}
@@ -269,7 +306,7 @@ In this case the function could look like this: 




static int foo_driver_enable_msix(struct foo_adapter *adapter, int nvec)

static int foo_driver_enable_msix(struct foo_adapter *adapter, int nvec)

{

{

	return pci_enable_msi_range(adapter->pdev, adapter->msix_entries,

	return pci_enable_msix_range(adapter->pdev, adapter->msix_entries,

				     FOO_DRIVER_MINIMUM_NVEC, nvec);

				     FOO_DRIVER_MINIMUM_NVEC, nvec);

}

}
@@ -282,10 +319,15 @@ parameters: 




static int foo_driver_enable_msix(struct foo_adapter *adapter, int nvec)

static int foo_driver_enable_msix(struct foo_adapter *adapter, int nvec)

{

{

	return pci_enable_msi_range(adapter->pdev, adapter->msix_entries,

	return pci_enable_msix_range(adapter->pdev, adapter->msix_entries,

				     nvec, nvec);

				     nvec, nvec);

}

}





Note, unlike pci_enable_msix_exact() function, which could be also used to

enable a particular number of MSI-X interrupts, pci_enable_msix_range()

returns either a negative errno or 'nvec' (not negative errno or 0 - as

pci_enable_msix_exact() does).



4.3.1.3 Specific requirements to the number of MSI-X interrupts

4.3.1.3 Specific requirements to the number of MSI-X interrupts





As noted above, there could be devices that can not operate with just any

As noted above, there could be devices that can not operate with just any
@@ -332,7 +374,64 @@ Note how pci_enable_msix_range() return value is analized for a fallback - 
any error code other than -ENOSPC indicates a fatal error and should not

any error code other than -ENOSPC indicates a fatal error and should not

be retried.

be retried.





4.3.2 pci_disable_msix

4.3.2 pci_enable_msix_exact



int pci_enable_msix_exact(struct pci_dev *dev,

			  struct msix_entry *entries, int nvec)



This variation on pci_enable_msix_range() call allows a device driver to

request exactly 'nvec' MSI-Xs.



If this function returns a negative number, it indicates an error and

the driver should not attempt to allocate any more MSI-X interrupts for

this device.



By contrast with pci_enable_msix_range() function, pci_enable_msix_exact()

returns zero in case of success, which indicates MSI-X interrupts have been

successfully allocated.



Another version of a routine that enables MSI-X mode for a device with

specific requirements described in chapter 4.3.1.3 might look like this:



/*

 * Assume 'minvec' and 'maxvec' are non-zero

 */

static int foo_driver_enable_msix(struct foo_adapter *adapter,

				  int minvec, int maxvec)

{

	int rc;



	minvec = roundup_pow_of_two(minvec);

	maxvec = rounddown_pow_of_two(maxvec);



	if (minvec > maxvec)

		return -ERANGE;



retry:

	rc = pci_enable_msix_exact(adapter->pdev,

				   adapter->msix_entries, maxvec);



	/*

	 * -ENOSPC is the only error code allowed to be analyzed

	 */

	if (rc == -ENOSPC) {

		if (maxvec == 1)

			return -ENOSPC;



		maxvec /= 2;



		if (minvec > maxvec)

			return -ENOSPC;



		goto retry;

	} else if (rc < 0) {

		return rc;

	}



	return maxvec;

}



4.3.3 pci_disable_msix





void pci_disable_msix(struct pci_dev *dev)

void pci_disable_msix(struct pci_dev *dev)

Documentation/devicetree/bindings/arm/omap/omap.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -91,7 +91,7 @@ Boards: 
  compatible = "ti,omap3-beagle", "ti,omap3"

  compatible = "ti,omap3-beagle", "ti,omap3"





- OMAP3 Tobi with Overo : Commercial expansion board with daughter board

- OMAP3 Tobi with Overo : Commercial expansion board with daughter board

  compatible = "ti,omap3-tobi", "ti,omap3-overo", "ti,omap3"

  compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo", "ti,omap3"





- OMAP4 SDP : Software Development Board

- OMAP4 SDP : Software Development Board

  compatible = "ti,omap4-sdp", "ti,omap4430"

  compatible = "ti,omap4-sdp", "ti,omap4430"

Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt

+10 −6
Original line number Original line Diff line number Diff line 
* Freescale Smart Direct Memory Access (SDMA) Controller for i.MX

* Freescale Smart Direct Memory Access (SDMA) Controller for i.MX





Required properties:

Required properties:

- compatible : Should be "fsl,imx31-sdma", "fsl,imx31-to1-sdma",

- compatible : Should be one of

  "fsl,imx31-to2-sdma", "fsl,imx35-sdma", "fsl,imx35-to1-sdma",

      "fsl,imx25-sdma"

  "fsl,imx35-to2-sdma", "fsl,imx51-sdma", "fsl,imx53-sdma" or

      "fsl,imx31-sdma", "fsl,imx31-to1-sdma", "fsl,imx31-to2-sdma"

  "fsl,imx6q-sdma". The -to variants should be preferred since they

      "fsl,imx35-sdma", "fsl,imx35-to1-sdma", "fsl,imx35-to2-sdma"

  allow to determnine the correct ROM script addresses needed for

      "fsl,imx51-sdma"

  the driver to work without additional firmware.

      "fsl,imx53-sdma"

      "fsl,imx6q-sdma"

  The -to variants should be preferred since they allow to determnine the

  correct ROM script addresses needed for the driver to work without additional

  firmware.

- reg : Should contain SDMA registers location and length

- reg : Should contain SDMA registers location and length

- interrupts : Should contain SDMA interrupt

- interrupts : Should contain SDMA interrupt

- #dma-cells : Must be <3>.

- #dma-cells : Must be <3>.

Documentation/devicetree/bindings/net/sti-dwmac.txt

0 → 100644
+58 −0
Original line number Original line Diff line number Diff line 
STMicroelectronics SoC DWMAC glue layer controller



The device node has following properties.



Required properties:

 - compatible	: Can be "st,stih415-dwmac", "st,stih416-dwmac" or

   "st,stid127-dwmac".

 - reg		: Offset of the glue configuration register map in system

   configuration regmap pointed by st,syscon property and size.



 - reg-names	: Should be "sti-ethconf".



 - st,syscon	: Should be phandle to system configuration node which

   encompases this glue registers.



 - st,tx-retime-src: On STi Parts for Giga bit speeds, 125Mhz clocks can be

   wired up in from different sources. One via TXCLK pin and other via CLK_125

   pin. This wiring is totally board dependent. However the retiming glue

   logic should be configured accordingly. Possible values for this property



	   "txclk" - if 125Mhz clock is wired up via txclk line.

	   "clk_125" - if 125Mhz clock is wired up via clk_125 line.



   This property is only valid for Giga bit setup( GMII, RGMII), and it is

   un-used for non-giga bit (MII and RMII) setups. Also note that internal

   clockgen can not generate stable 125Mhz clock.



 - st,ext-phyclk: This boolean property indicates who is generating the clock

  for tx and rx. This property is only valid for RMII case where the clock can

  be generated from the MAC or PHY.



 - clock-names: should be "sti-ethclk".

 - clocks: Should point to ethernet clockgen which can generate phyclk.





Example:



ethernet0: dwmac@fe810000 {

	device_type 	= "network";

	compatible	= "st,stih416-dwmac", "snps,dwmac", "snps,dwmac-3.710";

	reg 		= <0xfe810000 0x8000>, <0x8bc 0x4>;

	reg-names	= "stmmaceth", "sti-ethconf";

	interrupts	= <0 133 0>, <0 134 0>, <0 135 0>;

	interrupt-names	= "macirq", "eth_wake_irq", "eth_lpi";

	phy-mode	= "mii";



	st,syscon	= <&syscfg_rear>;



	snps,pbl 	= <32>;

	snps,mixed-burst;



	resets		= <&softreset STIH416_ETH0_SOFTRESET>;

	reset-names	= "stmmaceth";

	pinctrl-0	= <&pinctrl_mii0>;

	pinctrl-names 	= "default";

	clocks		= <&CLK_S_GMAC0_PHY>;

	clock-names	= "stmmaceth";

};