mirror of
https://github.com/torvalds/linux.git
synced 2026-06-07 14:04:54 +02:00
This is the 4.4.159 stable release
-----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAluvTzgACgkQONu9yGCS aT4cDBAAt3nIMdRL1imwklktUpNu+O8GlhoHi3Py3B5EijuaWMCrKHaONHCundtq rZ5fSVtZkdTE6wOEJygY/w8foTmlC0iqpeOUzLXB/rPXaAwIC1EUx4/eaU3SBv3m XN2XqKNnlF7lVoetIrS/RV2jGDM+h5p+oV0FOAMQb69/ozlpac0yIXABwiWXp7xe v8ccCyqdc3b+nCB0x6/jMmKocPAVDfRl4oWYXKBi7qmD7n3dLXPyHNaxvfoKoZY/ Zfepjx3uaL+r7Z2nPwl3/5uiEqEDahIBCHoc/EpIHS7EnwVXD4G9lBRQPCdtZfjG 9qKz5pVgjv/c713UIbvuigxZgL39iuyMQvJn9kySoLjuBJ6auKIBJdVkzpYmUSaY qMWVPW0l7j/VntF3hCTYYNXDU1xqI0d8BESkrA4dTQsLW8HbkNNmIPEwCZ0Fn60Y HIzkXX+wv3N+G2uIs4aTVXYuvJ+ukiTYW5vc4a16cP62ZSyafRUn/0aiiuyaWg/q lHI4jNnxEEkiOyH7EznBmxApWWfc8e9fVTsWva0p7ghFJ9dTbmE+eCEUzTIbE6I7 HITq7uu0VfB8WZWmL59HtZ+dI3CMN0oAzwHM0s5dbi/o0oPtiXGRkCAxjtq/+ikA 91+V3AAWkdADzKp+NQ0oV0GMe1M5lN61m19U93UCspE/Kn6UfX4= =0NRm -----END PGP SIGNATURE----- gpgsig -----BEGIN PGP SIGNATURE----- iQFHBAABCgAxFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAluyAWYTHGJyb29uaWVA a2VybmVsLm9yZwAKCRAk1otyXVSH0CAVB/4oaWph/dnlQrbwVhS/keGRtE9UWTHM zylB0/N3zDdOqJEd3y7UmgwfsvEYwP2d5BLBGqJgdEv7Ieu3lRF9yAgHuan94WFk vSMqSWTTj56tOJEuDbXf3bORrTGbyhkPpeKm7G4Y5KjcAA7Ytm/I2ej+Hl/ZoxXQ v6eA5UaBhbQEZxbPPn/v3AN7NvlNMyAb6IV/frc45K8ETiYoWVyuZKYFCRrQFA+g 9g3DurTHssQ25lsVbux7Xzs0G5UZfz7E+nlbgBHZ5EqWw++LfMm0/Ag8EBytQiL2 9ZJixr8TSmAzBl5aAf8FzojHfmpujSi1jQmhKaJPsL1wXTTGH0MtLhjo =ihN6 -----END PGP SIGNATURE----- Merge tag 'v4.4.159' into linux-linaro-lsk-v4.4 This is the 4.4.159 stable release # gpg: Signature made Sat 29 Sep 2018 11:08:56 BST # gpg: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E # gpg: Good signature from "Greg Kroah-Hartman <gregkh@linuxfoundation.org>" [unknown] # gpg: aka "Greg Kroah-Hartman (Linux kernel stable release signing key) <greg@kroah.com>" [unknown] # gpg: aka "Greg Kroah-Hartman <gregkh@kernel.org>" [unknown] # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: 647F 2865 4894 E3BD 4571 99BE 38DB BDC8 6092 693E
This commit is contained in:
Mark Brown
commit
c6ee9e74b2
2
Makefile
2
Makefile
|
|
@ -1,6 +1,6 @@
|
|||
VERSION = 4
|
||||
PATCHLEVEL = 4
|
||||
SUBLEVEL = 157
|
||||
SUBLEVEL = 159
|
||||
EXTRAVERSION =
|
||||
NAME = Blurry Fish Butt
|
||||
|
||||
|
|
|
|||
|
|
@ -260,6 +260,7 @@ static int __init exynos_pmu_irq_init(struct device_node *node,
|
|||
NULL);
|
||||
if (!domain) {
|
||||
iounmap(pmu_base_addr);
|
||||
pmu_base_addr = NULL;
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -148,13 +148,20 @@ static int hi3xxx_hotplug_init(void)
|
|||
struct device_node *node;
|
||||
|
||||
node = of_find_compatible_node(NULL, NULL, "hisilicon,sysctrl");
|
||||
if (node) {
|
||||
ctrl_base = of_iomap(node, 0);
|
||||
id = HI3620_CTRL;
|
||||
return 0;
|
||||
if (!node) {
|
||||
id = ERROR_CTRL;
|
||||
return -ENOENT;
|
||||
}
|
||||
id = ERROR_CTRL;
|
||||
return -ENOENT;
|
||||
|
||||
ctrl_base = of_iomap(node, 0);
|
||||
of_node_put(node);
|
||||
if (!ctrl_base) {
|
||||
id = ERROR_CTRL;
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
id = HI3620_CTRL;
|
||||
return 0;
|
||||
}
|
||||
|
||||
void hi3xxx_set_cpu(int cpu, bool enable)
|
||||
|
|
@ -173,11 +180,15 @@ static bool hix5hd2_hotplug_init(void)
|
|||
struct device_node *np;
|
||||
|
||||
np = of_find_compatible_node(NULL, NULL, "hisilicon,cpuctrl");
|
||||
if (np) {
|
||||
ctrl_base = of_iomap(np, 0);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
if (!np)
|
||||
return false;
|
||||
|
||||
ctrl_base = of_iomap(np, 0);
|
||||
of_node_put(np);
|
||||
if (!ctrl_base)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void hix5hd2_set_cpu(int cpu, bool enable)
|
||||
|
|
@ -219,10 +230,10 @@ void hip01_set_cpu(int cpu, bool enable)
|
|||
|
||||
if (!ctrl_base) {
|
||||
np = of_find_compatible_node(NULL, NULL, "hisilicon,hip01-sysctrl");
|
||||
if (np)
|
||||
ctrl_base = of_iomap(np, 0);
|
||||
else
|
||||
BUG();
|
||||
BUG_ON(!np);
|
||||
ctrl_base = of_iomap(np, 0);
|
||||
of_node_put(np);
|
||||
BUG_ON(!ctrl_base);
|
||||
}
|
||||
|
||||
if (enable) {
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ led@5 {
|
|||
led@6 {
|
||||
label = "apq8016-sbc:blue:bt";
|
||||
gpios = <&pm8916_mpps 3 GPIO_ACTIVE_HIGH>;
|
||||
linux,default-trigger = "bt";
|
||||
linux,default-trigger = "bluetooth-power";
|
||||
default-state = "off";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@ static char ath79_sys_type[ATH79_SYS_TYPE_LEN];
|
|||
|
||||
static void ath79_restart(char *command)
|
||||
{
|
||||
local_irq_disable();
|
||||
ath79_device_reset_set(AR71XX_RESET_FULL_CHIP);
|
||||
for (;;)
|
||||
if (cpu_wait)
|
||||
|
|
|
|||
|
|
@ -133,6 +133,7 @@ static inline u32 ath79_pll_rr(unsigned reg)
|
|||
static inline void ath79_reset_wr(unsigned reg, u32 val)
|
||||
{
|
||||
__raw_writel(val, ath79_reset_base + reg);
|
||||
(void) __raw_readl(ath79_reset_base + reg); /* flush */
|
||||
}
|
||||
|
||||
static inline u32 ath79_reset_rr(unsigned reg)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
platform-$(CONFIG_MACH_INGENIC) += jz4740/
|
||||
cflags-$(CONFIG_MACH_INGENIC) += -I$(srctree)/arch/mips/include/asm/mach-jz4740
|
||||
load-$(CONFIG_MACH_INGENIC) += 0xffffffff80010000
|
||||
zload-$(CONFIG_MACH_INGENIC) += 0xffffffff80600000
|
||||
zload-$(CONFIG_MACH_INGENIC) += 0xffffffff81000000
|
||||
|
|
|
|||
|
|
@ -14,12 +14,14 @@
|
|||
#include <linux/init.h>
|
||||
#include <linux/ioport.h>
|
||||
#include <linux/irqchip/mips-gic.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/mm.h>
|
||||
#include <linux/sched.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/timekeeper_internal.h>
|
||||
|
||||
#include <asm/abi.h>
|
||||
#include <asm/page.h>
|
||||
#include <asm/vdso.h>
|
||||
|
||||
/* Kernel-provided data used by the VDSO. */
|
||||
|
|
@ -118,12 +120,30 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
|
|||
vvar_size = gic_size + PAGE_SIZE;
|
||||
size = vvar_size + image->size;
|
||||
|
||||
/*
|
||||
* Find a region that's large enough for us to perform the
|
||||
* colour-matching alignment below.
|
||||
*/
|
||||
if (cpu_has_dc_aliases)
|
||||
size += shm_align_mask + 1;
|
||||
|
||||
base = get_unmapped_area(NULL, 0, size, 0, 0);
|
||||
if (IS_ERR_VALUE(base)) {
|
||||
ret = base;
|
||||
goto out;
|
||||
}
|
||||
|
||||
/*
|
||||
* If we suffer from dcache aliasing, ensure that the VDSO data page
|
||||
* mapping is coloured the same as the kernel's mapping of that memory.
|
||||
* This ensures that when the kernel updates the VDSO data userland
|
||||
* will observe it without requiring cache invalidations.
|
||||
*/
|
||||
if (cpu_has_dc_aliases) {
|
||||
base = __ALIGN_MASK(base, shm_align_mask);
|
||||
base += ((unsigned long)&vdso_data - gic_size) & shm_align_mask;
|
||||
}
|
||||
|
||||
data_addr = base + gic_size;
|
||||
vdso_addr = data_addr + PAGE_SIZE;
|
||||
|
||||
|
|
|
|||
|
|
@ -138,7 +138,7 @@ u32 pci_ohci_read_reg(int reg)
|
|||
break;
|
||||
case PCI_OHCI_INT_REG:
|
||||
_rdmsr(DIVIL_MSR_REG(PIC_YSEL_LOW), &hi, &lo);
|
||||
if ((lo & 0x00000f00) == CS5536_USB_INTR)
|
||||
if (((lo >> PIC_YSEL_LOW_USB_SHIFT) & 0xf) == CS5536_USB_INTR)
|
||||
conf_data = 1;
|
||||
break;
|
||||
default:
|
||||
|
|
|
|||
|
|
@ -371,7 +371,7 @@ int opal_put_chars(uint32_t vtermno, const char *data, int total_len)
|
|||
/* Closed or other error drop */
|
||||
if (rc != OPAL_SUCCESS && rc != OPAL_BUSY &&
|
||||
rc != OPAL_BUSY_EVENT) {
|
||||
written = total_len;
|
||||
written += total_len;
|
||||
break;
|
||||
}
|
||||
if (rc == OPAL_SUCCESS) {
|
||||
|
|
|
|||
|
|
@ -477,7 +477,7 @@ static void xen_convert_regs(const struct xen_pmu_regs *xen_regs,
|
|||
irqreturn_t xen_pmu_irq_handler(int irq, void *dev_id)
|
||||
{
|
||||
int err, ret = IRQ_NONE;
|
||||
struct pt_regs regs;
|
||||
struct pt_regs regs = {0};
|
||||
const struct xen_pmu_data *xenpmu_data = get_xenpmu_data();
|
||||
uint8_t xenpmu_flags = get_xenpmu_flags();
|
||||
|
||||
|
|
|
|||
|
|
@ -120,6 +120,7 @@ static void __init imx6ul_clocks_init(struct device_node *ccm_node)
|
|||
|
||||
np = of_find_compatible_node(NULL, NULL, "fsl,imx6ul-anatop");
|
||||
base = of_iomap(np, 0);
|
||||
of_node_put(np);
|
||||
WARN_ON(!base);
|
||||
|
||||
clks[IMX6UL_PLL1_BYPASS_SRC] = imx_clk_mux("pll1_bypass_src", base + 0x00, 14, 1, pll_bypass_src_sels, ARRAY_SIZE(pll_bypass_src_sels));
|
||||
|
|
|
|||
|
|
@ -1363,7 +1363,7 @@ static int sahara_register_algs(struct sahara_dev *dev)
|
|||
|
||||
err_sha_v3_algs:
|
||||
for (j = 0; j < k; j++)
|
||||
crypto_unregister_ahash(&sha_v4_algs[j]);
|
||||
crypto_unregister_ahash(&sha_v3_algs[j]);
|
||||
|
||||
err_aes_algs:
|
||||
for (j = 0; j < i; j++)
|
||||
|
|
@ -1379,7 +1379,7 @@ static void sahara_unregister_algs(struct sahara_dev *dev)
|
|||
for (i = 0; i < ARRAY_SIZE(aes_algs); i++)
|
||||
crypto_unregister_alg(&aes_algs[i]);
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(sha_v4_algs); i++)
|
||||
for (i = 0; i < ARRAY_SIZE(sha_v3_algs); i++)
|
||||
crypto_unregister_ahash(&sha_v3_algs[i]);
|
||||
|
||||
if (dev->version > SAHARA_VERSION_3)
|
||||
|
|
|
|||
|
|
@ -2132,13 +2132,14 @@ static int pl330_terminate_all(struct dma_chan *chan)
|
|||
|
||||
pm_runtime_get_sync(pl330->ddma.dev);
|
||||
spin_lock_irqsave(&pch->lock, flags);
|
||||
|
||||
spin_lock(&pl330->lock);
|
||||
_stop(pch->thread);
|
||||
spin_unlock(&pl330->lock);
|
||||
|
||||
pch->thread->req[0].desc = NULL;
|
||||
pch->thread->req[1].desc = NULL;
|
||||
pch->thread->req_running = -1;
|
||||
spin_unlock(&pl330->lock);
|
||||
|
||||
power_down = pch->active;
|
||||
pch->active = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ struct acpi_gpio_info {
|
|||
};
|
||||
|
||||
/* gpio suffixes used for ACPI and device tree lookup */
|
||||
static const char * const gpio_suffixes[] = { "gpios", "gpio" };
|
||||
static __maybe_unused const char * const gpio_suffixes[] = { "gpios", "gpio" };
|
||||
|
||||
#ifdef CONFIG_ACPI
|
||||
void acpi_gpiochip_add(struct gpio_chip *chip);
|
||||
|
|
|
|||
|
|
@ -125,6 +125,8 @@ struct kfd_process *kfd_get_process(const struct task_struct *thread)
|
|||
return ERR_PTR(-EINVAL);
|
||||
|
||||
process = find_process(thread);
|
||||
if (!process)
|
||||
return ERR_PTR(-EINVAL);
|
||||
|
||||
return process;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -253,12 +253,16 @@ nouveau_connector_detect(struct drm_connector *connector, bool force)
|
|||
nv_connector->edid = NULL;
|
||||
}
|
||||
|
||||
/* Outputs are only polled while runtime active, so acquiring a
|
||||
* runtime PM ref here is unnecessary (and would deadlock upon
|
||||
* runtime suspend because it waits for polling to finish).
|
||||
/* Outputs are only polled while runtime active, so resuming the
|
||||
* device here is unnecessary (and would deadlock upon runtime suspend
|
||||
* because it waits for polling to finish). We do however, want to
|
||||
* prevent the autosuspend timer from elapsing during this operation
|
||||
* if possible.
|
||||
*/
|
||||
if (!drm_kms_helper_is_poll_worker()) {
|
||||
ret = pm_runtime_get_sync(connector->dev->dev);
|
||||
if (drm_kms_helper_is_poll_worker()) {
|
||||
pm_runtime_get_noresume(dev->dev);
|
||||
} else {
|
||||
ret = pm_runtime_get_sync(dev->dev);
|
||||
if (ret < 0 && ret != -EACCES)
|
||||
return conn_status;
|
||||
}
|
||||
|
|
@ -329,10 +333,8 @@ nouveau_connector_detect(struct drm_connector *connector, bool force)
|
|||
|
||||
out:
|
||||
|
||||
if (!drm_kms_helper_is_poll_worker()) {
|
||||
pm_runtime_mark_last_busy(connector->dev->dev);
|
||||
pm_runtime_put_autosuspend(connector->dev->dev);
|
||||
}
|
||||
pm_runtime_mark_last_busy(dev->dev);
|
||||
pm_runtime_put_autosuspend(dev->dev);
|
||||
|
||||
return conn_status;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,6 +23,10 @@
|
|||
#ifdef CONFIG_NOUVEAU_PLATFORM_DRIVER
|
||||
#include "priv.h"
|
||||
|
||||
#if IS_ENABLED(CONFIG_ARM_DMA_USE_IOMMU)
|
||||
#include <asm/dma-iommu.h>
|
||||
#endif
|
||||
|
||||
static int
|
||||
nvkm_device_tegra_power_up(struct nvkm_device_tegra *tdev)
|
||||
{
|
||||
|
|
@ -85,6 +89,15 @@ nvkm_device_tegra_probe_iommu(struct nvkm_device_tegra *tdev)
|
|||
unsigned long pgsize_bitmap;
|
||||
int ret;
|
||||
|
||||
#if IS_ENABLED(CONFIG_ARM_DMA_USE_IOMMU)
|
||||
if (dev->archdata.mapping) {
|
||||
struct dma_iommu_mapping *mapping = to_dma_iommu_mapping(dev);
|
||||
|
||||
arm_iommu_detach_device(dev);
|
||||
arm_iommu_release_mapping(mapping);
|
||||
}
|
||||
#endif
|
||||
|
||||
if (!tdev->func->iommu_bit)
|
||||
return;
|
||||
|
||||
|
|
|
|||
|
|
@ -823,7 +823,7 @@ static void s6e8aa0_read_mtp_id(struct s6e8aa0 *ctx)
|
|||
int ret, i;
|
||||
|
||||
ret = s6e8aa0_dcs_read(ctx, 0xd1, id, ARRAY_SIZE(id));
|
||||
if (ret < ARRAY_SIZE(id) || id[0] == 0x00) {
|
||||
if (ret < 0 || ret < ARRAY_SIZE(id) || id[0] == 0x00) {
|
||||
dev_err(ctx->dev, "read id failed\n");
|
||||
ctx->error = -EIO;
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -2011,6 +2011,9 @@ static const struct hid_device_id hid_have_special_driver[] = {
|
|||
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER) },
|
||||
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2) },
|
||||
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_DONGLE) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGP_MOUSE) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_STEELSERIES, USB_DEVICE_ID_STEELSERIES_SRWS1) },
|
||||
|
|
|
|||
|
|
@ -879,6 +879,8 @@
|
|||
#define USB_DEVICE_ID_SONY_PS3_BDREMOTE 0x0306
|
||||
#define USB_DEVICE_ID_SONY_PS3_CONTROLLER 0x0268
|
||||
#define USB_DEVICE_ID_SONY_PS4_CONTROLLER 0x05c4
|
||||
#define USB_DEVICE_ID_SONY_PS4_CONTROLLER_2 0x09cc
|
||||
#define USB_DEVICE_ID_SONY_PS4_CONTROLLER_DONGLE 0x0ba0
|
||||
#define USB_DEVICE_ID_SONY_MOTION_CONTROLLER 0x03d5
|
||||
#define USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER 0x042f
|
||||
#define USB_DEVICE_ID_SONY_BUZZ_CONTROLLER 0x0002
|
||||
|
|
|
|||
|
|
@ -2460,6 +2460,12 @@ static const struct hid_device_id sony_devices[] = {
|
|||
.driver_data = DUALSHOCK4_CONTROLLER_USB },
|
||||
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER),
|
||||
.driver_data = DUALSHOCK4_CONTROLLER_BT },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2),
|
||||
.driver_data = DUALSHOCK4_CONTROLLER_USB },
|
||||
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2),
|
||||
.driver_data = DUALSHOCK4_CONTROLLER_BT },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_DONGLE),
|
||||
.driver_data = DUALSHOCK4_CONTROLLER_USB },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(hid, sony_devices);
|
||||
|
|
|
|||
|
|
@ -47,8 +47,9 @@
|
|||
|
||||
/** register definition **/
|
||||
/* FFSR - 0x300 */
|
||||
#define FFSR_FT_STOPPED BIT(1)
|
||||
#define FFSR_FT_STOPPED_BIT 1
|
||||
/* FFCR - 0x304 */
|
||||
#define FFCR_FON_MAN_BIT 6
|
||||
#define FFCR_FON_MAN BIT(6)
|
||||
#define FFCR_STOP_FI BIT(12)
|
||||
|
||||
|
|
@ -93,9 +94,9 @@ static void tpiu_disable_hw(struct tpiu_drvdata *drvdata)
|
|||
/* Generate manual flush */
|
||||
writel_relaxed(FFCR_STOP_FI | FFCR_FON_MAN, drvdata->base + TPIU_FFCR);
|
||||
/* Wait for flush to complete */
|
||||
coresight_timeout(drvdata->base, TPIU_FFCR, FFCR_FON_MAN, 0);
|
||||
coresight_timeout(drvdata->base, TPIU_FFCR, FFCR_FON_MAN_BIT, 0);
|
||||
/* Wait for formatter to stop */
|
||||
coresight_timeout(drvdata->base, TPIU_FFSR, FFSR_FT_STOPPED, 1);
|
||||
coresight_timeout(drvdata->base, TPIU_FFSR, FFSR_FT_STOPPED_BIT, 1);
|
||||
|
||||
CS_LOCK(drvdata->base);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ static int coresight_find_link_inport(struct coresight_device *csdev,
|
|||
dev_err(&csdev->dev, "couldn't find inport, parent: %s, child: %s\n",
|
||||
dev_name(&parent->dev), dev_name(&csdev->dev));
|
||||
|
||||
return 0;
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
static int coresight_find_link_outport(struct coresight_device *csdev,
|
||||
|
|
@ -125,7 +125,7 @@ static int coresight_find_link_outport(struct coresight_device *csdev,
|
|||
dev_err(&csdev->dev, "couldn't find outport, parent: %s, child: %s\n",
|
||||
dev_name(&csdev->dev), dev_name(&child->dev));
|
||||
|
||||
return 0;
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
static int coresight_enable_sink(struct coresight_device *csdev, u32 mode)
|
||||
|
|
@ -178,6 +178,9 @@ static int coresight_enable_link(struct coresight_device *csdev,
|
|||
else
|
||||
refport = 0;
|
||||
|
||||
if (refport < 0)
|
||||
return refport;
|
||||
|
||||
if (atomic_inc_return(&csdev->refcnt[refport]) == 1) {
|
||||
if (link_ops(csdev)->enable) {
|
||||
ret = link_ops(csdev)->enable(csdev, inport, outport);
|
||||
|
|
|
|||
|
|
@ -544,6 +544,7 @@ static int cma_resolve_ib_dev(struct rdma_id_private *id_priv)
|
|||
dgid = (union ib_gid *) &addr->sib_addr;
|
||||
pkey = ntohs(addr->sib_pkey);
|
||||
|
||||
mutex_lock(&lock);
|
||||
list_for_each_entry(cur_dev, &dev_list, list) {
|
||||
for (p = 1; p <= cur_dev->device->phys_port_cnt; ++p) {
|
||||
if (!rdma_cap_af_ib(cur_dev->device, p))
|
||||
|
|
@ -567,18 +568,19 @@ static int cma_resolve_ib_dev(struct rdma_id_private *id_priv)
|
|||
cma_dev = cur_dev;
|
||||
sgid = gid;
|
||||
id_priv->id.port_num = p;
|
||||
goto found;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!cma_dev)
|
||||
return -ENODEV;
|
||||
mutex_unlock(&lock);
|
||||
return -ENODEV;
|
||||
|
||||
found:
|
||||
cma_attach_to_dev(id_priv, cma_dev);
|
||||
addr = (struct sockaddr_ib *) cma_src_addr(id_priv);
|
||||
memcpy(&addr->sib_addr, &sgid, sizeof sgid);
|
||||
mutex_unlock(&lock);
|
||||
addr = (struct sockaddr_ib *)cma_src_addr(id_priv);
|
||||
memcpy(&addr->sib_addr, &sgid, sizeof(sgid));
|
||||
cma_translate_ib(addr, &id_priv->id.route.addr.dev_addr);
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1183,6 +1183,12 @@ static void flush_qp(struct c4iw_qp *qhp)
|
|||
|
||||
t4_set_wq_in_error(&qhp->wq);
|
||||
if (qhp->ibqp.uobject) {
|
||||
|
||||
/* for user qps, qhp->wq.flushed is protected by qhp->mutex */
|
||||
if (qhp->wq.flushed)
|
||||
return;
|
||||
|
||||
qhp->wq.flushed = 1;
|
||||
t4_set_cq_in_error(&rchp->cq);
|
||||
spin_lock_irqsave(&rchp->comp_handler_lock, flag);
|
||||
(*rchp->ibcq.comp_handler)(&rchp->ibcq, rchp->ibcq.cq_context);
|
||||
|
|
|
|||
|
|
@ -992,12 +992,14 @@ static int ipoib_cm_rep_handler(struct ib_cm_id *cm_id, struct ib_cm_event *even
|
|||
|
||||
skb_queue_head_init(&skqueue);
|
||||
|
||||
netif_tx_lock_bh(p->dev);
|
||||
spin_lock_irq(&priv->lock);
|
||||
set_bit(IPOIB_FLAG_OPER_UP, &p->flags);
|
||||
if (p->neigh)
|
||||
while ((skb = __skb_dequeue(&p->neigh->queue)))
|
||||
__skb_queue_tail(&skqueue, skb);
|
||||
spin_unlock_irq(&priv->lock);
|
||||
netif_tx_unlock_bh(p->dev);
|
||||
|
||||
while ((skb = __skb_dequeue(&skqueue))) {
|
||||
skb->dev = p->dev;
|
||||
|
|
|
|||
|
|
@ -1219,6 +1219,7 @@ static irqreturn_t arm_smmu_priq_thread(int irq, void *dev)
|
|||
|
||||
/* Sync our overflow flag, as we believe we're up to speed */
|
||||
q->cons = Q_OVF(q, q->prod) | Q_WRP(q, q->cons) | Q_IDX(q, q->cons);
|
||||
writel(q->cons, q->cons_reg);
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1366,6 +1366,11 @@ int vb2_core_qbuf(struct vb2_queue *q, unsigned int index, void *pb)
|
|||
struct vb2_buffer *vb;
|
||||
int ret;
|
||||
|
||||
if (q->error) {
|
||||
dprintk(1, "fatal error occurred on queue\n");
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
vb = q->bufs[index];
|
||||
|
||||
switch (vb->state) {
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@
|
|||
#include <linux/err.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/sysfs.h>
|
||||
#include <linux/nospec.h>
|
||||
|
||||
static DEFINE_MUTEX(compass_mutex);
|
||||
|
||||
|
|
@ -50,6 +51,7 @@ static int compass_store(struct device *dev, const char *buf, size_t count,
|
|||
return ret;
|
||||
if (val >= strlen(map))
|
||||
return -EINVAL;
|
||||
val = array_index_nospec(val, strlen(map));
|
||||
mutex_lock(&compass_mutex);
|
||||
ret = compass_command(c, map[val]);
|
||||
mutex_unlock(&compass_mutex);
|
||||
|
|
|
|||
|
|
@ -151,7 +151,7 @@ static int mei_nfc_if_version(struct mei_cl *cl,
|
|||
|
||||
ret = 0;
|
||||
bytes_recv = __mei_cl_recv(cl, (u8 *)reply, if_version_length);
|
||||
if (bytes_recv < if_version_length) {
|
||||
if (bytes_recv < 0 || bytes_recv < if_version_length) {
|
||||
dev_err(bus->dev, "Could not read IF version\n");
|
||||
ret = -EIO;
|
||||
goto err;
|
||||
|
|
|
|||
|
|
@ -59,9 +59,9 @@ static int __init init_soleng_maps(void)
|
|||
return -ENXIO;
|
||||
}
|
||||
}
|
||||
printk(KERN_NOTICE "Solution Engine: Flash at 0x%08lx, EPROM at 0x%08lx\n",
|
||||
soleng_flash_map.phys & 0x1fffffff,
|
||||
soleng_eprom_map.phys & 0x1fffffff);
|
||||
printk(KERN_NOTICE "Solution Engine: Flash at 0x%pap, EPROM at 0x%pap\n",
|
||||
&soleng_flash_map.phys,
|
||||
&soleng_eprom_map.phys);
|
||||
flash_mtd->owner = THIS_MODULE;
|
||||
|
||||
eprom_mtd = do_map_probe("map_rom", &soleng_eprom_map);
|
||||
|
|
|
|||
|
|
@ -160,8 +160,12 @@ static ssize_t mtdchar_read(struct file *file, char __user *buf, size_t count,
|
|||
|
||||
pr_debug("MTD_read\n");
|
||||
|
||||
if (*ppos + count > mtd->size)
|
||||
count = mtd->size - *ppos;
|
||||
if (*ppos + count > mtd->size) {
|
||||
if (*ppos < mtd->size)
|
||||
count = mtd->size - *ppos;
|
||||
else
|
||||
count = 0;
|
||||
}
|
||||
|
||||
if (!count)
|
||||
return 0;
|
||||
|
|
@ -246,7 +250,7 @@ static ssize_t mtdchar_write(struct file *file, const char __user *buf, size_t c
|
|||
|
||||
pr_debug("MTD_write\n");
|
||||
|
||||
if (*ppos == mtd->size)
|
||||
if (*ppos >= mtd->size)
|
||||
return -ENOSPC;
|
||||
|
||||
if (*ppos + count > mtd->size)
|
||||
|
|
|
|||
|
|
@ -284,8 +284,12 @@ static int ipddp_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
|
|||
case SIOCFINDIPDDPRT:
|
||||
spin_lock_bh(&ipddp_route_lock);
|
||||
rp = __ipddp_find_route(&rcp);
|
||||
if (rp)
|
||||
memcpy(&rcp2, rp, sizeof(rcp2));
|
||||
if (rp) {
|
||||
memset(&rcp2, 0, sizeof(rcp2));
|
||||
rcp2.ip = rp->ip;
|
||||
rcp2.at = rp->at;
|
||||
rcp2.flags = rp->flags;
|
||||
}
|
||||
spin_unlock_bh(&ipddp_route_lock);
|
||||
|
||||
if (rp) {
|
||||
|
|
|
|||
|
|
@ -2636,7 +2636,7 @@ static int hp100_login_to_vg_hub(struct net_device *dev, u_short force_relogin)
|
|||
/* Wait for link to drop */
|
||||
time = jiffies + (HZ / 10);
|
||||
do {
|
||||
if (~(hp100_inb(VG_LAN_CFG_1) & HP100_LINK_UP_ST))
|
||||
if (!(hp100_inb(VG_LAN_CFG_1) & HP100_LINK_UP_ST))
|
||||
break;
|
||||
if (!in_interrupt())
|
||||
schedule_timeout_interruptible(1);
|
||||
|
|
|
|||
|
|
@ -1164,25 +1164,34 @@ static void cpsw_slave_open(struct cpsw_slave *slave, struct cpsw_priv *priv)
|
|||
cpsw_ale_add_mcast(priv->ale, priv->ndev->broadcast,
|
||||
1 << slave_port, 0, 0, ALE_MCAST_FWD_2);
|
||||
|
||||
if (slave->data->phy_node)
|
||||
if (slave->data->phy_node) {
|
||||
slave->phy = of_phy_connect(priv->ndev, slave->data->phy_node,
|
||||
&cpsw_adjust_link, 0, slave->data->phy_if);
|
||||
else
|
||||
if (!slave->phy) {
|
||||
dev_err(priv->dev, "phy \"%s\" not found on slave %d\n",
|
||||
slave->data->phy_node->full_name,
|
||||
slave->slave_num);
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
slave->phy = phy_connect(priv->ndev, slave->data->phy_id,
|
||||
&cpsw_adjust_link, slave->data->phy_if);
|
||||
if (IS_ERR(slave->phy)) {
|
||||
dev_err(priv->dev, "phy %s not found on slave %d\n",
|
||||
slave->data->phy_id, slave->slave_num);
|
||||
slave->phy = NULL;
|
||||
} else {
|
||||
dev_info(priv->dev, "phy found : id is : 0x%x\n",
|
||||
slave->phy->phy_id);
|
||||
phy_start(slave->phy);
|
||||
|
||||
/* Configure GMII_SEL register */
|
||||
cpsw_phy_sel(&priv->pdev->dev, slave->phy->interface,
|
||||
slave->slave_num);
|
||||
if (IS_ERR(slave->phy)) {
|
||||
dev_err(priv->dev,
|
||||
"phy \"%s\" not found on slave %d, err %ld\n",
|
||||
slave->data->phy_id, slave->slave_num,
|
||||
PTR_ERR(slave->phy));
|
||||
slave->phy = NULL;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
dev_info(priv->dev, "phy found : id is : 0x%x\n", slave->phy->phy_id);
|
||||
|
||||
phy_start(slave->phy);
|
||||
|
||||
/* Configure GMII_SEL register */
|
||||
cpsw_phy_sel(&priv->pdev->dev, slave->phy->interface, slave->slave_num);
|
||||
}
|
||||
|
||||
static inline void cpsw_add_default_vlan(struct cpsw_priv *priv)
|
||||
|
|
|
|||
|
|
@ -86,8 +86,7 @@ struct netfront_cb {
|
|||
/* IRQ name is queue name with "-tx" or "-rx" appended */
|
||||
#define IRQ_NAME_SIZE (QUEUE_NAME_SIZE + 3)
|
||||
|
||||
static DECLARE_WAIT_QUEUE_HEAD(module_load_q);
|
||||
static DECLARE_WAIT_QUEUE_HEAD(module_unload_q);
|
||||
static DECLARE_WAIT_QUEUE_HEAD(module_wq);
|
||||
|
||||
struct netfront_stats {
|
||||
u64 packets;
|
||||
|
|
@ -893,7 +892,11 @@ static RING_IDX xennet_fill_frags(struct netfront_queue *queue,
|
|||
BUG_ON(pull_to <= skb_headlen(skb));
|
||||
__pskb_pull_tail(skb, pull_to - skb_headlen(skb));
|
||||
}
|
||||
BUG_ON(skb_shinfo(skb)->nr_frags >= MAX_SKB_FRAGS);
|
||||
if (unlikely(skb_shinfo(skb)->nr_frags >= MAX_SKB_FRAGS)) {
|
||||
queue->rx.rsp_cons = ++cons;
|
||||
kfree_skb(nskb);
|
||||
return ~0U;
|
||||
}
|
||||
|
||||
skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags,
|
||||
skb_frag_page(nfrag),
|
||||
|
|
@ -1030,6 +1033,8 @@ static int xennet_poll(struct napi_struct *napi, int budget)
|
|||
skb->len += rx->status;
|
||||
|
||||
i = xennet_fill_frags(queue, skb, &tmpq);
|
||||
if (unlikely(i == ~0U))
|
||||
goto err;
|
||||
|
||||
if (rx->flags & XEN_NETRXF_csum_blank)
|
||||
skb->ip_summed = CHECKSUM_PARTIAL;
|
||||
|
|
@ -1336,11 +1341,11 @@ static struct net_device *xennet_create_dev(struct xenbus_device *dev)
|
|||
netif_carrier_off(netdev);
|
||||
|
||||
xenbus_switch_state(dev, XenbusStateInitialising);
|
||||
wait_event(module_load_q,
|
||||
xenbus_read_driver_state(dev->otherend) !=
|
||||
XenbusStateClosed &&
|
||||
xenbus_read_driver_state(dev->otherend) !=
|
||||
XenbusStateUnknown);
|
||||
wait_event(module_wq,
|
||||
xenbus_read_driver_state(dev->otherend) !=
|
||||
XenbusStateClosed &&
|
||||
xenbus_read_driver_state(dev->otherend) !=
|
||||
XenbusStateUnknown);
|
||||
return netdev;
|
||||
|
||||
exit:
|
||||
|
|
@ -1608,6 +1613,7 @@ static int xennet_init_queue(struct netfront_queue *queue)
|
|||
{
|
||||
unsigned short i;
|
||||
int err = 0;
|
||||
char *devid;
|
||||
|
||||
spin_lock_init(&queue->tx_lock);
|
||||
spin_lock_init(&queue->rx_lock);
|
||||
|
|
@ -1615,8 +1621,9 @@ static int xennet_init_queue(struct netfront_queue *queue)
|
|||
setup_timer(&queue->rx_refill_timer, rx_refill_timeout,
|
||||
(unsigned long)queue);
|
||||
|
||||
snprintf(queue->name, sizeof(queue->name), "%s-q%u",
|
||||
queue->info->netdev->name, queue->id);
|
||||
devid = strrchr(queue->info->xbdev->nodename, '/') + 1;
|
||||
snprintf(queue->name, sizeof(queue->name), "vif%s-q%u",
|
||||
devid, queue->id);
|
||||
|
||||
/* Initialise tx_skbs as a free chain containing every entry. */
|
||||
queue->tx_skb_freelist = 0;
|
||||
|
|
@ -2023,15 +2030,14 @@ static void netback_changed(struct xenbus_device *dev,
|
|||
|
||||
dev_dbg(&dev->dev, "%s\n", xenbus_strstate(backend_state));
|
||||
|
||||
wake_up_all(&module_wq);
|
||||
|
||||
switch (backend_state) {
|
||||
case XenbusStateInitialising:
|
||||
case XenbusStateInitialised:
|
||||
case XenbusStateReconfiguring:
|
||||
case XenbusStateReconfigured:
|
||||
break;
|
||||
|
||||
case XenbusStateUnknown:
|
||||
wake_up_all(&module_unload_q);
|
||||
break;
|
||||
|
||||
case XenbusStateInitWait:
|
||||
|
|
@ -2047,12 +2053,10 @@ static void netback_changed(struct xenbus_device *dev,
|
|||
break;
|
||||
|
||||
case XenbusStateClosed:
|
||||
wake_up_all(&module_unload_q);
|
||||
if (dev->state == XenbusStateClosed)
|
||||
break;
|
||||
/* Missed the backend's CLOSING state -- fallthrough */
|
||||
case XenbusStateClosing:
|
||||
wake_up_all(&module_unload_q);
|
||||
xenbus_frontend_closed(dev);
|
||||
break;
|
||||
}
|
||||
|
|
@ -2160,14 +2164,14 @@ static int xennet_remove(struct xenbus_device *dev)
|
|||
|
||||
if (xenbus_read_driver_state(dev->otherend) != XenbusStateClosed) {
|
||||
xenbus_switch_state(dev, XenbusStateClosing);
|
||||
wait_event(module_unload_q,
|
||||
wait_event(module_wq,
|
||||
xenbus_read_driver_state(dev->otherend) ==
|
||||
XenbusStateClosing ||
|
||||
xenbus_read_driver_state(dev->otherend) ==
|
||||
XenbusStateUnknown);
|
||||
|
||||
xenbus_switch_state(dev, XenbusStateClosed);
|
||||
wait_event(module_unload_q,
|
||||
wait_event(module_wq,
|
||||
xenbus_read_driver_state(dev->otherend) ==
|
||||
XenbusStateClosed ||
|
||||
xenbus_read_driver_state(dev->otherend) ==
|
||||
|
|
|
|||
|
|
@ -286,12 +286,16 @@ static int bpp_probe(struct platform_device *op)
|
|||
|
||||
ops = kmemdup(&parport_sunbpp_ops, sizeof(struct parport_operations),
|
||||
GFP_KERNEL);
|
||||
if (!ops)
|
||||
if (!ops) {
|
||||
err = -ENOMEM;
|
||||
goto out_unmap;
|
||||
}
|
||||
|
||||
dprintk(("register_port\n"));
|
||||
if (!(p = parport_register_port((unsigned long)base, irq, dma, ops)))
|
||||
if (!(p = parport_register_port((unsigned long)base, irq, dma, ops))) {
|
||||
err = -ENOMEM;
|
||||
goto out_free_ops;
|
||||
}
|
||||
|
||||
p->size = size;
|
||||
p->dev = &op->dev;
|
||||
|
|
|
|||
|
|
@ -291,31 +291,47 @@ static int pmic_gpio_config_get(struct pinctrl_dev *pctldev,
|
|||
|
||||
switch (param) {
|
||||
case PIN_CONFIG_DRIVE_PUSH_PULL:
|
||||
arg = pad->buffer_type == PMIC_GPIO_OUT_BUF_CMOS;
|
||||
if (pad->buffer_type != PMIC_GPIO_OUT_BUF_CMOS)
|
||||
return -EINVAL;
|
||||
arg = 1;
|
||||
break;
|
||||
case PIN_CONFIG_DRIVE_OPEN_DRAIN:
|
||||
arg = pad->buffer_type == PMIC_GPIO_OUT_BUF_OPEN_DRAIN_NMOS;
|
||||
if (pad->buffer_type != PMIC_GPIO_OUT_BUF_OPEN_DRAIN_NMOS)
|
||||
return -EINVAL;
|
||||
arg = 1;
|
||||
break;
|
||||
case PIN_CONFIG_DRIVE_OPEN_SOURCE:
|
||||
arg = pad->buffer_type == PMIC_GPIO_OUT_BUF_OPEN_DRAIN_PMOS;
|
||||
if (pad->buffer_type != PMIC_GPIO_OUT_BUF_OPEN_DRAIN_PMOS)
|
||||
return -EINVAL;
|
||||
arg = 1;
|
||||
break;
|
||||
case PIN_CONFIG_BIAS_PULL_DOWN:
|
||||
arg = pad->pullup == PMIC_GPIO_PULL_DOWN;
|
||||
if (pad->pullup != PMIC_GPIO_PULL_DOWN)
|
||||
return -EINVAL;
|
||||
arg = 1;
|
||||
break;
|
||||
case PIN_CONFIG_BIAS_DISABLE:
|
||||
arg = pad->pullup = PMIC_GPIO_PULL_DISABLE;
|
||||
if (pad->pullup != PMIC_GPIO_PULL_DISABLE)
|
||||
return -EINVAL;
|
||||
arg = 1;
|
||||
break;
|
||||
case PIN_CONFIG_BIAS_PULL_UP:
|
||||
arg = pad->pullup == PMIC_GPIO_PULL_UP_30;
|
||||
if (pad->pullup != PMIC_GPIO_PULL_UP_30)
|
||||
return -EINVAL;
|
||||
arg = 1;
|
||||
break;
|
||||
case PIN_CONFIG_BIAS_HIGH_IMPEDANCE:
|
||||
arg = !pad->is_enabled;
|
||||
if (pad->is_enabled)
|
||||
return -EINVAL;
|
||||
arg = 1;
|
||||
break;
|
||||
case PIN_CONFIG_POWER_SOURCE:
|
||||
arg = pad->power_source;
|
||||
break;
|
||||
case PIN_CONFIG_INPUT_ENABLE:
|
||||
arg = pad->input_enabled;
|
||||
if (!pad->input_enabled)
|
||||
return -EINVAL;
|
||||
arg = 1;
|
||||
break;
|
||||
case PIN_CONFIG_OUTPUT:
|
||||
arg = pad->out_value;
|
||||
|
|
|
|||
|
|
@ -463,6 +463,7 @@ static acpi_status alienware_hdmi_command(struct hdmi_args *in_args,
|
|||
if (obj && obj->type == ACPI_TYPE_INTEGER)
|
||||
*out_data = (u32) obj->integer.value;
|
||||
}
|
||||
kfree(output.pointer);
|
||||
return status;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,6 +34,7 @@
|
|||
#define TOSHIBA_ACPI_VERSION "0.23"
|
||||
#define PROC_INTERFACE_VERSION 1
|
||||
|
||||
#include <linux/compiler.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/init.h>
|
||||
|
|
@ -1472,7 +1473,7 @@ static const struct file_operations keys_proc_fops = {
|
|||
.write = keys_proc_write,
|
||||
};
|
||||
|
||||
static int version_proc_show(struct seq_file *m, void *v)
|
||||
static int __maybe_unused version_proc_show(struct seq_file *m, void *v)
|
||||
{
|
||||
seq_printf(m, "driver: %s\n", TOSHIBA_ACPI_VERSION);
|
||||
seq_printf(m, "proc_interface: %d\n", PROC_INTERFACE_VERSION);
|
||||
|
|
|
|||
|
|
@ -164,6 +164,10 @@ static int bq4802_probe(struct platform_device *pdev)
|
|||
} else if (p->r->flags & IORESOURCE_MEM) {
|
||||
p->regs = devm_ioremap(&pdev->dev, p->r->start,
|
||||
resource_size(p->r));
|
||||
if (!p->regs){
|
||||
err = -ENOMEM;
|
||||
goto out;
|
||||
}
|
||||
p->read = bq4802_read_mem;
|
||||
p->write = bq4802_write_mem;
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -3505,13 +3505,14 @@ static void qeth_flush_buffers(struct qeth_qdio_out_q *queue, int index,
|
|||
qdio_flags = QDIO_FLAG_SYNC_OUTPUT;
|
||||
if (atomic_read(&queue->set_pci_flags_count))
|
||||
qdio_flags |= QDIO_FLAG_PCI_OUT;
|
||||
atomic_add(count, &queue->used_buffers);
|
||||
|
||||
rc = do_QDIO(CARD_DDEV(queue->card), qdio_flags,
|
||||
queue->queue_no, index, count);
|
||||
if (queue->card->options.performance_stats)
|
||||
queue->card->perf_stats.outbound_do_qdio_time +=
|
||||
qeth_get_micros() -
|
||||
queue->card->perf_stats.outbound_do_qdio_start_time;
|
||||
atomic_add(count, &queue->used_buffers);
|
||||
if (rc) {
|
||||
queue->card->stats.tx_errors += count;
|
||||
/* ignore temporary SIGA errors without busy condition */
|
||||
|
|
|
|||
|
|
@ -419,6 +419,7 @@ static ssize_t qeth_dev_layer2_store(struct device *dev,
|
|||
if (card->discipline) {
|
||||
card->discipline->remove(card->gdev);
|
||||
qeth_core_free_discipline(card);
|
||||
card->options.layer2 = -1;
|
||||
}
|
||||
|
||||
rc = qeth_core_load_discipline(card, newdis);
|
||||
|
|
|
|||
|
|
@ -26,18 +26,6 @@
|
|||
#include "iscsi_target_nego.h"
|
||||
#include "iscsi_target_auth.h"
|
||||
|
||||
static int chap_string_to_hex(unsigned char *dst, unsigned char *src, int len)
|
||||
{
|
||||
int j = DIV_ROUND_UP(len, 2), rc;
|
||||
|
||||
rc = hex2bin(dst, src, j);
|
||||
if (rc < 0)
|
||||
pr_debug("CHAP string contains non hex digit symbols\n");
|
||||
|
||||
dst[j] = '\0';
|
||||
return j;
|
||||
}
|
||||
|
||||
static void chap_binaryhex_to_asciihex(char *dst, char *src, int src_len)
|
||||
{
|
||||
int i;
|
||||
|
|
@ -241,9 +229,16 @@ static int chap_server_compute_md5(
|
|||
pr_err("Could not find CHAP_R.\n");
|
||||
goto out;
|
||||
}
|
||||
if (strlen(chap_r) != MD5_SIGNATURE_SIZE * 2) {
|
||||
pr_err("Malformed CHAP_R\n");
|
||||
goto out;
|
||||
}
|
||||
if (hex2bin(client_digest, chap_r, MD5_SIGNATURE_SIZE) < 0) {
|
||||
pr_err("Malformed CHAP_R\n");
|
||||
goto out;
|
||||
}
|
||||
|
||||
pr_debug("[server] Got CHAP_R=%s\n", chap_r);
|
||||
chap_string_to_hex(client_digest, chap_r, strlen(chap_r));
|
||||
|
||||
tfm = crypto_alloc_hash("md5", 0, CRYPTO_ALG_ASYNC);
|
||||
if (IS_ERR(tfm)) {
|
||||
|
|
@ -348,9 +343,7 @@ static int chap_server_compute_md5(
|
|||
pr_err("Could not find CHAP_C.\n");
|
||||
goto out;
|
||||
}
|
||||
pr_debug("[server] Got CHAP_C=%s\n", challenge);
|
||||
challenge_len = chap_string_to_hex(challenge_binhex, challenge,
|
||||
strlen(challenge));
|
||||
challenge_len = DIV_ROUND_UP(strlen(challenge), 2);
|
||||
if (!challenge_len) {
|
||||
pr_err("Unable to convert incoming challenge\n");
|
||||
goto out;
|
||||
|
|
@ -359,6 +352,11 @@ static int chap_server_compute_md5(
|
|||
pr_err("CHAP_C exceeds maximum binary size of 1024 bytes\n");
|
||||
goto out;
|
||||
}
|
||||
if (hex2bin(challenge_binhex, challenge, challenge_len) < 0) {
|
||||
pr_err("Malformed CHAP_C\n");
|
||||
goto out;
|
||||
}
|
||||
pr_debug("[server] Got CHAP_C=%s\n", challenge);
|
||||
/*
|
||||
* During mutual authentication, the CHAP_C generated by the
|
||||
* initiator must not match the original CHAP_C generated by
|
||||
|
|
|
|||
|
|
@ -31,6 +31,8 @@
|
|||
#include <asm/io.h>
|
||||
#include <asm/uaccess.h>
|
||||
|
||||
#include <linux/nospec.h>
|
||||
|
||||
#include <linux/kbd_kern.h>
|
||||
#include <linux/vt_kern.h>
|
||||
#include <linux/kbd_diacr.h>
|
||||
|
|
@ -703,6 +705,8 @@ int vt_ioctl(struct tty_struct *tty,
|
|||
if (vsa.console == 0 || vsa.console > MAX_NR_CONSOLES)
|
||||
ret = -ENXIO;
|
||||
else {
|
||||
vsa.console = array_index_nospec(vsa.console,
|
||||
MAX_NR_CONSOLES + 1);
|
||||
vsa.console--;
|
||||
console_lock();
|
||||
ret = vc_allocate(vsa.console);
|
||||
|
|
|
|||
|
|
@ -453,7 +453,7 @@ static int clear_wdm_read_flag(struct wdm_device *desc)
|
|||
|
||||
set_bit(WDM_RESPONDING, &desc->flags);
|
||||
spin_unlock_irq(&desc->iuspin);
|
||||
rv = usb_submit_urb(desc->response, GFP_KERNEL);
|
||||
rv = usb_submit_urb(desc->response, GFP_ATOMIC);
|
||||
spin_lock_irq(&desc->iuspin);
|
||||
if (rv) {
|
||||
dev_err(&desc->intf->dev,
|
||||
|
|
|
|||
|
|
@ -529,8 +529,6 @@ static int resume_common(struct device *dev, int event)
|
|||
event == PM_EVENT_RESTORE);
|
||||
if (retval) {
|
||||
dev_err(dev, "PCI post-resume error %d!\n", retval);
|
||||
if (hcd->shared_hcd)
|
||||
usb_hc_died(hcd->shared_hcd);
|
||||
usb_hc_died(hcd);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1282,6 +1282,11 @@ void usb_enable_interface(struct usb_device *dev,
|
|||
* is submitted that needs that bandwidth. Some other operating systems
|
||||
* allocate bandwidth early, when a configuration is chosen.
|
||||
*
|
||||
* xHCI reserves bandwidth and configures the alternate setting in
|
||||
* usb_hcd_alloc_bandwidth(). If it fails the original interface altsetting
|
||||
* may be disabled. Drivers cannot rely on any particular alternate
|
||||
* setting being in effect after a failure.
|
||||
*
|
||||
* This call is synchronous, and may not be used in an interrupt context.
|
||||
* Also, drivers must not change altsettings while urbs are scheduled for
|
||||
* endpoints in that interface; all such urbs must first be completed
|
||||
|
|
@ -1317,6 +1322,12 @@ int usb_set_interface(struct usb_device *dev, int interface, int alternate)
|
|||
alternate);
|
||||
return -EINVAL;
|
||||
}
|
||||
/*
|
||||
* usb3 hosts configure the interface in usb_hcd_alloc_bandwidth,
|
||||
* including freeing dropped endpoint ring buffers.
|
||||
* Make sure the interface endpoints are flushed before that
|
||||
*/
|
||||
usb_disable_interface(dev, iface, false);
|
||||
|
||||
/* Make sure we have enough bandwidth for this alternate interface.
|
||||
* Remove the current alt setting and add the new alt setting.
|
||||
|
|
|
|||
|
|
@ -37,6 +37,10 @@ static const struct usb_device_id usb_quirk_list[] = {
|
|||
/* CBM - Flash disk */
|
||||
{ USB_DEVICE(0x0204, 0x6025), .driver_info = USB_QUIRK_RESET_RESUME },
|
||||
|
||||
/* WORLDE Controller KS49 or Prodipe MIDI 49C USB controller */
|
||||
{ USB_DEVICE(0x0218, 0x0201), .driver_info =
|
||||
USB_QUIRK_CONFIG_INTF_STRINGS },
|
||||
|
||||
/* WORLDE easy key (easykey.25) MIDI controller */
|
||||
{ USB_DEVICE(0x0218, 0x0401), .driver_info =
|
||||
USB_QUIRK_CONFIG_INTF_STRINGS },
|
||||
|
|
@ -259,6 +263,9 @@ static const struct usb_device_id usb_quirk_list[] = {
|
|||
{ USB_DEVICE(0x2040, 0x7200), .driver_info =
|
||||
USB_QUIRK_CONFIG_INTF_STRINGS },
|
||||
|
||||
/* DJI CineSSD */
|
||||
{ USB_DEVICE(0x2ca3, 0x0031), .driver_info = USB_QUIRK_NO_LPM },
|
||||
|
||||
/* INTEL VALUE SSD */
|
||||
{ USB_DEVICE(0x8086, 0xf1a5), .driver_info = USB_QUIRK_RESET_RESUME },
|
||||
|
||||
|
|
|
|||
|
|
@ -1542,11 +1542,14 @@ static int net2280_pullup(struct usb_gadget *_gadget, int is_on)
|
|||
writel(tmp | BIT(USB_DETECT_ENABLE), &dev->usb->usbctl);
|
||||
} else {
|
||||
writel(tmp & ~BIT(USB_DETECT_ENABLE), &dev->usb->usbctl);
|
||||
stop_activity(dev, dev->driver);
|
||||
stop_activity(dev, NULL);
|
||||
}
|
||||
|
||||
spin_unlock_irqrestore(&dev->lock, flags);
|
||||
|
||||
if (!is_on && dev->driver)
|
||||
dev->driver->disconnect(&dev->gadget);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -2425,8 +2428,11 @@ static void stop_activity(struct net2280 *dev, struct usb_gadget_driver *driver)
|
|||
nuke(&dev->ep[i]);
|
||||
|
||||
/* report disconnect; the driver is already quiesced */
|
||||
if (driver)
|
||||
if (driver) {
|
||||
spin_unlock(&dev->lock);
|
||||
driver->disconnect(&dev->gadget);
|
||||
spin_lock(&dev->lock);
|
||||
}
|
||||
|
||||
usb_reinit(dev);
|
||||
}
|
||||
|
|
@ -3272,6 +3278,8 @@ static void handle_stat0_irqs(struct net2280 *dev, u32 stat)
|
|||
BIT(PCI_RETRY_ABORT_INTERRUPT))
|
||||
|
||||
static void handle_stat1_irqs(struct net2280 *dev, u32 stat)
|
||||
__releases(dev->lock)
|
||||
__acquires(dev->lock)
|
||||
{
|
||||
struct net2280_ep *ep;
|
||||
u32 tmp, num, mask, scratch;
|
||||
|
|
@ -3312,12 +3320,14 @@ static void handle_stat1_irqs(struct net2280 *dev, u32 stat)
|
|||
if (disconnect || reset) {
|
||||
stop_activity(dev, dev->driver);
|
||||
ep0_start(dev);
|
||||
spin_unlock(&dev->lock);
|
||||
if (reset)
|
||||
usb_gadget_udc_reset
|
||||
(&dev->gadget, dev->driver);
|
||||
else
|
||||
(dev->driver->disconnect)
|
||||
(&dev->gadget);
|
||||
spin_lock(&dev->lock);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
@ -3336,6 +3346,7 @@ static void handle_stat1_irqs(struct net2280 *dev, u32 stat)
|
|||
tmp = BIT(SUSPEND_REQUEST_CHANGE_INTERRUPT);
|
||||
if (stat & tmp) {
|
||||
writel(tmp, &dev->regs->irqstat1);
|
||||
spin_unlock(&dev->lock);
|
||||
if (stat & BIT(SUSPEND_REQUEST_INTERRUPT)) {
|
||||
if (dev->driver->suspend)
|
||||
dev->driver->suspend(&dev->gadget);
|
||||
|
|
@ -3346,6 +3357,7 @@ static void handle_stat1_irqs(struct net2280 *dev, u32 stat)
|
|||
dev->driver->resume(&dev->gadget);
|
||||
/* at high speed, note erratum 0133 */
|
||||
}
|
||||
spin_lock(&dev->lock);
|
||||
stat &= ~tmp;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2565,7 +2565,7 @@ static int u132_get_frame(struct usb_hcd *hcd)
|
|||
} else {
|
||||
int frame = 0;
|
||||
dev_err(&u132->platform_dev->dev, "TODO: u132_get_frame\n");
|
||||
msleep(100);
|
||||
mdelay(100);
|
||||
return frame;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -388,7 +388,7 @@ static unsigned char parport_uss720_frob_control(struct parport *pp, unsigned ch
|
|||
mask &= 0x0f;
|
||||
val &= 0x0f;
|
||||
d = (priv->reg[1] & (~mask)) ^ val;
|
||||
if (set_1284_register(pp, 2, d, GFP_KERNEL))
|
||||
if (set_1284_register(pp, 2, d, GFP_ATOMIC))
|
||||
return 0;
|
||||
priv->reg[1] = d;
|
||||
return d & 0xf;
|
||||
|
|
@ -398,7 +398,7 @@ static unsigned char parport_uss720_read_status(struct parport *pp)
|
|||
{
|
||||
unsigned char ret;
|
||||
|
||||
if (get_1284_register(pp, 1, &ret, GFP_KERNEL))
|
||||
if (get_1284_register(pp, 1, &ret, GFP_ATOMIC))
|
||||
return 0;
|
||||
return ret & 0xf8;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -439,13 +439,13 @@ static ssize_t yurex_write(struct file *file, const char __user *user_buffer,
|
|||
{
|
||||
struct usb_yurex *dev;
|
||||
int i, set = 0, retval = 0;
|
||||
char buffer[16];
|
||||
char buffer[16 + 1];
|
||||
char *data = buffer;
|
||||
unsigned long long c, c2 = 0;
|
||||
signed long timeout = 0;
|
||||
DEFINE_WAIT(wait);
|
||||
|
||||
count = min(sizeof(buffer), count);
|
||||
count = min(sizeof(buffer) - 1, count);
|
||||
dev = file->private_data;
|
||||
|
||||
/* verify that we actually have some data to write */
|
||||
|
|
@ -464,6 +464,7 @@ static ssize_t yurex_write(struct file *file, const char __user *user_buffer,
|
|||
retval = -EFAULT;
|
||||
goto error;
|
||||
}
|
||||
buffer[count] = 0;
|
||||
memset(dev->cntl_buffer, CMD_PADDING, YUREX_BUF_SIZE);
|
||||
|
||||
switch (buffer[0]) {
|
||||
|
|
|
|||
|
|
@ -178,7 +178,7 @@ struct ump_interrupt {
|
|||
} __attribute__((packed));
|
||||
|
||||
|
||||
#define TIUMP_GET_PORT_FROM_CODE(c) (((c) >> 4) - 3)
|
||||
#define TIUMP_GET_PORT_FROM_CODE(c) (((c) >> 6) & 0x01)
|
||||
#define TIUMP_GET_FUNC_FROM_CODE(c) ((c) & 0x0f)
|
||||
#define TIUMP_INTERRUPT_CODE_LSR 0x03
|
||||
#define TIUMP_INTERRUPT_CODE_MSR 0x04
|
||||
|
|
|
|||
|
|
@ -227,7 +227,7 @@ struct ti_interrupt {
|
|||
} __attribute__((packed));
|
||||
|
||||
/* Interrupt codes */
|
||||
#define TI_GET_PORT_FROM_CODE(c) (((c) >> 4) - 3)
|
||||
#define TI_GET_PORT_FROM_CODE(c) (((c) >> 6) & 0x01)
|
||||
#define TI_GET_FUNC_FROM_CODE(c) ((c) & 0x0f)
|
||||
#define TI_CODE_HARDWARE_ERROR 0xFF
|
||||
#define TI_CODE_DATA_ERROR 0x03
|
||||
|
|
|
|||
|
|
@ -341,6 +341,15 @@ static int queuecommand_lck(struct scsi_cmnd *srb,
|
|||
return 0;
|
||||
}
|
||||
|
||||
if ((us->fflags & US_FL_NO_ATA_1X) &&
|
||||
(srb->cmnd[0] == ATA_12 || srb->cmnd[0] == ATA_16)) {
|
||||
memcpy(srb->sense_buffer, usb_stor_sense_invalidCDB,
|
||||
sizeof(usb_stor_sense_invalidCDB));
|
||||
srb->result = SAM_STAT_CHECK_CONDITION;
|
||||
done(srb);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* enqueue the command and wake up the control thread */
|
||||
srb->scsi_done = done;
|
||||
us->srb = srb;
|
||||
|
|
|
|||
|
|
@ -2213,6 +2213,13 @@ UNUSUAL_DEV( 0x4146, 0xba01, 0x0100, 0x0100,
|
|||
"Micro Mini 1GB",
|
||||
USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_NOT_LOCKABLE ),
|
||||
|
||||
/* Reported-by: Tim Anderson <tsa@biglakesoftware.com> */
|
||||
UNUSUAL_DEV( 0x2ca3, 0x0031, 0x0000, 0x9999,
|
||||
"DJI",
|
||||
"CineSSD",
|
||||
USB_SC_DEVICE, USB_PR_DEVICE, NULL,
|
||||
US_FL_NO_ATA_1X),
|
||||
|
||||
/*
|
||||
* Nick Bowler <nbowler@elliptictech.com>
|
||||
* SCSI stack spams (otherwise harmless) error messages.
|
||||
|
|
|
|||
|
|
@ -644,7 +644,7 @@ static int fb_try_mode(struct fb_var_screeninfo *var, struct fb_info *info,
|
|||
*
|
||||
* Valid mode specifiers for @mode_option:
|
||||
*
|
||||
* <xres>x<yres>[M][R][-<bpp>][@<refresh>][i][m] or
|
||||
* <xres>x<yres>[M][R][-<bpp>][@<refresh>][i][p][m] or
|
||||
* <name>[-<bpp>][@<refresh>]
|
||||
*
|
||||
* with <xres>, <yres>, <bpp> and <refresh> decimal numbers and
|
||||
|
|
@ -653,10 +653,10 @@ static int fb_try_mode(struct fb_var_screeninfo *var, struct fb_info *info,
|
|||
* If 'M' is present after yres (and before refresh/bpp if present),
|
||||
* the function will compute the timings using VESA(tm) Coordinated
|
||||
* Video Timings (CVT). If 'R' is present after 'M', will compute with
|
||||
* reduced blanking (for flatpanels). If 'i' is present, compute
|
||||
* interlaced mode. If 'm' is present, add margins equal to 1.8%
|
||||
* of xres rounded down to 8 pixels, and 1.8% of yres. The char
|
||||
* 'i' and 'm' must be after 'M' and 'R'. Example:
|
||||
* reduced blanking (for flatpanels). If 'i' or 'p' are present, compute
|
||||
* interlaced or progressive mode. If 'm' is present, add margins equal
|
||||
* to 1.8% of xres rounded down to 8 pixels, and 1.8% of yres. The chars
|
||||
* 'i', 'p' and 'm' must be after 'M' and 'R'. Example:
|
||||
*
|
||||
* 1024x768MR-8@60m - Reduced blank with margins at 60Hz.
|
||||
*
|
||||
|
|
@ -697,7 +697,8 @@ int fb_find_mode(struct fb_var_screeninfo *var,
|
|||
unsigned int namelen = strlen(name);
|
||||
int res_specified = 0, bpp_specified = 0, refresh_specified = 0;
|
||||
unsigned int xres = 0, yres = 0, bpp = default_bpp, refresh = 0;
|
||||
int yres_specified = 0, cvt = 0, rb = 0, interlace = 0;
|
||||
int yres_specified = 0, cvt = 0, rb = 0;
|
||||
int interlace_specified = 0, interlace = 0;
|
||||
int margins = 0;
|
||||
u32 best, diff, tdiff;
|
||||
|
||||
|
|
@ -748,9 +749,17 @@ int fb_find_mode(struct fb_var_screeninfo *var,
|
|||
if (!cvt)
|
||||
margins = 1;
|
||||
break;
|
||||
case 'p':
|
||||
if (!cvt) {
|
||||
interlace = 0;
|
||||
interlace_specified = 1;
|
||||
}
|
||||
break;
|
||||
case 'i':
|
||||
if (!cvt)
|
||||
if (!cvt) {
|
||||
interlace = 1;
|
||||
interlace_specified = 1;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
goto done;
|
||||
|
|
@ -819,11 +828,21 @@ int fb_find_mode(struct fb_var_screeninfo *var,
|
|||
if ((name_matches(db[i], name, namelen) ||
|
||||
(res_specified && res_matches(db[i], xres, yres))) &&
|
||||
!fb_try_mode(var, info, &db[i], bpp)) {
|
||||
if (refresh_specified && db[i].refresh == refresh)
|
||||
return 1;
|
||||
const int db_interlace = (db[i].vmode &
|
||||
FB_VMODE_INTERLACED ? 1 : 0);
|
||||
int score = abs(db[i].refresh - refresh);
|
||||
|
||||
if (abs(db[i].refresh - refresh) < diff) {
|
||||
diff = abs(db[i].refresh - refresh);
|
||||
if (interlace_specified)
|
||||
score += abs(db_interlace - interlace);
|
||||
|
||||
if (!interlace_specified ||
|
||||
db_interlace == interlace)
|
||||
if (refresh_specified &&
|
||||
db[i].refresh == refresh)
|
||||
return 1;
|
||||
|
||||
if (score < diff) {
|
||||
diff = score;
|
||||
best = i;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -301,6 +301,7 @@ static int goldfish_fb_remove(struct platform_device *pdev)
|
|||
dma_free_coherent(&pdev->dev, framesize, (void *)fb->fb.screen_base,
|
||||
fb->fb.fix.smem_start);
|
||||
iounmap(fb->reg_base);
|
||||
kfree(fb);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -977,7 +977,7 @@ int omapfb_register_client(struct omapfb_notifier_block *omapfb_nb,
|
|||
{
|
||||
int r;
|
||||
|
||||
if ((unsigned)omapfb_nb->plane_idx > OMAPFB_PLANE_NUM)
|
||||
if ((unsigned)omapfb_nb->plane_idx >= OMAPFB_PLANE_NUM)
|
||||
return -EINVAL;
|
||||
|
||||
if (!notifier_inited) {
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@
|
|||
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#include <linux/compiler.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/seq_file.h>
|
||||
#include <linux/slab.h>
|
||||
|
|
@ -1468,7 +1469,7 @@ static const struct file_operations viafb_vt1636_proc_fops = {
|
|||
|
||||
#endif /* CONFIG_FB_VIA_DIRECT_PROCFS */
|
||||
|
||||
static int viafb_sup_odev_proc_show(struct seq_file *m, void *v)
|
||||
static int __maybe_unused viafb_sup_odev_proc_show(struct seq_file *m, void *v)
|
||||
{
|
||||
via_odev_to_seq(m, supported_odev_map[
|
||||
viaparinfo->shared->chip_info.gfx_chip_name]);
|
||||
|
|
|
|||
|
|
@ -1707,7 +1707,7 @@ static int fill_thread_core_info(struct elf_thread_core_info *t,
|
|||
const struct user_regset *regset = &view->regsets[i];
|
||||
do_thread_regset_writeback(t->task, regset);
|
||||
if (regset->core_note_type && regset->get &&
|
||||
(!regset->active || regset->active(t->task, regset))) {
|
||||
(!regset->active || regset->active(t->task, regset) > 0)) {
|
||||
int ret;
|
||||
size_t size = regset->n * regset->size;
|
||||
void *data = kmalloc(size, GFP_KERNEL);
|
||||
|
|
|
|||
|
|
@ -373,8 +373,15 @@ static char *nxt_dir_entry(char *old_entry, char *end_of_smb, int level)
|
|||
|
||||
new_entry = old_entry + sizeof(FIND_FILE_STANDARD_INFO) +
|
||||
pfData->FileNameLength;
|
||||
} else
|
||||
new_entry = old_entry + le32_to_cpu(pDirInfo->NextEntryOffset);
|
||||
} else {
|
||||
u32 next_offset = le32_to_cpu(pDirInfo->NextEntryOffset);
|
||||
|
||||
if (old_entry + next_offset < old_entry) {
|
||||
cifs_dbg(VFS, "invalid offset %u\n", next_offset);
|
||||
return NULL;
|
||||
}
|
||||
new_entry = old_entry + next_offset;
|
||||
}
|
||||
cifs_dbg(FYI, "new entry %p old entry %p\n", new_entry, old_entry);
|
||||
/* validate that new_entry is not past end of SMB */
|
||||
if (new_entry >= end_of_smb) {
|
||||
|
|
|
|||
|
|
@ -2402,33 +2402,38 @@ num_entries(char *bufstart, char *end_of_buf, char **lastentry, size_t size)
|
|||
int len;
|
||||
unsigned int entrycount = 0;
|
||||
unsigned int next_offset = 0;
|
||||
FILE_DIRECTORY_INFO *entryptr;
|
||||
char *entryptr;
|
||||
FILE_DIRECTORY_INFO *dir_info;
|
||||
|
||||
if (bufstart == NULL)
|
||||
return 0;
|
||||
|
||||
entryptr = (FILE_DIRECTORY_INFO *)bufstart;
|
||||
entryptr = bufstart;
|
||||
|
||||
while (1) {
|
||||
entryptr = (FILE_DIRECTORY_INFO *)
|
||||
((char *)entryptr + next_offset);
|
||||
|
||||
if ((char *)entryptr + size > end_of_buf) {
|
||||
if (entryptr + next_offset < entryptr ||
|
||||
entryptr + next_offset > end_of_buf ||
|
||||
entryptr + next_offset + size > end_of_buf) {
|
||||
cifs_dbg(VFS, "malformed search entry would overflow\n");
|
||||
break;
|
||||
}
|
||||
|
||||
len = le32_to_cpu(entryptr->FileNameLength);
|
||||
if ((char *)entryptr + len + size > end_of_buf) {
|
||||
entryptr = entryptr + next_offset;
|
||||
dir_info = (FILE_DIRECTORY_INFO *)entryptr;
|
||||
|
||||
len = le32_to_cpu(dir_info->FileNameLength);
|
||||
if (entryptr + len < entryptr ||
|
||||
entryptr + len > end_of_buf ||
|
||||
entryptr + len + size > end_of_buf) {
|
||||
cifs_dbg(VFS, "directory entry name would overflow frame end of buf %p\n",
|
||||
end_of_buf);
|
||||
break;
|
||||
}
|
||||
|
||||
*lastentry = (char *)entryptr;
|
||||
*lastentry = entryptr;
|
||||
entrycount++;
|
||||
|
||||
next_offset = le32_to_cpu(entryptr->NextEntryOffset);
|
||||
next_offset = le32_to_cpu(dir_info->NextEntryOffset);
|
||||
if (!next_offset)
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ int __ext4_check_dir_entry(const char *function, unsigned int line,
|
|||
else if (unlikely(rlen < EXT4_DIR_REC_LEN(de->name_len)))
|
||||
error_msg = "rec_len is too small for name_len";
|
||||
else if (unlikely(((char *) de - buf) + rlen > size))
|
||||
error_msg = "directory entry across range";
|
||||
error_msg = "directory entry overrun";
|
||||
else if (unlikely(le32_to_cpu(de->inode) >
|
||||
le32_to_cpu(EXT4_SB(dir->i_sb)->s_es->s_inodes_count)))
|
||||
error_msg = "inode out of bounds";
|
||||
|
|
@ -83,18 +83,16 @@ int __ext4_check_dir_entry(const char *function, unsigned int line,
|
|||
|
||||
if (filp)
|
||||
ext4_error_file(filp, function, line, bh->b_blocknr,
|
||||
"bad entry in directory: %s - offset=%u(%u), "
|
||||
"inode=%u, rec_len=%d, name_len=%d",
|
||||
error_msg, (unsigned) (offset % size),
|
||||
offset, le32_to_cpu(de->inode),
|
||||
rlen, de->name_len);
|
||||
"bad entry in directory: %s - offset=%u, "
|
||||
"inode=%u, rec_len=%d, name_len=%d, size=%d",
|
||||
error_msg, offset, le32_to_cpu(de->inode),
|
||||
rlen, de->name_len, size);
|
||||
else
|
||||
ext4_error_inode(dir, function, line, bh->b_blocknr,
|
||||
"bad entry in directory: %s - offset=%u(%u), "
|
||||
"inode=%u, rec_len=%d, name_len=%d",
|
||||
error_msg, (unsigned) (offset % size),
|
||||
offset, le32_to_cpu(de->inode),
|
||||
rlen, de->name_len);
|
||||
"bad entry in directory: %s - offset=%u, "
|
||||
"inode=%u, rec_len=%d, name_len=%d, size=%d",
|
||||
error_msg, offset, le32_to_cpu(de->inode),
|
||||
rlen, de->name_len, size);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1756,6 +1756,7 @@ int empty_inline_dir(struct inode *dir, int *has_inline_data)
|
|||
{
|
||||
int err, inline_size;
|
||||
struct ext4_iloc iloc;
|
||||
size_t inline_len;
|
||||
void *inline_pos;
|
||||
unsigned int offset;
|
||||
struct ext4_dir_entry_2 *de;
|
||||
|
|
@ -1783,8 +1784,9 @@ int empty_inline_dir(struct inode *dir, int *has_inline_data)
|
|||
goto out;
|
||||
}
|
||||
|
||||
inline_len = ext4_get_inline_size(dir);
|
||||
offset = EXT4_INLINE_DOTDOT_SIZE;
|
||||
while (offset < dir->i_size) {
|
||||
while (offset < inline_len) {
|
||||
de = ext4_get_inline_entry(dir, &iloc, offset,
|
||||
&inline_pos, &inline_size);
|
||||
if (ext4_check_dir_entry(dir, NULL, de,
|
||||
|
|
|
|||
|
|
@ -48,7 +48,6 @@ static int write_mmp_block(struct super_block *sb, struct buffer_head *bh)
|
|||
*/
|
||||
sb_start_write(sb);
|
||||
ext4_mmp_csum_set(sb, mmp);
|
||||
mark_buffer_dirty(bh);
|
||||
lock_buffer(bh);
|
||||
bh->b_end_io = end_buffer_write_sync;
|
||||
get_bh(bh);
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@
|
|||
|
||||
int ext4_resize_begin(struct super_block *sb)
|
||||
{
|
||||
struct ext4_sb_info *sbi = EXT4_SB(sb);
|
||||
int ret = 0;
|
||||
|
||||
if (!capable(CAP_SYS_RESOURCE))
|
||||
|
|
@ -28,7 +29,7 @@ int ext4_resize_begin(struct super_block *sb)
|
|||
* because the user tools have no way of handling this. Probably a
|
||||
* bad time to do it anyways.
|
||||
*/
|
||||
if (EXT4_SB(sb)->s_sbh->b_blocknr !=
|
||||
if (EXT4_B2C(sbi, sbi->s_sbh->b_blocknr) !=
|
||||
le32_to_cpu(EXT4_SB(sb)->s_es->s_first_data_block)) {
|
||||
ext4_warning(sb, "won't resize using backup superblock at %llu",
|
||||
(unsigned long long)EXT4_SB(sb)->s_sbh->b_blocknr);
|
||||
|
|
@ -1954,6 +1955,26 @@ int ext4_resize_fs(struct super_block *sb, ext4_fsblk_t n_blocks_count)
|
|||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Make sure the last group has enough space so that it's
|
||||
* guaranteed to have enough space for all metadata blocks
|
||||
* that it might need to hold. (We might not need to store
|
||||
* the inode table blocks in the last block group, but there
|
||||
* will be cases where this might be needed.)
|
||||
*/
|
||||
if ((ext4_group_first_block_no(sb, n_group) +
|
||||
ext4_group_overhead_blocks(sb, n_group) + 2 +
|
||||
sbi->s_itb_per_group + sbi->s_cluster_ratio) >= n_blocks_count) {
|
||||
n_blocks_count = ext4_group_first_block_no(sb, n_group);
|
||||
n_group--;
|
||||
n_blocks_count_retry = 0;
|
||||
if (resize_inode) {
|
||||
iput(resize_inode);
|
||||
resize_inode = NULL;
|
||||
}
|
||||
goto retry;
|
||||
}
|
||||
|
||||
/* extend the last group */
|
||||
if (n_group == o_group)
|
||||
add = n_blocks_count - o_blocks_count;
|
||||
|
|
|
|||
|
|
@ -4024,11 +4024,13 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
|
|||
block = ext4_count_free_clusters(sb);
|
||||
ext4_free_blocks_count_set(sbi->s_es,
|
||||
EXT4_C2B(sbi, block));
|
||||
ext4_superblock_csum_set(sb);
|
||||
err = percpu_counter_init(&sbi->s_freeclusters_counter, block,
|
||||
GFP_KERNEL);
|
||||
if (!err) {
|
||||
unsigned long freei = ext4_count_free_inodes(sb);
|
||||
sbi->s_es->s_free_inodes_count = cpu_to_le32(freei);
|
||||
ext4_superblock_csum_set(sb);
|
||||
err = percpu_counter_init(&sbi->s_freeinodes_counter, freei,
|
||||
GFP_KERNEL);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1476,7 +1476,7 @@ int gfs2_write_alloc_required(struct gfs2_inode *ip, u64 offset,
|
|||
end_of_file = (i_size_read(&ip->i_inode) + sdp->sd_sb.sb_bsize - 1) >> shift;
|
||||
lblock = offset >> shift;
|
||||
lblock_stop = (offset + len + sdp->sd_sb.sb_bsize - 1) >> shift;
|
||||
if (lblock_stop > end_of_file)
|
||||
if (lblock_stop > end_of_file && ip != GFS2_I(sdp->sd_rindex))
|
||||
return 1;
|
||||
|
||||
size = (lblock_stop - lblock) << shift;
|
||||
|
|
|
|||
|
|
@ -336,6 +336,7 @@ int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr,
|
|||
* for this bh as it's not marked locally
|
||||
* uptodate. */
|
||||
status = -EIO;
|
||||
clear_buffer_needs_validate(bh);
|
||||
put_bh(bh);
|
||||
bhs[i] = NULL;
|
||||
continue;
|
||||
|
|
|
|||
|
|
@ -378,7 +378,12 @@ static void *persistent_ram_vmap(phys_addr_t start, size_t size,
|
|||
vaddr = vmap(pages, page_count, VM_MAP, prot);
|
||||
kfree(pages);
|
||||
|
||||
return vaddr;
|
||||
/*
|
||||
* Since vmap() uses page granularity, we must add the offset
|
||||
* into the page here, to get the byte granularity address
|
||||
* into the mapping to represent the actual "start" location.
|
||||
*/
|
||||
return vaddr + offset_in_page(start);
|
||||
}
|
||||
|
||||
static void *persistent_ram_iomap(phys_addr_t start, size_t size,
|
||||
|
|
@ -397,6 +402,11 @@ static void *persistent_ram_iomap(phys_addr_t start, size_t size,
|
|||
else
|
||||
va = ioremap_wc(start, size);
|
||||
|
||||
/*
|
||||
* Since request_mem_region() and ioremap() are byte-granularity
|
||||
* there is no need handle anything special like we do when the
|
||||
* vmap() case in persistent_ram_vmap() above.
|
||||
*/
|
||||
return va;
|
||||
}
|
||||
|
||||
|
|
@ -417,7 +427,7 @@ static int persistent_ram_buffer_map(phys_addr_t start, phys_addr_t size,
|
|||
return -ENOMEM;
|
||||
}
|
||||
|
||||
prz->buffer = prz->vaddr + offset_in_page(start);
|
||||
prz->buffer = prz->vaddr;
|
||||
prz->buffer_size = size - sizeof(struct persistent_ram_buffer);
|
||||
|
||||
return 0;
|
||||
|
|
@ -464,7 +474,8 @@ void persistent_ram_free(struct persistent_ram_zone *prz)
|
|||
|
||||
if (prz->vaddr) {
|
||||
if (pfn_valid(prz->paddr >> PAGE_SHIFT)) {
|
||||
vunmap(prz->vaddr);
|
||||
/* We must vunmap() at page-granularity. */
|
||||
vunmap(prz->vaddr - offset_in_page(prz->paddr));
|
||||
} else {
|
||||
iounmap(prz->vaddr);
|
||||
release_mem_region(prz->paddr, prz->size);
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ struct nfc_hci_pipe {
|
|||
* According to specification 102 622 chapter 4.4 Pipes,
|
||||
* the pipe identifier is 7 bits long.
|
||||
*/
|
||||
#define NFC_HCI_MAX_PIPES 127
|
||||
#define NFC_HCI_MAX_PIPES 128
|
||||
struct nfc_hci_init_data {
|
||||
u8 gate_count;
|
||||
struct nfc_hci_gate gates[NFC_HCI_MAX_CUSTOM_GATES];
|
||||
|
|
|
|||
|
|
@ -419,6 +419,13 @@ int audit_add_watch(struct audit_krule *krule, struct list_head **list)
|
|||
struct path parent_path;
|
||||
int h, ret = 0;
|
||||
|
||||
/*
|
||||
* When we will be calling audit_add_to_parent, krule->watch might have
|
||||
* been updated and watch might have been freed.
|
||||
* So we need to keep a reference of watch.
|
||||
*/
|
||||
audit_get_watch(watch);
|
||||
|
||||
mutex_unlock(&audit_filter_mutex);
|
||||
|
||||
/* Avoid calling path_lookup under audit_filter_mutex. */
|
||||
|
|
@ -427,8 +434,10 @@ int audit_add_watch(struct audit_krule *krule, struct list_head **list)
|
|||
/* caller expects mutex locked */
|
||||
mutex_lock(&audit_filter_mutex);
|
||||
|
||||
if (ret)
|
||||
if (ret) {
|
||||
audit_put_watch(watch);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* either find an old parent or attach a new one */
|
||||
parent = audit_find_parent(d_backing_inode(parent_path.dentry));
|
||||
|
|
@ -446,6 +455,7 @@ int audit_add_watch(struct audit_krule *krule, struct list_head **list)
|
|||
*list = &audit_inode_hash[h];
|
||||
error:
|
||||
path_put(&parent_path);
|
||||
audit_put_watch(watch);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1513,6 +1513,8 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned long nr_pages)
|
|||
tmp_iter_page = first_page;
|
||||
|
||||
do {
|
||||
cond_resched();
|
||||
|
||||
to_remove_page = tmp_iter_page;
|
||||
rb_inc_page(cpu_buffer, &tmp_iter_page);
|
||||
|
||||
|
|
|
|||
|
|
@ -1464,6 +1464,8 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode
|
|||
mpol_shared_policy_init(&info->policy, NULL);
|
||||
break;
|
||||
}
|
||||
|
||||
lockdep_annotate_inode_mutex_key(inode);
|
||||
} else
|
||||
shmem_free_inode(sb);
|
||||
return inode;
|
||||
|
|
|
|||
|
|
@ -1140,6 +1140,12 @@ int neigh_update(struct neighbour *neigh, const u8 *lladdr, u8 new,
|
|||
lladdr = neigh->ha;
|
||||
}
|
||||
|
||||
/* Update confirmed timestamp for neighbour entry after we
|
||||
* received ARP packet even if it doesn't change IP to MAC binding.
|
||||
*/
|
||||
if (new & NUD_CONNECTED)
|
||||
neigh->confirmed = jiffies;
|
||||
|
||||
/* If entry was valid and address is not changed,
|
||||
do not change entry state, if new one is STALE.
|
||||
*/
|
||||
|
|
@ -1163,15 +1169,12 @@ int neigh_update(struct neighbour *neigh, const u8 *lladdr, u8 new,
|
|||
}
|
||||
}
|
||||
|
||||
/* Update timestamps only once we know we will make a change to the
|
||||
/* Update timestamp only once we know we will make a change to the
|
||||
* neighbour entry. Otherwise we risk to move the locktime window with
|
||||
* noop updates and ignore relevant ARP updates.
|
||||
*/
|
||||
if (new != old || lladdr != neigh->ha) {
|
||||
if (new & NUD_CONNECTED)
|
||||
neigh->confirmed = jiffies;
|
||||
if (new != old || lladdr != neigh->ha)
|
||||
neigh->updated = jiffies;
|
||||
}
|
||||
|
||||
if (new != old) {
|
||||
neigh_del_timer(neigh);
|
||||
|
|
|
|||
|
|
@ -1280,6 +1280,7 @@ static struct sk_buff *inet_gso_segment(struct sk_buff *skb,
|
|||
if (encap)
|
||||
skb_reset_inner_headers(skb);
|
||||
skb->network_header = (u8 *)iph - skb->head;
|
||||
skb_reset_mac_len(skb);
|
||||
} while ((skb = skb->next));
|
||||
|
||||
out:
|
||||
|
|
|
|||
|
|
@ -118,6 +118,7 @@ static struct sk_buff *ipv6_gso_segment(struct sk_buff *skb,
|
|||
ipv6h = (struct ipv6hdr *)(skb_mac_header(skb) + nhoff);
|
||||
ipv6h->payload_len = htons(skb->len - nhoff - sizeof(*ipv6h));
|
||||
skb->network_header = (u8 *)ipv6h - skb->head;
|
||||
skb_reset_mac_len(skb);
|
||||
|
||||
if (udpfrag) {
|
||||
int err = ip6_find_1stfragopt(skb, &prevhdr);
|
||||
|
|
|
|||
|
|
@ -193,12 +193,10 @@ int ip6_xmit(const struct sock *sk, struct sk_buff *skb, struct flowi6 *fl6,
|
|||
kfree_skb(skb);
|
||||
return -ENOBUFS;
|
||||
}
|
||||
if (skb->sk)
|
||||
skb_set_owner_w(skb2, skb->sk);
|
||||
consume_skb(skb);
|
||||
skb = skb2;
|
||||
/* skb_set_owner_w() changes sk->sk_wmem_alloc atomically,
|
||||
* it is safe to call in our context (socket lock not held)
|
||||
*/
|
||||
skb_set_owner_w(skb, (struct sock *)sk);
|
||||
}
|
||||
if (opt->opt_flen)
|
||||
ipv6_push_frag_opts(skb, opt, &proto);
|
||||
|
|
|
|||
|
|
@ -286,7 +286,7 @@ static int ieee80211_del_key(struct wiphy *wiphy, struct net_device *dev,
|
|||
goto out_unlock;
|
||||
}
|
||||
|
||||
ieee80211_key_free(key, true);
|
||||
ieee80211_key_free(key, sdata->vif.type == NL80211_IFTYPE_STATION);
|
||||
|
||||
ret = 0;
|
||||
out_unlock:
|
||||
|
|
|
|||
|
|
@ -647,11 +647,15 @@ int ieee80211_key_link(struct ieee80211_key *key,
|
|||
{
|
||||
struct ieee80211_local *local = sdata->local;
|
||||
struct ieee80211_key *old_key;
|
||||
int idx, ret;
|
||||
bool pairwise;
|
||||
|
||||
pairwise = key->conf.flags & IEEE80211_KEY_FLAG_PAIRWISE;
|
||||
idx = key->conf.keyidx;
|
||||
int idx = key->conf.keyidx;
|
||||
bool pairwise = key->conf.flags & IEEE80211_KEY_FLAG_PAIRWISE;
|
||||
/*
|
||||
* We want to delay tailroom updates only for station - in that
|
||||
* case it helps roaming speed, but in other cases it hurts and
|
||||
* can cause warnings to appear.
|
||||
*/
|
||||
bool delay_tailroom = sdata->vif.type == NL80211_IFTYPE_STATION;
|
||||
int ret;
|
||||
|
||||
mutex_lock(&sdata->local->key_mtx);
|
||||
|
||||
|
|
@ -679,14 +683,14 @@ int ieee80211_key_link(struct ieee80211_key *key,
|
|||
increment_tailroom_need_count(sdata);
|
||||
|
||||
ieee80211_key_replace(sdata, sta, pairwise, old_key, key);
|
||||
ieee80211_key_destroy(old_key, true);
|
||||
ieee80211_key_destroy(old_key, delay_tailroom);
|
||||
|
||||
ieee80211_debugfs_key_add(key);
|
||||
|
||||
if (!local->wowlan) {
|
||||
ret = ieee80211_key_enable_hw_accel(key);
|
||||
if (ret)
|
||||
ieee80211_key_free(key, true);
|
||||
ieee80211_key_free(key, delay_tailroom);
|
||||
} else {
|
||||
ret = 0;
|
||||
}
|
||||
|
|
@ -874,7 +878,8 @@ void ieee80211_free_sta_keys(struct ieee80211_local *local,
|
|||
ieee80211_key_replace(key->sdata, key->sta,
|
||||
key->conf.flags & IEEE80211_KEY_FLAG_PAIRWISE,
|
||||
key, NULL);
|
||||
__ieee80211_key_destroy(key, true);
|
||||
__ieee80211_key_destroy(key, key->sdata->vif.type ==
|
||||
NL80211_IFTYPE_STATION);
|
||||
}
|
||||
|
||||
for (i = 0; i < NUM_DEFAULT_KEYS; i++) {
|
||||
|
|
@ -884,7 +889,8 @@ void ieee80211_free_sta_keys(struct ieee80211_local *local,
|
|||
ieee80211_key_replace(key->sdata, key->sta,
|
||||
key->conf.flags & IEEE80211_KEY_FLAG_PAIRWISE,
|
||||
key, NULL);
|
||||
__ieee80211_key_destroy(key, true);
|
||||
__ieee80211_key_destroy(key, key->sdata->vif.type ==
|
||||
NL80211_IFTYPE_STATION);
|
||||
}
|
||||
|
||||
mutex_unlock(&local->key_mtx);
|
||||
|
|
|
|||
|
|
@ -209,6 +209,11 @@ void nfc_hci_cmd_received(struct nfc_hci_dev *hdev, u8 pipe, u8 cmd,
|
|||
}
|
||||
create_info = (struct hci_create_pipe_resp *)skb->data;
|
||||
|
||||
if (create_info->pipe >= NFC_HCI_MAX_PIPES) {
|
||||
status = NFC_HCI_ANY_E_NOK;
|
||||
goto exit;
|
||||
}
|
||||
|
||||
/* Save the new created pipe and bind with local gate,
|
||||
* the description for skb->data[3] is destination gate id
|
||||
* but since we received this cmd from host controller, we
|
||||
|
|
@ -232,6 +237,11 @@ void nfc_hci_cmd_received(struct nfc_hci_dev *hdev, u8 pipe, u8 cmd,
|
|||
}
|
||||
delete_info = (struct hci_delete_pipe_noti *)skb->data;
|
||||
|
||||
if (delete_info->pipe >= NFC_HCI_MAX_PIPES) {
|
||||
status = NFC_HCI_ANY_E_NOK;
|
||||
goto exit;
|
||||
}
|
||||
|
||||
hdev->pipes[delete_info->pipe].gate = NFC_HCI_INVALID_GATE;
|
||||
hdev->pipes[delete_info->pipe].dest_host = NFC_HCI_INVALID_HOST;
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -1845,7 +1845,10 @@ xfrm_resolve_and_create_bundle(struct xfrm_policy **pols, int num_pols,
|
|||
/* Try to instantiate a bundle */
|
||||
err = xfrm_tmpl_resolve(pols, num_pols, fl, xfrm, family);
|
||||
if (err <= 0) {
|
||||
if (err != 0 && err != -EAGAIN)
|
||||
if (err == 0)
|
||||
return NULL;
|
||||
|
||||
if (err != -EAGAIN)
|
||||
XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTPOLERROR);
|
||||
return ERR_PTR(err);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -359,3 +359,6 @@ endif
|
|||
endef
|
||||
#
|
||||
###############################################################################
|
||||
|
||||
# delete partially updated (i.e. corrupted) files on error
|
||||
.DELETE_ON_ERROR:
|
||||
|
|
|
|||
|
|
@ -648,27 +648,33 @@ EXPORT_SYMBOL(snd_interval_refine);
|
|||
|
||||
static int snd_interval_refine_first(struct snd_interval *i)
|
||||
{
|
||||
const unsigned int last_max = i->max;
|
||||
|
||||
if (snd_BUG_ON(snd_interval_empty(i)))
|
||||
return -EINVAL;
|
||||
if (snd_interval_single(i))
|
||||
return 0;
|
||||
i->max = i->min;
|
||||
i->openmax = i->openmin;
|
||||
if (i->openmax)
|
||||
if (i->openmin)
|
||||
i->max++;
|
||||
/* only exclude max value if also excluded before refine */
|
||||
i->openmax = (i->openmax && i->max >= last_max);
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int snd_interval_refine_last(struct snd_interval *i)
|
||||
{
|
||||
const unsigned int last_min = i->min;
|
||||
|
||||
if (snd_BUG_ON(snd_interval_empty(i)))
|
||||
return -EINVAL;
|
||||
if (snd_interval_single(i))
|
||||
return 0;
|
||||
i->min = i->max;
|
||||
i->openmin = i->openmax;
|
||||
if (i->openmin)
|
||||
if (i->openmax)
|
||||
i->min--;
|
||||
/* only exclude min value if also excluded before refine */
|
||||
i->openmin = (i->openmin && i->min <= last_min);
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -96,17 +96,13 @@ int snd_bebob_maudio_load_firmware(struct fw_unit *unit)
|
|||
struct fw_device *device = fw_parent_device(unit);
|
||||
int err, rcode;
|
||||
u64 date;
|
||||
__le32 cues[3] = {
|
||||
cpu_to_le32(MAUDIO_BOOTLOADER_CUE1),
|
||||
cpu_to_le32(MAUDIO_BOOTLOADER_CUE2),
|
||||
cpu_to_le32(MAUDIO_BOOTLOADER_CUE3)
|
||||
};
|
||||
__le32 *cues;
|
||||
|
||||
/* check date of software used to build */
|
||||
err = snd_bebob_read_block(unit, INFO_OFFSET_SW_DATE,
|
||||
&date, sizeof(u64));
|
||||
if (err < 0)
|
||||
goto end;
|
||||
return err;
|
||||
/*
|
||||
* firmware version 5058 or later has date later than "20070401", but
|
||||
* 'date' is not null-terminated.
|
||||
|
|
@ -114,20 +110,28 @@ int snd_bebob_maudio_load_firmware(struct fw_unit *unit)
|
|||
if (date < 0x3230303730343031LL) {
|
||||
dev_err(&unit->device,
|
||||
"Use firmware version 5058 or later\n");
|
||||
err = -ENOSYS;
|
||||
goto end;
|
||||
return -ENXIO;
|
||||
}
|
||||
|
||||
cues = kmalloc_array(3, sizeof(*cues), GFP_KERNEL);
|
||||
if (!cues)
|
||||
return -ENOMEM;
|
||||
|
||||
cues[0] = cpu_to_le32(MAUDIO_BOOTLOADER_CUE1);
|
||||
cues[1] = cpu_to_le32(MAUDIO_BOOTLOADER_CUE2);
|
||||
cues[2] = cpu_to_le32(MAUDIO_BOOTLOADER_CUE3);
|
||||
|
||||
rcode = fw_run_transaction(device->card, TCODE_WRITE_BLOCK_REQUEST,
|
||||
device->node_id, device->generation,
|
||||
device->max_speed, BEBOB_ADDR_REG_REQ,
|
||||
cues, sizeof(cues));
|
||||
cues, 3 * sizeof(*cues));
|
||||
kfree(cues);
|
||||
if (rcode != RCODE_COMPLETE) {
|
||||
dev_err(&unit->device,
|
||||
"Failed to send a cue to load firmware\n");
|
||||
err = -EIO;
|
||||
}
|
||||
end:
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -82,10 +82,10 @@
|
|||
|
||||
static void set_default_audio_parameters(struct snd_msnd *chip)
|
||||
{
|
||||
chip->play_sample_size = DEFSAMPLESIZE;
|
||||
chip->play_sample_size = snd_pcm_format_width(DEFSAMPLESIZE);
|
||||
chip->play_sample_rate = DEFSAMPLERATE;
|
||||
chip->play_channels = DEFCHANNELS;
|
||||
chip->capture_sample_size = DEFSAMPLESIZE;
|
||||
chip->capture_sample_size = snd_pcm_format_width(DEFSAMPLESIZE);
|
||||
chip->capture_sample_rate = DEFSAMPLERATE;
|
||||
chip->capture_channels = DEFCHANNELS;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2520,7 +2520,7 @@ static int snd_emu10k1_fx8010_ioctl(struct snd_hwdep * hw, struct file *file, un
|
|||
emu->support_tlv = 1;
|
||||
return put_user(SNDRV_EMU10K1_VERSION, (int __user *)argp);
|
||||
case SNDRV_EMU10K1_IOCTL_INFO:
|
||||
info = kmalloc(sizeof(*info), GFP_KERNEL);
|
||||
info = kzalloc(sizeof(*info), GFP_KERNEL);
|
||||
if (!info)
|
||||
return -ENOMEM;
|
||||
snd_emu10k1_fx8010_info(emu, info);
|
||||
|
|
|
|||
|
|
@ -157,8 +157,8 @@ static const struct snd_kcontrol_new cs4265_snd_controls[] = {
|
|||
SOC_SINGLE("Validity Bit Control Switch", CS4265_SPDIF_CTL2,
|
||||
3, 1, 0),
|
||||
SOC_ENUM("SPDIF Mono/Stereo", spdif_mono_stereo_enum),
|
||||
SOC_SINGLE("MMTLR Data Switch", 0,
|
||||
1, 1, 0),
|
||||
SOC_SINGLE("MMTLR Data Switch", CS4265_SPDIF_CTL2,
|
||||
0, 1, 0),
|
||||
SOC_ENUM("Mono Channel Select", spdif_mono_select_enum),
|
||||
SND_SOC_BYTES("C Data Buffer", CS4265_C_DATA_BUFF, 24),
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2875,7 +2875,8 @@ YAMAHA_DEVICE(0x7010, "UB99"),
|
|||
*/
|
||||
|
||||
#define AU0828_DEVICE(vid, pid, vname, pname) { \
|
||||
USB_DEVICE_VENDOR_SPEC(vid, pid), \
|
||||
.idVendor = vid, \
|
||||
.idProduct = pid, \
|
||||
.match_flags = USB_DEVICE_ID_MATCH_DEVICE | \
|
||||
USB_DEVICE_ID_MATCH_INT_CLASS | \
|
||||
USB_DEVICE_ID_MATCH_INT_SUBCLASS, \
|
||||
|
|
|
|||
|
|
@ -286,7 +286,7 @@ static int kvp_key_delete(int pool, const __u8 *key, int key_size)
|
|||
* Found a match; just move the remaining
|
||||
* entries up.
|
||||
*/
|
||||
if (i == num_records) {
|
||||
if (i == (num_records - 1)) {
|
||||
kvp_file_info[pool].num_records--;
|
||||
kvp_update_file(pool);
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -58,9 +58,13 @@ static int check_return_reg(int ra_regno, Dwarf_Frame *frame)
|
|||
}
|
||||
|
||||
/*
|
||||
* Check if return address is on the stack.
|
||||
* Check if return address is on the stack. If return address
|
||||
* is in a register (typically R0), it is yet to be saved on
|
||||
* the stack.
|
||||
*/
|
||||
if (nops != 0 || ops != NULL)
|
||||
if ((nops != 0 || ops != NULL) &&
|
||||
!(nops == 1 && ops[0].atom == DW_OP_regx &&
|
||||
ops[0].number2 == 0 && ops[0].offset == 0))
|
||||
return 0;
|
||||
|
||||
/*
|
||||
|
|
@ -246,7 +250,7 @@ int arch_skip_callchain_idx(struct thread *thread, struct ip_callchain *chain)
|
|||
if (!chain || chain->nr < 3)
|
||||
return skip_slot;
|
||||
|
||||
ip = chain->ips[2];
|
||||
ip = chain->ips[1];
|
||||
|
||||
thread__find_addr_location(thread, PERF_RECORD_MISC_USER,
|
||||
MAP__FUNCTION, ip, &al);
|
||||
|
|
|
|||
|
|
@ -146,6 +146,11 @@ int main(int argv, char **argc)
|
|||
printf(" %lld.%i(act)", ppm/1000, abs((int)(ppm%1000)));
|
||||
|
||||
if (llabs(eppm - ppm) > 1000) {
|
||||
if (tx1.offset || tx2.offset ||
|
||||
tx1.freq != tx2.freq || tx1.tick != tx2.tick) {
|
||||
printf(" [SKIP]\n");
|
||||
return ksft_exit_skip("The clock was adjusted externally. Shutdown NTPd or other time sync daemons\n");
|
||||
}
|
||||
printf(" [FAILED]\n");
|
||||
return ksft_exit_fail();
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user