Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
Pull networking updates from David Miller:
"Reasonably busy this cycle, but perhaps not as busy as in the 4.12
merge window:
1) Several optimizations for UDP processing under high load from
Paolo Abeni.
2) Support pacing internally in TCP when using the sch_fq packet
scheduler for this is not practical. From Eric Dumazet.
3) Support mutliple filter chains per qdisc, from Jiri Pirko.
4) Move to 1ms TCP timestamp clock, from Eric Dumazet.
5) Add batch dequeueing to vhost_net, from Jason Wang.
6) Flesh out more completely SCTP checksum offload support, from
Davide Caratti.
7) More plumbing of extended netlink ACKs, from David Ahern, Pablo
Neira Ayuso, and Matthias Schiffer.
8) Add devlink support to nfp driver, from Simon Horman.
9) Add RTM_F_FIB_MATCH flag to RTM_GETROUTE queries, from Roopa
Prabhu.
10) Add stack depth tracking to BPF verifier and use this information
in the various eBPF JITs. From Alexei Starovoitov.
11) Support XDP on qed device VFs, from Yuval Mintz.
12) Introduce BPF PROG ID for better introspection of installed BPF
programs. From Martin KaFai Lau.
13) Add bpf_set_hash helper for TC bpf programs, from Daniel Borkmann.
14) For loads, allow narrower accesses in bpf verifier checking, from
Yonghong Song.
15) Support MIPS in the BPF selftests and samples infrastructure, the
MIPS eBPF JIT will be merged in via the MIPS GIT tree. From David
Daney.
16) Support kernel based TLS, from Dave Watson and others.
17) Remove completely DST garbage collection, from Wei Wang.
18) Allow installing TCP MD5 rules using prefixes, from Ivan
Delalande.
19) Add XDP support to Intel i40e driver, from Björn Töpel
20) Add support for TC flower offload in nfp driver, from Simon
Horman, Pieter Jansen van Vuuren, Benjamin LaHaise, Jakub
Kicinski, and Bert van Leeuwen.
21) IPSEC offloading support in mlx5, from Ilan Tayari.
22) Add HW PTP support to macb driver, from Rafal Ozieblo.
23) Networking refcount_t conversions, From Elena Reshetova.
24) Add sock_ops support to BPF, from Lawrence Brako. This is useful
for tuning the TCP sockopt settings of a group of applications,
currently via CGROUPs"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1899 commits)
net: phy: dp83867: add workaround for incorrect RX_CTRL pin strap
dt-bindings: phy: dp83867: provide a workaround for incorrect RX_CTRL pin strap
cxgb4: Support for get_ts_info ethtool method
cxgb4: Add PTP Hardware Clock (PHC) support
cxgb4: time stamping interface for PTP
nfp: default to chained metadata prepend format
nfp: remove legacy MAC address lookup
nfp: improve order of interfaces in breakout mode
net: macb: remove extraneous return when MACB_EXT_DESC is defined
bpf: add missing break in for the TCP_BPF_SNDCWND_CLAMP case
bpf: fix return in load_bpf_file
mpls: fix rtm policy in mpls_getroute
net, ax25: convert ax25_cb.refcount from atomic_t to refcount_t
net, ax25: convert ax25_route.refcount from atomic_t to refcount_t
net, ax25: convert ax25_uid_assoc.refcount from atomic_t to refcount_t
net, sctp: convert sctp_ep_common.refcnt from atomic_t to refcount_t
net, sctp: convert sctp_transport.refcnt from atomic_t to refcount_t
net, sctp: convert sctp_chunk.refcnt from atomic_t to refcount_t
net, sctp: convert sctp_datamsg.refcnt from atomic_t to refcount_t
net, sctp: convert sctp_auth_bytes.refcnt from atomic_t to refcount_t
...
This commit is contained in:
Linus Torvalds
commit
5518b69b76
|
|
@ -251,3 +251,11 @@ Contact: netdev@vger.kernel.org
|
|||
Description:
|
||||
Indicates the unique physical switch identifier of a switch this
|
||||
port belongs to, as a string.
|
||||
|
||||
What: /sys/class/net/<iface>/phydev
|
||||
Date: May 2017
|
||||
KernelVersion: 4.13
|
||||
Contact: netdev@vger.kernel.org
|
||||
Description:
|
||||
Symbolic link to the PHY device this network device is attached
|
||||
to.
|
||||
|
|
|
|||
|
|
@ -0,0 +1,36 @@
|
|||
What: /sys/class/mdio_bus/<bus>/<device>/attached_dev
|
||||
Date: May 2017
|
||||
KernelVersion: 4.13
|
||||
Contact: netdev@vger.kernel.org
|
||||
Description:
|
||||
Symbolic link to the network device this PHY device is
|
||||
attached to.
|
||||
|
||||
What: /sys/class/mdio_bus/<bus>/<device>/phy_has_fixups
|
||||
Date: February 2014
|
||||
KernelVersion: 3.15
|
||||
Contact: netdev@vger.kernel.org
|
||||
Description:
|
||||
Boolean value indicating whether the PHY device has
|
||||
any fixups registered against it (phy_register_fixup)
|
||||
|
||||
What: /sys/class/mdio_bus/<bus>/<device>/phy_id
|
||||
Date: November 2012
|
||||
KernelVersion: 3.8
|
||||
Contact: netdev@vger.kernel.org
|
||||
Description:
|
||||
32-bit hexadecimal value corresponding to the PHY device's OUI,
|
||||
model and revision number.
|
||||
|
||||
What: /sys/class/mdio_bus/<bus>/<device>/phy_interface
|
||||
Date: February 2014
|
||||
KernelVersion: 3.15
|
||||
Contact: netdev@vger.kernel.org
|
||||
Description:
|
||||
String value indicating the PHY interface, possible
|
||||
values are:.
|
||||
<empty> (not available), mii, gmii, sgmii, tbi, rev-mii,
|
||||
rmii, rgmii, rgmii-id, rgmii-rxid, rgmii-txid, rtbi, smii
|
||||
xgmii, moca, qsgmii, trgmii, 1000base-x, 2500base-x, rxaui,
|
||||
xaui, 10gbase-kr, unknown
|
||||
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
* Allwinner sun8i system controller
|
||||
|
||||
This file describes the bindings for the system controller present in
|
||||
Allwinner SoC H3, A83T and A64.
|
||||
The principal function of this syscon is to control EMAC PHY choice and
|
||||
config.
|
||||
|
||||
Required properties for the system controller:
|
||||
- reg: address and length of the register for the device.
|
||||
- compatible: should be "syscon" and one of the following string:
|
||||
"allwinner,sun8i-h3-system-controller"
|
||||
"allwinner,sun8i-v3s-system-controller"
|
||||
"allwinner,sun50i-a64-system-controller"
|
||||
"allwinner,sun8i-a83t-system-controller"
|
||||
|
||||
Example:
|
||||
syscon: syscon@1c00000 {
|
||||
compatible = "allwinner,sun8i-h3-system-controller", "syscon";
|
||||
reg = <0x01c00000 0x1000>;
|
||||
};
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
Cortina Phy Driver Device Tree Bindings
|
||||
---------------------------------------
|
||||
|
||||
CORTINA is a registered trademark of Cortina Systems, Inc.
|
||||
|
||||
The driver supports the Cortina Electronic Dispersion Compensation (EDC)
|
||||
devices, equipped with clock and data recovery (CDR) circuits. These
|
||||
devices make use of registers that are not compatible with Clause 45 or
|
||||
Clause 22, therefore they need to be described using the
|
||||
"ethernet-phy-id" compatible.
|
||||
|
||||
Since the driver only implements polling mode support, interrupts info
|
||||
can be skipped.
|
||||
|
||||
Example (CS4340 phy):
|
||||
mdio {
|
||||
cs4340_phy@10 {
|
||||
compatible = "ethernet-phy-id13e5.1002";
|
||||
reg = <0x10>;
|
||||
};
|
||||
};
|
||||
|
|
@ -13,6 +13,9 @@ Required properties:
|
|||
"brcm,bcm5397"
|
||||
"brcm,bcm5398"
|
||||
|
||||
For the BCM11360 SoC, must be:
|
||||
"brcm,bcm11360-srab" and the mandatory "brcm,cygnus-srab" string
|
||||
|
||||
For the BCM5310x SoCs with an integrated switch, must be one of:
|
||||
"brcm,bcm53010-srab"
|
||||
"brcm,bcm53011-srab"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,72 @@
|
|||
Microchip KSZ Series Ethernet switches
|
||||
==================================
|
||||
|
||||
Required properties:
|
||||
|
||||
- compatible: For external switch chips, compatible string must be exactly one
|
||||
of: "microchip,ksz9477"
|
||||
|
||||
See Documentation/devicetree/bindings/dsa/dsa.txt for a list of additional
|
||||
required and optional properties.
|
||||
|
||||
Examples:
|
||||
|
||||
Ethernet switch connected via SPI to the host, CPU port wired to eth0:
|
||||
|
||||
eth0: ethernet@10001000 {
|
||||
fixed-link {
|
||||
speed = <1000>;
|
||||
full-duplex;
|
||||
};
|
||||
};
|
||||
|
||||
spi1: spi@f8008000 {
|
||||
pinctrl-0 = <&pinctrl_spi_ksz>;
|
||||
cs-gpios = <&pioC 25 0>;
|
||||
id = <1>;
|
||||
status = "okay";
|
||||
|
||||
ksz9477: ksz9477@0 {
|
||||
compatible = "microchip,ksz9477";
|
||||
reg = <0>;
|
||||
|
||||
spi-max-frequency = <44000000>;
|
||||
spi-cpha;
|
||||
spi-cpol;
|
||||
|
||||
status = "okay";
|
||||
ports {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
port@0 {
|
||||
reg = <0>;
|
||||
label = "lan1";
|
||||
};
|
||||
port@1 {
|
||||
reg = <1>;
|
||||
label = "lan2";
|
||||
};
|
||||
port@2 {
|
||||
reg = <2>;
|
||||
label = "lan3";
|
||||
};
|
||||
port@3 {
|
||||
reg = <3>;
|
||||
label = "lan4";
|
||||
};
|
||||
port@4 {
|
||||
reg = <4>;
|
||||
label = "lan5";
|
||||
};
|
||||
port@5 {
|
||||
reg = <5>;
|
||||
label = "cpu";
|
||||
ethernet = <ð0>;
|
||||
fixed-link {
|
||||
speed = <1000>;
|
||||
full-duplex;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -0,0 +1,84 @@
|
|||
* Allwinner sun8i GMAC ethernet controller
|
||||
|
||||
This device is a platform glue layer for stmmac.
|
||||
Please see stmmac.txt for the other unchanged properties.
|
||||
|
||||
Required properties:
|
||||
- compatible: should be one of the following string:
|
||||
"allwinner,sun8i-a83t-emac"
|
||||
"allwinner,sun8i-h3-emac"
|
||||
"allwinner,sun8i-v3s-emac"
|
||||
"allwinner,sun50i-a64-emac"
|
||||
- reg: address and length of the register for the device.
|
||||
- interrupts: interrupt for the device
|
||||
- interrupt-names: should be "macirq"
|
||||
- clocks: A phandle to the reference clock for this device
|
||||
- clock-names: should be "stmmaceth"
|
||||
- resets: A phandle to the reset control for this device
|
||||
- reset-names: should be "stmmaceth"
|
||||
- phy-mode: See ethernet.txt
|
||||
- phy-handle: See ethernet.txt
|
||||
- #address-cells: shall be 1
|
||||
- #size-cells: shall be 0
|
||||
- syscon: A phandle to the syscon of the SoC with one of the following
|
||||
compatible string:
|
||||
- allwinner,sun8i-h3-system-controller
|
||||
- allwinner,sun8i-v3s-system-controller
|
||||
- allwinner,sun50i-a64-system-controller
|
||||
- allwinner,sun8i-a83t-system-controller
|
||||
|
||||
Optional properties:
|
||||
- allwinner,tx-delay-ps: TX clock delay chain value in ps. Range value is 0-700. Default is 0)
|
||||
- allwinner,rx-delay-ps: RX clock delay chain value in ps. Range value is 0-3100. Default is 0)
|
||||
Both delay properties need to be a multiple of 100. They control the delay for
|
||||
external PHY.
|
||||
|
||||
Optional properties for the following compatibles:
|
||||
- "allwinner,sun8i-h3-emac",
|
||||
- "allwinner,sun8i-v3s-emac":
|
||||
- allwinner,leds-active-low: EPHY LEDs are active low
|
||||
|
||||
Required child node of emac:
|
||||
- mdio bus node: should be named mdio
|
||||
|
||||
Required properties of the mdio node:
|
||||
- #address-cells: shall be 1
|
||||
- #size-cells: shall be 0
|
||||
|
||||
The device node referenced by "phy" or "phy-handle" should be a child node
|
||||
of the mdio node. See phy.txt for the generic PHY bindings.
|
||||
|
||||
Required properties of the phy node with the following compatibles:
|
||||
- "allwinner,sun8i-h3-emac",
|
||||
- "allwinner,sun8i-v3s-emac":
|
||||
- clocks: a phandle to the reference clock for the EPHY
|
||||
- resets: a phandle to the reset control for the EPHY
|
||||
|
||||
Example:
|
||||
|
||||
emac: ethernet@1c0b000 {
|
||||
compatible = "allwinner,sun8i-h3-emac";
|
||||
syscon = <&syscon>;
|
||||
reg = <0x01c0b000 0x104>;
|
||||
interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "macirq";
|
||||
resets = <&ccu RST_BUS_EMAC>;
|
||||
reset-names = "stmmaceth";
|
||||
clocks = <&ccu CLK_BUS_EMAC>;
|
||||
clock-names = "stmmaceth";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
||||
phy-handle = <&int_mii_phy>;
|
||||
phy-mode = "mii";
|
||||
allwinner,leds-active-low;
|
||||
mdio: mdio {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
int_mii_phy: ethernet-phy@1 {
|
||||
reg = <1>;
|
||||
clocks = <&ccu CLK_BUS_EPHY>;
|
||||
resets = <&ccu RST_BUS_EPHY>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -11,6 +11,7 @@ The following properties are common to the Ethernet controllers:
|
|||
the maximum frame size (there's contradiction in ePAPR).
|
||||
- phy-mode: string, operation mode of the PHY interface. This is now a de-facto
|
||||
standard property; supported values are:
|
||||
* "internal"
|
||||
* "mii"
|
||||
* "gmii"
|
||||
* "sgmii"
|
||||
|
|
@ -32,6 +33,8 @@ The following properties are common to the Ethernet controllers:
|
|||
* "2000base-x",
|
||||
* "2500base-x",
|
||||
* "rxaui"
|
||||
* "xaui"
|
||||
* "10gbase-kr" (10GBASE-KR, XFI, SFI)
|
||||
- phy-connection-type: the same as "phy-mode" property but described in ePAPR;
|
||||
- phy-handle: phandle, specifies a reference to a node representing a PHY
|
||||
device; this property is described in ePAPR and so preferred;
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ Required properties:
|
|||
Required elements: 'pclk', 'hclk'
|
||||
Optional elements: 'tx_clk'
|
||||
Optional elements: 'rx_clk' applies to cdns,zynqmp-gem
|
||||
Optional elements: 'tsu_clk'
|
||||
- clocks: Phandles to input clocks.
|
||||
|
||||
Optional properties for PHY child node:
|
||||
|
|
|
|||
|
|
@ -1,12 +1,14 @@
|
|||
* Marvell MDIO Ethernet Controller interface
|
||||
|
||||
The Ethernet controllers of the Marvel Kirkwood, Dove, Orion5x,
|
||||
MV78xx0, Armada 370 and Armada XP have an identical unit that provides
|
||||
an interface with the MDIO bus. This driver handles this MDIO
|
||||
interface.
|
||||
MV78xx0, Armada 370, Armada XP, Armada 7k and Armada 8k have an
|
||||
identical unit that provides an interface with the MDIO bus.
|
||||
Additionally, Armada 7k and Armada 8k has a second unit which
|
||||
provides an interface with the xMDIO bus. This driver handles
|
||||
these interfaces.
|
||||
|
||||
Required properties:
|
||||
- compatible: "marvell,orion-mdio"
|
||||
- compatible: "marvell,orion-mdio" or "marvell,xmdio"
|
||||
- reg: address and length of the MDIO registers. When an interrupt is
|
||||
not present, the length is the size of the SMI register (4 bytes)
|
||||
otherwise it must be 0x84 bytes to cover the interrupt control
|
||||
|
|
|
|||
|
|
@ -13,14 +13,10 @@ Optional SoC Specific Properties:
|
|||
- pinctrl-names: Contains only one value - "default".
|
||||
- pintctrl-0: Specifies the pin control groups used for this controller.
|
||||
- autosuspend-delay: Specify autosuspend delay in milliseconds.
|
||||
- vin-voltage-override: Specify voltage of VIN pin in microvolts.
|
||||
- irq-status-read-quirk: Specify that the trf7970a being used has the
|
||||
"IRQ Status Read" erratum.
|
||||
- en2-rf-quirk: Specify that the trf7970a being used has the "EN2 RF"
|
||||
erratum.
|
||||
- t5t-rmb-extra-byte-quirk: Specify that the trf7970a has the erratum
|
||||
where an extra byte is returned by Read Multiple Block commands issued
|
||||
to Type 5 tags.
|
||||
- vdd-io-supply: Regulator specifying voltage for vdd-io
|
||||
- clock-frequency: Set to specify that the input frequency to the trf7970a is 13560000Hz or 27120000Hz
|
||||
|
||||
|
|
@ -37,15 +33,13 @@ Example (for ARM-based BeagleBone with TRF7970A on SPI1):
|
|||
spi-max-frequency = <2000000>;
|
||||
interrupt-parent = <&gpio2>;
|
||||
interrupts = <14 0>;
|
||||
ti,enable-gpios = <&gpio2 2 GPIO_ACTIVE_LOW>,
|
||||
<&gpio2 5 GPIO_ACTIVE_LOW>;
|
||||
ti,enable-gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>,
|
||||
<&gpio2 5 GPIO_ACTIVE_HIGH>;
|
||||
vin-supply = <&ldo3_reg>;
|
||||
vin-voltage-override = <5000000>;
|
||||
vdd-io-supply = <&ldo2_reg>;
|
||||
autosuspend-delay = <30000>;
|
||||
irq-status-read-quirk;
|
||||
en2-rf-quirk;
|
||||
t5t-rmb-extra-byte-quirk;
|
||||
clock-frequency = <27120000>;
|
||||
status = "okay";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -0,0 +1,88 @@
|
|||
* Qualcomm QCA7000
|
||||
|
||||
The QCA7000 is a serial-to-powerline bridge with a host interface which could
|
||||
be configured either as SPI or UART slave. This configuration is done by
|
||||
the QCA7000 firmware.
|
||||
|
||||
(a) Ethernet over SPI
|
||||
|
||||
In order to use the QCA7000 as SPI device it must be defined as a child of a
|
||||
SPI master in the device tree.
|
||||
|
||||
Required properties:
|
||||
- compatible : Should be "qca,qca7000"
|
||||
- reg : Should specify the SPI chip select
|
||||
- interrupts : The first cell should specify the index of the source
|
||||
interrupt and the second cell should specify the trigger
|
||||
type as rising edge
|
||||
- spi-cpha : Must be set
|
||||
- spi-cpol : Must be set
|
||||
|
||||
Optional properties:
|
||||
- interrupt-parent : Specify the pHandle of the source interrupt
|
||||
- spi-max-frequency : Maximum frequency of the SPI bus the chip can operate at.
|
||||
Numbers smaller than 1000000 or greater than 16000000
|
||||
are invalid. Missing the property will set the SPI
|
||||
frequency to 8000000 Hertz.
|
||||
- local-mac-address : see ./ethernet.txt
|
||||
- qca,legacy-mode : Set the SPI data transfer of the QCA7000 to legacy mode.
|
||||
In this mode the SPI master must toggle the chip select
|
||||
between each data word. In burst mode these gaps aren't
|
||||
necessary, which is faster. This setting depends on how
|
||||
the QCA7000 is setup via GPIO pin strapping. If the
|
||||
property is missing the driver defaults to burst mode.
|
||||
|
||||
SPI Example:
|
||||
|
||||
/* Freescale i.MX28 SPI master*/
|
||||
ssp2: spi@80014000 {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
compatible = "fsl,imx28-spi";
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&spi2_pins_a>;
|
||||
status = "okay";
|
||||
|
||||
qca7000: ethernet@0 {
|
||||
compatible = "qca,qca7000";
|
||||
reg = <0x0>;
|
||||
interrupt-parent = <&gpio3>; /* GPIO Bank 3 */
|
||||
interrupts = <25 0x1>; /* Index: 25, rising edge */
|
||||
spi-cpha; /* SPI mode: CPHA=1 */
|
||||
spi-cpol; /* SPI mode: CPOL=1 */
|
||||
spi-max-frequency = <8000000>; /* freq: 8 MHz */
|
||||
local-mac-address = [ A0 B0 C0 D0 E0 F0 ];
|
||||
};
|
||||
};
|
||||
|
||||
(b) Ethernet over UART
|
||||
|
||||
In order to use the QCA7000 as UART slave it must be defined as a child of a
|
||||
UART master in the device tree. It is possible to preconfigure the UART
|
||||
settings of the QCA7000 firmware, but it's not possible to change them during
|
||||
runtime.
|
||||
|
||||
Required properties:
|
||||
- compatible : Should be "qca,qca7000"
|
||||
|
||||
Optional properties:
|
||||
- local-mac-address : see ./ethernet.txt
|
||||
- current-speed : current baud rate of QCA7000 which defaults to 115200
|
||||
if absent, see also ../serial/slave-device.txt
|
||||
|
||||
UART Example:
|
||||
|
||||
/* Freescale i.MX28 UART */
|
||||
auart0: serial@8006a000 {
|
||||
compatible = "fsl,imx28-auart", "fsl,imx23-auart";
|
||||
reg = <0x8006a000 0x2000>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&auart0_2pins_a>;
|
||||
status = "okay";
|
||||
|
||||
qca7000: ethernet {
|
||||
compatible = "qca,qca7000";
|
||||
local-mac-address = [ A0 B0 C0 D0 E0 F0 ];
|
||||
current-speed = <38400>;
|
||||
};
|
||||
};
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
* Qualcomm QCA7000 (Ethernet over SPI protocol)
|
||||
|
||||
Note: The QCA7000 is useable as a SPI device. In this case it must be defined
|
||||
as a child of a SPI master in the device tree.
|
||||
|
||||
Required properties:
|
||||
- compatible : Should be "qca,qca7000"
|
||||
- reg : Should specify the SPI chip select
|
||||
- interrupts : The first cell should specify the index of the source interrupt
|
||||
and the second cell should specify the trigger type as rising edge
|
||||
- spi-cpha : Must be set
|
||||
- spi-cpol: Must be set
|
||||
|
||||
Optional properties:
|
||||
- interrupt-parent : Specify the pHandle of the source interrupt
|
||||
- spi-max-frequency : Maximum frequency of the SPI bus the chip can operate at.
|
||||
Numbers smaller than 1000000 or greater than 16000000 are invalid. Missing
|
||||
the property will set the SPI frequency to 8000000 Hertz.
|
||||
- local-mac-address: 6 bytes, MAC address
|
||||
- qca,legacy-mode : Set the SPI data transfer of the QCA7000 to legacy mode.
|
||||
In this mode the SPI master must toggle the chip select between each data
|
||||
word. In burst mode these gaps aren't necessary, which is faster.
|
||||
This setting depends on how the QCA7000 is setup via GPIO pin strapping.
|
||||
If the property is missing the driver defaults to burst mode.
|
||||
|
||||
Example:
|
||||
|
||||
/* Freescale i.MX28 SPI master*/
|
||||
ssp2: spi@80014000 {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
compatible = "fsl,imx28-spi";
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&spi2_pins_a>;
|
||||
status = "okay";
|
||||
|
||||
qca7000: ethernet@0 {
|
||||
compatible = "qca,qca7000";
|
||||
reg = <0x0>;
|
||||
interrupt-parent = <&gpio3>; /* GPIO Bank 3 */
|
||||
interrupts = <25 0x1>; /* Index: 25, rising edge */
|
||||
spi-cpha; /* SPI mode: CPHA=1 */
|
||||
spi-cpol; /* SPI mode: CPOL=1 */
|
||||
spi-max-frequency = <8000000>; /* freq: 8 MHz */
|
||||
local-mac-address = [ A0 B0 C0 D0 E0 F0 ];
|
||||
};
|
||||
};
|
||||
|
|
@ -18,6 +18,13 @@ Optional property:
|
|||
- ti,max-output-impedance - MAC Interface Impedance control to set
|
||||
the programmable output impedance to
|
||||
maximum value (70 ohms).
|
||||
- ti,dp83867-rxctrl-strap-quirk - This denotes the fact that the
|
||||
board has RX_DV/RX_CTRL pin strapped in
|
||||
mode 1 or 2. To ensure PHY operation,
|
||||
there are specific actions that
|
||||
software needs to take when this pin is
|
||||
strapped in these modes. See data manual
|
||||
for details.
|
||||
|
||||
Note: ti,min-output-impedance and ti,max-output-impedance are mutually
|
||||
exclusive. When both properties are present ti,max-output-impedance
|
||||
|
|
|
|||
|
|
@ -14,6 +14,12 @@ Required properties:
|
|||
- compatible: should be one of the following:
|
||||
"ti,wl1271-st"
|
||||
"ti,wl1273-st"
|
||||
"ti,wl1281-st"
|
||||
"ti,wl1283-st"
|
||||
"ti,wl1285-st"
|
||||
"ti,wl1801-st"
|
||||
"ti,wl1805-st"
|
||||
"ti,wl1807-st"
|
||||
"ti,wl1831-st"
|
||||
"ti,wl1835-st"
|
||||
"ti,wl1837-st"
|
||||
|
|
@ -22,6 +28,10 @@ Optional properties:
|
|||
- enable-gpios : GPIO signal controlling enabling of BT. Active high.
|
||||
- vio-supply : Vio input supply (1.8V)
|
||||
- vbat-supply : Vbat input supply (2.9-4.8V)
|
||||
- clocks : Must contain an entry, for each entry in clock-names.
|
||||
See ../clocks/clock-bindings.txt for details.
|
||||
- clock-names : Must include the following entry:
|
||||
"ext_clock" (External clock provided to the TI combo chip).
|
||||
|
||||
Example:
|
||||
|
||||
|
|
@ -31,5 +41,7 @@ Example:
|
|||
bluetooth {
|
||||
compatible = "ti,wl1835-st";
|
||||
enable-gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
|
||||
clocks = <&clk32k_wl18xx>;
|
||||
clock-names = "ext_clock";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ Required properties:
|
|||
* "ti,wl1273"
|
||||
* "ti,wl1281"
|
||||
* "ti,wl1283"
|
||||
* "ti,wl1285"
|
||||
* "ti,wl1801"
|
||||
* "ti,wl1805"
|
||||
* "ti,wl1807"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
* Broadcom Digital Timing Engine(DTE) based PTP clock driver
|
||||
|
||||
Required properties:
|
||||
- compatible: should be "brcm,ptp-dte"
|
||||
- reg: address and length of the DTE block's NCO registers
|
||||
|
||||
Example:
|
||||
|
||||
ptp_dte: ptp_dte@180af650 {
|
||||
compatible = "brcm,ptp-dte";
|
||||
reg = <0x180af650 0x10>;
|
||||
status = "okay";
|
||||
};
|
||||
|
|
@ -21,6 +21,15 @@ Optional Properties:
|
|||
can support. For example, a particular board has some signal
|
||||
quality issue or the host processor can't support higher
|
||||
baud rates.
|
||||
- current-speed : The current baud rate the device operates at. This should
|
||||
only be present in case a driver has no chance to know
|
||||
the baud rate of the slave device.
|
||||
Examples:
|
||||
* device supports auto-baud
|
||||
* the rate is setup by a bootloader and there is no
|
||||
way to reset the device
|
||||
* device baud rate is configured by its firmware but
|
||||
there is no way to request the actual settings
|
||||
|
||||
Example:
|
||||
|
||||
|
|
|
|||
|
|
@ -35,6 +35,9 @@ This interface only allows a single checksum to be offloaded. Where
|
|||
encapsulation is used, the packet may have multiple checksum fields in
|
||||
different header layers, and the rest will have to be handled by another
|
||||
mechanism such as LCO or RCO.
|
||||
CRC32c can also be offloaded using this interface, by means of filling
|
||||
skb->csum_start and skb->csum_offset as described above, and setting
|
||||
skb->csum_not_inet: see skbuff.h comment (section 'D') for more details.
|
||||
No offloading of the IP header checksum is performed; it is always done in
|
||||
software. This is OK because when we build the IP header, we obviously
|
||||
have it in cache, so summing it isn't expensive. It's also rather short.
|
||||
|
|
@ -49,9 +52,9 @@ A driver declares its offload capabilities in netdev->hw_features; see
|
|||
and csum_offset given in the SKB; if it tries to deduce these itself in
|
||||
hardware (as some NICs do) the driver should check that the values in the
|
||||
SKB match those which the hardware will deduce, and if not, fall back to
|
||||
checksumming in software instead (with skb_checksum_help or one of the
|
||||
skb_csum_off_chk* functions as mentioned in include/linux/skbuff.h). This
|
||||
is a pain, but that's what you get when hardware tries to be clever.
|
||||
checksumming in software instead (with skb_csum_hwoffload_help() or one of
|
||||
the skb_checksum_help() / skb_crc32c_csum_help functions, as mentioned in
|
||||
include/linux/skbuff.h).
|
||||
|
||||
The stack should, for the most part, assume that checksum offload is
|
||||
supported by the underlying device. The only place that should check is
|
||||
|
|
@ -60,7 +63,7 @@ The stack should, for the most part, assume that checksum offload is
|
|||
may include other offloads besides TX Checksum Offload) and, if they are
|
||||
not supported or enabled on the device (determined by netdev->features),
|
||||
performs the corresponding offload in software. In the case of TX
|
||||
Checksum Offload, that means calling skb_checksum_help(skb).
|
||||
Checksum Offload, that means calling skb_csum_hwoffload_help(skb, features).
|
||||
|
||||
|
||||
LCO: Local Checksum Offload
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
Linux* Base Driver for Intel(R) Network Connection
|
||||
==================================================
|
||||
|
||||
Intel XL710 X710 Virtual Function Linux driver.
|
||||
Copyright(c) 2013 Intel Corporation.
|
||||
Intel Ethernet Adaptive Virtual Function Linux driver.
|
||||
Copyright(c) 2013-2017 Intel Corporation.
|
||||
|
||||
Contents
|
||||
========
|
||||
|
|
@ -11,19 +11,26 @@ Contents
|
|||
- Known Issues/Troubleshooting
|
||||
- Support
|
||||
|
||||
This file describes the i40evf Linux* Base Driver for the Intel(R) XL710
|
||||
X710 Virtual Function.
|
||||
This file describes the i40evf Linux* Base Driver.
|
||||
|
||||
The i40evf driver supports XL710 and X710 virtual function devices that
|
||||
can only be activated on kernels with CONFIG_PCI_IOV enabled.
|
||||
The i40evf driver supports the below mentioned virtual function
|
||||
devices and can only be activated on kernels running the i40e or
|
||||
newer Physical Function (PF) driver compiled with CONFIG_PCI_IOV.
|
||||
The i40evf driver requires CONFIG_PCI_MSI to be enabled.
|
||||
|
||||
The guest OS loading the i40evf driver must support MSI-X interrupts.
|
||||
|
||||
Supported Hardware
|
||||
==================
|
||||
Intel XL710 X710 Virtual Function
|
||||
Intel Ethernet Adaptive Virtual Function
|
||||
Intel X722 Virtual Function
|
||||
|
||||
Identifying Your Adapter
|
||||
========================
|
||||
|
||||
For more information on how to identify your adapter, go to the Adapter &
|
||||
Driver ID Guide at:
|
||||
For more information on how to identify your adapter, go to the
|
||||
Adapter & Driver ID Guide at:
|
||||
|
||||
http://support.intel.com/support/go/network/adapter/idguide.htm
|
||||
|
||||
|
|
|
|||
|
|
@ -22,9 +22,9 @@ The driver can be built into the kernel (CONFIG_IPVLAN=y) or as a module
|
|||
There are no module parameters for this driver and it can be configured
|
||||
using IProute2/ip utility.
|
||||
|
||||
ip link add link <master-dev> <slave-dev> type ipvlan mode { l2 | l3 | l3s }
|
||||
ip link add link <master-dev> name <slave-dev> type ipvlan mode { l2 | l3 | l3s }
|
||||
|
||||
e.g. ip link add link ipvl0 eth0 type ipvlan mode l2
|
||||
e.g. ip link add link eth0 name ipvl0 type ipvlan mode l2
|
||||
|
||||
|
||||
4. Operating modes:
|
||||
|
|
|
|||
|
|
@ -295,7 +295,6 @@ Doing it all yourself
|
|||
settings in the PHY.
|
||||
|
||||
int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
|
||||
int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);
|
||||
|
||||
Ethtool convenience functions.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,150 +0,0 @@
|
|||
Classes
|
||||
-------
|
||||
|
||||
"Class" is a complete routing table in common sense.
|
||||
I.e. it is tree of nodes (destination prefix, tos, metric)
|
||||
with attached information: gateway, device etc.
|
||||
This tree is looked up as specified in RFC1812 5.2.4.3
|
||||
1. Basic match
|
||||
2. Longest match
|
||||
3. Weak TOS.
|
||||
4. Metric. (should not be in kernel space, but they are)
|
||||
5. Additional pruning rules. (not in kernel space).
|
||||
|
||||
We have two special type of nodes:
|
||||
REJECT - abort route lookup and return an error value.
|
||||
THROW - abort route lookup in this class.
|
||||
|
||||
|
||||
Currently the number of classes is limited to 255
|
||||
(0 is reserved for "not specified class")
|
||||
|
||||
Three classes are builtin:
|
||||
|
||||
RT_CLASS_LOCAL=255 - local interface addresses,
|
||||
broadcasts, nat addresses.
|
||||
|
||||
RT_CLASS_MAIN=254 - all normal routes are put there
|
||||
by default.
|
||||
|
||||
RT_CLASS_DEFAULT=253 - if ip_fib_model==1, then
|
||||
normal default routes are put there, if ip_fib_model==2
|
||||
all gateway routes are put there.
|
||||
|
||||
|
||||
Rules
|
||||
-----
|
||||
Rule is a record of (src prefix, src interface, tos, dst prefix)
|
||||
with attached information.
|
||||
|
||||
Rule types:
|
||||
RTP_ROUTE - lookup in attached class
|
||||
RTP_NAT - lookup in attached class and if a match is found,
|
||||
translate packet source address.
|
||||
RTP_MASQUERADE - lookup in attached class and if a match is found,
|
||||
masquerade packet as sourced by us.
|
||||
RTP_DROP - silently drop the packet.
|
||||
RTP_REJECT - drop the packet and send ICMP NET UNREACHABLE.
|
||||
RTP_PROHIBIT - drop the packet and send ICMP COMM. ADM. PROHIBITED.
|
||||
|
||||
Rule flags:
|
||||
RTRF_LOG - log route creations.
|
||||
RTRF_VALVE - One way route (used with masquerading)
|
||||
|
||||
Default setup:
|
||||
|
||||
root@amber:/pub/ip-routing # iproute -r
|
||||
Kernel routing policy rules
|
||||
Pref Source Destination TOS Iface Cl
|
||||
0 default default 00 * 255
|
||||
254 default default 00 * 254
|
||||
255 default default 00 * 253
|
||||
|
||||
|
||||
Lookup algorithm
|
||||
----------------
|
||||
|
||||
We scan rules list, and if a rule is matched, apply it.
|
||||
If a route is found, return it.
|
||||
If it is not found or a THROW node was matched, continue
|
||||
to scan rules.
|
||||
|
||||
Applications
|
||||
------------
|
||||
|
||||
1. Just ignore classes. All the routes are put into MAIN class
|
||||
(and/or into DEFAULT class).
|
||||
|
||||
HOWTO: iproute add PREFIX [ tos TOS ] [ gw GW ] [ dev DEV ]
|
||||
[ metric METRIC ] [ reject ] ... (look at iproute utility)
|
||||
|
||||
or use route utility from current net-tools.
|
||||
|
||||
2. Opposite case. Just forget all that you know about routing
|
||||
tables. Every rule is supplied with its own gateway, device
|
||||
info. record. This approach is not appropriate for automated
|
||||
route maintenance, but it is ideal for manual configuration.
|
||||
|
||||
HOWTO: iproute addrule [ from PREFIX ] [ to PREFIX ] [ tos TOS ]
|
||||
[ dev INPUTDEV] [ pref PREFERENCE ] route [ gw GATEWAY ]
|
||||
[ dev OUTDEV ] .....
|
||||
|
||||
Warning: As of now the size of the routing table in this
|
||||
approach is limited to 256. If someone likes this model, I'll
|
||||
relax this limitation.
|
||||
|
||||
3. OSPF classes (see RFC1583, RFC1812 E.3.3)
|
||||
Very clean, stable and robust algorithm for OSPF routing
|
||||
domains. Unfortunately, it is not widely used in the Internet.
|
||||
|
||||
Proposed setup:
|
||||
255 local addresses
|
||||
254 interface routes
|
||||
253 ASE routes with external metric
|
||||
252 ASE routes with internal metric
|
||||
251 inter-area routes
|
||||
250 intra-area routes for 1st area
|
||||
249 intra-area routes for 2nd area
|
||||
etc.
|
||||
|
||||
Rules:
|
||||
iproute addrule class 253
|
||||
iproute addrule class 252
|
||||
iproute addrule class 251
|
||||
iproute addrule to a-prefix-for-1st-area class 250
|
||||
iproute addrule to another-prefix-for-1st-area class 250
|
||||
...
|
||||
iproute addrule to a-prefix-for-2nd-area class 249
|
||||
...
|
||||
|
||||
Area classes must be terminated with reject record.
|
||||
iproute add default reject class 250
|
||||
iproute add default reject class 249
|
||||
...
|
||||
|
||||
4. The Variant Router Requirements Algorithm (RFC1812 E.3.2)
|
||||
Create 16 classes for different TOS values.
|
||||
It is a funny, but pretty useless algorithm.
|
||||
I listed it just to show the power of new routing code.
|
||||
|
||||
5. All the variety of combinations......
|
||||
|
||||
|
||||
GATED
|
||||
-----
|
||||
|
||||
Gated does not understand classes, but it will work
|
||||
happily in MAIN+DEFAULT. All policy routes can be set
|
||||
and maintained manually.
|
||||
|
||||
IMPORTANT NOTE
|
||||
--------------
|
||||
route.c has a compilation time switch CONFIG_IP_LOCAL_RT_POLICY.
|
||||
If it is set, locally originated packets are routed
|
||||
using all the policy list. This is not very convenient and
|
||||
pretty ambiguous when used with NAT and masquerading.
|
||||
I set it to FALSE by default.
|
||||
|
||||
|
||||
Alexey Kuznetov
|
||||
kuznet@ms2.inr.ac.ru
|
||||
|
|
@ -325,6 +325,9 @@ calls, to invoke certain actions and to report certain conditions. These are:
|
|||
RXRPC_LOCAL_ERROR -rt error num Local error encountered
|
||||
RXRPC_NEW_CALL -r- n/a New call received
|
||||
RXRPC_ACCEPT s-- n/a Accept new call
|
||||
RXRPC_EXCLUSIVE_CALL s-- n/a Make an exclusive client call
|
||||
RXRPC_UPGRADE_SERVICE s-- n/a Client call can be upgraded
|
||||
RXRPC_TX_LENGTH s-- data len Total length of Tx data
|
||||
|
||||
(SRT = usable in Sendmsg / delivered by Recvmsg / Terminal message)
|
||||
|
||||
|
|
@ -387,6 +390,40 @@ calls, to invoke certain actions and to report certain conditions. These are:
|
|||
return error ENODATA. If the user ID is already in use by another call,
|
||||
then error EBADSLT will be returned.
|
||||
|
||||
(*) RXRPC_EXCLUSIVE_CALL
|
||||
|
||||
This is used to indicate that a client call should be made on a one-off
|
||||
connection. The connection is discarded once the call has terminated.
|
||||
|
||||
(*) RXRPC_UPGRADE_SERVICE
|
||||
|
||||
This is used to make a client call to probe if the specified service ID
|
||||
may be upgraded by the server. The caller must check msg_name returned to
|
||||
recvmsg() for the service ID actually in use. The operation probed must
|
||||
be one that takes the same arguments in both services.
|
||||
|
||||
Once this has been used to establish the upgrade capability (or lack
|
||||
thereof) of the server, the service ID returned should be used for all
|
||||
future communication to that server and RXRPC_UPGRADE_SERVICE should no
|
||||
longer be set.
|
||||
|
||||
(*) RXRPC_TX_LENGTH
|
||||
|
||||
This is used to inform the kernel of the total amount of data that is
|
||||
going to be transmitted by a call (whether in a client request or a
|
||||
service response). If given, it allows the kernel to encrypt from the
|
||||
userspace buffer directly to the packet buffers, rather than copying into
|
||||
the buffer and then encrypting in place. This may only be given with the
|
||||
first sendmsg() providing data for a call. EMSGSIZE will be generated if
|
||||
the amount of data actually given is different.
|
||||
|
||||
This takes a parameter of __s64 type that indicates how much will be
|
||||
transmitted. This may not be less than zero.
|
||||
|
||||
The symbol RXRPC__SUPPORTED is defined as one more than the highest control
|
||||
message type supported. At run time this can be queried by means of the
|
||||
RXRPC_SUPPORTED_CMSG socket option (see below).
|
||||
|
||||
|
||||
==============
|
||||
SOCKET OPTIONS
|
||||
|
|
@ -433,6 +470,18 @@ AF_RXRPC sockets support a few socket options at the SOL_RXRPC level:
|
|||
Encrypted checksum plus entire packet padded and encrypted, including
|
||||
actual packet length.
|
||||
|
||||
(*) RXRPC_UPGRADEABLE_SERVICE
|
||||
|
||||
This is used to indicate that a service socket with two bindings may
|
||||
upgrade one bound service to the other if requested by the client. optval
|
||||
must point to an array of two unsigned short ints. The first is the
|
||||
service ID to upgrade from and the second the service ID to upgrade to.
|
||||
|
||||
(*) RXRPC_SUPPORTED_CMSG
|
||||
|
||||
This is a read-only option that writes an int into the buffer indicating
|
||||
the highest control message type supported.
|
||||
|
||||
|
||||
========
|
||||
SECURITY
|
||||
|
|
@ -542,6 +591,9 @@ A client would issue an operation by:
|
|||
MSG_MORE should be set in msghdr::msg_flags on all but the last part of
|
||||
the request. Multiple requests may be made simultaneously.
|
||||
|
||||
An RXRPC_TX_LENGTH control message can also be specified on the first
|
||||
sendmsg() call.
|
||||
|
||||
If a call is intended to go to a destination other than the default
|
||||
specified through connect(), then msghdr::msg_name should be set on the
|
||||
first request message of that call.
|
||||
|
|
@ -559,6 +611,17 @@ A client would issue an operation by:
|
|||
buffer instead, and MSG_EOR will be flagged to indicate the end of that
|
||||
call.
|
||||
|
||||
A client may ask for a service ID it knows and ask that this be upgraded to a
|
||||
better service if one is available by supplying RXRPC_UPGRADE_SERVICE on the
|
||||
first sendmsg() of a call. The client should then check srx_service in the
|
||||
msg_name filled in by recvmsg() when collecting the result. srx_service will
|
||||
hold the same value as given to sendmsg() if the upgrade request was ignored by
|
||||
the service - otherwise it will be altered to indicate the service ID the
|
||||
server upgraded to. Note that the upgraded service ID is chosen by the server.
|
||||
The caller has to wait until it sees the service ID in the reply before sending
|
||||
any more calls (further calls to the same destination will be blocked until the
|
||||
probe is concluded).
|
||||
|
||||
|
||||
====================
|
||||
EXAMPLE SERVER USAGE
|
||||
|
|
@ -588,7 +651,7 @@ A server would be set up to accept operations in the following manner:
|
|||
The keyring can be manipulated after it has been given to the socket. This
|
||||
permits the server to add more keys, replace keys, etc. whilst it is live.
|
||||
|
||||
(2) A local address must then be bound:
|
||||
(3) A local address must then be bound:
|
||||
|
||||
struct sockaddr_rxrpc srx = {
|
||||
.srx_family = AF_RXRPC,
|
||||
|
|
@ -600,11 +663,26 @@ A server would be set up to accept operations in the following manner:
|
|||
};
|
||||
bind(server, &srx, sizeof(srx));
|
||||
|
||||
(3) The server is then set to listen out for incoming calls:
|
||||
More than one service ID may be bound to a socket, provided the transport
|
||||
parameters are the same. The limit is currently two. To do this, bind()
|
||||
should be called twice.
|
||||
|
||||
(4) If service upgrading is required, first two service IDs must have been
|
||||
bound and then the following option must be set:
|
||||
|
||||
unsigned short service_ids[2] = { from_ID, to_ID };
|
||||
setsockopt(server, SOL_RXRPC, RXRPC_UPGRADEABLE_SERVICE,
|
||||
service_ids, sizeof(service_ids));
|
||||
|
||||
This will automatically upgrade connections on service from_ID to service
|
||||
to_ID if they request it. This will be reflected in msg_name obtained
|
||||
through recvmsg() when the request data is delivered to userspace.
|
||||
|
||||
(5) The server is then set to listen out for incoming calls:
|
||||
|
||||
listen(server, 100);
|
||||
|
||||
(4) The kernel notifies the server of pending incoming connections by sending
|
||||
(6) The kernel notifies the server of pending incoming connections by sending
|
||||
it a message for each. This is received with recvmsg() on the server
|
||||
socket. It has no data, and has a single dataless control message
|
||||
attached:
|
||||
|
|
@ -616,13 +694,13 @@ A server would be set up to accept operations in the following manner:
|
|||
the time it is accepted - in which case the first call still on the queue
|
||||
will be accepted.
|
||||
|
||||
(5) The server then accepts the new call by issuing a sendmsg() with two
|
||||
(7) The server then accepts the new call by issuing a sendmsg() with two
|
||||
pieces of control data and no actual data:
|
||||
|
||||
RXRPC_ACCEPT - indicate connection acceptance
|
||||
RXRPC_USER_CALL_ID - specify user ID for this call
|
||||
|
||||
(6) The first request data packet will then be posted to the server socket for
|
||||
(8) The first request data packet will then be posted to the server socket for
|
||||
recvmsg() to pick up. At that point, the RxRPC address for the call can
|
||||
be read from the address fields in the msghdr struct.
|
||||
|
||||
|
|
@ -634,7 +712,7 @@ A server would be set up to accept operations in the following manner:
|
|||
|
||||
RXRPC_USER_CALL_ID - specifies the user ID for this call
|
||||
|
||||
(8) The reply data should then be posted to the server socket using a series
|
||||
(9) The reply data should then be posted to the server socket using a series
|
||||
of sendmsg() calls, each with the following control messages attached:
|
||||
|
||||
RXRPC_USER_CALL_ID - specifies the user ID for this call
|
||||
|
|
@ -642,7 +720,7 @@ A server would be set up to accept operations in the following manner:
|
|||
MSG_MORE should be set in msghdr::msg_flags on all but the last message
|
||||
for a particular call.
|
||||
|
||||
(9) The final ACK from the client will be posted for retrieval by recvmsg()
|
||||
(10) The final ACK from the client will be posted for retrieval by recvmsg()
|
||||
when it is received. It will take the form of a dataless message with two
|
||||
control messages attached:
|
||||
|
||||
|
|
@ -652,7 +730,7 @@ A server would be set up to accept operations in the following manner:
|
|||
MSG_EOR will be flagged to indicate that this is the final message for
|
||||
this call.
|
||||
|
||||
(10) Up to the point the final packet of reply data is sent, the call can be
|
||||
(11) Up to the point the final packet of reply data is sent, the call can be
|
||||
aborted by calling sendmsg() with a dataless message with the following
|
||||
control messages attached:
|
||||
|
||||
|
|
@ -703,6 +781,7 @@ The kernel interface functions are as follows:
|
|||
struct sockaddr_rxrpc *srx,
|
||||
struct key *key,
|
||||
unsigned long user_call_ID,
|
||||
s64 tx_total_len,
|
||||
gfp_t gfp);
|
||||
|
||||
This allocates the infrastructure to make a new RxRPC call and assigns
|
||||
|
|
@ -719,6 +798,11 @@ The kernel interface functions are as follows:
|
|||
control data buffer. It is entirely feasible to use this to point to a
|
||||
kernel data structure.
|
||||
|
||||
tx_total_len is the amount of data the caller is intending to transmit
|
||||
with this call (or -1 if unknown at this point). Setting the data size
|
||||
allows the kernel to encrypt directly to the packet buffers, thereby
|
||||
saving a copy. The value may not be less than -1.
|
||||
|
||||
If this function is successful, an opaque reference to the RxRPC call is
|
||||
returned. The caller now holds a reference on this and it must be
|
||||
properly ended.
|
||||
|
|
@ -870,6 +954,17 @@ The kernel interface functions are as follows:
|
|||
|
||||
This is used to find the remote peer address of a call.
|
||||
|
||||
(*) Set the total transmit data size on a call.
|
||||
|
||||
void rxrpc_kernel_set_tx_length(struct socket *sock,
|
||||
struct rxrpc_call *call,
|
||||
s64 tx_total_len);
|
||||
|
||||
This sets the amount of data that the caller is intending to transmit on a
|
||||
call. It's intended to be used for setting the reply size as the request
|
||||
size should be set when the call is begun. tx_total_len may not be less
|
||||
than zero.
|
||||
|
||||
|
||||
=======================
|
||||
CONFIGURABLE PARAMETERS
|
||||
|
|
|
|||
|
|
@ -193,6 +193,24 @@ SOF_TIMESTAMPING_OPT_STATS:
|
|||
the transmit timestamps, such as how long a certain block of
|
||||
data was limited by peer's receiver window.
|
||||
|
||||
SOF_TIMESTAMPING_OPT_PKTINFO:
|
||||
|
||||
Enable the SCM_TIMESTAMPING_PKTINFO control message for incoming
|
||||
packets with hardware timestamps. The message contains struct
|
||||
scm_ts_pktinfo, which supplies the index of the real interface which
|
||||
received the packet and its length at layer 2. A valid (non-zero)
|
||||
interface index will be returned only if CONFIG_NET_RX_BUSY_POLL is
|
||||
enabled and the driver is using NAPI. The struct contains also two
|
||||
other fields, but they are reserved and undefined.
|
||||
|
||||
SOF_TIMESTAMPING_OPT_TX_SWHW:
|
||||
|
||||
Request both hardware and software timestamps for outgoing packets
|
||||
when SOF_TIMESTAMPING_TX_HARDWARE and SOF_TIMESTAMPING_TX_SOFTWARE
|
||||
are enabled at the same time. If both timestamps are generated,
|
||||
two separate messages will be looped to the socket's error queue,
|
||||
each containing just one timestamp.
|
||||
|
||||
New applications are encouraged to pass SOF_TIMESTAMPING_OPT_ID to
|
||||
disambiguate timestamps and SOF_TIMESTAMPING_OPT_TSONLY to operate
|
||||
regardless of the setting of sysctl net.core.tstamp_allow_data.
|
||||
|
|
@ -312,7 +330,7 @@ struct scm_timestamping {
|
|||
};
|
||||
|
||||
The structure can return up to three timestamps. This is a legacy
|
||||
feature. Only one field is non-zero at any time. Most timestamps
|
||||
feature. At least one field is non-zero at any time. Most timestamps
|
||||
are passed in ts[0]. Hardware timestamps are passed in ts[2].
|
||||
|
||||
ts[1] used to hold hardware timestamps converted to system time.
|
||||
|
|
@ -321,6 +339,12 @@ a HW PTP clock source, to allow time conversion in userspace and
|
|||
optionally synchronize system time with a userspace PTP stack such
|
||||
as linuxptp. For the PTP clock API, see Documentation/ptp/ptp.txt.
|
||||
|
||||
Note that if the SO_TIMESTAMP or SO_TIMESTAMPNS option is enabled
|
||||
together with SO_TIMESTAMPING using SOF_TIMESTAMPING_SOFTWARE, a false
|
||||
software timestamp will be generated in the recvmsg() call and passed
|
||||
in ts[0] when a real software timestamp is missing. This happens also
|
||||
on hardware transmit timestamps.
|
||||
|
||||
2.1.1 Transmit timestamps with MSG_ERRQUEUE
|
||||
|
||||
For transmit timestamps the outgoing packet is looped back to the
|
||||
|
|
|
|||
|
|
@ -0,0 +1,135 @@
|
|||
Overview
|
||||
========
|
||||
|
||||
Transport Layer Security (TLS) is a Upper Layer Protocol (ULP) that runs over
|
||||
TCP. TLS provides end-to-end data integrity and confidentiality.
|
||||
|
||||
User interface
|
||||
==============
|
||||
|
||||
Creating a TLS connection
|
||||
-------------------------
|
||||
|
||||
First create a new TCP socket and set the TLS ULP.
|
||||
|
||||
sock = socket(AF_INET, SOCK_STREAM, 0);
|
||||
setsockopt(sock, SOL_TCP, TCP_ULP, "tls", sizeof("tls"));
|
||||
|
||||
Setting the TLS ULP allows us to set/get TLS socket options. Currently
|
||||
only the symmetric encryption is handled in the kernel. After the TLS
|
||||
handshake is complete, we have all the parameters required to move the
|
||||
data-path to the kernel. There is a separate socket option for moving
|
||||
the transmit and the receive into the kernel.
|
||||
|
||||
/* From linux/tls.h */
|
||||
struct tls_crypto_info {
|
||||
unsigned short version;
|
||||
unsigned short cipher_type;
|
||||
};
|
||||
|
||||
struct tls12_crypto_info_aes_gcm_128 {
|
||||
struct tls_crypto_info info;
|
||||
unsigned char iv[TLS_CIPHER_AES_GCM_128_IV_SIZE];
|
||||
unsigned char key[TLS_CIPHER_AES_GCM_128_KEY_SIZE];
|
||||
unsigned char salt[TLS_CIPHER_AES_GCM_128_SALT_SIZE];
|
||||
unsigned char rec_seq[TLS_CIPHER_AES_GCM_128_REC_SEQ_SIZE];
|
||||
};
|
||||
|
||||
|
||||
struct tls12_crypto_info_aes_gcm_128 crypto_info;
|
||||
|
||||
crypto_info.info.version = TLS_1_2_VERSION;
|
||||
crypto_info.info.cipher_type = TLS_CIPHER_AES_GCM_128;
|
||||
memcpy(crypto_info.iv, iv_write, TLS_CIPHER_AES_GCM_128_IV_SIZE);
|
||||
memcpy(crypto_info.rec_seq, seq_number_write,
|
||||
TLS_CIPHER_AES_GCM_128_REC_SEQ_SIZE);
|
||||
memcpy(crypto_info.key, cipher_key_write, TLS_CIPHER_AES_GCM_128_KEY_SIZE);
|
||||
memcpy(crypto_info.salt, implicit_iv_write, TLS_CIPHER_AES_GCM_128_SALT_SIZE);
|
||||
|
||||
setsockopt(sock, SOL_TLS, TLS_TX, &crypto_info, sizeof(crypto_info));
|
||||
|
||||
Sending TLS application data
|
||||
----------------------------
|
||||
|
||||
After setting the TLS_TX socket option all application data sent over this
|
||||
socket is encrypted using TLS and the parameters provided in the socket option.
|
||||
For example, we can send an encrypted hello world record as follows:
|
||||
|
||||
const char *msg = "hello world\n";
|
||||
send(sock, msg, strlen(msg));
|
||||
|
||||
send() data is directly encrypted from the userspace buffer provided
|
||||
to the encrypted kernel send buffer if possible.
|
||||
|
||||
The sendfile system call will send the file's data over TLS records of maximum
|
||||
length (2^14).
|
||||
|
||||
file = open(filename, O_RDONLY);
|
||||
fstat(file, &stat);
|
||||
sendfile(sock, file, &offset, stat.st_size);
|
||||
|
||||
TLS records are created and sent after each send() call, unless
|
||||
MSG_MORE is passed. MSG_MORE will delay creation of a record until
|
||||
MSG_MORE is not passed, or the maximum record size is reached.
|
||||
|
||||
The kernel will need to allocate a buffer for the encrypted data.
|
||||
This buffer is allocated at the time send() is called, such that
|
||||
either the entire send() call will return -ENOMEM (or block waiting
|
||||
for memory), or the encryption will always succeed. If send() returns
|
||||
-ENOMEM and some data was left on the socket buffer from a previous
|
||||
call using MSG_MORE, the MSG_MORE data is left on the socket buffer.
|
||||
|
||||
Send TLS control messages
|
||||
-------------------------
|
||||
|
||||
Other than application data, TLS has control messages such as alert
|
||||
messages (record type 21) and handshake messages (record type 22), etc.
|
||||
These messages can be sent over the socket by providing the TLS record type
|
||||
via a CMSG. For example the following function sends @data of @length bytes
|
||||
using a record of type @record_type.
|
||||
|
||||
/* send TLS control message using record_type */
|
||||
static int klts_send_ctrl_message(int sock, unsigned char record_type,
|
||||
void *data, size_t length)
|
||||
{
|
||||
struct msghdr msg = {0};
|
||||
int cmsg_len = sizeof(record_type);
|
||||
struct cmsghdr *cmsg;
|
||||
char buf[CMSG_SPACE(cmsg_len)];
|
||||
struct iovec msg_iov; /* Vector of data to send/receive into. */
|
||||
|
||||
msg.msg_control = buf;
|
||||
msg.msg_controllen = sizeof(buf);
|
||||
cmsg = CMSG_FIRSTHDR(&msg);
|
||||
cmsg->cmsg_level = SOL_TLS;
|
||||
cmsg->cmsg_type = TLS_SET_RECORD_TYPE;
|
||||
cmsg->cmsg_len = CMSG_LEN(cmsg_len);
|
||||
*CMSG_DATA(cmsg) = record_type;
|
||||
msg.msg_controllen = cmsg->cmsg_len;
|
||||
|
||||
msg_iov.iov_base = data;
|
||||
msg_iov.iov_len = length;
|
||||
msg.msg_iov = &msg_iov;
|
||||
msg.msg_iovlen = 1;
|
||||
|
||||
return sendmsg(sock, &msg, 0);
|
||||
}
|
||||
|
||||
Control message data should be provided unencrypted, and will be
|
||||
encrypted by the kernel.
|
||||
|
||||
Integrating in to userspace TLS library
|
||||
---------------------------------------
|
||||
|
||||
At a high level, the kernel TLS ULP is a replacement for the record
|
||||
layer of a userspace TLS library.
|
||||
|
||||
A patchset to OpenSSL to use ktls as the record layer is here:
|
||||
|
||||
https://github.com/Mellanox/tls-openssl
|
||||
|
||||
An example of calling send directly after a handshake using
|
||||
gnutls. Since it doesn't implement a full record layer, control
|
||||
messages are not supported:
|
||||
|
||||
https://github.com/Mellanox/tls-af_ktls_tool
|
||||
81
MAINTAINERS
81
MAINTAINERS
|
|
@ -155,7 +155,7 @@ S: Maintained
|
|||
F: drivers/scsi/53c700*
|
||||
|
||||
6LOWPAN GENERIC (BTLE/IEEE 802.15.4)
|
||||
M: Alexander Aring <aar@pengutronix.de>
|
||||
M: Alexander Aring <alex.aring@gmail.com>
|
||||
M: Jukka Rissanen <jukka.rissanen@linux.intel.com>
|
||||
L: linux-bluetooth@vger.kernel.org
|
||||
L: linux-wpan@vger.kernel.org
|
||||
|
|
@ -2819,8 +2819,11 @@ BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER
|
|||
M: Arend van Spriel <arend.vanspriel@broadcom.com>
|
||||
M: Franky Lin <franky.lin@broadcom.com>
|
||||
M: Hante Meuleman <hante.meuleman@broadcom.com>
|
||||
M: Chi-Hsien Lin <chi-hsien.lin@cypress.com>
|
||||
M: Wright Feng <wright.feng@cypress.com>
|
||||
L: linux-wireless@vger.kernel.org
|
||||
L: brcm80211-dev-list.pdl@broadcom.com
|
||||
L: brcm80211-dev-list@cypress.com
|
||||
S: Supported
|
||||
F: drivers/net/wireless/broadcom/brcm80211/
|
||||
|
||||
|
|
@ -6465,7 +6468,7 @@ F: Documentation/cdrom/ide-cd
|
|||
F: drivers/ide/ide-cd*
|
||||
|
||||
IEEE 802.15.4 SUBSYSTEM
|
||||
M: Alexander Aring <aar@pengutronix.de>
|
||||
M: Alexander Aring <alex.aring@gmail.com>
|
||||
M: Stefan Schmidt <stefan@osg.samsung.com>
|
||||
L: linux-wpan@vger.kernel.org
|
||||
W: http://wpan.cakelab.org/
|
||||
|
|
@ -6789,6 +6792,7 @@ F: Documentation/networking/i40e.txt
|
|||
F: Documentation/networking/i40evf.txt
|
||||
F: drivers/net/ethernet/intel/
|
||||
F: drivers/net/ethernet/intel/*/
|
||||
F: include/linux/avf/virtchnl.h
|
||||
|
||||
INTEL RDMA RNIC DRIVER
|
||||
M: Faisal Latif <faisal.latif@intel.com>
|
||||
|
|
@ -8029,6 +8033,12 @@ S: Maintained
|
|||
F: drivers/net/ethernet/marvell/mv643xx_eth.*
|
||||
F: include/linux/mv643xx.h
|
||||
|
||||
MARVELL MV88X3310 PHY DRIVER
|
||||
M: Russell King <rmk@armlinux.org.uk>
|
||||
L: netdev@vger.kernel.org
|
||||
S: Maintained
|
||||
F: drivers/net/phy/marvell10g.c
|
||||
|
||||
MARVELL MVNETA ETHERNET DRIVER
|
||||
M: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
L: netdev@vger.kernel.org
|
||||
|
|
@ -8367,6 +8377,26 @@ W: http://www.mellanox.com
|
|||
Q: http://patchwork.ozlabs.org/project/netdev/list/
|
||||
F: drivers/net/ethernet/mellanox/mlx5/core/en_*
|
||||
|
||||
MELLANOX ETHERNET INNOVA DRIVER
|
||||
M: Ilan Tayari <ilant@mellanox.com>
|
||||
R: Boris Pismenny <borisp@mellanox.com>
|
||||
L: netdev@vger.kernel.org
|
||||
S: Supported
|
||||
W: http://www.mellanox.com
|
||||
Q: http://patchwork.ozlabs.org/project/netdev/list/
|
||||
F: drivers/net/ethernet/mellanox/mlx5/core/fpga/*
|
||||
F: include/linux/mlx5/mlx5_ifc_fpga.h
|
||||
|
||||
MELLANOX ETHERNET INNOVA IPSEC DRIVER
|
||||
M: Ilan Tayari <ilant@mellanox.com>
|
||||
R: Boris Pismenny <borisp@mellanox.com>
|
||||
L: netdev@vger.kernel.org
|
||||
S: Supported
|
||||
W: http://www.mellanox.com
|
||||
Q: http://patchwork.ozlabs.org/project/netdev/list/
|
||||
F: drivers/net/ethernet/mellanox/mlx5/core/en_ipsec/*
|
||||
F: drivers/net/ethernet/mellanox/mlx5/core/ipsec*
|
||||
|
||||
MELLANOX ETHERNET SWITCH DRIVERS
|
||||
M: Jiri Pirko <jiri@mellanox.com>
|
||||
M: Ido Schimmel <idosch@mellanox.com>
|
||||
|
|
@ -8376,6 +8406,14 @@ W: http://www.mellanox.com
|
|||
Q: http://patchwork.ozlabs.org/project/netdev/list/
|
||||
F: drivers/net/ethernet/mellanox/mlxsw/
|
||||
|
||||
MELLANOX FIRMWARE FLASH LIBRARY (mlxfw)
|
||||
M: Yotam Gigi <yotamg@mellanox.com>
|
||||
L: netdev@vger.kernel.org
|
||||
S: Supported
|
||||
W: http://www.mellanox.com
|
||||
Q: http://patchwork.ozlabs.org/project/netdev/list/
|
||||
F: drivers/net/ethernet/mellanox/mlxfw/
|
||||
|
||||
MELLANOX MLXCPLD I2C AND MUX DRIVER
|
||||
M: Vadim Pasternak <vadimp@mellanox.com>
|
||||
M: Michael Shych <michaelsh@mellanox.com>
|
||||
|
|
@ -8517,6 +8555,16 @@ F: drivers/media/platform/atmel/atmel-isc.c
|
|||
F: drivers/media/platform/atmel/atmel-isc-regs.h
|
||||
F: devicetree/bindings/media/atmel-isc.txt
|
||||
|
||||
MICROCHIP KSZ SERIES ETHERNET SWITCH DRIVER
|
||||
M: Woojung Huh <Woojung.Huh@microchip.com>
|
||||
M: Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>
|
||||
L: netdev@vger.kernel.org
|
||||
S: Maintained
|
||||
F: net/dsa/tag_ksz.c
|
||||
F: drivers/net/dsa/microchip/*
|
||||
F: include/linux/platform_data/microchip-ksz.h
|
||||
F: Documentation/devicetree/bindings/net/dsa/ksz.txt
|
||||
|
||||
MICROCHIP USB251XB DRIVER
|
||||
M: Richard Leitner <richard.leitner@skidata.com>
|
||||
L: linux-usb@vger.kernel.org
|
||||
|
|
@ -9009,6 +9057,16 @@ F: net/ipv6/
|
|||
F: include/net/ip*
|
||||
F: arch/x86/net/*
|
||||
|
||||
NETWORKING [TLS]
|
||||
M: Ilya Lesokhin <ilyal@mellanox.com>
|
||||
M: Aviad Yehezkel <aviadye@mellanox.com>
|
||||
M: Dave Watson <davejwatson@fb.com>
|
||||
L: netdev@vger.kernel.org
|
||||
S: Maintained
|
||||
F: net/tls/*
|
||||
F: include/uapi/linux/tls.h
|
||||
F: include/net/tls.h
|
||||
|
||||
NETWORKING [IPSEC]
|
||||
M: Steffen Klassert <steffen.klassert@secunet.com>
|
||||
M: Herbert Xu <herbert@gondor.apana.org.au>
|
||||
|
|
@ -9090,9 +9148,6 @@ F: include/uapi/linux/nfc.h
|
|||
F: drivers/nfc/
|
||||
F: include/linux/platform_data/nfcmrvl.h
|
||||
F: include/linux/platform_data/nxp-nci.h
|
||||
F: include/linux/platform_data/pn544.h
|
||||
F: include/linux/platform_data/st21nfca.h
|
||||
F: include/linux/platform_data/st-nci.h
|
||||
F: Documentation/devicetree/bindings/net/nfc/
|
||||
|
||||
NFS, SUNRPC, AND LOCKD CLIENTS
|
||||
|
|
@ -10665,6 +10720,14 @@ L: qemu-devel@nongnu.org
|
|||
S: Maintained
|
||||
F: drivers/firmware/qemu_fw_cfg.c
|
||||
|
||||
QUANTENNA QTNFMAC WIRELESS DRIVER
|
||||
M: Igor Mitsyanko <imitsyanko@quantenna.com>
|
||||
M: Avinash Patil <avinashp@quantenna.com>
|
||||
M: Sergey Matyukevich <smatyukevich@quantenna.com>
|
||||
L: linux-wireless@vger.kernel.org
|
||||
S: Maintained
|
||||
F: drivers/net/wireless/quantenna
|
||||
|
||||
RADOS BLOCK DEVICE (RBD)
|
||||
M: Ilya Dryomov <idryomov@gmail.com>
|
||||
M: Sage Weil <sage@redhat.com>
|
||||
|
|
@ -11423,6 +11486,14 @@ F: kernel/time/alarmtimer.c
|
|||
F: kernel/time/ntp.c
|
||||
F: tools/testing/selftests/timers/
|
||||
|
||||
TI TRF7970A NFC DRIVER
|
||||
M: Mark Greer <mgreer@animalcreek.com>
|
||||
L: linux-wireless@vger.kernel.org
|
||||
L: linux-nfc@lists.01.org (moderated for non-subscribers)
|
||||
S: Supported
|
||||
F: drivers/nfc/trf7970a.c
|
||||
F: Documentation/devicetree/bindings/net/nfc/trf7970a.txt
|
||||
|
||||
SC1200 WDT DRIVER
|
||||
M: Zwane Mwaikambo <zwanem@gmail.com>
|
||||
S: Maintained
|
||||
|
|
|
|||
|
|
@ -105,4 +105,8 @@
|
|||
|
||||
#define SO_COOKIE 57
|
||||
|
||||
#define SCM_TIMESTAMPING_PKTINFO 58
|
||||
|
||||
#define SO_PEERGROUPS 59
|
||||
|
||||
#endif /* _UAPI_ASM_SOCKET_H */
|
||||
|
|
|
|||
|
|
@ -141,6 +141,8 @@
|
|||
bluetooth {
|
||||
compatible = "ti,wl1835-st";
|
||||
enable-gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
|
||||
clocks = <&pmic>;
|
||||
clock-names = "ext_clock";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -71,6 +71,7 @@ struct jit_ctx {
|
|||
int epilogue_offset;
|
||||
int *offset;
|
||||
u32 *image;
|
||||
u32 stack_size;
|
||||
};
|
||||
|
||||
static inline void emit(const u32 insn, struct jit_ctx *ctx)
|
||||
|
|
@ -147,16 +148,11 @@ static inline int epilogue_offset(const struct jit_ctx *ctx)
|
|||
/* Stack must be multiples of 16B */
|
||||
#define STACK_ALIGN(sz) (((sz) + 15) & ~15)
|
||||
|
||||
#define _STACK_SIZE \
|
||||
(MAX_BPF_STACK \
|
||||
+ 4 /* extra for skb_copy_bits buffer */)
|
||||
|
||||
#define STACK_SIZE STACK_ALIGN(_STACK_SIZE)
|
||||
|
||||
#define PROLOGUE_OFFSET 8
|
||||
|
||||
static int build_prologue(struct jit_ctx *ctx)
|
||||
{
|
||||
const struct bpf_prog *prog = ctx->prog;
|
||||
const u8 r6 = bpf2a64[BPF_REG_6];
|
||||
const u8 r7 = bpf2a64[BPF_REG_7];
|
||||
const u8 r8 = bpf2a64[BPF_REG_8];
|
||||
|
|
@ -178,9 +174,9 @@ static int build_prologue(struct jit_ctx *ctx)
|
|||
* | |
|
||||
* | ... | BPF prog stack
|
||||
* | |
|
||||
* +-----+ <= (BPF_FP - MAX_BPF_STACK)
|
||||
* +-----+ <= (BPF_FP - prog->aux->stack_depth)
|
||||
* |RSVD | JIT scratchpad
|
||||
* current A64_SP => +-----+ <= (BPF_FP - STACK_SIZE)
|
||||
* current A64_SP => +-----+ <= (BPF_FP - ctx->stack_size)
|
||||
* | |
|
||||
* | ... | Function call stack
|
||||
* | |
|
||||
|
|
@ -204,8 +200,12 @@ static int build_prologue(struct jit_ctx *ctx)
|
|||
/* Initialize tail_call_cnt */
|
||||
emit(A64_MOVZ(1, tcc, 0, 0), ctx);
|
||||
|
||||
/* 4 byte extra for skb_copy_bits buffer */
|
||||
ctx->stack_size = prog->aux->stack_depth + 4;
|
||||
ctx->stack_size = STACK_ALIGN(ctx->stack_size);
|
||||
|
||||
/* Set up function call stack */
|
||||
emit(A64_SUB_I(1, A64_SP, A64_SP, STACK_SIZE), ctx);
|
||||
emit(A64_SUB_I(1, A64_SP, A64_SP, ctx->stack_size), ctx);
|
||||
|
||||
cur_offset = ctx->idx - idx0;
|
||||
if (cur_offset != PROLOGUE_OFFSET) {
|
||||
|
|
@ -290,7 +290,7 @@ static void build_epilogue(struct jit_ctx *ctx)
|
|||
const u8 fp = bpf2a64[BPF_REG_FP];
|
||||
|
||||
/* We're done with BPF stack */
|
||||
emit(A64_ADD_I(1, A64_SP, A64_SP, STACK_SIZE), ctx);
|
||||
emit(A64_ADD_I(1, A64_SP, A64_SP, ctx->stack_size), ctx);
|
||||
|
||||
/* Restore fs (x25) and x26 */
|
||||
emit(A64_POP(fp, A64_R(26), A64_SP), ctx);
|
||||
|
|
@ -589,7 +589,7 @@ emit_cond_jmp:
|
|||
break;
|
||||
}
|
||||
/* tail call */
|
||||
case BPF_JMP | BPF_CALL | BPF_X:
|
||||
case BPF_JMP | BPF_TAIL_CALL:
|
||||
if (emit_bpf_tail_call(ctx))
|
||||
return -EFAULT;
|
||||
break;
|
||||
|
|
@ -735,7 +735,7 @@ emit_cond_jmp:
|
|||
return -EINVAL;
|
||||
}
|
||||
emit_a64_mov_i64(r3, size, ctx);
|
||||
emit(A64_SUB_I(1, r4, fp, STACK_SIZE), ctx);
|
||||
emit(A64_SUB_I(1, r4, fp, ctx->stack_size), ctx);
|
||||
emit_a64_mov_i64(r5, (unsigned long)bpf_load_pointer, ctx);
|
||||
emit(A64_BLR(r5), ctx);
|
||||
emit(A64_MOV(1, r0, A64_R(0)), ctx);
|
||||
|
|
@ -903,6 +903,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)
|
|||
bpf_jit_binary_lock_ro(header);
|
||||
prog->bpf_func = (void *)ctx.image;
|
||||
prog->jited = 1;
|
||||
prog->jited_len = image_size;
|
||||
|
||||
out_off:
|
||||
kfree(ctx.offset);
|
||||
|
|
|
|||
|
|
@ -98,5 +98,9 @@
|
|||
|
||||
#define SO_COOKIE 57
|
||||
|
||||
#define SCM_TIMESTAMPING_PKTINFO 58
|
||||
|
||||
#define SO_PEERGROUPS 59
|
||||
|
||||
#endif /* _ASM_SOCKET_H */
|
||||
|
||||
|
|
|
|||
|
|
@ -107,4 +107,8 @@
|
|||
|
||||
#define SO_COOKIE 57
|
||||
|
||||
#define SCM_TIMESTAMPING_PKTINFO 58
|
||||
|
||||
#define SO_PEERGROUPS 59
|
||||
|
||||
#endif /* _ASM_IA64_SOCKET_H */
|
||||
|
|
|
|||
|
|
@ -98,4 +98,8 @@
|
|||
|
||||
#define SO_COOKIE 57
|
||||
|
||||
#define SCM_TIMESTAMPING_PKTINFO 58
|
||||
|
||||
#define SO_PEERGROUPS 59
|
||||
|
||||
#endif /* _ASM_M32R_SOCKET_H */
|
||||
|
|
|
|||
|
|
@ -116,4 +116,8 @@
|
|||
|
||||
#define SO_COOKIE 57
|
||||
|
||||
#define SCM_TIMESTAMPING_PKTINFO 58
|
||||
|
||||
#define SO_PEERGROUPS 59
|
||||
|
||||
#endif /* _UAPI_ASM_SOCKET_H */
|
||||
|
|
|
|||
|
|
@ -98,4 +98,8 @@
|
|||
|
||||
#define SO_COOKIE 57
|
||||
|
||||
#define SCM_TIMESTAMPING_PKTINFO 58
|
||||
|
||||
#define SO_PEERGROUPS 59
|
||||
|
||||
#endif /* _ASM_SOCKET_H */
|
||||
|
|
|
|||
|
|
@ -97,4 +97,8 @@
|
|||
|
||||
#define SO_COOKIE 0x4032
|
||||
|
||||
#define SCM_TIMESTAMPING_PKTINFO 0x4033
|
||||
|
||||
#define SO_PEERGROUPS 0x4034
|
||||
|
||||
#endif /* _UAPI_ASM_SOCKET_H */
|
||||
|
|
|
|||
|
|
@ -293,9 +293,7 @@
|
|||
compatible = "fsl,ucc-hdlc";
|
||||
rx-clock-name = "clk9";
|
||||
tx-clock-name = "clk9";
|
||||
fsl,tx-timeslot-mask = <0xfffffffe>;
|
||||
fsl,rx-timeslot-mask = <0xfffffffe>;
|
||||
fsl,siram-entry-id = <0>;
|
||||
fsl,hdlc-bus;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -295,6 +295,8 @@
|
|||
#define H_DISABLE_ALL_VIO_INTS 0x0A
|
||||
#define H_DISABLE_VIO_INTERRUPT 0x0B
|
||||
#define H_ENABLE_VIO_INTERRUPT 0x0C
|
||||
#define H_GET_SESSION_TOKEN 0x19
|
||||
#define H_SESSION_ERR_DETECTED 0x1A
|
||||
|
||||
|
||||
/* Platform specific hcalls, used by KVM */
|
||||
|
|
|
|||
|
|
@ -8,28 +8,6 @@
|
|||
* 2 of the License, or (at your option) any later version.
|
||||
*/
|
||||
|
||||
#include <asm/sockios.h>
|
||||
|
||||
/* For setsockopt(2) */
|
||||
#define SOL_SOCKET 1
|
||||
|
||||
#define SO_DEBUG 1
|
||||
#define SO_REUSEADDR 2
|
||||
#define SO_TYPE 3
|
||||
#define SO_ERROR 4
|
||||
#define SO_DONTROUTE 5
|
||||
#define SO_BROADCAST 6
|
||||
#define SO_SNDBUF 7
|
||||
#define SO_RCVBUF 8
|
||||
#define SO_SNDBUFFORCE 32
|
||||
#define SO_RCVBUFFORCE 33
|
||||
#define SO_KEEPALIVE 9
|
||||
#define SO_OOBINLINE 10
|
||||
#define SO_NO_CHECK 11
|
||||
#define SO_PRIORITY 12
|
||||
#define SO_LINGER 13
|
||||
#define SO_BSDCOMPAT 14
|
||||
#define SO_REUSEPORT 15
|
||||
#define SO_RCVLOWAT 16
|
||||
#define SO_SNDLOWAT 17
|
||||
#define SO_RCVTIMEO 18
|
||||
|
|
@ -37,72 +15,6 @@
|
|||
#define SO_PASSCRED 20
|
||||
#define SO_PEERCRED 21
|
||||
|
||||
/* Security levels - as per NRL IPv6 - don't actually do anything */
|
||||
#define SO_SECURITY_AUTHENTICATION 22
|
||||
#define SO_SECURITY_ENCRYPTION_TRANSPORT 23
|
||||
#define SO_SECURITY_ENCRYPTION_NETWORK 24
|
||||
|
||||
#define SO_BINDTODEVICE 25
|
||||
|
||||
/* Socket filtering */
|
||||
#define SO_ATTACH_FILTER 26
|
||||
#define SO_DETACH_FILTER 27
|
||||
#define SO_GET_FILTER SO_ATTACH_FILTER
|
||||
|
||||
#define SO_PEERNAME 28
|
||||
#define SO_TIMESTAMP 29
|
||||
#define SCM_TIMESTAMP SO_TIMESTAMP
|
||||
|
||||
#define SO_ACCEPTCONN 30
|
||||
|
||||
#define SO_PEERSEC 31
|
||||
#define SO_PASSSEC 34
|
||||
#define SO_TIMESTAMPNS 35
|
||||
#define SCM_TIMESTAMPNS SO_TIMESTAMPNS
|
||||
|
||||
#define SO_MARK 36
|
||||
|
||||
#define SO_TIMESTAMPING 37
|
||||
#define SCM_TIMESTAMPING SO_TIMESTAMPING
|
||||
|
||||
#define SO_PROTOCOL 38
|
||||
#define SO_DOMAIN 39
|
||||
|
||||
#define SO_RXQ_OVFL 40
|
||||
|
||||
#define SO_WIFI_STATUS 41
|
||||
#define SCM_WIFI_STATUS SO_WIFI_STATUS
|
||||
#define SO_PEEK_OFF 42
|
||||
|
||||
/* Instruct lower device to use last 4-bytes of skb data as FCS */
|
||||
#define SO_NOFCS 43
|
||||
|
||||
#define SO_LOCK_FILTER 44
|
||||
|
||||
#define SO_SELECT_ERR_QUEUE 45
|
||||
|
||||
#define SO_BUSY_POLL 46
|
||||
|
||||
#define SO_MAX_PACING_RATE 47
|
||||
|
||||
#define SO_BPF_EXTENSIONS 48
|
||||
|
||||
#define SO_INCOMING_CPU 49
|
||||
|
||||
#define SO_ATTACH_BPF 50
|
||||
#define SO_DETACH_BPF SO_DETACH_FILTER
|
||||
|
||||
#define SO_ATTACH_REUSEPORT_CBPF 51
|
||||
#define SO_ATTACH_REUSEPORT_EBPF 52
|
||||
|
||||
#define SO_CNX_ADVICE 53
|
||||
|
||||
#define SCM_TIMESTAMPING_OPT_STATS 54
|
||||
|
||||
#define SO_MEMINFO 55
|
||||
|
||||
#define SO_INCOMING_NAPI_ID 56
|
||||
|
||||
#define SO_COOKIE 57
|
||||
#include <asm-generic/socket.h>
|
||||
|
||||
#endif /* _ASM_POWERPC_SOCKET_H */
|
||||
|
|
|
|||
|
|
@ -938,7 +938,7 @@ common_load:
|
|||
/*
|
||||
* Tail call
|
||||
*/
|
||||
case BPF_JMP | BPF_CALL | BPF_X:
|
||||
case BPF_JMP | BPF_TAIL_CALL:
|
||||
ctx->seen |= SEEN_TAILCALL;
|
||||
bpf_jit_emit_tail_call(image, ctx, addrs[i + 1]);
|
||||
break;
|
||||
|
|
@ -1052,6 +1052,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *fp)
|
|||
|
||||
fp->bpf_func = (void *)image;
|
||||
fp->jited = 1;
|
||||
fp->jited_len = alloclen;
|
||||
|
||||
bpf_flush_icache(bpf_hdr, (u8 *)bpf_hdr + (bpf_hdr->pages * PAGE_SIZE));
|
||||
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
#ifndef _ASM_S390_DIAG_H
|
||||
#define _ASM_S390_DIAG_H
|
||||
|
||||
#include <linux/if_ether.h>
|
||||
#include <linux/percpu.h>
|
||||
|
||||
enum diag_stat_enum {
|
||||
|
|
@ -24,6 +25,7 @@ enum diag_stat_enum {
|
|||
DIAG_STAT_X224,
|
||||
DIAG_STAT_X250,
|
||||
DIAG_STAT_X258,
|
||||
DIAG_STAT_X26C,
|
||||
DIAG_STAT_X288,
|
||||
DIAG_STAT_X2C4,
|
||||
DIAG_STAT_X2FC,
|
||||
|
|
@ -225,6 +227,30 @@ struct diag204_x_phys_block {
|
|||
struct diag204_x_phys_cpu cpus[];
|
||||
} __packed;
|
||||
|
||||
enum diag26c_sc {
|
||||
DIAG26C_MAC_SERVICES = 0x00000030
|
||||
};
|
||||
|
||||
enum diag26c_version {
|
||||
DIAG26C_VERSION2 = 0x00000002 /* z/VM 5.4.0 */
|
||||
};
|
||||
|
||||
#define DIAG26C_GET_MAC 0x0000
|
||||
struct diag26c_mac_req {
|
||||
u32 resp_buf_len;
|
||||
u32 resp_version;
|
||||
u16 op_code;
|
||||
u16 devno;
|
||||
u8 res[4];
|
||||
};
|
||||
|
||||
struct diag26c_mac_resp {
|
||||
u32 version;
|
||||
u8 mac[ETH_ALEN];
|
||||
u8 res[2];
|
||||
} __aligned(8);
|
||||
|
||||
int diag204(unsigned long subcode, unsigned long size, void *addr);
|
||||
int diag224(void *ptr);
|
||||
int diag26c(void *req, void *resp, enum diag26c_sc subcode);
|
||||
#endif /* _ASM_S390_DIAG_H */
|
||||
|
|
|
|||
|
|
@ -104,4 +104,8 @@
|
|||
|
||||
#define SO_COOKIE 57
|
||||
|
||||
#define SCM_TIMESTAMPING_PKTINFO 58
|
||||
|
||||
#define SO_PEERGROUPS 59
|
||||
|
||||
#endif /* _ASM_SOCKET_H */
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@ static const struct diag_desc diag_map[NR_DIAG_STAT] = {
|
|||
[DIAG_STAT_X224] = { .code = 0x224, .name = "EBCDIC-Name Table" },
|
||||
[DIAG_STAT_X250] = { .code = 0x250, .name = "Block I/O" },
|
||||
[DIAG_STAT_X258] = { .code = 0x258, .name = "Page-Reference Services" },
|
||||
[DIAG_STAT_X26C] = { .code = 0x26c, .name = "Certain System Information" },
|
||||
[DIAG_STAT_X288] = { .code = 0x288, .name = "Time Bomb" },
|
||||
[DIAG_STAT_X2C4] = { .code = 0x2c4, .name = "FTP Services" },
|
||||
[DIAG_STAT_X2FC] = { .code = 0x2fc, .name = "Guest Performance Data" },
|
||||
|
|
@ -236,3 +237,31 @@ int diag224(void *ptr)
|
|||
return rc;
|
||||
}
|
||||
EXPORT_SYMBOL(diag224);
|
||||
|
||||
/*
|
||||
* Diagnose 26C: Access Certain System Information
|
||||
*/
|
||||
static inline int __diag26c(void *req, void *resp, enum diag26c_sc subcode)
|
||||
{
|
||||
register unsigned long _req asm("2") = (addr_t) req;
|
||||
register unsigned long _resp asm("3") = (addr_t) resp;
|
||||
register unsigned long _subcode asm("4") = subcode;
|
||||
register unsigned long _rc asm("5") = -EOPNOTSUPP;
|
||||
|
||||
asm volatile(
|
||||
" sam31\n"
|
||||
" diag %[rx],%[ry],0x26c\n"
|
||||
"0: sam64\n"
|
||||
EX_TABLE(0b,0b)
|
||||
: "+d" (_rc)
|
||||
: [rx] "d" (_req), "d" (_resp), [ry] "d" (_subcode)
|
||||
: "cc", "memory");
|
||||
return _rc;
|
||||
}
|
||||
|
||||
int diag26c(void *req, void *resp, enum diag26c_sc subcode)
|
||||
{
|
||||
diag_stat_inc(DIAG_STAT_X26C);
|
||||
return __diag26c(req, resp, subcode);
|
||||
}
|
||||
EXPORT_SYMBOL(diag26c);
|
||||
|
|
|
|||
|
|
@ -991,7 +991,7 @@ static noinline int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp, int i
|
|||
}
|
||||
break;
|
||||
}
|
||||
case BPF_JMP | BPF_CALL | BPF_X:
|
||||
case BPF_JMP | BPF_TAIL_CALL:
|
||||
/*
|
||||
* Implicit input:
|
||||
* B1: pointer to ctx
|
||||
|
|
@ -1329,6 +1329,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *fp)
|
|||
bpf_jit_binary_lock_ro(header);
|
||||
fp->bpf_func = (void *) jit.prg_buf;
|
||||
fp->jited = 1;
|
||||
fp->jited_len = jit.size;
|
||||
free_addrs:
|
||||
kfree(jit.addrs);
|
||||
out:
|
||||
|
|
|
|||
|
|
@ -94,6 +94,10 @@
|
|||
|
||||
#define SO_COOKIE 0x003b
|
||||
|
||||
#define SCM_TIMESTAMPING_PKTINFO 0x003c
|
||||
|
||||
#define SO_PEERGROUPS 0x003d
|
||||
|
||||
/* Security levels - as per NRL IPv6 - don't actually do anything */
|
||||
#define SO_SECURITY_AUTHENTICATION 0x5001
|
||||
#define SO_SECURITY_ENCRYPTION_TRANSPORT 0x5002
|
||||
|
|
|
|||
|
|
@ -802,8 +802,13 @@ static void build_prologue(struct jit_ctx *ctx)
|
|||
{
|
||||
s32 stack_needed = BASE_STACKFRAME;
|
||||
|
||||
if (ctx->saw_frame_pointer || ctx->saw_tail_call)
|
||||
stack_needed += MAX_BPF_STACK;
|
||||
if (ctx->saw_frame_pointer || ctx->saw_tail_call) {
|
||||
struct bpf_prog *prog = ctx->prog;
|
||||
u32 stack_depth;
|
||||
|
||||
stack_depth = prog->aux->stack_depth;
|
||||
stack_needed += round_up(stack_depth, 16);
|
||||
}
|
||||
|
||||
if (ctx->saw_tail_call)
|
||||
stack_needed += 8;
|
||||
|
|
@ -1217,7 +1222,7 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx)
|
|||
}
|
||||
|
||||
/* tail call */
|
||||
case BPF_JMP | BPF_CALL |BPF_X:
|
||||
case BPF_JMP | BPF_TAIL_CALL:
|
||||
emit_tail_call(ctx);
|
||||
break;
|
||||
|
||||
|
|
@ -1555,6 +1560,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)
|
|||
|
||||
prog->bpf_func = (void *)ctx.image;
|
||||
prog->jited = 1;
|
||||
prog->jited_len = image_size;
|
||||
|
||||
out_off:
|
||||
kfree(ctx.offset);
|
||||
|
|
|
|||
|
|
@ -19,9 +19,6 @@
|
|||
*/
|
||||
#define SKBDATA %r10
|
||||
#define SKF_MAX_NEG_OFF $(-0x200000) /* SKF_LL_OFF from filter.h */
|
||||
#define MAX_BPF_STACK (512 /* from filter.h */ + \
|
||||
32 /* space for rbx,r13,r14,r15 */ + \
|
||||
8 /* space for skb_copy_bits */)
|
||||
|
||||
#define FUNC(name) \
|
||||
.globl name; \
|
||||
|
|
@ -66,7 +63,7 @@ FUNC(sk_load_byte_positive_offset)
|
|||
|
||||
/* rsi contains offset and can be scratched */
|
||||
#define bpf_slow_path_common(LEN) \
|
||||
lea -MAX_BPF_STACK + 32(%rbp), %rdx;\
|
||||
lea 32(%rbp), %rdx;\
|
||||
FRAME_BEGIN; \
|
||||
mov %rbx, %rdi; /* arg1 == skb */ \
|
||||
push %r9; \
|
||||
|
|
@ -83,14 +80,14 @@ FUNC(sk_load_byte_positive_offset)
|
|||
bpf_slow_path_word:
|
||||
bpf_slow_path_common(4)
|
||||
js bpf_error
|
||||
mov - MAX_BPF_STACK + 32(%rbp),%eax
|
||||
mov 32(%rbp),%eax
|
||||
bswap %eax
|
||||
ret
|
||||
|
||||
bpf_slow_path_half:
|
||||
bpf_slow_path_common(2)
|
||||
js bpf_error
|
||||
mov - MAX_BPF_STACK + 32(%rbp),%ax
|
||||
mov 32(%rbp),%ax
|
||||
rol $8,%ax
|
||||
movzwl %ax,%eax
|
||||
ret
|
||||
|
|
@ -98,7 +95,7 @@ bpf_slow_path_half:
|
|||
bpf_slow_path_byte:
|
||||
bpf_slow_path_common(1)
|
||||
js bpf_error
|
||||
movzbl - MAX_BPF_STACK + 32(%rbp),%eax
|
||||
movzbl 32(%rbp),%eax
|
||||
ret
|
||||
|
||||
#define sk_negative_common(SIZE) \
|
||||
|
|
@ -148,9 +145,10 @@ FUNC(sk_load_byte_negative_offset)
|
|||
bpf_error:
|
||||
# force a return 0 from jit handler
|
||||
xor %eax,%eax
|
||||
mov - MAX_BPF_STACK(%rbp),%rbx
|
||||
mov - MAX_BPF_STACK + 8(%rbp),%r13
|
||||
mov - MAX_BPF_STACK + 16(%rbp),%r14
|
||||
mov - MAX_BPF_STACK + 24(%rbp),%r15
|
||||
mov (%rbp),%rbx
|
||||
mov 8(%rbp),%r13
|
||||
mov 16(%rbp),%r14
|
||||
mov 24(%rbp),%r15
|
||||
add $40, %rbp
|
||||
leaveq
|
||||
ret
|
||||
|
|
|
|||
|
|
@ -197,17 +197,16 @@ struct jit_context {
|
|||
#define BPF_MAX_INSN_SIZE 128
|
||||
#define BPF_INSN_SAFETY 64
|
||||
|
||||
#define STACKSIZE \
|
||||
(MAX_BPF_STACK + \
|
||||
32 /* space for rbx, r13, r14, r15 */ + \
|
||||
#define AUX_STACK_SPACE \
|
||||
(32 /* space for rbx, r13, r14, r15 */ + \
|
||||
8 /* space for skb_copy_bits() buffer */)
|
||||
|
||||
#define PROLOGUE_SIZE 48
|
||||
#define PROLOGUE_SIZE 37
|
||||
|
||||
/* emit x64 prologue code for BPF program and check it's size.
|
||||
* bpf_tail_call helper will skip it while jumping into another program
|
||||
*/
|
||||
static void emit_prologue(u8 **pprog)
|
||||
static void emit_prologue(u8 **pprog, u32 stack_depth)
|
||||
{
|
||||
u8 *prog = *pprog;
|
||||
int cnt = 0;
|
||||
|
|
@ -215,13 +214,17 @@ static void emit_prologue(u8 **pprog)
|
|||
EMIT1(0x55); /* push rbp */
|
||||
EMIT3(0x48, 0x89, 0xE5); /* mov rbp,rsp */
|
||||
|
||||
/* sub rsp, STACKSIZE */
|
||||
EMIT3_off32(0x48, 0x81, 0xEC, STACKSIZE);
|
||||
/* sub rsp, rounded_stack_depth + AUX_STACK_SPACE */
|
||||
EMIT3_off32(0x48, 0x81, 0xEC,
|
||||
round_up(stack_depth, 8) + AUX_STACK_SPACE);
|
||||
|
||||
/* sub rbp, AUX_STACK_SPACE */
|
||||
EMIT4(0x48, 0x83, 0xED, AUX_STACK_SPACE);
|
||||
|
||||
/* all classic BPF filters use R6(rbx) save it */
|
||||
|
||||
/* mov qword ptr [rbp-X],rbx */
|
||||
EMIT3_off32(0x48, 0x89, 0x9D, -STACKSIZE);
|
||||
/* mov qword ptr [rbp+0],rbx */
|
||||
EMIT4(0x48, 0x89, 0x5D, 0);
|
||||
|
||||
/* bpf_convert_filter() maps classic BPF register X to R7 and uses R8
|
||||
* as temporary, so all tcpdump filters need to spill/fill R7(r13) and
|
||||
|
|
@ -231,12 +234,12 @@ static void emit_prologue(u8 **pprog)
|
|||
* than synthetic ones. Therefore not worth adding complexity.
|
||||
*/
|
||||
|
||||
/* mov qword ptr [rbp-X],r13 */
|
||||
EMIT3_off32(0x4C, 0x89, 0xAD, -STACKSIZE + 8);
|
||||
/* mov qword ptr [rbp-X],r14 */
|
||||
EMIT3_off32(0x4C, 0x89, 0xB5, -STACKSIZE + 16);
|
||||
/* mov qword ptr [rbp-X],r15 */
|
||||
EMIT3_off32(0x4C, 0x89, 0xBD, -STACKSIZE + 24);
|
||||
/* mov qword ptr [rbp+8],r13 */
|
||||
EMIT4(0x4C, 0x89, 0x6D, 8);
|
||||
/* mov qword ptr [rbp+16],r14 */
|
||||
EMIT4(0x4C, 0x89, 0x75, 16);
|
||||
/* mov qword ptr [rbp+24],r15 */
|
||||
EMIT4(0x4C, 0x89, 0x7D, 24);
|
||||
|
||||
/* Clear the tail call counter (tail_call_cnt): for eBPF tail calls
|
||||
* we need to reset the counter to 0. It's done in two instructions,
|
||||
|
|
@ -246,8 +249,8 @@ static void emit_prologue(u8 **pprog)
|
|||
|
||||
/* xor eax, eax */
|
||||
EMIT2(0x31, 0xc0);
|
||||
/* mov qword ptr [rbp-X], rax */
|
||||
EMIT3_off32(0x48, 0x89, 0x85, -STACKSIZE + 32);
|
||||
/* mov qword ptr [rbp+32], rax */
|
||||
EMIT4(0x48, 0x89, 0x45, 32);
|
||||
|
||||
BUILD_BUG_ON(cnt != PROLOGUE_SIZE);
|
||||
*pprog = prog;
|
||||
|
|
@ -289,13 +292,13 @@ static void emit_bpf_tail_call(u8 **pprog)
|
|||
/* if (tail_call_cnt > MAX_TAIL_CALL_CNT)
|
||||
* goto out;
|
||||
*/
|
||||
EMIT2_off32(0x8B, 0x85, -STACKSIZE + 36); /* mov eax, dword ptr [rbp - 516] */
|
||||
EMIT2_off32(0x8B, 0x85, 36); /* mov eax, dword ptr [rbp + 36] */
|
||||
EMIT3(0x83, 0xF8, MAX_TAIL_CALL_CNT); /* cmp eax, MAX_TAIL_CALL_CNT */
|
||||
#define OFFSET2 36
|
||||
EMIT2(X86_JA, OFFSET2); /* ja out */
|
||||
label2 = cnt;
|
||||
EMIT3(0x83, 0xC0, 0x01); /* add eax, 1 */
|
||||
EMIT2_off32(0x89, 0x85, -STACKSIZE + 36); /* mov dword ptr [rbp - 516], eax */
|
||||
EMIT2_off32(0x89, 0x85, 36); /* mov dword ptr [rbp + 36], eax */
|
||||
|
||||
/* prog = array->ptrs[index]; */
|
||||
EMIT4_off32(0x48, 0x8D, 0x84, 0xD6, /* lea rax, [rsi + rdx * 8 + offsetof(...)] */
|
||||
|
|
@ -361,7 +364,7 @@ static int do_jit(struct bpf_prog *bpf_prog, int *addrs, u8 *image,
|
|||
int proglen = 0;
|
||||
u8 *prog = temp;
|
||||
|
||||
emit_prologue(&prog);
|
||||
emit_prologue(&prog, bpf_prog->aux->stack_depth);
|
||||
|
||||
if (seen_ld_abs)
|
||||
emit_load_skb_data_hlen(&prog);
|
||||
|
|
@ -877,7 +880,7 @@ xadd: if (is_imm8(insn->off))
|
|||
}
|
||||
break;
|
||||
|
||||
case BPF_JMP | BPF_CALL | BPF_X:
|
||||
case BPF_JMP | BPF_TAIL_CALL:
|
||||
emit_bpf_tail_call(&prog);
|
||||
break;
|
||||
|
||||
|
|
@ -1036,15 +1039,17 @@ common_load:
|
|||
seen_exit = true;
|
||||
/* update cleanup_addr */
|
||||
ctx->cleanup_addr = proglen;
|
||||
/* mov rbx, qword ptr [rbp-X] */
|
||||
EMIT3_off32(0x48, 0x8B, 0x9D, -STACKSIZE);
|
||||
/* mov r13, qword ptr [rbp-X] */
|
||||
EMIT3_off32(0x4C, 0x8B, 0xAD, -STACKSIZE + 8);
|
||||
/* mov r14, qword ptr [rbp-X] */
|
||||
EMIT3_off32(0x4C, 0x8B, 0xB5, -STACKSIZE + 16);
|
||||
/* mov r15, qword ptr [rbp-X] */
|
||||
EMIT3_off32(0x4C, 0x8B, 0xBD, -STACKSIZE + 24);
|
||||
/* mov rbx, qword ptr [rbp+0] */
|
||||
EMIT4(0x48, 0x8B, 0x5D, 0);
|
||||
/* mov r13, qword ptr [rbp+8] */
|
||||
EMIT4(0x4C, 0x8B, 0x6D, 8);
|
||||
/* mov r14, qword ptr [rbp+16] */
|
||||
EMIT4(0x4C, 0x8B, 0x75, 16);
|
||||
/* mov r15, qword ptr [rbp+24] */
|
||||
EMIT4(0x4C, 0x8B, 0x7D, 24);
|
||||
|
||||
/* add rbp, AUX_STACK_SPACE */
|
||||
EMIT4(0x48, 0x83, 0xC5, AUX_STACK_SPACE);
|
||||
EMIT1(0xC9); /* leave */
|
||||
EMIT1(0xC3); /* ret */
|
||||
break;
|
||||
|
|
@ -1162,6 +1167,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)
|
|||
bpf_jit_binary_lock_ro(header);
|
||||
prog->bpf_func = (void *)image;
|
||||
prog->jited = 1;
|
||||
prog->jited_len = proglen;
|
||||
} else {
|
||||
prog = orig_prog;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -109,4 +109,8 @@
|
|||
|
||||
#define SO_COOKIE 57
|
||||
|
||||
#define SCM_TIMESTAMPING_PKTINFO 58
|
||||
|
||||
#define SO_PEERGROUPS 59
|
||||
|
||||
#endif /* _XTENSA_SOCKET_H */
|
||||
|
|
|
|||
|
|
@ -877,7 +877,7 @@ static void aead_sock_destruct(struct sock *sk)
|
|||
unsigned int ivlen = crypto_aead_ivsize(
|
||||
crypto_aead_reqtfm(&ctx->aead_req));
|
||||
|
||||
WARN_ON(atomic_read(&sk->sk_refcnt) != 0);
|
||||
WARN_ON(refcount_read(&sk->sk_refcnt) != 0);
|
||||
aead_put_sgl(sk);
|
||||
sock_kzfree_s(sk, ctx->iv, ivlen);
|
||||
sock_kfree_s(sk, ctx, ctx->len);
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ static int atmtcp_send_control(struct atm_vcc *vcc,int type,
|
|||
return -EUNATCH;
|
||||
}
|
||||
atm_force_charge(out_vcc,skb->truesize);
|
||||
new_msg = (struct atmtcp_control *) skb_put(skb,sizeof(*new_msg));
|
||||
new_msg = skb_put(skb, sizeof(*new_msg));
|
||||
*new_msg = *msg;
|
||||
new_msg->hdr.length = ATMTCP_HDR_MAGIC;
|
||||
new_msg->type = type;
|
||||
|
|
@ -217,7 +217,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
|
|||
atomic_inc(&vcc->stats->tx_err);
|
||||
return -ENOBUFS;
|
||||
}
|
||||
hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr));
|
||||
hdr = skb_put(new_skb, sizeof(struct atmtcp_hdr));
|
||||
hdr->vpi = htons(vcc->vpi);
|
||||
hdr->vci = htons(vcc->vci);
|
||||
hdr->length = htonl(skb->len);
|
||||
|
|
|
|||
|
|
@ -924,12 +924,7 @@ fore200e_tx_irq(struct fore200e* fore200e)
|
|||
else {
|
||||
dev_kfree_skb_any(entry->skb);
|
||||
}
|
||||
#if 1
|
||||
/* race fixed by the above incarnation mechanism, but... */
|
||||
if (atomic_read(&sk_atm(vcc)->sk_wmem_alloc) < 0) {
|
||||
atomic_set(&sk_atm(vcc)->sk_wmem_alloc, 0);
|
||||
}
|
||||
#endif
|
||||
|
||||
/* check error condition */
|
||||
if (*entry->status & STATUS_ERROR)
|
||||
atomic_inc(&vcc->stats->tx_err);
|
||||
|
|
@ -1104,7 +1099,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
|
|||
/* Make device DMA transfer visible to CPU. */
|
||||
fore200e->bus->dma_sync_for_cpu(fore200e, buffer->data.dma_addr, rpd->rsd[ i ].length, DMA_FROM_DEVICE);
|
||||
|
||||
memcpy(skb_put(skb, rpd->rsd[ i ].length), buffer->data.align_addr, rpd->rsd[ i ].length);
|
||||
skb_put_data(skb, buffer->data.align_addr, rpd->rsd[i].length);
|
||||
|
||||
/* Now let the device get at it again. */
|
||||
fore200e->bus->dma_sync_for_device(fore200e, buffer->data.dma_addr, rpd->rsd[ i ].length, DMA_FROM_DEVICE);
|
||||
|
|
@ -1130,13 +1125,9 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
|
|||
return -ENOMEM;
|
||||
}
|
||||
|
||||
ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
|
||||
|
||||
vcc->push(vcc, skb);
|
||||
atomic_inc(&vcc->stats->rx);
|
||||
|
||||
ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -1572,7 +1563,6 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
|
|||
unsigned long flags;
|
||||
|
||||
ASSERT(vcc);
|
||||
ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
|
||||
ASSERT(fore200e);
|
||||
ASSERT(fore200e_vcc);
|
||||
|
||||
|
|
|
|||
|
|
@ -1735,7 +1735,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
|
|||
__net_timestamp(skb);
|
||||
|
||||
list_for_each_entry(heb, &he_vcc->buffers, entry)
|
||||
memcpy(skb_put(skb, heb->len), &heb->data, heb->len);
|
||||
skb_put_data(skb, &heb->data, heb->len);
|
||||
|
||||
switch (vcc->qos.aal) {
|
||||
case ATM_AAL0:
|
||||
|
|
@ -2395,7 +2395,7 @@ he_close(struct atm_vcc *vcc)
|
|||
* TBRQ, the host issues the close command to the adapter.
|
||||
*/
|
||||
|
||||
while (((tx_inuse = atomic_read(&sk_atm(vcc)->sk_wmem_alloc)) > 1) &&
|
||||
while (((tx_inuse = refcount_read(&sk_atm(vcc)->sk_wmem_alloc)) > 1) &&
|
||||
(retry < MAX_RETRY)) {
|
||||
msleep(sleep);
|
||||
if (sleep < 250)
|
||||
|
|
|
|||
|
|
@ -724,7 +724,7 @@ push_on_scq(struct idt77252_dev *card, struct vc_map *vc, struct sk_buff *skb)
|
|||
struct sock *sk = sk_atm(vcc);
|
||||
|
||||
vc->estimator->cells += (skb->len + 47) / 48;
|
||||
if (atomic_read(&sk->sk_wmem_alloc) >
|
||||
if (refcount_read(&sk->sk_wmem_alloc) >
|
||||
(sk->sk_sndbuf >> 1)) {
|
||||
u32 cps = vc->estimator->maxcps;
|
||||
|
||||
|
|
@ -1090,8 +1090,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
|
|||
|
||||
*((u32 *) sb->data) = aal0;
|
||||
skb_put(sb, sizeof(u32));
|
||||
memcpy(skb_put(sb, ATM_CELL_PAYLOAD),
|
||||
cell, ATM_CELL_PAYLOAD);
|
||||
skb_put_data(sb, cell, ATM_CELL_PAYLOAD);
|
||||
|
||||
ATM_SKB(sb)->vcc = vcc;
|
||||
__net_timestamp(sb);
|
||||
|
|
@ -1159,8 +1158,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
|
|||
return;
|
||||
}
|
||||
skb_queue_walk(&rpp->queue, sb)
|
||||
memcpy(skb_put(skb, sb->len),
|
||||
sb->data, sb->len);
|
||||
skb_put_data(skb, sb->data, sb->len);
|
||||
|
||||
recycle_rx_pool_skb(card, rpp);
|
||||
|
||||
|
|
@ -1322,8 +1320,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
|
|||
|
||||
*((u32 *) sb->data) = header;
|
||||
skb_put(sb, sizeof(u32));
|
||||
memcpy(skb_put(sb, ATM_CELL_PAYLOAD), &(queue->data[16]),
|
||||
ATM_CELL_PAYLOAD);
|
||||
skb_put_data(sb, &(queue->data[16]), ATM_CELL_PAYLOAD);
|
||||
|
||||
ATM_SKB(sb)->vcc = vcc;
|
||||
__net_timestamp(sb);
|
||||
|
|
@ -2012,9 +2009,9 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
|
|||
atomic_inc(&vcc->stats->tx_err);
|
||||
return -ENOMEM;
|
||||
}
|
||||
atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
|
||||
refcount_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
|
||||
|
||||
memcpy(skb_put(skb, 52), cell, 52);
|
||||
skb_put_data(skb, cell, 52);
|
||||
|
||||
return idt77252_send_skb(vcc, skb, 1);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -205,7 +205,7 @@ static ssize_t solos_param_show(struct device *dev, struct device_attribute *att
|
|||
return -ENOMEM;
|
||||
}
|
||||
|
||||
header = (void *)skb_put(skb, sizeof(*header));
|
||||
header = skb_put(skb, sizeof(*header));
|
||||
|
||||
buflen = snprintf((void *)&header[1], buflen - 1,
|
||||
"L%05d\n%s\n", current->pid, attr->attr.name);
|
||||
|
|
@ -261,7 +261,7 @@ static ssize_t solos_param_store(struct device *dev, struct device_attribute *at
|
|||
return -ENOMEM;
|
||||
}
|
||||
|
||||
header = (void *)skb_put(skb, sizeof(*header));
|
||||
header = skb_put(skb, sizeof(*header));
|
||||
|
||||
buflen = snprintf((void *)&header[1], buflen - 1,
|
||||
"L%05d\n%s\n%s\n", current->pid, attr->attr.name, buf);
|
||||
|
|
@ -486,14 +486,14 @@ static int send_command(struct solos_card *card, int dev, const char *buf, size_
|
|||
return 0;
|
||||
}
|
||||
|
||||
header = (void *)skb_put(skb, sizeof(*header));
|
||||
header = skb_put(skb, sizeof(*header));
|
||||
|
||||
header->size = cpu_to_le16(size);
|
||||
header->vpi = cpu_to_le16(0);
|
||||
header->vci = cpu_to_le16(0);
|
||||
header->type = cpu_to_le16(PKT_COMMAND);
|
||||
|
||||
memcpy(skb_put(skb, size), buf, size);
|
||||
skb_put_data(skb, buf, size);
|
||||
|
||||
fpga_queue(card, dev, skb, NULL);
|
||||
|
||||
|
|
@ -945,7 +945,7 @@ static int popen(struct atm_vcc *vcc)
|
|||
dev_warn(&card->dev->dev, "Failed to allocate sk_buff in popen()\n");
|
||||
return -ENOMEM;
|
||||
}
|
||||
header = (void *)skb_put(skb, sizeof(*header));
|
||||
header = skb_put(skb, sizeof(*header));
|
||||
|
||||
header->size = cpu_to_le16(0);
|
||||
header->vpi = cpu_to_le16(vcc->vpi);
|
||||
|
|
@ -982,7 +982,7 @@ static void pclose(struct atm_vcc *vcc)
|
|||
dev_warn(&card->dev->dev, "Failed to allocate sk_buff in pclose()\n");
|
||||
return;
|
||||
}
|
||||
header = (void *)skb_put(skb, sizeof(*header));
|
||||
header = skb_put(skb, sizeof(*header));
|
||||
|
||||
header->size = cpu_to_le16(0);
|
||||
header->vpi = cpu_to_le16(vcc->vpi);
|
||||
|
|
@ -1174,7 +1174,7 @@ static int psend(struct atm_vcc *vcc, struct sk_buff *skb)
|
|||
}
|
||||
}
|
||||
|
||||
header = (void *)skb_push(skb, sizeof(*header));
|
||||
header = skb_push(skb, sizeof(*header));
|
||||
|
||||
/* This does _not_ include the size of the header */
|
||||
header->size = cpu_to_le16(pktlen);
|
||||
|
|
@ -1251,10 +1251,10 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id)
|
|||
|
||||
if (reset) {
|
||||
iowrite32(1, card->config_regs + FPGA_MODE);
|
||||
data32 = ioread32(card->config_regs + FPGA_MODE);
|
||||
ioread32(card->config_regs + FPGA_MODE);
|
||||
|
||||
iowrite32(0, card->config_regs + FPGA_MODE);
|
||||
data32 = ioread32(card->config_regs + FPGA_MODE);
|
||||
ioread32(card->config_regs + FPGA_MODE);
|
||||
}
|
||||
|
||||
data32 = ioread32(card->config_regs + FPGA_VER);
|
||||
|
|
@ -1398,7 +1398,7 @@ static int atm_init(struct solos_card *card, struct device *parent)
|
|||
continue;
|
||||
}
|
||||
|
||||
header = (void *)skb_put(skb, sizeof(*header));
|
||||
header = skb_put(skb, sizeof(*header));
|
||||
|
||||
header->size = cpu_to_le16(0);
|
||||
header->vpi = cpu_to_le16(0);
|
||||
|
|
|
|||
|
|
@ -97,6 +97,7 @@ config BT_HCIUART_NOKIA
|
|||
depends on BT_HCIUART
|
||||
depends on BT_HCIUART_SERDEV
|
||||
depends on PM
|
||||
select BT_HCIUART_H4
|
||||
help
|
||||
Nokia H4+ is serial protocol for communication between Bluetooth
|
||||
device and host. This protocol is required for Bluetooth devices
|
||||
|
|
@ -131,7 +132,7 @@ config BT_HCIUART_ATH3K
|
|||
|
||||
config BT_HCIUART_LL
|
||||
bool "HCILL protocol support"
|
||||
depends on BT_HCIUART
|
||||
depends on BT_HCIUART_SERDEV
|
||||
help
|
||||
HCILL (HCI Low Level) is a serial protocol for communication
|
||||
between Bluetooth device and host. This protocol is required for
|
||||
|
|
|
|||
|
|
@ -335,7 +335,7 @@ static inline int bfusb_recv_block(struct bfusb_data *data, int hdr, unsigned ch
|
|||
}
|
||||
|
||||
if (len > 0)
|
||||
memcpy(skb_put(data->reassembly, len), buf, len);
|
||||
skb_put_data(data->reassembly, buf, len);
|
||||
|
||||
if (hdr & 0x08) {
|
||||
hci_recv_frame(data->hdev, data->reassembly);
|
||||
|
|
@ -505,7 +505,7 @@ static int bfusb_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
|
|||
buf[1] = 0x00;
|
||||
buf[2] = (size == BFUSB_MAX_BLOCK_SIZE) ? 0 : size;
|
||||
|
||||
memcpy(skb_put(nskb, 3), buf, 3);
|
||||
skb_put_data(nskb, buf, 3);
|
||||
skb_copy_from_linear_data_offset(skb, sent, skb_put(nskb, size), size);
|
||||
|
||||
sent += size;
|
||||
|
|
@ -516,7 +516,7 @@ static int bfusb_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
|
|||
if ((nskb->len % data->bulk_pkt_size) == 0) {
|
||||
buf[0] = 0xdd;
|
||||
buf[1] = 0x00;
|
||||
memcpy(skb_put(nskb, 2), buf, 2);
|
||||
skb_put_data(nskb, buf, 2);
|
||||
}
|
||||
|
||||
read_lock(&data->lock);
|
||||
|
|
|
|||
|
|
@ -448,7 +448,7 @@ static void bluecard_receive(struct bluecard_info *info,
|
|||
|
||||
} else {
|
||||
|
||||
*skb_put(info->rx_skb, 1) = buf[i];
|
||||
skb_put_u8(info->rx_skb, buf[i]);
|
||||
info->rx_count--;
|
||||
|
||||
if (info->rx_count == 0) {
|
||||
|
|
@ -597,7 +597,7 @@ static int bluecard_hci_set_baud_rate(struct hci_dev *hdev, int baud)
|
|||
break;
|
||||
}
|
||||
|
||||
memcpy(skb_put(skb, sizeof(cmd)), cmd, sizeof(cmd));
|
||||
skb_put_data(skb, cmd, sizeof(cmd));
|
||||
|
||||
skb_queue_tail(&(info->txq), skb);
|
||||
|
||||
|
|
|
|||
|
|
@ -297,7 +297,7 @@ static int bpa10x_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
|
|||
return -ENOMEM;
|
||||
|
||||
/* Prepend skb with frame type */
|
||||
*skb_push(skb, 1) = hci_skb_pkt_type(skb);
|
||||
*(u8 *)skb_push(skb, 1) = hci_skb_pkt_type(skb);
|
||||
|
||||
switch (hci_skb_pkt_type(skb)) {
|
||||
case HCI_COMMAND_PKT:
|
||||
|
|
|
|||
|
|
@ -282,7 +282,7 @@ static void bt3c_receive(struct bt3c_info *info)
|
|||
|
||||
__u8 x = inb(iobase + DATA_L);
|
||||
|
||||
*skb_put(info->rx_skb, 1) = x;
|
||||
skb_put_u8(info->rx_skb, x);
|
||||
inb(iobase + DATA_H);
|
||||
info->rx_count--;
|
||||
|
||||
|
|
|
|||
|
|
@ -246,6 +246,27 @@ static struct sk_buff *btbcm_read_verbose_config(struct hci_dev *hdev)
|
|||
return skb;
|
||||
}
|
||||
|
||||
static struct sk_buff *btbcm_read_controller_features(struct hci_dev *hdev)
|
||||
{
|
||||
struct sk_buff *skb;
|
||||
|
||||
skb = __hci_cmd_sync(hdev, 0xfc6e, 0, NULL, HCI_INIT_TIMEOUT);
|
||||
if (IS_ERR(skb)) {
|
||||
BT_ERR("%s: BCM: Read controller features failed (%ld)",
|
||||
hdev->name, PTR_ERR(skb));
|
||||
return skb;
|
||||
}
|
||||
|
||||
if (skb->len != 9) {
|
||||
BT_ERR("%s: BCM: Controller features length mismatch",
|
||||
hdev->name);
|
||||
kfree_skb(skb);
|
||||
return ERR_PTR(-EIO);
|
||||
}
|
||||
|
||||
return skb;
|
||||
}
|
||||
|
||||
static struct sk_buff *btbcm_read_usb_product(struct hci_dev *hdev)
|
||||
{
|
||||
struct sk_buff *skb;
|
||||
|
|
@ -274,6 +295,7 @@ static const struct {
|
|||
{ 0x410e, "BCM43341B0" }, /* 002.001.014 */
|
||||
{ 0x4406, "BCM4324B3" }, /* 002.004.006 */
|
||||
{ 0x610c, "BCM4354" }, /* 003.001.012 */
|
||||
{ 0x2209, "BCM43430A1" }, /* 001.002.009 */
|
||||
{ }
|
||||
};
|
||||
|
||||
|
|
@ -417,6 +439,14 @@ int btbcm_setup_patchram(struct hci_dev *hdev)
|
|||
BT_INFO("%s: BCM: chip id %u", hdev->name, skb->data[1]);
|
||||
kfree_skb(skb);
|
||||
|
||||
/* Read Controller Features */
|
||||
skb = btbcm_read_controller_features(hdev);
|
||||
if (IS_ERR(skb))
|
||||
return PTR_ERR(skb);
|
||||
|
||||
BT_INFO("%s: BCM: features 0x%2.2x", hdev->name, skb->data[1]);
|
||||
kfree_skb(skb);
|
||||
|
||||
/* Read Local Name */
|
||||
skb = btbcm_read_local_name(hdev);
|
||||
if (IS_ERR(skb))
|
||||
|
|
@ -540,6 +570,13 @@ int btbcm_setup_apple(struct hci_dev *hdev)
|
|||
kfree_skb(skb);
|
||||
}
|
||||
|
||||
/* Read Controller Features */
|
||||
skb = btbcm_read_controller_features(hdev);
|
||||
if (!IS_ERR(skb)) {
|
||||
BT_INFO("%s: BCM: features 0x%2.2x", hdev->name, skb->data[1]);
|
||||
kfree_skb(skb);
|
||||
}
|
||||
|
||||
/* Read Local Name */
|
||||
skb = btbcm_read_local_name(hdev);
|
||||
if (!IS_ERR(skb)) {
|
||||
|
|
|
|||
|
|
@ -575,3 +575,5 @@ MODULE_VERSION(VERSION);
|
|||
MODULE_LICENSE("GPL");
|
||||
MODULE_FIRMWARE("intel/ibt-11-5.sfi");
|
||||
MODULE_FIRMWARE("intel/ibt-11-5.ddc");
|
||||
MODULE_FIRMWARE("intel/ibt-12-16.sfi");
|
||||
MODULE_FIRMWARE("intel/ibt-12-16.ddc");
|
||||
|
|
|
|||
|
|
@ -189,12 +189,12 @@ static int btmrvl_send_sync_cmd(struct btmrvl_private *priv, u16 opcode,
|
|||
return -ENOMEM;
|
||||
}
|
||||
|
||||
hdr = (struct hci_command_hdr *)skb_put(skb, HCI_COMMAND_HDR_SIZE);
|
||||
hdr = skb_put(skb, HCI_COMMAND_HDR_SIZE);
|
||||
hdr->opcode = cpu_to_le16(opcode);
|
||||
hdr->plen = len;
|
||||
|
||||
if (len)
|
||||
memcpy(skb_put(skb, len), param, len);
|
||||
skb_put_data(skb, param, len);
|
||||
|
||||
hci_skb_pkt_type(skb) = MRVL_VENDOR_PKT;
|
||||
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ static int btqcomsmd_recv(struct hci_dev *hdev, unsigned int type,
|
|||
}
|
||||
|
||||
hci_skb_pkt_type(skb) = type;
|
||||
memcpy(skb_put(skb, count), data, count);
|
||||
skb_put_data(skb, data, count);
|
||||
|
||||
return hci_recv_frame(hdev, skb);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -233,7 +233,7 @@ static void btuart_receive(struct btuart_info *info)
|
|||
|
||||
} else {
|
||||
|
||||
*skb_put(info->rx_skb, 1) = inb(iobase + UART_RX);
|
||||
skb_put_u8(info->rx_skb, inb(iobase + UART_RX));
|
||||
info->rx_count--;
|
||||
|
||||
if (info->rx_count == 0) {
|
||||
|
|
|
|||
|
|
@ -266,6 +266,7 @@ static const struct usb_device_id blacklist_table[] = {
|
|||
{ USB_DEVICE(0x0cf3, 0xe301), .driver_info = BTUSB_QCA_ROME },
|
||||
{ USB_DEVICE(0x0cf3, 0xe360), .driver_info = BTUSB_QCA_ROME },
|
||||
{ USB_DEVICE(0x0489, 0xe092), .driver_info = BTUSB_QCA_ROME },
|
||||
{ USB_DEVICE(0x0489, 0xe0a2), .driver_info = BTUSB_QCA_ROME },
|
||||
{ USB_DEVICE(0x04ca, 0x3011), .driver_info = BTUSB_QCA_ROME },
|
||||
|
||||
/* Broadcom BCM2035 */
|
||||
|
|
@ -336,6 +337,7 @@ static const struct usb_device_id blacklist_table[] = {
|
|||
{ USB_DEVICE(0x8087, 0x0a2a), .driver_info = BTUSB_INTEL },
|
||||
{ USB_DEVICE(0x8087, 0x0a2b), .driver_info = BTUSB_INTEL_NEW },
|
||||
{ USB_DEVICE(0x8087, 0x0aa7), .driver_info = BTUSB_INTEL },
|
||||
{ USB_DEVICE(0x8087, 0x0aaa), .driver_info = BTUSB_INTEL_NEW },
|
||||
|
||||
/* Other Intel Bluetooth devices */
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(0x8087, 0xe0, 0x01, 0x01),
|
||||
|
|
@ -476,7 +478,7 @@ static int btusb_recv_intr(struct btusb_data *data, void *buffer, int count)
|
|||
}
|
||||
|
||||
len = min_t(uint, hci_skb_expect(skb), count);
|
||||
memcpy(skb_put(skb, len), buffer, len);
|
||||
skb_put_data(skb, buffer, len);
|
||||
|
||||
count -= len;
|
||||
buffer += len;
|
||||
|
|
@ -531,7 +533,7 @@ static int btusb_recv_bulk(struct btusb_data *data, void *buffer, int count)
|
|||
}
|
||||
|
||||
len = min_t(uint, hci_skb_expect(skb), count);
|
||||
memcpy(skb_put(skb, len), buffer, len);
|
||||
skb_put_data(skb, buffer, len);
|
||||
|
||||
count -= len;
|
||||
buffer += len;
|
||||
|
|
@ -588,7 +590,7 @@ static int btusb_recv_isoc(struct btusb_data *data, void *buffer, int count)
|
|||
}
|
||||
|
||||
len = min_t(uint, hci_skb_expect(skb), count);
|
||||
memcpy(skb_put(skb, len), buffer, len);
|
||||
skb_put_data(skb, buffer, len);
|
||||
|
||||
count -= len;
|
||||
buffer += len;
|
||||
|
|
@ -932,8 +934,8 @@ static void btusb_diag_complete(struct urb *urb)
|
|||
|
||||
skb = bt_skb_alloc(urb->actual_length, GFP_ATOMIC);
|
||||
if (skb) {
|
||||
memcpy(skb_put(skb, urb->actual_length),
|
||||
urb->transfer_buffer, urb->actual_length);
|
||||
skb_put_data(skb, urb->transfer_buffer,
|
||||
urb->actual_length);
|
||||
hci_recv_diag(hdev, skb);
|
||||
}
|
||||
} else if (urb->status == -ENOENT) {
|
||||
|
|
@ -1834,15 +1836,15 @@ static int inject_cmd_complete(struct hci_dev *hdev, __u16 opcode)
|
|||
if (!skb)
|
||||
return -ENOMEM;
|
||||
|
||||
hdr = (struct hci_event_hdr *)skb_put(skb, sizeof(*hdr));
|
||||
hdr = skb_put(skb, sizeof(*hdr));
|
||||
hdr->evt = HCI_EV_CMD_COMPLETE;
|
||||
hdr->plen = sizeof(*evt) + 1;
|
||||
|
||||
evt = (struct hci_ev_cmd_complete *)skb_put(skb, sizeof(*evt));
|
||||
evt = skb_put(skb, sizeof(*evt));
|
||||
evt->ncmd = 0x01;
|
||||
evt->opcode = cpu_to_le16(opcode);
|
||||
|
||||
*skb_put(skb, 1) = 0x00;
|
||||
skb_put_u8(skb, 0x00);
|
||||
|
||||
hci_skb_pkt_type(skb) = HCI_EVENT_PKT;
|
||||
|
||||
|
|
@ -2036,6 +2038,7 @@ static int btusb_setup_intel_new(struct hci_dev *hdev)
|
|||
switch (ver.hw_variant) {
|
||||
case 0x0b: /* SfP */
|
||||
case 0x0c: /* WsP */
|
||||
case 0x11: /* JfP */
|
||||
case 0x12: /* ThP */
|
||||
break;
|
||||
default:
|
||||
|
|
@ -2138,6 +2141,8 @@ static int btusb_setup_intel_new(struct hci_dev *hdev)
|
|||
* Currently the supported hardware variants are:
|
||||
* 11 (0x0b) for iBT3.0 (LnP/SfP)
|
||||
* 12 (0x0c) for iBT3.5 (WsP)
|
||||
* 17 (0x11) for iBT3.5 (JfP)
|
||||
* 18 (0x12) for iBT3.5 (ThP)
|
||||
*/
|
||||
snprintf(fwname, sizeof(fwname), "intel/ibt-%u-%u.sfi",
|
||||
le16_to_cpu(ver.hw_variant),
|
||||
|
|
@ -2390,7 +2395,7 @@ static int marvell_config_oob_wake(struct hci_dev *hdev)
|
|||
return -ENOMEM;
|
||||
}
|
||||
|
||||
memcpy(skb_put(skb, sizeof(cmd)), cmd, sizeof(cmd));
|
||||
skb_put_data(skb, cmd, sizeof(cmd));
|
||||
hci_skb_pkt_type(skb) = HCI_COMMAND_PKT;
|
||||
|
||||
ret = btusb_send_frame(hdev, skb);
|
||||
|
|
@ -2762,8 +2767,8 @@ static struct urb *alloc_diag_urb(struct hci_dev *hdev, bool enable)
|
|||
return ERR_PTR(-ENOMEM);
|
||||
}
|
||||
|
||||
*skb_put(skb, 1) = 0xf0;
|
||||
*skb_put(skb, 1) = enable;
|
||||
skb_put_u8(skb, 0xf0);
|
||||
skb_put_u8(skb, enable);
|
||||
|
||||
pipe = usb_sndbulkpipe(data->udev, data->diag_tx_ep->bEndpointAddress);
|
||||
|
||||
|
|
|
|||
|
|
@ -262,7 +262,6 @@ static int ti_st_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
|
|||
pkt_type = hci_skb_pkt_type(skb);
|
||||
len = hst->st_write(skb);
|
||||
if (len < 0) {
|
||||
kfree_skb(skb);
|
||||
BT_ERR("ST write failed (%ld)", len);
|
||||
/* Try Again, would only fail if UART has gone bad */
|
||||
return -EAGAIN;
|
||||
|
|
|
|||
|
|
@ -226,7 +226,7 @@ static void dtl1_receive(struct dtl1_info *info)
|
|||
}
|
||||
}
|
||||
|
||||
*skb_put(info->rx_skb, 1) = inb(iobase + UART_RX);
|
||||
skb_put_u8(info->rx_skb, inb(iobase + UART_RX));
|
||||
nsh = (struct nsh *)info->rx_skb->data;
|
||||
|
||||
info->rx_count--;
|
||||
|
|
@ -414,7 +414,7 @@ static int dtl1_hci_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
|
|||
skb_reserve(s, NSHL);
|
||||
skb_copy_from_linear_data(skb, skb_put(s, skb->len), skb->len);
|
||||
if (skb->len & 0x0001)
|
||||
*skb_put(s, 1) = 0; /* PAD */
|
||||
skb_put_u8(s, 0); /* PAD */
|
||||
|
||||
/* Prepend skb with Nokia frame header and queue */
|
||||
memcpy(skb_push(s, NSHL), &nsh, NSHL);
|
||||
|
|
|
|||
|
|
@ -262,9 +262,9 @@ static int bcm_set_diag(struct hci_dev *hdev, bool enable)
|
|||
if (!skb)
|
||||
return -ENOMEM;
|
||||
|
||||
*skb_put(skb, 1) = BCM_LM_DIAG_PKT;
|
||||
*skb_put(skb, 1) = 0xf0;
|
||||
*skb_put(skb, 1) = enable;
|
||||
skb_put_u8(skb, BCM_LM_DIAG_PKT);
|
||||
skb_put_u8(skb, 0xf0);
|
||||
skb_put_u8(skb, enable);
|
||||
|
||||
skb_queue_tail(&bcm->txq, skb);
|
||||
hci_uart_tx_wakeup(hu);
|
||||
|
|
@ -419,8 +419,7 @@ finalize:
|
|||
if (err)
|
||||
return err;
|
||||
|
||||
err = bcm_request_irq(bcm);
|
||||
if (!err)
|
||||
if (!bcm_request_irq(bcm))
|
||||
err = bcm_setup_sleep(hu);
|
||||
|
||||
return err;
|
||||
|
|
@ -657,6 +656,15 @@ static const struct dmi_system_id bcm_wrong_irq_dmi_table[] = {
|
|||
},
|
||||
.driver_data = &acpi_active_low,
|
||||
},
|
||||
{
|
||||
.ident = "Asus T100CHI",
|
||||
.matches = {
|
||||
DMI_EXACT_MATCH(DMI_SYS_VENDOR,
|
||||
"ASUSTeK COMPUTER INC."),
|
||||
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T100CHI"),
|
||||
},
|
||||
.driver_data = &acpi_active_low,
|
||||
},
|
||||
{ /* Handle ThinkPad 8 tablets with BCM2E55 chipset ACPI ID */
|
||||
.ident = "Lenovo ThinkPad 8",
|
||||
.matches = {
|
||||
|
|
@ -762,8 +770,7 @@ static int bcm_acpi_probe(struct bcm_device *dev)
|
|||
if (id)
|
||||
gpio_mapping = (const struct acpi_gpio_mapping *) id->driver_data;
|
||||
|
||||
ret = acpi_dev_add_driver_gpios(ACPI_COMPANION(&pdev->dev),
|
||||
gpio_mapping);
|
||||
ret = devm_acpi_dev_add_driver_gpios(&pdev->dev, gpio_mapping);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
|
|
@ -834,8 +841,6 @@ static int bcm_remove(struct platform_device *pdev)
|
|||
list_del(&dev->list);
|
||||
mutex_unlock(&bcm_device_lock);
|
||||
|
||||
acpi_dev_remove_driver_gpios(ACPI_COMPANION(&pdev->dev));
|
||||
|
||||
dev_info(&pdev->dev, "%s device unregistered.\n", dev->name);
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@ static void bcsp_slip_msgdelim(struct sk_buff *skb)
|
|||
{
|
||||
const char pkt_delim = 0xc0;
|
||||
|
||||
memcpy(skb_put(skb, 1), &pkt_delim, 1);
|
||||
skb_put_data(skb, &pkt_delim, 1);
|
||||
}
|
||||
|
||||
static void bcsp_slip_one_byte(struct sk_buff *skb, u8 c)
|
||||
|
|
@ -135,13 +135,13 @@ static void bcsp_slip_one_byte(struct sk_buff *skb, u8 c)
|
|||
|
||||
switch (c) {
|
||||
case 0xc0:
|
||||
memcpy(skb_put(skb, 2), &esc_c0, 2);
|
||||
skb_put_data(skb, &esc_c0, 2);
|
||||
break;
|
||||
case 0xdb:
|
||||
memcpy(skb_put(skb, 2), &esc_db, 2);
|
||||
skb_put_data(skb, &esc_db, 2);
|
||||
break;
|
||||
default:
|
||||
memcpy(skb_put(skb, 1), &c, 1);
|
||||
skb_put_data(skb, &c, 1);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -423,7 +423,7 @@ static void bcsp_handle_le_pkt(struct hci_uart *hu)
|
|||
BT_DBG("Found a LE conf pkt");
|
||||
if (!nskb)
|
||||
return;
|
||||
memcpy(skb_put(nskb, 4), conf_rsp_pkt, 4);
|
||||
skb_put_data(nskb, conf_rsp_pkt, 4);
|
||||
hci_skb_pkt_type(nskb) = BCSP_LE_PKT;
|
||||
|
||||
skb_queue_head(&bcsp->unrel, nskb);
|
||||
|
|
@ -447,7 +447,7 @@ static inline void bcsp_unslip_one_byte(struct bcsp_struct *bcsp, unsigned char
|
|||
bcsp->rx_esc_state = BCSP_ESCSTATE_ESC;
|
||||
break;
|
||||
default:
|
||||
memcpy(skb_put(bcsp->rx_skb, 1), &byte, 1);
|
||||
skb_put_data(bcsp->rx_skb, &byte, 1);
|
||||
if ((bcsp->rx_skb->data[0] & 0x40) != 0 &&
|
||||
bcsp->rx_state != BCSP_W4_CRC)
|
||||
bcsp_crc_update(&bcsp->message_crc, byte);
|
||||
|
|
@ -458,7 +458,7 @@ static inline void bcsp_unslip_one_byte(struct bcsp_struct *bcsp, unsigned char
|
|||
case BCSP_ESCSTATE_ESC:
|
||||
switch (byte) {
|
||||
case 0xdc:
|
||||
memcpy(skb_put(bcsp->rx_skb, 1), &c0, 1);
|
||||
skb_put_data(bcsp->rx_skb, &c0, 1);
|
||||
if ((bcsp->rx_skb->data[0] & 0x40) != 0 &&
|
||||
bcsp->rx_state != BCSP_W4_CRC)
|
||||
bcsp_crc_update(&bcsp->message_crc, 0xc0);
|
||||
|
|
@ -467,7 +467,7 @@ static inline void bcsp_unslip_one_byte(struct bcsp_struct *bcsp, unsigned char
|
|||
break;
|
||||
|
||||
case 0xdd:
|
||||
memcpy(skb_put(bcsp->rx_skb, 1), &db, 1);
|
||||
skb_put_data(bcsp->rx_skb, &db, 1);
|
||||
if ((bcsp->rx_skb->data[0] & 0x40) != 0 &&
|
||||
bcsp->rx_state != BCSP_W4_CRC)
|
||||
bcsp_crc_update(&bcsp->message_crc, 0xdb);
|
||||
|
|
|
|||
|
|
@ -209,7 +209,7 @@ struct sk_buff *h4_recv_buf(struct hci_dev *hdev, struct sk_buff *skb,
|
|||
}
|
||||
|
||||
len = min_t(uint, hci_skb_expect(skb) - skb->len, count);
|
||||
memcpy(skb_put(skb, len), buffer, len);
|
||||
skb_put_data(skb, buffer, len);
|
||||
|
||||
count -= len;
|
||||
buffer += len;
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@ static void h5_link_control(struct hci_uart *hu, const void *data, size_t len)
|
|||
|
||||
hci_skb_pkt_type(nskb) = HCI_3WIRE_LINK_PKT;
|
||||
|
||||
memcpy(skb_put(nskb, len), data, len);
|
||||
skb_put_data(nskb, data, len);
|
||||
|
||||
skb_queue_tail(&h5->unrel, nskb);
|
||||
}
|
||||
|
|
@ -487,7 +487,7 @@ static void h5_unslip_one_byte(struct h5 *h5, unsigned char c)
|
|||
}
|
||||
}
|
||||
|
||||
memcpy(skb_put(h5->rx_skb, 1), byte, 1);
|
||||
skb_put_data(h5->rx_skb, byte, 1);
|
||||
h5->rx_pending--;
|
||||
|
||||
BT_DBG("unsliped 0x%02hhx, rx_pending %zu", *byte, h5->rx_pending);
|
||||
|
|
@ -579,7 +579,7 @@ static void h5_slip_delim(struct sk_buff *skb)
|
|||
{
|
||||
const char delim = SLIP_DELIMITER;
|
||||
|
||||
memcpy(skb_put(skb, 1), &delim, 1);
|
||||
skb_put_data(skb, &delim, 1);
|
||||
}
|
||||
|
||||
static void h5_slip_one_byte(struct sk_buff *skb, u8 c)
|
||||
|
|
@ -589,13 +589,13 @@ static void h5_slip_one_byte(struct sk_buff *skb, u8 c)
|
|||
|
||||
switch (c) {
|
||||
case SLIP_DELIMITER:
|
||||
memcpy(skb_put(skb, 2), &esc_delim, 2);
|
||||
skb_put_data(skb, &esc_delim, 2);
|
||||
break;
|
||||
case SLIP_ESC:
|
||||
memcpy(skb_put(skb, 2), &esc_esc, 2);
|
||||
skb_put_data(skb, &esc_esc, 2);
|
||||
break;
|
||||
default:
|
||||
memcpy(skb_put(skb, 1), &c, 1);
|
||||
skb_put_data(skb, &c, 1);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -185,7 +185,7 @@ static int intel_lpm_suspend(struct hci_uart *hu)
|
|||
return -ENOMEM;
|
||||
}
|
||||
|
||||
memcpy(skb_put(skb, sizeof(suspend)), suspend, sizeof(suspend));
|
||||
skb_put_data(skb, suspend, sizeof(suspend));
|
||||
hci_skb_pkt_type(skb) = HCI_LPM_PKT;
|
||||
|
||||
set_bit(STATE_LPM_TRANSACTION, &intel->flags);
|
||||
|
|
@ -270,8 +270,7 @@ static int intel_lpm_host_wake(struct hci_uart *hu)
|
|||
return -ENOMEM;
|
||||
}
|
||||
|
||||
memcpy(skb_put(skb, sizeof(lpm_resume_ack)), lpm_resume_ack,
|
||||
sizeof(lpm_resume_ack));
|
||||
skb_put_data(skb, lpm_resume_ack, sizeof(lpm_resume_ack));
|
||||
hci_skb_pkt_type(skb) = HCI_LPM_PKT;
|
||||
|
||||
/* LPM flow is a priority, enqueue packet at list head */
|
||||
|
|
@ -463,15 +462,15 @@ static int inject_cmd_complete(struct hci_dev *hdev, __u16 opcode)
|
|||
if (!skb)
|
||||
return -ENOMEM;
|
||||
|
||||
hdr = (struct hci_event_hdr *)skb_put(skb, sizeof(*hdr));
|
||||
hdr = skb_put(skb, sizeof(*hdr));
|
||||
hdr->evt = HCI_EV_CMD_COMPLETE;
|
||||
hdr->plen = sizeof(*evt) + 1;
|
||||
|
||||
evt = (struct hci_ev_cmd_complete *)skb_put(skb, sizeof(*evt));
|
||||
evt = skb_put(skb, sizeof(*evt));
|
||||
evt->ncmd = 0x01;
|
||||
evt->opcode = cpu_to_le16(opcode);
|
||||
|
||||
*skb_put(skb, 1) = 0x00;
|
||||
skb_put_u8(skb, 0x00);
|
||||
|
||||
hci_skb_pkt_type(skb) = HCI_EVENT_PKT;
|
||||
|
||||
|
|
@ -522,7 +521,7 @@ static int intel_set_baudrate(struct hci_uart *hu, unsigned int speed)
|
|||
return -ENOMEM;
|
||||
}
|
||||
|
||||
memcpy(skb_put(skb, sizeof(speed_cmd)), speed_cmd, sizeof(speed_cmd));
|
||||
skb_put_data(skb, speed_cmd, sizeof(speed_cmd));
|
||||
hci_skb_pkt_type(skb) = HCI_COMMAND_PKT;
|
||||
|
||||
hci_uart_set_flow_control(hu, true);
|
||||
|
|
@ -1205,9 +1204,19 @@ static const struct dev_pm_ops intel_pm_ops = {
|
|||
SET_RUNTIME_PM_OPS(intel_suspend_device, intel_resume_device, NULL)
|
||||
};
|
||||
|
||||
static const struct acpi_gpio_params reset_gpios = { 0, 0, false };
|
||||
static const struct acpi_gpio_params host_wake_gpios = { 1, 0, false };
|
||||
|
||||
static const struct acpi_gpio_mapping acpi_hci_intel_gpios[] = {
|
||||
{ "reset-gpios", &reset_gpios, 1 },
|
||||
{ "host-wake-gpios", &host_wake_gpios, 1 },
|
||||
{ },
|
||||
};
|
||||
|
||||
static int intel_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct intel_device *idev;
|
||||
int ret;
|
||||
|
||||
idev = devm_kzalloc(&pdev->dev, sizeof(*idev), GFP_KERNEL);
|
||||
if (!idev)
|
||||
|
|
@ -1217,6 +1226,10 @@ static int intel_probe(struct platform_device *pdev)
|
|||
|
||||
idev->pdev = pdev;
|
||||
|
||||
ret = devm_acpi_dev_add_driver_gpios(&pdev->dev, acpi_hci_intel_gpios);
|
||||
if (ret)
|
||||
dev_dbg(&pdev->dev, "Unable to add GPIO mapping table\n");
|
||||
|
||||
idev->reset = devm_gpiod_get(&pdev->dev, "reset", GPIOD_OUT_LOW);
|
||||
if (IS_ERR(idev->reset)) {
|
||||
dev_err(&pdev->dev, "Unable to retrieve gpio\n");
|
||||
|
|
|
|||
|
|
@ -114,8 +114,12 @@ static inline struct sk_buff *hci_uart_dequeue(struct hci_uart *hu)
|
|||
struct sk_buff *skb = hu->tx_skb;
|
||||
|
||||
if (!skb) {
|
||||
read_lock(&hu->proto_lock);
|
||||
|
||||
if (test_bit(HCI_UART_PROTO_READY, &hu->flags))
|
||||
skb = hu->proto->dequeue(hu);
|
||||
|
||||
read_unlock(&hu->proto_lock);
|
||||
} else {
|
||||
hu->tx_skb = NULL;
|
||||
}
|
||||
|
|
@ -125,18 +129,23 @@ static inline struct sk_buff *hci_uart_dequeue(struct hci_uart *hu)
|
|||
|
||||
int hci_uart_tx_wakeup(struct hci_uart *hu)
|
||||
{
|
||||
read_lock(&hu->proto_lock);
|
||||
|
||||
if (!test_bit(HCI_UART_PROTO_READY, &hu->flags))
|
||||
return 0;
|
||||
goto no_schedule;
|
||||
|
||||
if (test_and_set_bit(HCI_UART_SENDING, &hu->tx_state)) {
|
||||
set_bit(HCI_UART_TX_WAKEUP, &hu->tx_state);
|
||||
return 0;
|
||||
goto no_schedule;
|
||||
}
|
||||
|
||||
BT_DBG("");
|
||||
|
||||
schedule_work(&hu->write_work);
|
||||
|
||||
no_schedule:
|
||||
read_unlock(&hu->proto_lock);
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(hci_uart_tx_wakeup);
|
||||
|
|
@ -237,9 +246,13 @@ static int hci_uart_flush(struct hci_dev *hdev)
|
|||
tty_ldisc_flush(tty);
|
||||
tty_driver_flush_buffer(tty);
|
||||
|
||||
read_lock(&hu->proto_lock);
|
||||
|
||||
if (test_bit(HCI_UART_PROTO_READY, &hu->flags))
|
||||
hu->proto->flush(hu);
|
||||
|
||||
read_unlock(&hu->proto_lock);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -261,10 +274,15 @@ static int hci_uart_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
|
|||
BT_DBG("%s: type %d len %d", hdev->name, hci_skb_pkt_type(skb),
|
||||
skb->len);
|
||||
|
||||
if (!test_bit(HCI_UART_PROTO_READY, &hu->flags))
|
||||
read_lock(&hu->proto_lock);
|
||||
|
||||
if (!test_bit(HCI_UART_PROTO_READY, &hu->flags)) {
|
||||
read_unlock(&hu->proto_lock);
|
||||
return -EUNATCH;
|
||||
}
|
||||
|
||||
hu->proto->enqueue(hu, skb);
|
||||
read_unlock(&hu->proto_lock);
|
||||
|
||||
hci_uart_tx_wakeup(hu);
|
||||
|
||||
|
|
@ -460,6 +478,8 @@ static int hci_uart_tty_open(struct tty_struct *tty)
|
|||
INIT_WORK(&hu->init_ready, hci_uart_init_work);
|
||||
INIT_WORK(&hu->write_work, hci_uart_write_work);
|
||||
|
||||
rwlock_init(&hu->proto_lock);
|
||||
|
||||
/* Flush any pending characters in the driver */
|
||||
tty_driver_flush_buffer(tty);
|
||||
|
||||
|
|
@ -475,6 +495,7 @@ static void hci_uart_tty_close(struct tty_struct *tty)
|
|||
{
|
||||
struct hci_uart *hu = tty->disc_data;
|
||||
struct hci_dev *hdev;
|
||||
unsigned long flags;
|
||||
|
||||
BT_DBG("tty %p", tty);
|
||||
|
||||
|
|
@ -490,7 +511,11 @@ static void hci_uart_tty_close(struct tty_struct *tty)
|
|||
|
||||
cancel_work_sync(&hu->write_work);
|
||||
|
||||
if (test_and_clear_bit(HCI_UART_PROTO_READY, &hu->flags)) {
|
||||
if (test_bit(HCI_UART_PROTO_READY, &hu->flags)) {
|
||||
write_lock_irqsave(&hu->proto_lock, flags);
|
||||
clear_bit(HCI_UART_PROTO_READY, &hu->flags);
|
||||
write_unlock_irqrestore(&hu->proto_lock, flags);
|
||||
|
||||
if (hdev) {
|
||||
if (test_bit(HCI_UART_REGISTERED, &hu->flags))
|
||||
hci_unregister_dev(hdev);
|
||||
|
|
@ -549,13 +574,18 @@ static void hci_uart_tty_receive(struct tty_struct *tty, const u8 *data,
|
|||
if (!hu || tty != hu->tty)
|
||||
return;
|
||||
|
||||
if (!test_bit(HCI_UART_PROTO_READY, &hu->flags))
|
||||
read_lock(&hu->proto_lock);
|
||||
|
||||
if (!test_bit(HCI_UART_PROTO_READY, &hu->flags)) {
|
||||
read_unlock(&hu->proto_lock);
|
||||
return;
|
||||
}
|
||||
|
||||
/* It does not need a lock here as it is already protected by a mutex in
|
||||
* tty caller
|
||||
*/
|
||||
hu->proto->recv(hu, data, count);
|
||||
read_unlock(&hu->proto_lock);
|
||||
|
||||
if (hu->hdev)
|
||||
hu->hdev->stat.byte_rx += count;
|
||||
|
|
|
|||
|
|
@ -48,6 +48,7 @@
|
|||
#include <linux/serdev.h>
|
||||
#include <linux/skbuff.h>
|
||||
#include <linux/ti_wilink_st.h>
|
||||
#include <linux/clk.h>
|
||||
|
||||
#include <net/bluetooth/bluetooth.h>
|
||||
#include <net/bluetooth/hci_core.h>
|
||||
|
|
@ -84,6 +85,7 @@ struct ll_device {
|
|||
struct hci_uart hu;
|
||||
struct serdev_device *serdev;
|
||||
struct gpio_desc *enable_gpio;
|
||||
struct clk *ext_clk;
|
||||
};
|
||||
|
||||
struct ll_struct {
|
||||
|
|
@ -118,7 +120,7 @@ static int send_hcill_cmd(u8 cmd, struct hci_uart *hu)
|
|||
}
|
||||
|
||||
/* prepare packet */
|
||||
hcill_packet = (struct hcill_cmd *) skb_put(skb, 1);
|
||||
hcill_packet = skb_put(skb, 1);
|
||||
hcill_packet->cmd = cmd;
|
||||
|
||||
/* send packet */
|
||||
|
|
@ -146,8 +148,12 @@ static int ll_open(struct hci_uart *hu)
|
|||
|
||||
hu->priv = ll;
|
||||
|
||||
if (hu->serdev)
|
||||
if (hu->serdev) {
|
||||
struct ll_device *lldev = serdev_device_get_drvdata(hu->serdev);
|
||||
serdev_device_open(hu->serdev);
|
||||
if (!IS_ERR(lldev->ext_clk))
|
||||
clk_prepare_enable(lldev->ext_clk);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -181,6 +187,8 @@ static int ll_close(struct hci_uart *hu)
|
|||
struct ll_device *lldev = serdev_device_get_drvdata(hu->serdev);
|
||||
gpiod_set_value_cansleep(lldev->enable_gpio, 0);
|
||||
|
||||
clk_disable_unprepare(lldev->ext_clk);
|
||||
|
||||
serdev_device_close(hu->serdev);
|
||||
}
|
||||
|
||||
|
|
@ -405,7 +413,7 @@ static int ll_recv(struct hci_uart *hu, const void *data, int count)
|
|||
while (count) {
|
||||
if (ll->rx_count) {
|
||||
len = min_t(unsigned int, ll->rx_count, count);
|
||||
memcpy(skb_put(ll->rx_skb, len), ptr, len);
|
||||
skb_put_data(ll->rx_skb, ptr, len);
|
||||
ll->rx_count -= len; count -= len; ptr += len;
|
||||
|
||||
if (ll->rx_count)
|
||||
|
|
@ -624,6 +632,7 @@ static int download_firmware(struct ll_device *lldev)
|
|||
skb = __hci_cmd_sync(lldev->hu.hdev, cmd->opcode, cmd->plen, &cmd->speed, HCI_INIT_TIMEOUT);
|
||||
if (IS_ERR(skb)) {
|
||||
bt_dev_err(lldev->hu.hdev, "send command failed\n");
|
||||
err = PTR_ERR(skb);
|
||||
goto out_rel_fw;
|
||||
}
|
||||
kfree_skb(skb);
|
||||
|
|
@ -720,6 +729,10 @@ static int hci_ti_probe(struct serdev_device *serdev)
|
|||
if (IS_ERR(lldev->enable_gpio))
|
||||
return PTR_ERR(lldev->enable_gpio);
|
||||
|
||||
lldev->ext_clk = devm_clk_get(&serdev->dev, "ext_clock");
|
||||
if (IS_ERR(lldev->ext_clk) && PTR_ERR(lldev->ext_clk) != -ENOENT)
|
||||
return PTR_ERR(lldev->ext_clk);
|
||||
|
||||
of_property_read_u32(serdev->dev.of_node, "max-speed", &max_speed);
|
||||
hci_uart_set_speeds(hu, 115200, max_speed);
|
||||
|
||||
|
|
@ -740,6 +753,14 @@ static void hci_ti_remove(struct serdev_device *serdev)
|
|||
}
|
||||
|
||||
static const struct of_device_id hci_ti_of_match[] = {
|
||||
{ .compatible = "ti,wl1271-st" },
|
||||
{ .compatible = "ti,wl1273-st" },
|
||||
{ .compatible = "ti,wl1281-st" },
|
||||
{ .compatible = "ti,wl1283-st" },
|
||||
{ .compatible = "ti,wl1285-st" },
|
||||
{ .compatible = "ti,wl1801-st" },
|
||||
{ .compatible = "ti,wl1805-st" },
|
||||
{ .compatible = "ti,wl1807-st" },
|
||||
{ .compatible = "ti,wl1831-st" },
|
||||
{ .compatible = "ti,wl1835-st" },
|
||||
{ .compatible = "ti,wl1837-st" },
|
||||
|
|
|
|||
|
|
@ -328,7 +328,7 @@ static int mrvl_load_firmware(struct hci_dev *hdev, const char *name)
|
|||
}
|
||||
bt_cb(skb)->pkt_type = MRVL_RAW_DATA;
|
||||
|
||||
memcpy(skb_put(skb, mrvl->tx_len), fw_ptr, mrvl->tx_len);
|
||||
skb_put_data(skb, fw_ptr, mrvl->tx_len);
|
||||
fw_ptr += mrvl->tx_len;
|
||||
|
||||
set_bit(STATE_FW_REQ_PENDING, &mrvl->flags);
|
||||
|
|
|
|||
|
|
@ -246,9 +246,9 @@ static int nokia_send_alive_packet(struct hci_uart *hu)
|
|||
hci_skb_pkt_type(skb) = HCI_NOKIA_ALIVE_PKT;
|
||||
memset(skb->data, 0x00, len);
|
||||
|
||||
hdr = (struct hci_nokia_alive_hdr *)skb_put(skb, sizeof(*hdr));
|
||||
hdr = skb_put(skb, sizeof(*hdr));
|
||||
hdr->dlen = sizeof(*pkt);
|
||||
pkt = (struct hci_nokia_alive_pkt *)skb_put(skb, sizeof(*pkt));
|
||||
pkt = skb_put(skb, sizeof(*pkt));
|
||||
pkt->mid = NOKIA_ALIVE_REQ;
|
||||
|
||||
nokia_enqueue(hu, skb);
|
||||
|
|
@ -285,10 +285,10 @@ static int nokia_send_negotiation(struct hci_uart *hu)
|
|||
|
||||
hci_skb_pkt_type(skb) = HCI_NOKIA_NEG_PKT;
|
||||
|
||||
neg_hdr = (struct hci_nokia_neg_hdr *)skb_put(skb, sizeof(*neg_hdr));
|
||||
neg_hdr = skb_put(skb, sizeof(*neg_hdr));
|
||||
neg_hdr->dlen = sizeof(*neg_cmd);
|
||||
|
||||
neg_cmd = (struct hci_nokia_neg_cmd *)skb_put(skb, sizeof(*neg_cmd));
|
||||
neg_cmd = skb_put(skb, sizeof(*neg_cmd));
|
||||
neg_cmd->ack = NOKIA_NEG_REQ;
|
||||
neg_cmd->baud = cpu_to_le16(baud);
|
||||
neg_cmd->unused1 = 0x0000;
|
||||
|
|
@ -532,7 +532,7 @@ static int nokia_enqueue(struct hci_uart *hu, struct sk_buff *skb)
|
|||
err = skb_pad(skb, 1);
|
||||
if (err)
|
||||
return err;
|
||||
*skb_put(skb, 1) = 0x00;
|
||||
skb_put_u8(skb, 0x00);
|
||||
}
|
||||
|
||||
skb_queue_tail(&btdev->txq, skb);
|
||||
|
|
@ -557,7 +557,7 @@ static int nokia_recv_negotiation_packet(struct hci_dev *hdev,
|
|||
goto finish_neg;
|
||||
}
|
||||
|
||||
evt = (struct hci_nokia_neg_evt *)skb_pull(skb, sizeof(*hdr));
|
||||
evt = skb_pull(skb, sizeof(*hdr));
|
||||
|
||||
if (evt->ack != NOKIA_NEG_ACK) {
|
||||
dev_err(dev, "Negotiation received: wrong reply");
|
||||
|
|
@ -595,7 +595,7 @@ static int nokia_recv_alive_packet(struct hci_dev *hdev, struct sk_buff *skb)
|
|||
goto finish_alive;
|
||||
}
|
||||
|
||||
pkt = (struct hci_nokia_alive_pkt *)skb_pull(skb, sizeof(*hdr));
|
||||
pkt = skb_pull(skb, sizeof(*hdr));
|
||||
|
||||
if (pkt->mid != NOKIA_ALIVE_RESP) {
|
||||
dev_err(dev, "Alive received: invalid response: 0x%02x!",
|
||||
|
|
|
|||
|
|
@ -215,7 +215,7 @@ static int send_hci_ibs_cmd(u8 cmd, struct hci_uart *hu)
|
|||
}
|
||||
|
||||
/* Assign HCI_IBS type */
|
||||
*skb_put(skb, 1) = cmd;
|
||||
skb_put_u8(skb, cmd);
|
||||
|
||||
skb_queue_tail(&qca->txq, skb);
|
||||
|
||||
|
|
@ -869,7 +869,7 @@ static int qca_set_baudrate(struct hci_dev *hdev, uint8_t baudrate)
|
|||
}
|
||||
|
||||
/* Assign commands to change baudrate and packet type. */
|
||||
memcpy(skb_put(skb, sizeof(cmd)), cmd, sizeof(cmd));
|
||||
skb_put_data(skb, cmd, sizeof(cmd));
|
||||
hci_skb_pkt_type(skb) = HCI_COMMAND_PKT;
|
||||
|
||||
skb_queue_tail(&qca->txq, skb);
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
|
||||
#include "hci_uart.h"
|
||||
|
||||
struct serdev_device_ops hci_serdev_client_ops;
|
||||
static struct serdev_device_ops hci_serdev_client_ops;
|
||||
|
||||
static inline void hci_uart_tx_complete(struct hci_uart *hu, int pkt_type)
|
||||
{
|
||||
|
|
@ -268,7 +268,7 @@ static int hci_uart_receive_buf(struct serdev_device *serdev, const u8 *data,
|
|||
return count;
|
||||
}
|
||||
|
||||
struct serdev_device_ops hci_serdev_client_ops = {
|
||||
static struct serdev_device_ops hci_serdev_client_ops = {
|
||||
.receive_buf = hci_uart_receive_buf,
|
||||
.write_wakeup = hci_uart_write_wakeup,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -87,6 +87,7 @@ struct hci_uart {
|
|||
struct work_struct write_work;
|
||||
|
||||
const struct hci_uart_proto *proto;
|
||||
rwlock_t proto_lock; /* Stop work for proto close */
|
||||
void *priv;
|
||||
|
||||
struct sk_buff *tx_skb;
|
||||
|
|
|
|||
|
|
@ -146,8 +146,8 @@ static int __vhci_create_device(struct vhci_data *data, __u8 opcode)
|
|||
|
||||
hci_skb_pkt_type(skb) = HCI_VENDOR_PKT;
|
||||
|
||||
*skb_put(skb, 1) = 0xff;
|
||||
*skb_put(skb, 1) = opcode;
|
||||
skb_put_u8(skb, 0xff);
|
||||
skb_put_u8(skb, opcode);
|
||||
put_unaligned_le16(hdev->id, skb_put(skb, 2));
|
||||
skb_queue_tail(&data->readq, skb);
|
||||
|
||||
|
|
|
|||
|
|
@ -4235,7 +4235,7 @@ static void hdlcdev_rx(MGSLPC_INFO *info, char *buf, int size)
|
|||
return;
|
||||
}
|
||||
|
||||
memcpy(skb_put(skb, size), buf, size);
|
||||
skb_put_data(skb, buf, size);
|
||||
|
||||
skb->protocol = hdlc_type_trans(skb, dev);
|
||||
|
||||
|
|
|
|||
|
|
@ -655,8 +655,7 @@ static struct sk_buff *create_cipher_wr(struct cipher_wr_param *wrparam)
|
|||
goto err;
|
||||
}
|
||||
skb_reserve(skb, sizeof(struct sge_opaque_hdr));
|
||||
chcr_req = (struct chcr_wr *)__skb_put(skb, transhdr_len);
|
||||
memset(chcr_req, 0, transhdr_len);
|
||||
chcr_req = __skb_put_zero(skb, transhdr_len);
|
||||
chcr_req->sec_cpl.op_ivinsrtofst =
|
||||
FILL_SEC_CPL_OP_IVINSR(ctx->dev->rx_channel_id, 2, 1);
|
||||
|
||||
|
|
@ -1371,8 +1370,7 @@ static struct sk_buff *create_hash_wr(struct ahash_request *req,
|
|||
return skb;
|
||||
|
||||
skb_reserve(skb, sizeof(struct sge_opaque_hdr));
|
||||
chcr_req = (struct chcr_wr *)__skb_put(skb, transhdr_len);
|
||||
memset(chcr_req, 0, transhdr_len);
|
||||
chcr_req = __skb_put_zero(skb, transhdr_len);
|
||||
|
||||
chcr_req->sec_cpl.op_ivinsrtofst =
|
||||
FILL_SEC_CPL_OP_IVINSR(ctx->dev->rx_channel_id, 2, 0);
|
||||
|
|
@ -2015,8 +2013,7 @@ static struct sk_buff *create_authenc_wr(struct aead_request *req,
|
|||
skb_reserve(skb, sizeof(struct sge_opaque_hdr));
|
||||
|
||||
/* Write WR */
|
||||
chcr_req = (struct chcr_wr *) __skb_put(skb, transhdr_len);
|
||||
memset(chcr_req, 0, transhdr_len);
|
||||
chcr_req = __skb_put_zero(skb, transhdr_len);
|
||||
|
||||
stop_offset = (op_type == CHCR_ENCRYPT_OP) ? 0 : authsize;
|
||||
|
||||
|
|
@ -2367,8 +2364,7 @@ static struct sk_buff *create_aead_ccm_wr(struct aead_request *req,
|
|||
|
||||
skb_reserve(skb, sizeof(struct sge_opaque_hdr));
|
||||
|
||||
chcr_req = (struct chcr_wr *) __skb_put(skb, transhdr_len);
|
||||
memset(chcr_req, 0, transhdr_len);
|
||||
chcr_req = __skb_put_zero(skb, transhdr_len);
|
||||
|
||||
fill_sec_cpl_for_aead(&chcr_req->sec_cpl, dst_size, req, op_type, ctx);
|
||||
|
||||
|
|
@ -2496,8 +2492,7 @@ static struct sk_buff *create_gcm_wr(struct aead_request *req,
|
|||
/* NIC driver is going to write the sge hdr. */
|
||||
skb_reserve(skb, sizeof(struct sge_opaque_hdr));
|
||||
|
||||
chcr_req = (struct chcr_wr *)__skb_put(skb, transhdr_len);
|
||||
memset(chcr_req, 0, transhdr_len);
|
||||
chcr_req = __skb_put_zero(skb, transhdr_len);
|
||||
|
||||
if (get_aead_subtype(tfm) == CRYPTO_ALG_SUB_TYPE_AEAD_RFC4106)
|
||||
assoclen = req->assoclen - 8;
|
||||
|
|
|
|||
|
|
@ -219,7 +219,7 @@ static int fwnet_header_create(struct sk_buff *skb, struct net_device *net,
|
|||
{
|
||||
struct fwnet_header *h;
|
||||
|
||||
h = (struct fwnet_header *)skb_push(skb, sizeof(*h));
|
||||
h = skb_push(skb, sizeof(*h));
|
||||
put_unaligned_be16(type, &h->h_proto);
|
||||
|
||||
if (net->flags & (IFF_LOOPBACK | IFF_NOARP)) {
|
||||
|
|
@ -600,7 +600,7 @@ static int fwnet_incoming_packet(struct fwnet_device *dev, __be32 *buf, int len,
|
|||
return -ENOMEM;
|
||||
}
|
||||
skb_reserve(skb, LL_RESERVED_SPACE(net));
|
||||
memcpy(skb_put(skb, len), buf, len);
|
||||
skb_put_data(skb, buf, len);
|
||||
|
||||
return fwnet_finish_incoming_packet(net, skb, source_node_id,
|
||||
is_broadcast, ether_type);
|
||||
|
|
@ -961,16 +961,14 @@ static int fwnet_send_packet(struct fwnet_packet_task *ptask)
|
|||
tx_len = ptask->max_payload;
|
||||
switch (fwnet_get_hdr_lf(&ptask->hdr)) {
|
||||
case RFC2374_HDR_UNFRAG:
|
||||
bufhdr = (struct rfc2734_header *)
|
||||
skb_push(ptask->skb, RFC2374_UNFRAG_HDR_SIZE);
|
||||
bufhdr = skb_push(ptask->skb, RFC2374_UNFRAG_HDR_SIZE);
|
||||
put_unaligned_be32(ptask->hdr.w0, &bufhdr->w0);
|
||||
break;
|
||||
|
||||
case RFC2374_HDR_FIRSTFRAG:
|
||||
case RFC2374_HDR_INTFRAG:
|
||||
case RFC2374_HDR_LASTFRAG:
|
||||
bufhdr = (struct rfc2734_header *)
|
||||
skb_push(ptask->skb, RFC2374_FRAG_HDR_SIZE);
|
||||
bufhdr = skb_push(ptask->skb, RFC2374_FRAG_HDR_SIZE);
|
||||
put_unaligned_be32(ptask->hdr.w0, &bufhdr->w0);
|
||||
put_unaligned_be32(ptask->hdr.w1, &bufhdr->w1);
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -179,8 +179,7 @@ static int ib_nl_ip_send_msg(struct rdma_dev_addr *dev_addr,
|
|||
}
|
||||
|
||||
/* Construct the family header first */
|
||||
header = (struct rdma_ls_ip_resolve_header *)
|
||||
skb_put(skb, NLMSG_ALIGN(sizeof(*header)));
|
||||
header = skb_put(skb, NLMSG_ALIGN(sizeof(*header)));
|
||||
header->ifindex = dev_addr->bound_dev_if;
|
||||
nla_put(skb, attrtype, size, daddr);
|
||||
|
||||
|
|
|
|||
|
|
@ -759,8 +759,7 @@ static void ib_nl_set_path_rec_attrs(struct sk_buff *skb,
|
|||
query->mad_buf->context[1] = NULL;
|
||||
|
||||
/* Construct the family header first */
|
||||
header = (struct rdma_ls_resolve_header *)
|
||||
skb_put(skb, NLMSG_ALIGN(sizeof(*header)));
|
||||
header = skb_put(skb, NLMSG_ALIGN(sizeof(*header)));
|
||||
memcpy(header->device_name, query->port->agent->device->name,
|
||||
LS_DEVICE_NAME_MAX);
|
||||
header->port_num = query->port->port_num;
|
||||
|
|
|
|||
|
|
@ -142,8 +142,7 @@ static int cxio_hal_clear_qp_ctx(struct cxio_rdev *rdev_p, u32 qpid)
|
|||
pr_debug("%s alloc_skb failed\n", __func__);
|
||||
return -ENOMEM;
|
||||
}
|
||||
wqe = (struct t3_modify_qp_wr *) skb_put(skb, sizeof(*wqe));
|
||||
memset(wqe, 0, sizeof(*wqe));
|
||||
wqe = skb_put_zero(skb, sizeof(*wqe));
|
||||
build_fw_riwrh((struct fw_riwrh *) wqe, T3_WR_QP_MOD,
|
||||
T3_COMPLETION_FLAG | T3_NOTIFY_FLAG, 0, qpid, 7,
|
||||
T3_SOPEOP);
|
||||
|
|
@ -561,8 +560,7 @@ static int cxio_hal_init_ctrl_qp(struct cxio_rdev *rdev_p)
|
|||
ctx1 |= ((u64) (V_EC_BASE_HI((u32) base_addr & 0xf) | V_EC_RESPQ(0) |
|
||||
V_EC_TYPE(0) | V_EC_GEN(1) |
|
||||
V_EC_UP_TOKEN(T3_CTL_QP_TID) | F_EC_VALID)) << 32;
|
||||
wqe = (struct t3_modify_qp_wr *) skb_put(skb, sizeof(*wqe));
|
||||
memset(wqe, 0, sizeof(*wqe));
|
||||
wqe = skb_put_zero(skb, sizeof(*wqe));
|
||||
build_fw_riwrh((struct fw_riwrh *) wqe, T3_WR_QP_MOD, 0, 0,
|
||||
T3_CTL_QP_TID, 7, T3_SOPEOP);
|
||||
wqe->flags = cpu_to_be32(MODQP_WRITE_EC);
|
||||
|
|
@ -837,7 +835,7 @@ int cxio_rdma_init(struct cxio_rdev *rdev_p, struct t3_rdma_init_attr *attr)
|
|||
if (!skb)
|
||||
return -ENOMEM;
|
||||
pr_debug("%s rdev_p %p\n", __func__, rdev_p);
|
||||
wqe = (struct t3_rdma_init_wr *) __skb_put(skb, sizeof(*wqe));
|
||||
wqe = __skb_put(skb, sizeof(*wqe));
|
||||
wqe->wrh.op_seop_flags = cpu_to_be32(V_FW_RIWR_OP(T3_WR_INIT));
|
||||
wqe->wrh.gen_tid_len = cpu_to_be32(V_FW_RIWR_TID(attr->tid) |
|
||||
V_FW_RIWR_LEN(sizeof(*wqe) >> 3));
|
||||
|
|
|
|||
|
|
@ -175,7 +175,7 @@ static void release_tid(struct t3cdev *tdev, u32 hwtid, struct sk_buff *skb)
|
|||
skb = get_skb(skb, sizeof *req, GFP_KERNEL);
|
||||
if (!skb)
|
||||
return;
|
||||
req = (struct cpl_tid_release *) skb_put(skb, sizeof(*req));
|
||||
req = skb_put(skb, sizeof(*req));
|
||||
req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD));
|
||||
OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_TID_RELEASE, hwtid));
|
||||
skb->priority = CPL_PRIORITY_SETUP;
|
||||
|
|
@ -190,7 +190,7 @@ int iwch_quiesce_tid(struct iwch_ep *ep)
|
|||
|
||||
if (!skb)
|
||||
return -ENOMEM;
|
||||
req = (struct cpl_set_tcb_field *) skb_put(skb, sizeof(*req));
|
||||
req = skb_put(skb, sizeof(*req));
|
||||
req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD));
|
||||
req->wr.wr_lo = htonl(V_WR_TID(ep->hwtid));
|
||||
OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_SET_TCB_FIELD, ep->hwtid));
|
||||
|
|
@ -211,7 +211,7 @@ int iwch_resume_tid(struct iwch_ep *ep)
|
|||
|
||||
if (!skb)
|
||||
return -ENOMEM;
|
||||
req = (struct cpl_set_tcb_field *) skb_put(skb, sizeof(*req));
|
||||
req = skb_put(skb, sizeof(*req));
|
||||
req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD));
|
||||
req->wr.wr_lo = htonl(V_WR_TID(ep->hwtid));
|
||||
OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_SET_TCB_FIELD, ep->hwtid));
|
||||
|
|
@ -398,7 +398,7 @@ static int send_halfclose(struct iwch_ep *ep, gfp_t gfp)
|
|||
}
|
||||
skb->priority = CPL_PRIORITY_DATA;
|
||||
set_arp_failure_handler(skb, arp_failure_discard);
|
||||
req = (struct cpl_close_con_req *) skb_put(skb, sizeof(*req));
|
||||
req = skb_put(skb, sizeof(*req));
|
||||
req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_OFLD_CLOSE_CON));
|
||||
req->wr.wr_lo = htonl(V_WR_TID(ep->hwtid));
|
||||
OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_CLOSE_CON_REQ, ep->hwtid));
|
||||
|
|
@ -417,8 +417,7 @@ static int send_abort(struct iwch_ep *ep, struct sk_buff *skb, gfp_t gfp)
|
|||
}
|
||||
skb->priority = CPL_PRIORITY_DATA;
|
||||
set_arp_failure_handler(skb, abort_arp_failure);
|
||||
req = (struct cpl_abort_req *) skb_put(skb, sizeof(*req));
|
||||
memset(req, 0, sizeof(*req));
|
||||
req = skb_put_zero(skb, sizeof(*req));
|
||||
req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_OFLD_HOST_ABORT_CON_REQ));
|
||||
req->wr.wr_lo = htonl(V_WR_TID(ep->hwtid));
|
||||
OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_ABORT_REQ, ep->hwtid));
|
||||
|
|
@ -456,7 +455,7 @@ static int send_connect(struct iwch_ep *ep)
|
|||
skb->priority = CPL_PRIORITY_SETUP;
|
||||
set_arp_failure_handler(skb, act_open_req_arp_failure);
|
||||
|
||||
req = (struct cpl_act_open_req *) skb_put(skb, sizeof(*req));
|
||||
req = skb_put(skb, sizeof(*req));
|
||||
req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD));
|
||||
OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_ACT_OPEN_REQ, ep->atid));
|
||||
req->local_port = ep->com.local_addr.sin_port;
|
||||
|
|
@ -514,7 +513,7 @@ static void send_mpa_req(struct iwch_ep *ep, struct sk_buff *skb)
|
|||
set_arp_failure_handler(skb, arp_failure_discard);
|
||||
skb_reset_transport_header(skb);
|
||||
len = skb->len;
|
||||
req = (struct tx_data_wr *) skb_push(skb, sizeof(*req));
|
||||
req = skb_push(skb, sizeof(*req));
|
||||
req->wr_hi = htonl(V_WR_OP(FW_WROPCODE_OFLD_TX_DATA)|F_WR_COMPL);
|
||||
req->wr_lo = htonl(V_WR_TID(ep->hwtid));
|
||||
req->len = htonl(len);
|
||||
|
|
@ -547,7 +546,7 @@ static int send_mpa_reject(struct iwch_ep *ep, const void *pdata, u8 plen)
|
|||
return -ENOMEM;
|
||||
}
|
||||
skb_reserve(skb, sizeof(*req));
|
||||
mpa = (struct mpa_message *) skb_put(skb, mpalen);
|
||||
mpa = skb_put(skb, mpalen);
|
||||
memset(mpa, 0, sizeof(*mpa));
|
||||
memcpy(mpa->key, MPA_KEY_REP, sizeof(mpa->key));
|
||||
mpa->flags = MPA_REJECT;
|
||||
|
|
@ -565,7 +564,7 @@ static int send_mpa_reject(struct iwch_ep *ep, const void *pdata, u8 plen)
|
|||
skb->priority = CPL_PRIORITY_DATA;
|
||||
set_arp_failure_handler(skb, arp_failure_discard);
|
||||
skb_reset_transport_header(skb);
|
||||
req = (struct tx_data_wr *) skb_push(skb, sizeof(*req));
|
||||
req = skb_push(skb, sizeof(*req));
|
||||
req->wr_hi = htonl(V_WR_OP(FW_WROPCODE_OFLD_TX_DATA)|F_WR_COMPL);
|
||||
req->wr_lo = htonl(V_WR_TID(ep->hwtid));
|
||||
req->len = htonl(mpalen);
|
||||
|
|
@ -597,7 +596,7 @@ static int send_mpa_reply(struct iwch_ep *ep, const void *pdata, u8 plen)
|
|||
}
|
||||
skb->priority = CPL_PRIORITY_DATA;
|
||||
skb_reserve(skb, sizeof(*req));
|
||||
mpa = (struct mpa_message *) skb_put(skb, mpalen);
|
||||
mpa = skb_put(skb, mpalen);
|
||||
memset(mpa, 0, sizeof(*mpa));
|
||||
memcpy(mpa->key, MPA_KEY_REP, sizeof(mpa->key));
|
||||
mpa->flags = (ep->mpa_attr.crc_enabled ? MPA_CRC : 0) |
|
||||
|
|
@ -616,7 +615,7 @@ static int send_mpa_reply(struct iwch_ep *ep, const void *pdata, u8 plen)
|
|||
set_arp_failure_handler(skb, arp_failure_discard);
|
||||
skb_reset_transport_header(skb);
|
||||
len = skb->len;
|
||||
req = (struct tx_data_wr *) skb_push(skb, sizeof(*req));
|
||||
req = skb_push(skb, sizeof(*req));
|
||||
req->wr_hi = htonl(V_WR_OP(FW_WROPCODE_OFLD_TX_DATA)|F_WR_COMPL);
|
||||
req->wr_lo = htonl(V_WR_TID(ep->hwtid));
|
||||
req->len = htonl(len);
|
||||
|
|
@ -801,7 +800,7 @@ static int update_rx_credits(struct iwch_ep *ep, u32 credits)
|
|||
return 0;
|
||||
}
|
||||
|
||||
req = (struct cpl_rx_data_ack *) skb_put(skb, sizeof(*req));
|
||||
req = skb_put(skb, sizeof(*req));
|
||||
req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD));
|
||||
OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_RX_DATA_ACK, ep->hwtid));
|
||||
req->credit_dack = htonl(V_RX_CREDITS(credits) | V_RX_FORCE_ACK(1));
|
||||
|
|
@ -1206,7 +1205,7 @@ static int listen_start(struct iwch_listen_ep *ep)
|
|||
return -ENOMEM;
|
||||
}
|
||||
|
||||
req = (struct cpl_pass_open_req *) skb_put(skb, sizeof(*req));
|
||||
req = skb_put(skb, sizeof(*req));
|
||||
req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD));
|
||||
OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_PASS_OPEN_REQ, ep->stid));
|
||||
req->local_port = ep->com.local_addr.sin_port;
|
||||
|
|
@ -1247,7 +1246,7 @@ static int listen_stop(struct iwch_listen_ep *ep)
|
|||
pr_err("%s - failed to alloc skb\n", __func__);
|
||||
return -ENOMEM;
|
||||
}
|
||||
req = (struct cpl_close_listserv_req *) skb_put(skb, sizeof(*req));
|
||||
req = skb_put(skb, sizeof(*req));
|
||||
req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD));
|
||||
req->cpu_idx = 0;
|
||||
OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_CLOSE_LISTSRV_REQ, ep->stid));
|
||||
|
|
@ -1615,7 +1614,7 @@ static int peer_abort(struct t3cdev *tdev, struct sk_buff *skb, void *ctx)
|
|||
goto out;
|
||||
}
|
||||
rpl_skb->priority = CPL_PRIORITY_DATA;
|
||||
rpl = (struct cpl_abort_rpl *) skb_put(rpl_skb, sizeof(*rpl));
|
||||
rpl = skb_put(rpl_skb, sizeof(*rpl));
|
||||
rpl->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_OFLD_HOST_ABORT_CON_RPL));
|
||||
rpl->wr.wr_lo = htonl(V_WR_TID(ep->hwtid));
|
||||
OPCODE_TID(rpl) = htonl(MK_OPCODE_TID(CPL_ABORT_RPL, ep->hwtid));
|
||||
|
|
|
|||
|
|
@ -670,8 +670,7 @@ int iwch_post_zb_read(struct iwch_ep *ep)
|
|||
pr_err("%s cannot send zb_read!!\n", __func__);
|
||||
return -ENOMEM;
|
||||
}
|
||||
wqe = (union t3_wr *)skb_put(skb, sizeof(struct t3_rdma_read_wr));
|
||||
memset(wqe, 0, sizeof(struct t3_rdma_read_wr));
|
||||
wqe = skb_put_zero(skb, sizeof(struct t3_rdma_read_wr));
|
||||
wqe->read.rdmaop = T3_READ_REQ;
|
||||
wqe->read.reserved[0] = 0;
|
||||
wqe->read.reserved[1] = 0;
|
||||
|
|
@ -702,8 +701,7 @@ int iwch_post_terminate(struct iwch_qp *qhp, struct respQ_msg_t *rsp_msg)
|
|||
pr_err("%s cannot send TERMINATE!\n", __func__);
|
||||
return -ENOMEM;
|
||||
}
|
||||
wqe = (union t3_wr *)skb_put(skb, 40);
|
||||
memset(wqe, 0, 40);
|
||||
wqe = skb_put_zero(skb, 40);
|
||||
wqe->send.rdmaop = T3_TERMINATE;
|
||||
|
||||
/* immediate data length */
|
||||
|
|
|
|||
|
|
@ -398,7 +398,8 @@ void _c4iw_free_ep(struct kref *kref)
|
|||
(const u32 *)&sin6->sin6_addr.s6_addr,
|
||||
1);
|
||||
}
|
||||
cxgb4_remove_tid(ep->com.dev->rdev.lldi.tids, 0, ep->hwtid);
|
||||
cxgb4_remove_tid(ep->com.dev->rdev.lldi.tids, 0, ep->hwtid,
|
||||
ep->com.local_addr.ss_family);
|
||||
dst_release(ep->dst);
|
||||
cxgb4_l2t_release(ep->l2t);
|
||||
if (ep->mpa_skb)
|
||||
|
|
@ -596,7 +597,7 @@ static int send_flowc(struct c4iw_ep *ep)
|
|||
else
|
||||
nparams = 9;
|
||||
|
||||
flowc = (struct fw_flowc_wr *)__skb_put(skb, FLOWC_LEN);
|
||||
flowc = __skb_put(skb, FLOWC_LEN);
|
||||
|
||||
flowc->op_to_nparams = cpu_to_be32(FW_WR_OP_V(FW_FLOWC_WR) |
|
||||
FW_FLOWC_WR_NPARAMS_V(nparams));
|
||||
|
|
@ -786,18 +787,16 @@ static int send_connect(struct c4iw_ep *ep)
|
|||
if (ep->com.remote_addr.ss_family == AF_INET) {
|
||||
switch (CHELSIO_CHIP_VERSION(adapter_type)) {
|
||||
case CHELSIO_T4:
|
||||
req = (struct cpl_act_open_req *)skb_put(skb, wrlen);
|
||||
req = skb_put(skb, wrlen);
|
||||
INIT_TP_WR(req, 0);
|
||||
break;
|
||||
case CHELSIO_T5:
|
||||
t5req = (struct cpl_t5_act_open_req *)skb_put(skb,
|
||||
wrlen);
|
||||
t5req = skb_put(skb, wrlen);
|
||||
INIT_TP_WR(t5req, 0);
|
||||
req = (struct cpl_act_open_req *)t5req;
|
||||
break;
|
||||
case CHELSIO_T6:
|
||||
t6req = (struct cpl_t6_act_open_req *)skb_put(skb,
|
||||
wrlen);
|
||||
t6req = skb_put(skb, wrlen);
|
||||
INIT_TP_WR(t6req, 0);
|
||||
req = (struct cpl_act_open_req *)t6req;
|
||||
t5req = (struct cpl_t5_act_open_req *)t6req;
|
||||
|
|
@ -838,18 +837,16 @@ static int send_connect(struct c4iw_ep *ep)
|
|||
} else {
|
||||
switch (CHELSIO_CHIP_VERSION(adapter_type)) {
|
||||
case CHELSIO_T4:
|
||||
req6 = (struct cpl_act_open_req6 *)skb_put(skb, wrlen);
|
||||
req6 = skb_put(skb, wrlen);
|
||||
INIT_TP_WR(req6, 0);
|
||||
break;
|
||||
case CHELSIO_T5:
|
||||
t5req6 = (struct cpl_t5_act_open_req6 *)skb_put(skb,
|
||||
wrlen);
|
||||
t5req6 = skb_put(skb, wrlen);
|
||||
INIT_TP_WR(t5req6, 0);
|
||||
req6 = (struct cpl_act_open_req6 *)t5req6;
|
||||
break;
|
||||
case CHELSIO_T6:
|
||||
t6req6 = (struct cpl_t6_act_open_req6 *)skb_put(skb,
|
||||
wrlen);
|
||||
t6req6 = skb_put(skb, wrlen);
|
||||
INIT_TP_WR(t6req6, 0);
|
||||
req6 = (struct cpl_act_open_req6 *)t6req6;
|
||||
t5req6 = (struct cpl_t5_act_open_req6 *)t6req6;
|
||||
|
|
@ -926,8 +923,7 @@ static int send_mpa_req(struct c4iw_ep *ep, struct sk_buff *skb,
|
|||
}
|
||||
set_wr_txq(skb, CPL_PRIORITY_DATA, ep->txq_idx);
|
||||
|
||||
req = (struct fw_ofld_tx_data_wr *)skb_put(skb, wrlen);
|
||||
memset(req, 0, wrlen);
|
||||
req = skb_put_zero(skb, wrlen);
|
||||
req->op_to_immdlen = cpu_to_be32(
|
||||
FW_WR_OP_V(FW_OFLD_TX_DATA_WR) |
|
||||
FW_WR_COMPL_F |
|
||||
|
|
@ -1033,8 +1029,7 @@ static int send_mpa_reject(struct c4iw_ep *ep, const void *pdata, u8 plen)
|
|||
}
|
||||
set_wr_txq(skb, CPL_PRIORITY_DATA, ep->txq_idx);
|
||||
|
||||
req = (struct fw_ofld_tx_data_wr *)skb_put(skb, wrlen);
|
||||
memset(req, 0, wrlen);
|
||||
req = skb_put_zero(skb, wrlen);
|
||||
req->op_to_immdlen = cpu_to_be32(
|
||||
FW_WR_OP_V(FW_OFLD_TX_DATA_WR) |
|
||||
FW_WR_COMPL_F |
|
||||
|
|
@ -1114,8 +1109,7 @@ static int send_mpa_reply(struct c4iw_ep *ep, const void *pdata, u8 plen)
|
|||
}
|
||||
set_wr_txq(skb, CPL_PRIORITY_DATA, ep->txq_idx);
|
||||
|
||||
req = (struct fw_ofld_tx_data_wr *) skb_put(skb, wrlen);
|
||||
memset(req, 0, wrlen);
|
||||
req = skb_put_zero(skb, wrlen);
|
||||
req->op_to_immdlen = cpu_to_be32(
|
||||
FW_WR_OP_V(FW_OFLD_TX_DATA_WR) |
|
||||
FW_WR_COMPL_F |
|
||||
|
|
@ -1199,7 +1193,7 @@ static int act_establish(struct c4iw_dev *dev, struct sk_buff *skb)
|
|||
|
||||
/* setup the hwtid for this connection */
|
||||
ep->hwtid = tid;
|
||||
cxgb4_insert_tid(t, ep, tid);
|
||||
cxgb4_insert_tid(t, ep, tid, ep->com.local_addr.ss_family);
|
||||
insert_ep_tid(ep);
|
||||
|
||||
ep->snd_seq = be32_to_cpu(req->snd_isn);
|
||||
|
|
@ -1906,8 +1900,7 @@ static int send_fw_act_open_req(struct c4iw_ep *ep, unsigned int atid)
|
|||
int win;
|
||||
|
||||
skb = get_skb(NULL, sizeof(*req), GFP_KERNEL);
|
||||
req = (struct fw_ofld_connection_wr *)__skb_put(skb, sizeof(*req));
|
||||
memset(req, 0, sizeof(*req));
|
||||
req = __skb_put_zero(skb, sizeof(*req));
|
||||
req->op_compl = htonl(WR_OP_V(FW_OFLD_CONNECTION_WR));
|
||||
req->len16_pkd = htonl(FW_WR_LEN16_V(DIV_ROUND_UP(sizeof(*req), 16)));
|
||||
req->le.filter = cpu_to_be32(cxgb4_select_ntuple(
|
||||
|
|
@ -2304,7 +2297,8 @@ fail:
|
|||
(const u32 *)&sin6->sin6_addr.s6_addr, 1);
|
||||
}
|
||||
if (status && act_open_has_tid(status))
|
||||
cxgb4_remove_tid(ep->com.dev->rdev.lldi.tids, 0, GET_TID(rpl));
|
||||
cxgb4_remove_tid(ep->com.dev->rdev.lldi.tids, 0, GET_TID(rpl),
|
||||
ep->com.local_addr.ss_family);
|
||||
|
||||
remove_handle(ep->com.dev, &ep->com.dev->atid_idr, atid);
|
||||
cxgb4_free_atid(t, atid);
|
||||
|
|
@ -2581,7 +2575,8 @@ static int pass_accept_req(struct c4iw_dev *dev, struct sk_buff *skb)
|
|||
child_ep->tx_chan, child_ep->smac_idx, child_ep->rss_qid);
|
||||
|
||||
init_timer(&child_ep->timer);
|
||||
cxgb4_insert_tid(t, child_ep, hwtid);
|
||||
cxgb4_insert_tid(t, child_ep, hwtid,
|
||||
child_ep->com.local_addr.ss_family);
|
||||
insert_ep_tid(child_ep);
|
||||
if (accept_cr(child_ep, skb, req)) {
|
||||
c4iw_put_ep(&parent_ep->com);
|
||||
|
|
@ -2849,7 +2844,8 @@ out:
|
|||
1);
|
||||
}
|
||||
remove_handle(ep->com.dev, &ep->com.dev->hwtid_idr, ep->hwtid);
|
||||
cxgb4_remove_tid(ep->com.dev->rdev.lldi.tids, 0, ep->hwtid);
|
||||
cxgb4_remove_tid(ep->com.dev->rdev.lldi.tids, 0, ep->hwtid,
|
||||
ep->com.local_addr.ss_family);
|
||||
dst_release(ep->dst);
|
||||
cxgb4_l2t_release(ep->l2t);
|
||||
c4iw_reconnect(ep);
|
||||
|
|
@ -3752,9 +3748,9 @@ static void build_cpl_pass_accept_req(struct sk_buff *skb, int stid , u8 tos)
|
|||
*/
|
||||
memset(&tmp_opt, 0, sizeof(tmp_opt));
|
||||
tcp_clear_options(&tmp_opt);
|
||||
tcp_parse_options(skb, &tmp_opt, 0, NULL);
|
||||
tcp_parse_options(&init_net, skb, &tmp_opt, 0, NULL);
|
||||
|
||||
req = (struct cpl_pass_accept_req *)__skb_push(skb, sizeof(*req));
|
||||
req = __skb_push(skb, sizeof(*req));
|
||||
memset(req, 0, sizeof(*req));
|
||||
req->l2info = cpu_to_be16(SYN_INTF_V(intf) |
|
||||
SYN_MAC_IDX_V(RX_MACIDX_G(
|
||||
|
|
@ -3806,8 +3802,7 @@ static void send_fw_pass_open_req(struct c4iw_dev *dev, struct sk_buff *skb,
|
|||
req_skb = alloc_skb(sizeof(struct fw_ofld_connection_wr), GFP_KERNEL);
|
||||
if (!req_skb)
|
||||
return;
|
||||
req = (struct fw_ofld_connection_wr *)__skb_put(req_skb, sizeof(*req));
|
||||
memset(req, 0, sizeof(*req));
|
||||
req = __skb_put_zero(req_skb, sizeof(*req));
|
||||
req->op_compl = htonl(WR_OP_V(FW_OFLD_CONNECTION_WR) | FW_WR_COMPL_F);
|
||||
req->len16_pkd = htonl(FW_WR_LEN16_V(DIV_ROUND_UP(sizeof(*req), 16)));
|
||||
req->le.version_cpl = htonl(FW_OFLD_CONNECTION_WR_CPL_F);
|
||||
|
|
|
|||
|
|
@ -44,8 +44,7 @@ static int destroy_cq(struct c4iw_rdev *rdev, struct t4_cq *cq,
|
|||
wr_len = sizeof *res_wr + sizeof *res;
|
||||
set_wr_txq(skb, CPL_PRIORITY_CONTROL, 0);
|
||||
|
||||
res_wr = (struct fw_ri_res_wr *)__skb_put(skb, wr_len);
|
||||
memset(res_wr, 0, wr_len);
|
||||
res_wr = __skb_put_zero(skb, wr_len);
|
||||
res_wr->op_nres = cpu_to_be32(
|
||||
FW_WR_OP_V(FW_RI_RES_WR) |
|
||||
FW_RI_RES_WR_NRES_V(1) |
|
||||
|
|
@ -114,8 +113,7 @@ static int create_cq(struct c4iw_rdev *rdev, struct t4_cq *cq,
|
|||
}
|
||||
set_wr_txq(skb, CPL_PRIORITY_CONTROL, 0);
|
||||
|
||||
res_wr = (struct fw_ri_res_wr *)__skb_put(skb, wr_len);
|
||||
memset(res_wr, 0, wr_len);
|
||||
res_wr = __skb_put_zero(skb, wr_len);
|
||||
res_wr->op_nres = cpu_to_be32(
|
||||
FW_WR_OP_V(FW_RI_RES_WR) |
|
||||
FW_RI_RES_WR_NRES_V(1) |
|
||||
|
|
|
|||
|
|
@ -81,8 +81,7 @@ static int _c4iw_write_mem_dma_aligned(struct c4iw_rdev *rdev, u32 addr,
|
|||
}
|
||||
set_wr_txq(skb, CPL_PRIORITY_CONTROL, 0);
|
||||
|
||||
req = (struct ulp_mem_io *)__skb_put(skb, wr_len);
|
||||
memset(req, 0, wr_len);
|
||||
req = __skb_put_zero(skb, wr_len);
|
||||
INIT_ULPTX_WR(req, wr_len, 0, 0);
|
||||
req->wr.wr_hi = cpu_to_be32(FW_WR_OP_V(FW_ULPTX_WR) |
|
||||
(wait ? FW_WR_COMPL_F : 0));
|
||||
|
|
@ -142,8 +141,7 @@ static int _c4iw_write_mem_inline(struct c4iw_rdev *rdev, u32 addr, u32 len,
|
|||
}
|
||||
set_wr_txq(skb, CPL_PRIORITY_CONTROL, 0);
|
||||
|
||||
req = (struct ulp_mem_io *)__skb_put(skb, wr_len);
|
||||
memset(req, 0, wr_len);
|
||||
req = __skb_put_zero(skb, wr_len);
|
||||
INIT_ULPTX_WR(req, wr_len, 0, 0);
|
||||
|
||||
if (i == (num_wqe-1)) {
|
||||
|
|
|
|||
|
|
@ -293,8 +293,7 @@ static int create_qp(struct c4iw_rdev *rdev, struct t4_wq *wq,
|
|||
}
|
||||
set_wr_txq(skb, CPL_PRIORITY_CONTROL, 0);
|
||||
|
||||
res_wr = (struct fw_ri_res_wr *)__skb_put(skb, wr_len);
|
||||
memset(res_wr, 0, wr_len);
|
||||
res_wr = __skb_put_zero(skb, wr_len);
|
||||
res_wr->op_nres = cpu_to_be32(
|
||||
FW_WR_OP_V(FW_RI_RES_WR) |
|
||||
FW_RI_RES_WR_NRES_V(2) |
|
||||
|
|
@ -1228,7 +1227,7 @@ static void post_terminate(struct c4iw_qp *qhp, struct t4_cqe *err_cqe,
|
|||
|
||||
set_wr_txq(skb, CPL_PRIORITY_DATA, qhp->ep->txq_idx);
|
||||
|
||||
wqe = (struct fw_ri_wr *)__skb_put(skb, sizeof(*wqe));
|
||||
wqe = __skb_put(skb, sizeof(*wqe));
|
||||
memset(wqe, 0, sizeof *wqe);
|
||||
wqe->op_compl = cpu_to_be32(FW_WR_OP_V(FW_RI_INIT_WR));
|
||||
wqe->flowid_len16 = cpu_to_be32(
|
||||
|
|
@ -1350,7 +1349,7 @@ static int rdma_fini(struct c4iw_dev *rhp, struct c4iw_qp *qhp,
|
|||
|
||||
set_wr_txq(skb, CPL_PRIORITY_DATA, ep->txq_idx);
|
||||
|
||||
wqe = (struct fw_ri_wr *)__skb_put(skb, sizeof(*wqe));
|
||||
wqe = __skb_put(skb, sizeof(*wqe));
|
||||
memset(wqe, 0, sizeof *wqe);
|
||||
wqe->op_compl = cpu_to_be32(
|
||||
FW_WR_OP_V(FW_RI_INIT_WR) |
|
||||
|
|
@ -1419,7 +1418,7 @@ static int rdma_init(struct c4iw_dev *rhp, struct c4iw_qp *qhp)
|
|||
}
|
||||
set_wr_txq(skb, CPL_PRIORITY_DATA, qhp->ep->txq_idx);
|
||||
|
||||
wqe = (struct fw_ri_wr *)__skb_put(skb, sizeof(*wqe));
|
||||
wqe = __skb_put(skb, sizeof(*wqe));
|
||||
memset(wqe, 0, sizeof *wqe);
|
||||
wqe->op_compl = cpu_to_be32(
|
||||
FW_WR_OP_V(FW_RI_INIT_WR) |
|
||||
|
|
|
|||
|
|
@ -61,8 +61,7 @@
|
|||
#include <rdma/mlx4-abi.h>
|
||||
|
||||
#define DRV_NAME MLX4_IB_DRV_NAME
|
||||
#define DRV_VERSION "2.2-1"
|
||||
#define DRV_RELDATE "Feb 2014"
|
||||
#define DRV_VERSION "4.0-0"
|
||||
|
||||
#define MLX4_IB_FLOW_MAX_PRIO 0xFFF
|
||||
#define MLX4_IB_FLOW_QPN_MASK 0xFFFFFF
|
||||
|
|
@ -79,7 +78,7 @@ MODULE_PARM_DESC(sm_guid_assign, "Enable SM alias_GUID assignment if sm_guid_ass
|
|||
|
||||
static const char mlx4_ib_version[] =
|
||||
DRV_NAME ": Mellanox ConnectX InfiniBand driver v"
|
||||
DRV_VERSION " (" DRV_RELDATE ")\n";
|
||||
DRV_VERSION "\n";
|
||||
|
||||
static void do_slave_init(struct mlx4_ib_dev *ibdev, int slave, int do_init);
|
||||
|
||||
|
|
|
|||
|
|
@ -788,7 +788,7 @@ static int create_cq_user(struct mlx5_ib_dev *dev, struct ib_udata *udata,
|
|||
|
||||
*inlen = MLX5_ST_SZ_BYTES(create_cq_in) +
|
||||
MLX5_FLD_SZ_BYTES(create_cq_in, pas[0]) * ncont;
|
||||
*cqb = mlx5_vzalloc(*inlen);
|
||||
*cqb = kvzalloc(*inlen, GFP_KERNEL);
|
||||
if (!*cqb) {
|
||||
err = -ENOMEM;
|
||||
goto err_db;
|
||||
|
|
@ -884,7 +884,7 @@ static int create_cq_kernel(struct mlx5_ib_dev *dev, struct mlx5_ib_cq *cq,
|
|||
|
||||
*inlen = MLX5_ST_SZ_BYTES(create_cq_in) +
|
||||
MLX5_FLD_SZ_BYTES(create_cq_in, pas[0]) * cq->buf.buf.npages;
|
||||
*cqb = mlx5_vzalloc(*inlen);
|
||||
*cqb = kvzalloc(*inlen, GFP_KERNEL);
|
||||
if (!*cqb) {
|
||||
err = -ENOMEM;
|
||||
goto err_buf;
|
||||
|
|
@ -1314,7 +1314,7 @@ int mlx5_ib_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
|
|||
inlen = MLX5_ST_SZ_BYTES(modify_cq_in) +
|
||||
MLX5_FLD_SZ_BYTES(modify_cq_in, pas[0]) * npas;
|
||||
|
||||
in = mlx5_vzalloc(inlen);
|
||||
in = kvzalloc(inlen, GFP_KERNEL);
|
||||
if (!in) {
|
||||
err = -ENOMEM;
|
||||
goto ex_resize;
|
||||
|
|
|
|||
|
|
@ -218,7 +218,7 @@ static int process_pma_cmd(struct ib_device *ibdev, u8 port_num,
|
|||
(struct ib_pma_portcounters_ext *)(out_mad->data + 40);
|
||||
int sz = MLX5_ST_SZ_BYTES(query_vport_counter_out);
|
||||
|
||||
out_cnt = mlx5_vzalloc(sz);
|
||||
out_cnt = kvzalloc(sz, GFP_KERNEL);
|
||||
if (!out_cnt)
|
||||
return IB_MAD_RESULT_FAILURE;
|
||||
|
||||
|
|
@ -231,7 +231,7 @@ static int process_pma_cmd(struct ib_device *ibdev, u8 port_num,
|
|||
(struct ib_pma_portcounters *)(out_mad->data + 40);
|
||||
int sz = MLX5_ST_SZ_BYTES(ppcnt_reg);
|
||||
|
||||
out_cnt = mlx5_vzalloc(sz);
|
||||
out_cnt = kvzalloc(sz, GFP_KERNEL);
|
||||
if (!out_cnt)
|
||||
return IB_MAD_RESULT_FAILURE;
|
||||
|
||||
|
|
|
|||
|
|
@ -60,8 +60,7 @@
|
|||
#include "cmd.h"
|
||||
|
||||
#define DRIVER_NAME "mlx5_ib"
|
||||
#define DRIVER_VERSION "2.2-1"
|
||||
#define DRIVER_RELDATE "Feb 2014"
|
||||
#define DRIVER_VERSION "5.0-0"
|
||||
|
||||
MODULE_AUTHOR("Eli Cohen <eli@mellanox.com>");
|
||||
MODULE_DESCRIPTION("Mellanox Connect-IB HCA IB driver");
|
||||
|
|
@ -70,7 +69,7 @@ MODULE_VERSION(DRIVER_VERSION);
|
|||
|
||||
static char mlx5_version[] =
|
||||
DRIVER_NAME ": Mellanox Connect-IB Infiniband driver v"
|
||||
DRIVER_VERSION " (" DRIVER_RELDATE ")\n";
|
||||
DRIVER_VERSION "\n";
|
||||
|
||||
enum {
|
||||
MLX5_ATOMIC_SIZE_QP_8BYTES = 1 << 3,
|
||||
|
|
@ -224,8 +223,8 @@ static int translate_eth_proto_oper(u32 eth_proto_oper, u8 *active_speed,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void mlx5_query_port_roce(struct ib_device *device, u8 port_num,
|
||||
struct ib_port_attr *props)
|
||||
static int mlx5_query_port_roce(struct ib_device *device, u8 port_num,
|
||||
struct ib_port_attr *props)
|
||||
{
|
||||
struct mlx5_ib_dev *dev = to_mdev(device);
|
||||
struct mlx5_core_dev *mdev = dev->mdev;
|
||||
|
|
@ -233,12 +232,14 @@ static void mlx5_query_port_roce(struct ib_device *device, u8 port_num,
|
|||
enum ib_mtu ndev_ib_mtu;
|
||||
u16 qkey_viol_cntr;
|
||||
u32 eth_prot_oper;
|
||||
int err;
|
||||
|
||||
/* Possible bad flows are checked before filling out props so in case
|
||||
* of an error it will still be zeroed out.
|
||||
*/
|
||||
if (mlx5_query_port_eth_proto_oper(mdev, ð_prot_oper, port_num))
|
||||
return;
|
||||
err = mlx5_query_port_eth_proto_oper(mdev, ð_prot_oper, port_num);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
translate_eth_proto_oper(eth_prot_oper, &props->active_speed,
|
||||
&props->active_width);
|
||||
|
|
@ -259,7 +260,7 @@ static void mlx5_query_port_roce(struct ib_device *device, u8 port_num,
|
|||
|
||||
ndev = mlx5_ib_get_netdev(device, port_num);
|
||||
if (!ndev)
|
||||
return;
|
||||
return 0;
|
||||
|
||||
if (mlx5_lag_is_active(dev->mdev)) {
|
||||
rcu_read_lock();
|
||||
|
|
@ -282,75 +283,49 @@ static void mlx5_query_port_roce(struct ib_device *device, u8 port_num,
|
|||
dev_put(ndev);
|
||||
|
||||
props->active_mtu = min(props->max_mtu, ndev_ib_mtu);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void ib_gid_to_mlx5_roce_addr(const union ib_gid *gid,
|
||||
const struct ib_gid_attr *attr,
|
||||
void *mlx5_addr)
|
||||
static int set_roce_addr(struct mlx5_ib_dev *dev, u8 port_num,
|
||||
unsigned int index, const union ib_gid *gid,
|
||||
const struct ib_gid_attr *attr)
|
||||
{
|
||||
#define MLX5_SET_RA(p, f, v) MLX5_SET(roce_addr_layout, p, f, v)
|
||||
char *mlx5_addr_l3_addr = MLX5_ADDR_OF(roce_addr_layout, mlx5_addr,
|
||||
source_l3_address);
|
||||
void *mlx5_addr_mac = MLX5_ADDR_OF(roce_addr_layout, mlx5_addr,
|
||||
source_mac_47_32);
|
||||
enum ib_gid_type gid_type = IB_GID_TYPE_IB;
|
||||
u8 roce_version = 0;
|
||||
u8 roce_l3_type = 0;
|
||||
bool vlan = false;
|
||||
u8 mac[ETH_ALEN];
|
||||
u16 vlan_id = 0;
|
||||
|
||||
if (!gid)
|
||||
return;
|
||||
if (gid) {
|
||||
gid_type = attr->gid_type;
|
||||
ether_addr_copy(mac, attr->ndev->dev_addr);
|
||||
|
||||
ether_addr_copy(mlx5_addr_mac, attr->ndev->dev_addr);
|
||||
|
||||
if (is_vlan_dev(attr->ndev)) {
|
||||
MLX5_SET_RA(mlx5_addr, vlan_valid, 1);
|
||||
MLX5_SET_RA(mlx5_addr, vlan_id, vlan_dev_vlan_id(attr->ndev));
|
||||
if (is_vlan_dev(attr->ndev)) {
|
||||
vlan = true;
|
||||
vlan_id = vlan_dev_vlan_id(attr->ndev);
|
||||
}
|
||||
}
|
||||
|
||||
switch (attr->gid_type) {
|
||||
switch (gid_type) {
|
||||
case IB_GID_TYPE_IB:
|
||||
MLX5_SET_RA(mlx5_addr, roce_version, MLX5_ROCE_VERSION_1);
|
||||
roce_version = MLX5_ROCE_VERSION_1;
|
||||
break;
|
||||
case IB_GID_TYPE_ROCE_UDP_ENCAP:
|
||||
MLX5_SET_RA(mlx5_addr, roce_version, MLX5_ROCE_VERSION_2);
|
||||
roce_version = MLX5_ROCE_VERSION_2;
|
||||
if (ipv6_addr_v4mapped((void *)gid))
|
||||
roce_l3_type = MLX5_ROCE_L3_TYPE_IPV4;
|
||||
else
|
||||
roce_l3_type = MLX5_ROCE_L3_TYPE_IPV6;
|
||||
break;
|
||||
|
||||
default:
|
||||
WARN_ON(true);
|
||||
mlx5_ib_warn(dev, "Unexpected GID type %u\n", gid_type);
|
||||
}
|
||||
|
||||
if (attr->gid_type != IB_GID_TYPE_IB) {
|
||||
if (ipv6_addr_v4mapped((void *)gid))
|
||||
MLX5_SET_RA(mlx5_addr, roce_l3_type,
|
||||
MLX5_ROCE_L3_TYPE_IPV4);
|
||||
else
|
||||
MLX5_SET_RA(mlx5_addr, roce_l3_type,
|
||||
MLX5_ROCE_L3_TYPE_IPV6);
|
||||
}
|
||||
|
||||
if ((attr->gid_type == IB_GID_TYPE_IB) ||
|
||||
!ipv6_addr_v4mapped((void *)gid))
|
||||
memcpy(mlx5_addr_l3_addr, gid, sizeof(*gid));
|
||||
else
|
||||
memcpy(&mlx5_addr_l3_addr[12], &gid->raw[12], 4);
|
||||
}
|
||||
|
||||
static int set_roce_addr(struct ib_device *device, u8 port_num,
|
||||
unsigned int index,
|
||||
const union ib_gid *gid,
|
||||
const struct ib_gid_attr *attr)
|
||||
{
|
||||
struct mlx5_ib_dev *dev = to_mdev(device);
|
||||
u32 in[MLX5_ST_SZ_DW(set_roce_address_in)] = {0};
|
||||
u32 out[MLX5_ST_SZ_DW(set_roce_address_out)] = {0};
|
||||
void *in_addr = MLX5_ADDR_OF(set_roce_address_in, in, roce_address);
|
||||
enum rdma_link_layer ll = mlx5_ib_port_link_layer(device, port_num);
|
||||
|
||||
if (ll != IB_LINK_LAYER_ETHERNET)
|
||||
return -EINVAL;
|
||||
|
||||
ib_gid_to_mlx5_roce_addr(gid, attr, in_addr);
|
||||
|
||||
MLX5_SET(set_roce_address_in, in, roce_address_index, index);
|
||||
MLX5_SET(set_roce_address_in, in, opcode, MLX5_CMD_OP_SET_ROCE_ADDRESS);
|
||||
return mlx5_cmd_exec(dev->mdev, in, sizeof(in), out, sizeof(out));
|
||||
return mlx5_core_roce_gid_set(dev->mdev, index, roce_version,
|
||||
roce_l3_type, gid->raw, mac, vlan,
|
||||
vlan_id);
|
||||
}
|
||||
|
||||
static int mlx5_ib_add_gid(struct ib_device *device, u8 port_num,
|
||||
|
|
@ -358,13 +333,13 @@ static int mlx5_ib_add_gid(struct ib_device *device, u8 port_num,
|
|||
const struct ib_gid_attr *attr,
|
||||
__always_unused void **context)
|
||||
{
|
||||
return set_roce_addr(device, port_num, index, gid, attr);
|
||||
return set_roce_addr(to_mdev(device), port_num, index, gid, attr);
|
||||
}
|
||||
|
||||
static int mlx5_ib_del_gid(struct ib_device *device, u8 port_num,
|
||||
unsigned int index, __always_unused void **context)
|
||||
{
|
||||
return set_roce_addr(device, port_num, index, NULL, NULL);
|
||||
return set_roce_addr(to_mdev(device), port_num, index, NULL, NULL);
|
||||
}
|
||||
|
||||
__be16 mlx5_get_roce_udp_sport(struct mlx5_ib_dev *dev, u8 port_num,
|
||||
|
|
@ -440,7 +415,7 @@ static void get_atomic_caps(struct mlx5_ib_dev *dev,
|
|||
u8 atomic_operations = MLX5_CAP_ATOMIC(dev->mdev, atomic_operations);
|
||||
u8 atomic_size_qp = MLX5_CAP_ATOMIC(dev->mdev, atomic_size_qp);
|
||||
u8 atomic_req_8B_endianness_mode =
|
||||
MLX5_CAP_ATOMIC(dev->mdev, atomic_req_8B_endianess_mode);
|
||||
MLX5_CAP_ATOMIC(dev->mdev, atomic_req_8B_endianness_mode);
|
||||
|
||||
/* Check if HW supports 8 bytes standard atomic operations and capable
|
||||
* of host endianness respond
|
||||
|
|
@ -979,20 +954,31 @@ out:
|
|||
int mlx5_ib_query_port(struct ib_device *ibdev, u8 port,
|
||||
struct ib_port_attr *props)
|
||||
{
|
||||
unsigned int count;
|
||||
int ret;
|
||||
|
||||
switch (mlx5_get_vport_access_method(ibdev)) {
|
||||
case MLX5_VPORT_ACCESS_METHOD_MAD:
|
||||
return mlx5_query_mad_ifc_port(ibdev, port, props);
|
||||
ret = mlx5_query_mad_ifc_port(ibdev, port, props);
|
||||
break;
|
||||
|
||||
case MLX5_VPORT_ACCESS_METHOD_HCA:
|
||||
return mlx5_query_hca_port(ibdev, port, props);
|
||||
ret = mlx5_query_hca_port(ibdev, port, props);
|
||||
break;
|
||||
|
||||
case MLX5_VPORT_ACCESS_METHOD_NIC:
|
||||
mlx5_query_port_roce(ibdev, port, props);
|
||||
return 0;
|
||||
ret = mlx5_query_port_roce(ibdev, port, props);
|
||||
break;
|
||||
|
||||
default:
|
||||
return -EINVAL;
|
||||
ret = -EINVAL;
|
||||
}
|
||||
|
||||
if (!ret && props) {
|
||||
count = mlx5_core_reserved_gids_count(to_mdev(ibdev)->mdev);
|
||||
props->gid_tbl_len -= count;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int mlx5_ib_query_gid(struct ib_device *ibdev, u8 port, int index,
|
||||
|
|
@ -2263,7 +2249,7 @@ static struct mlx5_ib_flow_handler *create_flow_rule(struct mlx5_ib_dev *dev,
|
|||
if (!is_valid_attr(dev->mdev, flow_attr))
|
||||
return ERR_PTR(-EINVAL);
|
||||
|
||||
spec = mlx5_vzalloc(sizeof(*spec));
|
||||
spec = kvzalloc(sizeof(*spec), GFP_KERNEL);
|
||||
handler = kzalloc(sizeof(*handler), GFP_KERNEL);
|
||||
if (!handler || !spec) {
|
||||
err = -ENOMEM;
|
||||
|
|
@ -3468,7 +3454,7 @@ static int mlx5_ib_query_q_counters(struct mlx5_ib_dev *dev,
|
|||
__be32 val;
|
||||
int ret, i;
|
||||
|
||||
out = mlx5_vzalloc(outlen);
|
||||
out = kvzalloc(outlen, GFP_KERNEL);
|
||||
if (!out)
|
||||
return -ENOMEM;
|
||||
|
||||
|
|
@ -3497,7 +3483,7 @@ static int mlx5_ib_query_cong_counters(struct mlx5_ib_dev *dev,
|
|||
int ret, i;
|
||||
int offset = port->cnts.num_q_counters;
|
||||
|
||||
out = mlx5_vzalloc(outlen);
|
||||
out = kvzalloc(outlen, GFP_KERNEL);
|
||||
if (!out)
|
||||
return -ENOMEM;
|
||||
|
||||
|
|
|
|||
|
|
@ -1110,7 +1110,7 @@ static struct mlx5_ib_mr *reg_create(struct ib_mr *ibmr, struct ib_pd *pd,
|
|||
|
||||
inlen = MLX5_ST_SZ_BYTES(create_mkey_in) +
|
||||
sizeof(*pas) * ((npages + 1) / 2) * 2;
|
||||
in = mlx5_vzalloc(inlen);
|
||||
in = kvzalloc(inlen, GFP_KERNEL);
|
||||
if (!in) {
|
||||
err = -ENOMEM;
|
||||
goto err_1;
|
||||
|
|
|
|||
|
|
@ -823,7 +823,7 @@ static int create_user_qp(struct mlx5_ib_dev *dev, struct ib_pd *pd,
|
|||
|
||||
*inlen = MLX5_ST_SZ_BYTES(create_qp_in) +
|
||||
MLX5_FLD_SZ_BYTES(create_qp_in, pas[0]) * ncont;
|
||||
*in = mlx5_vzalloc(*inlen);
|
||||
*in = kvzalloc(*inlen, GFP_KERNEL);
|
||||
if (!*in) {
|
||||
err = -ENOMEM;
|
||||
goto err_umem;
|
||||
|
|
@ -931,7 +931,7 @@ static int create_kernel_qp(struct mlx5_ib_dev *dev,
|
|||
qp->sq.qend = mlx5_get_send_wqe(qp, qp->sq.wqe_cnt);
|
||||
*inlen = MLX5_ST_SZ_BYTES(create_qp_in) +
|
||||
MLX5_FLD_SZ_BYTES(create_qp_in, pas[0]) * qp->buf.npages;
|
||||
*in = mlx5_vzalloc(*inlen);
|
||||
*in = kvzalloc(*inlen, GFP_KERNEL);
|
||||
if (!*in) {
|
||||
err = -ENOMEM;
|
||||
goto err_buf;
|
||||
|
|
@ -1060,7 +1060,7 @@ static int create_raw_packet_qp_sq(struct mlx5_ib_dev *dev,
|
|||
return err;
|
||||
|
||||
inlen = MLX5_ST_SZ_BYTES(create_sq_in) + sizeof(u64) * ncont;
|
||||
in = mlx5_vzalloc(inlen);
|
||||
in = kvzalloc(inlen, GFP_KERNEL);
|
||||
if (!in) {
|
||||
err = -ENOMEM;
|
||||
goto err_umem;
|
||||
|
|
@ -1140,7 +1140,7 @@ static int create_raw_packet_qp_rq(struct mlx5_ib_dev *dev,
|
|||
u32 rq_pas_size = get_rq_pas_size(qpc);
|
||||
|
||||
inlen = MLX5_ST_SZ_BYTES(create_rq_in) + rq_pas_size;
|
||||
in = mlx5_vzalloc(inlen);
|
||||
in = kvzalloc(inlen, GFP_KERNEL);
|
||||
if (!in)
|
||||
return -ENOMEM;
|
||||
|
||||
|
|
@ -1193,7 +1193,7 @@ static int create_raw_packet_qp_tir(struct mlx5_ib_dev *dev,
|
|||
int err;
|
||||
|
||||
inlen = MLX5_ST_SZ_BYTES(create_tir_in);
|
||||
in = mlx5_vzalloc(inlen);
|
||||
in = kvzalloc(inlen, GFP_KERNEL);
|
||||
if (!in)
|
||||
return -ENOMEM;
|
||||
|
||||
|
|
@ -1372,7 +1372,7 @@ static int create_rss_raw_qp_tir(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
|
|||
}
|
||||
|
||||
inlen = MLX5_ST_SZ_BYTES(create_tir_in);
|
||||
in = mlx5_vzalloc(inlen);
|
||||
in = kvzalloc(inlen, GFP_KERNEL);
|
||||
if (!in)
|
||||
return -ENOMEM;
|
||||
|
||||
|
|
@ -1633,7 +1633,7 @@ static int create_qp_common(struct mlx5_ib_dev *dev, struct ib_pd *pd,
|
|||
if (err)
|
||||
return err;
|
||||
} else {
|
||||
in = mlx5_vzalloc(inlen);
|
||||
in = kvzalloc(inlen, GFP_KERNEL);
|
||||
if (!in)
|
||||
return -ENOMEM;
|
||||
|
||||
|
|
@ -2164,7 +2164,7 @@ static int modify_raw_packet_eth_prio(struct mlx5_core_dev *dev,
|
|||
int err;
|
||||
|
||||
inlen = MLX5_ST_SZ_BYTES(modify_tis_in);
|
||||
in = mlx5_vzalloc(inlen);
|
||||
in = kvzalloc(inlen, GFP_KERNEL);
|
||||
if (!in)
|
||||
return -ENOMEM;
|
||||
|
||||
|
|
@ -2189,7 +2189,7 @@ static int modify_raw_packet_tx_affinity(struct mlx5_core_dev *dev,
|
|||
int err;
|
||||
|
||||
inlen = MLX5_ST_SZ_BYTES(modify_tis_in);
|
||||
in = mlx5_vzalloc(inlen);
|
||||
in = kvzalloc(inlen, GFP_KERNEL);
|
||||
if (!in)
|
||||
return -ENOMEM;
|
||||
|
||||
|
|
@ -2434,7 +2434,7 @@ static int modify_raw_packet_qp_rq(struct mlx5_ib_dev *dev,
|
|||
int err;
|
||||
|
||||
inlen = MLX5_ST_SZ_BYTES(modify_rq_in);
|
||||
in = mlx5_vzalloc(inlen);
|
||||
in = kvzalloc(inlen, GFP_KERNEL);
|
||||
if (!in)
|
||||
return -ENOMEM;
|
||||
|
||||
|
|
@ -2479,7 +2479,7 @@ static int modify_raw_packet_qp_sq(struct mlx5_core_dev *dev,
|
|||
int err;
|
||||
|
||||
inlen = MLX5_ST_SZ_BYTES(modify_sq_in);
|
||||
in = mlx5_vzalloc(inlen);
|
||||
in = kvzalloc(inlen, GFP_KERNEL);
|
||||
if (!in)
|
||||
return -ENOMEM;
|
||||
|
||||
|
|
@ -4281,7 +4281,7 @@ static int query_raw_packet_qp_sq_state(struct mlx5_ib_dev *dev,
|
|||
int err;
|
||||
|
||||
inlen = MLX5_ST_SZ_BYTES(query_sq_out);
|
||||
out = mlx5_vzalloc(inlen);
|
||||
out = kvzalloc(inlen, GFP_KERNEL);
|
||||
if (!out)
|
||||
return -ENOMEM;
|
||||
|
||||
|
|
@ -4308,7 +4308,7 @@ static int query_raw_packet_qp_rq_state(struct mlx5_ib_dev *dev,
|
|||
int err;
|
||||
|
||||
inlen = MLX5_ST_SZ_BYTES(query_rq_out);
|
||||
out = mlx5_vzalloc(inlen);
|
||||
out = kvzalloc(inlen, GFP_KERNEL);
|
||||
if (!out)
|
||||
return -ENOMEM;
|
||||
|
||||
|
|
@ -4612,7 +4612,7 @@ static int create_rq(struct mlx5_ib_rwq *rwq, struct ib_pd *pd,
|
|||
dev = to_mdev(pd->device);
|
||||
|
||||
inlen = MLX5_ST_SZ_BYTES(create_rq_in) + sizeof(u64) * rwq->rq_num_pas;
|
||||
in = mlx5_vzalloc(inlen);
|
||||
in = kvzalloc(inlen, GFP_KERNEL);
|
||||
if (!in)
|
||||
return -ENOMEM;
|
||||
|
||||
|
|
@ -4842,7 +4842,7 @@ struct ib_rwq_ind_table *mlx5_ib_create_rwq_ind_table(struct ib_device *device,
|
|||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
inlen = MLX5_ST_SZ_BYTES(create_rqt_in) + sizeof(u32) * sz;
|
||||
in = mlx5_vzalloc(inlen);
|
||||
in = kvzalloc(inlen, GFP_KERNEL);
|
||||
if (!in) {
|
||||
err = -ENOMEM;
|
||||
goto err;
|
||||
|
|
@ -4921,7 +4921,7 @@ int mlx5_ib_modify_wq(struct ib_wq *wq, struct ib_wq_attr *wq_attr,
|
|||
return -EOPNOTSUPP;
|
||||
|
||||
inlen = MLX5_ST_SZ_BYTES(modify_rq_in);
|
||||
in = mlx5_vzalloc(inlen);
|
||||
in = kvzalloc(inlen, GFP_KERNEL);
|
||||
if (!in)
|
||||
return -ENOMEM;
|
||||
|
||||
|
|
|
|||
|
|
@ -127,7 +127,7 @@ static int create_srq_user(struct ib_pd *pd, struct mlx5_ib_srq *srq,
|
|||
goto err_umem;
|
||||
}
|
||||
|
||||
in->pas = mlx5_vzalloc(sizeof(*in->pas) * ncont);
|
||||
in->pas = kvzalloc(sizeof(*in->pas) * ncont, GFP_KERNEL);
|
||||
if (!in->pas) {
|
||||
err = -ENOMEM;
|
||||
goto err_umem;
|
||||
|
|
@ -189,7 +189,7 @@ static int create_srq_kernel(struct mlx5_ib_dev *dev, struct mlx5_ib_srq *srq,
|
|||
}
|
||||
|
||||
mlx5_ib_dbg(dev, "srq->buf.page_shift = %d\n", srq->buf.page_shift);
|
||||
in->pas = mlx5_vzalloc(sizeof(*in->pas) * srq->buf.npages);
|
||||
in->pas = kvzalloc(sizeof(*in->pas) * srq->buf.npages, GFP_KERNEL);
|
||||
if (!in->pas) {
|
||||
err = -ENOMEM;
|
||||
goto err_buf;
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue