This is the 4.19.260 stable release
-----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmM0DccACgkQONu9yGCS aT7rLA/+Kht2QUTuMXaoGnhRnCICOgQC4RykQgrdLNlp7rmcwh43I8dIwWIGuUKP LHB1PQQTKrpAXwkksXUteB0oOwnXoodIwsQX4u21RBySPll1Fs2l1TyyP2hph8nw tDEXDcLrd5GdHhS/zR+skKkfyy+gMDEmM5ArDhrQeVjGArRytB5TcXPOUlfhdER+ C1g1JG0nAG4jM5x7Nq08XTSzn5zucL0R9mOx+2vO0yTjAmghsdu5oHBBifcbBmuH DS1ZmKg5u8XxjCYQlkTNoyoh0CcLckZyEKn/f2uQvnMvhinfXz9+qn+jpbL1YrV+ vAGpQOmLBoX8HSMktwjQGATDygeFi26+JF/cTFpTuL0knbiC4VvmK4V+Wkjpjge1 piUYv1p9g4+/ZpIQ9OtDpEoCFCJeFGJo1u1fttyNvBw/WXZo0Y4EgDWGNlcPJC7e FDL63CQ/VHfoE15yR63z9LzJD7LOiifCLBZvM0mjb+0KSgPRbexCTcyylh28QgHR bLU8L0Vs5t7NGOWxWjK/FPLl8eaj+F1jn9N7f5Y6oWvwE/qXtNyZS3b2Vw2WeRVn J4U484N3aZl60qbVYArFaEcRmvlASIOKdGk15G2jfwaBcdc4fcajt37ZlHSHXVph EDm96/ejTD+H8gHw18TgGtp8aOmovKiK4hHY3GK9/uOitWQG4aE= =aRqh -----END PGP SIGNATURE----- Merge 4.19.260 into android-4.19-stable Changes in 4.19.260 of: fdt: fix off-by-one error in unflatten_dt_nodes() gpio: mpc8xxx: Fix support for IRQ_TYPE_LEVEL_LOW flow_type in mpc85xx drm/meson: Correct OSD1 global alpha value parisc: ccio-dma: Add missing iounmap in error path in ccio_probe() nvmet: fix a use-after-free mvpp2: no need to check return value of debugfs_create functions cifs: don't send down the destination address to sendmsg for a SOCK_STREAM ASoC: nau8824: Fix semaphore unbalance at error paths regulator: pfuze100: Fix the global-out-of-bounds access in pfuze100_regulator_probe() rxrpc: Fix local destruction being repeated ALSA: hda/sigmatel: Keep power up while beep is enabled net: usb: qmi_wwan: add Quectel RM520N MIPS: OCTEON: irq: Fix octeon_irq_force_ciu_mapping() mksysmap: Fix the mismatch of 'L0' symbols in System.map video: fbdev: pxa3xx-gcu: Fix integer overflow in pxa3xx_gcu_write ALSA: hda/sigmatel: Fix unused variable warning for beep power change usb: dwc3: pci: Add Support for Intel Elkhart Lake Devices usb: dwc3: pci: add support for TigerLake Devices usb: dwc3: pci: add support for the Intel Tiger Lake PCH -H variant usb: dwc3: pci: add support for the Intel Jasper Lake usb: dwc3: pci: add support for the Intel Alder Lake-S wifi: mac80211: Fix UAF in ieee80211_scan_rx() USB: core: Fix RST error in hub.c USB: serial: option: add Quectel BG95 0x0203 composition USB: serial: option: add Quectel RM520N ALSA: hda/tegra: set depop delay for tegra ALSA: hda: add Intel 5 Series / 3400 PCI DID ALSA: hda/realtek: Enable 4-speaker output Dell Precision 5530 laptop efi: libstub: check Shim mode using MokSBStateRT mm/slub: fix to return errno if kmalloc() fails arm64: dts: rockchip: Set RK3399-Gru PCLK_EDP to 24 MHz arm64: dts: rockchip: Remove 'enable-active-low' from rk3399-puma netfilter: nf_conntrack_sip: fix ct_sip_walk_headers netfilter: nf_conntrack_irc: Tighten matching on DCC message iavf: Fix cached head and tail value for iavf_get_tx_pending ipvlan: Fix out-of-bound bugs caused by unset skb->mac_header net: team: Unsync device addresses on ndo_stop MIPS: lantiq: export clk_get_io() for lantiq_wdt.ko i40e: Fix VF set max MTU size i40e: Fix set max_tx_rate when it is lower than 1 Mbps of: mdio: Add of_node_put() when breaking out of for_each_xx netfilter: ebtables: fix memory leak when blob is malformed can: gs_usb: gs_can_open(): fix race dev->can.state condition perf jit: Include program header in ELF files perf kcore_copy: Do not check /proc/modules is unchanged net: sunhme: Fix packet reception for len < RX_COPY_THRESHOLD serial: Create uart_xmit_advance() serial: tegra: Use uart_xmit_advance(), fixes icount.tx accounting s390/dasd: fix Oops in dasd_alias_get_start_dev due to missing pavgroup Drivers: hv: Never allocate anything besides framebuffer from framebuffer memory region drm/amd/display: Limit user regamma to a valid value drm/rockchip: Fix return type of cdn_dp_connector_mode_valid workqueue: don't skip lockdep work dependency in cancel_work_sync() usb: dwc3: pci: Allow Elkhart Lake to utilize DSM method for PM functionality ext4: make directory inode spreading reflect flexbg size Linux 4.19.260 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: If1ae526556d6ba20a452243e4a6bce84c0831d49
This commit is contained in:
commit
79e1336747
2
Makefile
2
Makefile
@ -1,7 +1,7 @@
|
|||||||
# SPDX-License-Identifier: GPL-2.0
|
# SPDX-License-Identifier: GPL-2.0
|
||||||
VERSION = 4
|
VERSION = 4
|
||||||
PATCHLEVEL = 19
|
PATCHLEVEL = 19
|
||||||
SUBLEVEL = 259
|
SUBLEVEL = 260
|
||||||
EXTRAVERSION =
|
EXTRAVERSION =
|
||||||
NAME = "People's Front"
|
NAME = "People's Front"
|
||||||
|
|
||||||
|
@ -232,6 +232,14 @@
|
|||||||
&edp {
|
&edp {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
|
|
||||||
|
/*
|
||||||
|
* eDP PHY/clk don't sync reliably at anything other than 24 MHz. Only
|
||||||
|
* set this here, because rk3399-gru.dtsi ensures we can generate this
|
||||||
|
* off GPLL=600MHz, whereas some other RK3399 boards may not.
|
||||||
|
*/
|
||||||
|
assigned-clocks = <&cru PCLK_EDP>;
|
||||||
|
assigned-clock-rates = <24000000>;
|
||||||
|
|
||||||
ports {
|
ports {
|
||||||
edp_out: port@1 {
|
edp_out: port@1 {
|
||||||
reg = <1>;
|
reg = <1>;
|
||||||
|
@ -102,7 +102,6 @@
|
|||||||
vcc5v0_host: vcc5v0-host-regulator {
|
vcc5v0_host: vcc5v0-host-regulator {
|
||||||
compatible = "regulator-fixed";
|
compatible = "regulator-fixed";
|
||||||
gpio = <&gpio4 RK_PA3 GPIO_ACTIVE_LOW>;
|
gpio = <&gpio4 RK_PA3 GPIO_ACTIVE_LOW>;
|
||||||
enable-active-low;
|
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
pinctrl-0 = <&vcc5v0_host_en>;
|
pinctrl-0 = <&vcc5v0_host_en>;
|
||||||
regulator-name = "vcc5v0_host";
|
regulator-name = "vcc5v0_host";
|
||||||
|
@ -127,6 +127,16 @@ static void octeon_irq_free_cd(struct irq_domain *d, unsigned int irq)
|
|||||||
static int octeon_irq_force_ciu_mapping(struct irq_domain *domain,
|
static int octeon_irq_force_ciu_mapping(struct irq_domain *domain,
|
||||||
int irq, int line, int bit)
|
int irq, int line, int bit)
|
||||||
{
|
{
|
||||||
|
struct device_node *of_node;
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
of_node = irq_domain_get_of_node(domain);
|
||||||
|
if (!of_node)
|
||||||
|
return -EINVAL;
|
||||||
|
ret = irq_alloc_desc_at(irq, of_node_to_nid(of_node));
|
||||||
|
if (ret < 0)
|
||||||
|
return ret;
|
||||||
|
|
||||||
return irq_domain_associate(domain, irq, line << 6 | bit);
|
return irq_domain_associate(domain, irq, line << 6 | bit);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -52,6 +52,7 @@ struct clk *clk_get_io(void)
|
|||||||
{
|
{
|
||||||
return &cpu_clk_generic[2];
|
return &cpu_clk_generic[2];
|
||||||
}
|
}
|
||||||
|
EXPORT_SYMBOL_GPL(clk_get_io);
|
||||||
|
|
||||||
struct clk *clk_get_ppe(void)
|
struct clk *clk_get_ppe(void)
|
||||||
{
|
{
|
||||||
|
@ -21,7 +21,7 @@ static const efi_char16_t efi_SetupMode_name[] = L"SetupMode";
|
|||||||
|
|
||||||
/* SHIM variables */
|
/* SHIM variables */
|
||||||
static const efi_guid_t shim_guid = EFI_SHIM_LOCK_GUID;
|
static const efi_guid_t shim_guid = EFI_SHIM_LOCK_GUID;
|
||||||
static const efi_char16_t shim_MokSBState_name[] = L"MokSBState";
|
static const efi_char16_t shim_MokSBState_name[] = L"MokSBStateRT";
|
||||||
|
|
||||||
#define get_efi_var(name, vendor, ...) \
|
#define get_efi_var(name, vendor, ...) \
|
||||||
efi_call_runtime(get_variable, \
|
efi_call_runtime(get_variable, \
|
||||||
@ -60,8 +60,8 @@ enum efi_secureboot_mode efi_get_secureboot(efi_system_table_t *sys_table_arg)
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* See if a user has put the shim into insecure mode. If so, and if the
|
* See if a user has put the shim into insecure mode. If so, and if the
|
||||||
* variable doesn't have the runtime attribute set, we might as well
|
* variable doesn't have the non-volatile attribute set, we might as
|
||||||
* honor that.
|
* well honor that.
|
||||||
*/
|
*/
|
||||||
size = sizeof(moksbstate);
|
size = sizeof(moksbstate);
|
||||||
status = get_efi_var(shim_MokSBState_name, &shim_guid,
|
status = get_efi_var(shim_MokSBState_name, &shim_guid,
|
||||||
@ -70,7 +70,7 @@ enum efi_secureboot_mode efi_get_secureboot(efi_system_table_t *sys_table_arg)
|
|||||||
/* If it fails, we don't care why. Default to secure */
|
/* If it fails, we don't care why. Default to secure */
|
||||||
if (status != EFI_SUCCESS)
|
if (status != EFI_SUCCESS)
|
||||||
goto secure_boot_enabled;
|
goto secure_boot_enabled;
|
||||||
if (!(attr & EFI_VARIABLE_RUNTIME_ACCESS) && moksbstate == 1)
|
if (!(attr & EFI_VARIABLE_NON_VOLATILE) && moksbstate == 1)
|
||||||
return efi_secureboot_mode_disabled;
|
return efi_secureboot_mode_disabled;
|
||||||
|
|
||||||
secure_boot_enabled:
|
secure_boot_enabled:
|
||||||
|
@ -168,6 +168,7 @@ static int mpc8xxx_irq_set_type(struct irq_data *d, unsigned int flow_type)
|
|||||||
|
|
||||||
switch (flow_type) {
|
switch (flow_type) {
|
||||||
case IRQ_TYPE_EDGE_FALLING:
|
case IRQ_TYPE_EDGE_FALLING:
|
||||||
|
case IRQ_TYPE_LEVEL_LOW:
|
||||||
raw_spin_lock_irqsave(&mpc8xxx_gc->lock, flags);
|
raw_spin_lock_irqsave(&mpc8xxx_gc->lock, flags);
|
||||||
gc->write_reg(mpc8xxx_gc->regs + GPIO_ICR,
|
gc->write_reg(mpc8xxx_gc->regs + GPIO_ICR,
|
||||||
gc->read_reg(mpc8xxx_gc->regs + GPIO_ICR)
|
gc->read_reg(mpc8xxx_gc->regs + GPIO_ICR)
|
||||||
|
@ -1206,6 +1206,7 @@ static void interpolate_user_regamma(uint32_t hw_points_num,
|
|||||||
struct fixed31_32 lut2;
|
struct fixed31_32 lut2;
|
||||||
struct fixed31_32 delta_lut;
|
struct fixed31_32 delta_lut;
|
||||||
struct fixed31_32 delta_index;
|
struct fixed31_32 delta_index;
|
||||||
|
const struct fixed31_32 one = dc_fixpt_from_int(1);
|
||||||
|
|
||||||
i = 0;
|
i = 0;
|
||||||
/* fixed_pt library has problems handling too small values */
|
/* fixed_pt library has problems handling too small values */
|
||||||
@ -1234,6 +1235,9 @@ static void interpolate_user_regamma(uint32_t hw_points_num,
|
|||||||
} else
|
} else
|
||||||
hw_x = coordinates_x[i].x;
|
hw_x = coordinates_x[i].x;
|
||||||
|
|
||||||
|
if (dc_fixpt_le(one, hw_x))
|
||||||
|
hw_x = one;
|
||||||
|
|
||||||
norm_x = dc_fixpt_mul(norm_factor, hw_x);
|
norm_x = dc_fixpt_mul(norm_factor, hw_x);
|
||||||
index = dc_fixpt_floor(norm_x);
|
index = dc_fixpt_floor(norm_x);
|
||||||
if (index < 0 || index > 255)
|
if (index < 0 || index > 255)
|
||||||
|
@ -101,7 +101,7 @@ static void meson_plane_atomic_update(struct drm_plane *plane,
|
|||||||
|
|
||||||
/* Enable OSD and BLK0, set max global alpha */
|
/* Enable OSD and BLK0, set max global alpha */
|
||||||
priv->viu.osd1_ctrl_stat = OSD_ENABLE |
|
priv->viu.osd1_ctrl_stat = OSD_ENABLE |
|
||||||
(0xFF << OSD_GLOBAL_ALPHA_SHIFT) |
|
(0x100 << OSD_GLOBAL_ALPHA_SHIFT) |
|
||||||
OSD_BLK0_ENABLE;
|
OSD_BLK0_ENABLE;
|
||||||
|
|
||||||
/* Set up BLK0 to point to the right canvas */
|
/* Set up BLK0 to point to the right canvas */
|
||||||
|
@ -284,7 +284,8 @@ static int cdn_dp_connector_get_modes(struct drm_connector *connector)
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int cdn_dp_connector_mode_valid(struct drm_connector *connector,
|
static enum drm_mode_status
|
||||||
|
cdn_dp_connector_mode_valid(struct drm_connector *connector,
|
||||||
struct drm_display_mode *mode)
|
struct drm_display_mode *mode)
|
||||||
{
|
{
|
||||||
struct cdn_dp_device *dp = connector_to_dp(connector);
|
struct cdn_dp_device *dp = connector_to_dp(connector);
|
||||||
|
@ -1846,7 +1846,7 @@ int vmbus_allocate_mmio(struct resource **new, struct hv_device *device_obj,
|
|||||||
bool fb_overlap_ok)
|
bool fb_overlap_ok)
|
||||||
{
|
{
|
||||||
struct resource *iter, *shadow;
|
struct resource *iter, *shadow;
|
||||||
resource_size_t range_min, range_max, start;
|
resource_size_t range_min, range_max, start, end;
|
||||||
const char *dev_n = dev_name(&device_obj->device);
|
const char *dev_n = dev_name(&device_obj->device);
|
||||||
int retval;
|
int retval;
|
||||||
|
|
||||||
@ -1881,6 +1881,14 @@ int vmbus_allocate_mmio(struct resource **new, struct hv_device *device_obj,
|
|||||||
range_max = iter->end;
|
range_max = iter->end;
|
||||||
start = (range_min + align - 1) & ~(align - 1);
|
start = (range_min + align - 1) & ~(align - 1);
|
||||||
for (; start + size - 1 <= range_max; start += align) {
|
for (; start + size - 1 <= range_max; start += align) {
|
||||||
|
end = start + size - 1;
|
||||||
|
|
||||||
|
/* Skip the whole fb_mmio region if not fb_overlap_ok */
|
||||||
|
if (!fb_overlap_ok && fb_mmio &&
|
||||||
|
(((start >= fb_mmio->start) && (start <= fb_mmio->end)) ||
|
||||||
|
((end >= fb_mmio->start) && (end <= fb_mmio->end))))
|
||||||
|
continue;
|
||||||
|
|
||||||
shadow = __request_region(iter, start, size, NULL,
|
shadow = __request_region(iter, start, size, NULL,
|
||||||
IORESOURCE_BUSY);
|
IORESOURCE_BUSY);
|
||||||
if (!shadow)
|
if (!shadow)
|
||||||
|
@ -686,6 +686,7 @@ static int gs_can_open(struct net_device *netdev)
|
|||||||
flags |= GS_CAN_MODE_TRIPLE_SAMPLE;
|
flags |= GS_CAN_MODE_TRIPLE_SAMPLE;
|
||||||
|
|
||||||
/* finally start device */
|
/* finally start device */
|
||||||
|
dev->can.state = CAN_STATE_ERROR_ACTIVE;
|
||||||
dm->mode = cpu_to_le32(GS_CAN_MODE_START);
|
dm->mode = cpu_to_le32(GS_CAN_MODE_START);
|
||||||
dm->flags = cpu_to_le32(flags);
|
dm->flags = cpu_to_le32(flags);
|
||||||
rc = usb_control_msg(interface_to_usbdev(dev->iface),
|
rc = usb_control_msg(interface_to_usbdev(dev->iface),
|
||||||
@ -702,13 +703,12 @@ static int gs_can_open(struct net_device *netdev)
|
|||||||
if (rc < 0) {
|
if (rc < 0) {
|
||||||
netdev_err(netdev, "Couldn't start device (err=%d)\n", rc);
|
netdev_err(netdev, "Couldn't start device (err=%d)\n", rc);
|
||||||
kfree(dm);
|
kfree(dm);
|
||||||
|
dev->can.state = CAN_STATE_STOPPED;
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
kfree(dm);
|
kfree(dm);
|
||||||
|
|
||||||
dev->can.state = CAN_STATE_ERROR_ACTIVE;
|
|
||||||
|
|
||||||
parent->active_channels++;
|
parent->active_channels++;
|
||||||
if (!(dev->can.ctrlmode & CAN_CTRLMODE_LISTENONLY))
|
if (!(dev->can.ctrlmode & CAN_CTRLMODE_LISTENONLY))
|
||||||
netif_start_queue(netdev);
|
netif_start_queue(netdev);
|
||||||
|
@ -5487,6 +5487,26 @@ static int i40e_get_link_speed(struct i40e_vsi *vsi)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* i40e_bw_bytes_to_mbits - Convert max_tx_rate from bytes to mbits
|
||||||
|
* @vsi: Pointer to vsi structure
|
||||||
|
* @max_tx_rate: max TX rate in bytes to be converted into Mbits
|
||||||
|
*
|
||||||
|
* Helper function to convert units before send to set BW limit
|
||||||
|
**/
|
||||||
|
static u64 i40e_bw_bytes_to_mbits(struct i40e_vsi *vsi, u64 max_tx_rate)
|
||||||
|
{
|
||||||
|
if (max_tx_rate < I40E_BW_MBPS_DIVISOR) {
|
||||||
|
dev_warn(&vsi->back->pdev->dev,
|
||||||
|
"Setting max tx rate to minimum usable value of 50Mbps.\n");
|
||||||
|
max_tx_rate = I40E_BW_CREDIT_DIVISOR;
|
||||||
|
} else {
|
||||||
|
do_div(max_tx_rate, I40E_BW_MBPS_DIVISOR);
|
||||||
|
}
|
||||||
|
|
||||||
|
return max_tx_rate;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* i40e_set_bw_limit - setup BW limit for Tx traffic based on max_tx_rate
|
* i40e_set_bw_limit - setup BW limit for Tx traffic based on max_tx_rate
|
||||||
* @vsi: VSI to be configured
|
* @vsi: VSI to be configured
|
||||||
@ -5509,10 +5529,10 @@ int i40e_set_bw_limit(struct i40e_vsi *vsi, u16 seid, u64 max_tx_rate)
|
|||||||
max_tx_rate, seid);
|
max_tx_rate, seid);
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
if (max_tx_rate && max_tx_rate < 50) {
|
if (max_tx_rate && max_tx_rate < I40E_BW_CREDIT_DIVISOR) {
|
||||||
dev_warn(&pf->pdev->dev,
|
dev_warn(&pf->pdev->dev,
|
||||||
"Setting max tx rate to minimum usable value of 50Mbps.\n");
|
"Setting max tx rate to minimum usable value of 50Mbps.\n");
|
||||||
max_tx_rate = 50;
|
max_tx_rate = I40E_BW_CREDIT_DIVISOR;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Tx rate credits are in values of 50Mbps, 0 is disabled */
|
/* Tx rate credits are in values of 50Mbps, 0 is disabled */
|
||||||
@ -6949,9 +6969,9 @@ config_tc:
|
|||||||
|
|
||||||
if (pf->flags & I40E_FLAG_TC_MQPRIO) {
|
if (pf->flags & I40E_FLAG_TC_MQPRIO) {
|
||||||
if (vsi->mqprio_qopt.max_rate[0]) {
|
if (vsi->mqprio_qopt.max_rate[0]) {
|
||||||
u64 max_tx_rate = vsi->mqprio_qopt.max_rate[0];
|
u64 max_tx_rate = i40e_bw_bytes_to_mbits(vsi,
|
||||||
|
vsi->mqprio_qopt.max_rate[0]);
|
||||||
|
|
||||||
do_div(max_tx_rate, I40E_BW_MBPS_DIVISOR);
|
|
||||||
ret = i40e_set_bw_limit(vsi, vsi->seid, max_tx_rate);
|
ret = i40e_set_bw_limit(vsi, vsi->seid, max_tx_rate);
|
||||||
if (!ret) {
|
if (!ret) {
|
||||||
u64 credits = max_tx_rate;
|
u64 credits = max_tx_rate;
|
||||||
@ -9613,10 +9633,10 @@ static void i40e_rebuild(struct i40e_pf *pf, bool reinit, bool lock_acquired)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (vsi->mqprio_qopt.max_rate[0]) {
|
if (vsi->mqprio_qopt.max_rate[0]) {
|
||||||
u64 max_tx_rate = vsi->mqprio_qopt.max_rate[0];
|
u64 max_tx_rate = i40e_bw_bytes_to_mbits(vsi,
|
||||||
|
vsi->mqprio_qopt.max_rate[0]);
|
||||||
u64 credits = 0;
|
u64 credits = 0;
|
||||||
|
|
||||||
do_div(max_tx_rate, I40E_BW_MBPS_DIVISOR);
|
|
||||||
ret = i40e_set_bw_limit(vsi, vsi->seid, max_tx_rate);
|
ret = i40e_set_bw_limit(vsi, vsi->seid, max_tx_rate);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto end_unlock;
|
goto end_unlock;
|
||||||
|
@ -1712,6 +1712,25 @@ static void i40e_del_qch(struct i40e_vf *vf)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* i40e_vc_get_max_frame_size
|
||||||
|
* @vf: pointer to the VF
|
||||||
|
*
|
||||||
|
* Max frame size is determined based on the current port's max frame size and
|
||||||
|
* whether a port VLAN is configured on this VF. The VF is not aware whether
|
||||||
|
* it's in a port VLAN so the PF needs to account for this in max frame size
|
||||||
|
* checks and sending the max frame size to the VF.
|
||||||
|
**/
|
||||||
|
static u16 i40e_vc_get_max_frame_size(struct i40e_vf *vf)
|
||||||
|
{
|
||||||
|
u16 max_frame_size = vf->pf->hw.phy.link_info.max_frame_size;
|
||||||
|
|
||||||
|
if (vf->port_vlan_id)
|
||||||
|
max_frame_size -= VLAN_HLEN;
|
||||||
|
|
||||||
|
return max_frame_size;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* i40e_vc_get_vf_resources_msg
|
* i40e_vc_get_vf_resources_msg
|
||||||
* @vf: pointer to the VF info
|
* @vf: pointer to the VF info
|
||||||
@ -1814,6 +1833,7 @@ static int i40e_vc_get_vf_resources_msg(struct i40e_vf *vf, u8 *msg)
|
|||||||
vfres->max_vectors = pf->hw.func_caps.num_msix_vectors_vf;
|
vfres->max_vectors = pf->hw.func_caps.num_msix_vectors_vf;
|
||||||
vfres->rss_key_size = I40E_HKEY_ARRAY_SIZE;
|
vfres->rss_key_size = I40E_HKEY_ARRAY_SIZE;
|
||||||
vfres->rss_lut_size = I40E_VF_HLUT_ARRAY_SIZE;
|
vfres->rss_lut_size = I40E_VF_HLUT_ARRAY_SIZE;
|
||||||
|
vfres->max_mtu = i40e_vc_get_max_frame_size(vf);
|
||||||
|
|
||||||
if (vf->lan_vsi_idx) {
|
if (vf->lan_vsi_idx) {
|
||||||
vfres->vsi_res[0].vsi_id = vf->lan_vsi_id;
|
vfres->vsi_res[0].vsi_id = vf->lan_vsi_id;
|
||||||
|
@ -115,8 +115,11 @@ u32 i40evf_get_tx_pending(struct i40e_ring *ring, bool in_sw)
|
|||||||
{
|
{
|
||||||
u32 head, tail;
|
u32 head, tail;
|
||||||
|
|
||||||
|
/* underlying hardware might not allow access and/or always return
|
||||||
|
* 0 for the head/tail registers so just use the cached values
|
||||||
|
*/
|
||||||
head = ring->next_to_clean;
|
head = ring->next_to_clean;
|
||||||
tail = readl(ring->tail);
|
tail = ring->next_to_use;
|
||||||
|
|
||||||
if (head != tail)
|
if (head != tail)
|
||||||
return (head < tail) ?
|
return (head < tail) ?
|
||||||
|
@ -484,8 +484,6 @@ static int mvpp2_dbgfs_flow_port_init(struct dentry *parent,
|
|||||||
struct dentry *port_dir;
|
struct dentry *port_dir;
|
||||||
|
|
||||||
port_dir = debugfs_create_dir(port->dev->name, parent);
|
port_dir = debugfs_create_dir(port->dev->name, parent);
|
||||||
if (IS_ERR(port_dir))
|
|
||||||
return PTR_ERR(port_dir);
|
|
||||||
|
|
||||||
/* This will be freed by 'hash_opts' release op */
|
/* This will be freed by 'hash_opts' release op */
|
||||||
port_entry = kmalloc(sizeof(*port_entry), GFP_KERNEL);
|
port_entry = kmalloc(sizeof(*port_entry), GFP_KERNEL);
|
||||||
@ -515,8 +513,6 @@ static int mvpp2_dbgfs_flow_entry_init(struct dentry *parent,
|
|||||||
sprintf(flow_entry_name, "%02d", flow);
|
sprintf(flow_entry_name, "%02d", flow);
|
||||||
|
|
||||||
flow_entry_dir = debugfs_create_dir(flow_entry_name, parent);
|
flow_entry_dir = debugfs_create_dir(flow_entry_name, parent);
|
||||||
if (!flow_entry_dir)
|
|
||||||
return -ENOMEM;
|
|
||||||
|
|
||||||
/* This will be freed by 'type' release op */
|
/* This will be freed by 'type' release op */
|
||||||
entry = kmalloc(sizeof(*entry), GFP_KERNEL);
|
entry = kmalloc(sizeof(*entry), GFP_KERNEL);
|
||||||
@ -554,8 +550,6 @@ static int mvpp2_dbgfs_flow_init(struct dentry *parent, struct mvpp2 *priv)
|
|||||||
int i, ret;
|
int i, ret;
|
||||||
|
|
||||||
flow_dir = debugfs_create_dir("flows", parent);
|
flow_dir = debugfs_create_dir("flows", parent);
|
||||||
if (!flow_dir)
|
|
||||||
return -ENOMEM;
|
|
||||||
|
|
||||||
for (i = 0; i < MVPP2_N_FLOWS; i++) {
|
for (i = 0; i < MVPP2_N_FLOWS; i++) {
|
||||||
ret = mvpp2_dbgfs_flow_entry_init(flow_dir, priv, i);
|
ret = mvpp2_dbgfs_flow_entry_init(flow_dir, priv, i);
|
||||||
@ -579,8 +573,6 @@ static int mvpp2_dbgfs_prs_entry_init(struct dentry *parent,
|
|||||||
sprintf(prs_entry_name, "%03d", tid);
|
sprintf(prs_entry_name, "%03d", tid);
|
||||||
|
|
||||||
prs_entry_dir = debugfs_create_dir(prs_entry_name, parent);
|
prs_entry_dir = debugfs_create_dir(prs_entry_name, parent);
|
||||||
if (!prs_entry_dir)
|
|
||||||
return -ENOMEM;
|
|
||||||
|
|
||||||
/* The 'valid' entry's ops will free that */
|
/* The 'valid' entry's ops will free that */
|
||||||
entry = kmalloc(sizeof(*entry), GFP_KERNEL);
|
entry = kmalloc(sizeof(*entry), GFP_KERNEL);
|
||||||
@ -618,8 +610,6 @@ static int mvpp2_dbgfs_prs_init(struct dentry *parent, struct mvpp2 *priv)
|
|||||||
int i, ret;
|
int i, ret;
|
||||||
|
|
||||||
prs_dir = debugfs_create_dir("parser", parent);
|
prs_dir = debugfs_create_dir("parser", parent);
|
||||||
if (!prs_dir)
|
|
||||||
return -ENOMEM;
|
|
||||||
|
|
||||||
for (i = 0; i < MVPP2_PRS_TCAM_SRAM_SIZE; i++) {
|
for (i = 0; i < MVPP2_PRS_TCAM_SRAM_SIZE; i++) {
|
||||||
ret = mvpp2_dbgfs_prs_entry_init(prs_dir, priv, i);
|
ret = mvpp2_dbgfs_prs_entry_init(prs_dir, priv, i);
|
||||||
@ -636,8 +626,6 @@ static int mvpp2_dbgfs_port_init(struct dentry *parent,
|
|||||||
struct dentry *port_dir;
|
struct dentry *port_dir;
|
||||||
|
|
||||||
port_dir = debugfs_create_dir(port->dev->name, parent);
|
port_dir = debugfs_create_dir(port->dev->name, parent);
|
||||||
if (IS_ERR(port_dir))
|
|
||||||
return PTR_ERR(port_dir);
|
|
||||||
|
|
||||||
debugfs_create_file("parser_entries", 0444, port_dir, port,
|
debugfs_create_file("parser_entries", 0444, port_dir, port,
|
||||||
&mvpp2_dbgfs_port_parser_fops);
|
&mvpp2_dbgfs_port_parser_fops);
|
||||||
@ -671,15 +659,10 @@ void mvpp2_dbgfs_init(struct mvpp2 *priv, const char *name)
|
|||||||
int ret, i;
|
int ret, i;
|
||||||
|
|
||||||
mvpp2_root = debugfs_lookup(MVPP2_DRIVER_NAME, NULL);
|
mvpp2_root = debugfs_lookup(MVPP2_DRIVER_NAME, NULL);
|
||||||
if (!mvpp2_root) {
|
if (!mvpp2_root)
|
||||||
mvpp2_root = debugfs_create_dir(MVPP2_DRIVER_NAME, NULL);
|
mvpp2_root = debugfs_create_dir(MVPP2_DRIVER_NAME, NULL);
|
||||||
if (IS_ERR(mvpp2_root))
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
mvpp2_dir = debugfs_create_dir(name, mvpp2_root);
|
mvpp2_dir = debugfs_create_dir(name, mvpp2_root);
|
||||||
if (IS_ERR(mvpp2_dir))
|
|
||||||
return;
|
|
||||||
|
|
||||||
priv->dbgfs_dir = mvpp2_dir;
|
priv->dbgfs_dir = mvpp2_dir;
|
||||||
|
|
||||||
|
@ -2064,9 +2064,9 @@ static void happy_meal_rx(struct happy_meal *hp, struct net_device *dev)
|
|||||||
|
|
||||||
skb_reserve(copy_skb, 2);
|
skb_reserve(copy_skb, 2);
|
||||||
skb_put(copy_skb, len);
|
skb_put(copy_skb, len);
|
||||||
dma_sync_single_for_cpu(hp->dma_dev, dma_addr, len, DMA_FROM_DEVICE);
|
dma_sync_single_for_cpu(hp->dma_dev, dma_addr, len + 2, DMA_FROM_DEVICE);
|
||||||
skb_copy_from_linear_data(skb, copy_skb->data, len);
|
skb_copy_from_linear_data(skb, copy_skb->data, len);
|
||||||
dma_sync_single_for_device(hp->dma_dev, dma_addr, len, DMA_FROM_DEVICE);
|
dma_sync_single_for_device(hp->dma_dev, dma_addr, len + 2, DMA_FROM_DEVICE);
|
||||||
/* Reuse original ring buffer. */
|
/* Reuse original ring buffer. */
|
||||||
hme_write_rxd(hp, this,
|
hme_write_rxd(hp, this,
|
||||||
(RXFLAG_OWN|((RX_BUF_ALLOC_SIZE-RX_OFFSET)<<16)),
|
(RXFLAG_OWN|((RX_BUF_ALLOC_SIZE-RX_OFFSET)<<16)),
|
||||||
|
@ -502,7 +502,6 @@ static int ipvlan_process_v6_outbound(struct sk_buff *skb)
|
|||||||
|
|
||||||
static int ipvlan_process_outbound(struct sk_buff *skb)
|
static int ipvlan_process_outbound(struct sk_buff *skb)
|
||||||
{
|
{
|
||||||
struct ethhdr *ethh = eth_hdr(skb);
|
|
||||||
int ret = NET_XMIT_DROP;
|
int ret = NET_XMIT_DROP;
|
||||||
|
|
||||||
/* The ipvlan is a pseudo-L2 device, so the packets that we receive
|
/* The ipvlan is a pseudo-L2 device, so the packets that we receive
|
||||||
@ -512,6 +511,8 @@ static int ipvlan_process_outbound(struct sk_buff *skb)
|
|||||||
if (skb_mac_header_was_set(skb)) {
|
if (skb_mac_header_was_set(skb)) {
|
||||||
/* In this mode we dont care about
|
/* In this mode we dont care about
|
||||||
* multicast and broadcast traffic */
|
* multicast and broadcast traffic */
|
||||||
|
struct ethhdr *ethh = eth_hdr(skb);
|
||||||
|
|
||||||
if (is_multicast_ether_addr(ethh->h_dest)) {
|
if (is_multicast_ether_addr(ethh->h_dest)) {
|
||||||
pr_debug_ratelimited(
|
pr_debug_ratelimited(
|
||||||
"Dropped {multi|broad}cast of type=[%x]\n",
|
"Dropped {multi|broad}cast of type=[%x]\n",
|
||||||
@ -596,7 +597,7 @@ out:
|
|||||||
static int ipvlan_xmit_mode_l2(struct sk_buff *skb, struct net_device *dev)
|
static int ipvlan_xmit_mode_l2(struct sk_buff *skb, struct net_device *dev)
|
||||||
{
|
{
|
||||||
const struct ipvl_dev *ipvlan = netdev_priv(dev);
|
const struct ipvl_dev *ipvlan = netdev_priv(dev);
|
||||||
struct ethhdr *eth = eth_hdr(skb);
|
struct ethhdr *eth = skb_eth_hdr(skb);
|
||||||
struct ipvl_addr *addr;
|
struct ipvl_addr *addr;
|
||||||
void *lyr3h;
|
void *lyr3h;
|
||||||
int addr_type;
|
int addr_type;
|
||||||
@ -626,6 +627,7 @@ static int ipvlan_xmit_mode_l2(struct sk_buff *skb, struct net_device *dev)
|
|||||||
return dev_forward_skb(ipvlan->phy_dev, skb);
|
return dev_forward_skb(ipvlan->phy_dev, skb);
|
||||||
|
|
||||||
} else if (is_multicast_ether_addr(eth->h_dest)) {
|
} else if (is_multicast_ether_addr(eth->h_dest)) {
|
||||||
|
skb_reset_mac_header(skb);
|
||||||
ipvlan_skb_crossing_ns(skb, NULL);
|
ipvlan_skb_crossing_ns(skb, NULL);
|
||||||
ipvlan_multicast_enqueue(ipvlan->port, skb, true);
|
ipvlan_multicast_enqueue(ipvlan->port, skb, true);
|
||||||
return NET_XMIT_SUCCESS;
|
return NET_XMIT_SUCCESS;
|
||||||
|
@ -1280,10 +1280,12 @@ static int team_port_add(struct team *team, struct net_device *port_dev,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (dev->flags & IFF_UP) {
|
||||||
netif_addr_lock_bh(dev);
|
netif_addr_lock_bh(dev);
|
||||||
dev_uc_sync_multiple(port_dev, dev);
|
dev_uc_sync_multiple(port_dev, dev);
|
||||||
dev_mc_sync_multiple(port_dev, dev);
|
dev_mc_sync_multiple(port_dev, dev);
|
||||||
netif_addr_unlock_bh(dev);
|
netif_addr_unlock_bh(dev);
|
||||||
|
}
|
||||||
|
|
||||||
port->index = -1;
|
port->index = -1;
|
||||||
list_add_tail_rcu(&port->list, &team->port_list);
|
list_add_tail_rcu(&port->list, &team->port_list);
|
||||||
@ -1354,8 +1356,10 @@ static int team_port_del(struct team *team, struct net_device *port_dev)
|
|||||||
netdev_rx_handler_unregister(port_dev);
|
netdev_rx_handler_unregister(port_dev);
|
||||||
team_port_disable_netpoll(port);
|
team_port_disable_netpoll(port);
|
||||||
vlan_vids_del_by_dev(port_dev, dev);
|
vlan_vids_del_by_dev(port_dev, dev);
|
||||||
|
if (dev->flags & IFF_UP) {
|
||||||
dev_uc_unsync(port_dev, dev);
|
dev_uc_unsync(port_dev, dev);
|
||||||
dev_mc_unsync(port_dev, dev);
|
dev_mc_unsync(port_dev, dev);
|
||||||
|
}
|
||||||
dev_close(port_dev);
|
dev_close(port_dev);
|
||||||
team_port_leave(team, port);
|
team_port_leave(team, port);
|
||||||
|
|
||||||
@ -1703,6 +1707,14 @@ static int team_open(struct net_device *dev)
|
|||||||
|
|
||||||
static int team_close(struct net_device *dev)
|
static int team_close(struct net_device *dev)
|
||||||
{
|
{
|
||||||
|
struct team *team = netdev_priv(dev);
|
||||||
|
struct team_port *port;
|
||||||
|
|
||||||
|
list_for_each_entry(port, &team->port_list, list) {
|
||||||
|
dev_uc_unsync(port->dev, dev);
|
||||||
|
dev_mc_unsync(port->dev, dev);
|
||||||
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1049,6 +1049,7 @@ static const struct usb_device_id products[] = {
|
|||||||
{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0512)}, /* Quectel EG12/EM12 */
|
{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0512)}, /* Quectel EG12/EM12 */
|
||||||
{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0620)}, /* Quectel EM160R-GL */
|
{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0620)}, /* Quectel EM160R-GL */
|
||||||
{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0800)}, /* Quectel RM500Q-GL */
|
{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0800)}, /* Quectel RM500Q-GL */
|
||||||
|
{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0801)}, /* Quectel RM520N */
|
||||||
|
|
||||||
/* 3. Combined interface devices matching on interface number */
|
/* 3. Combined interface devices matching on interface number */
|
||||||
{QMI_FIXED_INTF(0x0408, 0xea42, 4)}, /* Yota / Megafon M100-1 */
|
{QMI_FIXED_INTF(0x0408, 0xea42, 4)}, /* Yota / Megafon M100-1 */
|
||||||
|
@ -504,6 +504,7 @@ static void __nvmet_req_complete(struct nvmet_req *req, u16 status)
|
|||||||
{
|
{
|
||||||
u32 old_sqhd, new_sqhd;
|
u32 old_sqhd, new_sqhd;
|
||||||
u16 sqhd;
|
u16 sqhd;
|
||||||
|
struct nvmet_ns *ns = req->ns;
|
||||||
|
|
||||||
if (status)
|
if (status)
|
||||||
nvmet_set_status(req, status);
|
nvmet_set_status(req, status);
|
||||||
@ -520,9 +521,9 @@ static void __nvmet_req_complete(struct nvmet_req *req, u16 status)
|
|||||||
req->rsp->sq_id = cpu_to_le16(req->sq->qid);
|
req->rsp->sq_id = cpu_to_le16(req->sq->qid);
|
||||||
req->rsp->command_id = req->cmd->common.command_id;
|
req->rsp->command_id = req->cmd->common.command_id;
|
||||||
|
|
||||||
if (req->ns)
|
|
||||||
nvmet_put_namespace(req->ns);
|
|
||||||
req->ops->queue_response(req);
|
req->ops->queue_response(req);
|
||||||
|
if (ns)
|
||||||
|
nvmet_put_namespace(ns);
|
||||||
}
|
}
|
||||||
|
|
||||||
void nvmet_req_complete(struct nvmet_req *req, u16 status)
|
void nvmet_req_complete(struct nvmet_req *req, u16 status)
|
||||||
|
@ -484,7 +484,7 @@ static int unflatten_dt_nodes(const void *blob,
|
|||||||
for (offset = 0;
|
for (offset = 0;
|
||||||
offset >= 0 && depth >= initial_depth;
|
offset >= 0 && depth >= initial_depth;
|
||||||
offset = fdt_next_node(blob, offset, &depth)) {
|
offset = fdt_next_node(blob, offset, &depth)) {
|
||||||
if (WARN_ON_ONCE(depth >= FDT_MAX_DEPTH))
|
if (WARN_ON_ONCE(depth >= FDT_MAX_DEPTH - 1))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (!IS_ENABLED(CONFIG_OF_KOBJ) &&
|
if (!IS_ENABLED(CONFIG_OF_KOBJ) &&
|
||||||
|
@ -283,6 +283,7 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)
|
|||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
unregister:
|
unregister:
|
||||||
|
of_node_put(child);
|
||||||
mdiobus_unregister(mdio);
|
mdiobus_unregister(mdio);
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
@ -1555,6 +1555,7 @@ static int __init ccio_probe(struct parisc_device *dev)
|
|||||||
}
|
}
|
||||||
ccio_ioc_init(ioc);
|
ccio_ioc_init(ioc);
|
||||||
if (ccio_init_resources(ioc)) {
|
if (ccio_init_resources(ioc)) {
|
||||||
|
iounmap(ioc->ioc_regs);
|
||||||
kfree(ioc);
|
kfree(ioc);
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
@ -710,7 +710,7 @@ static int pfuze100_regulator_probe(struct i2c_client *client,
|
|||||||
((pfuze_chip->chip_id == PFUZE3000) ? "3000" : "3001"))));
|
((pfuze_chip->chip_id == PFUZE3000) ? "3000" : "3001"))));
|
||||||
|
|
||||||
memcpy(pfuze_chip->regulator_descs, pfuze_chip->pfuze_regulators,
|
memcpy(pfuze_chip->regulator_descs, pfuze_chip->pfuze_regulators,
|
||||||
sizeof(pfuze_chip->regulator_descs));
|
regulator_num * sizeof(struct pfuze_regulator));
|
||||||
|
|
||||||
ret = pfuze_parse_regulators_dt(pfuze_chip);
|
ret = pfuze_parse_regulators_dt(pfuze_chip);
|
||||||
if (ret)
|
if (ret)
|
||||||
|
@ -675,12 +675,12 @@ int dasd_alias_remove_device(struct dasd_device *device)
|
|||||||
struct dasd_device *dasd_alias_get_start_dev(struct dasd_device *base_device)
|
struct dasd_device *dasd_alias_get_start_dev(struct dasd_device *base_device)
|
||||||
{
|
{
|
||||||
struct dasd_eckd_private *alias_priv, *private = base_device->private;
|
struct dasd_eckd_private *alias_priv, *private = base_device->private;
|
||||||
struct alias_pav_group *group = private->pavgroup;
|
|
||||||
struct alias_lcu *lcu = private->lcu;
|
struct alias_lcu *lcu = private->lcu;
|
||||||
struct dasd_device *alias_device;
|
struct dasd_device *alias_device;
|
||||||
|
struct alias_pav_group *group;
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
|
||||||
if (!group || !lcu)
|
if (!lcu)
|
||||||
return NULL;
|
return NULL;
|
||||||
if (lcu->pav == NO_PAV ||
|
if (lcu->pav == NO_PAV ||
|
||||||
lcu->flags & (NEED_UAC_UPDATE | UPDATE_PENDING))
|
lcu->flags & (NEED_UAC_UPDATE | UPDATE_PENDING))
|
||||||
@ -697,6 +697,11 @@ struct dasd_device *dasd_alias_get_start_dev(struct dasd_device *base_device)
|
|||||||
}
|
}
|
||||||
|
|
||||||
spin_lock_irqsave(&lcu->lock, flags);
|
spin_lock_irqsave(&lcu->lock, flags);
|
||||||
|
group = private->pavgroup;
|
||||||
|
if (!group) {
|
||||||
|
spin_unlock_irqrestore(&lcu->lock, flags);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
alias_device = group->next;
|
alias_device = group->next;
|
||||||
if (!alias_device) {
|
if (!alias_device) {
|
||||||
if (list_empty(&group->aliaslist)) {
|
if (list_empty(&group->aliaslist)) {
|
||||||
|
@ -398,7 +398,7 @@ static void tegra_uart_tx_dma_complete(void *args)
|
|||||||
count = tup->tx_bytes_requested - state.residue;
|
count = tup->tx_bytes_requested - state.residue;
|
||||||
async_tx_ack(tup->tx_dma_desc);
|
async_tx_ack(tup->tx_dma_desc);
|
||||||
spin_lock_irqsave(&tup->uport.lock, flags);
|
spin_lock_irqsave(&tup->uport.lock, flags);
|
||||||
xmit->tail = (xmit->tail + count) & (UART_XMIT_SIZE - 1);
|
uart_xmit_advance(&tup->uport, count);
|
||||||
tup->tx_in_progress = 0;
|
tup->tx_in_progress = 0;
|
||||||
if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
|
if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
|
||||||
uart_write_wakeup(&tup->uport);
|
uart_write_wakeup(&tup->uport);
|
||||||
@ -482,7 +482,6 @@ static unsigned int tegra_uart_tx_empty(struct uart_port *u)
|
|||||||
static void tegra_uart_stop_tx(struct uart_port *u)
|
static void tegra_uart_stop_tx(struct uart_port *u)
|
||||||
{
|
{
|
||||||
struct tegra_uart_port *tup = to_tegra_uport(u);
|
struct tegra_uart_port *tup = to_tegra_uport(u);
|
||||||
struct circ_buf *xmit = &tup->uport.state->xmit;
|
|
||||||
struct dma_tx_state state;
|
struct dma_tx_state state;
|
||||||
unsigned int count;
|
unsigned int count;
|
||||||
|
|
||||||
@ -493,7 +492,7 @@ static void tegra_uart_stop_tx(struct uart_port *u)
|
|||||||
dmaengine_tx_status(tup->tx_dma_chan, tup->tx_cookie, &state);
|
dmaengine_tx_status(tup->tx_dma_chan, tup->tx_cookie, &state);
|
||||||
count = tup->tx_bytes_requested - state.residue;
|
count = tup->tx_bytes_requested - state.residue;
|
||||||
async_tx_ack(tup->tx_dma_desc);
|
async_tx_ack(tup->tx_dma_desc);
|
||||||
xmit->tail = (xmit->tail + count) & (UART_XMIT_SIZE - 1);
|
uart_xmit_advance(&tup->uport, count);
|
||||||
tup->tx_in_progress = 0;
|
tup->tx_in_progress = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -36,6 +36,11 @@
|
|||||||
#define PCI_DEVICE_ID_INTEL_CNPH 0xa36e
|
#define PCI_DEVICE_ID_INTEL_CNPH 0xa36e
|
||||||
#define PCI_DEVICE_ID_INTEL_CNPV 0xa3b0
|
#define PCI_DEVICE_ID_INTEL_CNPV 0xa3b0
|
||||||
#define PCI_DEVICE_ID_INTEL_ICLLP 0x34ee
|
#define PCI_DEVICE_ID_INTEL_ICLLP 0x34ee
|
||||||
|
#define PCI_DEVICE_ID_INTEL_EHLLP 0x4b7e
|
||||||
|
#define PCI_DEVICE_ID_INTEL_TGPLP 0xa0ee
|
||||||
|
#define PCI_DEVICE_ID_INTEL_TGPH 0x43ee
|
||||||
|
#define PCI_DEVICE_ID_INTEL_JSP 0x4dee
|
||||||
|
#define PCI_DEVICE_ID_INTEL_ADLS 0x7ae1
|
||||||
|
|
||||||
#define PCI_INTEL_BXT_DSM_GUID "732b85d5-b7a7-4a1b-9ba0-4bbd00ffd511"
|
#define PCI_INTEL_BXT_DSM_GUID "732b85d5-b7a7-4a1b-9ba0-4bbd00ffd511"
|
||||||
#define PCI_INTEL_BXT_FUNC_PMU_PWR 4
|
#define PCI_INTEL_BXT_FUNC_PMU_PWR 4
|
||||||
@ -144,7 +149,8 @@ static int dwc3_pci_quirks(struct dwc3_pci *dwc)
|
|||||||
|
|
||||||
if (pdev->vendor == PCI_VENDOR_ID_INTEL) {
|
if (pdev->vendor == PCI_VENDOR_ID_INTEL) {
|
||||||
if (pdev->device == PCI_DEVICE_ID_INTEL_BXT ||
|
if (pdev->device == PCI_DEVICE_ID_INTEL_BXT ||
|
||||||
pdev->device == PCI_DEVICE_ID_INTEL_BXT_M) {
|
pdev->device == PCI_DEVICE_ID_INTEL_BXT_M ||
|
||||||
|
pdev->device == PCI_DEVICE_ID_INTEL_EHLLP) {
|
||||||
guid_parse(PCI_INTEL_BXT_DSM_GUID, &dwc->guid);
|
guid_parse(PCI_INTEL_BXT_DSM_GUID, &dwc->guid);
|
||||||
dwc->has_dsm_for_pm = true;
|
dwc->has_dsm_for_pm = true;
|
||||||
}
|
}
|
||||||
@ -351,6 +357,21 @@ static const struct pci_device_id dwc3_pci_id_table[] = {
|
|||||||
{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ICLLP),
|
{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ICLLP),
|
||||||
(kernel_ulong_t) &dwc3_pci_intel_properties, },
|
(kernel_ulong_t) &dwc3_pci_intel_properties, },
|
||||||
|
|
||||||
|
{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_EHLLP),
|
||||||
|
(kernel_ulong_t) &dwc3_pci_intel_properties, },
|
||||||
|
|
||||||
|
{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_TGPLP),
|
||||||
|
(kernel_ulong_t) &dwc3_pci_intel_properties, },
|
||||||
|
|
||||||
|
{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_TGPH),
|
||||||
|
(kernel_ulong_t) &dwc3_pci_intel_properties, },
|
||||||
|
|
||||||
|
{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_JSP),
|
||||||
|
(kernel_ulong_t) &dwc3_pci_intel_properties, },
|
||||||
|
|
||||||
|
{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ADLS),
|
||||||
|
(kernel_ulong_t) &dwc3_pci_intel_properties, },
|
||||||
|
|
||||||
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_NL_USB),
|
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_NL_USB),
|
||||||
(kernel_ulong_t) &dwc3_pci_amd_properties, },
|
(kernel_ulong_t) &dwc3_pci_amd_properties, },
|
||||||
{ } /* Terminating Entry */
|
{ } /* Terminating Entry */
|
||||||
|
@ -256,6 +256,7 @@ static void option_instat_callback(struct urb *urb);
|
|||||||
#define QUECTEL_PRODUCT_EM060K 0x030b
|
#define QUECTEL_PRODUCT_EM060K 0x030b
|
||||||
#define QUECTEL_PRODUCT_EM12 0x0512
|
#define QUECTEL_PRODUCT_EM12 0x0512
|
||||||
#define QUECTEL_PRODUCT_RM500Q 0x0800
|
#define QUECTEL_PRODUCT_RM500Q 0x0800
|
||||||
|
#define QUECTEL_PRODUCT_RM520N 0x0801
|
||||||
#define QUECTEL_PRODUCT_EC200S_CN 0x6002
|
#define QUECTEL_PRODUCT_EC200S_CN 0x6002
|
||||||
#define QUECTEL_PRODUCT_EC200T 0x6026
|
#define QUECTEL_PRODUCT_EC200T 0x6026
|
||||||
#define QUECTEL_PRODUCT_RM500K 0x7001
|
#define QUECTEL_PRODUCT_RM500K 0x7001
|
||||||
@ -1138,6 +1139,8 @@ static const struct usb_device_id option_ids[] = {
|
|||||||
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG95, 0xff, 0xff, 0xff),
|
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG95, 0xff, 0xff, 0xff),
|
||||||
.driver_info = NUMEP2 },
|
.driver_info = NUMEP2 },
|
||||||
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG95, 0xff, 0, 0) },
|
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG95, 0xff, 0, 0) },
|
||||||
|
{ USB_DEVICE_INTERFACE_CLASS(QUECTEL_VENDOR_ID, 0x0203, 0xff), /* BG95-M3 */
|
||||||
|
.driver_info = ZLP },
|
||||||
{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
|
{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
|
||||||
.driver_info = RSVD(4) },
|
.driver_info = RSVD(4) },
|
||||||
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EP06, 0xff, 0xff, 0xff),
|
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EP06, 0xff, 0xff, 0xff),
|
||||||
@ -1159,6 +1162,9 @@ static const struct usb_device_id option_ids[] = {
|
|||||||
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500Q, 0xff, 0, 0) },
|
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500Q, 0xff, 0, 0) },
|
||||||
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500Q, 0xff, 0xff, 0x10),
|
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500Q, 0xff, 0xff, 0x10),
|
||||||
.driver_info = ZLP },
|
.driver_info = ZLP },
|
||||||
|
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM520N, 0xff, 0xff, 0x30) },
|
||||||
|
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM520N, 0xff, 0, 0x40) },
|
||||||
|
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM520N, 0xff, 0, 0) },
|
||||||
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200S_CN, 0xff, 0, 0) },
|
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200S_CN, 0xff, 0, 0) },
|
||||||
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200T, 0xff, 0, 0) },
|
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200T, 0xff, 0, 0) },
|
||||||
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500K, 0xff, 0x00, 0x00) },
|
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500K, 0xff, 0x00, 0x00) },
|
||||||
|
@ -394,7 +394,7 @@ pxa3xx_gcu_write(struct file *file, const char *buff,
|
|||||||
struct pxa3xx_gcu_batch *buffer;
|
struct pxa3xx_gcu_batch *buffer;
|
||||||
struct pxa3xx_gcu_priv *priv = to_pxa3xx_gcu_priv(file);
|
struct pxa3xx_gcu_priv *priv = to_pxa3xx_gcu_priv(file);
|
||||||
|
|
||||||
int words = count / 4;
|
size_t words = count / 4;
|
||||||
|
|
||||||
/* Does not need to be atomic. There's a lock in user space,
|
/* Does not need to be atomic. There's a lock in user space,
|
||||||
* but anyhow, this is just for statistics. */
|
* but anyhow, this is just for statistics. */
|
||||||
|
@ -168,8 +168,8 @@ smb_send_kvec(struct TCP_Server_Info *server, struct msghdr *smb_msg,
|
|||||||
|
|
||||||
*sent = 0;
|
*sent = 0;
|
||||||
|
|
||||||
smb_msg->msg_name = (struct sockaddr *) &server->dstaddr;
|
smb_msg->msg_name = NULL;
|
||||||
smb_msg->msg_namelen = sizeof(struct sockaddr);
|
smb_msg->msg_namelen = 0;
|
||||||
smb_msg->msg_control = NULL;
|
smb_msg->msg_control = NULL;
|
||||||
smb_msg->msg_controllen = 0;
|
smb_msg->msg_controllen = 0;
|
||||||
if (server->noblocksnd)
|
if (server->noblocksnd)
|
||||||
|
@ -505,7 +505,7 @@ static int find_group_orlov(struct super_block *sb, struct inode *parent,
|
|||||||
goto fallback;
|
goto fallback;
|
||||||
}
|
}
|
||||||
|
|
||||||
max_dirs = ndirs / ngroups + inodes_per_group / 16;
|
max_dirs = ndirs / ngroups + inodes_per_group*flex_size / 16;
|
||||||
min_inodes = avefreei - inodes_per_group*flex_size / 4;
|
min_inodes = avefreei - inodes_per_group*flex_size / 4;
|
||||||
if (min_inodes < 1)
|
if (min_inodes < 1)
|
||||||
min_inodes = 1;
|
min_inodes = 1;
|
||||||
|
@ -306,6 +306,23 @@ struct uart_state {
|
|||||||
/* number of characters left in xmit buffer before we ask for more */
|
/* number of characters left in xmit buffer before we ask for more */
|
||||||
#define WAKEUP_CHARS 256
|
#define WAKEUP_CHARS 256
|
||||||
|
|
||||||
|
/**
|
||||||
|
* uart_xmit_advance - Advance xmit buffer and account Tx'ed chars
|
||||||
|
* @up: uart_port structure describing the port
|
||||||
|
* @chars: number of characters sent
|
||||||
|
*
|
||||||
|
* This function advances the tail of circular xmit buffer by the number of
|
||||||
|
* @chars transmitted and handles accounting of transmitted bytes (into
|
||||||
|
* @up's icount.tx).
|
||||||
|
*/
|
||||||
|
static inline void uart_xmit_advance(struct uart_port *up, unsigned int chars)
|
||||||
|
{
|
||||||
|
struct circ_buf *xmit = &up->state->xmit;
|
||||||
|
|
||||||
|
xmit->tail = (xmit->tail + chars) & (UART_XMIT_SIZE - 1);
|
||||||
|
up->icount.tx += chars;
|
||||||
|
}
|
||||||
|
|
||||||
struct module;
|
struct module;
|
||||||
struct tty_driver;
|
struct tty_driver;
|
||||||
|
|
||||||
|
@ -2942,10 +2942,8 @@ static bool __flush_work(struct work_struct *work, bool from_cancel)
|
|||||||
if (WARN_ON(!work->func))
|
if (WARN_ON(!work->func))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
if (!from_cancel) {
|
|
||||||
lock_map_acquire(&work->lockdep_map);
|
lock_map_acquire(&work->lockdep_map);
|
||||||
lock_map_release(&work->lockdep_map);
|
lock_map_release(&work->lockdep_map);
|
||||||
}
|
|
||||||
|
|
||||||
if (start_flush_work(work, &barr, from_cancel)) {
|
if (start_flush_work(work, &barr, from_cancel)) {
|
||||||
wait_for_completion(&barr.done);
|
wait_for_completion(&barr.done);
|
||||||
|
@ -5737,7 +5737,8 @@ static char *create_unique_id(struct kmem_cache *s)
|
|||||||
char *name = kmalloc(ID_STR_LENGTH, GFP_KERNEL);
|
char *name = kmalloc(ID_STR_LENGTH, GFP_KERNEL);
|
||||||
char *p = name;
|
char *p = name;
|
||||||
|
|
||||||
BUG_ON(!name);
|
if (!name)
|
||||||
|
return ERR_PTR(-ENOMEM);
|
||||||
|
|
||||||
*p++ = ':';
|
*p++ = ':';
|
||||||
/*
|
/*
|
||||||
@ -5819,6 +5820,8 @@ static int sysfs_slab_add(struct kmem_cache *s)
|
|||||||
* for the symlinks.
|
* for the symlinks.
|
||||||
*/
|
*/
|
||||||
name = create_unique_id(s);
|
name = create_unique_id(s);
|
||||||
|
if (IS_ERR(name))
|
||||||
|
return PTR_ERR(name);
|
||||||
}
|
}
|
||||||
|
|
||||||
s->kobj.kset = kset;
|
s->kobj.kset = kset;
|
||||||
|
@ -1003,8 +1003,10 @@ static int do_replace_finish(struct net *net, struct ebt_replace *repl,
|
|||||||
goto free_iterate;
|
goto free_iterate;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (repl->valid_hooks != t->valid_hooks)
|
if (repl->valid_hooks != t->valid_hooks) {
|
||||||
|
ret = -EINVAL;
|
||||||
goto free_unlock;
|
goto free_unlock;
|
||||||
|
}
|
||||||
|
|
||||||
if (repl->num_counters && repl->num_counters != t->private->nentries) {
|
if (repl->num_counters && repl->num_counters != t->private->nentries) {
|
||||||
ret = -EINVAL;
|
ret = -EINVAL;
|
||||||
|
@ -412,10 +412,6 @@ static void __ieee80211_scan_completed(struct ieee80211_hw *hw, bool aborted)
|
|||||||
scan_req = rcu_dereference_protected(local->scan_req,
|
scan_req = rcu_dereference_protected(local->scan_req,
|
||||||
lockdep_is_held(&local->mtx));
|
lockdep_is_held(&local->mtx));
|
||||||
|
|
||||||
if (scan_req != local->int_scan_req) {
|
|
||||||
local->scan_info.aborted = aborted;
|
|
||||||
cfg80211_scan_done(scan_req, &local->scan_info);
|
|
||||||
}
|
|
||||||
RCU_INIT_POINTER(local->scan_req, NULL);
|
RCU_INIT_POINTER(local->scan_req, NULL);
|
||||||
|
|
||||||
scan_sdata = rcu_dereference_protected(local->scan_sdata,
|
scan_sdata = rcu_dereference_protected(local->scan_sdata,
|
||||||
@ -425,6 +421,13 @@ static void __ieee80211_scan_completed(struct ieee80211_hw *hw, bool aborted)
|
|||||||
local->scanning = 0;
|
local->scanning = 0;
|
||||||
local->scan_chandef.chan = NULL;
|
local->scan_chandef.chan = NULL;
|
||||||
|
|
||||||
|
synchronize_rcu();
|
||||||
|
|
||||||
|
if (scan_req != local->int_scan_req) {
|
||||||
|
local->scan_info.aborted = aborted;
|
||||||
|
cfg80211_scan_done(scan_req, &local->scan_info);
|
||||||
|
}
|
||||||
|
|
||||||
/* Set power back to normal operating levels. */
|
/* Set power back to normal operating levels. */
|
||||||
ieee80211_hw_config(local, 0);
|
ieee80211_hw_config(local, 0);
|
||||||
|
|
||||||
|
@ -150,15 +150,37 @@ static int help(struct sk_buff *skb, unsigned int protoff,
|
|||||||
data = ib_ptr;
|
data = ib_ptr;
|
||||||
data_limit = ib_ptr + skb->len - dataoff;
|
data_limit = ib_ptr + skb->len - dataoff;
|
||||||
|
|
||||||
/* strlen("\1DCC SENT t AAAAAAAA P\1\n")=24
|
/* Skip any whitespace */
|
||||||
* 5+MINMATCHLEN+strlen("t AAAAAAAA P\1\n")=14 */
|
while (data < data_limit - 10) {
|
||||||
while (data < data_limit - (19 + MINMATCHLEN)) {
|
if (*data == ' ' || *data == '\r' || *data == '\n')
|
||||||
if (memcmp(data, "\1DCC ", 5)) {
|
data++;
|
||||||
|
else
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* strlen("PRIVMSG x ")=10 */
|
||||||
|
if (data < data_limit - 10) {
|
||||||
|
if (strncasecmp("PRIVMSG ", data, 8))
|
||||||
|
goto out;
|
||||||
|
data += 8;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* strlen(" :\1DCC SENT t AAAAAAAA P\1\n")=26
|
||||||
|
* 7+MINMATCHLEN+strlen("t AAAAAAAA P\1\n")=26
|
||||||
|
*/
|
||||||
|
while (data < data_limit - (21 + MINMATCHLEN)) {
|
||||||
|
/* Find first " :", the start of message */
|
||||||
|
if (memcmp(data, " :", 2)) {
|
||||||
data++;
|
data++;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
data += 2;
|
||||||
|
|
||||||
|
/* then check that place only for the DCC command */
|
||||||
|
if (memcmp(data, "\1DCC ", 5))
|
||||||
|
goto out;
|
||||||
data += 5;
|
data += 5;
|
||||||
/* we have at least (19+MINMATCHLEN)-5 bytes valid data left */
|
/* we have at least (21+MINMATCHLEN)-(2+5) bytes valid data left */
|
||||||
|
|
||||||
iph = ip_hdr(skb);
|
iph = ip_hdr(skb);
|
||||||
pr_debug("DCC found in master %pI4:%u %pI4:%u\n",
|
pr_debug("DCC found in master %pI4:%u %pI4:%u\n",
|
||||||
@ -174,7 +196,7 @@ static int help(struct sk_buff *skb, unsigned int protoff,
|
|||||||
pr_debug("DCC %s detected\n", dccprotos[i]);
|
pr_debug("DCC %s detected\n", dccprotos[i]);
|
||||||
|
|
||||||
/* we have at least
|
/* we have at least
|
||||||
* (19+MINMATCHLEN)-5-dccprotos[i].matchlen bytes valid
|
* (21+MINMATCHLEN)-7-dccprotos[i].matchlen bytes valid
|
||||||
* data left (== 14/13 bytes) */
|
* data left (== 14/13 bytes) */
|
||||||
if (parse_dcc(data, data_limit, &dcc_ip,
|
if (parse_dcc(data, data_limit, &dcc_ip,
|
||||||
&dcc_port, &addr_beg_p, &addr_end_p)) {
|
&dcc_port, &addr_beg_p, &addr_end_p)) {
|
||||||
|
@ -471,7 +471,7 @@ static int ct_sip_walk_headers(const struct nf_conn *ct, const char *dptr,
|
|||||||
return ret;
|
return ret;
|
||||||
if (ret == 0)
|
if (ret == 0)
|
||||||
break;
|
break;
|
||||||
dataoff += *matchoff;
|
dataoff = *matchoff;
|
||||||
}
|
}
|
||||||
*in_header = 0;
|
*in_header = 0;
|
||||||
}
|
}
|
||||||
@ -483,7 +483,7 @@ static int ct_sip_walk_headers(const struct nf_conn *ct, const char *dptr,
|
|||||||
break;
|
break;
|
||||||
if (ret == 0)
|
if (ret == 0)
|
||||||
return ret;
|
return ret;
|
||||||
dataoff += *matchoff;
|
dataoff = *matchoff;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (in_header)
|
if (in_header)
|
||||||
|
@ -452,6 +452,9 @@ static void rxrpc_local_processor(struct work_struct *work)
|
|||||||
container_of(work, struct rxrpc_local, processor);
|
container_of(work, struct rxrpc_local, processor);
|
||||||
bool again;
|
bool again;
|
||||||
|
|
||||||
|
if (local->dead)
|
||||||
|
return;
|
||||||
|
|
||||||
trace_rxrpc_local(local->debug_id, rxrpc_local_processing,
|
trace_rxrpc_local(local->debug_id, rxrpc_local_processing,
|
||||||
atomic_read(&local->usage), NULL);
|
atomic_read(&local->usage), NULL);
|
||||||
|
|
||||||
|
@ -41,4 +41,4 @@
|
|||||||
# so we just ignore them to let readprofile continue to work.
|
# so we just ignore them to let readprofile continue to work.
|
||||||
# (At least sparc64 has __crc_ in the middle).
|
# (At least sparc64 has __crc_ in the middle).
|
||||||
|
|
||||||
$NM -n $1 | grep -v '\( [aNUw] \)\|\(__crc_\)\|\( \$[adt]\)\|\( \.L\)' > $2
|
$NM -n $1 | grep -v '\( [aNUw] \)\|\(__crc_\)\|\( \$[adt]\)\|\( \.L\)\|\( L0\)' > $2
|
||||||
|
@ -2634,6 +2634,8 @@ static const struct pci_device_id azx_ids[] = {
|
|||||||
/* 5 Series/3400 */
|
/* 5 Series/3400 */
|
||||||
{ PCI_DEVICE(0x8086, 0x3b56),
|
{ PCI_DEVICE(0x8086, 0x3b56),
|
||||||
.driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM },
|
.driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM },
|
||||||
|
{ PCI_DEVICE(0x8086, 0x3b57),
|
||||||
|
.driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM },
|
||||||
/* Poulsbo */
|
/* Poulsbo */
|
||||||
{ PCI_DEVICE(0x8086, 0x811b),
|
{ PCI_DEVICE(0x8086, 0x811b),
|
||||||
.driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_BASE },
|
.driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_BASE },
|
||||||
|
@ -3455,6 +3455,7 @@ static int patch_tegra_hdmi(struct hda_codec *codec)
|
|||||||
if (err)
|
if (err)
|
||||||
return err;
|
return err;
|
||||||
|
|
||||||
|
codec->depop_delay = 10;
|
||||||
codec->patch_ops.build_pcms = tegra_hdmi_build_pcms;
|
codec->patch_ops.build_pcms = tegra_hdmi_build_pcms;
|
||||||
spec = codec->spec;
|
spec = codec->spec;
|
||||||
spec->chmap.ops.chmap_cea_alloc_validate_get_type =
|
spec->chmap.ops.chmap_cea_alloc_validate_get_type =
|
||||||
|
@ -7081,6 +7081,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
|
|||||||
SND_PCI_QUIRK(0x1028, 0x0871, "Dell Precision 3630", ALC255_FIXUP_DELL_HEADSET_MIC),
|
SND_PCI_QUIRK(0x1028, 0x0871, "Dell Precision 3630", ALC255_FIXUP_DELL_HEADSET_MIC),
|
||||||
SND_PCI_QUIRK(0x1028, 0x0872, "Dell Precision 3630", ALC255_FIXUP_DELL_HEADSET_MIC),
|
SND_PCI_QUIRK(0x1028, 0x0872, "Dell Precision 3630", ALC255_FIXUP_DELL_HEADSET_MIC),
|
||||||
SND_PCI_QUIRK(0x1028, 0x0873, "Dell Precision 3930", ALC255_FIXUP_DUMMY_LINEOUT_VERB),
|
SND_PCI_QUIRK(0x1028, 0x0873, "Dell Precision 3930", ALC255_FIXUP_DUMMY_LINEOUT_VERB),
|
||||||
|
SND_PCI_QUIRK(0x1028, 0x087d, "Dell Precision 5530", ALC289_FIXUP_DUAL_SPK),
|
||||||
SND_PCI_QUIRK(0x1028, 0x08ad, "Dell WYSE AIO", ALC225_FIXUP_DELL_WYSE_AIO_MIC_NO_PRESENCE),
|
SND_PCI_QUIRK(0x1028, 0x08ad, "Dell WYSE AIO", ALC225_FIXUP_DELL_WYSE_AIO_MIC_NO_PRESENCE),
|
||||||
SND_PCI_QUIRK(0x1028, 0x08ae, "Dell WYSE NB", ALC225_FIXUP_DELL1_MIC_NO_PRESENCE),
|
SND_PCI_QUIRK(0x1028, 0x08ae, "Dell WYSE NB", ALC225_FIXUP_DELL1_MIC_NO_PRESENCE),
|
||||||
SND_PCI_QUIRK(0x1028, 0x0935, "Dell", ALC274_FIXUP_DELL_AIO_LINEOUT_VERB),
|
SND_PCI_QUIRK(0x1028, 0x0935, "Dell", ALC274_FIXUP_DELL_AIO_LINEOUT_VERB),
|
||||||
|
@ -222,6 +222,7 @@ struct sigmatel_spec {
|
|||||||
|
|
||||||
/* beep widgets */
|
/* beep widgets */
|
||||||
hda_nid_t anabeep_nid;
|
hda_nid_t anabeep_nid;
|
||||||
|
bool beep_power_on;
|
||||||
|
|
||||||
/* SPDIF-out mux */
|
/* SPDIF-out mux */
|
||||||
const char * const *spdif_labels;
|
const char * const *spdif_labels;
|
||||||
@ -4463,6 +4464,28 @@ static int stac_suspend(struct hda_codec *codec)
|
|||||||
stac_shutup(codec);
|
stac_shutup(codec);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int stac_check_power_status(struct hda_codec *codec, hda_nid_t nid)
|
||||||
|
{
|
||||||
|
#ifdef CONFIG_SND_HDA_INPUT_BEEP
|
||||||
|
struct sigmatel_spec *spec = codec->spec;
|
||||||
|
#endif
|
||||||
|
int ret = snd_hda_gen_check_power_status(codec, nid);
|
||||||
|
|
||||||
|
#ifdef CONFIG_SND_HDA_INPUT_BEEP
|
||||||
|
if (nid == spec->gen.beep_nid && codec->beep) {
|
||||||
|
if (codec->beep->enabled != spec->beep_power_on) {
|
||||||
|
spec->beep_power_on = codec->beep->enabled;
|
||||||
|
if (spec->beep_power_on)
|
||||||
|
snd_hda_power_up_pm(codec);
|
||||||
|
else
|
||||||
|
snd_hda_power_down_pm(codec);
|
||||||
|
}
|
||||||
|
ret |= spec->beep_power_on;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
#else
|
#else
|
||||||
#define stac_suspend NULL
|
#define stac_suspend NULL
|
||||||
#endif /* CONFIG_PM */
|
#endif /* CONFIG_PM */
|
||||||
@ -4475,6 +4498,7 @@ static const struct hda_codec_ops stac_patch_ops = {
|
|||||||
.unsol_event = snd_hda_jack_unsol_event,
|
.unsol_event = snd_hda_jack_unsol_event,
|
||||||
#ifdef CONFIG_PM
|
#ifdef CONFIG_PM
|
||||||
.suspend = stac_suspend,
|
.suspend = stac_suspend,
|
||||||
|
.check_power_status = stac_check_power_status,
|
||||||
#endif
|
#endif
|
||||||
.reboot_notify = stac_shutup,
|
.reboot_notify = stac_shutup,
|
||||||
};
|
};
|
||||||
|
@ -1075,6 +1075,7 @@ static int nau8824_hw_params(struct snd_pcm_substream *substream,
|
|||||||
struct snd_soc_component *component = dai->component;
|
struct snd_soc_component *component = dai->component;
|
||||||
struct nau8824 *nau8824 = snd_soc_component_get_drvdata(component);
|
struct nau8824 *nau8824 = snd_soc_component_get_drvdata(component);
|
||||||
unsigned int val_len = 0, osr, ctrl_val, bclk_fs, bclk_div;
|
unsigned int val_len = 0, osr, ctrl_val, bclk_fs, bclk_div;
|
||||||
|
int err = -EINVAL;
|
||||||
|
|
||||||
nau8824_sema_acquire(nau8824, HZ);
|
nau8824_sema_acquire(nau8824, HZ);
|
||||||
|
|
||||||
@ -1091,7 +1092,7 @@ static int nau8824_hw_params(struct snd_pcm_substream *substream,
|
|||||||
osr &= NAU8824_DAC_OVERSAMPLE_MASK;
|
osr &= NAU8824_DAC_OVERSAMPLE_MASK;
|
||||||
if (nau8824_clock_check(nau8824, substream->stream,
|
if (nau8824_clock_check(nau8824, substream->stream,
|
||||||
nau8824->fs, osr))
|
nau8824->fs, osr))
|
||||||
return -EINVAL;
|
goto error;
|
||||||
regmap_update_bits(nau8824->regmap, NAU8824_REG_CLK_DIVIDER,
|
regmap_update_bits(nau8824->regmap, NAU8824_REG_CLK_DIVIDER,
|
||||||
NAU8824_CLK_DAC_SRC_MASK,
|
NAU8824_CLK_DAC_SRC_MASK,
|
||||||
osr_dac_sel[osr].clk_src << NAU8824_CLK_DAC_SRC_SFT);
|
osr_dac_sel[osr].clk_src << NAU8824_CLK_DAC_SRC_SFT);
|
||||||
@ -1101,7 +1102,7 @@ static int nau8824_hw_params(struct snd_pcm_substream *substream,
|
|||||||
osr &= NAU8824_ADC_SYNC_DOWN_MASK;
|
osr &= NAU8824_ADC_SYNC_DOWN_MASK;
|
||||||
if (nau8824_clock_check(nau8824, substream->stream,
|
if (nau8824_clock_check(nau8824, substream->stream,
|
||||||
nau8824->fs, osr))
|
nau8824->fs, osr))
|
||||||
return -EINVAL;
|
goto error;
|
||||||
regmap_update_bits(nau8824->regmap, NAU8824_REG_CLK_DIVIDER,
|
regmap_update_bits(nau8824->regmap, NAU8824_REG_CLK_DIVIDER,
|
||||||
NAU8824_CLK_ADC_SRC_MASK,
|
NAU8824_CLK_ADC_SRC_MASK,
|
||||||
osr_adc_sel[osr].clk_src << NAU8824_CLK_ADC_SRC_SFT);
|
osr_adc_sel[osr].clk_src << NAU8824_CLK_ADC_SRC_SFT);
|
||||||
@ -1122,7 +1123,7 @@ static int nau8824_hw_params(struct snd_pcm_substream *substream,
|
|||||||
else if (bclk_fs <= 256)
|
else if (bclk_fs <= 256)
|
||||||
bclk_div = 0;
|
bclk_div = 0;
|
||||||
else
|
else
|
||||||
return -EINVAL;
|
goto error;
|
||||||
regmap_update_bits(nau8824->regmap,
|
regmap_update_bits(nau8824->regmap,
|
||||||
NAU8824_REG_PORT0_I2S_PCM_CTRL_2,
|
NAU8824_REG_PORT0_I2S_PCM_CTRL_2,
|
||||||
NAU8824_I2S_LRC_DIV_MASK | NAU8824_I2S_BLK_DIV_MASK,
|
NAU8824_I2S_LRC_DIV_MASK | NAU8824_I2S_BLK_DIV_MASK,
|
||||||
@ -1143,15 +1144,17 @@ static int nau8824_hw_params(struct snd_pcm_substream *substream,
|
|||||||
val_len |= NAU8824_I2S_DL_32;
|
val_len |= NAU8824_I2S_DL_32;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return -EINVAL;
|
goto error;
|
||||||
}
|
}
|
||||||
|
|
||||||
regmap_update_bits(nau8824->regmap, NAU8824_REG_PORT0_I2S_PCM_CTRL_1,
|
regmap_update_bits(nau8824->regmap, NAU8824_REG_PORT0_I2S_PCM_CTRL_1,
|
||||||
NAU8824_I2S_DL_MASK, val_len);
|
NAU8824_I2S_DL_MASK, val_len);
|
||||||
|
err = 0;
|
||||||
|
|
||||||
|
error:
|
||||||
nau8824_sema_release(nau8824);
|
nau8824_sema_release(nau8824);
|
||||||
|
|
||||||
return 0;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int nau8824_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
|
static int nau8824_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
|
||||||
@ -1160,8 +1163,6 @@ static int nau8824_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
|
|||||||
struct nau8824 *nau8824 = snd_soc_component_get_drvdata(component);
|
struct nau8824 *nau8824 = snd_soc_component_get_drvdata(component);
|
||||||
unsigned int ctrl1_val = 0, ctrl2_val = 0;
|
unsigned int ctrl1_val = 0, ctrl2_val = 0;
|
||||||
|
|
||||||
nau8824_sema_acquire(nau8824, HZ);
|
|
||||||
|
|
||||||
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
|
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
|
||||||
case SND_SOC_DAIFMT_CBM_CFM:
|
case SND_SOC_DAIFMT_CBM_CFM:
|
||||||
ctrl2_val |= NAU8824_I2S_MS_MASTER;
|
ctrl2_val |= NAU8824_I2S_MS_MASTER;
|
||||||
@ -1203,6 +1204,8 @@ static int nau8824_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
|
|||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
nau8824_sema_acquire(nau8824, HZ);
|
||||||
|
|
||||||
regmap_update_bits(nau8824->regmap, NAU8824_REG_PORT0_I2S_PCM_CTRL_1,
|
regmap_update_bits(nau8824->regmap, NAU8824_REG_PORT0_I2S_PCM_CTRL_1,
|
||||||
NAU8824_I2S_DF_MASK | NAU8824_I2S_BP_MASK |
|
NAU8824_I2S_DF_MASK | NAU8824_I2S_BP_MASK |
|
||||||
NAU8824_I2S_PCMB_EN, ctrl1_val);
|
NAU8824_I2S_PCMB_EN, ctrl1_val);
|
||||||
|
@ -256,6 +256,7 @@ jit_write_elf(int fd, uint64_t load_addr, const char *sym,
|
|||||||
Elf_Data *d;
|
Elf_Data *d;
|
||||||
Elf_Scn *scn;
|
Elf_Scn *scn;
|
||||||
Elf_Ehdr *ehdr;
|
Elf_Ehdr *ehdr;
|
||||||
|
Elf_Phdr *phdr;
|
||||||
Elf_Shdr *shdr;
|
Elf_Shdr *shdr;
|
||||||
uint64_t eh_frame_base_offset;
|
uint64_t eh_frame_base_offset;
|
||||||
char *strsym = NULL;
|
char *strsym = NULL;
|
||||||
@ -290,6 +291,19 @@ jit_write_elf(int fd, uint64_t load_addr, const char *sym,
|
|||||||
ehdr->e_version = EV_CURRENT;
|
ehdr->e_version = EV_CURRENT;
|
||||||
ehdr->e_shstrndx= unwinding ? 4 : 2; /* shdr index for section name */
|
ehdr->e_shstrndx= unwinding ? 4 : 2; /* shdr index for section name */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* setup program header
|
||||||
|
*/
|
||||||
|
phdr = elf_newphdr(e, 1);
|
||||||
|
phdr[0].p_type = PT_LOAD;
|
||||||
|
phdr[0].p_offset = 0;
|
||||||
|
phdr[0].p_vaddr = 0;
|
||||||
|
phdr[0].p_paddr = 0;
|
||||||
|
phdr[0].p_filesz = csize;
|
||||||
|
phdr[0].p_memsz = csize;
|
||||||
|
phdr[0].p_flags = PF_X | PF_R;
|
||||||
|
phdr[0].p_align = 8;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* setup text section
|
* setup text section
|
||||||
*/
|
*/
|
||||||
|
@ -41,8 +41,10 @@ int jit_add_debug_info(Elf *e, uint64_t code_addr, void *debug, int nr_debug_ent
|
|||||||
|
|
||||||
#if GEN_ELF_CLASS == ELFCLASS64
|
#if GEN_ELF_CLASS == ELFCLASS64
|
||||||
#define elf_newehdr elf64_newehdr
|
#define elf_newehdr elf64_newehdr
|
||||||
|
#define elf_newphdr elf64_newphdr
|
||||||
#define elf_getshdr elf64_getshdr
|
#define elf_getshdr elf64_getshdr
|
||||||
#define Elf_Ehdr Elf64_Ehdr
|
#define Elf_Ehdr Elf64_Ehdr
|
||||||
|
#define Elf_Phdr Elf64_Phdr
|
||||||
#define Elf_Shdr Elf64_Shdr
|
#define Elf_Shdr Elf64_Shdr
|
||||||
#define Elf_Sym Elf64_Sym
|
#define Elf_Sym Elf64_Sym
|
||||||
#define ELF_ST_TYPE(a) ELF64_ST_TYPE(a)
|
#define ELF_ST_TYPE(a) ELF64_ST_TYPE(a)
|
||||||
@ -50,8 +52,10 @@ int jit_add_debug_info(Elf *e, uint64_t code_addr, void *debug, int nr_debug_ent
|
|||||||
#define ELF_ST_VIS(a) ELF64_ST_VISIBILITY(a)
|
#define ELF_ST_VIS(a) ELF64_ST_VISIBILITY(a)
|
||||||
#else
|
#else
|
||||||
#define elf_newehdr elf32_newehdr
|
#define elf_newehdr elf32_newehdr
|
||||||
|
#define elf_newphdr elf32_newphdr
|
||||||
#define elf_getshdr elf32_getshdr
|
#define elf_getshdr elf32_getshdr
|
||||||
#define Elf_Ehdr Elf32_Ehdr
|
#define Elf_Ehdr Elf32_Ehdr
|
||||||
|
#define Elf_Phdr Elf32_Phdr
|
||||||
#define Elf_Shdr Elf32_Shdr
|
#define Elf_Shdr Elf32_Shdr
|
||||||
#define Elf_Sym Elf32_Sym
|
#define Elf_Sym Elf32_Sym
|
||||||
#define ELF_ST_TYPE(a) ELF32_ST_TYPE(a)
|
#define ELF_ST_TYPE(a) ELF32_ST_TYPE(a)
|
||||||
|
@ -1871,8 +1871,8 @@ static int kcore_copy__compare_file(const char *from_dir, const char *to_dir,
|
|||||||
* unusual. One significant peculiarity is that the mapping (start -> pgoff)
|
* unusual. One significant peculiarity is that the mapping (start -> pgoff)
|
||||||
* is not the same for the kernel map and the modules map. That happens because
|
* is not the same for the kernel map and the modules map. That happens because
|
||||||
* the data is copied adjacently whereas the original kcore has gaps. Finally,
|
* the data is copied adjacently whereas the original kcore has gaps. Finally,
|
||||||
* kallsyms and modules files are compared with their copies to check that
|
* kallsyms file is compared with its copy to check that modules have not been
|
||||||
* modules have not been loaded or unloaded while the copies were taking place.
|
* loaded or unloaded while the copies were taking place.
|
||||||
*
|
*
|
||||||
* Return: %0 on success, %-1 on failure.
|
* Return: %0 on success, %-1 on failure.
|
||||||
*/
|
*/
|
||||||
@ -1935,9 +1935,6 @@ int kcore_copy(const char *from_dir, const char *to_dir)
|
|||||||
goto out_extract_close;
|
goto out_extract_close;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (kcore_copy__compare_file(from_dir, to_dir, "modules"))
|
|
||||||
goto out_extract_close;
|
|
||||||
|
|
||||||
if (kcore_copy__compare_file(from_dir, to_dir, "kallsyms"))
|
if (kcore_copy__compare_file(from_dir, to_dir, "kallsyms"))
|
||||||
goto out_extract_close;
|
goto out_extract_close;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user