diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index f368560cdf67..453849b7ca9c 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -190,7 +190,7 @@ static void show_data(unsigned long addr, int nbytes, const char *name) if (addr < PAGE_OFFSET || addr > -256UL) return; - printk("\n%s: %pS:\n", name, addr); + printk("\n%s: %pS:\n", name, (void*)addr); /* * round address down to a 32 bit boundary diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index e9462f1c246f..b1aa679bda65 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -3348,8 +3348,7 @@ int mmc_flush_cache(struct mmc_card *card) (card->ext_csd.cache_size > 0) && (card->ext_csd.cache_ctrl & 1)) { err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, - EXT_CSD_FLUSH_CACHE, 1, - MMC_CACHE_FLUSH_TIMEOUT_MS); + EXT_CSD_FLUSH_CACHE, 1, 0); if (err) pr_err("%s: cache flush error %d\n", mmc_hostname(card->host), err); diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c index b70d55301042..eb3b954eb6a7 100644 --- a/drivers/mmc/core/mmc_ops.c +++ b/drivers/mmc/core/mmc_ops.c @@ -550,11 +550,13 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value, /* We have an unspecified cmd timeout, use the fallback value. */ if (!timeout_ms) { +#if 0 pr_warn("%s: unspecified timeout for CMD6 - use generic\n", mmc_hostname(host)); - timeout_ms = card->ext_csd.generic_cmd6_time; +#endif + timeout_ms = 10 * 60 * 1000; + /* instead of card->ext_csd.generic_cmd6_time; */ } - /* Must check status to be sure of no errors. */ timeout = jiffies + msecs_to_jiffies(timeout_ms) + 1; do { @@ -588,7 +590,6 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value, mmc_delay(timeout_ms); goto out; } - /* Timeout if the device never leaves the program state. */ if (expired && (R1_CURRENT_STATE(status) == R1_STATE_PRG || busy)) { diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c index 37ae1a351ac3..4713a2a7425f 100644 --- a/drivers/usb/core/driver.c +++ b/drivers/usb/core/driver.c @@ -1366,7 +1366,8 @@ static int usb_suspend_both(struct usb_device *udev, pm_message_t msg) } done: - dev_info(&udev->dev, "%s: status %d\n", __func__, status); + if (status != -EBUSY) + dev_info(&udev->dev, "%s: status %d\n", __func__, status); return status; } diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index cf289d53bfae..863385bce2a4 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -1934,12 +1934,6 @@ static bool f2fs_dummy_context(struct inode *inode) return DUMMY_ENCRYPTION_ENABLED(F2FS_I_SB(inode)); } -static unsigned f2fs_max_namelen(struct inode *inode) -{ - return S_ISLNK(inode->i_mode) ? - inode->i_sb->s_blocksize : F2FS_NAME_LEN; -} - static const struct fscrypt_operations f2fs_cryptops = { .key_prefix = "f2fs:", .get_context = f2fs_get_context, diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h index 5660b43e3d64..4dd8038ee9db 100644 --- a/include/trace/events/sched.h +++ b/include/trace/events/sched.h @@ -673,10 +673,10 @@ TRACE_EVENT(sched_load_avg_task, __entry->util_avg, __entry->util_fast_avg, __entry->util_avg_pelt, - __entry->util_avg_walt, - (u64)__entry->load_sum, - (u32)__entry->util_sum, - (u32)__entry->period_contrib) + (unsigned long)__entry->util_avg_walt, + (unsigned long long)__entry->load_sum, + (unsigned int)__entry->util_sum, + (unsigned int)__entry->period_contrib) ); /* @@ -716,7 +716,7 @@ TRACE_EVENT(sched_load_avg_cpu, "util_avg_pelt=%lu util_avg_walt=%lu", __entry->cpu, __entry->load_avg, __entry->util_avg, __entry->util_fast_avg, - __entry->util_avg_pelt, __entry->util_avg_walt) + __entry->util_avg_pelt, (unsigned long)__entry->util_avg_walt) ); /* diff --git a/kernel/memremap.c b/kernel/memremap.c index e68e357a1402..77b2db478f60 100644 --- a/kernel/memremap.c +++ b/kernel/memremap.c @@ -173,6 +173,8 @@ EXPORT_SYMBOL(devm_memunmap); #ifdef CONFIG_ZONE_DEVICE static DEFINE_MUTEX(pgmap_lock); static RADIX_TREE(pgmap_radix, GFP_KERNEL); +#undef SECTION_MASK +#undef SECTION_SIZE #define SECTION_MASK ~((1UL << PA_SECTION_SHIFT) - 1) #define SECTION_SIZE (1UL << PA_SECTION_SHIFT) diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 665f42e3ab47..19acca22e224 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -3154,9 +3154,9 @@ static int hda_codec_force_resume(struct device *dev) * device hasn't been used at suspend time. This trick is needed to * update the jack state change during the sleep. */ - pm_runtime_get_noresume(dev); + // pm_runtime_get_noresume(dev); ret = pm_runtime_force_resume(dev); - pm_runtime_put(dev); + // pm_runtime_put(dev); return ret; } diff --git a/sound/pci/hda/hda_tegra.c b/sound/pci/hda/hda_tegra.c deleted file mode 100644 index b567c4bdae00..000000000000 --- a/sound/pci/hda/hda_tegra.c +++ /dev/null @@ -1,586 +0,0 @@ -/* - * - * Implementation of primary ALSA driver code base for NVIDIA Tegra HDA. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include "hda_codec.h" -#include "hda_controller.h" - -/* Defines for Nvidia Tegra HDA support */ -#define HDA_BAR0 0x8000 - -#define HDA_CFG_CMD 0x1004 -#define HDA_CFG_BAR0 0x1010 - -#define HDA_ENABLE_IO_SPACE (1 << 0) -#define HDA_ENABLE_MEM_SPACE (1 << 1) -#define HDA_ENABLE_BUS_MASTER (1 << 2) -#define HDA_ENABLE_SERR (1 << 8) -#define HDA_DISABLE_INTR (1 << 10) -#define HDA_BAR0_INIT_PROGRAM 0xFFFFFFFF -#define HDA_BAR0_FINAL_PROGRAM (1 << 14) - -/* IPFS */ -#define HDA_IPFS_CONFIG 0x180 -#define HDA_IPFS_EN_FPCI 0x1 - -#define HDA_IPFS_FPCI_BAR0 0x80 -#define HDA_FPCI_BAR0_START 0x40 - -#define HDA_IPFS_INTR_MASK 0x188 -#define HDA_IPFS_EN_INTR (1 << 16) - -/* max number of SDs */ -#define NUM_CAPTURE_SD 1 -#define NUM_PLAYBACK_SD 1 - -struct hda_tegra { - struct azx chip; - struct device *dev; - struct clk *hda_clk; - struct clk *hda2codec_2x_clk; - struct clk *hda2hdmi_clk; - void __iomem *regs; - struct work_struct probe_work; -}; - -#ifdef CONFIG_PM -static int power_save = CONFIG_SND_HDA_POWER_SAVE_DEFAULT; -module_param(power_save, bint, 0644); -MODULE_PARM_DESC(power_save, - "Automatic power-saving timeout (in seconds, 0 = disable)."); -#else -#define power_save 0 -#endif - -/* - * DMA page allocation ops. - */ -static int dma_alloc_pages(struct hdac_bus *bus, int type, size_t size, - struct snd_dma_buffer *buf) -{ - return snd_dma_alloc_pages(type, bus->dev, size, buf); -} - -static void dma_free_pages(struct hdac_bus *bus, struct snd_dma_buffer *buf) -{ - snd_dma_free_pages(buf); -} - -static int substream_alloc_pages(struct azx *chip, - struct snd_pcm_substream *substream, - size_t size) -{ - return snd_pcm_lib_malloc_pages(substream, size); -} - -static int substream_free_pages(struct azx *chip, - struct snd_pcm_substream *substream) -{ - return snd_pcm_lib_free_pages(substream); -} - -/* - * Register access ops. Tegra HDA register access is DWORD only. - */ -static void hda_tegra_writel(u32 value, u32 __iomem *addr) -{ - writel(value, addr); -} - -static u32 hda_tegra_readl(u32 __iomem *addr) -{ - return readl(addr); -} - -static void hda_tegra_writew(u16 value, u16 __iomem *addr) -{ - unsigned int shift = ((unsigned long)(addr) & 0x3) << 3; - void __iomem *dword_addr = (void __iomem *)((unsigned long)(addr) & ~0x3); - u32 v; - - v = readl(dword_addr); - v &= ~(0xffff << shift); - v |= value << shift; - writel(v, dword_addr); -} - -static u16 hda_tegra_readw(u16 __iomem *addr) -{ - unsigned int shift = ((unsigned long)(addr) & 0x3) << 3; - void __iomem *dword_addr = (void __iomem *)((unsigned long)(addr) & ~0x3); - u32 v; - - v = readl(dword_addr); - return (v >> shift) & 0xffff; -} - -static void hda_tegra_writeb(u8 value, u8 __iomem *addr) -{ - unsigned int shift = ((unsigned long)(addr) & 0x3) << 3; - void __iomem *dword_addr = (void __iomem *)((unsigned long)(addr) & ~0x3); - u32 v; - - v = readl(dword_addr); - v &= ~(0xff << shift); - v |= value << shift; - writel(v, dword_addr); -} - -static u8 hda_tegra_readb(u8 __iomem *addr) -{ - unsigned int shift = ((unsigned long)(addr) & 0x3) << 3; - void __iomem *dword_addr = (void __iomem *)((unsigned long)(addr) & ~0x3); - u32 v; - - v = readl(dword_addr); - return (v >> shift) & 0xff; -} - -static const struct hdac_io_ops hda_tegra_io_ops = { - .reg_writel = hda_tegra_writel, - .reg_readl = hda_tegra_readl, - .reg_writew = hda_tegra_writew, - .reg_readw = hda_tegra_readw, - .reg_writeb = hda_tegra_writeb, - .reg_readb = hda_tegra_readb, - .dma_alloc_pages = dma_alloc_pages, - .dma_free_pages = dma_free_pages, -}; - -static const struct hda_controller_ops hda_tegra_ops = { - .substream_alloc_pages = substream_alloc_pages, - .substream_free_pages = substream_free_pages, -}; - -static void hda_tegra_init(struct hda_tegra *hda) -{ - u32 v; - - /* Enable PCI access */ - v = readl(hda->regs + HDA_IPFS_CONFIG); - v |= HDA_IPFS_EN_FPCI; - writel(v, hda->regs + HDA_IPFS_CONFIG); - - /* Enable MEM/IO space and bus master */ - v = readl(hda->regs + HDA_CFG_CMD); - v &= ~HDA_DISABLE_INTR; - v |= HDA_ENABLE_MEM_SPACE | HDA_ENABLE_IO_SPACE | - HDA_ENABLE_BUS_MASTER | HDA_ENABLE_SERR; - writel(v, hda->regs + HDA_CFG_CMD); - - writel(HDA_BAR0_INIT_PROGRAM, hda->regs + HDA_CFG_BAR0); - writel(HDA_BAR0_FINAL_PROGRAM, hda->regs + HDA_CFG_BAR0); - writel(HDA_FPCI_BAR0_START, hda->regs + HDA_IPFS_FPCI_BAR0); - - v = readl(hda->regs + HDA_IPFS_INTR_MASK); - v |= HDA_IPFS_EN_INTR; - writel(v, hda->regs + HDA_IPFS_INTR_MASK); -} - -static int hda_tegra_enable_clocks(struct hda_tegra *data) -{ - int rc; - - rc = clk_prepare_enable(data->hda_clk); - if (rc) - return rc; - rc = clk_prepare_enable(data->hda2codec_2x_clk); - if (rc) - goto disable_hda; - rc = clk_prepare_enable(data->hda2hdmi_clk); - if (rc) - goto disable_codec_2x; - - return 0; - -disable_codec_2x: - clk_disable_unprepare(data->hda2codec_2x_clk); -disable_hda: - clk_disable_unprepare(data->hda_clk); - return rc; -} - -#ifdef CONFIG_PM_SLEEP -static void hda_tegra_disable_clocks(struct hda_tegra *data) -{ - clk_disable_unprepare(data->hda2hdmi_clk); - clk_disable_unprepare(data->hda2codec_2x_clk); - clk_disable_unprepare(data->hda_clk); -} - -/* - * power management - */ -static int hda_tegra_suspend(struct device *dev) -{ - struct snd_card *card = dev_get_drvdata(dev); - struct azx *chip = card->private_data; - struct hda_tegra *hda = container_of(chip, struct hda_tegra, chip); - struct hdac_bus *bus = azx_bus(chip); - - snd_power_change_state(card, SNDRV_CTL_POWER_D3hot); - - azx_stop_chip(chip); - synchronize_irq(bus->irq); - azx_enter_link_reset(chip); - hda_tegra_disable_clocks(hda); - - return 0; -} - -static int hda_tegra_resume(struct device *dev) -{ - struct snd_card *card = dev_get_drvdata(dev); - struct azx *chip = card->private_data; - struct hda_tegra *hda = container_of(chip, struct hda_tegra, chip); - - hda_tegra_enable_clocks(hda); - - hda_tegra_init(hda); - - azx_init_chip(chip, 1); - - snd_power_change_state(card, SNDRV_CTL_POWER_D0); - - return 0; -} -#endif /* CONFIG_PM_SLEEP */ - -static const struct dev_pm_ops hda_tegra_pm = { - SET_SYSTEM_SLEEP_PM_OPS(hda_tegra_suspend, hda_tegra_resume) -}; - -static int hda_tegra_dev_disconnect(struct snd_device *device) -{ - struct azx *chip = device->device_data; - - chip->bus.shutdown = 1; - return 0; -} - -/* - * destructor - */ -static int hda_tegra_dev_free(struct snd_device *device) -{ - struct azx *chip = device->device_data; - struct hda_tegra *hda = container_of(chip, struct hda_tegra, chip); - - cancel_work_sync(&hda->probe_work); - if (azx_bus(chip)->chip_init) { - azx_stop_all_streams(chip); - azx_stop_chip(chip); - } - - azx_free_stream_pages(chip); - azx_free_streams(chip); - snd_hdac_bus_exit(azx_bus(chip)); - - return 0; -} - -static int hda_tegra_init_chip(struct azx *chip, struct platform_device *pdev) -{ - struct hda_tegra *hda = container_of(chip, struct hda_tegra, chip); - struct hdac_bus *bus = azx_bus(chip); - struct device *dev = hda->dev; - struct resource *res; - int err; - - hda->hda_clk = devm_clk_get(dev, "hda"); - if (IS_ERR(hda->hda_clk)) { - dev_err(dev, "failed to get hda clock\n"); - return PTR_ERR(hda->hda_clk); - } - hda->hda2codec_2x_clk = devm_clk_get(dev, "hda2codec_2x"); - if (IS_ERR(hda->hda2codec_2x_clk)) { - dev_err(dev, "failed to get hda2codec_2x clock\n"); - return PTR_ERR(hda->hda2codec_2x_clk); - } - hda->hda2hdmi_clk = devm_clk_get(dev, "hda2hdmi"); - if (IS_ERR(hda->hda2hdmi_clk)) { - dev_err(dev, "failed to get hda2hdmi clock\n"); - return PTR_ERR(hda->hda2hdmi_clk); - } - - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - hda->regs = devm_ioremap_resource(dev, res); - if (IS_ERR(hda->regs)) - return PTR_ERR(hda->regs); - - bus->remap_addr = hda->regs + HDA_BAR0; - bus->addr = res->start + HDA_BAR0; - - err = hda_tegra_enable_clocks(hda); - if (err) { - dev_err(dev, "failed to get enable clocks\n"); - return err; - } - - hda_tegra_init(hda); - - return 0; -} - -static int hda_tegra_first_init(struct azx *chip, struct platform_device *pdev) -{ - struct hdac_bus *bus = azx_bus(chip); - struct snd_card *card = chip->card; - int err; - unsigned short gcap; - int irq_id = platform_get_irq(pdev, 0); - - if (irq_id < 0) - return irq_id; - - err = hda_tegra_init_chip(chip, pdev); - if (err) - return err; - - err = devm_request_irq(chip->card->dev, irq_id, azx_interrupt, - IRQF_SHARED, KBUILD_MODNAME, chip); - if (err) { - dev_err(chip->card->dev, - "unable to request IRQ %d, disabling device\n", - irq_id); - return err; - } - bus->irq = irq_id; - - synchronize_irq(bus->irq); - - gcap = azx_readw(chip, GCAP); - dev_dbg(card->dev, "chipset global capabilities = 0x%x\n", gcap); - - /* read number of streams from GCAP register instead of using - * hardcoded value - */ - chip->capture_streams = (gcap >> 8) & 0x0f; - chip->playback_streams = (gcap >> 12) & 0x0f; - if (!chip->playback_streams && !chip->capture_streams) { - /* gcap didn't give any info, switching to old method */ - chip->playback_streams = NUM_PLAYBACK_SD; - chip->capture_streams = NUM_CAPTURE_SD; - } - chip->capture_index_offset = 0; - chip->playback_index_offset = chip->capture_streams; - chip->num_streams = chip->playback_streams + chip->capture_streams; - - /* initialize streams */ - err = azx_init_streams(chip); - if (err < 0) { - dev_err(card->dev, "failed to initialize streams: %d\n", err); - return err; - } - - err = azx_alloc_stream_pages(chip); - if (err < 0) { - dev_err(card->dev, "failed to allocate stream pages: %d\n", - err); - return err; - } - - /* initialize chip */ - azx_init_chip(chip, 1); - - /* codec detection */ - if (!bus->codec_mask) { - dev_err(card->dev, "no codecs found!\n"); - return -ENODEV; - } - - strcpy(card->driver, "tegra-hda"); - strcpy(card->shortname, "tegra-hda"); - snprintf(card->longname, sizeof(card->longname), - "%s at 0x%lx irq %i", - card->shortname, bus->addr, bus->irq); - - return 0; -} - -/* - * constructor - */ - -static void hda_tegra_probe_work(struct work_struct *work); - -static int hda_tegra_create(struct snd_card *card, - unsigned int driver_caps, - struct hda_tegra *hda) -{ - static struct snd_device_ops ops = { - .dev_disconnect = hda_tegra_dev_disconnect, - .dev_free = hda_tegra_dev_free, - }; - struct azx *chip; - int err; - - chip = &hda->chip; - - mutex_init(&chip->open_mutex); - chip->card = card; - chip->ops = &hda_tegra_ops; - chip->driver_caps = driver_caps; - chip->driver_type = driver_caps & 0xff; - chip->dev_index = 0; - INIT_LIST_HEAD(&chip->pcm_list); - - chip->codec_probe_mask = -1; - - chip->single_cmd = false; - chip->snoop = true; - - INIT_WORK(&hda->probe_work, hda_tegra_probe_work); - - err = azx_bus_init(chip, NULL, &hda_tegra_io_ops); - if (err < 0) - return err; - - chip->bus.needs_damn_long_delay = 1; - - err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops); - if (err < 0) { - dev_err(card->dev, "Error creating device\n"); - return err; - } - - return 0; -} - -static const struct of_device_id hda_tegra_match[] = { - { .compatible = "nvidia,tegra30-hda" }, - {}, -}; -MODULE_DEVICE_TABLE(of, hda_tegra_match); - -static int hda_tegra_probe(struct platform_device *pdev) -{ - const unsigned int driver_flags = AZX_DCAPS_CORBRP_SELF_CLEAR; - struct snd_card *card; - struct azx *chip; - struct hda_tegra *hda; - int err; - - hda = devm_kzalloc(&pdev->dev, sizeof(*hda), GFP_KERNEL); - if (!hda) - return -ENOMEM; - hda->dev = &pdev->dev; - chip = &hda->chip; - - err = snd_card_new(&pdev->dev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1, - THIS_MODULE, 0, &card); - if (err < 0) { - dev_err(&pdev->dev, "Error creating card!\n"); - return err; - } - - err = hda_tegra_create(card, driver_flags, hda); - if (err < 0) - goto out_free; - card->private_data = chip; - - dev_set_drvdata(&pdev->dev, card); - schedule_work(&hda->probe_work); - - return 0; - -out_free: - snd_card_free(card); - return err; -} - -static void hda_tegra_probe_work(struct work_struct *work) -{ - struct hda_tegra *hda = container_of(work, struct hda_tegra, probe_work); - struct azx *chip = &hda->chip; - struct platform_device *pdev = to_platform_device(hda->dev); - int err; - - err = hda_tegra_first_init(chip, pdev); - if (err < 0) - goto out_free; - - /* create codec instances */ - err = azx_probe_codecs(chip, 0); - if (err < 0) - goto out_free; - - err = azx_codec_configure(chip); - if (err < 0) - goto out_free; - - err = snd_card_register(chip->card); - if (err < 0) - goto out_free; - - chip->running = 1; - snd_hda_set_power_save(&chip->bus, power_save * 1000); - - out_free: - return; /* no error return from async probe */ -} - -static int hda_tegra_remove(struct platform_device *pdev) -{ - return snd_card_free(dev_get_drvdata(&pdev->dev)); -} - -static void hda_tegra_shutdown(struct platform_device *pdev) -{ - struct snd_card *card = dev_get_drvdata(&pdev->dev); - struct azx *chip; - - if (!card) - return; - chip = card->private_data; - if (chip && chip->running) - azx_stop_chip(chip); -} - -static struct platform_driver tegra_platform_hda = { - .driver = { - .name = "tegra-hda", - .pm = &hda_tegra_pm, - .of_match_table = hda_tegra_match, - }, - .probe = hda_tegra_probe, - .remove = hda_tegra_remove, - .shutdown = hda_tegra_shutdown, -}; -module_platform_driver(tegra_platform_hda); - -MODULE_DESCRIPTION("Tegra HDA bus driver"); -MODULE_LICENSE("GPL v2");