This is the 5.4.109 stable release
-----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmBjGy8ACgkQONu9yGCS aT6P4Q//RUTmWKIEvODK9Hyac0qfvd1CsIgebVR/1hkadYO8OVssIVjSZoyHvfgg B2rsjrY1+ywwPl+IYFe4V29SIEuy+YWNo7rjavAPP7W1ybYzhaUXog7KSapho8cy hqTlLyWq/TeSehdomz2Luv5vM794RgEV4NjgxnBsncfjUchx5smGQH80xbKRbWFB QNq2h1coPbABv3dj1cBb1v2jiCc58QD8rfJuguaHjAiGem2HaMat2iWYo8T2Qcre UDb1yrOxCbwltc8+aRRcXI4QuS/4edPz3ZH8H9zdqMQVoS5RX0Alse+w6+F26c1c fRZmtg6t70wsznIQ+Jn6ouMY3Ea1jtrF4oVjMCMnno+4V7BgDGW+A+CAqbCC90mt QTwaObNyJRjUYjlLmTml7t+S3GqW2YoC2jALs2P3hx/ht0wOl6TIt7YmHCh3/tnR wZjyofl+2ml/z+cPqP7/IWGJzzNCEwxreZNcvjgx+k/L/zeNri4q/+fLETe0VE0H LNU04JBl2oOOMpkyX8MJODH5Gm9sOg+GiQ3tEZWsgls0mwtxKMxRuu6zNPQvIY93 cGntM1kVTtQ8fzIUugZR0JgElnosg1xFup3nQKyoids+SEGDgDpC4O5pxYvNW8oo jThLWud1waFzhnVXGRGviI0irQPUeYh7Bfw///c7hPHbqw9+F0k= =6s9w -----END PGP SIGNATURE----- gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEdQaENiSDAlGTDEbB7G51OISzHs0FAmBsF/oACgkQ7G51OISz Hs3CjRAApVP+mu2FCtefIpEnIJJnsPt3L3QQKq3OtChJb6pSRv9FZ7+KW9RYz+qg kTyYa1O8FPxaiUH1RUJnRt93qRYf12JitFAUOuEthJGL6Rac5pl2JfvMNAAWvhW7 nin/Ci7klYyve7Fk3JsBnzpppQHgODTHbQ4TyUH0Mcx8l20o7uxoClevs9JqB3m8 RbpwRjKKU+4dZU51ueLVPKenS2pk8Hz3kKLPDP27ZJh0PeJrLa4Och7rh3cqVBLW nYFJDLBRMRmuVnAHmzCclhH/YFzRC9TKI/iET2u14P1HPdHFO5TUqARbRY37iWLT w33qPohDAdR08Kzn7LWGxxoiyoYxqyWgCXhTaeuciMS+NipdHo8/dyDVQClnYZdh aPf0eqNciWEkE4KwltvKl4huYwzptsraBxa5eweHa4LhB6M21kmcOdenwPAz1dcO upiQqC68ZJAVoT75RD1M1cvQfVDPoNMcrl/Nw+sDqqawwUQ6jpyu46kRK3ttJ0Qx EiG5UhS50IyNPbgNUztnsezks26ajyNho69yQuiGA7qgPBKDBPuBrLnk3LlEkuzq 8fpMRYDQqIYe0YaKb/DV/8X/c9WowskNv9VkGoqx4VbOFnQUFoxl9MEDjzWcksOq 9OihF8flIwsY8rKFZGJ5EbMbgaw85DutEu6m830CMoIZfUTCRFo= =XQ0y -----END PGP SIGNATURE----- Merge tag 'v5.4.109' into 5.4-2.3.x-imx This is the 5.4.109 stable release Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
This commit is contained in:
commit
c4253dfaf6
2
Makefile
2
Makefile
|
@ -1,7 +1,7 @@
|
|||
# SPDX-License-Identifier: GPL-2.0
|
||||
VERSION = 5
|
||||
PATCHLEVEL = 4
|
||||
SUBLEVEL = 108
|
||||
SUBLEVEL = 109
|
||||
EXTRAVERSION =
|
||||
NAME = Kleptomaniac Octopus
|
||||
|
||||
|
|
|
@ -44,8 +44,8 @@
|
|||
pinctrl-0 = <&pinctrl_macb0_default>;
|
||||
phy-mode = "rmii";
|
||||
|
||||
ethernet-phy@0 {
|
||||
reg = <0x0>;
|
||||
ethernet-phy@7 {
|
||||
reg = <0x7>;
|
||||
interrupt-parent = <&pioA>;
|
||||
interrupts = <PIN_PD31 IRQ_TYPE_LEVEL_LOW>;
|
||||
pinctrl-names = "default";
|
||||
|
|
|
@ -150,6 +150,7 @@
|
|||
ranges = <0x0 0x00 0x1700000 0x100000>;
|
||||
reg = <0x00 0x1700000 0x0 0x100000>;
|
||||
interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
|
||||
dma-coherent;
|
||||
|
||||
sec_jr0: jr@10000 {
|
||||
compatible = "fsl,sec-v5.4-job-ring",
|
||||
|
|
|
@ -256,6 +256,7 @@
|
|||
ranges = <0x0 0x00 0x1700000 0x100000>;
|
||||
reg = <0x00 0x1700000 0x0 0x100000>;
|
||||
interrupts = <0 75 0x4>;
|
||||
dma-coherent;
|
||||
|
||||
sec_jr0: jr@10000 {
|
||||
compatible = "fsl,sec-v5.4-job-ring",
|
||||
|
|
|
@ -259,6 +259,7 @@
|
|||
ranges = <0x0 0x00 0x1700000 0x100000>;
|
||||
reg = <0x00 0x1700000 0x0 0x100000>;
|
||||
interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
|
||||
dma-coherent;
|
||||
|
||||
sec_jr0: jr@10000 {
|
||||
compatible = "fsl,sec-v5.4-job-ring",
|
||||
|
|
|
@ -64,5 +64,7 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
|
|||
ssize_t elfcorehdr_read(char *buf, size_t count, u64 *ppos)
|
||||
{
|
||||
memcpy(buf, phys_to_virt((phys_addr_t)*ppos), count);
|
||||
*ppos += count;
|
||||
|
||||
return count;
|
||||
}
|
||||
|
|
|
@ -32,7 +32,7 @@ static inline void syscall_rollback(struct task_struct *task,
|
|||
static inline long syscall_get_error(struct task_struct *task,
|
||||
struct pt_regs *regs)
|
||||
{
|
||||
return regs->r10 == -1 ? regs->r8:0;
|
||||
return regs->r10 == -1 ? -regs->r8:0;
|
||||
}
|
||||
|
||||
static inline long syscall_get_return_value(struct task_struct *task,
|
||||
|
|
|
@ -2147,27 +2147,39 @@ static void syscall_get_set_args_cb(struct unw_frame_info *info, void *data)
|
|||
{
|
||||
struct syscall_get_set_args *args = data;
|
||||
struct pt_regs *pt = args->regs;
|
||||
unsigned long *krbs, cfm, ndirty;
|
||||
unsigned long *krbs, cfm, ndirty, nlocals, nouts;
|
||||
int i, count;
|
||||
|
||||
if (unw_unwind_to_user(info) < 0)
|
||||
return;
|
||||
|
||||
/*
|
||||
* We get here via a few paths:
|
||||
* - break instruction: cfm is shared with caller.
|
||||
* syscall args are in out= regs, locals are non-empty.
|
||||
* - epsinstruction: cfm is set by br.call
|
||||
* locals don't exist.
|
||||
*
|
||||
* For both cases argguments are reachable in cfm.sof - cfm.sol.
|
||||
* CFM: [ ... | sor: 17..14 | sol : 13..7 | sof : 6..0 ]
|
||||
*/
|
||||
cfm = pt->cr_ifs;
|
||||
nlocals = (cfm >> 7) & 0x7f; /* aka sol */
|
||||
nouts = (cfm & 0x7f) - nlocals; /* aka sof - sol */
|
||||
krbs = (unsigned long *)info->task + IA64_RBS_OFFSET/8;
|
||||
ndirty = ia64_rse_num_regs(krbs, krbs + (pt->loadrs >> 19));
|
||||
|
||||
count = 0;
|
||||
if (in_syscall(pt))
|
||||
count = min_t(int, args->n, cfm & 0x7f);
|
||||
count = min_t(int, args->n, nouts);
|
||||
|
||||
/* Iterate over outs. */
|
||||
for (i = 0; i < count; i++) {
|
||||
int j = ndirty + nlocals + i + args->i;
|
||||
if (args->rw)
|
||||
*ia64_rse_skip_regs(krbs, ndirty + i + args->i) =
|
||||
args->args[i];
|
||||
*ia64_rse_skip_regs(krbs, j) = args->args[i];
|
||||
else
|
||||
args->args[i] = *ia64_rse_skip_regs(krbs,
|
||||
ndirty + i + args->i);
|
||||
args->args[i] = *ia64_rse_skip_regs(krbs, j);
|
||||
}
|
||||
|
||||
if (!args->rw) {
|
||||
|
|
|
@ -53,8 +53,8 @@ static inline void mtdcrx(unsigned int reg, unsigned int val)
|
|||
#define mfdcr(rn) \
|
||||
({unsigned int rval; \
|
||||
if (__builtin_constant_p(rn) && rn < 1024) \
|
||||
asm volatile("mfdcr %0," __stringify(rn) \
|
||||
: "=r" (rval)); \
|
||||
asm volatile("mfdcr %0, %1" : "=r" (rval) \
|
||||
: "n" (rn)); \
|
||||
else if (likely(cpu_has_feature(CPU_FTR_INDEXED_DCR))) \
|
||||
rval = mfdcrx(rn); \
|
||||
else \
|
||||
|
@ -64,8 +64,8 @@ static inline void mtdcrx(unsigned int reg, unsigned int val)
|
|||
#define mtdcr(rn, v) \
|
||||
do { \
|
||||
if (__builtin_constant_p(rn) && rn < 1024) \
|
||||
asm volatile("mtdcr " __stringify(rn) ",%0" \
|
||||
: : "r" (v)); \
|
||||
asm volatile("mtdcr %0, %1" \
|
||||
: : "n" (rn), "r" (v)); \
|
||||
else if (likely(cpu_has_feature(CPU_FTR_INDEXED_DCR))) \
|
||||
mtdcrx(rn, v); \
|
||||
else \
|
||||
|
|
|
@ -275,14 +275,13 @@ bool is_no_fault_exception(struct pt_regs *regs)
|
|||
asi = (regs->tstate >> 24); /* saved %asi */
|
||||
else
|
||||
asi = (insn >> 5); /* immediate asi */
|
||||
if ((asi & 0xf2) == ASI_PNF) {
|
||||
if (insn & 0x1000000) { /* op3[5:4]=3 */
|
||||
handle_ldf_stq(insn, regs);
|
||||
return true;
|
||||
} else if (insn & 0x200000) { /* op3[2], stores */
|
||||
if ((asi & 0xf6) == ASI_PNF) {
|
||||
if (insn & 0x200000) /* op3[2], stores */
|
||||
return false;
|
||||
}
|
||||
handle_ld_nf(insn, regs);
|
||||
if (insn & 0x1000000) /* op3[5:4]=3 (fp) */
|
||||
handle_ldf_stq(insn, regs);
|
||||
else
|
||||
handle_ld_nf(insn, regs);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -229,7 +229,7 @@ static void __init __set_clr_pte_enc(pte_t *kpte, int level, bool enc)
|
|||
if (pgprot_val(old_prot) == pgprot_val(new_prot))
|
||||
return;
|
||||
|
||||
pa = pfn << page_level_shift(level);
|
||||
pa = pfn << PAGE_SHIFT;
|
||||
size = page_level_size(level);
|
||||
|
||||
/*
|
||||
|
|
|
@ -370,6 +370,14 @@ unsigned int blk_recalc_rq_segments(struct request *rq)
|
|||
switch (bio_op(rq->bio)) {
|
||||
case REQ_OP_DISCARD:
|
||||
case REQ_OP_SECURE_ERASE:
|
||||
if (queue_max_discard_segments(rq->q) > 1) {
|
||||
struct bio *bio = rq->bio;
|
||||
|
||||
for_each_bio(bio)
|
||||
nr_phys_segs++;
|
||||
return nr_phys_segs;
|
||||
}
|
||||
return 1;
|
||||
case REQ_OP_WRITE_ZEROES:
|
||||
return 0;
|
||||
case REQ_OP_WRITE_SAME:
|
||||
|
|
|
@ -637,10 +637,8 @@ static void register_disk(struct device *parent, struct gendisk *disk,
|
|||
disk->part0.holder_dir = kobject_create_and_add("holders", &ddev->kobj);
|
||||
disk->slave_dir = kobject_create_and_add("slaves", &ddev->kobj);
|
||||
|
||||
if (disk->flags & GENHD_FL_HIDDEN) {
|
||||
dev_set_uevent_suppress(ddev, 0);
|
||||
if (disk->flags & GENHD_FL_HIDDEN)
|
||||
return;
|
||||
}
|
||||
|
||||
/* No minors to use for partitions */
|
||||
if (!disk_part_scan_enabled(disk))
|
||||
|
|
|
@ -9,6 +9,8 @@
|
|||
#ifndef _ACPI_INTERNAL_H_
|
||||
#define _ACPI_INTERNAL_H_
|
||||
|
||||
#include <linux/idr.h>
|
||||
|
||||
#define PREFIX "ACPI: "
|
||||
|
||||
int early_acpi_osi_init(void);
|
||||
|
@ -96,9 +98,11 @@ void acpi_scan_table_handler(u32 event, void *table, void *context);
|
|||
|
||||
extern struct list_head acpi_bus_id_list;
|
||||
|
||||
#define ACPI_MAX_DEVICE_INSTANCES 4096
|
||||
|
||||
struct acpi_device_bus_id {
|
||||
const char *bus_id;
|
||||
unsigned int instance_no;
|
||||
struct ida instance_ida;
|
||||
struct list_head node;
|
||||
};
|
||||
|
||||
|
|
|
@ -483,9 +483,8 @@ static void acpi_device_del(struct acpi_device *device)
|
|||
list_for_each_entry(acpi_device_bus_id, &acpi_bus_id_list, node)
|
||||
if (!strcmp(acpi_device_bus_id->bus_id,
|
||||
acpi_device_hid(device))) {
|
||||
if (acpi_device_bus_id->instance_no > 0)
|
||||
acpi_device_bus_id->instance_no--;
|
||||
else {
|
||||
ida_simple_remove(&acpi_device_bus_id->instance_ida, device->pnp.instance_no);
|
||||
if (ida_is_empty(&acpi_device_bus_id->instance_ida)) {
|
||||
list_del(&acpi_device_bus_id->node);
|
||||
kfree_const(acpi_device_bus_id->bus_id);
|
||||
kfree(acpi_device_bus_id);
|
||||
|
@ -624,12 +623,38 @@ void acpi_bus_put_acpi_device(struct acpi_device *adev)
|
|||
put_device(&adev->dev);
|
||||
}
|
||||
|
||||
static struct acpi_device_bus_id *acpi_device_bus_id_match(const char *dev_id)
|
||||
{
|
||||
struct acpi_device_bus_id *acpi_device_bus_id;
|
||||
|
||||
/* Find suitable bus_id and instance number in acpi_bus_id_list. */
|
||||
list_for_each_entry(acpi_device_bus_id, &acpi_bus_id_list, node) {
|
||||
if (!strcmp(acpi_device_bus_id->bus_id, dev_id))
|
||||
return acpi_device_bus_id;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static int acpi_device_set_name(struct acpi_device *device,
|
||||
struct acpi_device_bus_id *acpi_device_bus_id)
|
||||
{
|
||||
struct ida *instance_ida = &acpi_device_bus_id->instance_ida;
|
||||
int result;
|
||||
|
||||
result = ida_simple_get(instance_ida, 0, ACPI_MAX_DEVICE_INSTANCES, GFP_KERNEL);
|
||||
if (result < 0)
|
||||
return result;
|
||||
|
||||
device->pnp.instance_no = result;
|
||||
dev_set_name(&device->dev, "%s:%02x", acpi_device_bus_id->bus_id, result);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int acpi_device_add(struct acpi_device *device,
|
||||
void (*release)(struct device *))
|
||||
{
|
||||
struct acpi_device_bus_id *acpi_device_bus_id;
|
||||
int result;
|
||||
struct acpi_device_bus_id *acpi_device_bus_id, *new_bus_id;
|
||||
int found = 0;
|
||||
|
||||
if (device->handle) {
|
||||
acpi_status status;
|
||||
|
@ -655,41 +680,38 @@ int acpi_device_add(struct acpi_device *device,
|
|||
INIT_LIST_HEAD(&device->del_list);
|
||||
mutex_init(&device->physical_node_lock);
|
||||
|
||||
new_bus_id = kzalloc(sizeof(struct acpi_device_bus_id), GFP_KERNEL);
|
||||
if (!new_bus_id) {
|
||||
pr_err(PREFIX "Memory allocation error\n");
|
||||
result = -ENOMEM;
|
||||
goto err_detach;
|
||||
}
|
||||
|
||||
mutex_lock(&acpi_device_lock);
|
||||
/*
|
||||
* Find suitable bus_id and instance number in acpi_bus_id_list
|
||||
* If failed, create one and link it into acpi_bus_id_list
|
||||
*/
|
||||
list_for_each_entry(acpi_device_bus_id, &acpi_bus_id_list, node) {
|
||||
if (!strcmp(acpi_device_bus_id->bus_id,
|
||||
acpi_device_hid(device))) {
|
||||
acpi_device_bus_id->instance_no++;
|
||||
found = 1;
|
||||
kfree(new_bus_id);
|
||||
break;
|
||||
|
||||
acpi_device_bus_id = acpi_device_bus_id_match(acpi_device_hid(device));
|
||||
if (acpi_device_bus_id) {
|
||||
result = acpi_device_set_name(device, acpi_device_bus_id);
|
||||
if (result)
|
||||
goto err_unlock;
|
||||
} else {
|
||||
acpi_device_bus_id = kzalloc(sizeof(*acpi_device_bus_id),
|
||||
GFP_KERNEL);
|
||||
if (!acpi_device_bus_id) {
|
||||
result = -ENOMEM;
|
||||
goto err_unlock;
|
||||
}
|
||||
}
|
||||
if (!found) {
|
||||
acpi_device_bus_id = new_bus_id;
|
||||
acpi_device_bus_id->bus_id =
|
||||
kstrdup_const(acpi_device_hid(device), GFP_KERNEL);
|
||||
if (!acpi_device_bus_id->bus_id) {
|
||||
pr_err(PREFIX "Memory allocation error for bus id\n");
|
||||
kfree(acpi_device_bus_id);
|
||||
result = -ENOMEM;
|
||||
goto err_free_new_bus_id;
|
||||
goto err_unlock;
|
||||
}
|
||||
|
||||
ida_init(&acpi_device_bus_id->instance_ida);
|
||||
|
||||
result = acpi_device_set_name(device, acpi_device_bus_id);
|
||||
if (result) {
|
||||
kfree(acpi_device_bus_id);
|
||||
goto err_unlock;
|
||||
}
|
||||
|
||||
acpi_device_bus_id->instance_no = 0;
|
||||
list_add_tail(&acpi_device_bus_id->node, &acpi_bus_id_list);
|
||||
}
|
||||
dev_set_name(&device->dev, "%s:%02x", acpi_device_bus_id->bus_id, acpi_device_bus_id->instance_no);
|
||||
|
||||
if (device->parent)
|
||||
list_add_tail(&device->node, &device->parent->children);
|
||||
|
@ -721,13 +743,9 @@ int acpi_device_add(struct acpi_device *device,
|
|||
list_del(&device->node);
|
||||
list_del(&device->wakeup_list);
|
||||
|
||||
err_free_new_bus_id:
|
||||
if (!found)
|
||||
kfree(new_bus_id);
|
||||
|
||||
err_unlock:
|
||||
mutex_unlock(&acpi_device_lock);
|
||||
|
||||
err_detach:
|
||||
acpi_detach_data(device->handle, acpi_scan_drop_device);
|
||||
return result;
|
||||
}
|
||||
|
|
|
@ -150,6 +150,7 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
|
|||
},
|
||||
},
|
||||
{
|
||||
.callback = video_detect_force_vendor,
|
||||
.ident = "Sony VPCEH3U1E",
|
||||
.matches = {
|
||||
DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
|
||||
|
|
|
@ -2281,7 +2281,8 @@ out:
|
|||
return rc;
|
||||
|
||||
err_eni_release:
|
||||
eni_do_release(dev);
|
||||
dev->phy = NULL;
|
||||
iounmap(ENI_DEV(dev)->ioaddr);
|
||||
err_unregister:
|
||||
atm_dev_deregister(dev);
|
||||
err_free_consistent:
|
||||
|
|
|
@ -262,7 +262,7 @@ static int idt77105_start(struct atm_dev *dev)
|
|||
{
|
||||
unsigned long flags;
|
||||
|
||||
if (!(dev->dev_data = kmalloc(sizeof(struct idt77105_priv),GFP_KERNEL)))
|
||||
if (!(dev->phy_data = kmalloc(sizeof(struct idt77105_priv),GFP_KERNEL)))
|
||||
return -ENOMEM;
|
||||
PRIV(dev)->dev = dev;
|
||||
spin_lock_irqsave(&idt77105_priv_lock, flags);
|
||||
|
@ -337,7 +337,7 @@ static int idt77105_stop(struct atm_dev *dev)
|
|||
else
|
||||
idt77105_all = walk->next;
|
||||
dev->phy = NULL;
|
||||
dev->dev_data = NULL;
|
||||
dev->phy_data = NULL;
|
||||
kfree(walk);
|
||||
break;
|
||||
}
|
||||
|
|
|
@ -2234,6 +2234,7 @@ static int lanai_dev_open(struct atm_dev *atmdev)
|
|||
conf1_write(lanai);
|
||||
#endif
|
||||
iounmap(lanai->base);
|
||||
lanai->base = NULL;
|
||||
error_pci:
|
||||
pci_disable_device(lanai->pci);
|
||||
error:
|
||||
|
@ -2246,6 +2247,8 @@ static int lanai_dev_open(struct atm_dev *atmdev)
|
|||
static void lanai_dev_close(struct atm_dev *atmdev)
|
||||
{
|
||||
struct lanai_dev *lanai = (struct lanai_dev *) atmdev->dev_data;
|
||||
if (lanai->base==NULL)
|
||||
return;
|
||||
printk(KERN_INFO DEV_LABEL "(itf %d): shutting down interface\n",
|
||||
lanai->number);
|
||||
lanai_timed_poll_stop(lanai);
|
||||
|
@ -2555,7 +2558,7 @@ static int lanai_init_one(struct pci_dev *pci,
|
|||
struct atm_dev *atmdev;
|
||||
int result;
|
||||
|
||||
lanai = kmalloc(sizeof(*lanai), GFP_KERNEL);
|
||||
lanai = kzalloc(sizeof(*lanai), GFP_KERNEL);
|
||||
if (lanai == NULL) {
|
||||
printk(KERN_ERR DEV_LABEL
|
||||
": couldn't allocate dev_data structure!\n");
|
||||
|
|
|
@ -211,7 +211,7 @@ static void uPD98402_int(struct atm_dev *dev)
|
|||
static int uPD98402_start(struct atm_dev *dev)
|
||||
{
|
||||
DPRINTK("phy_start\n");
|
||||
if (!(dev->dev_data = kmalloc(sizeof(struct uPD98402_priv),GFP_KERNEL)))
|
||||
if (!(dev->phy_data = kmalloc(sizeof(struct uPD98402_priv),GFP_KERNEL)))
|
||||
return -ENOMEM;
|
||||
spin_lock_init(&PRIV(dev)->lock);
|
||||
memset(&PRIV(dev)->sonet_stats,0,sizeof(struct k_sonet_stats));
|
||||
|
|
|
@ -305,7 +305,7 @@ static int rpm_get_suppliers(struct device *dev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void rpm_put_suppliers(struct device *dev)
|
||||
static void __rpm_put_suppliers(struct device *dev, bool try_to_suspend)
|
||||
{
|
||||
struct device_link *link;
|
||||
|
||||
|
@ -313,10 +313,30 @@ static void rpm_put_suppliers(struct device *dev)
|
|||
device_links_read_lock_held()) {
|
||||
|
||||
while (refcount_dec_not_one(&link->rpm_active))
|
||||
pm_runtime_put(link->supplier);
|
||||
pm_runtime_put_noidle(link->supplier);
|
||||
|
||||
if (try_to_suspend)
|
||||
pm_request_idle(link->supplier);
|
||||
}
|
||||
}
|
||||
|
||||
static void rpm_put_suppliers(struct device *dev)
|
||||
{
|
||||
__rpm_put_suppliers(dev, true);
|
||||
}
|
||||
|
||||
static void rpm_suspend_suppliers(struct device *dev)
|
||||
{
|
||||
struct device_link *link;
|
||||
int idx = device_links_read_lock();
|
||||
|
||||
list_for_each_entry_rcu(link, &dev->links.suppliers, c_node,
|
||||
device_links_read_lock_held())
|
||||
pm_request_idle(link->supplier);
|
||||
|
||||
device_links_read_unlock(idx);
|
||||
}
|
||||
|
||||
/**
|
||||
* __rpm_callback - Run a given runtime PM callback for a given device.
|
||||
* @cb: Runtime PM callback to run.
|
||||
|
@ -344,8 +364,10 @@ static int __rpm_callback(int (*cb)(struct device *), struct device *dev)
|
|||
idx = device_links_read_lock();
|
||||
|
||||
retval = rpm_get_suppliers(dev);
|
||||
if (retval)
|
||||
if (retval) {
|
||||
rpm_put_suppliers(dev);
|
||||
goto fail;
|
||||
}
|
||||
|
||||
device_links_read_unlock(idx);
|
||||
}
|
||||
|
@ -368,9 +390,9 @@ static int __rpm_callback(int (*cb)(struct device *), struct device *dev)
|
|||
|| (dev->power.runtime_status == RPM_RESUMING && retval))) {
|
||||
idx = device_links_read_lock();
|
||||
|
||||
fail:
|
||||
rpm_put_suppliers(dev);
|
||||
__rpm_put_suppliers(dev, false);
|
||||
|
||||
fail:
|
||||
device_links_read_unlock(idx);
|
||||
}
|
||||
|
||||
|
@ -644,8 +666,11 @@ static int rpm_suspend(struct device *dev, int rpmflags)
|
|||
goto out;
|
||||
}
|
||||
|
||||
if (dev->power.irq_safe)
|
||||
goto out;
|
||||
|
||||
/* Maybe the parent is now able to suspend. */
|
||||
if (parent && !parent->power.ignore_children && !dev->power.irq_safe) {
|
||||
if (parent && !parent->power.ignore_children) {
|
||||
spin_unlock(&dev->power.lock);
|
||||
|
||||
spin_lock(&parent->power.lock);
|
||||
|
@ -654,6 +679,14 @@ static int rpm_suspend(struct device *dev, int rpmflags)
|
|||
|
||||
spin_lock(&dev->power.lock);
|
||||
}
|
||||
/* Maybe the suppliers are now able to suspend. */
|
||||
if (dev->power.links_count > 0) {
|
||||
spin_unlock_irq(&dev->power.lock);
|
||||
|
||||
rpm_suspend_suppliers(dev);
|
||||
|
||||
spin_lock_irq(&dev->power.lock);
|
||||
}
|
||||
|
||||
out:
|
||||
trace_rpm_return_int_rcuidle(dev, _THIS_IP_, retval);
|
||||
|
|
|
@ -944,7 +944,7 @@ next:
|
|||
out:
|
||||
for (i = last_map; i < num; i++) {
|
||||
/* Don't zap current batch's valid persistent grants. */
|
||||
if(i >= last_map + segs_to_map)
|
||||
if(i >= map_until)
|
||||
pages[i]->persistent_gnt = NULL;
|
||||
pages[i]->handle = BLKBACK_INVALID_HANDLE;
|
||||
}
|
||||
|
|
|
@ -285,7 +285,7 @@ static int omap_l3_probe(struct platform_device *pdev)
|
|||
*/
|
||||
l3->debug_irq = platform_get_irq(pdev, 0);
|
||||
ret = devm_request_irq(l3->dev, l3->debug_irq, l3_interrupt_handler,
|
||||
0x0, "l3-dbg-irq", l3);
|
||||
IRQF_NO_THREAD, "l3-dbg-irq", l3);
|
||||
if (ret) {
|
||||
dev_err(l3->dev, "request_irq failed for %d\n",
|
||||
l3->debug_irq);
|
||||
|
@ -294,7 +294,7 @@ static int omap_l3_probe(struct platform_device *pdev)
|
|||
|
||||
l3->app_irq = platform_get_irq(pdev, 1);
|
||||
ret = devm_request_irq(l3->dev, l3->app_irq, l3_interrupt_handler,
|
||||
0x0, "l3-app-irq", l3);
|
||||
IRQF_NO_THREAD, "l3-app-irq", l3);
|
||||
if (ret)
|
||||
dev_err(l3->dev, "request_irq failed for %d\n", l3->app_irq);
|
||||
|
||||
|
|
|
@ -103,6 +103,8 @@ static const struct of_device_id whitelist[] __initconst = {
|
|||
static const struct of_device_id blacklist[] __initconst = {
|
||||
{ .compatible = "allwinner,sun50i-h6", },
|
||||
|
||||
{ .compatible = "arm,vexpress", },
|
||||
|
||||
{ .compatible = "calxeda,highbank", },
|
||||
{ .compatible = "calxeda,ecx-2000", },
|
||||
|
||||
|
|
|
@ -174,7 +174,7 @@ static void acpi_gpiochip_request_irq(struct acpi_gpio_chip *acpi_gpio,
|
|||
int ret, value;
|
||||
|
||||
ret = request_threaded_irq(event->irq, NULL, event->handler,
|
||||
event->irqflags, "ACPI:Event", event);
|
||||
event->irqflags | IRQF_ONESHOT, "ACPI:Event", event);
|
||||
if (ret) {
|
||||
dev_err(acpi_gpio->chip->parent,
|
||||
"Failed to setup interrupt handler for %d\n",
|
||||
|
|
|
@ -206,6 +206,7 @@ source "drivers/gpu/drm/arm/Kconfig"
|
|||
config DRM_RADEON
|
||||
tristate "ATI Radeon"
|
||||
depends on DRM && PCI && MMU
|
||||
depends on AGP || !AGP
|
||||
select FW_LOADER
|
||||
select DRM_KMS_HELPER
|
||||
select DRM_TTM
|
||||
|
|
|
@ -146,7 +146,7 @@ static int amdgpufb_create_pinned_object(struct amdgpu_fbdev *rfbdev,
|
|||
size = mode_cmd->pitches[0] * height;
|
||||
aligned_size = ALIGN(size, PAGE_SIZE);
|
||||
ret = amdgpu_gem_object_create(adev, aligned_size, 0, domain, flags,
|
||||
ttm_bo_type_kernel, NULL, &gobj);
|
||||
ttm_bo_type_device, NULL, &gobj);
|
||||
if (ret) {
|
||||
pr_err("failed to allocate framebuffer (%d)\n", aligned_size);
|
||||
return -ENOMEM;
|
||||
|
|
|
@ -257,7 +257,7 @@ struct _vcs_dpi_soc_bounding_box_st dcn2_1_soc = {
|
|||
.num_banks = 8,
|
||||
.num_chans = 4,
|
||||
.vmm_page_size_bytes = 4096,
|
||||
.dram_clock_change_latency_us = 11.72,
|
||||
.dram_clock_change_latency_us = 23.84,
|
||||
.return_bus_width_bytes = 64,
|
||||
.dispclk_dppclk_vco_speed_mhz = 3600,
|
||||
.xfc_bus_transport_time_us = 4,
|
||||
|
|
|
@ -1326,6 +1326,10 @@ static int msm_pdev_remove(struct platform_device *pdev)
|
|||
static void msm_pdev_shutdown(struct platform_device *pdev)
|
||||
{
|
||||
struct drm_device *drm = platform_get_drvdata(pdev);
|
||||
struct msm_drm_private *priv = drm ? drm->dev_private : NULL;
|
||||
|
||||
if (!priv || !priv->kms)
|
||||
return;
|
||||
|
||||
drm_atomic_helper_shutdown(drm);
|
||||
}
|
||||
|
|
|
@ -3610,13 +3610,13 @@ int c4iw_destroy_listen(struct iw_cm_id *cm_id)
|
|||
ep->com.local_addr.ss_family == AF_INET) {
|
||||
err = cxgb4_remove_server_filter(
|
||||
ep->com.dev->rdev.lldi.ports[0], ep->stid,
|
||||
ep->com.dev->rdev.lldi.rxq_ids[0], 0);
|
||||
ep->com.dev->rdev.lldi.rxq_ids[0], false);
|
||||
} else {
|
||||
struct sockaddr_in6 *sin6;
|
||||
c4iw_init_wr_wait(ep->com.wr_waitp);
|
||||
err = cxgb4_remove_server(
|
||||
ep->com.dev->rdev.lldi.ports[0], ep->stid,
|
||||
ep->com.dev->rdev.lldi.rxq_ids[0], 0);
|
||||
ep->com.dev->rdev.lldi.rxq_ids[0], true);
|
||||
if (err)
|
||||
goto done;
|
||||
err = c4iw_wait_for_reply(&ep->com.dev->rdev, ep->com.wr_waitp,
|
||||
|
|
|
@ -179,4 +179,5 @@ err_free_tcu:
|
|||
}
|
||||
IRQCHIP_DECLARE(jz4740_tcu_irq, "ingenic,jz4740-tcu", ingenic_tcu_irq_init);
|
||||
IRQCHIP_DECLARE(jz4725b_tcu_irq, "ingenic,jz4725b-tcu", ingenic_tcu_irq_init);
|
||||
IRQCHIP_DECLARE(jz4760_tcu_irq, "ingenic,jz4760-tcu", ingenic_tcu_irq_init);
|
||||
IRQCHIP_DECLARE(jz4770_tcu_irq, "ingenic,jz4770-tcu", ingenic_tcu_irq_init);
|
||||
|
|
|
@ -168,6 +168,7 @@ static int __init intc_2chip_of_init(struct device_node *node,
|
|||
{
|
||||
return ingenic_intc_of_init(node, 2);
|
||||
}
|
||||
IRQCHIP_DECLARE(jz4760_intc, "ingenic,jz4760-intc", intc_2chip_of_init);
|
||||
IRQCHIP_DECLARE(jz4770_intc, "ingenic,jz4770-intc", intc_2chip_of_init);
|
||||
IRQCHIP_DECLARE(jz4775_intc, "ingenic,jz4775-intc", intc_2chip_of_init);
|
||||
IRQCHIP_DECLARE(jz4780_intc, "ingenic,jz4780-intc", intc_2chip_of_init);
|
||||
|
|
|
@ -529,7 +529,7 @@ static int list_devices(struct file *filp, struct dm_ioctl *param, size_t param_
|
|||
* Grab our output buffer.
|
||||
*/
|
||||
nl = orig_nl = get_result_buffer(param, param_size, &len);
|
||||
if (len < needed) {
|
||||
if (len < needed || len < sizeof(nl->dev)) {
|
||||
param->flags |= DM_BUFFER_FULL_FLAG;
|
||||
goto out;
|
||||
}
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
#define DM_VERITY_OPT_IGN_ZEROES "ignore_zero_blocks"
|
||||
#define DM_VERITY_OPT_AT_MOST_ONCE "check_at_most_once"
|
||||
|
||||
#define DM_VERITY_OPTS_MAX (2 + DM_VERITY_OPTS_FEC + \
|
||||
#define DM_VERITY_OPTS_MAX (3 + DM_VERITY_OPTS_FEC + \
|
||||
DM_VERITY_ROOT_HASH_VERIFICATION_OPTS)
|
||||
|
||||
static unsigned dm_verity_prefetch_cluster = DM_VERITY_DEFAULT_PREFETCH_SIZE;
|
||||
|
|
|
@ -108,6 +108,8 @@ static int hl_device_release_ctrl(struct inode *inode, struct file *filp)
|
|||
list_del(&hpriv->dev_node);
|
||||
mutex_unlock(&hdev->fpriv_list_lock);
|
||||
|
||||
put_pid(hpriv->taskpid);
|
||||
|
||||
kfree(hpriv);
|
||||
|
||||
return 0;
|
||||
|
|
|
@ -212,18 +212,6 @@ static const struct can_bittiming_const c_can_bittiming_const = {
|
|||
.brp_inc = 1,
|
||||
};
|
||||
|
||||
static inline void c_can_pm_runtime_enable(const struct c_can_priv *priv)
|
||||
{
|
||||
if (priv->device)
|
||||
pm_runtime_enable(priv->device);
|
||||
}
|
||||
|
||||
static inline void c_can_pm_runtime_disable(const struct c_can_priv *priv)
|
||||
{
|
||||
if (priv->device)
|
||||
pm_runtime_disable(priv->device);
|
||||
}
|
||||
|
||||
static inline void c_can_pm_runtime_get_sync(const struct c_can_priv *priv)
|
||||
{
|
||||
if (priv->device)
|
||||
|
@ -1334,7 +1322,6 @@ static const struct net_device_ops c_can_netdev_ops = {
|
|||
|
||||
int register_c_can_dev(struct net_device *dev)
|
||||
{
|
||||
struct c_can_priv *priv = netdev_priv(dev);
|
||||
int err;
|
||||
|
||||
/* Deactivate pins to prevent DRA7 DCAN IP from being
|
||||
|
@ -1344,28 +1331,19 @@ int register_c_can_dev(struct net_device *dev)
|
|||
*/
|
||||
pinctrl_pm_select_sleep_state(dev->dev.parent);
|
||||
|
||||
c_can_pm_runtime_enable(priv);
|
||||
|
||||
dev->flags |= IFF_ECHO; /* we support local echo */
|
||||
dev->netdev_ops = &c_can_netdev_ops;
|
||||
|
||||
err = register_candev(dev);
|
||||
if (err)
|
||||
c_can_pm_runtime_disable(priv);
|
||||
else
|
||||
if (!err)
|
||||
devm_can_led_init(dev);
|
||||
|
||||
return err;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(register_c_can_dev);
|
||||
|
||||
void unregister_c_can_dev(struct net_device *dev)
|
||||
{
|
||||
struct c_can_priv *priv = netdev_priv(dev);
|
||||
|
||||
unregister_candev(dev);
|
||||
|
||||
c_can_pm_runtime_disable(priv);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(unregister_c_can_dev);
|
||||
|
||||
|
|
|
@ -239,12 +239,13 @@ static void c_can_pci_remove(struct pci_dev *pdev)
|
|||
{
|
||||
struct net_device *dev = pci_get_drvdata(pdev);
|
||||
struct c_can_priv *priv = netdev_priv(dev);
|
||||
void __iomem *addr = priv->base;
|
||||
|
||||
unregister_c_can_dev(dev);
|
||||
|
||||
free_c_can_dev(dev);
|
||||
|
||||
pci_iounmap(pdev, priv->base);
|
||||
pci_iounmap(pdev, addr);
|
||||
pci_disable_msi(pdev);
|
||||
pci_clear_master(pdev);
|
||||
pci_release_regions(pdev);
|
||||
|
|
|
@ -29,6 +29,7 @@
|
|||
#include <linux/list.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/pm_runtime.h>
|
||||
#include <linux/clk.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/of_device.h>
|
||||
|
@ -385,6 +386,7 @@ static int c_can_plat_probe(struct platform_device *pdev)
|
|||
platform_set_drvdata(pdev, dev);
|
||||
SET_NETDEV_DEV(dev, &pdev->dev);
|
||||
|
||||
pm_runtime_enable(priv->device);
|
||||
ret = register_c_can_dev(dev);
|
||||
if (ret) {
|
||||
dev_err(&pdev->dev, "registering %s failed (err=%d)\n",
|
||||
|
@ -397,6 +399,7 @@ static int c_can_plat_probe(struct platform_device *pdev)
|
|||
return 0;
|
||||
|
||||
exit_free_device:
|
||||
pm_runtime_disable(priv->device);
|
||||
free_c_can_dev(dev);
|
||||
exit:
|
||||
dev_err(&pdev->dev, "probe failed\n");
|
||||
|
@ -407,9 +410,10 @@ exit:
|
|||
static int c_can_plat_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct net_device *dev = platform_get_drvdata(pdev);
|
||||
struct c_can_priv *priv = netdev_priv(dev);
|
||||
|
||||
unregister_c_can_dev(dev);
|
||||
|
||||
pm_runtime_disable(priv->device);
|
||||
free_c_can_dev(dev);
|
||||
|
||||
return 0;
|
||||
|
|
|
@ -1226,6 +1226,7 @@ static void can_dellink(struct net_device *dev, struct list_head *head)
|
|||
|
||||
static struct rtnl_link_ops can_link_ops __read_mostly = {
|
||||
.kind = "can",
|
||||
.netns_refund = true,
|
||||
.maxtype = IFLA_CAN_MAX,
|
||||
.policy = can_policy,
|
||||
.setup = can_setup,
|
||||
|
|
|
@ -684,9 +684,15 @@ static int flexcan_chip_disable(struct flexcan_priv *priv)
|
|||
static int flexcan_chip_freeze(struct flexcan_priv *priv)
|
||||
{
|
||||
struct flexcan_regs __iomem *regs = priv->regs;
|
||||
unsigned int timeout = 1000 * 1000 * 10 / priv->can.bittiming.bitrate;
|
||||
unsigned int timeout;
|
||||
u32 bitrate = priv->can.bittiming.bitrate;
|
||||
u32 reg;
|
||||
|
||||
if (bitrate)
|
||||
timeout = 1000 * 1000 * 10 / bitrate;
|
||||
else
|
||||
timeout = FLEXCAN_TIMEOUT_US / 10;
|
||||
|
||||
reg = priv->read(®s->mcr);
|
||||
reg |= FLEXCAN_MCR_FRZ | FLEXCAN_MCR_HALT;
|
||||
priv->write(reg, ®s->mcr);
|
||||
|
|
|
@ -57,6 +57,7 @@ MODULE_DESCRIPTION("CAN driver for Kvaser CAN/PCIe devices");
|
|||
#define KVASER_PCIEFD_KCAN_STAT_REG 0x418
|
||||
#define KVASER_PCIEFD_KCAN_MODE_REG 0x41c
|
||||
#define KVASER_PCIEFD_KCAN_BTRN_REG 0x420
|
||||
#define KVASER_PCIEFD_KCAN_BUS_LOAD_REG 0x424
|
||||
#define KVASER_PCIEFD_KCAN_BTRD_REG 0x428
|
||||
#define KVASER_PCIEFD_KCAN_PWM_REG 0x430
|
||||
/* Loopback control register */
|
||||
|
@ -947,6 +948,9 @@ static int kvaser_pciefd_setup_can_ctrls(struct kvaser_pciefd *pcie)
|
|||
timer_setup(&can->bec_poll_timer, kvaser_pciefd_bec_poll_timer,
|
||||
0);
|
||||
|
||||
/* Disable Bus load reporting */
|
||||
iowrite32(0, can->reg_base + KVASER_PCIEFD_KCAN_BUS_LOAD_REG);
|
||||
|
||||
tx_npackets = ioread32(can->reg_base +
|
||||
KVASER_PCIEFD_KCAN_TX_NPACKETS_REG);
|
||||
if (((tx_npackets >> KVASER_PCIEFD_KCAN_TX_NPACKETS_MAX_SHIFT) &
|
||||
|
|
|
@ -501,9 +501,6 @@ static int m_can_do_rx_poll(struct net_device *dev, int quota)
|
|||
}
|
||||
|
||||
while ((rxfs & RXFS_FFL_MASK) && (quota > 0)) {
|
||||
if (rxfs & RXFS_RFL)
|
||||
netdev_warn(dev, "Rx FIFO 0 Message Lost\n");
|
||||
|
||||
m_can_read_fifo(dev, rxfs);
|
||||
|
||||
quota--;
|
||||
|
@ -842,7 +839,7 @@ static int m_can_rx_peripheral(struct net_device *dev)
|
|||
{
|
||||
struct m_can_classdev *cdev = netdev_priv(dev);
|
||||
|
||||
m_can_rx_handler(dev, 1);
|
||||
m_can_rx_handler(dev, M_CAN_NAPI_WEIGHT);
|
||||
|
||||
m_can_enable_all_interrupts(cdev);
|
||||
|
||||
|
|
|
@ -996,13 +996,6 @@ static int b53_setup(struct dsa_switch *ds)
|
|||
b53_disable_port(ds, port);
|
||||
}
|
||||
|
||||
/* Let DSA handle the case were multiple bridges span the same switch
|
||||
* device and different VLAN awareness settings are requested, which
|
||||
* would be breaking filtering semantics for any of the other bridge
|
||||
* devices. (not hardware supported)
|
||||
*/
|
||||
ds->vlan_filtering_is_global = true;
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -2418,6 +2411,13 @@ struct b53_device *b53_switch_alloc(struct device *base,
|
|||
dev->priv = priv;
|
||||
dev->ops = ops;
|
||||
ds->ops = &b53_switch_ops;
|
||||
/* Let DSA handle the case were multiple bridges span the same switch
|
||||
* device and different VLAN awareness settings are requested, which
|
||||
* would be breaking filtering semantics for any of the other bridge
|
||||
* devices. (not hardware supported)
|
||||
*/
|
||||
ds->vlan_filtering_is_global = true;
|
||||
|
||||
mutex_init(&dev->reg_mutex);
|
||||
mutex_init(&dev->stats_mutex);
|
||||
|
||||
|
|
|
@ -479,8 +479,10 @@ static u32 bcm_sf2_sw_get_phy_flags(struct dsa_switch *ds, int port)
|
|||
* in bits 15:8 and the patch level in bits 7:0 which is exactly what
|
||||
* the REG_PHY_REVISION register layout is.
|
||||
*/
|
||||
|
||||
return priv->hw_params.gphy_rev;
|
||||
if (priv->int_phy_mask & BIT(port))
|
||||
return priv->hw_params.gphy_rev;
|
||||
else
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void bcm_sf2_sw_validate(struct dsa_switch *ds, int port,
|
||||
|
|
|
@ -1512,7 +1512,7 @@ dm9000_probe(struct platform_device *pdev)
|
|||
goto out;
|
||||
}
|
||||
|
||||
db->irq_wake = platform_get_irq(pdev, 1);
|
||||
db->irq_wake = platform_get_irq_optional(pdev, 1);
|
||||
if (db->irq_wake >= 0) {
|
||||
dev_dbg(db->dev, "wakeup irq %d\n", db->irq_wake);
|
||||
|
||||
|
|
|
@ -1307,6 +1307,7 @@ static int ftgmac100_poll(struct napi_struct *napi, int budget)
|
|||
*/
|
||||
if (unlikely(priv->need_mac_restart)) {
|
||||
ftgmac100_start_hw(priv);
|
||||
priv->need_mac_restart = false;
|
||||
|
||||
/* Re-enable "bad" interrupts */
|
||||
iowrite32(FTGMAC100_INT_BAD,
|
||||
|
|
|
@ -382,9 +382,16 @@ static int fec_ptp_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts)
|
|||
u64 ns;
|
||||
unsigned long flags;
|
||||
|
||||
mutex_lock(&adapter->ptp_clk_mutex);
|
||||
/* Check the ptp clock */
|
||||
if (!adapter->ptp_clk_on) {
|
||||
mutex_unlock(&adapter->ptp_clk_mutex);
|
||||
return -EINVAL;
|
||||
}
|
||||
spin_lock_irqsave(&adapter->tmreg_lock, flags);
|
||||
ns = timecounter_read(&adapter->tc);
|
||||
spin_unlock_irqrestore(&adapter->tmreg_lock, flags);
|
||||
mutex_unlock(&adapter->ptp_clk_mutex);
|
||||
|
||||
*ts = ns_to_timespec64(ns);
|
||||
|
||||
|
|
|
@ -2388,6 +2388,10 @@ static bool gfar_add_rx_frag(struct gfar_rx_buff *rxb, u32 lstatus,
|
|||
if (lstatus & BD_LFLAG(RXBD_LAST))
|
||||
size -= skb->len;
|
||||
|
||||
WARN(size < 0, "gianfar: rx fragment size underflow");
|
||||
if (size < 0)
|
||||
return false;
|
||||
|
||||
skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags, page,
|
||||
rxb->page_offset + RXBUF_ALIGNMENT,
|
||||
size, GFAR_RXB_TRUESIZE);
|
||||
|
@ -2550,6 +2554,17 @@ static int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue,
|
|||
if (lstatus & BD_LFLAG(RXBD_EMPTY))
|
||||
break;
|
||||
|
||||
/* lost RXBD_LAST descriptor due to overrun */
|
||||
if (skb &&
|
||||
(lstatus & BD_LFLAG(RXBD_FIRST))) {
|
||||
/* discard faulty buffer */
|
||||
dev_kfree_skb(skb);
|
||||
skb = NULL;
|
||||
rx_queue->stats.rx_dropped++;
|
||||
|
||||
/* can continue normally */
|
||||
}
|
||||
|
||||
/* order rx buffer descriptor reads */
|
||||
rmb();
|
||||
|
||||
|
|
|
@ -1677,8 +1677,10 @@ static int hns_nic_clear_all_rx_fetch(struct net_device *ndev)
|
|||
for (j = 0; j < fetch_num; j++) {
|
||||
/* alloc one skb and init */
|
||||
skb = hns_assemble_skb(ndev);
|
||||
if (!skb)
|
||||
if (!skb) {
|
||||
ret = -ENOMEM;
|
||||
goto out;
|
||||
}
|
||||
rd = &tx_ring_data(priv, skb->queue_mapping);
|
||||
hns_nic_net_xmit_hw(ndev, skb, rd);
|
||||
|
||||
|
|
|
@ -899,6 +899,8 @@ static s32 e1000_set_d0_lplu_state_82571(struct e1000_hw *hw, bool active)
|
|||
} else {
|
||||
data &= ~IGP02E1000_PM_D0_LPLU;
|
||||
ret_val = e1e_wphy(hw, IGP02E1000_PHY_POWER_MGMT, data);
|
||||
if (ret_val)
|
||||
return ret_val;
|
||||
/* LPLU and SmartSpeed are mutually exclusive. LPLU is used
|
||||
* during Dx states where the power conservation is most
|
||||
* important. During driver activity we should enable
|
||||
|
|
|
@ -5953,15 +5953,19 @@ static void e1000_reset_task(struct work_struct *work)
|
|||
struct e1000_adapter *adapter;
|
||||
adapter = container_of(work, struct e1000_adapter, reset_task);
|
||||
|
||||
rtnl_lock();
|
||||
/* don't run the task if already down */
|
||||
if (test_bit(__E1000_DOWN, &adapter->state))
|
||||
if (test_bit(__E1000_DOWN, &adapter->state)) {
|
||||
rtnl_unlock();
|
||||
return;
|
||||
}
|
||||
|
||||
if (!(adapter->flags & FLAG_RESTART_NOW)) {
|
||||
e1000e_dump(adapter);
|
||||
e_err("Reset adapter unexpectedly\n");
|
||||
}
|
||||
e1000e_reinit_locked(adapter);
|
||||
rtnl_unlock();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -1786,7 +1786,8 @@ static int iavf_init_get_resources(struct iavf_adapter *adapter)
|
|||
goto err_alloc;
|
||||
}
|
||||
|
||||
if (iavf_process_config(adapter))
|
||||
err = iavf_process_config(adapter);
|
||||
if (err)
|
||||
goto err_alloc;
|
||||
adapter->current_op = VIRTCHNL_OP_UNKNOWN;
|
||||
|
||||
|
|
|
@ -1690,6 +1690,9 @@ static int igc_get_link_ksettings(struct net_device *netdev,
|
|||
Autoneg);
|
||||
}
|
||||
|
||||
/* Set pause flow control settings */
|
||||
ethtool_link_ksettings_add_link_mode(cmd, supported, Pause);
|
||||
|
||||
switch (hw->fc.requested_mode) {
|
||||
case igc_fc_full:
|
||||
ethtool_link_ksettings_add_link_mode(cmd, advertising, Pause);
|
||||
|
@ -1704,9 +1707,7 @@ static int igc_get_link_ksettings(struct net_device *netdev,
|
|||
Asym_Pause);
|
||||
break;
|
||||
default:
|
||||
ethtool_link_ksettings_add_link_mode(cmd, advertising, Pause);
|
||||
ethtool_link_ksettings_add_link_mode(cmd, advertising,
|
||||
Asym_Pause);
|
||||
break;
|
||||
}
|
||||
|
||||
status = pm_runtime_suspended(&adapter->pdev->dev) ?
|
||||
|
|
|
@ -9595,8 +9595,10 @@ static int ixgbe_configure_clsu32(struct ixgbe_adapter *adapter,
|
|||
ixgbe_atr_compute_perfect_hash_82599(&input->filter, mask);
|
||||
err = ixgbe_fdir_write_perfect_filter_82599(hw, &input->filter,
|
||||
input->sw_idx, queue);
|
||||
if (!err)
|
||||
ixgbe_update_ethtool_fdir_entry(adapter, input, input->sw_idx);
|
||||
if (err)
|
||||
goto err_out_w_lock;
|
||||
|
||||
ixgbe_update_ethtool_fdir_entry(adapter, input, input->sw_idx);
|
||||
spin_unlock(&adapter->fdir_perfect_lock);
|
||||
|
||||
if ((uhtid != 0x800) && (adapter->jump_tables[uhtid]))
|
||||
|
|
|
@ -1980,8 +1980,10 @@ static void rvu_unregister_interrupts(struct rvu *rvu)
|
|||
INTR_MASK(rvu->hw->total_pfs) & ~1ULL);
|
||||
|
||||
for (irq = 0; irq < rvu->num_vec; irq++) {
|
||||
if (rvu->irq_allocated[irq])
|
||||
if (rvu->irq_allocated[irq]) {
|
||||
free_irq(pci_irq_vector(rvu->pdev, irq), rvu);
|
||||
rvu->irq_allocated[irq] = false;
|
||||
}
|
||||
}
|
||||
|
||||
pci_free_irq_vectors(rvu->pdev);
|
||||
|
|
|
@ -1967,10 +1967,10 @@ int rvu_mbox_handler_npc_mcam_free_counter(struct rvu *rvu,
|
|||
index = find_next_bit(mcam->bmap, mcam->bmap_entries, entry);
|
||||
if (index >= mcam->bmap_entries)
|
||||
break;
|
||||
entry = index + 1;
|
||||
if (mcam->entry2cntr_map[index] != req->cntr)
|
||||
continue;
|
||||
|
||||
entry = index + 1;
|
||||
npc_unmap_mcam_entry_and_cntr(rvu, mcam, blkaddr,
|
||||
index, req->cntr);
|
||||
}
|
||||
|
|
|
@ -227,6 +227,10 @@ static int mlx5e_tc_tun_parse_geneve_options(struct mlx5e_priv *priv,
|
|||
option_key = (struct geneve_opt *)&enc_opts.key->data[0];
|
||||
option_mask = (struct geneve_opt *)&enc_opts.mask->data[0];
|
||||
|
||||
if (option_mask->opt_class == 0 && option_mask->type == 0 &&
|
||||
!memchr_inv(option_mask->opt_data, 0, option_mask->length * 4))
|
||||
return 0;
|
||||
|
||||
if (option_key->length > max_tlv_option_data_len) {
|
||||
NL_SET_ERR_MSG_MOD(extack,
|
||||
"Matching on GENEVE options: unsupported option len");
|
||||
|
|
|
@ -1811,6 +1811,7 @@ static int set_pflag_rx_cqe_compress(struct net_device *netdev,
|
|||
{
|
||||
struct mlx5e_priv *priv = netdev_priv(netdev);
|
||||
struct mlx5_core_dev *mdev = priv->mdev;
|
||||
int err;
|
||||
|
||||
if (!MLX5_CAP_GEN(mdev, cqe_compression))
|
||||
return -EOPNOTSUPP;
|
||||
|
@ -1820,7 +1821,10 @@ static int set_pflag_rx_cqe_compress(struct net_device *netdev,
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
mlx5e_modify_rx_cqe_compression_locked(priv, enable);
|
||||
err = mlx5e_modify_rx_cqe_compression_locked(priv, enable);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
priv->channels.params.rx_cqe_compress_def = enable;
|
||||
|
||||
return 0;
|
||||
|
|
|
@ -327,8 +327,14 @@ int nfp_compile_flow_metadata(struct nfp_app *app,
|
|||
goto err_free_ctx_entry;
|
||||
}
|
||||
|
||||
/* Do net allocate a mask-id for pre_tun_rules. These flows are used to
|
||||
* configure the pre_tun table and are never actually send to the
|
||||
* firmware as an add-flow message. This causes the mask-id allocation
|
||||
* on the firmware to get out of sync if allocated here.
|
||||
*/
|
||||
new_mask_id = 0;
|
||||
if (!nfp_check_mask_add(app, nfp_flow->mask_data,
|
||||
if (!nfp_flow->pre_tun_rule.dev &&
|
||||
!nfp_check_mask_add(app, nfp_flow->mask_data,
|
||||
nfp_flow->meta.mask_len,
|
||||
&nfp_flow->meta.flags, &new_mask_id)) {
|
||||
NL_SET_ERR_MSG_MOD(extack, "invalid entry: cannot allocate a new mask id");
|
||||
|
@ -359,7 +365,8 @@ int nfp_compile_flow_metadata(struct nfp_app *app,
|
|||
goto err_remove_mask;
|
||||
}
|
||||
|
||||
if (!nfp_check_mask_remove(app, nfp_flow->mask_data,
|
||||
if (!nfp_flow->pre_tun_rule.dev &&
|
||||
!nfp_check_mask_remove(app, nfp_flow->mask_data,
|
||||
nfp_flow->meta.mask_len,
|
||||
NULL, &new_mask_id)) {
|
||||
NL_SET_ERR_MSG_MOD(extack, "invalid entry: cannot release mask id");
|
||||
|
@ -374,8 +381,10 @@ int nfp_compile_flow_metadata(struct nfp_app *app,
|
|||
return 0;
|
||||
|
||||
err_remove_mask:
|
||||
nfp_check_mask_remove(app, nfp_flow->mask_data, nfp_flow->meta.mask_len,
|
||||
NULL, &new_mask_id);
|
||||
if (!nfp_flow->pre_tun_rule.dev)
|
||||
nfp_check_mask_remove(app, nfp_flow->mask_data,
|
||||
nfp_flow->meta.mask_len,
|
||||
NULL, &new_mask_id);
|
||||
err_remove_rhash:
|
||||
WARN_ON_ONCE(rhashtable_remove_fast(&priv->stats_ctx_table,
|
||||
&ctx_entry->ht_node,
|
||||
|
@ -406,9 +415,10 @@ int nfp_modify_flow_metadata(struct nfp_app *app,
|
|||
|
||||
__nfp_modify_flow_metadata(priv, nfp_flow);
|
||||
|
||||
nfp_check_mask_remove(app, nfp_flow->mask_data,
|
||||
nfp_flow->meta.mask_len, &nfp_flow->meta.flags,
|
||||
&new_mask_id);
|
||||
if (!nfp_flow->pre_tun_rule.dev)
|
||||
nfp_check_mask_remove(app, nfp_flow->mask_data,
|
||||
nfp_flow->meta.mask_len, &nfp_flow->meta.flags,
|
||||
&new_mask_id);
|
||||
|
||||
/* Update flow payload with mask ids. */
|
||||
nfp_flow->unmasked_data[NFP_FL_MASK_ID_LOCATION] = new_mask_id;
|
||||
|
|
|
@ -1426,6 +1426,7 @@ void qlcnic_83xx_get_minidump_template(struct qlcnic_adapter *adapter)
|
|||
|
||||
if (fw_dump->tmpl_hdr == NULL || current_version > prev_version) {
|
||||
vfree(fw_dump->tmpl_hdr);
|
||||
fw_dump->tmpl_hdr = NULL;
|
||||
|
||||
if (qlcnic_83xx_md_check_extended_dump_capability(adapter))
|
||||
extended = !qlcnic_83xx_extend_md_capab(adapter);
|
||||
|
@ -1444,6 +1445,8 @@ void qlcnic_83xx_get_minidump_template(struct qlcnic_adapter *adapter)
|
|||
struct qlcnic_83xx_dump_template_hdr *hdr;
|
||||
|
||||
hdr = fw_dump->tmpl_hdr;
|
||||
if (!hdr)
|
||||
return;
|
||||
hdr->drv_cap_mask = 0x1f;
|
||||
fw_dump->cap_mask = 0x1f;
|
||||
dev_info(&pdev->dev,
|
||||
|
|
|
@ -1693,14 +1693,17 @@ static int netsec_netdev_init(struct net_device *ndev)
|
|||
goto err1;
|
||||
|
||||
/* set phy power down */
|
||||
data = netsec_phy_read(priv->mii_bus, priv->phy_addr, MII_BMCR) |
|
||||
BMCR_PDOWN;
|
||||
netsec_phy_write(priv->mii_bus, priv->phy_addr, MII_BMCR, data);
|
||||
data = netsec_phy_read(priv->mii_bus, priv->phy_addr, MII_BMCR);
|
||||
netsec_phy_write(priv->mii_bus, priv->phy_addr, MII_BMCR,
|
||||
data | BMCR_PDOWN);
|
||||
|
||||
ret = netsec_reset_hardware(priv, true);
|
||||
if (ret)
|
||||
goto err2;
|
||||
|
||||
/* Restore phy power state */
|
||||
netsec_phy_write(priv->mii_bus, priv->phy_addr, MII_BMCR, data);
|
||||
|
||||
spin_lock_init(&priv->desc_ring[NETSEC_RING_TX].lock);
|
||||
spin_lock_init(&priv->desc_ring[NETSEC_RING_RX].lock);
|
||||
|
||||
|
|
|
@ -1222,6 +1222,8 @@ static int sun8i_dwmac_probe(struct platform_device *pdev)
|
|||
plat_dat->init = sun8i_dwmac_init;
|
||||
plat_dat->exit = sun8i_dwmac_exit;
|
||||
plat_dat->setup = sun8i_dwmac_setup;
|
||||
plat_dat->tx_fifo_size = 4096;
|
||||
plat_dat->rx_fifo_size = 16384;
|
||||
|
||||
ret = sun8i_dwmac_init(pdev, plat_dat->bsp_priv);
|
||||
if (ret)
|
||||
|
|
|
@ -3931,8 +3931,6 @@ static void niu_xmac_interrupt(struct niu *np)
|
|||
mp->rx_mcasts += RXMAC_MC_FRM_CNT_COUNT;
|
||||
if (val & XRXMAC_STATUS_RXBCAST_CNT_EXP)
|
||||
mp->rx_bcasts += RXMAC_BC_FRM_CNT_COUNT;
|
||||
if (val & XRXMAC_STATUS_RXBCAST_CNT_EXP)
|
||||
mp->rx_bcasts += RXMAC_BC_FRM_CNT_COUNT;
|
||||
if (val & XRXMAC_STATUS_RXHIST1_CNT_EXP)
|
||||
mp->rx_hist_cnt1 += RXMAC_HIST_CNT1_COUNT;
|
||||
if (val & XRXMAC_STATUS_RXHIST2_CNT_EXP)
|
||||
|
|
|
@ -2052,6 +2052,7 @@ bdx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|||
/*bdx_hw_reset(priv); */
|
||||
if (bdx_read_mac(priv)) {
|
||||
pr_err("load MAC address failed\n");
|
||||
err = -EFAULT;
|
||||
goto err_out_iomap;
|
||||
}
|
||||
SET_NETDEV_DEV(ndev, &pdev->dev);
|
||||
|
|
|
@ -387,6 +387,8 @@ static int usbpn_probe(struct usb_interface *intf, const struct usb_device_id *i
|
|||
|
||||
err = register_netdev(dev);
|
||||
if (err) {
|
||||
/* Set disconnected flag so that disconnect() returns early. */
|
||||
pnd->disconnected = 1;
|
||||
usb_driver_release_interface(&usbpn_driver, data_intf);
|
||||
goto out;
|
||||
}
|
||||
|
|
|
@ -2836,29 +2836,6 @@ static void __rtl_set_wol(struct r8152 *tp, u32 wolopts)
|
|||
device_set_wakeup_enable(&tp->udev->dev, false);
|
||||
}
|
||||
|
||||
static void r8153_mac_clk_spd(struct r8152 *tp, bool enable)
|
||||
{
|
||||
/* MAC clock speed down */
|
||||
if (enable) {
|
||||
ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL,
|
||||
ALDPS_SPDWN_RATIO);
|
||||
ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL2,
|
||||
EEE_SPDWN_RATIO);
|
||||
ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL3,
|
||||
PKT_AVAIL_SPDWN_EN | SUSPEND_SPDWN_EN |
|
||||
U1U2_SPDWN_EN | L1_SPDWN_EN);
|
||||
ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL4,
|
||||
PWRSAVE_SPDWN_EN | RXDV_SPDWN_EN | TX10MIDLE_EN |
|
||||
TP100_SPDWN_EN | TP500_SPDWN_EN | EEE_SPDWN_EN |
|
||||
TP1000_SPDWN_EN);
|
||||
} else {
|
||||
ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL, 0);
|
||||
ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL2, 0);
|
||||
ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL3, 0);
|
||||
ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL4, 0);
|
||||
}
|
||||
}
|
||||
|
||||
static void r8153_u1u2en(struct r8152 *tp, bool enable)
|
||||
{
|
||||
u8 u1u2[8];
|
||||
|
@ -3158,11 +3135,9 @@ static void rtl8153_runtime_enable(struct r8152 *tp, bool enable)
|
|||
if (enable) {
|
||||
r8153_u1u2en(tp, false);
|
||||
r8153_u2p3en(tp, false);
|
||||
r8153_mac_clk_spd(tp, true);
|
||||
rtl_runtime_suspend_enable(tp, true);
|
||||
} else {
|
||||
rtl_runtime_suspend_enable(tp, false);
|
||||
r8153_mac_clk_spd(tp, false);
|
||||
|
||||
switch (tp->version) {
|
||||
case RTL_VER_03:
|
||||
|
@ -3727,7 +3702,6 @@ static void r8153_first_init(struct r8152 *tp)
|
|||
u32 ocp_data;
|
||||
int i;
|
||||
|
||||
r8153_mac_clk_spd(tp, false);
|
||||
rxdy_gated_en(tp, true);
|
||||
r8153_teredo_off(tp);
|
||||
|
||||
|
@ -3789,8 +3763,6 @@ static void r8153_enter_oob(struct r8152 *tp)
|
|||
u32 ocp_data;
|
||||
int i;
|
||||
|
||||
r8153_mac_clk_spd(tp, true);
|
||||
|
||||
ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
|
||||
ocp_data &= ~NOW_IS_OOB;
|
||||
ocp_write_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, ocp_data);
|
||||
|
@ -4498,9 +4470,14 @@ static void r8153_init(struct r8152 *tp)
|
|||
|
||||
ocp_write_word(tp, MCU_TYPE_USB, USB_CONNECT_TIMER, 0x0001);
|
||||
|
||||
/* MAC clock speed down */
|
||||
ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL, 0);
|
||||
ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL2, 0);
|
||||
ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL3, 0);
|
||||
ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL4, 0);
|
||||
|
||||
r8153_power_cut_en(tp, false);
|
||||
r8153_u1u2en(tp, true);
|
||||
r8153_mac_clk_spd(tp, false);
|
||||
usb_enable_lpm(tp->udev);
|
||||
|
||||
ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_CONFIG6);
|
||||
|
@ -5552,7 +5529,10 @@ static int rtl_ops_init(struct r8152 *tp)
|
|||
ops->in_nway = rtl8153_in_nway;
|
||||
ops->hw_phy_cfg = r8153_hw_phy_cfg;
|
||||
ops->autosuspend_en = rtl8153_runtime_enable;
|
||||
tp->rx_buf_sz = 32 * 1024;
|
||||
if (tp->udev->speed < USB_SPEED_SUPER)
|
||||
tp->rx_buf_sz = 16 * 1024;
|
||||
else
|
||||
tp->rx_buf_sz = 32 * 1024;
|
||||
tp->eee_en = true;
|
||||
tp->eee_adv = MDIO_EEE_1000T | MDIO_EEE_100TX;
|
||||
break;
|
||||
|
|
|
@ -254,8 +254,7 @@ static netdev_tx_t veth_xmit(struct sk_buff *skb, struct net_device *dev)
|
|||
if (rxq < rcv->real_num_rx_queues) {
|
||||
rq = &rcv_priv->rq[rxq];
|
||||
rcv_xdp = rcu_access_pointer(rq->xdp_prog);
|
||||
if (rcv_xdp)
|
||||
skb_record_rx_queue(skb, rxq);
|
||||
skb_record_rx_queue(skb, rxq);
|
||||
}
|
||||
|
||||
skb_tx_timestamp(skb);
|
||||
|
|
|
@ -204,14 +204,18 @@ static int uhdlc_init(struct ucc_hdlc_private *priv)
|
|||
priv->rx_skbuff = kcalloc(priv->rx_ring_size,
|
||||
sizeof(*priv->rx_skbuff),
|
||||
GFP_KERNEL);
|
||||
if (!priv->rx_skbuff)
|
||||
if (!priv->rx_skbuff) {
|
||||
ret = -ENOMEM;
|
||||
goto free_ucc_pram;
|
||||
}
|
||||
|
||||
priv->tx_skbuff = kcalloc(priv->tx_ring_size,
|
||||
sizeof(*priv->tx_skbuff),
|
||||
GFP_KERNEL);
|
||||
if (!priv->tx_skbuff)
|
||||
if (!priv->tx_skbuff) {
|
||||
ret = -ENOMEM;
|
||||
goto free_rx_skbuff;
|
||||
}
|
||||
|
||||
priv->skb_curtx = 0;
|
||||
priv->skb_dirtytx = 0;
|
||||
|
|
|
@ -312,6 +312,7 @@ bool nvme_cancel_request(struct request *req, void *data, bool reserved)
|
|||
return true;
|
||||
|
||||
nvme_req(req)->status = NVME_SC_HOST_ABORTED_CMD;
|
||||
nvme_req(req)->flags |= NVME_REQ_CANCELLED;
|
||||
blk_mq_complete_request(req);
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -1608,7 +1608,7 @@ nvme_fc_fcpio_done(struct nvmefc_fcp_req *req)
|
|||
sizeof(op->rsp_iu), DMA_FROM_DEVICE);
|
||||
|
||||
if (opstate == FCPOP_STATE_ABORTED)
|
||||
status = cpu_to_le16(NVME_SC_HOST_PATH_ERROR << 1);
|
||||
status = cpu_to_le16(NVME_SC_HOST_ABORTED_CMD << 1);
|
||||
else if (freq->status) {
|
||||
status = cpu_to_le16(NVME_SC_HOST_PATH_ERROR << 1);
|
||||
dev_info(ctrl->ctrl.device,
|
||||
|
|
|
@ -3176,6 +3176,7 @@ static const struct pci_device_id nvme_id_table[] = {
|
|||
.driver_data = NVME_QUIRK_DELAY_BEFORE_CHK_RDY, },
|
||||
{ PCI_DEVICE(0x144d, 0xa822), /* Samsung PM1725a */
|
||||
.driver_data = NVME_QUIRK_DELAY_BEFORE_CHK_RDY |
|
||||
NVME_QUIRK_DISABLE_WRITE_ZEROES|
|
||||
NVME_QUIRK_IGNORE_DEV_SUBNQN, },
|
||||
{ PCI_DEVICE(0x1987, 0x5016), /* Phison E16 */
|
||||
.driver_data = NVME_QUIRK_IGNORE_DEV_SUBNQN, },
|
||||
|
|
|
@ -46,8 +46,16 @@ static const struct key_entry intel_vbtn_keymap[] = {
|
|||
};
|
||||
|
||||
static const struct key_entry intel_vbtn_switchmap[] = {
|
||||
{ KE_SW, 0xCA, { .sw = { SW_DOCK, 1 } } }, /* Docked */
|
||||
{ KE_SW, 0xCB, { .sw = { SW_DOCK, 0 } } }, /* Undocked */
|
||||
/*
|
||||
* SW_DOCK should only be reported for docking stations, but DSDTs using the
|
||||
* intel-vbtn code, always seem to use this for 2-in-1s / convertibles and set
|
||||
* SW_DOCK=1 when in laptop-mode (in tandem with setting SW_TABLET_MODE=0).
|
||||
* This causes userspace to think the laptop is docked to a port-replicator
|
||||
* and to disable suspend-on-lid-close, which is undesirable.
|
||||
* Map the dock events to KEY_IGNORE to avoid this broken SW_DOCK reporting.
|
||||
*/
|
||||
{ KE_IGNORE, 0xCA, { .sw = { SW_DOCK, 1 } } }, /* Docked */
|
||||
{ KE_IGNORE, 0xCB, { .sw = { SW_DOCK, 0 } } }, /* Undocked */
|
||||
{ KE_SW, 0xCC, { .sw = { SW_TABLET_MODE, 1 } } }, /* Tablet */
|
||||
{ KE_SW, 0xCD, { .sw = { SW_TABLET_MODE, 0 } } }, /* Laptop */
|
||||
};
|
||||
|
|
|
@ -726,8 +726,8 @@ static const struct rpmh_vreg_hw_data pmic5_ftsmps510 = {
|
|||
static const struct rpmh_vreg_hw_data pmic5_hfsmps515 = {
|
||||
.regulator_type = VRM,
|
||||
.ops = &rpmh_regulator_vrm_ops,
|
||||
.voltage_range = REGULATOR_LINEAR_RANGE(2800000, 0, 4, 16000),
|
||||
.n_voltages = 5,
|
||||
.voltage_range = REGULATOR_LINEAR_RANGE(320000, 0, 235, 16000),
|
||||
.n_voltages = 236,
|
||||
.pmic_mode_map = pmic_mode_map_pmic5_smps,
|
||||
.of_map_mode = rpmh_regulator_pmic4_smps_of_map_mode,
|
||||
};
|
||||
|
|
|
@ -7102,14 +7102,18 @@ mpt3sas_base_attach(struct MPT3SAS_ADAPTER *ioc)
|
|||
ioc->pend_os_device_add_sz++;
|
||||
ioc->pend_os_device_add = kzalloc(ioc->pend_os_device_add_sz,
|
||||
GFP_KERNEL);
|
||||
if (!ioc->pend_os_device_add)
|
||||
if (!ioc->pend_os_device_add) {
|
||||
r = -ENOMEM;
|
||||
goto out_free_resources;
|
||||
}
|
||||
|
||||
ioc->device_remove_in_progress_sz = ioc->pend_os_device_add_sz;
|
||||
ioc->device_remove_in_progress =
|
||||
kzalloc(ioc->device_remove_in_progress_sz, GFP_KERNEL);
|
||||
if (!ioc->device_remove_in_progress)
|
||||
if (!ioc->device_remove_in_progress) {
|
||||
r = -ENOMEM;
|
||||
goto out_free_resources;
|
||||
}
|
||||
|
||||
ioc->fwfault_debug = mpt3sas_fwfault_debug;
|
||||
|
||||
|
|
|
@ -1605,6 +1605,7 @@ static int qedi_alloc_global_queues(struct qedi_ctx *qedi)
|
|||
if (!qedi->global_queues[i]) {
|
||||
QEDI_ERR(&qedi->dbg_ctx,
|
||||
"Unable to allocation global queue %d.\n", i);
|
||||
status = -ENOMEM;
|
||||
goto mem_alloc_failure;
|
||||
}
|
||||
|
||||
|
|
|
@ -3216,8 +3216,7 @@ int qlt_xmit_response(struct qla_tgt_cmd *cmd, int xmit_type,
|
|||
if (!qpair->fw_started || (cmd->reset_count != qpair->chip_reset) ||
|
||||
(cmd->sess && cmd->sess->deleted)) {
|
||||
cmd->state = QLA_TGT_STATE_PROCESSED;
|
||||
res = 0;
|
||||
goto free;
|
||||
return 0;
|
||||
}
|
||||
|
||||
ql_dbg_qp(ql_dbg_tgt, qpair, 0xe018,
|
||||
|
@ -3228,8 +3227,9 @@ int qlt_xmit_response(struct qla_tgt_cmd *cmd, int xmit_type,
|
|||
|
||||
res = qlt_pre_xmit_response(cmd, &prm, xmit_type, scsi_status,
|
||||
&full_req_cnt);
|
||||
if (unlikely(res != 0))
|
||||
goto free;
|
||||
if (unlikely(res != 0)) {
|
||||
return res;
|
||||
}
|
||||
|
||||
spin_lock_irqsave(qpair->qp_lock_ptr, flags);
|
||||
|
||||
|
@ -3249,8 +3249,7 @@ int qlt_xmit_response(struct qla_tgt_cmd *cmd, int xmit_type,
|
|||
vha->flags.online, qla2x00_reset_active(vha),
|
||||
cmd->reset_count, qpair->chip_reset);
|
||||
spin_unlock_irqrestore(qpair->qp_lock_ptr, flags);
|
||||
res = 0;
|
||||
goto free;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Does F/W have an IOCBs for this request */
|
||||
|
@ -3353,8 +3352,6 @@ out_unmap_unlock:
|
|||
qlt_unmap_sg(vha, cmd);
|
||||
spin_unlock_irqrestore(qpair->qp_lock_ptr, flags);
|
||||
|
||||
free:
|
||||
vha->hw->tgt.tgt_ops->free_cmd(cmd);
|
||||
return res;
|
||||
}
|
||||
EXPORT_SYMBOL(qlt_xmit_response);
|
||||
|
|
|
@ -623,7 +623,6 @@ static int tcm_qla2xxx_queue_data_in(struct se_cmd *se_cmd)
|
|||
{
|
||||
struct qla_tgt_cmd *cmd = container_of(se_cmd,
|
||||
struct qla_tgt_cmd, se_cmd);
|
||||
struct scsi_qla_host *vha = cmd->vha;
|
||||
|
||||
if (cmd->aborted) {
|
||||
/* Cmd can loop during Q-full. tcm_qla2xxx_aborted_task
|
||||
|
@ -636,7 +635,6 @@ static int tcm_qla2xxx_queue_data_in(struct se_cmd *se_cmd)
|
|||
cmd->se_cmd.transport_state,
|
||||
cmd->se_cmd.t_state,
|
||||
cmd->se_cmd.se_cmd_flags);
|
||||
vha->hw->tgt.tgt_ops->free_cmd(cmd);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -664,7 +662,6 @@ static int tcm_qla2xxx_queue_status(struct se_cmd *se_cmd)
|
|||
{
|
||||
struct qla_tgt_cmd *cmd = container_of(se_cmd,
|
||||
struct qla_tgt_cmd, se_cmd);
|
||||
struct scsi_qla_host *vha = cmd->vha;
|
||||
int xmit_type = QLA_TGT_XMIT_STATUS;
|
||||
|
||||
if (cmd->aborted) {
|
||||
|
@ -678,7 +675,6 @@ static int tcm_qla2xxx_queue_status(struct se_cmd *se_cmd)
|
|||
cmd, kref_read(&cmd->se_cmd.cmd_kref),
|
||||
cmd->se_cmd.transport_state, cmd->se_cmd.t_state,
|
||||
cmd->se_cmd.se_cmd_flags);
|
||||
vha->hw->tgt.tgt_ops->free_cmd(cmd);
|
||||
return 0;
|
||||
}
|
||||
cmd->bufflen = se_cmd->data_length;
|
||||
|
|
|
@ -3743,8 +3743,7 @@ smb2_async_readv(struct cifs_readdata *rdata)
|
|||
if (rdata->credits.value > 0) {
|
||||
shdr->CreditCharge = cpu_to_le16(DIV_ROUND_UP(rdata->bytes,
|
||||
SMB2_MAX_BUFFER_SIZE));
|
||||
shdr->CreditRequest =
|
||||
cpu_to_le16(le16_to_cpu(shdr->CreditCharge) + 1);
|
||||
shdr->CreditRequest = cpu_to_le16(le16_to_cpu(shdr->CreditCharge) + 8);
|
||||
|
||||
rc = adjust_credits(server, &rdata->credits, rdata->bytes);
|
||||
if (rc)
|
||||
|
@ -4038,8 +4037,7 @@ smb2_async_writev(struct cifs_writedata *wdata,
|
|||
if (wdata->credits.value > 0) {
|
||||
shdr->CreditCharge = cpu_to_le16(DIV_ROUND_UP(wdata->bytes,
|
||||
SMB2_MAX_BUFFER_SIZE));
|
||||
shdr->CreditRequest =
|
||||
cpu_to_le16(le16_to_cpu(shdr->CreditCharge) + 1);
|
||||
shdr->CreditRequest = cpu_to_le16(le16_to_cpu(shdr->CreditCharge) + 8);
|
||||
|
||||
rc = adjust_credits(server, &wdata->credits, wdata->bytes);
|
||||
if (rc)
|
||||
|
|
|
@ -1148,7 +1148,7 @@ compound_send_recv(const unsigned int xid, struct cifs_ses *ses,
|
|||
}
|
||||
if (rc != 0) {
|
||||
for (; i < num_rqst; i++) {
|
||||
cifs_server_dbg(VFS, "Cancelling wait for mid %llu cmd: %d\n",
|
||||
cifs_server_dbg(FYI, "Cancelling wait for mid %llu cmd: %d\n",
|
||||
midQ[i]->mid, le16_to_cpu(midQ[i]->command));
|
||||
send_cancel(server, &rqst[i], midQ[i]);
|
||||
spin_lock(&GlobalMid_Lock);
|
||||
|
|
|
@ -1476,6 +1476,9 @@ ext4_xattr_inode_cache_find(struct inode *inode, const void *value,
|
|||
if (!ce)
|
||||
return NULL;
|
||||
|
||||
WARN_ON_ONCE(ext4_handle_valid(journal_current_handle()) &&
|
||||
!(current->flags & PF_MEMALLOC_NOFS));
|
||||
|
||||
ea_data = ext4_kvmalloc(value_len, GFP_NOFS);
|
||||
if (!ea_data) {
|
||||
mb_cache_entry_put(ea_inode_cache, ce);
|
||||
|
@ -2342,6 +2345,7 @@ ext4_xattr_set_handle(handle_t *handle, struct inode *inode, int name_index,
|
|||
error = -ENOSPC;
|
||||
goto cleanup;
|
||||
}
|
||||
WARN_ON_ONCE(!(current->flags & PF_MEMALLOC_NOFS));
|
||||
}
|
||||
|
||||
error = ext4_reserve_inode_write(handle, inode, &is.iloc);
|
||||
|
|
|
@ -440,7 +440,7 @@ static void remove_inode_hugepages(struct inode *inode, loff_t lstart,
|
|||
u32 hash;
|
||||
|
||||
index = page->index;
|
||||
hash = hugetlb_fault_mutex_hash(h, mapping, index, 0);
|
||||
hash = hugetlb_fault_mutex_hash(h, mapping, index);
|
||||
mutex_lock(&hugetlb_fault_mutex_table[hash]);
|
||||
|
||||
/*
|
||||
|
@ -644,7 +644,7 @@ static long hugetlbfs_fallocate(struct file *file, int mode, loff_t offset,
|
|||
addr = index * hpage_size;
|
||||
|
||||
/* mutex taken here, fault path and hole punch */
|
||||
hash = hugetlb_fault_mutex_hash(h, mapping, index, addr);
|
||||
hash = hugetlb_fault_mutex_hash(h, mapping, index);
|
||||
mutex_lock(&hugetlb_fault_mutex_table[hash]);
|
||||
|
||||
/* See if already present in mapping to avoid alloc/free */
|
||||
|
|
|
@ -127,7 +127,7 @@ config PNFS_BLOCK
|
|||
config PNFS_FLEXFILE_LAYOUT
|
||||
tristate
|
||||
depends on NFS_V4_1 && NFS_V3
|
||||
default m
|
||||
default NFS_V4
|
||||
|
||||
config NFS_V4_1_IMPLEMENTATION_ID_DOMAIN
|
||||
string "NFSv4.1 Implementation ID Domain"
|
||||
|
|
|
@ -35,6 +35,7 @@
|
|||
*/
|
||||
#define NFS3_fhandle_sz (1+16)
|
||||
#define NFS3_fh_sz (NFS3_fhandle_sz) /* shorthand */
|
||||
#define NFS3_post_op_fh_sz (1+NFS3_fh_sz)
|
||||
#define NFS3_sattr_sz (15)
|
||||
#define NFS3_filename_sz (1+(NFS3_MAXNAMLEN>>2))
|
||||
#define NFS3_path_sz (1+(NFS3_MAXPATHLEN>>2))
|
||||
|
@ -72,7 +73,7 @@
|
|||
#define NFS3_readlinkres_sz (1+NFS3_post_op_attr_sz+1+1)
|
||||
#define NFS3_readres_sz (1+NFS3_post_op_attr_sz+3+1)
|
||||
#define NFS3_writeres_sz (1+NFS3_wcc_data_sz+4)
|
||||
#define NFS3_createres_sz (1+NFS3_fh_sz+NFS3_post_op_attr_sz+NFS3_wcc_data_sz)
|
||||
#define NFS3_createres_sz (1+NFS3_post_op_fh_sz+NFS3_post_op_attr_sz+NFS3_wcc_data_sz)
|
||||
#define NFS3_renameres_sz (1+(2 * NFS3_wcc_data_sz))
|
||||
#define NFS3_linkres_sz (1+NFS3_post_op_attr_sz+NFS3_wcc_data_sz)
|
||||
#define NFS3_readdirres_sz (1+NFS3_post_op_attr_sz+2+1)
|
||||
|
|
|
@ -5754,6 +5754,9 @@ static int __nfs4_proc_set_acl(struct inode *inode, const void *buf, size_t bufl
|
|||
unsigned int npages = DIV_ROUND_UP(buflen, PAGE_SIZE);
|
||||
int ret, i;
|
||||
|
||||
/* You can't remove system.nfs4_acl: */
|
||||
if (buflen == 0)
|
||||
return -EINVAL;
|
||||
if (!nfs4_server_supports_acls(server))
|
||||
return -EOPNOTSUPP;
|
||||
if (npages > ARRAY_SIZE(pages))
|
||||
|
|
|
@ -152,14 +152,18 @@ __le64 *squashfs_read_inode_lookup_table(struct super_block *sb,
|
|||
start = le64_to_cpu(table[n]);
|
||||
end = le64_to_cpu(table[n + 1]);
|
||||
|
||||
if (start >= end || (end - start) > SQUASHFS_METADATA_SIZE) {
|
||||
if (start >= end
|
||||
|| (end - start) >
|
||||
(SQUASHFS_METADATA_SIZE + SQUASHFS_BLOCK_OFFSET)) {
|
||||
kfree(table);
|
||||
return ERR_PTR(-EINVAL);
|
||||
}
|
||||
}
|
||||
|
||||
start = le64_to_cpu(table[indexes - 1]);
|
||||
if (start >= lookup_table_start || (lookup_table_start - start) > SQUASHFS_METADATA_SIZE) {
|
||||
if (start >= lookup_table_start ||
|
||||
(lookup_table_start - start) >
|
||||
(SQUASHFS_METADATA_SIZE + SQUASHFS_BLOCK_OFFSET)) {
|
||||
kfree(table);
|
||||
return ERR_PTR(-EINVAL);
|
||||
}
|
||||
|
|
|
@ -97,14 +97,16 @@ __le64 *squashfs_read_id_index_table(struct super_block *sb,
|
|||
start = le64_to_cpu(table[n]);
|
||||
end = le64_to_cpu(table[n + 1]);
|
||||
|
||||
if (start >= end || (end - start) > SQUASHFS_METADATA_SIZE) {
|
||||
if (start >= end || (end - start) >
|
||||
(SQUASHFS_METADATA_SIZE + SQUASHFS_BLOCK_OFFSET)) {
|
||||
kfree(table);
|
||||
return ERR_PTR(-EINVAL);
|
||||
}
|
||||
}
|
||||
|
||||
start = le64_to_cpu(table[indexes - 1]);
|
||||
if (start >= id_table_start || (id_table_start - start) > SQUASHFS_METADATA_SIZE) {
|
||||
if (start >= id_table_start || (id_table_start - start) >
|
||||
(SQUASHFS_METADATA_SIZE + SQUASHFS_BLOCK_OFFSET)) {
|
||||
kfree(table);
|
||||
return ERR_PTR(-EINVAL);
|
||||
}
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
|
||||
/* size of metadata (inode and directory) blocks */
|
||||
#define SQUASHFS_METADATA_SIZE 8192
|
||||
#define SQUASHFS_BLOCK_OFFSET 2
|
||||
|
||||
/* default size of block device I/O */
|
||||
#ifdef CONFIG_SQUASHFS_4K_DEVBLK_SIZE
|
||||
|
|
|
@ -109,14 +109,16 @@ __le64 *squashfs_read_xattr_id_table(struct super_block *sb, u64 table_start,
|
|||
start = le64_to_cpu(table[n]);
|
||||
end = le64_to_cpu(table[n + 1]);
|
||||
|
||||
if (start >= end || (end - start) > SQUASHFS_METADATA_SIZE) {
|
||||
if (start >= end || (end - start) >
|
||||
(SQUASHFS_METADATA_SIZE + SQUASHFS_BLOCK_OFFSET)) {
|
||||
kfree(table);
|
||||
return ERR_PTR(-EINVAL);
|
||||
}
|
||||
}
|
||||
|
||||
start = le64_to_cpu(table[indexes - 1]);
|
||||
if (start >= table_start || (table_start - start) > SQUASHFS_METADATA_SIZE) {
|
||||
if (start >= table_start || (table_start - start) >
|
||||
(SQUASHFS_METADATA_SIZE + SQUASHFS_BLOCK_OFFSET)) {
|
||||
kfree(table);
|
||||
return ERR_PTR(-EINVAL);
|
||||
}
|
||||
|
|
|
@ -232,6 +232,7 @@ struct acpi_pnp_type {
|
|||
|
||||
struct acpi_device_pnp {
|
||||
acpi_bus_id bus_id; /* Object name */
|
||||
int instance_no; /* Instance number of this object */
|
||||
struct acpi_pnp_type type; /* ID type */
|
||||
acpi_bus_address bus_address; /* _ADR */
|
||||
char *unique_id; /* _UID */
|
||||
|
|
|
@ -535,7 +535,7 @@ int bpf_prog_array_copy(struct bpf_prog_array *old_array,
|
|||
struct bpf_prog *include_prog,
|
||||
struct bpf_prog_array **new_array);
|
||||
|
||||
#define __BPF_PROG_RUN_ARRAY(array, ctx, func, check_non_null) \
|
||||
#define __BPF_PROG_RUN_ARRAY(array, ctx, func, check_non_null, set_cg_storage) \
|
||||
({ \
|
||||
struct bpf_prog_array_item *_item; \
|
||||
struct bpf_prog *_prog; \
|
||||
|
@ -548,7 +548,8 @@ int bpf_prog_array_copy(struct bpf_prog_array *old_array,
|
|||
goto _out; \
|
||||
_item = &_array->items[0]; \
|
||||
while ((_prog = READ_ONCE(_item->prog))) { \
|
||||
bpf_cgroup_storage_set(_item->cgroup_storage); \
|
||||
if (set_cg_storage) \
|
||||
bpf_cgroup_storage_set(_item->cgroup_storage); \
|
||||
_ret &= func(_prog, ctx); \
|
||||
_item++; \
|
||||
} \
|
||||
|
@ -609,10 +610,10 @@ _out: \
|
|||
})
|
||||
|
||||
#define BPF_PROG_RUN_ARRAY(array, ctx, func) \
|
||||
__BPF_PROG_RUN_ARRAY(array, ctx, func, false)
|
||||
__BPF_PROG_RUN_ARRAY(array, ctx, func, false, true)
|
||||
|
||||
#define BPF_PROG_RUN_ARRAY_CHECK(array, ctx, func) \
|
||||
__BPF_PROG_RUN_ARRAY(array, ctx, func, true)
|
||||
__BPF_PROG_RUN_ARRAY(array, ctx, func, true, false)
|
||||
|
||||
#ifdef CONFIG_BPF_SYSCALL
|
||||
DECLARE_PER_CPU(int, bpf_prog_active);
|
||||
|
|
|
@ -106,7 +106,7 @@ void free_huge_page(struct page *page);
|
|||
void hugetlb_fix_reserve_counts(struct inode *inode);
|
||||
extern struct mutex *hugetlb_fault_mutex_table;
|
||||
u32 hugetlb_fault_mutex_hash(struct hstate *h, struct address_space *mapping,
|
||||
pgoff_t idx, unsigned long address);
|
||||
pgoff_t idx);
|
||||
|
||||
pte_t *huge_pmd_share(struct mm_struct *mm, unsigned long addr, pud_t *pud);
|
||||
|
||||
|
|
|
@ -42,13 +42,14 @@ static inline void macvlan_count_rx(const struct macvlan_dev *vlan,
|
|||
if (likely(success)) {
|
||||
struct vlan_pcpu_stats *pcpu_stats;
|
||||
|
||||
pcpu_stats = this_cpu_ptr(vlan->pcpu_stats);
|
||||
pcpu_stats = get_cpu_ptr(vlan->pcpu_stats);
|
||||
u64_stats_update_begin(&pcpu_stats->syncp);
|
||||
pcpu_stats->rx_packets++;
|
||||
pcpu_stats->rx_bytes += len;
|
||||
if (multicast)
|
||||
pcpu_stats->rx_multicast++;
|
||||
u64_stats_update_end(&pcpu_stats->syncp);
|
||||
put_cpu_ptr(vlan->pcpu_stats);
|
||||
} else {
|
||||
this_cpu_inc(vlan->pcpu_stats->rx_errors);
|
||||
}
|
||||
|
|
|
@ -1226,13 +1226,26 @@ static inline bool cpupid_match_pid(struct task_struct *task, int cpupid)
|
|||
#endif /* CONFIG_NUMA_BALANCING */
|
||||
|
||||
#ifdef CONFIG_KASAN_SW_TAGS
|
||||
|
||||
/*
|
||||
* KASAN per-page tags are stored xor'ed with 0xff. This allows to avoid
|
||||
* setting tags for all pages to native kernel tag value 0xff, as the default
|
||||
* value 0x00 maps to 0xff.
|
||||
*/
|
||||
|
||||
static inline u8 page_kasan_tag(const struct page *page)
|
||||
{
|
||||
return (page->flags >> KASAN_TAG_PGSHIFT) & KASAN_TAG_MASK;
|
||||
u8 tag;
|
||||
|
||||
tag = (page->flags >> KASAN_TAG_PGSHIFT) & KASAN_TAG_MASK;
|
||||
tag ^= 0xff;
|
||||
|
||||
return tag;
|
||||
}
|
||||
|
||||
static inline void page_kasan_tag_set(struct page *page, u8 tag)
|
||||
{
|
||||
tag ^= 0xff;
|
||||
page->flags &= ~(KASAN_TAG_MASK << KASAN_TAG_PGSHIFT);
|
||||
page->flags |= (tag & KASAN_TAG_MASK) << KASAN_TAG_PGSHIFT;
|
||||
}
|
||||
|
|
|
@ -171,7 +171,7 @@ extern void mutex_lock_io(struct mutex *lock);
|
|||
# define mutex_lock_interruptible_nested(lock, subclass) mutex_lock_interruptible(lock)
|
||||
# define mutex_lock_killable_nested(lock, subclass) mutex_lock_killable(lock)
|
||||
# define mutex_lock_nest_lock(lock, nest_lock) mutex_lock(lock)
|
||||
# define mutex_lock_io_nested(lock, subclass) mutex_lock(lock)
|
||||
# define mutex_lock_io_nested(lock, subclass) mutex_lock_io(lock)
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
|
|
@ -227,7 +227,7 @@ struct xt_table {
|
|||
unsigned int valid_hooks;
|
||||
|
||||
/* Man behind the curtain... */
|
||||
struct xt_table_info __rcu *private;
|
||||
struct xt_table_info *private;
|
||||
|
||||
/* Set this to THIS_MODULE if you are a module, otherwise NULL */
|
||||
struct module *me;
|
||||
|
@ -376,7 +376,7 @@ static inline unsigned int xt_write_recseq_begin(void)
|
|||
* since addend is most likely 1
|
||||
*/
|
||||
__this_cpu_add(xt_recseq.sequence, addend);
|
||||
smp_wmb();
|
||||
smp_mb();
|
||||
|
||||
return addend;
|
||||
}
|
||||
|
@ -448,9 +448,6 @@ xt_get_per_cpu_counter(struct xt_counters *cnt, unsigned int cpu)
|
|||
|
||||
struct nf_hook_ops *xt_hook_ops_alloc(const struct xt_table *, nf_hookfn *);
|
||||
|
||||
struct xt_table_info
|
||||
*xt_table_get_private_protected(const struct xt_table *table);
|
||||
|
||||
#ifdef CONFIG_COMPAT
|
||||
#include <net/compat.h>
|
||||
|
||||
|
|
|
@ -69,12 +69,13 @@ struct u64_stats_sync {
|
|||
};
|
||||
|
||||
|
||||
#if BITS_PER_LONG == 32 && defined(CONFIG_SMP)
|
||||
#define u64_stats_init(syncp) seqcount_init(&(syncp)->seq)
|
||||
#else
|
||||
static inline void u64_stats_init(struct u64_stats_sync *syncp)
|
||||
{
|
||||
#if BITS_PER_LONG == 32 && defined(CONFIG_SMP)
|
||||
seqcount_init(&syncp->seq);
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
static inline void u64_stats_update_begin(struct u64_stats_sync *syncp)
|
||||
{
|
||||
|
|
|
@ -287,7 +287,7 @@ static inline int inet_csk_reqsk_queue_is_full(const struct sock *sk)
|
|||
return inet_csk_reqsk_queue_len(sk) >= sk->sk_max_ack_backlog;
|
||||
}
|
||||
|
||||
void inet_csk_reqsk_queue_drop(struct sock *sk, struct request_sock *req);
|
||||
bool inet_csk_reqsk_queue_drop(struct sock *sk, struct request_sock *req);
|
||||
void inet_csk_reqsk_queue_drop_and_put(struct sock *sk, struct request_sock *req);
|
||||
|
||||
void inet_csk_destroy_sock(struct sock *sk);
|
||||
|
|
|
@ -291,6 +291,7 @@ static inline struct fib_nh *fib_info_nh(struct fib_info *fi, int nhsel)
|
|||
int fib6_check_nexthop(struct nexthop *nh, struct fib6_config *cfg,
|
||||
struct netlink_ext_ack *extack);
|
||||
|
||||
/* Caller should either hold rcu_read_lock(), or RTNL. */
|
||||
static inline struct fib6_nh *nexthop_fib6_nh(struct nexthop *nh)
|
||||
{
|
||||
struct nh_info *nhi;
|
||||
|
@ -311,6 +312,29 @@ static inline struct fib6_nh *nexthop_fib6_nh(struct nexthop *nh)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
/* Variant of nexthop_fib6_nh().
|
||||
* Caller should either hold rcu_read_lock_bh(), or RTNL.
|
||||
*/
|
||||
static inline struct fib6_nh *nexthop_fib6_nh_bh(struct nexthop *nh)
|
||||
{
|
||||
struct nh_info *nhi;
|
||||
|
||||
if (nh->is_group) {
|
||||
struct nh_group *nh_grp;
|
||||
|
||||
nh_grp = rcu_dereference_bh_rtnl(nh->nh_grp);
|
||||
nh = nexthop_mpath_select(nh_grp, 0);
|
||||
if (!nh)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
nhi = rcu_dereference_bh_rtnl(nh->nh_info);
|
||||
if (nhi->family == AF_INET6)
|
||||
return &nhi->fib6_nh;
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static inline struct net_device *fib6_info_nh_dev(struct fib6_info *f6i)
|
||||
{
|
||||
struct fib6_nh *fib6_nh;
|
||||
|
|
|
@ -168,7 +168,8 @@ static inline void red_set_vars(struct red_vars *v)
|
|||
v->qcount = -1;
|
||||
}
|
||||
|
||||
static inline bool red_check_params(u32 qth_min, u32 qth_max, u8 Wlog, u8 Scell_log)
|
||||
static inline bool red_check_params(u32 qth_min, u32 qth_max, u8 Wlog,
|
||||
u8 Scell_log, u8 *stab)
|
||||
{
|
||||
if (fls(qth_min) + Wlog > 32)
|
||||
return false;
|
||||
|
@ -178,6 +179,13 @@ static inline bool red_check_params(u32 qth_min, u32 qth_max, u8 Wlog, u8 Scell_
|
|||
return false;
|
||||
if (qth_max < qth_min)
|
||||
return false;
|
||||
if (stab) {
|
||||
int i;
|
||||
|
||||
for (i = 0; i < RED_STAB_SIZE; i++)
|
||||
if (stab[i] >= 32)
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
@ -33,6 +33,7 @@ static inline int rtnl_msg_family(const struct nlmsghdr *nlh)
|
|||
*
|
||||
* @list: Used internally
|
||||
* @kind: Identifier
|
||||
* @netns_refund: Physical device, move to init_net on netns exit
|
||||
* @maxtype: Highest device specific netlink attribute number
|
||||
* @policy: Netlink policy for device specific attribute validation
|
||||
* @validate: Optional validation function for netlink/changelink parameters
|
||||
|
@ -64,6 +65,7 @@ struct rtnl_link_ops {
|
|||
size_t priv_size;
|
||||
void (*setup)(struct net_device *dev);
|
||||
|
||||
bool netns_refund;
|
||||
unsigned int maxtype;
|
||||
const struct nla_policy *policy;
|
||||
int (*validate)(struct nlattr *tb[],
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue