6.15.3-rc1 review
Subsystems (10)
Greg Kroah-Hartman
maintainerPATCH 485/780 rust: file: mark `LocalFile` as `repr(transparent)`
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pekka Ristola <[email protected]>
[ Upstream commit 15ecd83dc06277385ad71dc7ea26911d9a79acaf ]
Unsafe code in LocalFile's methods assumes that the type has the same layout as the inner bindings::file. This is not guaranteed by the default struct representation in Rust, but requires specifying the transparent representation.
The File struct (which also wraps bindings::file) is already marked as repr(transparent), so this change makes their layouts equivalent.
--- rust/kernel/fs/file.rs | 1 + 1 file changed, 1 insertion(+)
rust/kernel/fs/file.rs +1 -0
@@ -219,6 +219,7 @@ unsafe impl AlwaysRefCounted for File {/// must be on the same thread as this file. /// /// [`assume_no_fdget_pos`]: LocalFile::assume_no_fdget_pos +#[repr(transparent)] pub struct LocalFile { inner:Opaque <bindings::file >, }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 486/780 exportfs: require ->fh_to_parent() to encode connectable file handles
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Amir Goldstein <[email protected]>
[ Upstream commit 5402c4d4d2000a9baa30c1157c97152ec6383733 ]
When user requests a connectable file handle explicitly with the AT_HANDLE_CONNECTABLE flag, fail the request if filesystem (e.g. nfs) does not know how to decode a connected non-dir dentry.
--- include/linux/exportfs.h | 10 ++++++++++ 1 file changed, 10 insertions(+)
include/linux/exportfs.h +10 -0
@@ -314,6 +314,9 @@ static inline bool exportfs_can_decode_fh(const struct export_operations *nop)static inline bool exportfs_can_encode_fh (const struct export_operations *nop,int fh_flags) { +if (!nop) +return false; +/* * If a non-decodeable file handle was requested, we only need to make * sure that filesystem did not opt-out of encoding fid.
@@ -321,6 +324,13 @@ static inline bool exportfs_can_encode_fh(const struct export_operations *nop,if (fh_flags &EXPORT_FH_FID )return exportfs_can_encode_fid (nop); +/* +* If a connectable file handle was requested, we need to make sure that +* filesystem can also decode connected file handles. +*/ +if ((fh_flags &EXPORT_FH_CONNECTABLE ) && !nop->fh_to_parent) +return false; +/* * If a decodeable file handle was requested, we need to make sure that * filesystem can also decode file handles.
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 487/780 perf callchain: Always populate the addr_location map when adding IP
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Rogers <[email protected]>
[ Upstream commit a913ef6fd883c05bd6538ed21ee1e773f0d750b7 ]
Dropping symbols also meant the callchain maps wasn't populated, but the callchain map is needed to find the DSO.
Plumb the symbols option better, falling back to thread__find_map() rather than thread__find_symbol() when symbols are disabled.
--- tools/perf/util/machine.c | 6 ++++-- tools/perf/util/thread.c | 8 ++++++-- tools/perf/util/thread.h | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-)
tools/perf/util/machine.c +4 -2
@@ -1976,7 +1976,7 @@ static void ip__resolve_ams(struct thread *thread,* Thus, we have to try consecutively until we find a match * or else, the symbol is unknown */ -thread__find_cpumode_addr_location (thread, ip, &al); +thread__find_cpumode_addr_location (thread, ip,/*symbols=*/ true, &al); ams->addr = ip; ams->al_addr = al.addr;
@@ -2078,7 +2078,7 @@ static int add_callchain_ip(struct thread *thread, al.sym =NULL ; al.srcline =NULL ;if (!cpumode) { -thread__find_cpumode_addr_location (thread, ip, &al); +thread__find_cpumode_addr_location (thread, ip, symbols, &al); }else {if (ip >=PERF_CONTEXT_MAX ) {switch (ip) {
@@ -2106,6 +2106,8 @@ static int add_callchain_ip(struct thread *thread, }if (symbols)thread__find_symbol (thread, *cpumode, ip, &al); +else +thread__find_map (thread, *cpumode, ip, &al); }if (al.sym !=NULL ) {
tools/perf/util/thread.c +6 -2
@@ -410,7 +410,7 @@ int thread__fork(struct thread *thread, struct thread *parent, u64 timestamp, bo }void thread__find_cpumode_addr_location (struct thread *thread,u64 addr, -struct addr_location *al) +bool symbols,struct addr_location *al) {size_t i;const u8 cpumodes[] = {
@@ -421,7 +421,11 @@ void thread__find_cpumode_addr_location(struct thread *thread, u64 addr, };for (i =0 ; i <ARRAY_SIZE (cpumodes); i++) { -thread__find_symbol (thread, cpumodes[i], addr, al); +if (symbols) +thread__find_symbol (thread, cpumodes[i], addr, al); +else +thread__find_map (thread, cpumodes[i], addr, al); +if (al->map)break ; }
tools/perf/util/thread.h +1 -1
@@ -126,7 +126,7 @@ struct symbol *thread__find_symbol_fb(struct thread *thread, u8 cpumode, u64 addr, struct addr_location *al);void thread__find_cpumode_addr_location (struct thread *thread,u64 addr, -struct addr_location *al); +bool symbols,struct addr_location *al);int thread__memcpy (struct thread *thread,struct machine *machine,void *buf,u64 ip,int len,bool *is64bit);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 488/780 cifs: Fix validation of SMB1 query reparse point response
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pali Rohár <[email protected]>
[ Upstream commit 56e84c64fc257a95728ee73165456b025c48d408 ]
Validate the SMB1 query reparse point response per [MS-CIFS] section 2.2.7.2 NT_TRANSACT_IOCTL.
NT_TRANSACT_IOCTL response contains one word long setup data after which is ByteCount member. So check that SetupCount is 1 before trying to read and use ByteCount member.
Output setup data contains ReturnedDataLen member which is the output length of executed IOCTL command by remote system. So check that output was not truncated before transferring over network.
Change MaxSetupCount of NT_TRANSACT_IOCTL request from 4 to 1 as io_rsp structure already expects one word long output setup data. This should prevent server sending incompatible structure (in case it would be extended in future, which is unlikely).
Change MaxParameterCount of NT_TRANSACT_IOCTL request from 2 to 0 as NT IOCTL does not have any documented output parameters and this function does not parse any output parameters at all.
--- fs/smb/client/cifssmb.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)
fs/smb/client/cifssmb.c +18 -2
@@ -2753,10 +2753,10 @@ int cifs_query_reparse_point(const unsigned int xid, io_req->TotalParameterCount =0 ; io_req->TotalDataCount =0 ; - io_req->MaxParameterCount =cpu_to_le32 (2 ); + io_req->MaxParameterCount =cpu_to_le32 (0 );/* BB find exact data count max from sess structure BB */ io_req->MaxDataCount =cpu_to_le32 (CIFSMaxBufSize &0xFFFFFF00 ); - io_req->MaxSetupCount =4 ; + io_req->MaxSetupCount =1 ; io_req->Reserved =0 ; io_req->ParameterOffset =0 ; io_req->DataCount =0 ;
@@ -2783,6 +2783,22 @@ int cifs_query_reparse_point(const unsigned int xid, goto error; } +/* SetupCount must be 1, otherwise offset to ByteCount is incorrect. */ +if (io_rsp->SetupCount !=1 ) { + rc = -EIO ; + goto error; + } + +/* +* ReturnedDataLen is output length of executed IOCTL. +* DataCount is output length transferred over network. +* Check that we have full FSCTL_GET_REPARSE_POINT buffer. +*/ +if (data_count !=le16_to_cpu (io_rsp->ReturnedDataLen)) { + rc = -EIO ; + goto error; + } + end =2 +get_bcc (&io_rsp->hdr) + (__u8 *)&io_rsp->ByteCount; start = (__u8 *)&io_rsp->hdr.Protocol + data_offset;if (start >= end) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 489/780 rust: alloc: add missing invariant in Vec::set_len()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Danilo Krummrich <[email protected]>
[ Upstream commit fb1bf1067de979c89ae33589e0466d6ce0dde204 ]
When setting a new length, we have to justify that the set length represents the exact number of elements stored in the vector.
--- rust/kernel/alloc/kvec.rs | 3 +++ 1 file changed, 3 insertions(+)
rust/kernel/alloc/kvec.rs +3 -0
@@ -196,6 +196,9 @@ where#[inline] pub unsafe fn set_len (&mut self, new_len:usize ) {debug_assert! (new_len <= self.capacity ()); + +// INVARIANT: By the safety requirements of this method `new_len` represents the exact +// number of elements stored within `self`. self.len = new_len; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 490/780 rtc: sh: assign correct interrupts with DT
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wolfram Sang <[email protected]>
[ Upstream commit 8f2efdbc303fe7baa83843d3290dd6ea5ba3276c ]
The DT bindings for this driver define the interrupts in the order as they are numbered in the interrupt controller. The old platform_data, however, listed them in a different order. So, for DT based platforms, they are mixed up. Assign them specifically for DT, so we can keep the bindings stable. After the fix, 'rtctest' passes again on the Renesas Genmai board (RZ-A1 / R7S72100).
--- drivers/rtc/rtc-sh.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/rtc/rtc-sh.c +9 -3
@@ -485,9 +485,15 @@ static int __init sh_rtc_probe(struct platform_device *pdev)return -ENOENT ; } - rtc->periodic_irq = ret; - rtc->carry_irq =platform_get_irq (pdev,1 ); - rtc->alarm_irq =platform_get_irq (pdev,2 ); +if (!pdev->dev.of_node) { + rtc->periodic_irq = ret; + rtc->carry_irq =platform_get_irq (pdev,1 ); + rtc->alarm_irq =platform_get_irq (pdev,2 ); + }else { + rtc->alarm_irq = ret; + rtc->periodic_irq =platform_get_irq (pdev,1 ); + rtc->carry_irq =platform_get_irq (pdev,2 ); + } res =platform_get_resource (pdev,IORESOURCE_IO ,0 );if (!res)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 491/780 phy: rockchip: samsung-hdptx: Fix clock ratio setup
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cristian Ciocaltea <[email protected]>
[ Upstream commit 0422253ac1919fea8292381c85f11a9decff1bb1 ]
The switch from 1/10 to 1/40 clock ratio must happen when exceeding the 340 MHz rate limit of HDMI 1.4, i.e. when entering the HDMI 2.0 domain, and not before.
Therefore, use the correct comparison operator '>' instead of '>=' when checking the max rate. While at it, introduce a define for this rate limit constant.
--- drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c +2 -1
@@ -320,6 +320,7 @@#define LN3_TX_SER_RATE_SEL_HBR2_MASK BIT(3)#define LN3_TX_SER_RATE_SEL_HBR3_MASK BIT(2) +#define HDMI14_MAX_RATE 340000000#define HDMI20_MAX_RATE 600000000enum dp_link_rate {
@@ -1074,7 +1075,7 @@ static int rk_hdptx_ropll_tmds_mode_config(struct rk_hdptx_phy *hdptx,regmap_write (hdptx->regmap,LNTOP_REG (0200 ),0x06 ); -if (rate >=3400000 ) { +if (rate >HDMI14_MAX_RATE /100 ) {/* For 1/40 bitrate clk */ rk_hdptx_multi_reg_write (hdptx, rk_hdtpx_tmds_lntop_highbr_seq); }else {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 492/780 phy: rockchip: samsung-hdptx: Do no set rk_hdptx_phy->rate in case of errors
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cristian Ciocaltea <[email protected]>
[ Upstream commit 1f4d382769e3b38dfc498c806811dae856e40f31 ]
Ensure rk_hdptx_ropll_tmds_cmn_config() updates hdptx->rate only after all the other operations have been successful.
--- drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c +6 -4
@@ -1008,9 +1008,7 @@ static int rk_hdptx_ropll_tmds_cmn_config(struct rk_hdptx_phy *hdptx, {const struct ropll_config *cfg =NULL ;struct ropll_config rc = {0 }; -int i; - - hdptx->rate = rate *100 ; +int ret, i;for (i =0 ; i <ARRAY_SIZE (ropll_tmds_cfg); i++)if (rate == ropll_tmds_cfg[i].bit_rate) {
@@ -1065,7 +1063,11 @@ static int rk_hdptx_ropll_tmds_cmn_config(struct rk_hdptx_phy *hdptx,regmap_update_bits (hdptx->regmap,CMN_REG (0086 ),PLL_PCG_CLK_EN_MASK ,FIELD_PREP (PLL_PCG_CLK_EN_MASK ,0x1 )); -return rk_hdptx_post_enable_pll (hdptx); + ret =rk_hdptx_post_enable_pll (hdptx); +if (!ret) + hdptx->rate = rate *100 ; + +return ret; } static int rk_hdptx_ropll_tmds_mode_config(struct rk_hdptx_phy *hdptx,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 493/780 PCI: pciehp: Ignore Presence Detect Changed caused by DPC
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lukas Wunner <[email protected]>
[ Upstream commit c3be50f7547ccb533284b22f74baf37d3379843e ]
Commit a97396c6eb13 ("PCI: pciehp: Ignore Link Down/Up caused by DPC") amended PCIe hotplug to not bring down the slot upon Data Link Layer State Changed events caused by Downstream Port Containment.
However Keith reports off-list that if the slot uses in-band presence detect (i.e. Presence Detect State is derived from Data Link Layer Link Active), DPC also causes a spurious Presence Detect Changed event.
This needs to be ignored as well.
Unfortunately there's no register indicating that in-band presence detect is used. PCIe r5.0 sec 7.5.3.10 introduced the In-Band PD Disable bit in the Slot Control Register. The PCIe hotplug driver sets this bit on ports supporting it. But older ports may still use in-band presence detect.
If in-band presence detect can be disabled, Presence Detect Changed events occurring during DPC must not be ignored because they signal device replacement. On all other ports, device replacement cannot be detected reliably because the Presence Detect Changed event could be a side effect of DPC. On those (older) ports, perform a best-effort device replacement check by comparing the Vendor ID, Device ID and other data in Config Space with the values cached in struct pci_dev. Use the existing helper pciehp_device_replaced() to accomplish this. It is currently #ifdef'ed to CONFIG_PM_SLEEP in pciehp_core.c, so move it to pciehp_hpc.c where most other functions accessing config space reside.
Stable-dep-of: 2af781a9edc4 ("PCI: pciehp: Ignore Link Down/Up caused by Secondary Bus Reset")
--- drivers/pci/hotplug/pciehp.h | 1 + drivers/pci/hotplug/pciehp_core.c | 29 ------------------ drivers/pci/hotplug/pciehp_hpc.c | 49 ++++++++++++++++++++++++++----- 3 files changed, 43 insertions(+), 36 deletions(-)
drivers/pci/hotplug/pciehp.h +1 -0
@@ -187,6 +187,7 @@ int pciehp_card_present(struct controller *ctrl);int pciehp_card_present_or_link_active (struct controller *ctrl);int pciehp_check_link_status (struct controller *ctrl);int pciehp_check_link_active (struct controller *ctrl); +bool pciehp_device_replaced (struct controller *ctrl);void pciehp_release_ctrl (struct controller *ctrl);int pciehp_sysfs_enable_slot (struct hotplug_slot *hotplug_slot);
drivers/pci/hotplug/pciehp_core.c +0 -29
@@ -284,35 +284,6 @@ static int pciehp_suspend(struct pcie_device *dev)return 0 ; } -static bool pciehp_device_replaced (struct controller *ctrl) -{ - struct pci_dev *pdev __free(pci_dev_put) = NULL; -u32 reg; - -if (pci_dev_is_disconnected (ctrl->pcie->port)) -return false; - - pdev =pci_get_slot (ctrl->pcie->port->subordinate,PCI_DEVFN (0 ,0 )); -if (!pdev) -return true; - -if (pci_read_config_dword (pdev,PCI_VENDOR_ID , ®) || - reg != (pdev->vendor | (pdev->device <<16 )) || -pci_read_config_dword (pdev,PCI_CLASS_REVISION , ®) || - reg != (pdev->revision | (pdev->class <<8 ))) -return true; - -if (pdev->hdr_type ==PCI_HEADER_TYPE_NORMAL && - (pci_read_config_dword (pdev,PCI_SUBSYSTEM_VENDOR_ID , ®) || - reg != (pdev->subsystem_vendor | (pdev->subsystem_device <<16 )))) -return true; - -if (pci_get_dsn (pdev) != ctrl->dsn) -return true; - -return false; -} -static int pciehp_resume_noirq (struct pcie_device *dev) {struct controller *ctrl =get_service_data (dev);
drivers/pci/hotplug/pciehp_hpc.c +42 -7
76 lines not on this page · raw message
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 494/780 PCI: pciehp: Ignore Link Down/Up caused by Secondary Bus Reset
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lukas Wunner <[email protected]>
[ Upstream commit 2af781a9edc4ef5f6684c0710cc3542d9be48b31 ]
When a Secondary Bus Reset is issued at a hotplug port, it causes a Data Link Layer State Changed event as a side effect. On hotplug ports using in-band presence detect, it additionally causes a Presence Detect Changed event.
These spurious events should not result in teardown and re-enumeration of the device in the slot. Hence commit 2e35afaefe64 ("PCI: pciehp: Add reset_slot() method") masked the Presence Detect Changed Enable bit in the Slot Control register during a Secondary Bus Reset. Commit 06a8d89af551 ("PCI: pciehp: Disable link notification across slot reset") additionally masked the Data Link Layer State Changed Enable bit.
However masking those bits only disables interrupt generation (PCIe r6.2 sec 6.7.3.1). The events are still visible in the Slot Status register and picked up by the IRQ handler if it runs during a Secondary Bus Reset. This can happen if the interrupt is shared or if an unmasked hotplug event occurs, e.g. Attention Button Pressed or Power Fault Detected.
The likelihood of this happening used to be small, so it wasn't much of a problem in practice. That has changed with the recent introduction of bandwidth control in v6.13-rc1 with commit 665745f27487 ("PCI/bwctrl:
Re-add BW notification portdrv as PCIe BW controller"):
Bandwidth control shares the interrupt with PCIe hotplug. A Secondary Bus Reset causes a Link Bandwidth Notification, so the hotplug IRQ handler runs, picks up the masked events and tears down the device in the slot.
As a result, Joel reports VFIO passthrough failure of a GPU, which Ilpo root-caused to the incorrect handling of masked hotplug events.
Clearly, a more reliable way is needed to ignore spurious hotplug events.
For Downstream Port Containment, a new ignore mechanism was introduced by commit a97396c6eb13 ("PCI: pciehp: Ignore Link Down/Up caused by DPC"). It has been working reliably for the past four years.
Adapt it for Secondary Bus Resets.
Introduce two helpers to annotate code sections which cause spurious link
changes: pci_hp_ignore_link_change() and pci_hp_unignore_link_change() Use those helpers in lieu of masking interrupts in the Slot Control register.
Introduce a helper to check whether such a code section is executing concurrently and if so, await it: pci_hp_spurious_link_change() Invoke the helper in the hotplug IRQ thread pciehp_ist(). Re-use the IRQ thread's existing code which ignores DPC-induced link changes unless the link is unexpectedly down after reset recovery or the device was replaced during the bus reset.
That code block in pciehp_ist() was previously only executed if a Data Link Layer State Changed event has occurred. Additionally execute it for Presence Detect Changed events. That's necessary for compatibility with PCIe r1.0 hotplug ports because Data Link Layer State Changed didn't exist before PCIe r1.1. DPC was added with PCIe r3.1 and thus DPC-capable hotplug ports always support Data Link Layer State Changed events. But the same cannot be assumed for Secondary Bus Reset, which already existed in PCIe r1.0.
Secondary Bus Reset is only one of many causes of spurious link changes. Others include runtime suspend to D3cold, firmware updates or FPGA reconfiguration. The new pci_hp_{,un}ignore_link_change() helpers may be used by all kinds of drivers to annotate such code sections, hence their declarations are publicly visible in <linux/pci.h>. A case in point is the Mellanox Ethernet driver which disables a firmware reset feature if the Ethernet card is attached to a hotplug port, see commit 3d7a3f2612d7 ("net/mlx5: Nack sync reset request when HotPlug is enabled"). Going forward, PCIe hotplug will be able to cope gracefully with all such use cases once the code sections are properly annotated.
The new helpers internally use two bits in struct pci_dev's priv_flags as well as a wait_queue. This mirrors what was done for DPC by commit a97396c6eb13 ("PCI: pciehp: Ignore Link Down/Up caused by DPC"). That may be insufficient if spurious link changes are caused by multiple sources simultaneously. An example might be a Secondary Bus Reset issued by AER during FPGA reconfiguration. If this turns out to happen in real life, support for it can easily be added by replacing the PCI_LINK_CHANGING flag with an atomic_t counter incremented by pci_hp_ignore_link_change() and decremented by pci_hp_unignore_link_change(). Instead of awaiting a zero PCI_LINK_CHANGING flag, the pci_hp_spurious_link_change() helper would then simply await a zero counter.
--- drivers/pci/hotplug/pci_hotplug_core.c | 69 ++++++++++++++++++++++++++ drivers/pci/hotplug/pciehp_hpc.c | 35 +++++-------- drivers/pci/pci.h | 3 ++ include/linux/pci.h | 8 +++ 4 files changed, 92 insertions(+), 23 deletions(-)
drivers/pci/hotplug/pci_hotplug_core.c +69 -0
@@ -492,6 +492,75 @@ void pci_hp_destroy(struct hotplug_slot *slot) }EXPORT_SYMBOL_GPL (pci_hp_destroy); +static DECLARE_WAIT_QUEUE_HEAD (pci_hp_link_change_wq); + +/** +* pci_hp_ignore_link_change - begin code section causing spurious link changes +* @pdev: PCI hotplug bridge +* +* Mark the beginning of a code section causing spurious link changes on the +* Secondary Bus of @pdev, e.g. as a side effect of a Secondary Bus Reset, +* D3cold transition, firmware update or FPGA reconfiguration. +* +* Hotplug drivers can thus check whether such a code section is executing +* concurrently, await it with pci_hp_spurious_link_change() and ignore the +* resulting link change events. +* +* Must be paired with pci_hp_unignore_link_change(). May be called both +* from the PCI core and from Endpoint drivers. May be called for bridges +* which are not hotplug-capable, in which case it has no effect because +* no hotplug driver is bound to the bridge. +*/ +void pci_hp_ignore_link_change (struct pci_dev *pdev) +{ +set_bit (PCI_LINK_CHANGING , &pdev->priv_flags); +smp_mb__after_atomic ();/* pairs with implied barrier of wait_event() */ +} + +/** +* pci_hp_unignore_link_change - end code section causing spurious link changes +* @pdev: PCI hotplug bridge +* +* Mark the end of a code section causing spurious link changes on the +* Secondary Bus of @pdev. Must be paired with pci_hp_ignore_link_change(). +*/ +void pci_hp_unignore_link_change (struct pci_dev *pdev) +{ +set_bit (PCI_LINK_CHANGED , &pdev->priv_flags); +mb ();/* ensure pci_hp_spurious_link_change() sees either bit set */ +clear_bit (PCI_LINK_CHANGING , &pdev->priv_flags); +wake_up_all (&pci_hp_link_change_wq); +} + +/** +* pci_hp_spurious_link_change - check for spurious link changes +* @pdev: PCI hotplug bridge +* +* Check whether a code section is executing concurrently which is causing +* spurious link changes on the Secondary Bus of @pdev. Await the end of the +* code section if so. +* +* May be called by hotplug drivers to check whether a link change is spurious +* and can be ignored. +* +* Because a genuine link change may have occurred in-between a spurious link +* change and the invocation of this function, hotplug drivers should perform +* sanity checks such as retrieving the current link state and bringing down +* the slot if the link is down. +* +* Return: %true if such a code section has been executing concurrently, +* otherwise %false. Also return %true if such a code section has not been +* executing concurrently, but at least once since the last invocation of this +* function. +*/ +bool pci_hp_spurious_link_change (struct pci_dev *pdev) +{ +wait_event (pci_hp_link_change_wq, + !test_bit (PCI_LINK_CHANGING , &pdev->priv_flags)); + +return test_and_clear_bit (PCI_LINK_CHANGED , &pdev->priv_flags); +} +static int __init pci_hotplug_init (void ) {int result;
drivers/pci/hotplug/pciehp_hpc.c +12 -23
@@ -592,21 +592,21 @@ bool pciehp_device_replaced(struct controller *ctrl)return false; } -static void pciehp_ignore_dpc_link_change (struct controller *ctrl, -struct pci_dev *pdev,int irq, -u16 ignored_events) +static void pciehp_ignore_link_change (struct controller *ctrl, +struct pci_dev *pdev,int irq, +u16 ignored_events) {/* * Ignore link changes which occurred while waiting for DPC recovery. * Could be several if DPC triggered multiple times consecutively. +* Also ignore link changes caused by Secondary Bus Reset, etc. */ synchronize_hardirq (irq);atomic_and (~ignored_events, &ctrl->pending_events);if (pciehp_poll_mode)pcie_capability_write_word (pdev,PCI_EXP_SLTSTA , ignored_events); -ctrl_info (ctrl,"Slot(%s): Link Down/Up ignored (recovered by DPC)\n" , -slot_name (ctrl)); +ctrl_info (ctrl,"Slot(%s): Link Down/Up ignored\n" ,slot_name (ctrl));/* * If the link is unexpectedly down after successful recovery,
@@ -762,9 +762,11 @@ static irqreturn_t pciehp_ist(int irq, void *dev_id)/* * Ignore Link Down/Up events caused by Downstream Port Containment -* if recovery from the error succeeded. +* if recovery succeeded, or caused by Secondary Bus Reset, +* suspend to D3cold, firmware update, FPGA reconfiguration, etc. */ -if ((events &PCI_EXP_SLTSTA_DLLSC ) &&pci_dpc_recovered (pdev) && +if ((events & (PCI_EXP_SLTSTA_PDC |PCI_EXP_SLTSTA_DLLSC )) && + (pci_dpc_recovered (pdev) ||pci_hp_spurious_link_change (pdev)) && ctrl->state ==ON_STATE ) {u16 ignored_events =PCI_EXP_SLTSTA_DLLSC ;
@@ -772,7 +774,7 @@ static irqreturn_t pciehp_ist(int irq, void *dev_id) ignored_events |= events &PCI_EXP_SLTSTA_PDC ; events &= ~ignored_events; -pciehp_ignore_dpc_link_change (ctrl, pdev, irq, ignored_events); +pciehp_ignore_link_change (ctrl, pdev, irq, ignored_events); }/*
@@ -937,7 +939,6 @@ int pciehp_reset_slot(struct hotplug_slot *hotplug_slot, bool probe) {struct controller *ctrl =to_ctrl (hotplug_slot);struct pci_dev *pdev =ctrl_dev (ctrl); -u16 stat_mask =0 , ctrl_mask =0 ;int rc;if (probe)
@@ -945,23 +946,11 @@ int pciehp_reset_slot(struct hotplug_slot *hotplug_slot, bool probe)down_write_nested (&ctrl->reset_lock, ctrl->depth); -if (!ATTN_BUTTN (ctrl)) { - ctrl_mask |=PCI_EXP_SLTCTL_PDCE ; - stat_mask |=PCI_EXP_SLTSTA_PDC ; - } - ctrl_mask |=PCI_EXP_SLTCTL_DLLSCE ; - stat_mask |=PCI_EXP_SLTSTA_DLLSC ; - -pcie_write_cmd (ctrl,0 , ctrl_mask); -ctrl_dbg (ctrl,"%s: SLOTCTRL %x write cmd %x\n" , __func__, -pci_pcie_cap (ctrl->pcie->port) +PCI_EXP_SLTCTL ,0 ); +pci_hp_ignore_link_change (pdev); rc =pci_bridge_secondary_bus_reset (ctrl->pcie->port); -pcie_capability_write_word (pdev,PCI_EXP_SLTSTA , stat_mask); -pcie_write_cmd_nowait (ctrl, ctrl_mask, ctrl_mask); -ctrl_dbg (ctrl,"%s: SLOTCTRL %x write cmd %x\n" , __func__, -pci_pcie_cap (ctrl->pcie->port) +PCI_EXP_SLTCTL , ctrl_mask); +pci_hp_unignore_link_change (pdev);up_write (&ctrl->reset_lock);return rc;
drivers/pci/pci.h +3 -0
@@ -227,6 +227,7 @@ static inline int pci_proc_detach_bus(struct pci_bus *bus) { return 0; }/* Functions for PCI Hotplug drivers to use */ int pci_hp_add_bridge (struct pci_dev *dev); +bool pci_hp_spurious_link_change (struct pci_dev *pdev);#if defined(CONFIG_SYSFS ) && defined(HAVE_PCI_LEGACY )void pci_create_legacy_files (struct pci_bus *bus);
@@ -557,6 +558,8 @@ static inline int pci_dev_set_disconnected(struct pci_dev *dev, void *unused)#define PCI_DPC_RECOVERED 1#define PCI_DPC_RECOVERING 2#define PCI_DEV_REMOVED 3 +#define PCI_LINK_CHANGED 4 +#define PCI_LINK_CHANGING 5static inline void pci_dev_assign_added (struct pci_dev *dev) {
include/linux/pci.h +8 -0
@@ -1850,6 +1850,14 @@ static inline bool pcie_aspm_support_enabled(void) { return false; }static inline bool pcie_aspm_enabled (struct pci_dev *pdev) {return false; }#endif +#ifdef CONFIG_HOTPLUG_PCI +void pci_hp_ignore_link_change (struct pci_dev *pdev); +void pci_hp_unignore_link_change (struct pci_dev *pdev); +#else +static inline void pci_hp_ignore_link_change (struct pci_dev *pdev) { } +static inline void pci_hp_unignore_link_change (struct pci_dev *pdev) { } +#endif +#ifdef CONFIG_PCIEAER bool pci_aer_available (void );#else
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 495/780 PCI: Print the actual delay time in pci_bridge_wait_for_secondary_bus()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wilfred Mallawa <[email protected]>
[ Upstream commit d24eba726aadf8778f2907dd42281c6380b0ccaa ]
Print the delay amount that pcie_wait_for_link_delay() is invoked with instead of the hardcoded 1000ms value in the debug info print.
--- drivers/pci/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/pci.c +1 -1
@@ -4954,7 +4954,7 @@ int pci_bridge_wait_for_secondary_bus(struct pci_dev *dev, char *reset_type) delay);if (!pcie_wait_for_link_delay (dev, true, delay)) {/* Did not train, no need to wait any further */ -pci_info (dev,"Data Link Layer Link Active not set in 1000 msec\n" ); +pci_info (dev,"Data Link Layer Link Active not set in %d msec\n" , delay);return -ENOTTY ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 496/780 PCI: rockchip: Fix order of rockchip_pci_core_rsts
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jensen Huang <[email protected]>
[ Upstream commit c7540e5423d7f588c7210a9941ceb6a836963ccc ]
The order of rockchip_pci_core_rsts introduced in the offending commit followed the previous comment that warned not to reorder them. But the commit failed to take into account that reset_control_bulk_deassert() deasserts the resets in reverse order. So this leads to the link getting downgraded to 2.5 GT/s.
Hence, restore the deassert order and also add back the comments for rockchip_pci_core_rsts.
Tested on NanoPC-T4 with Samsung 970 Pro.
--- drivers/pci/controller/pcie-rockchip.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/pci/controller/pcie-rockchip.h +4 -3
@@ -319,11 +319,12 @@ static const char * const rockchip_pci_pm_rsts[] = { "aclk", }; +/* NOTE: Do not reorder the deassert sequence of the following reset pins */ static const char *const rockchip_pci_core_rsts[] = { -"mgmt-sticky" , -"core" , -"mgmt" ,"pipe" , +"mgmt" , +"core" , +"mgmt-sticky" , };struct rockchip_pcie {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 497/780 PCI: rcar-gen4: set ep BAR4 fixed size
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jerome Brunet <[email protected]>
[ Upstream commit b584ab12d59f646b9254b2b16ff197d612fd4935 ]
On rcar-gen4, the ep BAR4 has a fixed size of 256B. Document this constraint in the epc features of the platform.
--- drivers/pci/controller/dwc/pcie-rcar-gen4.c | 1 + 1 file changed, 1 insertion(+)
drivers/pci/controller/dwc/pcie-rcar-gen4.c +1 -0
@@ -403,6 +403,7 @@ static const struct pci_epc_features rcar_gen4_pcie_epc_features = { .msix_capable = false, .bar[BAR_1] = { .type = BAR_RESERVED, }, .bar[BAR_3] = { .type = BAR_RESERVED, }, + .bar[BAR_4] = { .type = BAR_FIXED, .fixed_size = 256 }, .bar[BAR_5] = { .type = BAR_RESERVED, }, .align = SZ_1M, };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 498/780 PCI: cadence: Fix runtime atomic count underflow
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans Zhang <[email protected]>
[ Upstream commit 8805f32a96d3b97cef07999fa6f52112678f7e65 ]
If the call to pci_host_probe() in cdns_pcie_host_setup() fails, PM runtime count is decremented in the error path using pm_runtime_put_sync(). But the runtime count is not incremented by this driver, but only by the callers (cdns_plat_pcie_probe/j721e_pcie_probe). And the callers also decrement the runtime PM count in their error path. So this leads to the below warning from the PM core:
"runtime PM usage count underflow!"
So fix it by getting rid of pm_runtime_put_sync() in the error path and directly return the errno.
--- drivers/pci/controller/cadence/pcie-cadence-host.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
drivers/pci/controller/cadence/pcie-cadence-host.c +1 -10
@@ -570,14 +570,5 @@ int cdns_pcie_host_setup(struct cdns_pcie_rc *rc)if (!bridge->ops) bridge->ops = &cdns_pcie_host_ops; - ret =pci_host_probe (bridge); -if (ret <0 ) - goto err_init; - -return 0 ; - - err_init: -pm_runtime_put_sync (dev); - -return ret; +return pci_host_probe (bridge); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 499/780 PCI: apple: Use gpiod_set_value_cansleep in probe flow
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hector Martin <[email protected]>
[ Upstream commit 7334364f9de79a9a236dd0243ba574b8d2876e89 ]
We're allowed to sleep here, so tell the GPIO core by using gpiod_set_value_cansleep instead of gpiod_set_value.
--- drivers/pci/controller/pcie-apple.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pci/controller/pcie-apple.c +2 -2
@@ -540,7 +540,7 @@ static int apple_pcie_setup_port(struct apple_pcie *pcie,rmw_set (PORT_APPCLK_EN , port->base +PORT_APPCLK );/* Assert PERST# before setting up the clock */ -gpiod_set_value (reset,1 ); +gpiod_set_value_cansleep (reset,1 ); ret =apple_pcie_setup_refclk (pcie, port);if (ret <0 )
@@ -551,7 +551,7 @@ static int apple_pcie_setup_port(struct apple_pcie *pcie,/* Deassert PERST# */ rmw_set (PORT_PERST_OFF , port->base +PORT_PERST ); -gpiod_set_value (reset,0 ); +gpiod_set_value_cansleep (reset,0 );/* Wait for 100ms after PERST# deassertion (PCIe r5.0, 6.6.1) */ msleep (100 );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 500/780 PCI: imx6: Save and restore the LUT setting during suspend/resume for i.MX95 SoC
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Richard Zhu <[email protected]>
[ Upstream commit e4d66131caaf18d7c3c69914513f4be0519ddaaf ]
The look up table (LUT) setting would be lost during the PCIe suspend on i.MX95 SoC. So to ensure proper functionality after resume, save it during suspend and restore it while resuming.
--- drivers/pci/controller/dwc/pci-imx6.c | 47 +++++++++++++++++++++++++++ 1 file changed, 47 insertions(+)
drivers/pci/controller/dwc/pci-imx6.c +47 -0
@@ -129,6 +129,11 @@ struct imx_pcie_drvdata {const struct dw_pcie_host_ops *ops; }; +struct imx_lut_data { +u32 data1; +u32 data2; +}; +struct imx_pcie {struct dw_pcie *pci;struct gpio_desc *reset_gpiod;
@@ -148,6 +153,8 @@ struct imx_pcie {struct regulator *vph;void __iomem *phy_base; +/* LUT data for pcie */ +struct imx_lut_data luts[IMX95_MAX_LUT ];/* power domain for pcie */ struct device *pd_pcie;/* power domain for pcie phy */
@@ -1386,6 +1393,42 @@ static void imx_pcie_msi_save_restore(struct imx_pcie *imx_pcie, bool save) } } +static void imx_pcie_lut_save (struct imx_pcie *imx_pcie) +{ +u32 data1, data2; +int i; + +for (i =0 ; i <IMX95_MAX_LUT ; i++) { +regmap_write (imx_pcie->iomuxc_gpr,IMX95_PE0_LUT_ACSCTRL , +IMX95_PEO_LUT_RWA | i); +regmap_read (imx_pcie->iomuxc_gpr,IMX95_PE0_LUT_DATA1 , &data1); +regmap_read (imx_pcie->iomuxc_gpr,IMX95_PE0_LUT_DATA2 , &data2); +if (data1 &IMX95_PE0_LUT_VLD ) { + imx_pcie->luts[i].data1 = data1; + imx_pcie->luts[i].data2 = data2; + }else { + imx_pcie->luts[i].data1 =0 ; + imx_pcie->luts[i].data2 =0 ; + } + } +} + +static void imx_pcie_lut_restore (struct imx_pcie *imx_pcie) +{ +int i; + +for (i =0 ; i <IMX95_MAX_LUT ; i++) { +if ((imx_pcie->luts[i].data1 &IMX95_PE0_LUT_VLD ) ==0 ) +continue ; + +regmap_write (imx_pcie->iomuxc_gpr,IMX95_PE0_LUT_DATA1 , + imx_pcie->luts[i].data1); +regmap_write (imx_pcie->iomuxc_gpr,IMX95_PE0_LUT_DATA2 , + imx_pcie->luts[i].data2); +regmap_write (imx_pcie->iomuxc_gpr,IMX95_PE0_LUT_ACSCTRL , i); + } +} +static int imx_pcie_suspend_noirq (struct device *dev) {struct imx_pcie *imx_pcie =dev_get_drvdata (dev);
@@ -1394,6 +1437,8 @@ static int imx_pcie_suspend_noirq(struct device *dev)return 0 ;imx_pcie_msi_save_restore (imx_pcie, true); +if (imx_check_flag (imx_pcie,IMX_PCIE_FLAG_HAS_LUT )) +imx_pcie_lut_save (imx_pcie);if (imx_check_flag (imx_pcie,IMX_PCIE_FLAG_BROKEN_SUSPEND )) {/* * The minimum for a workaround would be to set PERST# and to
@@ -1438,6 +1483,8 @@ static int imx_pcie_resume_noirq(struct device *dev)if (ret)return ret; } +if (imx_check_flag (imx_pcie,IMX_PCIE_FLAG_HAS_LUT )) +imx_pcie_lut_restore (imx_pcie);imx_pcie_msi_save_restore (imx_pcie, false);return 0 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 501/780 PCI: Explicitly put devices into D0 when initializing
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mario Limonciello <[email protected]>
[ Upstream commit 4d4c10f763d7808fbade28d83d237411603bca05 ]
AMD BIOS team has root caused an issue that NVMe storage failed to come back from suspend to a lack of a call to _REG when NVMe device was probed.
112a7f9c8edbf ("PCI/ACPI: Call _REG when transitioning D-states") added support for calling _REG when transitioning D-states, but this only works if the device actually "transitions" D-states.
967577b062417 ("PCI/PM: Keep runtime PM enabled for unbound PCI devices") added support for runtime PM on PCI devices, but never actually 'explicitly' sets the device to D0.
To make sure that devices are in D0 and that platform methods such as _REG are called, explicitly set all devices into D0 during initialization.
--- drivers/pci/pci-driver.c | 6 ------ drivers/pci/pci.c | 13 ++++++++++--- drivers/pci/pci.h | 1 + 3 files changed, 11 insertions(+), 9 deletions(-)
drivers/pci/pci-driver.c +0 -6
@@ -555,12 +555,6 @@ static void pci_pm_default_resume(struct pci_dev *pci_dev)pci_enable_wake (pci_dev,PCI_D0 , false); } -static void pci_pm_power_up_and_verify_state (struct pci_dev *pci_dev) -{ -pci_power_up (pci_dev); -pci_update_current_state (pci_dev,PCI_D0 ); -} -static void pci_pm_default_resume_early (struct pci_dev *pci_dev) {pci_pm_power_up_and_verify_state (pci_dev);
drivers/pci/pci.c +10 -3
@@ -3192,6 +3192,12 @@ void pci_d3cold_disable(struct pci_dev *dev) }EXPORT_SYMBOL_GPL (pci_d3cold_disable); +void pci_pm_power_up_and_verify_state (struct pci_dev *pci_dev) +{ +pci_power_up (pci_dev); +pci_update_current_state (pci_dev,PCI_D0 ); +} +/** * pci_pm_init - Initialize PM functions of given PCI device * @dev: PCI device to handle.
@@ -3202,9 +3208,6 @@ void pci_pm_init(struct pci_dev *dev)u16 status;u16 pmc; -pm_runtime_forbid (&dev->dev); -pm_runtime_set_active (&dev->dev); -pm_runtime_enable (&dev->dev);device_enable_async_suspend (&dev->dev); dev->wakeup_prepared = false;
@@ -3266,6 +3269,10 @@ void pci_pm_init(struct pci_dev *dev)pci_read_config_word (dev,PCI_STATUS , &status);if (status &PCI_STATUS_IMM_READY ) dev->imm_ready =1 ; +pci_pm_power_up_and_verify_state (dev); +pm_runtime_forbid (&dev->dev); +pm_runtime_set_active (&dev->dev); +pm_runtime_enable (&dev->dev); }static unsigned long pci_ea_flags (struct pci_dev *dev,u8 prop)
drivers/pci/pci.h +1 -0
@@ -148,6 +148,7 @@ void pci_dev_adjust_pme(struct pci_dev *dev);void pci_dev_complete_resume (struct pci_dev *pci_dev);void pci_config_pm_runtime_get (struct pci_dev *dev);void pci_config_pm_runtime_put (struct pci_dev *dev); +void pci_pm_power_up_and_verify_state (struct pci_dev *pci_dev);void pci_pm_init (struct pci_dev *dev);void pci_ea_init (struct pci_dev *dev);void pci_msi_init (struct pci_dev *dev);
Signature · 1 line
2.39.5
Re: [PATCH 6.15 501/780] PCI: Explicitly put devices into D0 when initializing
Quoted 22 lines · Greg Kroah-Hartman
6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mario Limonciello <[email protected]>
[ Upstream commit
4d4c10f763d7808fbade28d83d237411603bca05]AMD BIOS team has root caused an issue that NVMe storage failed to come back from suspend to a lack of a call to
_REGwhen NVMe device was probed.
112a7f9c8edbf("PCI/ACPI: Call_REGwhen transitioning D-states") added support for calling_REGwhen transitioning D-states, but this only works if the device actually "transitions" D-states.
967577b062417("PCI/PM: Keep runtime PM enabled for unbound PCI devices") added support for runtime PM on PCI devices, but never actually 'explicitly' sets the device to D0.To make sure that devices are in D0 and that platform methods such as
_REGare called, explicitly set all devices into D0 during initialization.
Quoted 9 lines
Fixes 967577b062417 ("PCI/PM: Keep runtime PM enabled for unbound PCI devices")Signed-off-by Mario Limonciello <[email protected]>Signed-off-by Bjorn Helgaas <[email protected]>Tested-by Denis Benato <[email protected]>Tested-by Yijun Shen <[email protected]>Tested-by David Perry <[email protected]>Reviewed-by Rafael J. Wysocki <[email protected]>Signed-off-by Sasha Levin <[email protected]>
Same comment as on 6.6:
I do think this should come back to stable, but I think we need to wait a stable cycle to pick it up so that it can come with this fix too.
https://lore.kernel.org/linux-pci/[email protected]/
Quoted 73 lines
--- drivers/pci/pci-driver.c | 6 ------ drivers/pci/pci.c | 13 ++++++++++--- drivers/pci/pci.h | 1 + 3 files changed, 11 insertions(+), 9 deletions(-)drivers/pci/pci-driver.c +0
-6@@ -555,12 +555,6 @@ static void pci_pm_default_resume(struct pci_dev *pci_dev)pci_enable_wake (pci_dev,PCI_D0 , false); } -static void pci_pm_power_up_and_verify_state (struct pci_dev *pci_dev) -{ -pci_power_up (pci_dev); -pci_update_current_state (pci_dev,PCI_D0 ); -} -static void pci_pm_default_resume_early (struct pci_dev *pci_dev) {pci_pm_power_up_and_verify_state (pci_dev);drivers/pci/pci.c +10
-3@@ -3192,6 +3192,12 @@ void pci_d3cold_disable(struct pci_dev *dev) }EXPORT_SYMBOL_GPL (pci_d3cold_disable); +void pci_pm_power_up_and_verify_state (struct pci_dev *pci_dev) +{ +pci_power_up (pci_dev); +pci_update_current_state (pci_dev,PCI_D0 ); +} +/** * pci_pm_init - Initialize PM functions of given PCI device * @dev: PCI device to handle. @@ -3202,9 +3208,6 @@ void pci_pm_init(struct pci_dev *dev)u16 status;u16 pmc; -pm_runtime_forbid (&dev->dev); -pm_runtime_set_active (&dev->dev); -pm_runtime_enable (&dev->dev);device_enable_async_suspend (&dev->dev); dev->wakeup_prepared = false;@@ -3266,6 +3269,10 @@ void pci_pm_init(struct pci_dev *dev)pci_read_config_word (dev,PCI_STATUS , &status);if (status &PCI_STATUS_IMM_READY ) dev->imm_ready =1 ; +pci_pm_power_up_and_verify_state (dev); +pm_runtime_forbid (&dev->dev); +pm_runtime_set_active (&dev->dev); +pm_runtime_enable (&dev->dev); }static unsigned long pci_ea_flags (struct pci_dev *dev,u8 prop)drivers/pci/pci.h +1
-0@@ -148,6 +148,7 @@ void pci_dev_adjust_pme(struct pci_dev *dev);void pci_dev_complete_resume (struct pci_dev *pci_dev);void pci_config_pm_runtime_get (struct pci_dev *dev);void pci_config_pm_runtime_put (struct pci_dev *dev); +void pci_pm_power_up_and_verify_state (struct pci_dev *pci_dev);void pci_pm_init (struct pci_dev *dev);void pci_ea_init (struct pci_dev *dev);void pci_msi_init (struct pci_dev *dev);
Greg Kroah-Hartman
maintainerPATCH 502/780 phy: qcom-qmp-usb: Fix an NULL vs IS_ERR() bug
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chenyuan Yang <[email protected]>
[ Upstream commit d14402a38c2d868cacb1facaf9be908ca6558e59 ]
The qmp_usb_iomap() helper function currently returns the raw result of devm_ioremap() for non-exclusive mappings. Since devm_ioremap() may return a NULL pointer and the caller only checks error pointers with IS_ERR(), NULL could bypass the check and lead to an invalid dereference.
Fix the issue by checking if devm_ioremap() returns NULL. When it does, qmp_usb_iomap() now returns an error pointer via IOMEM_ERR_PTR(-ENOMEM), ensuring safe and consistent error handling.
--- drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/phy/qualcomm/phy-qcom-qmp-usb.c +5 -1
@@ -2106,12 +2106,16 @@ static void __iomem *qmp_usb_iomap(struct device *dev, struct device_node *np, int index, bool exclusive) {struct resource res; +void __iomem *mem;if (!exclusive) {if (of_address_to_resource (np, index, &res))return IOMEM_ERR_PTR (-EINVAL ); -return devm_ioremap (dev, res.start,resource_size (&res)); + mem =devm_ioremap (dev, res.start,resource_size (&res)); +if (!mem) +return IOMEM_ERR_PTR (-ENOMEM ); +return mem; }return devm_of_iomap (dev, np, index,NULL );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 503/780 Revert "phy: qcom-qusb2: add QUSB2 support for IPQ5424"
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kathiravan Thirumoorthy <[email protected]>
[ Upstream commit 8a040e13afd94a1f91acaf8e0505769d4f7f5af4 ]
With the current settings, compliance tests especially eye diagram (Host High-speed Signal Quality) tests are failing. Reuse the IPQ6018 settings to overcome this issue, as mentioned in the Hardware Design Document.
So revert the change which introduced the new settings and reuse the IPQ6018 settings in the subsequent patch.
--- drivers/phy/qualcomm/phy-qcom-qusb2.c | 28 --------------------------- 1 file changed, 28 deletions(-)
drivers/phy/qualcomm/phy-qcom-qusb2.c +0 -28
@@ -151,21 +151,6 @@ static const struct qusb2_phy_init_tbl ipq6018_init_tbl[] = { QUSB2_PHY_INIT_CFG(QUSB2PHY_PLL_AUTOPGM_CTL1, 0x9F), }; -static const struct qusb2_phy_init_tbl ipq5424_init_tbl[] = { -QUSB2_PHY_INIT_CFG (QUSB2PHY_PLL ,0x14 ), -QUSB2_PHY_INIT_CFG_L (QUSB2PHY_PORT_TUNE1 ,0x00 ), -QUSB2_PHY_INIT_CFG_L (QUSB2PHY_PORT_TUNE2 ,0x53 ), -QUSB2_PHY_INIT_CFG_L (QUSB2PHY_PORT_TUNE4 ,0xc3 ), -QUSB2_PHY_INIT_CFG (QUSB2PHY_PLL_TUNE ,0x30 ), -QUSB2_PHY_INIT_CFG (QUSB2PHY_PLL_USER_CTL1 ,0x79 ), -QUSB2_PHY_INIT_CFG (QUSB2PHY_PLL_USER_CTL2 ,0x21 ), -QUSB2_PHY_INIT_CFG_L (QUSB2PHY_PORT_TUNE5 ,0x00 ), -QUSB2_PHY_INIT_CFG (QUSB2PHY_PLL_PWR_CTRL ,0x00 ), -QUSB2_PHY_INIT_CFG_L (QUSB2PHY_PORT_TEST2 ,0x14 ), -QUSB2_PHY_INIT_CFG (QUSB2PHY_PLL_TEST ,0x80 ), -QUSB2_PHY_INIT_CFG (QUSB2PHY_PLL_AUTOPGM_CTL1 ,0x9f ), -}; -static const struct qusb2_phy_init_tbl qcs615_init_tbl[] = {QUSB2_PHY_INIT_CFG_L (QUSB2PHY_PORT_TUNE1 ,0xc8 ),QUSB2_PHY_INIT_CFG_L (QUSB2PHY_PORT_TUNE2 ,0xb3 ),
@@ -359,16 +344,6 @@ static const struct qusb2_phy_cfg ipq6018_phy_cfg = { .autoresume_en = BIT(0), }; -static const struct qusb2_phy_cfg ipq5424_phy_cfg = { - .tbl = ipq5424_init_tbl, - .tbl_num =ARRAY_SIZE (ipq5424_init_tbl), - .regs = ipq6018_regs_layout, - - .disable_ctrl =POWER_DOWN , - .mask_core_ready =PLL_LOCKED , - .autoresume_en =BIT (0 ), -}; -static const struct qusb2_phy_cfg qcs615_phy_cfg = { .tbl = qcs615_init_tbl, .tbl_num =ARRAY_SIZE (qcs615_init_tbl),
@@ -954,9 +929,6 @@ static const struct phy_ops qusb2_phy_gen_ops = {static const struct of_device_id qusb2_phy_of_match_table[] = { { - .compatible ="qcom,ipq5424-qusb2-phy" , - .data = &ipq5424_phy_cfg, - }, { .compatible ="qcom,ipq6018-qusb2-phy" , .data = &ipq6018_phy_cfg, }, {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 504/780 phy: qcom-qusb2: reuse the IPQ6018 settings for IPQ5424
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kathiravan Thirumoorthy <[email protected]>
[ Upstream commit 25c36b54eafc98b3ef004e2037cea1328d9b8bc5 ]
With the settings used in the commit 9c56a1de296e ("phy: qcom-qusb2: add QUSB2 support for IPQ5424"), compliance test cases especially eye-diagram (Host High-speed Signal Quality) tests are failing.
Reuse the IPQ6018 settings for IPQ5424 as mentioned in the Hardware Design Document which helps to meet all the complaince requirement test cases.
--- drivers/phy/qualcomm/phy-qcom-qusb2.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/phy/qualcomm/phy-qcom-qusb2.c +3 -0
@@ -929,6 +929,9 @@ static const struct phy_ops qusb2_phy_gen_ops = {static const struct of_device_id qusb2_phy_of_match_table[] = { { + .compatible ="qcom,ipq5424-qusb2-phy" , + .data = &ipq6018_phy_cfg, + }, { .compatible ="qcom,ipq6018-qusb2-phy" , .data = &ipq6018_phy_cfg, }, {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 505/780 soundwire: only compute port params in specific stream states
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bard Liao <[email protected]>
[ Upstream commit 62ada17a6217a50fbd1b23f10899890f56effc97 ]
Currently, sdw_compute_master_ports() is blindly called for every single Manager runtime. However, we should not take into account the stream's bandwidth if the stream is just allocated or already deprepared.
--- drivers/soundwire/generic_bandwidth_allocation.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/soundwire/generic_bandwidth_allocation.c +7 -0
@@ -204,6 +204,13 @@ static void _sdw_compute_port_params(struct sdw_bus *bus, port_bo =1 ;list_for_each_entry (m_rt, &bus->m_rt_list, bus_node) { +/* +* Only runtimes with CONFIGURED, PREPARED, ENABLED, and DISABLED +* states should be included in the bandwidth calculation. +*/ +if (m_rt->stream->state >SDW_STREAM_DISABLED || + m_rt->stream->state <SDW_STREAM_CONFIGURED ) +continue ;sdw_compute_master_ports (m_rt, ¶ms[i], &port_bo, hstop); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 506/780 dmaengine: ti: Add NULL check in udma_probe()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Henry Martin <[email protected]>
[ Upstream commit fd447415e74bccd7362f760d4ea727f8e1ebfe91 ]
devm_kasprintf() returns NULL when memory allocation fails. Currently, udma_probe() does not check for this case, which results in a NULL pointer dereference.
Add NULL check after devm_kasprintf() to prevent this issue.
--- drivers/dma/ti/k3-udma.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/dma/ti/k3-udma.c +2 -1
@@ -5624,7 +5624,8 @@ static int udma_probe(struct platform_device *pdev) uc->config.dir =DMA_MEM_TO_MEM ; uc->name =devm_kasprintf (dev,GFP_KERNEL ,"%s chan%d" ,dev_name (dev), i); - +if (!uc->name) +return -ENOMEM ;vchan_init (&uc->vc, &ud->ddev);/* Use custom vchan completion handling */ tasklet_setup (&uc->vc.task, udma_vchan_complete);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 507/780 PCI/ACPI: Fix allocated memory release on error in pci_acpi_scan_root()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhe Qiao <[email protected]>
[ Upstream commit 631b2af2f35737750af284be22e63da56bf20139 ]
In the pci_acpi_scan_root() function, when creating a PCI bus fails, we need to free up the previously allocated memory, which can avoid invalid memory usage and save resources.
--- drivers/pci/pci-acpi.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-)
drivers/pci/pci-acpi.c +13 -10
@@ -1676,24 +1676,19 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)return NULL ; root_ops =kzalloc (sizeof (*root_ops),GFP_KERNEL ); -if (!root_ops) { -kfree (ri); -return NULL ; - } +if (!root_ops) + goto free_ri; ri->cfg =pci_acpi_setup_ecam_mapping (root); -if (!ri->cfg) { -kfree (ri); -kfree (root_ops); -return NULL ; - } +if (!ri->cfg) + goto free_root_ops; root_ops->release_info = pci_acpi_generic_release_info; root_ops->prepare_resources = pci_acpi_root_prepare_resources; root_ops->pci_ops = (struct pci_ops *)&ri->cfg->ops->pci_ops; bus =acpi_pci_root_create (root, root_ops, &ri->common, ri->cfg);if (!bus) -return NULL ; + goto free_cfg;/* If we must preserve the resource configuration, claim now */ host =pci_find_host_bridge (bus);
@@ -1710,6 +1705,14 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)pcie_bus_configure_settings (child);return bus; + +free_cfg: +pci_ecam_free (ri->cfg); +free_root_ops: +kfree (root_ops); +free_ri: +kfree (ri); +return NULL ; }void pcibios_add_bus (struct pci_bus *bus)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 508/780 PCI/DPC: Initialize aer_err_info before using it
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bjorn Helgaas <[email protected]>
[ Upstream commit a424b598e6a6c1e69a2bb801d6fd16e805ab2c38 ]
Previously the struct aer_err_info "info" was allocated on the stack without being initialized, so it contained junk except for the fields we explicitly set later.
Initialize "info" at declaration so it starts as all zeros.
--- drivers/pci/pcie/dpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/pcie/dpc.c +1 -1
@@ -258,7 +258,7 @@ static int dpc_get_aer_uncorrect_severity(struct pci_dev *dev,void dpc_process_error (struct pci_dev *pdev) {u16 cap = pdev->dpc_cap, status, source, reason, ext_reason; -struct aer_err_info info; +struct aer_err_info info = {};pci_read_config_word (pdev, cap +PCI_EXP_DPC_STATUS , &status);pci_read_config_word (pdev, cap +PCI_EXP_DPC_SOURCE_ID , &source);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 509/780 PCI/DPC: Log Error Source ID only when valid
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bjorn Helgaas <[email protected]>
[ Upstream commit a0b62cc310239c7f1323fb20bd3789f21bdd8615 ]
DPC Error Source ID is only valid when the DPC Trigger Reason indicates that DPC was triggered due to reception of an ERR_NONFATAL or ERR_FATAL Message (PCIe r6.0, sec 7.9.14.5).
When DPC was triggered by ERR_NONFATAL (PCI_EXP_DPC_STATUS_TRIGGER_RSN_NFE) or ERR_FATAL (PCI_EXP_DPC_STATUS_TRIGGER_RSN_FE) from a downstream device, log the Error Source ID (decoded into domain/bus/device/function). Don't print the source otherwise, since it's not valid.
For DPC trigger due to reception of ERR_NONFATAL or ERR_FATAL, the dmesg logging changes:
- pci 0000:00:01.0: DPC: containment event, status:0x000d source:0x0200
- pci 0000:00:01.0: DPC: ERR_FATAL detected
+ pci 0000:00:01.0: DPC: containment event, status:0x000d, ERR_FATAL received from 0000:02:00.0
and when DPC triggered for other reasons, where DPC Error Source ID is undefined, e.g., unmasked uncorrectable error:
- pci 0000:00:01.0: DPC: containment event, status:0x0009 source:0x0200
- pci 0000:00:01.0: DPC: unmasked uncorrectable error detected
+ pci 0000:00:01.0: DPC: containment event, status:0x0009: unmasked uncorrectable error detected
Previously the "containment event" message was at KERN_INFO and the "%s detected" message was at KERN_WARNING. Now the single message is at KERN_WARNING.
--- drivers/pci/pcie/dpc.c | 66 +++++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 29 deletions(-)
drivers/pci/pcie/dpc.c +37 -29
@@ -261,37 +261,45 @@ void dpc_process_error(struct pci_dev *pdev)struct aer_err_info info = {};pci_read_config_word (pdev, cap +PCI_EXP_DPC_STATUS , &status); -pci_read_config_word (pdev, cap +PCI_EXP_DPC_SOURCE_ID , &source); - -pci_info (pdev,"containment event, status:%#06x source:%#06x\n" , - status, source); reason = status &PCI_EXP_DPC_STATUS_TRIGGER_RSN ; - ext_reason = status &PCI_EXP_DPC_STATUS_TRIGGER_RSN_EXT ; -pci_warn (pdev,"%s detected\n" , - (reason ==PCI_EXP_DPC_STATUS_TRIGGER_RSN_UNCOR ) ? -"unmasked uncorrectable error" : - (reason ==PCI_EXP_DPC_STATUS_TRIGGER_RSN_NFE ) ? -"ERR_NONFATAL" : - (reason ==PCI_EXP_DPC_STATUS_TRIGGER_RSN_FE ) ? -"ERR_FATAL" : - (ext_reason ==PCI_EXP_DPC_STATUS_TRIGGER_RSN_RP_PIO ) ? -"RP PIO error" : - (ext_reason ==PCI_EXP_DPC_STATUS_TRIGGER_RSN_SW_TRIGGER ) ? -"software trigger" : -"reserved error" ); - -/* show RP PIO error detail information */ -if (pdev->dpc_rp_extensions && - reason ==PCI_EXP_DPC_STATUS_TRIGGER_RSN_IN_EXT && - ext_reason ==PCI_EXP_DPC_STATUS_TRIGGER_RSN_RP_PIO ) -dpc_process_rp_pio_error (pdev); -else if (reason ==PCI_EXP_DPC_STATUS_TRIGGER_RSN_UNCOR && -dpc_get_aer_uncorrect_severity (pdev, &info) && -aer_get_device_error_info (pdev, &info)) { -aer_print_error (pdev, &info); -pci_aer_clear_nonfatal_status (pdev); -pci_aer_clear_fatal_status (pdev); + +switch (reason) { +case PCI_EXP_DPC_STATUS_TRIGGER_RSN_UNCOR : +pci_warn (pdev,"containment event, status:%#06x: unmasked uncorrectable error detected\n" , + status); +if (dpc_get_aer_uncorrect_severity (pdev, &info) && +aer_get_device_error_info (pdev, &info)) { +aer_print_error (pdev, &info); +pci_aer_clear_nonfatal_status (pdev); +pci_aer_clear_fatal_status (pdev); + } +break ; +case PCI_EXP_DPC_STATUS_TRIGGER_RSN_NFE : +case PCI_EXP_DPC_STATUS_TRIGGER_RSN_FE : +pci_read_config_word (pdev, cap +PCI_EXP_DPC_SOURCE_ID , + &source); +pci_warn (pdev,"containment event, status:%#06x, %s received from %04x:%02x:%02x.%d\n" , + status, + (reason ==PCI_EXP_DPC_STATUS_TRIGGER_RSN_FE ) ? +"ERR_FATAL" :"ERR_NONFATAL" , +pci_domain_nr (pdev->bus),PCI_BUS_NUM (source), +PCI_SLOT (source),PCI_FUNC (source)); +break ; +case PCI_EXP_DPC_STATUS_TRIGGER_RSN_IN_EXT : + ext_reason = status &PCI_EXP_DPC_STATUS_TRIGGER_RSN_EXT ; +pci_warn (pdev,"containment event, status:%#06x: %s detected\n" , + status, + (ext_reason ==PCI_EXP_DPC_STATUS_TRIGGER_RSN_RP_PIO ) ? +"RP PIO error" : + (ext_reason ==PCI_EXP_DPC_STATUS_TRIGGER_RSN_SW_TRIGGER ) ? +"software trigger" : +"reserved error" ); +/* show RP PIO error detail information */ +if (ext_reason ==PCI_EXP_DPC_STATUS_TRIGGER_RSN_RP_PIO && + pdev->dpc_rp_extensions) +dpc_process_rp_pio_error (pdev); +break ; } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 510/780 PCI/pwrctrl: Cancel outstanding rescan work when unregistering
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Brian Norris <[email protected]>
[ Upstream commit 8b926f237743f020518162c62b93cb7107a2b5eb ]
It's possible to trigger use-after-free here by:
(a) forcing rescan_work_func() to take a long time and
(b) utilizing a pwrctrl driver that may be unloaded for some reason
Cancel outstanding work to ensure it is finished before we allow our data structures to be cleaned up.
--- drivers/pci/pwrctrl/core.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/pci/pwrctrl/core.c +2 -0
@@ -101,6 +101,8 @@ EXPORT_SYMBOL_GPL(pci_pwrctrl_device_set_ready);*/ void pci_pwrctrl_device_unset_ready (struct pci_pwrctrl *pwrctrl) { +cancel_work_sync (&pwrctrl->work); +/* * We don't have to delete the link here. Typically, this function * is only called when the power control device is being detached. If
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 511/780 rtc: loongson: Add missing alarm notifications for ACPI RTC events
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Liu Dalin <[email protected]>
[ Upstream commit 5af9f1fa576874b24627d4c05e3a84672204c200 ]
When an application sets and enables an alarm on Loongson RTC devices, the alarm notification fails to propagate to userspace because the ACPI event handler omits calling rtc_update_irq().
As a result, processes waiting via select() or poll() on RTC device files fail to receive alarm notifications.
The ACPI interrupt is also triggered multiple times. In loongson_rtc_handler, we need to clear TOY_MATCH0_REG to resolve this issue.
--- drivers/rtc/rtc-loongson.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/rtc/rtc-loongson.c +8 -0
@@ -129,6 +129,14 @@ static u32 loongson_rtc_handler(void *id) {struct loongson_rtc_priv *priv = (struct loongson_rtc_priv *)id; +rtc_update_irq (priv->rtcdev,1 ,RTC_AF |RTC_IRQF ); + +/* +* The TOY_MATCH0_REG should be cleared 0 here, +* otherwise the interrupt cannot be cleared. +*/ +regmap_write (priv->regmap,TOY_MATCH0_REG ,0 ); +spin_lock (&priv->lock);/* Disable RTC alarm wakeup and interrupt */ writel(readl(priv->pm_base + PM1_EN_REG) & ~RTC_EN,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 512/780 rust: pci: fix docs related to missing Markdown code spans
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miguel Ojeda <[email protected]>
[ Upstream commit 1dbaf8b1bafb8557904eb54b98bb323a3061dd2c ]
In particular:
- Add missing Markdown code spans.
- Improve title for DeviceId, adding a link to the struct in the C side, rather than referring to bindings::.
- Convert TODO from documentation to a normal comment, and put code in block.
This was found using the Clippy doc_markdown lint, which we may want to enable.
--- rust/kernel/pci.rs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
rust/kernel/pci.rs +9 -6
@@ -118,7 +118,9 @@ macro_rules! module_pci_driver { }; } -/// Abstraction for bindings::pci_device_id. +/// Abstraction for the PCI device ID structure ([`struct pci_device_id`]). +/// +/// [`struct pci_device_id`]: https://docs.kernel.org/PCI/pci.html#c.pci_device_id #[repr(transparent)] #[derive( Clone , Copy )] pub struct DeviceId (bindings::pci_device_id );
@@ -173,7 +175,7 @@ unsafe impl RawDeviceId for DeviceId { } } -/// IdTable type for PCI +/// `IdTable` type for PCI. pub type IdTable <T > = &'staticdyn kernel::device_id::IdTable <DeviceId ,T >;/// Create a PCI `IdTable` with its alias for modpost.
@@ -224,10 +226,11 @@ macro_rules! pci_device_table {/// `Adapter` documentation for an example. pub trait Driver :Send {/// The type holding information about each device id supported by the driver. -/// -/// TODO: Use associated_type_defaults once stabilized: -/// -/// type IdInfo: 'static = (); +// TODO: Use `associated_type_defaults` once stabilized: +// +// ``` +// type IdInfo: 'static = (); +// ``` type IdInfo : 'static;/// The table of device ids supported by the driver.
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 513/780 PCI: endpoint: Retain fixed-size BAR size as well as aligned size
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jerome Brunet <[email protected]>
[ Upstream commit 793908d60b8745c386b9f4e29eb702f74ceb0886 ]
When allocating space for an endpoint function on a BAR with a fixed size, the size saved in 'struct pci_epf_bar.size' should be the fixed size as expected by pci_epc_set_bar().
However, if pci_epf_alloc_space() increased the allocation size to accommodate iATU alignment requirements, it previously saved the larger aligned size in .size, which broke pci_epc_set_bar().
To solve this, keep the fixed BAR size in .size and save the aligned size in a new .aligned_size for use when deallocating it.
--- drivers/pci/endpoint/pci-epf-core.c | 22 +++++++++++++++------- include/linux/pci-epf.h | 3 +++ 2 files changed, 18 insertions(+), 7 deletions(-)
drivers/pci/endpoint/pci-epf-core.c +15 -7
@@ -236,12 +236,13 @@ void pci_epf_free_space(struct pci_epf *epf, void *addr, enum pci_barno bar, } dev = epc->dev.parent; -dma_free_coherent (dev, epf_bar[bar].size, addr, +dma_free_coherent (dev, epf_bar[bar].aligned_size, addr, epf_bar[bar].phys_addr); epf_bar[bar].phys_addr =0 ; epf_bar[bar].addr =NULL ; epf_bar[bar].size =0 ; + epf_bar[bar].aligned_size =0 ; epf_bar[bar].barno =0 ; epf_bar[bar].flags =0 ; }
@@ -264,7 +265,7 @@ void *pci_epf_alloc_space(struct pci_epf *epf, size_t size, enum pci_barno bar, enum pci_epc_interface_type type) {u64 bar_fixed_size = epc_features->bar[bar].fixed_size; -size_t align = epc_features->align; +size_t aligned_size, align = epc_features->align;struct pci_epf_bar *epf_bar;dma_addr_t phys_addr;struct pci_epc *epc;
@@ -285,12 +286,18 @@ void *pci_epf_alloc_space(struct pci_epf *epf, size_t size, enum pci_barno bar,return NULL ; } size = bar_fixed_size; + }else { +/* BAR size must be power of two */ + size =roundup_pow_of_two (size); } -if (align) - size =ALIGN (size, align); -else - size =roundup_pow_of_two (size); +/* +* Allocate enough memory to accommodate the iATU alignment +* requirement. In most cases, this will be the same as .size but +* it might be different if, for example, the fixed size of a BAR +* is smaller than align. +*/ + aligned_size = align ?ALIGN (size, align) : size;if (type ==PRIMARY_INTERFACE ) { epc = epf->epc;
@@ -301,7 +308,7 @@ void *pci_epf_alloc_space(struct pci_epf *epf, size_t size, enum pci_barno bar, } dev = epc->dev.parent; - space =dma_alloc_coherent (dev, size, &phys_addr,GFP_KERNEL ); + space =dma_alloc_coherent (dev, aligned_size, &phys_addr,GFP_KERNEL );if (!space) {dev_err (dev,"failed to allocate mem space\n" );return NULL ;
@@ -310,6 +317,7 @@ void *pci_epf_alloc_space(struct pci_epf *epf, size_t size, enum pci_barno bar, epf_bar[bar].phys_addr = phys_addr; epf_bar[bar].addr = space; epf_bar[bar].size = size; + epf_bar[bar].aligned_size = aligned_size; epf_bar[bar].barno = bar;if (upper_32_bits (size) || epc_features->bar[bar].only_64bit) epf_bar[bar].flags |=PCI_BASE_ADDRESS_MEM_TYPE_64 ;
include/linux/pci-epf.h +3 -0
@@ -114,6 +114,8 @@ struct pci_epf_driver {* @phys_addr: physical address that should be mapped to the BAR * @addr: virtual address corresponding to the @phys_addr * @size: the size of the address space present in BAR +* @aligned_size: the size actually allocated to accommodate the iATU alignment +* requirement * @barno: BAR number * @flags: flags that are set for the BAR */
@@ -121,6 +123,7 @@ struct pci_epf_bar {dma_addr_t phys_addr;void *addr;size_t size; +size_t aligned_size;enum pci_barno barno;int flags; };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 514/780 sched_ext: idle: Skip cross-node search with !CONFIG_NUMA
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrea Righi <[email protected]>
[ Upstream commit 9960be72a54cf0e4d47abdd4cacd1278835a3bb4 ]
In the idle CPU selection logic, attempting cross-node searches adds unnecessary complexity when CONFIG_NUMA is disabled.
Since there's no meaningful concept of nodes in this case, simplify the logic by restricting the idle CPU search to the current node only.
--- kernel/sched/ext_idle.c | 8 ++++++++ 1 file changed, 8 insertions(+)
kernel/sched/ext_idle.c +8 -0
@@ -131,6 +131,7 @@ static s32 pick_idle_cpu_in_node(const struct cpumask *cpus_allowed, int node, u goto retry; } +#ifdef CONFIG_NUMA /* * Tracks nodes that have not yet been visited when searching for an idle * CPU across all available nodes.
@@ -179,6 +180,13 @@ static s32 pick_idle_cpu_from_online_nodes(const struct cpumask *cpus_allowed, i return cpu; } +#else +static inline s32 +pick_idle_cpu_from_online_nodes (const struct cpumask *cpus_allowed,int node,u64 flags) +{ +return -EBUSY ; +} +#endif /* * Find an idle CPU in the system, starting from @node.
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 515/780 usb: renesas_usbhs: Reorder clock handling and power management in probe
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lad Prabhakar <[email protected]>
[ Upstream commit ffb34a60ce86656ba12d46e91f1ccc71dd221251 ]
Reorder the initialization sequence in usbhs_probe() to enable runtime PM before accessing registers, preventing potential crashes due to uninitialized clocks.
Currently, in the probe path, registers are accessed before enabling the clocks, leading to a synchronous external abort on the RZ/V2H SoC. The problematic call flow is as follows:
usbhs_probe()
usbhs_sys_clock_ctrl()
usbhs_bset()
usbhs_write()
iowrite16() <-- Register access before enabling clocks
Since iowrite16() is performed without ensuring the required clocks are enabled, this can lead to access errors. To fix this, enable PM runtime early in the probe function and ensure clocks are acquired before register access, preventing crashes like the following on RZ/V2H:
[13.272640] Internal error: synchronous external abort: 0000000096000010 [#1] PREEMPT SMP [13.280814] Modules linked in: cec renesas_usbhs(+) drm_kms_helper fuse drm backlight ipv6 [13.289088] CPU: 1 UID: 0 PID: 195 Comm: (udev-worker) Not tainted 6.14.0-rc7+ #98 [13.296640] Hardware name: Renesas RZ/V2H EVK Board based on r9a09g057h44 (DT) [13.303834] pstate: 60400005 (nZCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) [13.310770] pc : usbhs_bset+0x14/0x4c [renesas_usbhs] [13.315831] lr : usbhs_probe+0x2e4/0x5ac [renesas_usbhs] [13.321138] sp : ffff8000827e3850 [13.324438] x29: ffff8000827e3860 x28: 0000000000000000 x27: ffff8000827e3ca0 [13.331554] x26: ffff8000827e3ba0 x25: ffff800081729668 x24: 0000000000000025 [13.338670] x23: ffff0000c0f08000 x22: 0000000000000000 x21: ffff0000c0f08010 [13.345783] x20: 0000000000000000 x19: ffff0000c3b52080 x18: 00000000ffffffff [13.352895] x17: 0000000000000000 x16: 0000000000000000 x15: ffff8000827e36ce [13.360009] x14: 00000000000003d7 x13: 00000000000003d7 x12: 0000000000000000 [13.367122] x11: 0000000000000000 x10: 0000000000000aa0 x9 : ffff8000827e3750 [13.374235] x8 : ffff0000c1850b00 x7 : 0000000003826060 x6 : 000000000000001c [13.381347] x5 : 000000030d5fcc00 x4 : ffff8000825c0000 x3 : 0000000000000000 [13.388459] x2 : 0000000000000400 x1 : 0000000000000000 x0 : ffff0000c3b52080 [13.395574] Call trace: [13.398013] usbhs_bset+0x14/0x4c [renesas_usbhs] (P) [13.403076] platform_probe+0x68/0xdc [13.406738] really_probe+0xbc/0x2c0 [13.410306] __driver_probe_device+0x78/0x120 [13.414653] driver_probe_device+0x3c/0x154 [13.418825] __driver_attach+0x90/0x1a0 [13.422647] bus_for_each_dev+0x7c/0xe0 [13.426470] driver_attach+0x24/0x30 [13.430032] bus_add_driver+0xe4/0x208 [13.433766] driver_register+0x68/0x130 [13.437587] __platform_driver_register+0x24/0x30 [13.442273] renesas_usbhs_driver_init+0x20/0x1000 [renesas_usbhs] [13.448450] do_one_initcall+0x60/0x1d4 [13.452276] do_init_module+0x54/0x1f8 [13.456014] load_module+0x1754/0x1c98 [13.459750] init_module_from_file+0x88/0xcc [13.464004] __arm64_sys_finit_module+0x1c4/0x328 [13.468689] invoke_syscall+0x48/0x104 [13.472426] el0_svc_common.constprop.0+0xc0/0xe0 [13.477113] do_el0_svc+0x1c/0x28 [13.480415] el0_svc+0x30/0xcc [13.483460] el0t_64_sync_handler+0x10c/0x138 [13.487800] el0t_64_sync+0x198/0x19c [13.491453] Code: 2a0103e1 12003c42 12003c63 8b010084 (79400084) [13.497522] ---[ end trace 0000000000000000 ]---
--- drivers/usb/renesas_usbhs/common.c | 50 +++++++++++++++++++++++------- 1 file changed, 38 insertions(+), 12 deletions(-)
drivers/usb/renesas_usbhs/common.c +38 -12
@@ -685,10 +685,29 @@ static int usbhs_probe(struct platform_device *pdev)INIT_DELAYED_WORK (&priv->notify_hotplug_work, usbhsc_notify_hotplug);spin_lock_init (usbhs_priv_to_lock (priv)); +/* +* Acquire clocks and enable power management (PM) early in the +* probe process, as the driver accesses registers during +* initialization. Ensure the device is active before proceeding. +*/ +pm_runtime_enable (dev); + + ret =usbhsc_clk_get (dev, priv); +if (ret) + goto probe_pm_disable; + + ret =pm_runtime_resume_and_get (dev); +if (ret) + goto probe_clk_put; + + ret =usbhsc_clk_prepare_enable (priv); +if (ret) + goto probe_pm_put; +/* call pipe and module init */ ret =usbhs_pipe_probe (priv);if (ret <0 ) -return ret; + goto probe_clk_dis_unprepare; ret =usbhs_fifo_probe (priv);if (ret <0 )
@@ -705,10 +724,6 @@ static int usbhs_probe(struct platform_device *pdev)if (ret) goto probe_fail_rst; - ret =usbhsc_clk_get (dev, priv); -if (ret) - goto probe_fail_clks; -/* * deviece reset here because * USB device might be used in boot loader.
@@ -721,7 +736,7 @@ static int usbhs_probe(struct platform_device *pdev)if (ret) {dev_warn (dev,"USB function not selected (GPIO)\n" ); ret = -ENOTSUPP ; - goto probe_end_mod_exit; + goto probe_assert_rest; } }
@@ -735,14 +750,19 @@ static int usbhs_probe(struct platform_device *pdev) ret =usbhs_platform_call (priv, hardware_init, pdev);if (ret <0 ) {dev_err (dev,"platform init failed.\n" ); - goto probe_end_mod_exit; + goto probe_assert_rest; }/* reset phy for connection */ usbhs_platform_call (priv, phy_reset, pdev); -/* power control */ -pm_runtime_enable (dev); +/* +* Disable the clocks that were enabled earlier in the probe path, +* and let the driver handle the clocks beyond this point. +*/ +usbhsc_clk_disable_unprepare (priv); +pm_runtime_put (dev); +if (!usbhs_get_dparam (priv, runtime_pwctrl)) {usbhsc_power_ctrl (priv,1 );usbhs_mod_autonomy_mode (priv);
@@ -759,9 +779,7 @@ static int usbhs_probe(struct platform_device *pdev)return ret; -probe_end_mod_exit: -usbhsc_clk_put (priv); -probe_fail_clks: +probe_assert_rest:reset_control_assert (priv->rsts); probe_fail_rst:usbhs_mod_remove (priv);
@@ -769,6 +787,14 @@ static int usbhs_probe(struct platform_device *pdev)usbhs_fifo_remove (priv); probe_end_pipe_exit:usbhs_pipe_remove (priv); +probe_clk_dis_unprepare: +usbhsc_clk_disable_unprepare (priv); +probe_pm_put: +pm_runtime_put (dev); +probe_clk_put: +usbhsc_clk_put (priv); +probe_pm_disable: +pm_runtime_disable (dev);dev_info (dev,"probe failed (%d)\n" , ret);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 516/780 serial: Fix potential null-ptr-deref in mlb_usio_probe()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Henry Martin <[email protected]>
[ Upstream commit 86bcae88c9209e334b2f8c252f4cc66beb261886 ]
devm_ioremap() can return NULL on error. Currently, mlb_usio_probe() does not check for this case, which could result in a NULL pointer dereference.
Add NULL check after devm_ioremap() to prevent this issue.
--- drivers/tty/serial/milbeaut_usio.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/tty/serial/milbeaut_usio.c +4 -1
@@ -523,7 +523,10 @@ static int mlb_usio_probe(struct platform_device *pdev) } port->membase =devm_ioremap (&pdev->dev, res->start,resource_size (res)); - +if (!port->membase) { + ret = -ENOMEM ; + goto failed; + } ret =platform_get_irq_byname (pdev,"rx" ); mlb_usio_irq[index][RX ] = ret;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 517/780 thunderbolt: Fix a logic error in wake on connect
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mario Limonciello <[email protected]>
[ Upstream commit 1a760d10ded372d113a0410c42be246315bbc2ff ]
commit a5cfc9d65879c ("thunderbolt: Add wake on connect/disconnect on USB4 ports") introduced a sysfs file to control wake up policy for a given USB4 port that defaulted to disabled.
However when testing commit 4bfeea6ec1c02 ("thunderbolt: Use wake on connect and disconnect over suspend") I found that it was working even without making changes to the power/wakeup file (which defaults to disabled). This is because of a logic error doing a bitwise or of the wake-on-connect flag with device_may_wakeup() which should have been a logical AND.
Adjust the logic so that policy is only applied when wakeup is actually enabled.
--- drivers/thunderbolt/usb4.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/thunderbolt/usb4.c +2 -2
@@ -440,10 +440,10 @@ int usb4_switch_set_wake(struct tb_switch *sw, unsigned int flags)bool configured = val &PORT_CS_19_PC ; usb4 = port->usb4; -if (((flags &TB_WAKE_ON_CONNECT ) | +if (((flags &TB_WAKE_ON_CONNECT ) &&device_may_wakeup (&usb4->dev)) && !configured) val |=PORT_CS_19_WOC ; -if (((flags &TB_WAKE_ON_DISCONNECT ) | +if (((flags &TB_WAKE_ON_DISCONNECT ) &&device_may_wakeup (&usb4->dev)) && configured) val |=PORT_CS_19_WOD ;if ((flags &TB_WAKE_ON_USB4 ) && configured)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 518/780 iio: filter: admv8818: fix band 4, state 15
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sam Winchenbach <[email protected]>
[ Upstream commit ef0ce24f590ac075d5eda11f2d6434b303333ed6 ]
Corrects the upper range of LPF Band 4 from 18.5 GHz to 18.85 GHz per the ADMV8818 datasheet
--- drivers/iio/filter/admv8818.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/filter/admv8818.c +1 -1
@@ -103,7 +103,7 @@ static const unsigned long long freq_range_lpf[4][2] = { {2050000000ULL, 3850000000ULL}, {3350000000ULL, 7250000000ULL}, {7000000000, 13000000000}, - {12550000000, 18500000000} + {12550000000, 18850000000} };static const struct regmap_config admv8818_regmap_config = {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 519/780 iio: filter: admv8818: fix integer overflow
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sam Winchenbach <[email protected]>
[ Upstream commit fb6009a28d77edec4eb548b5875dae8c79b88467 ]
HZ_PER_MHZ is only unsigned long. This math overflows, leading to incorrect results.
--- drivers/iio/filter/admv8818.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/filter/admv8818.c +1 -1
@@ -154,7 +154,7 @@ static int __admv8818_hpf_select(struct admv8818_state *st, u64 freq) }/* Close HPF frequency gap between 12 and 12.5 GHz */ -if (freq >=12000 *HZ_PER_MHZ && freq <=12500 *HZ_PER_MHZ ) { +if (freq >=12000ULL *HZ_PER_MHZ && freq <12500ULL *HZ_PER_MHZ ) { hpf_band =3 ; hpf_step =15 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 520/780 iio: filter: admv8818: fix range calculation
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sam Winchenbach <[email protected]>
[ Upstream commit d542db7095d322bfcdc8e306db6f8c48358c9619 ]
Search for the minimum error while ensuring that the LPF corner frequency is greater than the target, and the HPF corner frequency is lower than the target
This fixes issues where the range calculations were suboptimal.
Add two new DTS properties to set the margin between the input frequency and the calculated corner frequency
Below is a generated table of the differences between the old algorithm and the new. This is a sweep from 0 to 20 GHz in 10 MHz steps. === HPF ===
freq = 1750 MHz, 3db: bypass => 1750 MHz
freq = 3400 MHz, 3db: 3310 => 3400 MHz
freq = 3410 MHz, 3db: 3310 => 3400 MHz
freq = 3420 MHz, 3db: 3310 => 3400 MHz
freq = 3660 MHz, 3db: 3550 => 3656 MHz
freq = 6600 MHz, 3db: 6479 => 6600 MHz
freq = 6610 MHz, 3db: 6479 => 6600 MHz
freq = 6620 MHz, 3db: 6479 => 6600 MHz
freq = 6630 MHz, 3db: 6479 => 6600 MHz
freq = 6640 MHz, 3db: 6479 => 6600 MHz
freq = 6650 MHz, 3db: 6479 => 6600 MHz
freq = 6660 MHz, 3db: 6479 => 6600 MHz
freq = 6670 MHz, 3db: 6479 => 6600 MHz
freq = 6680 MHz, 3db: 6479 => 6600 MHz
freq = 6690 MHz, 3db: 6479 => 6600 MHz
freq = 6700 MHz, 3db: 6479 => 6600 MHz
freq = 6710 MHz, 3db: 6479 => 6600 MHz
freq = 6720 MHz, 3db: 6479 => 6600 MHz
freq = 6730 MHz, 3db: 6479 => 6600 MHz
freq = 6960 MHz, 3db: 6736 => 6960 MHz
freq = 6970 MHz, 3db: 6736 => 6960 MHz
freq = 6980 MHz, 3db: 6736 => 6960 MHz
freq = 6990 MHz, 3db: 6736 => 6960 MHz
freq = 7320 MHz, 3db: 7249 => 7320 MHz
freq = 7330 MHz, 3db: 7249 => 7320 MHz
freq = 7340 MHz, 3db: 7249 => 7320 MHz
freq = 7350 MHz, 3db: 7249 => 7320 MHz
freq = 7360 MHz, 3db: 7249 => 7320 MHz
freq = 7370 MHz, 3db: 7249 => 7320 MHz
freq = 7380 MHz, 3db: 7249 => 7320 MHz
freq = 7390 MHz, 3db: 7249 => 7320 MHz
freq = 7400 MHz, 3db: 7249 => 7320 MHz
freq = 7410 MHz, 3db: 7249 => 7320 MHz
freq = 7420 MHz, 3db: 7249 => 7320 MHz
freq = 7430 MHz, 3db: 7249 => 7320 MHz
freq = 7440 MHz, 3db: 7249 => 7320 MHz
freq = 7450 MHz, 3db: 7249 => 7320 MHz
freq = 7460 MHz, 3db: 7249 => 7320 MHz
freq = 7470 MHz, 3db: 7249 => 7320 MHz
freq = 7480 MHz, 3db: 7249 => 7320 MHz
freq = 7490 MHz, 3db: 7249 => 7320 MHz
freq = 7500 MHz, 3db: 7249 => 7320 MHz
freq = 12500 MHz, 3db: 12000 => 12500 MHz
=== LPF ===
freq = 2050 MHz, 3db: bypass => 2050 MHz freq = 2170 MHz, 3db: 2290 => 2170 MHz freq = 2290 MHz, 3db: 2410 => 2290 MHz freq = 2410 MHz, 3db: 2530 => 2410 MHz freq = 2530 MHz, 3db: 2650 => 2530 MHz freq = 2650 MHz, 3db: 2770 => 2650 MHz freq = 2770 MHz, 3db: 2890 => 2770 MHz freq = 2890 MHz, 3db: 3010 => 2890 MHz freq = 3010 MHz, 3db: 3130 => 3010 MHz freq = 3130 MHz, 3db: 3250 => 3130 MHz freq = 3250 MHz, 3db: 3370 => 3250 MHz freq = 3260 MHz, 3db: 3370 => 3350 MHz freq = 3270 MHz, 3db: 3370 => 3350 MHz freq = 3280 MHz, 3db: 3370 => 3350 MHz freq = 3290 MHz, 3db: 3370 => 3350 MHz freq = 3300 MHz, 3db: 3370 => 3350 MHz freq = 3310 MHz, 3db: 3370 => 3350 MHz freq = 3320 MHz, 3db: 3370 => 3350 MHz freq = 3330 MHz, 3db: 3370 => 3350 MHz freq = 3340 MHz, 3db: 3370 => 3350 MHz freq = 3350 MHz, 3db: 3370 => 3350 MHz freq = 3370 MHz, 3db: 3490 => 3370 MHz freq = 3490 MHz, 3db: 3610 => 3490 MHz freq = 3610 MHz, 3db: 3730 => 3610 MHz freq = 3730 MHz, 3db: 3850 => 3730 MHz freq = 3850 MHz, 3db: 3870 => 3850 MHz freq = 3870 MHz, 3db: 4130 => 3870 MHz freq = 4130 MHz, 3db: 4390 => 4130 MHz freq = 4390 MHz, 3db: 4650 => 4390 MHz freq = 4650 MHz, 3db: 4910 => 4650 MHz freq = 4910 MHz, 3db: 5170 => 4910 MHz freq = 5170 MHz, 3db: 5430 => 5170 MHz freq = 5430 MHz, 3db: 5690 => 5430 MHz freq = 5690 MHz, 3db: 5950 => 5690 MHz freq = 5950 MHz, 3db: 6210 => 5950 MHz freq = 6210 MHz, 3db: 6470 => 6210 MHz freq = 6470 MHz, 3db: 6730 => 6470 MHz freq = 6730 MHz, 3db: 6990 => 6730 MHz freq = 6990 MHz, 3db: 7250 => 6990 MHz freq = 7000 MHz, 3db: 7250 => 7000 MHz freq = 7250 MHz, 3db: 7400 => 7250 MHz freq = 7400 MHz, 3db: 7800 => 7400 MHz freq = 7800 MHz, 3db: 8200 => 7800 MHz freq = 8200 MHz, 3db: 8600 => 8200 MHz freq = 8600 MHz, 3db: 9000 => 8600 MHz freq = 9000 MHz, 3db: 9400 => 9000 MHz freq = 9400 MHz, 3db: 9800 => 9400 MHz freq = 9800 MHz, 3db: 10200 => 9800 MHz freq = 10200 MHz, 3db: 10600 => 10200 MHz freq = 10600 MHz, 3db: 11000 => 10600 MHz freq = 11000 MHz, 3db: 11400 => 11000 MHz freq = 11400 MHz, 3db: 11800 => 11400 MHz freq = 11800 MHz, 3db: 12200 => 11800 MHz freq = 12200 MHz, 3db: 12600 => 12200 MHz freq = 12210 MHz, 3db: 12600 => 12550 MHz freq = 12220 MHz, 3db: 12600 => 12550 MHz freq = 12230 MHz, 3db: 12600 => 12550 MHz freq = 12240 MHz, 3db: 12600 => 12550 MHz freq = 12250 MHz, 3db: 12600 => 12550 MHz freq = 12260 MHz, 3db: 12600 => 12550 MHz freq = 12270 MHz, 3db: 12600 => 12550 MHz freq = 12280 MHz, 3db: 12600 => 12550 MHz freq = 12290 MHz, 3db: 12600 => 12550 MHz freq = 12300 MHz, 3db: 12600 => 12550 MHz freq = 12310 MHz, 3db: 12600 => 12550 MHz freq = 12320 MHz, 3db: 12600 => 12550 MHz freq = 12330 MHz, 3db: 12600 => 12550 MHz freq = 12340 MHz, 3db: 12600 => 12550 MHz freq = 12350 MHz, 3db: 12600 => 12550 MHz freq = 12360 MHz, 3db: 12600 => 12550 MHz freq = 12370 MHz, 3db: 12600 => 12550 MHz freq = 12380 MHz, 3db: 12600 => 12550 MHz freq = 12390 MHz, 3db: 12600 => 12550 MHz freq = 12400 MHz, 3db: 12600 => 12550 MHz freq = 12410 MHz, 3db: 12600 => 12550 MHz freq = 12420 MHz, 3db: 12600 => 12550 MHz freq = 12430 MHz, 3db: 12600 => 12550 MHz freq = 12440 MHz, 3db: 12600 => 12550 MHz freq = 12450 MHz, 3db: 12600 => 12550 MHz freq = 12460 MHz, 3db: 12600 => 12550 MHz freq = 12470 MHz, 3db: 12600 => 12550 MHz freq = 12480 MHz, 3db: 12600 => 12550 MHz freq = 12490 MHz, 3db: 12600 => 12550 MHz freq = 12500 MHz, 3db: 12600 => 12550 MHz freq = 12510 MHz, 3db: 12600 => 12550 MHz freq = 12520 MHz, 3db: 12600 => 12550 MHz freq = 12530 MHz, 3db: 12600 => 12550 MHz freq = 12540 MHz, 3db: 12600 => 12550 MHz freq = 12550 MHz, 3db: 12600 => 12550 MHz freq = 12600 MHz, 3db: 13000 => 12600 MHz freq = 12610 MHz, 3db: 13000 => 12970 MHz freq = 12620 MHz, 3db: 13000 => 12970 MHz freq = 12630 MHz, 3db: 13000 => 12970 MHz freq = 12640 MHz, 3db: 13000 => 12970 MHz freq = 12650 MHz, 3db: 13000 => 12970 MHz freq = 12660 MHz, 3db: 13000 => 12970 MHz freq = 12670 MHz, 3db: 13000 => 12970 MHz freq = 12680 MHz, 3db: 13000 => 12970 MHz freq = 12690 MHz, 3db: 13000 => 12970 MHz freq = 12700 MHz, 3db: 13000 => 12970 MHz freq = 12710 MHz, 3db: 13000 => 12970 MHz freq = 12720 MHz, 3db: 13000 => 12970 MHz freq = 12730 MHz, 3db: 13000 => 12970 MHz freq = 12740 MHz, 3db: 13000 => 12970 MHz freq = 12750 MHz, 3db: 13000 => 12970 MHz freq = 12760 MHz, 3db: 13000 => 12970 MHz freq = 12770 MHz, 3db: 13000 => 12970 MHz freq = 12780 MHz, 3db: 13000 => 12970 MHz freq = 12790 MHz, 3db: 13000 => 12970 MHz freq = 12800 MHz, 3db: 13000 => 12970 MHz freq = 12810 MHz, 3db: 13000 => 12970 MHz freq = 12820 MHz, 3db: 13000 => 12970 MHz freq = 12830 MHz, 3db: 13000 => 12970 MHz freq = 12840 MHz, 3db: 13000 => 12970 MHz freq = 12850 MHz, 3db: 13000 => 12970 MHz freq = 12860 MHz, 3db: 13000 => 12970 MHz freq = 12870 MHz, 3db: 13000 => 12970 MHz freq = 12880 MHz, 3db: 13000 => 12970 MHz freq = 12890 MHz, 3db: 13000 => 12970 MHz freq = 12900 MHz, 3db: 13000 => 12970 MHz freq = 12910 MHz, 3db: 13000 => 12970 MHz freq = 12920 MHz, 3db: 13000 => 12970 MHz freq = 12930 MHz, 3db: 13000 => 12970 MHz freq = 12940 MHz, 3db: 13000 => 12970 MHz freq = 12950 MHz, 3db: 13000 => 12970 MHz freq = 12960 MHz, 3db: 13000 => 12970 MHz freq = 12970 MHz, 3db: 13000 => 12970 MHz freq = 13000 MHz, 3db: 13390 => 13000 MHz freq = 13390 MHz, 3db: 13810 => 13390 MHz freq = 13810 MHz, 3db: 14230 => 13810 MHz freq = 14230 MHz, 3db: 14650 => 14230 MHz freq = 14650 MHz, 3db: 15070 => 14650 MHz freq = 15070 MHz, 3db: 15490 => 15070 MHz freq = 15490 MHz, 3db: 15910 => 15490 MHz freq = 15910 MHz, 3db: 16330 => 15910 MHz freq = 16330 MHz, 3db: 16750 => 16330 MHz freq = 16750 MHz, 3db: 17170 => 16750 MHz freq = 17170 MHz, 3db: 17590 => 17170 MHz freq = 17590 MHz, 3db: 18010 => 17590 MHz freq = 18010 MHz, 3db: 18430 => 18010 MHz freq = 18430 MHz, 3db: 18850 => 18430 MHz freq = 18850 MHz, 3db: bypass => 18850 MHz
--- drivers/iio/filter/admv8818.c | 205 +++++++++++++++++++++++++--------- 1 file changed, 152 insertions(+), 53 deletions(-)
drivers/iio/filter/admv8818.c +152 -53
@@ -14,6 +14,7 @@#include <linux/mod_devicetable.h> #include <linux/mutex.h> #include <linux/notifier.h> +#include <linux/property.h> #include <linux/regmap.h> #include <linux/spi/spi.h> #include <linux/units.h>
@@ -70,6 +71,16 @@#define ADMV8818_HPF_WR0_MSK GENMASK(7, 4)#define ADMV8818_LPF_WR0_MSK GENMASK(3, 0) +#define ADMV8818_BAND_BYPASS 0 +#define ADMV8818_BAND_MIN 1 +#define ADMV8818_BAND_MAX 4 +#define ADMV8818_BAND_CORNER_LOW 0 +#define ADMV8818_BAND_CORNER_HIGH 1 + +#define ADMV8818_STATE_MIN 0 +#define ADMV8818_STATE_MAX 15 +#define ADMV8818_NUM_STATES 16 +enum {ADMV8818_BW_FREQ ,ADMV8818_CENTER_FREQ
@@ -90,16 +101,20 @@ struct admv8818_state {struct mutex lock;unsigned int filter_mode;u64 cf_hz; +u64 lpf_margin_hz; +u64 hpf_margin_hz; }; -static const unsigned long long freq_range_hpf[4 ][2 ] = { +static const unsigned long long freq_range_hpf[5 ][2 ] = { + {0ULL ,0ULL },/* bypass */ {1750000000ULL ,3550000000ULL }, {3400000000ULL ,7250000000ULL }, {6600000000 ,12000000000 }, {12500000000 ,19900000000 } }; -static const unsigned long long freq_range_lpf[4 ][2 ] = { +static const unsigned long long freq_range_lpf[5 ][2 ] = { + {U64_MAX ,U64_MAX },/* bypass */ {2050000000ULL ,3850000000ULL }, {3350000000ULL ,7250000000ULL }, {7000000000 ,13000000000 },
@@ -121,44 +136,59 @@ static const char * const admv8818_modes[] = {static int __admv8818_hpf_select (struct admv8818_state *st,u64 freq) { -unsigned int hpf_step =0 , hpf_band =0 , i, j; -u64 freq_step; -int ret; +int band, state, ret; +unsigned int hpf_state =ADMV8818_STATE_MIN , hpf_band =ADMV8818_BAND_BYPASS ; +u64 freq_error, min_freq_error, freq_corner, freq_step; -if (freq < freq_range_hpf[0 ][0 ]) +if (freq < freq_range_hpf[ADMV8818_BAND_MIN ][ADMV8818_BAND_CORNER_LOW ]) goto hpf_write; -if (freq > freq_range_hpf[3 ][1 ]) { - hpf_step =15 ; - hpf_band =4 ; - +if (freq >= freq_range_hpf[ADMV8818_BAND_MAX ][ADMV8818_BAND_CORNER_HIGH ]) { + hpf_state =ADMV8818_STATE_MAX ; + hpf_band =ADMV8818_BAND_MAX ; goto hpf_write; } -for (i =0 ; i <4 ; i++) { - freq_step =div_u64 ((freq_range_hpf[i][1 ] - - freq_range_hpf[i][0 ]),15 ); +/* Close HPF frequency gap between 12 and 12.5 GHz */ +if (freq >=12000ULL *HZ_PER_MHZ && freq <12500ULL *HZ_PER_MHZ ) { + hpf_state =ADMV8818_STATE_MAX ; + hpf_band =3 ; + goto hpf_write; + } -if (freq > freq_range_hpf[i][0 ] && - (freq < freq_range_hpf[i][1 ] + freq_step)) { - hpf_band = i +1 ; + min_freq_error =U64_MAX ; +for (band =ADMV8818_BAND_MIN ; band <=ADMV8818_BAND_MAX ; band++) { +/* +* This (and therefore all other ranges) have a corner +* frequency higher than the target frequency. +*/ +if (freq_range_hpf[band][ADMV8818_BAND_CORNER_LOW ] > freq) +break ; -for (j =1 ; j <=16 ; j++) { -if (freq < (freq_range_hpf[i][0 ] + (freq_step * j))) { - hpf_step = j -1 ; -break ; - } + freq_step = freq_range_hpf[band][ADMV8818_BAND_CORNER_HIGH ] - + freq_range_hpf[band][ADMV8818_BAND_CORNER_LOW ]; + freq_step =div_u64 (freq_step,ADMV8818_NUM_STATES -1 ); + +for (state =ADMV8818_STATE_MIN ; state <=ADMV8818_STATE_MAX ; state++) { + freq_corner = freq_range_hpf[band][ADMV8818_BAND_CORNER_LOW ] + + freq_step * state; + +/* +* This (and therefore all other states) have a corner +* frequency higher than the target frequency. +*/ +if (freq_corner > freq) +break ; + + freq_error = freq - freq_corner; +if (freq_error < min_freq_error) { + min_freq_error = freq_error; + hpf_state = state; + hpf_band = band; } -break ; } } -/* Close HPF frequency gap between 12 and 12.5 GHz */ -if (freq >=12000ULL *HZ_PER_MHZ && freq <12500ULL *HZ_PER_MHZ ) { - hpf_band =3 ; - hpf_step =15 ; - } - hpf_write: ret = regmap_update_bits(st->regmap, ADMV8818_REG_WR0_SW, ADMV8818_SW_IN_SET_WR0_MSK |
@@ -170,7 +200,7 @@ static int __admv8818_hpf_select(struct admv8818_state *st, u64 freq)return regmap_update_bits (st->regmap,ADMV8818_REG_WR0_FILTER ,ADMV8818_HPF_WR0_MSK , -FIELD_PREP (ADMV8818_HPF_WR0_MSK , hpf_step)); +FIELD_PREP (ADMV8818_HPF_WR0_MSK , hpf_state)); }static int admv8818_hpf_select (struct admv8818_state *st,u64 freq)
@@ -186,31 +216,52 @@ static int admv8818_hpf_select(struct admv8818_state *st, u64 freq)static int __admv8818_lpf_select (struct admv8818_state *st,u64 freq) { -unsigned int lpf_step =0 , lpf_band =0 , i, j; -u64 freq_step; -int ret; +int band, state, ret; +unsigned int lpf_state =ADMV8818_STATE_MIN , lpf_band =ADMV8818_BAND_BYPASS ; +u64 freq_error, min_freq_error, freq_corner, freq_step; -if (freq > freq_range_lpf[3 ][1 ]) +if (freq > freq_range_lpf[ADMV8818_BAND_MAX ][ADMV8818_BAND_CORNER_HIGH ]) goto lpf_write; -if (freq < freq_range_lpf[0 ][0 ]) { - lpf_band =1 ; - +if (freq < freq_range_lpf[ADMV8818_BAND_MIN ][ADMV8818_BAND_CORNER_LOW ]) { + lpf_state =ADMV8818_STATE_MIN ; + lpf_band =ADMV8818_BAND_MIN ; goto lpf_write; } -for (i =0 ; i <4 ; i++) { -if (freq > freq_range_lpf[i][0 ] && freq < freq_range_lpf[i][1 ]) { - lpf_band = i +1 ; - freq_step =div_u64 ((freq_range_lpf[i][1 ] - freq_range_lpf[i][0 ]),15 ); + min_freq_error =U64_MAX ; +for (band =ADMV8818_BAND_MAX ; band >=ADMV8818_BAND_MIN ; --band) { +/* +* At this point the highest corner frequency of +* all remaining ranges is below the target. +* LPF corner should be >= the target. +*/ +if (freq > freq_range_lpf[band][ADMV8818_BAND_CORNER_HIGH ]) +break ; + + freq_step = freq_range_lpf[band][ADMV8818_BAND_CORNER_HIGH ] - + freq_range_lpf[band][ADMV8818_BAND_CORNER_LOW ]; + freq_step =div_u64 (freq_step,ADMV8818_NUM_STATES -1 ); + +for (state =ADMV8818_STATE_MAX ; state >=ADMV8818_STATE_MIN ; --state) { -for (j =0 ; j <=15 ; j++) { -if (freq < (freq_range_lpf[i][0 ] + (freq_step * j))) { - lpf_step = j; -break ; - } + freq_corner = freq_range_lpf[band][ADMV8818_BAND_CORNER_LOW ] + + state * freq_step; + +/* +* At this point all other states in range will +* place the corner frequency below the target +* LPF corner should >= the target. +*/ +if (freq > freq_corner) +break ; + + freq_error = freq_corner - freq; +if (freq_error < min_freq_error) { + min_freq_error = freq_error; + lpf_state = state; + lpf_band = band; } -break ; } }
@@ -225,7 +276,7 @@ static int __admv8818_lpf_select(struct admv8818_state *st, u64 freq)return regmap_update_bits (st->regmap,ADMV8818_REG_WR0_FILTER ,ADMV8818_LPF_WR0_MSK , -FIELD_PREP (ADMV8818_LPF_WR0_MSK , lpf_step)); +FIELD_PREP (ADMV8818_LPF_WR0_MSK , lpf_state)); }static int admv8818_lpf_select (struct admv8818_state *st,u64 freq)
@@ -242,16 +293,28 @@ static int admv8818_lpf_select(struct admv8818_state *st, u64 freq)static int admv8818_rfin_band_select (struct admv8818_state *st) {int ret; +u64 hpf_corner_target, lpf_corner_target; st->cf_hz =clk_get_rate (st->clkin); +/* Check for underflow */ +if (st->cf_hz > st->hpf_margin_hz) + hpf_corner_target = st->cf_hz - st->hpf_margin_hz; +else + hpf_corner_target =0 ; + +/* Check for overflow */ + lpf_corner_target = st->cf_hz + st->lpf_margin_hz; +if (lpf_corner_target < st->cf_hz) + lpf_corner_target =U64_MAX ; +mutex_lock (&st->lock); - ret =__admv8818_hpf_select (st, st->cf_hz); + ret =__admv8818_hpf_select (st, hpf_corner_target);if (ret) goto exit; - ret =__admv8818_lpf_select (st, st->cf_hz); + ret =__admv8818_lpf_select (st, lpf_corner_target); exit:mutex_unlock (&st->lock);return ret;
@@ -278,8 +341,11 @@ static int __admv8818_read_hpf_freq(struct admv8818_state *st, u64 *hpf_freq) hpf_state =FIELD_GET (ADMV8818_HPF_WR0_MSK , data); - *hpf_freq =div_u64 (freq_range_hpf[hpf_band -1 ][1 ] - freq_range_hpf[hpf_band -1 ][0 ],15 ); - *hpf_freq = freq_range_hpf[hpf_band -1 ][0 ] + (*hpf_freq * hpf_state); + *hpf_freq = freq_range_hpf[hpf_band][ADMV8818_BAND_CORNER_HIGH ] - + freq_range_hpf[hpf_band][ADMV8818_BAND_CORNER_LOW ]; + *hpf_freq =div_u64 (*hpf_freq,ADMV8818_NUM_STATES -1 ); + *hpf_freq = freq_range_hpf[hpf_band][ADMV8818_BAND_CORNER_LOW ] + + (*hpf_freq * hpf_state);return ret; }
@@ -316,8 +382,11 @@ static int __admv8818_read_lpf_freq(struct admv8818_state *st, u64 *lpf_freq) lpf_state =FIELD_GET (ADMV8818_LPF_WR0_MSK , data); - *lpf_freq =div_u64 (freq_range_lpf[lpf_band -1 ][1 ] - freq_range_lpf[lpf_band -1 ][0 ],15 ); - *lpf_freq = freq_range_lpf[lpf_band -1 ][0 ] + (*lpf_freq * lpf_state); + *lpf_freq = freq_range_lpf[lpf_band][ADMV8818_BAND_CORNER_HIGH ] - + freq_range_lpf[lpf_band][ADMV8818_BAND_CORNER_LOW ]; + *lpf_freq =div_u64 (*lpf_freq,ADMV8818_NUM_STATES -1 ); + *lpf_freq = freq_range_lpf[lpf_band][ADMV8818_BAND_CORNER_LOW ] + + (*lpf_freq * lpf_state);return ret; }
@@ -641,6 +710,32 @@ static int admv8818_clk_setup(struct admv8818_state *st)return devm_add_action_or_reset (&spi->dev, admv8818_clk_notifier_unreg, st); } +static int admv8818_read_properties (struct admv8818_state *st) +{ +struct spi_device *spi = st->spi; +u32 mhz; +int ret; + + ret =device_property_read_u32 (&spi->dev,"adi,lpf-margin-mhz" , &mhz); +if (ret ==0 ) + st->lpf_margin_hz = (u64 )mhz *HZ_PER_MHZ ; +else if (ret == -EINVAL ) + st->lpf_margin_hz =0 ; +else +return ret; + + + ret =device_property_read_u32 (&spi->dev,"adi,hpf-margin-mhz" , &mhz); +if (ret ==0 ) + st->hpf_margin_hz = (u64 )mhz *HZ_PER_MHZ ; +else if (ret == -EINVAL ) + st->hpf_margin_hz =0 ; +else if (ret <0 ) +return ret; + +return 0 ; +} +static int admv8818_probe (struct spi_device *spi) {struct iio_dev *indio_dev;
@@ -672,6 +767,10 @@ static int admv8818_probe(struct spi_device *spi)mutex_init (&st->lock); + ret =admv8818_read_properties (st); +if (ret) +return ret; + ret =admv8818_init (st);if (ret)return ret;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 521/780 iio: filter: admv8818: Support frequencies >= 2^32
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Brian Pellegrino <[email protected]>
[ Upstream commit 9016776f1301627de78a633bda7c898425a56572 ]
This patch allows writing u64 values to the ADMV8818's high and low-pass filter frequencies. It includes the following changes:
- Rejects negative frequencies in admv8818_write_raw.
- Adds a write_raw_get_fmt function to admv8818's iio_info, returning IIO_VAL_INT_64 for the high and low-pass filter 3dB frequency channels.
--- drivers/iio/filter/admv8818.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
drivers/iio/filter/admv8818.c +17 -0
@@ -402,6 +402,19 @@ static int admv8818_read_lpf_freq(struct admv8818_state *st, u64 *lpf_freq)return ret; } +static int admv8818_write_raw_get_fmt (struct iio_dev *indio_dev, +struct iio_chan_spec const *chan, +long mask) +{ +switch (mask) { +case IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY : +case IIO_CHAN_INFO_HIGH_PASS_FILTER_3DB_FREQUENCY : +return IIO_VAL_INT_64 ; +default : +return -EINVAL ; + } +} +static int admv8818_write_raw (struct iio_dev *indio_dev,struct iio_chan_spec const *chan,int val,int val2,long info)
@@ -410,6 +423,9 @@ static int admv8818_write_raw(struct iio_dev *indio_dev,u64 freq = ((u64 )val2 <<32 | (u32 )val); +if ((s64 )freq <0 ) +return -EINVAL ; +switch (info) {case IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY :return admv8818_lpf_select (st, freq);
@@ -571,6 +587,7 @@ static int admv8818_set_mode(struct iio_dev *indio_dev,static const struct iio_info admv8818_info = { .write_raw = admv8818_write_raw, + .write_raw_get_fmt = admv8818_write_raw_get_fmt, .read_raw = admv8818_read_raw, .debugfs_reg_access = &admv8818_reg_access, };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 522/780 iio: adc: ad7124: Fix 3dB filter frequency reading
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uwe Kleine-König <[email protected]>
[ Upstream commit 8712e4986e7ce42a14c762c4c350f290989986a5 ]
The sinc4 filter has a factor 0.23 between Output Data Rate and f_{3dB} and for sinc3 the factor is 0.272 according to the data sheets for ad7124-4 (Rev. E.) and ad7124-8 (Rev. F).
--- drivers/iio/adc/ad7124.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/adc/ad7124.c +2 -2
@@ -301,9 +301,9 @@ static int ad7124_get_3db_filter_freq(struct ad7124_state *st,switch (st->channels[channel].cfg.filter_type) {case AD7124_SINC3_FILTER : -return DIV_ROUND_CLOSEST (fadc *230 ,1000 ); +return DIV_ROUND_CLOSEST (fadc *272 ,1000 );case AD7124_SINC4_FILTER : -return DIV_ROUND_CLOSEST (fadc *262 ,1000 ); +return DIV_ROUND_CLOSEST (fadc *230 ,1000 );default :return -EINVAL ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 523/780 usb: acpi: Prevent null pointer dereference in usb_acpi_add_usb4_devlink()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chenyuan Yang <[email protected]>
[ Upstream commit 73fb0ec9436ae87bcae067ce35d6cdd72bade86c ]
As demonstrated by the fix for update_port_device_state,
commit 12783c0b9e2c ("usb: core: Prevent null pointer dereference in update_port_device_state"), usb_hub_to_struct_hub() can return NULL in certain scenarios,
such as during hub driver unbind or teardown race conditions,
even if the underlying usb_device structure exists.
Plus, all other places that call usb_hub_to_struct_hub() in the same file do check for NULL return values.
If usb_hub_to_struct_hub() returns NULL, the subsequent access to hub->ports[udev->portnum - 1] will cause a null pointer dereference.
--- drivers/usb/core/usb-acpi.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/core/usb-acpi.c +2 -0
@@ -165,6 +165,8 @@ static int usb_acpi_add_usb4_devlink(struct usb_device *udev)return 0 ; hub =usb_hub_to_struct_hub (udev->parent); +if (!hub) +return 0 ; port_dev = hub->ports[udev->portnum -1 ]; struct fwnode_handle *nhi_fwnode __free(fwnode_handle) =
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 524/780 MIPS: Loongson64: Add missing #interrupt-cells for loongson64c_ls7a
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: WangYuli <[email protected]>
[ Upstream commit 6d223b8ffcd1593d032b71875def2daa71c53111 ]
Similar to commit 98a9e2ac3755 ("MIPS: Loongson64: DTS: Fix msi node for ls7a").
Fix follow warnings:
arch/mips/boot/dts/loongson/loongson64c_4core_ls7a.dts:28.31-36.4: Warning (interrupt_provider): /bus@10000000/msi-controller@2ff00000: Missing '#interrupt-cells' in interrupt provider arch/mips/boot/dts/loongson/loongson64c_4core_ls7a.dtb: Warning (interrupt_map): Failed prerequisite 'interrupt_provider'
--- arch/mips/boot/dts/loongson/loongson64c_4core_ls7a.dts | 1 + 1 file changed, 1 insertion(+)
arch/mips/boot/dts/loongson/loongson64c_4core_ls7a.dts +1 -0
@@ -29,6 +29,7 @@ compatible = "loongson,pch-msi-1.0"; reg = <0 0x2ff00000 0 0x8>; interrupt-controller; + #interrupt-cells = <1>; msi-controller; loongson,msi-base-vec = <64>; loongson,msi-num-vecs = <64>;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 525/780 coresight: Fixes devices owner field for registered using coresight_init_driver()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Junhao He <[email protected]>
[ Upstream commit 9f52aecc952ddf307571517d5c91136c8c4e87c9 ]
The coresight_init_driver() of the coresight-core module is called from the sub coresgiht device (such as tmc/stm/funnle/...) module. It calls amba_driver_register() and Platform_driver_register(), which are macro functions that use the coresight-core's module to initialize the caller's owner field. Therefore, when the sub coresight device calls coresight_init_driver(), an incorrect THIS_MODULE value is captured.
The sub coesgiht modules can be removed while their callbacks are running, resulting in a general protection failure.
Add module parameter to coresight_init_driver() so can be called with the module of the callback.
--- drivers/hwtracing/coresight/coresight-catu.c | 2 +- drivers/hwtracing/coresight/coresight-core.c | 6 +++--- drivers/hwtracing/coresight/coresight-cpu-debug.c | 3 ++- drivers/hwtracing/coresight/coresight-funnel.c | 3 ++- drivers/hwtracing/coresight/coresight-replicator.c | 3 ++- drivers/hwtracing/coresight/coresight-stm.c | 2 +- drivers/hwtracing/coresight/coresight-tmc-core.c | 2 +- drivers/hwtracing/coresight/coresight-tpiu.c | 2 +- include/linux/coresight.h | 2 +- 9 files changed, 14 insertions(+), 11 deletions(-)
drivers/hwtracing/coresight/coresight-catu.c +1 -1
@@ -702,7 +702,7 @@ static int __init catu_init(void) {int ret; - ret =coresight_init_driver ("catu" , &catu_driver, &catu_platform_driver); + ret =coresight_init_driver ("catu" , &catu_driver, &catu_platform_driver,THIS_MODULE );tmc_etr_set_catu_ops (&etr_catu_buf_ops);return ret; }
drivers/hwtracing/coresight/coresight-core.c +3 -3
@@ -1585,17 +1585,17 @@ module_init(coresight_init);module_exit (coresight_exit);int coresight_init_driver (const char *drv,struct amba_driver *amba_drv, -struct platform_driver *pdev_drv) +struct platform_driver *pdev_drv,struct module *owner) {int ret; - ret =amba_driver_register (amba_drv); + ret =__amba_driver_register (amba_drv, owner);if (ret) {pr_err ("%s: error registering AMBA driver\n" , drv);return ret; } - ret =platform_driver_register (pdev_drv); + ret =__platform_driver_register (pdev_drv, owner);if (!ret)return 0 ;
drivers/hwtracing/coresight/coresight-cpu-debug.c +2 -1
@@ -774,7 +774,8 @@ static struct platform_driver debug_platform_driver = {static int __init debug_init (void ) { -return coresight_init_driver ("debug" , &debug_driver, &debug_platform_driver); +return coresight_init_driver ("debug" , &debug_driver, &debug_platform_driver, +THIS_MODULE ); } static void __exit debug_exit(void)
drivers/hwtracing/coresight/coresight-funnel.c +2 -1
@@ -433,7 +433,8 @@ static struct amba_driver dynamic_funnel_driver = {static int __init funnel_init (void ) { -return coresight_init_driver ("funnel" , &dynamic_funnel_driver, &funnel_driver); +return coresight_init_driver ("funnel" , &dynamic_funnel_driver, &funnel_driver, +THIS_MODULE ); } static void __exit funnel_exit(void)
drivers/hwtracing/coresight/coresight-replicator.c +2 -1
@@ -438,7 +438,8 @@ static struct amba_driver dynamic_replicator_driver = {static int __init replicator_init (void ) { -return coresight_init_driver ("replicator" , &dynamic_replicator_driver, &replicator_driver); +return coresight_init_driver ("replicator" , &dynamic_replicator_driver, &replicator_driver, +THIS_MODULE ); } static void __exit replicator_exit(void)
drivers/hwtracing/coresight/coresight-stm.c +1 -1
@@ -1058,7 +1058,7 @@ static struct platform_driver stm_platform_driver = {static int __init stm_init (void ) { -return coresight_init_driver ("stm" , &stm_driver, &stm_platform_driver); +return coresight_init_driver ("stm" , &stm_driver, &stm_platform_driver,THIS_MODULE ); } static void __exit stm_exit(void)
drivers/hwtracing/coresight/coresight-tmc-core.c +1 -1
@@ -1060,7 +1060,7 @@ static struct platform_driver tmc_platform_driver = {static int __init tmc_init (void ) { -return coresight_init_driver ("tmc" , &tmc_driver, &tmc_platform_driver); +return coresight_init_driver ("tmc" , &tmc_driver, &tmc_platform_driver,THIS_MODULE ); } static void __exit tmc_exit(void)
drivers/hwtracing/coresight/coresight-tpiu.c +1 -1
@@ -318,7 +318,7 @@ static struct platform_driver tpiu_platform_driver = {static int __init tpiu_init (void ) { -return coresight_init_driver ("tpiu" , &tpiu_driver, &tpiu_platform_driver); +return coresight_init_driver ("tpiu" , &tpiu_driver, &tpiu_platform_driver,THIS_MODULE ); } static void __exit tpiu_exit(void)
include/linux/coresight.h +1 -1
@@ -723,7 +723,7 @@ coresight_find_output_type(struct coresight_platform_data *pdata, union coresight_dev_subtype subtype);int coresight_init_driver (const char *drv,struct amba_driver *amba_drv, -struct platform_driver *pdev_drv); +struct platform_driver *pdev_drv,struct module *owner);void coresight_remove_driver (struct amba_driver *amba_drv,struct platform_driver *pdev_drv);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 526/780 coresight: catu: Introduce refcount and spinlock for enabling/disabling
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yabin Cui <[email protected]>
[ Upstream commit a03a0a08c6fe5e50c1b12ea41b9e228e7f649c22 ]
When tracing ETM data on multiple CPUs concurrently via the perf interface, the CATU device is shared across different CPU paths. This can lead to race conditions when multiple CPUs attempt to enable or disable the CATU device simultaneously.
To address these race conditions, this patch introduces the following changes:
1. The enable and disable operations for the CATU device are not reentrant. Therefore, a spinlock is added to ensure that only one CPU can enable or disable a given CATU device at any point in time.
2. A reference counter is used to manage the enable/disable state of the CATU device. The device is enabled when the first CPU requires it and is only disabled when the last CPU finishes using it. This ensures the device remains active as long as at least one CPU needs it.
--- drivers/hwtracing/coresight/coresight-catu.c | 25 +++++++++++++------- drivers/hwtracing/coresight/coresight-catu.h | 1 + 2 files changed, 18 insertions(+), 8 deletions(-)
drivers/hwtracing/coresight/coresight-catu.c +17 -8
@@ -458,12 +458,17 @@ static int catu_enable_hw(struct catu_drvdata *drvdata, enum cs_mode cs_mode,static int catu_enable (struct coresight_device *csdev,enum cs_mode mode,void *data) { -int rc; +int rc =0 ;struct catu_drvdata *catu_drvdata =csdev_to_catu_drvdata (csdev); -CS_UNLOCK (catu_drvdata->base); - rc =catu_enable_hw (catu_drvdata, mode, data); -CS_LOCK (catu_drvdata->base); +guard (raw_spinlock_irqsave)(&catu_drvdata->spinlock); +if (csdev->refcnt ==0 ) { +CS_UNLOCK (catu_drvdata->base); + rc =catu_enable_hw (catu_drvdata, mode, data); +CS_LOCK (catu_drvdata->base); + } +if (!rc) + csdev->refcnt++;return rc; }
@@ -486,12 +491,15 @@ static int catu_disable_hw(struct catu_drvdata *drvdata)static int catu_disable (struct coresight_device *csdev,void *__unused) { -int rc; +int rc =0 ;struct catu_drvdata *catu_drvdata =csdev_to_catu_drvdata (csdev); -CS_UNLOCK (catu_drvdata->base); - rc =catu_disable_hw (catu_drvdata); -CS_LOCK (catu_drvdata->base); +guard (raw_spinlock_irqsave)(&catu_drvdata->spinlock); +if (--csdev->refcnt ==0 ) { +CS_UNLOCK (catu_drvdata->base); + rc =catu_disable_hw (catu_drvdata); +CS_LOCK (catu_drvdata->base); + }return rc; }
@@ -550,6 +558,7 @@ static int __catu_probe(struct device *dev, struct resource *res) dev->platform_data = pdata; drvdata->base = base; +raw_spin_lock_init (&drvdata->spinlock); catu_desc.access =CSDEV_ACCESS_IOMEM (base); catu_desc.pdata = pdata; catu_desc.dev = dev;
drivers/hwtracing/coresight/coresight-catu.h +1 -0
@@ -65,6 +65,7 @@ struct catu_drvdata {void __iomem *base;struct coresight_device *csdev;int irq; +raw_spinlock_t spinlock; };#define CATU_REG32 (name, offset) \
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 527/780 coresight: core: Disable helpers for devices that fail to enable
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yabin Cui <[email protected]>
[ Upstream commit f6028eeeb5e4cf86f93f805098c84974a79bba8a ]
When enabling a SINK or LINK type coresight device fails, the associated helpers should be disabled.
--- drivers/hwtracing/coresight/coresight-core.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
drivers/hwtracing/coresight/coresight-core.c +10 -5
@@ -465,7 +465,7 @@ int coresight_enable_path(struct coresight_path *path, enum cs_mode mode,/* Enable all helpers adjacent to the path first */ ret =coresight_enable_helpers (csdev, mode, path);if (ret) - goto err; + goto err_disable_path;/* * ETF devices are tricky... They can be a link or a sink, * depending on how they are configured. If an ETF has been
@@ -486,8 +486,10 @@ int coresight_enable_path(struct coresight_path *path, enum cs_mode mode,* that need disabling. Disabling the path here * would mean we could disrupt an existing session. */ -if (ret) +if (ret) { +coresight_disable_helpers (csdev, path); goto out; + }break ;case CORESIGHT_DEV_TYPE_SOURCE :/* sources are enabled from either sysFS or Perf */
@@ -497,16 +499,19 @@ int coresight_enable_path(struct coresight_path *path, enum cs_mode mode, child =list_next_entry (nd, link)->csdev; ret =coresight_enable_link (csdev, parent, child, source);if (ret) - goto err; + goto err_disable_helpers;break ;default : - goto err; + ret = -EINVAL ; + goto err_disable_helpers; } } out:return ret; -err: +err_disable_helpers: +coresight_disable_helpers (csdev, path); +err_disable_path:coresight_disable_path_from (path, nd); goto out; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 528/780 counter: interrupt-cnt: Protect enable/disable OPs with mutex
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Sverdlin <[email protected]>
[ Upstream commit 7351312632e831e51383f48957d47712fae791ef ]
Enable/disable seems to be racy on SMP, consider the following scenario:
CPU0 CPU1
interrupt_cnt_enable_write(true)
{
if (priv->enabled == enable)
return 0;
if (enable) {
priv->enabled = true;
interrupt_cnt_enable_write(false)
{
if (priv->enabled == enable)
return 0;
if (enable) {
priv->enabled = true;
enable_irq(priv->irq);
} else {
disable_irq(priv->irq)
priv->enabled = false;
}
enable_irq(priv->irq);
} else {
disable_irq(priv->irq);
priv->enabled = false;
}The above would result in priv->enabled == false, but IRQ left enabled. Protect both write (above race) and read (to propagate the value on SMP) callbacks with a mutex.
--- drivers/counter/interrupt-cnt.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/counter/interrupt-cnt.c +9 -0
@@ -3,12 +3,14 @@* Copyright (c) 2021 Pengutronix, Oleksij Rempel <[email protected]> */ +#include <linux/cleanup.h> #include <linux/counter.h> #include <linux/gpio/consumer.h> #include <linux/interrupt.h> #include <linux/irq.h> #include <linux/mod_devicetable.h> #include <linux/module.h> +#include <linux/mutex.h> #include <linux/platform_device.h> #include <linux/types.h>
@@ -19,6 +21,7 @@ struct interrupt_cnt_priv {struct gpio_desc *gpio;int irq;bool enabled; +struct mutex lock;struct counter_signal signals;struct counter_synapse synapses;struct counter_count cnts;
@@ -41,6 +44,8 @@ static int interrupt_cnt_enable_read(struct counter_device *counter, {struct interrupt_cnt_priv *priv =counter_priv (counter); +guard (mutex)(&priv->lock); + *enable = priv->enabled;return 0 ;
@@ -51,6 +56,8 @@ static int interrupt_cnt_enable_write(struct counter_device *counter, {struct interrupt_cnt_priv *priv =counter_priv (counter); +guard (mutex)(&priv->lock); +if (priv->enabled == enable)return 0 ;
@@ -227,6 +234,8 @@ static int interrupt_cnt_probe(struct platform_device *pdev)if (ret)return ret; +mutex_init (&priv->lock); + ret =devm_counter_add (dev, counter);if (ret <0 )return dev_err_probe (dev, ret,"Failed to add counter\n" );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 529/780 fpga: fix potential null pointer deref in fpga_mgr_test_img_load_sgt()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qasim Ijaz <[email protected]>
[ Upstream commit 6ebf1982038af12f3588417e4fd0417d2551da28 ]
fpga_mgr_test_img_load_sgt() allocates memory for sgt using kunit_kzalloc() however it does not check if the allocation failed. It then passes sgt to sg_alloc_table(), which passes it to __sg_alloc_table(). This function calls memset() on sgt in an attempt to zero it out. If the allocation fails then sgt will be NULL and the memset will trigger a NULL pointer dereference.
Fix this by checking the allocation with KUNIT_ASSERT_NOT_ERR_OR_NULL().
--- drivers/fpga/tests/fpga-mgr-test.c | 1 + 1 file changed, 1 insertion(+)
drivers/fpga/tests/fpga-mgr-test.c +1 -0
@@ -263,6 +263,7 @@ static void fpga_mgr_test_img_load_sgt(struct kunit *test) img_buf =init_test_buffer (test,IMAGE_SIZE ); sgt =kunit_kzalloc (test,sizeof (*sgt),GFP_KERNEL ); +KUNIT_ASSERT_NOT_ERR_OR_NULL (test, sgt); ret =sg_alloc_table (sgt,1 ,GFP_KERNEL );KUNIT_ASSERT_EQ (test, ret,0 );sg_init_one (sgt->sgl, img_buf,IMAGE_SIZE );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 530/780 iio: dac: adi-axi-dac: fix bus read
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Angelo Dureghello <[email protected]>
[ Upstream commit 921fece3268c3bf2e8c20dd17ff9e5454fa16fda ]
Fix bus read function.
Testing the driver, on a random basis, wrong reads was detected, mainly by a wrong DAC chip ID read at first boot.
Before reading the expected value from the AXI regmap, need always to wait for busy flag to be cleared.
--- drivers/iio/dac/adi-axi-dac.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/iio/dac/adi-axi-dac.c +8 -0
@@ -707,6 +707,7 @@ static int axi_dac_bus_reg_read(struct iio_backend *back, u32 reg, u32 *val, {struct axi_dac_state *st =iio_backend_get_priv (back);int ret; +u32 ival;guard (mutex)(&st->lock);
@@ -719,6 +720,13 @@ static int axi_dac_bus_reg_read(struct iio_backend *back, u32 reg, u32 *val,if (ret)return ret; + ret =regmap_read_poll_timeout (st->regmap, +AXI_DAC_UI_STATUS_REG , ival, +FIELD_GET (AXI_DAC_UI_STATUS_IF_BUSY , ival) ==0 , +10 ,100 *KILO ); +if (ret) +return ret; +return regmap_read (st->regmap,AXI_DAC_CUSTOM_RD_REG , val); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 531/780 iio: adc: ad4851: fix ad4858 chan pointer handling
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Antoniu Miclaus <[email protected]>
[ Upstream commit 499a8cee812588905cc940837e69918c1649a19e ]
The pointer returned from ad4851_parse_channels_common() is incremented internally as each channel is populated. In ad4858_parse_channels(), the same pointer was further incremented while setting ext_scan_type fields for each channel. This resulted in indio_dev->channels being set to a pointer past the end of the allocated array, potentially causing memory corruption or undefined behavior.
Fix this by iterating over the channels using an explicit index instead of incrementing the pointer. This preserves the original base pointer and ensures all channel metadata is set correctly.
--- drivers/iio/adc/ad4851.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/iio/adc/ad4851.c +7 -7
@@ -1034,7 +1034,7 @@ static int ad4858_parse_channels(struct iio_dev *indio_dev)struct device *dev = &st->spi->dev;struct iio_chan_spec *ad4851_channels;const struct iio_chan_spec ad4851_chan =AD4858_IIO_CHANNEL ; -int ret; +int ret, i =0 ; ret =ad4851_parse_channels_common (indio_dev, &ad4851_channels, ad4851_chan);
@@ -1042,15 +1042,15 @@ static int ad4858_parse_channels(struct iio_dev *indio_dev)return ret;device_for_each_child_node_scoped (dev, child) { - ad4851_channels->has_ext_scan_type =1 ; + ad4851_channels[i].has_ext_scan_type =1 ;if (fwnode_property_read_bool (child,"bipolar" )) { - ad4851_channels->ext_scan_type = ad4851_scan_type_20_b; - ad4851_channels->num_ext_scan_type =ARRAY_SIZE (ad4851_scan_type_20_b); + ad4851_channels[i].ext_scan_type = ad4851_scan_type_20_b; + ad4851_channels[i].num_ext_scan_type =ARRAY_SIZE (ad4851_scan_type_20_b); }else { - ad4851_channels->ext_scan_type = ad4851_scan_type_20_u; - ad4851_channels->num_ext_scan_type =ARRAY_SIZE (ad4851_scan_type_20_u); + ad4851_channels[i].ext_scan_type = ad4851_scan_type_20_u; + ad4851_channels[i].num_ext_scan_type =ARRAY_SIZE (ad4851_scan_type_20_u); } - ad4851_channels++; + i++; } indio_dev->channels = ad4851_channels;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 532/780 coresight: tmc: fix failure to disable/enable ETF after reading
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mao Jinlong <[email protected]>
[ Upstream commit d23bc38e8aa4efbd617bf660bb1a25fee9f6c177 ]
ETF may fail to re-enable after reading, and driver->reading will not be set to false, this will cause failure to enable/disable to ETF. This change set driver->reading to false even if re-enabling fail.
--- drivers/hwtracing/coresight/coresight-tmc-etf.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/hwtracing/coresight/coresight-tmc-etf.c +5 -6
@@ -747,7 +747,6 @@ int tmc_read_unprepare_etb(struct tmc_drvdata *drvdata)char *buf =NULL ;enum tmc_mode mode;unsigned long flags; -int rc =0 ;/* config types are set a boot time and never change */ if (WARN_ON_ONCE(drvdata->config_type != TMC_CONFIG_TYPE_ETB &&
@@ -773,11 +772,11 @@ int tmc_read_unprepare_etb(struct tmc_drvdata *drvdata)* can't be NULL. */ memset (drvdata->buf,0 , drvdata->size); - rc =__tmc_etb_enable_hw (drvdata); -if (rc) { -raw_spin_unlock_irqrestore (&drvdata->spinlock, flags); -return rc; - } +/* +* Ignore failures to enable the TMC to make sure, we don't +* leave the TMC in a "reading" state. +*/ +__tmc_etb_enable_hw (drvdata); }else {/* * The ETB/ETF is not tracing and the buffer was just read.
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 533/780 coresight: etm4x: Fix timestamp bit field handling
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leo Yan <[email protected]>
[ Upstream commit ee811bc733be5c57a2bfecdf2f6f5d4db466200a ]
Timestamps in the trace data appear as all zeros on recent kernels, although the feature works correctly on old kernels (e.g., v6.12).
Since commit c382ee674c8b ("arm64/sysreg/tools: Move TRFCR definitions to sysreg"), the TRFCR_ELx_TS_{VIRTUAL|GUEST_PHYSICAL|PHYSICAL} macros were updated to remove the bit shift. As a result, the driver no longer shifts bits when operates the timestamp field.
Fix this by using the FIELD_PREP() and FIELD_GET() helpers.
--- drivers/hwtracing/coresight/coresight-etm4x-core.c | 2 +- drivers/hwtracing/coresight/coresight-etm4x-sysfs.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/hwtracing/coresight/coresight-etm4x-core.c +1 -1
@@ -1176,7 +1176,7 @@ static void cpu_detect_trace_filtering(struct etmv4_drvdata *drvdata)* tracing at the kernel EL and EL0, forcing to use the * virtual time as the timestamp. */ - trfcr = (TRFCR_EL1_TS_VIRTUAL | + trfcr = (FIELD_PREP (TRFCR_EL1_TS_MASK ,TRFCR_EL1_TS_VIRTUAL ) | TRFCR_EL1_ExTRE |TRFCR_EL1_E0TRE );
drivers/hwtracing/coresight/coresight-etm4x-sysfs.c +2 -2
@@ -2320,11 +2320,11 @@ static ssize_t ts_source_show(struct device *dev, goto out; } -switch (drvdata->trfcr &TRFCR_EL1_TS_MASK ) { + val =FIELD_GET (TRFCR_EL1_TS_MASK , drvdata->trfcr); +switch (val) {case TRFCR_EL1_TS_VIRTUAL :case TRFCR_EL1_TS_GUEST_PHYSICAL :case TRFCR_EL1_TS_PHYSICAL : - val =FIELD_GET (TRFCR_EL1_TS_MASK , drvdata->trfcr);break ;default : val =-1 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 534/780 coresight/etm4: fix missing disable active config
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yeoreum Yun <[email protected]>
[ Upstream commit 895b12b7d7b8c651f73f57a1ea040d35aa7048cb ]
When etm4 device is disabled via sysfs, it should disable its active count.
--- drivers/hwtracing/coresight/coresight-etm4x-core.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/hwtracing/coresight/coresight-etm4x-core.c +3 -0
@@ -1020,6 +1020,9 @@ static void etm4_disable_sysfs(struct coresight_device *csdev)smp_call_function_single (drvdata->cpu, etm4_disable_hw, drvdata,1 );raw_spin_unlock (&drvdata->spinlock); + +cscfg_csdev_disable_active_config (csdev); +cpus_read_unlock ();/*
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 535/780 coresight: holding cscfg_csdev_lock while removing cscfg from csdev
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yeoreum Yun <[email protected]>
[ Upstream commit 53b9e2659719b04f5ba7593f2af0f2335f75e94a ]
There'll be possible race scenario for coresight config:
CPU0 CPU1
(perf enable) load module
cscfg_load_config_sets() activate config. // sysfs (sys_active_cnt == 1)
...cscfg_csdev_enable_active_config()
lock(csdev->cscfg_csdev_lock)
deactivate config // sysfs (sys_activec_cnt == 0) cscfg_unload_config_sets()
<iterating config_csdev_list> cscfg_remove_owned_csdev_configs()
// here load config activate by CPU1 unlock(csdev->cscfg_csdev_lock)
iterating config_csdev_list could be raced with config_csdev_list's entry delete.
To resolve this race , hold csdev->cscfg_csdev_lock() while cscfg_remove_owned_csdev_configs()
--- drivers/hwtracing/coresight/coresight-syscfg.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/hwtracing/coresight/coresight-syscfg.c +2 -0
@@ -395,6 +395,8 @@ static void cscfg_remove_owned_csdev_configs(struct coresight_device *csdev, voiif (list_empty (&csdev->config_csdev_list))return ; +guard (raw_spinlock_irqsave)(&csdev->cscfg_csdev_lock); +list_for_each_entry_safe (config_csdev, tmp, &csdev->config_csdev_list, node) {if (config_csdev->config_desc->load_owner == load_owner)list_del (&config_csdev->node);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 536/780 coresight: prevent deactivate active config while enabling the config
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yeoreum Yun <[email protected]>
[ Upstream commit 408c97c4a5e0b634dcd15bf8b8808b382e888164 ]
While enable active config via cscfg_csdev_enable_active_config(), active config could be deactivated via configfs' sysfs interface. This could make UAF issue in below scenario:
CPU0 CPU1
(sysfs enable) load module
cscfg_load_config_sets() activate config. // sysfs (sys_active_cnt == 1)
...cscfg_csdev_enable_active_config() lock(csdev->cscfg_csdev_lock)
// here load config activate by CPU1 unlock(csdev->cscfg_csdev_lock)
deactivate config // sysfs (sys_activec_cnt == 0) cscfg_unload_config_sets() unload module
// access to config_desc which freed
// while unloading module.cscfg_csdev_enable_config
To address this, use cscfg_config_desc's active_cnt as a reference count
which will be holded when
- activate the config.
- enable the activated config.
and put the module reference when config_active_cnt == 0.
--- .../hwtracing/coresight/coresight-config.h | 2 +- .../hwtracing/coresight/coresight-syscfg.c | 49 +++++++++++++------ 2 files changed, 35 insertions(+), 16 deletions(-)
drivers/hwtracing/coresight/coresight-config.h +1 -1
@@ -228,7 +228,7 @@ struct cscfg_feature_csdev {* @feats_csdev:references to the device features to enable. */ struct cscfg_config_csdev { -const struct cscfg_config_desc *config_desc; +struct cscfg_config_desc *config_desc;struct coresight_device *csdev;bool enabled;struct list_head node;
drivers/hwtracing/coresight/coresight-syscfg.c +34 -15
101 lines not on this page · raw message
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 537/780 vt: remove VT_RESIZE and VT_RESIZEX from vt_compat_ioctl()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicolas Pitre <[email protected]>
[ Upstream commit c4c7ead7b86c1e7f11c64915b7e5bb6d2e242691 ]
They are listed amon those cmd values that "treat 'arg' as an integer" which is wrong. They should instead fall into the default case. Probably nobody ever relied on that code since 2009 but still.
--- drivers/tty/vt/vt_ioctl.c | 2 -- 1 file changed, 2 deletions(-)
drivers/tty/vt/vt_ioctl.c +0 -2
@@ -1103,8 +1103,6 @@ long vt_compat_ioctl(struct tty_struct *tty,case VT_WAITACTIVE :case VT_RELDISP :case VT_DISALLOCATE : -case VT_RESIZE : -case VT_RESIZEX :return vt_ioctl (tty, cmd, arg);/*
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 538/780 staging: gpib: Fix PCMCIA config identifier
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Penkler <[email protected]>
[ Upstream commit 034a456869a071c635a9997e0bf3947a6cb20b25 ]
The PCMCIA config identifier in the ines_exit_module function was never changed because it was misspelled in the original commit.
Update the config parameter to use the correct identifier from gpib/Kconfig
--- drivers/staging/gpib/ines/ines_gpib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/gpib/ines/ines_gpib.c +1 -1
@@ -1484,7 +1484,7 @@ static void __exit ines_exit_module(void)gpib_unregister_driver (&ines_pci_unaccel_interface);gpib_unregister_driver (&ines_pci_accel_interface);gpib_unregister_driver (&ines_isa_interface); -#ifdef GPIB__PCMCIA +#ifdef CONFIG_GPIB_PCMCIA gpib_unregister_driver (&ines_pcmcia_interface);gpib_unregister_driver (&ines_pcmcia_unaccel_interface);gpib_unregister_driver (&ines_pcmcia_accel_interface);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 539/780 staging: gpib: Fix secondary address restriction
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Penkler <[email protected]>
[ Upstream commit 5aac95320d0f17f1098960e903ce5e087f42bc70 ]
GPIB secondary addresses have valid values between 0 and 31 inclusive. The Make Secondary Address function MSA, used to form the protocol byte, was using the gpib_address_restrict function erroneously restricting the address range to 0 through 30.
Remove the call to gpib_address_restrict and simply trim the address to 5 bits.
--- drivers/staging/gpib/uapi/gpib_user.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/gpib/uapi/gpib_user.h +1 -1
@@ -178,7 +178,7 @@ static inline uint8_t MTA(unsigned int addr)static inline uint8_t MSA (unsigned int addr) { -return gpib_address_restrict (addr) |SAD ; +return (addr &0x1f ) |SAD ; }static inline uint8_t PPE_byte (unsigned int dio_line,int sense)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 540/780 rust: miscdevice: fix typo in MiscDevice::ioctl documentation
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian Schrefl <[email protected]>
[ Upstream commit 81e9edc1a8d657291409d70d93361d8277d226d8 ]
Fixes one small typo (utilties to utilities) in the documentation of MiscDevice::ioctl.
--- rust/kernel/miscdevice.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
rust/kernel/miscdevice.rs +1 -1
@@ -121,7 +121,7 @@ pub trait MiscDevice: Sized {/// Handler for ioctls. /// -/// The `cmd` argument is usually manipulated using the utilties in [`kernel::ioctl`]. +/// The `cmd` argument is usually manipulated using the utilities in [`kernel::ioctl`]. /// /// [`kernel::ioctl`]: mod@crate::ioctl fn ioctl(
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 541/780 misc: lis3lv02d: Fix correct sysfs directory path for lis3lv02d
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Roxana Nicolescu <[email protected]>
[ Upstream commit 7b386d7454b610534026b279aa150e5a9e584082 ]
The lis3lv02d driver does not create a platform device anymore. It was recently changed to use a faux device instead. Therefore the sysfs path has changed from /sys/devices/platform/lis3lv02d to /sys/devices/faux/lis3lv02d.
--- Documentation/misc-devices/lis3lv02d.rst | 6 +++--- drivers/misc/lis3lv02d/Kconfig | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)
Documentation/misc-devices/lis3lv02d.rst +3 -3
@@ -22,10 +22,10 @@ sporting the feature officially called "HP Mobile Data Protection System 3D" or models (full list can be found in drivers/platform/x86/hp_accel.c) will have their axis automatically oriented on standard way (eg: you can directly play neverball). The accelerometer data is readable via -/sys/devices/platform/lis3lv02d. Reported values are scaled +/sys/devices/faux/lis3lv02d. Reported values are scaled to mg values (1/1000th of earth gravity). -Sysfs attributes under /sys/devices/platform/lis3lv02d/: +Sysfs attributes under /sys/devices/faux/lis3lv02d/: position - 3D position that the accelerometer reports. Format: "(x,y,z)"
@@ -85,7 +85,7 @@ the accelerometer are converted into a "standard" organisation of the axes If your laptop model is not recognized (cf "dmesg"), you can send an email to the maintainer to add it to the database. When reporting a new laptop, please include the output of "dmidecode" plus the value of -/sys/devices/platform/lis3lv02d/position in these four cases. +/sys/devices/faux/lis3lv02d/position in these four cases. Q&A ---
drivers/misc/lis3lv02d/Kconfig +2 -2
@@ -10,7 +10,7 @@ config SENSORS_LIS3_SPI help This driver provides support for the LIS3LV02Dx accelerometer connected via SPI. The accelerometer data is readable via - /sys/devices/platform/lis3lv02d. + /sys/devices/faux/lis3lv02d. This driver also provides an absolute input class device, allowing the laptop to act as a pinball machine-esque joystick.
@@ -26,7 +26,7 @@ config SENSORS_LIS3_I2C help This driver provides support for the LIS3LV02Dx accelerometer connected via I2C. The accelerometer data is readable via - /sys/devices/platform/lis3lv02d. + /sys/devices/faux/lis3lv02d. This driver also provides an absolute input class device, allowing the device to act as a pinball machine-esque joystick.
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 542/780 char: tlclk: Fix correct sysfs directory path for tlclk
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Roxana Nicolescu <[email protected]>
[ Upstream commit 46a4d12a005c58317e89b5644774c683365dc2ca ]
The tlckl driver does not create a platform device anymore. It was recently changed to use a faux device instead. Therefore the sysfs path has changed from /sys/devices/platform/telco_clock to /sys/devices/faux/telco_clock.
--- drivers/char/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/char/Kconfig +1 -1
@@ -404,7 +404,7 @@ config TELCLOCK configuration of the telecom clock configuration settings. This device is used for hardware synchronization across the ATCA backplane fabric. Upon loading, the driver exports a sysfs directory, - /sys/devices/platform/telco_clock, with a number of files for + /sys/devices/faux/telco_clock, with a number of files for controlling the behavior of this hardware. source "drivers/s390/char/Kconfig"
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 543/780 mei: vsc: Cast tx_buf to (__be32 *) when passed to cpu_to_be32_array()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
[ Upstream commit 97ce0fe2b7240d47d9124daa92217e478c21a3ba ]
Commit f88c0c72ffb0 ("mei: vsc: Use struct vsc_tp_packet as vsc-tp tx_buf and rx_buf type") changed the type of tx_buf from "void *" to "struct vsc_tp_packet *" and added a cast to (u32 *) when passing it to cpu_to_be32_array() and the same change was made for rx_buf.
This triggers the type-check warning in sparse:
vsc-tp.c:327:28: sparse: expected restricted __be32 [usertype] *dst vsc-tp.c:327:28: sparse: got unsigned int [usertype] *
vsc-tp.c:343:42: sparse: expected restricted __be32 const [usertype] *src vsc-tp.c:343:42: sparse: got unsigned int [usertype] *
Fix this by casting to (__be32 *) instead.
Note actually changing the type of the buffers to "be32 *" is not an option this buffer does actually contain a "struct vsc_tp_packet" and is used as such most of the time. vsc_tp_rom_xfer() re-uses the buffers as just dumb arrays of 32 bit words to talk to the device before the firmware has booted, to avoid needing to allocate a separate buffer.
--- drivers/misc/mei/vsc-tp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/misc/mei/vsc-tp.c +2 -2
@@ -324,7 +324,7 @@ int vsc_tp_rom_xfer(struct vsc_tp *tp, const void *obuf, void *ibuf, size_t len)guard (mutex)(&tp->mutex);/* rom xfer is big endian */ -cpu_to_be32_array ((u32 *)tp->tx_buf, obuf, words); +cpu_to_be32_array ((__be32 *)tp->tx_buf, obuf, words); ret = read_poll_timeout(gpiod_get_value_cansleep, ret, !ret, VSC_TP_ROM_XFER_POLL_DELAY_US,
@@ -340,7 +340,7 @@ int vsc_tp_rom_xfer(struct vsc_tp *tp, const void *obuf, void *ibuf, size_t len)return ret;if (ibuf) -be32_to_cpu_array (ibuf, (u32 *)tp->rx_buf, words); +be32_to_cpu_array (ibuf, (__be32 *)tp->rx_buf, words);return ret; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 544/780 iio: adc: PAC1934: fix typo in documentation link
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marius Cristea <[email protected]>
[ Upstream commit 52c43d80fa8370eb877fc63b1fc1eec67e1b1410 ]
Fix a typo,(PAC1934 -> PAC193X), into the link from an application note related to the ACPI device definition.
--- drivers/iio/adc/pac1934.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/adc/pac1934.c +1 -1
@@ -1081,7 +1081,7 @@ static int pac1934_chip_identify(struct pac1934_chip_info *info)/* * documentation related to the ACPI device definition -* https://ww1.microchip.com/downloads/aemDocuments/documents/OTH/ApplicationNotes/ApplicationNotes/PAC1934-Integration-Notes-for-Microsoft-Windows-10-and-Windows-11-Driver-Support-DS00002534.pdf +* https://ww1.microchip.com/downloads/aemDocuments/documents/OTH/ApplicationNotes/ApplicationNotes/PAC193X-Integration-Notes-for-Microsoft-Windows-10-and-Windows-11-Driver-Support-DS00002534.pdf */ static int pac1934_acpi_parse_channel_config (struct i2c_client *client,struct pac1934_chip_info *info)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 545/780 iio: adc: mcp3911: fix device dependent mappings for conversion result registers
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marcus Folkesson <[email protected]>
[ Upstream commit f62c49d8f32d6ce8871b01795498352775aa61db ]
The conversion result registers differs between devices. Make sure the mapping is correct by using a device dependent .get_raw() callback function.
--- drivers/iio/adc/mcp3911.c | 39 ++++++++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 5 deletions(-)
drivers/iio/adc/mcp3911.c +34 -5
@@ -6,7 +6,7 @@* Copyright (C) 2018 Kent Gustavsson <[email protected]> */ #include <linux/bitfield.h> -#include <linux/bits.h> +#include <linux/bitops.h> #include <linux/cleanup.h> #include <linux/clk.h> #include <linux/delay.h>
@@ -79,6 +79,8 @@#define MCP3910_CONFIG1_CLKEXT BIT(6)#define MCP3910_CONFIG1_VREFEXT BIT(7) +#define MCP3910_CHANNEL (ch) (MCP3911_REG_CHANNEL0 + (ch)) +#define MCP3910_REG_OFFCAL_CH0 0x0f#define MCP3910_OFFCAL (ch) (MCP3910_REG_OFFCAL_CH0 + (ch) * 6)
@@ -110,6 +112,7 @@ struct mcp3911_chip_info {int (*get_offset)(struct mcp3911 *adc,int channel,int *val);int (*set_offset)(struct mcp3911 *adc,int channel,int val);int (*set_scale)(struct mcp3911 *adc,int channel,u32 val); +int (*get_raw)(struct mcp3911 *adc,int channel,int *val); };struct mcp3911 {
@@ -170,6 +173,18 @@ static int mcp3911_update(struct mcp3911 *adc, u8 reg, u32 mask, u32 val, u8 lenreturn mcp3911_write (adc, reg, val, len); } +static int mcp3911_read_s24 (struct mcp3911 *const adc,u8 const reg,s32 *const val) +{ +u32 uval; +int const ret =mcp3911_read (adc, reg, &uval,3 ); + +if (ret) +return ret; + + *val =sign_extend32 (uval,23 ); +return ret; +} +static int mcp3910_enable_offset (struct mcp3911 *adc,bool enable) {unsigned int mask =MCP3910_CONFIG0_EN_OFFCAL ;
@@ -194,6 +209,11 @@ static int mcp3910_set_offset(struct mcp3911 *adc, int channel, int val)return adc->chip->enable_offset (adc,1 ); } +static int mcp3910_get_raw (struct mcp3911 *adc,int channel,s32 *val) +{ +return mcp3911_read_s24 (adc,MCP3910_CHANNEL (channel), val); +} +static int mcp3911_enable_offset (struct mcp3911 *adc,bool enable) {unsigned int mask =MCP3911_STATUSCOM_EN_OFFCAL ;
@@ -218,6 +238,11 @@ static int mcp3911_set_offset(struct mcp3911 *adc, int channel, int val)return adc->chip->enable_offset (adc,1 ); } +static int mcp3911_get_raw (struct mcp3911 *adc,int channel,s32 *val) +{ +return mcp3911_read_s24 (adc,MCP3911_CHANNEL (channel), val); +} +static int mcp3910_get_osr (struct mcp3911 *adc,u32 *val) {int ret;
@@ -321,12 +346,9 @@ static int mcp3911_read_raw(struct iio_dev *indio_dev,guard (mutex)(&adc->lock);switch (mask) {case IIO_CHAN_INFO_RAW : - ret =mcp3911_read (adc, -MCP3911_CHANNEL (channel->channel), val,3 ); + ret = adc->chip->get_raw (adc, channel->channel, val);if (ret)return ret; - - *val =sign_extend32 (*val,23 );return IIO_VAL_INT ;case IIO_CHAN_INFO_OFFSET : ret = adc->chip->get_offset (adc, channel->channel, val);
@@ -799,6 +821,7 @@ static const struct mcp3911_chip_info mcp3911_chip_info[] = { .get_offset = mcp3910_get_offset, .set_offset = mcp3910_set_offset, .set_scale = mcp3910_set_scale, + .get_raw = mcp3910_get_raw, }, [MCP3911] = { .channels = mcp3911_channels,
@@ -810,6 +833,7 @@ static const struct mcp3911_chip_info mcp3911_chip_info[] = { .get_offset = mcp3911_get_offset, .set_offset = mcp3911_set_offset, .set_scale = mcp3911_set_scale, + .get_raw = mcp3911_get_raw, }, [MCP3912] = { .channels = mcp3912_channels,
@@ -821,6 +845,7 @@ static const struct mcp3911_chip_info mcp3911_chip_info[] = { .get_offset = mcp3910_get_offset, .set_offset = mcp3910_set_offset, .set_scale = mcp3910_set_scale, + .get_raw = mcp3910_get_raw, }, [MCP3913] = { .channels = mcp3913_channels,
@@ -832,6 +857,7 @@ static const struct mcp3911_chip_info mcp3911_chip_info[] = { .get_offset = mcp3910_get_offset, .set_offset = mcp3910_set_offset, .set_scale = mcp3910_set_scale, + .get_raw = mcp3910_get_raw, }, [MCP3914] = { .channels = mcp3914_channels,
@@ -843,6 +869,7 @@ static const struct mcp3911_chip_info mcp3911_chip_info[] = { .get_offset = mcp3910_get_offset, .set_offset = mcp3910_set_offset, .set_scale = mcp3910_set_scale, + .get_raw = mcp3910_get_raw, }, [MCP3918] = { .channels = mcp3918_channels,
@@ -854,6 +881,7 @@ static const struct mcp3911_chip_info mcp3911_chip_info[] = { .get_offset = mcp3910_get_offset, .set_offset = mcp3910_set_offset, .set_scale = mcp3910_set_scale, + .get_raw = mcp3910_get_raw, }, [MCP3919] = { .channels = mcp3919_channels,
@@ -865,6 +893,7 @@ static const struct mcp3911_chip_info mcp3911_chip_info[] = { .get_offset = mcp3910_get_offset, .set_offset = mcp3910_set_offset, .set_scale = mcp3910_set_scale, + .get_raw = mcp3910_get_raw, }, }; static const struct of_device_id mcp3911_dt_ids[] = {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 546/780 USB: serial: bus: fix const issue in usb_serial_device_match()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
[ Upstream commit 92cd405b648605db4da866f3b9818b271ae84ef0 ]
usb_serial_device_match() takes a const pointer, and then decides to cast it away into a non-const one, which is not a good thing to do overall. Fix this up by properly setting the pointers to be const to preserve that attribute.
--- drivers/usb/serial/bus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/serial/bus.c +1 -1
@@ -17,7 +17,7 @@ static int usb_serial_device_match(struct device *dev, const struct device_driver *drv) {const struct usb_serial_port *port =to_usb_serial_port (dev); -struct usb_serial_driver *driver =to_usb_serial_driver (drv); +const struct usb_serial_driver *driver =to_usb_serial_driver (drv);/* * drivers are already assigned to ports in serial_probe so it's
Signature · 1 line
2.39.5
Re: [PATCH 6.15 546/780] USB: serial: bus: fix const issue in usb_serial_device_match()
Quoted 13 lines · Greg Kroah-Hartman
6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
[ Upstream commit
92cd405b648605db4da866f3b9818b271ae84ef0]
usb_serial_device_match()takes a const pointer, and then decides to cast it away into a non-const one, which is not a good thing to do overall. Fix this up by properly setting the pointers to be const to preserve that attribute.
Quoted 4 lines
Fixes d69d80484598 ("driver core: have match() callback in struct bus_type take a const *")Signed-off-by Greg Kroah-Hartman <[email protected]>Signed-off-by Johan Hovold <[email protected]>Signed-off-by Sasha Levin <[email protected]>
I believe I already asked for this one to be dropped since it does not really fix anything and therefore does not meet the criteria for stable backport. The stable tag was as usual left out on purpose.
Johan
Greg Kroah-Hartman
maintainerRe: [PATCH 6.15 546/780] USB: serial: bus: fix const issue in usb_serial_device_match()
Quoted 14 lines · Johan Hovold
Quoted 13 lines · Greg Kroah-Hartman
6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
[ Upstream commit
92cd405b648605db4da866f3b9818b271ae84ef0]
usb_serial_device_match()takes a const pointer, and then decides to cast it away into a non-const one, which is not a good thing to do overall. Fix this up by properly setting the pointers to be const to preserve that attribute.
Quoted 8 lines
Quoted 4 lines
Fixes d69d80484598 ("driver core: have match() callback in struct bus_type take a const *")Signed-off-by Greg Kroah-Hartman <[email protected]>Signed-off-by Johan Hovold <[email protected]>Signed-off-by Sasha Levin <[email protected]>I believe I already asked for this one to be dropped since it does not really fix anything and therefore does not meet the criteria for stable backport. The stable tag was as usual left out on purpose.
Now dropped from everywhere, sorry about that.
greg k-h
Greg Kroah-Hartman
maintainerPATCH 547/780 USB: gadget: udc: fix const issue in gadget_match_driver()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
[ Upstream commit 5f5cc794fac605afd3bef8065e33096aeacf6257 ]
gadget_match_driver() takes a const pointer, and then decides to cast it away into a non-const one, which is not a good thing to do overall. Fix this up by properly setting the pointers to be const to preserve that attribute.
--- drivers/usb/gadget/udc/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/gadget/udc/core.c +1 -1
@@ -1570,7 +1570,7 @@ static int gadget_match_driver(struct device *dev, const struct device_driver *d {struct usb_gadget *gadget =dev_to_usb_gadget (dev);struct usb_udc *udc = gadget->udc; -struct usb_gadget_driver *driver =container_of (drv, +const struct usb_gadget_driver *driver =container_of (drv, struct usb_gadget_driver, driver);/* If the driver specifies a udc_name, it must match the UDC's name */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 548/780 USB: typec: fix const issue in typec_match()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
[ Upstream commit ae4432e01dd967a64f6670a152d91d5328032726 ]
typec_match() takes a const pointer, and then decides to cast it away into a non-const one, which is not a good thing to do overall. Fix this up by properly setting the pointers to be const to preserve that attribute.
--- drivers/usb/typec/bus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/typec/bus.c +1 -1
@@ -449,7 +449,7 @@ ATTRIBUTE_GROUPS(typec);static int typec_match (struct device *dev,const struct device_driver *driver) { -struct typec_altmode_driver *drv =to_altmode_driver (driver); +const struct typec_altmode_driver *drv =to_altmode_driver (driver);struct typec_altmode *altmode =to_typec_altmode (dev);const struct typec_device_id *id;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 549/780 loop: add file_start_write() and file_end_write()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Lei <[email protected]>
[ Upstream commit 39d86db34e41b96bd86f1955cd0ce6cd9c5fca4c ]
file_start_write() and file_end_write() should be added around ->write_iter().
Recently we switch to ->write_iter() from vfs_iter_write(), and the implied file_start_write() and file_end_write() are lost.
Also we never add them for dio code path, so add them back for covering both.
--- drivers/block/loop.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/block/loop.c +6 -2
@@ -308,11 +308,14 @@ static void lo_complete_rq(struct request *rq)static void lo_rw_aio_do_completion (struct loop_cmd *cmd) {struct request *rq =blk_mq_rq_from_pdu (cmd); +struct loop_device *lo = rq->q->queuedata;if (!atomic_dec_and_test (&cmd->ref))return ;kfree (cmd->bvec); cmd->bvec =NULL ; +if (req_op (rq) ==REQ_OP_WRITE ) +file_end_write (lo->lo_backing_file);if (likely (!blk_should_fake_timeout (rq->q)))blk_mq_complete_request (rq); }
@@ -387,9 +390,10 @@ static int lo_rw_aio(struct loop_device *lo, struct loop_cmd *cmd, cmd->iocb.ki_flags =0 ; } -if (rw ==ITER_SOURCE ) +if (rw ==ITER_SOURCE ) { +file_start_write (lo->lo_backing_file); ret = file->f_op->write_iter (&cmd->iocb, &iter); -else + }else ret = file->f_op->read_iter (&cmd->iocb, &iter);lo_rw_aio_do_completion (cmd);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 550/780 drm/connector: only call HDMI audio helper plugged cb if non-null
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicolas Frattaroli <[email protected]>
[ Upstream commit be9b3f9a54101c19226c25ba7163d291183777a0 ]
On driver remove, sound/soc/codecs/hdmi-codec.c calls the plugged_cb with NULL as the callback function and codec_dev, as seen in its hdmi_remove function.
The HDMI audio helper then happily tries calling said null function pointer, and produces an Oops as a result.
Fix this by only executing the callback if fn is non-null. This means the .plugged_cb and .plugged_cb_dev members still get appropriately cleared.
--- drivers/gpu/drm/display/drm_hdmi_audio_helper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/display/drm_hdmi_audio_helper.c +2 -1
@@ -103,7 +103,8 @@ static int drm_connector_hdmi_audio_hook_plugged_cb(struct device *dev, connector->hdmi_audio.plugged_cb = fn; connector->hdmi_audio.plugged_cb_dev = codec_dev; -fn (codec_dev, connector->hdmi_audio.last_state); +if (fn) +fn (codec_dev, connector->hdmi_audio.last_state);mutex_unlock (&connector->hdmi_audio.lock);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 551/780 drm/bridge: analogix_dp: Remove the unnecessary calls to clk_disable_unprepare() during probing
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Damon Ding <[email protected]>
[ Upstream commit 6579a03e68ffa5feb2d2823dea16ca7466f6de16 ]
With the commit f37952339cc2 ("drm/bridge: analogix_dp: handle clock via runtime PM"), the PM operations can help enable/disable the clock. The err_disable_clk label and clk_disable_unprepare() operations are no longer necessary because the analogix_dp_resume() will not be called during probing.
--- .../gpu/drm/bridge/analogix/analogix_dp_core.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-)
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +5 -13
@@ -1597,10 +1597,8 @@ analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data) } dp->reg_base =devm_platform_ioremap_resource (pdev,0 ); -if (IS_ERR (dp->reg_base)) { - ret =PTR_ERR (dp->reg_base); - goto err_disable_clk; - } +if (IS_ERR (dp->reg_base)) +return ERR_CAST (dp->reg_base); dp->force_hpd =of_property_read_bool (dev->of_node,"force-hpd" );
@@ -1612,8 +1610,7 @@ analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data)if (IS_ERR (dp->hpd_gpiod)) {dev_err (dev,"error getting HDP GPIO: %ld\n" ,PTR_ERR (dp->hpd_gpiod)); - ret =PTR_ERR (dp->hpd_gpiod); - goto err_disable_clk; +return ERR_CAST (dp->hpd_gpiod); }if (dp->hpd_gpiod) {
@@ -1633,8 +1630,7 @@ analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data)if (dp->irq == -ENXIO ) {dev_err (&pdev->dev,"failed to get irq\n" ); - ret = -ENODEV ; - goto err_disable_clk; +return ERR_PTR (-ENODEV ); } ret = devm_request_threaded_irq(&pdev->dev, dp->irq,
@@ -1643,15 +1639,11 @@ analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data) irq_flags, "analogix-dp", dp);if (ret) {dev_err (&pdev->dev,"failed to request irq\n" ); - goto err_disable_clk; +return ERR_PTR (ret); }disable_irq (dp->irq);return dp; - -err_disable_clk: -clk_disable_unprepare (dp->clock); -return ERR_PTR (ret); }EXPORT_SYMBOL_GPL (analogix_dp_probe);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 552/780 accel/ivpu: Reorder Doorbell Unregister and Command Queue Destruction
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Karol Wachowski <[email protected]>
[ Upstream commit 4557cc834712eca4eae7adbd9f0a06bdd8f79c99 ]
Refactor ivpu_cmdq_unregister() to ensure the doorbell is unregistered before destroying the command queue. The NPU firmware requires doorbells to be unregistered prior to command queue destruction.
If doorbell remains registered when command queue destroy command is sent firmware will automatically unregister the doorbell, making subsequent unregister attempts no-operations (NOPs).
Ensure compliance with firmware expectations by moving the doorbell unregister call ahead of the command queue destruction logic, thus preventing unnecessary NOP operation.
--- drivers/accel/ivpu/ivpu_job.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/accel/ivpu/ivpu_job.c +4 -4
@@ -247,6 +247,10 @@ static int ivpu_cmdq_unregister(struct ivpu_file_priv *file_priv, struct ivpu_cmif (!cmdq->db_id)return 0 ; + ret =ivpu_jsm_unregister_db (vdev, cmdq->db_id); +if (!ret) +ivpu_dbg (vdev,JOB ,"DB %d unregistered\n" , cmdq->db_id); +if (vdev->fw->sched_mode ==VPU_SCHEDULING_MODE_HW ) { ret =ivpu_jsm_hws_destroy_cmdq (vdev, file_priv->ctx.id, cmdq->id);if (!ret)
@@ -254,10 +258,6 @@ static int ivpu_cmdq_unregister(struct ivpu_file_priv *file_priv, struct ivpu_cm cmdq->id, file_priv->ctx.id); } - ret =ivpu_jsm_unregister_db (vdev, cmdq->db_id); -if (!ret) -ivpu_dbg (vdev,JOB ,"DB %d unregistered\n" , cmdq->db_id); -xa_erase (&file_priv->vdev->db_xa, cmdq->db_id); cmdq->db_id =0 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 553/780 drm/bridge: analogix_dp: Remove CONFIG_PM related check in analogix_dp_bind()/analogix_dp_unbind()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Damon Ding <[email protected]>
[ Upstream commit c71db051142a74b255cb61b84d8fedae3b70952f ]
Remove the check related to CONFIG_PM in order to make the code more concise, as the CONFIG_PM should be a required option for many drivers.
In addition, it is preferable to use devm_pm_runtime_enable() instead of manually invoking pm_runtime_enable() followed by pm_runtime_disable().
Stable-dep-of: fd03f82a026c ("drm/bridge: analogix_dp: Fix clk-disable removal")
--- .../drm/bridge/analogix/analogix_dp_core.c | 30 ++++--------------- 1 file changed, 6 insertions(+), 24 deletions(-)
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +6 -24
@@ -1688,15 +1688,11 @@ int analogix_dp_bind(struct analogix_dp_device *dp, struct drm_device *drm_dev) dp->drm_dev = drm_dev; dp->encoder = dp->plat_data->encoder; -if (IS_ENABLED (CONFIG_PM )) { -pm_runtime_use_autosuspend (dp->dev); -pm_runtime_set_autosuspend_delay (dp->dev,100 ); -pm_runtime_enable (dp->dev); - }else { - ret =analogix_dp_resume (dp); -if (ret) -return ret; - } +pm_runtime_use_autosuspend (dp->dev); +pm_runtime_set_autosuspend_delay (dp->dev,100 ); + ret =devm_pm_runtime_enable (dp->dev); +if (ret) +return ret; dp->aux.name ="DP-AUX" ; dp->aux.transfer = analogix_dpaux_transfer;
@@ -1706,7 +1702,7 @@ int analogix_dp_bind(struct analogix_dp_device *dp, struct drm_device *drm_dev) ret =drm_dp_aux_register (&dp->aux);if (ret) {DRM_ERROR ("failed to register AUX (%d)\n" , ret); - goto err_disable_pm_runtime; +return ret; } ret =analogix_dp_create_bridge (drm_dev, dp);
@@ -1719,13 +1715,6 @@ int analogix_dp_bind(struct analogix_dp_device *dp, struct drm_device *drm_dev) err_unregister_aux:drm_dp_aux_unregister (&dp->aux); -err_disable_pm_runtime: -if (IS_ENABLED (CONFIG_PM )) { -pm_runtime_dont_use_autosuspend (dp->dev); -pm_runtime_disable (dp->dev); - }else { -analogix_dp_suspend (dp); - }return ret; }
@@ -1742,13 +1731,6 @@ void analogix_dp_unbind(struct analogix_dp_device *dp) }drm_dp_aux_unregister (&dp->aux); - -if (IS_ENABLED (CONFIG_PM )) { -pm_runtime_dont_use_autosuspend (dp->dev); -pm_runtime_disable (dp->dev); - }else { -analogix_dp_suspend (dp); - } }EXPORT_SYMBOL_GPL (analogix_dp_unbind);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 554/780 drm/bridge: analogix_dp: Add support to get panel from the DP AUX bus
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Damon Ding <[email protected]>
[ Upstream commit e5e9fa9f7aad4ad7eedb6359baea9193531bf4ac ]
The main modification is moving the DP AUX initialization from function analogix_dp_bind() to analogix_dp_probe(). In order to get the EDID of eDP panel during probing, it is also needed to advance PM operations to ensure that eDP controller and phy are prepared for AUX transmission.
Stable-dep-of: fd03f82a026c ("drm/bridge: analogix_dp: Fix clk-disable removal")
--- .../drm/bridge/analogix/analogix_dp_core.c | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +11 -9
@@ -1643,6 +1643,17 @@ analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data) }disable_irq (dp->irq); + dp->aux.name ="DP-AUX" ; + dp->aux.transfer = analogix_dpaux_transfer; + dp->aux.dev = dp->dev; +drm_dp_aux_init (&dp->aux); + +pm_runtime_use_autosuspend (dp->dev); +pm_runtime_set_autosuspend_delay (dp->dev,100 ); + ret =devm_pm_runtime_enable (dp->dev); +if (ret) + goto err_disable_clk; +return dp; }EXPORT_SYMBOL_GPL (analogix_dp_probe);
@@ -1688,15 +1699,6 @@ int analogix_dp_bind(struct analogix_dp_device *dp, struct drm_device *drm_dev) dp->drm_dev = drm_dev; dp->encoder = dp->plat_data->encoder; -pm_runtime_use_autosuspend (dp->dev); -pm_runtime_set_autosuspend_delay (dp->dev,100 ); - ret =devm_pm_runtime_enable (dp->dev); -if (ret) -return ret; - - dp->aux.name ="DP-AUX" ; - dp->aux.transfer = analogix_dpaux_transfer; - dp->aux.dev = dp->dev; dp->aux.drm_dev = drm_dev; ret =drm_dp_aux_register (&dp->aux);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 555/780 drm/bridge: analogix_dp: Fix clk-disable removal
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heiko Stuebner <[email protected]>
[ Upstream commit fd03f82a026cc03cb8051a8c6487c99f96c9029f ]
Commit 6579a03e68ff ("drm/bridge: analogix_dp: Remove the unnecessary calls to clk_disable_unprepare() during probing") removed the mismatched clock_disable calls from analogix_dp_probe.
But that patch was created and sent before
commit e5e9fa9f7aad ("drm/bridge: analogix_dp: Add support to get panel from the DP AUX bus") was merged, so couldn't know about this change.
So in the original patch the last change is
if (ret) {
dev_err(&pdev->dev, "failed to request irq\n");
- goto err_disable_clk;
+ return ERR_PTR(ret);
}
disable_irq(dp->irq);
return dp;-
-err_disable_clk:
- clk_disable_unprepare(dp->clock);
- return ERR_PTR(ret);
}
EXPORT_SYMBOL_GPL(analogix_dp_probe);
the analogix_dp_core.c actually now has the runtime-pm handling between disable_irq() and return do introducing another goto err_clk_disable there.
So remove that one too and return an error pointer, to not create build breakage.
--- drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +1 -1
@@ -1652,7 +1652,7 @@ analogix_dp_probe(struct device *dev, struct analogix_dp_plat_data *plat_data)pm_runtime_set_autosuspend_delay (dp->dev,100 ); ret =devm_pm_runtime_enable (dp->dev);if (ret) - goto err_disable_clk; +return ERR_PTR (ret);return dp; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 556/780 drm/xe: Make xe_gt_freq part of the Documentation
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rodrigo Vivi <[email protected]>
[ Upstream commit 55f8aa083604ce098c9d6a0911c6bcde15d03a80 ]
The documentation was created with the creation of the component, however it has never been actually shown in the actual Documentation.
While doing this, fixes the identation style, to avoid new warnings while building htmldocs.
--- Documentation/gpu/xe/index.rst | 1 + Documentation/gpu/xe/xe_gt_freq.rst | 14 ++++++++++++++ drivers/gpu/drm/xe/xe_gt_freq.c | 2 ++ 3 files changed, 17 insertions(+) create mode 100644 Documentation/gpu/xe/xe_gt_freq.rst
Documentation/gpu/xe/index.rst +1 -0
@@ -16,6 +16,7 @@ DG2, etc is provided to prototype the driver. xe_migrate xe_cs xe_pm + xe_gt_freq xe_pcode xe_gt_mcr xe_wa
Documentation/gpu/xe/xe_gt_freq.rst new file +14 -0
@@ -0,0 +1,14 @@ +.. SPDX-License-Identifier: (GPL-2.0+ OR MIT) + +========================== +Xe GT Frequency Management +========================== + +.. kernel-doc:: drivers/gpu/drm/xe/xe_gt_freq.c + :doc: Xe GT Frequency Management + +Internal API +============ + +.. kernel-doc:: drivers/gpu/drm/xe/xe_gt_freq.c + :internal:
drivers/gpu/drm/xe/xe_gt_freq.c +2 -0
@@ -32,6 +32,7 @@* Xe's Freq provides a sysfs API for frequency management: * * device/tile#/gt#/freq0/<item>_freq *read-only* files: +* * - act_freq: The actual resolved frequency decided by PCODE. * - cur_freq: The current one requested by GuC PC to the PCODE. * - rpn_freq: The Render Performance (RP) N level, which is the minimal one.
@@ -39,6 +40,7 @@* - rp0_freq: The Render Performance (RP) 0 level, which is the maximum one. * * device/tile#/gt#/freq0/<item>_freq *read-write* files: +* * - min_freq: Min frequency request. * - max_freq: Max frequency request. * If max <= min, then freq_min becomes a fixed frequency request.
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 557/780 drm/xe: Add missing documentation of rpa_freq
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rodrigo Vivi <[email protected]>
[ Upstream commit 40493d97b329f8185c0f04dc0ef2b9ffc58e7f3b ]
While at it, already adjust the rpe_freq frequency, to highlight that both are calculated by PCODE at runtime.
--- drivers/gpu/drm/xe/xe_gt_freq.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/xe/xe_gt_freq.c +3 -0
@@ -36,7 +36,10 @@* - act_freq: The actual resolved frequency decided by PCODE. * - cur_freq: The current one requested by GuC PC to the PCODE. * - rpn_freq: The Render Performance (RP) N level, which is the minimal one. +* - rpa_freq: The Render Performance (RP) A level, which is the achiveable one. +* Calculated by PCODE at runtime based on multiple running conditions * - rpe_freq: The Render Performance (RP) E level, which is the efficient one. +* Calculated by PCODE at runtime based on multiple running conditions * - rp0_freq: The Render Performance (RP) 0 level, which is the maximum one. * * device/tile#/gt#/freq0/<item>_freq *read-write* files:
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 558/780 Fix sock_exceed_buf_limit not being triggered in __sk_mem_raise_allocated
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tengteng Yang <[email protected]>
[ Upstream commit 8542d6fac25c03b4bf36b2d762cfe60fda8491bb ]
When a process under memory pressure is not part of any cgroup and the charged flag is false, trace_sock_exceed_buf_limit was not called as expected.
This regression was introduced by commit 2def8ff3fdb6 ("sock:
Code cleanup on __sk_mem_raise_allocated()"). The fix changes the default value of charged to true while preserving existing logic.
--- net/core/sock.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/core/sock.c +4 -4
@@ -3234,16 +3234,16 @@ int __sk_mem_raise_allocated(struct sock *sk, int size, int amt, int kind) {struct mem_cgroup *memcg = mem_cgroup_sockets_enabled ? sk->sk_memcg :NULL ;struct proto *prot = sk->sk_prot; -bool charged = false; +bool charged = true;long allocated;sk_memory_allocated_add (sk, amt); allocated =sk_memory_allocated (sk);if (memcg) { -if (!mem_cgroup_charge_skmem (memcg, amt,gfp_memcg_charge ())) + charged =mem_cgroup_charge_skmem (memcg, amt,gfp_memcg_charge ()); +if (!charged) goto suppress_allocation; - charged = true; }/* Under limit. */
@@ -3328,7 +3328,7 @@ int __sk_mem_raise_allocated(struct sock *sk, int size, int amt, int kind)sk_memory_allocated_sub (sk, amt); -if (charged) +if (memcg && charged)mem_cgroup_uncharge_skmem (memcg, amt);return 0 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 559/780 page_pool: Fix use-after-free in page_pool_recycle_in_ring
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dong Chenchen <[email protected]>
[ Upstream commit 271683bb2cf32e5126c592b5d5e6a756fa374fd9 ]
syzbot reported a uaf in page_pool_recycle_in_ring:
BUG: KASAN: slab-use-after-free in lock_release+0x151/0xa30 kernel/locking/lockdep.c:5862 Read of size 8 at addr ffff8880286045a0 by task syz.0.284/6943 CPU: 0 UID: 0 PID: 6943 Comm: syz.0.284 Not tainted 6.13.0-rc3-syzkaller-gdfa94ce54f41 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 09/13/2024 Call Trace: <TASK> __dump_stack lib/dump_stack.c:94 [inline] dump_stack_lvl+0x241/0x360 lib/dump_stack.c:120 print_address_description mm/kasan/report.c:378 [inline] print_report+0x169/0x550 mm/kasan/report.c:489 kasan_report+0x143/0x180 mm/kasan/report.c:602 lock_release+0x151/0xa30 kernel/locking/lockdep.c:5862 __raw_spin_unlock_bh include/linux/spinlock_api_smp.h:165 [inline] _raw_spin_unlock_bh+0x1b/0x40 kernel/locking/spinlock.c:210 spin_unlock_bh include/linux/spinlock.h:396 [inline] ptr_ring_produce_bh include/linux/ptr_ring.h:164 [inline] page_pool_recycle_in_ring net/core/page_pool.c:707 [inline] page_pool_put_unrefed_netmem+0x748/0xb00 net/core/page_pool.c:826 page_pool_put_netmem include/net/page_pool/helpers.h:323 [inline] page_pool_put_full_netmem include/net/page_pool/helpers.h:353 [inline] napi_pp_put_page+0x149/0x2b0 net/core/skbuff.c:1036 skb_pp_recycle net/core/skbuff.c:1047 [inline] skb_free_head net/core/skbuff.c:1094 [inline] skb_release_data+0x6c4/0x8a0 net/core/skbuff.c:1125 skb_release_all net/core/skbuff.c:1190 [inline] __kfree_skb net/core/skbuff.c:1204 [inline] sk_skb_reason_drop+0x1c9/0x380 net/core/skbuff.c:1242 kfree_skb_reason include/linux/skbuff.h:1263 [inline] __skb_queue_purge_reason include/linux/skbuff.h:3343 [inline]
root cause is:
page_pool_recycle_in_ring
ptr_ring_produce
spin_lock(&r->producer_lock);
WRITE_ONCE(r->queue[r->producer++], ptr)
//recycle last page to pool
page_pool_release
page_pool_scrub
page_pool_empty_ring
ptr_ring_consume
page_pool_return_page //release all page
__page_pool_destroy
free_percpu(pool->recycle_stats);
free(pool) //free
spin_unlock(&r->producer_lock); //pool->ring uaf read recycle_stat_inc(pool, ring);
page_pool can be free while page pool recycle the last page in ring. Add producer-lock barrier to page_pool_release to prevent the page pool from being free before all pages have been recycled.
recycle_stat_inc() is empty when CONFIG_PAGE_POOL_STATS is not enabled, which will trigger Wempty-body build warning. Add definition for pool stat macro to fix warning.
--- net/core/page_pool.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-)
net/core/page_pool.c +14 -13
@@ -153,9 +153,9 @@ u64 *page_pool_ethtool_stats_get(u64 *data, const void *stats)EXPORT_SYMBOL (page_pool_ethtool_stats_get);#else -#define alloc_stat_inc (pool, __stat) -#define recycle_stat_inc (pool, __stat) -#define recycle_stat_add (pool, __stat, val) +#define alloc_stat_inc (...) do { } while (0) +#define recycle_stat_inc (...) do { } while (0) +#define recycle_stat_add (...) do { } while (0)#endif static bool page_pool_producer_lock (struct page_pool *pool)
@@ -741,19 +741,16 @@ void page_pool_return_page(struct page_pool *pool, netmem_ref netmem)static bool page_pool_recycle_in_ring (struct page_pool *pool,netmem_ref netmem) { -int ret; -/* BH protection not needed if current is softirq */ -if (in_softirq ()) - ret =ptr_ring_produce (&pool->ring, (__force void *)netmem); -else - ret =ptr_ring_produce_bh (&pool->ring, (__force void *)netmem); +bool in_softirq, ret; -if (!ret) { +/* BH protection not needed if current is softirq */ + in_softirq =page_pool_producer_lock (pool); + ret = !__ptr_ring_produce (&pool->ring, (__force void *)netmem); +if (ret)recycle_stat_inc (pool, ring); -return true; - } +page_pool_producer_unlock (pool, in_softirq); -return false; +return ret; }/* Only allow direct recycling in special circumstances, into the
@@ -1146,10 +1143,14 @@ static void page_pool_scrub(struct page_pool *pool)static int page_pool_release (struct page_pool *pool) { +bool in_softirq;int inflight;page_pool_scrub (pool); inflight =page_pool_inflight (pool, true); +/* Acquire producer lock to make sure producers have exited. */ + in_softirq =page_pool_producer_lock (pool); +page_pool_producer_unlock (pool, in_softirq);if (!inflight)__page_pool_destroy (pool);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 560/780 net: stmmac: platform: guarantee uniqueness of bus_id
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Quentin Schulz <[email protected]>
[ Upstream commit eb7fd7aa35bfcc1e1fda4ecc42ccfcb526cdc780 ]
bus_id is currently derived from the ethernetX alias. If one is missing for the device, 0 is used. If ethernet0 points to another stmmac device or if there are 2+ stmmac devices without an ethernet alias, then bus_id will be 0 for all of those.
This is an issue because the bus_id is used to generate the mdio bus id (new_bus->id in drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c stmmac_mdio_register) and this needs to be unique.
This allows to avoid needing to define ethernet aliases for devices with multiple stmmac controllers (such as the Rockchip RK3588) for multiple stmmac devices to probe properly.
Obviously, the bus_id isn't guaranteed to be stable across reboots if no alias is set for the device but that is easily fixed by simply adding an alias if this is desired.
--- drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +9 -2
@@ -430,6 +430,7 @@ stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac)struct device_node *np = pdev->dev.of_node;struct plat_stmmacenet_data *plat;struct stmmac_dma_cfg *dma_cfg; +static int bus_id = -ENODEV ;int phy_mode;void *ret;int rc;
@@ -465,8 +466,14 @@ stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac)of_property_read_u32 (np,"max-speed" , &plat->max_speed); plat->bus_id =of_alias_get_id (np,"ethernet" ); -if (plat->bus_id <0 ) - plat->bus_id =0 ; +if (plat->bus_id <0 ) { +if (bus_id <0 ) + bus_id =of_alias_get_highest_id ("ethernet" ); +/* No ethernet alias found, init at -1 so first bus_id is 0 */ +if (bus_id <0 ) + bus_id =-1 ; + plat->bus_id = ++bus_id; + }/* Default to phy auto-detection */ plat->phy_addr =-1 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 561/780 gve: Fix RX_BUFFERS_POSTED stat to report per-queue fill_cnt
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alok Tiwari <[email protected]>
[ Upstream commit f41a94aade120dc60322865f363cee7865f2df01 ]
Previously, the RX_BUFFERS_POSTED stat incorrectly reported the fill_cnt from RX queue 0 for all queues, resulting in inaccurate per-queue statistics.
Fix this by correctly indexing priv->rx[idx].fill_cnt for each RX queue.
--- drivers/net/ethernet/google/gve/gve_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/google/gve/gve_main.c +1 -1
@@ -2153,7 +2153,7 @@ void gve_handle_report_stats(struct gve_priv *priv) }; stats[stats_idx++] = (struct stats ) { .stat_name =cpu_to_be32 (RX_BUFFERS_POSTED ), - .value =cpu_to_be64 (priv->rx[0 ].fill_cnt), + .value =cpu_to_be64 (priv->rx[idx].fill_cnt), .queue_id =cpu_to_be32 (idx), }; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 562/780 net: tipc: fix refcount warning in tipc_aead_encrypt
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Charalampos Mitrodimas <[email protected]>
[ Upstream commit f29ccaa07cf3d35990f4d25028cc55470d29372b ]
syzbot reported a refcount warning [1] caused by calling get_net() on a network namespace that is being destroyed (refcount=0). This happens when a TIPC discovery timer fires during network namespace cleanup.
The recently added get_net() call in commit e279024617134 ("net/tipc:
fix slab-use-after-free Read in tipc_aead_encrypt_done") attempts to hold a reference to the network namespace. However, if the namespace is already being destroyed, its refcount might be zero, leading to the use-after-free warning.
Replace get_net() with maybe_get_net(), which safely checks if the refcount is non-zero before incrementing it. If the namespace is being destroyed, return -ENODEV early, after releasing the bearer reference.
[1]: https://lore.kernel.org/all/[email protected]/T/#m12019cf9ae77e1954f666914640efa36d52704a2
--- net/tipc/crypto.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
net/tipc/crypto.c +5 -1
@@ -818,7 +818,11 @@ static int tipc_aead_encrypt(struct tipc_aead *aead, struct sk_buff *skb, }/* Get net to avoid freed tipc_crypto when delete namespace */ -get_net (aead->crypto->net); +if (!maybe_get_net (aead->crypto->net)) { +tipc_bearer_put (b); + rc = -ENODEV ; + goto exit; + }/* Now, do encrypt */ rc =crypto_aead_encrypt (req);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 563/780 driver: net: ethernet: mtk_star_emac: fix suspend/resume issue
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yanqing Wang <[email protected]>
[ Upstream commit ba99c627aac85bc746fb4a6e2d79edb3ad100326 ]
Identify the cause of the suspend/resume hang: netif_carrier_off() is called during link state changes and becomes stuck while executing linkwatch_work().
To resolve this issue, call netif_device_detach() during the Ethernet suspend process to temporarily detach the network device from the kernel and prevent the suspend/resume hang.
--- drivers/net/ethernet/mediatek/mtk_star_emac.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ethernet/mediatek/mtk_star_emac.c +4 -0
@@ -1463,6 +1463,8 @@ static __maybe_unused int mtk_star_suspend(struct device *dev)if (netif_running (ndev))mtk_star_disable (ndev); +netif_device_detach (ndev); +clk_bulk_disable_unprepare (MTK_STAR_NCLKS , priv->clks);return 0 ;
@@ -1487,6 +1489,8 @@ static __maybe_unused int mtk_star_resume(struct device *dev)clk_bulk_disable_unprepare (MTK_STAR_NCLKS , priv->clks); } +netif_device_attach (ndev); +return ret; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 564/780 net/mlx4_en: Prevent potential integer overflow calculating Hz
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit 54d34165b4f786d7fea8412a18fb4a54c1eab623 ]
The "freq" variable is in terms of MHz and "max_val_cycles" is in terms of Hz. The fact that "max_val_cycles" is a u64 suggests that support for high frequency is intended but the "freq_khz * 1000" would overflow the u32 type if we went above 4GHz. Use unsigned long long type for the mutliplication to prevent that.
--- drivers/net/ethernet/mellanox/mlx4/en_clock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx4/en_clock.c +1 -1
@@ -249,7 +249,7 @@ static const struct ptp_clock_info mlx4_en_ptp_clock_info = {static u32 freq_to_shift (u16 freq) {u32 freq_khz = freq *1000 ; -u64 max_val_cycles = freq_khz *1000 *MLX4_EN_WRAP_AROUND_SEC ; +u64 max_val_cycles = freq_khz *1000ULL *MLX4_EN_WRAP_AROUND_SEC ;u64 max_val_cycles_rounded =1ULL <<fls64 (max_val_cycles -1 );/* calculate max possible multiplier in order to fit in 64bit */ u64 max_mul =div64_u64 (ULLONG_MAX , max_val_cycles_rounded);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 565/780 net: lan966x: Make sure to insert the vlan tags also in host mode
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Horatiu Vultur <[email protected]>
[ Upstream commit 27eab4c644236a9324084a70fe79e511cbd07393 ]
When running these commands on DUT (and similar at the other end) ip link set dev eth0 up
ip link add link eth0 name eth0.10 type vlan id 10
ip addr add 10.0.0.1/24 dev eth0.10
ip link set dev eth0.10 up
ping 10.0.0.2
The ping will fail.
The reason why is failing is because, the network interfaces for lan966x have a flag saying that the HW can insert the vlan tags into the frames(NETIF_F_HW_VLAN_CTAG_TX). Meaning that the frames that are transmitted don't have the vlan tag inside the skb data, but they have it inside the skb. We already get that vlan tag and put it in the IFH but the problem is that we don't configure the HW to rewrite the frame when the interface is in host mode.
The fix consists in actually configuring the HW to insert the vlan tag if it is different than 0.
--- .../ethernet/microchip/lan966x/lan966x_main.c | 1 + .../ethernet/microchip/lan966x/lan966x_main.h | 1 + .../microchip/lan966x/lan966x_switchdev.c | 1 + .../ethernet/microchip/lan966x/lan966x_vlan.c | 21 +++++++++++++++++++ 4 files changed, 24 insertions(+)
drivers/net/ethernet/microchip/lan966x/lan966x_main.c +1 -0
@@ -879,6 +879,7 @@ static int lan966x_probe_port(struct lan966x *lan966x, u32 p,lan966x_vlan_port_set_vlan_aware (port,0 );lan966x_vlan_port_set_vid (port,HOST_PVID , false, false);lan966x_vlan_port_apply (port); +lan966x_vlan_port_rew_host (port);return 0 ; }
drivers/net/ethernet/microchip/lan966x/lan966x_main.h +1 -0
@@ -497,6 +497,7 @@ void lan966x_vlan_port_apply(struct lan966x_port *port);bool lan966x_vlan_cpu_member_cpu_vlan_mask (struct lan966x *lan966x,u16 vid);void lan966x_vlan_port_set_vlan_aware (struct lan966x_port *port,bool vlan_aware); +void lan966x_vlan_port_rew_host (struct lan966x_port *port); int lan966x_vlan_port_set_vid(struct lan966x_port *port, u16 vid, bool pvid,
drivers/net/ethernet/microchip/lan966x/lan966x_switchdev.c +1 -0
@@ -297,6 +297,7 @@ static void lan966x_port_bridge_leave(struct lan966x_port *port,lan966x_vlan_port_set_vlan_aware (port, false);lan966x_vlan_port_set_vid (port,HOST_PVID , false, false);lan966x_vlan_port_apply (port); +lan966x_vlan_port_rew_host (port); } int lan966x_port_changeupper(struct net_device *dev,
drivers/net/ethernet/microchip/lan966x/lan966x_vlan.c +21 -0
@@ -149,6 +149,27 @@ void lan966x_vlan_port_set_vlan_aware(struct lan966x_port *port, port->vlan_aware = vlan_aware; } +/* When the interface is in host mode, the interface should not be vlan aware +* but it should insert all the tags that it gets from the network stack. +* The tags are not in the data of the frame but actually in the skb and the ifh +* is configured already to get this tag. So what we need to do is to update the +* rewriter to insert the vlan tag for all frames which have a vlan tag +* different than 0. +*/ +void lan966x_vlan_port_rew_host (struct lan966x_port *port) +{ +struct lan966x *lan966x = port->lan966x; +u32 val; + +/* Tag all frames except when VID=0*/ + val =REW_TAG_CFG_TAG_CFG_SET (2 ); + +/* Update only some bits in the register */ +lan_rmw (val, +REW_TAG_CFG_TAG_CFG , + lan966x,REW_TAG_CFG (port->chip_port)); +} +void lan966x_vlan_port_apply (struct lan966x_port *port) {struct lan966x *lan966x = port->lan966x;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 566/780 md/raid1,raid10: dont handle IO error for REQ_RAHEAD and REQ_NOWAIT
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yu Kuai <[email protected]>
[ Upstream commit 9f346f7d4ea73692b82f5102ca8698e4040469ea ]
IO with REQ_RAHEAD or REQ_NOWAIT can fail early, even if the storage medium is fine, hence record badblocks or remove the disk from array does not make sense.
This problem if found by lvm2 test lvcreate-large-raid, where dm-zero will fail read ahead IO directly.
--- drivers/md/raid1-10.c | 10 ++++++++++ drivers/md/raid1.c | 19 ++++++++++--------- drivers/md/raid10.c | 11 ++++++----- 3 files changed, 26 insertions(+), 14 deletions(-)
drivers/md/raid1-10.c +10 -0
@@ -293,3 +293,13 @@ static inline bool raid1_should_read_first(struct mddev *mddev,return false; } + +/* +* bio with REQ_RAHEAD or REQ_NOWAIT can fail at anytime, before such IO is +* submitted to the underlying disks, hence don't record badblocks or retry +* in this case. +*/ +static inline bool raid1_should_handle_error (struct bio *bio) +{ +return !(bio->bi_opf & (REQ_RAHEAD |REQ_NOWAIT )); +}
drivers/md/raid1.c +10 -9
@@ -373,14 +373,16 @@ static void raid1_end_read_request(struct bio *bio)*/ update_head_pos (r1_bio->read_disk, r1_bio); -if (uptodate) +if (uptodate) {set_bit (R1BIO_Uptodate, &r1_bio->state); -else if (test_bit (FailFast, &rdev->flags) && -test_bit (R1BIO_FailFast, &r1_bio->state)) + }else if (test_bit (FailFast, &rdev->flags) && +test_bit (R1BIO_FailFast, &r1_bio->state)) {/* This was a fail-fast read so we definitely * want to retry */ ; -else { + }else if (!raid1_should_handle_error (bio)) { + uptodate =1 ; + }else {/* If all other devices have failed, we want to return * the error upwards rather than fail the last device. * Here we redefine "uptodate" to mean "Don't want to retry"
@@ -451,16 +453,15 @@ static void raid1_end_write_request(struct bio *bio)struct bio *to_put =NULL ;int mirror =find_bio_disk (r1_bio, bio);struct md_rdev *rdev = conf->mirrors[mirror].rdev; -bool discard_error;sector_t lo = r1_bio->sector;sector_t hi = r1_bio->sector + r1_bio->sectors; - - discard_error = bio->bi_status &&bio_op (bio) ==REQ_OP_DISCARD ; +bool ignore_error = !raid1_should_handle_error (bio) || + (bio->bi_status &&bio_op (bio) ==REQ_OP_DISCARD );/* * 'one mirror IO has finished' event handler: */ -if (bio->bi_status && !discard_error) { +if (bio->bi_status && !ignore_error) {set_bit (WriteErrorSeen, &rdev->flags);if (!test_and_set_bit (WantReplacement, &rdev->flags)) set_bit(MD_RECOVERY_NEEDED, &
@@ -511,7 +512,7 @@ static void raid1_end_write_request(struct bio *bio)/* Maybe we can clear some bad blocks. */ if (rdev_has_badblock (rdev, r1_bio->sector, r1_bio->sectors) && - !discard_error) { + !ignore_error) { r1_bio->bios[mirror] =IO_MADE_GOOD ;set_bit (R1BIO_MadeGood, &r1_bio->state); }
drivers/md/raid10.c +6 -5
@@ -399,6 +399,8 @@ static void raid10_end_read_request(struct bio *bio)* wait for the 'master' bio. */ set_bit (R10BIO_Uptodate, &r10_bio->state); + }else if (!raid1_should_handle_error (bio)) { + uptodate =1 ; }else {/* If all other devices that store this block have * failed, we want to return the error upwards rather
@@ -456,9 +458,8 @@ static void raid10_end_write_request(struct bio *bio)int slot, repl;struct md_rdev *rdev =NULL ;struct bio *to_put =NULL ; -bool discard_error; - - discard_error = bio->bi_status &&bio_op (bio) ==REQ_OP_DISCARD ; +bool ignore_error = !raid1_should_handle_error (bio) || + (bio->bi_status &&bio_op (bio) ==REQ_OP_DISCARD ); dev =find_bio_disk (conf, r10_bio, bio, &slot, &repl);
@@ -472,7 +473,7 @@ static void raid10_end_write_request(struct bio *bio)/* * this branch is our 'one mirror IO has finished' event handler: */ -if (bio->bi_status && !discard_error) { +if (bio->bi_status && !ignore_error) {if (repl)/* Never record new bad blocks to replacement, * just fail it.
@@ -527,7 +528,7 @@ static void raid10_end_write_request(struct bio *bio)/* Maybe we can clear some bad blocks. */ if (rdev_has_badblock (rdev, r10_bio->devs[slot].addr, r10_bio->sectors) && - !discard_error) { + !ignore_error) {bio_put (bio);if (repl) r10_bio->devs[slot].repl_bio =IO_MADE_GOOD ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 567/780 spi: bcm63xx-spi: fix shared reset
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Álvaro Fernández Rojas <[email protected]>
[ Upstream commit 5ad20e3d8cfe3b2e42bbddc7e0ebaa74479bb589 ]
Some bmips SoCs (bcm6362, bcm63268) share the same SPI reset for both SPI and HSSPI controllers, so reset shouldn't be exclusive.
--- drivers/spi/spi-bcm63xx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-bcm63xx.c +1 -1
@@ -523,7 +523,7 @@ static int bcm63xx_spi_probe(struct platform_device *pdev)return PTR_ERR (clk); } - reset =devm_reset_control_get_optional_exclusive (dev,NULL ); + reset =devm_reset_control_get_optional_shared (dev,NULL );if (IS_ERR (reset))return PTR_ERR (reset);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 568/780 spi: bcm63xx-hsspi: fix shared reset
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Álvaro Fernández Rojas <[email protected]>
[ Upstream commit 3d6d84c8f2f66d3fd6a43a1e2ce8e6b54c573960 ]
Some bmips SoCs (bcm6362, bcm63268) share the same SPI reset for both SPI and HSSPI controllers, so reset shouldn't be exclusive.
--- drivers/spi/spi-bcm63xx-hsspi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-bcm63xx-hsspi.c +1 -1
@@ -745,7 +745,7 @@ static int bcm63xx_hsspi_probe(struct platform_device *pdev)if (IS_ERR (clk))return PTR_ERR (clk); - reset =devm_reset_control_get_optional_exclusive (dev,NULL ); + reset =devm_reset_control_get_optional_shared (dev,NULL );if (IS_ERR (reset))return PTR_ERR (reset);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 569/780 Bluetooth: MGMT: reject malformed HCI_CMD_SYNC commands
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Antipov <[email protected]>
[ Upstream commit 03f1700b9b4d4f2fed3165370f3c23db76553178 ]
In 'mgmt_hci_cmd_sync()', check whether the size of parameters passed in 'struct mgmt_cp_hci_cmd_sync' matches the total size of the data (i.e. 'sizeof(struct mgmt_cp_hci_cmd_sync)' plus trailing bytes). Otherwise, large invalid 'params_len' will cause 'hci_cmd_sync_alloc()' to do 'skb_put_data()' from an area beyond the one actually passed to 'mgmt_hci_cmd_sync()'.
--- net/bluetooth/mgmt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/bluetooth/mgmt.c +2 -1
@@ -2566,7 +2566,8 @@ static int mgmt_hci_cmd_sync(struct sock *sk, struct hci_dev *hdev,struct mgmt_pending_cmd *cmd;int err; -if (len <sizeof (*cp)) +if (len != (offsetof(struct mgmt_cp_hci_cmd_sync , params) + +le16_to_cpu (cp->params_len)))return mgmt_cmd_status (sk, hdev->id,MGMT_OP_HCI_CMD_SYNC ,MGMT_STATUS_INVALID_PARAMS );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 570/780 Bluetooth: L2CAP: Fix not responding with L2CAP_CR_LE_ENCRYPTION
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luiz Augusto von Dentz <[email protected]>
[ Upstream commit 03dba9cea72f977e873e4e60e220fa596959dd8f ]
Depending on the security set the response to L2CAP_LE_CONN_REQ shall be just L2CAP_CR_LE_ENCRYPTION if only encryption when BT_SECURITY_MEDIUM is selected since that means security mode 2 which doesn't require authentication which is something that is covered in the qualification test L2CAP/LE/CFC/BV-25-C.
--- net/bluetooth/l2cap_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/bluetooth/l2cap_core.c +2 -1
@@ -4870,7 +4870,8 @@ static int l2cap_le_connect_req(struct l2cap_conn *conn,if (!smp_sufficient_security (conn->hcon, pchan->sec_level,SMP_ALLOW_STK )) { - result =L2CAP_CR_LE_AUTHENTICATION ; + result = pchan->sec_level ==BT_SECURITY_MEDIUM ? +L2CAP_CR_LE_ENCRYPTION :L2CAP_CR_LE_AUTHENTICATION ; chan =NULL ; goto response_unlock; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 571/780 ice: fix Tx scheduler error handling in XDP callback
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Kubiak <[email protected]>
[ Upstream commit 0153f36041b8e52019ebfa8629c13bf8f9b0a951 ]
When the XDP program is loaded, the XDP callback adds new Tx queues. This means that the callback must update the Tx scheduler with the new queue number. In the event of a Tx scheduler failure, the XDP callback should also fail and roll back any changes previously made for XDP preparation.
The previous implementation had a bug that not all changes made by the XDP callback were rolled back. This caused the crash with the following call trace:
[ +9.549584] ice 0000:ca:00.0: Failed VSI LAN queue config for XDP, error: -5 [ +0.382335] Oops: general protection fault, probably for non-canonical address 0x50a2250a90495525: 0000 [#1] SMP NOPTI [ +0.010710] CPU: 103 UID: 0 PID: 0 Comm: swapper/103 Not tainted 6.14.0-net-next-mar-31+ #14 PREEMPT(voluntary) [ +0.010175] Hardware name: Intel Corporation M50CYP2SBSTD/M50CYP2SBSTD, BIOS SE5C620.86B.01.01.0005.2202160810 02/16/2022 [ +0.010946] RIP: 0010:__ice_update_sample+0x39/0xe0 [ice]
[...]
[ +0.002715] Call Trace: [ +0.002452] <IRQ> [ +0.002021] ? __die_body.cold+0x19/0x29 [ +0.003922] ? die_addr+0x3c/0x60 [ +0.003319] ? exc_general_protection+0x17c/0x400 [ +0.004707] ? asm_exc_general_protection+0x26/0x30 [ +0.004879] ? __ice_update_sample+0x39/0xe0 [ice] [ +0.004835] ice_napi_poll+0x665/0x680 [ice] [ +0.004320] __napi_poll+0x28/0x190 [ +0.003500] net_rx_action+0x198/0x360 [ +0.003752] ? update_rq_clock+0x39/0x220 [ +0.004013] handle_softirqs+0xf1/0x340 [ +0.003840] ? sched_clock_cpu+0xf/0x1f0 [ +0.003925] __irq_exit_rcu+0xc2/0xe0 [ +0.003665] common_interrupt+0x85/0xa0 [ +0.003839] </IRQ> [ +0.002098] <TASK> [ +0.002106] asm_common_interrupt+0x26/0x40 [ +0.004184] RIP: 0010:cpuidle_enter_state+0xd3/0x690
Fix this by performing the missing unmapping of XDP queues from q_vectors and setting the XDP rings pointer back to NULL after all those queues are released.
Also, add an immediate exit from the XDP callback in case of ring preparation failure.
--- drivers/net/ethernet/intel/ice/ice_main.c | 47 ++++++++++++++++------- 1 file changed, 33 insertions(+), 14 deletions(-)
drivers/net/ethernet/intel/ice/ice_main.c +33 -14
@@ -2740,6 +2740,27 @@ void ice_map_xdp_rings(struct ice_vsi *vsi) } } +/** +* ice_unmap_xdp_rings - Unmap XDP rings from interrupt vectors +* @vsi: the VSI with XDP rings being unmapped +*/ +static void ice_unmap_xdp_rings (struct ice_vsi *vsi) +{ +int v_idx; + +ice_for_each_q_vector (vsi, v_idx) { +struct ice_q_vector *q_vector = vsi->q_vectors[v_idx]; +struct ice_tx_ring *ring; + +ice_for_each_tx_ring (ring, q_vector->tx) +if (!ring->tx_buf || !ice_ring_is_xdp (ring)) +break ; + +/* restore the value of last node prior to XDP setup */ + q_vector->tx.tx_ring = ring; + } +} +/** * ice_prepare_xdp_rings - Allocate, configure and setup Tx rings for XDP * @vsi: VSI to bring up Tx rings used by XDP
@@ -2803,7 +2824,7 @@ int ice_prepare_xdp_rings(struct ice_vsi *vsi, struct bpf_prog *prog,if (status) {dev_err (dev,"Failed VSI LAN queue config for XDP, error: %d\n" , status); - goto clear_xdp_rings; + goto unmap_xdp_rings; }/* assign the prog only when it's not already present on VSI;
@@ -2819,6 +2840,8 @@ int ice_prepare_xdp_rings(struct ice_vsi *vsi, struct bpf_prog *prog,ice_vsi_assign_bpf_prog (vsi, prog);return 0 ; +unmap_xdp_rings: +ice_unmap_xdp_rings (vsi); clear_xdp_rings:ice_for_each_xdp_txq (vsi, i)if (vsi->xdp_rings[i]) {
@@ -2835,6 +2858,8 @@ int ice_prepare_xdp_rings(struct ice_vsi *vsi, struct bpf_prog *prog,mutex_unlock (&pf->avail_q_mutex);devm_kfree (dev, vsi->xdp_rings); + vsi->xdp_rings =NULL ; +return -ENOMEM ; }
@@ -2850,7 +2875,7 @@ int ice_destroy_xdp_rings(struct ice_vsi *vsi, enum ice_xdp_cfg cfg_type) {u16 max_txqs[ICE_MAX_TRAFFIC_CLASS ] = {0 };struct ice_pf *pf = vsi->back; -int i, v_idx; +int i;/* q_vectors are freed in reset path so there's no point in detaching * rings
@@ -2858,17 +2883,7 @@ int ice_destroy_xdp_rings(struct ice_vsi *vsi, enum ice_xdp_cfg cfg_type)if (cfg_type ==ICE_XDP_CFG_PART ) goto free_qmap; -ice_for_each_q_vector (vsi, v_idx) { -struct ice_q_vector *q_vector = vsi->q_vectors[v_idx]; -struct ice_tx_ring *ring; - -ice_for_each_tx_ring (ring, q_vector->tx) -if (!ring->tx_buf || !ice_ring_is_xdp (ring)) -break ; - -/* restore the value of last node prior to XDP setup */ - q_vector->tx.tx_ring = ring; - } +ice_unmap_xdp_rings (vsi); free_qmap:mutex_lock (&pf->avail_q_mutex);
@@ -3013,11 +3028,14 @@ ice_xdp_setup_prog(struct ice_vsi *vsi, struct bpf_prog *prog, xdp_ring_err =ice_vsi_determine_xdp_res (vsi);if (xdp_ring_err) {NL_SET_ERR_MSG_MOD (extack,"Not enough Tx resources for XDP" ); + goto resume_if; }else { xdp_ring_err =ice_prepare_xdp_rings (vsi, prog,ICE_XDP_CFG_FULL ); -if (xdp_ring_err) +if (xdp_ring_err) {NL_SET_ERR_MSG_MOD (extack,"Setting up XDP Tx resources failed" ); + goto resume_if; + } }xdp_features_set_redirect_target (vsi->netdev, true);/* reallocate Rx queues that are used for zero-copy */
@@ -3035,6 +3053,7 @@ ice_xdp_setup_prog(struct ice_vsi *vsi, struct bpf_prog *prog,NL_SET_ERR_MSG_MOD (extack,"Freeing XDP Rx resources failed" ); } +resume_if:if (if_running) ret =ice_up (vsi);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 572/780 ice: create new Tx scheduler nodes for new queues only
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Kubiak <[email protected]>
[ Upstream commit 6fa2942578472c9cab13a8fc1dae0d830193e0a1 ]
The current implementation of the Tx scheduler tree attempts to create nodes for all Tx queues, ignoring the fact that some queues may already exist in the tree. For example, if the VSI already has 128 Tx queues and the user requests for 16 new queues, the Tx scheduler will compute the tree for 272 queues (128 existing queues + 144 new queues), instead of 144 queues (128 existing queues and 16 new queues).
Fix that by modifying the node count calculation algorithm to skip the queues that already exist in the tree.
--- drivers/net/ethernet/intel/ice/ice_sched.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/net/ethernet/intel/ice/ice_sched.c +6 -5
@@ -1604,16 +1604,16 @@ ice_sched_get_agg_node(struct ice_port_info *pi, struct ice_sched_node *tc_node,/** * ice_sched_calc_vsi_child_nodes - calculate number of VSI child nodes * @hw: pointer to the HW struct -* @num_qs: number of queues +* @num_new_qs: number of new queues that will be added to the tree * @num_nodes: num nodes array * * This function calculates the number of VSI child nodes based on the * number of queues. */ static void -ice_sched_calc_vsi_child_nodes (struct ice_hw *hw,u16 num_qs,u16 *num_nodes) +ice_sched_calc_vsi_child_nodes (struct ice_hw *hw,u16 num_new_qs,u16 *num_nodes) { -u16 num = num_qs; +u16 num = num_new_qs;u8 i, qgl, vsil; qgl =ice_sched_get_qgrp_layer (hw);
@@ -1863,8 +1863,9 @@ ice_sched_update_vsi_child_nodes(struct ice_port_info *pi, u16 vsi_handle,return status; } -if (new_numqs) -ice_sched_calc_vsi_child_nodes (hw, new_numqs, new_num_nodes); +ice_sched_calc_vsi_child_nodes (hw, new_numqs - prev_numqs, + new_num_nodes); +/* Keep the max number of queue configuration all the time. Update the * tree only if number of queues > previous number of queues. This may * leave some extra nodes in the tree if number of queues < previous
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 573/780 ice: fix rebuilding the Tx scheduler tree for large queue counts
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Kubiak <[email protected]>
[ Upstream commit 73145e6d81070d34a21431c9e0d7aaf2f29ca048 ]
The current implementation of the Tx scheduler allows the tree to be rebuilt as the user adds more Tx queues to the VSI. In such a case, additional child nodes are added to the tree to support the new number of queues.
Unfortunately, this algorithm does not take into account that the limit of the VSI support node may be exceeded, so an additional node in the VSI layer may be required to handle all the requested queues.
Such a scenario occurs when adding XDP Tx queues on machines with many CPUs. Although the driver still respects the queue limit returned by the FW, the Tx scheduler was unable to add those queues to its tree and returned one of the errors below.
Such a scenario occurs when adding XDP Tx queues on machines with many CPUs (e.g. at least 321 CPUs, if there is already 128 Tx/Rx queue pairs). Although the driver still respects the queue limit returned by the FW, the Tx scheduler was unable to add those queues to its tree and returned the following errors:
Failed VSI LAN queue config for XDP, error: -5
or:
Failed to set LAN Tx queue context, error: -22
Fix this problem by extending the tree rebuild algorithm to check if the current VSI node can support the requested number of queues. If it cannot, create as many additional VSI support nodes as necessary to handle all the required Tx queues. Symmetrically, adjust the VSI node removal algorithm to remove all nodes associated with the given VSI. Also, make the search for the next free VSI node more restrictive. That is, add queue group nodes only to the VSI support nodes that have a matching VSI handle.
Finally, fix the comment describing the tree update algorithm to better reflect the current scenario.
--- drivers/net/ethernet/intel/ice/ice_sched.c | 170 +++++++++++++++++---- 1 file changed, 142 insertions(+), 28 deletions(-)
drivers/net/ethernet/intel/ice/ice_sched.c +142 -28
@@ -84,6 +84,27 @@ ice_sched_find_node_by_teid(struct ice_sched_node *start_node, u32 teid)return NULL ; } +/** +* ice_sched_find_next_vsi_node - find the next node for a given VSI +* @vsi_node: VSI support node to start search with +* +* Return: Next VSI support node, or NULL. +* +* The function returns a pointer to the next node from the VSI layer +* assigned to the given VSI, or NULL if there is no such a node. +*/ +static struct ice_sched_node * +ice_sched_find_next_vsi_node (struct ice_sched_node *vsi_node) +{ +unsigned int vsi_handle = vsi_node->vsi_handle; + +while ((vsi_node = vsi_node->sibling) !=NULL ) +if (vsi_node->vsi_handle == vsi_handle) +break ; + +return vsi_node; +} +/** * ice_aqc_send_sched_elem_cmd - send scheduling elements cmd * @hw: pointer to the HW struct
@@ -1084,8 +1105,10 @@ ice_sched_add_nodes_to_layer(struct ice_port_info *pi,if (parent->num_children < max_child_nodes) { new_num_nodes = max_child_nodes - parent->num_children; }else { -/* This parent is full, try the next sibling */ - parent = parent->sibling; +/* This parent is full, +* try the next available sibling. +*/ + parent =ice_sched_find_next_vsi_node (parent);/* Don't modify the first node TEID memory if the * first node was added already in the above call. * Instead send some temp memory for all other
@@ -1528,12 +1551,23 @@ ice_sched_get_free_qparent(struct ice_port_info *pi, u16 vsi_handle, u8 tc,/* get the first queue group node from VSI sub-tree */ qgrp_node =ice_sched_get_first_node (pi, vsi_node, qgrp_layer);while (qgrp_node) { +struct ice_sched_node *next_vsi_node; +/* make sure the qgroup node is part of the VSI subtree */ if (ice_sched_find_node_in_subtree (pi->hw, vsi_node, qgrp_node))if (qgrp_node->num_children < max_children && qgrp_node->owner == owner)break ; qgrp_node = qgrp_node->sibling; +if (qgrp_node) +continue ; + + next_vsi_node =ice_sched_find_next_vsi_node (vsi_node); +if (!next_vsi_node) +break ; + + vsi_node = next_vsi_node; + qgrp_node =ice_sched_get_first_node (pi, vsi_node, qgrp_layer); }/* Select the best queue group */
@@ -1779,7 +1813,11 @@ ice_sched_add_vsi_support_nodes(struct ice_port_info *pi, u16 vsi_handle,if (!parent)return -EIO ; -if (i == vsil) +/* Do not modify the VSI handle for already existing VSI nodes, +* (if no new VSI node was added to the tree). +* Assign the VSI handle only to newly added VSI nodes. +*/ +if (i == vsil && num_added) parent->vsi_handle = vsi_handle; }
@@ -1812,6 +1850,41 @@ ice_sched_add_vsi_to_topo(struct ice_port_info *pi, u16 vsi_handle, u8 tc) num_nodes); } +/** +* ice_sched_recalc_vsi_support_nodes - recalculate VSI support nodes count +* @hw: pointer to the HW struct +* @vsi_node: pointer to the leftmost VSI node that needs to be extended +* @new_numqs: new number of queues that has to be handled by the VSI +* @new_num_nodes: pointer to nodes count table to modify the VSI layer entry +* +* This function recalculates the number of supported nodes that need to +* be added after adding more Tx queues for a given VSI. +* The number of new VSI support nodes that shall be added will be saved +* to the @new_num_nodes table for the VSI layer. +*/ +static void +ice_sched_recalc_vsi_support_nodes (struct ice_hw *hw, +struct ice_sched_node *vsi_node, +unsigned int new_numqs,u16 *new_num_nodes) +{ +u32 vsi_nodes_cnt =1 ; +u32 max_queue_cnt =1 ; +u32 qgl, vsil; + + qgl =ice_sched_get_qgrp_layer (hw); + vsil =ice_sched_get_vsi_layer (hw); + +for (u32 i = vsil; i <= qgl; i++) + max_queue_cnt *= hw->max_children[i]; + +while ((vsi_node =ice_sched_find_next_vsi_node (vsi_node)) !=NULL ) + vsi_nodes_cnt++; + +if (new_numqs > (max_queue_cnt * vsi_nodes_cnt)) + new_num_nodes[vsil] =DIV_ROUND_UP (new_numqs, max_queue_cnt) - + vsi_nodes_cnt; +} +/** * ice_sched_update_vsi_child_nodes - update VSI child nodes * @pi: port information structure
@@ -1863,16 +1936,25 @@ ice_sched_update_vsi_child_nodes(struct ice_port_info *pi, u16 vsi_handle,return status; } +ice_sched_recalc_vsi_support_nodes (hw, vsi_node, + new_numqs, new_num_nodes);ice_sched_calc_vsi_child_nodes (hw, new_numqs - prev_numqs, new_num_nodes); -/* Keep the max number of queue configuration all the time. Update the -* tree only if number of queues > previous number of queues. This may +/* Never decrease the number of queues in the tree. Update the tree +* only if number of queues > previous number of queues. This may * leave some extra nodes in the tree if number of queues < previous * number but that wouldn't harm anything. Removing those extra nodes * may complicate the code if those nodes are part of SRL or * individually rate limited. +* Also, add the required VSI support nodes if the existing ones cannot +* handle the requested new number of queues. */ + status =ice_sched_add_vsi_support_nodes (pi, vsi_handle, tc_node, + new_num_nodes); +if (status) +return status; + status =ice_sched_add_vsi_child_nodes (pi, vsi_handle, tc_node, new_num_nodes, owner);if (status)
@@ -2013,6 +2095,58 @@ static bool ice_sched_is_leaf_node_present(struct ice_sched_node *node)return (node->info.data.elem_type ==ICE_AQC_ELEM_TYPE_LEAF ); } +/** +* ice_sched_rm_vsi_subtree - remove all nodes assigned to a given VSI +* @pi: port information structure +* @vsi_node: pointer to the leftmost node of the VSI to be removed +* @owner: LAN or RDMA +* @tc: TC number +* +* Return: Zero in case of success, or -EBUSY if the VSI has leaf nodes in TC. +* +* This function removes all the VSI support nodes associated with a given VSI +* and its LAN or RDMA children nodes from the scheduler tree. +*/ +static int +ice_sched_rm_vsi_subtree (struct ice_port_info *pi, +struct ice_sched_node *vsi_node,u8 owner,u8 tc) +{ +u16 vsi_handle = vsi_node->vsi_handle; +bool all_vsi_nodes_removed = true; +int j =0 ; + +while (vsi_node) { +struct ice_sched_node *next_vsi_node; + +if (ice_sched_is_leaf_node_present (vsi_node)) { +ice_debug (pi->hw,ICE_DBG_SCHED ,"VSI has leaf nodes in TC %d\n" , tc); +return -EBUSY ; + } +while (j < vsi_node->num_children) { +if (vsi_node->children[j]->owner == owner) +ice_free_sched_node (pi, vsi_node->children[j]); +else + j++; + } + + next_vsi_node =ice_sched_find_next_vsi_node (vsi_node); + +/* remove the VSI if it has no children */ +if (!vsi_node->num_children) +ice_free_sched_node (pi, vsi_node); +else + all_vsi_nodes_removed = false; + + vsi_node = next_vsi_node; + } + +/* clean up aggregator related VSI info if any */ +if (all_vsi_nodes_removed) +ice_sched_rm_agg_vsi_info (pi, vsi_handle); + +return 0 ; +} +/** * ice_sched_rm_vsi_cfg - remove the VSI and its children nodes * @pi: port information structure
@@ -2039,7 +2173,6 @@ ice_sched_rm_vsi_cfg(struct ice_port_info *pi, u16 vsi_handle, u8 owner)ice_for_each_traffic_class (i) {struct ice_sched_node *vsi_node, *tc_node; -u8 j =0 ; tc_node =ice_sched_get_tc_node (pi, i);if (!tc_node)
@@ -2049,31 +2182,12 @@ ice_sched_rm_vsi_cfg(struct ice_port_info *pi, u16 vsi_handle, u8 owner)if (!vsi_node)continue ; -if (ice_sched_is_leaf_node_present (vsi_node)) { -ice_debug (pi->hw,ICE_DBG_SCHED ,"VSI has leaf nodes in TC %d\n" , i); - status = -EBUSY ; + status =ice_sched_rm_vsi_subtree (pi, vsi_node, owner, i); +if (status) goto exit_sched_rm_vsi_cfg; - } -while (j < vsi_node->num_children) { -if (vsi_node->children[j]->owner == owner) { -ice_free_sched_node (pi, vsi_node->children[j]); -/* reset the counter again since the num -* children will be updated after node removal -*/ - j =0 ; - }else { - j++; - } - } -/* remove the VSI if it has no children */ -if (!vsi_node->num_children) { -ice_free_sched_node (pi, vsi_node); - vsi_ctx->sched.vsi_node[i] =NULL ; + vsi_ctx->sched.vsi_node[i] =NULL ; -/* clean up aggregator related VSI info if any */ -ice_sched_rm_agg_vsi_info (pi, vsi_handle); - }if (owner ==ICE_SCHED_NODE_OWNER_LAN ) vsi_ctx->sched.max_lanq[i] =0 ;else
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 574/780 idpf: fix a race in txq wakeup
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Brian Vazquez <[email protected]>
[ Upstream commit 7292af042bcf22e2c18b96ed250f78498a5b28ab ]
Add a helper function to correctly handle the lockless synchronization when the sender needs to block. The paradigm is
if (no_resources()) {
stop_queue();
barrier();
if (!no_resources())
restart_queue();
}netif_subqueue_maybe_stop already handles the paradigm correctly, but the code split the check for resources in three parts, the first one (descriptors) followed the protocol, but the other two (completions and tx_buf) were only doing the first part and so race prone.
Luckily netif_subqueue_maybe_stop macro already allows you to use a function to evaluate the start/stop conditions so the fix only requires the right helper function to evaluate all the conditions at once.
The patch removes idpf_tx_maybe_stop_common since it's no longer needed and instead adjusts separately the conditions for singleq and splitq.
Note that idpf_tx_buf_hw_update doesn't need to check for resources since that will be covered in idpf_tx_splitq_frame.
To reproduce:
Reduce the threshold for pending completions to increase the chances of hitting this pause by changing your kernel:
drivers/net/ethernet/intel/idpf/idpf_txrx.h
-#define IDPF_TX_COMPLQ_OVERFLOW_THRESH(txcq) ((txcq)->desc_count >> 1)
+#define IDPF_TX_COMPLQ_OVERFLOW_THRESH(txcq) ((txcq)->desc_count >> 4)
Use pktgen to force the host to push small pkts very aggressively:
./pktgen_sample02_multiqueue.sh -i eth1 -s 100 -6 -d $IP -m $MAC \
-p 10000-10000 -t 16 -n 0 -v -x -c 64
--- .../ethernet/intel/idpf/idpf_singleq_txrx.c | 9 ++-- drivers/net/ethernet/intel/idpf/idpf_txrx.c | 45 +++++++------------ drivers/net/ethernet/intel/idpf/idpf_txrx.h | 8 ---- 3 files changed, 22 insertions(+), 40 deletions(-)
drivers/net/ethernet/intel/idpf/idpf_singleq_txrx.c +5 -4
@@ -362,17 +362,18 @@ netdev_tx_t idpf_tx_singleq_frame(struct sk_buff *skb, {struct idpf_tx_offload_params offload = { };struct idpf_tx_buf *first; +int csum, tso, needed;unsigned int count;__be16 protocol; -int csum, tso; count =idpf_tx_desc_count_required (tx_q, skb);if (unlikely (!count))return idpf_tx_drop_skb (tx_q, skb); -if (idpf_tx_maybe_stop_common (tx_q, - count +IDPF_TX_DESCS_PER_CACHE_LINE + -IDPF_TX_DESCS_FOR_CTX )) { + needed = count +IDPF_TX_DESCS_PER_CACHE_LINE +IDPF_TX_DESCS_FOR_CTX ; +if (!netif_subqueue_maybe_stop (tx_q->netdev, tx_q->idx, +IDPF_DESC_UNUSED (tx_q), + needed, needed)) {idpf_tx_buf_hw_update (tx_q, tx_q->next_to_use, false);u64_stats_update_begin (&tx_q->stats_sync);
drivers/net/ethernet/intel/idpf/idpf_txrx.c +17 -28
64 lines not on this page · raw message
drivers/net/ethernet/intel/idpf/idpf_txrx.h +0 -8
@@ -1037,12 +1037,4 @@ bool idpf_rx_singleq_buf_hw_alloc_all(struct idpf_rx_queue *rxq, u16 cleaned_count);int idpf_tso (struct sk_buff *skb,struct idpf_tx_offload_params *off); -static inline bool idpf_tx_maybe_stop_common (struct idpf_tx_queue *tx_q, -u32 needed) -{ -return !netif_subqueue_maybe_stop (tx_q->netdev, tx_q->idx, -IDPF_DESC_UNUSED (tx_q), - needed, needed); -} -#endif /* !_IDPF_TXRX_H_ */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 575/780 idpf: avoid mailbox timeout delays during reset
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Emil Tantilov <[email protected]>
[ Upstream commit 9dc63d8ff182150d7d7b318ab9389702a2c0a292 ]
Mailbox operations are not possible while the driver is in reset. Operations that require MBX exchange with the control plane will result in long delays if executed while a reset is in progress:
ethtool -L <inf> combined 8& echo 1 > /sys/class/net/<inf>/device/reset
idpf 0000:83:00.0: HW reset detected
idpf 0000:83:00.0: Device HW Reset initiated
idpf 0000:83:00.0: Transaction timed-out (op:504 cookie:be00 vc_op:504 salt:be timeout:2000ms) idpf 0000:83:00.0: Transaction timed-out (op:508 cookie:bf00 vc_op:508 salt:bf timeout:2000ms) idpf 0000:83:00.0: Transaction timed-out (op:512 cookie:c000 vc_op:512 salt:c0 timeout:2000ms) idpf 0000:83:00.0: Transaction timed-out (op:510 cookie:c100 vc_op:510 salt:c1 timeout:2000ms) idpf 0000:83:00.0: Transaction timed-out (op:509 cookie:c200 vc_op:509 salt:c2 timeout:60000ms) idpf 0000:83:00.0: Transaction timed-out (op:509 cookie:c300 vc_op:509 salt:c3 timeout:60000ms) idpf 0000:83:00.0: Transaction timed-out (op:505 cookie:c400 vc_op:505 salt:c4 timeout:60000ms) idpf 0000:83:00.0: Failed to configure queues for vport 0, -62
Disable mailbox communication in case of a reset, unless it's done during a driver load, where the virtchnl operations are needed to configure the device.
--- drivers/net/ethernet/intel/idpf/idpf_lib.c | 18 +++++++++++++----- .../net/ethernet/intel/idpf/idpf_virtchnl.c | 2 +- .../net/ethernet/intel/idpf/idpf_virtchnl.h | 1 + 3 files changed, 15 insertions(+), 6 deletions(-)
drivers/net/ethernet/intel/idpf/idpf_lib.c +13 -5
@@ -1816,11 +1816,19 @@ void idpf_vc_event_task(struct work_struct *work)if (test_bit (IDPF_REMOVE_IN_PROG , adapter->flags))return ; -if (test_bit (IDPF_HR_FUNC_RESET , adapter->flags) || -test_bit (IDPF_HR_DRV_LOAD , adapter->flags)) { -set_bit (IDPF_HR_RESET_IN_PROG , adapter->flags); -idpf_init_hard_reset (adapter); - } +if (test_bit (IDPF_HR_FUNC_RESET , adapter->flags)) + goto func_reset; + +if (test_bit (IDPF_HR_DRV_LOAD , adapter->flags)) + goto drv_load; + +return ; + +func_reset: +idpf_vc_xn_shutdown (adapter->vcxn_mngr); +drv_load: +set_bit (IDPF_HR_RESET_IN_PROG , adapter->flags); +idpf_init_hard_reset (adapter); }/**
drivers/net/ethernet/intel/idpf/idpf_virtchnl.c +1 -1
@@ -376,7 +376,7 @@ static void idpf_vc_xn_init(struct idpf_vc_xn_manager *vcxn_mngr)* All waiting threads will be woken-up and their transaction aborted. Further * operations on that object will fail. */ -static void idpf_vc_xn_shutdown (struct idpf_vc_xn_manager *vcxn_mngr) +void idpf_vc_xn_shutdown (struct idpf_vc_xn_manager *vcxn_mngr) {int i;
drivers/net/ethernet/intel/idpf/idpf_virtchnl.h +1 -0
@@ -66,5 +66,6 @@ int idpf_send_get_stats_msg(struct idpf_vport *vport);int idpf_send_set_sriov_vfs_msg (struct idpf_adapter *adapter,u16 num_vfs);int idpf_send_get_set_rss_key_msg (struct idpf_vport *vport,bool get);int idpf_send_get_set_rss_lut_msg (struct idpf_vport *vport,bool get); +void idpf_vc_xn_shutdown (struct idpf_vc_xn_manager *vcxn_mngr);#endif /* _IDPF_VIRTCHNL_H_ */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 576/780 net: dsa: tag_brcm: legacy: fix pskb_may_pull length
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Álvaro Fernández Rojas <[email protected]>
[ Upstream commit efdddc4484859082da6c7877ed144c8121c8ea55 ]
BRCM_LEG_PORT_ID was incorrectly used for pskb_may_pull length. The correct check is BRCM_LEG_TAG_LEN + VLAN_HLEN, or 10 bytes.
--- net/dsa/tag_brcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/dsa/tag_brcm.c +1 -1
@@ -257,7 +257,7 @@ static struct sk_buff *brcm_leg_tag_rcv(struct sk_buff *skb,int source_port;u8 *brcm_tag; -if (unlikely (!pskb_may_pull (skb,BRCM_LEG_PORT_ID ))) +if (unlikely (!pskb_may_pull (skb,BRCM_LEG_TAG_LEN +VLAN_HLEN )))return NULL ; brcm_tag =dsa_etype_header_pos_rx (skb);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 577/780 net: stmmac: make sure that ptp_rate is not 0 before configuring timestamping
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexis Lothoré <[email protected]>
[ Upstream commit 030ce919e114a111e83b7976ecb3597cefd33f26 ]
The stmmac platform drivers that do not open-code the clk_ptp_rate value after having retrieved the default one from the device-tree can end up with 0 in clk_ptp_rate (as clk_get_rate can return 0). It will eventually propagate up to PTP initialization when bringing up the interface, leading to a divide by 0:
Division by zero in kernel.
CPU: 1 UID: 0 PID: 1 Comm: swapper/0 Not tainted 6.12.30-00001-g48313bd5768a #22 Hardware name: STM32 (Device Tree Support) Call trace: unwind_backtrace from show_stack+0x18/0x1c show_stack from dump_stack_lvl+0x6c/0x8c dump_stack_lvl from Ldiv0_64+0x8/0x18 Ldiv0_64 from stmmac_init_tstamp_counter+0x190/0x1a4 stmmac_init_tstamp_counter from stmmac_hw_setup+0xc1c/0x111c stmmac_hw_setup from __stmmac_open+0x18c/0x434 __stmmac_open from stmmac_open+0x3c/0xbc stmmac_open from __dev_open+0xf4/0x1ac __dev_open from __dev_change_flags+0x1cc/0x224 __dev_change_flags from dev_change_flags+0x24/0x60 dev_change_flags from ip_auto_config+0x2e8/0x11a0 ip_auto_config from do_one_initcall+0x84/0x33c do_one_initcall from kernel_init_freeable+0x1b8/0x214 kernel_init_freeable from kernel_init+0x24/0x140 kernel_init from ret_from_fork+0x14/0x28 Exception stack(0xe0815fb0 to 0xe0815ff8)
Prevent this division by 0 by adding an explicit check and error log about the actual issue. While at it, remove the same check from stmmac_ptp_register, which then becomes duplicate
--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 5 +++++ drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +5 -0
@@ -803,6 +803,11 @@ int stmmac_init_tstamp_counter(struct stmmac_priv *priv, u32 systime_flags)if (!(priv->dma_cap.time_stamp || priv->dma_cap.atime_stamp))return -EOPNOTSUPP ; +if (!priv->plat->clk_ptp_rate) { +netdev_err (priv->dev,"Invalid PTP clock rate" ); +return -EINVAL ; + } +stmmac_config_hw_tstamping (priv, priv->ptpaddr, systime_flags); priv->systime_flags = systime_flags;
drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c +1 -1
@@ -317,7 +317,7 @@ void stmmac_ptp_register(struct stmmac_priv *priv)/* Calculate the clock domain crossing (CDC) error if necessary */ priv->plat->cdc_error_adj =0 ; -if (priv->plat->has_gmac4 && priv->plat->clk_ptp_rate) +if (priv->plat->has_gmac4) priv->plat->cdc_error_adj = (2 *NSEC_PER_SEC ) / priv->plat->clk_ptp_rate;/* Update the ptp clock parameters based on feature discovery, when
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 578/780 net: stmmac: make sure that ptp_rate is not 0 before configuring EST
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexis Lothoré <[email protected]>
[ Upstream commit cbefe2ffa7784525ec5d008ba87c7add19ec631a ]
If the ptp_rate recorded earlier in the driver happens to be 0, this bogus value will propagate up to EST configuration, where it will trigger a division by 0.
Prevent this division by 0 by adding the corresponding check and error code.
--- drivers/net/ethernet/stmicro/stmmac/stmmac_est.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/ethernet/stmicro/stmmac/stmmac_est.c +5 -0
@@ -32,6 +32,11 @@ static int est_configure(struct stmmac_priv *priv, struct stmmac_est *cfg,int i, ret =0 ;u32 ctrl; +if (!ptp_rate) { +netdev_warn (priv->dev,"Invalid PTP rate" ); +return -EINVAL ; + } + ret |=est_write (est_addr,EST_BTR_LOW , cfg->btr[0 ], false); ret |=est_write (est_addr,EST_BTR_HIGH , cfg->btr[1 ], false); ret |=est_write (est_addr,EST_TER , cfg->ter, false);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 579/780 net: Fix checksum update for ILA adj-transport
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul Chaignon <[email protected]>
[ Upstream commit 6043b794c7668c19dabc4a93c75b924a19474d59 ]
During ILA address translations, the L4 checksums can be handled in different ways. One of them, adj-transport, consist in parsing the transport layer and updating any found checksum. This logic relies on inet_proto_csum_replace_by_diff and produces an incorrect skb->csum when in state CHECKSUM_COMPLETE.
This bug can be reproduced with a simple ILA to SIR mapping, assuming packets are received with CHECKSUM_COMPLETE:
$ ip a show dev eth0
14: eth0@if15: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UP group default qlen 1000
link/ether 62:ae:35:9e:0f:8d brd ff:ff:ff:ff:ff:ff link-netnsid 0
inet6 3333:0:0:1::c078/64 scope global
valid_lft forever preferred_lft forever
inet6 fd00:10:244:1::c078/128 scope global nodad
valid_lft forever preferred_lft forever
inet6 fe80::60ae:35ff:fe9e:f8d/64 scope link proto kernel_ll
valid_lft forever preferred_lft forever
$ ip ila add loc_match fd00:10:244:1 loc 3333:0:0:1 \
csum-mode adj-transport ident-type luid dev eth0Then I hit [fd00:10:244:1::c078]:8000 with a server listening only on [3333:0:0:1::c078]:8000. With the bug, the SYN packet is dropped with SKB_DROP_REASON_TCP_CSUM after inet_proto_csum_replace_by_diff changed skb->csum. The translation and drop are visible on pwru [1] traces:
IFACE TUPLE FUNC eth0:9 [fd00:10:244:3::3d8]:51420->[fd00:10:244:1::c078]:8000(tcp) ipv6_rcv eth0:9 [fd00:10:244:3::3d8]:51420->[fd00:10:244:1::c078]:8000(tcp) ip6_rcv_core eth0:9 [fd00:10:244:3::3d8]:51420->[fd00:10:244:1::c078]:8000(tcp) nf_hook_slow eth0:9 [fd00:10:244:3::3d8]:51420->[fd00:10:244:1::c078]:8000(tcp) inet_proto_csum_replace_by_diff eth0:9 [fd00:10:244:3::3d8]:51420->[3333:0:0:1::c078]:8000(tcp) tcp_v6_early_demux eth0:9 [fd00:10:244:3::3d8]:51420->[3333:0:0:1::c078]:8000(tcp) ip6_route_input eth0:9 [fd00:10:244:3::3d8]:51420->[3333:0:0:1::c078]:8000(tcp) ip6_input eth0:9 [fd00:10:244:3::3d8]:51420->[3333:0:0:1::c078]:8000(tcp) ip6_input_finish eth0:9 [fd00:10:244:3::3d8]:51420->[3333:0:0:1::c078]:8000(tcp) ip6_protocol_deliver_rcu eth0:9 [fd00:10:244:3::3d8]:51420->[3333:0:0:1::c078]:8000(tcp) raw6_local_deliver eth0:9 [fd00:10:244:3::3d8]:51420->[3333:0:0:1::c078]:8000(tcp) ipv6_raw_deliver eth0:9 [fd00:10:244:3::3d8]:51420->[3333:0:0:1::c078]:8000(tcp) tcp_v6_rcv eth0:9 [fd00:10:244:3::3d8]:51420->[3333:0:0:1::c078]:8000(tcp) __skb_checksum_complete eth0:9 [fd00:10:244:3::3d8]:51420->[3333:0:0:1::c078]:8000(tcp) kfree_skb_reason(SKB_DROP_REASON_TCP_CSUM) eth0:9 [fd00:10:244:3::3d8]:51420->[3333:0:0:1::c078]:8000(tcp) skb_release_head_state eth0:9 [fd00:10:244:3::3d8]:51420->[3333:0:0:1::c078]:8000(tcp) skb_release_data eth0:9 [fd00:10:244:3::3d8]:51420->[3333:0:0:1::c078]:8000(tcp) skb_free_head eth0:9 [fd00:10:244:3::3d8]:51420->[3333:0:0:1::c078]:8000(tcp) kfree_skbmem
This is happening because inet_proto_csum_replace_by_diff is updating skb->csum when it shouldn't. The L4 checksum is updated such that it "cancels" the IPv6 address change in terms of checksum computation, so the impact on skb->csum is null.
Note this would be different for an IPv4 packet since three fields would be updated: the IPv4 address, the IP checksum, and the L4 checksum. Two would cancel each other and skb->csum would still need to be updated to take the L4 checksum change into account.
This patch fixes it by passing an ipv6 flag to inet_proto_csum_replace_by_diff, to skip the skb->csum update if we're in the IPv6 case. Note the behavior of the only other user of inet_proto_csum_replace_by_diff, the BPF subsystem, is left as is in this patch and fixed in the subsequent patch.
With the fix, using the reproduction from above, I can confirm skb->csum is not touched by inet_proto_csum_replace_by_diff and the TCP SYN proceeds to the application after the ILA translation.
--- include/net/checksum.h | 2 +- net/core/filter.c | 2 +- net/core/utils.c | 4 ++-- net/ipv6/ila/ila_common.c | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-)
include/net/checksum.h +1 -1
@@ -164,7 +164,7 @@ void inet_proto_csum_replace16(__sum16 *sum, struct sk_buff *skb, const __be32 *from, const __be32 *to, bool pseudohdr);void inet_proto_csum_replace_by_diff (__sum16 *sum,struct sk_buff *skb, -__wsum diff,bool pseudohdr); +__wsum diff,bool pseudohdr,bool ipv6); static __always_inline void inet_proto_csum_replace2(__sum16 *sum, struct sk_buff *skb,
net/core/filter.c +1 -1
@@ -1987,7 +1987,7 @@ BPF_CALL_5(bpf_l4_csum_replace, struct sk_buff *, skb, u32, offset,if (unlikely (from !=0 ))return -EINVAL ; -inet_proto_csum_replace_by_diff (ptr, skb, to, is_pseudo); +inet_proto_csum_replace_by_diff (ptr, skb, to, is_pseudo, false);break ;case 2 :inet_proto_csum_replace2 (ptr, skb, from, to, is_pseudo);
net/core/utils.c +2 -2
@@ -473,11 +473,11 @@ void inet_proto_csum_replace16(__sum16 *sum, struct sk_buff *skb,EXPORT_SYMBOL (inet_proto_csum_replace16);void inet_proto_csum_replace_by_diff (__sum16 *sum,struct sk_buff *skb, -__wsum diff,bool pseudohdr) +__wsum diff,bool pseudohdr,bool ipv6) {if (skb->ip_summed !=CHECKSUM_PARTIAL ) {csum_replace_by_diff (sum, diff); -if (skb->ip_summed ==CHECKSUM_COMPLETE && pseudohdr) +if (skb->ip_summed ==CHECKSUM_COMPLETE && pseudohdr && !ipv6) skb->csum = ~csum_sub (diff, skb->csum); }else if (pseudohdr) { *sum = ~csum_fold (csum_add (diff,csum_unfold (*sum)));
net/ipv6/ila/ila_common.c +3 -3
@@ -86,7 +86,7 @@ static void ila_csum_adjust_transport(struct sk_buff *skb, diff =get_csum_diff (ip6h, p);inet_proto_csum_replace_by_diff (&th->check, skb, - diff, true); + diff, true, true); }break ;case NEXTHDR_UDP :
@@ -97,7 +97,7 @@ static void ila_csum_adjust_transport(struct sk_buff *skb,if (uh->check || skb->ip_summed ==CHECKSUM_PARTIAL ) { diff =get_csum_diff (ip6h, p);inet_proto_csum_replace_by_diff (&uh->check, skb, - diff, true); + diff, true, true);if (!uh->check) uh->check =CSUM_MANGLED_0 ; }
@@ -111,7 +111,7 @@ static void ila_csum_adjust_transport(struct sk_buff *skb, diff =get_csum_diff (ip6h, p);inet_proto_csum_replace_by_diff (&ih->icmp6_cksum, skb, - diff, true); + diff, true, true); }break ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 580/780 bpf: Clarify the meaning of BPF_F_PSEUDO_HDR
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul Chaignon <[email protected]>
[ Upstream commit 5a15a050df714959f0d5a57ac3201bd1c6594984 ]
In the bpf_l4_csum_replace helper, the BPF_F_PSEUDO_HDR flag should only be set if the modified header field is part of the pseudo-header.
If you modify for example the UDP ports and pass BPF_F_PSEUDO_HDR, inet_proto_csum_replace4 will update skb->csum even though it shouldn't (the port and the UDP checksum updates null each other).
Stable-dep-of: ead7f9b8de65 ("bpf: Fix L4 csum update on IPv6 in CHECKSUM_COMPLETE")
--- include/uapi/linux/bpf.h | 2 +- tools/include/uapi/linux/bpf.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
include/uapi/linux/bpf.h +1 -1
@@ -2051,7 +2051,7 @@ union bpf_attr {* untouched (unless **BPF_F_MARK_ENFORCE** is added as well), and * for updates resulting in a null checksum the value is set to * **CSUM_MANGLED_0** instead. Flag **BPF_F_PSEUDO_HDR** indicates -* the checksum is to be computed against a pseudo-header. +* that the modified header field is part of the pseudo-header. * * This helper works in combination with **bpf_csum_diff**\ (), * which does not update the checksum in-place, but offers more
tools/include/uapi/linux/bpf.h +1 -1
@@ -2051,7 +2051,7 @@ union bpf_attr {* untouched (unless **BPF_F_MARK_ENFORCE** is added as well), and * for updates resulting in a null checksum the value is set to * **CSUM_MANGLED_0** instead. Flag **BPF_F_PSEUDO_HDR** indicates -* the checksum is to be computed against a pseudo-header. +* that the modified header field is part of the pseudo-header. * * This helper works in combination with **bpf_csum_diff**\ (), * which does not update the checksum in-place, but offers more
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 581/780 bpf: Fix L4 csum update on IPv6 in CHECKSUM_COMPLETE
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul Chaignon <[email protected]>
[ Upstream commit ead7f9b8de65632ef8060b84b0c55049a33cfea1 ]
In Cilium, we use bpf_csum_diff + bpf_l4_csum_replace to, among other things, update the L4 checksum after reverse SNATing IPv6 packets. That use case is however not currently supported and leads to invalid skb->csum values in some cases. This patch adds support for IPv6 address changes in bpf_l4_csum_update via a new flag.
When calling bpf_l4_csum_replace in Cilium, it ends up calling inet_proto_csum_replace_by_diff:
1: void inet_proto_csum_replace_by_diff(__sum16 *sum, struct sk_buff *skb,
2: __wsum diff, bool pseudohdr)
3: {
4: if (skb->ip_summed != CHECKSUM_PARTIAL) {
5: csum_replace_by_diff(sum, diff);
6: if (skb->ip_summed == CHECKSUM_COMPLETE && pseudohdr)
7: skb->csum = ~csum_sub(diff, skb->csum);
8: } else if (pseudohdr) {
9: *sum = ~csum_fold(csum_add(diff, csum_unfold(*sum)));
10: }
11: }The bug happens when we're in the CHECKSUM_COMPLETE state. We've just updated one of the IPv6 addresses. The helper now updates the L4 header checksum on line 5. Next, it updates skb->csum on line 7. It shouldn't.
For an IPv6 packet, the updates of the IPv6 address and of the L4 checksum will cancel each other. The checksums are set such that computing a checksum over the packet including its checksum will result in a sum of 0. So the same is true here when we update the L4 checksum on line 5. We'll update it as to cancel the previous IPv6 address update. Hence skb->csum should remain untouched in this case.
The same bug doesn't affect IPv4 packets because, in that case, three fields are updated: the IPv4 address, the IP checksum, and the L4 checksum. The change to the IPv4 address and one of the checksums still cancel each other in skb->csum, but we're left with one checksum update and should therefore update skb->csum accordingly. That's exactly what inet_proto_csum_replace_by_diff does.
This special case for IPv6 L4 checksums is also described atop inet_proto_csum_replace16, the function we should be using in this case.
This patch introduces a new bpf_l4_csum_replace flag, BPF_F_IPV6, to indicate that we're updating the L4 checksum of an IPv6 packet. When the flag is set, inet_proto_csum_replace_by_diff will skip the skb->csum update.
--- include/uapi/linux/bpf.h | 2 ++ net/core/filter.c | 5 +++-- tools/include/uapi/linux/bpf.h | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-)
include/uapi/linux/bpf.h +2 -0
@@ -2052,6 +2052,7 @@ union bpf_attr {* for updates resulting in a null checksum the value is set to * **CSUM_MANGLED_0** instead. Flag **BPF_F_PSEUDO_HDR** indicates * that the modified header field is part of the pseudo-header. +* Flag **BPF_F_IPV6** should be set for IPv6 packets. * * This helper works in combination with **bpf_csum_diff**\ (), * which does not update the checksum in-place, but offers more
@@ -6068,6 +6069,7 @@ enum {BPF_F_PSEUDO_HDR = (1ULL <<4 ),BPF_F_MARK_MANGLED_0 = (1ULL <<5 ),BPF_F_MARK_ENFORCE = (1ULL <<6 ), + BPF_F_IPV6 = (1ULL << 7), };/* BPF_FUNC_skb_set_tunnel_key and BPF_FUNC_skb_get_tunnel_key flags. */
net/core/filter.c +3 -2
@@ -1968,10 +1968,11 @@ BPF_CALL_5(bpf_l4_csum_replace, struct sk_buff *, skb, u32, offset,bool is_pseudo = flags &BPF_F_PSEUDO_HDR ;bool is_mmzero = flags &BPF_F_MARK_MANGLED_0 ;bool do_mforce = flags &BPF_F_MARK_ENFORCE ; +bool is_ipv6 = flags &BPF_F_IPV6 ;__sum16 *ptr;if (unlikely (flags & ~(BPF_F_MARK_MANGLED_0 |BPF_F_MARK_ENFORCE | -BPF_F_PSEUDO_HDR |BPF_F_HDR_FIELD_MASK ))) +BPF_F_PSEUDO_HDR |BPF_F_HDR_FIELD_MASK |BPF_F_IPV6 )))return -EINVAL ;if (unlikely (offset >0xffff || offset &1 ))return -EFAULT ;
@@ -1987,7 +1988,7 @@ BPF_CALL_5(bpf_l4_csum_replace, struct sk_buff *, skb, u32, offset,if (unlikely (from !=0 ))return -EINVAL ; -inet_proto_csum_replace_by_diff (ptr, skb, to, is_pseudo, false); +inet_proto_csum_replace_by_diff (ptr, skb, to, is_pseudo, is_ipv6);break ;case 2 :inet_proto_csum_replace2 (ptr, skb, from, to, is_pseudo);
tools/include/uapi/linux/bpf.h +2 -0
@@ -2052,6 +2052,7 @@ union bpf_attr {* for updates resulting in a null checksum the value is set to * **CSUM_MANGLED_0** instead. Flag **BPF_F_PSEUDO_HDR** indicates * that the modified header field is part of the pseudo-header. +* Flag **BPF_F_IPV6** should be set for IPv6 packets. * * This helper works in combination with **bpf_csum_diff**\ (), * which does not update the checksum in-place, but offers more
@@ -6068,6 +6069,7 @@ enum {BPF_F_PSEUDO_HDR = (1ULL <<4 ),BPF_F_MARK_MANGLED_0 = (1ULL <<5 ),BPF_F_MARK_ENFORCE = (1ULL <<6 ), + BPF_F_IPV6 = (1ULL << 7), };/* BPF_FUNC_skb_set_tunnel_key and BPF_FUNC_skb_get_tunnel_key flags. */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 582/780 drm/i915/guc: Check if expecting reply before decrementing outstanding_submission_g2h
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jesus Narvaez <[email protected]>
[ Upstream commit c557fd1050f6691dde36818dfc1a4c415c42901b ]
When sending a H2G message where a reply is expected in guc_submission_send_busy_loop(), outstanding_submission_g2h is incremented before the send. However, if there is an error sending the message, outstanding_submission_g2h is decremented without checking if a reply is expected.
Therefore, check if reply is expected when there is a failure before decrementing outstanding_submission_g2h.
--- drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +1 -1
@@ -633,7 +633,7 @@ static int guc_submission_send_busy_loop(struct intel_guc *guc,atomic_inc (&guc->outstanding_submission_g2h); ret =intel_guc_send_busy_loop (guc, action, len, g2h_len_dw, loop); -if (ret) +if (ret && g2h_len_dw)atomic_dec (&guc->outstanding_submission_g2h);return ret;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 583/780 drm/i915/psr: Fix using wrong mask in REG_FIELD_PREP
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jouni Högander <[email protected]>
[ Upstream commit 57d63c6cd0851d3af612a556ec61b0f2a9bd522f ]
Wrong mask is used in PORT_ALPM_LFPS_CTL_FIRST_LFPS_HALF_CYCLE_DURATION and PORT_ALPM_LFPS_CTL_LAST_LFPS_HALF_CYCLE_DURATION.
--- drivers/gpu/drm/i915/display/intel_psr_regs.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_psr_regs.h +2 -2
@@ -325,8 +325,8 @@#define PORT_ALPM_LFPS_CTL_LFPS_HALF_CYCLE_DURATION_MASK REG_GENMASK(20, 16)#define PORT_ALPM_LFPS_CTL_LFPS_HALF_CYCLE_DURATION (val) REG_FIELD_PREP(PORT_ALPM_LFPS_CTL_LFPS_HALF_CYCLE_DURATION_MASK, val)#define PORT_ALPM_LFPS_CTL_FIRST_LFPS_HALF_CYCLE_DURATION_MASK REG_GENMASK(12, 8) -#define PORT_ALPM_LFPS_CTL_FIRST_LFPS_HALF_CYCLE_DURATION (val) REG_FIELD_PREP(PORT_ALPM_LFPS_CTL_LFPS_HALF_CYCLE_DURATION_MASK, val) +#define PORT_ALPM_LFPS_CTL_FIRST_LFPS_HALF_CYCLE_DURATION (val) REG_FIELD_PREP(PORT_ALPM_LFPS_CTL_FIRST_LFPS_HALF_CYCLE_DURATION_MASK, val)#define PORT_ALPM_LFPS_CTL_LAST_LFPS_HALF_CYCLE_DURATION_MASK REG_GENMASK(4, 0) -#define PORT_ALPM_LFPS_CTL_LAST_LFPS_HALF_CYCLE_DURATION (val) REG_FIELD_PREP(PORT_ALPM_LFPS_CTL_LFPS_HALF_CYCLE_DURATION_MASK, val) +#define PORT_ALPM_LFPS_CTL_LAST_LFPS_HALF_CYCLE_DURATION (val) REG_FIELD_PREP(PORT_ALPM_LFPS_CTL_LAST_LFPS_HALF_CYCLE_DURATION_MASK, val)#endif /* __INTEL_PSR_REGS_H__ */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 584/780 drm/i915/guc: Handle race condition where wakeref count drops below 0
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jesus Narvaez <[email protected]>
[ Upstream commit 0323a5127e7c534cfc88efe0f850a0cb777e938b ]
There is a rare race condition when preparing for a reset where guc_lrc_desc_unpin() could be in the process of deregistering a context while a different thread is scrubbing outstanding contexts and it alters the context state and does a wakeref put. Then, if there is a failure with deregister_context(), a second wakeref put could occur. As a result the wakeref count could drop below 0 and fail an INTEL_WAKEREF_BUG_ON() check.
Therefore if there is a failure with deregister_context(), undo the context state changes and do a wakeref put only if the context was set to be destroyed earlier.
v2: Expand comment to better explain change. (Daniele)
v3: Removed addition to the original comment. (Daniele)
--- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +14 -3
@@ -3443,18 +3443,29 @@ static inline int guc_lrc_desc_unpin(struct intel_context *ce)* GuC is active, lets destroy this context, but at this point we can still be racing * with suspend, so we undo everything if the H2G fails in deregister_context so * that GuC reset will find this context during clean up. +* +* There is a race condition where the reset code could have altered +* this context's state and done a wakeref put before we try to +* deregister it here. So check if the context is still set to be +* destroyed before undoing earlier changes, to avoid two wakeref puts +* on the same context. */ ret =deregister_context (ce, ce->guc_id.id);if (ret) { +bool pending_destroyed;spin_lock_irqsave (&ce->guc_state.lock, flags); -set_context_registered (ce); -clr_context_destroyed (ce); + pending_destroyed =context_destroyed (ce); +if (pending_destroyed) { +set_context_registered (ce); +clr_context_destroyed (ce); + }spin_unlock_irqrestore (&ce->guc_state.lock, flags);/* * As gt-pm is awake at function entry, intel_wakeref_put_async merely decrements * the wakeref immediately but per function spec usage call this after unlock. */ -intel_wakeref_put_async (>->wakeref); +if (pending_destroyed) +intel_wakeref_put_async (>->wakeref); }return ret;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 585/780 um: Fix tgkill compile error on old host OSes
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yongting Lin <[email protected]>
[ Upstream commit fd054188999ff19746cc09f4e0f196a113964db9 ]
tgkill is a quite old syscall since kernel 2.5.75, but unfortunately glibc doesn't support it before 2.30. Thus some systems fail to compile the latest UserMode Linux.
Here is the compile error I encountered when I tried to compile UML in my system shipped with glibc-2.28.
CALL scripts/checksyscalls.sh
CC arch/um/os-Linux/sigio.o
In file included from arch/um/os-Linux/sigio.c:17:
arch/um/os-Linux/sigio.c: In function ‘write_sigio_thread’:
arch/um/os-Linux/sigio.c:49:19: error: implicit declaration of function ‘tgkill’; did you mean ‘kill’? [-Werror=implicit-function-declaration]
CATCH_EINTR(r = tgkill(pid, pid, SIGIO));
^~~~~~
./arch/um/include/shared/os.h:21:48: note: in definition of macro ‘CATCH_EINTR’
#define CATCH_EINTR(expr) while ((errno = 0, ((expr) < 0)) && (errno == EINTR))
^~~~cc1: some warnings being treated as errors
Fix it by Replacing glibc call with raw syscall.
--- arch/um/os-Linux/sigio.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/um/os-Linux/sigio.c +2 -1
@@ -12,6 +12,7 @@#include <signal.h> #include <string.h> #include <sys/epoll.h> +#include <asm/unistd.h> #include <kern_util.h> #include <init.h> #include <os.h>
@@ -46,7 +47,7 @@ static void *write_sigio_thread(void *unused) __func__, errno); } -CATCH_EINTR (r =tgkill (pid, pid,SIGIO )); +CATCH_EINTR (r =syscall (__NR_tgkill, pid, pid,SIGIO ));if (r <0 )printk (UM_KERN_ERR "%s: tgkill failed, errno = %d\n" , __func__, errno);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 586/780 net: fix udp gso skb_segment after pull from frag_list
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shiming Cheng <[email protected]>
[ Upstream commit 3382a1ed7f778db841063f5d7e317ac55f9e7f72 ]
Commit a1e40ac5b5e9 ("net: gso: fix udp gso fraglist segmentation after pull from frag_list") detected invalid geometry in frag_list skbs and redirects them from skb_segment_list to more robust skb_segment. But some packets with modified geometry can also hit bugs in that code. We don't know how many such cases exist. Addressing each one by one also requires touching the complex skb_segment code, which risks introducing bugs for other types of skbs. Instead, linearize all these packets that fail the basic invariants on gso fraglist skbs. That is more robust.
If only part of the fraglist payload is pulled into head_skb, it will always cause exception when splitting skbs by skb_segment. For detailed call stack information, see below.
Valid SKB_GSO_FRAGLIST skbs
- consist of two or more segments
- the head_skb holds the protocol headers plus first gso_size
- one or more frag_list skbs hold exactly one segment
- all but the last must be gso_size
Optional datapath hooks such as NAT and BPF (bpf_skb_pull_data) can modify fraglist skbs, breaking these invariants.
In extreme cases they pull one part of data into skb linear. For UDP, this causes three payloads with lengths of (11,11,10) bytes were pulled tail to become (12,10,10) bytes.
The skbs no longer meets the above SKB_GSO_FRAGLIST conditions because payload was pulled into head_skb, it needs to be linearized before pass to regular skb_segment.
skb_segment+0xcd0/0xd14
__udp_gso_segment+0x334/0x5f4
udp4_ufo_fragment+0x118/0x15c
inet_gso_segment+0x164/0x338
skb_mac_gso_segment+0xc4/0x13c
__skb_gso_segment+0xc4/0x124
validate_xmit_skb+0x9c/0x2c0
validate_xmit_skb_list+0x4c/0x80
sch_direct_xmit+0x70/0x404
__dev_queue_xmit+0x64c/0xe5c
neigh_resolve_output+0x178/0x1c4
ip_finish_output2+0x37c/0x47c
__ip_finish_output+0x194/0x240
ip_finish_output+0x20/0xf4
ip_output+0x100/0x1a0
NF_HOOK+0xc4/0x16c
ip_forward+0x314/0x32c
ip_rcv+0x90/0x118
__netif_receive_skb+0x74/0x124
process_backlog+0xe8/0x1a4
__napi_poll+0x5c/0x1f8
net_rx_action+0x154/0x314
handle_softirqs+0x154/0x4b8 [118.376811] [C201134] rxq0_pus: [name:bug&]kernel BUG at net/core/skbuff.c:4278!
[118.376829] [C201134] rxq0_pus: [name:traps&]Internal error: Oops - BUG: 00000000f2000800 [#1] PREEMPT SMP
[118.470774] [C201134] rxq0_pus: [name:mrdump&]Kernel Offset: 0x178cc00000 from 0xffffffc008000000
[118.470810] [C201134] rxq0_pus: [name:mrdump&]PHYS_OFFSET: 0x40000000
[118.470827] [C201134] rxq0_pus: [name:mrdump&]pstate: 60400005 (nZCv daif +PAN -UAO)
[118.470848] [C201134] rxq0_pus: [name:mrdump&]pc : [0xffffffd79598aefc] skb_segment+0xcd0/0xd14
[118.470900] [C201134] rxq0_pus: [name:mrdump&]lr : [0xffffffd79598a5e8] skb_segment+0x3bc/0xd14
[118.470928] [C201134] rxq0_pus: [name:mrdump&]sp : ffffffc008013770--- net/ipv4/udp_offload.c | 5 +++++ 1 file changed, 5 insertions(+)
net/ipv4/udp_offload.c +5 -0
@@ -495,6 +495,7 @@ struct sk_buff *__udp_gso_segment(struct sk_buff *gso_skb,bool copy_dtor;__sum16 check;__be16 newlen; +int ret =0 ; mss =skb_shinfo (gso_skb)->gso_size;if (gso_skb->len <=sizeof (*uh) + mss)
@@ -523,6 +524,10 @@ struct sk_buff *__udp_gso_segment(struct sk_buff *gso_skb,if (skb_pagelen (gso_skb) -sizeof (*uh) ==skb_shinfo (gso_skb)->gso_size)return __udp_gso_segment_list (gso_skb, features, is_ipv6); + ret =__skb_linearize (gso_skb); +if (ret) +return ERR_PTR (ret); +/* Setup csum, as fraglist skips this in udp4_gro_receive. */ gso_skb->csum_start =skb_transport_header (gso_skb) - gso_skb->head; gso_skb->csum_offset = offsetof(struct udphdr , check);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 587/780 net: wwan: t7xx: Fix napi rx poll issue
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jinjian Song <[email protected]>
[ Upstream commit 905fe0845bb27e4eed2ca27ea06e6c4847f1b2b1 ]
When driver handles the napi rx polling requests, the netdev might have been released by the dellink logic triggered by the disconnect operation on user plane. However, in the logic of processing skb in polling, an invalid netdev is still being used, which causes a panic.
BUG: kernel NULL pointer dereference, address: 00000000000000f1 Oops: 0000 [#1] PREEMPT SMP NOPTI RIP: 0010:dev_gro_receive+0x3a/0x620 [...] Call Trace: <IRQ> ? __die_body+0x68/0xb0 ? page_fault_oops+0x379/0x3e0 ? exc_page_fault+0x4f/0xa0 ? asm_exc_page_fault+0x22/0x30 ? __pfx_t7xx_ccmni_recv_skb+0x10/0x10 [mtk_t7xx (HASH:1400 7)] ? dev_gro_receive+0x3a/0x620 napi_gro_receive+0xad/0x170 t7xx_ccmni_recv_skb+0x48/0x70 [mtk_t7xx (HASH:1400 7)] t7xx_dpmaif_napi_rx_poll+0x590/0x800 [mtk_t7xx (HASH:1400 7)] net_rx_action+0x103/0x470 irq_exit_rcu+0x13a/0x310 sysvec_apic_timer_interrupt+0x56/0x90 </IRQ>
--- drivers/net/wwan/t7xx/t7xx_netdev.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/net/wwan/t7xx/t7xx_netdev.c +6 -5
@@ -302,7 +302,7 @@ static int t7xx_ccmni_wwan_newlink(void *ctxt, struct net_device *dev, u32 if_id ccmni->ctlb = ctlb; ccmni->dev = dev;atomic_set (&ccmni->usage,0 ); - ctlb->ccmni_inst[if_id] = ccmni; +WRITE_ONCE (ctlb->ccmni_inst[if_id], ccmni); ret =register_netdevice (dev);if (ret)
@@ -324,6 +324,7 @@ static void t7xx_ccmni_wwan_dellink(void *ctxt, struct net_device *dev, struct lif (WARN_ON (ctlb->ccmni_inst[if_id] != ccmni))return ; +WRITE_ONCE (ctlb->ccmni_inst[if_id],NULL );unregister_netdevice (dev); }
@@ -419,7 +420,7 @@ static void t7xx_ccmni_recv_skb(struct t7xx_ccmni_ctrl *ccmni_ctlb, struct sk_bu skb_cb =T7XX_SKB_CB (skb); netif_id = skb_cb->netif_idx; - ccmni = ccmni_ctlb->ccmni_inst[netif_id]; + ccmni =READ_ONCE (ccmni_ctlb->ccmni_inst[netif_id]);if (!ccmni) {dev_kfree_skb (skb);return ;
@@ -441,7 +442,7 @@ static void t7xx_ccmni_recv_skb(struct t7xx_ccmni_ctrl *ccmni_ctlb, struct sk_bustatic void t7xx_ccmni_queue_tx_irq_notify (struct t7xx_ccmni_ctrl *ctlb,int qno) { -struct t7xx_ccmni *ccmni = ctlb->ccmni_inst[0 ]; +struct t7xx_ccmni *ccmni =READ_ONCE (ctlb->ccmni_inst[0 ]);struct netdev_queue *net_queue;if (netif_running (ccmni->dev) &&atomic_read (&ccmni->usage) >0 ) {
@@ -453,7 +454,7 @@ static void t7xx_ccmni_queue_tx_irq_notify(struct t7xx_ccmni_ctrl *ctlb, int qnostatic void t7xx_ccmni_queue_tx_full_notify (struct t7xx_ccmni_ctrl *ctlb,int qno) { -struct t7xx_ccmni *ccmni = ctlb->ccmni_inst[0 ]; +struct t7xx_ccmni *ccmni =READ_ONCE (ctlb->ccmni_inst[0 ]);struct netdev_queue *net_queue;if (atomic_read (&ccmni->usage) >0 ) {
@@ -471,7 +472,7 @@ static void t7xx_ccmni_queue_state_notify(struct t7xx_pci_dev *t7xx_dev,if (ctlb->md_sta !=MD_STATE_READY )return ; -if (!ctlb->ccmni_inst[0 ]) { +if (!READ_ONCE (ctlb->ccmni_inst[0 ])) {dev_warn (&t7xx_dev->pdev->dev,"No netdev registered yet\n" );return ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 588/780 vmxnet3: correctly report gso type for UDP tunnels
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ronak Doshi <[email protected]>
[ Upstream commit 982d30c30eaa2ec723df42e3bf526c014c1dbb88 ]
Commit 3d010c8031e3 ("udp: do not accept non-tunnel GSO skbs landing in a tunnel") added checks in linux stack to not accept non-tunnel GRO packets landing in a tunnel. This exposed an issue in vmxnet3 which was not correctly reporting GRO packets for tunnel packets.
This patch fixes this issue by setting correct GSO type for the tunnel packets.
Currently, vmxnet3 does not support reporting inner fields for LRO tunnel packets. The issue is not seen for egress drivers that do not use skb inner fields. The workaround is to enable tnl-segmentation offload on the egress interfaces if the driver supports it. This problem pre-exists this patch fix and can be addressed as a separate future patch.
--- drivers/net/vmxnet3/vmxnet3_drv.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
drivers/net/vmxnet3/vmxnet3_drv.c +26 -0
@@ -1568,6 +1568,30 @@ vmxnet3_get_hdr_len(struct vmxnet3_adapter *adapter, struct sk_buff *skb,return (hlen + (hdr.tcp->doff <<2 )); } +static void +vmxnet3_lro_tunnel (struct sk_buff *skb,__be16 ip_proto) +{ +struct udphdr *uh =NULL ; + +if (ip_proto ==htons (ETH_P_IP )) { +struct iphdr *iph = (struct iphdr *)skb->data; + +if (iph->protocol ==IPPROTO_UDP ) + uh = (struct udphdr *)(iph +1 ); + }else { +struct ipv6hdr *iph = (struct ipv6hdr *)skb->data; + +if (iph->nexthdr ==IPPROTO_UDP ) + uh = (struct udphdr *)(iph +1 ); + } +if (uh) { +if (uh->check) +skb_shinfo (skb)->gso_type |=SKB_GSO_UDP_TUNNEL_CSUM ; +else +skb_shinfo (skb)->gso_type |=SKB_GSO_UDP_TUNNEL ; + } +} +static int vmxnet3_rq_rx_complete (struct vmxnet3_rx_queue *rq,struct vmxnet3_adapter *adapter,int quota)
@@ -1881,6 +1905,8 @@ vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq,if (segCnt !=0 && mss !=0 ) {skb_shinfo (skb)->gso_type = rcd->v4 ?SKB_GSO_TCPV4 :SKB_GSO_TCPV6 ; +if (encap_lro) +vmxnet3_lro_tunnel (skb, skb->protocol);skb_shinfo (skb)->gso_size = mss;skb_shinfo (skb)->gso_segs = segCnt; }else if ((segCnt !=0 || skb->len > mtu) && !encap_lro) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 589/780 selftests: net: build net/lib dependency in all target
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bui Quang Minh <[email protected]>
[ Upstream commit d3f2a9587ebe68f5067f9ff624f9a83dfb911f60 ]
We have the logic to include net/lib automatically for net related selftests. However, currently, this logic is only in install target which means only make install will have net/lib included. This commit adds the logic to all target so that all make, make run_tests and make install will have net/lib included in net related selftests.
--- tools/testing/selftests/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/Makefile +1 -1
@@ -202,7 +202,7 @@ export KHDR_INCLUDES all: @ret=1; \ - for TARGET in $(TARGETS); do \ + for TARGET in $(TARGETS) $(INSTALL_DEP_TARGETS); do \ BUILD_TARGET=$$BUILD/$$TARGET; \ mkdir $$BUILD_TARGET -p; \ $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET \
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 590/780 net: airoha: Add the capability to allocate hfwd descriptors in SRAM
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lorenzo Bianconi <[email protected]>
[ Upstream commit c683e378c0907e66cee939145edf936c254ff1e3 ]
In order to improve packet processing and packet forwarding performances, EN7581 SoC supports consuming SRAM instead of DRAM for hw forwarding descriptors queue.
For downlink hw accelerated traffic request to consume SRAM memory for hw forwarding descriptors queue.
Stable-dep-of: a869d3a5eb01 ("net: airoha: Initialize PPE UPDMEM source-mac table")
--- drivers/net/ethernet/airoha/airoha_eth.c | 11 +---------- drivers/net/ethernet/airoha/airoha_eth.h | 9 +++++++++ drivers/net/ethernet/airoha/airoha_ppe.c | 6 ++++++ 3 files changed, 16 insertions(+), 10 deletions(-)
drivers/net/ethernet/airoha/airoha_eth.c +1 -10
@@ -67,15 +67,6 @@ static void airoha_qdma_irq_disable(struct airoha_qdma *qdma, int index,airoha_qdma_set_irqmask (qdma, index, mask,0 ); } -static bool airhoa_is_lan_gdm_port (struct airoha_gdm_port *port) -{ -/* GDM1 port on EN7581 SoC is connected to the lan dsa switch. -* GDM{2,3,4} can be used as wan port connected to an external -* phy module. -*/ -return port->id ==1 ; -} -static void airoha_set_macaddr (struct airoha_gdm_port *port,const u8 *addr) {struct airoha_eth *eth = port->qdma->eth;
@@ -1068,7 +1059,7 @@ static int airoha_qdma_init_hfwd_queues(struct airoha_qdma *qdma)LMGR_INIT_START |LMGR_SRAM_MODE_MASK |HW_FWD_DESC_NUM_MASK ,FIELD_PREP (HW_FWD_DESC_NUM_MASK ,HW_DSCP_NUM ) | - LMGR_INIT_START); + LMGR_INIT_START | LMGR_SRAM_MODE_MASK); return read_poll_timeout(airoha_qdma_rr, status, !(status & LMGR_INIT_START), USEC_PER_MSEC,
drivers/net/ethernet/airoha/airoha_eth.h +9 -0
@@ -532,6 +532,15 @@ u32 airoha_rmw(void __iomem *base, u32 offset, u32 mask, u32 val);#define airoha_qdma_clear (qdma, offset, val) \ airoha_rmw((qdma)->regs, (offset), (val), 0) +static inline bool airhoa_is_lan_gdm_port (struct airoha_gdm_port *port) +{ +/* GDM1 port on EN7581 SoC is connected to the lan dsa switch. +* GDM{2,3,4} can be used as wan port connected to an external +* phy module. +*/ +return port->id ==1 ; +} +bool airoha_is_valid_gdm_port (struct airoha_eth *eth,struct airoha_gdm_port *port);
drivers/net/ethernet/airoha/airoha_ppe.c +6 -0
@@ -234,6 +234,12 @@ static int airoha_ppe_foe_entry_prepare(struct airoha_eth *eth,else pse_port =2 ;/* uplink relies on GDM2 loopback */ val |=FIELD_PREP (AIROHA_FOE_IB2_PSE_PORT , pse_port); + +/* For downlink traffic consume SRAM memory for hw forwarding +* descriptors queue. +*/ +if (airhoa_is_lan_gdm_port (port)) + val |=AIROHA_FOE_IB2_FAST_PATH ; }if (is_multicast_ether_addr (data->eth.h_dest))
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 591/780 net: airoha: Initialize PPE UPDMEM source-mac table
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lorenzo Bianconi <[email protected]>
[ Upstream commit a869d3a5eb011a9cf9bd864f31f5cf27362de8c7 ]
UPDMEM source-mac table is a key-value map used to store devices mac addresses according to the port identifier. UPDMEM source mac table is used during IPv6 traffic hw acceleration since PPE entries, for space constraints, do not contain the full source mac address but just the identifier in the UPDMEM source-mac table.
Configure UPDMEM source-mac table with device mac addresses and set the source-mac ID field for PPE IPv6 entries in order to select the proper device mac address as source mac for L3 IPv6 hw accelerated traffic.
--- drivers/net/ethernet/airoha/airoha_eth.c | 2 ++ drivers/net/ethernet/airoha/airoha_eth.h | 1 + drivers/net/ethernet/airoha/airoha_ppe.c | 26 ++++++++++++++++++++++- drivers/net/ethernet/airoha/airoha_regs.h | 10 +++++++++ 4 files changed, 38 insertions(+), 1 deletion(-)
drivers/net/ethernet/airoha/airoha_eth.c +2 -0
@@ -80,6 +80,8 @@ static void airoha_set_macaddr(struct airoha_gdm_port *port, const u8 *addr) val = (addr[3 ] <<16 ) | (addr[4 ] <<8 ) | addr[5 ];airoha_fe_wr (eth,REG_FE_MAC_LMIN (reg), val);airoha_fe_wr (eth,REG_FE_MAC_LMAX (reg), val); + +airoha_ppe_init_upd_mem (port); } static void airoha_set_gdm_port_fwd_cfg(struct airoha_eth *eth, u32 addr,
drivers/net/ethernet/airoha/airoha_eth.h +1 -0
@@ -549,6 +549,7 @@ int airoha_ppe_setup_tc_block_cb(enum tc_setup_type type, void *type_data, void *cb_priv);int airoha_ppe_init (struct airoha_eth *eth);void airoha_ppe_deinit (struct airoha_eth *eth); +void airoha_ppe_init_upd_mem (struct airoha_gdm_port *port);struct airoha_foe_entry *airoha_ppe_foe_get_entry (struct airoha_ppe *ppe,u32 hash);
drivers/net/ethernet/airoha/airoha_ppe.c +25 -1
@@ -206,6 +206,7 @@ static int airoha_ppe_foe_entry_prepare(struct airoha_eth *eth,int dsa_port =airoha_get_dsa_port (&dev);struct airoha_foe_mac_info_common *l2;u32 qdata, ports_pad, val; +u8 smac_id =0xf ;memset (hwe,0 ,sizeof (*hwe));
@@ -240,6 +241,8 @@ static int airoha_ppe_foe_entry_prepare(struct airoha_eth *eth,*/ if (airhoa_is_lan_gdm_port (port)) val |=AIROHA_FOE_IB2_FAST_PATH ; + + smac_id = port->id; }if (is_multicast_ether_addr (data->eth.h_dest))
@@ -280,7 +283,7 @@ static int airoha_ppe_foe_entry_prepare(struct airoha_eth *eth, hwe->ipv4.l2.src_mac_lo =get_unaligned_be16 (data->eth.h_source +4 ); }else { - l2->src_mac_hi =FIELD_PREP (AIROHA_FOE_MAC_SMAC_ID ,0xf ); + l2->src_mac_hi =FIELD_PREP (AIROHA_FOE_MAC_SMAC_ID , smac_id); }if (data->vlan.num) {
@@ -868,6 +871,27 @@ void airoha_ppe_check_skb(struct airoha_ppe *ppe, u16 hash)airoha_ppe_foe_insert_entry (ppe, hash); } +void airoha_ppe_init_upd_mem (struct airoha_gdm_port *port) +{ +struct airoha_eth *eth = port->qdma->eth; +struct net_device *dev = port->dev; +const u8 *addr = dev->dev_addr; +u32 val; + + val = (addr[2 ] <<24 ) | (addr[3 ] <<16 ) | (addr[4 ] <<8 ) | addr[5 ]; +airoha_fe_wr (eth,REG_UPDMEM_DATA (0 ), val); +airoha_fe_wr (eth,REG_UPDMEM_CTRL (0 ), +FIELD_PREP (PPE_UPDMEM_ADDR_MASK , port->id) | +PPE_UPDMEM_WR_MASK |PPE_UPDMEM_REQ_MASK ); + + val = (addr[0 ] <<8 ) | addr[1 ]; +airoha_fe_wr (eth,REG_UPDMEM_DATA (0 ), val); +airoha_fe_wr (eth,REG_UPDMEM_CTRL (0 ), +FIELD_PREP (PPE_UPDMEM_ADDR_MASK , port->id) | +FIELD_PREP (PPE_UPDMEM_OFFSET_MASK ,1 ) | +PPE_UPDMEM_WR_MASK |PPE_UPDMEM_REQ_MASK ); +} +int airoha_ppe_init (struct airoha_eth *eth) {struct airoha_ppe *ppe;
drivers/net/ethernet/airoha/airoha_regs.h +10 -0
@@ -312,6 +312,16 @@#define REG_PPE_RAM_BASE (_n) (((_n) ? PPE2_BASE : PPE1_BASE) + 0x320)#define REG_PPE_RAM_ENTRY (_m, _n) (REG_PPE_RAM_BASE(_m) + ((_n) << 2)) +#define REG_UPDMEM_CTRL (_n) (((_n) ? PPE2_BASE : PPE1_BASE) + 0x370) +#define PPE_UPDMEM_ACK_MASK BIT(31) +#define PPE_UPDMEM_ADDR_MASK GENMASK(11, 8) +#define PPE_UPDMEM_OFFSET_MASK GENMASK(7, 4) +#define PPE_UPDMEM_SEL_MASK GENMASK(3, 2) +#define PPE_UPDMEM_WR_MASK BIT(1) +#define PPE_UPDMEM_REQ_MASK BIT(0) + +#define REG_UPDMEM_DATA (_n) (((_n) ? PPE2_BASE : PPE1_BASE) + 0x374) +#define REG_FE_GDM_TX_OK_PKT_CNT_H (_n) (GDM_BASE(_n) + 0x280)#define REG_FE_GDM_TX_OK_BYTE_CNT_H (_n) (GDM_BASE(_n) + 0x284)#define REG_FE_GDM_TX_ETH_PKT_CNT_H (_n) (GDM_BASE(_n) + 0x288)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 592/780 iavf: iavf_suspend(): take RTNL before netdev_lock()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Przemek Kitszel <[email protected]>
[ Upstream commit dba35a4bb4a3da5696f2a179b7d695dc3ea25fb8 ]
Fix an obvious violation of lock ordering.
Jakub's [1] added netdev_lock() call that is wrong ordered wrt RTNL, but the Fixes tag points to crit_lock being wrongly placed (by lockdep standards).
Actual reason we got it wrong is dated back to critical section managed by pure flag checks, which is with us since the very beginning.
[1] afc664987ab3 ("eth: iavf: extend the netdev_lock usage")
--- drivers/net/ethernet/intel/iavf/iavf_main.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/iavf/iavf_main.c +9 -4
@@ -5596,22 +5596,27 @@ static int iavf_suspend(struct device *dev_d) {struct net_device *netdev =dev_get_drvdata (dev_d);struct iavf_adapter *adapter =netdev_priv (netdev); +bool running;netif_device_detach (netdev); + running =netif_running (netdev); +if (running) +rtnl_lock (); +netdev_lock (netdev);mutex_lock (&adapter->crit_lock); -if (netif_running (netdev)) { -rtnl_lock (); +if (running)iavf_down (adapter); -rtnl_unlock (); - } +iavf_free_misc_irq (adapter);iavf_reset_interrupt_capability (adapter);mutex_unlock (&adapter->crit_lock);netdev_unlock (netdev); +if (running) +rtnl_unlock ();return 0 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 593/780 iavf: centralize watchdog requeueing itself
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Przemek Kitszel <[email protected]>
[ Upstream commit 099418da91b7d3d46ddcccbb03075cc4f1ba2d44 ]
Centralize the unlock(critlock); unlock(netdev); queue_delayed_work(watchog_task); pattern to one place.
Stable-dep-of: 120f28a6f314 ("iavf: get rid of the crit lock")
--- drivers/net/ethernet/intel/iavf/iavf_main.c | 103 ++++++++------------ 1 file changed, 41 insertions(+), 62 deletions(-)
drivers/net/ethernet/intel/iavf/iavf_main.c +41 -62
@@ -2911,6 +2911,8 @@ static void iavf_init_config_adapter(struct iavf_adapter *adapter)iavf_change_state (adapter, __IAVF_INIT_FAILED); } +static const int IAVF_NO_RESCHED =-1 ; +/** * iavf_watchdog_task - Periodic call-back task * @work: pointer to work_struct
@@ -2922,6 +2924,7 @@ static void iavf_watchdog_task(struct work_struct *work) watchdog_task.work);struct net_device *netdev = adapter->netdev;struct iavf_hw *hw = &adapter->hw; +int msec_delay;u32 reg_val;netdev_lock (netdev);
@@ -2940,39 +2943,24 @@ static void iavf_watchdog_task(struct work_struct *work)switch (adapter->state) {case __IAVF_STARTUP:iavf_startup (adapter); -mutex_unlock (&adapter->crit_lock); -netdev_unlock (netdev); -queue_delayed_work (adapter->wq, &adapter->watchdog_task, -msecs_to_jiffies (30 )); -return ; + msec_delay =30 ; + goto watchdog_done;case __IAVF_INIT_VERSION_CHECK:iavf_init_version_check (adapter); -mutex_unlock (&adapter->crit_lock); -netdev_unlock (netdev); -queue_delayed_work (adapter->wq, &adapter->watchdog_task, -msecs_to_jiffies (30 )); -return ; + msec_delay =30 ; + goto watchdog_done;case __IAVF_INIT_GET_RESOURCES:iavf_init_get_resources (adapter); -mutex_unlock (&adapter->crit_lock); -netdev_unlock (netdev); -queue_delayed_work (adapter->wq, &adapter->watchdog_task, -msecs_to_jiffies (1 )); -return ; + msec_delay =1 ; + goto watchdog_done;case __IAVF_INIT_EXTENDED_CAPS:iavf_init_process_extended_caps (adapter); -mutex_unlock (&adapter->crit_lock); -netdev_unlock (netdev); -queue_delayed_work (adapter->wq, &adapter->watchdog_task, -msecs_to_jiffies (1 )); -return ; + msec_delay =1 ; + goto watchdog_done;case __IAVF_INIT_CONFIG_ADAPTER:iavf_init_config_adapter (adapter); -mutex_unlock (&adapter->crit_lock); -netdev_unlock (netdev); -queue_delayed_work (adapter->wq, &adapter->watchdog_task, -msecs_to_jiffies (1 )); -return ; + msec_delay =1 ; + goto watchdog_done;case __IAVF_INIT_FAILED:if (test_bit (__IAVF_IN_REMOVE_TASK, &adapter->crit_section)) {
@@ -2980,27 +2968,21 @@ static void iavf_watchdog_task(struct work_struct *work)* watchdog task, iavf_remove should handle this state * as it can loop forever */ -mutex_unlock (&adapter->crit_lock); -netdev_unlock (netdev); -return ; + msec_delay =IAVF_NO_RESCHED ; + goto watchdog_done; }if (++adapter->aq_wait_count >IAVF_AQ_MAX_ERR ) {dev_err (&adapter->pdev->dev,"Failed to communicate with PF; waiting before retry\n" ); adapter->flags |=IAVF_FLAG_PF_COMMS_FAILED ;iavf_shutdown_adminq (hw); -mutex_unlock (&adapter->crit_lock); -netdev_unlock (netdev); -queue_delayed_work (adapter->wq, - &adapter->watchdog_task, (5 *HZ )); -return ; + msec_delay =5000 ; + goto watchdog_done; }/* Try again from failed step*/ iavf_change_state (adapter, adapter->last_state); -mutex_unlock (&adapter->crit_lock); -netdev_unlock (netdev); -queue_delayed_work (adapter->wq, &adapter->watchdog_task,HZ ); -return ; + msec_delay =1000 ; + goto watchdog_done;case __IAVF_COMM_FAILED:if (test_bit (__IAVF_IN_REMOVE_TASK, &adapter->crit_section)) {
@@ -3010,9 +2992,8 @@ static void iavf_watchdog_task(struct work_struct *work)*/ iavf_change_state (adapter, __IAVF_INIT_FAILED); adapter->flags &= ~IAVF_FLAG_PF_COMMS_FAILED ; -mutex_unlock (&adapter->crit_lock); -netdev_unlock (netdev); -return ; + msec_delay =IAVF_NO_RESCHED ; + goto watchdog_done; } reg_val =rd32 (hw,IAVF_VFGEN_RSTAT ) &IAVF_VFGEN_RSTAT_VFR_STATE_MASK ;
@@ -3030,18 +3011,11 @@ static void iavf_watchdog_task(struct work_struct *work) } adapter->aq_required =0 ; adapter->current_op =VIRTCHNL_OP_UNKNOWN ; -mutex_unlock (&adapter->crit_lock); -netdev_unlock (netdev); -queue_delayed_work (adapter->wq, - &adapter->watchdog_task, -msecs_to_jiffies (10 )); -return ; + msec_delay =10 ; + goto watchdog_done;case __IAVF_RESETTING: -mutex_unlock (&adapter->crit_lock); -netdev_unlock (netdev); -queue_delayed_work (adapter->wq, &adapter->watchdog_task, -HZ *2 ); -return ; + msec_delay =2000 ; + goto watchdog_done;case __IAVF_DOWN:case __IAVF_DOWN_PENDING:case __IAVF_TESTING:
@@ -3068,9 +3042,8 @@ static void iavf_watchdog_task(struct work_struct *work)break ;case __IAVF_REMOVE:default : -mutex_unlock (&adapter->crit_lock); -netdev_unlock (netdev); -return ; + msec_delay =IAVF_NO_RESCHED ; + goto watchdog_done; }/* check for hw reset */
@@ -3080,24 +3053,30 @@ static void iavf_watchdog_task(struct work_struct *work) adapter->current_op =VIRTCHNL_OP_UNKNOWN ;dev_err (&adapter->pdev->dev,"Hardware reset detected\n" );iavf_schedule_reset (adapter,IAVF_FLAG_RESET_PENDING ); -mutex_unlock (&adapter->crit_lock); -netdev_unlock (netdev); -queue_delayed_work (adapter->wq, - &adapter->watchdog_task,HZ *2 ); -return ; + msec_delay =2000 ; + goto watchdog_done; }mutex_unlock (&adapter->crit_lock); restart_watchdog:netdev_unlock (netdev); + +/* note that we schedule a different task */ if (adapter->state >= __IAVF_DOWN)queue_work (adapter->wq, &adapter->adminq_task);if (adapter->aq_required) -queue_delayed_work (adapter->wq, &adapter->watchdog_task, -msecs_to_jiffies (20 )); + msec_delay =20 ;else + msec_delay =2000 ; + goto skip_unlock; +watchdog_done: +mutex_unlock (&adapter->crit_lock); +netdev_unlock (netdev); +skip_unlock: + +if (msec_delay !=IAVF_NO_RESCHED )queue_delayed_work (adapter->wq, &adapter->watchdog_task, -HZ *2 ); +msecs_to_jiffies (msec_delay)); }/**
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 594/780 iavf: simplify watchdog_task in terms of adminq task scheduling
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Przemek Kitszel <[email protected]>
[ Upstream commit ecb4cd0461accc446d20a7a167f39ed2fd5e9b0e ]
Simplify the decision whether to schedule adminq task. The condition is the same, but it is executed in more scenarios.
Note that movement of watchdog_done label makes this commit a bit surprising. (Hence not squashing it to anything bigger).
Stable-dep-of: 120f28a6f314 ("iavf: get rid of the crit lock")
--- drivers/net/ethernet/intel/iavf/iavf_main.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-)
drivers/net/ethernet/intel/iavf/iavf_main.c +6 -11
@@ -2934,6 +2934,7 @@ static void iavf_watchdog_task(struct work_struct *work)return ; } + msec_delay =20 ; goto restart_watchdog; }
@@ -3053,10 +3054,13 @@ static void iavf_watchdog_task(struct work_struct *work) adapter->current_op =VIRTCHNL_OP_UNKNOWN ;dev_err (&adapter->pdev->dev,"Hardware reset detected\n" );iavf_schedule_reset (adapter,IAVF_FLAG_RESET_PENDING ); - msec_delay =2000 ; - goto watchdog_done; } +if (adapter->aq_required) + msec_delay =20 ; +else + msec_delay =2000 ; +watchdog_done:mutex_unlock (&adapter->crit_lock); restart_watchdog:netdev_unlock (netdev);
@@ -3064,15 +3068,6 @@ static void iavf_watchdog_task(struct work_struct *work)/* note that we schedule a different task */ if (adapter->state >= __IAVF_DOWN)queue_work (adapter->wq, &adapter->adminq_task); -if (adapter->aq_required) - msec_delay =20 ; -else - msec_delay =2000 ; - goto skip_unlock; -watchdog_done: -mutex_unlock (&adapter->crit_lock); -netdev_unlock (netdev); -skip_unlock:if (msec_delay !=IAVF_NO_RESCHED ) queue_delayed_work(adapter->wq, &adapter->watchdog_task,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 595/780 iavf: extract iavf_watchdog_step() out of iavf_watchdog_task()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Przemek Kitszel <[email protected]>
[ Upstream commit 257a8241ad7f4dc312494f69e3bc79a5598b4514 ]
Finish up easy refactor of watchdog_task, total for this + prev two commits is:
1 file changed, 47 insertions(+), 82 deletions(-)
Stable-dep-of: 120f28a6f314 ("iavf: get rid of the crit lock")
--- drivers/net/ethernet/intel/iavf/iavf_main.c | 87 +++++++++------------ 1 file changed, 39 insertions(+), 48 deletions(-)
drivers/net/ethernet/intel/iavf/iavf_main.c +39 -48
@@ -2913,30 +2913,14 @@ static void iavf_init_config_adapter(struct iavf_adapter *adapter)static const int IAVF_NO_RESCHED =-1 ; -/** -* iavf_watchdog_task - Periodic call-back task -* @work: pointer to work_struct -**/ -static void iavf_watchdog_task (struct work_struct *work) +/* return: msec delay for requeueing itself */ +static int iavf_watchdog_step (struct iavf_adapter *adapter) { -struct iavf_adapter *adapter =container_of (work, - struct iavf_adapter, - watchdog_task.work); -struct net_device *netdev = adapter->netdev;struct iavf_hw *hw = &adapter->hw; -int msec_delay;u32 reg_val; -netdev_lock (netdev); -if (!mutex_trylock (&adapter->crit_lock)) { -if (adapter->state == __IAVF_REMOVE) { -netdev_unlock (netdev); -return ; - } - - msec_delay =20 ; - goto restart_watchdog; - } +netdev_assert_locked (adapter->netdev); +lockdep_assert_held (&adapter->crit_lock);if (adapter->flags &IAVF_FLAG_PF_COMMS_FAILED )iavf_change_state (adapter, __IAVF_COMM_FAILED);
@@ -2944,24 +2928,19 @@ static void iavf_watchdog_task(struct work_struct *work)switch (adapter->state) {case __IAVF_STARTUP:iavf_startup (adapter); - msec_delay =30 ; - goto watchdog_done; +return 30 ;case __IAVF_INIT_VERSION_CHECK:iavf_init_version_check (adapter); - msec_delay =30 ; - goto watchdog_done; +return 30 ;case __IAVF_INIT_GET_RESOURCES:iavf_init_get_resources (adapter); - msec_delay =1 ; - goto watchdog_done; +return 1 ;case __IAVF_INIT_EXTENDED_CAPS:iavf_init_process_extended_caps (adapter); - msec_delay =1 ; - goto watchdog_done; +return 1 ;case __IAVF_INIT_CONFIG_ADAPTER:iavf_init_config_adapter (adapter); - msec_delay =1 ; - goto watchdog_done; +return 1 ;case __IAVF_INIT_FAILED:if (test_bit (__IAVF_IN_REMOVE_TASK, &adapter->crit_section)) {
@@ -2969,21 +2948,18 @@ static void iavf_watchdog_task(struct work_struct *work)* watchdog task, iavf_remove should handle this state * as it can loop forever */ - msec_delay =IAVF_NO_RESCHED ; - goto watchdog_done; +return IAVF_NO_RESCHED ; }if (++adapter->aq_wait_count >IAVF_AQ_MAX_ERR ) {dev_err (&adapter->pdev->dev,"Failed to communicate with PF; waiting before retry\n" ); adapter->flags |=IAVF_FLAG_PF_COMMS_FAILED ;iavf_shutdown_adminq (hw); - msec_delay =5000 ; - goto watchdog_done; +return 5000 ; }/* Try again from failed step*/ iavf_change_state (adapter, adapter->last_state); - msec_delay =1000 ; - goto watchdog_done; +return 1000 ;case __IAVF_COMM_FAILED:if (test_bit (__IAVF_IN_REMOVE_TASK, &adapter->crit_section)) {
@@ -2993,8 +2969,7 @@ static void iavf_watchdog_task(struct work_struct *work)*/ iavf_change_state (adapter, __IAVF_INIT_FAILED); adapter->flags &= ~IAVF_FLAG_PF_COMMS_FAILED ; - msec_delay =IAVF_NO_RESCHED ; - goto watchdog_done; +return IAVF_NO_RESCHED ; } reg_val =rd32 (hw,IAVF_VFGEN_RSTAT ) &IAVF_VFGEN_RSTAT_VFR_STATE_MASK ;
@@ -3012,11 +2987,9 @@ static void iavf_watchdog_task(struct work_struct *work) } adapter->aq_required =0 ; adapter->current_op =VIRTCHNL_OP_UNKNOWN ; - msec_delay =10 ; - goto watchdog_done; +return 10 ;case __IAVF_RESETTING: - msec_delay =2000 ; - goto watchdog_done; +return 2000 ;case __IAVF_DOWN:case __IAVF_DOWN_PENDING:case __IAVF_TESTING:
@@ -3043,8 +3016,7 @@ static void iavf_watchdog_task(struct work_struct *work)break ;case __IAVF_REMOVE:default : - msec_delay =IAVF_NO_RESCHED ; - goto watchdog_done; +return IAVF_NO_RESCHED ; }/* check for hw reset */
@@ -3055,12 +3027,31 @@ static void iavf_watchdog_task(struct work_struct *work)dev_err (&adapter->pdev->dev,"Hardware reset detected\n" );iavf_schedule_reset (adapter,IAVF_FLAG_RESET_PENDING ); } -if (adapter->aq_required) + +return adapter->aq_required ?20 :2000 ; +} + +static void iavf_watchdog_task (struct work_struct *work) +{ +struct iavf_adapter *adapter =container_of (work, + struct iavf_adapter, + watchdog_task.work); +struct net_device *netdev = adapter->netdev; +int msec_delay; + +netdev_lock (netdev); +if (!mutex_trylock (&adapter->crit_lock)) { +if (adapter->state == __IAVF_REMOVE) { +netdev_unlock (netdev); +return ; + } + msec_delay =20 ; -else - msec_delay =2000 ; + goto restart_watchdog; + } + + msec_delay =iavf_watchdog_step (adapter); -watchdog_done:mutex_unlock (&adapter->crit_lock); restart_watchdog:netdev_unlock (netdev);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 596/780 iavf: sprinkle netdev_assert_locked() annotations
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Przemek Kitszel <[email protected]>
[ Upstream commit 05702b5c949bd46243181833d4726f4c5e95f5e3 ]
Lockdep annotations help in general, but here it is extra good, as next commit will remove crit lock.
Stable-dep-of: 120f28a6f314 ("iavf: get rid of the crit lock")
--- drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 6 ++++++ drivers/net/ethernet/intel/iavf/iavf_main.c | 10 ++++++++++ 2 files changed, 16 insertions(+)
drivers/net/ethernet/intel/iavf/iavf_ethtool.c +6 -0
@@ -4,6 +4,8 @@#include <linux/bitfield.h> #include <linux/uaccess.h> +#include <net/netdev_lock.h> +/* ethtool support for iavf */ #include "iavf.h"
@@ -1259,6 +1261,8 @@ static int iavf_add_fdir_ethtool(struct iavf_adapter *adapter, struct ethtool_rxint count =50 ;int err; +netdev_assert_locked (adapter->netdev); +if (!(adapter->flags &IAVF_FLAG_FDIR_ENABLED ))return -EOPNOTSUPP ;
@@ -1440,6 +1444,8 @@ iavf_set_adv_rss_hash_opt(struct iavf_adapter *adapter,u64 hash_flds;u32 hdrs; +netdev_assert_locked (adapter->netdev); +if (!ADV_RSS_SUPPORT (adapter))return -EOPNOTSUPP ;
drivers/net/ethernet/intel/iavf/iavf_main.c +10 -0
@@ -1292,6 +1292,8 @@ static void iavf_configure(struct iavf_adapter *adapter)**/ static void iavf_up_complete (struct iavf_adapter *adapter) { +netdev_assert_locked (adapter->netdev); +iavf_change_state (adapter, __IAVF_RUNNING);clear_bit (__IAVF_VSI_DOWN, adapter->vsi.state);
@@ -1417,6 +1419,8 @@ void iavf_down(struct iavf_adapter *adapter) {struct net_device *netdev = adapter->netdev; +netdev_assert_locked (netdev); +if (adapter->state <= __IAVF_DOWN_PENDING)return ;
@@ -3078,6 +3082,8 @@ static void iavf_disable_vf(struct iavf_adapter *adapter)struct iavf_vlan_filter *fv, *fvtmp;struct iavf_cloud_filter *cf, *cftmp; +netdev_assert_locked (adapter->netdev); + adapter->flags |=IAVF_FLAG_PF_COMMS_FAILED ;/* We don't use netif_running() because it may be true prior to
@@ -5194,6 +5200,8 @@ iavf_shaper_set(struct net_shaper_binding *binding,struct iavf_ring *tx_ring;int ret =0 ; +netdev_assert_locked (adapter->netdev); +mutex_lock (&adapter->crit_lock);if (handle->id >= adapter->num_active_queues) goto unlock;
@@ -5222,6 +5230,8 @@ static int iavf_shaper_del(struct net_shaper_binding *binding,struct iavf_adapter *adapter =netdev_priv (binding->netdev);struct iavf_ring *tx_ring; +netdev_assert_locked (adapter->netdev); +mutex_lock (&adapter->crit_lock);if (handle->id >= adapter->num_active_queues) goto unlock;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 597/780 iavf: get rid of the crit lock
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Przemek Kitszel <[email protected]>
[ Upstream commit 120f28a6f314fef7f282c99f196923fe44081cad ]
Get rid of the crit lock.
That frees us from the error prone logic of try_locks.
Thanks to netdev_lock() by Jakub it is now easy, and in most cases we were protected by it already - replace crit lock by netdev lock when it was not the case.
Lockdep reports that we should cancel the work under crit_lock [splat1], and that was the scheme we have mostly followed since [1] by Slawomir. But when that is done we still got into deadlocks [splat2]. So instead we should look at the bigger problem, namely "weird locking/scheduling" of the iavf. The first step to fix that is to remove the crit lock. I will followup with a -next series that simplifies scheduling/tasks.
Cancel the work without netdev lock (weird unlock+lock scheme), to fix the [splat2] (which would be totally ugly if we would kept the crit lock).
Extend protected part of iavf_watchdog_task() to include scheduling more work.
Note that the removed comment in iavf_reset_task() was misplaced, it belonged to inside of the removed if condition, so it's gone now.
[splat1] - w/o this patch - The deadlock during VF removal:
WARNING: possible circular locking dependency detected
sh/3825 is trying to acquire lock:
((work_completion)(&(&adapter->watchdog_task)->work)){+.+.}-{0:0}, at: start_flush_work+0x1a1/0x470
but task is already holding lock:
(&adapter->crit_lock){+.+.}-{4:4}, at: iavf_remove+0xd1/0x690 [iavf]
which lock already depends on the new lock.
[splat2] - when cancelling work under crit lock, w/o this series,
see [2] for the band aid attempt
WARNING: possible circular locking dependency detected sh/3550 is trying to acquire lock:
((wq_completion)iavf){+.+.}-{0:0}, at: touch_wq_lockdep_map+0x26/0x90
but task is already holding lock:
(&dev->lock){+.+.}-{4:4}, at: iavf_remove+0xa6/0x6e0 [iavf]
which lock already depends on the new lock.
[1] fc2e6b3b132a ("iavf: Rework mutexes for better synchronisation")
[2] https://github.com/pkitszel/linux/commit/52dddbfc2bb60294083f5711a158a
--- drivers/net/ethernet/intel/iavf/iavf.h | 1 - .../net/ethernet/intel/iavf/iavf_ethtool.c | 23 +-- drivers/net/ethernet/intel/iavf/iavf_main.c | 165 ++++-------------- 3 files changed, 38 insertions(+), 151 deletions(-)
drivers/net/ethernet/intel/iavf/iavf.h +0 -1
@@ -268,7 +268,6 @@ struct iavf_adapter {struct list_head vlan_filter_list;int num_vlan_filters;struct list_head mac_filter_list; -struct mutex crit_lock;/* Lock to protect accesses to MAC and VLAN lists */ spinlock_t mac_vlan_list_lock;char misc_vector_name[IFNAMSIZ +9 ];
drivers/net/ethernet/intel/iavf/iavf_ethtool.c +1 -22
@@ -1258,7 +1258,6 @@ static int iavf_add_fdir_ethtool(struct iavf_adapter *adapter, struct ethtool_rx {struct ethtool_rx_flow_spec *fsp = &cmd->fs;struct iavf_fdir_fltr *fltr; -int count =50 ;int err;netdev_assert_locked (adapter->netdev);
@@ -1281,14 +1280,6 @@ static int iavf_add_fdir_ethtool(struct iavf_adapter *adapter, struct ethtool_rxif (!fltr)return -ENOMEM ; -while (!mutex_trylock (&adapter->crit_lock)) { -if (--count ==0 ) { -kfree (fltr); -return -EINVAL ; - } -udelay (1 ); - } - err =iavf_add_fdir_fltr_info (adapter, fsp, fltr);if (!err) err =iavf_fdir_add_fltr (adapter, fltr);
@@ -1296,7 +1287,6 @@ static int iavf_add_fdir_ethtool(struct iavf_adapter *adapter, struct ethtool_rxif (err)kfree (fltr); -mutex_unlock (&adapter->crit_lock);return err; }
@@ -1439,9 +1429,9 @@ iavf_set_adv_rss_hash_opt(struct iavf_adapter *adapter, {struct iavf_adv_rss *rss_old, *rss_new;bool rss_new_add = false; -int count =50 , err =0 ;bool symm = false;u64 hash_flds; +int err =0 ;u32 hdrs;netdev_assert_locked (adapter->netdev);
@@ -1469,15 +1459,6 @@ iavf_set_adv_rss_hash_opt(struct iavf_adapter *adapter,return -EINVAL ; } -while (!mutex_trylock (&adapter->crit_lock)) { -if (--count ==0 ) { -kfree (rss_new); -return -EINVAL ; - } - -udelay (1 ); - } -spin_lock_bh (&adapter->adv_rss_lock); rss_old =iavf_find_adv_rss_cfg_by_hdrs (adapter, hdrs);if (rss_old) {
@@ -1506,8 +1487,6 @@ iavf_set_adv_rss_hash_opt(struct iavf_adapter *adapter,if (!err)iavf_schedule_aq_request (adapter,IAVF_FLAG_AQ_ADD_ADV_RSS_CFG ); -mutex_unlock (&adapter->crit_lock); -if (!rss_new_add)kfree (rss_new);
drivers/net/ethernet/intel/iavf/iavf_main.c +37 -128
445 lines not on this page · raw message
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 598/780 drm/amdgpu/gfx10: Refine Cleaner Shader for GFX10.1.10
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vitaly Prosyak <[email protected]>
[ Upstream commit d26625d034fb8d596f0488472969493fa02d03f3 ]
This patch updates the cleaner shader, which is responsible for initializing GPU resources such as Local Data Share (LDS), Vector General Purpose Registers (VGPRs), and Scalar General Purpose Registers (SGPRs). Changes include adjustments to register clearing and shader configuration.
- Updated GPU resource initialization addresses in the cleaner shader from be803080 to be803000.
- Simplified the logic in the SGPR clearing section, ensuring all SGPRs are set to zero.
--- .../gpu/drm/amd/amdgpu/gfx_v10_0_cleaner_shader.h | 6 +++--- .../drm/amd/amdgpu/gfx_v10_1_10_cleaner_shader.asm | 13 ++++++------- 2 files changed, 9 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v10_0_cleaner_shader.h +3 -3
@@ -43,9 +43,9 @@ static const u32 gfx_10_1_10_cleaner_shader_hex[] = {0xd70f6a01 ,0x000202ff ,0x00000400 ,0x80828102 ,0xbf84fff7 ,0xbefc03ff , -0x00000068 ,0xbe803080 , -0xbe813080 ,0xbe823080 , -0xbe833080 ,0x80fc847c , +0x00000068 ,0xbe803000 , +0xbe813000 ,0xbe823000 , +0xbe833000 ,0x80fc847c ,0xbf84fffa ,0xbeea0480 ,0xbeec0480 ,0xbeee0480 , 0xbef00480, 0xbef20480,
drivers/gpu/drm/amd/amdgpu/gfx_v10_1_10_cleaner_shader.asm +6 -7
@@ -40,7 +40,6 @@ shader main type(CS) wave_size(32) // Note: original source code from SQ team - // // Create 32 waves in a threadgroup (CS waves) // Each allocates 64 VGPRs
@@ -71,8 +70,8 @@ label_0005: s_sub_u32 s2, s2, 8 s_cbranch_scc0 label_0005 // - s_mov_b32 s2, 0x80000000 // Bit31 is first_wave - s_and_b32 s2, s2, s0 // sgpr0 has tg_size (first_wave) term as in ucode only COMPUTE_PGM_RSRC2.tg_size_en is set + s_mov_b32 s2, 0x80000000 // Bit31 is first_wave + s_and_b32 s2, s2, s1 // sgpr0 has tg_size (first_wave) term as in ucode only COMPUTE_PGM_RSRC2.tg_size_en is set s_cbranch_scc0 label_0023 // Clean LDS if its first wave of ThreadGroup/WorkGroup // CLEAR LDS //
@@ -99,10 +98,10 @@ label_001F: label_0023: s_mov_b32 m0, 0x00000068 // Loop 108/4=27 times (loop unrolled for performance) label_sgpr_loop: - s_movreld_b32 s0, 0 - s_movreld_b32 s1, 0 - s_movreld_b32 s2, 0 - s_movreld_b32 s3, 0 + s_movreld_b32 s0, s0 + s_movreld_b32 s1, s0 + s_movreld_b32 s2, s0 + s_movreld_b32 s3, s0 s_sub_u32 m0, m0, 4 s_cbranch_scc0 label_sgpr_loop
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 599/780 PM: sleep: Fix power.is_suspended cleanup for direct-complete devices
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rafael J. Wysocki <[email protected]>
[ Upstream commit d46c4c839c20a599a0eb8d73708ce401f9c7d06d ]
Commit 03f1444016b7 ("PM: sleep: Fix handling devices with direct_complete set on errors") caused power.is_suspended to be set for devices with power.direct_complete set, but it forgot to ensure the clearing of that flag for them in device_resume(), so power.is_suspended is still set for them during the next system suspend-resume cycle.
If that cycle is aborted in dpm_suspend(), the subsequent invocation of dpm_resume() will trigger a device_resume() call for every device and because power.is_suspended is set for the devices in question, they will not be skipped by device_resume() as expected which causes scary error messages to be logged (as appropriate).
To address this issue, move the clearing of power.is_suspended in device_resume() immediately after the power.is_suspended check so it will be always cleared for all devices processed by that function.
--- drivers/base/power/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/base/power/main.c +2 -1
@@ -941,6 +941,8 @@ static void device_resume(struct device *dev, pm_message_t state, bool async)if (!dev->power.is_suspended) goto Complete; + dev->power.is_suspended = false; +if (dev->power.direct_complete) {/* * Allow new children to be added under the device after this
@@ -1003,7 +1005,6 @@ static void device_resume(struct device *dev, pm_message_t state, bool async) End: error =dpm_run_callback (callback, dev, state, info); - dev->power.is_suspended = false;device_unlock (dev);dpm_watchdog_clear (&wd);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 600/780 block: flip iter directions in blk_rq_integrity_map_user()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Caleb Sander Mateos <[email protected]>
[ Upstream commit 43a67dd812c5d3de163c0b6971046b4a4b633d3f ]
blk_rq_integrity_map_user() creates the ubuf iter with ITER_DEST for write-direction operations and ITER_SOURCE for read-direction ones. This is backwards; writes use the user buffer as a source for metadata and reads use it as a destination. Switch to the rq_data_dir() helper, which maps writes to ITER_SOURCE (WRITE) and reads to ITER_DEST(READ).
--- block/blk-integrity.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
block/blk-integrity.c +1 -6
@@ -117,13 +117,8 @@ int blk_rq_integrity_map_user(struct request *rq, void __user *ubuf, {int ret;struct iov_iter iter; -unsigned int direction; -if (op_is_write (req_op (rq))) - direction =ITER_DEST ; -else - direction =ITER_SOURCE ; -iov_iter_ubuf (&iter, direction, ubuf, bytes); +iov_iter_ubuf (&iter,rq_data_dir (rq), ubuf, bytes); ret =bio_integrity_map_user (rq->bio, &iter);if (ret)return ret;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 601/780 nvme: fix command limits status code
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Keith Busch <[email protected]>
[ Upstream commit 10f4a7cd724e34b7a6ff96e57ac49dc0cadececc ]
The command specific status code, 0x183, was introduced in the NVMe 2.0 specification defined to "Command Size Limits Exceeded" and only ever applied to DSM and Copy commands. Fix the name and, remove the incorrect translation to error codes and special treatment in the target code for it.
--- drivers/nvme/host/constants.c | 2 +- drivers/nvme/host/core.c | 1 - drivers/nvme/host/pr.c | 2 -- drivers/nvme/target/core.c | 9 +-------- drivers/nvme/target/io-cmd-bdev.c | 9 +-------- include/linux/nvme.h | 2 +- 6 files changed, 4 insertions(+), 21 deletions(-)
drivers/nvme/host/constants.c +1 -1
@@ -145,7 +145,7 @@ static const char * const nvme_statuses[] = { [NVME_SC_BAD_ATTRIBUTES] = "Conflicting Attributes", [NVME_SC_INVALID_PI] = "Invalid Protection Information", [NVME_SC_READ_ONLY] = "Attempted Write to Read Only Range", - [NVME_SC_ONCS_NOT_SUPPORTED] = "ONCS Not Supported", + [NVME_SC_CMD_SIZE_LIM_EXCEEDED ] = "Command Size Limits Exceeded", [NVME_SC_ZONE_BOUNDARY_ERROR] = "Zoned Boundary Error", [NVME_SC_ZONE_FULL] = "Zone Is Full", [NVME_SC_ZONE_READ_ONLY] = "Zone Is Read Only",
drivers/nvme/host/core.c +0 -1
@@ -286,7 +286,6 @@ static blk_status_t nvme_error_status(u16 status)case NVME_SC_NS_NOT_READY :return BLK_STS_TARGET ;case NVME_SC_BAD_ATTRIBUTES : -case NVME_SC_ONCS_NOT_SUPPORTED :case NVME_SC_INVALID_OPCODE :case NVME_SC_INVALID_FIELD :case NVME_SC_INVALID_NS :
drivers/nvme/host/pr.c +0 -2
@@ -82,8 +82,6 @@ static int nvme_status_to_pr_err(int status)return PR_STS_SUCCESS ;case NVME_SC_RESERVATION_CONFLICT :return PR_STS_RESERVATION_CONFLICT ; -case NVME_SC_ONCS_NOT_SUPPORTED : -return -EOPNOTSUPP ;case NVME_SC_BAD_ATTRIBUTES :case NVME_SC_INVALID_OPCODE :case NVME_SC_INVALID_FIELD :
drivers/nvme/target/core.c +1 -8
@@ -62,14 +62,7 @@ inline u16 errno_to_nvme_status(struct nvmet_req *req, int errno)return NVME_SC_LBA_RANGE |NVME_STATUS_DNR ;case -EOPNOTSUPP : req->error_loc = offsetof(struct nvme_common_command , opcode); -switch (req->cmd->common.opcode) { -case nvme_cmd_dsm: -case nvme_cmd_write_zeroes: -return NVME_SC_ONCS_NOT_SUPPORTED |NVME_STATUS_DNR ; -default : -return NVME_SC_INVALID_OPCODE |NVME_STATUS_DNR ; - } -break ; +return NVME_SC_INVALID_OPCODE |NVME_STATUS_DNR ;case -ENODATA : req->error_loc = offsetof(struct nvme_rw_command , nsid);return NVME_SC_ACCESS_DENIED ;
drivers/nvme/target/io-cmd-bdev.c +1 -8
@@ -145,15 +145,8 @@ u16 blk_to_nvme_status(struct nvmet_req *req, blk_status_t blk_sts) req->error_loc = offsetof(struct nvme_rw_command , slba);break ;case BLK_STS_NOTSUPP : + status =NVME_SC_INVALID_OPCODE |NVME_STATUS_DNR ; req->error_loc = offsetof(struct nvme_common_command , opcode); -switch (req->cmd->common.opcode) { -case nvme_cmd_dsm: -case nvme_cmd_write_zeroes: - status =NVME_SC_ONCS_NOT_SUPPORTED |NVME_STATUS_DNR ; -break ; -default : - status =NVME_SC_INVALID_OPCODE |NVME_STATUS_DNR ; - }break ;case BLK_STS_MEDIUM : status =NVME_SC_ACCESS_DENIED ;
include/linux/nvme.h +1 -1
@@ -2094,7 +2094,7 @@ enum {NVME_SC_BAD_ATTRIBUTES =0x180 ,NVME_SC_INVALID_PI =0x181 ,NVME_SC_READ_ONLY =0x182 , - NVME_SC_ONCS_NOT_SUPPORTED = 0x183, + NVME_SC_CMD_SIZE_LIM_EXCEEDED = 0x183,/* * I/O Command Set Specific - Fabrics commands:
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 602/780 nvme: fix implicit bool to flags conversion
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pavel Begunkov <[email protected]>
[ Upstream commit c4b680ac2863821e19d360fca62f78b68b1c8ece ]
nvme_map_user_request() takes flags as the last argument, but nvme_uring_cmd_io() shoves a bool "vec" into it. It behaves as expected because bool is converted to 0/1 and NVME_IOCTL_VEC is defined as 1, but it's better to pass flags explicitly.
--- drivers/nvme/host/ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvme/host/ioctl.c +1 -1
@@ -521,7 +521,7 @@ static int nvme_uring_cmd_io(struct nvme_ctrl *ctrl, struct nvme_ns *ns,if (d.data_len) { ret =nvme_map_user_request (req, d.addr, d.data_len,nvme_to_user_ptr (d.metadata), d.metadata_len, - map_iter, vec); + map_iter, vec ?NVME_IOCTL_VEC :0 );if (ret) goto out_free_req; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 603/780 gve: add missing NULL check for gve_alloc_pending_packet() in TX DQO
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alok Tiwari <[email protected]>
[ Upstream commit 12c331b29c7397ac3b03584e12902990693bc248 ]
gve_alloc_pending_packet() can return NULL, but gve_tx_add_skb_dqo() did not check for this case before dereferencing the returned pointer.
Add a missing NULL check to prevent a potential NULL pointer dereference when allocation fails.
This improves robustness in low-memory scenarios.
--- drivers/net/ethernet/google/gve/gve_tx_dqo.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/google/gve/gve_tx_dqo.c +3 -0
@@ -763,6 +763,9 @@ static int gve_tx_add_skb_dqo(struct gve_tx_ring *tx,s16 completion_tag; pkt =gve_alloc_pending_packet (tx); +if (!pkt) +return -ENOMEM ; + pkt->skb = skb; completion_tag = pkt - tx->dqo.pending_packets;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 604/780 drm/i915/display: Fix u32 overflow in SNPS PHY HDMI PLL setup
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dibin Moolakadan Subrahmanian <[email protected]>
[ Upstream commit 791d76005de0ab556b590473eb4cbfede727fce0 ]
When configuring the HDMI PLL, calculations use DIV_ROUND_UP_ULL and DIV_ROUND_DOWN_ULL macros, which internally rely on do_div. However, do_div expects a 32-bit (u32) divisor, and at higher data rates, the divisor can exceed this limit. This leads to incorrect division results and ultimately misconfigured PLL values.
This fix replaces do_div calls with div64_base64 calls where diviser can exceed u32 limit.
--- .../gpu/drm/i915/display/intel_snps_hdmi_pll.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/display/intel_snps_hdmi_pll.c +8 -8
@@ -41,12 +41,12 @@ static s64 interp(s64 x, s64 x1, s64 x2, s64 y1, s64 y2) {s64 dydx; - dydx =DIV_ROUND_UP_ULL ((y2 - y1) *100000 , (x2 - x1)); + dydx =DIV64_U64_ROUND_UP ((y2 - y1) *100000 , (x2 - x1)); -return (y1 +DIV_ROUND_UP_ULL (dydx * (x - x1),100000 )); +return (y1 +DIV64_U64_ROUND_UP (dydx * (x - x1),100000 )); } -static void get_ana_cp_int_prop(u32 vco_clk, +static void get_ana_cp_int_prop(u64 vco_clk, u32 refclk_postscalar, int mpll_ana_v2i, int c, int a,
@@ -115,16 +115,16 @@ static void get_ana_cp_int_prop(u32 vco_clk, CURVE0_MULTIPLIER)); scaled_interpolated_sqrt = -int_sqrt (DIV_ROUND_UP_ULL (interpolated_product, vco_div_refclk_float) * +int_sqrt (DIV64_U64_ROUND_UP (interpolated_product, vco_div_refclk_float) *DIV_ROUND_DOWN_ULL (1000000000000ULL ,55 ));/* Scale vco_div_refclk for ana_cp_int */ scaled_vco_div_refclk2 =DIV_ROUND_UP_ULL (vco_div_refclk_float,1000000 ); - adjusted_vco_clk2 =1460281 *DIV_ROUND_UP_ULL (scaled_interpolated_sqrt * + adjusted_vco_clk2 =1460281 *DIV64_U64_ROUND_UP (scaled_interpolated_sqrt * scaled_vco_div_refclk2, curve_1_interpolated); - *ana_cp_prop =DIV_ROUND_UP_ULL (adjusted_vco_clk2, curve_2_scaled2); + *ana_cp_prop =DIV64_U64_ROUND_UP (adjusted_vco_clk2, curve_2_scaled2); *ana_cp_prop =max (1 ,min (*ana_cp_prop,127 )); }
@@ -165,10 +165,10 @@ static void compute_hdmi_tmds_pll(u64 pixel_clock, u32 refclk,/* Select appropriate v2i point */ if (datarate <=INTEL_SNPS_PHY_HDMI_9999MHZ ) { mpll_ana_v2i =2 ; - tx_clk_div =ilog2 (DIV_ROUND_DOWN_ULL (INTEL_SNPS_PHY_HDMI_9999MHZ , datarate)); + tx_clk_div =ilog2 (div64_u64 (INTEL_SNPS_PHY_HDMI_9999MHZ , datarate)); }else { mpll_ana_v2i =3 ; - tx_clk_div =ilog2 (DIV_ROUND_DOWN_ULL (INTEL_SNPS_PHY_HDMI_16GHZ , datarate)); + tx_clk_div =ilog2 (div64_u64 (INTEL_SNPS_PHY_HDMI_16GHZ , datarate)); } vco_clk = (datarate << tx_clk_div) >>1 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 605/780 wifi: iwlwifi: mld: avoid panic on init failure
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miri Korenblit <[email protected]>
[ Upstream commit 960c7e6d388034d219dafffa6da0a5c2ccd5ff30 ]
In case of an error during init, in_hw_restart will be set, but it will never get cleared.
Instead, we will retry to init again, and then we will act like we are in a restart when we are actually not.
This causes (among others) to a NULL pointer dereference when canceling rx_omi::finished_work, that was not even initialized, because we thought that we are in hw_restart.
Set in_hw_restart to true only if the fw is running, then we know that FW was loaded successfully and we are not going to the retry loop.
--- drivers/net/wireless/intel/iwlwifi/mld/mld.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/mld/mld.c +2 -1
@@ -638,7 +638,8 @@ iwl_mld_nic_error(struct iwl_op_mode *op_mode,* It might not actually be true that we'll restart, but the * setting doesn't matter if we're going to be unbound either. */ -if (type !=IWL_ERR_TYPE_RESET_HS_TIMEOUT ) +if (type !=IWL_ERR_TYPE_RESET_HS_TIMEOUT && + mld->fw_status.running) mld->fw_status.in_hw_restart = true; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 606/780 drm/panel-simple: fix the warnings for the Evervision VGG644804
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Walle <[email protected]>
[ Upstream commit 5dc1ea903588a73fb03b3a3e5a041a7c63a4bccd ]
The panel lacked the connector type which causes a warning. Adding the connector type reveals wrong bus_flags and bits per pixel. Fix all of it.
--- drivers/gpu/drm/panel/panel-simple.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/panel/panel-simple.c +3 -2
@@ -2199,13 +2199,14 @@ static const struct display_timing evervision_vgg644804_timing = {static const struct panel_desc evervision_vgg644804 = { .timings = &evervision_vgg644804_timing, .num_timings =1 , - .bpc =8 , + .bpc =6 , .size = { .width =115 , .height =86 , }, .bus_format =MEDIA_BUS_FMT_RGB666_1X7X3_SPWG , - .bus_flags =DRM_BUS_FLAG_DE_HIGH |DRM_BUS_FLAG_PIXDATA_SAMPLE_NEGEDGE , + .bus_flags =DRM_BUS_FLAG_DE_HIGH , + .connector_type =DRM_MODE_CONNECTOR_LVDS , };static const struct display_timing evervision_vgg804821_timing = {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 607/780 netfilter: nf_set_pipapo_avx2: fix initial map fill
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Westphal <[email protected]>
[ Upstream commit ea77c397bff8b6d59f6d83dae1425b08f465e8b5 ]
If the first field doesn't cover the entire start map, then we must zero out the remainder, else we leak those bits into the next match round map.
The early fix was incomplete and did only fix up the generic C implementation.
A followup patch adds a test case to nft_concat_range.sh.
--- net/netfilter/nft_set_pipapo_avx2.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-)
net/netfilter/nft_set_pipapo_avx2.c +20 -1
@@ -1113,6 +1113,25 @@ bool nft_pipapo_avx2_estimate(const struct nft_set_desc *desc, u32 features,return true; } +/** +* pipapo_resmap_init_avx2() - Initialise result map before first use +* @m: Matching data, including mapping table +* @res_map: Result map +* +* Like pipapo_resmap_init() but do not set start map bits covered by the first field. +*/ +static inline void pipapo_resmap_init_avx2 (const struct nft_pipapo_match *m,unsigned long *res_map) +{ +const struct nft_pipapo_field *f = m->f; +int i; + +/* Starting map doesn't need to be set to all-ones for this implementation, +* but we do need to zero the remaining bits, if any. +*/ +for (i = f->bsize; i < m->bsize_max; i++) + res_map[i] =0ul ; +} +/** * nft_pipapo_avx2_lookup() - Lookup function for AVX2 implementation * @net: Network namespace
@@ -1171,7 +1190,7 @@ bool nft_pipapo_avx2_lookup(const struct net *net, const struct nft_set *set, res = scratch->map + (map_index ? m->bsize_max :0 ); fill = scratch->map + (map_index ?0 : m->bsize_max); -/* Starting map doesn't need to be set for this implementation */ +pipapo_resmap_init_avx2 (m, res);nft_pipapo_avx2_prepare ();
Signature · 1 line
2.39.5
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.15.3 release. There are 780 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 19 Jun 2025 15:22:30 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.15.3-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.15.y
and the diffstat can be found below.thanks,
greg k-h
On ARCH_BRCMTB using 32-bit and 64-bit kernels, build on BMIPS_GENERIC:
Signature · 1 line
Florian
Greg Kroah-Hartman
maintainerPATCH 608/780 netfilter: nf_nat: also check reverse tuple to obtain clashing entry
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Westphal <[email protected]>
[ Upstream commit 50d9ce9679dd50df2dc51ada717fa875bc248fad ]
The logic added in the blamed commit was supposed to only omit nat source port allocation if neither the existing nor the new entry are subject to NAT.
However, its not enough to lookup the conntrack based on the proposed tuple, we must also check the reverse direction.
Otherwise there are esoteric cases where the collision is in the reverse direction because that colliding connection has a port rewrite, but the new entry doesn't. In this case, we only check the new entry and then erronously conclude that no clash exists anymore.
The existing (udp) tuple is:
a:p -> b:P, with nat translation to s:P, i.e. pure daddr rewrite, reverse tuple in conntrack table is s:P -> a:p.
When another UDP packet is sent directly to s, i.e. a:p->s:P, this is correctly detected as a colliding entry: tuple is taken by existing reply tuple in reverse direction.
But the colliding conntrack is only searched for with unreversed direction, and we can't find such entry matching a:p->s:P.
The incorrect conclusion is that the clashing entry has timed out and that no port address translation is required.
Such conntrack will then be discarded at nf_confirm time because the proposed reverse direction clashes with an existing mapping in the conntrack table.
Search for the reverse tuple too, this will then check the NAT bits of the colliding entry and triggers port reallocation.
Followp patch extends nft_nat.sh selftest to cover this scenario.
The IPS_SEQ_ADJUST change is also a bug fix:
Instead of checking for SEQ_ADJ this tested for SEEN_REPLY and ASSURED by accident -- _BIT is only for use with the test_bit() API.
This bug has little consequence in practice, because the sequence number adjustments are only useful for TCP which doesn't support clash resolution.
The existing test case (conntrack_reverse_clash.sh) exercise a race condition path (parallel conntrack creation on different CPUs), so the colliding entries have neither SEEN_REPLY nor ASSURED set.
Thanks to Yafang Shao and Shaun Brady for an initial investigation of this bug.
--- net/netfilter/nf_nat_core.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
net/netfilter/nf_nat_core.c +9 -3
@@ -248,7 +248,7 @@ static noinline bool nf_nat_used_tuple_new(const struct nf_conntrack_tuple *tuple, const struct nf_conn *ignored_ct) { -static const unsigned long uses_nat =IPS_NAT_MASK |IPS_SEQ_ADJUST_BIT ; +static const unsigned long uses_nat =IPS_NAT_MASK |IPS_SEQ_ADJUST ;const struct nf_conntrack_tuple_hash *thash;const struct nf_conntrack_zone *zone;struct nf_conn *ct;
@@ -287,8 +287,14 @@ nf_nat_used_tuple_new(const struct nf_conntrack_tuple *tuple, zone =nf_ct_zone (ignored_ct); thash =nf_conntrack_find_get (net, zone, tuple); -if (unlikely (!thash))/* clashing entry went away */ -return false; +if (unlikely (!thash)) { +struct nf_conntrack_tuple reply; + +nf_ct_invert_tuple (&reply, tuple); + thash =nf_conntrack_find_get (net, zone, &reply); +if (!thash)/* clashing entry went away */ +return false; + } ct =nf_ct_tuplehash_to_ctrack (thash);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 609/780 net: ti: icssg-prueth: Fix swapped TX stats for MII interfaces.
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Meghana Malladi <[email protected]>
[ Upstream commit 919d763d609428c2680ec8159257d9655f002f89 ]
In MII mode, Tx lines are swapped for port0 and port1, which means Tx port0 receives data from PRU1 and the Tx port1 receives data from PRU0. This is an expected hardware behavior and reading the Tx stats needs to be handled accordingly in the driver. Update the driver to read Tx stats from the PRU1 for port0 and PRU0 for port1.
--- drivers/net/ethernet/ti/icssg/icssg_stats.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/net/ethernet/ti/icssg/icssg_stats.c +8 -0
@@ -29,6 +29,14 @@ void emac_update_hardware_stats(struct prueth_emac *emac)spin_lock (&prueth->stats_lock);for (i =0 ; i <ARRAY_SIZE (icssg_all_miig_stats); i++) { +/* In MII mode TX lines are swapped inside ICSSG, so read Tx stats +* from slice1 for port0 and slice0 for port1 to get accurate Tx +* stats for a given port +*/ +if (emac->phy_if ==PHY_INTERFACE_MODE_MII && + icssg_all_miig_stats[i].offset >=ICSSG_TX_PACKET_OFFSET && + icssg_all_miig_stats[i].offset <=ICSSG_TX_BYTE_OFFSET ) + base = stats_base[slice ^1 ];regmap_read (prueth->miig_rt, base + icssg_all_miig_stats[i].offset, &val);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 610/780 net: dsa: b53: do not enable EEE on bcm63xx
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonas Gorski <[email protected]>
[ Upstream commit 1237c2d4a8db79dfd4369bff6930b0e385ed7d5c ]
BCM63xx internal switches do not support EEE, but provide multiple RGMII ports where external PHYs may be connected. If one of these PHYs are EEE capable, we may try to enable EEE for the MACs, which then hangs the system on access of the (non-existent) EEE registers.
Fix this by checking if the switch actually supports EEE before attempting to configure it.
--- drivers/net/dsa/b53/b53_common.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/dsa/b53/b53_common.c +4 -1
@@ -2348,6 +2348,9 @@ int b53_eee_init(struct dsa_switch *ds, int port, struct phy_device *phy) {int ret; +if (!b53_support_eee (ds, port)) +return 0 ; + ret =phy_init_eee (phy, false);if (ret)return 0 ;
@@ -2362,7 +2365,7 @@ bool b53_support_eee(struct dsa_switch *ds, int port) {struct b53_device *dev = ds->priv; -return !is5325 (dev) && !is5365 (dev); +return !is5325 (dev) && !is5365 (dev) && !is63xx (dev); }EXPORT_SYMBOL (b53_support_eee);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 611/780 net: dsa: b53: do not enable RGMII delay on bcm63xx
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonas Gorski <[email protected]>
[ Upstream commit 4af523551d876ab8b8057d1e5303a860fd736fcb ]
bcm63xx's RGMII ports are always in MAC mode, never in PHY mode, so we shouldn't enable any delays and let the PHY handle any delays as necessary.
This fixes using RGMII ports with normal PHYs like BCM54612E, which will handle the delay in the PHY.
--- drivers/net/dsa/b53/b53_common.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-)
drivers/net/dsa/b53/b53_common.c +1 -18
@@ -1325,24 +1325,7 @@ static void b53_adjust_63xx_rgmii(struct dsa_switch *ds, int port, off =B53_RGMII_CTRL_P (port);b53_read8 (dev,B53_CTRL_PAGE , off, &rgmii_ctrl); - -switch (interface) { -case PHY_INTERFACE_MODE_RGMII_ID : - rgmii_ctrl |= (RGMII_CTRL_DLL_RXC |RGMII_CTRL_DLL_TXC ); -break ; -case PHY_INTERFACE_MODE_RGMII_RXID : - rgmii_ctrl &= ~(RGMII_CTRL_DLL_TXC ); - rgmii_ctrl |=RGMII_CTRL_DLL_RXC ; -break ; -case PHY_INTERFACE_MODE_RGMII_TXID : - rgmii_ctrl &= ~(RGMII_CTRL_DLL_RXC ); - rgmii_ctrl |=RGMII_CTRL_DLL_TXC ; -break ; -case PHY_INTERFACE_MODE_RGMII : -default : - rgmii_ctrl &= ~(RGMII_CTRL_DLL_RXC |RGMII_CTRL_DLL_TXC ); -break ; - } + rgmii_ctrl &= ~(RGMII_CTRL_DLL_RXC |RGMII_CTRL_DLL_TXC );if (port != dev->imp_port) {if (is63268 (dev))
Signature · 1 line
2.39.5