Skip to content

Commit 0dc76ec

Browse files
arndbarndb
committed
Merge tag 'memory-controller-drv-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl into arm/drivers
Memory controller drivers for v5.15 Few minor fixes: maintainer pattern, unused-function warning in Tegra186 and suspend/resume in OMAP GPMC. * tag 'memory-controller-drv-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl: memory: omap-gpmc: Drop custom PM calls with cpu_pm notifier memory: omap-gpmc: Clear GPMC_CS_CONFIG7 register on restore if unused MAINTAINERS: update arm,pl353-smc.yaml reference memory: tegra: fix unused-function warning Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents a8c371f + c28b584 commit 0dc76ec

File tree

5 files changed

+121
-82
lines changed

5 files changed

+121
-82
lines changed

‎MAINTAINERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1488,7 +1488,7 @@ M: Miquel Raynal <[email protected]@bootlin.com>
14881488
M: Naga Sureshkumar Relli <[email protected]>
14891489
L: [email protected] (moderated for non-subscribers)
14901490
S: Maintained
1491-
F: Documentation/devicetree/bindings/mtd/arm,pl353-smc.yaml
1491+
F: Documentation/devicetree/bindings/memory-controllers/arm,pl353-smc.yaml
14921492
F: drivers/memory/pl353-smc.c
14931493

14941494
ARM PRIMECELL CLCD PL110 DRIVER

‎arch/arm/mach-omap2/pm34xx.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include <linux/delay.h>
2727
#include <linux/slab.h>
2828
#include <linux/of.h>
29-
#include <linux/omap-gpmc.h>
3029

3130
#include <trace/events/power.h>
3231

@@ -81,8 +80,6 @@ static void omap3_core_save_context(void)
8180

8281
/* Save the Interrupt controller context */
8382
omap_intc_save_context();
84-
/* Save the GPMC context */
85-
omap3_gpmc_save_context();
8683
/* Save the system control module context, padconf already save above*/
8784
omap3_control_save_context();
8885
}
@@ -91,8 +88,6 @@ static void omap3_core_restore_context(void)
9188
{
9289
/* Restore the control module context, padconf restored by h/w */
9390
omap3_control_restore_context();
94-
/* Restore the GPMC context */
95-
omap3_gpmc_restore_context();
9691
/* Restore the interrupt controller context */
9792
omap_intc_restore_context();
9893
}

‎drivers/memory/omap-gpmc.c

Lines changed: 118 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
* Copyright (C) 2009 Texas Instruments
1010
* Added OMAP4 support - Santosh Shilimkar <[email protected]>
1111
*/
12+
#include <linux/cpu_pm.h>
1213
#include <linux/irq.h>
1314
#include <linux/kernel.h>
1415
#include <linux/init.h>
@@ -232,7 +233,10 @@ struct gpmc_device {
232233
int irq;
233234
struct irq_chip irq_chip;
234235
struct gpio_chip gpio_chip;
236+
struct notifier_block nb;
237+
struct omap3_gpmc_regs context;
235238
int nirqs;
239+
unsigned int is_suspended:1;
236240
};
237241

238242
static struct irq_domain *gpmc_irq_domain;
@@ -2384,6 +2388,106 @@ static int gpmc_gpio_init(struct gpmc_device *gpmc)
23842388
return 0;
23852389
}
23862390

2391+
static void omap3_gpmc_save_context(struct gpmc_device *gpmc)
2392+
{
2393+
struct omap3_gpmc_regs *gpmc_context;
2394+
int i;
2395+
2396+
if (!gpmc || !gpmc_base)
2397+
return;
2398+
2399+
gpmc_context = &gpmc->context;
2400+
2401+
gpmc_context->sysconfig = gpmc_read_reg(GPMC_SYSCONFIG);
2402+
gpmc_context->irqenable = gpmc_read_reg(GPMC_IRQENABLE);
2403+
gpmc_context->timeout_ctrl = gpmc_read_reg(GPMC_TIMEOUT_CONTROL);
2404+
gpmc_context->config = gpmc_read_reg(GPMC_CONFIG);
2405+
gpmc_context->prefetch_config1 = gpmc_read_reg(GPMC_PREFETCH_CONFIG1);
2406+
gpmc_context->prefetch_config2 = gpmc_read_reg(GPMC_PREFETCH_CONFIG2);
2407+
gpmc_context->prefetch_control = gpmc_read_reg(GPMC_PREFETCH_CONTROL);
2408+
for (i = 0; i < gpmc_cs_num; i++) {
2409+
gpmc_context->cs_context[i].is_valid = gpmc_cs_mem_enabled(i);
2410+
if (gpmc_context->cs_context[i].is_valid) {
2411+
gpmc_context->cs_context[i].config1 =
2412+
gpmc_cs_read_reg(i, GPMC_CS_CONFIG1);
2413+
gpmc_context->cs_context[i].config2 =
2414+
gpmc_cs_read_reg(i, GPMC_CS_CONFIG2);
2415+
gpmc_context->cs_context[i].config3 =
2416+
gpmc_cs_read_reg(i, GPMC_CS_CONFIG3);
2417+
gpmc_context->cs_context[i].config4 =
2418+
gpmc_cs_read_reg(i, GPMC_CS_CONFIG4);
2419+
gpmc_context->cs_context[i].config5 =
2420+
gpmc_cs_read_reg(i, GPMC_CS_CONFIG5);
2421+
gpmc_context->cs_context[i].config6 =
2422+
gpmc_cs_read_reg(i, GPMC_CS_CONFIG6);
2423+
gpmc_context->cs_context[i].config7 =
2424+
gpmc_cs_read_reg(i, GPMC_CS_CONFIG7);
2425+
}
2426+
}
2427+
}
2428+
2429+
static void omap3_gpmc_restore_context(struct gpmc_device *gpmc)
2430+
{
2431+
struct omap3_gpmc_regs *gpmc_context;
2432+
int i;
2433+
2434+
if (!gpmc || !gpmc_base)
2435+
return;
2436+
2437+
gpmc_context = &gpmc->context;
2438+
2439+
gpmc_write_reg(GPMC_SYSCONFIG, gpmc_context->sysconfig);
2440+
gpmc_write_reg(GPMC_IRQENABLE, gpmc_context->irqenable);
2441+
gpmc_write_reg(GPMC_TIMEOUT_CONTROL, gpmc_context->timeout_ctrl);
2442+
gpmc_write_reg(GPMC_CONFIG, gpmc_context->config);
2443+
gpmc_write_reg(GPMC_PREFETCH_CONFIG1, gpmc_context->prefetch_config1);
2444+
gpmc_write_reg(GPMC_PREFETCH_CONFIG2, gpmc_context->prefetch_config2);
2445+
gpmc_write_reg(GPMC_PREFETCH_CONTROL, gpmc_context->prefetch_control);
2446+
for (i = 0; i < gpmc_cs_num; i++) {
2447+
if (gpmc_context->cs_context[i].is_valid) {
2448+
gpmc_cs_write_reg(i, GPMC_CS_CONFIG1,
2449+
gpmc_context->cs_context[i].config1);
2450+
gpmc_cs_write_reg(i, GPMC_CS_CONFIG2,
2451+
gpmc_context->cs_context[i].config2);
2452+
gpmc_cs_write_reg(i, GPMC_CS_CONFIG3,
2453+
gpmc_context->cs_context[i].config3);
2454+
gpmc_cs_write_reg(i, GPMC_CS_CONFIG4,
2455+
gpmc_context->cs_context[i].config4);
2456+
gpmc_cs_write_reg(i, GPMC_CS_CONFIG5,
2457+
gpmc_context->cs_context[i].config5);
2458+
gpmc_cs_write_reg(i, GPMC_CS_CONFIG6,
2459+
gpmc_context->cs_context[i].config6);
2460+
gpmc_cs_write_reg(i, GPMC_CS_CONFIG7,
2461+
gpmc_context->cs_context[i].config7);
2462+
} else {
2463+
gpmc_cs_write_reg(i, GPMC_CS_CONFIG7, 0);
2464+
}
2465+
}
2466+
}
2467+
2468+
static int omap_gpmc_context_notifier(struct notifier_block *nb,
2469+
unsigned long cmd, void *v)
2470+
{
2471+
struct gpmc_device *gpmc;
2472+
2473+
gpmc = container_of(nb, struct gpmc_device, nb);
2474+
if (gpmc->is_suspended || pm_runtime_suspended(gpmc->dev))
2475+
return NOTIFY_OK;
2476+
2477+
switch (cmd) {
2478+
case CPU_CLUSTER_PM_ENTER:
2479+
omap3_gpmc_save_context(gpmc);
2480+
break;
2481+
case CPU_CLUSTER_PM_ENTER_FAILED: /* No need to restore context */
2482+
break;
2483+
case CPU_CLUSTER_PM_EXIT:
2484+
omap3_gpmc_restore_context(gpmc);
2485+
break;
2486+
}
2487+
2488+
return NOTIFY_OK;
2489+
}
2490+
23872491
static int gpmc_probe(struct platform_device *pdev)
23882492
{
23892493
int rc;
@@ -2472,6 +2576,9 @@ static int gpmc_probe(struct platform_device *pdev)
24722576

24732577
gpmc_probe_dt_children(pdev);
24742578

2579+
gpmc->nb.notifier_call = omap_gpmc_context_notifier;
2580+
cpu_pm_register_notifier(&gpmc->nb);
2581+
24752582
return 0;
24762583

24772584
gpio_init_failed:
@@ -2486,6 +2593,7 @@ static int gpmc_remove(struct platform_device *pdev)
24862593
{
24872594
struct gpmc_device *gpmc = platform_get_drvdata(pdev);
24882595

2596+
cpu_pm_unregister_notifier(&gpmc->nb);
24892597
gpmc_free_irq(gpmc);
24902598
gpmc_mem_exit();
24912599
pm_runtime_put_sync(&pdev->dev);
@@ -2497,15 +2605,23 @@ static int gpmc_remove(struct platform_device *pdev)
24972605
#ifdef CONFIG_PM_SLEEP
24982606
static int gpmc_suspend(struct device *dev)
24992607
{
2500-
omap3_gpmc_save_context();
2608+
struct gpmc_device *gpmc = dev_get_drvdata(dev);
2609+
2610+
omap3_gpmc_save_context(gpmc);
25012611
pm_runtime_put_sync(dev);
2612+
gpmc->is_suspended = 1;
2613+
25022614
return 0;
25032615
}
25042616

25052617
static int gpmc_resume(struct device *dev)
25062618
{
2619+
struct gpmc_device *gpmc = dev_get_drvdata(dev);
2620+
25072621
pm_runtime_get_sync(dev);
2508-
omap3_gpmc_restore_context();
2622+
omap3_gpmc_restore_context(gpmc);
2623+
gpmc->is_suspended = 0;
2624+
25092625
return 0;
25102626
}
25112627
#endif
@@ -2527,74 +2643,3 @@ static __init int gpmc_init(void)
25272643
return platform_driver_register(&gpmc_driver);
25282644
}
25292645
postcore_initcall(gpmc_init);
2530-
2531-
static struct omap3_gpmc_regs gpmc_context;
2532-
2533-
void omap3_gpmc_save_context(void)
2534-
{
2535-
int i;
2536-
2537-
if (!gpmc_base)
2538-
return;
2539-
2540-
gpmc_context.sysconfig = gpmc_read_reg(GPMC_SYSCONFIG);
2541-
gpmc_context.irqenable = gpmc_read_reg(GPMC_IRQENABLE);
2542-
gpmc_context.timeout_ctrl = gpmc_read_reg(GPMC_TIMEOUT_CONTROL);
2543-
gpmc_context.config = gpmc_read_reg(GPMC_CONFIG);
2544-
gpmc_context.prefetch_config1 = gpmc_read_reg(GPMC_PREFETCH_CONFIG1);
2545-
gpmc_context.prefetch_config2 = gpmc_read_reg(GPMC_PREFETCH_CONFIG2);
2546-
gpmc_context.prefetch_control = gpmc_read_reg(GPMC_PREFETCH_CONTROL);
2547-
for (i = 0; i < gpmc_cs_num; i++) {
2548-
gpmc_context.cs_context[i].is_valid = gpmc_cs_mem_enabled(i);
2549-
if (gpmc_context.cs_context[i].is_valid) {
2550-
gpmc_context.cs_context[i].config1 =
2551-
gpmc_cs_read_reg(i, GPMC_CS_CONFIG1);
2552-
gpmc_context.cs_context[i].config2 =
2553-
gpmc_cs_read_reg(i, GPMC_CS_CONFIG2);
2554-
gpmc_context.cs_context[i].config3 =
2555-
gpmc_cs_read_reg(i, GPMC_CS_CONFIG3);
2556-
gpmc_context.cs_context[i].config4 =
2557-
gpmc_cs_read_reg(i, GPMC_CS_CONFIG4);
2558-
gpmc_context.cs_context[i].config5 =
2559-
gpmc_cs_read_reg(i, GPMC_CS_CONFIG5);
2560-
gpmc_context.cs_context[i].config6 =
2561-
gpmc_cs_read_reg(i, GPMC_CS_CONFIG6);
2562-
gpmc_context.cs_context[i].config7 =
2563-
gpmc_cs_read_reg(i, GPMC_CS_CONFIG7);
2564-
}
2565-
}
2566-
}
2567-
2568-
void omap3_gpmc_restore_context(void)
2569-
{
2570-
int i;
2571-
2572-
if (!gpmc_base)
2573-
return;
2574-
2575-
gpmc_write_reg(GPMC_SYSCONFIG, gpmc_context.sysconfig);
2576-
gpmc_write_reg(GPMC_IRQENABLE, gpmc_context.irqenable);
2577-
gpmc_write_reg(GPMC_TIMEOUT_CONTROL, gpmc_context.timeout_ctrl);
2578-
gpmc_write_reg(GPMC_CONFIG, gpmc_context.config);
2579-
gpmc_write_reg(GPMC_PREFETCH_CONFIG1, gpmc_context.prefetch_config1);
2580-
gpmc_write_reg(GPMC_PREFETCH_CONFIG2, gpmc_context.prefetch_config2);
2581-
gpmc_write_reg(GPMC_PREFETCH_CONTROL, gpmc_context.prefetch_control);
2582-
for (i = 0; i < gpmc_cs_num; i++) {
2583-
if (gpmc_context.cs_context[i].is_valid) {
2584-
gpmc_cs_write_reg(i, GPMC_CS_CONFIG1,
2585-
gpmc_context.cs_context[i].config1);
2586-
gpmc_cs_write_reg(i, GPMC_CS_CONFIG2,
2587-
gpmc_context.cs_context[i].config2);
2588-
gpmc_cs_write_reg(i, GPMC_CS_CONFIG3,
2589-
gpmc_context.cs_context[i].config3);
2590-
gpmc_cs_write_reg(i, GPMC_CS_CONFIG4,
2591-
gpmc_context.cs_context[i].config4);
2592-
gpmc_cs_write_reg(i, GPMC_CS_CONFIG5,
2593-
gpmc_context.cs_context[i].config5);
2594-
gpmc_cs_write_reg(i, GPMC_CS_CONFIG6,
2595-
gpmc_context.cs_context[i].config6);
2596-
gpmc_cs_write_reg(i, GPMC_CS_CONFIG7,
2597-
gpmc_context.cs_context[i].config7);
2598-
}
2599-
}
2600-
}

‎drivers/memory/tegra/tegra186.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ static int tegra186_mc_resume(struct tegra_mc *mc)
7171
return 0;
7272
}
7373

74+
#if IS_ENABLED(CONFIG_IOMMU_API)
7475
static void tegra186_mc_client_sid_override(struct tegra_mc *mc,
7576
const struct tegra_mc_client *client,
7677
unsigned int sid)
@@ -108,6 +109,7 @@ static void tegra186_mc_client_sid_override(struct tegra_mc *mc,
108109
writel(sid, mc->regs + client->regs.sid.override);
109110
}
110111
}
112+
#endif
111113

112114
static int tegra186_mc_probe_device(struct tegra_mc *mc, struct device *dev)
113115
{

‎include/linux/omap-gpmc.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,6 @@ extern int gpmc_configure(int cmd, int wval);
8181
extern void gpmc_read_settings_dt(struct device_node *np,
8282
struct gpmc_settings *p);
8383

84-
extern void omap3_gpmc_save_context(void);
85-
extern void omap3_gpmc_restore_context(void);
86-
8784
struct gpmc_timings;
8885
struct omap_nand_platform_data;
8986
struct omap_onenand_platform_data;

0 commit comments

Comments
 (0)