drm/bridge: tc358767: Increase AUX transfer length limit
Subsystems (7)
Sasha Levin
maintainerPATCH 1/19 drm/bridge: tc358767: Increase AUX transfer length limit
From: Andrey Smirnov <[email protected]>
[ Upstream commit e0655feaec62d5139b6b13a7b1bbb1ab8f1c2d83 ]
According to the datasheet tc358767 can transfer up to 16 bytes via its AUX channel, so the artificial limit of 8 appears to be too low. However only up to 15-bytes seem to be actually supported and trying to use 16-byte transfers results in transfers failing sporadically (with bogus status in case of I2C transfers), so limit it to 15.
--- drivers/gpu/drm/bridge/tc358767.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/bridge/tc358767.c +1 -1
@@ -300,7 +300,7 @@ static ssize_t tc_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg) {struct tc_data *tc =aux_to_tc (aux); -size_t size =min_t (size_t,8 , msg->size); +size_t size =min_t (size_t,DP_AUX_MAX_PAYLOAD_BYTES -1 , msg->size);u8 request = msg->request & ~DP_AUX_I2C_MOT ;u8 *buf = msg->buffer;u32 tmp =0 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 2/19 video: ssd1307fb: Start page range at page_offset
From: Marko Kohtala <[email protected]>
[ Upstream commit dd9782834dd9dde3624ff1acea8859f3d3e792d4 ]
The page_offset was only applied to the end of the page range. This caused the display updates to cause a scrolling effect on the display because the amount of data written to the display did not match the range display expected.
--- drivers/video/fbdev/ssd1307fb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/ssd1307fb.c +1 -1
@@ -430,7 +430,7 @@ static int ssd1307fb_init(struct ssd1307fb_par *par)if (ret <0 )return ret; - ret =ssd1307fb_write_cmd (par->client,0x0 ); + ret =ssd1307fb_write_cmd (par->client, par->page_offset);if (ret <0 )return ret;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 3/19 drm/radeon: Fix EEH during kexec
In reply to Sasha LevinFrom: KyleMahlkuch <[email protected]>
[ Upstream commit 6f7fe9a93e6c09bf988c5059403f5f88e17e21e6 ]
During kexec some adapters hit an EEH since they are not properly shut down in the radeon_pci_shutdown() function. Adding radeon_suspend_kms() fixes this issue.
--- drivers/gpu/drm/radeon/radeon_drv.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/gpu/drm/radeon/radeon_drv.c +8 -0
@@ -366,11 +366,19 @@ radeon_pci_remove(struct pci_dev *pdev)static void radeon_pci_shutdown (struct pci_dev *pdev) { +struct drm_device *ddev =pci_get_drvdata (pdev); +/* if we are running in a VM, make sure the device * torn down properly on reboot/shutdown */ if (radeon_device_is_virtual ())radeon_pci_remove (pdev); + +/* Some adapters need to be suspended before a +* shutdown occurs in order to prevent an error +* during kexec. +*/ +radeon_suspend_kms (ddev, true, true, false); }static int radeon_pmops_suspend (struct device *dev)
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Sasha Levin
maintainerPATCH 4/19 gpu: drm: radeon: Fix a possible null-pointer dereference in radeon_connector_set_property()
In reply to Sasha LevinFrom: Jia-Ju Bai <[email protected]>
[ Upstream commit f3eb9b8f67bc28783eddc142ad805ebdc53d6339 ]
In radeon_connector_set_property(), there is an if statement on line 743 to check whether connector->encoder is NULL:
if (connector->encoder)
When connector->encoder is NULL, it is used on line 755:
if (connector->encoder->crtc)
Thus, a possible null-pointer dereference may occur.
To fix this bug, connector->encoder is checked before being used.
This bug is found by a static analysis tool STCheck written by us.
--- drivers/gpu/drm/radeon/radeon_connectors.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/radeon/radeon_connectors.c +1 -1
@@ -764,7 +764,7 @@ static int radeon_connector_set_property(struct drm_connector *connector, struct radeon_encoder->output_csc = val; -if (connector->encoder->crtc) { +if (connector->encoder && connector->encoder->crtc) {struct drm_crtc *crtc = connector->encoder->crtc;const struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;struct radeon_crtc *radeon_crtc =to_radeon_crtc (crtc);
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Sasha Levin
maintainerPATCH 5/19 ipmi_si: Only schedule continuously in the thread in maintenance mode
In reply to Sasha LevinFrom: Corey Minyard <[email protected]>
[ Upstream commit 340ff31ab00bca5c15915e70ad9ada3030c98cf8 ]
ipmi_thread() uses back-to-back schedule() to poll for command completion which, on some machines, can push up CPU consumption and heavily tax the scheduler locks leading to noticeable overall performance degradation.
This was originally added so firmware updates through IPMI would complete in a timely manner. But we can't kill the scheduler locks for that one use case.
Instead, only run schedule() continuously in maintenance mode, where firmware updates should run.
--- drivers/char/ipmi/ipmi_si_intf.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-)
drivers/char/ipmi/ipmi_si_intf.c +19 -5
@@ -283,6 +283,9 @@ struct smi_info {*/ bool irq_enable_broken; +/* Is the driver in maintenance mode? */ +bool in_maintenance_mode; +/* * Did we get an attention that we did not handle? */
@@ -1093,11 +1096,20 @@ static int ipmi_thread(void *data)spin_unlock_irqrestore (&(smi_info->si_lock), flags); busy_wait =ipmi_thread_busy_wait (smi_result, smi_info, &busy_until); -if (smi_result ==SI_SM_CALL_WITHOUT_DELAY ) +if (smi_result ==SI_SM_CALL_WITHOUT_DELAY ) { ;/* do nothing */ -else if (smi_result ==SI_SM_CALL_WITH_DELAY && busy_wait) -schedule (); -else if (smi_result ==SI_SM_IDLE ) { + }else if (smi_result ==SI_SM_CALL_WITH_DELAY && busy_wait) { +/* +* In maintenance mode we run as fast as +* possible to allow firmware updates to +* complete as fast as possible, but normally +* don't bang on the scheduler. +*/ +if (smi_info->in_maintenance_mode) +schedule (); +else +usleep_range (100 ,200 ); + }else if (smi_result ==SI_SM_IDLE ) {if (atomic_read (&smi_info->need_watch)) {schedule_timeout_interruptible (100 ); }else {
@@ -1105,8 +1117,9 @@ static int ipmi_thread(void *data)__set_current_state (TASK_INTERRUPTIBLE );schedule (); } - }else + }else {schedule_timeout_interruptible (1 ); + } }return 0 ; }
@@ -1285,6 +1298,7 @@ static void set_maintenance_mode(void *send_info, bool enable)if (!enable)atomic_set (&smi_info->req_events,0 ); + smi_info->in_maintenance_mode = enable; }static const struct ipmi_smi_handlers handlers = {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 6/19 clk: qoriq: Fix -Wunused-const-variable
In reply to Sasha LevinFrom: Nathan Huckleberry <[email protected]>
[ Upstream commit a95fb581b144b5e73da382eaedb2e32027610597 ]
drivers/clk/clk-qoriq.c:138:38: warning: unused variable 'p5020_cmux_grp1' [-Wunused-const-variable] static const struct clockgen_muxinfo p5020_cmux_grp1
drivers/clk/clk-qoriq.c:146:38: warning: unused variable 'p5020_cmux_grp2' [-Wunused-const-variable] static const struct clockgen_muxinfo p5020_cmux_grp2
In the definition of the p5020 chip, the p2041 chip's info was used instead. The p5020 and p2041 chips have different info. This is most likely a typo.
--- drivers/clk/clk-qoriq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/clk-qoriq.c +1 -1
@@ -540,7 +540,7 @@ static const struct clockgen_chipinfo chipinfo[] = { .guts_compat = "fsl,qoriq-device-config-1.0", .init_periph = p5020_init_periph, .cmux_groups = { - &p2041_cmux_grp1, &p2041_cmux_grp2 + &p5020_cmux_grp1, &p5020_cmux_grp2 }, .cmux_to_group = {0 ,1 ,-1
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 7/19 drm/amd/powerplay/smu7: enforce minimal VBITimeout (v2)
In reply to Sasha LevinFrom: Ahzo <[email protected]>
[ Upstream commit f659bb6dae58c113805f92822e4c16ddd3156b79 ]
This fixes screen corruption/flickering on 75 Hz displays.
v2: make print statement debug only (Alex)
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102646
--- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +5 -0
@@ -3739,6 +3739,11 @@ int smu7_program_display_gap(struct pp_hwmgr *hwmgr) data->frame_time_x2 = frame_time_in_us *2 /100 ; +if (data->frame_time_x2 <280 ) { +pr_debug ("%s: enforce minimal VBITimeout: %d -> 280\n" , __func__, data->frame_time_x2); + data->frame_time_x2 =280 ; + } + display_gap2 = pre_vbi_time_in_us * (ref_clock /100 );cgs_write_ind_register (hwmgr->device,CGS_IND_REG__SMC , ixCG_DISPLAY_GAP_CNTL2, display_gap2);
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Sasha Levin
maintainerPATCH 8/19 clk: sirf: Don't reference clk_init_data after registration
In reply to Sasha LevinFrom: Stephen Boyd <[email protected]>
[ Upstream commit af55dadfbce35b4f4c6247244ce3e44b2e242b84 ]
A future patch is going to change semantics of clk_register() so that clk_hw::init is guaranteed to be NULL after a clk is registered. Avoid referencing this member here so that we don't run into NULL pointer exceptions.
--- drivers/clk/sirf/clk-common.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/clk/sirf/clk-common.c +8 -4
@@ -298,9 +298,10 @@ static u8 dmn_clk_get_parent(struct clk_hw *hw) {struct clk_dmn *clk =to_dmnclk (hw);u32 cfg =clkc_readl (clk->regofs); +const char *name =clk_hw_get_name (hw);/* parent of io domain can only be pll3 */ -if (strcmp (hw->init->name,"io" ) ==0 ) +if (strcmp (name,"io" ) ==0 )return 4 ;WARN_ON ((cfg & (BIT (3 ) -1 )) >4 );
@@ -312,9 +313,10 @@ static int dmn_clk_set_parent(struct clk_hw *hw, u8 parent) {struct clk_dmn *clk =to_dmnclk (hw);u32 cfg =clkc_readl (clk->regofs); +const char *name =clk_hw_get_name (hw);/* parent of io domain can only be pll3 */ -if (strcmp (hw->init->name,"io" ) ==0 ) +if (strcmp (name,"io" ) ==0 )return -EINVAL ; cfg &= ~(BIT (3 ) -1 );
@@ -354,7 +356,8 @@ static long dmn_clk_round_rate(struct clk_hw *hw, unsigned long rate, {unsigned long fin;unsigned ratio, wait, hold; -unsigned bits = (strcmp (hw->init->name,"mem" ) ==0 ) ?3 :4 ; +const char *name =clk_hw_get_name (hw); +unsigned bits = (strcmp (name,"mem" ) ==0 ) ?3 :4 ; fin = *parent_rate; ratio = fin / rate;
@@ -376,7 +379,8 @@ static int dmn_clk_set_rate(struct clk_hw *hw, unsigned long rate,struct clk_dmn *clk =to_dmnclk (hw);unsigned long fin;unsigned ratio, wait, hold, reg; -unsigned bits = (strcmp (hw->init->name,"mem" ) ==0 ) ?3 :4 ; +const char *name =clk_hw_get_name (hw); +unsigned bits = (strcmp (name,"mem" ) ==0 ) ?3 :4 ; fin = parent_rate; ratio = fin / rate;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 9/19 powerpc/rtas: use device model APIs and serialization during LPM
In reply to Sasha LevinFrom: Nathan Lynch <[email protected]>
[ Upstream commit a6717c01ddc259f6f73364779df058e2c67309f8 ]
The LPAR migration implementation and userspace-initiated cpu hotplug can interleave their executions like so:
1. Set cpu 7 offline via sysfs.
2. Begin a partition migration, whose implementation requires the OS to ensure all present cpus are online; cpu 7 is onlined:
rtas_ibm_suspend_me -> rtas_online_cpus_mask -> cpu_up
This sets cpu 7 online in all respects except for the cpu's corresponding struct device; dev->offline remains true.
3. Set cpu 7 online via sysfs. _cpu_up() determines that cpu 7 is already online and returns success. The driver core (device_online) sets dev->offline = false.
4. The migration completes and restores cpu 7 to offline state:
rtas_ibm_suspend_me -> rtas_offline_cpus_mask -> cpu_down
This leaves cpu7 in a state where the driver core considers the cpu device online, but in all other respects it is offline and unused. Attempts to online the cpu via sysfs appear to succeed but the driver core actually does not pass the request to the lower-level cpuhp support code. This makes the cpu unusable until the cpu device is manually set offline and then online again via sysfs.
Instead of directly calling cpu_up/cpu_down, the migration code should use the higher-level device core APIs to maintain consistent state and serialize operations.
--- arch/powerpc/kernel/rtas.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
arch/powerpc/kernel/rtas.c +8 -3
@@ -874,15 +874,17 @@ static int rtas_cpu_state_change_mask(enum rtas_cpu_state state,return 0 ;for_each_cpu (cpu, cpus) { +struct device *dev =get_cpu_device (cpu); +switch (state) {case DOWN : - cpuret =cpu_down (cpu); + cpuret =device_offline (dev);break ;case UP : - cpuret =cpu_up (cpu); + cpuret =device_online (dev);break ; } -if (cpuret) { +if (cpuret <0 ) { pr_debug("%s: cpu_%s for cpu#%d returned %d.\n", __func__, ((state == UP) ? "up" : "down"),
@@ -971,6 +973,8 @@ int rtas_ibm_suspend_me(u64 handle) data.token =rtas_token ("ibm,suspend-me" ); data.complete = &done; +lock_device_hotplug (); +/* All present CPUs must be online */ cpumask_andnot (offline_mask, cpu_present_mask, cpu_online_mask); cpuret =rtas_online_cpus_mask (offline_mask);
@@ -1002,6 +1006,7 @@ int rtas_ibm_suspend_me(u64 handle) __func__); out: +unlock_device_hotplug ();free_cpumask_var (offline_mask);return atomic_read (&data.error); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 10/19 powerpc/futex: Fix warning: 'oldval' may be used uninitialized in this function
In reply to Sasha LevinFrom: Christophe Leroy <[email protected]>
[ Upstream commit 38a0d0cdb46d3f91534e5b9839ec2d67be14c59d ]
We see warnings such as:
kernel/futex.c: In function 'do_futex':
kernel/futex.c:1676:17: warning: 'oldval' may be used uninitialized in this function [-Wmaybe-uninitialized]
return oldval == cmparg;
^
kernel/futex.c:1651:6: note: 'oldval' was declared here
int oldval, ret;
^This is because arch_futex_atomic_op_inuser() only sets *oval if ret is 0 and GCC doesn't see that it will only use it when ret is 0.
Anyway, the non-zero ret path is an error path that won't suffer from setting *oval, and as *oval is a local var in futex_atomic_op_inuser() it will have no impact.
--- arch/powerpc/include/asm/futex.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/powerpc/include/asm/futex.h +1 -2
@@ -60,8 +60,7 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,pagefault_enable (); -if (!ret) - *oval = oldval; + *oval = oldval;return ret; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 11/19 powerpc/pseries/mobility: use cond_resched when updating device tree
In reply to Sasha LevinFrom: Nathan Lynch <[email protected]>
[ Upstream commit ccfb5bd71d3d1228090a8633800ae7cdf42a94ac ]
After a partition migration, pseries_devicetree_update() processes changes to the device tree communicated from the platform to Linux. This is a relatively heavyweight operation, with multiple device tree searches, memory allocations, and conversations with partition firmware.
There's a few levels of nested loops which are bounded only by decisions made by the platform, outside of Linux's control, and indeed we have seen RCU stalls on large systems while executing this call graph. Use cond_resched() in these loops so that the cpu is yielded when needed.
--- arch/powerpc/platforms/pseries/mobility.c | 9 +++++++++ 1 file changed, 9 insertions(+)
arch/powerpc/platforms/pseries/mobility.c +9 -0
@@ -11,6 +11,7 @@#include <linux/kernel.h> #include <linux/kobject.h> +#include <linux/sched.h> #include <linux/smp.h> #include <linux/stat.h> #include <linux/completion.h>
@@ -206,7 +207,11 @@ static int update_dt_node(__be32 phandle, s32 scope) prop_data += vd; } + +cond_resched (); } + +cond_resched (); }while (rtas_rc ==1 );of_node_put (dn);
@@ -282,8 +287,12 @@ int pseries_devicetree_update(s32 scope)add_dt_node (phandle, drc_index);break ; } + +cond_resched (); } } + +cond_resched (); }while (rc ==1 );kfree (rtas_buf);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 12/19 pinctrl: tegra: Fix write barrier placement in pmx_writel
In reply to Sasha LevinFrom: Sowjanya Komatineni <[email protected]>
[ Upstream commit c2cf351eba2ff6002ce8eb178452219d2521e38e ]
pmx_writel uses writel which inserts write barrier before the register write.
This patch has fix to replace writel with writel_relaxed followed by a readback and memory barrier to ensure write operation is completed for successful pinctrl change.
--- drivers/pinctrl/tegra/pinctrl-tegra.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/pinctrl/tegra/pinctrl-tegra.c +3 -1
@@ -52,7 +52,9 @@ static inline u32 pmx_readl(struct tegra_pmx *pmx, u32 bank, u32 reg)static inline void pmx_writel (struct tegra_pmx *pmx,u32 val,u32 bank,u32 reg) { -writel (val, pmx->regs[bank] + reg); +writel_relaxed (val, pmx->regs[bank] + reg); +/* make sure pinmux register write completed */ +pmx_readl (pmx, bank, reg); }static int tegra_pinctrl_get_groups_count (struct pinctrl_dev *pctldev)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 13/19 vfio_pci: Restore original state on release
In reply to Sasha LevinFrom: hexin <[email protected]>
[ Upstream commit 92c8026854c25093946e0d7fe536fd9eac440f06 ]
vfio_pci_enable() saves the device's initial configuration information with the intent that it is restored in vfio_pci_disable(). However, the commit referenced in Fixes: below replaced the call to __pci_reset_function_locked(), which is not wrapped in a state save and restore, with pci_try_reset_function(), which overwrites the restored device state with the current state before applying it to the device. Reinstate use of __pci_reset_function_locked() to return to the desired behavior.
--- drivers/vfio/pci/vfio_pci.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
drivers/vfio/pci/vfio_pci.c +13 -4
@@ -356,11 +356,20 @@ static void vfio_pci_disable(struct vfio_pci_device *vdev)pci_write_config_word (pdev,PCI_COMMAND ,PCI_COMMAND_INTX_DISABLE );/* -* Try to reset the device. The success of this is dependent on -* being able to lock the device, which is not always possible. +* Try to get the locks ourselves to prevent a deadlock. The +* success of this is dependent on being able to lock the device, +* which is not always possible. +* We can not use the "try" reset interface here, which will +* overwrite the previously restored configuration information. */ -if (vdev->reset_works && !pci_try_reset_function (pdev)) - vdev->needs_reset = false; +if (vdev->reset_works &&pci_cfg_access_trylock (pdev)) { +if (device_trylock (&pdev->dev)) { +if (!__pci_reset_function_locked (pdev)) + vdev->needs_reset = false; +device_unlock (&pdev->dev); + } +pci_cfg_access_unlock (pdev); + }pci_restore_state (pdev); out:
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 14/19 drm/amdgpu/si: fix ASIC tests
In reply to Sasha LevinFrom: Jean Delvare <[email protected]>
[ Upstream commit 77efe48a729588527afb4d5811b9e0acb29f5e51 ]
Comparing adev->family with CHIP constants is not correct. adev->family can only be compared with AMDGPU_FAMILY constants and adev->asic_type is the struct member to compare with CHIP constants. They are separate identification spaces.
--- drivers/gpu/drm/amd/amdgpu/si.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/si.c +3 -3
@@ -1606,7 +1606,7 @@ static void si_program_aspm(struct amdgpu_device *adev)if (orig != data)si_pif_phy1_wreg (adev,PB1_PIF_PWRDOWN_1 , data); -if ((adev->family !=CHIP_OLAND ) && (adev->family !=CHIP_HAINAN )) { +if ((adev->asic_type !=CHIP_OLAND ) && (adev->asic_type !=CHIP_HAINAN )) { orig = data =si_pif_phy0_rreg (adev,PB0_PIF_PWRDOWN_0 ); data &= ~PLL_RAMP_UP_TIME_0_MASK ;if (orig != data)
@@ -1655,14 +1655,14 @@ static void si_program_aspm(struct amdgpu_device *adev) orig = data =si_pif_phy0_rreg (adev,PB0_PIF_CNTL ); data &= ~LS2_EXIT_TIME_MASK ; -if ((adev->family ==CHIP_OLAND ) || (adev->family ==CHIP_HAINAN )) +if ((adev->asic_type ==CHIP_OLAND ) || (adev->asic_type ==CHIP_HAINAN )) data |=LS2_EXIT_TIME (5 );if (orig != data)si_pif_phy0_wreg (adev,PB0_PIF_CNTL , data); orig = data =si_pif_phy1_rreg (adev,PB1_PIF_CNTL ); data &= ~LS2_EXIT_TIME_MASK ; -if ((adev->family ==CHIP_OLAND ) || (adev->family ==CHIP_HAINAN )) +if ((adev->asic_type ==CHIP_OLAND ) || (adev->asic_type ==CHIP_HAINAN )) data |=LS2_EXIT_TIME (5 );if (orig != data)si_pif_phy1_wreg (adev,PB1_PIF_CNTL , data);
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Sasha Levin
maintainerPATCH 15/19 powerpc/64s/exception: machine check use correct cfar for late handler
In reply to Sasha LevinFrom: Nicholas Piggin <[email protected]>
[ Upstream commit 0b66370c61fcf5fcc1d6901013e110284da6e2bb ]
Bare metal machine checks run an "early" handler in real mode before running the main handler which reports the event.
The main handler runs exactly as a normal interrupt handler, after the "windup" which sets registers back as they were at interrupt entry. CFAR does not get restored by the windup code, so that will be wrong when the handler is run.
Restore the CFAR to the saved value before running the late handler.
--- arch/powerpc/kernel/exceptions-64s.S | 4 ++++ 1 file changed, 4 insertions(+)
arch/powerpc/kernel/exceptions-64s.S +4 -0
@@ -467,6 +467,10 @@ EXC_COMMON_BEGIN(machine_check_handle_early) RFI_TO_USER_OR_KERNEL 9: /* Deliver the machine check to host kernel in V mode. */ +BEGIN_FTR_SECTION + ld r10,ORIG_GPR3(r1) + mtspr SPRN_CFAR,r10 +END_FTR_SECTION_IFSET(CPU_FTR_CFAR) MACHINE_CHECK_HANDLER_WINDUP b machine_check_pSeries
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 16/19 powerpc/pseries: correctly track irq state in default idle
In reply to Sasha LevinFrom: Nathan Lynch <[email protected]>
[ Upstream commit 92c94dfb69e350471473fd3075c74bc68150879e ]
prep_irq_for_idle() is intended to be called before entering H_CEDE (and it is used by the pseries cpuidle driver). However the default pseries idle routine does not call it, leading to mismanaged lazy irq state when the cpuidle driver isn't in use. Manifestations of this include:
* Dropped IPIs in the time immediately after a cpu comes online (before it has installed the cpuidle handler), making the online operation block indefinitely waiting for the new cpu to respond.
* Hitting this WARN_ON in arch_local_irq_restore():
/* * We should already be hard disabled here. We had bugs * where that wasn't the case so let's dbl check it and * warn if we are wrong. Only do that when IRQ tracing * is enabled as mfmsr() can be costly. */ if (WARN_ON_ONCE(mfmsr() & MSR_EE)) __hard_irq_disable();
Call prep_irq_for_idle() from pseries_lpar_idle() and honor its result.
--- arch/powerpc/platforms/pseries/setup.c | 3 +++ 1 file changed, 3 insertions(+)
arch/powerpc/platforms/pseries/setup.c +3 -0
@@ -298,6 +298,9 @@ static void pseries_lpar_idle(void)* low power mode by ceding processor to hypervisor */ +if (!prep_irq_for_idle ()) +return ; +/* Indicate to hypervisor that we are idle. */ get_lppaca ()->idle =1 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 17/19 arm64: fix unreachable code issue with cmpxchg
In reply to Sasha LevinFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 920fdab7b3ce98c14c840261e364f490f3679a62 ]
On arm64 build with clang, sometimes the __cmpxchg_mb is not inlined when CONFIG_OPTIMIZE_INLINING is set.
Clang then fails a compile-time assertion, because it cannot tell at compile time what the size of the argument is:
mm/memcontrol.o: In function `__cmpxchg_mb':
memcontrol.c:(.text+0x1a4c): undefined reference to __compiletime_assert_175' memcontrol.c:(.text+0x1a4c): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol __compiletime_assert_175'
Mark all of the cmpxchg() style functions as __always_inline to ensure that the compiler can see the result.
--- arch/arm64/include/asm/cmpxchg.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/include/asm/cmpxchg.h +3 -3
@@ -73,7 +73,7 @@ __XCHG_CASE( , , mb_8, dmb ish, nop, , a, l, "memory")#undef __XCHG_CASE#define __XCHG_GEN (sfx) \ -static inline unsigned long __xchg##sfx(unsigned long x, \ +static __always_inline unsigned long __xchg##sfx(unsigned long x, \ volatile void *ptr, \ int size) \ { \
@@ -115,7 +115,7 @@ __XCHG_GEN(_mb)#define xchg (...) __xchg_wrapper( _mb, __VA_ARGS__)#define __CMPXCHG_GEN (sfx) \ -static inline unsigned long __cmpxchg##sfx(volatile void *ptr, \ +static __always_inline unsigned long __cmpxchg##sfx(volatile void *ptr, \ unsigned long old, \ unsigned long new, \ int size) \
@@ -248,7 +248,7 @@ __CMPWAIT_CASE( , , 8);#undef __CMPWAIT_CASE#define __CMPWAIT_GEN (sfx) \ -static inline void __cmpwait##sfx(volatile void *ptr, \ +static __always_inline void __cmpwait##sfx(volatile void *ptr, \ unsigned long val, \ int size) \ { \
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 18/19 clk: at91: select parent if main oscillator or bypass is enabled
In reply to Sasha LevinFrom: Eugen Hristev <[email protected]>
[ Upstream commit 69a6bcde7fd3fe6f3268ce26f31d9d9378384c98 ]
Selecting the right parent for the main clock is done using only main oscillator enabled bit.
In case we have this oscillator bypassed by an external signal (no driving on the XOUT line), we still use external clock, but with BYPASS bit set. So, in this case we must select the same parent as before. Create a macro that will select the right parent considering both bits from the MOR register.
Use this macro when looking for the right parent.
--- drivers/clk/at91/clk-main.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/clk/at91/clk-main.c +7 -3
@@ -27,6 +27,10 @@#define MOR_KEY_MASK (0xff << 16) +#define clk_main_parent_select (s) (((s) & \ + (AT91_PMC_MOSCEN | \ + AT91_PMC_OSCBYPASS)) ? 1 : 0) +struct clk_main_osc {struct clk_hw hw;struct regmap *regmap;
@@ -119,7 +123,7 @@ static int clk_main_osc_is_prepared(struct clk_hw *hw)regmap_read (regmap,AT91_PMC_SR , &status); -return (status &AT91_PMC_MOSCS ) && (tmp &AT91_PMC_MOSCEN ); +return (status &AT91_PMC_MOSCS ) &&clk_main_parent_select (tmp); }static const struct clk_ops main_osc_ops = {
@@ -530,7 +534,7 @@ static u8 clk_sam9x5_main_get_parent(struct clk_hw *hw)regmap_read (clkmain->regmap,AT91_CKGR_MOR , &status); -return status &AT91_PMC_MOSCEN ?1 :0 ; +return clk_main_parent_select (status); }static const struct clk_ops sam9x5_main_ops = {
@@ -572,7 +576,7 @@ at91_clk_register_sam9x5_main(struct regmap *regmap, clkmain->hw.init = &init; clkmain->regmap = regmap;regmap_read (clkmain->regmap,AT91_CKGR_MOR , &status); - clkmain->parent = status &AT91_PMC_MOSCEN ?1 :0 ; + clkmain->parent =clk_main_parent_select (status); hw = &clkmain->hw; ret =clk_hw_register (NULL , &clkmain->hw);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 19/19 scsi: core: Reduce memory required for SCSI logging
In reply to Sasha LevinFrom: Bart Van Assche <[email protected]>
[ Upstream commit dccc96abfb21dc19d69e707c38c8ba439bba7160 ]
The data structure used for log messages is so large that it can cause a boot failure. Since allocations from that data structure can fail anyway, use kmalloc() / kfree() instead of that data structure.
See also https://bugzilla.kernel.org/show_bug.cgi?id=204119.
See also commit ded85c193a39 ("scsi: Implement per-cpu logging buffer") # v4.0.
--- drivers/scsi/scsi_logging.c | 48 +++---------------------------------- include/scsi/scsi_dbg.h | 2 -- 2 files changed, 3 insertions(+), 47 deletions(-)
drivers/scsi/scsi_logging.c +3 -45
@@ -16,57 +16,15 @@#include <scsi/scsi_eh.h> #include <scsi/scsi_dbg.h> -#define SCSI_LOG_SPOOLSIZE 4096 - -#if (SCSI_LOG_SPOOLSIZE /SCSI_LOG_BUFSIZE ) >BITS_PER_LONG -#warning SCSI logging bitmask too large -#endif - -struct scsi_log_buf { -char buffer[SCSI_LOG_SPOOLSIZE ]; -unsigned long map; -}; - -static DEFINE_PER_CPU(struct scsi_log_buf, scsi_format_log); -static char *scsi_log_reserve_buffer (size_t *len) { -struct scsi_log_buf *buf; -unsigned long map_bits =sizeof (buf->buffer) /SCSI_LOG_BUFSIZE ; -unsigned long idx =0 ; - -preempt_disable (); - buf =this_cpu_ptr (&scsi_format_log); - idx =find_first_zero_bit (&buf->map, map_bits); -if (likely (idx < map_bits)) { -while (test_and_set_bit (idx, &buf->map)) { - idx =find_next_zero_bit (&buf->map, map_bits, idx); -if (idx >= map_bits) -break ; - } - } -if (WARN_ON (idx >= map_bits)) { -preempt_enable (); -return NULL ; - } - *len =SCSI_LOG_BUFSIZE ; -return buf->buffer + idx *SCSI_LOG_BUFSIZE ; + *len =128 ; +return kmalloc (*len,GFP_ATOMIC ); }static void scsi_log_release_buffer (char *bufptr) { -struct scsi_log_buf *buf; -unsigned long idx; -int ret; - - buf =this_cpu_ptr (&scsi_format_log); -if (bufptr >= buf->buffer && - bufptr < buf->buffer +SCSI_LOG_SPOOLSIZE ) { - idx = (bufptr - buf->buffer) /SCSI_LOG_BUFSIZE ; - ret =test_and_clear_bit (idx, &buf->map); -WARN_ON (!ret); - } -preempt_enable (); +kfree (bufptr); }static inline const char *scmd_name (const struct scsi_cmnd *scmd)
include/scsi/scsi_dbg.h +0 -2
@@ -5,8 +5,6 @@ struct scsi_cmnd;struct scsi_device ;struct scsi_sense_hdr ; -#define SCSI_LOG_BUFSIZE 128 -extern void scsi_print_command (struct scsi_cmnd *);extern size_t __scsi_format_command (char *,size_t ,const unsigned char *,size_t );
Signature · 1 line
2.20.1