Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d62e9bf5 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Rich Felker
Browse files

arch/sh: pcie-sh7786: exclude unusable PCI MEM areas 



Depending on the physical memory layout, some PCI MEM areas are not
usable. According to the SH7786 datasheet, the PCI MEM area from
1000_0000 to 13FF_FFFF is only usable if the physical memory layout
(in MMSELR) is 1, 2, 5 or 6. In all other configurations, this PCI MEM
area is not usable (because it overlaps with DRAM).

Therefore, this commit adjusts the PCI SH7786 initialization to mark
the relevant PCI resource as IORESOURCE_DISABLED if we can't use it.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarRich Felker <dalias@libc.org>
parent 7dd7f698

arch/sh/drivers/pci/pcie-sh7786.c

+12 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/clk.h>

#include <linux/sh_clk.h>

#include <linux/sh_intc.h>

#include <cpu/sh7786.h>

#include "pcie-sh7786.h"

#include <asm/sizes.h>
@@ -530,6 +531,7 @@ static struct sh7786_pcie_hwops sh7786_65nm_pcie_hwops __initdata = { 
static int __init sh7786_pcie_init(void)

{

	struct clk *platclk;

	u32 mm_sel;

	int i;



	printk(KERN_NOTICE "PCI: Starting initialization.\n");
@@ -563,6 +565,16 @@ static int __init sh7786_pcie_init(void) 


	clk_enable(platclk);



	mm_sel = sh7786_mm_sel();



	/*

	 * Depending on the MMSELR register value, the PCIe0 MEM 1

	 * area may not be available. See Table 13.11 of the SH7786

	 * datasheet.

	 */

	if (mm_sel != 1 && mm_sel != 2 && mm_sel != 5 && mm_sel != 6)

		sh7786_pci0_resources[2].flags |= IORESOURCE_DISABLED;



	printk(KERN_NOTICE "PCI: probing %d ports.\n", nr_ports);



	for (i = 0; i < nr_ports; i++) {