4.19.130-rc1 review
Subsystems (7)
Greg Kroah-Hartman
maintainerPATCH 154/206 ASoC: core: only convert non DPCM link to DPCM link
In reply to Greg Kroah-HartmanFrom: Bard Liao <[email protected]>
[ Upstream commit 607fa205a7e4dfad28b8a67ab1c985756ddbccb0 ]
Additional checks for valid DAIs expose a corner case, where existing BE dailinks get modified, e.g. HDMI links are tagged with dpcm_capture=1 even if the DAIs are for playback.
This patch makes those changes conditional and flags configuration issues when a BE dailink is has no_pcm=0 but dpcm_playback or dpcm_capture=1 (which makes no sense).
As discussed on the alsa-devel mailing list, there are redundant flags for dpcm_playback, dpcm_capture, playback_only, capture_only. This will have to be cleaned-up in a future update. For now only correct and flag problematic configurations.
--- sound/soc/soc-core.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-)
sound/soc/soc-core.c +19 -3
@@ -1920,9 +1920,25 @@ static void soc_check_tplg_fes(struct snd_soc_card *card) dai_link->platform_name = component->name;/* convert non BE into BE */ - dai_link->no_pcm =1 ; - dai_link->dpcm_playback =1 ; - dai_link->dpcm_capture =1 ; +if (!dai_link->no_pcm) { + dai_link->no_pcm =1 ; + +if (dai_link->dpcm_playback) +dev_warn (card->dev, +"invalid configuration, dailink %s has flags no_pcm=0 and dpcm_playback=1\n" , + dai_link->name); +if (dai_link->dpcm_capture) +dev_warn (card->dev, +"invalid configuration, dailink %s has flags no_pcm=0 and dpcm_capture=1\n" , + dai_link->name); + +/* convert normal link into DPCM one */ +if (!(dai_link->dpcm_playback || + dai_link->dpcm_capture)) { + dai_link->dpcm_playback = !dai_link->capture_only; + dai_link->dpcm_capture = !dai_link->playback_only; + } + }/* override any BE fixups */ dai_link->be_hw_params_fixup =
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 155/206 ASoC: Intel: bytcr_rt5640: Add quirk for Toshiba Encore WT10-A tablet
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit 199a5e8fda54ab3c8c6f6bf980c004e97ebf5ccb ]
The Toshiba Encore WT10-A tablet almost fully works with the default settings for Bay Trail CR devices. The only issue is that it uses a digital mic. connected the the DMIC1 input instead of an analog mic.
Add a quirk for this model using the default settings with the input-map replaced with BYT_RT5640_DMIC1_MAP.
--- sound/soc/intel/boards/bytcr_rt5640.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
sound/soc/intel/boards/bytcr_rt5640.c +12 -0
@@ -724,6 +724,18 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {BYT_RT5640_JD_NOT_INV | BYT_RT5640_MCLK_EN), }, + { /* Toshiba Encore WT10-A */ + .matches = { +DMI_EXACT_MATCH (DMI_SYS_VENDOR ,"TOSHIBA" ), + DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "TOSHIBA WT10-A-103"), + }, + .driver_data = (void *)(BYT_RT5640_DMIC1_MAP | +BYT_RT5640_JD_SRC_JD1_IN4P | +BYT_RT5640_OVCD_TH_2000UA | +BYT_RT5640_OVCD_SF_0P75 | +BYT_RT5640_SSP0_AIF2 | + BYT_RT5640_MCLK_EN), + }, { /* Catch-all for generic Insyde tablets, must be last */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Insyde"),
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 156/206 ASoC: rt5645: Add platform-data for Asus T101HA
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit 79d4f823a06796656289f97b922493da5690e46c ]
The Asus T101HA uses the default jack-detect mode 3, but instead of using an analog microphone it is using a DMIC on dmic-data-pin 1, like the Asus T100HA. Note unlike the T100HA its jack-detect is not inverted.
Add a DMI quirk with the correct settings for this model.
--- sound/soc/codecs/rt5645.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
sound/soc/codecs/rt5645.c +14 -0
@@ -3656,6 +3656,12 @@ static const struct rt5645_platform_data asus_t100ha_platform_data = { .inv_jd1_1 = true, }; +static const struct rt5645_platform_data asus_t101ha_platform_data = { + .dmic1_data_pin =RT5645_DMIC_DATA_IN2N , + .dmic2_data_pin =RT5645_DMIC2_DISABLE , + .jd_mode =3 , +}; +static const struct rt5645_platform_data lenovo_ideapad_miix_310_pdata = { .jd_mode =3 , .in2_diff = true,
@@ -3733,6 +3739,14 @@ static const struct dmi_system_id dmi_platform_data[] = { }, .driver_data = (void *)&asus_t100ha_platform_data, }, + { + .ident = "ASUS T101HA", + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"ASUSTeK COMPUTER INC." ), + DMI_MATCH(DMI_PRODUCT_NAME, "T101HA"), + }, + .driver_data = (void *)&asus_t101ha_platform_data, + }, { .ident ="MINIX Z83-4" , .matches = {
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 157/206 drm/sun4i: hdmi ddc clk: Fix size of m divider
In reply to Greg Kroah-HartmanFrom: Jernej Skrabec <[email protected]>
[ Upstream commit 54e1e06bcf1cf6e7ac3f86daa5f7454add24b494 ]
m divider in DDC clock register is 4 bits wide. Fix that.
--- drivers/gpu/drm/sun4i/sun4i_hdmi.h | 2 +- drivers/gpu/drm/sun4i/sun4i_hdmi_ddc_clk.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/sun4i/sun4i_hdmi.h +1 -1
@@ -152,7 +152,7 @@#define SUN4I_HDMI_DDC_CMD_IMPLICIT_WRITE 3#define SUN4I_HDMI_DDC_CLK_REG 0x528 -#define SUN4I_HDMI_DDC_CLK_M (m) (((m) & 0x7) << 3) +#define SUN4I_HDMI_DDC_CLK_M (m) (((m) & 0xf) << 3)#define SUN4I_HDMI_DDC_CLK_N (n) ((n) & 0x7)#define SUN4I_HDMI_DDC_LINE_CTRL_REG 0x540
drivers/gpu/drm/sun4i/sun4i_hdmi_ddc_clk.c +1 -1
@@ -37,7 +37,7 @@ static unsigned long sun4i_ddc_calc_divider(unsigned long rate,unsigned long best_rate =0 ;u8 best_m =0 , best_n =0 , _m, _n; -for (_m =0 ; _m <8 ; _m++) { +for (_m =0 ; _m <16 ; _m++) {for (_n =0 ; _n <8 ; _n++) {unsigned long tmp_rate;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 158/206 scsi: acornscsi: Fix an error handling path in acornscsi_probe()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 42c76c9848e13dbe0538d7ae0147a269dfa859cb ]
'ret' is known to be 0 at this point. Explicitly return -ENOMEM if one of the 'ecardm_iomap()' calls fail.
--- drivers/scsi/arm/acornscsi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/scsi/arm/acornscsi.c +3 -1
@@ -2914,8 +2914,10 @@ static int acornscsi_probe(struct expansion_card *ec, const struct ecard_id *id) ashost->base =ecardm_iomap (ec,ECARD_RES_MEMC ,0 ,0 ); ashost->fast =ecardm_iomap (ec,ECARD_RES_IOCFAST ,0 ,0 ); -if (!ashost->base || !ashost->fast) +if (!ashost->base || !ashost->fast) { + ret = -ENOMEM ; goto out_put; + } host->irq = ec->irq; ashost->host = host;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 159/206 x86/idt: Keep spurious entries unset in system_vectors
In reply to Greg Kroah-HartmanFrom: Vitaly Kuznetsov <[email protected]>
[ Upstream commit 1f1fbc70c10e81f70e9fbe2102d439c883269811 ]
With commit dc20b2d52653 ("x86/idt: Move interrupt gate initialization to IDT code") non assigned system vectors are also marked as used in 'used_vectors' (now 'system_vectors') bitmap. This makes checks in arch_show_interrupts() whether a particular system vector is allocated to always pass and e.g. 'Hyper-V reenlightenment interrupts' entry always shows up in /proc/interrupts.
Another side effect of having all unassigned system vectors marked as used is that irq_matrix_debug_show() will wrongly count them among 'System' vectors.
As it is now ensured that alloc_intr_gate() is not called after init, it is possible to leave unused entries in 'system_vectors' unset to fix these issues.
--- arch/x86/kernel/idt.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
arch/x86/kernel/idt.c +5 -1
@@ -320,7 +320,11 @@ void __init idt_setup_apic_and_irq_gates(void)#ifdef CONFIG_X86_LOCAL_APIC for_each_clear_bit_from (i, system_vectors,NR_VECTORS ) { -set_bit (i, system_vectors); +/* +* Don't set the non assigned system vectors in the +* system_vectors bitmap. Otherwise they show up in +* /proc/interrupts. +*/ entry = spurious_entries_start +8 * (i -FIRST_SYSTEM_VECTOR );set_intr_gate (i, entry); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 160/206 net/filter: Permit reading NET in load_bytes_relative when MAC not set
In reply to Greg Kroah-HartmanFrom: YiFei Zhu <[email protected]>
[ Upstream commit 0f5d82f187e1beda3fe7295dfc500af266a5bd80 ]
Added a check in the switch case on start_header that checks for the existence of the header, and in the case that MAC is not set and the caller requests for MAC, -EFAULT. If the caller requests for NET then MAC's existence is completely ignored.
There is no function to check NET header's existence and as far as cgroup_skb/egress is concerned it should always be set.
Removed for ptr >= the start of header, considering offset is bounded unsigned and should always be true. len <= end - mac is redundant to ptr + len <= end.
--- net/core/filter.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
net/core/filter.c +9 -7
@@ -1730,25 +1730,27 @@ BPF_CALL_5(bpf_skb_load_bytes_relative, const struct sk_buff *, skb, u32, offset, void *, to, u32, len, u32, start_header) {u8 *end =skb_tail_pointer (skb); -u8 *net =skb_network_header (skb); -u8 *mac =skb_mac_header (skb); -u8 *ptr; +u8 *start, *ptr; -if (unlikely (offset >0xffff || len > (end - mac))) +if (unlikely (offset >0xffff )) goto err_clear;switch (start_header) {case BPF_HDR_START_MAC : - ptr = mac + offset; +if (unlikely (!skb_mac_header_was_set (skb))) + goto err_clear; + start =skb_mac_header (skb);break ;case BPF_HDR_START_NET : - ptr = net + offset; + start =skb_network_header (skb);break ;default : goto err_clear; } -if (likely (ptr >= mac && ptr + len <= end)) { + ptr = start + offset; + +if (likely (ptr + len <= end)) {memcpy (to, ptr, len);return 0 ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 161/206 xdp: Fix xsk_generic_xmit errno
In reply to Greg Kroah-HartmanFrom: Li RongQing <[email protected]>
[ Upstream commit aa2cad0600ed2ca6a0ab39948d4db1666b6c962b ]
Propagate sock_alloc_send_skb error code, not set it to EAGAIN unconditionally, when fail to allocate skb, which might cause that user space unnecessary loops.
--- net/xdp/xsk.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
net/xdp/xsk.c +1 -3
@@ -233,10 +233,8 @@ static int xsk_generic_xmit(struct sock *sk, struct msghdr *m, len = desc.len; skb =sock_alloc_send_skb (sk, len,1 , &err); -if (unlikely (!skb)) { - err = -EAGAIN ; +if (unlikely (!skb)) goto out; - }skb_put (skb, len); addr = desc.addr;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 162/206 usb/xhci-plat: Set PM runtime as active on resume
In reply to Greg Kroah-HartmanFrom: Qais Yousef <[email protected]>
[ Upstream commit 79112cc3c29f4a8c73a21428fbcbcb0afb005e3e ]
Follow suit of ohci-platform.c and perform pm_runtime_set_active() on resume.
ohci-platform.c had a warning reported due to the missing pm_runtime_set_active() [1].
[1] https://lore.kernel.org/lkml/[email protected]/
--- drivers/usb/host/xhci-plat.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/usb/host/xhci-plat.c +9 -1
@@ -408,7 +408,15 @@ static int __maybe_unused xhci_plat_resume(struct device *dev)if (ret)return ret; -return xhci_resume (xhci,0 ); + ret =xhci_resume (xhci,0 ); +if (ret) +return ret; + +pm_runtime_disable (dev); +pm_runtime_set_active (dev); +pm_runtime_enable (dev); + +return 0 ; }static int __maybe_unused xhci_plat_runtime_suspend (struct device *dev)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 163/206 usb: host: ehci-platform: add a quirk to avoid stuck
In reply to Greg Kroah-HartmanFrom: Yoshihiro Shimoda <[email protected]>
[ Upstream commit cc7eac1e4afdd151085be4d0341a155760388653 ]
Since EHCI/OHCI controllers on R-Car Gen3 SoCs are possible to be getting stuck very rarely after a full/low usb device was disconnected. To detect/recover from such a situation, the controllers require a special way which poll the EHCI PORTSC register and changes the OHCI functional state.
So, this patch adds a polling timer into the ehci-platform driver, and if the ehci driver detects the issue by the EHCI PORTSC register, the ehci driver removes a companion device (= the OHCI controller) to change the OHCI functional state to USB Reset once. And then, the ehci driver adds the companion device again.
--- drivers/usb/host/ehci-platform.c | 127 +++++++++++++++++++++++++++++++ include/linux/usb/ehci_def.h | 2 +- 2 files changed, 128 insertions(+), 1 deletion(-)
drivers/usb/host/ehci-platform.c +127 -0
@@ -29,6 +29,8 @@#include <linux/of.h> #include <linux/platform_device.h> #include <linux/reset.h> +#include <linux/sys_soc.h> +#include <linux/timer.h> #include <linux/usb.h> #include <linux/usb/hcd.h> #include <linux/usb/ehci_pdriver.h>
@@ -44,6 +46,9 @@ struct ehci_platform_priv {struct clk *clks[EHCI_MAX_CLKS ];struct reset_control *rsts;bool reset_on_resume; +bool quirk_poll; +struct timer_list poll_timer; +struct delayed_work poll_work; };static const char hcd_name[] ="ehci-platform" ;
@@ -118,6 +123,111 @@ static struct usb_ehci_pdata ehci_platform_defaults = { .power_off = ehci_platform_power_off, }; +/** +* quirk_poll_check_port_status - Poll port_status if the device sticks +* @ehci: the ehci hcd pointer +* +* Since EHCI/OHCI controllers on R-Car Gen3 SoCs are possible to be getting +* stuck very rarely after a full/low usb device was disconnected. To +* detect such a situation, the controllers require a special way which poll +* the EHCI PORTSC register. +* +* Return: true if the controller's port_status indicated getting stuck +*/ +static bool quirk_poll_check_port_status (struct ehci_hcd *ehci) +{ +u32 port_status =ehci_readl (ehci, &ehci->regs->port_status[0 ]); + +if (!(port_status &PORT_OWNER ) && + (port_status &PORT_POWER ) && + !(port_status &PORT_CONNECT ) && + (port_status &PORT_LS_MASK )) +return true; + +return false; +} + +/** +* quirk_poll_rebind_companion - rebind comanion device to recover +* @ehci: the ehci hcd pointer +* +* Since EHCI/OHCI controllers on R-Car Gen3 SoCs are possible to be getting +* stuck very rarely after a full/low usb device was disconnected. To +* recover from such a situation, the controllers require changing the OHCI +* functional state. +*/ +static void quirk_poll_rebind_companion (struct ehci_hcd *ehci) +{ +struct device *companion_dev; +struct usb_hcd *hcd =ehci_to_hcd (ehci); + + companion_dev =usb_of_get_companion_dev (hcd->self.controller); +if (!companion_dev) +return ; + +device_release_driver (companion_dev); +if (device_attach (companion_dev) <0 ) +ehci_err (ehci,"%s: failed\n" , __func__); + +put_device (companion_dev); +} + +static void quirk_poll_work (struct work_struct *work) +{ +struct ehci_platform_priv *priv = + container_of(to_delayed_work(work), struct ehci_platform_priv, + poll_work); + struct ehci_hcd *ehci = container_of((void *)priv, struct ehci_hcd, + priv); + +/* check the status twice to reduce misdetection rate */ +if (!quirk_poll_check_port_status (ehci)) +return ; +udelay (10 ); +if (!quirk_poll_check_port_status (ehci)) +return ; + +ehci_dbg (ehci,"%s: detected getting stuck. rebind now!\n" , __func__); +quirk_poll_rebind_companion (ehci); +} + +static void quirk_poll_timer (struct timer_list *t) +{ +struct ehci_platform_priv *priv =from_timer (priv, t, poll_timer); + struct ehci_hcd *ehci = container_of((void *)priv, struct ehci_hcd, + priv); + +if (quirk_poll_check_port_status (ehci)) { +/* +* Now scheduling the work for testing the port more. Note that +* updating the status is possible to be delayed when +* reconnection. So, this uses delayed work with 5 ms delay +* to avoid misdetection. +*/ +schedule_delayed_work (&priv->poll_work,msecs_to_jiffies (5 )); + } + +mod_timer (&priv->poll_timer, jiffies +HZ ); +} + +static void quirk_poll_init (struct ehci_platform_priv *priv) +{ +INIT_DELAYED_WORK (&priv->poll_work, quirk_poll_work); +timer_setup (&priv->poll_timer, quirk_poll_timer,0 ); +mod_timer (&priv->poll_timer, jiffies +HZ ); +} + +static void quirk_poll_end (struct ehci_platform_priv *priv) +{ +del_timer_sync (&priv->poll_timer); +cancel_delayed_work (&priv->poll_work); +} + +static const struct soc_device_attribute quirk_poll_match[] = { + { .family ="R-Car Gen3" }, + {/* sentinel*/ } +}; +static int ehci_platform_probe (struct platform_device *dev) {struct usb_hcd *hcd;
@@ -178,6 +288,9 @@ static int ehci_platform_probe(struct platform_device *dev) "has-transaction-translator")) hcd->has_tt =1 ; +if (soc_device_match (quirk_poll_match)) + priv->quirk_poll = true; +for (clk =0 ; clk <EHCI_MAX_CLKS ; clk++) { priv->clks[clk] =of_clk_get (dev->dev.of_node, clk);if (IS_ERR (priv->clks[clk])) {
@@ -249,6 +362,9 @@ static int ehci_platform_probe(struct platform_device *dev)device_enable_async_suspend (hcd->self.controller);platform_set_drvdata (dev, hcd); +if (priv->quirk_poll) +quirk_poll_init (priv); +return err; err_power:
@@ -275,6 +391,9 @@ static int ehci_platform_remove(struct platform_device *dev)struct ehci_platform_priv *priv =hcd_to_ehci_priv (hcd);int clk; +if (priv->quirk_poll) +quirk_poll_end (priv); +usb_remove_hcd (hcd);if (pdata->power_off)
@@ -299,9 +418,13 @@ static int ehci_platform_suspend(struct device *dev)struct usb_hcd *hcd =dev_get_drvdata (dev);struct usb_ehci_pdata *pdata =dev_get_platdata (dev);struct platform_device *pdev =to_platform_device (dev); +struct ehci_platform_priv *priv =hcd_to_ehci_priv (hcd);bool do_wakeup =device_may_wakeup (dev);int ret; +if (priv->quirk_poll) +quirk_poll_end (priv); + ret =ehci_suspend (hcd, do_wakeup);if (ret)return ret;
@@ -333,6 +456,10 @@ static int ehci_platform_resume(struct device *dev) }ehci_resume (hcd, priv->reset_on_resume); + +if (priv->quirk_poll) +quirk_poll_init (priv); +return 0 ; }#endif /* CONFIG_PM_SLEEP */
include/linux/usb/ehci_def.h +1 -1
@@ -151,7 +151,7 @@ struct ehci_regs {#define PORT_OWNER (1<<13)/* true: companion hc owns this port */ #define PORT_POWER (1<<12)/* true: has power (see PPC) */ #define PORT_USB11 (x) (((x)&(3<<10)) == (1<<10))/* USB 1.1 device */ -/* 11:10 for detecting lowspeed devices (reset vs release ownership) */ +#define PORT_LS_MASK (3<<10)/* Link status (SE0, K or J */ /* 9 reserved */ #define PORT_LPM (1<<9)/* LPM transaction */ #define PORT_RESET (1<<8)/* reset port */
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 164/206 usb/ehci-platform: Set PM runtime as active on resume
In reply to Greg Kroah-HartmanFrom: Qais Yousef <[email protected]>
[ Upstream commit 16bdc04cc98ab0c74392ceef2475ecc5e73fcf49 ]
Follow suit of ohci-platform.c and perform pm_runtime_set_active() on resume.
ohci-platform.c had a warning reported due to the missing pm_runtime_set_active() [1].
[1] https://lore.kernel.org/lkml/[email protected]/
--- drivers/usb/host/ehci-platform.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/usb/host/ehci-platform.c +4 -0
@@ -457,6 +457,10 @@ static int ehci_platform_resume(struct device *dev)ehci_resume (hcd, priv->reset_on_resume); +pm_runtime_disable (dev); +pm_runtime_set_active (dev); +pm_runtime_enable (dev); +if (priv->quirk_poll)quirk_poll_init (priv);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 165/206 perf report: Fix NULL pointer dereference in hists__fprintf_nr_sample_events()
In reply to Greg Kroah-HartmanFrom: Gaurav Singh <[email protected]>
[ Upstream commit 11b6e5482e178055ec1f2444b55f2518713809d1 ]
The 'evname' variable can be NULL, as it is checked a few lines back, check it before using.
--- tools/perf/builtin-report.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
tools/perf/builtin-report.c +1 -2
@@ -447,8 +447,7 @@ static size_t hists__fprintf_nr_sample_events(struct hists *hists, struct reportif (rep->time_str) ret +=fprintf (fp," (time slices: %s)" , rep->time_str); -if (symbol_conf.show_ref_callgraph && -strstr (evname,"call-graph=no" )) { +if (symbol_conf.show_ref_callgraph && evname &&strstr (evname,"call-graph=no" )) { ret +=fprintf (fp,", show reference callgraph" ); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 166/206 ext4: stop overwrite the errcode in ext4_setup_super
In reply to Greg Kroah-HartmanFrom: yangerkun <[email protected]>
[ Upstream commit 5adaccac46ea79008d7b75f47913f1a00f91d0ce ]
Now the errcode from ext4_commit_super will overwrite EROFS exists in ext4_setup_super. Actually, no need to call ext4_commit_super since we will return EROFS. Fix it by goto done directly.
--- fs/ext4/super.c | 1 + 1 file changed, 1 insertion(+)
fs/ext4/super.c +1 -0
@@ -2249,6 +2249,7 @@ static int ext4_setup_super(struct super_block *sb, struct ext4_super_block *es,ext4_msg (sb,KERN_ERR ,"revision level too high, " "forcing read-only mode" ); err = -EROFS ; + goto done; }if (read_only) goto done;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 167/206 bcache: fix potential deadlock problem in btree_gc_coalesce
In reply to Greg Kroah-HartmanFrom: Zhiqiang Liu <[email protected]>
[ Upstream commit be23e837333a914df3f24bf0b32e87b0331ab8d1 ]
coccicheck reports:
drivers/md//bcache/btree.c:1538:1-7: preceding lock on line 1417
In btree_gc_coalesce func, if the coalescing process fails, we will goto to out_nocoalesce tag directly without releasing new_nodes[i]->write_lock. Then, it will cause a deadlock when trying to acquire new_nodes[i]-> write_lock for freeing new_nodes[i] before return.
btree_gc_coalesce func details as follows:
if alloc new_nodes[i] fails: goto out_nocoalesce; // obtain new_nodes[i]->write_lock mutex_lock(&new_nodes[i]->write_lock) // main coalescing process for (i = nodes - 1; i > 0; --i) [snipped] if coalescing process fails: // Here, directly goto out_nocoalesce // tag will cause a deadlock goto out_nocoalesce; [snipped] // release new_nodes[i]->write_lock mutex_unlock(&new_nodes[i]->write_lock) // coalesing succ, return return; out_nocoalesce: btree_node_free(new_nodes[i]) // free new_nodes[i] // obtain new_nodes[i]->write_lock mutex_lock(&new_nodes[i]->write_lock); // set flag for reuse clear_bit(BTREE_NODE_dirty, &ew_nodes[i]->flags); // release new_nodes[i]->write_lock mutex_unlock(&new_nodes[i]->write_lock);
To fix the problem, we add a new tag 'out_unlock_nocoalesce' for releasing new_nodes[i]->write_lock before out_nocoalesce tag. If coalescing process fails, we will go to out_unlock_nocoalesce tag for releasing new_nodes[i]->write_lock before free new_nodes[i] in out_nocoalesce tag.
(Coly Li helps to clean up commit log format.)
--- drivers/md/bcache/btree.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/md/bcache/btree.c +6 -2
@@ -1432,7 +1432,7 @@ static int btree_gc_coalesce(struct btree *b, struct btree_op *op,if (__set_blocks (n1, n1->keys + n2->keys,block_bytes (b->c)) >btree_blocks (new_nodes[i])) - goto out_nocoalesce; + goto out_unlock_nocoalesce; keys = n2->keys;/* Take the key of the node we're getting rid of */
@@ -1461,7 +1461,7 @@ static int btree_gc_coalesce(struct btree *b, struct btree_op *op,if (__bch_keylist_realloc (&keylist,bkey_u64s (&new_nodes[i]->key))) - goto out_nocoalesce; + goto out_unlock_nocoalesce;bch_btree_node_write (new_nodes[i], &cl);bch_keylist_add (&keylist, &new_nodes[i]->key);
@@ -1507,6 +1507,10 @@ static int btree_gc_coalesce(struct btree *b, struct btree_op *op,/* Invalidated our iterator */ return -EINTR ; +out_unlock_nocoalesce: +for (i =0 ; i < nodes; i++) +mutex_unlock (&new_nodes[i]->write_lock); + out_nocoalesce:closure_sync (&cl);bch_keylist_free (&keylist);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 168/206 afs: Fix non-setting of mtime when writing into mmap
In reply to Greg Kroah-HartmanFrom: David Howells <[email protected]>
[ Upstream commit bb413489288e4e457353bac513fddb6330d245ca ]
The mtime on an inode needs to be updated when a write is made into an mmap'ed section. There are three ways in which this could be done: update it when page_mkwrite is called, update it when a page is changed from dirty to writeback or leave it to the server and fix the mtime up from the reply to the StoreData RPC.
Found with the generic/215 xfstest.
--- fs/afs/write.c | 1 + 1 file changed, 1 insertion(+)
fs/afs/write.c +1 -0
@@ -792,6 +792,7 @@ vm_fault_t afs_page_mkwrite(struct vm_fault *vmf) vmf->page->index, priv);SetPagePrivate (vmf->page);set_page_private (vmf->page, priv); +file_update_time (file);sb_end_pagefault (inode->i_sb);return VM_FAULT_LOCKED ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 169/206 afs: afs_write_end() should change i_size under the right lock
In reply to Greg Kroah-HartmanFrom: David Howells <[email protected]>
[ Upstream commit 1f32ef79897052ef7d3d154610d8d6af95abde83 ]
Fix afs_write_end() to change i_size under vnode->cb_lock rather than ->wb_lock so that it doesn't race with afs_vnode_commit_status() and afs_getattr().
The ->wb_lock is only meant to guard access to ->wb_keys which isn't accessed by that piece of code.
--- fs/afs/write.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/afs/write.c +2 -2
@@ -188,11 +188,11 @@ int afs_write_end(struct file *file, struct address_space *mapping, i_size =i_size_read (&vnode->vfs_inode);if (maybe_i_size > i_size) { -spin_lock (&vnode->wb_lock); +write_seqlock (&vnode->cb_lock); i_size =i_size_read (&vnode->vfs_inode);if (maybe_i_size > i_size)i_size_write (&vnode->vfs_inode, maybe_i_size); -spin_unlock (&vnode->wb_lock); +write_sequnlock (&vnode->cb_lock); }if (!PageUptodate (page)) {
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 170/206 block: Fix use-after-free in blkdev_get()
In reply to Greg Kroah-HartmanFrom: Jason Yan <[email protected]>
[ Upstream commit 2d3a8e2deddea6c89961c422ec0c5b851e648c14 ]
In blkdev_get() we call __blkdev_get() to do some internal jobs and if there is some errors in __blkdev_get(), the bdput() is called which means we have released the refcount of the bdev (actually the refcount of the bdev inode). This means we cannot access bdev after that point. But acctually bdev is still accessed in blkdev_get() after calling __blkdev_get(). This results in use-after-free if the refcount is the last one we released in __blkdev_get(). Let's take a look at the following scenerio:
CPU0 CPU1 CPU2blkdev_open blkdev_open Remove disk
bd_acquire
blkdev_get
__blkdev_get del_gendisk
bdev_unhash_inode
bd_acquire bdev_get_gendisk
bd_forget failed because of unhashed
bdput
bdput (the last one)
bdev_evict_inode
access bdev => use after free
[ 459.350216] BUG: KASAN: use-after-free in __lock_acquire+0x24c1/0x31b0
[ 459.351190] Read of size 8 at addr ffff88806c815a80 by task syz-executor.0/20132
[ 459.352347]
[ 459.352594] CPU: 0 PID: 20132 Comm: syz-executor.0 Not tainted 4.19.90 #2
[ 459.353628] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-1ubuntu1 04/01/2014
[ 459.354947] Call Trace:
[ 459.355337] dump_stack+0x111/0x19e
[ 459.355879] ? __lock_acquire+0x24c1/0x31b0
[ 459.356523] print_address_description+0x60/0x223
[ 459.357248] ? __lock_acquire+0x24c1/0x31b0
[ 459.357887] kasan_report.cold+0xae/0x2d8
[ 459.358503] __lock_acquire+0x24c1/0x31b0
[ 459.359120] ? _raw_spin_unlock_irq+0x24/0x40
[ 459.359784] ? lockdep_hardirqs_on+0x37b/0x580
[ 459.360465] ? _raw_spin_unlock_irq+0x24/0x40
[ 459.361123] ? finish_task_switch+0x125/0x600
[ 459.361812] ? finish_task_switch+0xee/0x600
[ 459.362471] ? mark_held_locks+0xf0/0xf0
[ 459.363108] ? __schedule+0x96f/0x21d0
[ 459.363716] lock_acquire+0x111/0x320
[ 459.364285] ? blkdev_get+0xce/0xbe0
[ 459.364846] ? blkdev_get+0xce/0xbe0
[ 459.365390] __mutex_lock+0xf9/0x12a0
[ 459.365948] ? blkdev_get+0xce/0xbe0
[ 459.366493] ? bdev_evict_inode+0x1f0/0x1f0
[ 459.367130] ? blkdev_get+0xce/0xbe0
[ 459.367678] ? destroy_inode+0xbc/0x110
[ 459.368261] ? mutex_trylock+0x1a0/0x1a0
[ 459.368867] ? __blkdev_get+0x3e6/0x1280
[ 459.369463] ? bdev_disk_changed+0x1d0/0x1d0
[ 459.370114] ? blkdev_get+0xce/0xbe0
[ 459.370656] blkdev_get+0xce/0xbe0
[ 459.371178] ? find_held_lock+0x2c/0x110
[ 459.371774] ? __blkdev_get+0x1280/0x1280
[ 459.372383] ? lock_downgrade+0x680/0x680
[ 459.373002] ? lock_acquire+0x111/0x320
[ 459.373587] ? bd_acquire+0x21/0x2c0
[ 459.374134] ? do_raw_spin_unlock+0x4f/0x250
[ 459.374780] blkdev_open+0x202/0x290
[ 459.375325] do_dentry_open+0x49e/0x1050
[ 459.375924] ? blkdev_get_by_dev+0x70/0x70
[ 459.376543] ? __x64_sys_fchdir+0x1f0/0x1f0
[ 459.377192] ? inode_permission+0xbe/0x3a0
[ 459.377818] path_openat+0x148c/0x3f50
[ 459.378392] ? kmem_cache_alloc+0xd5/0x280
[ 459.379016] ? entry_SYSCALL_64_after_hwframe+0x49/0xbe
[ 459.379802] ? path_lookupat.isra.0+0x900/0x900
[ 459.380489] ? __lock_is_held+0xad/0x140
[ 459.381093] do_filp_open+0x1a1/0x280
[ 459.381654] ? may_open_dev+0xf0/0xf0
[ 459.382214] ? find_held_lock+0x2c/0x110
[ 459.382816] ? lock_downgrade+0x680/0x680
[ 459.383425] ? __lock_is_held+0xad/0x140
[ 459.384024] ? do_raw_spin_unlock+0x4f/0x250
[ 459.384668] ? _raw_spin_unlock+0x1f/0x30
[ 459.385280] ? __alloc_fd+0x448/0x560
[ 459.385841] do_sys_open+0x3c3/0x500
[ 459.386386] ? filp_open+0x70/0x70
[ 459.386911] ? trace_hardirqs_on_thunk+0x1a/0x1c
[ 459.387610] ? trace_hardirqs_off_caller+0x55/0x1c0
[ 459.388342] ? do_syscall_64+0x1a/0x520
[ 459.388930] do_syscall_64+0xc3/0x520
[ 459.389490] entry_SYSCALL_64_after_hwframe+0x49/0xbe
[ 459.390248] RIP: 0033:0x416211
[ 459.390720] Code: 75 14 b8 02 00 00 00 0f 05 48 3d 01 f0 ff ff 0f 83
04 19 00 00 c3 48 83 ec 08 e8 0a fa ff ff 48 89 04 24 b8 02 00 00 00 0f
05 <48> 8b 3c 24 48 89 c2 e8 53 fa ff ff 48 89 d0 48 83 c4 08 48 3d
01
[ 459.393483] RSP: 002b:00007fe45dfe9a60 EFLAGS: 00000293 ORIG_RAX: 0000000000000002
[ 459.394610] RAX: ffffffffffffffda RBX: 00007fe45dfea6d4 RCX: 0000000000416211
[ 459.395678] RDX: 00007fe45dfe9b0a RSI: 0000000000000002 RDI: 00007fe45dfe9b00
[ 459.396758] RBP: 000000000076bf20 R08: 0000000000000000 R09: 000000000000000a
[ 459.397930] R10: 0000000000000075 R11: 0000000000000293 R12: 00000000ffffffff
[ 459.399022] R13: 0000000000000bd9 R14: 00000000004cdb80 R15: 000000000076bf2c
[ 459.400168]
[ 459.400430] Allocated by task 20132:
[ 459.401038] kasan_kmalloc+0xbf/0xe0
[ 459.401652] kmem_cache_alloc+0xd5/0x280
[ 459.402330] bdev_alloc_inode+0x18/0x40
[ 459.402970] alloc_inode+0x5f/0x180
[ 459.403510] iget5_locked+0x57/0xd0
[ 459.404095] bdget+0x94/0x4e0
[ 459.404607] bd_acquire+0xfa/0x2c0
[ 459.405113] blkdev_open+0x110/0x290
[ 459.405702] do_dentry_open+0x49e/0x1050
[ 459.406340] path_openat+0x148c/0x3f50
[ 459.406926] do_filp_open+0x1a1/0x280
[ 459.407471] do_sys_open+0x3c3/0x500
[ 459.408010] do_syscall_64+0xc3/0x520
[ 459.408572] entry_SYSCALL_64_after_hwframe+0x49/0xbe
[ 459.409415]
[ 459.409679] Freed by task 1262:
[ 459.410212] __kasan_slab_free+0x129/0x170
[ 459.410919] kmem_cache_free+0xb2/0x2a0
[ 459.411564] rcu_process_callbacks+0xbb2/0x2320
[ 459.412318] __do_softirq+0x225/0x8acFix this by delaying bdput() to the end of blkdev_get() which means we have finished accessing bdev.
--- fs/block_dev.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
fs/block_dev.c +7 -5
@@ -1463,10 +1463,8 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)*/ if (!for_part) { ret =devcgroup_inode_permission (bdev->bd_inode, perm); -if (ret !=0 ) { -bdput (bdev); +if (ret !=0 )return ret; - } } restart:
@@ -1535,8 +1533,10 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part) goto out_clear;BUG_ON (for_part); ret =__blkdev_get (whole, mode,1 ); -if (ret) +if (ret) { +bdput (whole); goto out_clear; + } bdev->bd_contains = whole; bdev->bd_part =disk_get_part (disk, partno); if (!(disk->flags & GENHD_FL_UP) ||
@@ -1586,7 +1586,6 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)disk_unblock_events (disk);put_disk_and_module (disk); out: -bdput (bdev);return ret; }
@@ -1672,6 +1671,9 @@ int blkdev_get(struct block_device *bdev, fmode_t mode, void *holder)bdput (whole); } +if (res) +bdput (bdev); +return res; }EXPORT_SYMBOL (blkdev_get);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 171/206 arm64: hw_breakpoint: Dont invoke overflow handler on uaccess watchpoints
In reply to Greg Kroah-HartmanFrom: Will Deacon <[email protected]>
[ Upstream commit 24ebec25fb270100e252b19c288e21bd7d8cc7f7 ]
Unprivileged memory accesses generated by the so-called "translated" instructions (e.g. STTR) at EL1 can cause EL0 watchpoints to fire unexpectedly if kernel debugging is enabled. In such cases, the hw_breakpoint logic will invoke the user overflow handler which will typically raise a SIGTRAP back to the current task. This is futile when returning back to the kernel because (a) the signal won't have been delivered and (b) userspace can't handle the thing anyway.
Avoid invoking the user overflow handler for watchpoints triggered by kernel uaccess routines, and instead single-step over the faulting instruction as we would if no overflow handler had been installed.
(Fixes tag identifies the introduction of unprivileged memory accesses,
which exposed this latent bug in the hw_breakpoint code)
--- arch/arm64/kernel/hw_breakpoint.c | 44 ++++++++++++++++++------------- 1 file changed, 26 insertions(+), 18 deletions(-)
arch/arm64/kernel/hw_breakpoint.c +26 -18
@@ -737,6 +737,27 @@ static u64 get_distance_from_watchpoint(unsigned long addr, u64 val,return 0 ; } +static int watchpoint_report (struct perf_event *wp,unsigned long addr, +struct pt_regs *regs) +{ +int step =is_default_overflow_handler (wp); +struct arch_hw_breakpoint *info =counter_arch_bp (wp); + + info->trigger = addr; + +/* +* If we triggered a user watchpoint from a uaccess routine, then +* handle the stepping ourselves since userspace really can't help +* us with this. +*/ +if (!user_mode (regs) && info->ctrl.privilege ==AARCH64_BREAKPOINT_EL0 ) + step =1 ; +else +perf_bp_event (wp, regs); + +return step; +} +static int watchpoint_handler (unsigned long addr,unsigned int esr,struct pt_regs *regs) {
@@ -746,7 +767,6 @@ static int watchpoint_handler(unsigned long addr, unsigned int esr,u64 val;struct perf_event *wp, **slots;struct debug_info *debug_info; -struct arch_hw_breakpoint *info;struct arch_hw_breakpoint_ctrl ctrl; slots =this_cpu_ptr (wp_on_reg);
@@ -784,25 +804,13 @@ static int watchpoint_handler(unsigned long addr, unsigned int esr,if (dist !=0 )continue ; - info =counter_arch_bp (wp); - info->trigger = addr; -perf_bp_event (wp, regs); - -/* Do we need to handle the stepping? */ -if (is_default_overflow_handler (wp)) - step =1 ; + step =watchpoint_report (wp, addr, regs); } -if (min_dist >0 && min_dist !=-1 ) { -/* No exact match found. */ - wp = slots[closest_match]; - info =counter_arch_bp (wp); - info->trigger = addr; -perf_bp_event (wp, regs); -/* Do we need to handle the stepping? */ -if (is_default_overflow_handler (wp)) - step =1 ; - } +/* No exact match found? */ +if (min_dist >0 && min_dist !=-1 ) + step =watchpoint_report (slots[closest_match], addr, regs); +rcu_read_unlock ();if (!step)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 172/206 libata: Use per port sync for detach
In reply to Greg Kroah-HartmanFrom: Kai-Heng Feng <[email protected]>
[ Upstream commit b5292111de9bb70cba3489075970889765302136 ]
Commit 130f4caf145c ("libata: Ensure ata_port probe has completed before detach") may cause system freeze during suspend.
Using async_synchronize_full() in PM callbacks is wrong, since async callbacks that are already scheduled may wait for not-yet-scheduled callbacks, causes a circular dependency.
Instead of using big hammer like async_synchronize_full(), use async cookie to make sure port probe are synced, without affecting other scheduled PM callbacks.
--- drivers/ata/libata-core.c | 11 +++++------ include/linux/libata.h | 3 +++ 2 files changed, 8 insertions(+), 6 deletions(-)
drivers/ata/libata-core.c +5 -6
@@ -57,7 +57,6 @@#include <linux/workqueue.h> #include <linux/scatterlist.h> #include <linux/io.h> -#include <linux/async.h> #include <linux/log2.h> #include <linux/slab.h> #include <linux/glob.h>
@@ -6610,7 +6609,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)/* perform each probe asynchronously */ for (i =0 ; i < host->n_ports; i++) {struct ata_port *ap = host->ports[i]; -async_schedule (async_port_probe, ap); + ap->cookie =async_schedule (async_port_probe, ap); }return 0 ;
@@ -6750,11 +6749,11 @@ void ata_host_detach(struct ata_host *host) {int i; -/* Ensure ata_port probe has completed */ -async_synchronize_full (); - -for (i =0 ; i < host->n_ports; i++) +for (i =0 ; i < host->n_ports; i++) { +/* Ensure ata_port probe has completed */ +async_synchronize_cookie (host->ports[i]->cookie +1 );ata_port_detach (host->ports[i]); + }/* the host is dead now, dissociate ACPI */ ata_acpi_dissociate (host);
include/linux/libata.h +3 -0
@@ -38,6 +38,7 @@#include <linux/acpi.h> #include <linux/cdrom.h> #include <linux/sched.h> +#include <linux/async.h> /* * Define if arch has non-standard setup. This is a _PCI_ standard
@@ -887,6 +888,8 @@ struct ata_port {struct timer_list fastdrain_timer;unsigned long fastdrain_cnt; +async_cookie_t cookie; +int em_message_type;void *private_data;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 173/206 drm: encoder_slave: fix refcouting error for modules
In reply to Greg Kroah-HartmanFrom: Wolfram Sang <[email protected]>
[ Upstream commit f78d4032de60f50fd4afaa0fb68ea03b985f820a ]
module_put() balances try_module_get(), not request_module(). Fix the error path to match that.
--- drivers/gpu/drm/drm_encoder_slave.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/drm_encoder_slave.c +3 -2
@@ -84,7 +84,7 @@ int drm_i2c_encoder_init(struct drm_device *dev, err = encoder_drv->encoder_init (client, dev, encoder);if (err) - goto fail_unregister; + goto fail_module_put;if (info->platform_data) encoder->slave_funcs->set_config(&encoder->base,
@@ -92,9 +92,10 @@ int drm_i2c_encoder_init(struct drm_device *dev,return 0 ; +fail_module_put: +module_put (module); fail_unregister:i2c_unregister_device (client); -module_put (module); fail:return err; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 174/206 drm/dp_mst: Reformat drm_dp_check_act_status() a bit
In reply to Greg Kroah-HartmanFrom: Lyude Paul <[email protected]>
commit a5cb5fa6c3a5c2cf492db667b8670ee7b044b79f upstream.
Just add a bit more line wrapping, get rid of some extraneous whitespace, remove an unneeded goto label, and move around some variable declarations. No functional changes here.
--- drivers/gpu/drm/drm_dp_mst_topology.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-)
drivers/gpu/drm/drm_dp_mst_topology.c +10 -12
@@ -2837,33 +2837,31 @@ fail:*/ int drm_dp_check_act_status (struct drm_dp_mst_topology_mgr *mgr) { +int count =0 , ret;u8 status; -int ret; -int count =0 ;do { - ret =drm_dp_dpcd_readb (mgr->aux,DP_PAYLOAD_TABLE_UPDATE_STATUS , &status); - + ret =drm_dp_dpcd_readb (mgr->aux, +DP_PAYLOAD_TABLE_UPDATE_STATUS , + &status);if (ret <0 ) { -DRM_DEBUG_KMS ("failed to read payload table status %d\n" , ret); - goto fail; +DRM_DEBUG_KMS ("failed to read payload table status %d\n" , + ret); +return ret; }if (status &DP_PAYLOAD_ACT_HANDLED )break ; count++;udelay (100 ); - }while (count <30 );if (!(status &DP_PAYLOAD_ACT_HANDLED )) { -DRM_DEBUG_KMS ("failed to get ACT bit %d after %d retries\n" , status, count); - ret = -EINVAL ; - goto fail; +DRM_DEBUG_KMS ("failed to get ACT bit %d after %d retries\n" , + status, count); +return -EINVAL ; }return 0 ; -fail: -return ret; }EXPORT_SYMBOL (drm_dp_check_act_status);
Greg Kroah-Hartman
maintainerPATCH 175/206 drm/qxl: Use correct notify port address when creating cursor ring
In reply to Greg Kroah-HartmanFrom: Huacai Chen <[email protected]>
commit 80e5f89da3ab949fbbf1cae01dfaea29f5483a75 upstream.
The command ring and cursor ring use different notify port addresses
definition: QXL_IO_NOTIFY_CMD and QXL_IO_NOTIFY_CURSOR. However, in qxl_device_init() we use QXL_IO_NOTIFY_CMD to create both command ring and cursor ring. This doesn't cause any problems now, because QEMU's behaviors on QXL_IO_NOTIFY_CMD and QXL_IO_NOTIFY_CURSOR are the same. However, QEMU's behavior may be change in future, so let's fix it.
P.S.: In the X.org QXL driver, the notify port address of cursor ring
is correct.
--- drivers/gpu/drm/qxl/qxl_kms.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/qxl/qxl_kms.c +1 -1
@@ -181,7 +181,7 @@ int qxl_device_init(struct qxl_device *q &(qdev->ram_header->cursor_ring_hdr),sizeof (struct qxl_command ),QXL_CURSOR_RING_SIZE , - qdev->io_base +QXL_IO_NOTIFY_CMD , + qdev->io_base +QXL_IO_NOTIFY_CURSOR , false, &qdev->cursor_event);
Greg Kroah-Hartman
maintainerPATCH 176/206 drm/amdgpu: Replace invalid device ID with a valid device ID
In reply to Greg Kroah-HartmanFrom: Sandeep Raghuraman <[email protected]>
commit 790243d3bf78f9830a3b2ffbca1ed0f528295d48 upstream.
Initializes Powertune data for a specific Hawaii card by fixing what looks like a typo in the code. The device ID 66B1 is not a supported device ID for this driver, and is not mentioned elsewhere. 67B1 is a valid device ID, and is a Hawaii Pro GPU.
I have tested on my R9 390 which has device ID 67B1, and it works fine without problems.
--- drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c +1 -1
@@ -238,7 +238,7 @@ static void ci_initialize_power_tune_defswitch (dev_id) {case 0x67BA : -case 0x66B1 : +case 0x67B1 : smu_data->power_tune_defaults = &defaults_hawaii_pro;break ;case 0x67B8 :
Greg Kroah-Hartman
maintainerPATCH 177/206 selinux: fix double free
In reply to Greg Kroah-HartmanFrom: Tom Rix <[email protected]>
commit 65de50969a77509452ae590e9449b70a22b923bb upstream.
Clang's static analysis tool reports these double free memory errors.
security/selinux/ss/services.c:2987:4: warning: Attempt to free released memory [unix.Malloc]
kfree(bnames[i]);
^~~~~~~~~~~~~~~~
security/selinux/ss/services.c:2990:2: warning: Attempt to free released memory [unix.Malloc]
kfree(bvalues);
^~~~~~~~~~~~~~So improve the security_get_bools error handling by freeing these variables and setting their return pointers to NULL and the return len to 0
--- security/selinux/ss/services.c | 4 ++++ 1 file changed, 4 insertions(+)
security/selinux/ss/services.c +4 -0
@@ -2857,8 +2857,12 @@ err:if (*names) {for (i =0 ; i < *len; i++)kfree ((*names)[i]); +kfree (*names); }kfree (*values); + *len =0 ; + *names =NULL ; + *values =NULL ; goto out; }
Greg Kroah-Hartman
maintainerPATCH 178/206 ext4: fix partial cluster initialization when splitting extent
In reply to Greg Kroah-Hartman[ Upstream commit cfb3c85a600c6aa25a2581b3c1c4db3460f14e46 ]
Fix the bug when calculating the physical block number of the first block in the split extent.
This bug will cause xfstests shared/298 failure on ext4 with bigalloc enabled occasionally. Ext4 error messages indicate that previously freed blocks are being freed again, and the following fsck will fail due to the inconsistency of block bitmap and bg descriptor.
The following is an example case:
1. First, Initialize a ext4 filesystem with cluster size '16K', block size '4K', in which case, one cluster contains four blocks.
2. Create one file (e.g., xxx.img) on this ext4 filesystem. Now the extent tree of this file is like:
...
36864:[0]4:220160
36868:[0]14332:145408
51200:[0]2:231424
...
3. Then execute PUNCH_HOLE fallocate on this file. The hole range is like:
..ext4_ext_remove_space: dev 254,16 ino 12 since 49506 end 49506 depth 1ext4_ext_remove_space: dev 254,16 ino 12 since 49544 end 49546 depth 1ext4_ext_remove_space: dev 254,16 ino 12 since 49605 end 49607 depth 1
...
4. Then the extent tree of this file after punching is like
...
49507:[0]37:158047
49547:[0]58:158087
...
5. Detailed procedure of punching hole [49544, 49546]
5.1. The block address space:
``` lblk ~49505 49506 49507~49543 49544~49546 49547~ ---------+------+-------------+----------------+-------- extent | hole | extent | hole | extent ---------+------+-------------+----------------+-------- pblk ~158045 158046 158047~158083 158084~158086 158087~ ```
5.2. The detailed layout of cluster 39521:
``` cluster 39521 <-------------------------------> hole extent <----------------------><-------- lblk 49544 49545 49546 49547 +-------+-------+-------+-------+ | | | | | +-------+-------+-------+-------+ pblk 158084 1580845 158086 158087 ```
5.3. The ftrace output when punching hole [49544, 49546]:
- ext4_ext_remove_space (start 49544, end 49546)
- ext4_ext_rm_leaf (start 49544, end 49546, last_extent [49507(158047), 40], partial [pclu 39522 lblk 0 state 2])
- ext4_remove_blocks (extent [49507(158047), 40], from 49544 to 49546, partial [pclu 39522 lblk 0 state 2]
- ext4_free_blocks: (block 158084 count 4)
- ext4_mballoc_free (extent 1/6753/1)
5.4. Ext4 error message in dmesg:
EXT4-fs error (device vdb): mb_free_blocks:1457: group 1, block 158084:freeing already freed block (bit 6753); block bitmap corrupt. EXT4-fs error (device vdb): ext4_mb_generate_buddy:747: group 1, block bitmap and bg descriptor inconsistent: 19550 vs 19551 free clusters
In this case, the whole cluster 39521 is freed mistakenly when freeing pblock 158084~158086 (i.e., the first three blocks of this cluster), although pblock 158087 (the last remaining block of this cluster) has not been freed yet.
The root cause of this isuue is that, the pclu of the partial cluster is calculated mistakenly in ext4_ext_remove_space(). The correct partial_cluster.pclu (i.e., the cluster number of the first block in the next extent, that is, lblock 49597 (pblock 158086)) should be 39521 rather than 39522.
--- fs/ext4/extents.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ext4/extents.c +1 -1
@@ -2905,7 +2905,7 @@ int ext4_ext_remove_space(struct inode *inode, ext4_lblk_t start,* in use to avoid freeing it when removing blocks. */ if (sbi->s_cluster_ratio >1 ) { - pblk =ext4_ext_pblock (ex) + end - ee_block +2 ; + pblk =ext4_ext_pblock (ex) + end - ee_block +1 ; partial_cluster = -(long long )EXT4_B2C (sbi, pblk); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 179/206 ext4: avoid race conditions when remounting with options that change dax
In reply to Greg Kroah-HartmanFrom: Theodore Ts'o <[email protected]>
[ Upstream commit 829b37b8cddb1db75c1b7905505b90e593b15db1 ]
Trying to change dax mount options when remounting could allow mount options to be enabled for a small amount of time, and then the mount option change would be reverted.
In the case of "mount -o remount,dax", this can cause a race where files would temporarily treated as DAX --- and then not.
--- fs/ext4/super.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-)
fs/ext4/super.c +10 -12
@@ -1989,6 +1989,16 @@ static int handle_mount_opt(struct super_block *sb, char *opt, int token,#endif }else if (token == Opt_dax) {#ifdef CONFIG_FS_DAX +if (is_remount &&test_opt (sb,DAX )) { +ext4_msg (sb,KERN_ERR ,"can't mount with " +"both data=journal and dax" ); +return -1 ; + } +if (is_remount && !(sbi->s_mount_opt &EXT4_MOUNT_DAX )) { +ext4_msg (sb,KERN_ERR ,"can't change " +"dax mount option while remounting" ); +return -1 ; + }ext4_msg (sb,KERN_WARNING ,"DAX enabled. Warning: EXPERIMENTAL, use at your own risk" ); sbi->s_mount_opt |= m->mount_opt;
@@ -5274,12 +5284,6 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data) err = -EINVAL ; goto restore_opts; } -if (test_opt (sb,DAX )) { -ext4_msg (sb,KERN_ERR ,"can't mount with " -"both data=journal and dax" ); - err = -EINVAL ; - goto restore_opts; - } }else if (test_opt (sb,DATA_FLAGS ) ==EXT4_MOUNT_ORDERED_DATA ) {if (test_opt (sb,JOURNAL_ASYNC_COMMIT )) { ext4_msg(sb, KERN_ERR, "can't mount with "
@@ -5295,12 +5299,6 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data) goto restore_opts; } -if ((sbi->s_mount_opt ^ old_opts.s_mount_opt) &EXT4_MOUNT_DAX ) { -ext4_msg (sb,KERN_WARNING ,"warning: refusing change of " -"dax flag with busy inodes while remounting" ); - sbi->s_mount_opt ^=EXT4_MOUNT_DAX ; - } -if (sbi->s_mount_flags &EXT4_MF_FS_ABORTED )ext4_abort (sb,"Abort forced by user" );
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 180/206 drm/dp_mst: Increase ACT retry timeout to 3s
In reply to Greg Kroah-HartmanFrom: Lyude Paul <[email protected]>
[ Upstream commit 873a95e0d59ac06901ae261dda0b7165ffd002b8 ]
Currently we only poll for an ACT up to 30 times, with a busy-wait delay of 100µs between each attempt - giving us a timeout of 2900µs. While this might seem sensible, it would appear that in certain scenarios it can take dramatically longer then that for us to receive an ACT. On one of the EVGA MST hubs that I have available, I observed said hub sometimes taking longer then a second before signalling the ACT. These delays mostly seem to occur when previous sideband messages we've sent are NAKd by the hub, however it wouldn't be particularly surprising if it's possible to reproduce times like this simply by introducing branch devices with large LCTs since payload allocations have to take effect on every downstream device up to the payload's target.
So, instead of just retrying 30 times we poll for the ACT for up to 3ms, and additionally use usleep_range() to avoid a very long and rude busy-wait. Note that the previous retry count of 30 appears to have been arbitrarily chosen, as I can't find any mention of a recommended timeout or retry count for ACTs in the DisplayPort 2.0 specification. This also goes for the range we were previously using for udelay(), although I suspect that was just copied from the recommended delay for link training on SST devices.
Changes since v1:
* Use readx_poll_timeout() instead of open-coding timeout loop - Sean Paul
Changes since v2:
* Increase poll interval to 200us - Sean Paul
* Print status in hex when we timeout waiting for ACT - Sean Paul
--- drivers/gpu/drm/drm_dp_mst_topology.c | 54 ++++++++++++++++----------- 1 file changed, 32 insertions(+), 22 deletions(-)
drivers/gpu/drm/drm_dp_mst_topology.c +32 -22
@@ -29,6 +29,7 @@#include <linux/i2c.h> #include <drm/drm_dp_mst_helper.h> #include <drm/drmP.h> +#include <linux/iopoll.h> #include <drm/drm_fixed.h> #include <drm/drm_atomic.h>
@@ -2828,6 +2829,17 @@ static int drm_dp_dpcd_write_payload(struct drm_dp_mst_topology_mgr *mgr,return ret; } +static int do_get_act_status (struct drm_dp_aux *aux) +{ +int ret; +u8 status; + + ret =drm_dp_dpcd_readb (aux,DP_PAYLOAD_TABLE_UPDATE_STATUS , &status); +if (ret <0 ) +return ret; + +return status; +}/** * drm_dp_check_act_status() - Check ACT handled status.
@@ -2837,30 +2849,28 @@ static int drm_dp_dpcd_write_payload(struct drm_dp_mst_topology_mgr *mgr,*/ int drm_dp_check_act_status (struct drm_dp_mst_topology_mgr *mgr) { -int count =0 , ret; -u8 status; - -do { - ret =drm_dp_dpcd_readb (mgr->aux, -DP_PAYLOAD_TABLE_UPDATE_STATUS , - &status); -if (ret <0 ) { -DRM_DEBUG_KMS ("failed to read payload table status %d\n" , - ret); -return ret; - } - -if (status &DP_PAYLOAD_ACT_HANDLED ) -break ; - count++; -udelay (100 ); - }while (count <30 ); - -if (!(status &DP_PAYLOAD_ACT_HANDLED )) { -DRM_DEBUG_KMS ("failed to get ACT bit %d after %d retries\n" , - status, count); +/* +* There doesn't seem to be any recommended retry count or timeout in +* the MST specification. Since some hubs have been observed to take +* over 1 second to update their payload allocations under certain +* conditions, we use a rather large timeout value. +*/ +const int timeout_ms =3000 ; +int ret, status; + + ret =readx_poll_timeout (do_get_act_status, mgr->aux, status, + status &DP_PAYLOAD_ACT_HANDLED || status <0 , +200 , timeout_ms *USEC_PER_MSEC ); +if (ret <0 && status >=0 ) { +DRM_DEBUG_KMS ("Failed to get ACT after %dms, last status: %02x\n" , + timeout_ms, status);return -EINVAL ; + }else if (status <0 ) { +DRM_DEBUG_KMS ("Failed to read payload table status: %d\n" , + status); +return status; } +return 0 ; }EXPORT_SYMBOL (drm_dp_check_act_status);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 181/206 x86/boot/compressed: Relax sed symbol type regex for LLVM ld.lld
In reply to Greg Kroah-HartmanFrom: Ard Biesheuvel <[email protected]>
commit bc310baf2ba381c648983c7f4748327f17324562 upstream.
The final build stage of the x86 kernel captures some symbol addresses from the decompressor binary and copies them into zoffset.h. It uses sed with a regular expression that matches the address, symbol type and symbol name, and mangles the captured addresses and the names of symbols of interest into #define directives that are added to zoffset.h
The symbol type is indicated by a single letter, which we match
strictly: only letters in the set 'ABCDGRSTVW' are matched, even though the actual symbol type is relevant and therefore ignored.
Commit bc7c9d620 ("efi/libstub/x86: Force 'hidden' visibility for extern declarations") made a change to the way external symbol references are classified, resulting in 'startup_32' now being emitted as a hidden symbol. This prevents the use of GOT entries to refer to this symbol via its absolute address, which recent toolchains (including Clang based ones) already avoid by default, making this change a no-op in the majority of cases.
However, as it turns out, the LLVM linker classifies such hidden symbols as symbols with static linkage in fully linked ELF binaries, causing tools such as NM to output a lowercase 't' rather than an upper case 'T' for the type of such symbols. Since our sed expression only matches upper case letters for the symbol type, the line describing startup_32 is disregarded, resulting in a build error like the following
arch/x86/boot/header.S:568:18: error: symbol 'ZO_startup_32' can not be
undefined in a subtraction expression
init_size: .long (0x00000000008fd000 - ZO_startup_32 +
(((0x0000000001f6361c + ((0x0000000001f6361c >> 8) + 65536)
- 0x00000000008c32e5) + 4095) & ~4095)) # kernel initialization size
Given that we are only interested in the value of the symbol, let's match any character in the set 'a-zA-Z' instead.
--- arch/x86/boot/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/boot/Makefile +1 -1
@@ -87,7 +87,7 @@ $(obj)/vmlinux.bin: $(obj)/compressed/vmlinux FORCE SETUP_OBJS = $(addprefix $(obj)/,$(setup-y)) -sed-zoffset := -e 's/^\([0-9a-fA-F]*\) [ABCDGRSTVW] \(startup_32\|startup_64\|efi32_stub_entry\|efi64_stub_entry\|efi_pe_entry\|input_data\|_end\|_ehead\|_text\|z_.*\)$$/\#define ZO_\2 0x\1/p' +sed-zoffset := -e 's/^\([0-9a-fA-F]*\) [a-zA-Z] \(startup_32\|startup_64\|efi32_stub_entry\|efi64_stub_entry\|efi_pe_entry\|input_data\|_end\|_ehead\|_text\|z_.*\)$$/\#define ZO_\2 0x\1/p' quiet_cmd_zoffset = ZOFFSET $@ cmd_zoffset = $(NM) $< | sed -n $(sed-zoffset) > $@
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 182/206 block: nr_sects_write(): Disable preemption on seqcount write
In reply to Greg Kroah-HartmanFrom: Ahmed S. Darwish <[email protected]>
[ Upstream commit 15b81ce5abdc4b502aa31dff2d415b79d2349d2f ]
For optimized block readers not holding a mutex, the "number of sectors" 64-bit value is protected from tearing on 32-bit architectures by a sequence counter.
Disable preemption before entering that sequence counter's write side critical section. Otherwise, the read side can preempt the write side section and spin for the entire scheduler tick. If the reader belongs to a real-time scheduling class, it can spin forever and the kernel will livelock.
--- include/linux/genhd.h | 2 ++ 1 file changed, 2 insertions(+)
include/linux/genhd.h +2 -0
@@ -729,9 +729,11 @@ static inline sector_t part_nr_sects_read(struct hd_struct *part)static inline void part_nr_sects_write (struct hd_struct *part,sector_t size) {#if BITS_PER_LONG ==32 && defined(CONFIG_LBDAF ) && defined(CONFIG_SMP ) +preempt_disable ();write_seqcount_begin (&part->nr_sects_seq); part->nr_sects = size;write_seqcount_end (&part->nr_sects_seq); +preempt_enable ();#elif BITS_PER_LONG ==32 && defined(CONFIG_LBDAF ) && defined(CONFIG_PREEMPT )preempt_disable (); part->nr_sects = size;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 183/206 mtd: rawnand: Pass a nand_chip object to nand_scan()
In reply to Greg Kroah-HartmanFrom: Boris Brezillon <[email protected]>
[ Upstream commit 00ad378f304a091ab2e2df5f944892a6ed558610 ]
Let's make the raw NAND API consistent by patching all helpers to take a nand_chip object instead of an mtd_info one.
We start with nand_scan().
--- Documentation/driver-api/mtdnand.rst | 2 +- drivers/mtd/nand/raw/ams-delta.c | 2 +- drivers/mtd/nand/raw/atmel/nand-controller.c | 2 +- drivers/mtd/nand/raw/au1550nd.c | 2 +- .../mtd/nand/raw/bcm47xxnflash/ops_bcm4706.c | 2 +- drivers/mtd/nand/raw/brcmnand/brcmnand.c | 2 +- drivers/mtd/nand/raw/cafe_nand.c | 2 +- drivers/mtd/nand/raw/cmx270_nand.c | 2 +- drivers/mtd/nand/raw/cs553x_nand.c | 2 +- drivers/mtd/nand/raw/davinci_nand.c | 2 +- drivers/mtd/nand/raw/denali.c | 2 +- drivers/mtd/nand/raw/diskonchip.c | 2 +- drivers/mtd/nand/raw/docg4.c | 2 +- drivers/mtd/nand/raw/fsl_elbc_nand.c | 2 +- drivers/mtd/nand/raw/fsl_ifc_nand.c | 2 +- drivers/mtd/nand/raw/fsl_upm.c | 2 +- drivers/mtd/nand/raw/fsmc_nand.c | 2 +- drivers/mtd/nand/raw/gpio.c | 2 +- drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 2 +- drivers/mtd/nand/raw/hisi504_nand.c | 2 +- drivers/mtd/nand/raw/jz4740_nand.c | 2 +- drivers/mtd/nand/raw/jz4780_nand.c | 2 +- drivers/mtd/nand/raw/lpc32xx_mlc.c | 2 +- drivers/mtd/nand/raw/lpc32xx_slc.c | 2 +- drivers/mtd/nand/raw/marvell_nand.c | 2 +- drivers/mtd/nand/raw/mpc5121_nfc.c | 2 +- drivers/mtd/nand/raw/mtk_nand.c | 2 +- drivers/mtd/nand/raw/mxc_nand.c | 2 +- drivers/mtd/nand/raw/nand_base.c | 21 +++++++++---------- drivers/mtd/nand/raw/nandsim.c | 2 +- drivers/mtd/nand/raw/ndfc.c | 2 +- drivers/mtd/nand/raw/nuc900_nand.c | 2 +- drivers/mtd/nand/raw/omap2.c | 2 +- drivers/mtd/nand/raw/orion_nand.c | 2 +- drivers/mtd/nand/raw/oxnas_nand.c | 2 +- drivers/mtd/nand/raw/pasemi_nand.c | 2 +- drivers/mtd/nand/raw/plat_nand.c | 2 +- drivers/mtd/nand/raw/qcom_nandc.c | 2 +- drivers/mtd/nand/raw/s3c2410.c | 2 +- drivers/mtd/nand/raw/sh_flctl.c | 2 +- drivers/mtd/nand/raw/sharpsl.c | 2 +- drivers/mtd/nand/raw/sm_common.c | 2 +- drivers/mtd/nand/raw/socrates_nand.c | 2 +- drivers/mtd/nand/raw/sunxi_nand.c | 2 +- drivers/mtd/nand/raw/tango_nand.c | 2 +- drivers/mtd/nand/raw/tegra_nand.c | 2 +- drivers/mtd/nand/raw/tmio_nand.c | 2 +- drivers/mtd/nand/raw/txx9ndfmc.c | 2 +- drivers/mtd/nand/raw/vf610_nfc.c | 2 +- drivers/mtd/nand/raw/xway_nand.c | 2 +- drivers/staging/mt29f_spinand/mt29f_spinand.c | 2 +- include/linux/mtd/rawnand.h | 7 ++++--- 52 files changed, 64 insertions(+), 64 deletions(-)
Documentation/driver-api/mtdnand.rst +1 -1
@@ -246,7 +246,7 @@ necessary information about the device. this->eccmode = NAND_ECC_SOFT; /* Scan to find existence of the device */ - if (nand_scan (board_mtd, 1)) { + if (nand_scan (this, 1)) { err = -ENXIO; goto out_ior; }
drivers/mtd/nand/raw/ams-delta.c +1 -1
@@ -235,7 +235,7 @@ static int ams_delta_init(struct platform_device *pdev) goto out_gpio;/* Scan to find existence of the device */ - err =nand_scan (ams_delta_mtd,1 ); + err =nand_scan (this,1 );if (err) goto out_mtd;
drivers/mtd/nand/raw/atmel/nand-controller.c +1 -1
@@ -1694,7 +1694,7 @@ atmel_nand_controller_add_nand(struct atmel_nand_controller *nc, nc->caps->ops->nand_init (nc, nand); - ret =nand_scan (mtd, nand->numcs); + ret =nand_scan (chip, nand->numcs);if (ret) {dev_err (nc->dev,"NAND scan failed: %d\n" , ret);return ret;
drivers/mtd/nand/raw/au1550nd.c +1 -1
@@ -466,7 +466,7 @@ static int au1550nd_probe(struct platform_device *pdev) this->write_buf = (pd->devwidth) ? au_write_buf16 : au_write_buf; this->read_buf = (pd->devwidth) ? au_read_buf16 : au_read_buf; - ret =nand_scan (mtd,1 ); + ret =nand_scan (this,1 );if (ret) {dev_err (&pdev->dev,"NAND scan failed with %d\n" , ret); goto out3;
drivers/mtd/nand/raw/bcm47xxnflash/ops_bcm4706.c +1 -1
@@ -423,7 +423,7 @@ int bcm47xxnflash_ops_bcm4706_init(struct bcm47xxnflash *b47n) (w4 << 24 | w3 << 18 | w2 << 12 | w1 << 6 | w0));/* Scan NAND */ - err =nand_scan (nand_to_mtd (&b47n->nand_chip),1 ); + err =nand_scan (&b47n->nand_chip,1 );if (err) {pr_err ("Could not scan NAND flash: %d\n" , err); goto exit;
drivers/mtd/nand/raw/brcmnand/brcmnand.c +1 -1
@@ -2304,7 +2304,7 @@ static int brcmnand_init_cs(struct brcmnand_host *host, struct device_node *dn)nand_writereg (ctrl, cfg_offs,nand_readreg (ctrl, cfg_offs) & ~CFG_BUS_WIDTH ); - ret =nand_scan (mtd,1 ); + ret =nand_scan (chip,1 );if (ret)return ret;
drivers/mtd/nand/raw/cafe_nand.c +1 -1
@@ -783,7 +783,7 @@ static int cafe_nand_probe(struct pci_dev *pdev,/* Scan to find existence of the device */ cafe->nand.dummy_controller.ops = &cafe_nand_controller_ops; - err =nand_scan (mtd,2 ); + err =nand_scan (&cafe->nand,2 );if (err) goto out_irq;
drivers/mtd/nand/raw/cmx270_nand.c +1 -1
@@ -193,7 +193,7 @@ static int __init cmx270_init(void) this->write_buf = cmx270_write_buf;/* Scan to find existence of the device */ - ret =nand_scan (cmx270_nand_mtd,1 ); + ret =nand_scan (this,1 );if (ret) {pr_notice ("No NAND device\n" ); goto err_scan;
drivers/mtd/nand/raw/cs553x_nand.c +1 -1
@@ -241,7 +241,7 @@ static int __init cs553x_init_one(int cs, int mmio, unsigned long adr) }/* Scan to find existence of the device */ - err =nand_scan (new_mtd,1 ); + err =nand_scan (this,1 );if (err) goto out_free;
drivers/mtd/nand/raw/davinci_nand.c +1 -1
@@ -807,7 +807,7 @@ static int nand_davinci_probe(struct platform_device *pdev)/* Scan to find existence of the device(s) */ info->chip.dummy_controller.ops = &davinci_nand_controller_ops; - ret =nand_scan (mtd, pdata->mask_chipsel ?2 :1 ); + ret =nand_scan (&info->chip, pdata->mask_chipsel ?2 :1 );if (ret <0 ) {dev_dbg (&pdev->dev,"no NAND chip(s) found\n" );return ret;
drivers/mtd/nand/raw/denali.c +1 -1
@@ -1384,7 +1384,7 @@ int denali_init(struct denali_nand_info *denali) chip->setup_data_interface = denali_setup_data_interface; chip->dummy_controller.ops = &denali_controller_ops; - ret =nand_scan (mtd, denali->max_banks); + ret =nand_scan (chip, denali->max_banks);if (ret) goto disable_irq;
drivers/mtd/nand/raw/diskonchip.c +1 -1
@@ -1620,7 +1620,7 @@ static int __init doc_probe(unsigned long physadr)else numchips =doc2001_init (mtd); -if ((ret =nand_scan (mtd, numchips)) || (ret = doc->late_init (mtd))) { +if ((ret =nand_scan (nand, numchips)) || (ret = doc->late_init (mtd))) {/* DBB note: i believe nand_release is necessary here, as buffers may have been allocated in nand_base. Check with Thomas. FIX ME! */
drivers/mtd/nand/raw/docg4.c +1 -1
@@ -1391,7 +1391,7 @@ static int __init probe_docg4(struct platform_device *pdev)* ->attach_chip callback. */ nand->dummy_controller.ops = &docg4_controller_ops; - retval =nand_scan (mtd,0 ); + retval =nand_scan (nand,0 );if (retval) goto free_nand;
drivers/mtd/nand/raw/fsl_elbc_nand.c +1 -1
@@ -915,7 +915,7 @@ static int fsl_elbc_nand_probe(struct platform_device *pdev) goto err; priv->chip.controller->ops = &fsl_elbc_controller_ops; - ret =nand_scan (mtd,1 ); + ret =nand_scan (&priv->chip,1 );if (ret) goto err;
drivers/mtd/nand/raw/fsl_ifc_nand.c +1 -1
@@ -1079,7 +1079,7 @@ static int fsl_ifc_nand_probe(struct platform_device *dev) goto err; priv->chip.controller->ops = &fsl_ifc_controller_ops; - ret =nand_scan (mtd,1 ); + ret =nand_scan (&priv->chip,1 );if (ret) goto err;
drivers/mtd/nand/raw/fsl_upm.c +1 -1
@@ -191,7 +191,7 @@ static int fun_chip_init(struct fsl_upm_nand *fun, goto err; } - ret =nand_scan (mtd, fun->mchip_count); + ret =nand_scan (&fun->chip, fun->mchip_count);if (ret) goto err;
drivers/mtd/nand/raw/fsmc_nand.c +1 -1
@@ -1125,7 +1125,7 @@ static int __init fsmc_nand_probe(struct platform_device *pdev)* Scan to find existence of the device */ nand->dummy_controller.ops = &fsmc_nand_controller_ops; - ret =nand_scan (mtd,1 ); + ret =nand_scan (nand,1 );if (ret) goto release_dma_write_chan;
drivers/mtd/nand/raw/gpio.c +1 -1
@@ -289,7 +289,7 @@ static int gpio_nand_probe(struct platform_device *pdev)if (gpiomtd->nwp && !IS_ERR (gpiomtd->nwp))gpiod_direction_output (gpiomtd->nwp,1 ); - ret =nand_scan (mtd,1 ); + ret =nand_scan (chip,1 );if (ret) goto err_wp;
drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c +1 -1
@@ -1934,7 +1934,7 @@ static int gpmi_nand_init(struct gpmi_nand_data *this) goto err_out; chip->dummy_controller.ops = &gpmi_nand_controller_ops; - ret =nand_scan (mtd,GPMI_IS_MX6 (this) ?2 :1 ); + ret =nand_scan (chip,GPMI_IS_MX6 (this) ?2 :1 );if (ret) goto err_out;
drivers/mtd/nand/raw/hisi504_nand.c +1 -1
@@ -811,7 +811,7 @@ static int hisi_nfc_probe(struct platform_device *pdev) } chip->dummy_controller.ops = &hisi_nfc_controller_ops; - ret =nand_scan (mtd, max_chips); + ret =nand_scan (chip, max_chips);if (ret)return ret;
drivers/mtd/nand/raw/jz4740_nand.c +1 -1
@@ -331,7 +331,7 @@ static int jz_nand_detect_bank(struct platform_device *pdev,if (chipnr ==0 ) {/* Detect first chip. */ - ret =nand_scan (mtd,1 ); + ret =nand_scan (chip,1 );if (ret) goto notfound_id;
drivers/mtd/nand/raw/jz4780_nand.c +1 -1
@@ -286,7 +286,7 @@ static int jz4780_nand_init_chip(struct platform_device *pdev,nand_set_flash_node (chip, np); chip->controller->ops = &jz4780_nand_controller_ops; - ret =nand_scan (mtd,1 ); + ret =nand_scan (chip,1 );if (ret)return ret;
drivers/mtd/nand/raw/lpc32xx_mlc.c +1 -1
@@ -802,7 +802,7 @@ static int lpc32xx_nand_probe(struct platform_device *pdev)* SMALL block or LARGE block. */ nand_chip->dummy_controller.ops = &lpc32xx_nand_controller_ops; - res =nand_scan (mtd,1 ); + res =nand_scan (nand_chip,1 );if (res) goto free_irq;
drivers/mtd/nand/raw/lpc32xx_slc.c +1 -1
@@ -925,7 +925,7 @@ static int lpc32xx_nand_probe(struct platform_device *pdev)/* Find NAND device */ chip->dummy_controller.ops = &lpc32xx_nand_controller_ops; - res =nand_scan (mtd,1 ); + res =nand_scan (chip,1 );if (res) goto release_dma;
drivers/mtd/nand/raw/marvell_nand.c +1 -1
@@ -2551,7 +2551,7 @@ static int marvell_nand_chip_init(struct device *dev, struct marvell_nfc *nfc, chip->options |=NAND_BUSWIDTH_AUTO ; - ret =nand_scan (mtd, marvell_nand->nsels); + ret =nand_scan (chip, marvell_nand->nsels);if (ret) {dev_err (dev,"could not scan the nand chip\n" );return ret;
drivers/mtd/nand/raw/mpc5121_nfc.c +1 -1
@@ -778,7 +778,7 @@ static int mpc5121_nfc_probe(struct platform_device *op) }/* Detect NAND chips */ - retval =nand_scan (mtd,be32_to_cpup (chips_no)); + retval =nand_scan (chip,be32_to_cpup (chips_no));if (retval) {dev_err (dev,"NAND Flash not found !\n" ); goto error;
drivers/mtd/nand/raw/mtk_nand.c +1 -1
@@ -1382,7 +1382,7 @@ static int mtk_nfc_nand_chip_init(struct device *dev, struct mtk_nfc *nfc,mtk_nfc_hw_init (nfc); - ret =nand_scan (mtd, nsels); + ret =nand_scan (nand, nsels);if (ret)return ret;
drivers/mtd/nand/raw/mxc_nand.c +1 -1
@@ -1900,7 +1900,7 @@ static int mxcnd_probe(struct platform_device *pdev)/* Scan the NAND device */ this->dummy_controller.ops = &mxcnd_controller_ops; - err =nand_scan (mtd,is_imx25_nfc (host) ?4 :1 ); + err =nand_scan (this,is_imx25_nfc (host) ?4 :1 );if (err) goto escan;
drivers/mtd/nand/raw/nand_base.c +10 -11
@@ -5953,7 +5953,7 @@ static int nand_dt_init(struct nand_chip *chip)/** * nand_scan_ident - Scan for the NAND device -* @mtd: MTD device structure +* @chip: NAND chip object * @maxchips: number of chips to scan for * @table: alternative NAND ID table *
@@ -5965,11 +5965,11 @@ static int nand_dt_init(struct nand_chip *chip)* prevented dynamic allocations during this phase which was unconvenient and * as been banned for the benefit of the ->init_ecc()/cleanup_ecc() hooks. */ -static int nand_scan_ident (struct mtd_info *mtd,int maxchips, +static int nand_scan_ident (struct nand_chip *chip,int maxchips,struct nand_flash_dev *table) { +struct mtd_info *mtd =nand_to_mtd (chip);int i, nand_maf_id, nand_dev_id; -struct nand_chip *chip =mtd_to_nand (mtd);int ret;/* Enforce the right timings for reset/detection */
@@ -6423,15 +6423,15 @@ static bool nand_ecc_strength_good(struct mtd_info *mtd)/** * nand_scan_tail - Scan for the NAND device -* @mtd: MTD device structure +* @chip: NAND chip object * * This is the second phase of the normal nand_scan() function. It fills out * all the uninitialized function pointers with the defaults and scans for a * bad block table if appropriate. */ -static int nand_scan_tail (struct mtd_info *mtd) +static int nand_scan_tail (struct nand_chip *chip) { -struct nand_chip *chip =mtd_to_nand (mtd); +struct mtd_info *mtd =nand_to_mtd (chip);struct nand_ecc_ctrl *ecc = &chip->ecc;int ret, i;
@@ -6770,7 +6770,7 @@ static void nand_detach(struct nand_chip *chip)/** * nand_scan_with_ids - [NAND Interface] Scan for the NAND device -* @mtd: MTD device structure +* @chip: NAND chip object * @maxchips: number of chips to scan for. @nand_scan_ident() will not be run if * this parameter is zero (useful for specific drivers that must * handle this part of the process themselves, e.g docg4).
@@ -6780,14 +6780,13 @@ static void nand_detach(struct nand_chip *chip)* The flash ID is read and the mtd/chip structures are filled with the * appropriate values. */ -int nand_scan_with_ids (struct mtd_info *mtd,int maxchips, +int nand_scan_with_ids (struct nand_chip *chip,int maxchips,struct nand_flash_dev *ids) { -struct nand_chip *chip =mtd_to_nand (mtd);int ret;if (maxchips) { - ret =nand_scan_ident (mtd, maxchips, ids); + ret =nand_scan_ident (chip, maxchips, ids);if (ret)return ret; }
@@ -6796,7 +6795,7 @@ int nand_scan_with_ids(struct mtd_info *mtd, int maxchips,if (ret) goto cleanup_ident; - ret =nand_scan_tail (mtd); + ret =nand_scan_tail (chip);if (ret) goto detach_chip;
drivers/mtd/nand/raw/nandsim.c +1 -1
@@ -2319,7 +2319,7 @@ static int __init ns_init_module(void) goto error; chip->dummy_controller.ops = &ns_controller_ops; - retval =nand_scan (nsmtd,1 ); + retval =nand_scan (chip,1 );if (retval) {NS_ERR ("Could not scan NAND Simulator device\n" ); goto error;
drivers/mtd/nand/raw/ndfc.c +1 -1
@@ -181,7 +181,7 @@ static int ndfc_chip_init(struct ndfc_controller *ndfc, goto err; } - ret =nand_scan (mtd,1 ); + ret =nand_scan (chip,1 );if (ret) goto err;
drivers/mtd/nand/raw/nuc900_nand.c +1 -1
@@ -270,7 +270,7 @@ static int nuc900_nand_probe(struct platform_device *pdev)nuc900_nand_enable (nuc900_nand); -if (nand_scan (mtd,1 )) +if (nand_scan (chip,1 ))return -ENXIO ;mtd_device_register (mtd, partitions,ARRAY_SIZE (partitions));
drivers/mtd/nand/raw/omap2.c +1 -1
@@ -2254,7 +2254,7 @@ static int omap_nand_probe(struct platform_device *pdev)/* scan NAND device connected to chip controller */ nand_chip->options |= info->devsize &NAND_BUSWIDTH_16 ; - err =nand_scan (mtd,1 ); + err =nand_scan (nand_chip,1 );if (err) goto return_error;
drivers/mtd/nand/raw/orion_nand.c +1 -1
@@ -174,7 +174,7 @@ static int __init orion_nand_probe(struct platform_device *pdev)return ret; } - ret =nand_scan (mtd,1 ); + ret =nand_scan (nc,1 );if (ret) goto no_dev;
drivers/mtd/nand/raw/oxnas_nand.c +1 -1
@@ -142,7 +142,7 @@ static int oxnas_nand_probe(struct platform_device *pdev) chip->chip_delay =30 ;/* Scan to find existence of the device */ - err =nand_scan (mtd,1 ); + err =nand_scan (chip,1 );if (err) goto err_clk_unprepare;
drivers/mtd/nand/raw/pasemi_nand.c +1 -1
@@ -156,7 +156,7 @@ static int pasemi_nand_probe(struct platform_device *ofdev) chip->bbt_options =NAND_BBT_USE_FLASH ;/* Scan to find existence of the device */ - err =nand_scan (pasemi_nand_mtd,1 ); + err =nand_scan (chip,1 );if (err) goto out_lpc;
drivers/mtd/nand/raw/plat_nand.c +1 -1
@@ -84,7 +84,7 @@ static int plat_nand_probe(struct platform_device *pdev) }/* Scan to find existence of the device */ - err =nand_scan (mtd, pdata->chip.nr_chips); + err =nand_scan (&data->chip, pdata->chip.nr_chips);if (err) goto out;
drivers/mtd/nand/raw/qcom_nandc.c +1 -1
@@ -2834,7 +2834,7 @@ static int qcom_nand_host_init_and_register(struct qcom_nand_controller *nandc,/* set up initial status value */ host->status =NAND_STATUS_READY |NAND_STATUS_WP ; - ret =nand_scan (mtd,1 ); + ret =nand_scan (chip,1 );if (ret)return ret;
drivers/mtd/nand/raw/s3c2410.c +1 -1
@@ -1170,7 +1170,7 @@ static int s3c24xx_nand_probe(struct platform_device *pdev) mtd->dev.parent = &pdev->dev;s3c2410_nand_init_chip (info, nmtd, sets); - err =nand_scan (mtd, sets ? sets->nr_chips :1 ); + err =nand_scan (&nmtd->chip, sets ? sets->nr_chips :1 );if (err) goto exit_error;
drivers/mtd/nand/raw/sh_flctl.c +1 -1
@@ -1203,7 +1203,7 @@ static int flctl_probe(struct platform_device *pdev)flctl_setup_dma (flctl); nand->dummy_controller.ops = &flctl_nand_controller_ops; - ret =nand_scan (flctl_mtd,1 ); + ret =nand_scan (nand,1 );if (ret) goto err_chip;
drivers/mtd/nand/raw/sharpsl.c +1 -1
@@ -171,7 +171,7 @@ static int sharpsl_nand_probe(struct platform_device *pdev) this->ecc.correct = nand_correct_data;/* Scan to find existence of the device */ - err =nand_scan (mtd,1 ); + err =nand_scan (this,1 );if (err) goto err_scan;
drivers/mtd/nand/raw/sm_common.c +1 -1
@@ -195,7 +195,7 @@ int sm_register_device(struct mtd_info *mtd, int smartmedia)/* Scan for card properties */ chip->dummy_controller.ops = &sm_controller_ops; flash_ids = smartmedia ? nand_smartmedia_flash_ids : nand_xd_flash_ids; - ret =nand_scan_with_ids (mtd,1 , flash_ids); + ret =nand_scan_with_ids (chip,1 , flash_ids);if (ret)return ret;
drivers/mtd/nand/raw/socrates_nand.c +1 -1
@@ -185,7 +185,7 @@ static int socrates_nand_probe(struct platform_device *ofdev)dev_set_drvdata (&ofdev->dev, host); - res =nand_scan (mtd,1 ); + res =nand_scan (nand_chip,1 );if (res) goto out;
drivers/mtd/nand/raw/sunxi_nand.c +1 -1
@@ -1940,7 +1940,7 @@ static int sunxi_nand_chip_init(struct device *dev, struct sunxi_nfc *nfc, mtd =nand_to_mtd (nand); mtd->dev.parent = dev; - ret =nand_scan (mtd, nsels); + ret =nand_scan (nand, nsels);if (ret)return ret;
drivers/mtd/nand/raw/tango_nand.c +1 -1
@@ -588,7 +588,7 @@ static int chip_init(struct device *dev, struct device_node *np)mtd_set_ooblayout (mtd, &tango_nand_ooblayout_ops); mtd->dev.parent = dev; - err =nand_scan (mtd,1 ); + err =nand_scan (chip,1 );if (err)return err;
drivers/mtd/nand/raw/tegra_nand.c +1 -1
@@ -1119,7 +1119,7 @@ static int tegra_nand_chips_init(struct device *dev, chip->select_chip = tegra_nand_select_chip; chip->setup_data_interface = tegra_nand_setup_data_interface; - ret =nand_scan (mtd,1 ); + ret =nand_scan (chip,1 );if (ret)return ret;
drivers/mtd/nand/raw/tmio_nand.c +1 -1
@@ -436,7 +436,7 @@ static int tmio_probe(struct platform_device *dev) nand_chip->waitfunc = tmio_nand_wait;/* Scan to find existence of the device */ - retval =nand_scan (mtd,1 ); + retval =nand_scan (nand_chip,1 );if (retval) goto err_irq;
drivers/mtd/nand/raw/txx9ndfmc.c +1 -1
@@ -359,7 +359,7 @@ static int __init txx9ndfmc_probe(struct platform_device *dev)if (plat->wide_mask & (1 << i)) chip->options |=NAND_BUSWIDTH_16 ; -if (nand_scan (mtd,1 )) { +if (nand_scan (chip,1 )) {kfree (txx9_priv->mtdname);kfree (txx9_priv);continue ;
drivers/mtd/nand/raw/vf610_nfc.c +1 -1
@@ -892,7 +892,7 @@ static int vf610_nfc_probe(struct platform_device *pdev)/* Scan the NAND chip */ chip->dummy_controller.ops = &vf610_nfc_controller_ops; - err =nand_scan (mtd,1 ); + err =nand_scan (chip,1 );if (err) goto err_disable_clk;
drivers/mtd/nand/raw/xway_nand.c +1 -1
@@ -205,7 +205,7 @@ static int xway_nand_probe(struct platform_device *pdev) | cs_flag, EBU_NAND_CON);/* Scan to find existence of the device */ - err =nand_scan (mtd,1 ); + err =nand_scan (&data->chip,1 );if (err)return err;
drivers/staging/mt29f_spinand/mt29f_spinand.c +1 -1
@@ -934,7 +934,7 @@ static int spinand_probe(struct spi_device *spi_nand)mtd_set_ooblayout (mtd, &spinand_oob_64_ops);#endif -if (nand_scan (mtd,1 )) +if (nand_scan (chip,1 ))return -ENXIO ;return mtd_device_register (mtd,NULL ,0 );
include/linux/mtd/rawnand.h +4 -3
@@ -24,15 +24,16 @@#include <linux/of.h> #include <linux/types.h> +struct nand_chip ;struct nand_flash_dev ;/* Scan and identify a NAND device */ -int nand_scan_with_ids (struct mtd_info *mtd,int max_chips, +int nand_scan_with_ids (struct nand_chip *chip,int max_chips,struct nand_flash_dev *ids); -static inline int nand_scan (struct mtd_info *mtd,int max_chips) +static inline int nand_scan (struct nand_chip *chip,int max_chips) { -return nand_scan_with_ids (mtd, max_chips,NULL ); +return nand_scan_with_ids (chip, max_chips,NULL ); }/* Internal helper for board drivers which need to override command function */
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 184/206 mtd: rawnand: Pass a nand_chip object to nand_release()
In reply to Greg Kroah-HartmanFrom: Boris Brezillon <[email protected]>
[ Upstream commit 59ac276f22270fb2094910f9a734c17f41c25e70 ]
Let's make the raw NAND API consistent by patching all helpers to take a nand_chip object instead of an mtd_info one.
Now is nand_release()'s turn.
--- Documentation/driver-api/mtdnand.rst | 2 +- drivers/mtd/nand/raw/ams-delta.c | 2 +- drivers/mtd/nand/raw/au1550nd.c | 2 +- drivers/mtd/nand/raw/bcm47xxnflash/main.c | 2 +- drivers/mtd/nand/raw/brcmnand/brcmnand.c | 2 +- drivers/mtd/nand/raw/cafe_nand.c | 2 +- drivers/mtd/nand/raw/cmx270_nand.c | 2 +- drivers/mtd/nand/raw/cs553x_nand.c | 2 +- drivers/mtd/nand/raw/davinci_nand.c | 2 +- drivers/mtd/nand/raw/denali.c | 4 +--- drivers/mtd/nand/raw/diskonchip.c | 4 ++-- drivers/mtd/nand/raw/docg4.c | 2 +- drivers/mtd/nand/raw/fsl_elbc_nand.c | 3 +-- drivers/mtd/nand/raw/fsl_ifc_nand.c | 3 +-- drivers/mtd/nand/raw/fsl_upm.c | 2 +- drivers/mtd/nand/raw/fsmc_nand.c | 2 +- drivers/mtd/nand/raw/gpio.c | 2 +- drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 2 +- drivers/mtd/nand/raw/hisi504_nand.c | 3 +-- drivers/mtd/nand/raw/jz4740_nand.c | 2 +- drivers/mtd/nand/raw/jz4780_nand.c | 4 ++-- drivers/mtd/nand/raw/lpc32xx_mlc.c | 3 +-- drivers/mtd/nand/raw/lpc32xx_slc.c | 3 +-- drivers/mtd/nand/raw/marvell_nand.c | 4 ++-- drivers/mtd/nand/raw/mpc5121_nfc.c | 2 +- drivers/mtd/nand/raw/mtk_nand.c | 4 ++-- drivers/mtd/nand/raw/mxc_nand.c | 2 +- drivers/mtd/nand/raw/nand_base.c | 8 ++++---- drivers/mtd/nand/raw/nandsim.c | 4 ++-- drivers/mtd/nand/raw/ndfc.c | 2 +- drivers/mtd/nand/raw/nuc900_nand.c | 2 +- drivers/mtd/nand/raw/omap2.c | 2 +- drivers/mtd/nand/raw/orion_nand.c | 5 ++--- drivers/mtd/nand/raw/oxnas_nand.c | 4 ++-- drivers/mtd/nand/raw/pasemi_nand.c | 2 +- drivers/mtd/nand/raw/plat_nand.c | 4 ++-- drivers/mtd/nand/raw/qcom_nandc.c | 2 +- drivers/mtd/nand/raw/r852.c | 4 ++-- drivers/mtd/nand/raw/s3c2410.c | 2 +- drivers/mtd/nand/raw/sh_flctl.c | 2 +- drivers/mtd/nand/raw/sharpsl.c | 4 ++-- drivers/mtd/nand/raw/socrates_nand.c | 5 ++--- drivers/mtd/nand/raw/sunxi_nand.c | 4 ++-- drivers/mtd/nand/raw/tango_nand.c | 2 +- drivers/mtd/nand/raw/tmio_nand.c | 4 ++-- drivers/mtd/nand/raw/txx9ndfmc.c | 2 +- drivers/mtd/nand/raw/vf610_nfc.c | 2 +- drivers/mtd/nand/raw/xway_nand.c | 4 ++-- include/linux/mtd/rawnand.h | 2 +- 49 files changed, 66 insertions(+), 75 deletions(-)
Documentation/driver-api/mtdnand.rst +1 -1
@@ -277,7 +277,7 @@ unregisters the partitions in the MTD layer. static void __exit board_cleanup (void) { /* Release resources, unregister device */ - nand_release (board_mtd); + nand_release (mtd_to_nand(board_mtd)); /* unmap physical address */ iounmap(baseaddr);
drivers/mtd/nand/raw/ams-delta.c +1 -1
@@ -264,7 +264,7 @@ static int ams_delta_cleanup(struct platform_device *pdev)void __iomem *io_base =platform_get_drvdata (pdev);/* Release resources, unregister device */ -nand_release (ams_delta_mtd); +nand_release (mtd_to_nand (ams_delta_mtd));gpio_free_array (_mandatory_gpio,ARRAY_SIZE (_mandatory_gpio));gpio_free (AMS_DELTA_GPIO_PIN_NAND_RB );
drivers/mtd/nand/raw/au1550nd.c +1 -1
@@ -492,7 +492,7 @@ static int au1550nd_remove(struct platform_device *pdev)struct au1550nd_ctx *ctx =platform_get_drvdata (pdev);struct resource *r =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); -nand_release (nand_to_mtd (&ctx->chip)); +nand_release (&ctx->chip);iounmap (ctx->base);release_mem_region (r->start,0x1000 );kfree (ctx);
drivers/mtd/nand/raw/bcm47xxnflash/main.c +1 -1
@@ -65,7 +65,7 @@ static int bcm47xxnflash_remove(struct platform_device *pdev) {struct bcm47xxnflash *nflash =platform_get_drvdata (pdev); -nand_release (nand_to_mtd (&nflash->nand_chip)); +nand_release (&nflash->nand_chip);return 0 ; }
drivers/mtd/nand/raw/brcmnand/brcmnand.c +1 -1
@@ -2619,7 +2619,7 @@ int brcmnand_remove(struct platform_device *pdev)struct brcmnand_host *host;list_for_each_entry (host, &ctrl->host_list, node) -nand_release (nand_to_mtd (&host->chip)); +nand_release (&host->chip);clk_disable_unprepare (ctrl->clk);
drivers/mtd/nand/raw/cafe_nand.c +1 -1
@@ -819,7 +819,7 @@ static void cafe_nand_remove(struct pci_dev *pdev)/* Disable NAND IRQ in global IRQ mask register */ cafe_writel (cafe, ~1 &cafe_readl (cafe,GLOBAL_IRQ_MASK ),GLOBAL_IRQ_MASK );free_irq (pdev->irq, mtd); -nand_release (mtd); +nand_release (chip);free_rs (cafe->rs);pci_iounmap (pdev, cafe->mmio);dma_free_coherent (&cafe->pdev->dev,2112 , cafe->dmabuf, cafe->dmaaddr);
drivers/mtd/nand/raw/cmx270_nand.c +1 -1
@@ -228,7 +228,7 @@ module_init(cmx270_init); static void __exit cmx270_cleanup(void) {/* Release resources, unregister device */ -nand_release (cmx270_nand_mtd); +nand_release (mtd_to_nand (cmx270_nand_mtd));gpio_free (GPIO_NAND_RB );gpio_free (GPIO_NAND_CS );
drivers/mtd/nand/raw/cs553x_nand.c +1 -1
@@ -336,7 +336,7 @@ static void __exit cs553x_cleanup(void) mmio_base = this->IO_ADDR_R;/* Release resources, unregister device */ -nand_release (mtd); +nand_release (this);kfree (mtd->name); cs553x_mtd[i] =NULL ;
drivers/mtd/nand/raw/davinci_nand.c +1 -1
@@ -841,7 +841,7 @@ static int nand_davinci_remove(struct platform_device *pdev) ecc4_busy = false;spin_unlock_irq (&davinci_nand_lock); -nand_release (nand_to_mtd (&info->chip)); +nand_release (&info->chip);return 0 ; }
drivers/mtd/nand/raw/denali.c +1 -3
@@ -1407,9 +1407,7 @@ EXPORT_SYMBOL(denali_init);void denali_remove (struct denali_nand_info *denali) { -struct mtd_info *mtd =nand_to_mtd (&denali->nand); - -nand_release (mtd); +nand_release (&denali->nand);denali_disable_irq (denali); }EXPORT_SYMBOL (denali_remove);
drivers/mtd/nand/raw/diskonchip.c +2 -2
@@ -1627,7 +1627,7 @@ static int __init doc_probe(unsigned long physadr)/* nand_release will call mtd_device_unregister, but we haven't yet added it. This is handled without incident by mtd_device_unregister, as far as I can tell. */ -nand_release (mtd); +nand_release (nand); goto fail; }
@@ -1662,7 +1662,7 @@ static void release_nanddoc(void) doc =nand_get_controller_data (nand); nextmtd = doc->nextdoc; -nand_release (mtd); +nand_release (nand);iounmap (doc->virtadr);release_mem_region (doc->physadr,DOC_IOREMAP_LEN );free_rs (doc->rs_decoder);
drivers/mtd/nand/raw/docg4.c +1 -1
@@ -1420,7 +1420,7 @@ static int __init probe_docg4(struct platform_device *pdev) static int __exit cleanup_docg4(struct platform_device *pdev) {struct docg4_priv *doc =platform_get_drvdata (pdev); -nand_release (doc->mtd); +nand_release (mtd_to_nand (doc->mtd));kfree (mtd_to_nand (doc->mtd));iounmap (doc->virtadr);return 0 ;
drivers/mtd/nand/raw/fsl_elbc_nand.c +1 -2
@@ -942,9 +942,8 @@ static int fsl_elbc_nand_remove(struct platform_device *pdev) {struct fsl_elbc_fcm_ctrl *elbc_fcm_ctrl = fsl_lbc_ctrl_dev->nand;struct fsl_elbc_mtd *priv =dev_get_drvdata (&pdev->dev); -struct mtd_info *mtd =nand_to_mtd (&priv->chip); -nand_release (mtd); +nand_release (&priv->chip);fsl_elbc_chip_remove (priv);mutex_lock (&fsl_elbc_nand_mutex);
drivers/mtd/nand/raw/fsl_ifc_nand.c +1 -2
@@ -1105,9 +1105,8 @@ static int fsl_ifc_nand_probe(struct platform_device *dev)static int fsl_ifc_nand_remove (struct platform_device *dev) {struct fsl_ifc_mtd *priv =dev_get_drvdata (&dev->dev); -struct mtd_info *mtd =nand_to_mtd (&priv->chip); -nand_release (mtd); +nand_release (&priv->chip);fsl_ifc_chip_remove (priv);mutex_lock (&fsl_ifc_nand_mutex);
drivers/mtd/nand/raw/fsl_upm.c +1 -1
@@ -326,7 +326,7 @@ static int fun_remove(struct platform_device *ofdev)struct mtd_info *mtd =nand_to_mtd (&fun->chip);int i; -nand_release (mtd); +nand_release (&fun->chip);kfree (mtd->name);for (i =0 ; i < fun->mchip_count; i++) {
drivers/mtd/nand/raw/fsmc_nand.c +1 -1
@@ -1161,7 +1161,7 @@ static int fsmc_nand_remove(struct platform_device *pdev)struct fsmc_nand_data *host =platform_get_drvdata (pdev);if (host) { -nand_release (nand_to_mtd (&host->nand)); +nand_release (&host->nand);if (host->mode ==USE_DMA_ACCESS ) {dma_release_channel (host->write_dma_chan);
drivers/mtd/nand/raw/gpio.c +1 -1
@@ -194,7 +194,7 @@ static int gpio_nand_remove(struct platform_device *pdev) {struct gpiomtd *gpiomtd =platform_get_drvdata (pdev); -nand_release (nand_to_mtd (&gpiomtd->nand_chip)); +nand_release (&gpiomtd->nand_chip);/* Enable write protection and disable the chip */ if (gpiomtd->nwp && !IS_ERR (gpiomtd->nwp))
drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c +1 -1
@@ -2026,7 +2026,7 @@ static int gpmi_nand_remove(struct platform_device *pdev) {struct gpmi_nand_data *this =platform_get_drvdata (pdev); -nand_release (nand_to_mtd (&this->nand)); +nand_release (&this->nand);gpmi_free_dma_buffer (this);release_resources (this);return 0 ;
drivers/mtd/nand/raw/hisi504_nand.c +1 -2
@@ -828,9 +828,8 @@ static int hisi_nfc_probe(struct platform_device *pdev)static int hisi_nfc_remove (struct platform_device *pdev) {struct hinfc_host *host =platform_get_drvdata (pdev); -struct mtd_info *mtd =nand_to_mtd (&host->chip); -nand_release (mtd); +nand_release (&host->chip);return 0 ; }
drivers/mtd/nand/raw/jz4740_nand.c +1 -1
@@ -507,7 +507,7 @@ static int jz_nand_remove(struct platform_device *pdev)struct jz_nand *nand =platform_get_drvdata (pdev);size_t i; -nand_release (nand_to_mtd (&nand->chip)); +nand_release (&nand->chip);/* Deassert and disable all chips */ writel (0 , nand->base +JZ_REG_NAND_CTRL );
drivers/mtd/nand/raw/jz4780_nand.c +2 -2
@@ -292,7 +292,7 @@ static int jz4780_nand_init_chip(struct platform_device *pdev, ret =mtd_device_register (mtd,NULL ,0 );if (ret) { -nand_release (mtd); +nand_release (chip);return ret; }
@@ -307,7 +307,7 @@ static void jz4780_nand_cleanup_chips(struct jz4780_nand_controller *nfc)while (!list_empty (&nfc->chips)) { chip = list_first_entry(&nfc->chips, struct jz4780_nand_chip, chip_list); -nand_release (nand_to_mtd (&chip->chip)); +nand_release (&chip->chip);list_del (&chip->chip_list); } }
drivers/mtd/nand/raw/lpc32xx_mlc.c +1 -2
@@ -839,9 +839,8 @@ static int lpc32xx_nand_probe(struct platform_device *pdev)static int lpc32xx_nand_remove (struct platform_device *pdev) {struct lpc32xx_nand_host *host =platform_get_drvdata (pdev); -struct mtd_info *mtd =nand_to_mtd (&host->nand_chip); -nand_release (mtd); +nand_release (&host->nand_chip);free_irq (host->irq, host);if (use_dma)dma_release_channel (host->dma_chan);
drivers/mtd/nand/raw/lpc32xx_slc.c +1 -2
@@ -956,9 +956,8 @@ static int lpc32xx_nand_remove(struct platform_device *pdev) {uint32_t tmp;struct lpc32xx_nand_host *host =platform_get_drvdata (pdev); -struct mtd_info *mtd =nand_to_mtd (&host->nand_chip); -nand_release (mtd); +nand_release (&host->nand_chip);dma_release_channel (host->dma_chan);/* Force CE high */
drivers/mtd/nand/raw/marvell_nand.c +2 -2
@@ -2564,7 +2564,7 @@ static int marvell_nand_chip_init(struct device *dev, struct marvell_nfc *nfc, ret =mtd_device_register (mtd,NULL ,0 );if (ret) {dev_err (dev,"failed to register mtd device: %d\n" , ret); -nand_release (mtd); +nand_release (chip);return ret; }
@@ -2619,7 +2619,7 @@ static void marvell_nand_chips_cleanup(struct marvell_nfc *nfc)struct marvell_nand_chip *entry, *temp;list_for_each_entry_safe (entry, temp, &nfc->chips, node) { -nand_release (nand_to_mtd (&entry->chip)); +nand_release (&entry->chip);list_del (&entry->node); } }
drivers/mtd/nand/raw/mpc5121_nfc.c +1 -1
@@ -828,7 +828,7 @@ static int mpc5121_nfc_remove(struct platform_device *op)struct device *dev = &op->dev;struct mtd_info *mtd =dev_get_drvdata (dev); -nand_release (mtd); +nand_release (mtd_to_nand (mtd));mpc5121_nfc_free (dev, mtd);return 0 ;
drivers/mtd/nand/raw/mtk_nand.c +2 -2
@@ -1389,7 +1389,7 @@ static int mtk_nfc_nand_chip_init(struct device *dev, struct mtk_nfc *nfc, ret =mtd_device_register (mtd,NULL ,0 );if (ret) {dev_err (dev,"mtd parse partition error\n" ); -nand_release (mtd); +nand_release (nand);return ret; }
@@ -1555,7 +1555,7 @@ static int mtk_nfc_remove(struct platform_device *pdev)while (!list_empty (&nfc->chips)) { chip = list_first_entry(&nfc->chips, struct mtk_nfc_nand_chip, node); -nand_release (nand_to_mtd (&chip->nand)); +nand_release (&chip->nand);list_del (&chip->node); }
drivers/mtd/nand/raw/mxc_nand.c +1 -1
@@ -1928,7 +1928,7 @@ static int mxcnd_remove(struct platform_device *pdev) {struct mxc_nand_host *host =platform_get_drvdata (pdev); -nand_release (nand_to_mtd (&host->nand)); +nand_release (&host->nand);if (host->clk_act)clk_disable_unprepare (host->clk);
drivers/mtd/nand/raw/nand_base.c +4 -4
@@ -6846,12 +6846,12 @@ EXPORT_SYMBOL_GPL(nand_cleanup);/** * nand_release - [NAND Interface] Unregister the MTD device and free resources * held by the NAND device -* @mtd: MTD device structure +* @chip: NAND chip object */ -void nand_release (struct mtd_info *mtd) +void nand_release (struct nand_chip *chip) { -mtd_device_unregister (mtd); -nand_cleanup (mtd_to_nand (mtd)); +mtd_device_unregister (nand_to_mtd (chip)); +nand_cleanup (chip); }EXPORT_SYMBOL_GPL (nand_release);
drivers/mtd/nand/raw/nandsim.c +2 -2
@@ -2364,7 +2364,7 @@ static int __init ns_init_module(void) err_exit:free_nandsim (nand); -nand_release (nsmtd); +nand_release (chip);for (i =0 ;i <ARRAY_SIZE (nand->partitions); ++i)kfree (nand->partitions[i].name); error:
@@ -2386,7 +2386,7 @@ static void __exit ns_cleanup_module(void)int i;free_nandsim (ns);/* Free nandsim private resources */ -nand_release (nsmtd);/* Unregister driver */ +nand_release (chip);/* Unregister driver */ for (i =0 ;i <ARRAY_SIZE (ns->partitions); ++i)kfree (ns->partitions[i].name);kfree (mtd_to_nand (nsmtd));/* Free other structures */
drivers/mtd/nand/raw/ndfc.c +1 -1
@@ -258,7 +258,7 @@ static int ndfc_remove(struct platform_device *ofdev)struct ndfc_controller *ndfc =dev_get_drvdata (&ofdev->dev);struct mtd_info *mtd =nand_to_mtd (&ndfc->chip); -nand_release (mtd); +nand_release (&ndfc->chip);kfree (mtd->name);return 0 ;
drivers/mtd/nand/raw/nuc900_nand.c +1 -1
@@ -284,7 +284,7 @@ static int nuc900_nand_remove(struct platform_device *pdev) {struct nuc900_nand *nuc900_nand =platform_get_drvdata (pdev); -nand_release (nand_to_mtd (&nuc900_nand->chip)); +nand_release (&nuc900_nand->chip);clk_disable (nuc900_nand->clk);return 0 ;
drivers/mtd/nand/raw/omap2.c +1 -1
@@ -2290,7 +2290,7 @@ static int omap_nand_remove(struct platform_device *pdev) }if (info->dma)dma_release_channel (info->dma); -nand_release (mtd); +nand_release (nand_chip);return 0 ; }
drivers/mtd/nand/raw/orion_nand.c +2 -3
@@ -181,7 +181,7 @@ static int __init orion_nand_probe(struct platform_device *pdev) mtd->name ="orion_nand" ; ret =mtd_device_register (mtd, board->parts, board->nr_parts);if (ret) { -nand_release (mtd); +nand_release (nc); goto no_dev; }
@@ -196,9 +196,8 @@ static int orion_nand_remove(struct platform_device *pdev) {struct orion_nand_info *info =platform_get_drvdata (pdev);struct nand_chip *chip = &info->chip; -struct mtd_info *mtd =nand_to_mtd (chip); -nand_release (mtd); +nand_release (chip);clk_disable_unprepare (info->clk);
drivers/mtd/nand/raw/oxnas_nand.c +2 -2
@@ -148,7 +148,7 @@ static int oxnas_nand_probe(struct platform_device *pdev) err =mtd_device_register (mtd,NULL ,0 );if (err) { -nand_release (mtd); +nand_release (chip); goto err_clk_unprepare; }
@@ -176,7 +176,7 @@ static int oxnas_nand_remove(struct platform_device *pdev)struct oxnas_nand_ctrl *oxnas =platform_get_drvdata (pdev);if (oxnas->chips[0 ]) -nand_release (nand_to_mtd (oxnas->chips[0 ])); +nand_release (oxnas->chips[0 ]);clk_disable_unprepare (oxnas->clk);
drivers/mtd/nand/raw/pasemi_nand.c +1 -1
@@ -193,7 +193,7 @@ static int pasemi_nand_remove(struct platform_device *ofdev) chip =mtd_to_nand (pasemi_nand_mtd);/* Release resources, unregister device */ -nand_release (pasemi_nand_mtd); +nand_release (chip);release_region (lpcctl,4 );
drivers/mtd/nand/raw/plat_nand.c +2 -2
@@ -97,7 +97,7 @@ static int plat_nand_probe(struct platform_device *pdev)if (!err)return err; -nand_release (mtd); +nand_release (&data->chip); out:if (pdata->ctrl.remove) pdata->ctrl.remove (pdev);
@@ -112,7 +112,7 @@ static int plat_nand_remove(struct platform_device *pdev)struct plat_nand_data *data =platform_get_drvdata (pdev);struct platform_nand_data *pdata =dev_get_platdata (&pdev->dev); -nand_release (nand_to_mtd (&data->chip)); +nand_release (&data->chip);if (pdata->ctrl.remove) pdata->ctrl.remove (pdev);
drivers/mtd/nand/raw/qcom_nandc.c +1 -1
@@ -2999,7 +2999,7 @@ static int qcom_nandc_remove(struct platform_device *pdev)struct qcom_nand_host *host;list_for_each_entry (host, &nandc->host_list, node) -nand_release (nand_to_mtd (&host->chip)); +nand_release (&host->chip);qcom_nandc_unalloc (nandc);
drivers/mtd/nand/raw/r852.c +2 -2
@@ -656,7 +656,7 @@ static int r852_register_nand_device(struct r852_device *dev) dev->card_registred =1 ;return 0 ; error3: -nand_release (mtd); +nand_release (dev->chip); error1:/* Force card redetect */ dev->card_detected =0 ;
@@ -675,7 +675,7 @@ static void r852_unregister_nand_device(struct r852_device *dev)return ;device_remove_file (&mtd->dev, &dev_attr_media_type); -nand_release (mtd); +nand_release (dev->chip);r852_engine_disable (dev); dev->card_registred =0 ; }
drivers/mtd/nand/raw/s3c2410.c +1 -1
@@ -781,7 +781,7 @@ static int s3c24xx_nand_remove(struct platform_device *pdev)for (mtdno =0 ; mtdno < info->mtd_count; mtdno++, ptr++) {pr_debug ("releasing mtd %d (%p)\n" , mtdno, ptr); -nand_release (nand_to_mtd (&ptr->chip)); +nand_release (&ptr->chip); } }
drivers/mtd/nand/raw/sh_flctl.c +1 -1
@@ -1226,7 +1226,7 @@ static int flctl_remove(struct platform_device *pdev)struct sh_flctl *flctl =platform_get_drvdata (pdev);flctl_release_dma (flctl); -nand_release (nand_to_mtd (&flctl->chip)); +nand_release (&flctl->chip);pm_runtime_disable (&pdev->dev);return 0 ;
drivers/mtd/nand/raw/sharpsl.c +2 -2
@@ -187,7 +187,7 @@ static int sharpsl_nand_probe(struct platform_device *pdev)return 0 ; err_add: -nand_release (mtd); +nand_release (this); err_scan:iounmap (sharpsl->io);
@@ -205,7 +205,7 @@ static int sharpsl_nand_remove(struct platform_device *pdev)struct sharpsl_nand *sharpsl =platform_get_drvdata (pdev);/* Release resources, unregister device */ -nand_release (nand_to_mtd (&sharpsl->chip)); +nand_release (&sharpsl->chip);iounmap (sharpsl->io);
drivers/mtd/nand/raw/socrates_nand.c +2 -3
@@ -193,7 +193,7 @@ static int socrates_nand_probe(struct platform_device *ofdev)if (!res)return res; -nand_release (mtd); +nand_release (nand_chip); out:iounmap (host->io_base);
@@ -206,9 +206,8 @@ static int socrates_nand_probe(struct platform_device *ofdev)static int socrates_nand_remove (struct platform_device *ofdev) {struct socrates_nand_host *host =dev_get_drvdata (&ofdev->dev); -struct mtd_info *mtd =nand_to_mtd (&host->nand_chip); -nand_release (mtd); +nand_release (&host->nand_chip);iounmap (host->io_base);
drivers/mtd/nand/raw/sunxi_nand.c +2 -2
@@ -1947,7 +1947,7 @@ static int sunxi_nand_chip_init(struct device *dev, struct sunxi_nfc *nfc, ret =mtd_device_register (mtd,NULL ,0 );if (ret) {dev_err (dev,"failed to register mtd device: %d\n" , ret); -nand_release (mtd); +nand_release (nand);return ret; }
@@ -1986,7 +1986,7 @@ static void sunxi_nand_chips_cleanup(struct sunxi_nfc *nfc)while (!list_empty (&nfc->chips)) { chip = list_first_entry(&nfc->chips, struct sunxi_nand_chip, node); -nand_release (nand_to_mtd (&chip->nand)); +nand_release (&chip->nand);sunxi_nand_ecc_cleanup (&chip->nand.ecc);list_del (&chip->node); }
drivers/mtd/nand/raw/tango_nand.c +1 -1
@@ -617,7 +617,7 @@ static int tango_nand_remove(struct platform_device *pdev)for (cs =0 ; cs <MAX_CS ; ++cs) {if (nfc->chips[cs]) -nand_release (nand_to_mtd (&nfc->chips[cs]->nand_chip)); +nand_release (&nfc->chips[cs]->nand_chip); }return 0 ;
drivers/mtd/nand/raw/tmio_nand.c +2 -2
@@ -449,7 +449,7 @@ static int tmio_probe(struct platform_device *dev)if (!retval)return retval; -nand_release (mtd); +nand_release (nand_chip); err_irq:tmio_hw_stop (dev, tmio);
@@ -460,7 +460,7 @@ static int tmio_remove(struct platform_device *dev) {struct tmio_nand *tmio =platform_get_drvdata (dev); -nand_release (nand_to_mtd (&tmio->chip)); +nand_release (&tmio->chip);tmio_hw_stop (dev, tmio);return 0 ; }
drivers/mtd/nand/raw/txx9ndfmc.c +1 -1
@@ -390,7 +390,7 @@ static int __exit txx9ndfmc_remove(struct platform_device *dev) chip =mtd_to_nand (mtd); txx9_priv =nand_get_controller_data (chip); -nand_release (mtd); +nand_release (chip);kfree (txx9_priv->mtdname);kfree (txx9_priv); }
drivers/mtd/nand/raw/vf610_nfc.c +1 -1
@@ -916,7 +916,7 @@ static int vf610_nfc_remove(struct platform_device *pdev)struct mtd_info *mtd =platform_get_drvdata (pdev);struct vf610_nfc *nfc =mtd_to_nfc (mtd); -nand_release (mtd); +nand_release (mtd_to_nand (mtd));clk_disable_unprepare (nfc->clk);return 0 ; }
drivers/mtd/nand/raw/xway_nand.c +2 -2
@@ -211,7 +211,7 @@ static int xway_nand_probe(struct platform_device *pdev) err =mtd_device_register (mtd,NULL ,0 );if (err) -nand_release (mtd); +nand_release (&data->chip);return err; }
@@ -223,7 +223,7 @@ static int xway_nand_remove(struct platform_device *pdev) {struct xway_nand_data *data =platform_get_drvdata (pdev); -nand_release (nand_to_mtd (&data->chip)); +nand_release (&data->chip);return 0 ; }
include/linux/mtd/rawnand.h +1 -1
@@ -1741,7 +1741,7 @@ int nand_write_data_op(struct nand_chip *chip, const void *buf,*/ void nand_cleanup (struct nand_chip *chip);/* Unregister the MTD device and calls nand_cleanup() */ -void nand_release (struct mtd_info *mtd); +void nand_release (struct nand_chip *chip);/* Default extended ID decoding function */ void nand_decode_ext_id (struct nand_chip *chip);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 185/206 mtd: rawnand: diskonchip: Fix the probe error path
In reply to Greg Kroah-HartmanFrom: Miquel Raynal <[email protected]>
[ Upstream commit c5be12e45940f1aa1b5dfa04db5d15ad24f7c896 ]
Not sure nand_cleanup() is the right function to call here but in any case it is not nand_release(). Indeed, even a comment says that calling nand_release() is a bit of a hack as there is no MTD device to unregister. So switch to nand_cleanup() for now and drop this comment.
There is no Fixes tag applying here as the use of nand_release()
in this driver predates by far the introduction of nand_cleanup() in
commit d44154f969a4 ("mtd: nand: Provide nand_cleanup() function to free NAND related resources") which makes this change possible. However, pointing this commit as the
culprit for backporting purposes makes sense even if it did not intruce
any bug.
--- drivers/mtd/nand/raw/diskonchip.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/mtd/nand/raw/diskonchip.c +2 -5
@@ -1621,13 +1621,10 @@ static int __init doc_probe(unsigned long physadr) numchips =doc2001_init (mtd);if ((ret =nand_scan (nand, numchips)) || (ret = doc->late_init (mtd))) { -/* DBB note: i believe nand_release is necessary here, as +/* DBB note: i believe nand_cleanup is necessary here, as buffers may have been allocated in nand_base. Check with Thomas. FIX ME! */ -/* nand_release will call mtd_device_unregister, but we -haven't yet added it. This is handled without incident by -mtd_device_unregister, as far as I can tell. */ -nand_release (nand); +nand_cleanup (nand); goto fail; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 186/206 mtd: rawnand: sharpsl: Fix the probe error path
In reply to Greg Kroah-HartmanFrom: Miquel Raynal <[email protected]>
[ Upstream commit 0f44b3275b3798ccb97a2f51ac85871c30d6fbbc ]
nand_release() is supposed be called after MTD device registration. Here, only nand_scan() happened, so use nand_cleanup() instead.
There is no Fixes tag applying here as the use of nand_release()
in this driver predates by far the introduction of nand_cleanup() in
commit d44154f969a4 ("mtd: nand: Provide nand_cleanup() function to free NAND related resources") which makes this change possible. However, pointing this commit as the
culprit for backporting purposes makes sense.
--- drivers/mtd/nand/raw/sharpsl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/nand/raw/sharpsl.c +1 -1
@@ -187,7 +187,7 @@ static int sharpsl_nand_probe(struct platform_device *pdev)return 0 ; err_add: -nand_release (this); +nand_cleanup (this); err_scan:iounmap (sharpsl->io);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 187/206 mtd: rawnand: xway: Fix the probe error path
In reply to Greg Kroah-HartmanFrom: Miquel Raynal <[email protected]>
[ Upstream commit 34531be5e804a8e1abf314a6c3a19fe342e4a154 ]
nand_release() is supposed be called after MTD device registration. Here, only nand_scan() happened, so use nand_cleanup() instead.
There is no real Fixes tag applying here as the use of nand_release()
in this driver predates the introduction of nand_cleanup() in
commit d44154f969a4 ("mtd: nand: Provide nand_cleanup() function to free NAND related resources") which makes this change possible. However, pointing this commit as the
culprit for backporting purposes makes sense even if this commit is not introducing any bug.
--- drivers/mtd/nand/raw/xway_nand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/nand/raw/xway_nand.c +1 -1
@@ -211,7 +211,7 @@ static int xway_nand_probe(struct platform_device *pdev) err =mtd_device_register (mtd,NULL ,0 );if (err) -nand_release (&data->chip); +nand_cleanup (&data->chip);return err; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 188/206 mtd: rawnand: orion: Fix the probe error path
In reply to Greg Kroah-HartmanFrom: Miquel Raynal <[email protected]>
[ Upstream commit be238fbf78e4c7c586dac235ab967d3e565a4d1a ]
nand_release() is supposed be called after MTD device registration. Here, only nand_scan() happened, so use nand_cleanup() instead.
There is no real Fixes tag applying here as the use of nand_release()
in this driver predates by far the introduction of nand_cleanup() in
commit d44154f969a4 ("mtd: nand: Provide nand_cleanup() function to free NAND related resources") which makes this change possible. However, pointing this commit as the
culprit for backporting purposes makes sense even if this commit is not introducing any bug.
--- drivers/mtd/nand/raw/orion_nand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/nand/raw/orion_nand.c +1 -1
@@ -181,7 +181,7 @@ static int __init orion_nand_probe(struct platform_device *pdev) mtd->name ="orion_nand" ; ret =mtd_device_register (mtd, board->parts, board->nr_parts);if (ret) { -nand_release (nc); +nand_cleanup (nc); goto no_dev; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 189/206 mtd: rawnand: oxnas: Add of_node_put()
In reply to Greg Kroah-HartmanFrom: Nishka Dasgupta <[email protected]>
[ Upstream commit c436f68beeb20f2f92937677db1d9069b0dd2a3d ]
Each iteration of for_each_child_of_node puts the previous node, but in the case of a goto from the middle of the loop, there is no put, thus causing a memory leak. Hence add an of_node_put under a new goto to put the node at a loop exit.
Issue found with Coccinelle.
--- drivers/mtd/nand/raw/oxnas_nand.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/mtd/nand/raw/oxnas_nand.c +5 -3
@@ -123,7 +123,7 @@ static int oxnas_nand_probe(struct platform_device *pdev) GFP_KERNEL);if (!chip) { err = -ENOMEM ; - goto err_clk_unprepare; + goto err_release_child; } chip->controller = &oxnas->base;
@@ -144,12 +144,12 @@ static int oxnas_nand_probe(struct platform_device *pdev)/* Scan to find existence of the device */ err =nand_scan (chip,1 );if (err) - goto err_clk_unprepare; + goto err_release_child; err =mtd_device_register (mtd,NULL ,0 );if (err) {nand_release (chip); - goto err_clk_unprepare; + goto err_release_child; } oxnas->chips[nchips] = chip;
@@ -166,6 +166,8 @@ static int oxnas_nand_probe(struct platform_device *pdev)return 0 ; +err_release_child: +of_node_put (nand_np); err_clk_unprepare:clk_disable_unprepare (oxnas->clk);return err;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 190/206 mtd: rawnand: oxnas: Fix the probe error path
In reply to Greg Kroah-HartmanFrom: Miquel Raynal <[email protected]>
[ Upstream commit 154298e2a3f6c9ce1d76cdb48d89fd5b107ea1a3 ]
nand_release() is supposed be called after MTD device registration. Here, only nand_scan() happened, so use nand_cleanup() instead.
While at it, be consistent and move the function call in the error path thanks to a goto statement.
--- drivers/mtd/nand/raw/oxnas_nand.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/mtd/nand/raw/oxnas_nand.c +4 -4
@@ -147,10 +147,8 @@ static int oxnas_nand_probe(struct platform_device *pdev) goto err_release_child; err =mtd_device_register (mtd,NULL ,0 ); -if (err) { -nand_release (chip); - goto err_release_child; - } +if (err) + goto err_cleanup_nand; oxnas->chips[nchips] = chip; ++nchips;
@@ -166,6 +164,8 @@ static int oxnas_nand_probe(struct platform_device *pdev)return 0 ; +err_cleanup_nand: +nand_cleanup (chip); err_release_child:of_node_put (nand_np); err_clk_unprepare:
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 191/206 mtd: rawnand: socrates: Fix the probe error path
In reply to Greg Kroah-HartmanFrom: Miquel Raynal <[email protected]>
[ Upstream commit 9c6c2e5cc77119ce0dacb4f9feedb73ce0354421 ]
nand_release() is supposed be called after MTD device registration. Here, only nand_scan() happened, so use nand_cleanup() instead.
There is no real Fixes tag applying here as the use of nand_release()
in this driver predates by far the introduction of nand_cleanup() in
commit d44154f969a4 ("mtd: nand: Provide nand_cleanup() function to free NAND related resources") which makes this change possible. However, pointing this commit as the
culprit for backporting purposes makes sense even if this commit is not introducing any bug.
--- drivers/mtd/nand/raw/socrates_nand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/nand/raw/socrates_nand.c +1 -1
@@ -193,7 +193,7 @@ static int socrates_nand_probe(struct platform_device *ofdev)if (!res)return res; -nand_release (nand_chip); +nand_cleanup (nand_chip); out:iounmap (host->io_base);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 192/206 mtd: rawnand: plat_nand: Fix the probe error path
In reply to Greg Kroah-HartmanFrom: Miquel Raynal <[email protected]>
[ Upstream commit 5284024b4dac5e94f7f374ca905c7580dbc455e9 ]
nand_release() is supposed be called after MTD device registration. Here, only nand_scan() happened, so use nand_cleanup() instead.
There is no real Fixes tag applying here as the use of nand_release()
in this driver predates by far the introduction of nand_cleanup() in
commit d44154f969a4 ("mtd: nand: Provide nand_cleanup() function to free NAND related resources") which makes this change possible, hence pointing it as the commit to
fix for backporting purposes, even if this commit is not introducing
any bug.
--- drivers/mtd/nand/raw/plat_nand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/nand/raw/plat_nand.c +1 -1
@@ -97,7 +97,7 @@ static int plat_nand_probe(struct platform_device *pdev)if (!err)return err; -nand_release (&data->chip); +nand_cleanup (&data->chip); out:if (pdata->ctrl.remove) pdata->ctrl.remove (pdev);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 193/206 mtd: rawnand: mtk: Fix the probe error path
In reply to Greg Kroah-HartmanFrom: Miquel Raynal <[email protected]>
[ Upstream commit 8a82bbcadec877f5f938c54026278dfc1f05a332 ]
nand_release() is supposed be called after MTD device registration. Here, only nand_scan() happened, so use nand_cleanup() instead.
There is no real Fixes tag applying here as the use of nand_release()
in this driver predates the introduction of nand_cleanup() in
commit d44154f969a4 ("mtd: nand: Provide nand_cleanup() function to free NAND related resources") which makes this change possible. However, pointing this commit as the
culprit for backporting purposes makes sense even if this commit is not introducing any bug.
--- drivers/mtd/nand/raw/mtk_nand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/nand/raw/mtk_nand.c +1 -1
@@ -1389,7 +1389,7 @@ static int mtk_nfc_nand_chip_init(struct device *dev, struct mtk_nfc *nfc, ret =mtd_device_register (mtd,NULL ,0 );if (ret) {dev_err (dev,"mtd parse partition error\n" ); -nand_release (nand); +nand_cleanup (nand);return ret; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 194/206 mtd: rawnand: tmio: Fix the probe error path
In reply to Greg Kroah-HartmanFrom: Miquel Raynal <[email protected]>
[ Upstream commit 75e9a330a9bd48f97a55a08000236084fe3dae56 ]
nand_release() is supposed be called after MTD device registration. Here, only nand_scan() happened, so use nand_cleanup() instead.
There is no real Fixes tag applying here as the use of nand_release()
in this driver predates by far the introduction of nand_cleanup() in
commit d44154f969a4 ("mtd: nand: Provide nand_cleanup() function to free NAND related resources") which makes this change possible. However, pointing this commit as the
culprit for backporting purposes makes sense even if this commit is not introducing any bug.
--- drivers/mtd/nand/raw/tmio_nand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/nand/raw/tmio_nand.c +1 -1
@@ -449,7 +449,7 @@ static int tmio_probe(struct platform_device *dev)if (!retval)return retval; -nand_release (nand_chip); +nand_cleanup (nand_chip); err_irq:tmio_hw_stop (dev, tmio);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 195/206 s390: fix syscall_get_error for compat processes
In reply to Greg Kroah-HartmanFrom: Dmitry V. Levin <[email protected]>
commit b3583fca5fb654af2cfc1c08259abb9728272538 upstream.
If both the tracer and the tracee are compat processes, and gprs[2] is assigned a value by __poke_user_compat, then the higher 32 bits of gprs[2] are cleared, IS_ERR_VALUE() always returns false, and syscall_get_error() always returns 0.
Fix the implementation by sign-extending the value for compat processes the same way as x86 implementation does.
The bug was exposed to user space by commit 201766a20e30f ("ptrace: add PTRACE_GET_SYSCALL_INFO request") and detected by strace test suite.
This change fixes strace syscall tampering on s390.
--- arch/s390/include/asm/syscall.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
arch/s390/include/asm/syscall.h +11 -1
@@ -38,7 +38,17 @@ static inline void syscall_rollback(strustatic inline long syscall_get_error (struct task_struct *task,struct pt_regs *regs) { -return IS_ERR_VALUE (regs->gprs[2 ]) ? regs->gprs[2 ] :0 ; +unsigned long error = regs->gprs[2 ]; +#ifdef CONFIG_COMPAT +if (test_tsk_thread_flag (task,TIF_31BIT )) { +/* +* Sign-extend the value so (int)-EFOO becomes (long)-EFOO +* and will match correctly in comparisons. +*/ + error = (long )(int )error; + } +#endif +return IS_ERR_VALUE (error) ? error :0 ; } static inline long syscall_get_return_value(struct task_struct *task,
Greg Kroah-Hartman
maintainerPATCH 196/206 drm/i915: Whitelist context-local timestamp in the gen9 cmdparser
In reply to Greg Kroah-HartmanFrom: Chris Wilson <[email protected]>
commit 273500ae71711c040d258a7b3f4b6f44c368fff2 upstream.
Allow batch buffers to read their own _local_ cumulative HW runtime of their logical context.
--- drivers/gpu/drm/i915/i915_cmd_parser.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/i915/i915_cmd_parser.c +4 -0
@@ -570,6 +570,9 @@ struct drm_i915_reg_descriptor {#define REG32 (_reg, ...) \ { .addr = (_reg), __VA_ARGS__ } +#define REG32_IDX (_reg, idx) \ + { .addr = _reg(idx) } +/* * Convenience macro for adding 64-bit registers. *
@@ -667,6 +670,7 @@ static const struct drm_i915_reg_descripREG64_IDX (RING_TIMESTAMP ,BSD_RING_BASE ),REG32 (BCS_SWCTRL ),REG64_IDX (RING_TIMESTAMP ,BLT_RING_BASE ), +REG32_IDX (RING_CTX_TIMESTAMP ,BLT_RING_BASE ),REG64_IDX (BCS_GPR ,0 ),REG64_IDX (BCS_GPR ,1 ), REG64_IDX(BCS_GPR, 2),
Greg Kroah-Hartman
maintainerPATCH 197/206 drm/i915/icl+: Fix hotplug interrupt disabling after storm detection
In reply to Greg Kroah-HartmanFrom: Imre Deak <[email protected]>
commit a3005c2edf7e8c3478880db1ca84028a2b6819bb upstream.
Atm, hotplug interrupts on TypeC ports are left enabled after detecting an interrupt storm, fix this.
Bugzilla: https://gitlab.freedesktop.org/drm/intel/-/issues/1964
--- drivers/gpu/drm/i915/i915_irq.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/i915/i915_irq.c +1 -0
@@ -3821,6 +3821,7 @@ static void gen11_hpd_irq_setup(struct d val =I915_READ (GEN11_DE_HPD_IMR ); val &= ~hotplug_irqs; + val |= ~enabled_irqs & hotplug_irqs;I915_WRITE (GEN11_DE_HPD_IMR , val);POSTING_READ (GEN11_DE_HPD_IMR );
Greg Kroah-Hartman
maintainerPATCH 198/206 crypto: algif_skcipher - Cap recv SG list at ctx->used
In reply to Greg Kroah-HartmanFrom: Herbert Xu <[email protected]>
commit 7cf81954705b7e5b057f7dc39a7ded54422ab6e1 upstream.
Somewhere along the line the cap on the SG list length for receive was lost. This patch restores it and removes the subsequent test which is now redundant.
--- crypto/algif_skcipher.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
crypto/algif_skcipher.c +1 -5
@@ -78,14 +78,10 @@ static int _skcipher_recvmsg(struct sockreturn PTR_ERR (areq);/* convert iovecs of output buffers into RX SGL */ - err =af_alg_get_rsgl (sk, msg, flags, areq,-1 , &len); + err =af_alg_get_rsgl (sk, msg, flags, areq, ctx->used, &len);if (err) goto free; -/* Process only as much RX buffers for which we have TX data */ -if (len > ctx->used) - len = ctx->used; -/* * If more buffers are to be expected to be processed, process only * full block size buffers.
Greg Kroah-Hartman
maintainerPATCH 199/206 crypto: algboss - dont wait during notifier callback
In reply to Greg Kroah-HartmanFrom: Eric Biggers <[email protected]>
commit 77251e41f89a813b4090f5199442f217bbf11297 upstream.
When a crypto template needs to be instantiated, CRYPTO_MSG_ALG_REQUEST is sent to crypto_chain. cryptomgr_schedule_probe() handles this by starting a thread to instantiate the template, then waiting for this thread to complete via crypto_larval::completion.
This can deadlock because instantiating the template may require loading modules, and this (apparently depending on userspace) may need to wait for the crc-t10dif module (lib/crc-t10dif.c) to be loaded. But crc-t10dif's module_init function uses crypto_register_notifier() and therefore takes crypto_chain.rwsem for write. That can't proceed until the notifier callback has finished, as it holds this semaphore for read.
Fix this by removing the wait on crypto_larval::completion from within cryptomgr_schedule_probe(). It's actually unnecessary because crypto_alg_mod_lookup() calls crypto_larval_wait() itself after sending CRYPTO_MSG_ALG_REQUEST.
This only actually became a problem in v4.20 due to commit b76377543b73 ("crc-t10dif: Pick better transform if one becomes available"), but the unnecessary wait was much older.
--- crypto/algboss.c | 2 -- 1 file changed, 2 deletions(-)
crypto/algboss.c +0 -2
@@ -193,8 +193,6 @@ static int cryptomgr_schedule_probe(struif (IS_ERR (thread)) goto err_put_larval; -wait_for_completion_interruptible (&larval->completion); -return NOTIFY_STOP ; err_put_larval:
Greg Kroah-Hartman
maintainerPATCH 200/206 kprobes: Fix to protect kick_kprobe_optimizer() by kprobe_mutex
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu <[email protected]>
commit 1a0aa991a6274161c95a844c58cfb801d681eb59 upstream.
In kprobe_optimizer() kick_kprobe_optimizer() is called without kprobe_mutex, but this can race with other caller which is protected by kprobe_mutex.
To fix that, expand kprobe_mutex protected area to protect kick_kprobe_optimizer() call.
--- kernel/kprobes.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/kprobes.c +2 -1
@@ -599,11 +599,12 @@ static void kprobe_optimizer(struct workmutex_unlock (&module_mutex);mutex_unlock (&text_mutex);cpus_read_unlock (); -mutex_unlock (&kprobe_mutex);/* Step 5: Kick optimizer again if needed */ if (!list_empty (&optimizing_list) || !list_empty (&unoptimizing_list))kick_kprobe_optimizer (); + +mutex_unlock (&kprobe_mutex); }/* Wait for completing optimization and unoptimization */
Greg Kroah-Hartman
maintainerPATCH 201/206 e1000e: Do not wake up the system via WOL if device wakeup is disabled
In reply to Greg Kroah-HartmanFrom: Chen Yu <[email protected]>
commit 6bf6be1127f7e6d4bf39f84d56854e944d045d74 upstream.
Currently the system will be woken up via WOL(Wake On LAN) even if the device wakeup ability has been disabled via sysfs:
cat /sys/devices/pci0000:00/0000:00:1f.6/power/wakeup disabled
The system should not be woken up if the user has explicitly disabled the wake up ability for this device.
This patch clears the WOL ability of this network device if the user has disabled the wake up ability in sysfs.
--- drivers/net/ethernet/intel/e1000e/netdev.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/e1000e/netdev.c +10 -4
@@ -6308,11 +6308,17 @@ static int __e1000_shutdown(struct pci_dstruct net_device *netdev =pci_get_drvdata (pdev);struct e1000_adapter *adapter =netdev_priv (netdev);struct e1000_hw *hw = &adapter->hw; -u32 ctrl, ctrl_ext, rctl, status; -/* Runtime suspend should only enable wakeup for link changes */ -u32 wufc = runtime ?E1000_WUFC_LNKC : adapter->wol; +u32 ctrl, ctrl_ext, rctl, status, wufc;int retval =0 ; +/* Runtime suspend should only enable wakeup for link changes */ +if (runtime) + wufc =E1000_WUFC_LNKC ; +else if (device_may_wakeup (&pdev->dev)) + wufc = adapter->wol; +else + wufc =0 ; + status =er32 (STATUS );if (status &E1000_STATUS_LU ) wufc &= ~E1000_WUFC_LNKC ;
@@ -6369,7 +6375,7 @@ static int __e1000_shutdown(struct pci_dif (adapter->hw.phy.type == e1000_phy_igp_3) {e1000e_igp3_phy_powerdown_workaround_ich8lan (&adapter->hw); }else if (hw->mac.type >= e1000_pch_lpt) { -if (!(wufc & (E1000_WUFC_EX |E1000_WUFC_MC |E1000_WUFC_BC ))) +if (wufc && !(wufc & (E1000_WUFC_EX |E1000_WUFC_MC |E1000_WUFC_BC )))/* ULP does not support wake from unicast, multicast * or broadcast. */
Greg Kroah-Hartman
maintainerPATCH 202/206 net: octeon: mgmt: Repair filling of RX ring
In reply to Greg Kroah-HartmanFrom: Alexander Sverdlin <[email protected]>
commit 0c34bb598c510e070160029f34efeeb217000f8d upstream.
The removal of mips_swiotlb_ops exposed a problem in octeon_mgmt Ethernet driver. mips_swiotlb_ops had an mb() after most of the operations and the removal of the ops had broken the receive functionality of the driver. My code inspection has shown no other places except octeon_mgmt_rx_fill_ring() where an explicit barrier would be obviously missing. The latter function however has to make sure that "ringing the bell" doesn't happen before RX ring entry is really written.
The patch has been successfully tested on Octeon II.
--- drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/ethernet/cavium/octeon/octeon_mgmt.c +5 -0
@@ -235,6 +235,11 @@ static void octeon_mgmt_rx_fill_ring(str/* Put it in the ring. */ p->rx_ring[p->rx_next_fill] = re.d64; +/* Make sure there is no reorder of filling the ring and ringing +* the bell +*/ +wmb (); +dma_sync_single_for_device (p->dev, p->rx_ring_handle,ring_size_to_bytes (OCTEON_MGMT_RX_RING_SIZE ),DMA_BIDIRECTIONAL );
Greg Kroah-Hartman
maintainerPATCH 203/206 kretprobe: Prevent triggering kretprobe from within kprobe_flush_task
In reply to Greg Kroah-HartmanFrom: Jiri Olsa <[email protected]>
[ Upstream commit 9b38cc704e844e41d9cf74e647bff1d249512cb3 ]
Ziqian reported lockup when adding retprobe on _raw_spin_lock_irqsave. My test was also able to trigger lockdep output:
============================================
WARNING: possible recursive locking detected
5.6.0-rc6+ #6 Not tainted
--------------------------------------------
sched-messaging/2767 is trying to acquire lock:
ffffffff9a492798 (&(kretprobe_table_locks[i].lock)){-.-.}, at: kretprobe_hash_lock+0x52/0xa0
but task is already holding lock:
ffffffff9a491a18 (&(kretprobe_table_locks[i].lock)){-.-.}, at: kretprobe_trampoline+0x0/0x50
other info that might help us debug this:
Possible unsafe locking scenario:
CPU0
---- lock(&(kretprobe_table_locks[i].lock));
lock(&(kretprobe_table_locks[i].lock));
*** DEADLOCK ***
May be due to missing lock nesting notation
1 lock held by sched-messaging/2767:
#0: ffffffff9a491a18 (&(kretprobe_table_locks[i].lock)){-.-.}, at: kretprobe_trampoline+0x0/0x50
stack backtrace: CPU: 3 PID: 2767 Comm: sched-messaging Not tainted 5.6.0-rc6+ #6 Call Trace: dump_stack+0x96/0xe0 __lock_acquire.cold.57+0x173/0x2b7 ? native_queued_spin_lock_slowpath+0x42b/0x9e0 ? lockdep_hardirqs_on+0x590/0x590 ? __lock_acquire+0xf63/0x4030 lock_acquire+0x15a/0x3d0 ? kretprobe_hash_lock+0x52/0xa0 _raw_spin_lock_irqsave+0x36/0x70 ? kretprobe_hash_lock+0x52/0xa0 kretprobe_hash_lock+0x52/0xa0 trampoline_handler+0xf8/0x940 ? kprobe_fault_handler+0x380/0x380 ? find_held_lock+0x3a/0x1c0 kretprobe_trampoline+0x25/0x50 ? lock_acquired+0x392/0xbc0 ? _raw_spin_lock_irqsave+0x50/0x70 ? __get_valid_kprobe+0x1f0/0x1f0 ? _raw_spin_unlock_irqrestore+0x3b/0x40 ? finish_task_switch+0x4b9/0x6d0 ? __switch_to_asm+0x34/0x70 ? __switch_to_asm+0x40/0x70
The code within the kretprobe handler checks for probe reentrancy, so we won't trigger any _raw_spin_lock_irqsave probe in there.
The problem is in outside kprobe_flush_task, where we call:
kprobe_flush_task
kretprobe_table_lock
raw_spin_lock_irqsave
_raw_spin_lock_irqsave
where _raw_spin_lock_irqsave triggers the kretprobe and installs kretprobe_trampoline handler on _raw_spin_lock_irqsave return.
The kretprobe_trampoline handler is then executed with already locked kretprobe_table_locks, and first thing it does is to lock kretprobe_table_locks ;-) the whole lockup path like:
kprobe_flush_task
kretprobe_table_lock
raw_spin_lock_irqsave
_raw_spin_lock_irqsave ---> probe triggered, kretprobe_trampoline installed
---> kretprobe_table_locks locked
kretprobe_trampoline
trampoline_handler
kretprobe_hash_lock(current, &head, &flags); <--- deadlockAdding kprobe_busy_begin/end helpers that mark code with fake probe installed to prevent triggering of another kprobe within this code.
Using these helpers in kprobe_flush_task, so the probe recursion protection check is hit and the probe is never set to prevent above lockup.
--- arch/x86/kernel/kprobes/core.c | 16 +++------------- include/linux/kprobes.h | 4 ++++ kernel/kprobes.c | 24 ++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 13 deletions(-)
arch/x86/kernel/kprobes/core.c +3 -13
@@ -765,16 +765,11 @@ asm(NOKPROBE_SYMBOL (kretprobe_trampoline);STACK_FRAME_NON_STANDARD (kretprobe_trampoline); -static struct kprobe kretprobe_kprobe = { - .addr = (void *)kretprobe_trampoline, -}; -/* * Called from kretprobe_trampoline */ __visible __used void *trampoline_handler(struct pt_regs *regs) { -struct kprobe_ctlblk *kcb;struct kretprobe_instance *ri =NULL ;struct hlist_head *head, empty_rp;struct hlist_node *tmp;
@@ -784,16 +779,12 @@ __visible __used void *trampoline_handler(struct pt_regs *regs)void *frame_pointer;bool skipped = false; -preempt_disable (); -/* * Set a dummy kprobe for avoiding kretprobe recursion. * Since kretprobe never run in kprobe handler, kprobe must not * be running at this point. */ - kcb =get_kprobe_ctlblk (); -__this_cpu_write (current_kprobe, &kretprobe_kprobe); - kcb->kprobe_status =KPROBE_HIT_ACTIVE ; +kprobe_busy_begin ();INIT_HLIST_HEAD (&empty_rp);kretprobe_hash_lock (current, &head, &flags);
@@ -872,7 +863,7 @@ __visible __used void *trampoline_handler(struct pt_regs *regs)__this_cpu_write (current_kprobe, &ri->rp->kp); ri->ret_addr = correct_ret_addr; ri->rp->handler (ri, regs); -__this_cpu_write (current_kprobe, &kretprobe_kprobe); +__this_cpu_write (current_kprobe, &kprobe_busy); }recycle_rp_inst (ri, &empty_rp);
@@ -888,8 +879,7 @@ __visible __used void *trampoline_handler(struct pt_regs *regs)kretprobe_hash_unlock (current, &flags); -__this_cpu_write (current_kprobe,NULL ); -preempt_enable (); +kprobe_busy_end ();hlist_for_each_entry_safe (ri, tmp, &empty_rp, hlist) {hlist_del (&ri->hlist);
include/linux/kprobes.h +4 -0
@@ -363,6 +363,10 @@ static inline struct kprobe_ctlblk *get_kprobe_ctlblk(void)return this_cpu_ptr (&kprobe_ctlblk); } +extern struct kprobe kprobe_busy; +void kprobe_busy_begin (void ); +void kprobe_busy_end (void ); +kprobe_opcode_t *kprobe_lookup_name (const char *name,unsigned int offset);int register_kprobe (struct kprobe *p);void unregister_kprobe (struct kprobe *p);
kernel/kprobes.c +24 -0
@@ -1227,6 +1227,26 @@ __releases(hlist_lock) }NOKPROBE_SYMBOL (kretprobe_table_unlock); +struct kprobe kprobe_busy = { + .addr = (void *) get_kprobe, +}; + +void kprobe_busy_begin (void ) +{ +struct kprobe_ctlblk *kcb; + +preempt_disable (); +__this_cpu_write (current_kprobe, &kprobe_busy); + kcb =get_kprobe_ctlblk (); + kcb->kprobe_status =KPROBE_HIT_ACTIVE ; +} + +void kprobe_busy_end (void ) +{ +__this_cpu_write (current_kprobe,NULL ); +preempt_enable (); +} +/* * This function is called from finish_task_switch when task tk becomes dead, * so that we can recycle any function-return probe instances associated
@@ -1244,6 +1264,8 @@ void kprobe_flush_task(struct task_struct *tk)/* Early boot. kretprobe_table_locks not yet initialized. */ return ; +kprobe_busy_begin (); +INIT_HLIST_HEAD (&empty_rp); hash =hash_ptr (tk,KPROBE_HASH_BITS ); head = &kretprobe_inst_table[hash];
@@ -1257,6 +1279,8 @@ void kprobe_flush_task(struct task_struct *tk)hlist_del (&ri->hlist);kfree (ri); } + +kprobe_busy_end (); }NOKPROBE_SYMBOL (kprobe_flush_task);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 204/206 sched/rt, net: Use CONFIG_PREEMPTION.patch
In reply to Greg Kroah-HartmanFrom: Thomas Gleixner <[email protected]>
[ Upstream commit 2da2b32fd9346009e9acdb68c570ca8d3966aba7 ]
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT.
Update the comment to use CONFIG_PREEMPTION.
--- net/core/dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/core/dev.c +1 -1
@@ -902,7 +902,7 @@ EXPORT_SYMBOL(dev_get_by_napi_id);* * The use of raw_seqcount_begin() and cond_resched() before * retrying is required as we want to give the writers a chance -* to complete when CONFIG_PREEMPT is not set. +* to complete when CONFIG_PREEMPTION is not set. */ int netdev_get_name (struct net *net,char *name,int ifindex) {
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 205/206 net: core: device_rename: Use rwsem instead of a seqcount
In reply to Greg Kroah-HartmanFrom: Ahmed S. Darwish <[email protected]>
[ Upstream commit 11d6011c2cf29f7c8181ebde6c8bc0c4d83adcd7 ]
Sequence counters write paths are critical sections that must never be preempted, and blocking, even for CONFIG_PREEMPTION=n, is not allowed.
Commit 5dbe7c178d3f ("net: fix kernel deadlock with interface rename and netdev name retrieval.") handled a deadlock, observed with CONFIG_PREEMPTION=n, where the devnet_rename seqcount read side was infinitely spinning: it got scheduled after the seqcount write side blocked inside its own critical section.
To fix that deadlock, among other issues, the commit added a cond_resched() inside the read side section. While this will get the non-preemptible kernel eventually unstuck, the seqcount reader is fully exhausting its slice just spinning -- until TIF_NEED_RESCHED is set.
The fix is also still broken: if the seqcount reader belongs to a real-time scheduling policy, it can spin forever and the kernel will livelock.
Disabling preemption over the seqcount write side critical section will not work: inside it are a number of GFP_KERNEL allocations and mutex locking through the drivers/base/ :: device_rename() call chain.
Quoted 1 line
From all the above, replace the seqcount with a rwsem.
--- net/core/dev.c | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-)
net/core/dev.c +18 -22
@@ -83,6 +83,7 @@#include <linux/sched.h> #include <linux/sched/mm.h> #include <linux/mutex.h> +#include <linux/rwsem.h> #include <linux/string.h> #include <linux/mm.h> #include <linux/socket.h>
@@ -195,7 +196,7 @@ static DEFINE_SPINLOCK(napi_hash_lock);static unsigned int napi_gen_id =NR_CPUS ; static DEFINE_READ_MOSTLY_HASHTABLE(napi_hash, 8); -static seqcount_t devnet_rename_seq; +static DECLARE_RWSEM (devnet_rename_sem);static inline void dev_base_seq_inc (struct net *net) {
@@ -899,33 +900,28 @@ EXPORT_SYMBOL(dev_get_by_napi_id);* @net: network namespace * @name: a pointer to the buffer where the name will be stored. * @ifindex: the ifindex of the interface to get the name from. -* -* The use of raw_seqcount_begin() and cond_resched() before -* retrying is required as we want to give the writers a chance -* to complete when CONFIG_PREEMPTION is not set. */ int netdev_get_name (struct net *net,char *name,int ifindex) {struct net_device *dev; -unsigned int seq; +int ret; -retry: - seq =raw_seqcount_begin (&devnet_rename_seq); +down_read (&devnet_rename_sem);rcu_read_lock (); + dev =dev_get_by_index_rcu (net, ifindex);if (!dev) { -rcu_read_unlock (); -return -ENODEV ; + ret = -ENODEV ; + goto out; }strcpy (name, dev->name); -rcu_read_unlock (); -if (read_seqcount_retry (&devnet_rename_seq, seq)) { -cond_resched (); - goto retry; - } -return 0 ; + ret =0 ; +out: +rcu_read_unlock (); +up_read (&devnet_rename_sem); +return ret; }/**
@@ -1198,10 +1194,10 @@ int dev_change_name(struct net_device *dev, const char *newname) likely(!(dev->priv_flags & IFF_LIVE_RENAME_OK)))return -EBUSY ; -write_seqcount_begin (&devnet_rename_seq); +down_write (&devnet_rename_sem);if (strncmp (newname, dev->name,IFNAMSIZ ) ==0 ) { -write_seqcount_end (&devnet_rename_seq); +up_write (&devnet_rename_sem);return 0 ; }
@@ -1209,7 +1205,7 @@ int dev_change_name(struct net_device *dev, const char *newname) err =dev_get_valid_name (net, dev, newname);if (err <0 ) { -write_seqcount_end (&devnet_rename_seq); +up_write (&devnet_rename_sem);return err; }
@@ -1224,11 +1220,11 @@ rollback:if (ret) {memcpy (dev->name, oldname,IFNAMSIZ ); dev->name_assign_type = old_assign_type; -write_seqcount_end (&devnet_rename_seq); +up_write (&devnet_rename_sem);return ret; } -write_seqcount_end (&devnet_rename_seq); +up_write (&devnet_rename_sem);netdev_adjacent_rename_links (dev, oldname);
@@ -1249,7 +1245,7 @@ rollback:/* err >= 0 after dev_alloc_name() or stores the first errno */ if (err >=0 ) { err = ret; -write_seqcount_begin (&devnet_rename_seq); +down_write (&devnet_rename_sem);memcpy (dev->name, oldname,IFNAMSIZ );memcpy (oldname, newname,IFNAMSIZ ); dev->name_assign_type = old_assign_type;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 206/206 Revert "dpaa_eth: fix usage as DSA master, try 3"
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
This reverts commit b145710b69388aa4034d32b4a937f18f66b5538e which is commit 5d14c304bfc14b4fd052dc83d5224376b48f52f0 upstream.
The patch is not wrong, but the Fixes: tag is. It should have been:
Fixes: 060ad66f9795 ("dpaa_eth: change DMA device")which means that it's fixing a commit which was introduced in:
git describe --tags 060ad66f97954
v5.4-rc3-783-g060ad66f9795
which then means it should have not been backported to linux-4.19.y, where things _were_ working and now they're not.
--- drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c +1 -1
@@ -2796,7 +2796,7 @@ static int dpaa_eth_probe(struct platfor }/* Do this here, so we can be verbose early */ -SET_NETDEV_DEV (net_dev, dev->parent); +SET_NETDEV_DEV (net_dev, dev);dev_set_drvdata (dev, net_dev); priv =netdev_priv (net_dev);
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.130 release. There are 206 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, 25 Jun 2020 19:52:30 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.130-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.19.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah