Skip to content

Merge/sound upstream 20200820 - #2376

Merged
plbossart merged 10000 commits into
thesofproject:topic/sof-devfrom
plbossart:merge/sound-upstream-20200820
Aug 24, 2020
Merged

plbossart merged 10000 commits into
thesofproject:topic/sof-devfrom
plbossart:merge/sound-upstream-20200820

Conversation

@plbossart

@plbossart plbossart commented Aug 20, 2020 •

Copy link
Copy Markdown
Member

First merge based on v5.9-rc1 (Takashi's branch is still a bit behind).

I had a couple of merge issues on SoundWire (intel.c/intel.h) and a change I did upstream on @RanderWang work that was not yet shared (sound/soc/sof/intel/hda-codec.c).

There's one regression in W=1 for a DA7219 codec so Travis CI should report a compilation issue (good test). Edit: it does fail as planned!

Let's see how this goes.

Linus Torvalds and others added 30 commits August 14, 2020 15:58
…ernel/git/tiwai/sound

Pull sound fixes from Takashi Iwai:
 "All device-specific small fixes and quirks mostly for usual suspects,
  USB-audio and HD-audio"

* tag 'sound-fix-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: echoaudio: Fix potential Oops in snd_echo_resume()
  ALSA: hda/hdmi: Use force connectivity quirk on another HP desktop
  ALSA: hda/realtek - Fix unused variable warning
  ALSA: hda - reverse the setting value in the micmute_led_set
  ALSA: echoaduio: Drop superfluous volatile modifier
  ALSA: usb-audio: Disable Lenovo P620 Rear line-in volume control
  ALSA: usb-audio: add quirk for Pioneer DDJ-RB
  ALSA: usb-audio: work around streaming quirk for MacroSilicon MS2109
  ALSA: hda - fix the micmute led status for Lenovo ThinkCentre AIO
  ALSA: usb-audio: fix overeager device match for MacroSilicon MS2109
  ALSA: hda/realtek: Fix pin default on Intel NUC 8 Rugged
  ALSA: usb-audio: Creative USB X-Fi Pro SB1095 volume knob support
  ALSA: usb-audio: fix spelling mistake "buss" -> "bus"
…nel/git/thierry.reding/linux-pwm

Pull pwm updates from Thierry Reding:
 "The majority of this batch is conversion of the PWM period and duty
  cycle to 64-bit unsigned integers, which is required so that some
  types of hardware can generate the full range of signals that they're
  capable of.

  The remainder is mostly minor fixes and cleanups"

* tag 'pwm/for-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm:
  pwm: bcm-iproc: handle clk_get_rate() return
  pwm: Replace HTTP links with HTTPS ones
  pwm: omap-dmtimer: Repair pwm_omap_dmtimer_chip's broken kerneldoc header
  pwm: mediatek: Provide missing kerneldoc description for 'soc' arg
  pwm: bcm-kona: Remove impossible comparison when validating duty cycle
  pwm: bcm-iproc: Remove impossible comparison when validating duty cycle
  pwm: iqs620a: Use lowercase hexadecimal literals for consistency
  pwm: Convert period and duty cycle to u64
  clk: pwm: Use 64-bit division function
  backlight: pwm_bl: Use 64-bit division function
  pwm: sun4i: Use nsecs_to_jiffies to avoid a division
  pwm: sifive: Use 64-bit division macro
  pwm: iqs620a: Use 64-bit division
  pwm: imx27: Use 64-bit division macro
  pwm: imx-tpm: Use 64-bit division macro
  pwm: clps711x: Use 64-bit division macro
  hwmon: pwm-fan: Use 64-bit division macro
  drm/i915: Use 64-bit division macro
…t/jejb/scsi

Pull more SCSI updates from James Bottomley:
 "This is the set of patches which arrived too late to stabilise in
  -next for the first pull.

  It's really just an lpfc driver update and an assortment of minor
  fixes, all in drivers. The only core update is to the zone block
  device driver, which isn't the one most people use"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: lpfc: Update lpfc version to 12.8.0.3
  scsi: lpfc: Fix LUN loss after cable pull
  scsi: lpfc: Fix validation of bsg reply lengths
  scsi: lpfc: Fix retry of PRLI when status indicates its unsupported
  scsi: lpfc: Fix oops when unloading driver while running mds diags
  scsi: lpfc: Fix RSCN timeout due to incorrect gidft counter
  scsi: lpfc: Fix no message shown for lpfc_hdw_queue out of range value
  scsi: lpfc: Fix FCoE speed reporting
  scsi: lpfc: Add missing misc_deregister() for lpfc_init()
  scsi: lpfc: nvmet: Avoid hang / use-after-free again when destroying targetport
  scsi: scsi_transport_sas: Add spaces around binary operator "|"
  scsi: sd_zbc: Improve zone revalidation
  scsi: libfc: Free skb in fc_disc_gpn_id_resp() for valid cases
  scsi: fcoe: Memory leak fix in fcoe_sysfs_fcf_del()
  scsi: target: Make iscsit_register_transport() return void
Exception vector is missing on nommu platform and that is an issue.
This patch is tested in Sipeed Maix Bit Dev Board.

Fixes: 79b1feb ("RISC-V: Setup exception vector early")
Suggested-by: Anup Patel <anup@brainfault.org>
Suggested-by: Atish Patra <atishp@atishpatra.org>
Signed-off-by: Qiu Wenbo <qiuwenbo@phytium.com.cn>
Reviewed-by: Atish Patra <atish.patra@wdc.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
The pgd kmem_cache allocation both specified __GFP_ZERO and had a
constructor which makes no sense.  Remove __GFP_ZERO and zero the user
parts of the pgd explicitly.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Rich Felker <dalias@libc.org>
Function dma_alloc_coherent use in buf already zeroes out memory,
so memset is not needed.

Signed-off-by: Chen Zhou <chenzhou10@huawei.com>
Signed-off-by: Rich Felker <dalias@libc.org>
Trying to build the kernel with CONFIG_INFINIBAND_USER_ACCESS enabled fails

     ERROR: "__get_user_unknown" [drivers/infiniband/core/ib_uverbs.ko] undefined!

with on SH since the kernel misses a 64-bit implementation of get_user().

Implement the missing 64-bit get_user() as __get_user_u64(), matching the
already existing __put_user_u64() which implements the 64-bit put_user().

Signed-off-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Acked-by: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Rich Felker <dalias@libc.org>
This reverts commit d1f56f3.

__delay() is an internal implementation detail on several architectures.
Drivers should not call __delay() directly, as it has non-standardized
semantics, or may not even exist.
Hence there is no need to export __delay() to modules.

See also include/asm-generic/delay.h:

    /* Undefined functions to get compile-time errors */
    ...
    extern void __delay(unsigned long loops);

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Rich Felker <dalias@libc.org>
Fix typo: "triger" --> "trigger"

Signed-off-by: Flavio Suligoi <f.suligoi@asem.it>
Signed-off-by: Rich Felker <dalias@libc.org>
Since the removal of core support for SH5, Cayman support can no longer
be selected.

Fixes: 37744fe ("sh: remove sh5 support")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Rich Felker <dalias@libc.org>
As of commit 37744fe ("sh: remove sh5 support"), support for
the SH5-based Cayman platform can no longer be selected.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Rich Felker <dalias@libc.org>
Somewhere along the patch handling path, both the old "printk(KERN_ALERT
....)" and the new "pr_alert(...)" were retained, leading to the
duplicate printing of "PC:".

Drop the old one.

Fixes: eaabf98 ("sh: fault: modernize printing of kernel messages")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Rich Felker <dalias@libc.org>
This reverts commit 2deebe4.

printk_address() is always used as a continuation of the previous
logging, hence it should not include a log level.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Rich Felker <dalias@libc.org>
This reverts commit 8b92f34.

"data" became the log level in commit 539e786 ("sh: add loglvl
to show_trace()"), so we do need to keep the printk() before the
continuation in print_trace_address().

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Rich Felker <dalias@libc.org>
Rejoin the broken lines by using pr_cont().
Convert the remaining printk() calls to pr_*() while at it.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Rich Felker <dalias@libc.org>
Rejoin the broken lines by dropping the log level parameters and using
pr_cont().
Use "%px" to print sensible addresses in call traces.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Rich Felker <dalias@libc.org>
Rejoin the broken lines by using pr_cont().
Convert the remaining printk() calls to pr_*() while at it.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Rich Felker <dalias@libc.org>
  - Convert from printk() to pr_*(),
  - Add missing continuation.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Rich Felker <dalias@libc.org>
  - Convert from printk() to pr_*(),
  - Add missing continuations,
  - Join broken messages.

Note that printk(KERN_DEBUG ...) is retained, to preserve behavior
(pr_debug() is a dummy if DEBUG is not defined).

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Rich Felker <dalias@libc.org>
  - Convert from printk() to pr_*(),
  - Add missing continuations.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Rich Felker <dalias@libc.org>
The SH implementation never called stacktrace_ops.stack().
Presumably this was copied from the x86 implementation.

Hence remove the method, and all implementations (most of them are
dummies).

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Rich Felker <dalias@libc.org>
Drop all configs with the CONFIG_SOC_CAMERA prefix since those
have been removed.

SOC_CAMERA support for the sh architecture was removed a long time ago.
Drop it from the configs.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Rich Felker <dalias@libc.org>
Rationale:
Reduces attack surface on kernel devs opening the links for MITM
as HTTPS traffic is much harder to manipulate.

Deterministic algorithm:
For each file:
  If not .svg:
    For each line:
      If doesn't contain `\bxmlns\b`:
        For each link, `\bhttp://[^# \t\r\n]*(?:\w|/)`:
	  If neither `\bgnu\.org/license`, nor `\bmozilla\.org/MPL\b`:
            If both the HTTP and HTTPS versions
            return 200 OK and serve the same content:
              Replace HTTP with HTTPS.

Signed-off-by: Alexander A. Klimov <grandmaster@al2klimov.de>
Signed-off-by: Rich Felker <dalias@libc.org>
The sh build is full of warnings when building with gcc 9.2.1.  While
fixing those would be great, at least avoid failing the build.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Rich Felker <dalias@libc.org>
Ensure there is an order for the selects.  Also remove a duplicate
one.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Rich Felker <dalias@libc.org>
There is no point in having __KERNEL__ ifdefs in headers not exported to
userspace.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Rich Felker <dalias@libc.org>
ioremap_fixed is an internal implementation detail and should not be
exposed to drivers.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Rich Felker <dalias@libc.org>
Move the internal implementation details of ioremap out of line, no need
to expose any of this to drivers for a slow path API.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Rich Felker <dalias@libc.org>
No need to expose the details of trapped I/O to drivers.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Rich Felker <dalias@libc.org>
Both functions are only used by compiled in core code.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Rich Felker <dalias@libc.org>
@plbossart

ghost commented Aug 20, 2020

Copy link
Copy Markdown
Member Author

Complete fail for sof-test on GLK-BOBBA

2020-08-20 19:24:53 UTC [REMOTE_ERROR] Pipeline(s) from topology don't match pipeline(s) from system

@fredoh9 @ranj063 can you help here? This could be a configuration issue, no?

@ranj063

ghost commented Aug 20, 2020

Copy link
Copy Markdown
Collaborator

Complete fail for sof-test on GLK-BOBBA

2020-08-20 19:24:53 UTC [REMOTE_ERROR] Pipeline(s) from topology don't match pipeline(s) from system

@fredoh9 @ranj063 can you help here? This could be a configuration issue, no?

@plbossart we've got a codec probe failure
kernel: [ 5.258979] sof-audio-pci 0000:00:0e.0: codec #2 probe error, ret: -5
kernel: [ 5.259177] sof-audio-pci 0000:00:0e.0: no hda codecs found!

And the machine driver never probes. I wonder why

@plbossart

ghost commented Aug 21, 2020

Copy link
Copy Markdown
Member Author

Complete fail for sof-test on GLK-BOBBA

2020-08-20 19:24:53 UTC [REMOTE_ERROR] Pipeline(s) from topology don't match pipeline(s) from system

@fredoh9 @ranj063 can you help here? This could be a configuration issue, no?

@plbossart we've got a codec probe failure
kernel: [ 5.258979] sof-audio-pci 0000:00:0e.0: codec #2 probe error, ret: -5
kernel: [ 5.259177] sof-audio-pci 0000:00:0e.0: no hda codecs found!

we've seen those errors before, they are not fatal IIRC. @kv2019i this is one question for you I guess.

And the machine driver never probes. I wonder why

Yep, the tag provided by Takashi to Linus works, but at some point Linus' tree doesn't work any more. bisecting is the only way to know I guess

@ranj063

ghost commented Aug 21, 2020

Copy link
Copy Markdown
Collaborator

And the machine driver never probes. I wonder why

Yep, the tag provided by Takashi to Linus works, but at some point Linus' tree doesn't work any more. bisecting is the only way to know I guess

I'll try bisecting tonight and see whats going on

@plbossart

ghost commented Aug 21, 2020

Copy link
Copy Markdown
Member Author

And the machine driver never probes. I wonder why

Yep, the tag provided by Takashi to Linus works, but at some point Linus' tree doesn't work any more. bisecting is the only way to know I guess

I'll try bisecting tonight and see whats going on

working on it, it seems to be in the DRM stuff.

@plbossart

ghost commented Aug 21, 2020

Copy link
Copy Markdown
Member Author

Bisect results

4f0b4352bd26eff85f972ccf12bcdf9236a42175 is the first bad commit
commit 4f0b4352bd26eff85f972ccf12bcdf9236a42175
Author: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
Date:   Tue May 19 16:11:12 2020 +0300

    drm/i915: Extract cdclk requirements checking to separate function
    
    In Gen11+ whenever we might exceed DBuf bandwidth we might need to
    recalculate CDCLK which DBuf bandwidth is scaled with.
    Total Dbuf bw used might change based on particular plane needs.
    
    Thus to calculate if cdclk needs to be changed it is not enough
    anymore to check plane configuration and plane min cdclk, per DBuf
    bw can be calculated only after wm/ddb calculation is done and
    all required planes are added into the state. In order to keep
    all min_cdclk related checks in one place let's extract it into
    separate function, checking and modifying any_ms.
    
    Reviewed-by: Manasi Navare <manasi.d.navare@intel.com>
    Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
    Signed-off-by: Manasi Navare <manasi.d.navare@intel.com>
    Link: https://patchwork.freedesktop.org/patch/msgid/20200519131117.17190-3-stanislav.lisovskiy@intel.com

 drivers/gpu/drm/i915/display/intel_display.c | 30 ++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

@kv2019i do you have a GLK Bobba device and can you look into this?

@RanderWang

ghost commented Aug 21, 2020 •

Copy link
Copy Markdown

validated it with sof-test on TGL-RVP. pass!

@kv2019i

ghost commented Aug 21, 2020

Copy link
Copy Markdown
Collaborator

@plbossart wrote:

drm/i915: Extract cdclk requirements checking to separate function

[...]

@kv2019i do you have a GLK Bobba device and can you look into this?

I can arrange it. I'll try on another GLK device first, I suspect this will trigger on all GLK platforms. I suggest reverting this for now in sof-dev. I'll raise this with Stanislav as well. GKL are an exception case with very low base cdclk clock freq and this patch changes the logic related to cdclk changes. Just based on the outcome, I suspect the clock is not getting raised as it should in probe and thus the failure.

ghost left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@plbossart Test on CFL-S passed, so looks good. If you revert the one DRM patch, I think we can go ahead and merge this. I'll continue debug on GLK next week (no progress yet with DRM folks today on this).

Pierre-Louis Bossart added 7 commits August 21, 2020 12:50
This reverts commit 19aefbc.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
This reverts commit cac91e6.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
This reverts commit cd19154.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
This reverts commit 8435576.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
This reverts commit cf12976.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
This reverts commit 9877c37.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
…ction"

This reverts commit 4f0b435.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
@plbossart

ghost commented Aug 21, 2020 •

Copy link
Copy Markdown
Member Author

@kv2019i I did a bunch of blind reverts, this seems to work locally, so pushed to GitHub to see the results on the CI devices.
Here's the list of what I reverted

19aefbc778b8 drm/i915: Fix wrong CDCLK adjustment changes
cac91e671ad5 drm/i915: Fix includes and local vars order
cd1915460861 drm/i915: Adjust CDCLK accordingly to our DBuf bw needs
8435576b3f69 drm/i915: Introduce for_each_dbuf_slice_in_mask macro
cf129762ba15 drm/i915: Plane configuration affects CDCLK in Gen11+
9877c37e05c8 drm/i915: Check plane configuration properly
4f0b4352bd26 drm/i915: Extract cdclk requirements checking to separate function

Previous improvements around handling device and codec level
probe functionality added the possibility of the voltage level
being undefined for the scenario where the IO voltage retrieved
from the regulator supply was below 1.2V, whereas previously the
code defaulted to the 2.5V to 3.6V range in that case. This
commit restores the default value to avoid this happening.

Fixes: aa5b18d ("ASoC: da7219: Move soft reset handling to codec level probe")
Reported-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
@plbossart

ghost commented Aug 21, 2020 •

Copy link
Copy Markdown
Member Author

also added a fix for the DA7219 issue so we should be good to go. Fingers crossed.

@plbossart

ghost commented Aug 21, 2020

Copy link
Copy Markdown
Member Author

@fredoh9 @xiulipan @ranj063 can you help with the error on ICL RVP:

kernel: [  450.204615] sof-audio-pci 0000:00:1f.3: error: extended rom status: 0x6000010 0x0 0x0 0x0 0x0 0x0 0x2001182 0x0

Could it me that we need to filter this in sof-test (the message has changed)?

Also why is BSW Cyan not online?

I don't want to merge until those two platforms are cleared.

@ranj063

ghost commented Aug 22, 2020

Copy link
Copy Markdown
Collaborator

@fredoh9 @xiulipan @ranj063 can you help with the error on ICL RVP:

kernel: [  450.204615] sof-audio-pci 0000:00:1f.3: error: extended rom status: 0x6000010 0x0 0x0 0x0 0x0 0x0 0x2001182 0x0

Could it me that we need to filter this in sof-test (the message has changed)?

Also why is BSW Cyan not online?

I don't want to merge until those two platforms are cleared.

@plbossart ICL is a known issue. Sometimes it takes more than 1 attempt to boot the firmware and an error shown in the first attempt results in a failed test. Wehave an issue filed to track this already thesofproject/sof-test#340

@fredoh9

ghost commented Aug 22, 2020

Copy link
Copy Markdown
Collaborator

Also why is BSW Cyan not online?

BSW platform has two devices. All are online. I think, daily build and other pr took all of them at that moment. I will trigger one more time.

@fredoh9

ghost commented Aug 22, 2020

Copy link
Copy Markdown
Collaborator

SOFCI TEST

@fredoh9

ghost commented Aug 22, 2020

Copy link
Copy Markdown
Collaborator

@plbossart BSW_CYN_MAX98090 is verified. Although this time APL_UP2_NOCODEC didn't run, good to go.

@kv2019i

ghost commented Aug 24, 2020

Copy link
Copy Markdown
Collaborator

@plbossart wrote:

@kv2019i I did a bunch of blind reverts, this seems to work locally, so pushed to GitHub to see the results on the CI devices.
Here's the list of what I reverted

Seems good to me. I tried to debug this on a Helios, but it so far I've not been able to boot 5.9-rc on it at all due to NVME failures. Might take longer to figure this out, so I'm ok to push ahead with the merge given the Bobba GLK device in CI gives greenlight for this.

@plbossart
plbossart merged commit d46d357 into thesofproject:topic/sof-dev Aug 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.