Skip to content

Commit 3927237

Browse files
heftigheftig
committed
Merge tag 'v5.6.3' into 5.6/master
This is the 5.6.3 stable release * tag 'v5.6.3': (31 commits) Linux 5.6.3 mm: mempolicy: require at least one nodeid for MPOL_PREFERRED perf python: Fix clang detection to strip out options passed in $CC soc: mediatek: knows_txdone needs to be set in Mediatek CMDQ helper ALSA: hda/ca0132 - Add Recon3Di quirk to handle integrated sound on EVGA X99 Classified motherboard Revert "dm: always call blk_queue_split() in dm_process_bio()" Revert "ALSA: uapi: Drop asound.h inclusion from asoc.h" power: supply: axp288_charger: Add special handling for HP Pavilion x2 10 extcon: axp288: Add wakeup support nvmem: sprd: Fix the block lock operation nvmem: check for NULL reg_read and reg_write before dereferencing nvmem: release the write-protect pin mei: me: add cedar fork device ids coresight: do not use the BIT() macro in the UAPI header PCI: sysfs: Revert "rescan" file renames misc: pci_endpoint_test: Avoid using module parameter to determine irqtype misc: pci_endpoint_test: Fix to support > 10 pci-endpoint-test devices misc: rtsx: set correct pcr_ops for rts522A drm/i915/display: Fix mode private_flags comparison at atomic_check drm/bridge: analogix-anx6345: Avoid duplicate -supply suffix ...
2 parents 4ef7cf2 + f9fb857 commit 3927237

33 files changed

Lines changed: 225 additions & 49 deletions

File tree

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 5
33
PATCHLEVEL = 6
4-
SUBLEVEL = 2
4+
SUBLEVEL = 3
55
EXTRAVERSION = -zen
66
NAME = Tea Storm
77

‎drivers/extcon/extcon-axp288.c‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -443,9 +443,40 @@ static int axp288_extcon_probe(struct platform_device *pdev)
443443
/* Start charger cable type detection */
444444
axp288_extcon_enable(info);
445445

446+
device_init_wakeup(dev, true);
447+
platform_set_drvdata(pdev, info);
448+
449+
return 0;
450+
}
451+
452+
static int __maybe_unused axp288_extcon_suspend(struct device *dev)
453+
{
454+
struct axp288_extcon_info *info = dev_get_drvdata(dev);
455+
456+
if (device_may_wakeup(dev))
457+
enable_irq_wake(info->irq[VBUS_RISING_IRQ]);
458+
446459
return 0;
447460
}
448461

462+
static int __maybe_unused axp288_extcon_resume(struct device *dev)
463+
{
464+
struct axp288_extcon_info *info = dev_get_drvdata(dev);
465+
466+
/*
467+
* Wakeup when a charger is connected to do charger-type
468+
* connection and generate an extcon event which makes the
469+
* axp288 charger driver set the input current limit.
470+
*/
471+
if (device_may_wakeup(dev))
472+
disable_irq_wake(info->irq[VBUS_RISING_IRQ]);
473+
474+
return 0;
475+
}
476+
477+
static SIMPLE_DEV_PM_OPS(axp288_extcon_pm_ops, axp288_extcon_suspend,
478+
axp288_extcon_resume);
479+
449480
static const struct platform_device_id axp288_extcon_table[] = {
450481
{ .name = "axp288_extcon" },
451482
{},
@@ -457,6 +488,7 @@ static struct platform_driver axp288_extcon_driver = {
457488
.id_table = axp288_extcon_table,
458489
.driver = {
459490
.name = "axp288_extcon",
491+
.pm = &axp288_extcon_pm_ops,
460492
},
461493
};
462494

‎drivers/gpu/drm/bridge/analogix/analogix-anx6345.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -711,14 +711,14 @@ static int anx6345_i2c_probe(struct i2c_client *client,
711711
DRM_DEBUG("No panel found\n");
712712

713713
/* 1.2V digital core power regulator */
714-
anx6345->dvdd12 = devm_regulator_get(dev, "dvdd12-supply");
714+
anx6345->dvdd12 = devm_regulator_get(dev, "dvdd12");
715715
if (IS_ERR(anx6345->dvdd12)) {
716716
DRM_ERROR("dvdd12-supply not found\n");
717717
return PTR_ERR(anx6345->dvdd12);
718718
}
719719

720720
/* 2.5V digital core power regulator */
721-
anx6345->dvdd25 = devm_regulator_get(dev, "dvdd25-supply");
721+
anx6345->dvdd25 = devm_regulator_get(dev, "dvdd25");
722722
if (IS_ERR(anx6345->dvdd25)) {
723723
DRM_ERROR("dvdd25-supply not found\n");
724724
return PTR_ERR(anx6345->dvdd25);

‎drivers/gpu/drm/i915/display/intel_display.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14582,8 +14582,8 @@ static int intel_atomic_check(struct drm_device *dev,
1458214582
/* Catch I915_MODE_FLAG_INHERITED */
1458314583
for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state,
1458414584
new_crtc_state, i) {
14585-
if (new_crtc_state->hw.mode.private_flags !=
14586-
old_crtc_state->hw.mode.private_flags)
14585+
if (new_crtc_state->uapi.mode.private_flags !=
14586+
old_crtc_state->uapi.mode.private_flags)
1458714587
new_crtc_state->uapi.mode_changed = true;
1458814588
}
1458914589

‎drivers/md/dm.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1739,8 +1739,9 @@ static blk_qc_t dm_process_bio(struct mapped_device *md,
17391739
* won't be imposed.
17401740
*/
17411741
if (current->bio_list) {
1742-
blk_queue_split(md->queue, &bio);
1743-
if (!is_abnormal_io(bio))
1742+
if (is_abnormal_io(bio))
1743+
blk_queue_split(md->queue, &bio);
1744+
else
17441745
dm_queue_split(md, ti, &bio);
17451746
}
17461747

‎drivers/misc/cardreader/rts5227.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,7 @@ static const struct pcr_ops rts522a_pcr_ops = {
394394
void rts522a_init_params(struct rtsx_pcr *pcr)
395395
{
396396
rts5227_init_params(pcr);
397+
pcr->ops = &rts522a_pcr_ops;
397398
pcr->tx_initial_phase = SET_CLOCK_PHASE(20, 20, 11);
398399
pcr->reg_pm_ctrl3 = RTS522A_PM_CTRL3;
399400

‎drivers/misc/mei/hw-me-regs.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@
8787
#define MEI_DEV_ID_CMP_H 0x06e0 /* Comet Lake H */
8888
#define MEI_DEV_ID_CMP_H_3 0x06e4 /* Comet Lake H 3 (iTouch) */
8989

90+
#define MEI_DEV_ID_CDF 0x18D3 /* Cedar Fork */
91+
9092
#define MEI_DEV_ID_ICP_LP 0x34E0 /* Ice Lake Point LP */
9193

9294
#define MEI_DEV_ID_JSP_N 0x4DE0 /* Jasper Lake Point N */

‎drivers/misc/mei/pci-me.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,8 @@ static const struct pci_device_id mei_me_pci_tbl[] = {
111111
{MEI_PCI_DEVICE(MEI_DEV_ID_MCC, MEI_ME_PCH15_CFG)},
112112
{MEI_PCI_DEVICE(MEI_DEV_ID_MCC_4, MEI_ME_PCH8_CFG)},
113113

114+
{MEI_PCI_DEVICE(MEI_DEV_ID_CDF, MEI_ME_PCH8_CFG)},
115+
114116
/* required last entry */
115117
{0, }
116118
};

‎drivers/misc/pci_endpoint_test.c‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ struct pci_endpoint_test {
9898
struct completion irq_raised;
9999
int last_irq;
100100
int num_irqs;
101+
int irq_type;
101102
/* mutex to protect the ioctls */
102103
struct mutex mutex;
103104
struct miscdevice miscdev;
@@ -157,6 +158,7 @@ static void pci_endpoint_test_free_irq_vectors(struct pci_endpoint_test *test)
157158
struct pci_dev *pdev = test->pdev;
158159

159160
pci_free_irq_vectors(pdev);
161+
test->irq_type = IRQ_TYPE_UNDEFINED;
160162
}
161163

162164
static bool pci_endpoint_test_alloc_irq_vectors(struct pci_endpoint_test *test,
@@ -191,6 +193,8 @@ static bool pci_endpoint_test_alloc_irq_vectors(struct pci_endpoint_test *test,
191193
irq = 0;
192194
res = false;
193195
}
196+
197+
test->irq_type = type;
194198
test->num_irqs = irq;
195199

196200
return res;
@@ -330,6 +334,7 @@ static bool pci_endpoint_test_copy(struct pci_endpoint_test *test, size_t size)
330334
dma_addr_t orig_dst_phys_addr;
331335
size_t offset;
332336
size_t alignment = test->alignment;
337+
int irq_type = test->irq_type;
333338
u32 src_crc32;
334339
u32 dst_crc32;
335340

@@ -426,6 +431,7 @@ static bool pci_endpoint_test_write(struct pci_endpoint_test *test, size_t size)
426431
dma_addr_t orig_phys_addr;
427432
size_t offset;
428433
size_t alignment = test->alignment;
434+
int irq_type = test->irq_type;
429435
u32 crc32;
430436

431437
if (size > SIZE_MAX - alignment)
@@ -494,6 +500,7 @@ static bool pci_endpoint_test_read(struct pci_endpoint_test *test, size_t size)
494500
dma_addr_t orig_phys_addr;
495501
size_t offset;
496502
size_t alignment = test->alignment;
503+
int irq_type = test->irq_type;
497504
u32 crc32;
498505

499506
if (size > SIZE_MAX - alignment)
@@ -555,7 +562,7 @@ static bool pci_endpoint_test_set_irq(struct pci_endpoint_test *test,
555562
return false;
556563
}
557564

558-
if (irq_type == req_irq_type)
565+
if (test->irq_type == req_irq_type)
559566
return true;
560567

561568
pci_endpoint_test_release_irq(test);
@@ -567,12 +574,10 @@ static bool pci_endpoint_test_set_irq(struct pci_endpoint_test *test,
567574
if (!pci_endpoint_test_request_irq(test))
568575
goto err;
569576

570-
irq_type = req_irq_type;
571577
return true;
572578

573579
err:
574580
pci_endpoint_test_free_irq_vectors(test);
575-
irq_type = IRQ_TYPE_UNDEFINED;
576581
return false;
577582
}
578583

@@ -633,7 +638,7 @@ static int pci_endpoint_test_probe(struct pci_dev *pdev,
633638
{
634639
int err;
635640
int id;
636-
char name[20];
641+
char name[24];
637642
enum pci_barno bar;
638643
void __iomem *base;
639644
struct device *dev = &pdev->dev;
@@ -652,6 +657,7 @@ static int pci_endpoint_test_probe(struct pci_dev *pdev,
652657
test->test_reg_bar = 0;
653658
test->alignment = 0;
654659
test->pdev = pdev;
660+
test->irq_type = IRQ_TYPE_UNDEFINED;
655661

656662
if (no_msi)
657663
irq_type = IRQ_TYPE_LEGACY;

‎drivers/net/dsa/microchip/Kconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# SPDX-License-Identifier: GPL-2.0-only
22
config NET_DSA_MICROCHIP_KSZ_COMMON
3+
select NET_DSA_TAG_KSZ
34
tristate
45

56
menuconfig NET_DSA_MICROCHIP_KSZ9477

0 commit comments

Comments
 (0)