Merged
Conversation
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
paulmenzel
suggested changes
Jan 25, 2025
Contributor
paulmenzel
left a comment
paulmenzel
left a comment
There was a problem hiding this comment.
Thank you for doing this. It’d be great if you documented your findings about the patches in the commit message as you already did the work analyzing, which patches to apply and which not.
patch/series
Outdated
| 0093-hwmon-pmbus-Add-support-for-MPS-Multi-phase-mp2855-c.patch | ||
| 0094-i2c-asf-Introduce-MCTP-support-over-ASF-controller.patch | ||
| 0095-platform-mellanox-nvsw-sn2201-Add-support-for-new-sy.patch | ||
| #0095-platform-mellanox-nvsw-sn2201-Add-support-for-new-sy.patch |
Contributor
Author
There was a problem hiding this comment.
There was a patch conflict, so I disabled it just for the purposes of getting the build working. This set of patches is managed by Mellanox, and they'll update these patches as needed for 6.1.123.
| From 29922c1e20e86e643687a76b8c3181e388067b03 Mon Sep 17 00:00:00 2001 | ||
| From: Vivek Reddy <[email protected]> | ||
| Date: Fri, 27 Sep 2024 02:27:37 +0000 | ||
| Subject: [PATCH] Revert "mtd: spi-nor: Correct flags for Winbond w25q128" |
Contributor
There was a problem hiding this comment.
This seems to be the commit below, which does a little bit more though.
commit a207af9bfe76bdc97c14ce58b31759d74440cf8e
Author: Michael Walle <[email protected]>
Date: Fri Jun 21 14:09:29 2024 +0200
mtd: spi-nor: winbond: fix w25q128 regression
commit d35df77707bf5ae1221b5ba1c8a88cf4fcdd4901 upstream.
Commit 83e824a4a595 ("mtd: spi-nor: Correct flags for Winbond w25q128")
removed the flags for non-SFDP devices. It was assumed that it wasn't in
use anymore. This wasn't true. Add the no_sfdp_flags as well as the size
again.
We add the additional flags for dual and quad read because they have
been reported to work properly by Hartmut using both older and newer
versions of this flash, the similar flashes with 64Mbit and 256Mbit
already have these flags and because it will (luckily) trigger our
legacy SFDP parsing, so newer versions with SFDP support will still get
the parameters from the SFDP tables.
Reported-by: Hartmut Birr <[email protected]>
Closes: https://lore.kernel.org/r/CALxbwRo_-9CaJmt7r7ELgu+vOcgk=xZcGHobnKf=oT2=u4d4aA@mail.gmail.com/
Fixes: 83e824a4a595 ("mtd: spi-nor: Correct flags for Winbond w25q128")
Reviewed-by: Linus Walleij <[email protected]>
Signed-off-by: Michael Walle <[email protected]>
Acked-by: Tudor Ambarus <[email protected]>
Reviewed-by: Esben Haabendal <[email protected]>
Reviewed-by: Pratyush Yadav <[email protected]>
Signed-off-by: Pratyush Yadav <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Link: https://lore.kernel.org/r/[email protected]
[Backported to v6.6 - vastly different due to upstream changes]
Reviewed-by: Tudor Ambarus <[email protected]>
Signed-off-by: Linus Walleij <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
diff --git a/drivers/mtd/spi-nor/winbond.c b/drivers/mtd/spi-nor/winbond.c
index b7c775b615e85..58aba52022bfb 100644
--- a/drivers/mtd/spi-nor/winbond.c
+++ b/drivers/mtd/spi-nor/winbond.c
@@ -120,9 +120,10 @@ static const struct flash_info winbond_nor_parts[] = {
NO_SFDP_FLAGS(SECT_4K) },
{ "w25q80bl", INFO(0xef4014, 0, 64 * 1024, 16)
NO_SFDP_FLAGS(SECT_4K) },
- { "w25q128", INFO(0xef4018, 0, 0, 0)
- PARSE_SFDP
- FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) },
+ { "w25q128", INFO(0xef4018, 0, 64 * 1024, 256)
+ FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
+ NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ |
+ SPI_NOR_QUAD_READ) },
{ "w25q256", INFO(0xef4019, 0, 64 * 1024, 512)
NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ)
.fixups = &w25q256_fixups },
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Contributor
|
Due to the merges, it’s hard to review as the merged commits in the branch master are shown again. No idea why though. Could you please rebase? |
Signed-off-by: Saikrishna Arcot <[email protected]>
## Patch List * 0095-platform-mellanox-nvsw-sn2201-Add-support-for-new-sy.patch : * 0098-platform-mellanox-Downstream-Add-support-for-new-Nvi.patch : * 0099-platform-mellanox-Downstream-Add-support-DGX-flavor-.patch : * 0100-platform-mellanox-mlxreg-io-Extend-number-of-hwmon-a.patch : * 0101-platform_data-mlxreg-Add-fields-for-interrupt-storm-.patch : * 0102-platform-mellanox-mlxreg-hotplug-Add-support-for-han.patch : * 0103-platform-mellanox-mlx-dpu-improve-interrupt-handling.patch : * 8012-hwmon-pmbus-Downstream-Workaround-for-psu-attributes.patch :
saiarcot895
force-pushed
the
linux-6.1.123-update
branch
from
2c65f42 to
c289a12
Compare
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Contributor
Author
Done |
yxieca
approved these changes
May 16, 2025
|
Cherry-pick PR to 202505: #483 |
yejianquan
added
Included in 202505 Branch
and removed
Created PR to 202505 Branch
labels
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This updates the kernel to 6.1.123, bringing in bug and CVE fixes.
0001-Revert-mtd-spi-nor-Correct-flags-for-Winbond-w25q128.patchand0001-devlink-Fix-RCU-stall-when-unregistering-a-devlink-i.patchhave been reverted as they're included in 6.1.123. Other existing patches didn't require any modifications.